Unifield Server

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

  1. US-6568
  2. Merge into uf14
Proposed by jftempo
Status: Merged
Merged at revision: 5507
Proposed branch: lp:~dorian-kemps/unifield-server/US-6568
Merge into: lp:unifield-server/uf14
Diff against target: 12 lines (+1/-1)
1 file modified
bin/addons/sales_followup/report/ir_follow_up_location_report.py (+1/-1)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-6568
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+373560@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
=== modified file 'bin/addons/sales_followup/report/ir_follow_up_location_report.py'
--- bin/addons/sales_followup/report/ir_follow_up_location_report.py 2019-09-25 14:04:16 +0000
+++ bin/addons/sales_followup/report/ir_follow_up_location_report.py 2019-10-03 10:38:13 +0000
@@ -282,7 +282,7 @@
282 elif from_stock:282 elif from_stock:
283 packing = move.picking_id.name or '-'283 packing = move.picking_id.name or '-'
284 shipment = '-'284 shipment = '-'
285 is_shipment_done = move.picking_id.state == 'done' and move.state != 'cancel'285 is_shipment_done = move.picking_id.state in ('done', 'delivered') and move.state != 'cancel'
286 state = move.picking_id.state286 state = move.picking_id.state
287 else:287 else:
288 shipment = move.picking_id.name or '-'288 shipment = move.picking_id.name or '-'

Subscribers

People subscribed via source and target branches

to all changes: