From 532db63193503e2991c0a745df5688fbf29f7bdf Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Thu, 13 Jun 2024 01:09:47 +0200 Subject: [PATCH] [IMP] product_standard_margin : Remove 'theoretical' in the name of field, as it is based on the field cost and sale price, that doesn't contain 'theoretical' --- product_standard_margin/models/product_product.py | 12 ++++++------ product_standard_margin/models/product_template.py | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/product_standard_margin/models/product_product.py b/product_standard_margin/models/product_product.py index a63e86a7..bc1ede62 100644 --- a/product_standard_margin/models/product_product.py +++ b/product_standard_margin/models/product_product.py @@ -20,10 +20,10 @@ class ProductProduct(models.Model): standard_margin = fields.Float( compute="_compute_margin", - string="Theorical Margin", + string="Margin", store=True, digits="Product Price", - help="Theorical Margin is [ sale price (Wo Tax) - cost price ] " + help="Margin is [ sale price (Wo Tax) - cost price ] " "of the product form (not based on historical values). " "Take care of tax include and exclude. If no sale price, " "the margin will be negativ.", @@ -31,20 +31,20 @@ class ProductProduct(models.Model): standard_margin_rate = fields.Float( compute="_compute_margin", - string="Theorical Margin (%)", + string="Margin (%)", store=True, digits="Product Price", - help="Margin rate is [ Theorical Margin / sale price (Wo Tax) ] " + help="Margin rate is [ Margin / sale price (Wo Tax) ] " "of the product form (not based on historical values)." "Take care of tax include and exclude.. If no sale price " "set, will display 999.0", ) standard_markup_rate = fields.Float( compute="_compute_margin", - string="Theorical Markup (%)", + string="Markup (%)", store=True, digits="Product Price", - help="Markup rate is [ Theorical Margin / cost price (Wo Tax) ] " + help="Markup rate is [ Margin / cost price (Wo Tax) ] " "of the product form (not based on historical values)." "Take care of tax include and exclude.. If no cost price " "set, will display 999.0", diff --git a/product_standard_margin/models/product_template.py b/product_standard_margin/models/product_template.py index 658b1ce3..8ff84888 100644 --- a/product_standard_margin/models/product_template.py +++ b/product_standard_margin/models/product_template.py @@ -19,9 +19,9 @@ class ProductTemplate(models.Model): standard_margin = fields.Float( compute="_compute_margin", - string="Theorical Margin", + string="Margin", digits="Product Price", - help="Theorical Margin is [ sale price (Wo Tax) - cost price ] " + help="Margin is [ sale price (Wo Tax) - cost price ] " "of the product form (not based on historical values). " "Take care of tax include and exclude. If no sale price, " "the margin will be negativ.", @@ -29,18 +29,18 @@ class ProductTemplate(models.Model): standard_margin_rate = fields.Float( compute="_compute_margin", - string="Theorical Margin (%)", + string="Margin (%)", digits="Product Price", - help="Margin rate is [ Theorical Margin / sale price (Wo Tax) ] " + help="Margin rate is [ Margin / sale price (Wo Tax) ] " "of the product form (not based on historical values)." "Take care of tax include and exclude.. If no sale price " "set, will display 999.0", ) standard_markup_rate = fields.Float( compute="_compute_margin", - string="Theorical Markup (%)", + string="Markup (%)", digits="Product Price", - help="Markup rate is [ Theorical Margin / cost price (Wo Tax) ] " + help="Markup rate is [ Margin / cost price (Wo Tax) ] " "of the product form (not based on historical values)." "Take care of tax include and exclude.. If no cost price " "set, will display 999.0",