Merge lp:~ajite/openobject-addons/elico-7.0-add-0002 into lp:~openerp-community/openobject-addons/elico-7.0

Status: Merged
Approved by: Eric Caudal - www.elico-corp.com
Approved revision: no longer in the source branch.
Merged at revision: 31
Proposed branch: lp:~ajite/openobject-addons/elico-7.0-add-0002
Merge into: lp:~openerp-community/openobject-addons/elico-7.0
Diff against target: 34 lines (+11/-6)
1 file modified
base_intercompany/unit/export_synchronizer.py (+11/-6)
To merge this branch: bzr merge lp:~ajite/openobject-addons/elico-7.0-add-0002
Reviewer Review Type Date Requested Status
LIN Yu Pending
Review via email: mp+207813@code.launchpad.net

Description of the change

[FIX] Fixed a bug that was preventing a user to create normal SO/PO

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
=== modified file 'base_intercompany/unit/export_synchronizer.py'
--- base_intercompany/unit/export_synchronizer.py 2014-02-18 12:28:09 +0000
+++ base_intercompany/unit/export_synchronizer.py 2014-02-23 01:07:25 +0000
@@ -128,19 +128,24 @@
128 for icops in self._get_icops():128 for icops in self._get_icops():
129 backend = self._get_backend_with_permission(icops)129 backend = self._get_backend_with_permission(icops)
130 self._set_icops(icops, backend)130 self._set_icops(icops, backend)
131 try:131 map_record = self._map_data(fields=fields)
132 map_record = self._map_data(fields=fields)
133 except MappingError as e:
134 continue
135 if self.icops_ids:132 if self.icops_ids:
136 record = self._update_data(map_record, fields=fields)133 record = None
134 try:
135 record = self._update_data(map_record, fields=fields)
136 except MappingError as e:
137 continue
137 if not record:138 if not record:
138 continue139 continue
139 nb_records += 1140 nb_records += 1
140 self._validate_data(record)141 self._validate_data(record)
141 self._routing(record, fields)142 self._routing(record, fields)
142 else:143 else:
143 record = self._create_data(map_record, fields=fields)144 record = None
145 try:
146 record = self._create_data(map_record, fields=fields)
147 except MappingError as e:
148 continue
144 if not record:149 if not record:
145 continue150 continue
146 nb_records += 1151 nb_records += 1