Merge lp:~camptocamp/magentoerpconnect/operp6.1-legacy-module-fix1028812 into lp:magentoerpconnect/oerp6.1-oldstable

[Alexandre Fayolle - camptocamp]

fix lp:1028812

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

review: Approve

=== modified file 'magentoerpconnect/product.py'
--- magentoerpconnect/product.py	2012-07-05 13:15:15 +0000
+++ magentoerpconnect/product.py	2012-07-25 12:50:39 +0000
@@ -1717,15 +1717,23 @@
             try:
                 product_links = conn.call('product_link.list', [link_type, product.magento_sku])
             except Exception, e:
-                self.log(cr, uid, product.id, "Error when retrieving the list of links in Magento for product with sku %s and product id %s !" % (product.magento_sku, product.id,))
-                logger.debug("Error when retrieving the list of links in Magento for product with sku %s and product id %s !", product.magento_sku, product.id)
+                self.log(cr, uid, product.id,
+                         "Error when retrieving the list of links in Magento for "
+                         "product with sku %s and product id %s !" % \
+                         (product.magento_sku, product.id,))
+                logger.error("Error %s when retrieving the list of links in Magento for "
+                             "product with sku %s and product id %s !",
+                             e, product.magento_sku, product.id)
 
             for product_link in product_links:
                 ctx = context.copy()
                 ctx['alternative_key'] = product_link['sku']
-                linked_product_id = self.extid_to_oeid(cr, uid, product_link['product_id'], external_referential_id, context=context)
+                ctx['import_no_new_cr'] = 'True' # otherwise, the product is created in another transaction,
+                                                 # and the isolation level means we cannot see it in this one,
+                                                 # resulting in an integrity error on the FK of product_link
+                linked_product_id = self.extid_to_oeid(cr, uid, product_link['product_id'], external_referential_id, context=ctx)
                 link_data = {
-                    'product_id': product.id,
+                    'product_id': product.id2,
                     'type': link_type,
                     'linked_product_id': linked_product_id,
                     'sequence': product_link['position'],
@@ -1744,21 +1752,32 @@
         return True
 
     def mag_import_product_links_types(self, cr, uid, ids, link_types, external_referential_id, conn, context=None):
-        if isinstance(ids, (int, long)): ids = [ids]
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         for product in self.browse(cr, uid, ids, context=context):
             for link_type in link_types:
                 self._mag_import_product_links_type(cr, uid, product, link_type, external_referential_id, conn, context=context)
         return True
 
     def mag_import_product_links(self, cr, uid, ids, external_referential_id, conn, context=None):
+        logger = logging.getLogger('magentoerpconnect')
         link_types = self.pool.get('external.referential').get_magento_product_link_types(cr, uid, external_referential_id, conn, context=context)
         local_cr = pooler.get_db(cr.dbname).cursor()
+        errors = []
         try:
             for product_id in ids:
-                self.mag_import_product_links_types(local_cr, uid, [product_id], link_types, external_referential_id, conn, context=context)
-                local_cr.commit()
+                try:
+                    self.mag_import_product_links_types(local_cr, uid, [product_id], link_types, external_referential_id, conn, context=context)
+                    local_cr.commit()
+                except Exception, exc:
+                    logger.exception('error during product_links import for product id %s', product_id)
+                    errors.append((product_id, str(exc)))
         finally:
             local_cr.close()
+        if errors:
+            message = [u'product_id %s: %s' % (product_id, error) for product_id, error in errors]
+            raise osv.except_osv( _('Error'),
+                                  _("Errors during product_links import:\n%s") % u'\n'.join(message))
         return True
 
 product_product()