From 672a51b65a8bc755c8b2255945179a765a22bac4 Mon Sep 17 00:00:00 2001
From: "Hardik Ansodariy (OpenERP)" <han@tinyerp.com>
Date: Wed, 7 Sep 2011 12:20:08 +0530
Subject: [PATCH] [imp] set default product_uom through xml_id

bzr revid: han@tinyerp.com-20110907065008-r9uhal7tdlwnodb0
---
 addons/purchase/purchase.py | 10 +++++++---
 addons/sale/sale.py         | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index bd3f8256065..7d3af70382a 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -613,9 +613,13 @@ class purchase_order_line(osv.osv):
         return res
 
     def _get_uom_id(self, cr, uid, *args):
-        cr.execute('select id from product_uom order by id limit 1')
-        res = cr.fetchone()
-        return res and res[0] or False
+        model_data = self.pool.get('ir.model.data')
+        xml_id = 'product_uom_unit'
+        res = model_data.search(cr,uid, [('name', '=', xml_id)])
+        if len(res):
+            res = model_data.browse(cr, uid, res[0])
+            return res.res_id 
+        return False
     
     _columns = {
         'name': fields.char('Description', size=256, required=True),
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 231fa2cdbf1..a150ceb3469 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -839,9 +839,13 @@ class sale_order_line(osv.osv):
         return res
 
     def _get_uom_id(self, cr, uid, *args):
-        cr.execute('select id from product_uom order by id limit 1')
-        res = cr.fetchone()
-        return res and res[0] or False
+        model_data = self.pool.get('ir.model.data')
+        xml_id = 'product_uom_unit'
+        res = model_data.search(cr, uid, [('name', '=', xml_id)])
+        if len(res):
+            res = model_data.browse(cr,uid,res[0])
+            return res.res_id
+        return False
     
     _name = 'sale.order.line'
     _description = 'Sales Order Line'