Unifield Server

Merge lp:~julie-w/unifield-server/US-5796 into lp:unifield-server/uf12

  1. US-5796
  2. Merge into uf12
Proposed by jftempo
Status: Merged
Merged at revision: 5313
Proposed branch: lp:~julie-w/unifield-server/US-5796
Merge into: lp:unifield-server/uf12
Diff against target: 24 lines (+2/-1)
2 files modified
bin/addons/purchase/purchase_order_line.py (+1/-1)
bin/addons/sync_client/orm.py (+1/-0)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-5796
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+365217@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_line.py'
2--- bin/addons/purchase/purchase_order_line.py 2019-03-04 11:09:31 +0000
3+++ bin/addons/purchase/purchase_order_line.py 2019-03-28 11:11:53 +0000
4@@ -1768,7 +1768,7 @@
5 if pol.order_id.partner_id.partner_type == 'esc' and import_commitments:
6 return False
7
8- if pol.order_id.order_type == 'loan':
9+ if pol.order_id.order_type in ['loan', 'in_kind']:
10 return False
11
12 commitment_voucher_id = self.pool.get('account.commitment').search(cr, uid, [('purchase_id', '=', pol.order_id.id), ('state', '=', 'draft')], context=context)
13
14=== modified file 'bin/addons/sync_client/orm.py'
15--- bin/addons/sync_client/orm.py 2019-03-04 11:05:48 +0000
16+++ bin/addons/sync_client/orm.py 2019-03-28 11:11:53 +0000
17@@ -132,6 +132,7 @@
18 FROM ir_model_data
19 WHERE module = 'sd' AND
20 model = %s AND
21+ COALESCE(touched, '') != '[]' AND
22 """+add_sql+"""
23 ("""+field+""" < last_modification OR """+field+""" IS NULL)""",
24 sql_params) # not_a_user_entry

Subscribers

People subscribed via source and target branches