From b6cbc36f9ab33a6cff2834222828d8a09b86d601 Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Thu, 11 Feb 2016 17:06:40 +0100
Subject: [PATCH] =?UTF-8?q?[FIX]=C2=A0product,=20stock=5Faccount:=20volume?=
 =?UTF-8?q?,=20weight,=20standard=20price=20in=20product=20template?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When a product template has several variants, the fields volume, weight and
standard price don't have be displayed in the prodcut template form view.

opw:669240
---
 addons/product/product_view.xml       | 10 +++++-----
 addons/stock_account/product_view.xml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 51d5754c646..8163800778d 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -108,7 +108,7 @@
                                     </group>
                                     <group name="group_standard_price">
                                         <field name="list_price" widget='monetary' options="{'currency_field': 'currency_id'}"/>
-                                        <label for="standard_price" groups="base.group_user"/>
+                                        <label for="standard_price" groups="base.group_user" attrs="{'invisible': [('product_variant_count', '&gt;', 1)]}"/>
                                         <div name="standard_price_uom" groups="base.group_user">
                                             <field name="standard_price" widget='monetary' options="{'currency_field': 'currency_id'}" class="oe_inline"/>
                                         </div>
@@ -126,12 +126,12 @@
                                         <field name="categ_id" string="Internal Category"/>
                                     </group>
                                     <group name="group_lots_and_weight">
-                                        <label for="weight" attrs="{'invisible':[('type', 'not in', ['product', 'consu']), ('product_variant_count', '&gt;', 1)]}"/>
-                                        <div class="o_row" name="weight" attrs="{'invisible':[('type', 'not in', ['product', 'consu']), ('product_variant_count', '&gt;', 1)]}">
+                                        <label for="weight" attrs="{'invisible':['|', ('type', 'not in', ['product', 'consu']), ('product_variant_count', '&gt;', 1)]}"/>
+                                        <div class="o_row" name="weight" attrs="{'invisible':['|', ('type', 'not in', ['product', 'consu']), ('product_variant_count', '&gt;', 1)]}">
                                             <field name="weight" string="Weight"/>
                                         </div>
-                                        <label for="volume" attrs="{'invisible':[('type', 'not in', ['product', 'consu']), ('product_variant_count', '&gt;', 1)]}"/>
-                                        <div class="o_row" name="volume" attrs="{'invisible':[('type', 'not in', ['product', 'consu']), ('product_variant_count', '&gt;', 1)]}">
+                                        <label for="volume" attrs="{'invisible':['|', ('type', 'not in', ['product', 'consu']), ('product_variant_count', '&gt;', 1)]}"/>
+                                        <div class="o_row" name="volume" attrs="{'invisible':['|', ('type', 'not in', ['product', 'consu']), ('product_variant_count', '&gt;', 1)]}">
                                             <field name="volume" string="Volume"/>
                                         </div>
                                     </group>
diff --git a/addons/stock_account/product_view.xml b/addons/stock_account/product_view.xml
index cfe702bc390..69fe3cddd7e 100644
--- a/addons/stock_account/product_view.xml
+++ b/addons/stock_account/product_view.xml
@@ -35,7 +35,7 @@
                     </field>
                     <field name="standard_price" position="replace">
                         <field name="standard_price"
-                            attrs="{'readonly':['&amp;', ('valuation','=','real_time'), ('cost_method', 'in', ['standard', 'average'])]}" class="oe_inline"
+                            attrs="{'readonly':['&amp;', ('valuation','=','real_time'), ('cost_method', 'in', ['standard', 'average'])], 'invisible': [('product_variant_count', '&gt;', 1)]}" class="oe_inline"
                             widget='monetary' options="{'currency_field': 'currency_id'}"/>
                     </field>
                     <div name="standard_price_uom" position="after">