Merge lp:~magentoerpconnect-community/magentoerpconnect/legacy61-fix-1011463 into lp:magentoerpconnect/oerp6.1-oldstable

[Guewen Baconnier @ Camptocamp]

More info at : https://bugs.launchpad.net/magentoerpconnect/+bug/1011463

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

looks good to me.

review: Approve (code review)

=== modified file 'magentoerpconnect/sale.py'
--- magentoerpconnect/sale.py	2012-05-25 09:01:25 +0000
+++ magentoerpconnect/sale.py	2012-06-11 08:05:33 +0000
@@ -418,6 +418,7 @@
         @param data_record: full data dict of the order
         @param ext_field: name of the field in data_record where the amount of the extra lineis stored
         @param product_ref: tuple with module and xml_id (module, xml_id) of the product to use for the extra line
+            or id as int/long of the product
 
         Optional arguments in context:
         sign: multiply the amount with the sign to add or substract it from the sale order
@@ -430,7 +431,10 @@
         ext_tax_field = 'ext_tax_field' in context and context['ext_tax_field'] or None
         ext_code_field = 'ext_code_field' in context and context['ext_code_field'] or None
 
-        model, product_id = model_data_obj.get_object_reference(cr, uid, *product_ref)
+        if isinstance(product_ref, tuple):
+            dummy, product_id = model_data_obj.get_object_reference(cr, uid, *product_ref)
+        else:
+            product_id = product_ref
         product = self.pool.get('product.product').browse(cr, uid, product_id, context)
         is_tax_included = context.get('price_is_tax_included', False)
         amount = float(data_record[ext_field]) * sign
@@ -473,8 +477,13 @@
             ctx.update({
                 'ext_tax_field': 'shipping_tax_amount',
             })
-            product_ref = ('base_sale_multichannels', 'product_product_shipping')
-            res = self.add_order_extra_line(cr, uid, res, data_record, 'shipping_amount', product_ref, defaults, ctx)
+            product = False
+            if res.get('carrier_id'):
+                carrier = self.pool.get('delivery.carrier').browse(cr, uid, res['carrier_id'], context=context)
+                product = carrier.product_id.id
+            else:
+                product = ('base_sale_multichannels', 'product_product_shipping')
+            res = self.add_order_extra_line(cr, uid, res, data_record, 'shipping_amount', product, defaults, ctx)
         return res
 
     def add_gift_certificates(self, cr, uid, res, external_referential_id, data_record, defaults, context=None):