Skip to content

Commit

Permalink
Merge PR #210 into 16.0
Browse files Browse the repository at this point in the history
Signed-off-by legalsylvain
  • Loading branch information
OCA-git-bot committed Oct 20, 2024
2 parents 9c4f767 + 532db63 commit a13f01d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions product_standard_margin/models/product_product.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,31 +20,31 @@ 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.",
)

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",
Expand Down
12 changes: 6 additions & 6 deletions product_standard_margin/models/product_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,28 @@ 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.",
)

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",
Expand Down

0 comments on commit a13f01d

Please sign in to comment.