← Back to team overview

openerp-community-reviewer team mailing list archive

[Merge] lp:~pedro.baeza/ocb-addons/6.1-product-imp-units into lp:ocb-addons/6.1

 

Pedro Manuel Baeza has proposed merging lp:~pedro.baeza/ocb-addons/6.1-product-imp-units into lp:ocb-addons/6.1.

Requested reviews:
  OpenERP Community Backports (ocb)

For more details, see:
https://code.launchpad.net/~pedro.baeza/ocb-addons/6.1-product-imp-units/+merge/223111

[IMP] product: Added a unit category (volume) and two units (dozen and liter), like in 7.0. There is no bug report attached and no MP for official because this change is already merged on 7.0 and 6.1 is no supported.
-- 
https://code.launchpad.net/~pedro.baeza/ocb-addons/6.1-product-imp-units/+merge/223111
Your team OpenERP Community Backports is requested to review the proposed merge of lp:~pedro.baeza/ocb-addons/6.1-product-imp-units into lp:ocb-addons/6.1.
=== modified file 'product/product_data.xml'
--- product/product_data.xml	2011-12-30 12:31:00 +0000
+++ product/product_data.xml	2014-06-13 18:14:51 +0000
@@ -20,7 +20,9 @@
         <record id="uom_categ_length" model="product.uom.categ">
             <field name="name">Length / Distance</field>
         </record>
-
+        <record id="product_uom_categ_vol" model="product.uom.categ">
+            <field name="name">Volume</field>
+        </record>
 
         <!--
             Resource: product.uom
@@ -31,6 +33,12 @@
             <field name="factor" eval="1.0"/>
             <field name="rounding" eval="1.0"/>
         </record>
+       <record id="product_uom_dozen" model="product.uom">
+            <field name="category_id" ref="product.product_uom_categ_unit"/>
+            <field name="name">Dozen(s)</field>
+            <field name="factor_inv" eval="12"/>
+            <field name="uom_type">bigger</field>
+        </record>
         <record id="product_uom_kgm" model="product.uom">
             <field name="category_id" ref="product_uom_categ_kgm"/>
             <field name="name">kg</field>
@@ -78,7 +86,11 @@
             <field name="factor" eval="100"/>
             <field name="uom_type">smaller</field>
         </record>
-
+        <record id="product_uom_litre" model="product.uom">
+            <field name="name">Liter(s)</field>
+            <field name="category_id" ref="product_uom_categ_vol"/>
+            <field name="factor">1.0</field>
+        </record>
 
         <!--
 ... to here, it should be in product_demo but we cant just move it