From 94ed502def588dcbbdd96040a3a0ef1ca4ee0cbd Mon Sep 17 00:00:00 2001 From: Quentin Dupont Date: Fri, 20 Dec 2024 14:43:34 +0100 Subject: [PATCH] [FIX] review remarks adressed --- mrp_bom_product_price_margin/i18n/fr.po | 20 +++++++++++-------- .../models/mrp_bom.py | 11 ++-------- .../views/view_mrp_bom.xml | 6 +++--- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/mrp_bom_product_price_margin/i18n/fr.po b/mrp_bom_product_price_margin/i18n/fr.po index 00da10e59..5f2cb89aa 100644 --- a/mrp_bom_product_price_margin/i18n/fr.po +++ b/mrp_bom_product_price_margin/i18n/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-08 13:58+0000\n" -"PO-Revision-Date: 2024-11-08 13:58+0000\n" +"POT-Creation-Date: 2024-12-20 13:38+0000\n" +"PO-Revision-Date: 2024-12-20 13:38+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -128,7 +128,7 @@ msgstr "Cela définira le coût du Produit avec ce total." #. module: mrp_bom_product_price_margin #: model:ir.model.fields,field_description:mrp_bom_product_price_margin.field_mrp_bom__product_margin_rate msgid "Margin (%)" -msgstr "Marge théorique (%)" +msgstr "Taux de marque (%)" #. module: mrp_bom_product_price_margin #: model:ir.model.fields,help:mrp_bom_product_price_margin.field_mrp_bom__product_margin_rate @@ -148,11 +148,6 @@ msgstr "" msgid "Product" msgstr "Produit" -#. module: mrp_bom_product_price_margin -#: model:ir.model.fields,field_description:mrp_bom_product_price_margin.field_mrp_bom__product_margin_rate_percentage -msgid "Product Margin" -msgstr "Produit - Marge" - #. module: mrp_bom_product_price_margin #: model:ir.model.fields,field_description:mrp_bom_product_price_margin.field_mrp_bom__product_sale_price msgid "Product Sale Price" @@ -188,6 +183,15 @@ msgstr "Sous-total" msgid "Subtotal price %" msgstr "Sous-total %" +#. module: mrp_bom_product_price_margin +#: model:ir.model.fields,help:mrp_bom_product_price_margin.field_mrp_bom__diff_product_bom_standard_price +msgid "" +"Technical field used to display or hide button 'Apply this cost to Product " +"standard price' in the form view" +msgstr "" +"Champ technique utilisé pour afficher ou cacher le bouton 'Définir le coût du Produit " +"avec ce prix.' dans la vue formulaire." + #. module: mrp_bom_product_price_margin #: model_terms:ir.ui.view,arch_db:mrp_bom_product_price_margin.view_mrp_bom_sale_product_margin_form msgid "Total" diff --git a/mrp_bom_product_price_margin/models/mrp_bom.py b/mrp_bom_product_price_margin/models/mrp_bom.py index 982769afc..94fefe8cc 100644 --- a/mrp_bom_product_price_margin/models/mrp_bom.py +++ b/mrp_bom_product_price_margin/models/mrp_bom.py @@ -21,8 +21,9 @@ class MrpBom(models.Model): help="Calculated with raw components cost divided by the BoM quantity.", ) diff_product_bom_standard_price = fields.Boolean( - default=False, compute="_compute_diff_product_bom_standard_price", + help="Technical field used to display or hide button 'Apply this cost " + "to Product standard price' in the form view", ) # Fields related to sale price @@ -30,9 +31,6 @@ class MrpBom(models.Model): string="Product Sale Price", related="product_tmpl_id.list_price" ) product_margin_rate = fields.Float(related="product_tmpl_id.standard_margin_rate") - product_margin_rate_percentage = fields.Float( - string="Product Margin", compute="_compute_product_margin_rate_percentage" - ) # Compute functions @api.depends("product_tmpl_id", "product_tmpl_id.standard_price") @@ -58,11 +56,6 @@ class MrpBom(models.Model): else: bom.diff_product_bom_standard_price = False - @api.depends("product_margin_rate") - def _compute_product_margin_rate_percentage(self): - for bom in self: - bom.product_margin_rate_percentage = bom.product_margin_rate / 100 - # Functions to change product fields def set_product_standard_price(self): for bom in self.filtered(lambda x: x.product_tmpl_id): diff --git a/mrp_bom_product_price_margin/views/view_mrp_bom.xml b/mrp_bom_product_price_margin/views/view_mrp_bom.xml index ad820cd01..07d00e9d1 100644 --- a/mrp_bom_product_price_margin/views/view_mrp_bom.xml +++ b/mrp_bom_product_price_margin/views/view_mrp_bom.xml @@ -128,7 +128,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). product_margin_rate_percentage < 0 + >product_margin_rate < 0 @@ -142,8 +142,8 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). help="It will set Product's standard price with this price" /> - - + +