Unifield Server

Merge lp:~unifield-team/unifield-server/us-2569 into lp:unifield-server

  1. us-2569
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4265
Proposed branch: lp:~unifield-team/unifield-server/us-2569
Merge into: lp:unifield-server
Diff against target: 47 lines (+12/-4)
1 file modified
bin/addons/product_attributes/product_attributes.py (+12/-4)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-2569
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+319028@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/product_attributes/product_attributes.py'
2--- bin/addons/product_attributes/product_attributes.py 2017-02-09 17:18:36 +0000
3+++ bin/addons/product_attributes/product_attributes.py 2017-03-06 08:57:41 +0000
4@@ -1334,7 +1334,9 @@
5 prod_state = prod_status_obj.read(cr, uid, state_id, ['code'], context=context)[0]['code']
6 local_smrl_ids = smrl_obj.search(cr, uid, [('product_state', '!=', prod_state), ('product_id', 'in', ids), ('full_view', '=', False), ('mission_report_id.local_report', '=', True)], context=context)
7 if local_smrl_ids:
8- smrl_obj.write(cr, 1, local_smrl_ids, {'product_state': prod_state}, context=context)
9+ no_sync_context = context.copy()
10+ no_sync_context['sync_update_execution'] = False
11+ smrl_obj.write(cr, 1, local_smrl_ids, {'product_state': prod_state}, context=no_sync_context)
12
13 if 'international_status' in vals:
14 intstat_code = ''
15@@ -1351,7 +1353,9 @@
16 ('mission_report_id.local_report', '=', True)
17 ], context=context)
18 if local_smrl_ids:
19- smrl_obj.write(cr, 1, local_smrl_ids, {'international_status_code': intstat_code or ''}, context=context)
20+ no_sync_context = context.copy()
21+ no_sync_context['sync_update_execution'] = False
22+ smrl_obj.write(cr, 1, local_smrl_ids, {'international_status_code': intstat_code or ''}, context=no_sync_context)
23
24 if 'state_ud' in vals:
25 # just update SMRL that belongs to our instance:
26@@ -1362,7 +1366,9 @@
27 ('state_ud', '!=', vals['state_ud'] or ''),
28 ], context=context)
29 if local_smrl_ids:
30- smrl_obj.write(cr, 1, local_smrl_ids, {'state_ud': vals['state_ud'] or ''}, context=context)
31+ no_sync_context = context.copy()
32+ no_sync_context['sync_update_execution'] = False
33+ smrl_obj.write(cr, 1, local_smrl_ids, {'state_ud': vals['state_ud'] or ''}, context=no_sync_context)
34
35 product_uom_categ = []
36 if 'uom_id' in vals or 'uom_po_id' in vals:
37@@ -1405,7 +1411,9 @@
38 ('product_active', '!=', vals['active'])
39 ], context=context)
40 if local_smrl_ids:
41- smrl_obj.write(cr, 1, local_smrl_ids, {'product_active': vals['active']}, context=context)
42+ no_sync_context = context.copy()
43+ no_sync_context['sync_update_execution'] = False
44+ smrl_obj.write(cr, 1, local_smrl_ids, {'product_active': vals['active']}, context=no_sync_context)
45
46 if 'narcotic' in vals or 'controlled_substance' in vals:
47 if vals.get('narcotic') == True or tools.ustr(vals.get('controlled_substance', '')) == 'True':

Subscribers

People subscribed via source and target branches

to all changes: