From fa8a83a9d71d8af4b9ba186d0ee8c0ca5c94e55a Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Fri, 9 Oct 2015 10:26:35 +0200
Subject: [PATCH] Revert "[REM] sale, purchase: useless groups"

This reverts commit 9d56450d34b4febf40b8a777c9c67b619a42e218.

Enterprise makes use of these views. Anyway, views should not be removed
in stable.
---
 addons/account/views/res_config_view.xml |  8 ++++++++
 addons/purchase/res_config.py            |  1 -
 addons/purchase/res_config_view.xml      | 21 +++++++++++++++++++++
 addons/sale/res_config.py                |  1 -
 addons/sale/res_config_view.xml          | 20 ++++++++++++++++++++
 5 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/addons/account/views/res_config_view.xml b/addons/account/views/res_config_view.xml
index 0f46c0b4e01..25de6aed4e4 100644
--- a/addons/account/views/res_config_view.xml
+++ b/addons/account/views/res_config_view.xml
@@ -230,6 +230,14 @@
                             </div>
                         </div>
                     </group>
+                    <!-- Invisible section which is inherited in other modules -->
+                    <separator name="analytic_account" string="Analytic Accounting" invisible="1"/>
+                    <group name="analytic_account_sale" invisible="1">
+                        <label for="id" string="Sale"/>
+                    </group>
+                    <group name="analytic_account_purchase" invisible="1">
+                        <label for="id" string="Purchase"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index 6f6cfdd43eb..d2ef7967e01 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -57,7 +57,6 @@ class purchase_config_settings(osv.osv_memory):
 class account_config_settings(osv.osv_memory):
     _inherit = 'account.config.settings'
     _columns = {
-        # TODO: remove in v10
         'group_analytic_account_for_purchases': fields.boolean('Analytic accounting for purchases',
             implied_group='purchase.group_analytic_accounting',
             help="Allows you to specify an analytic account on purchase order lines."),
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index b524125708c..6aae2feaad3 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -48,5 +48,26 @@
 
         <menuitem id="menu_purchase_general_settings" name="Settings" parent="menu_purchase_config"
             sequence="0" action="action_purchase_configuration"/>
+
+        <record id="view_account_config" model="ir.ui.view">
+            <field name="name">account settings</field>
+            <field name="model">account.config.settings</field>
+            <field name="inherit_id" ref="account.view_account_config_settings"/>
+            <field name="priority" eval="18"/>
+            <field name="arch" type="xml">
+                <separator name="analytic_account" position="attributes">
+                    <attribute name="invisible">0</attribute>
+                </separator>
+                <group name="analytic_account_purchase" position="attributes">
+                    <attribute name="invisible">0</attribute>
+                </group>
+                <xpath expr="//group[@name='analytic_account_purchase']" position="inside">
+                    <div>
+                        <field name="group_analytic_account_for_purchases" class="oe_inline"/>
+                        <label for="group_analytic_account_for_purchases"/>
+                    </div>
+                </xpath>
+            </field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index be0242dda8b..b2f2c51e552 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -104,7 +104,6 @@ class sale_configuration(osv.TransientModel):
 class account_config_settings(osv.osv_memory):
     _inherit = 'account.config.settings'
     _columns = {
-        # TODO: remove in v10
         'group_analytic_account_for_sales': fields.boolean('Analytic accounting for sales',
             implied_group='sale.group_analytic_accounting',
             help="Allows you to specify an analytic account on sales orders."),
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index cb5778ae05e..3ff132e5986 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -53,5 +53,25 @@
         <menuitem id="base.menu_sale_general_settings" name="Settings" parent="base.menu_sale_config"
             sequence="0" action="base_setup.action_sale_config"/>
 
+        <record id="view_account_config" model="ir.ui.view">
+            <field name="name">account settings</field>
+            <field name="model">account.config.settings</field>
+            <field name="inherit_id" ref="account.view_account_config_settings"/>
+            <field name="priority" eval="16"/>
+            <field name="arch" type="xml">
+                <separator name="analytic_account" position="attributes">
+                    <attribute name="invisible">0</attribute>
+                </separator>
+                <group name="analytic_account_sale" position="attributes">
+                    <attribute name="invisible">0</attribute>
+                </group>
+                <xpath expr="//group[@name='analytic_account_sale']" position="inside">
+                    <div>
+                        <field name="group_analytic_account_for_sales" class="oe_inline"/>
+                        <label for="group_analytic_account_for_sales"/>
+                    </div>
+                </xpath>
+            </field>
+        </record>
     </data>
 </openerp>