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

[jftempo]

=== 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-11-09 08:28:09 +0000
+++ bin/addons/msf_supply_doc_export/msf_supply_doc_export.py	2017-02-13 13:49:10 +0000
@@ -490,7 +490,7 @@
                 report_lines.extend(self.printAnalyticLines(analytic_lines))
                 first_line = False
 
-            for spsul in same_product_same_uom:
+            for spsul in sorted(same_product_same_uom, key=lambda spsu: spsu.get('backorder_id'), reverse=True):
                 report_line = {
                     'order_ref': order.name or '',
                     'order_created': order.date_order or '',
@@ -511,14 +511,15 @@
                 }
 
                 report_lines.append(report_line)
+                    
+                if spsul.get('backorder_id') and spsul.get('state') != 'done':
+                   report_line['qty_backordered'] = spsul.get('product_qty', '')
 
                 if first_line:
-                    if spsul.get('backorder_id') and spsul.get('state') != 'done':
-                        report_line['qty_backordered'] = spsul.get('product_qty', '')
                     report_lines.extend(self.printAnalyticLines(analytic_lines))
                     first_line = False
 
-            for spl in same_product:
+            for spl in sorted(same_product, key=lambda spsu: spsu.get('backorder_id'), reverse=True):
                 report_line = {
                     'order_ref': order.name or '',
                     'order_created': order.date_order or '',
@@ -538,10 +539,11 @@
                     'in_unit_price': spl.get('price_unit'),
                 }
                 report_lines.append(report_line)
+                
+                if spl.get('backorder_id') and spl.get('state') != 'done':
+                    report_line['qty_backordered'] = spl.get('product_qty', '')
 
                 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
 
@@ -597,7 +599,7 @@
               AND
                 sm.picking_id = sp.id
             ORDER BY
-                sp.name, sm.id asc''', tuple([po_line_id]))
+                sp.name, sp.backorder_id, sm.id asc''', tuple([po_line_id]))
         for res in self.cr.dictfetchall():
             yield res