Merge lp:~yann-papouin/ocb-addons/6.1-bug-1048547-product-variant-supplierinfo-pricelist into lp:ocb-addons/6.1

[Yann Papouin]

[Pedro Manuel Baeza (pedro.baeza)]

I have never faced this problem, but I don't use variants. Seems OK.

Regards.

review: Approve (code review)

[Stefan Rijnhart (Opener) (stefan-opener)]

Yes, I have run into problems because I assumed supplierinfo's product_id field refers to product_product while it actually refers to product_template. So the solution seems correct to me.

I checked 7.0 and the change in product/pricelist.py is there, while purchase/purchase.py's onchange_product_id() has been rewritten so that it evades the problem which is fixed in this change.

review: Approve

[Holger Brunn (Therp) (hbrunn)]

review: Approve (code review)

=== modified file 'product/pricelist.py'
--- product/pricelist.py	2013-11-20 01:17:39 +0000
+++ product/pricelist.py	2014-02-06 13:50:45 +0000
@@ -206,7 +206,7 @@
 
                 if partner:
                     partner_where = 'base <> -2 OR %s IN (SELECT name FROM product_supplierinfo WHERE product_id = %s) '
-                    partner_args = (partner, product_id)
+                    partner_args = (partner, tmpl_id)
                 else:
                     partner_where = 'base <> -2 '
                     partner_args = ()

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2013-11-20 01:17:39 +0000
+++ purchase/purchase.py	2014-02-06 13:50:45 +0000
@@ -783,7 +783,7 @@
 
         qty = qty or 1.0
         supplierinfo = False
-        supplierinfo_ids = product_supplierinfo.search(cr, uid, [('name','=',partner_id),('product_id','=',product.id)])
+        supplierinfo_ids = product_supplierinfo.search(cr, uid, [('name', '=', partner_id),('product_id', '=', product.product_tmpl_id.id)])
         if supplierinfo_ids:
             supplierinfo = product_supplierinfo.browse(cr, uid, supplierinfo_ids[0], context=context)
             if supplierinfo.product_uom.id != uom_id: