From f394ec23578fd359fec475c78fafcbce65331d92 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 11 Feb 2011 18:29:20 +0530
Subject: [PATCH] [FIX] Purchase:[PS] Purchase order line_ Unit of measure

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

bzr revid: aag@tinyerp.co.in-20110211125920-iarez31rjra2bep8
---
 addons/purchase/purchase.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 2527d0d6a7e..2b4ffb69f1f 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -662,7 +662,6 @@ class purchase_order_line(osv.osv):
                 'notes': notes or'', 'product_uom' : uom or False}, 'domain':{'product_uom':[]}}
         res = {}
         prod= self.pool.get('product.product').browse(cr, uid, product)
-
         product_uom_pool = self.pool.get('product.uom')
         lang=False
         if partner_id:
@@ -678,6 +677,11 @@ class purchase_order_line(osv.osv):
             date_order = time.strftime('%Y-%m-%d')
         qty = qty or 1.0
         seller_delay = 0
+        if uom:
+            uom1_cat = prod.uom_id.category_id.id
+            uom2_cat = product_uom_pool.browse(cr, uid, uom).category_id.id
+            if uom1_cat != uom2_cat:
+                uom = False
 
         prod_name = self.pool.get('product.product').name_get(cr, uid, [prod.id], context=context)[0][1]
         res = {}
@@ -704,14 +708,13 @@ class purchase_order_line(osv.osv):
             'taxes_id':map(lambda x: x.id, prod.supplier_taxes_id),
             'date_planned': date_planned or dt,'notes': notes or prod.description_purchase,
             'product_qty': qty,
-            'product_uom': uom}})
+            'product_uom': prod.uom_id.id}})
         domain = {}
 
         taxes = self.pool.get('account.tax').browse(cr, uid,map(lambda x: x.id, prod.supplier_taxes_id))
         fpos = fiscal_position and self.pool.get('account.fiscal.position').browse(cr, uid, fiscal_position) or False
         res['value']['taxes_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, taxes)
-
-        res2 = self.pool.get('product.uom').read(cr, uid, [uom], ['category_id'])
+        res2 = self.pool.get('product.uom').read(cr, uid, [prod.uom_id.id], ['category_id'])
         res3 = prod.uom_id.category_id.id
         domain = {'product_uom':[('category_id','=',res2[0]['category_id'][0])]}
         if res2[0]['category_id'][0] != res3: