Merge lp:~openerp-dev/openobject-addons/7.0-opw-592447-rha into lp:openobject-addons/7.0

[Rifakat Husen (OpenERP)]

On sales order, when you have pricelist configured with the rule that calculates price based on
supplier price on the product form, that price is not getting used.

Scenario:
* I want to sell product based on the price on which this product's supplier delivers
* create sales pricelist having version rule based on 'Supplier prices on the product form'
* selecting product on sales item does not fill unit price based on it's supplier price

Also there is a problem when we have any version rule based on 'Other Pricelist' nestedly.
When selling any product, it checks customer's id on the product_supplierinfo table to fetch
price(this is actually a case for purchase) and we will never find customer id on this table
so there is not need to check it, and simply get supplier's price which satisfies the qty criteria.

[Naresh(OpenERP) (nch-openerp)]

review: Approve

Unmerged revisions

9133. By Rifakat Husen (OpenERP) on 2013-05-16

[FIX] product: selling product with sales pricelist on version rule based on supplier price does not work

=== modified file 'product/pricelist.py'
--- product/pricelist.py	2013-04-18 14:10:13 +0000
+++ product/pricelist.py	2013-05-16 11:51:09 +0000
@@ -202,14 +202,15 @@
                     categ_where = '(categ_id IN (' + ','.join(map(str, 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) '
+                
+                if partner and self.browse(cr, uid, pricelist_id, context=context).type == 'purchase':
+                    partner_where = 'AND (base <> -2 OR %s IN (SELECT name FROM product_supplierinfo WHERE product_id = %s)) '
                     partner_args = (partner, tmpl_id)
                 else:
-                    partner_where = 'base <> -2 '
+                    partner_where= ' '
                     partner_args = ()
-
+                    partner = None
+                    
                 cr.execute(
                     'SELECT i.*, pl.currency_id '
                     'FROM product_pricelist_item AS i, '
@@ -217,7 +218,7 @@
                     '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 + ') '
+                        + 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 '
@@ -233,7 +234,7 @@
                             else:
                                 price_tmp = self.price_get(cr, uid,
                                         [res['base_pricelist_id']], product_id,
-                                        qty, context=context)[res['base_pricelist_id']]
+                                        qty, partner=partner, context=context)[res['base_pricelist_id']]
                                 ptype_src = self.browse(cr, uid, res['base_pricelist_id']).currency_id.id
                                 uom_price_already_computed = True
                                 price = currency_obj.compute(cr, uid,