From 04f33ca7acade8cbde0f4e0ab35d82089bca5fe3 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 29 Mar 2012 16:21:21 +0200
Subject: [PATCH] [IMP] account.config.settings: move sale and purchase group
 fields in their respecive module

bzr revid: rco@openerp.com-20120329142121-lc5b6d3mcds68p34
---
 addons/account/res_config.py                   |  6 ------
 addons/account/res_config_view.xml             |  5 +----
 addons/account/security/account_security.xml   |  8 --------
 addons/purchase/purchase_view.xml              |  4 ++--
 addons/purchase/res_config.py                  | 10 ++++++++++
 addons/purchase/res_config_view.xml            | 13 +++++++++++++
 addons/purchase/security/purchase_security.xml |  5 +++++
 addons/sale/res_config.py                      | 10 ++++++++++
 addons/sale/res_config_view.xml                | 13 +++++++++++++
 addons/sale/sale_view.xml                      |  2 +-
 addons/sale/security/sale_security.xml         |  5 +++++
 11 files changed, 60 insertions(+), 21 deletions(-)

diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 9a5b7ae5d5b..f96060bfaa8 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -113,12 +113,6 @@ class account_config_settings(osv.osv_memory):
                     * draw horizontal lines and put page breaks.
                 This installs the module account_invoice_layout."""),
 
-        'group_analytic_account_for_sales': fields.boolean('Analytic Accounting for Sales',
-            implied_group='base.group_analytic_account_for_sales',
-            help="Allows you to specify an analytic account on sale orders."),
-        'group_analytic_account_for_purchase': fields.boolean('Analytic Accounting for Purchases',
-            implied_group='base.group_analytic_account_for_purchase',
-            help="Allows you to specify an analytic account on purchase orders."),
         'group_dates_periods': fields.boolean('Allow dates/periods',
             implied_group='base.group_dates_periods',
             help="Allows you to keep the period same as your invoice date when you validate the invoice."),
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index f50beb39002..7705856b1cd 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -107,10 +107,7 @@
                     </group>
                     <group colspan="2">
                         <separator string="Analytic Accounting" colspan="4"/>
-                        <field name="group_analytic_account_for_sales"/>
-                        <newline/>
-                        <field name="group_analytic_account_for_purchase"/>
-                        <newline/>
+                        <group name="analytic_accounting" colspan="4"/>
                         <field name="module_account_analytic_plans"/>
                         <newline/>
                         <field name="module_account_analytic_default"/>
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index 2781186d6ea..d3ceb7d52e1 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -16,14 +16,6 @@
         <field name="implied_ids" eval="[(4, ref('group_account_user'))]"/>
     </record>
 
-    <record id="base.group_analytic_account_for_sales" model="res.groups">
-        <field name="name">Analytic Accounting for Sales</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
-    <record id="base.group_analytic_account_for_purchase" model="res.groups">
-        <field name="name">Analytic Accounting for Purchase</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
     <record id="base.group_dates_periods" model="res.groups">
         <field name="name">Dates and Periods</field>
         <field name="category_id" ref="base.module_category_hidden"/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 1cc9ce39611..1b0c4c0acb4 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -366,7 +366,7 @@
                             <field name="date_planned" widget="date"/>
                             <field name="price_unit"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="account_analytic_id" colspan="4" groups="base.group_analytic_account_for_purchase" domain="[('parent_id','!=',False)]" />
+                            <field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
                             <group colspan="4" col="4" groups="purchase.group_taxes_on_order_line">
                                 <separator colspan="4" string="Taxes"/>
                                 <field colspan="4" nolabel="1" name="taxes_id"
@@ -429,7 +429,7 @@
                             <field name="date_planned" widget="date"  readonly="1"/>
                             <field name="price_unit"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="account_analytic_id" colspan="4" groups="base.group_analytic_account_for_purchase" domain="[('parent_id','!=',False)]"/>
+                            <field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
                             <group colspan="4" col="4" groups="base.group_extended">
                                 <separator colspan="4" string="Taxes"/>
                                 <field colspan="4" nolabel="1" name="taxes_id"
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index 1ef2c87cad7..61b12284507 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -91,4 +91,14 @@ class purchase_config_settings(osv.osv_memory):
             'group_purchase_taxes_on_order_line': tax_policy == 'on_order_line',
         }}
 
+
+
+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 orders."),
+    }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 1009ac0d8d9..7fe1458afc0 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -42,5 +42,18 @@
         <menuitem id="menu_purchase_config" name="Purchases" parent="base.menu_config"
             sequence="2" 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="type">form</field>
+            <field name="inherit_id" ref="account.view_account_config_settings"/>
+            <field name="arch" type="xml">
+                <group name="analytic_accounting" position="after">
+                    <field name="group_analytic_account_for_purchases"/>
+                    <newline/>
+                </group>
+            </field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index ba5e7fe5256..cbf03cd32c7 100644
--- a/addons/purchase/security/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
@@ -23,6 +23,11 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
+    <record id="group_analytic_accounting" model="res.groups">
+        <field name="name">Analytic Accounting for Purchases</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+
     <record model="ir.rule" id="purchase_order_comp_rule">
         <field name="name">Purchase Order multi-company</field>
         <field name="model_id" ref="model_purchase_order"/>
diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index fb551eea0e7..fd271cef345 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -160,4 +160,14 @@ class sale_configuration(osv.osv_memory):
             'group_sale_taxes_on_order_line': tax_policy == 'on_order_line',
         }}
 
+
+
+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 sale orders."),
+    }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index 3025f26d37d..e2e950b10dc 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -47,5 +47,18 @@
 
         <menuitem id="base.menu_sale_config" name="Sales" parent="base.menu_config" sequence="1" action="base.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="type">form</field>
+            <field name="inherit_id" ref="account.view_account_config_settings"/>
+            <field name="arch" type="xml">
+                <group name="analytic_accounting" position="after">
+                    <field name="group_analytic_account_for_sales"/>
+                    <newline/>
+                </group>
+            </field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index b8526ee1cb2..f4408af5e87 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -120,7 +120,7 @@
                             <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
                             <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
-                            <field name="project_id" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="base.group_analytic_account_for_sales" domain="[('parent_id','!=',False)]"/>
+                            <field name="project_id" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
                             <newline/>
                             <field colspan="4" name="order_line" nolabel="1" widget="one2many_list">
                                 <form string="Sales Order Lines">
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index ee45aa65463..52b2af50ea8 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -50,6 +50,11 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
+    <record id="group_analytic_accounting" model="res.groups">
+        <field name="name">Analytic Accounting for Sales</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+
     <record model="res.users" id="base.user_admin">
         <field eval="[(4,ref('base.group_partner_manager'))]" name="groups_id"/>
     </record>