Merge lp:~openerp-dev/openobject-addons/6.1-bug-1011651-dhs into lp:openobject-addons/6.1

[Dhruti Shastri(OpenERP)]

Take a standard demo in 6.1 and install module sales.
Put user in extended
Change product "Ice Cream" Supplier tab
-> create line with supplier asustek / product
Price for 1 unit -> 555 euro
goto sales>configuration>
public pricelist
select Default Public
change price based on to : Partner section of the product form

goto Sales / Products / product
change context / pricelist / Public
price in pricelist should be 555 euro

[Peter Langenberg (peter-langenberg)]

I've tested it, and it works.

Unmerged revisions

6842. By Dhruti Shastri(OpenERP) on 2012-06-14

[FIX][Product] : Partner Section in pricelist doesn't work for salespricelist

=== modified file 'product/pricelist.py'
--- product/pricelist.py	2012-01-31 13:36:57 +0000
+++ product/pricelist.py	2012-06-14 08:57:37 +0000
@@ -205,6 +205,11 @@
                 if partner:
                     partner_where = 'base <> -2 OR %s IN (SELECT name FROM product_supplierinfo WHERE product_id = %s) '
                     partner_args = (partner, product_id)
+
+                elif not partner and self.pool.get('product.pricelist.version').browse(cr, uid, pricelist_version_ids[0],context=context).items_id[0].base == -2:
+                    partner_where = 'base = -2 '
+                    partner_args = ()
+
                 else:
                     partner_where = 'base <> -2 '
                     partner_args = ()