pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] product,product_margin: changed duplicate field label in the same model

Browse Source
This commit is contained in:
Kinjal Mehta
2018-01-04 17:56:55 +05:30
parent 1db7018095
commit cf748e030c
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/product/views/product_template_views.xml
+1 -1
View File
@@ -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"/>
addons/product/views/product_views.xml
+1 -1
View File
@@ -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}"/>
addons/product_margin/models/product_product.py
+2 -2
View File
@@ -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")
addons/product_margin/views/product_product_views.xml
+3 -3
View File
@@ -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"/>