From 916639de6aba7c0d061f89a8f7f4226eb5447236 Mon Sep 17 00:00:00 2001
From: Nimesh Jethva <nje@odoo.com>
Date: Fri, 18 Jan 2019 09:14:11 +0000
Subject: [PATCH] [IMP] crm(_*), sales_team : another round of sales
 team/channel renaming

Rename model description, field strings & filter names from "Sales Channel"
to "Sales team". From section to team [1], from team to channel [2],
from channel to team [3], then re-adding channel naming [4][5], now back to
team.

Related to task 1929561
Linked to PR #30335

[1] https://github.com/odoo/odoo/commit/fd659e908be0cc598b8a8af46b066f914dbb03d7
[2] https://github.com/odoo/odoo/commit/eed8a3468639aff82360a7552f9c7a1216b89345
[3] https://github.com/odoo/odoo/commit/384647e58326476d5e68d2ecb5230cb6678a3fdb
[4] https://github.com/odoo/odoo/commit/71820dbc20313dfbacc56277b197b267ac81b7a4
[5] https://github.com/odoo/odoo/commit/44fd3bc8082205290e38de183d092b42c02c8215

Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
---
 addons/crm/models/crm_team.py                        |  2 +-
 addons/crm/views/crm_lead_views.xml                  |  2 +-
 .../crm_iap_lead_website/models/crm_reveal_rule.py   |  2 +-
 addons/sales_team/views/crm_team_views.xml           | 12 ++++++------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/crm/models/crm_team.py b/addons/crm/models/crm_team.py
index d7e66bfa3ee..b62904788d2 100644
--- a/addons/crm/models/crm_team.py
+++ b/addons/crm/models/crm_team.py
@@ -11,7 +11,7 @@ from odoo.exceptions import ValidationError
 class Team(models.Model):
     _name = 'crm.team'
     _inherit = ['mail.alias.mixin', 'crm.team']
-    _description = 'Sales Channels'
+    _description = 'Sales Team'
     use_opportunities = fields.Boolean('Manage a pipeline', default=True, help="Check this box to manage a presales process with opportunities.")
     alias_id = fields.Many2one('mail.alias', string='Alias', ondelete="restrict", required=True, help="The email address associated with this channel. New emails received will automatically create new leads assigned to the channel.")    
 
diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml
index 78bc490c674..5c6798f39b4 100644
--- a/addons/crm/views/crm_lead_views.xml
+++ b/addons/crm/views/crm_lead_views.xml
@@ -437,7 +437,7 @@
                         ]"/>
                     <group expand="0" string="Group By">
                         <filter string="Salesperson" name="salesperson" context="{'group_by':'user_id'}"/>
-                        <filter string="Sales Channel" name="saleschannel" context="{'group_by':'team_id'}"/>
+                        <filter string="Sales Team" name="saleschannel" context="{'group_by':'team_id'}"/>
                         <filter name="stage" string="Stage" context="{'group_by':'stage_id'}"/>
                         <filter name="city" string="City" context="{'group_by': 'city'}"/>
                         <filter string="Country" name="country" context="{'group_by':'country_id'}" />
diff --git a/addons/crm_iap_lead_website/models/crm_reveal_rule.py b/addons/crm_iap_lead_website/models/crm_reveal_rule.py
index c0744e7a053..1b063d95c75 100644
--- a/addons/crm_iap_lead_website/models/crm_reveal_rule.py
+++ b/addons/crm_iap_lead_website/models/crm_reveal_rule.py
@@ -50,7 +50,7 @@ class CRMRevealRule(models.Model):
     lead_for = fields.Selection([('companies', 'Companies'), ('people', 'Companies and their Contacts')], string='Data Tracking', required=True, default='companies', help='Choose whether to track companies only or companies and their contacts')
     lead_type = fields.Selection([('lead', 'Lead'), ('opportunity', 'Opportunity')], string='Type', required=True, default='opportunity')
     suffix = fields.Char(string='Suffix', help='This will be appended in name of generated lead so you can identify lead/opportunity is generated with this rule')
-    team_id = fields.Many2one('crm.team', string='Sales Channel')
+    team_id = fields.Many2one('crm.team', string='Sales Team')
     tag_ids = fields.Many2many('crm.lead.tag', string='Tags')
     user_id = fields.Many2one('res.users', string='Salesperson')
     priority = fields.Selection(crm_stage.AVAILABLE_PRIORITIES, string='Priority')
diff --git a/addons/sales_team/views/crm_team_views.xml b/addons/sales_team/views/crm_team_views.xml
index 3b3f273b83a..d5a835710d0 100644
--- a/addons/sales_team/views/crm_team_views.xml
+++ b/addons/sales_team/views/crm_team_views.xml
@@ -28,10 +28,10 @@
             <field name="context">{'in_sales_app': True}</field>
             <field name="help" type="html">
                 <p class="o_view_nocontent_smiling_face">
-                    Define a new Sales Team
+                    Define a new sales team
                 </p><p>
                     Use Sales Teams to organize your sales departments.
-                    Each channel will work with a separate pipeline.
+                    Each team will work with a separate pipeline.
                 </p>
             </field>
         </record>
@@ -45,10 +45,10 @@
             <field name="context">{}</field>
             <field name="help" type="html">
                 <p class="o_view_nocontent_smiling_face">
-                    Define a new Sales Team
+                    Define a new sales team
                 </p><p>
                     Use Sales Teams to organize your sales departments.
-                    Each channel will work with a separate pipeline.
+                    Each team will work with a separate pipeline.
                 </p>
             </field>
         </record>
@@ -166,10 +166,10 @@
             <field name="view_id" ref="crm_team_salesteams_search"/>
             <field name="help" type="html">
                 <p class="o_view_nocontent_smiling_face">
-                    Define a new Sales Team
+                    Define a new sales team
                 </p><p>
                     Use Sales Teams to organize your sales departments.
-                    Each channel will work with a separate pipeline.
+                    Each team will work with a separate pipeline.
                 </p>
             </field>
         </record>