Merge lp:~therp-nl/magentoerpconnect/61trunk-lp1089266-api_change into lp:~magentoerpconnect-core-editors/magentoerpconnect/oerp7.0-refactor

[Stefan Rijnhart (Opener)]

[Stefan Rijnhart (Opener) (stefan-opener)]

Same as https://code.launchpad.net/~therp-nl/magentoerpconnect/61stable-lp1089266-api_change/+merge/139439, but for trunk

Unmerged revisions

665. By Stefan Rijnhart (Opener) on 2012-12-12

 [FIX] Adapt to API change in base_external_referentials' extid_to_existing_oeid()
       in http://bazaar.launchpad.net/~extra-addons-commiter/openobject-extension/oerp6.1-stable/revision/215

=== modified file 'magentoerpconnect/magerp_core.py'
--- magentoerpconnect/magerp_core.py	2012-08-21 15:34:50 +0000
+++ magentoerpconnect/magerp_core.py	2012-12-12 11:09:24 +0000
@@ -392,7 +392,7 @@
         res = {}
         for shop_group in self.browse(cr, uid, ids, context):
             if shop_group.default_shop_integer_id:
-                rid = self.pool.get('sale.shop').extid_to_existing_oeid(cr, uid, shop_group.default_shop_integer_id, shop_group.referential_id.id)
+                rid = self.pool.get('sale.shop').extid_to_existing_oeid(cr, uid, shop_group.referential_id.id, shop_group.default_shop_integer_id)
                 res[shop_group.id] = rid
             else:
                 res[shop_group.id] = False

=== modified file 'magentoerpconnect/product.py'
--- magentoerpconnect/product.py	2012-08-22 16:32:16 +0000
+++ magentoerpconnect/product.py	2012-12-12 11:09:24 +0000
@@ -227,7 +227,7 @@
     def _get_group(self, cr, uid, ids, prop, unknow_none, context=None):
         res = {}
         for attribute in self.browse(cr, uid, ids, context):
-            res[attribute.id] = self.pool.get('magerp.product_attribute_groups').extid_to_existing_oeid(cr, uid, attribute.group_id, attribute.referential_id.id)
+            res[attribute.id] = self.pool.get('magerp.product_attribute_groups').extid_to_existing_oeid(cr, uid, attribute.referential_id.id, attribute.group_id)
         return res
 
     _columns = {
@@ -1187,7 +1187,7 @@
             #the character '/' is not allowed in the name of the image
             data['name'] = data['name'].replace('/', ' ')
             images_name.append(data['name'])
-            image_oe_id = image_obj.extid_to_existing_oeid(cr, uid, image['file'], referential_id, context=None)
+            image_oe_id = image_obj.extid_to_existing_oeid(cr, uid, referential_id, image['file'], context=None)
             if image_oe_id:
                 # update existing image
                 image_obj.write(cr, uid, image_oe_id, data, context=context)

=== modified file 'magentoerpconnect/sale.py'
--- magentoerpconnect/sale.py	2012-08-22 16:32:16 +0000
+++ magentoerpconnect/sale.py	2012-12-12 11:09:24 +0000
@@ -135,7 +135,7 @@
         shop = self.browse(cr, uid, id, context=context)
         if shop.root_category_id:
             model_data_id = self.pool.get('product.category').\
-            extid_to_existing_oeid(cr, uid, shop.root_category_id, shop.referential_id.id, context=context)
+            extid_to_existing_oeid(cr, uid, shop.referential_id.id, shop.root_category_id, context=context)
             if model_data_id:
                 ir_model_data_obj.write(cr, uid, model_data_id, {'res_id' : value}, context=context)
             else:
@@ -319,7 +319,7 @@
 
         wf_service = netsvc.LocalService("workflow")
         for parent_incr_id in parent_list:
-            canceled_order_id = self.extid_to_existing_oeid(cr, uid, parent_incr_id, external_referential_id)
+            canceled_order_id = self.extid_to_existing_oeid(cr, uid, external_referential_id, parent_incr_id)
             if canceled_order_id:
                 try:
                     wf_service.trg_validate(uid, 'sale.order', canceled_order_id, 'cancel', cr)

=== modified file 'magentoerpconnect/settings/1.5.0.0/res.partner/external.mappinglines.template.csv'
--- magentoerpconnect/settings/1.5.0.0/res.partner/external.mappinglines.template.csv	2012-08-14 14:53:28 +0000
+++ magentoerpconnect/settings/1.5.0.0/res.partner/external.mappinglines.template.csv	2012-12-12 11:09:24 +0000
@@ -2,7 +2,7 @@
 mag1500_res_partner_password,,in_out,direct,password,magentoerpconnect.field_res_partner_magento_pwd,unicode,False,magentoerpconnect.mag1500_res_partner,,,,,
 mag1500_res_partner_group_id,,in_out,direct,group_id,magentoerpconnect.field_res_partner_group_id,int,False,magentoerpconnect.mag1500_res_partner,,,,,
 magentoerpconnect.mag1500_res_partner_storeview,,in_out,function,store_id,magentoerpconnect.field_res_partner_store_id,list,False,magentoerpconnect.mag1500_res_partner,storeview,"if ifield:
-    result=self.pool.get('magerp.storeviews').extid_to_existing_oeid(cr,uid,ifield,referential_id)
+    result=self.pool.get('magerp.storeviews').extid_to_existing_oeid(cr,uid,referential_id,ifield)
     if result:
         lang = self.pool.get('magerp.storeviews').browse(cr, uid, result).lang_id
         result=[('store_id',result),('lang',lang and lang.code or False)]","if resource['store_id']: