Magento OpenERP Connector

Merge lp:~magentoerpconnect-community/magentoerpconnect/fix-grouped-product-export into lp:magentoerpconnect/oerp6.1-oldstable

  1. fix-grouped-product-export
  2. Merge into trunk_version
Status: Merged
Merge reported by: Guewen Baconnier @ Camptocamp
Merged at revision: not available
Proposed branch: lp:~magentoerpconnect-community/magentoerpconnect/fix-grouped-product-export
Merge into: lp:magentoerpconnect/oerp6.1-oldstable
Diff against target: 11 lines (+1/-1)
1 file modified
magentoerpconnect/product.py (+1/-1)
To merge this branch: bzr merge lp:~magentoerpconnect-community/magentoerpconnect/fix-grouped-product-export
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp Approve
Sébastien BEAU - http://www.akretion.com Pending
Review via email: mp+98507@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

Thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'magentoerpconnect/product.py'
--- magentoerpconnect/product.py 2012-03-16 10:42:08 +0000
+++ magentoerpconnect/product.py 2012-03-20 20:15:29 +0000
@@ -1285,7 +1285,7 @@
1285 child_ids = []1285 child_ids = []
1286 product_type = self.read(cr, uid, id, ['product_type'])['product_type']1286 product_type = self.read(cr, uid, id, ['product_type'])['product_type']
1287 if product_type == 'grouped': # lookup for Magento "grouped product"1287 if product_type == 'grouped': # lookup for Magento "grouped product"
1288 quantities, childs_ids = self.action_before_exporting_grouped_product(cr, uid, id, external_referential_ids, defaults, context)1288 quantities, child_ids = self.action_before_exporting_grouped_product(cr, uid, id, external_referential_ids, defaults, context)
1289 1289
1290 self.action_before_exporting(cr, uid, id, product_type, external_referential_ids, defaults, context=context)1290 self.action_before_exporting(cr, uid, id, product_type, external_referential_ids, defaults, context=context)
1291 1291