Merge lp:~registry/e-commerce-addons/fix1288719 into lp:~extra-addons-commiter/e-commerce-addons/oerp6.1-stable

[Daniel Stenlöv]

Fix bug lp:1288719, Wrong SQL-statement if product_m2mcategories is installed.

[lp:~registry/e-commerce-addons/fix1288719]

290. By Daniel Stenlöv on 2014-03-06

[FIX] Correct SQL statement

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

LGTM

Thanks

review: Approve (code review)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Hi Daniel,

I answered on your bug report here https://bugs.launchpad.net/e-commerce-addons/+bug/1288719/comments/4
The current code is valid. Usually I prefer not to change working code for no reason but we could argue it improve the readability, so I approve your proposal.

Thanks

review: Approve

=== modified file 'base_sale_multichannels/sale.py'
--- base_sale_multichannels/sale.py	2013-11-09 16:30:45 +0000
+++ base_sale_multichannels/sale.py	2014-03-06 13:05:09 +0000
@@ -106,8 +106,7 @@
 
             # If product_m2mcategories module is installed search in main category
             # and extra categories. If not, only in main category
-            cr.execute('select * from ir_module_module where name=%s and state=%s',
-                                                            ('product_m2mcategories','installed'))
+            cr.execute("select * from ir_module_module where name='product_m2mcategories' and state='installed'")
             if cr.fetchone():
                 res[shop['id']] = self.pool.get("product.product").search(cr, uid, ['|',
                         ('categ_id', 'in', all_categories),('categ_ids', 'in', all_categories)])