openerp-community-reviewer team mailing list archive

[Yann Papouin <yann.papouin@xxxxxxxxx>]

Yann Papouin has proposed merging lp:~yann-papouin/ocb-addons/6.1-bug-1048547-product-variant-supplierinfo-pricelist into lp:ocb-addons/6.1.

Requested reviews:
  OpenERP Community Backports Team (ocb)
Related bugs:
  Bug #1048547 in OpenERP Community Backports (Addons): "[6.1] purchase: changing a product uses wrong supplier info data"
  https://bugs.launchpad.net/ocb-addons/+bug/1048547

For more details, see:
https://code.launchpad.net/~yann-papouin/ocb-addons/6.1-bug-1048547-product-variant-supplierinfo-pricelist/+merge/205161
-- 
https://code.launchpad.net/~yann-papouin/ocb-addons/6.1-bug-1048547-product-variant-supplierinfo-pricelist/+merge/205161
Your team OpenERP Community Backports Team is requested to review the proposed merge of lp:~yann-papouin/ocb-addons/6.1-bug-1048547-product-variant-supplierinfo-pricelist into lp:ocb-addons/6.1.

=== 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: