From d53dd959626fd27b921b1ea20f5ce72993c55f26 Mon Sep 17 00:00:00 2001
From: "Darshan Kalola (OpenERP)" <dka@tinyerp.com>
Date: Mon, 25 Nov 2013 16:43:52 +0530
Subject: [PATCH 1/2] [ADD]demo data of Americanization  units of measure and
 test case for the same.

bzr revid: dka@tinyerp.com-20131125111352-0dcg73dbk3tmca6k
---
 addons/product/product_data.xml     | 49 +++++++++++++++++++++++++++++
 addons/product/test/product_uom.yml | 13 +++++++-
 2 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 91d78722d14..2b63fcbce8b 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -96,6 +96,55 @@
             <field name="factor">1.0</field>
         </record>
 
+        <!--Americanization of units of measure-->
+        <record id="product_uom_lb" model="product.uom">
+            <field name="name">lb(s)</field>
+            <field name="category_id" ref="product_uom_categ_kgm"/>
+            <field name="factor">2.20462</field>
+            <field name="uom_type">smaller</field>
+        </record>
+        <record id="product_uom_oz" model="product.uom">
+            <field name="name">oz(s)</field>
+            <field name="category_id" ref="product_uom_categ_kgm"/>
+            <field name="factor">35.274</field>
+            <field name="uom_type">smaller</field>
+        </record>
+        <record id="product_uom_inch" model="product.uom">
+            <field name="name">inch(es)</field>
+            <field name="category_id" ref="uom_categ_length"/>
+            <field name="factor">39.3701</field>
+            <field name="uom_type">smaller</field>
+        </record>
+        <record id="product_uom_foot" model="product.uom">
+            <field name="name">foot(ft)</field>
+            <field name="category_id" ref="uom_categ_length"/>
+            <field name="factor">3.28084</field>
+            <field name="uom_type">smaller</field>
+        </record>
+        <record id="product_uom_mile" model="product.uom">
+            <field name="name">mile(s)</field>
+            <field name="category_id" ref="uom_categ_length"/>
+            <field name="factor_inv" eval="1609.34"/>
+            <field name="uom_type">bigger</field>
+        </record>
+        <record id="product_uom_floz" model="product.uom">
+            <field name="name">fl oz</field>
+            <field name="category_id" ref="product_uom_categ_vol"/>
+            <field name="factor">33.814</field>
+            <field name="uom_type">smaller</field>
+        </record>
+        <record id="product_uom_qt" model="product.uom">
+            <field name="name">qt</field>
+            <field name="category_id" ref="product_uom_categ_vol"/>
+            <field name="factor">1.05669</field>
+            <field name="uom_type">smaller</field>
+        </record>
+        <record id="product_uom_gal" model="product.uom">
+            <field name="name">gal(s)</field>
+            <field name="category_id" ref="product_uom_categ_vol"/>
+            <field name="factor_inv" eval="3.78541"/>
+            <field name="uom_type">bigger</field>
+        </record>
 
         <!--
 ... to here, it should be in product_demo but we cant just move it
diff --git a/addons/product/test/product_uom.yml b/addons/product/test/product_uom.yml
index 04928d43d87..b5013fbe2f4 100644
--- a/addons/product/test/product_uom.yml
+++ b/addons/product/test/product_uom.yml
@@ -12,4 +12,15 @@
     qty = self._compute_qty(cr, uid, from_uom_id, qty, to_uom_id)
     assert qty == 1.02, "Qty is not correspond."
     assert price == 2000000.0, "Price is not correspond."
-
+-
+  I convert Liters into Gallons with price.
+-
+  !python {model: product.uom}: |
+    from_uom_id = ref("product_uom_litre")
+    to_uom_id = ref("product_uom_gal")
+    price = 2
+    qty = 30.28
+    price = self._compute_price(cr, uid, from_uom_id, price, to_uom_id)
+    qty = self._compute_qty(cr, uid, from_uom_id, qty, to_uom_id)
+    assert qty == 8, "Qty is not correspond."
+    assert round(price,2) == 7.57, "Price is not correspond."

From eaccb836f4dd9da19450909b9e96ca3d86c61e1f Mon Sep 17 00:00:00 2001
From: "Jitendra Prajapati (OpenERP)" <prajapatijitendra7969@gmail.com>
Date: Wed, 11 Dec 2013 11:52:32 +0530
Subject: [PATCH 2/2] [IMP]remove (%) icon in payment term

bzr revid: prajapatijitendra7969@gmail.com-20131211062232-kwylrq7fms2t23o9
---
 addons/account/account_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ed2d88b7386..1a2a645e9cd 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1600,7 +1600,6 @@
 	                        <label for="value_amount" string="Amount To Pay"  attrs="{'invisible':[('value','=','balance')]}"/>
 	                        <div attrs="{'invisible':[('value','=','balance')]}">
 	                            <field name="value_amount" class="oe_inline"/>
-	                            <label string="%%" class="oe_inline" attrs="{'invisible':['!',('value','=','procent')]}" />
 	                        </div>
                         </group>
                         <group string="Due Date Computation">