Merge lp:~richard-willowit/e-commerce-addons/get-ids-and-update-fix into lp:~extra-addons-commiter/e-commerce-addons/oerp6.1-stable

[Richard deMeester]

Fix to list of exportable products for a shop.

get_ids_and_update_date for product.product works through a list of "exportable_product_ids" for a shop calling _check_if_export for each id.

The resulting list is then passed to super get_ids_and_update_date.

If the list is empty when the super function is called, then the super function assumes all ids.

Secondary fix is to return ([], {}) from get_ids_and_update_date instead of (False, False) - this is in line with the super functions returned data structure, and outer code which fails due to "False" not having a defined len()

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Seems fine to me.

Thanks

review: Approve

=== modified file 'base_sale_multichannels/product.py'
--- base_sale_multichannels/product.py	2012-08-01 13:00:46 +0000
+++ base_sale_multichannels/product.py	2012-08-07 00:17:22 +0000
@@ -52,17 +52,17 @@
 
     @only_for_referential(ref_categ ='Multichannel Sale')
     def get_ids_and_update_date(self, cr, uid, external_session, ids=None, last_exported_date=None, context=None):
+        res = (), {} # list of ids, dict of ids to date_changed
         shop = external_session.sync_from_object
         if shop.exportable_product_ids:
             product_ids = [product.id for product in shop.exportable_product_ids if self._check_if_export(cr, uid, external_session, product, context=context)]
             if ids:
                 product_ids = set(ids).intersection(set(product_ids))
-            res = super(product_product, self).get_ids_and_update_date(cr, uid, external_session,
+            if product_ids:
+                res = super(product_product, self).get_ids_and_update_date(cr, uid, external_session,
                                                             ids=product_ids,
                                                             last_exported_date=last_exported_date,
                                                             context=context)
-        else:
-            res = (), {} # list of ids, dict of ids to date_changed
         return res
 
 class product_category(osv.osv):
@@ -106,6 +106,6 @@
                                                             last_exported_date=last_exported_date,
                                                             context=context)
         else:
-            res= [False, False]
+            res = (), {} # list of ids, dict of ids to date_changed
         return res