Merge branch 'master' of https://github.com/odoo/odoo

[odoo/odoo.git] / addons / product / product_view.xml

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index c225169..7de859b 100644 (file)
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -126,6 +126,7 @@
                                     <group groups="product.group_uos" string="Unit of Measure">
                                         <field name="uos_id"/>
                                         <field name="uos_coeff"/>
+                                        <field name="mes_type"/>
                                     </group>
                                 </group>
                                 <group name="website_and_pos" col="2">
@@ -216,6 +217,7 @@
             <field name="view_type">form</field>
             <field name="context">{'search_default_product_tmpl_id': [active_id], 'default_product_tmpl_id': active_id}</field>
             <field name="search_view_id" ref="product_search_form_view"/>
+            <field name="view_id" eval="False"/> <!-- Force empty -->
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
                 Click to define a new product.
@@ -244,7 +246,7 @@
                     <attribute name="name">Product Template</attribute>
                 </xpath>
                 <field name="active" position="after">
-                    <field name="ean13" attrs="{'invisible': [('product_variant_count', '>', 1)]}"/>
+                    <field name="barcode" attrs="{'invisible': [('product_variant_count', '>', 1)]}"/>
                     <field name="default_code" attrs="{'invisible': [('product_variant_count', '>', 1)]}"/>
                 </field>
                 <xpath expr="//page[@string='Sales']" position="after">
@@ -341,7 +343,7 @@
                     <field name="lst_price"/>
                     <field name="price" invisible="not context.get('pricelist',False)"/>
                     <field name="uom_id"/>
-                    <field name="ean13"/>
+                    <field name="barcode"/>
                     <field name="state" invisible="1"/>
                     <field name="product_tmpl_id" invisible="1"/>
                 </tree>
@@ -359,7 +361,7 @@
                     <attribute name="string">Product Variant</attribute>
                 </form>
                 <field name="active" position="after">
-                    <field name="ean13"/>
+                    <field name="barcode"/>
                     <field name="default_code"/>
                 </field>
                 <field name="list_price" position="attributes">
@@ -608,7 +610,7 @@
                                 <field name="factor"
                                     digits="[42,5]"
                                     attrs="{'invisible':[('uom_type','!=','smaller')],
-                                            'readonly':[('uom_type','!=','smaller')]}"/>
+                                            'readonly':[('uom_type','=','bigger')]}"/>
                                 <field name="factor_inv"
                                     digits="[42,5]"
                                     attrs="{'invisible':[('uom_type','!=','bigger')],
@@ -623,7 +625,7 @@
                         </group>
                         <group>
                             <field name="active"/>
-                            <field name="rounding"/>
+                            <field name="rounding" digits="[42, 5]"/>
                         </group>
                     </group>
                 </form>
@@ -733,7 +735,7 @@
                 <tree string="Packaging">
                     <field name="sequence" widget="handle"/>
                     <field name="product_tmpl_id"/>
-                    <field name="ean"/>
+                    <field name="barcode"/>
                     <field name="qty"/>
                     <field name="ul"/>
                     <field name="ul_container"/>
@@ -763,7 +765,7 @@
                     <group col="4">
                         <field name="product_tmpl_id"/>
                         <newline/>
-                        <field name="ean"/>
+                        <field name="barcode"/>
                         <field name="sequence" invisible="1"/>
                         <newline/>
                         <field name="qty"/>
@@ -786,7 +788,7 @@
             <field name="arch" type="xml">
                 <form string="Packaging">
                     <group col="4">
-                        <field name="ean"/>
+                        <field name="barcode"/>
                         <field name="sequence" invisible="1"/>
                         <newline/>
                         <field name="qty"/>