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] [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>