diff options
| author | Gaurav Panchal <gan@openerp.com> | 2015-01-12 13:00:50 +0530 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2015-02-03 16:55:55 +0100 |
| commit | 0ac04b335c163e82b4d852c41a18d91e039878d4 (patch) | |
| tree | 623be922b036eba89bc7e15a824a2cce9e0f69f0 /addons | |
| parent | 351f5231e2bafc4d9e131d05a45fa6b119de6aff (diff) | |
[REM] sales_team: removed group_mono_salesteam user group.
This group is never used in the code; only group_multi_salesteam is used
whenever knowing if sales team are used.
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/sales_team/res_config.py | 27 | ||||
| -rw-r--r-- | addons/sales_team/security/sales_team_security.xml | 8 | ||||
| -rw-r--r-- | addons/website_sale/security/website_sale.xml | 4 |
3 files changed, 2 insertions, 37 deletions
diff --git a/addons/sales_team/res_config.py b/addons/sales_team/res_config.py index 3081a2e918d..4517945b267 100644 --- a/addons/sales_team/res_config.py +++ b/addons/sales_team/res_config.py @@ -7,33 +7,6 @@ class sales_team_configuration(osv.TransientModel): _name = 'sale.config.settings' _inherit = ['sale.config.settings'] - def set_group_multi_salesteams(self, cr, uid, ids, context=None): - """ This method is automatically called by res_config as it begins - with set. It is used to implement the 'one group or another' - behavior. We have to perform some group manipulation by hand - because in res_config.execute(), set_* methods are called - after group_*; therefore writing on an hidden res_config file - could not work. - If group_multi_salesteams is checked: remove group_mono_salesteams - from group_user, remove the users. Otherwise, just add - group_mono_salesteams in group_user. - The inverse logic about group_multi_salesteams is managed by the - normal behavior of 'group_multi_salesteams' field. - """ - def ref(xml_id): - mod, xml = xml_id.split('.', 1) - return self.pool['ir.model.data'].get_object(cr, uid, mod, xml, context) - - for obj in self.browse(cr, uid, ids, context=context): - config_group = ref('base.group_mono_salesteams') - base_group = ref('base.group_user') - if obj.group_multi_salesteams: - base_group.write({'implied_ids': [(3, config_group.id)]}) - config_group.write({'users': [(3, u.id) for u in base_group.users]}) - else: - base_group.write({'implied_ids': [(4, config_group.id)]}) - return True - _columns = { 'group_multi_salesteams': fields.boolean("Organize Sales activities into multiple Sales Teams", implied_group='base.group_multi_salesteams', diff --git a/addons/sales_team/security/sales_team_security.xml b/addons/sales_team/security/sales_team_security.xml index d9002f8332f..ae872edd301 100644 --- a/addons/sales_team/security/sales_team_security.xml +++ b/addons/sales_team/security/sales_team_security.xml @@ -1,14 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data noupdate="0"> - <record id="base.group_mono_salesteams" model="res.groups"> - <field name="name">Do Not Use Sales Teams</field> - <field name="category_id" ref="base.module_category_hidden"/> - </record> - <record id="base.group_user" model="res.groups"> - <field name="implied_ids" eval="[(4, ref('base.group_mono_salesteams'))]"/> - </record> - <record id="base.group_multi_salesteams" model="res.groups"> <field name="name">Manage Sales Teams</field> <field name="category_id" ref="base.module_category_hidden"/> diff --git a/addons/website_sale/security/website_sale.xml b/addons/website_sale/security/website_sale.xml index 90bf72bd21c..e0a4addc428 100644 --- a/addons/website_sale/security/website_sale.xml +++ b/addons/website_sale/security/website_sale.xml @@ -23,9 +23,9 @@ <field name="perm_unlink" eval="False"/> </record> - <!-- toggle multi salesteam mode --> + <!-- multi salesteam mode --> <record id="base.group_user" model="res.groups"> - <field name="implied_ids" eval="[(3, ref('base.group_mono_salesteams')), (4, ref('base.group_multi_salesteams'))]"/> + <field name="implied_ids" eval="[(4, ref('base.group_multi_salesteams'))]"/> </record> </data> |
