[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

@@ -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}}

addons/purchase/res_config_view.xml

@@ -72,10 +72,6 @@
                                 <field name="group_advance_purchase_requisition" class="oe_inline"/>
                                 <label for="group_advance_purchase_requisition"/>
                             </div>
-                            <div>
-                                <field name="module_purchase_analytic_plans" on_change="onchange_purchase_analytic_plans(module_purchase_analytic_plans, context)" class="oe_inline"/>
-                                <label for="module_purchase_analytic_plans"/>
-                            </div>
                             <div>
                                 <field name="group_analytic_account_for_purchases" class="oe_inline"/>
                                 <label for="group_analytic_account_for_purchases"/>
@@ -124,10 +120,6 @@
                         <field name="group_analytic_account_for_purchases" class="oe_inline"/>
                         <label for="group_analytic_account_for_purchases"/>
                     </div>
-                    <div>
-                        <field name="module_purchase_analytic_plans" on_change="onchange_purchase_analytic_plans(module_purchase_analytic_plans, context)" class="oe_inline"/>
-                        <label for="module_purchase_analytic_plans"/>
-                    </div>
                 </xpath>
             </field>
         </record>

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,

addons/purchase_analytic_plans/res_config.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<record id="base.group_user" model="res.groups">
+    <field name="implied_ids" eval="[(4, ref('purchase.group_analytic_accounting'))]"/>
+</record>
+
+</odoo>

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}}

addons/sale/res_config_view.xml

@@ -130,10 +130,6 @@
                         <field name="group_analytic_account_for_sales" class="oe_inline"/>
                         <label for="group_analytic_account_for_sales"/>
                     </div>
-                    <div>
-                        <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>
                 </xpath>
             </field>
         </record>

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,

addons/sale_analytic_plans/res_config.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<record id="base.group_user" model="res.groups">
+    <field name="implied_ids" eval="[(4, ref('sale.group_analytic_accounting'))]"/>
+</record>
+
+</odoo>