[MERGE] from master

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

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index f07769b..7de859b 100644 (file)
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -246,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">
@@ -343,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>
@@ -361,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">
@@ -735,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"/>
@@ -765,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"/>
@@ -788,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"/>