From ee9aa9ffd48a38f14483c5856e708b3b5f1d455e Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 20 Dec 2013 10:58:06 +0100
Subject: [PATCH] [IMP] mrp, product, stock, project_mrp: usability of product
 form view

bzr revid: qdp-launchpad@openerp.com-20131220095806-16siwncivyuokrym
---
 addons/mrp/mrp_view.xml                 |  3 ---
 addons/product/product_view.xml         |  3 +--
 addons/project_mrp/project_mrp_view.xml | 10 ++++++----
 addons/stock/stock_view.xml             |  2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index e0591d348ed..0f223ab9d16 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -551,9 +551,6 @@
                         </div>                        
                     </group>                
                 </xpath>
-                <xpath expr="//field[@name='standard_price']" position="after">
-                    <field name="active" />                                    
-                </xpath>
             </field>
         </record>
         
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index dfeb9acef15..e9aac7419c8 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -96,14 +96,13 @@
                             <page string="Procurements" groups="base.group_user">
                                 <group name="procurement">
                                     <group name="general">
+                                        <field name="active"/>
                                         <field name="standard_price"/>
                                     </group>
                                     <group name="procurement_uom" groups="product.group_uom" string="Purchase">
                                         <field name="uom_po_id"/>
                                     </group>
                                 </group>
-                                <label for="active"/>
-                                <field name="active"/>
                                 <separator string="Description for Suppliers"/>
                                 <field name="description_purchase" placeholder="This note will be displayed on requests for quotation..."/>
                             </page>
diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml
index 08ac6c94ec2..9964ff18d13 100644
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/project_mrp/project_mrp_view.xml
@@ -16,10 +16,12 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <field name="type" position="after">
-                    <field name="project_id" attrs="{'invisible':[('type','!=','service')]}" />
-                    <field name="auto_create_task" attrs="{'invisible': [('type', '!=', 'service')]}"/>
-                </field>
+                <xpath expr="//group[@name='general']" position="after">
+                    <group string="Project Management Information" attrs="{'invisible': [('type', '!=', 'service')]}">
+                        <field name="auto_create_task"/>
+                        <field name="project_id" attrs="{'invisible':['|', ('type','!=','service'), ('auto_create_task', '=', False)]}"/>
+                    </group>
+                </xpath>
             </field>
         </record>
         <record id="task_type_edit_mrp_inherit" model="ir.ui.view">
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 6083cf46a50..b16fe203d77 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1871,7 +1871,7 @@
                 
                 <xpath expr="//group[@name='general']" position="after" >
                    <newline/>
-                   <group string="Supply Chain Information">
+                   <group string="Supply Chain Information" attrs="{'invisible': [('type', '=', 'service')]}">
                        <field name="route_ids" widget="many2many_checkboxes"/>
                    </group>
                    <newline/>