Merge lp:~openerp-dev/openobject-addons/7.0-opw-601797-msh into lp:openobject-addons/7.0

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of price_get, it should consider other items if it fails in following scenario. Create a pricelist with two items, Item A and Item B, Item A: product=null, category=null, sequence=1, base=Supplier Prices on the product form, Item B: product=null, category=null, sequence=5, base=Cost Price, now edit any product and set supplier with any price rule in Supplier Information tab of product and then create a purchase order with same supplier and add a purchasse order line with same product which we changed and you will find price=0 because no price rules are defined in supplier form of product, when this is the case then we should consider other pricelist items.

Demo:-
Take any existing product
Cost price = $10
Supplier exists (product_supplierinfo)
no Supplier price exists (pricelist_partnerinfo)
create new purchase pricelist with the following:

pricelist item A:
Product is null
Product Category is null
Sequence = 1
Based On = Supplier Prices on the product form (value = -2)
remaining fields = 0

pricelist item B:
Product is null
Product Category is null
Sequence = 5
Based On = Cost Price (value = 2)
remaining fields = 0

Steps to face:
create new Purchase Order
Supplier is same as defined in product setup above
select pricelist created from above setup
select part from above setup
RESULT: price_unit = $0
EXPECTED: price_unit = $10

If there are no price rule defined in supplier information then those pricelist items must be skipped from initial query, what is current behavior we search for supplier information i.e product_supplierinfo then we iterate through those items which matches criteria then again check if base==-2 then tries to fetch price based on min_quantity but if there is no rule then second query to fetch price will return no record and we by default set price=0.0 and then we break the loop if price other than False.

We should filter those items which has base == -2 and there is no supplier price rule defined and we should consider other items to calculate price.

The fix will considers pricelist items in sequence if first pricelist(according to sequence) have configuration like based on supplier information of product form and product has supplier without price rule then code will skip that item and considers next item.

Thanks.

[Vinay Rana (OpenERP) (vra-openerp)]

I am agree with the solution as the partner section price is not assigned then system will return another sequence rule instead of zero value.
The propose fix will fixes this issue.

review: Approve

Unmerged revisions

9702. By Mohammed Shekha(OpenERP)<email address hidden> on 2013-12-17

[FIX]Fixed the issue of price_get, it should consider other items if it fails in following scenario. Create a pricelist with two items, Item A and Item B, Item A: product=null, category=null, sequence=1, base=Supplier Prices on the product form, Item B: product=null, category=null, sequence=5, base=Cost Price, now edit any product and set supplier with any price rule in Supplier Information tab of product and then create a purchase order with same supplier and add a purchasse order line with same product which we changed and you will find price=0 because no price rules are defined in supplier form of product, when this is the case then we should consider other pricelist items.

=== modified file 'product/pricelist.py'
--- product/pricelist.py	2013-09-20 14:45:29 +0000
+++ product/pricelist.py	2013-12-18 05:43:13 +0000
@@ -223,9 +223,28 @@
                 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, tmpl_id)
+                where = []
+                if partner:
+                    where = [('name', '=', partner) ]
+                sinfo = supplierinfo_obj.search(cr, uid,
+                        [('product_id', '=', tmpl_id)] + where)
+                qty_in_product_uom = qty
+                if sinfo:
+                    product_default_uom = product_obj.read(cr, uid, [product_id], ['uom_id'])[0]['uom_id'][0]
+                    supplier = supplierinfo_obj.browse(cr, uid, sinfo, context=context)[0]
+                    seller_uom = supplier.product_uom and supplier.product_uom.id or False
+                    if seller_uom and product_default_uom and product_default_uom != seller_uom:
+                        uom_price_already_computed = True
+                        qty_in_product_uom = product_uom_obj._compute_qty(cr, uid, product_default_uom, qty, to_uom_id=seller_uom)
+
+                if partner:
+                    partner_where = 'base <> -2 OR %s IN (SELECT product_supplierinfo.name FROM product_supplierinfo, pricelist_partnerinfo ' \
+                                            'WHERE product_supplierinfo.product_id = %s ' \
+                                                'AND product_supplierinfo.id = pricelist_partnerinfo.suppinfo_id ' \
+                                                'AND pricelist_partnerinfo.min_quantity <= %s ' \
+                                                'ORDER BY pricelist_partnerinfo.min_quantity DESC LIMIT 1) '
+                    partner_args = (partner, tmpl_id, qty_in_product_uom)
+
                 else:
                     partner_where = 'base <> -2 '
                     partner_args = ()
@@ -261,21 +280,6 @@
                                         price_tmp, round=False,
                                         context=context)
                         elif res['base'] == -2:
-                            # this section could be improved by moving the queries outside the loop:
-                            where = []
-                            if partner:
-                                where = [('name', '=', partner) ]
-                            sinfo = supplierinfo_obj.search(cr, uid,
-                                    [('product_id', '=', tmpl_id)] + where)
-                            price = 0.0
-                            if sinfo:
-                                qty_in_product_uom = qty
-                                product_default_uom = product_obj.read(cr, uid, [product_id], ['uom_id'])[0]['uom_id'][0]
-                                supplier = supplierinfo_obj.browse(cr, uid, sinfo, context=context)[0]
-                                seller_uom = supplier.product_uom and supplier.product_uom.id or False
-                                if seller_uom and product_default_uom and product_default_uom != seller_uom:
-                                    uom_price_already_computed = True
-                                    qty_in_product_uom = product_uom_obj._compute_qty(cr, uid, product_default_uom, qty, to_uom_id=seller_uom)
                                 cr.execute('SELECT * ' \
                                         'FROM pricelist_partnerinfo ' \
                                         'WHERE suppinfo_id IN %s' \