Unifield Server

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

  1. US-6430
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5481
Proposed branch: lp:~dorian-kemps/unifield-server/US-6430
Merge into: lp:unifield-server
Diff against target: 32 lines (+3/-3)
2 files modified
bin/addons/stock/report/stock_delivery_report.py (+1/-1)
bin/addons/stock/wizard/stock_delivery_wizard.py (+2/-2)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-6430
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+371885@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/stock/report/stock_delivery_report.py'
2--- bin/addons/stock/report/stock_delivery_report.py 2019-08-22 09:27:03 +0000
3+++ bin/addons/stock/report/stock_delivery_report.py 2019-08-27 15:04:17 +0000
4@@ -66,7 +66,7 @@
5 'destination': ppl and pick.partner_id.name or fo and not fo.procurement_request and fo.partner_id.name
6 or move.location_dest_id.name or '',
7 'create_date': pick.date,
8- 'shipped_date': ppl and ship and ship.shipment_expected_date or pick.date_done,
9+ 'shipped_date': ppl and ship and ship.shipment_actual_date or pick.date_done,
10 })
11
12 self._order_iterator += 1
13
14=== modified file 'bin/addons/stock/wizard/stock_delivery_wizard.py'
15--- bin/addons/stock/wizard/stock_delivery_wizard.py 2019-08-22 09:27:03 +0000
16+++ bin/addons/stock/wizard/stock_delivery_wizard.py 2019-08-27 15:04:17 +0000
17@@ -84,13 +84,13 @@
18 out_domain.insert(0, '&')
19 out_domain.append(('picking_id.date_done', '>=', wizard.start_date))
20 ppl_domain.insert(0, '&')
21- ppl_domain.append(('picking_id.shipment_id.shipment_expected_date', '>=', wizard.start_date))
22+ ppl_domain.append(('picking_id.shipment_id.shipment_actual_date', '>=', wizard.start_date))
23
24 if wizard.end_date:
25 out_domain.insert(0, '&')
26 out_domain.append(('picking_id.date_done', '<=', wizard.end_date))
27 ppl_domain.insert(0, '&')
28- ppl_domain.append(('picking_id.shipment_id.shipment_expected_date', '<=', wizard.end_date))
29+ ppl_domain.append(('picking_id.shipment_id.shipment_actual_date', '<=', wizard.end_date))
30
31 if wizard.location_id:
32 out_domain.insert(0, '&')

Subscribers

People subscribed via source and target branches