Merge lp:~jfb-tempo-consulting/unifield-server/US-8923 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_outgoing/msf_outgoing.py'
--- bin/addons/msf_outgoing/msf_outgoing.py	2021-08-11 15:37:51 +0000
+++ bin/addons/msf_outgoing/msf_outgoing.py	2021-10-05 12:22:23 +0000
@@ -4437,9 +4437,9 @@
             select
                 min(m.id) as id,
                 p.shipment_id as shipment_id,
+                from_pack as from_pack,
                 to_pack as to_pack,
                 array_agg(m.id) as move_lines,
-                min(from_pack) as from_pack,
                 min(packing_list) as packing_list,
                 bool_and(m.volume_set) as volume_set,
                 bool_and(m.weight_set) as weight_set,
@@ -4470,7 +4470,7 @@
             left join sale_order_line sol on sol.id = m.sale_line_id
             left join product_pricelist pl on pl.id = so.pricelist_id
             where p.shipment_id is not null
-            group by p.shipment_id, p.description_ppl, to_pack, sale_id, p.subtype, p.id, p.previous_step_id
+            group by p.shipment_id, p.description_ppl, from_pack, to_pack, sale_id, p.subtype, p.id, p.previous_step_id
     )
     ''')