Merge lp:~therp-nl/magentoerpconnect/lp1179840-pass_external_session_to_extid_to_oeid into lp:magentoerpconnect/oerp6.1-stable

Proposed by Stefan Rijnhart (Opener)
Status: Merged
Merged at revision: 688
Proposed branch: lp:~therp-nl/magentoerpconnect/lp1179840-pass_external_session_to_extid_to_oeid
Merge into: lp:magentoerpconnect/oerp6.1-stable
Diff against target: 21 lines (+9/-1)
1 file modified
magentoerpconnect/product.py (+9/-1)
To merge this branch: bzr merge lp:~therp-nl/magentoerpconnect/lp1179840-pass_external_session_to_extid_to_oeid
Reviewer Review Type Date Requested Status
MagentoERPConnect core editors Pending
Review via email: mp+163658@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 'magentoerpconnect/product.py'
2--- magentoerpconnect/product.py 2013-01-25 10:50:53 +0000
3+++ magentoerpconnect/product.py 2013-05-14 08:42:26 +0000
4@@ -720,8 +720,16 @@
5 _order = "sort_order"
6 def _get_set(self, cr, uid, ids, prop, unknow_none, context=None):
7 res = {}
8+ external_sessions = {}
9+ set_obj = self.pool.get('magerp.product_attribute_set')
10 for attribute_group in self.browse(cr, uid, ids, context):
11- res[attribute_group.id] = self.pool.get('magerp.product_attribute_set').extid_to_oeid(cr, uid, attribute_group.attribute_set_id, attribute_group.referential_id.id)
12+ if attribute_group.referential_id.id not in external_sessions:
13+ external_sessions[attribute_group.referential_id.id] = ExternalSession(
14+ attribute_group.referential_id)
15+ res[attribute_group.id] = set_obj.extid_to_oeid(
16+ cr, uid,
17+ external_sessions[attribute_group.referential_id.id],
18+ attribute_group.attribute_set_id)
19 return res
20
21 def _get_filter(self, cr, uid, external_session, step, previous_filter=None, context=None):