Unifield Server

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

  1. US-3196
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4878
Proposed branch: lp:~jfb-tempo-consulting/unifield-server/US-3196
Merge into: lp:unifield-server
Diff against target: 13 lines (+3/-0)
1 file modified
bin/addons/purchase/purchase_order.py (+3/-0)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-server/US-3196
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+344701@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/purchase/purchase_order.py'
2--- bin/addons/purchase/purchase_order.py 2018-04-03 10:31:44 +0000
3+++ bin/addons/purchase/purchase_order.py 2018-04-27 10:13:06 +0000
4@@ -1686,6 +1686,9 @@
5 elif order_type == 'direct':
6 v['cross_docking_ok'] = False
7
8+ if order_type == 'regular' and v['invoice_method'] == 'picking':
9+ v['cross_docking_ok'] = True
10+
11 if order_type == 'purchase_list' and delivery_requested_date:
12 v.update({'delivery_confirmed_date': delivery_requested_date})
13 # UF-1440: Add today's date if no date and you choose "purchase_list" PO

Subscribers

People subscribed via source and target branches