From 689ea6ea1a27b260a04e553c80c53a9c26276b70 Mon Sep 17 00:00:00 2001
From: Kinjal Mehta <kme@odoo.com>
Date: Thu, 28 Dec 2017 12:00:51 +0530
Subject: [PATCH 01/22] [IMP] base: give warning if fields have same label to
 easily identify duplicate field string.

---
 odoo/addons/base/models/ir_model.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/odoo/addons/base/models/ir_model.py b/odoo/addons/base/models/ir_model.py
index af51ddb547f..62b4ea6ab50 100644
--- a/odoo/addons/base/models/ir_model.py
+++ b/odoo/addons/base/models/ir_model.py
@@ -786,7 +786,12 @@ class IrModelFields(models.Model):
     def _reflect_model(self, model):
         """ Reflect the given model's fields. """
         self.clear_caches()
+        duplicate_fields_label = {}
         for field in model._fields.values():
+            if field.string in duplicate_fields_label.keys():
+                _logger.warning('two fields (%s, %s) have same label for this model (%s)', field.name, duplicate_fields_label[field.string], model)
+            else:
+                duplicate_fields_label[field.string] = field.name
             self._reflect_field(field)
 
         if not self.pool._init:

From 0f7930353d8fd283380c7e50658f2656ebdd7845 Mon Sep 17 00:00:00 2001
From: dbh <dbh@odoo.com>
Date: Tue, 2 May 2017 18:54:07 +0530
Subject: [PATCH 02/22] [IMP] base,base_address_city,base_setup: give warning
 if fields have same label to easily identify duplicate field string.

---
 addons/base_address_city/models/res_partner.py          | 2 +-
 addons/base_setup/models/res_config_settings.py         | 2 +-
 odoo/addons/base/models/ir_actions.py                   | 4 ++--
 odoo/addons/base/models/ir_sequence.py                  | 4 ++--
 odoo/addons/base/models/ir_ui_view.py                   | 4 ++--
 odoo/addons/base/models/res_partner.py                  | 2 +-
 odoo/addons/base/views/ir_sequence_views.xml            | 6 +++---
 odoo/addons/base/views/ir_ui_view_views.xml             | 2 +-
 odoo/addons/base/wizard/base_module_uninstall_views.xml | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/base_address_city/models/res_partner.py b/addons/base_address_city/models/res_partner.py
index 27b08b5a2a3..efc7f10f341 100644
--- a/addons/base_address_city/models/res_partner.py
+++ b/addons/base_address_city/models/res_partner.py
@@ -9,7 +9,7 @@ class Partner(models.Model):
     _inherit = 'res.partner'
 
     country_enforce_cities = fields.Boolean(related='country_id.enforce_cities')
-    city_id = fields.Many2one('res.city', string='City')
+    city_id = fields.Many2one('res.city', string='Partner City')
 
     @api.onchange('city_id')
     def _onchange_city_id(self):
diff --git a/addons/base_setup/models/res_config_settings.py b/addons/base_setup/models/res_config_settings.py
index 32946bf4a59..e925bac6a05 100644
--- a/addons/base_setup/models/res_config_settings.py
+++ b/addons/base_setup/models/res_config_settings.py
@@ -28,7 +28,7 @@ class ResConfigSettings(models.TransientModel):
         help="Share your partners to all companies defined in your instance.\n"
              " * Checked : Partners are visible for every companies, even if a company is defined on the partner.\n"
              " * Unchecked : Each company can see only its partner (partners where company is defined). Partners not related to a company are visible for all companies.")
-    default_custom_report_footer = fields.Boolean("Custom Report Footer")
+    default_custom_report_footer = fields.Boolean("Default Custom Report Footer")
     report_footer = fields.Text(related="company_id.report_footer", string='Custom Report Footer', help="Footer text displayed at the bottom of all reports.")
     group_multi_currency = fields.Boolean(string='Multi-Currencies',
             implied_group='base.group_multi_currency',
diff --git a/odoo/addons/base/models/ir_actions.py b/odoo/addons/base/models/ir_actions.py
index 776a098e453..dc5336fce12 100644
--- a/odoo/addons/base/models/ir_actions.py
+++ b/odoo/addons/base/models/ir_actions.py
@@ -173,7 +173,7 @@ class IrActionsActWindow(models.Model):
                                  help="View type: Tree type to use for the tree view, set to 'tree' for a hierarchical tree view, or 'form' for a regular list view")
     usage = fields.Char(string='Action Usage',
                         help="Used to filter menu and home actions from the user form.")
-    view_ids = fields.One2many('ir.actions.act_window.view', 'act_window_id', string='Views')
+    view_ids = fields.One2many('ir.actions.act_window.view', 'act_window_id', string='No of Views')
     views = fields.Binary(compute='_compute_views',
                           help="This function field computes the ordered list of views that should be enabled " \
                                "when displaying the result of an action, federating view mode, views and " \
@@ -358,7 +358,7 @@ class IrActionsServer(models.Model):
                                    "based on the sequence. Low number means high priority.")
     model_id = fields.Many2one('ir.model', string='Model', required=True, ondelete='cascade',
                                help="Model on which the server action runs.")
-    model_name = fields.Char(related='model_id.model', readonly=True, store=True)
+    model_name = fields.Char(related='model_id.model', string='Model Name', readonly=True, store=True)
     # Python code
     code = fields.Text(string='Python Code', groups='base.group_system',
                        default=DEFAULT_PYTHON_CODE,
diff --git a/odoo/addons/base/models/ir_sequence.py b/odoo/addons/base/models/ir_sequence.py
index 3f370f3fb4c..6a23b0e3f00 100644
--- a/odoo/addons/base/models/ir_sequence.py
+++ b/odoo/addons/base/models/ir_sequence.py
@@ -126,7 +126,7 @@ class IrSequence(models.Model):
     suffix = fields.Char(help="Suffix value of the record for the sequence", trim=False)
     number_next = fields.Integer(string='Next Number', required=True, default=1, help="Next number of this sequence")
     number_next_actual = fields.Integer(compute='_get_number_next_actual', inverse='_set_number_next_actual',
-                                        string='Next Number',
+                                        string='Actual Next Number',
                                         help="Next number that will be used. This number can be incremented "
                                         "frequently so the displayed value might already be obsolete")
     number_increment = fields.Integer(string='Step', required=True, default=1,
@@ -340,7 +340,7 @@ class IrSequenceDateRange(models.Model):
     sequence_id = fields.Many2one("ir.sequence", string='Main Sequence', required=True, ondelete='cascade')
     number_next = fields.Integer(string='Next Number', required=True, default=1, help="Next number of this sequence")
     number_next_actual = fields.Integer(compute='_get_number_next_actual', inverse='_set_number_next_actual',
-                                        string='Next Number',
+                                        string='Actual Next Number',
                                         help="Next number that will be used. This number can be incremented "
                                              "frequently so the displayed value might already be obsolete")
 
diff --git a/odoo/addons/base/models/ir_ui_view.py b/odoo/addons/base/models/ir_ui_view.py
index 70094f476d1..ee810c95fe1 100644
--- a/odoo/addons/base/models/ir_ui_view.py
+++ b/odoo/addons/base/models/ir_ui_view.py
@@ -195,7 +195,7 @@ class View(models.Model):
                              ('search', 'Search'),
                              ('qweb', 'QWeb')], string='View Type')
     arch = fields.Text(compute='_compute_arch', inverse='_inverse_arch', string='View Architecture', nodrop=True)
-    arch_base = fields.Text(compute='_compute_arch_base', inverse='_inverse_arch_base', string='View Architecture')
+    arch_base = fields.Text(compute='_compute_arch_base', inverse='_inverse_arch_base', string='Base View Architecture')
     arch_db = fields.Text(string='Arch Blob', translate=xml_translate, oldname='arch')
     arch_fs = fields.Char(string='Arch Filename')
     inherit_id = fields.Many2one('ir.ui.view', string='Inherited View', ondelete='restrict', index=True)
@@ -207,7 +207,7 @@ class View(models.Model):
                          help="ID of the view defined in xml file")
     groups_id = fields.Many2many('res.groups', 'ir_ui_view_group_rel', 'view_id', 'group_id',
                                  string='Groups', help="If this field is empty, the view applies to all users. Otherwise, the view applies to the users of those groups only.")
-    model_ids = fields.One2many('ir.model.data', 'res_id', domain=[('model', '=', 'ir.ui.view')], auto_join=True)
+    model_ids = fields.One2many('ir.model.data', 'res_id', string="Models", domain=[('model', '=', 'ir.ui.view')], auto_join=True)
     create_date = fields.Datetime(readonly=True)
     write_date = fields.Datetime(string='Last Modification Date', readonly=True)
 
diff --git a/odoo/addons/base/models/res_partner.py b/odoo/addons/base/models/res_partner.py
index 996efde0721..0e350ba9901 100644
--- a/odoo/addons/base/models/res_partner.py
+++ b/odoo/addons/base/models/res_partner.py
@@ -213,7 +213,7 @@ class Partner(models.Model):
     # technical field used for managing commercial fields
     commercial_partner_id = fields.Many2one('res.partner', compute='_compute_commercial_partner',
                                              string='Commercial Entity', store=True, index=True)
-    commercial_partner_country_id = fields.Many2one('res.country', related='commercial_partner_id.country_id', store=True)
+    commercial_partner_country_id = fields.Many2one('res.country', related='commercial_partner_id.country_id', string='Commercial Entity Country', store=True)
     commercial_company_name = fields.Char('Company Name Entity', compute='_compute_commercial_company_name',
                                           store=True)
     company_name = fields.Char('Company Name')
diff --git a/odoo/addons/base/views/ir_sequence_views.xml b/odoo/addons/base/views/ir_sequence_views.xml
index 9bfaf30850c..d53570cc79a 100644
--- a/odoo/addons/base/views/ir_sequence_views.xml
+++ b/odoo/addons/base/views/ir_sequence_views.xml
@@ -28,14 +28,14 @@
                           <group>
                             <field name="padding"/>
                             <field name="number_increment"/>
-                            <field name="number_next_actual" attrs="{'invisible': [('use_date_range', '=', True)]}"/>
+                            <field name="number_next_actual" string="Next Number" attrs="{'invisible': [('use_date_range', '=', True)]}"/>
                           </group>
                         </group>
                         <field name="date_range_ids" attrs="{'invisible': [('use_date_range', '=', False)]}">
                             <tree string="Sequences" editable="top">
                                 <field name="date_from"/>
                                 <field name="date_to"/>
-                                <field name="number_next_actual"/>
+                                <field name="number_next_actual" string="Next Number"/>
                             </tree>
                         </field>
                         <group col="3" string="Legend (for prefix, suffix)">
@@ -78,7 +78,7 @@
                     <field name="prefix"/>
                     <field name="padding"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="number_next_actual"/>
+                    <field name="number_next_actual" string="Next Number"/>
                     <field name="number_increment"/>
                     <field name="implementation"/>
                 </tree>
diff --git a/odoo/addons/base/views/ir_ui_view_views.xml b/odoo/addons/base/views/ir_ui_view_views.xml
index 58f3a70fd42..256b85cf918 100644
--- a/odoo/addons/base/views/ir_ui_view_views.xml
+++ b/odoo/addons/base/views/ir_ui_view_views.xml
@@ -26,7 +26,7 @@
                         <page string="Architecture">
                             <button type="object" name="open_translations"
                                 string="Edit Translations" class="oe_link oe_right"/>
-                            <field name="arch_base" widget="ace" options="{'mode': 'xml'}"/>
+                            <field name="arch_base" string="View Architecture" widget="ace" options="{'mode': 'xml'}"/>
                         </page>
                         <page string="Access Rights">
                             <field name="groups_id"/>
diff --git a/odoo/addons/base/wizard/base_module_uninstall_views.xml b/odoo/addons/base/wizard/base_module_uninstall_views.xml
index 43da6a2bcde..aa945029b00 100644
--- a/odoo/addons/base/wizard/base_module_uninstall_views.xml
+++ b/odoo/addons/base/wizard/base_module_uninstall_views.xml
@@ -34,7 +34,7 @@
                         </kanban>
                     </field>
                     <h3>The following documents will be permanently lost</h3>
-                    <field name="model_ids">
+                    <field name="model_ids" string="Models">
                         <tree string="Models">
                             <field name="name" string="Document"/>
                             <field name="count"/>

From e8fbf7085d3d2af0fde7370466d7d875565d2619 Mon Sep 17 00:00:00 2001
From: Kinjal Mehta <kme@odoo.com>
Date: Wed, 6 Dec 2017 15:08:20 +0530
Subject: [PATCH 03/22] [IMP] account: changed duplicate field label in the
 same model

---
 addons/account/models/account_bank_statement.py    | 2 +-
 addons/account/models/account_invoice.py           | 8 ++++----
 addons/account/models/account_move.py              | 4 ++--
 addons/account/models/account_payment.py           | 2 +-
 addons/account/models/partner.py                   | 2 +-
 addons/account/models/res_config_settings.py       | 2 +-
 addons/account/report/account_invoice_report.py    | 4 ++--
 addons/account/views/account_invoice_view.xml      | 8 ++++----
 addons/account/views/res_config_settings_views.xml | 2 +-
 addons/account/wizard/account_financial_report.py  | 4 ++--
 10 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/addons/account/models/account_bank_statement.py b/addons/account/models/account_bank_statement.py
index d087388cfd2..80fa020aa8e 100644
--- a/addons/account/models/account_bank_statement.py
+++ b/addons/account/models/account_bank_statement.py
@@ -352,7 +352,7 @@ class AccountBankStatementLine(models.Model):
     name = fields.Char(string='Label', required=True)
     date = fields.Date(required=True, default=lambda self: self._context.get('date', fields.Date.context_today(self)))
     amount = fields.Monetary(digits=0, currency_field='journal_currency_id')
-    journal_currency_id = fields.Many2one('res.currency', related='statement_id.currency_id',
+    journal_currency_id = fields.Many2one('res.currency', string="Journal Currency", related='statement_id.currency_id',
         help='Utility field to express amount currency', readonly=True)
     partner_id = fields.Many2one('res.partner', string='Partner')
     bank_account_id = fields.Many2one('res.partner.bank', string='Bank Account')
diff --git a/addons/account/models/account_invoice.py b/addons/account/models/account_invoice.py
index 4e538b8e21d..cc2baec25c5 100644
--- a/addons/account/models/account_invoice.py
+++ b/addons/account/models/account_invoice.py
@@ -366,7 +366,7 @@ class AccountInvoice(models.Model):
 
     #fields use to set the sequence, on the first invoice of the journal
     sequence_number_next = fields.Char(string='Next Number', compute="_get_sequence_number_next", inverse="_set_sequence_next")
-    sequence_number_next_prefix = fields.Char(string='Next Number', compute="_get_sequence_prefix")
+    sequence_number_next_prefix = fields.Char(string='Next Number Prefix', compute="_get_sequence_prefix")
 
     _sql_constraints = [
         ('number_uniq', 'unique(number, company_id, journal_id, type)', 'Invoice Number must be unique per Company!'),
@@ -1500,9 +1500,9 @@ class AccountInvoiceLine(models.Model):
         default=_default_account,
         help="The income or expense account related to the selected product.")
     price_unit = fields.Float(string='Unit Price', required=True, digits=dp.get_precision('Product Price'))
-    price_subtotal = fields.Monetary(string='Amount',
+    price_subtotal = fields.Monetary(string='Amount (without Taxes)',
         store=True, readonly=True, compute='_compute_price', help="Total amount without taxes")
-    price_total = fields.Monetary(string='Amount',
+    price_total = fields.Monetary(string='Amount (with Taxes)',
         store=True, readonly=True, compute='_compute_price', help="Total amount with taxes")
     price_subtotal_signed = fields.Monetary(string='Amount Signed', currency_field='company_currency_id',
         store=True, readonly=True, compute='_compute_price',
@@ -1698,7 +1698,7 @@ class AccountInvoiceTax(models.Model):
     account_analytic_id = fields.Many2one('account.analytic.account', string='Analytic account')
     amount = fields.Monetary()
     amount_rounding = fields.Monetary()
-    amount_total = fields.Monetary(string="Amount", compute='_compute_amount_total')
+    amount_total = fields.Monetary(string="Amount Total", compute='_compute_amount_total')
     manual = fields.Boolean(default=True)
     sequence = fields.Integer(help="Gives the sequence order when displaying a list of invoice tax.")
     company_id = fields.Many2one('res.company', string='Company', related='account_id.company_id', store=True, readonly=True)
diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index 5018b1e28e2..76641cdeb74 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -1562,9 +1562,9 @@ class AccountPartialReconcile(models.Model):
     amount = fields.Monetary(currency_field='company_currency_id', help="Amount concerned by this matching. Assumed to be always positive")
     amount_currency = fields.Monetary(string="Amount in Currency")
     currency_id = fields.Many2one('res.currency', string='Currency')
-    company_currency_id = fields.Many2one('res.currency', related='company_id.currency_id', readonly=True,
+    company_currency_id = fields.Many2one('res.currency', string="Company Currency", related='company_id.currency_id', readonly=True,
         help='Utility field to express amount currency')
-    company_id = fields.Many2one('res.company', related='debit_move_id.company_id', store=True, string='Currency')
+    company_id = fields.Many2one('res.company', related='debit_move_id.company_id', store=True, string='Company')
     full_reconcile_id = fields.Many2one('account.full.reconcile', string="Full Reconcile", copy=False)
     max_date = fields.Date(string='Max Date of Matched Lines', compute='_compute_max_date',
         readonly=True, copy=False, store=True,
diff --git a/addons/account/models/account_payment.py b/addons/account/models/account_payment.py
index b6bc2732231..e17e48165a5 100644
--- a/addons/account/models/account_payment.py
+++ b/addons/account/models/account_payment.py
@@ -290,7 +290,7 @@ class account_payment(models.Model):
     invoice_ids = fields.Many2many('account.invoice', 'account_invoice_payment_rel', 'payment_id', 'invoice_id', string="Invoices", copy=False, readonly=True)
     has_invoices = fields.Boolean(compute="_get_has_invoices", help="Technical field used for usability purposes")
     payment_difference = fields.Monetary(compute='_compute_payment_difference', readonly=True)
-    payment_difference_handling = fields.Selection([('open', 'Keep open'), ('reconcile', 'Mark invoice as fully paid')], default='open', string="Payment Difference", copy=False)
+    payment_difference_handling = fields.Selection([('open', 'Keep open'), ('reconcile', 'Mark invoice as fully paid')], default='open', string="Payment Difference Handling", copy=False)
     writeoff_account_id = fields.Many2one('account.account', string="Difference Account", domain=[('deprecated', '=', False)], copy=False)
     writeoff_label = fields.Char(
         string='Journal Item Label',
diff --git a/addons/account/models/partner.py b/addons/account/models/partner.py
index 246c402a23c..a1fa22a824c 100644
--- a/addons/account/models/partner.py
+++ b/addons/account/models/partner.py
@@ -380,7 +380,7 @@ class ResPartner(models.Model):
         groups='account.group_account_invoice')
     currency_id = fields.Many2one('res.currency', compute='_get_company_currency', readonly=True,
         string="Currency", help='Utility field to express amount currency')
-    contracts_count = fields.Integer(compute='_compute_contracts_count', string="Contracts", type='integer')
+    contracts_count = fields.Integer(compute='_compute_contracts_count', string="Contracts Count", type='integer')
     journal_item_count = fields.Integer(compute='_compute_journal_item_count', string="Journal Items", type="integer")
     property_account_payable_id = fields.Many2one('account.account', company_dependent=True,
         string="Account Payable", oldname="property_account_payable",
diff --git a/addons/account/models/res_config_settings.py b/addons/account/models/res_config_settings.py
index 304fc0d54a3..fbd61dea5c6 100644
--- a/addons/account/models/res_config_settings.py
+++ b/addons/account/models/res_config_settings.py
@@ -28,7 +28,7 @@ class ResConfigSettings(models.TransientModel):
     module_account_accountant = fields.Boolean(string='Accounting')
     group_analytic_accounting = fields.Boolean(string='Analytic Accounting',
         implied_group='analytic.group_analytic_accounting')
-    group_warning_account = fields.Boolean(string="Warnings", implied_group='account.group_warning_account')
+    group_warning_account = fields.Boolean(string="Warnings for Accounting", implied_group='account.group_warning_account')
     group_cash_rounding = fields.Boolean(string="Cash Rounding", implied_group='account.group_cash_rounding')
     module_account_asset = fields.Boolean(string='Assets Management')
     module_account_deferred_revenue = fields.Boolean(string="Revenue Recognition")
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index 62c2fe786a1..db25a045775 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -42,9 +42,9 @@ class AccountInvoiceReport(models.Model):
     company_id = fields.Many2one('res.company', string='Company', readonly=True)
     user_id = fields.Many2one('res.users', string='Salesperson', readonly=True)
     price_total = fields.Float(string='Total Without Tax', readonly=True)
-    user_currency_price_total = fields.Float(string="Total Without Tax", compute='_compute_amounts_in_user_currency', digits=0)
+    user_currency_price_total = fields.Float(string="Total Without Tax User Currency", compute='_compute_amounts_in_user_currency', digits=0)
     price_average = fields.Float(string='Average Price', readonly=True, group_operator="avg")
-    user_currency_price_average = fields.Float(string="Average Price", compute='_compute_amounts_in_user_currency', digits=0)
+    user_currency_price_average = fields.Float(string="Average Price User currency", compute='_compute_amounts_in_user_currency', digits=0)
     currency_rate = fields.Float(string='Currency Rate', readonly=True, group_operator="avg", groups="base.group_multi_currency")
     nbr = fields.Integer(string='# of Lines', readonly=True)  # TDE FIXME master: rename into nbr_lines
     type = fields.Selection([
diff --git a/addons/account/views/account_invoice_view.xml b/addons/account/views/account_invoice_view.xml
index 92c5e5db026..c0a618f2462 100644
--- a/addons/account/views/account_invoice_view.xml
+++ b/addons/account/views/account_invoice_view.xml
@@ -95,7 +95,7 @@
                     <field name="name"/>
                     <field name="account_id" groups="account.group_account_user"/>
                     <field name="base"/>
-                    <field name="amount_total"/>
+                    <field name="amount_total" string="Amount"/>
                     <field name="currency_id" invisible="1"/>
                 </tree>
             </field>
@@ -112,7 +112,7 @@
                         <field name="account_id" groups="account.group_account_user"/>
                         <field name="account_analytic_id" domain="[('company_id', '=', parent.company_id)]" groups="analytic.group_analytic_accounting"/>
                         <field name="manual"/>
-                        <field name="amount_total"/>
+                        <field name="amount_total" string="Amount"/>
                         <field name="base"/>
                         <field name="currency_id" invisible="1"/>
                     </group>
@@ -279,7 +279,7 @@
                                     <field name="discount" groups="base.group_no_one"/>
                                     <field name="invoice_line_tax_ids" widget="many2many_tags" options="{'no_create': True}" context="{'type':parent.type}"
                                         domain="[('type_tax_use','=','purchase'),('company_id', '=', parent.company_id)]"/>
-                                    <field name="price_subtotal"/>
+                                    <field name="price_subtotal" string="Amount"/>
                                     <field name="currency_id" invisible="1"/>
                                 </tree>
                             </field>
@@ -429,7 +429,7 @@
                                     <field name="discount" groups="base.group_no_one"/>
                                     <field name="invoice_line_tax_ids" widget="many2many_tags" options="{'no_create': True}" context="{'type':parent.type}"
                                         domain="[('type_tax_use','=','sale'),('company_id', '=', parent.company_id)]"/>
-                                    <field name="price_subtotal"/>
+                                    <field name="price_subtotal" string="Subtotal"/>
                                     <field name="currency_id" invisible="1"/>
                                 </tree>
                                 <kanban class="o_kanban_mobile">
diff --git a/addons/account/views/res_config_settings_views.xml b/addons/account/views/res_config_settings_views.xml
index 22726578d1b..748d7c5a3c7 100644
--- a/addons/account/views/res_config_settings_views.xml
+++ b/addons/account/views/res_config_settings_views.xml
@@ -396,7 +396,7 @@
                                     <field name="group_warning_account"/>
                                 </div>
                                 <div class="o_setting_right_pane">
-                                    <label for="group_warning_account"/>
+                                    <label for="group_warning_account" string="Warnings"/>
                                     <div class="text-muted">
                                         Get warnings when invoicing specific customers
                                     </div>
diff --git a/addons/account/wizard/account_financial_report.py b/addons/account/wizard/account_financial_report.py
index 0ea2c6e55c5..cbfe9103c29 100644
--- a/addons/account/wizard/account_financial_report.py
+++ b/addons/account/wizard/account_financial_report.py
@@ -20,8 +20,8 @@ class AccountingReport(models.TransientModel):
     account_report_id = fields.Many2one('account.financial.report', string='Account Reports', required=True, default=_get_account_report)
     label_filter = fields.Char(string='Column Label', help="This label will be displayed on report to show the balance computed for the given comparison filter.")
     filter_cmp = fields.Selection([('filter_no', 'No Filters'), ('filter_date', 'Date')], string='Filter by', required=True, default='filter_no')
-    date_from_cmp = fields.Date(string='Start Date')
-    date_to_cmp = fields.Date(string='End Date')
+    date_from_cmp = fields.Date(string='Starting Date')
+    date_to_cmp = fields.Date(string='Ending Date')
     debit_credit = fields.Boolean(string='Display Debit/Credit Columns', help="This option allows you to get more details about the way your balances are computed. Because it is space consuming, we do not allow to use it while doing a comparison.")
 
     def _build_comparison_context(self, data):

From 32498c008c33f11c5a3d6950e82a2f2c9f02a9f2 Mon Sep 17 00:00:00 2001
From: Kinjal Mehta <kme@odoo.com>
Date: Wed, 6 Dec 2017 12:47:39 +0530
Subject: [PATCH 04/22] [IMP] anonymization: changed duplicate field label in
 the same model

---
 addons/anonymization/models/anonymization.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/anonymization/models/anonymization.py b/addons/anonymization/models/anonymization.py
index a0c90382938..3d82981a226 100644
--- a/addons/anonymization/models/anonymization.py
+++ b/addons/anonymization/models/anonymization.py
@@ -144,5 +144,5 @@ class IrModelFieldsAnonymizationMigrationFix(models.Model):
     model_name = fields.Char('Model')
     field_name = fields.Char('Field')
     query = fields.Text()
-    query_type = fields.Selection(selection=[('sql', 'sql'), ('python', 'python')], string='Query')
+    query_type = fields.Selection(selection=[('sql', 'sql'), ('python', 'python')], string='Query Type')
     sequence = fields.Integer()

From b61e5a92872e5ce4797c15e8459b7a4706956d4f Mon Sep 17 00:00:00 2001
From: Kinjal Mehta <kme@odoo.com>
Date: Wed, 6 Dec 2017 12:49:29 +0530
Subject: [PATCH 05/22] [IMP] calendar: changed duplicate field label in the
 same model

---
 addons/calendar/models/calendar.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/calendar/models/calendar.py b/addons/calendar/models/calendar.py
index 97676349df9..0d32bd038c6 100644
--- a/addons/calendar/models/calendar.py
+++ b/addons/calendar/models/calendar.py
@@ -816,7 +816,7 @@ class Meeting(models.Model):
         ('-1', 'Last')
     ], string='By day')
     final_date = fields.Date('Repeat Until')
-    user_id = fields.Many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}, default=lambda self: self.env.user)
+    user_id = fields.Many2one('res.users', 'Owner', states={'done': [('readonly', True)]}, default=lambda self: self.env.user)
     partner_id = fields.Many2one('res.partner', string='Responsible', related='user_id.partner_id', readonly=True)
     active = fields.Boolean('Active', default=True, help="If the active field is set to false, it will allow you to hide the event alarm information without removing it.")
     categ_ids = fields.Many2many('calendar.event.type', 'meeting_category_rel', 'event_id', 'type_id', 'Tags')

From c9fcbd60a5c7a6ed325eebf405ff5b4c5d0e426a Mon Sep 17 00:00:00 2001
From: Kinjal Mehta <kme@odoo.com>
Date: Wed, 6 Dec 2017 12:09:33 +0530
Subject: [PATCH 06/22] [IMP] crm: rename duplicate field label

---
 addons/crm/models/crm_lead.py | 2 +-
 addons/crm/models/crm_team.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/crm/models/crm_lead.py b/addons/crm/models/crm_lead.py
index 932a8ec5bcd..18e0826af80 100644
--- a/addons/crm/models/crm_lead.py
+++ b/addons/crm/models/crm_lead.py
@@ -72,7 +72,7 @@ class Lead(models.Model):
     team_id = fields.Many2one('crm.team', string='Sales Channel', oldname='section_id', default=lambda self: self.env['crm.team'].sudo()._get_default_team_id(user_id=self.env.uid),
         index=True, track_visibility='onchange', help='When sending mails, the default email address is taken from the sales channel.')
     kanban_state = fields.Selection([('grey', 'No next activity planned'), ('red', 'Next activity late'), ('green', 'Next activity is planned')],
-        string='Activity State', compute='_compute_kanban_state')
+        string='Kanban State', compute='_compute_kanban_state')
     email_cc = fields.Text('Global CC', help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma")
     description = fields.Text('Notes')
     create_date = fields.Datetime('Create Date', readonly=True)
diff --git a/addons/crm/models/crm_team.py b/addons/crm/models/crm_team.py
index cddad92eea1..3519aaa19c5 100644
--- a/addons/crm/models/crm_team.py
+++ b/addons/crm/models/crm_team.py
@@ -23,7 +23,7 @@ class Team(models.Model):
         string='Number of open opportunities', readonly=True)
     opportunities_amount = fields.Integer(
         compute='_compute_opportunities',
-        string='Amount of quotations to invoice', readonly=True)
+        string='Amount of opportunities to invoice', readonly=True)
     dashboard_graph_model = fields.Selection(selection_add=[('crm.opportunity.report', 'Pipeline')])
     dashboard_graph_period_pipeline = fields.Selection([
         ('week', 'Within a Week'),
@@ -37,7 +37,7 @@ class Team(models.Model):
         ('month', 'Expected Closing Month'),
         ('user', 'Salesperson'),
         ('stage', 'Stage'),
-    ], string='Group by', default='day', help="How this channel's dashboard graph will group the results.")
+    ], string='Group by Pipeline', default='day', help="How this channel's dashboard graph will group the results.")
 
     def _compute_unassigned_leads_count(self):
         leads_data = self.env['crm.lead'].read_group([

From 092bb2bd5c0cf1668a3f846bf2b6b12ca7896cb3 Mon Sep 17 00:00:00 2001
From: Kinjal Mehta <kme@odoo.com>
Date: Wed, 6 Dec 2017 12:49:56 +0530
Subject: [PATCH 07/22] [IMP] fleet: changed duplicate field label in the same
 model

---
 addons/fleet/models/fleet_vehicle.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/fleet/models/fleet_vehicle.py b/addons/fleet/models/fleet_vehicle.py
index 508e5bfe836..694d7e26b10 100644
--- a/addons/fleet/models/fleet_vehicle.py
+++ b/addons/fleet/models/fleet_vehicle.py
@@ -27,9 +27,9 @@ class FleetVehicle(models.Model):
     log_services = fields.One2many('fleet.vehicle.log.services', 'vehicle_id', 'Services Logs')
     log_contracts = fields.One2many('fleet.vehicle.log.contract', 'vehicle_id', 'Contracts')
     cost_count = fields.Integer(compute="_compute_count_all", string="Costs")
-    contract_count = fields.Integer(compute="_compute_count_all", string='Contracts')
+    contract_count = fields.Integer(compute="_compute_count_all", string='# of Contracts')
     service_count = fields.Integer(compute="_compute_count_all", string='Services')
-    fuel_logs_count = fields.Integer(compute="_compute_count_all", string='Fuel Logs')
+    fuel_logs_count = fields.Integer(compute="_compute_count_all", string='# of Fuel Logs')
     odometer_count = fields.Integer(compute="_compute_count_all", string='Odometer')
     acquisition_date = fields.Date('Immatriculation Date', required=False, help='Date when the vehicle has been immatriculated')
     color = fields.Char(help='Color of the vehicle')

From 2bba0da0804cbd945d3c9fb01ca112d8cb5cd0da Mon Sep 17 00:00:00 2001
From: Kinjal Mehta <kme@odoo.com>
Date: Wed, 6 Dec 2017 12:50:30 +0530
Subject: [PATCH 08/22] [IMP] google_spreadsheet: changed duplicate field label
 in the same model

---
 addons/google_spreadsheet/models/res_config_settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/google_spreadsheet/models/res_config_settings.py b/addons/google_spreadsheet/models/res_config_settings.py
index 86649bae17d..ee47df724de 100644
--- a/addons/google_spreadsheet/models/res_config_settings.py
+++ b/addons/google_spreadsheet/models/res_config_settings.py
@@ -7,4 +7,4 @@ from odoo import fields, models
 class ResConfigSettings(models.TransientModel):
     _inherit = "res.config.settings"
 
-    google_drive_uri_copy = fields.Char(related='google_drive_uri', string='URI', help="The URL to generate the authorization code from Google")
+    google_drive_uri_copy = fields.Char(related='google_drive_uri', string='URI Copy', help="The URL to generate the authorization code from Google")

From c91d44aef506c36b6f9a8ffcfd1443718a6134ed Mon Sep 17 00:00:00 2001
From: Kinjal Mehta <kme@odoo.com>
Date: Wed, 6 Dec 2017 12:51:08 +0530
Subject: [PATCH 09/22] [IMP]
 hr_attendance,hr_contract,hr_expense_check,hr_payroll,hr_recruitment: changed
 duplicate field label in the same model

---
 addons/hr_attendance/models/hr_employee.py | 2 +-
 addons/hr_contract/models/hr_contract.py   | 2 +-
 addons/hr_expense_check/models/payment.py  | 1 +
 addons/hr_payroll/models/hr_employee.py    | 2 +-
 addons/hr_recruitment/models/hr_job.py     | 6 +++---
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/hr_attendance/models/hr_employee.py b/addons/hr_attendance/models/hr_employee.py
index 7eab0eedf64..3f7eee536cf 100644
--- a/addons/hr_attendance/models/hr_employee.py
+++ b/addons/hr_attendance/models/hr_employee.py
@@ -25,7 +25,7 @@ class HrEmployee(models.Model):
 
     attendance_ids = fields.One2many('hr.attendance', 'employee_id', help='list of attendances for the employee')
     last_attendance_id = fields.Many2one('hr.attendance', compute='_compute_last_attendance_id', store=True)
-    attendance_state = fields.Selection(string="Attendance", compute='_compute_attendance_state', selection=[('checked_out', "Checked out"), ('checked_in', "Checked in")])
+    attendance_state = fields.Selection(string="Attendance Status", compute='_compute_attendance_state', selection=[('checked_out', "Checked out"), ('checked_in', "Checked in")])
     manual_attendance = fields.Boolean(string='Manual Attendance', compute='_compute_manual_attendance', inverse='_inverse_manual_attendance',
                                        help='The employee will have access to the "My Attendances" menu to check in and out from his session')
 
diff --git a/addons/hr_contract/models/hr_contract.py b/addons/hr_contract/models/hr_contract.py
index c58b5d2a917..cef3f5437d3 100644
--- a/addons/hr_contract/models/hr_contract.py
+++ b/addons/hr_contract/models/hr_contract.py
@@ -21,7 +21,7 @@ class Employee(models.Model):
         string='Home-Work Dist.', help="In kilometers", groups="hr.group_hr_user")
     contract_ids = fields.One2many('hr.contract', 'employee_id', string='Contracts')
     contract_id = fields.Many2one('hr.contract', compute='_compute_contract_id', string='Current Contract', help='Latest contract of the employee')
-    contracts_count = fields.Integer(compute='_compute_contracts_count', string='Contracts')
+    contracts_count = fields.Integer(compute='_compute_contracts_count', string='# of Contracts')
 
     def _compute_contract_id(self):
         """ get the lastest contract """
diff --git a/addons/hr_expense_check/models/payment.py b/addons/hr_expense_check/models/payment.py
index d2609d63181..857ac4a030d 100644
--- a/addons/hr_expense_check/models/payment.py
+++ b/addons/hr_expense_check/models/payment.py
@@ -14,6 +14,7 @@ class HrExpenseRegisterPaymentWizard(models.TransientModel):
              "you can manage the numbering in the journal configuration page.")
     payment_method_code_2 = fields.Char(related='payment_method_id.code',
                                       help="Technical field used to adapt the interface to the payment type selected.",
+                                      string="Payment Method Code 2",
                                       readonly=True)
 
     @api.onchange('journal_id')
diff --git a/addons/hr_payroll/models/hr_employee.py b/addons/hr_payroll/models/hr_employee.py
index 6d1283e7346..36ddad88bce 100644
--- a/addons/hr_payroll/models/hr_employee.py
+++ b/addons/hr_payroll/models/hr_employee.py
@@ -9,7 +9,7 @@ class HrEmployee(models.Model):
     _description = 'Employee'
 
     slip_ids = fields.One2many('hr.payslip', 'employee_id', string='Payslips', readonly=True)
-    payslip_count = fields.Integer(compute='_compute_payslip_count', string='Payslips', groups="hr_payroll.group_hr_payroll_user")
+    payslip_count = fields.Integer(compute='_compute_payslip_count', string='# of Payslips', groups="hr_payroll.group_hr_payroll_user")
 
     @api.multi
     def _compute_payslip_count(self):
diff --git a/addons/hr_recruitment/models/hr_job.py b/addons/hr_recruitment/models/hr_job.py
index a5c69d18226..6dc18d47be4 100644
--- a/addons/hr_recruitment/models/hr_job.py
+++ b/addons/hr_recruitment/models/hr_job.py
@@ -15,15 +15,15 @@ class Job(models.Model):
         'res.partner', "Job Location", default=_default_address_id,
         help="Address where employees are working")
     application_ids = fields.One2many('hr.applicant', 'job_id', "Applications")
-    application_count = fields.Integer(compute='_compute_application_count', string="Applications")
+    application_count = fields.Integer(compute='_compute_application_count', string="# of Applications")
     manager_id = fields.Many2one(
         'hr.employee', related='department_id.manager_id', string="Department Manager",
         readonly=True, store=True)
     user_id = fields.Many2one('res.users', "Recruitment Responsible", track_visibility='onchange')
     hr_responsible_id = fields.Many2one('res.users', "HR Responsible", track_visibility='onchange',
         help="Person responsible of validating the employee's contracts.")
-    document_ids = fields.One2many('ir.attachment', compute='_compute_document_ids', string="Applications")
-    documents_count = fields.Integer(compute='_compute_document_ids', string="Documents")
+    document_ids = fields.One2many('ir.attachment', compute='_compute_document_ids', string="Documents")
+    documents_count = fields.Integer(compute='_compute_document_ids', string="# of Documents")
     alias_id = fields.Many2one(
         'mail.alias', "Alias", ondelete="restrict", required=True,
         help="Email alias for this job position. New emails will automatically create new applicants for this job position.")

From 0da738dc8cf1040b8c7d956cb6042f2c042b8be7 Mon Sep 17 00:00:00 2001
From: Kinjal Mehta <kme@odoo.com>
Date: Wed, 6 Dec 2017 14:41:30 +0530
Subject: [PATCH 10/22] [IMP] l10n_be_hr_payroll,l10n_ch: changed duplicate
 field label in the same model

---
 addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py | 2 +-
 addons/l10n_ch/models/account_invoice.py               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py b/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py
index 1b9835b1624..8665d2bdc46 100644
--- a/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py
+++ b/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py
@@ -36,7 +36,7 @@ class HrContract(models.Model):
     company_car_total_depreciated_cost = fields.Monetary()
     public_transport_reimbursed_amount = fields.Monetary(string='Reimbursed amount',
         compute='_compute_public_transport_reimbursed_amount', readonly=False, store=True)
-    others_reimbursed_amount = fields.Monetary(string='Reimbursed amount')
+    others_reimbursed_amount = fields.Monetary(string='Other Reimbursed amount')
     transport_employer_cost = fields.Monetary(compute='_compute_transport_employer_cost', string="Employer cost from employee transports")
     warrants_cost = fields.Monetary(compute='_compute_warrants_cost')
 
diff --git a/addons/l10n_ch/models/account_invoice.py b/addons/l10n_ch/models/account_invoice.py
index 928e5887415..20888252b26 100644
--- a/addons/l10n_ch/models/account_invoice.py
+++ b/addons/l10n_ch/models/account_invoice.py
@@ -26,7 +26,7 @@ class AccountInvoice(models.Model):
     l10n_ch_isr_valid = fields.Boolean(compute='_compute_l10n_ch_isr_valid', help='Boolean value. True iff all the data required to generate the ISR are present')
 
     l10n_ch_isr_sent = fields.Boolean(defaut=False, help="Boolean value telling whether or not the ISR corresponding to this invoice has already been printed or sent by mail.")
-    l10n_ch_currency_name = fields.Char(related='currency_id.name', help="The name of this invoice's currency") #This field is used in the "invisible" condition field of the 'Print ISR' button.
+    l10n_ch_currency_name = fields.Char(related='currency_id.name', string="Invoice Currency", help="The name of this invoice's currency") #This field is used in the "invisible" condition field of the 'Print ISR' button.
 
     @api.depends('partner_bank_id.bank_id.l10n_ch_postal_eur', 'partner_bank_id.bank_id.l10n_ch_postal_chf')
     def _compute_l10n_ch_isr_postal(self):

From d2b55d75a8a2d23bbdb3bcdb4a2842868b6db1a2 Mon Sep 17 00:00:00 2001
From: Kinjal Mehta <kme@odoo.com>
Date: Wed, 6 Dec 2017 14:42:28 +0530
Subject: [PATCH 11/22] [IMP] mail,mass_mailing: changed duplicate field label
 in the same model

---
 addons/mail/models/mail_activity.py                | 6 +++---
 addons/mass_mailing/wizard/mail_compose_message.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mail/models/mail_activity.py b/addons/mail/models/mail_activity.py
index 2f53fe3fe72..68922cb332f 100644
--- a/addons/mail/models/mail_activity.py
+++ b/addons/mail/models/mail_activity.py
@@ -70,7 +70,7 @@ class MailActivity(models.Model):
     # owner
     res_id = fields.Integer('Related Document ID', index=True, required=True)
     res_model_id = fields.Many2one(
-        'ir.model', 'Related Document Model',
+        'ir.model', 'Document Model',
         index=True, ondelete='cascade', required=True)
     res_model = fields.Char(
         'Related Document Model',
@@ -299,13 +299,13 @@ class MailActivityMixin(models.AbstractModel):
     activity_state = fields.Selection([
         ('overdue', 'Overdue'),
         ('today', 'Today'),
-        ('planned', 'Planned')], string='State',
+        ('planned', 'Planned')], string='Activity State',
         compute='_compute_activity_state',
         groups="base.group_user",
         help='Status based on activities\nOverdue: Due date is already passed\n'
              'Today: Activity date is today\nPlanned: Future activities.')
     activity_user_id = fields.Many2one(
-        'res.users', 'Responsible',
+        'res.users', 'Responsible Person',
         related='activity_ids.user_id',
         search='_search_activity_user_id',
         groups="base.group_user")
diff --git a/addons/mass_mailing/wizard/mail_compose_message.py b/addons/mass_mailing/wizard/mail_compose_message.py
index 8708dd9a098..8f28f6b5244 100644
--- a/addons/mass_mailing/wizard/mail_compose_message.py
+++ b/addons/mass_mailing/wizard/mail_compose_message.py
@@ -10,7 +10,7 @@ class MailComposeMessage(models.TransientModel):
 
     mass_mailing_campaign_id = fields.Many2one('mail.mass_mailing.campaign', string='Mass Mailing Campaign')
     mass_mailing_id = fields.Many2one('mail.mass_mailing', string='Mass Mailing', ondelete='cascade')
-    mass_mailing_name = fields.Char(string='Mass Mailing')
+    mass_mailing_name = fields.Char(string='Mass Mailing Name')
     mailing_list_ids = fields.Many2many('mail.mass_mailing.list', string='Mailing List')
 
     @api.multi

From 33e1105cec74398d425c9aaef3bd220466a19e4c Mon Sep 17 00:00:00 2001
From: Kinjal Mehta <kme@odoo.com>
Date: Wed, 6 Dec 2017 14:42:58 +0530
Subject: [PATCH 12/22] [IMP] maintenance: changed duplicate field label in the
 same model

---
 addons/maintenance/models/maintenance.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/maintenance/models/maintenance.py b/addons/maintenance/models/maintenance.py
index c3109a2c45b..e88bf86f5b8 100644
--- a/addons/maintenance/models/maintenance.py
+++ b/addons/maintenance/models/maintenance.py
@@ -37,7 +37,7 @@ class MaintenanceEquipmentCategory(models.Model):
     equipment_ids = fields.One2many('maintenance.equipment', 'category_id', string='Equipments', copy=False)
     equipment_count = fields.Integer(string="Equipment", compute='_compute_equipment_count')
     maintenance_ids = fields.One2many('maintenance.request', 'category_id', copy=False)
-    maintenance_count = fields.Integer(string="Maintenance", compute='_compute_maintenance_count')
+    maintenance_count = fields.Integer(string="# of Maintenance", compute='_compute_maintenance_count')
     alias_id = fields.Many2one(
         'mail.alias', 'Alias', ondelete='restrict', required=True,
         help="Email alias for this equipment category. New emails will automatically "
@@ -137,7 +137,7 @@ class MaintenanceEquipment(models.Model):
     color = fields.Integer('Color Index')
     scrap_date = fields.Date('Scrap Date')
     maintenance_ids = fields.One2many('maintenance.request', 'equipment_id')
-    maintenance_count = fields.Integer(compute='_compute_maintenance_count', string="Maintenance", store=True)
+    maintenance_count = fields.Integer(compute='_compute_maintenance_count', string="Maintenance Count", store=True)
     maintenance_open_count = fields.Integer(compute='_compute_maintenance_count', string="Current Maintenance", store=True)
     period = fields.Integer('Days between each preventive maintenance')
     next_action_date = fields.Date(compute='_compute_next_maintenance', string='Date of the next preventive maintenance', store=True)
@@ -275,7 +275,7 @@ class MaintenanceRequest(models.Model):
     description = fields.Text('Description')
     request_date = fields.Date('Request Date', track_visibility='onchange', default=fields.Date.context_today,
                                help="Date requested for the maintenance to happen")
-    owner_user_id = fields.Many2one('res.users', string='Created by', default=lambda s: s.env.uid)
+    owner_user_id = fields.Many2one('res.users', string='Created by User', default=lambda s: s.env.uid)
     category_id = fields.Many2one('maintenance.equipment.category', related='equipment_id.category_id', string='Category', store=True, readonly=True)
     equipment_id = fields.Many2one('maintenance.equipment', string='Equipment', index=True)
     technician_user_id = fields.Many2one('res.users', string='Owner', track_visibility='onchange', oldname='user_id')

From e1628532d67689e7b0aba250ee66642ac94fa201 Mon Sep 17 00:00:00 2001
From: Kinjal Mehta <kme@odoo.com>
Date: Wed, 6 Dec 2017 14:46:34 +0530
Subject: [PATCH 13/22] [IMP] mrp: changed duplicate field label in the same
 model

---
 addons/mrp/models/mrp_workcenter.py            | 4 ++--
 addons/mrp/models/mrp_workorder.py             | 1 -
 addons/mrp/models/res_config_settings.py       | 2 +-
 addons/mrp/views/res_config_settings_views.xml | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/mrp/models/mrp_workcenter.py b/addons/mrp/models/mrp_workcenter.py
index 431f65a2145..7a255dcc994 100644
--- a/addons/mrp/models/mrp_workcenter.py
+++ b/addons/mrp/models/mrp_workcenter.py
@@ -36,14 +36,14 @@ class MrpWorkcenter(models.Model):
     workorder_count = fields.Integer('# Work Orders', compute='_compute_workorder_count')
     workorder_ready_count = fields.Integer('# Read Work Orders', compute='_compute_workorder_count')
     workorder_progress_count = fields.Integer('Total Running Orders', compute='_compute_workorder_count')
-    workorder_pending_count = fields.Integer('Total Running Orders', compute='_compute_workorder_count')
+    workorder_pending_count = fields.Integer('Total Pending Orders', compute='_compute_workorder_count')
     workorder_late_count = fields.Integer('Total Late Orders', compute='_compute_workorder_count')
 
     time_ids = fields.One2many('mrp.workcenter.productivity', 'workcenter_id', 'Time Logs')
     working_state = fields.Selection([
         ('normal', 'Normal'),
         ('blocked', 'Blocked'),
-        ('done', 'In Progress')], 'Status', compute="_compute_working_state", store=True)
+        ('done', 'In Progress')], 'Workcenter Status', compute="_compute_working_state", store=True)
     blocked_time = fields.Float(
         'Blocked Time', compute='_compute_blocked_time',
         help='Blocked hour(s) over the last month', digits=(16, 2))
diff --git a/addons/mrp/models/mrp_workorder.py b/addons/mrp/models/mrp_workorder.py
index 90980117b29..9a3f093a87d 100644
--- a/addons/mrp/models/mrp_workorder.py
+++ b/addons/mrp/models/mrp_workorder.py
@@ -113,7 +113,6 @@ class MrpWorkorder(models.Model):
     final_lot_id = fields.Many2one(
         'stock.production.lot', 'Lot/Serial Number', domain="[('product_id', '=', product_id)]",
         states={'done': [('readonly', True)], 'cancel': [('readonly', True)]})
-    tracking = fields.Selection(related='production_id.product_id.tracking')
     time_ids = fields.One2many(
         'mrp.workcenter.productivity', 'workorder_id')
     is_user_working = fields.Boolean(
diff --git a/addons/mrp/models/res_config_settings.py b/addons/mrp/models/res_config_settings.py
index d7ae6ee4ee6..3cf13109582 100644
--- a/addons/mrp/models/res_config_settings.py
+++ b/addons/mrp/models/res_config_settings.py
@@ -16,7 +16,7 @@ class ResConfigSettings(models.TransientModel):
     module_mrp_workorder = fields.Boolean("Work Orders")
     module_mrp_repair = fields.Boolean("Repair")
     module_quality_control = fields.Boolean("Quality")
-    group_mrp_routings = fields.Boolean("Work Orders",
+    group_mrp_routings = fields.Boolean("Mrp",
         implied_group='mrp.group_mrp_routings')
 
     @api.model
diff --git a/addons/mrp/views/res_config_settings_views.xml b/addons/mrp/views/res_config_settings_views.xml
index 87256906259..2381b925e3b 100644
--- a/addons/mrp/views/res_config_settings_views.xml
+++ b/addons/mrp/views/res_config_settings_views.xml
@@ -17,7 +17,7 @@
                                     <field name="module_mrp_workorder" invisible="1"/>
                                 </div>
                                 <div class="o_setting_right_pane">
-                                    <label for="group_mrp_routings"/>
+                                    <label for="group_mrp_routings" string="Work Orders"/>
                                     <div class="text-muted">
                                         Process operations at specific work centers based on the routing
                                     </div>

From 1db7018095c1116f5974cea9b67cacdf1ebc9f62 Mon Sep 17 00:00:00 2001
From: Kinjal Mehta <kme@odoo.com>
Date: Wed, 6 Dec 2017 14:47:42 +0530
Subject: [PATCH 14/22] [IMP]
 point_of_sale,pos_mercury,pos_sale,pos_restaurant: changed duplicate field
 label in the same model

---
 addons/point_of_sale/models/pos_order.py         | 2 +-
 addons/point_of_sale/views/pos_order_view.xml    | 4 ++--
 addons/pos_mercury/models/pos_mercury.py         | 2 +-
 addons/pos_mercury/views/pos_mercury_views.xml   | 2 +-
 addons/pos_restaurant/models/pos_config.py       | 2 +-
 addons/pos_restaurant/views/pos_config_views.xml | 2 +-
 addons/pos_sale/models/crm_team.py               | 2 +-
 addons/pos_sale/views/sales_team_views.xml       | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/point_of_sale/models/pos_order.py b/addons/point_of_sale/models/pos_order.py
index e7ce561d56f..eabb86c522d 100644
--- a/addons/point_of_sale/models/pos_order.py
+++ b/addons/point_of_sale/models/pos_order.py
@@ -864,7 +864,7 @@ class PosOrderLine(models.Model):
     order_id = fields.Many2one('pos.order', string='Order Ref', ondelete='cascade')
     create_date = fields.Datetime(string='Creation Date', readonly=True)
     tax_ids = fields.Many2many('account.tax', string='Taxes', readonly=True)
-    tax_ids_after_fiscal_position = fields.Many2many('account.tax', compute='_get_tax_ids_after_fiscal_position', string='Taxes')
+    tax_ids_after_fiscal_position = fields.Many2many('account.tax', compute='_get_tax_ids_after_fiscal_position', string='Taxes mapped after Fiscal Position')
     pack_lot_ids = fields.One2many('pos.pack.operation.lot', 'pos_order_line_id', string='Lot/serial Number')
 
     @api.model
diff --git a/addons/point_of_sale/views/pos_order_view.xml b/addons/point_of_sale/views/pos_order_view.xml
index ae6bd51b754..c5c0fc1ddc6 100644
--- a/addons/point_of_sale/views/pos_order_view.xml
+++ b/addons/point_of_sale/views/pos_order_view.xml
@@ -37,7 +37,7 @@
                                 <field name="qty"/>
                                 <field name="price_unit" widget="monetary"/>
                                 <field name="discount" widget="monetary"/>
-                                <field name="tax_ids_after_fiscal_position" widget="many2many_tags"/>
+                                <field name="tax_ids_after_fiscal_position" widget="many2many_tags" string="Taxes"/>
                                 <field name="tax_ids" widget="many2many_tags" invisible="1"/>
                                 <field name="price_subtotal" widget="monetary"/>
                                 <field name="price_subtotal_incl" widget="monetary"/>
@@ -50,7 +50,7 @@
                                     <field name="price_unit" widget="monetary"/>
                                     <field name="price_subtotal" invisible="1" widget="monetary"/>
                                     <field name="price_subtotal_incl" invisible="1" widget="monetary"/>
-                                    <field name="tax_ids_after_fiscal_position" widget="many2many_tags"/>
+                                    <field name="tax_ids_after_fiscal_position" widget="many2many_tags" string="Taxes"/>
                                     <field name="tax_ids" widget="many2many_tags" invisible="1"/>
                                     <field name="notice"/>
                                 </group>
diff --git a/addons/pos_mercury/models/pos_mercury.py b/addons/pos_mercury/models/pos_mercury.py
index 0a329634e5e..65512565ba1 100644
--- a/addons/pos_mercury/models/pos_mercury.py
+++ b/addons/pos_mercury/models/pos_mercury.py
@@ -28,7 +28,7 @@ class AccountBankStatementLine(models.Model):
     _inherit = "account.bank.statement.line"
 
     mercury_card_number = fields.Char(string='Card Number', help='The last 4 numbers of the card used to pay')
-    mercury_prefixed_card_number = fields.Char(string='Card Number', compute='_compute_prefixed_card_number', help='The card number used for the payment.')
+    mercury_prefixed_card_number = fields.Char(string='Card Number Prefix', compute='_compute_prefixed_card_number', help='The card number used for the payment.')
     mercury_card_brand = fields.Char(string='Card Brand', help='The brand of the payment card (e.g. Visa, AMEX, ...)')
     mercury_card_owner_name = fields.Char(string='Card Owner Name', help='The name of the card owner')
     mercury_ref_no = fields.Char(string='Mercury reference number', help='Payment reference number from Mercury Pay')
diff --git a/addons/pos_mercury/views/pos_mercury_views.xml b/addons/pos_mercury/views/pos_mercury_views.xml
index d9f668b6c0d..726973d16b6 100644
--- a/addons/pos_mercury/views/pos_mercury_views.xml
+++ b/addons/pos_mercury/views/pos_mercury_views.xml
@@ -97,7 +97,7 @@
           <field name="inherit_id" ref="point_of_sale.view_pos_pos_form"/>
           <field name="arch" type="xml">
             <xpath expr="//field[@name='amount']" position="before">
-              <field name="mercury_prefixed_card_number"/>
+              <field name="mercury_prefixed_card_number" string="Card Number"/>
               <field name="mercury_card_brand"/>
               <field name="mercury_card_owner_name"/>
             </xpath>
diff --git a/addons/pos_restaurant/models/pos_config.py b/addons/pos_restaurant/models/pos_config.py
index 8a396f9ff01..07c2dd88253 100644
--- a/addons/pos_restaurant/models/pos_config.py
+++ b/addons/pos_restaurant/models/pos_config.py
@@ -13,7 +13,7 @@ class PosConfig(models.Model):
     floor_ids = fields.One2many('restaurant.floor', 'pos_config_id', string='Restaurant Floors', help='The restaurant floors served by this point of sale.')
     printer_ids = fields.Many2many('restaurant.printer', 'pos_config_printer_rel', 'config_id', 'printer_id', string='Order Printers')
     is_table_management = fields.Boolean('Table Management')
-    is_order_printer = fields.Boolean('Order Printers')
+    is_order_printer = fields.Boolean('Order Printer')
     module_pos_restaurant = fields.Boolean(default=True)
 
     @api.onchange('iface_tipproduct')
diff --git a/addons/pos_restaurant/views/pos_config_views.xml b/addons/pos_restaurant/views/pos_config_views.xml
index be94d8fd3ff..2c5ecbc87bb 100644
--- a/addons/pos_restaurant/views/pos_config_views.xml
+++ b/addons/pos_restaurant/views/pos_config_views.xml
@@ -57,7 +57,7 @@
                         <field name="is_order_printer"/>
                     </div>
                     <div class="o_setting_right_pane">
-                        <label for="is_order_printer"/>
+                        <label for="is_order_printer" string="Order Printers"/>
                         <span class="fa fa-lg fa-cutlery" title="For bars and restaurants"/>
                         <div class="text-muted">
                             Print orders at the kitchen, at the bar, etc.
diff --git a/addons/pos_sale/models/crm_team.py b/addons/pos_sale/models/crm_team.py
index e11727e0a1d..27eec46542f 100644
--- a/addons/pos_sale/models/crm_team.py
+++ b/addons/pos_sale/models/crm_team.py
@@ -18,7 +18,7 @@ class CrmTeam(models.Model):
         ('month', 'Month'),
         ('user', 'Salesperson'),
         ('pos', 'Point of Sale'),
-    ], string='Group by', default='day', help="How this channel's dashboard graph will group the results.")
+    ], string='Group by POS', default='day', help="How this channel's dashboard graph will group the results.")
 
     @api.onchange('dashboard_graph_group_pos')
     def _onchange_dashboard_graph_group_pos(self):
diff --git a/addons/pos_sale/views/sales_team_views.xml b/addons/pos_sale/views/sales_team_views.xml
index 044d4abc40b..076df092699 100644
--- a/addons/pos_sale/views/sales_team_views.xml
+++ b/addons/pos_sale/views/sales_team_views.xml
@@ -12,7 +12,7 @@
                 <attribute name="attrs">{'invisible': ['|', ('dashboard_graph_model', '=', 'crm.opportunity.report'), ('team_type', '=', 'pos')]}</attribute>
             </xpath>
             <xpath expr="//field[@name='dashboard_graph_group']" position="after">
-                <field name="dashboard_graph_group_pos" attrs="{'invisible': [('team_type', '!=', 'pos')]}"/>
+                <field name="dashboard_graph_group_pos" string="Group by" attrs="{'invisible': [('team_type', '!=', 'pos')]}"/>
             </xpath>
         </field>
     </record>

From cf748e030c45d415e96951ebbad3229c3de1a074 Mon Sep 17 00:00:00 2001
From: Kinjal Mehta <kme@odoo.com>
Date: Wed, 6 Dec 2017 15:54:33 +0530
Subject: [PATCH 15/22] [IMP] product,product_margin: changed duplicate field
 label in the same model

---
 addons/product/views/product_template_views.xml       | 2 +-
 addons/product/views/product_views.xml                | 2 +-
 addons/product_margin/models/product_product.py       | 4 ++--
 addons/product_margin/views/product_product_views.xml | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/product/views/product_template_views.xml b/addons/product/views/product_template_views.xml
index 1cd7f1a166c..321135c75b1 100644
--- a/addons/product/views/product_template_views.xml
+++ b/addons/product/views/product_template_views.xml
@@ -8,7 +8,7 @@
                 <field name="sequence" widget="handle"/>
                 <field name="default_code"/>
                 <field name="name"/>
-                <field name="list_price"/>
+                <field name="list_price" string="Sales Price"/>
                 <field name="standard_price"/>
                 <field name="categ_id"/>
                 <field name="type"/>
diff --git a/addons/product/views/product_views.xml b/addons/product/views/product_views.xml
index 5345158eb59..016fa5bad8e 100644
--- a/addons/product/views/product_views.xml
+++ b/addons/product/views/product_views.xml
@@ -47,7 +47,7 @@
                                     <field name="categ_id" string="Product Category"/>
                                 </group>
                                 <group name="group_standard_price">
-                                    <field name="list_price" widget='monetary' options="{'currency_field': 'currency_id'}"/>
+                                    <field name="list_price" string="Sales Price" widget='monetary' options="{'currency_field': 'currency_id'}"/>
                                     <field name="company_id" groups="base.group_multi_company"
                                         options="{'no_create': True}"/>
                                     <field name="uom_id" groups="product.group_uom" options="{'no_create': True}"/>
diff --git a/addons/product_margin/models/product_product.py b/addons/product_margin/models/product_product.py
index 3dd735b26a4..f9ff3927466 100644
--- a/addons/product_margin/models/product_product.py
+++ b/addons/product_margin/models/product_product.py
@@ -17,9 +17,9 @@ class ProductProduct(models.Model):
             ('open_paid', 'Open and Paid'),
             ('draft_open_paid', 'Draft, Open and Paid')
         ], string='Invoice State', readonly=True)
-    sale_avg_price = fields.Float(compute='_compute_product_margin_fields_values', string='Avg. Unit Price',
+    sale_avg_price = fields.Float(compute='_compute_product_margin_fields_values', string='Avg. Unit Price of sale',
         help="Avg. Price in Customer Invoices.")
-    purchase_avg_price = fields.Float(compute='_compute_product_margin_fields_values', string='Avg. Unit Price',
+    purchase_avg_price = fields.Float(compute='_compute_product_margin_fields_values', string='Avg. Unit Price of purchase',
         help="Avg. Price in Vendor Bills ")
     sale_num_invoiced = fields.Float(compute='_compute_product_margin_fields_values', string='# Invoiced in Sale',
         help="Sum of Quantity in Customer Invoices")
diff --git a/addons/product_margin/views/product_product_views.xml b/addons/product_margin/views/product_product_views.xml
index 8612b355a1d..a36d35da25f 100644
--- a/addons/product_margin/views/product_product_views.xml
+++ b/addons/product_margin/views/product_product_views.xml
@@ -31,7 +31,7 @@
                             <field name="invoice_state" />
 
                             <separator string="Sales" colspan="4"/>
-                            <field name="sale_avg_price"/>
+                            <field name="sale_avg_price" string="Avg. Unit Price"/>
                             <field name="list_price" string="Catalog Price" readonly="1"/>
                             <field name="sale_num_invoiced" />
                             <field name="sales_gap" />
@@ -39,7 +39,7 @@
                             <field name="sale_expected" />
 
                             <separator string="Purchases" colspan="4"/>
-                            <field name="purchase_avg_price"/>
+                            <field name="purchase_avg_price" string="Avg. Unit Price"/>
                             <field name="standard_price" string="Standard Price" readonly="1"/>
                             <field name="purchase_num_invoiced" />
                             <field name="purchase_gap" />
@@ -66,7 +66,7 @@
                 <tree string="Product Margins">
                     <field name="name"/>
                     <field name="default_code"/>
-                    <field name="sale_avg_price"/>
+                    <field name="sale_avg_price" string="Avg. Unit Price"/>
                     <field name="sale_num_invoiced"/>
                     <field name="turnover" sum="Turnover"/>
                     <field name="sales_gap" sum="Sales Gap"/>

From aaae189baf88f0543fe845d9dc10ff64b1c40160 Mon Sep 17 00:00:00 2001
From: Kinjal Mehta <kme@odoo.com>
Date: Wed, 6 Dec 2017 14:48:49 +0530
Subject: [PATCH 16/22] [IMP] project: changed duplicate field label in the
 same model

---
 addons/project/models/project.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/project/models/project.py b/addons/project/models/project.py
index 3fcae1781db..1c574e81eb5 100644
--- a/addons/project/models/project.py
+++ b/addons/project/models/project.py
@@ -197,8 +197,8 @@ class Project(models.Model):
         default=lambda self: self.env.user.company_id.resource_calendar_id.id,
         help="Timetable working hours to adjust the gantt diagram report")
     type_ids = fields.Many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', string='Tasks Stages')
-    task_count = fields.Integer(compute='_compute_task_count', string="Tasks")
-    task_needaction_count = fields.Integer(compute='_compute_task_needaction_count', string="Tasks")
+    task_count = fields.Integer(compute='_compute_task_count', string="# of Tasks")
+    task_needaction_count = fields.Integer(compute='_compute_task_needaction_count', string="# of Tasks need action")
     task_ids = fields.One2many('project.task', 'project_id', string='Tasks',
                                domain=['|', ('stage_id.fold', '=', False), ('stage_id', '=', False)])
     color = fields.Integer(string='Color Index')
@@ -482,7 +482,7 @@ class Task(models.Model):
         ('done', 'Green'),
         ('blocked', 'Red')], string='Kanban State',
         copy=False, default='normal', required=True)
-    kanban_state_label = fields.Char(compute='_compute_kanban_state_label', string='Kanban State', track_visibility='onchange')
+    kanban_state_label = fields.Char(compute='_compute_kanban_state_label', string='Kanban State Label', track_visibility='onchange')
     create_date = fields.Datetime(index=True)
     write_date = fields.Datetime(index=True)  #not displayed in the view but it might be useful with base_automation module (and it needs to be defined first for that)
     date_start = fields.Datetime(string='Starting Date',

From c90348d4823079aa4586d24efa75e4457258ca44 Mon Sep 17 00:00:00 2001
From: Kinjal Mehta <kme@odoo.com>
Date: Wed, 6 Dec 2017 14:49:15 +0530
Subject: [PATCH 17/22] [IMP] purchase: changed duplicate field label in the
 same model

---
 addons/purchase/models/purchase.py                  | 2 +-
 addons/purchase/models/res_config_settings.py       | 4 ++--
 addons/purchase/views/res_config_settings_views.xml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/purchase/models/purchase.py b/addons/purchase/models/purchase.py
index a8ae709e023..9f3e03eb66b 100644
--- a/addons/purchase/models/purchase.py
+++ b/addons/purchase/models/purchase.py
@@ -138,7 +138,7 @@ class PurchaseOrder(models.Model):
         ('invoiced', 'No Bill to Receive'),
         ], string='Billing Status', compute='_get_invoiced', store=True, readonly=True, copy=False, default='no')
 
-    picking_count = fields.Integer(compute='_compute_picking', string='Receptions', default=0, store=True)
+    picking_count = fields.Integer(compute='_compute_picking', string='Picking count', default=0, store=True)
     picking_ids = fields.Many2many('stock.picking', compute='_compute_picking', string='Receptions', copy=False, store=True)
 
     # There is no inverse function on purpose since the date may be different on each line
diff --git a/addons/purchase/models/res_config_settings.py b/addons/purchase/models/res_config_settings.py
index ffb24e9e488..5297ef9441e 100644
--- a/addons/purchase/models/res_config_settings.py
+++ b/addons/purchase/models/res_config_settings.py
@@ -12,7 +12,7 @@ class ResConfigSettings(models.TransientModel):
     po_order_approval = fields.Boolean("Order Approval", default=lambda self: self.env.user.company_id.po_double_validation == 'two_step')
     po_double_validation = fields.Selection(related='company_id.po_double_validation', string="Levels of Approvals *")
     po_double_validation_amount = fields.Monetary(related='company_id.po_double_validation_amount', string="Minimum Amount", currency_field='company_currency_id')
-    company_currency_id = fields.Many2one('res.currency', related='company_id.currency_id', readonly=True,
+    company_currency_id = fields.Many2one('res.currency', related='company_id.currency_id', string="Company Currency", readonly=True,
         help='Utility field to express amount currency')
     default_purchase_method = fields.Selection([
         ('purchase', 'Ordered quantities'),
@@ -21,7 +21,7 @@ class ResConfigSettings(models.TransientModel):
         help="This default value is applied to any new product created. "
         "This can be changed in the product detail form.", default="receive")
     module_purchase_requisition = fields.Boolean("Purchase Agreements")
-    group_warning_purchase = fields.Boolean("Warnings", implied_group='purchase.group_warning_purchase')
+    group_warning_purchase = fields.Boolean("Warnings for Purchase", implied_group='purchase.group_warning_purchase')
     module_stock_dropshipping = fields.Boolean("Dropshipping")
     group_manage_vendor_price = fields.Boolean("Vendor Pricelists",
         implied_group="purchase.group_manage_vendor_price")
diff --git a/addons/purchase/views/res_config_settings_views.xml b/addons/purchase/views/res_config_settings_views.xml
index ac4309e3523..ee31000c9e4 100644
--- a/addons/purchase/views/res_config_settings_views.xml
+++ b/addons/purchase/views/res_config_settings_views.xml
@@ -62,7 +62,7 @@
                                 <field name="group_warning_purchase"/>
                             </div>
                             <div class="o_setting_right_pane">
-                                <label for="group_warning_purchase"/>
+                                <label for="group_warning_purchase" string="Warnings"/>
                                 <div class="text-muted">
                                     Get warnings in orders for products or vendors
                                 </div>

From 3000e61d69e804f290db4258b8c634aabdee05e2 Mon Sep 17 00:00:00 2001
From: Kinjal Mehta <kme@odoo.com>
Date: Wed, 6 Dec 2017 14:49:39 +0530
Subject: [PATCH 18/22] [IMP] rating: changed duplicate field label in the same
 model

---
 addons/rating/models/rating.py      | 2 +-
 addons/rating/views/rating_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/rating/models/rating.py b/addons/rating/models/rating.py
index 67360ffd3d3..d7d8a06c151 100644
--- a/addons/rating/models/rating.py
+++ b/addons/rating/models/rating.py
@@ -48,7 +48,7 @@ class Rating(models.Model):
         ('satisfied', 'Satisfied'),
         ('not_satisfied', 'Not satisfied'),
         ('highly_dissatisfied', 'Highly dissatisfied'),
-        ('no_rating', 'No Rating yet')], string='Rating', store=True, compute='_compute_rating_text', readonly=True)
+        ('no_rating', 'No Rating yet')], string='Rating Text', store=True, compute='_compute_rating_text', readonly=True)
     feedback = fields.Text('Comment', help="Reason of the rating")
     message_id = fields.Many2one('mail.message', string="Linked message", help="Associated message when posting a review. Mainly used in website addons.", index=True)
     access_token = fields.Char('Security Token', default=new_access_token, help="Access token to set the rating of the value")
diff --git a/addons/rating/views/rating_view.xml b/addons/rating/views/rating_view.xml
index 5c6100cadb1..de79c63a053 100644
--- a/addons/rating/views/rating_view.xml
+++ b/addons/rating/views/rating_view.xml
@@ -132,7 +132,7 @@
             <field name="arch" type="xml">
                 <search string="Ratings">
                     <field name="rated_partner_id"/>
-                    <field name="rating"/>
+                    <field name="rating" string="Rating"/>
                     <field name="partner_id"/>
                     <field name="res_name" filter_domain="[('res_name','ilike',self)]"/>
                     <field name="res_id"/>

From c7821f528c8655e0fe2326892795fdd59a1ef232 Mon Sep 17 00:00:00 2001
From: Kinjal Mehta <kme@odoo.com>
Date: Wed, 6 Dec 2017 14:50:19 +0530
Subject: [PATCH 19/22] [IMP] sale,sales_team: changed duplicate field label in
 the same model

---
 addons/sale/models/res_config_settings.py       | 8 ++++----
 addons/sale/models/res_partner.py               | 2 +-
 addons/sale/models/sale.py                      | 4 ++--
 addons/sale/views/res_config_settings_views.xml | 4 ++--
 addons/sales_team/models/res_users.py           | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/sale/models/res_config_settings.py b/addons/sale/models/res_config_settings.py
index 06cbc88432f..b4fb00bc30b 100644
--- a/addons/sale/models/res_config_settings.py
+++ b/addons/sale/models/res_config_settings.py
@@ -16,19 +16,19 @@ class ResConfigSettings(models.TransientModel):
     group_discount_per_so_line = fields.Boolean("Discounts", implied_group='sale.group_discount_per_so_line')
     module_sale_margin = fields.Boolean("Margins")
     group_sale_layout = fields.Boolean("Sections on Sales Orders", implied_group='sale.group_sale_layout')
-    group_warning_sale = fields.Boolean("Warnings", implied_group='sale.group_warning_sale')
+    group_warning_sale = fields.Boolean("Warnings for Sale", implied_group='sale.group_warning_sale')
     portal_confirmation = fields.Boolean('Online Signature & Payment')
     portal_confirmation_options = fields.Selection([
         ('sign', 'Signature'),
         ('pay', 'Payment')], string="Online Signature & Payment options")
-    module_sale_payment = fields.Boolean("Online Signature & Payment", help='Technical field implied by user choice of online_confirmation')
+    module_sale_payment = fields.Boolean("Sale Payment", help='Technical field implied by user choice of online_confirmation')
     module_website_quote = fields.Boolean("Quotations Templates")
     group_sale_delivery_address = fields.Boolean("Customer Addresses", implied_group='sale.group_delivery_invoice_address')
     multi_sales_price = fields.Boolean("Multiple Sales Prices per Product")
     multi_sales_price_method = fields.Selection([
         ('percentage', 'Multiple prices per product (e.g. customer segments, currencies)'),
         ('formula', 'Prices computed from formulas (discounts, margins, roundings)')
-        ], default='percentage', string="Pricelists")
+        ], default='percentage', string="Pricelists Method")
     sale_pricelist_setting = fields.Selection([
         ('fixed', 'A single sales price per product'),
         ('percentage', 'Multiple prices per product (e.g. customer segments, currencies)'),
@@ -60,7 +60,7 @@ class ResConfigSettings(models.TransientModel):
         domain="[('type', '=', 'service')]",
         oldname='deposit_product_id_setting',
         help='Default product used for payment advances')
-    auto_done_setting = fields.Boolean("Lock Confirmed Orders")
+    auto_done_setting = fields.Boolean("Auto Done Setting")
     module_website_sale_digital = fields.Boolean("Sell digital products - provide downloadable content on your customer portal")
 
     auth_signup_uninvited = fields.Selection([
diff --git a/addons/sale/models/res_partner.py b/addons/sale/models/res_partner.py
index f382de1e18c..4d3fb5a19c4 100644
--- a/addons/sale/models/res_partner.py
+++ b/addons/sale/models/res_partner.py
@@ -10,7 +10,7 @@ class ResPartner(models.Model):
 
     sale_order_count = fields.Integer(compute='_compute_sale_order_count', string='# of Sales Order')
     sale_order_ids = fields.One2many('sale.order', 'partner_id', 'Sales Order')
-    sale_warn = fields.Selection(WARNING_MESSAGE, 'Sales Order', default='no-message', help=WARNING_HELP, required=True)
+    sale_warn = fields.Selection(WARNING_MESSAGE, 'Sales Order Warning', default='no-message', help=WARNING_HELP, required=True)
     sale_warn_msg = fields.Text('Message for Sales Order')
 
     def _compute_sale_order_count(self):
diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py
index 2e009e09d18..e29ace879b4 100644
--- a/addons/sale/models/sale.py
+++ b/addons/sale/models/sale.py
@@ -843,7 +843,7 @@ class SaleOrderLine(models.Model):
     price_unit = fields.Float('Unit Price', required=True, digits=dp.get_precision('Product Price'), default=0.0)
 
     price_subtotal = fields.Monetary(compute='_compute_amount', string='Subtotal', readonly=True, store=True)
-    price_tax = fields.Float(compute='_compute_amount', string='Taxes', readonly=True, store=True)
+    price_tax = fields.Float(compute='_compute_amount', string='Total Tax', readonly=True, store=True)
     price_total = fields.Monetary(compute='_compute_amount', string='Total', readonly=True, store=True)
 
     price_reduce = fields.Float(compute='_get_price_reduce', string='Price Reduce', digits=dp.get_precision('Product Price'), readonly=True, store=True)
@@ -855,7 +855,7 @@ class SaleOrderLine(models.Model):
 
     product_id = fields.Many2one('product.product', string='Product', domain=[('sale_ok', '=', True)], change_default=True, ondelete='restrict', required=True)
     product_updatable = fields.Boolean(compute='_compute_product_updatable', string='Can Edit Product', readonly=True, default=True)
-    product_uom_qty = fields.Float(string='Quantity', digits=dp.get_precision('Product Unit of Measure'), required=True, default=1.0)
+    product_uom_qty = fields.Float(string='Ordered Quantity', digits=dp.get_precision('Product Unit of Measure'), required=True, default=1.0)
     product_uom = fields.Many2one('product.uom', string='Unit of Measure', required=True)
     # Non-stored related field to allow portal user to see the image of the product he has ordered
     product_image = fields.Binary('Product Image', related="product_id.image", store=False)
diff --git a/addons/sale/views/res_config_settings_views.xml b/addons/sale/views/res_config_settings_views.xml
index 651c9cf5909..d3315deb754 100644
--- a/addons/sale/views/res_config_settings_views.xml
+++ b/addons/sale/views/res_config_settings_views.xml
@@ -219,7 +219,7 @@
                                 <field name="group_warning_sale"/>
                             </div>
                             <div class="o_setting_right_pane">
-                                <label for="group_warning_sale"/>
+                                <label for="group_warning_sale" string="Warnings"/>
                                 <div class="text-muted">
                                     Get warnings in orders for products or customers
                                 </div>
@@ -246,7 +246,7 @@
                                 <field name="auto_done_setting"/>
                             </div>
                             <div class="o_setting_right_pane">
-                                <label for="auto_done_setting"/>
+                                <label for="auto_done_setting" string="Lock Confirmed Orders"/>
                                 <div class="text-muted">
                                     No longer edit orders once confirmed
                                 </div>
diff --git a/addons/sales_team/models/res_users.py b/addons/sales_team/models/res_users.py
index 325664abae6..9d396046ca3 100644
--- a/addons/sales_team/models/res_users.py
+++ b/addons/sales_team/models/res_users.py
@@ -8,7 +8,7 @@ class ResUsers(models.Model):
     _inherit = 'res.users'
 
     sale_team_id = fields.Many2one(
-        'crm.team', 'Sales Channel',
+        'crm.team', 'User Sales Channel',
         help='Sales Channel the user is member of. Used to compute the members of a sales channel through the inverse one2many')
 
     @api.model

From f4ce2f77186892e8a72ace87217fc2b97c002c0c Mon Sep 17 00:00:00 2001
From: Kinjal Mehta <kme@odoo.com>
Date: Thu, 7 Dec 2017 12:59:41 +0530
Subject: [PATCH 20/22] [IMP] stock,sale_stock: changed duplicate field label
 in the same model

---
 addons/sale_stock/models/res_config_settings.py       | 2 +-
 addons/sale_stock/views/res_config_settings_views.xml | 2 +-
 addons/stock/models/res_config_settings.py            | 4 ++--
 addons/stock/models/stock_inventory.py                | 2 +-
 addons/stock/views/res_config_settings_views.xml      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/sale_stock/models/res_config_settings.py b/addons/sale_stock/models/res_config_settings.py
index a6e006caec2..fba1d57e4f2 100644
--- a/addons/sale_stock/models/res_config_settings.py
+++ b/addons/sale_stock/models/res_config_settings.py
@@ -19,7 +19,7 @@ class ResConfigSettings(models.TransientModel):
     default_picking_policy = fields.Selection([
         ('direct', 'Ship products as soon as available, with back orders'),
         ('one', 'Ship all products at once')
-        ], "Shipping Management", default='direct', default_model="sale.order", required=True)
+        ], "Picking Policy", default='direct', default_model="sale.order", required=True)
 
     @api.onchange('use_security_lead')
     def _onchange_use_security_lead(self):
diff --git a/addons/sale_stock/views/res_config_settings_views.xml b/addons/sale_stock/views/res_config_settings_views.xml
index cf734b0dd66..1060212f00c 100644
--- a/addons/sale_stock/views/res_config_settings_views.xml
+++ b/addons/sale_stock/views/res_config_settings_views.xml
@@ -75,7 +75,7 @@
                 </div>
                 <div class="col-xs-12 col-md-6 o_setting_box">
                     <div class="o_setting_right_pane">
-                        <label for="default_picking_policy"/>
+                        <label for="default_picking_policy" string="Shipping Management"/>
                         <div class="text-muted">
                             When to start shipping
                         </div>
diff --git a/addons/stock/models/res_config_settings.py b/addons/stock/models/res_config_settings.py
index 79adb8fb349..281b1bd8ea5 100644
--- a/addons/stock/models/res_config_settings.py
+++ b/addons/stock/models/res_config_settings.py
@@ -23,8 +23,8 @@ class ResConfigSettings(models.TransientModel):
     group_stock_adv_location = fields.Boolean("Multi-Step Routes",
         implied_group='stock.group_adv_location',
         help="Add and customize route operations to process product moves in your warehouse(s): e.g. unload > quality control > stock for incoming products, pick > pack > ship for outgoing products. \n You can also set putaway strategies on warehouse locations in order to send incoming products into specific child locations straight away (e.g. specific bins, racks).")
-    group_warning_stock = fields.Boolean("Warnings", implied_group='stock.group_warning_stock')
-    propagation_minimum_delta = fields.Integer(related='company_id.propagation_minimum_delta', string="No Rescheduling Propagation")
+    group_warning_stock = fields.Boolean("Warnings for Stock", implied_group='stock.group_warning_stock')
+    propagation_minimum_delta = fields.Integer(related='company_id.propagation_minimum_delta', string="Minimum Delta for Propagation")
     use_propagation_minimum_delta = fields.Boolean(
         string="No Rescheduling Propagation",
         oldname='default_new_propagation_minimum_delta',
diff --git a/addons/stock/models/stock_inventory.py b/addons/stock/models/stock_inventory.py
index 0544501cb11..9a706eb342a 100644
--- a/addons/stock/models/stock_inventory.py
+++ b/addons/stock/models/stock_inventory.py
@@ -336,7 +336,7 @@ class InventoryLine(models.Model):
         'Theoretical Quantity', compute='_compute_theoretical_qty',
         digits=dp.get_precision('Product Unit of Measure'), readonly=True, store=True)
     inventory_location_id = fields.Many2one(
-        'stock.location', 'Location', related='inventory_id.location_id', related_sudo=False)
+        'stock.location', 'Inventory Location', related='inventory_id.location_id', related_sudo=False)
 
     @api.one
     @api.depends('location_id', 'product_id', 'package_id', 'product_uom_id', 'company_id', 'prod_lot_id', 'partner_id')
diff --git a/addons/stock/views/res_config_settings_views.xml b/addons/stock/views/res_config_settings_views.xml
index 63aa5467458..77ca65baefd 100644
--- a/addons/stock/views/res_config_settings_views.xml
+++ b/addons/stock/views/res_config_settings_views.xml
@@ -52,7 +52,7 @@
                                     <field name="group_warning_stock"/>
                                 </div>
                                 <div class="o_setting_right_pane">
-                                    <label for="group_warning_stock"/>
+                                    <label for="group_warning_stock" string="Warnings"/>
                                     <div class="text-muted">
                                         Get informative or blocking warnings on partners
                                     </div>

From 145c1fd9312c57ae6ba61c952dfc308c724b8e4c Mon Sep 17 00:00:00 2001
From: Kinjal Mehta <kme@odoo.com>
Date: Wed, 6 Dec 2017 15:56:18 +0530
Subject: [PATCH 21/22] [IMP]
 website,website_blog,website_event_track,website_sale_stock,website_sale:
 changed duplicate field label in the same model

---
 addons/website/models/ir_attachment.py                        | 2 +-
 addons/website_blog/models/website_blog.py                    | 2 +-
 addons/website_event_track/models/event.py                    | 4 ++--
 addons/website_event_track/views/event_views.xml              | 4 ++--
 addons/website_sale/models/res_config_settings.py             | 2 +-
 addons/website_sale_stock/models/res_config_settings.py       | 2 +-
 addons/website_sale_stock/views/product_template_views.xml    | 2 +-
 addons/website_sale_stock/views/res_config_settings_views.xml | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/website/models/ir_attachment.py b/addons/website/models/ir_attachment.py
index 215b182bfb8..a71038adbf5 100644
--- a/addons/website/models/ir_attachment.py
+++ b/addons/website/models/ir_attachment.py
@@ -9,4 +9,4 @@ class Attachment(models.Model):
     _inherit = "ir.attachment"
 
     # related for backward compatibility with saas-6
-    website_url = fields.Char(string="Attachment URL", related='local_url', deprecated=True)
+    website_url = fields.Char(string="Website URL", related='local_url', deprecated=True)
diff --git a/addons/website_blog/models/website_blog.py b/addons/website_blog/models/website_blog.py
index d215ba39ddd..00cfc6ff5cf 100644
--- a/addons/website_blog/models/website_blog.py
+++ b/addons/website_blog/models/website_blog.py
@@ -148,7 +148,7 @@ class BlogPost(models.Model):
     post_date = fields.Datetime('Publishing date', compute='_compute_post_date', inverse='_set_post_date', store=True,
                                 help="The blog post will be visible for your visitors as of this date on the website if it is set as published.")
     create_uid = fields.Many2one('res.users', 'Created by', index=True, readonly=True)
-    write_date = fields.Datetime('Last Modified on', index=True, readonly=True)
+    write_date = fields.Datetime('Last Updated on', index=True, readonly=True)
     write_uid = fields.Many2one('res.users', 'Last Contributor', index=True, readonly=True)
     author_avatar = fields.Binary(related='author_id.image_small', string="Avatar")
     visits = fields.Integer('No of Views')
diff --git a/addons/website_event_track/models/event.py b/addons/website_event_track/models/event.py
index 94fab7e0609..95d0f281caf 100644
--- a/addons/website_event_track/models/event.py
+++ b/addons/website_event_track/models/event.py
@@ -30,10 +30,10 @@ class Event(models.Model):
     _inherit = "event.event"
 
     track_ids = fields.One2many('event.track', 'event_id', 'Tracks')
-    track_count = fields.Integer('Tracks', compute='_compute_track_count')
+    track_count = fields.Integer('# of tracks', compute='_compute_track_count')
 
     sponsor_ids = fields.One2many('event.sponsor', 'event_id', 'Sponsors')
-    sponsor_count = fields.Integer('Sponsors', compute='_compute_sponsor_count')
+    sponsor_count = fields.Integer('# of Sponsors', compute='_compute_sponsor_count')
 
     website_track = fields.Boolean('Tracks on Website')
     website_track_proposal = fields.Boolean('Proposals on Website')
diff --git a/addons/website_event_track/views/event_views.xml b/addons/website_event_track/views/event_views.xml
index fdaf69c56eb..b74856dda64 100644
--- a/addons/website_event_track/views/event_views.xml
+++ b/addons/website_event_track/views/event_views.xml
@@ -28,13 +28,13 @@
                             type="action"
                             class="oe_stat_button"
                             icon="fa-inbox">
-                        <field name="track_count" widget="statinfo"/>
+                        <field name="track_count" string="Tracks" widget="statinfo"/>
                     </button>
                     <button name="%(action_event_sponsor_from_event)d"
                             type="action"
                             class="oe_stat_button"
                             icon="fa-users">
-                        <field name="sponsor_count" widget="statinfo"/>
+                        <field name="sponsor_count" string="Sponsors" widget="statinfo"/>
                     </button>
                 </button>
                 <label for="website_menu" position="after">
diff --git a/addons/website_sale/models/res_config_settings.py b/addons/website_sale/models/res_config_settings.py
index 74ad507499d..824ffd989cc 100644
--- a/addons/website_sale/models/res_config_settings.py
+++ b/addons/website_sale/models/res_config_settings.py
@@ -22,7 +22,7 @@ class ResConfigSettings(models.TransientModel):
 
     salesperson_id = fields.Many2one('res.users', related='website_id.salesperson_id', string='Salesperson')
     salesteam_id = fields.Many2one('crm.team', related='website_id.salesteam_id', string='Sales Channel', domain=[('team_type', '!=', 'pos')])
-    module_website_sale_delivery = fields.Boolean("Shipping Costs")
+    module_website_sale_delivery = fields.Boolean("Shipping Costs in eCommerce")
     # field used to have a nice radio in form view, resuming the 2 fields above
     sale_delivery_settings = fields.Selection([
         ('none', 'No shipping management on website'),
diff --git a/addons/website_sale_stock/models/res_config_settings.py b/addons/website_sale_stock/models/res_config_settings.py
index 04152d8ccb3..73b02412726 100644
--- a/addons/website_sale_stock/models/res_config_settings.py
+++ b/addons/website_sale_stock/models/res_config_settings.py
@@ -12,7 +12,7 @@ class ResConfigSettings(models.TransientModel):
         ('always', 'Show inventory on website and prevent sales if not enough stock'),
         ('threshold', 'Show inventory below a threshold and prevent sales if not enough stock'),
         ('custom', 'Show product-specific notifications'),
-    ], string='Inventory', default='never')
+    ], string='Inventory Availability', default='never')
     available_threshold = fields.Float(string='Availability Threshold')
 
     @api.multi
diff --git a/addons/website_sale_stock/views/product_template_views.xml b/addons/website_sale_stock/views/product_template_views.xml
index 6081ea7fa94..0869099673b 100644
--- a/addons/website_sale_stock/views/product_template_views.xml
+++ b/addons/website_sale_stock/views/product_template_views.xml
@@ -6,7 +6,7 @@
         <field name="inherit_id" ref="website_sale.product_template_form_view" />
         <field name="arch" type="xml">
             <field name="website_style_ids" position="before">
-                <field name="inventory_availability" widget="selection" attrs="{'invisible':[('type', 'in', ['service', 'consu'])]}"/>
+                <field name="inventory_availability" string="Inventory" widget="selection" attrs="{'invisible':[('type', 'in', ['service', 'consu'])]}"/>
                 <field name="available_threshold" attrs="{'invisible': ['|', ('type', 'in', ['service', 'consu']), ('inventory_availability', '!=', 'threshold')], 'required': [('inventory_availability', '=', 'threshold'), ('type', '=', 'product')]}"/>
                 <field name="custom_message" attrs="{'invisible': ['|', ('type', 'in', ['service', 'consu']), ('inventory_availability', '!=', 'custom')]}"/>
             </field>
diff --git a/addons/website_sale_stock/views/res_config_settings_views.xml b/addons/website_sale_stock/views/res_config_settings_views.xml
index b35f6210b22..372d8f14279 100644
--- a/addons/website_sale_stock/views/res_config_settings_views.xml
+++ b/addons/website_sale_stock/views/res_config_settings_views.xml
@@ -14,7 +14,7 @@
                 <div class="content-group">
                     <div class="row mt16" title="Default availability mode set on newly created stockable products. This can be changed at the product level.">
                         <label for="inventory_availability" string="Default Availability Mode" class="col-md-3 o_light_label" />
-                        <field name="inventory_availability" />
+                        <field name="inventory_availability" string="Inventory"/>
                     </div><br/>
                     <div class="row" attrs="{'invisible': [('inventory_availability', '!=', 'threshold')]}">
                         <label for="available_threshold" string="Default threshold" class="col-md-3 o_light_label" />

From 564988f58db57209365767314e17df20a3c21422 Mon Sep 17 00:00:00 2001
From: Kinjal Mehta <kme@odoo.com>
Date: Wed, 6 Dec 2017 14:53:30 +0530
Subject: [PATCH 22/22] [IMP] test_new_api: changed duplicate field label in
 the same model

---
 odoo/addons/test_new_api/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/odoo/addons/test_new_api/models.py b/odoo/addons/test_new_api/models.py
index ab8ebdb1ac4..e6673e4f776 100644
--- a/odoo/addons/test_new_api/models.py
+++ b/odoo/addons/test_new_api/models.py
@@ -317,8 +317,8 @@ class Related(models.Model):
 
     name = fields.Char()
     # related fields with a single field
-    related_name = fields.Char(related='name')
-    related_related_name = fields.Char(related='related_name')
+    related_name = fields.Char(related='name', string='A related on Name')
+    related_related_name = fields.Char(related='related_name', string='A related on a related on Name')
 
 
 class ComputeInverse(models.Model):