Unifield Server

Merge lp:~mallorymarcot/unifield-server/us-5009 into lp:unifield-server

  1. us-5009
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5117
Proposed branch: lp:~mallorymarcot/unifield-server/us-5009
Merge into: lp:unifield-server
Diff against target: 39 lines (+4/-4)
1 file modified
bin/addons/msf_supply_doc_export/msf_supply_doc_export.py (+4/-4)
To merge this branch: bzr merge lp:~mallorymarcot/unifield-server/us-5009
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+355537@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_supply_doc_export/msf_supply_doc_export.py'
2--- bin/addons/msf_supply_doc_export/msf_supply_doc_export.py 2018-08-10 10:21:43 +0000
3+++ bin/addons/msf_supply_doc_export/msf_supply_doc_export.py 2018-09-24 12:25:32 +0000
4@@ -550,7 +550,7 @@
5 report_line = {
6 'order_ref': order.name or '',
7 'order_created': order.date_order or '',
8- 'order_confirmed_date': order.delivery_confirmed_date or '',
9+ 'order_confirmed_date': line.confirmed_delivery_date or order.delivery_confirmed_date or '',
10 'raw_state': line.state,
11 'line_status': get_sel(self.cr, self.uid, 'purchase.order.line', 'state', line.state, {}) or '',
12 'state': line.state_to_display or '',
13@@ -576,7 +576,7 @@
14 report_line = {
15 'order_ref': order.name or '',
16 'order_created': order.date_order or '',
17- 'order_confirmed_date': order.delivery_confirmed_date or '',
18+ 'order_confirmed_date': line.confirmed_delivery_date or order.delivery_confirmed_date or '',
19 'raw_state': line.state,
20 'order_status': self._get_states().get(order.state, ''),
21 'line_status': first_line and get_sel(self.cr, self.uid, 'purchase.order.line', 'state', line.state, {}) or '',
22@@ -608,7 +608,7 @@
23 report_line = {
24 'order_ref': order.name or '',
25 'order_created': order.date_order or '',
26- 'order_confirmed_date': order.delivery_confirmed_date or '',
27+ 'order_confirmed_date': line.confirmed_delivery_date or order.delivery_confirmed_date or '',
28 'raw_state': line.state,
29 'order_status': self._get_states().get(order.state, ''),
30 'line_status': first_line and get_sel(self.cr, self.uid, 'purchase.order.line', 'state', line.state, {}) or '',
31@@ -640,7 +640,7 @@
32 report_line = {
33 'order_ref': order.name or '',
34 'order_created': order.date_order or '',
35- 'order_confirmed_date': order.delivery_confirmed_date or '',
36+ 'order_confirmed_date': line.confirmed_delivery_date or order.delivery_confirmed_date or '',
37 'raw_state': line.state,
38 'order_status': self._get_states().get(order.state, ''),
39 'line_status': get_sel(self.cr, self.uid, 'purchase.order.line', 'state', line.state, {}) or '',

Subscribers

People subscribed via source and target branches