Unifield Server

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

  1. US-8923
  2. Merge into trunk
Proposed by jftempo
Status: Needs review
Proposed branch: lp:~jfb-tempo-consulting/unifield-server/US-8923
Merge into: lp:unifield-server
Diff against target: 22 lines (+2/-2)
1 file modified
bin/addons/msf_outgoing/msf_outgoing.py (+2/-2)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-server/US-8923
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+409653@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/msf_outgoing/msf_outgoing.py'
2--- bin/addons/msf_outgoing/msf_outgoing.py 2021-08-11 15:37:51 +0000
3+++ bin/addons/msf_outgoing/msf_outgoing.py 2021-10-05 12:22:23 +0000
4@@ -4437,9 +4437,9 @@
5 select
6 min(m.id) as id,
7 p.shipment_id as shipment_id,
8+ from_pack as from_pack,
9 to_pack as to_pack,
10 array_agg(m.id) as move_lines,
11- min(from_pack) as from_pack,
12 min(packing_list) as packing_list,
13 bool_and(m.volume_set) as volume_set,
14 bool_and(m.weight_set) as weight_set,
15@@ -4470,7 +4470,7 @@
16 left join sale_order_line sol on sol.id = m.sale_line_id
17 left join product_pricelist pl on pl.id = so.pricelist_id
18 where p.shipment_id is not null
19- group by p.shipment_id, p.description_ppl, to_pack, sale_id, p.subtype, p.id, p.previous_step_id
20+ group by p.shipment_id, p.description_ppl, from_pack, to_pack, sale_id, p.subtype, p.id, p.previous_step_id
21 )
22 ''')
23

Subscribers

People subscribed via source and target branches