From 84b0fb5bbc392788f14184a893e1bdeabb51f92c Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Tue, 28 Jun 2016 10:19:53 +0200
Subject: [PATCH] [FIX] sale, purchase: add back analytic groups

The commit 2277b8955dfee9e9aafdcb631c69aa334797ecdb removed these groups
while they should be kept.

opw-681848
---
 addons/account/views/res_config_view.xml |  8 ++++++++
 addons/purchase/res_config.py            |  9 +++++++++
 addons/purchase/res_config_view.xml      | 21 +++++++++++++++++++++
 addons/sale/res_config.py                |  7 +++++++
 addons/sale/res_config_view.xml          | 20 ++++++++++++++++++++
 5 files changed, 65 insertions(+)

diff --git a/addons/account/views/res_config_view.xml b/addons/account/views/res_config_view.xml
index 4b265251385..3430ef9d8a8 100644
--- a/addons/account/views/res_config_view.xml
+++ b/addons/account/views/res_config_view.xml
@@ -250,6 +250,14 @@
                             <div name='payment_acquirer'/>
                         </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 c5e601f83d7..b5bd8db2f71 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -50,3 +50,12 @@ class purchase_config_settings(osv.osv_memory):
             ], "Vendor Price", 
             implied_group="purchase.group_manage_vendor_price"),
     }
+
+
+class account_config_settings(osv.osv_memory):
+    _inherit = 'account.config.settings'
+    _columns = {
+        '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 ce7539b2947..a1039e89f86 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -35,5 +35,26 @@
 
         <menuitem id="menu_purchase_general_settings" name="Settings" parent="menu_purchase_config"
             sequence="0" action="action_purchase_configuration" groups="base.group_system"/>
+
+        <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 ce123f8dcfc..b74f978455f 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -128,3 +128,10 @@ class sale_configuration(osv.TransientModel):
         res = {'value': dict(group_show_price_subtotal=False, group_show_price_total=False)}
         res['value']['group_show_price_%s' % sale_show_tax] = True
         return res
+class account_config_settings(osv.osv_memory):
+    _inherit = 'account.config.settings'
+    _columns = {
+        '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 7377bdbbeb6..66a52e51587 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -62,5 +62,25 @@
         <menuitem id="sales_team.menu_sale_general_settings" name="Settings" parent="sales_team.menu_sale_config"
             sequence="0" action="sales_team.action_sale_config" groups="base.group_system"/>
 
+        <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>