Revert "[IMP] base,sales_team: Move res_groups and menuitems to sales_team"

This branch need more testing instead of doing 10 fixes. A lot of issues are occuring
when installing modules in different orders.

This reverts commit fa6e415cdb23ce9494487ed672792186157b40e0.

2 files changed, 32 insertions, 32 deletions

diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 6a7a1ff2ab9..b211f06d5e4 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -2,25 +2,25 @@
 <openerp>
 <data noupdate="0">
 
-    <record id="sales_team.group_sale_salesman" model="res.groups">
+    <record id="base.group_sale_salesman" model="res.groups">
         <field name="name">User: Own Documents Only</field>
         <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
         <field name="comment">the user will have access to his own data in the sales application.</field>
     </record>
 
-    <record id="sales_team.group_sale_salesman_all_leads" model="res.groups">
+    <record id="base.group_sale_salesman_all_leads" model="res.groups">
         <field name="name">User: All Documents</field>
         <field name="category_id" ref="base.module_category_sales_management"/>
-        <field name="implied_ids" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
+        <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman'))]"/>
         <field name="comment">the user will have access to all records of everyone in the sales application.</field>
     </record>
 
-    <record id="sales_team.group_sale_manager" model="res.groups">
+    <record id="base.group_sale_manager" model="res.groups">
         <field name="name">Manager</field>
         <field name="comment">the user will have an access to the sales configuration as well as statistic reports.</field>
         <field name="category_id" ref="base.module_category_sales_management"/>
-        <field name="implied_ids" eval="[(4, ref('sales_team.group_sale_salesman_all_leads'))]"/>
+        <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
@@ -33,12 +33,12 @@
         <field eval="[(4,ref('base.group_partner_manager'))]" name="groups_id"/>
     </record>
 
-    <record model='ir.ui.menu' id='sales_team.menu_base_partner'>
-        <field name="groups_id" eval="[(4,ref('sales_team.group_sale_manager')),(4,ref('sales_team.group_sale_salesman'))]"/>
+    <record model='ir.ui.menu' id='base.menu_base_partner'>
+        <field name="groups_id" eval="[(4,ref('base.group_sale_manager')),(4,ref('base.group_sale_salesman'))]"/>
     </record>
 
-    <record model="ir.ui.menu" id="sales_team.menu_sale_config">
-        <field eval="[(4, ref('sales_team.group_sale_manager'))]" name="groups_id"/>
+    <record model="ir.ui.menu" id="base.menu_sale_config">
+        <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/>
     </record>
 
 </data>
@@ -49,13 +49,13 @@
         <field name="name">Personal Leads</field>
         <field ref="model_crm_lead" name="model_id"/>
         <field name="domain_force">['|',('user_id','=',user.id),('user_id','=',False)]</field>
-        <field name="groups" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
     </record>
     <record id="crm_rule_all_lead" model="ir.rule">
         <field name="name">All Leads</field>
         <field ref="model_crm_lead" name="model_id"/>
         <field name="domain_force">[(1,'=',1)]</field>
-        <field name="groups" eval="[(4, ref('sales_team.group_sale_salesman_all_leads'))]"/>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
     </record>
 
     <record id="calendar_event_global" model="ir.rule">
@@ -69,28 +69,28 @@
         <field name="name">Personal Leads Analysis</field>
         <field ref="model_crm_opportunity_report" name="model_id"/>
         <field name="domain_force">['|',('user_id','=',user.id),('user_id','=',False)]</field>
-        <field name="groups" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
     </record>
 
     <record id="crm_rule_all_lead_report" model="ir.rule">
         <field name="name">All Leads Analysis</field>
         <field ref="model_crm_opportunity_report" name="model_id"/>
         <field name="domain_force">[(1,'=',1)]</field>
-        <field name="groups" eval="[(4, ref('sales_team.group_sale_salesman_all_leads'))]"/>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
     </record>
 
     <record id="crm_activity_report_rule_all_activities" model="ir.rule">
         <field name="name">All Activities</field>
         <field ref="model_crm_activity_report" name="model_id"/>
         <field name="domain_force">[(1,'=',1)]</field>
-        <field name="groups" eval="[(4, ref('sales_team.group_sale_salesman_all_leads'))]"/>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
     </record>
 
     <record id="crm_activity_report_rule_personal_activities" model="ir.rule">
         <field name="name">Personal Activities</field>
         <field ref="model_crm_activity_report" name="model_id"/>
         <field name="domain_force">['|',('user_id','=',user.id),('user_id','=',False)]</field>
-        <field name="groups" eval="[(4, ref('sales_team.group_sale_salesman'))]"/>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
     </record>
 </data>
 </openerp>
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index b1f839b819e..a1ecf821756 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -1,24 +1,24 @@
 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,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_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_stage,crm.stage,model_crm_stage,,1,0,0,0

-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_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_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,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_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_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,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_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_report_user,crm.activity.report.user,model_crm_activity_report,base.group_user,1,0,0,0