From 52aebcf4341cdad3ecd702aa5051085403ddf80c Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 2 Jul 2012 16:56:53 +0530
Subject: [PATCH] [IMP]product: Improve product categories form view

bzr revid: dbr@tinyerp.com-20120702112653-qswk4pggbfi6h1p9
---
 addons/account/product_view.xml             |  8 +++-----
 addons/account_anglo_saxon/product_view.xml |  6 ++----
 addons/product/product_view.xml             |  5 ++++-
 addons/stock/product_view.xml               | 12 +++++-------
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml
index 4b73e18b0fa..8591b28b173 100644
--- a/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@ -52,11 +52,9 @@
             <field name="inherit_id" ref="product.product_category_form_view"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="/form/sheet//group[@name='basic']" position="inside">
-                        <group string="Accounting Properties">
-                            <field name="property_account_income_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                            <field name="property_account_expense_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                        </group>
+                    <xpath expr="/form/sheet//group[@name='account_property']" position="inside">
+                        <field name="property_account_income_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                        <field name="property_account_expense_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                     </xpath>
                 </data>
             </field>
diff --git a/addons/account_anglo_saxon/product_view.xml b/addons/account_anglo_saxon/product_view.xml
index a342438dca5..b88f8f2db42 100644
--- a/addons/account_anglo_saxon/product_view.xml
+++ b/addons/account_anglo_saxon/product_view.xml
@@ -35,10 +35,8 @@
             <field name="inherit_id" ref="product.product_category_form_view"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="/form/sheet//group[@name='basic']" position="before">
-                        <group string="Accounting Property">
-                            <field name="property_account_creditor_price_difference_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                        </group>
+                    <xpath expr="/form/sheet//group[@name='account_property']" position="inside">
+                        <field name="property_account_creditor_price_difference_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                     </xpath>
                 </data>
             </field>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 75945f4cfb7..f0072e8b3a8 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -323,7 +323,10 @@
                                 <field name="sequence" invisible="1"/>
                             </group>
                         </group>
-                        <group name="basic" col="4"/>
+                        <group name="basic">
+                            <group name="account_property" string="Account Properties"/>
+                            <group name="account_stock_property" string="Account Stock Properties"/>
+                        </group>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 1175cdff3e5..04a0959739a 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -22,13 +22,11 @@
             <field name="inherit_id" ref="product.product_category_form_view"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="/form/sheet//group[@name='basic']" position="inside">
-                        <group string="Accounting Stock Properties">
-                            <field name="property_stock_account_input_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                            <field name="property_stock_account_output_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                            <field name="property_stock_valuation_account_id" domain="[('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
-                            <field name="property_stock_journal"/>
-                        </group>
+                    <xpath expr="/form/sheet//group[@name='account_stock_property']" position="inside">
+                        <field name="property_stock_account_input_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                        <field name="property_stock_account_output_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                        <field name="property_stock_valuation_account_id" domain="[('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
+                        <field name="property_stock_journal"/>
                     </xpath>
                 </data>
             </field>