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

Proposed by Pedro Manuel Baeza
Status: Needs review
Proposed branch: lp:~pedro.baeza/ocb-addons/6.1-product-imp-units
Merge into: lp:ocb-addons/6.1
Diff against target: 40 lines (+14/-2)
1 file modified
product/product_data.xml (+14/-2)
To merge this branch: bzr merge lp:~pedro.baeza/ocb-addons/6.1-product-imp-units
Reviewer Review Type Date Requested Status
OpenERP Community Backports Pending
Review via email: mp+223111@code.launchpad.net

Description of the change

[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.

To post a comment you must log in.

Unmerged revisions

6844. By Pedro Manuel Baeza (<email address hidden>)

[IMP] product: Added some units (dozen, liter) and unit category (volume) like in 7.0

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'product/product_data.xml'
2--- product/product_data.xml 2011-12-30 12:31:00 +0000
3+++ product/product_data.xml 2014-06-13 18:14:51 +0000
4@@ -20,7 +20,9 @@
5 <record id="uom_categ_length" model="product.uom.categ">
6 <field name="name">Length / Distance</field>
7 </record>
8-
9+ <record id="product_uom_categ_vol" model="product.uom.categ">
10+ <field name="name">Volume</field>
11+ </record>
12
13 <!--
14 Resource: product.uom
15@@ -31,6 +33,12 @@
16 <field name="factor" eval="1.0"/>
17 <field name="rounding" eval="1.0"/>
18 </record>
19+ <record id="product_uom_dozen" model="product.uom">
20+ <field name="category_id" ref="product.product_uom_categ_unit"/>
21+ <field name="name">Dozen(s)</field>
22+ <field name="factor_inv" eval="12"/>
23+ <field name="uom_type">bigger</field>
24+ </record>
25 <record id="product_uom_kgm" model="product.uom">
26 <field name="category_id" ref="product_uom_categ_kgm"/>
27 <field name="name">kg</field>
28@@ -78,7 +86,11 @@
29 <field name="factor" eval="100"/>
30 <field name="uom_type">smaller</field>
31 </record>
32-
33+ <record id="product_uom_litre" model="product.uom">
34+ <field name="name">Liter(s)</field>
35+ <field name="category_id" ref="product_uom_categ_vol"/>
36+ <field name="factor">1.0</field>
37+ </record>
38
39 <!--
40 ... to here, it should be in product_demo but we cant just move it

Subscribers

People subscribed via source and target branches