Merge lp:~serpent-consulting-services/magentoerpconnect/gekko-tek-992750 into lp:magentoerpconnect/oerp6.1-stable

Proposed by Kyle Waid
Status: Merged
Merge reported by: Sébastien BEAU - http://www.akretion.com
Merged at revision: not available
Proposed branch: lp:~serpent-consulting-services/magentoerpconnect/gekko-tek-992750
Merge into: lp:magentoerpconnect/oerp6.1-stable
Diff against target: 12 lines (+1/-1)
1 file modified
magentoerpconnect/magerp_core.py (+1/-1)
To merge this branch: bzr merge lp:~serpent-consulting-services/magentoerpconnect/gekko-tek-992750
Reviewer Review Type Date Requested Status
Sébastien BEAU - http://www.akretion.com Pending
Review via email: mp+106395@code.launchpad.net

Description of the change

Fix import of product links

To post a comment you must log in.
Revision history for this message
Sébastien BEAU - http://www.akretion.com (sebastien.beau) wrote :

merge rev 630. Thank you

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'magentoerpconnect/magerp_core.py'
2--- magentoerpconnect/magerp_core.py 2012-05-14 22:55:18 +0000
3+++ magentoerpconnect/magerp_core.py 2012-05-18 14:55:25 +0000
4@@ -227,7 +227,7 @@
5 if referential.import_image_with_product:
6 prod_obj.import_product_image(import_cr, uid, product_id, referential.id, attr_conn, ext_id=ext_product_id, context=context)
7 if referential.import_links_with_product:
8- prod_obj.mag_import_product_links_types(import_cr, uid, product_id, link_types, referential.id, attr_conn, context=context)
9+ prod_obj.mag_import_product_links_types(import_cr, uid, product_id, link_types, external_session, context=context)
10 self.write(import_cr, uid, referential.id, {'last_imported_product_id': int(ext_product_id)}, context=context)
11 import_cr.commit()
12 finally: