Unifield Server

Merge lp:~dorian-kemps/unifield-server/US-6693 into lp:unifield-server

  1. US-6693
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5624
Proposed branch: lp:~dorian-kemps/unifield-server/US-6693
Merge into: lp:unifield-server
Diff against target: 38 lines (+5/-1)
3 files modified
bin/addons/import_data/import_data.py (+1/-1)
bin/addons/msf_doc_import/wizard/wiz_common_import.py (+2/-0)
bin/addons/sync_so/specific_xml_id.py (+2/-0)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-6693
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+378101@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/import_data/import_data.py'
2--- bin/addons/import_data/import_data.py 2019-10-07 08:56:57 +0000
3+++ bin/addons/import_data/import_data.py 2020-01-27 10:41:33 +0000
4@@ -480,7 +480,7 @@
5 for to_remove in ['standard_price', 'perishable', 'batch_management']:
6 if to_remove in data:
7 del data[to_remove]
8- impobj.write(cr, uid, ids_to_update, data)
9+ impobj.write(cr, uid, ids_to_update, data, context=context)
10 nb_update_success += 1
11 cr.commit()
12 else:
13
14=== modified file 'bin/addons/msf_doc_import/wizard/wiz_common_import.py'
15--- bin/addons/msf_doc_import/wizard/wiz_common_import.py 2018-12-04 12:55:36 +0000
16+++ bin/addons/msf_doc_import/wizard/wiz_common_import.py 2020-01-27 10:41:33 +0000
17@@ -278,6 +278,8 @@
18 _inherit = 'product.product'
19
20 def write(self, cr, uid, ids, vals, context=None):
21+ if context is None:
22+ context = {}
23 import_product_qty = 'import_product_qty'
24 if len(vals) == 1 and import_product_qty in vals:
25 self._write_imp_product_qty(cr, uid, ids, field_name=import_product_qty, values=vals[import_product_qty], args=None, context=context)
26
27=== modified file 'bin/addons/sync_so/specific_xml_id.py'
28--- bin/addons/sync_so/specific_xml_id.py 2019-09-10 14:46:40 +0000
29+++ bin/addons/sync_so/specific_xml_id.py 2020-01-27 10:41:33 +0000
30@@ -725,6 +725,8 @@
31
32 # UF-2254: Treat the case of product with empty or XXX for default_code
33 def write(self, cr, uid, ids, vals, context=None):
34+ if context is None:
35+ context = {}
36 if not ids:
37 return True
38 res = super(product_product, self).write(cr, uid, ids, vals, context=context)

Subscribers

People subscribed via source and target branches