Unifield Server

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

  1. us-3757
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5341
Proposed branch: lp:~mallorymarcot/unifield-server/us-3757
Merge into: lp:unifield-server
Diff against target: 25 lines (+2/-2)
2 files modified
bin/addons/msf_custom_settings/sale.py (+1/-1)
bin/addons/sale/res_partner.py (+1/-1)
To merge this branch: bzr merge lp:~mallorymarcot/unifield-server/us-3757
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+355439@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_custom_settings/sale.py'
2--- bin/addons/msf_custom_settings/sale.py 2016-01-11 14:49:28 +0000
3+++ bin/addons/msf_custom_settings/sale.py 2018-09-20 14:23:38 +0000
4@@ -59,7 +59,7 @@
5 Check that partner and order type are compatibles
6 """
7 compats = {
8- 'regular': ['internal', 'intermission', 'section', 'external'],
9+ 'regular': ['internal', 'intermission', 'section', 'external', 'esc'],
10 'donation_st': ['internal', 'intermission', 'section', 'external'],
11 'loan': ['internal', 'intermission', 'section', 'external'],
12 'donation_exp': ['internal', 'intermission', 'section', 'external'],
13
14=== modified file 'bin/addons/sale/res_partner.py'
15--- bin/addons/sale/res_partner.py 2017-10-09 21:06:10 +0000
16+++ bin/addons/sale/res_partner.py 2018-09-20 14:23:38 +0000
17@@ -55,7 +55,7 @@
18 order_type = arg[2]['order_type']
19 p_list = []
20 if order_type in ['regular']:
21- p_list = ['internal', 'intermission', 'external'] # UTP-953: Cannot create an FO regular for Intersection due to the Push Flow sync
22+ p_list = ['internal', 'intermission', 'external', 'esc'] # UTP-953: Cannot create an FO regular for Intersection due to the Push Flow sync
23 elif order_type in ['donation_st', 'loan', 'donation_exp']:
24 p_list = ['internal', 'intermission', 'section', 'external']
25 elif order_type in ['direct', 'in_kind']:

Subscribers

People subscribed via source and target branches