From 41d172ea6dd0fb3825116a37565876bfd88420ae Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 8 Apr 2014 20:09:20 +0200
Subject: [PATCH] [FIX] product, stock: set active field in default product
 view, instead of inherited view of stock module

The active field was placed in the Delays section, which does not make sense
Besides, we should be able to disable products by default, not when stock is installed.

bzr revid: dle@openerp.com-20140408180920-jpl50ups6ro1z4qp
---
 addons/product/product_view.xml | 1 +
 addons/stock/product_view.xml   | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 4946a71f80b..c547a611cd4 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -118,6 +118,7 @@
                                         </div>
                                         <field name="company_id" groups="base.group_multi_company" widget="selection"
                                             attrs="{'invisible': [('is_only_child', '=', False)]}"/>
+                                        <field name="active" />
                                     </group>
                                 </group>
                                 <field name="description" placeholder="describe the product characteristics..."
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 11f970d6ddb..2efd1c8acbe 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -82,7 +82,6 @@
                         <div attrs="{'invisible':[('type','=','service')]}">
                             <field name="produce_delay" class="oe_inline"/> days
                         </div>
-                        <field name="active"/>
                     </group>
                 </group>
                 <xpath expr="//group[@string='Sale Conditions']" position="inside">