Merge lp:~sebastien.beau/e-commerce-addons/e-commerce-addons-fix-picking-export into lp:~extra-addons-commiter/e-commerce-addons/oerp6.1-stable

[Sébastien BEAU - http://www.akretion.com]

My customer just export the picking from the wizard import/export of openerp and then the picking was not exporting to magento. Indeed the SQL request was wrong, so I fix it.

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

This merge is on the 7.0 branch. Can you confirm this is what you intended?

review: Needs Information

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Sébastien I definitely think that you want to merge this fix in the 6.1 branch. Can you confirm and resubmit your proposal accordingly please?

review: Needs Resubmitting

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

Sorry, for the mistake, it's a fix for 6.1.

Thanks

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM

Thanks

review: Approve

=== modified file 'base_sale_multichannels/sale.py'
--- base_sale_multichannels/sale.py	2013-01-03 10:08:13 +0000
+++ base_sale_multichannels/sale.py	2013-04-03 09:31:21 +0000
@@ -402,7 +402,10 @@
         LEFT JOIN delivery_carrier
                   ON delivery_carrier.id = stock_picking.carrier_id
         WHERE sale_order.shop_id = %(shop_id)s
-              AND ir_model_data.res_id ISNULL
+              AND (
+                  ir_model_data.referential_id is Null
+                  OR ir_model_data.referential_id != %(referential_id)s
+              )
               AND stock_picking.state = 'done'
               AND stock_picking.type = 'out'
               AND NOT stock_picking.do_not_export
@@ -415,7 +418,7 @@
                  stock_picking.backorder_id
         ORDER BY sale_order.id ASC,
                  COALESCE(stock_picking.backorder_id, NULL, 0) ASC"""
-        params = {'shop_id': shop.id}
+        params = {'shop_id': shop.id, 'referential_id': shop.referential_id.id}
         return query, params
 
     def export_shipping(self, cr, uid, ids, context):