Merge lp:~openerp-dev/openobject-addons/6.1-opw-580286-rgo into lp:openobject-addons/6.1

[Ravi Gohil (OpenERP)]

Hello,

This fix improves wrong values passed to the query parameter(product_id) of the `product.supplierinfo` object.

In V6.1, `product.supplierinfo` object defines `product_id` field like,
'product_id' : fields.many2one('product.template', 'Product', required=True, ondelete='cascade', select=True),

so, when you query `product.supplierinfo` object, the `id` must be used from `product.template` object and not from `product.product` object.

I have fixed this. Kindly review it.

Thanks.

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Already Fixed on Trunk (means that it was already fixed and merged in Trunk). If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

7027. By Ravi Gohil (OpenERP) on 2012-10-12

[FIX] product.product object is used in searching value for product_id field of product.supplierinfo object where as product.template object should be used as product_id is m2o with product.template object(Courtesy: Sébastien LANGE for providing patch) : (Maintenance Case : 580286)

=== modified file 'product/pricelist.py'
--- product/pricelist.py	2012-01-31 13:36:57 +0000
+++ product/pricelist.py	2012-10-12 11:46:25 +0000
@@ -204,7 +204,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	2012-10-09 12:16:14 +0000
+++ purchase/purchase.py	2012-10-12 11:46:25 +0000
@@ -781,7 +781,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: