From 082f696ef47eceb19e3ce8d82d10440aee80004f Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Thu, 4 Oct 2012 11:41:32 +0530
Subject: [PATCH 1/9] UOM, List view: remove the ratio column.

bzr revid: tta@openerp.com-20121004061132-0p5o9qcfpo0xyvzh
---
 addons/product/product_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 8c19aee026f..2509abfec4e 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -449,7 +449,6 @@
                 <tree string="Units of Measure">
                     <field name="name"/>
                     <field name="category_id"/>
-                    <field name="factor"/>
                 </tree>
             </field>
         </record>

From 5fe8e1e1a6fd79bd71badfa0aba17d0c564fe098 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Mon, 8 Oct 2012 12:46:25 +0530
Subject: [PATCH 2/9] [IMP] Refine form view layout for UOM.

bzr revid: tta@openerp.com-20121008071625-yaeo8ogvlajw7k7r
---
 addons/product/product.py       | 31 +++++++++++++++++++++++++++----
 addons/product/product_view.xml | 22 ++++++++++++----------
 2 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index d5acee0333b..a895fbd0c64 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -107,10 +107,18 @@ class product_uom(osv.osv):
             del(data['factor_inv'])
         return super(product_uom, self).create(cr, uid, data, context)
 
+    def _product_uom_name(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        if context is None:
+            context = {}
+        for p in self.browse(cr, uid, ids, context=context):
+            res[p.id] = p.name
+        return res
+
     _order = "name"
     _columns = {
-        'name': fields.char('Name', size=64, required=True, translate=True),
-        'category_id': fields.many2one('product.uom.categ', 'Unit of Measure Category', required=True, ondelete='cascade',
+        'name': fields.char('Unit of Measure', size=64, required=True, translate=True),
+        'category_id': fields.many2one('product.uom.categ', 'Category', required=True, ondelete='cascade',
             help="Quantity conversions may happen automatically between Units of Measure in the same category, according to their respective ratios."),
         'factor': fields.float('Ratio', required=True,digits=(12, 12),
             help='How many times this Unit of Measure is smaller than the reference Unit of Measure in this category:\n'\
@@ -120,13 +128,15 @@ class product_uom(osv.osv):
             string='Ratio',
             help='How many times this Unit of Measure is bigger than the reference Unit of Measure in this category:\n'\
                     '1 * (this unit) = ratio * (reference unit)', required=True),
-        'rounding': fields.float('Rounding Precision', digits_compute=dp.get_precision('Product Unit of Measure'), required=True,
+        'rounding': fields.float('Rounding precision', digits_compute=dp.get_precision('Product Unit of Measure'), required=True,
             help="The computed quantity will be a multiple of this value. "\
                  "Use 1.0 for a Unit of Measure that cannot be further split, such as a piece."),
         'active': fields.boolean('Active', help="By unchecking the active field you can disable a unit of measure without deleting it."),
         'uom_type': fields.selection([('bigger','Bigger than the reference Unit of Measure'),
                                       ('reference','Reference Unit of Measure for this category'),
-                                      ('smaller','Smaller than the reference Unit of Measure')],'Unit of Measure Type', required=1),
+                                      ('smaller','Smaller than the reference Unit of Measure')],'Type', required=1),
+        'reference_uom_id': fields.many2one('product.uom', 'Reference UoM', readonly=True, help='Reference unit'),
+        'name_ref': fields.function(_product_uom_name, type='char', string='Name'),
     }
 
     _defaults = {
@@ -139,6 +149,14 @@ class product_uom(osv.osv):
         ('factor_gt_zero', 'CHECK (factor!=0)', 'The conversion ratio for a unit of measure cannot be 0!')
     ]
 
+    def onchange_category_id(self, cr, uid, ids, category_id):
+    	reference_uom = False
+	if category_id:
+            uom_ids = self.search(cr, uid, [('category_id', '=',category_id),('uom_type', '=', 'reference')])
+	    if uom_ids:
+                reference_uom = uom_ids[0]
+	return {'value':{'reference_uom_id': reference_uom}}
+
     def _compute_qty(self, cr, uid, from_uom_id, qty, to_uom_id=False):
         if not from_uom_id or not qty or not to_uom_id:
             return qty
@@ -177,6 +195,11 @@ class product_uom(osv.osv):
             amount = amount / to_unit.factor
         return amount
 
+    def onchange_name(self, cursor, user, ids, value):
+        if value:
+            return {'value': {'name_ref': value}}
+        return {}
+
     def onchange_type(self, cursor, user, ids, value):
         if value == 'reference':
             return {'value': {'factor': 1, 'factor_inv': 1}}
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 2509abfec4e..826ae77770f 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -460,21 +460,23 @@
                 <form string="Units of Measure" version="7.0">
                     <group>
                         <group>
-                            <field name="name"/>
-                            <field name="category_id"/>
+                            <field name="name" on_change="onchange_name(name)"/>
+			                <field name="category_id" on_change="onchange_category_id(category_id)"/>
                             <field name="active"/>
                         </group>
                         <group>
                             <field name="uom_type" on_change="onchange_type(uom_type)"/>
-                            <p attrs="{'invisible':[('uom_type','!=','smaller')]}" colspan="2">
-                                e.g: 1 * (reference unit) = ratio * (this unit)
-                            </p>
-                            <p attrs="{'invisible':[('uom_type','!=','bigger')]}" colspan="2">
-                                e.g: 1 * (this unit) = ratio * (reference unit)
-                            </p>
+                            <label string="Computation" for="factor" attrs="{'invisible':[('uom_type','=','reference')]}" style="margin: 9px 0 9px 0;"/>
+                            <group col="5" attrs="{'invisible':[('uom_type','=','reference')]}">
+                            <div>
+                                <label string="1" attrs="{'invisible':[('uom_type','=','reference')]}" width="1"/>
+                			    <field class="oe_inline" name="reference_uom_id" attrs="{'invisible':[('reference_uom_id','=',False)]}" nolabel="1"/>
+                                <field name="factor" attrs="{'invisible':[('uom_type','!=','smaller')]}" String="Computation" nolabel="1"/>
+                                <field name="factor_inv" attrs="{'invisible':[('uom_type','!=','bigger')]}" String="Computation" nolabel="1"/>
+                                <field name="name_ref" nolabel="1" attrs="{'readonly': True}" width="1"/>
+                            </div>
+                            </group>                            
                             <field name="rounding"/>
-                            <field name="factor" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
-                            <field name="factor_inv" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
                         </group>
                     </group>
                 </form>

From 4fb104ffee70c03b07d2fd5552556c72d9329ad9 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Mon, 8 Oct 2012 15:30:46 +0530
Subject: [PATCH 3/9] [IMP] Depend on UOM type computation layout change.

bzr revid: tta@openerp.com-20121008100046-x93cu80uh9epdq21
---
 addons/product/product_data.xml | 18 ++++++++++++------
 addons/product/product_view.xml | 12 +++++++-----
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 1974acc6df2..37668d7abfa 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -42,6 +42,7 @@
             <field name="name">Dozen</field>
             <field name="factor_inv" eval="12"/>
             <field name="uom_type">bigger</field>
+            <field name="reference_uom_id" ref="product_uom_unit"/>
         </record>
         <record id="product_uom_kgm" model="product.uom">
             <field name="category_id" ref="product_uom_categ_kgm"/>
@@ -53,18 +54,20 @@
             <field name="name">g</field>
             <field name="factor" eval="1000"/>
             <field name="uom_type">smaller</field>
-        </record>
-        <record id="product_uom_hour" model="product.uom">
-            <field name="name">Hour</field>
-            <field eval="uom_categ_wtime" name="category_id"/>
-            <field name="factor" eval="8.0"/>
-            <field name="uom_type">smaller</field>
+            <field name="reference_uom_id" ref="product_uom_kgm"/>
         </record>
         <record id="product_uom_day" model="product.uom">
             <field name="name">Day</field>
             <field eval="uom_categ_wtime" name="category_id"/>
             <field name="factor" eval="1.0"/>
         </record>
+        <record id="product_uom_hour" model="product.uom">
+            <field name="name">Hour</field>
+            <field eval="uom_categ_wtime" name="category_id"/>
+            <field name="factor" eval="8.0"/>
+            <field name="uom_type">smaller</field>
+            <field name="reference_uom_id" ref="product_uom_day"/>
+        </record>        
         <record id="product_uom_ton" model="product.uom">
             <field name="category_id" ref="product_uom_categ_kgm"/>
             <!-- 'tonne' is the most common spelling in english-speaking countries,
@@ -72,6 +75,7 @@
             <field name="name">t</field>
             <field name="factor_inv" eval="1000"/>
             <field name="uom_type">bigger</field>
+            <field name="reference_uom_id" ref="product_uom_kgm"/>
         </record>
         <record id="product_uom_meter" model="product.uom">
             <field name="category_id" ref="uom_categ_length"/>
@@ -83,12 +87,14 @@
             <field name="name">km</field>
             <field name="factor_inv" eval="1000"/>
             <field name="uom_type">bigger</field>
+            <field name="reference_uom_id" ref="product_uom_meter"/>
         </record>
         <record id="product_uom_cm" model="product.uom">
             <field name="category_id" ref="uom_categ_length"/>
             <field name="name">cm</field>
             <field name="factor" eval="100"/>
             <field name="uom_type">smaller</field>
+            <field name="reference_uom_id" ref="product_uom_meter"/>
         </record>
         <record id="product_uom_litre" model="product.uom">
             <field name="name">Litre</field>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 826ae77770f..482dfdf61d5 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -468,12 +468,14 @@
                             <field name="uom_type" on_change="onchange_type(uom_type)"/>
                             <label string="Computation" for="factor" attrs="{'invisible':[('uom_type','=','reference')]}" style="margin: 9px 0 9px 0;"/>
                             <group col="5" attrs="{'invisible':[('uom_type','=','reference')]}">
-                            <div>
-                                <label string="1" attrs="{'invisible':[('uom_type','=','reference')]}" width="1"/>
-                			    <field class="oe_inline" name="reference_uom_id" attrs="{'invisible':[('reference_uom_id','=',False)]}" nolabel="1"/>
-                                <field name="factor" attrs="{'invisible':[('uom_type','!=','smaller')]}" String="Computation" nolabel="1"/>
+                            <div style="margin-left: -12px;">
                                 <field name="factor_inv" attrs="{'invisible':[('uom_type','!=','bigger')]}" String="Computation" nolabel="1"/>
-                                <field name="name_ref" nolabel="1" attrs="{'readonly': True}" width="1"/>
+                                <label string="1" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
+                			    <field class="oe_inline" name="reference_uom_id" attrs="{'invisible':[('uom_type','=','reference')]}" nolabel="1"/>
+                			    <label string="="/>                                
+                                <field class="oe_inline" name="factor" attrs="{'invisible':[('uom_type','!=','smaller')]}" String="Computation" nolabel="1"/>
+                                <label string="1" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
+                                <field class="oe_inline" name="name_ref" nolabel="1" attrs="{'readonly': True}" width="1"/>
                             </div>
                             </group>                            
                             <field name="rounding"/>

From dd19cbb65afc0c3f68404922ec9f6c797751f6c8 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Mon, 8 Oct 2012 15:43:27 +0530
Subject: [PATCH 4/9] [IMP] Small fix for display issue.

bzr revid: tta@openerp.com-20121008101327-lkzvw3wdarhcyht8
---
 addons/product/product_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 482dfdf61d5..fee43562227 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -469,7 +469,7 @@
                             <label string="Computation" for="factor" attrs="{'invisible':[('uom_type','=','reference')]}" style="margin: 9px 0 9px 0;"/>
                             <group col="5" attrs="{'invisible':[('uom_type','=','reference')]}">
                             <div style="margin-left: -12px;">
-                                <field name="factor_inv" attrs="{'invisible':[('uom_type','!=','bigger')]}" String="Computation" nolabel="1"/>
+                                <field name="factor_inv" class="oe_inline" attrs="{'invisible':[('uom_type','!=','bigger')]}" String="Computation" nolabel="1"/>
                                 <label string="1" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
                 			    <field class="oe_inline" name="reference_uom_id" attrs="{'invisible':[('uom_type','=','reference')]}" nolabel="1"/>
                 			    <label string="="/>                                

From 90079f6752c30c8dc0a206d6559317367be5419e Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Tue, 9 Oct 2012 11:53:05 +0530
Subject: [PATCH 5/9] [FIX]Corrected indentation issue.

bzr revid: tta@openerp.com-20121009062305-kxsxabgrjrzz5gr3
---
 addons/product/product.py       | 6 +++---
 addons/product/product_view.xml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index a895fbd0c64..ff67f5d5cc6 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -152,10 +152,10 @@ class product_uom(osv.osv):
     def onchange_category_id(self, cr, uid, ids, category_id):
     	reference_uom = False
 	if category_id:
-            uom_ids = self.search(cr, uid, [('category_id', '=',category_id),('uom_type', '=', 'reference')])
+	    uom_ids = self.search(cr, uid, [('category_id', '=',category_id),('uom_type', '=', 'reference')])
 	    if uom_ids:
-                reference_uom = uom_ids[0]
-	return {'value':{'reference_uom_id': reference_uom}}
+	        reference_uom = uom_ids[0]
+    return {'value':{'reference_uom_id': reference_uom}}
 
     def _compute_qty(self, cr, uid, from_uom_id, qty, to_uom_id=False):
         if not from_uom_id or not qty or not to_uom_id:
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index fee43562227..e517fed6061 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -461,7 +461,7 @@
                     <group>
                         <group>
                             <field name="name" on_change="onchange_name(name)"/>
-			                <field name="category_id" on_change="onchange_category_id(category_id)"/>
+                            <field name="category_id" on_change="onchange_category_id(category_id)"/>
                             <field name="active"/>
                         </group>
                         <group>
@@ -471,8 +471,8 @@
                             <div style="margin-left: -12px;">
                                 <field name="factor_inv" class="oe_inline" attrs="{'invisible':[('uom_type','!=','bigger')]}" String="Computation" nolabel="1"/>
                                 <label string="1" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
-                			    <field class="oe_inline" name="reference_uom_id" attrs="{'invisible':[('uom_type','=','reference')]}" nolabel="1"/>
-                			    <label string="="/>                                
+                                <field class="oe_inline" name="reference_uom_id" attrs="{'invisible':[('uom_type','=','reference')]}" nolabel="1"/>
+                                <label string="="/>
                                 <field class="oe_inline" name="factor" attrs="{'invisible':[('uom_type','!=','smaller')]}" String="Computation" nolabel="1"/>
                                 <label string="1" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
                                 <field class="oe_inline" name="name_ref" nolabel="1" attrs="{'readonly': True}" width="1"/>

From c22440e5f4d9f0cdaf4b11fb7349de9572bc461b Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Tue, 9 Oct 2012 14:48:18 +0530
Subject: [PATCH 6/9] [Fix] Set right margin and corrected indentation.

bzr revid: tta@openerp.com-20121009091818-k4wi2eio1spd98x7
---
 addons/product/__openerp__.py         |  1 +
 addons/product/product.py             | 14 +++++++-------
 addons/product/product_view.xml       |  2 +-
 addons/product/static/css/product.css |  3 +++
 4 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 addons/product/static/css/product.css

diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py
index fdadda2e4d4..c1799918b1b 100644
--- a/addons/product/__openerp__.py
+++ b/addons/product/__openerp__.py
@@ -67,5 +67,6 @@ Print product labels with barcode.
     'installable': True,
     'auto_install': False,
     'images': ['images/product_uom.jpeg','images/product_pricelists.jpeg','images/products_categories.jpeg', 'images/products_form.jpeg'],
+    'css': ['static/css/product.css']
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product/product.py b/addons/product/product.py
index ff67f5d5cc6..d807c1f916d 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -148,14 +148,14 @@ class product_uom(osv.osv):
     _sql_constraints = [
         ('factor_gt_zero', 'CHECK (factor!=0)', 'The conversion ratio for a unit of measure cannot be 0!')
     ]
-
+    
     def onchange_category_id(self, cr, uid, ids, category_id):
-    	reference_uom = False
-	if category_id:
-	    uom_ids = self.search(cr, uid, [('category_id', '=',category_id),('uom_type', '=', 'reference')])
-	    if uom_ids:
-	        reference_uom = uom_ids[0]
-    return {'value':{'reference_uom_id': reference_uom}}
+        reference_uom = False
+        if category_id:
+            uom_ids = self.search(cr, uid, [('category_id', '=',category_id),('uom_type', '=', 'reference')])
+            if uom_ids:
+                reference_uom = uom_ids[0]
+        return {'value':{'reference_uom_id': reference_uom}}
 
     def _compute_qty(self, cr, uid, from_uom_id, qty, to_uom_id=False):
         if not from_uom_id or not qty or not to_uom_id:
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index e517fed6061..3672e6a6e68 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -468,7 +468,7 @@
                             <field name="uom_type" on_change="onchange_type(uom_type)"/>
                             <label string="Computation" for="factor" attrs="{'invisible':[('uom_type','=','reference')]}" style="margin: 9px 0 9px 0;"/>
                             <group col="5" attrs="{'invisible':[('uom_type','=','reference')]}">
-                            <div style="margin-left: -12px;">
+                            <div class="oe_moveleft">
                                 <field name="factor_inv" class="oe_inline" attrs="{'invisible':[('uom_type','!=','bigger')]}" String="Computation" nolabel="1"/>
                                 <label string="1" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
                                 <field class="oe_inline" name="reference_uom_id" attrs="{'invisible':[('uom_type','=','reference')]}" nolabel="1"/>
diff --git a/addons/product/static/css/product.css b/addons/product/static/css/product.css
new file mode 100644
index 00000000000..af27eaeabae
--- /dev/null
+++ b/addons/product/static/css/product.css
@@ -0,0 +1,3 @@
+.oe_moveleft{
+    margin-left: -12px;
+}

From 685149861c7134e3e417055cd93da86fa987b25a Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Thu, 11 Oct 2012 13:50:52 +0530
Subject: [PATCH 7/9] removed css

bzr revid: tta@openerp.com-20121011082052-x95w69vuovbo3s2r
---
 addons/product/__openerp__.py         | 1 -
 addons/product/product_view.xml       | 2 +-
 addons/product/static/css/product.css | 3 ---
 3 files changed, 1 insertion(+), 5 deletions(-)
 delete mode 100644 addons/product/static/css/product.css

diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py
index c1799918b1b..fdadda2e4d4 100644
--- a/addons/product/__openerp__.py
+++ b/addons/product/__openerp__.py
@@ -67,6 +67,5 @@ Print product labels with barcode.
     'installable': True,
     'auto_install': False,
     'images': ['images/product_uom.jpeg','images/product_pricelists.jpeg','images/products_categories.jpeg', 'images/products_form.jpeg'],
-    'css': ['static/css/product.css']
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 3672e6a6e68..e517fed6061 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -468,7 +468,7 @@
                             <field name="uom_type" on_change="onchange_type(uom_type)"/>
                             <label string="Computation" for="factor" attrs="{'invisible':[('uom_type','=','reference')]}" style="margin: 9px 0 9px 0;"/>
                             <group col="5" attrs="{'invisible':[('uom_type','=','reference')]}">
-                            <div class="oe_moveleft">
+                            <div style="margin-left: -12px;">
                                 <field name="factor_inv" class="oe_inline" attrs="{'invisible':[('uom_type','!=','bigger')]}" String="Computation" nolabel="1"/>
                                 <label string="1" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
                                 <field class="oe_inline" name="reference_uom_id" attrs="{'invisible':[('uom_type','=','reference')]}" nolabel="1"/>
diff --git a/addons/product/static/css/product.css b/addons/product/static/css/product.css
deleted file mode 100644
index af27eaeabae..00000000000
--- a/addons/product/static/css/product.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.oe_moveleft{
-    margin-left: -12px;
-}

From 03eb5a002a4f0d0856a2a9d120bffda298c569c8 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Thu, 11 Oct 2012 18:10:40 +0530
Subject: [PATCH 8/9] [Fix] Create a functional field : reference_uom_id.

bzr revid: tta@openerp.com-20121011124040-egs4a1ds7w7dc9fa
---
 addons/product/product.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index d807c1f916d..833911b3671 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -106,13 +106,15 @@ class product_uom(osv.osv):
                 data['factor'] = self._compute_factor_inv(data['factor_inv'])
             del(data['factor_inv'])
         return super(product_uom, self).create(cr, uid, data, context)
-
-    def _product_uom_name(self, cr, uid, ids, name, arg, context=None):
+        
+    def _reference_uom(self, cr, uid, ids, field, arg, context=None):
         res = {}
-        if context is None:
-            context = {}
-        for p in self.browse(cr, uid, ids, context=context):
-            res[p.id] = p.name
+        for uom in self.browse(cr, uid, ids, context):
+            uom_ids = []
+            if uom.category_id and uom.category_id.id:
+                uom_ids = self.search(cr, uid, [('category_id', '=', uom.category_id.id), ('uom_type', '=', 'reference')], context=context)
+            if uom_ids:
+                res[uom.id] = uom_ids[0]
         return res
 
     _order = "name"
@@ -135,8 +137,7 @@ class product_uom(osv.osv):
         'uom_type': fields.selection([('bigger','Bigger than the reference Unit of Measure'),
                                       ('reference','Reference Unit of Measure for this category'),
                                       ('smaller','Smaller than the reference Unit of Measure')],'Type', required=1),
-        'reference_uom_id': fields.many2one('product.uom', 'Reference UoM', readonly=True, help='Reference unit'),
-        'name_ref': fields.function(_product_uom_name, type='char', string='Name'),
+        'reference_uom_id': fields.function(_reference_uom, type='many2one', relation="product.uom"),
     }
 
     _defaults = {
@@ -148,7 +149,7 @@ class product_uom(osv.osv):
     _sql_constraints = [
         ('factor_gt_zero', 'CHECK (factor!=0)', 'The conversion ratio for a unit of measure cannot be 0!')
     ]
-    
+
     def onchange_category_id(self, cr, uid, ids, category_id):
         reference_uom = False
         if category_id:

From d08e05be59fd07e8ea6665a5a9bd0461e6b9b6ea Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Thu, 11 Oct 2012 19:10:09 +0530
Subject: [PATCH 9/9] [Fix] Removed name_ref field.

bzr revid: tta@openerp.com-20121011134009-disfhlj4t34i3jhz
---
 addons/product/product_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index e517fed6061..a15f6b64bf3 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -475,7 +475,6 @@
                                 <label string="="/>
                                 <field class="oe_inline" name="factor" attrs="{'invisible':[('uom_type','!=','smaller')]}" String="Computation" nolabel="1"/>
                                 <label string="1" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
-                                <field class="oe_inline" name="name_ref" nolabel="1" attrs="{'readonly': True}" width="1"/>
                             </div>
                             </group>                            
                             <field name="rounding"/>