Merge lp:~openerp-dev/openobject-addons/6.0-opw-591881-msh into lp:openobject-addons/6.0

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of uom conversion, conversion of supplier quantity should from supplier uom to purchase uom.

Demo:- Create one test product with Default unit of measure cm and Purchase unit of measure km, also define the supplier for product with supplier unit of measure to km and minimum quantity 1.

Now ask for product that is create procurement order for this product with 100cm and check the product quantity in purchase order, conversion is wrong, the method _calc_qty of product_supplier_info object converts quantity from supplier UOM to default UOM it should be supplier UOM to Purchase UOM.

One more scenario is remove minimum quantity from supplier and then create procurement order, still conversion issue.

So fixed this issue and used po_uom_id, check version 6.1 or 7.0 we use supplier uom as po_uom by default and made that supplier uom field readonly so there is no need of conversion from supplier to po, the quantity should always be converted to purchase UOM.

Thanks.

Unmerged revisions

5478. By Mohammed Shekha<email address hidden> on 2013-06-05

[FIX]Fixed the issue of uom conversion, conversion of supplier quantity should from supplier uom to purchase uom.

=== modified file 'product/product.py'
--- product/product.py	2012-03-30 08:53:02 +0000
+++ product/product.py	2013-06-05 08:40:50 +0000
@@ -712,7 +712,8 @@
             for field in fields:
                 result[supplier_info.id] = {field:False}
             if supplier_info.product_uom.id:
-                qty = product_uom_pool._compute_qty(cr, uid, supplier_info.product_uom.id, supplier_info.min_qty, to_uom_id=supplier_info.product_id.uom_id.id)
+                #conversion should from supplier uom to po_uom_id
+                qty = product_uom_pool._compute_qty(cr, uid, supplier_info.product_uom.id, supplier_info.min_qty, to_uom_id=supplier_info.product_id.uom_po_id.id)
             else:
                 qty = supplier_info.min_qty
             result[supplier_info.id]['qty'] = qty

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2012-06-29 14:14:29 +0000
+++ purchase/purchase.py	2013-06-05 08:40:50 +0000
@@ -811,25 +811,22 @@
                 qty = max(qty,seller_qty)
 
             price = pricelist_obj.price_get(cr, uid, [pricelist_id], procurement.product_id.id, qty, partner_id, {'uom': uom_id})[pricelist_id]
+            price_unit_precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Purchase Price')
+            price = rounding(price, 10**-price_unit_precision)
 
             newdate = datetime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S')
             newdate = (newdate - relativedelta(days=company.po_lead)) - relativedelta(days=seller_delay)
 
-            res_onchange = po_line_obj.product_id_change(cr, uid, ids, pricelist_id, procurement.product_id.id, qty, uom_id,
-                partner_id, time.strftime('%Y-%m-%d'), fiscal_position=fiscal_position, date_planned=datetime.now() + relativedelta(days=seller_delay or 0.0),
-            name=procurement.name, price_unit=procurement.product_id.list_price, notes=procurement.product_id.description_purchase)
-
             #Passing partner_id to context for purchase order line integrity of Line name
             context.update({'lang': partner.lang, 'partner_id': partner_id})
 
             product = prod_obj.browse(cr, uid, procurement.product_id.id, context=context)
-
             line = {
                 'name': product.partner_ref,
-                'product_qty': res_onchange['value']['product_qty'],
+                'product_qty': qty,
                 'product_id': procurement.product_id.id,
-                'product_uom': res_onchange['value']['product_uom'],
-                'price_unit': res_onchange['value']['price_unit'],
+                'product_uom': uom_id,
+                'price_unit': price or 0.0,
                 'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'),
                 'move_dest_id': res_id,
                 'notes': product.description_purchase,