From 1d853d1b2b99be4162975133abbb6ddd140de75a Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 3 Aug 2012 14:46:59 +0200
Subject: [PATCH] [IMP] better handling of showing/hidding groups in accounting
 config wizard

bzr revid: abo@openerp.com-20120803124659-pjuqqhu4vft9duqe
---
 addons/account/res_config_view.xml    | 8 +++++---
 addons/base_setup/res_config_view.xml | 1 +
 addons/purchase/res_config_view.xml   | 7 ++++---
 addons/sale/res_config_view.xml       | 6 +++---
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 73d83807cb7..b2cace5d21a 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -237,11 +237,13 @@
                         </div>
                     </group>
                     <separator name="analytic_account" string="Analytic Accounting" invisible="1"/>
-                    <group name="analytic_account" invisible="1">
+                    <group name="analytic_account_sale" invisible="1">
                         <label for="id" string="Sale"/>
-                        <div name="analytic_account_sale"></div>
+                        <div/>
+                    </group>
+                    <group name="analytic_account_purchase" invisible="1">
                         <label for="id" string="Purchase"/>
-                        <div name="analytic_account_purchase"></div>
+                        <div/>
                     </group>
                     <field name="sale_journal_id" invisible="1"/>
                     <field name="sale_refund_journal_id" invisible="1"/>
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index b8f5abdf80f..f163def05ca 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -117,5 +117,6 @@
             <field name="view_mode">form</field>
             <field name="target">inline</field>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 46688537acc..ee45902d346 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
         <record id="view_purchase_configuration" model="ir.ui.view">
@@ -89,10 +90,10 @@
                 <separator name="analytic_account" position="attributes">
                     <attribute name="invisible">0</attribute>
                 </separator>
-                <group name="analytic_account" position="attributes">
+                <group name="analytic_account_purchase" position="attributes">
                     <attribute name="invisible">0</attribute>
                 </group>
-                <div name="analytic_account_purchase" position="inside">
+                <xpath expr="//group[@name='analytic_account_purchase']/div" position="inside">
                     <div>
                         <field name="group_analytic_account_for_purchases" class="oe_inline"/>
                         <label for="group_analytic_account_for_purchases"/>
@@ -101,7 +102,7 @@
                         <field name="module_purchase_analytic_plans" on_change="onchange_purchase_analytic_plans(module_purchase_analytic_plans)" class="oe_inline"/>
                         <label for="module_purchase_analytic_plans"/>
                     </div>
-                </div>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index e33c6decd88..c7f4e8572db 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -141,10 +141,10 @@
                 <separator name="analytic_account" position="attributes">
                     <attribute name="invisible">0</attribute>
                 </separator>
-                <group name="analytic_account" position="attributes">
+                <group name="analytic_account_sale" position="attributes">
                     <attribute name="invisible">0</attribute>
                 </group>
-                <div name="analytic_account_sale" position="inside">
+                <xpath expr="//group[@name='analytic_account_sale']/div" position="inside">
                     <div>
                         <field name="group_analytic_account_for_sales" class="oe_inline"/>
                         <label for="group_analytic_account_for_sales"/>
@@ -153,7 +153,7 @@
                         <field name="module_sale_analytic_plans" on_change="onchange_sale_analytic_plans(module_sale_analytic_plans)" class="oe_inline"/>
                         <label for="module_sale_analytic_plans"/>
                     </div>
-                </div>
+                </xpath>
             </field>
         </record>
     </data>