From a2d4d2391293a51605eb2c544756a69147cf5c01 Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Tue, 5 May 2015 09:08:46 +0200 Subject: [PATCH] [IMP] sale,purchase: removed multi-analytic plans settings Lots of people used to activate this option by mistake, so we remove the checkbox but people can still install the module. --- addons/purchase/res_config.py | 19 ------------------- addons/purchase/res_config_view.xml | 8 -------- addons/purchase_analytic_plans/__openerp__.py | 2 +- addons/purchase_analytic_plans/res_config.xml | 8 ++++++++ addons/sale/res_config.py | 8 -------- addons/sale/res_config_view.xml | 4 ---- addons/sale_analytic_plans/__openerp__.py | 2 +- addons/sale_analytic_plans/res_config.xml | 8 ++++++++ 8 files changed, 18 insertions(+), 41 deletions(-) create mode 100644 addons/purchase_analytic_plans/res_config.xml create mode 100644 addons/sale_analytic_plans/res_config.xml diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py index 93754df9fab..2e2ac07e1a3 100644 --- a/addons/purchase/res_config.py +++ b/addons/purchase/res_config.py @@ -38,9 +38,6 @@ class purchase_config_settings(osv.osv_memory): 'group_advance_purchase_requisition': fields.boolean("Choose from several bids in a call for tenders", implied_group='purchase.group_advance_bidding', help="""In the process of a public tendering, you can compare the tender lines and choose for each requested product which quantity you will buy from each bid."""), - 'module_purchase_analytic_plans': fields.boolean('Use multiple analytic accounts on purchase orders', - help='Allows the user to maintain several analysis plans. These let you split lines on a purchase order between several accounts and analytic plans.\n' - '-This installs the module purchase_analytic_plans.'), '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."), @@ -53,27 +50,11 @@ class purchase_config_settings(osv.osv_memory): 'default_invoice_method': 'order', } - def onchange_purchase_analytic_plans(self, cr, uid, ids, module_purchase_analytic_plans, context=None): - """ change group_analytic_account_for_purchases following module_purchase_analytic_plans """ - if not module_purchase_analytic_plans: - return {} - return {'value': {'group_analytic_account_for_purchases': module_purchase_analytic_plans}} - - class account_config_settings(osv.osv_memory): _inherit = 'account.config.settings' _columns = { - 'module_purchase_analytic_plans': fields.boolean('Use multiple analytic accounts on orders', - help='Allows the user to maintain several analysis plans. These let you split lines on a purchase order between several accounts and analytic plans.\n' - '-This installs the module purchase_analytic_plans.'), '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."), } - - def onchange_purchase_analytic_plans(self, cr, uid, ids, module_purchase_analytic_plans, context=None): - """ change group_analytic_account_for_purchases following module_purchase_analytic_plans """ - if not module_purchase_analytic_plans: - return {} - return {'value': {'group_analytic_account_for_purchases': module_purchase_analytic_plans}} diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml index b6051586fd4..7a1246a264b 100644 --- a/addons/purchase/res_config_view.xml +++ b/addons/purchase/res_config_view.xml @@ -72,10 +72,6 @@ diff --git a/addons/purchase_analytic_plans/__openerp__.py b/addons/purchase_analytic_plans/__openerp__.py index de3fd09d7d1..2b6a0d556e3 100644 --- a/addons/purchase_analytic_plans/__openerp__.py +++ b/addons/purchase_analytic_plans/__openerp__.py @@ -16,7 +16,7 @@ on a supplier purchase order into several accounts and analytic plans. 'author': 'OpenERP SA', 'website': 'https://www.odoo.com/page/purchase', 'depends': ['purchase', 'account_analytic_plans'], - 'data': ['purchase_analytic_plans_view.xml'], + 'data': ['purchase_analytic_plans_view.xml', 'res_config.xml'], 'demo': [], 'installable': True, 'auto_install': False, diff --git a/addons/purchase_analytic_plans/res_config.xml b/addons/purchase_analytic_plans/res_config.xml new file mode 100644 index 00000000000..496c2fc33e8 --- /dev/null +++ b/addons/purchase_analytic_plans/res_config.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py index 123b78e7e7f..c91bd93e4f2 100644 --- a/addons/sale/res_config.py +++ b/addons/sale/res_config.py @@ -85,15 +85,7 @@ Example: 10% for retailers, promotion of 5 EUR on this product, etc."""), class account_config_settings(osv.osv_memory): _inherit = 'account.config.settings' _columns = { - 'module_sale_analytic_plans': fields.boolean('Use multiple analytic accounts on sales', - help="""This allows install module sale_analytic_plans."""), '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."), } - - def onchange_sale_analytic_plans(self, cr, uid, ids, module_sale_analytic_plans, context=None): - """ change group_analytic_account_for_sales following module_sale_analytic_plans """ - if not module_sale_analytic_plans: - return {} - return {'value': {'group_analytic_account_for_sales': module_sale_analytic_plans}} diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml index 4e629dbe66f..536459d7107 100644 --- a/addons/sale/res_config_view.xml +++ b/addons/sale/res_config_view.xml @@ -130,10 +130,6 @@ diff --git a/addons/sale_analytic_plans/__openerp__.py b/addons/sale_analytic_plans/__openerp__.py index 84a5c05afa8..3084f1c8586 100644 --- a/addons/sale_analytic_plans/__openerp__.py +++ b/addons/sale_analytic_plans/__openerp__.py @@ -14,7 +14,7 @@ Using this module you will be able to link analytic accounts to sales orders. 'author': 'OpenERP SA', 'website': 'https://www.odoo.com/page/crm', 'depends': ['sale', 'account_analytic_plans'], - 'data': ['sale_analytic_plans_view.xml'], + 'data': ['sale_analytic_plans_view.xml','res_config.xml'], 'demo': [], 'installable': True, 'auto_install': False, diff --git a/addons/sale_analytic_plans/res_config.xml b/addons/sale_analytic_plans/res_config.xml new file mode 100644 index 00000000000..9fe2b5bb622 --- /dev/null +++ b/addons/sale_analytic_plans/res_config.xml @@ -0,0 +1,8 @@ + + + + + + + +