diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 7ff51a470e3..ecdefb9e051 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -51,7 +51,7 @@ Dashboard for CRM will include:
'depends': [
'base_action_rule',
'base_setup',
- 'sale_team',
+ 'sales_team',
'mail',
'email_template',
'calendar',
diff --git a/addons/crm/crm_action_rule_demo.xml b/addons/crm/crm_action_rule_demo.xml
index 2524132c4d4..d77211a0f12 100644
--- a/addons/crm/crm_action_rule_demo.xml
+++ b/addons/crm/crm_action_rule_demo.xml
@@ -41,7 +41,7 @@
True
ir.actions.server
code
- sales_team = self.pool.get('ir.model.data').get_object(cr, uid, 'sale_team', 'section_sales_department')
+ sales_team = self.pool.get('ir.model.data').get_object(cr, uid, 'sales_team', 'section_sales_department')
object.write({'section_id': sales_team.id})
diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml
index 94f59217065..cc6aba3c408 100644
--- a/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@ -83,7 +83,7 @@
crm.case.section.kanban
crm.case.section
-
+
@@ -100,7 +100,7 @@
crm.case.section.kanban
crm.case.section
-
+
@@ -158,13 +158,13 @@
crm.case.section
[('parent_id','=',False)]
tree
-
+
-
+
crm.case.section.form
crm.case.section
-
+
diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index cec54a683bd..a5a732747ab 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -26,7 +26,7 @@
Email
-
+
True
sales
@@ -35,22 +35,22 @@
Cash
-
+
Check
-
+
Credit Card
-
+
Demand Draft
-
+
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index dbc0f94f65e..9ea859937a2 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -61,7 +61,7 @@
opportunity
-
+
Telesales
-
+
Email Campaign - Services
-
+
Email Campaign - Products
-
+
Twitter Ads
-
+
Google Adwords
-
+
Banner Ads
-
+
Television
-
+
Newsletter
-
+
Product
-
+
Software
-
+
Services
-
+
Information
-
+
Design
-
+
Training
-
+
Consulting
-
+
Other
-
+
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 64ee8f7b870..ef105d3989e 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -20,7 +20,7 @@
1
-
+
Hello,
@@ -55,7 +55,7 @@ Could you please send me the details ?
4
-
+
@@ -84,7 +84,7 @@ Could you please send me the details ?
2
-
+
@@ -105,7 +105,7 @@ Could you please send me the details ?
3
-
+
@@ -130,7 +130,7 @@ Could you please send me the details ?
3
-
+
Hi,
@@ -157,7 +157,7 @@ Contact: +1 813 494 5005
2
-
+
@@ -175,7 +175,7 @@ Contact: +1 813 494 5005
0
-
+
@@ -194,7 +194,7 @@ Contact: +1 813 494 5005
1
-
+
@@ -213,7 +213,7 @@ Contact: +1 813 494 5005
2
-
+
@@ -231,7 +231,7 @@ Contact: +1 813 494 5005
2
-
+
Hi,
@@ -254,7 +254,7 @@ Andrew
2
-
+
@@ -272,7 +272,7 @@ Andrew
2
-
+
@@ -310,7 +310,7 @@ Andrew
Meeting for pricing information.
-
+
@@ -335,7 +335,7 @@ Andrew
Send Catalogue by Email
-
+
@@ -356,7 +356,7 @@ Andrew
Call to ask system requirement
-
+
@@ -383,7 +383,7 @@ Andrew
Convert to quote
-
+
@@ -408,7 +408,7 @@ Andrew
Send price list regarding our interventions
-
+
@@ -435,7 +435,7 @@ Andrew
Call to define real needs about training
-
+
@@ -462,7 +462,7 @@ Andrew
Ask for the good receprion of the proposition
-
+
@@ -479,7 +479,7 @@ Andrew
2
-
+
@@ -493,7 +493,7 @@ Andrew
2
-
+
@@ -511,7 +511,7 @@ Andrew
1
-
+
@@ -526,7 +526,7 @@ Andrew
0
-
+
@@ -545,7 +545,7 @@ Andrew
0
-
+
@@ -568,7 +568,7 @@ Andrew
2
Conf call with technical service
-
+
@@ -592,7 +592,7 @@ Andrew
Send Catalogue by Email
-
+
diff --git a/addons/crm/crm_phonecall_data.xml b/addons/crm/crm_phonecall_data.xml
index 4e613e7f72a..ce82a9a7b51 100644
--- a/addons/crm/crm_phonecall_data.xml
+++ b/addons/crm/crm_phonecall_data.xml
@@ -6,13 +6,13 @@
-->
Inbound
-
+
Outbound
-
+
diff --git a/addons/crm/crm_phonecall_demo.xml b/addons/crm/crm_phonecall_demo.xml
index 8d41c868c27..8563a38b075 100644
--- a/addons/crm/crm_phonecall_demo.xml
+++ b/addons/crm/crm_phonecall_demo.xml
@@ -11,7 +11,7 @@
Left the message
done
+34 934 340 230
-
+
@@ -24,7 +24,7 @@
Need more information on the proposed deal
done
+44 121 690 4596
-
+
@@ -37,7 +37,7 @@
Ask for convenient time of meeting
open
+1 786 525 0724
-
+
@@ -50,7 +50,7 @@
done
(077) 582-4035
(077) 341-3591
-
+
@@ -63,7 +63,7 @@
More information on the proposed deal
pending
+1 312 349 2324
-
+
@@ -74,7 +74,7 @@
Proposal for discount offer
open
+34 230 953 485
-
+
diff --git a/addons/crm/test/crm_lead_cancel.yml b/addons/crm/test/crm_lead_cancel.yml
index fa98f47e6ea..eca85e4b7a1 100644
--- a/addons/crm/test/crm_lead_cancel.yml
+++ b/addons/crm/test/crm_lead_cancel.yml
@@ -5,7 +5,7 @@
uid: 'crm_res_users_salesmanager'
-
!python {model: crm.lead}: |
- section_id = self.pool.get('crm.case.section').create(cr, uid, {'name': "Phone Marketing", 'parent_id': ref("sale_team.crm_case_section_2")})
+ section_id = self.pool.get('crm.case.section').create(cr, uid, {'name': "Phone Marketing", 'parent_id': ref("sales_team.crm_case_section_2")})
self.write(cr, uid, [ref("crm_case_1")], {'section_id': section_id})
-
Salesman check unqualified lead .
diff --git a/addons/crm/test/crm_lead_find_stage.yml b/addons/crm/test/crm_lead_find_stage.yml
index 9fcff6ab512..19bed36fc7e 100644
--- a/addons/crm/test/crm_lead_find_stage.yml
+++ b/addons/crm/test/crm_lead_find_stage.yml
@@ -6,7 +6,7 @@
name: 'Test lead new'
partner_id: base.res_partner_1
description: This is the description of the test new lead.
- section_id: sale_team.section_sales_department
+ section_id: sales_team.section_sales_department
-
I check default stage of lead.
-
diff --git a/addons/crm/test/lead2opportunity2win.yml b/addons/crm/test/lead2opportunity2win.yml
index c91768bcc07..1bae79bf983 100644
--- a/addons/crm/test/lead2opportunity2win.yml
+++ b/addons/crm/test/lead2opportunity2win.yml
@@ -65,7 +65,7 @@
-
!python {model: crm.lead2opportunity.partner.mass}: |
context.update({'active_model': 'crm.lead', 'active_ids': [ref("crm_case_13"), ref("crm_case_2")], 'active_id': ref("crm_case_13")})
- id = self.create(cr, uid, {'user_ids': [(6, 0, [ref('base.user_root')])], 'section_id': ref('sale_team.section_sales_department')}, context=context)
+ id = self.create(cr, uid, {'user_ids': [(6, 0, [ref('base.user_root')])], 'section_id': ref('sales_team.section_sales_department')}, context=context)
self.mass_convert(cr, uid, [id], context=context)
-
Now I check first lead converted on opportunity.
diff --git a/addons/crm/test/lead2opportunity_assign_salesmen.yml b/addons/crm/test/lead2opportunity_assign_salesmen.yml
index 6206db33050..9ac3e954f88 100644
--- a/addons/crm/test/lead2opportunity_assign_salesmen.yml
+++ b/addons/crm/test/lead2opportunity_assign_salesmen.yml
@@ -66,7 +66,7 @@
-
!python {model: crm.lead2opportunity.partner.mass}: |
context.update({'active_model': 'crm.lead', 'active_ids': [ref("test_crm_lead_01"), ref("test_crm_lead_02"), ref("test_crm_lead_03"), ref("test_crm_lead_04"), ref("test_crm_lead_05"), ref("test_crm_lead_06")], 'active_id': ref("test_crm_lead_01")})
- id = self.create(cr, uid, {'user_ids': [(6, 0, [ref('test_res_user_01'), ref('test_res_user_02'), ref('test_res_user_03'), ref('test_res_user_04')])], 'section_id': ref('sale_team.section_sales_department'), 'deduplicate': False, 'force_assignation': True}, context=context)
+ id = self.create(cr, uid, {'user_ids': [(6, 0, [ref('test_res_user_01'), ref('test_res_user_02'), ref('test_res_user_03'), ref('test_res_user_04')])], 'section_id': ref('sales_team.section_sales_department'), 'deduplicate': False, 'force_assignation': True}, context=context)
self.mass_convert(cr, uid, [id], context=context)
-
The leads should now be opps with a salesman and a salesteam. Also, salesmen should have been assigned following a round-robin method.
diff --git a/addons/crm_claim/crm_claim_data.xml b/addons/crm_claim/crm_claim_data.xml
index 8a1bae29a2b..fca7ac51178 100644
--- a/addons/crm_claim/crm_claim_data.xml
+++ b/addons/crm_claim/crm_claim_data.xml
@@ -8,19 +8,19 @@
Factual Claims
-
+
Value Claims
-
+
Policy Claims
-
+
@@ -30,12 +30,12 @@
Corrective
-
+
Preventive
-
+