Unifield Server

Merge lp:~dorian-kemps/unifield-server/US-5716 into lp:unifield-server

  1. US-5716
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5358
Proposed branch: lp:~dorian-kemps/unifield-server/US-5716
Merge into: lp:unifield-server
Diff against target: 15 lines (+2/-2)
1 file modified
bin/addons/sales_followup/report/sale_follow_up_report_multi.py (+2/-2)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-5716
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+366896@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/sales_followup/report/sale_follow_up_report_multi.py'
2--- bin/addons/sales_followup/report/sale_follow_up_report_multi.py 2018-09-24 15:01:54 +0000
3+++ bin/addons/sales_followup/report/sale_follow_up_report_multi.py 2019-05-03 09:52:04 +0000
4@@ -214,9 +214,9 @@
5 is_shipment_done = move.picking_id.state == 'done'
6 packing = '-'
7 if not grouped:
8- key = (packing, False, move.product_uom.name)
9+ key = (packing, s_out and shipment or False, move.product_uom.name)
10 else:
11- key = (packing, False, move.product_uom.name, line.line_number)
12+ key = (packing, s_out and shipment or False, move.product_uom.name, line.line_number)
13 if not only_bo:
14 data.update({
15 'packing': packing,

Subscribers

People subscribed via source and target branches