odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Only consider pricelist items based on partner if we have a partner and it's on the product's supplier info 

lp bug: https://launchpad.net/bugs/860625 fixed

bzr revid: ls@numerigraphe.fr-20110928153434-5qd9lbk6i2dm2f5l
This commit is contained in:
Numerigraphe - Lionel Sausin 2011-09-28 17:34:34 +02:00
parent bdfaf1e37d
commit c13d18d93b
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
addons/product/pricelist.py
View File

@ -210,6 +210,13 @@ class product_pricelist(osv.osv):
else:
categ_where = '(categ_id IS NULL)'
if partner:
partner_where = 'base <> -2 OR %s IN (SELECT name FROM product_supplierinfo WHERE product_id = %s) '
partner_args = (partner, product_id)
else:
partner_where = 'base <> -2 '
partner_args = ()
cr.execute(
'SELECT i.*, pl.currency_id '
'FROM product_pricelist_item AS i, '
@ -217,11 +224,12 @@ class product_pricelist(osv.osv):
'WHERE (product_tmpl_id IS NULL OR product_tmpl_id = %s) '
'AND (product_id IS NULL OR product_id = %s) '
'AND (' + categ_where + ' OR (categ_id IS NULL)) '
'AND (' + partner_where + ') '
'AND price_version_id = %s '
'AND (min_quantity IS NULL OR min_quantity <= %s) '
'AND i.price_version_id = v.id AND v.pricelist_id = pl.id '
'ORDER BY sequence',
(tmpl_id, product_id, plversion_ids[0], qty))
(tmpl_id, product_id) + partner_args + (plversion_ids[0], qty))
res1 = cr.dictfetchall()
uom_price_already_computed = False
for res in res1:
@ -365,6 +373,12 @@ class product_pricelist(osv.osv):
categ_where = '(categ_id IN (' + ','.join(categ_ids) + '))'
else:
categ_where = '(categ_id IS NULL)'
if partner:
partner_where = 'base <> -2 OR %s IN (SELECT name FROM product_supplierinfo WHERE product_id = %s) '
sqlargs = sqlargs + (partner, prod_id)
else:
partner_where = 'base <> -2 '
cr.execute(
'SELECT i.*, pl.currency_id '
@ -373,6 +387,7 @@ class product_pricelist(osv.osv):
'WHERE (product_tmpl_id IS NULL OR product_tmpl_id = %s) '
'AND (product_id IS NULL OR product_id = %s) '
'AND (' + categ_where + ' OR (categ_id IS NULL)) '
'AND (' + partner_where + ') '
'AND price_version_id = %s '
'AND (min_quantity IS NULL OR min_quantity <= %s) '
'AND i.price_version_id = v.id AND v.pricelist_id = pl.id '