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] [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"/>