From 9e57185449a0bd958ad38eddc280d146e2d60e1e Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Mon, 6 Jun 2016 09:52:17 +0200 Subject: [PATCH] [IMP] base,sales_team: Move res_groups and menuitems to sales_team Purpose: Having the res_group defined in base and sales_team auto installed with mail doens't make sense. - Move the empty res_config class and the related view from base_setup to sales_team (base_setup only contains the 'General Settings' model and views - Move the 'sale' related content from product to sale module (Access rights, menuitems,...) - Set sales_team at autoinstall False. The module is installed when needed by crm or sale for example - Set sales_team as a dependency of voip. (Access rights defined for configuration purpose) - Set sales_team ad a dependency of subscription (Access rights issue too) [FIX] account: move some ir.model.access to sale module [FIX] payment: Move some ir.rule to website_sale [FIX] stock: move some ir.model.access rule to sale_stock [FIX] project: Move some ir.model.access rules to crm_project_issue [FIX] mrp: Move some ir.model.access rules to sale_mrp [FIX] calendar: move some ir.model.access rules to crm Rename xmlids accordingly. Example: 'base.group_sale_manager' becomes sales_team.group_sale_manager. [ADD] sales_team: See own documents => See only his sales team Moved the "User: Own Leads Only", "User: All Leads" and "Manager" groups from sale and crm into sales_team module. Add the record rules so that user can see only his Own Sales Team if "See Own Leads" is sales right and can see all sales teams if he is having sales rights of "See All Leads" or manager. --- addons/account/security/ir.model.access.csv | 5 -- .../security/ir.model.access.csv | 2 +- addons/association/profile_association.xml | 2 +- addons/base_setup/models/res_config.py | 7 -- addons/base_setup/views/res_config_views.xml | 25 ------ addons/calendar/security/ir.model.access.csv | 5 -- addons/crm/calendar_event_menu.xml | 2 +- addons/crm/crm_demo.xml | 2 +- addons/crm/crm_lead.py | 2 +- addons/crm/crm_lead_menu.xml | 8 +- addons/crm/crm_lead_view.xml | 6 +- addons/crm/crm_view.xml | 14 ++-- .../crm/report/crm_activity_report_view.xml | 2 +- addons/crm/res_config_view.xml | 8 +- addons/crm/security/crm_security.xml | 42 +++------- addons/crm/security/ir.model.access.csv | 39 +++++---- addons/crm/test/crm_access_group_users.yml | 4 +- addons/crm/tests/common.py | 2 +- addons/crm/web_planner_data.xml | 2 +- .../wizard/crm_lead_to_opportunity_view.xml | 2 +- .../wizard/crm_merge_opportunities_view.xml | 2 +- addons/crm_partner_assign/crm_lead_view.xml | 4 +- .../crm_partner_assign/res_partner_view.xml | 4 +- .../security/ir.model.access.csv | 8 +- .../wizard/crm_forward_to_partner_view.xml | 2 +- addons/crm_project_issue/__openerp__.py | 1 + .../security/ir.model.access.csv | 5 ++ addons/delivery/security/ir.model.access.csv | 8 +- addons/delivery/views/delivery_view.xml | 2 +- .../gamification_sale_crm/sale_crm_goals.xml | 4 +- addons/mrp/security/ir.model.access.csv | 5 -- addons/payment/security/payment_security.xml | 13 --- addons/product/pricelist_view.xml | 13 ++- addons/product/product_demo.xml | 4 - addons/product/product_view.xml | 25 ------ addons/product/security/ir.model.access.csv | 9 -- addons/project/project_demo.xml | 2 +- addons/project/security/ir.model.access.csv | 4 - .../security/ir.model.access.csv | 4 +- .../security/ir.model.access.csv | 2 +- .../views/report_intrastat_views.xml | 2 +- addons/sale/res_config_view.xml | 8 +- addons/sale/res_partner_view.xml | 4 +- addons/sale/sale_demo.xml | 6 +- addons/sale/sale_view.xml | 39 ++++++--- addons/sale/security/ir.model.access.csv | 84 +++++++++++-------- addons/sale/security/sale_security.xml | 42 +++------- addons/sale/tests/test_sale_common.py | 4 +- .../sale/views/sale_layout_category_view.xml | 2 +- .../sale/wizard/sale_make_invoice_advance.xml | 2 +- addons/sale_crm/views/crm_lead_views.xml | 6 +- addons/sale_mrp/security/ir.model.access.csv | 7 +- .../sale_stock/security/ir.model.access.csv | 31 ++++--- addons/sale_stock/stock_view.xml | 4 +- addons/sales_team/__openerp__.py | 2 + addons/sales_team/data/sales_team_data.xml | 8 ++ addons/sales_team/data/sales_team_demo.xml | 2 +- addons/sales_team/models/__init__.py | 1 + addons/sales_team/models/res_config.py | 9 ++ .../sales_team/security/ir.model.access.csv | 4 +- .../security/sales_team_security.xml | 50 +++++++++++ addons/sales_team/views/crm_team_views.xml | 29 +++++-- addons/sales_team/views/res_config_view.xml | 26 ++++++ addons/stock/security/ir.model.access.csv | 5 -- addons/subscription/__openerp__.py | 2 +- .../subscription/data/subscription_demo.xml | 2 +- .../subscription/security/ir.model.access.csv | 12 +-- addons/utm/models/utm.py | 2 +- .../security/ir.model.access.csv | 2 +- .../views/website_customer_view.xml | 2 +- .../security/ir.model.access.csv | 14 ++-- .../views/website_quotation_backend.xml | 2 +- .../website_sale/security/ir.model.access.csv | 4 +- addons/website_sale/security/website_sale.xml | 14 ++++ addons/website_sale/views/templates.xml | 8 +- addons/website_sale/views/views.xml | 4 +- doc/howtos/backend.rst | 2 +- openerp/addons/base/module/module_data.xml | 8 -- openerp/addons/base/res/res_bank_view.xml | 5 -- openerp/addons/base/res/res_config.py | 4 +- openerp/addons/base/res/res_country_view.xml | 7 -- openerp/addons/base/res/res_currency_view.xml | 2 - openerp/addons/base/res/res_partner_view.xml | 15 ---- openerp/addons/base/res/res_security.xml | 9 -- .../addons/base/security/base_security.xml | 13 --- 85 files changed, 388 insertions(+), 424 deletions(-) create mode 100644 addons/crm_project_issue/security/ir.model.access.csv create mode 100644 addons/sales_team/models/res_config.py create mode 100644 addons/sales_team/views/res_config_view.xml diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv index a49886ab0c3..287a50c8a18 100644 --- a/addons/account/security/ir.model.access.csv +++ b/addons/account/security/ir.model.access.csv @@ -37,7 +37,6 @@ access_account_invoice_user,account.invoice user,model_account_invoice,base.grou access_account_invoice_user,account.invoice.line user,model_account_invoice_line,base.group_user,1,0,0,0 access_account_payment_term_partner_manager,account.payment.term partner manager,model_account_payment_term,base.group_user,1,0,0,0 access_account_payment_term_line_partner_manager,account.payment.term.line partner manager,model_account_payment_term_line,base.group_user,1,0,0,0 -access_account_account_sale_manager,account.account sale manager,model_account_account,base.group_sale_manager,1,0,0,0 access_account_fiscal_position_product_manager,account.fiscal.position account.manager,model_account_fiscal_position,account.group_account_manager,1,1,1,1 access_account_fiscal_position_tax_product_manager,account.fiscal.position.tax account.manager,model_account_fiscal_position_tax,account.group_account_manager,1,1,1,1 access_account_fiscal_position_account_product_manager,account.fiscal.position account.manager,model_account_fiscal_position_account,account.group_account_manager,1,1,1,1 @@ -60,9 +59,6 @@ access_account_invoice_line_accountant,account.invoice.line accountant,model_acc access_account_account_invoice,account.account invoice,model_account_account,account.group_account_invoice,1,0,0,0 access_account_analytic_accountant,account.analytic.account accountant,analytic.model_account_analytic_account,account.group_account_user,1,1,1,1 access_account_account_type_invoice,account.account.type invoice,model_account_account_type,account.group_account_invoice,1,0,0,0 -access_account_tax_sale_manager,account.tax sale manager,model_account_tax,base.group_sale_salesman,1,0,0,0 -access_account_journal_sale_manager,account.journal sale manager,model_account_journal,base.group_sale_salesman,1,0,0,0 -access_account_invoice_tax_sale_manager,account.invoice.tax sale manager,model_account_invoice_tax,base.group_sale_salesman,1,0,0,0 access_account_financial_report,account.financial.report,model_account_financial_report,account.group_account_user,1,1,1,1 access_account_financial_report_invoice,account.financial.report invoice,model_account_financial_report,account.group_account_invoice,1,0,0,0 access_account_account_tax,account.account.tag,model_account_account_tag,account.group_account_user,1,0,0,0 @@ -79,4 +75,3 @@ access_account_cashbox_line,account.bank.statement.cashbox.line,model_account_ca access_account_tax_group_internal_user,account.tax.group internal user,model_account_tax_group,base.group_user,1,0,0,0 access_account_tax_group,account.tax.group,model_account_tax_group,account.group_account_invoice,1,0,0,0 access_account_tax_group_manager,account.tax.group,model_account_tax_group,account.group_account_manager,1,1,1,1 -access_account_tax_group_sale_manager,account.tax.group sale manager,model_account_tax_group,base.group_sale_salesman,1,0,0,0 diff --git a/addons/account_analytic_default/security/ir.model.access.csv b/addons/account_analytic_default/security/ir.model.access.csv index dc2ecfdb076..0960cb1633d 100644 --- a/addons/account_analytic_default/security/ir.model.access.csv +++ b/addons/account_analytic_default/security/ir.model.access.csv @@ -2,4 +2,4 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_account_analytic_default,account.analytic.default,model_account_analytic_default,account.group_account_user,1,0,0,0 access_account_analytic_default_analytic,account.analytic.default analytic,model_account_analytic_default,analytic.group_analytic_accounting,1,0,0,0 access_account_analytic_default_invoice,account.analytic.default invoice,model_account_analytic_default,account.group_account_invoice,1,1,1,1 -access_account_analytic_default_salesman,account.analytic.default.salesman,model_account_analytic_default,base.group_sale_salesman,1,1,1,1 +access_account_analytic_default_salesman,account.analytic.default.salesman,model_account_analytic_default,sales_team.group_sale_salesman,1,1,1,1 diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml index 910670d3d72..a3a6f9a1684 100644 --- a/addons/association/profile_association.xml +++ b/addons/association/profile_association.xml @@ -5,7 +5,7 @@ diff --git a/addons/base_setup/models/res_config.py b/addons/base_setup/models/res_config.py index 9602593c105..246900e0e75 100644 --- a/addons/base_setup/models/res_config.py +++ b/addons/base_setup/models/res_config.py @@ -55,10 +55,3 @@ class BaseConfigSettings(models.TransientModel): partner_rule = self.env.ref('base.res_partner_rule') for config in self: partner_rule.write({'active': not config.company_share_partner}) - - -# Empty class but required since it's overrided by sale & crm -class SaleConfigSettings(models.TransientModel): - - _name = 'sale.config.settings' - _inherit = 'res.config.settings' diff --git a/addons/base_setup/views/res_config_views.xml b/addons/base_setup/views/res_config_views.xml index b45a4909c97..bdba02a9399 100644 --- a/addons/base_setup/views/res_config_views.xml +++ b/addons/base_setup/views/res_config_views.xml @@ -124,29 +124,4 @@ action="action_general_configuration" groups="base.group_system"/> - - - - sale settings - sale.config.settings - -
-
-
-
- - - - - - Configure Sales - ir.actions.act_window - sale.config.settings - - form - inline - - diff --git a/addons/calendar/security/ir.model.access.csv b/addons/calendar/security/ir.model.access.csv index c6f55f93af8..7b8c1e3af2a 100644 --- a/addons/calendar/security/ir.model.access.csv +++ b/addons/calendar/security/ir.model.access.csv @@ -2,15 +2,10 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_calendar_attendee_portal,calendar.attendee_portal,model_calendar_attendee,base.group_portal,1,1,0,0 access_calendar_attendee_employee,calendar.attendee_employee,model_calendar_attendee,base.group_user,1,1,1,1 access_calendar_alarm,calendar.alarm,model_calendar_alarm,base.group_user,1,1,1,1 -access_calendar_event_manager,calendar.event.manager,model_calendar_event,base.group_sale_manager,1,1,1,1 -access_calendar_event,calendar.event,model_calendar_event,base.group_sale_salesman,1,1,1,0 access_calendar_event_all_user,calendar.event_all_user,model_calendar_event,base.group_portal,1,0,0,0 access_calendar_event_all_employee,calendar.event_all_employee,model_calendar_event,base.group_user,1,1,1,1 access_calendar_event_partner_manager,calendar.event.partner.manager,model_calendar_event,base.group_partner_manager,1,1,1,1 access_calendar_event_type_all,calendar.event.type.all,model_calendar_event_type,base.group_user,1,0,0,0 -access_calendar_event_type_sale_manager,calendar.event.type.manager,model_calendar_event_type,base.group_sale_manager,1,1,1,0 -access_calendar_event_type_sale_user,calendar.event.type.user,model_calendar_event_type,base.group_user,1,0,0,0 -access_calendar_event_type_sale_user,calendar.event.type.salesman,model_calendar_event_type,base.group_sale_salesman,1,0,0,0 access_calendar_event_type_manager,calendar.event.type.manager,model_calendar_event_type,base.group_system,1,1,1,1 access_calendar_alarm_manager,access_calendar_alarm_manager,model_calendar_alarm_manager,base.group_user,1,1,1,1 access_calendar_contacts_all,access_calendar_contacts_all,model_calendar_contacts,base.group_user,1,1,1,1 diff --git a/addons/crm/calendar_event_menu.xml b/addons/crm/calendar_event_menu.xml index eb3889f0857..c9d43050387 100644 --- a/addons/crm/calendar_event_menu.xml +++ b/addons/crm/calendar_event_menu.xml @@ -3,7 +3,7 @@ + parent="sales_team.menu_base_partner"/> CRM - Meetings Search diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml index 4daf241fd49..60834cbc311 100644 --- a/addons/crm/crm_demo.xml +++ b/addons/crm/crm_demo.xml @@ -2,7 +2,7 @@ - + diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index aa408550b5d..e70f0db08f1 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -889,7 +889,7 @@ Update your business card, phone book, social media,... Send an email right now def _notification_group_recipients(self, cr, uid, ids, message, recipients, done_ids, group_data, context=None): """ Override the mail.thread method to handle salesman recipients. Indeed those will have specific action in their notification emails. """ - group_sale_salesman = self.pool['ir.model.data'].xmlid_to_res_id(cr, uid, 'base.group_sale_salesman') + group_sale_salesman = self.pool['ir.model.data'].xmlid_to_res_id(cr, uid, 'sales_team.group_sale_salesman') for recipient in recipients: if recipient.id in done_ids: continue diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml index 561ccfe2cab..1d212e9a53c 100644 --- a/addons/crm/crm_lead_menu.xml +++ b/addons/crm/crm_lead_menu.xml @@ -103,10 +103,10 @@ - - + - + Next Activities @@ -134,7 +134,7 @@ + parent="sales_team.menu_sales" action="crm_lead_action_activities" /> diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 1252ad41fb6..c667c69b2fd 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -114,7 +114,7 @@ + context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'sales_team.group_sale_salesman_all_leads'], 'team_id': team_id}"/> @@ -445,7 +445,7 @@ - + @@ -629,7 +629,7 @@ 'default_use_template': True, 'default_template_id': ref('crm.email_template_opportunity_mail'), }" - groups="base.group_sale_salesman" + groups="sales_team.group_sale_salesman" /> + id="sales_team.menu_base_partner" + web_icon="crm,static/description/icon.png"/> + parent="sales_team.menu_sale_config" sequence="5" groups="sales_team.group_sale_manager"/> + parent="sales_team.menu_sale_config" sequence="1" groups="sales_team.group_sale_manager"/> - + diff --git a/addons/crm/report/crm_activity_report_view.xml b/addons/crm/report/crm_activity_report_view.xml index f71cbe5fe14..66d1ad8d5ae 100644 --- a/addons/crm/report/crm_activity_report_view.xml +++ b/addons/crm/report/crm_activity_report_view.xml @@ -58,7 +58,7 @@ [] diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml index 47e3f2b20d3..1e9cc22ae15 100644 --- a/addons/crm/res_config_view.xml +++ b/addons/crm/res_config_view.xml @@ -4,7 +4,7 @@ crm settings sale.config.settings - +
@@ -47,9 +47,9 @@ - - + diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml index b211f06d5e4..7f9803cbee3 100644 --- a/addons/crm/security/crm_security.xml +++ b/addons/crm/security/crm_security.xml @@ -2,28 +2,6 @@ - - User: Own Documents Only - - - the user will have access to his own data in the sales application. - - - - User: All Documents - - - the user will have access to all records of everyone in the sales application. - - - - Manager - the user will have an access to the sales configuration as well as statistic reports. - - - - - Show Lead Menu @@ -33,12 +11,12 @@ - - + + - - + + @@ -49,13 +27,13 @@ Personal Leads ['|',('user_id','=',user.id),('user_id','=',False)] - + All Leads [(1,'=',1)] - + @@ -69,28 +47,28 @@ Personal Leads Analysis ['|',('user_id','=',user.id),('user_id','=',False)] - + All Leads Analysis [(1,'=',1)] - + All Activities [(1,'=',1)] - + Personal Activities ['|',('user_id','=',user.id),('user_id','=',False)] - + diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv index a1ecf821756..919f2c7a17d 100644 --- a/addons/crm/security/ir.model.access.csv +++ b/addons/crm/security/ir.model.access.csv @@ -1,24 +1,29 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_crm_lead_manager,crm.lead.manager,model_crm_lead,base.group_sale_manager,1,1,1,1 -access_crm_lead,crm.lead,model_crm_lead,base.group_sale_salesman,1,1,1,0 +access_crm_lead_manager,crm.lead.manager,model_crm_lead,sales_team.group_sale_manager,1,1,1,1 +access_crm_lead,crm.lead,model_crm_lead,sales_team.group_sale_salesman,1,1,1,0 access_crm_stage,crm.stage,model_crm_stage,,1,0,0,0 -access_crm_stage_manager,crm.stage,model_crm_stage,base.group_sale_manager,1,1,1,1 -access_crm_opportunity_report_user,crm.opportunity.report,model_crm_opportunity_report,base.group_sale_salesman,1,0,0,0 -access_crm_opportunity_report_manager,crm.opportunity.report,model_crm_opportunity_report,base.group_sale_manager,1,1,1,1 -access_res_partner_manager,res.partner.crm.manager,base.model_res_partner,base.group_sale_manager,1,0,0,0 -access_res_partner_category_manager,res.partner.category.crm.manager,base.model_res_partner_category,base.group_sale_manager,1,0,0,0 -access_res_partner,res.partner.crm.user,base.model_res_partner,base.group_sale_salesman,1,1,1,0 -access_res_partner_category,res.partner.category.crm.user,base.model_res_partner_category,base.group_sale_salesman,1,1,1,0 -mail_mailgate_thread,mail.thread,mail.model_mail_thread,base.group_sale_salesman,1,1,1,1 -access_base_action_rule_manager,base.action.rule manager,base_action_rule.model_base_action_rule,base.group_sale_manager,1,1,1,1 +access_crm_stage_manager,crm.stage,model_crm_stage,sales_team.group_sale_manager,1,1,1,1 +access_crm_opportunity_report_user,crm.opportunity.report,model_crm_opportunity_report,sales_team.group_sale_salesman,1,0,0,0 +access_crm_opportunity_report_manager,crm.opportunity.report,model_crm_opportunity_report,sales_team.group_sale_manager,1,1,1,1 +access_res_partner_manager,res.partner.crm.manager,base.model_res_partner,sales_team.group_sale_manager,1,0,0,0 +access_res_partner_category_manager,res.partner.category.crm.manager,base.model_res_partner_category,sales_team.group_sale_manager,1,0,0,0 +access_res_partner,res.partner.crm.user,base.model_res_partner,sales_team.group_sale_salesman,1,1,1,0 +access_res_partner_category,res.partner.category.crm.user,base.model_res_partner_category,sales_team.group_sale_salesman,1,1,1,0 +mail_mailgate_thread,mail.thread,mail.model_mail_thread,sales_team.group_sale_salesman,1,1,1,1 +access_base_action_rule_manager,base.action.rule manager,base_action_rule.model_base_action_rule,sales_team.group_sale_manager,1,1,1,1 access_crm_lead_partner_manager,crm.lead.partner.manager,model_crm_lead,base.group_partner_manager,1,0,0,0 access_crm_lead_tag,crm_lead_tag,model_crm_lead_tag,base.group_user,1,0,0,0 -access_crm_lead_tag_salesman,crm_lead_tag salesman,model_crm_lead_tag,base.group_sale_salesman,1,1,1,0 -access_crm_lead_tag_manager,crm_lead_tag manager,model_crm_lead_tag,base.group_sale_manager,1,1,1,1 -access_crm_lost_reason_manager,crm.lost.reason.manager,model_crm_lost_reason,base.group_sale_manager,1,1,1,1 -access_crm_lost_reason_salesman,crm.lost.reason.salesman,model_crm_lost_reason,base.group_sale_salesman,1,0,0,0 +access_crm_lead_tag_salesman,crm_lead_tag salesman,model_crm_lead_tag,sales_team.group_sale_salesman,1,1,1,0 +access_crm_lead_tag_manager,crm_lead_tag manager,model_crm_lead_tag,sales_team.group_sale_manager,1,1,1,1 +access_crm_lost_reason_manager,crm.lost.reason.manager,model_crm_lost_reason,sales_team.group_sale_manager,1,1,1,1 +access_crm_lost_reason_salesman,crm.lost.reason.salesman,model_crm_lost_reason,sales_team.group_sale_salesman,1,0,0,0 access_crm_lost_reason_user,crm.lost.reason.user,model_crm_lost_reason,base.group_user,1,0,0,0 access_crm_activity_user,crm.activity.user,model_crm_activity,base.group_user,1,1,1,0 -access_crm_activity_manager,crm.activity.manager,model_crm_activity,base.group_sale_manager,1,1,1,1 -access_crm_activity_salesman,crm.activity.salesman,model_crm_activity,base.group_sale_salesman,1,1,1,0 +access_crm_activity_manager,crm.activity.manager,model_crm_activity,sales_team.group_sale_manager,1,1,1,1 +access_crm_activity_salesman,crm.activity.salesman,model_crm_activity,sales_team.group_sale_salesman,1,1,1,0 access_crm_activity_report_user,crm.activity.report.user,model_crm_activity_report,base.group_user,1,0,0,0 +access_calendar_event_manager,calendar.event.manager,calendar.model_calendar_event,sales_team.group_sale_manager,1,1,1,1 +access_calendar_event,calendar.event,calendar.model_calendar_event,sales_team.group_sale_salesman,1,1,1,0 +access_calendar_event_type_sale_manager,calendar.event.type.manager,calendar.model_calendar_event_type,sales_team.group_sale_manager,1,1,1,0 +access_calendar_event_type_sale_user,calendar.event.type.user,calendar.model_calendar_event_type,base.group_user,1,0,0,0 +access_calendar_event_type_sale_user,calendar.event.type.salesman,calendar.model_calendar_event_type,sales_team.group_sale_salesman,1,0,0,0 diff --git a/addons/crm/test/crm_access_group_users.yml b/addons/crm/test/crm_access_group_users.yml index e7fdc86d096..176283592b7 100644 --- a/addons/crm/test/crm_access_group_users.yml +++ b/addons/crm/test/crm_access_group_users.yml @@ -11,7 +11,7 @@ - !record {model: res.users, id: crm_res_users_salesmanager}: groups_id: - - base.group_sale_manager + - sales_team.group_sale_manager - Create a user as 'Crm Salesman' - @@ -25,5 +25,5 @@ - !record {model: res.users, id: crm_res_users_salesman}: groups_id: - - base.group_sale_salesman_all_leads + - sales_team.group_sale_salesman_all_leads - base.group_partner_manager diff --git a/addons/crm/tests/common.py b/addons/crm/tests/common.py index 7156d1a0844..b59be71bada 100644 --- a/addons/crm/tests/common.py +++ b/addons/crm/tests/common.py @@ -10,7 +10,7 @@ class TestCrm(TestMail): super(TestCrm, cls).setUpClass() user_group_employee = cls.env.ref('base.group_user') - user_group_salesman_all = cls.env.ref('base.group_sale_salesman_all_leads') + user_group_salesman_all = cls.env.ref('sales_team.group_sale_salesman_all_leads') # Test users to use through the various tests Users = cls.env['res.users'].with_context({'no_reset_password': True, 'mail_create_nosubscribe': True}) diff --git a/addons/crm/web_planner_data.xml b/addons/crm/web_planner_data.xml index cbbd1f9ab13..12a43dd3409 100644 --- a/addons/crm/web_planner_data.xml +++ b/addons/crm/web_planner_data.xml @@ -956,7 +956,7 @@ Sales strategy planner - + planner_crm diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml index 7dfc976c6ce..964372a6b64 100644 --- a/addons/crm/wizard/crm_merge_opportunities_view.xml +++ b/addons/crm/wizard/crm_merge_opportunities_view.xml @@ -50,7 +50,7 @@ key2="client_action_multi" name="Merge leads/opportunities" res_model="crm.merge.opportunity" src_model="crm.lead" view_mode="form" target="new" view_type="form" - groups="base.group_sale_salesman" + groups="sales_team.group_sale_salesman" /> diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml index 0f82c08debe..025be1e2eed 100644 --- a/addons/crm_partner_assign/crm_lead_view.xml +++ b/addons/crm_partner_assign/crm_lead_view.xml @@ -7,7 +7,7 @@ - +