Merge lp:~unifield-team/unifield-server/us-218 into lp:unifield-server

[Quentin THEURET @Amaris]

Unmerged revisions

3870. By Quentin THEURET @Amaris on 2016-07-26

US-218 [FIX] No display backorder quantities if the IN is canceled

3869. By Quentin THEURET @Amaris on 2016-07-26

US-218 [IMP] PO follow-up per supplier: The original IN with the BO qty will always be the last displayed,

3868. By Quentin THEURET @Amaris on 2016-07-26

US-218 [IMP] PO follow-up per supplier: The original IN with the BO qty will always be the last displayed,

3867. By Quentin THEURET @Amaris on 2016-07-26

US-218 [FIX] Make the report in background

=== modified file 'bin/addons/msf_supply_doc_export/msf_supply_doc_export.py'
--- bin/addons/msf_supply_doc_export/msf_supply_doc_export.py	2016-03-15 06:38:29 +0000
+++ bin/addons/msf_supply_doc_export/msf_supply_doc_export.py	2016-07-27 07:09:11 +0000
@@ -408,8 +408,17 @@
 
         return res
 
+    def setTotalLines(self, po_ids):
+        if not self.total_lines:
+            self.total_lines = self.pool.get('purchase.order.line').search(self.cr, self.uid, [('order_id', 'in', [x.id for x in po_ids])], count=True, context=self.localcontext)
+        return True
+
     def yieldPoLines(self, po_line_ids):
         for pol_id in po_line_ids:
+            self.processed_lines += 1
+            if self.back_browse:
+                percent = float(self.processed_lines) / float(self.total_lines)
+                self.pool.get('memory.background.report').update_percent(self.cr, self.uid, [self.back_browse.id], percent)
             yield self.pool.get('purchase.order.line').browse(self.cr, self.uid, pol_id, context=self.localcontext)
 
         raise StopIteration
@@ -433,7 +442,9 @@
             same_product = []
             other_product = []
 
+            inl_index = 0
             for inl in self.getAllLineIN(line.id):
+                inl_index += 1
                 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)
@@ -442,6 +453,8 @@
                 else:
                     other_product.append(inl)
 
+            oneline = inl_index == 1
+            first_line_data = []
             first_line = True
             # Display information of the initial reception
             if not same_product_same_uom:
@@ -468,15 +481,17 @@
                 first_line = False
 
             for spsul in same_product_same_uom:
+                bo_qty = spsul.get('backorder_id') and spsul.get('state') != 'done'
+                display_main_info = (first_line and not bo_qty) or oneline
                 report_line = {
                     'order_ref': order.name or '',
                     'order_created': order.date_order or '',
                     'order_confirmed_date': order.delivery_confirmed_date or '',
                     'order_status': self._get_states().get(order.state, ''),
-                    'item': first_line and line.line_number or '',
-                    'code': first_line and line.product_id.default_code or '',
-                    'description': first_line and line.product_id.name or '',
-                    'qty_ordered': first_line and line.product_qty or '',
+                    'item': display_main_info and line.line_number or '',
+                    'code': display_main_info and line.product_id.default_code or '',
+                    'description': display_main_info and line.product_id.name or '',
+                    'qty_ordered': display_main_info and line.product_qty or '',
                     'uom': line.product_uom.name or '',
                     'qty_received': spsul.get('state') == 'done' and spsul.get('product_qty', '') or '0.00',
                     'in': spsul.get('name', '') or '',
@@ -487,24 +502,28 @@
                     'in_unit_price': spsul.get('price_unit'),
                 }
 
-                report_lines.append(report_line)
-
-                if first_line:
-                    if spsul.get('backorder_id') and spsul.get('state') != 'done':
+                if first_line and not first_line_data and bo_qty:
+                    if spsul.get('state') != 'cancel':
                         report_line['qty_backordered'] = spsul.get('product_qty', '')
-                    report_lines.extend(self.printAnalyticLines(analytic_lines))
-                    first_line = False
+                    first_line_data.append(report_line)
+                else:
+                    report_lines.append(report_line)
+                    if first_line:
+                        first_line = False
+                        report_lines.extend(self.printAnalyticLines(analytic_lines))
 
             for spl in same_product:
+                bo_qty = spl.get('backorder_id') and spl.get('state') != 'done'
+                display_main_info = (first_line and not bo_qty) or oneline
                 report_line = {
                     'order_ref': order.name or '',
                     'order_created': order.date_order or '',
                     'order_confirmed_date': order.delivery_confirmed_date or '',
                     'order_status': self._get_states().get(order.state, ''),
-                    'item': first_line and line.line_number or '',
-                    'code': first_line and line.product_id.default_code or '',
-                    'description': first_line and line.product_id.name or '',
-                    'qty_ordered': first_line and line.product_qty or '',
+                    'item': display_main_info and line.line_number or '',
+                    'code': display_main_info and line.product_id.default_code or '',
+                    'description': display_main_info and line.product_id.name or '',
+                    'qty_ordered': display_main_info and  line.product_qty or '',
                     'uom': uom_obj.read(self.cr, self.uid, spl.get('product_uom'), ['name'])['name'],
                     'qty_received': spl.get('state') == 'done' and spl.get('product_qty', '') or '0.00',
                     'in': spl.get('name', '') or '',
@@ -514,13 +533,16 @@
                     'unit_price': line.price_unit or '',
                     'in_unit_price': spl.get('price_unit'),
                 }
-                report_lines.append(report_line)
 
-                if first_line:
-                    if spl.get('backorder_id') and spl.get('state') != 'done':
-                        report_line['qty_backordered'] = spl.get('product_qty', '')
-                    report_lines.extend(self.printAnalyticLines(analytic_lines))
-                    first_line = False
+                if first_line and not first_line_data and bo_qty:
+                    if spl.get('state') != 'cancel':
+                        report_line['qty_backordered'] = spsul.get('product_qty', '')
+                    first_line_data.append(report_line)
+                else:
+                    report_lines.append(report_line)
+                    if first_line:
+                        first_line = False
+                        report_lines.extend(self.printAnalyticLines(analytic_lines))
 
             for ol in other_product:
                 prod_brw = prod_obj.browse(self.cr, self.uid, ol.get('product_id'))
@@ -544,6 +566,9 @@
                 }
                 report_lines.append(report_line)
 
+            if first_line_data:
+                report_lines.extend(first_line_data)
+
         return report_lines
 
     def getAnalyticLines(self,po_line):
@@ -580,7 +605,7 @@
 
         raise StopIteration
 
-    def getReportHeaderLine1(self):
+    def getReportHeaderLine1(self, po_ids):
         return self.datas.get('report_header')[0]
     
     def getReportHeaderLine2(self):
@@ -605,9 +630,11 @@
             'getPOLines': self.getPOLines,
             'getPOLineHeaders': self.getPOLineHeaders,
             'getRunParms': self.getRunParms,
+            'setTotalLines': self.setTotalLines,
         })
-
-    
+        self.total_lines = 0
+        self.processed_lines = 0
+        self.back_browse = get_back_browse(self, self.cr, self.uid, context)
 
 
 class po_follow_up_report_xls(SpreadsheetReport):
@@ -633,7 +660,11 @@
             'getReportHeaderLine1': self.getReportHeaderLine1,
             'getReportHeaderLine2': self.getReportHeaderLine2,
             'getRunParmsRML': self.getRunParmsRML,
+            'setTotalLines': self.setTotalLines,
         })
+        self.total_lines = 0
+        self.processed_lines = 0
+        self.back_browse = get_back_browse(self, self.cr, self.uid, context)
 
 report_sxw.report_sxw('report.po.follow.up_rml', 'purchase.order', 'addons/msf_supply_doc_export/report/report_po_follow_up.rml', parser=parser_po_follow_up_rml, header=False)
 

=== modified file 'bin/addons/msf_supply_doc_export/report/report_po_follow_up.rml'
--- bin/addons/msf_supply_doc_export/report/report_po_follow_up.rml	2014-11-05 16:27:19 +0000
+++ bin/addons/msf_supply_doc_export/report/report_po_follow_up.rml	2016-07-27 07:09:11 +0000
@@ -67,8 +67,9 @@
 
     <para style="P2">
       <font color="white"> </font>
+        [[ setTotalLines(objects) ]]
     </para>
-    
+
     <para>[[repeatIn(objects,'o')]]</para>
     <blockTable colWidths="150.0,150.0,150.0,150.0,150.0,150.0" style="Tableau3">
     <tr>

=== modified file 'bin/addons/msf_supply_doc_export/report/report_po_follow_up_xls.mako'
--- bin/addons/msf_supply_doc_export/report/report_po_follow_up_xls.mako	2015-02-20 12:56:44 +0000
+++ bin/addons/msf_supply_doc_export/report/report_po_follow_up_xls.mako	2016-07-27 07:09:11 +0000
@@ -114,6 +114,7 @@
     # Cost Center
     <Column ss:AutoFitWidth="1" ss:Width="95" />
 
+    ${setTotalLines(objects)}
 <Row>
     <Cell ss:MergeAcross="11" ss:StyleID="mainheader"><Data ss:Type="String">${getRunParms()['title'] or '' |x}</Data></Cell>
 </Row>
@@ -130,7 +131,6 @@
     	    <Cell ss:StyleID="header"><Data ss:Type="String">${header}</Data></Cell>
        % endfor       
     </Row>
-    
 % for o in objects:
     
     % for line in getPOLines(o.id):

=== modified file 'bin/addons/msf_supply_doc_export/wizard/po_follow_up.py'
--- bin/addons/msf_supply_doc_export/wizard/po_follow_up.py	2016-01-29 15:34:00 +0000
+++ bin/addons/msf_supply_doc_export/wizard/po_follow_up.py	2016-07-27 07:09:11 +0000
@@ -54,7 +54,7 @@
     
     _defaults = {
         'export_format': lambda *a: 'xls',
-        'background_time': lambda *a: 20,
+        'background_time': lambda *a: 5,
     }
     
     def button_validate(self, cr, uid, ids, context=None):
@@ -138,6 +138,7 @@
         background_id = self.pool.get('memory.background.report').create(cr, uid, {'file_name': report_name, 'report_name': report_name}, context=context)
         context['background_id'] = background_id
         context['background_time'] = wiz.background_time
+        datas['context'] = context
                                                                              
         return {                                                                
             'type': 'ir.actions.report.xml',                                    
@@ -146,7 +147,7 @@
             'nodestroy': True,                                                  
             'context': context,                                                 
         }
-    
+ 
 po_follow_up()