Merge lp:~unifield-team/unifield-wm/us-829 into lp:unifield-wm

[jftempo]

=== modified file 'account_mcdb/wizard/output_currency_for_export.py'
--- account_mcdb/wizard/output_currency_for_export.py	2016-01-19 10:34:18 +0000
+++ account_mcdb/wizard/output_currency_for_export.py	2016-01-22 08:55:06 +0000
@@ -176,6 +176,7 @@
             'report_name': fields.char('Report Name', size=256),
             'report_id': fields.integer('Report id'),
             'percent': fields.float('Percent'),
+            'finished': fields.boolean('Finished'),
         }
         def update_percent(self, cr, uid, ids, percent, context=None):
             self.write(cr, uid, ids, {'percent': percent})

=== modified file 'msf_supply_doc_export/msf_supply_doc_export.py'
--- msf_supply_doc_export/msf_supply_doc_export.py	2015-07-23 13:47:45 +0000
+++ msf_supply_doc_export/msf_supply_doc_export.py	2016-01-22 08:55:06 +0000
@@ -408,6 +408,12 @@
 
         return res
 
+    def yieldPoLines(self, po_line_ids):
+        for pol_id in po_line_ids:
+            yield self.pool.get('purchase.order.line').browse(self.cr, self.uid, pol_id)
+
+        raise StopIteration
+
     def getPOLines(self, po_id):
         ''' developer note: would be a lot easier to write this as a single sql and then use on-break '''
         # TODO the multiplier is the value populated for no change in stock_move.price_unit
@@ -418,17 +424,16 @@
         prod_obj = self.pool.get('product.product')
         uom_obj = self.pool.get('product.uom')
         po_line_ids = pol_obj.search(self.cr, self.uid, [('order_id','=',po_id)], order='line_number')
-        po_lines = pol_obj.browse(self.cr, self.uid, po_line_ids)
+#        po_lines = pol_obj.browse(self.cr, self.uid, po_line_ids)
         report_lines = []
         order = po_obj.browse(self.cr, self.uid, po_id)
-        for line in po_lines:
-            in_lines = self.getAllLineIN(line.id)
+        for line in self.yieldPoLines(po_line_ids):
             analytic_lines = self.getAnalyticLines(line)
             same_product_same_uom = []
             same_product = []
             other_product = []
 
-            for inl in in_lines:
+            for inl in self.getAllLineIN(line.id):
                 if inl.get('product_id') and inl.get('product_id') == line.product_id.id:
                     if inl.get('product_uom') and inl.get('product_uom') == line.product_uom.id:
                         same_product_same_uom.append(inl)
@@ -539,7 +544,10 @@
                 }
                 report_lines.append(report_line)
 
-        return report_lines
+            for rl in report_lines:
+                yield rl
+
+        raise StopIteration
 
     def getAnalyticLines(self,po_line):
         ccdl_obj = self.pool.get('cost.center.distribution.line')
@@ -570,7 +578,10 @@
                 sm.picking_id = sp.id
             ORDER BY
                 sp.name, sm.id asc''', tuple([po_line_id]))
-        return self.cr.dictfetchall()
+        for res in self.cr.dictfetchall():
+            yield res
+
+        raise StopIteration
 
     def getReportHeaderLine1(self):
         return self.datas.get('report_header')[0]

=== modified file 'msf_supply_doc_export/wizard/po_follow_up.py'
--- msf_supply_doc_export/wizard/po_follow_up.py	2014-11-07 15:09:38 +0000
+++ msf_supply_doc_export/wizard/po_follow_up.py	2016-01-22 08:55:06 +0000
@@ -159,6 +159,7 @@
             'report_name': fields.char('Report Name', size=256),
             'report_id': fields.integer('Report id'),
             'percent': fields.float('Percent'),
+            'finished': fields.boolean('Finished'),
         }
         def update_percent(self, cr, uid, ids, percent, context=None):
             self.write(cr, uid, ids, {'percent': percent})

=== modified file 'sales_followup/report/sale_follow_up_multi_report.rml'
--- sales_followup/report/sale_follow_up_multi_report.rml	2014-11-05 16:48:01 +0000
+++ sales_followup/report/sale_follow_up_multi_report.rml	2016-01-22 08:55:06 +0000
@@ -193,7 +193,7 @@
                     <para style="Lines"></para>
                 </td>
                 <td>
-                    <para style="Lines"># Items: [[ len(getProducts(o)) ]]</para>
+                    <para style="Lines"># Items: [[ getCountProducts(o) ]]</para>
                 </td>
                 <td>
                     <para style="Lines">Estimated amount: [[ formatLang(o.amount_total or 0.00) ]] [[ o.pricelist_id.currency_id.name ]]</para>

=== modified file 'sales_followup/report/sale_follow_up_multi_report_xls.mako'
--- sales_followup/report/sale_follow_up_multi_report_xls.mako	2015-07-06 09:55:29 +0000
+++ sales_followup/report/sale_follow_up_multi_report_xls.mako	2016-01-22 08:55:06 +0000
@@ -263,7 +263,7 @@
                 <Cell ss:StyleID="order_header_first" ss:MergeAcross="2"><Data ss:Type="String">Order ref.: ${o.name|x}     Status: ${getSel(o, 'state')|x}</Data></Cell>
                 <Cell ss:StyleID="order_header" ss:MergeAcross="2"><Data ss:Type="String">Received: ${saleUstr(formatLang(o.date_order, date=True))|x}</Data></Cell>
                 <Cell ss:StyleID="order_header" ss:MergeAcross="2"><Data ss:Type="String">Req. Delivery date: ${o.delivery_requested_date and saleUstr(formatLang(o.delivery_requested_date, date=True)) or ''|x}</Data></Cell>
-                <Cell ss:StyleID="order_header"><Data ss:Type="String"># Items: ${len(getProducts(o))|x}</Data></Cell>
+                <Cell ss:StyleID="order_header"><Data ss:Type="String"># Items: ${getProducts(o)|x}</Data></Cell>
                 <Cell ss:StyleID="order_header_last" ss:MergeAcross="2"><Data ss:Type="String">Estimated amount: ${formatLang(o.amount_total or 0.00)|x} ${o.pricelist_id.currency_id.name|x}</Data></Cell>
             </Row>
 

=== modified file 'sales_followup/report/sale_follow_up_report_multi.py'
--- sales_followup/report/sale_follow_up_report_multi.py	2015-06-16 08:08:25 +0000
+++ sales_followup/report/sale_follow_up_report_multi.py	2016-01-22 08:55:06 +0000
@@ -53,40 +53,43 @@
 
     def _get_orders(self, report):
         orders = []
-
-        for order in report.order_ids:
-            if len(order.order_line):
-                orders.append(order)
+        for order_id in report.order_ids:
+            if self.pool.get('sale.order.line').search(self.cr, self.uid, [('order_id', '=', order_id)]):
+                orders.append(order_id)
 
         self._nb_orders = len(orders)
 
-        return orders
+        for order in orders:
+            yield self.pool.get('sale.order').browse(self.cr, self.uid, order)
+
+        raise StopIteration
 
     def _get_products(self, order, count=False):
         '''
         Returns the list of products in the order
         '''
-        prod_obj = self.pool.get('product.product')
-
-        self.cr.execute('''SELECT distinct(product_id) FROM sale_order_line WHERE order_id = %(order_id)s''', {'order_id': order.id})
-        product_ids = [x[0] for x in self.cr.fetchall() if x[0] is not None]
-
-        if count:
-            return len(product_ids)
-
-        return prod_obj.browse(self.cr, self.uid, product_ids)
+        self.cr.execute('''SELECT COUNT(DISTINCT(product_id)) FROM sale_order_line WHERE order_id = %(order_id)s''', {'order_id': order.id})
+        return self.cr.fetchone()[0]
+
+    def _get_order_line(self, order_id):
+        order_line_ids = self.pool.get('sale.order.line').search(self.cr, self.uid, [('order_id', '=', order_id)])
+        for order_line_id in order_line_ids:
+            yield self.pool.get('sale.order.line').browse(self.cr, self.uid, order_line_id)
+
+        raise StopIteration
 
     def _get_lines(self, order, grouped=False):
         '''
         Get all lines with OUT/PICK for an order
         '''
-        res = []
         keys = []
-        for line in order.order_line:
+        for line in self._get_order_line(order.id):
             if not grouped:
                 keys = []
             lines = []
             first_line = True
+            fl_index = 0
+            m_index = 0
             bo_qty = line.product_uom_qty
             for move in line.move_ids:
                 m_type = move.product_qty != 0.00 and move.picking_id.type == 'out'
@@ -154,6 +157,9 @@
                     else:
                         keys.append(key)
                         lines.append(data)
+                        if data.get('first_line'):
+                            fl_index= m_index
+                        m_index += 1
 
             # No move found
             if first_line:
@@ -172,11 +178,12 @@
                 lines.append(data)
 
             # Put the backorderd qty on the first line
-            for l in lines:
-                if l.get('first_line'):
-                    l['backordered_qty'] = bo_qty
+            if not lines:
+                continue
+            lines[fl_index]['backordered_qty'] = bo_qty
 
-            res.extend(lines)
+            for line in lines:
+                yield line
 
         self._order_iterator += 1
 
@@ -184,7 +191,7 @@
             percent = float(self._order_iterator) / float(self._nb_orders)
             self.pool.get('memory.background.report').update_percent(self.cr, self.uid, [self.back_browse.id], percent)
 
-        return res
+        raise StopIteration
 
     def _parse_date_xls(self, dt_str, is_datetime=True):
         if not dt_str or dt_str == 'False':

=== modified file 'sales_followup/wizard/sale_followup_multi_wizard.py'
--- sales_followup/wizard/sale_followup_multi_wizard.py	2014-09-25 07:20:48 +0000
+++ sales_followup/wizard/sale_followup_multi_wizard.py	2016-01-22 08:55:06 +0000
@@ -61,13 +61,17 @@
             string='Status',
             readonly=True,
         ),
-        'order_ids': fields.many2many(
-            'sale.order',
-            'followup_per_client_rel',
-            'report_id',
-            'order_id',
+        'order_ids': fields.text(
             string='Orders',
+            readonly=True
         ),
+        #'order_ids': fields.many2many(
+        #    'sale.order',
+        #    'followup_per_client_rel',
+        #    'report_id',
+        #    'order_id',
+        #    string='Orders',
+        #),
         'order_id': fields.many2one(
             'sale.order',
             string='Order Ref.',
@@ -173,7 +177,7 @@
                         _('No data found with these parameters'),
                     )
 
-            self.write(cr, uid, [wizard.id], {'order_ids': [(6,0,fo_ids)]}, context=context)
+            self.write(cr, uid, [wizard.id], {'order_ids': fo_ids}, context=context)
 
         return True