Merge lp:~unifield-team/unifield-wm/us-213-215 into lp:unifield-wm

[jftempo]

Unmerged revisions

2480. By Quentin THEURET @Amaris on 2015-04-27

US-215 [FIX] Real consumption report: Don't take care of stock moves not done in the real consumption report copy all feature

2479. By Quentin THEURET @Amaris on 2015-04-27

US-213 [FIX] Shipment: When return Pack from Shipment, if the From/To packs overrides the From/To packs from other lines, ...

=== modified file 'consumption_calculation/consumption_calculation.py'
--- consumption_calculation/consumption_calculation.py	2015-04-14 12:31:45 +0000
+++ consumption_calculation/consumption_calculation.py	2015-05-04 08:00:00 +0000
@@ -396,17 +396,9 @@
                             pp.batch_management, pp.perishable, pp.product_tmpl_id,
                             pt.uom_id
                         from stock_move sm, product_product pp, product_template pt
-                        where sm.location_id = %s and pp.id = sm.product_id and pt.id = pp.product_tmpl_id
-                        ''', (report.cons_location_id.id, ))
-            dict1 = cr.dictfetchall()
-            cr.execute('''select distinct sm.product_id, sm.prodlot_id, sm.expired_date,
-                                pp.batch_management, pp.perishable, pp.product_tmpl_id,
-                                pt.uom_id
-                            from stock_move sm, product_product pp, product_template pt
-                            where sm.location_dest_id = %s and pp.id = sm.product_id and pt.id = pp.product_tmpl_id
-                            ''', (report.cons_location_id.id, ))
-            dict2 = cr.dictfetchall()
-            products_by_location = dict1 + dict2
+                        where (sm.location_id = %s or sm.location_dest_id = %s) and pp.id = sm.product_id and pt.id = pp.product_tmpl_id and sm.state = 'done'
+                        ''', (report.cons_location_id.id, report.cons_location_id.id ))
+            products_by_location = cr.dictfetchall()
 
             context['location_id'] = report.cons_location_id.id
             for product in products_by_location:

=== modified file 'msf_outgoing/wizard/return_pack_shipment_processor.py'
--- msf_outgoing/wizard/return_pack_shipment_processor.py	2014-12-02 16:38:34 +0000
+++ msf_outgoing/wizard/return_pack_shipment_processor.py	2015-05-04 08:00:00 +0000
@@ -158,7 +158,7 @@
                         # previous sequence
                         seqb = sequences[i - 1]
                         # Rule #3: sfrom[i] > sto[i-1] for i>0 // no overlapping, unique sequence
-                        if not (seq[0] > seqb[1]):
+                        if seq[2] == seqb[2] and not (seq[0] > seqb[1]):
                             overlap_ids.append(seq[2])
 
             if overlap_ids: