Merge lp:~gbaconnier-c2c/e-commerce-addons/e-commerce-addons-6-1-fix-1011463 into lp:~extra-addons-commiter/e-commerce-addons/oerp6.1-stable

[Guewen Baconnier @ Camptocamp]

More info at : https://bugs.launchpad.net/magentoerpconnect/openerp6.1-legacy-module/+bug/1011463

Please have a special check because I didn't run this code! ;-)

Also, I'm not sure of the implementation because I had to treat this special case, the current code is only destined to use a predefined dict of values...

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Hello Sébastien,

If you have any occasion to test this, I would be nice so we can close the merge and the bug report.

Thanks

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

The link to the bugs is dead.
https://bugs.launchpad.net/magentoerpconnect/+bug/1011463

Not tested but LGTM

Nicolas

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Sebastien, any news on the test asked by Guewen ?

review: Needs Information

[Sébastien BEAU - http://www.akretion.com (sebastien.beau)]

I just test it right now. It's work perfectly and it's a good improvement. We should not forget to add it in V7 version.
Thanks for your work Guewen

=== modified file 'base_sale_multichannels/sale.py'
--- base_sale_multichannels/sale.py	2012-06-01 17:46:16 +0000
+++ base_sale_multichannels/sale.py	2012-06-11 08:51:32 +0000
@@ -748,18 +748,21 @@
     def _get_special_fields(self, cr, uid, context=None):
         return [
             {
+            'key': 'shipping',
             'price_unit_tax_excluded' : 'shipping_amount_tax_excluded',
             'price_unit_tax_included' : 'shipping_amount_tax_included',
             'tax_rate_field' : 'shipping_tax_rate',
             'product_ref' : ('base_sale_multichannels', 'product_product_shipping'),
             },
             {
+            'key': 'cash_on_delivery',
             'tax_rate_field' : 'cash_on_delivery_taxe_rate',
             'price_unit_tax_excluded' : 'cash_on_delivery_amount_tax_excluded',
             'price_unit_tax_included' : 'cash_on_delivery_amount_tax_included',
             'product_ref' : ('base_sale_multichannels', 'product_product_cash_on_delivery'),
             },
             {
+            'key': 'gift_certificate',
             'price_unit_tax_excluded' : 'gift_certificates_amount', #gift certificate doesn't have any tax
             'price_unit_tax_included' : 'gift_certificates_amount',
             'product_ref' : ('base_sale_multichannels', 'product_product_gift'),
@@ -787,8 +790,16 @@
                     del vals[option[key]]
             return vals #if there is not price, we have nothing to import
 
-        model_data_obj = self.pool.get('ir.model.data')
-        model, product_id = model_data_obj.get_object_reference(cr, uid, *option['product_ref'])
+        product_id = False
+        # shipping product should be the one of the delivery method
+        # otherwise, it uses the default one
+        if option.get('key') == 'shipping' and vals.get('carrier_id'):
+            carrier = self.pool.get('delivery.carrier').browse(cr, uid, vals['carrier_id'], context=context)
+            product_id = carrier.product_id.id
+        if not product_id:
+            model_data_obj = self.pool.get('ir.model.data')
+            dummy, product_id = model_data_obj.get_object_reference(cr, uid, *option['product_ref'])
+
         product = self.pool.get('product.product').browse(cr, uid, product_id, context)
 
         extra_line = {