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