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

[jftempo]

=== modified file 'bin/addons/purchase/purchase_order_line.py'
--- bin/addons/purchase/purchase_order_line.py	2019-03-04 11:09:31 +0000
+++ bin/addons/purchase/purchase_order_line.py	2019-03-28 11:11:53 +0000
@@ -1768,7 +1768,7 @@
             if pol.order_id.partner_id.partner_type == 'esc' and import_commitments:
                 return False
 
-            if pol.order_id.order_type == 'loan':
+            if pol.order_id.order_type in ['loan', 'in_kind']:
                 return False
 
             commitment_voucher_id = self.pool.get('account.commitment').search(cr, uid, [('purchase_id', '=', pol.order_id.id), ('state', '=', 'draft')], context=context)
 
=== modified file 'bin/addons/sync_client/orm.py'
--- bin/addons/sync_client/orm.py	2019-03-04 11:05:48 +0000
+++ bin/addons/sync_client/orm.py	2019-03-28 11:11:53 +0000
@@ -132,6 +132,7 @@
     FROM ir_model_data
     WHERE module = 'sd' AND
           model = %s AND
+          COALESCE(touched, '') != '[]' AND
           """+add_sql+"""
           ("""+field+""" < last_modification OR """+field+""" IS NULL)""",
                        sql_params) # not_a_user_entry