From 09e380e239e74835aa8fc5ea75e39eaecacdf75b Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Tue, 3 Oct 2017 10:47:25 +0200
Subject: [PATCH] [FIX] base, website_customer: incorrect wording

opw-768886
---
 .../views/website_customer_templates.xml           |  2 +-
 odoo/addons/base/i18n/base.pot                     | 14 ++++++++++----
 odoo/addons/base/res/res_partner.py                |  4 ++--
 odoo/addons/base/res/res_partner_view.xml          | 14 +++++++-------
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/addons/website_customer/views/website_customer_templates.xml b/addons/website_customer/views/website_customer_templates.xml
index c5a4825db76..5674f3d3440 100644
--- a/addons/website_customer/views/website_customer_templates.xml
+++ b/addons/website_customer/views/website_customer_templates.xml
@@ -94,7 +94,7 @@
     </xpath>
 </template>
 
-<template id="opt_industry_list" inherit_id="website_customer.index" customize_show="True" name="Filter on Sector of Activity" priority="20">
+<template id="opt_industry_list" inherit_id="website_customer.index" customize_show="True" name="Filter on Industry" priority="20">
     <xpath expr="//div[@id='ref_left_column']" position="inside">
         <h3>References by Sectors of Activity</h3>
         <ul class="nav nav-pills nav-stacked mt16 mb32">
diff --git a/odoo/addons/base/i18n/base.pot b/odoo/addons/base/i18n/base.pot
index b95086b42d9..317089f9478 100644
--- a/odoo/addons/base/i18n/base.pot
+++ b/odoo/addons/base/i18n/base.pot
@@ -6487,13 +6487,13 @@ msgid "Click to create a new bank."
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,help:base.action_partner_category_form
-msgid "Click to create a new partner tag."
+#: model:ir.actions.act_window,help:base.res_partner_industry_action
+msgid "Click to create a new industry."
 msgstr ""
 
 #. module: base
-#: model:ir.actions.act_window,help:base.res_partner_industry_action
-msgid "Click to create a new sector of activity."
+#: model:ir.actions.act_window,help:base.action_partner_category_form
+msgid "Click to create a new partner tag."
 msgstr ""
 
 #. module: base
@@ -10273,6 +10273,12 @@ msgstr ""
 msgid "Indonesia"
 msgstr ""
 
+#. module: base
+#: model:ir.model.fields,field_description:base.field_res_partner_industry_id
+#: model:ir.model.fields,field_description:base.field_res_users_industry_id
+msgid "Industry"
+msgstr ""
+
 #. module: base
 #: model:ir.model.fields,field_description:base.field_ir_model_info
 #: model:ir.ui.view,arch_db:base.module_form
diff --git a/odoo/addons/base/res/res_partner.py b/odoo/addons/base/res/res_partner.py
index 6fa0e251311..48cf0656631 100644
--- a/odoo/addons/base/res/res_partner.py
+++ b/odoo/addons/base/res/res_partner.py
@@ -196,7 +196,7 @@ class Partner(models.Model):
     mobile = fields.Char()
     is_company = fields.Boolean(string='Is a Company', default=False,
         help="Check if the contact is a company, otherwise it is a person")
-    industry_id = fields.Many2one('res.partner.industry', 'Sector of Activity')
+    industry_id = fields.Many2one('res.partner.industry', 'Industry')
     # company_type is only an interface field, do not use it in business logic
     company_type = fields.Selection(string='Company Type',
         selection=[('person', 'Individual'), ('company', 'Company')],
@@ -777,7 +777,7 @@ class Partner(models.Model):
 
 
 class ResPartnerIndustry(models.Model):
-    _description = 'Sector of Activity'
+    _description = 'Industry'
     _name = "res.partner.industry"
     _order = "name"
 
diff --git a/odoo/addons/base/res/res_partner_view.xml b/odoo/addons/base/res/res_partner_view.xml
index e1933a5184c..ca3990dc019 100644
--- a/odoo/addons/base/res/res_partner_view.xml
+++ b/odoo/addons/base/res/res_partner_view.xml
@@ -662,12 +662,12 @@
             </field>
         </record>
 
-        <!-- Sector of Activity -->
+        <!-- Industry -->
         <record id="res_partner_industry_view_form" model="ir.ui.view">
-            <field name="name">Sector of Activity</field>
+            <field name="name">Industry</field>
             <field name="model">res.partner.industry</field>
             <field name="arch" type="xml">
-                <form string="Sector of Activity">
+                <form string="Industry">
                     <group col="4">
                         <field name="name"/>
                         <field name="full_name"/>
@@ -677,11 +677,11 @@
             </field>
         </record>
         <record id="res_partner_industry_view_tree" model="ir.ui.view">
-            <field name="name">Sector of Activity</field>
+            <field name="name">Industry</field>
             <field name="model">res.partner.industry</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
-                <tree string="Sector of Activity">
+                <tree string="Industry">
                     <field name="name"/>
                     <field name="full_name"/>
                     <field name="active"/>
@@ -689,14 +689,14 @@
             </field>
         </record>
         <record id="res_partner_industry_action" model="ir.actions.act_window">
-            <field name="name">Sector of Activity</field>
+            <field name="name">Industry</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.partner.industry</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
-                    Click to create a new sector of activity.
+                    Click to create a new industry.
                 </p>
                 <p>
                     Manage sectors of activity to better classify partners for tracking and analysis purposes.