From 7c9e8eb952a62d8e269dcd7c8bbadca12bda3d29 Mon Sep 17 00:00:00 2001 From: Carlos Dauden Date: Tue, 21 Nov 2023 17:34:17 +0100 Subject: [PATCH] [IMP] sale_margin_security: Avoid display margin in measures pivot view. Set group_sale_margin_security in all sensible fields. --- sale_margin_security/__init__.py | 1 + sale_margin_security/models/__init__.py | 1 + sale_margin_security/models/sale_order.py | 25 ++++++++++++++++++++++ sale_margin_security/report/sale_report.py | 7 +++--- 4 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 sale_margin_security/models/__init__.py create mode 100644 sale_margin_security/models/sale_order.py diff --git a/sale_margin_security/__init__.py b/sale_margin_security/__init__.py index 4c4f242f..bf588bc8 100644 --- a/sale_margin_security/__init__.py +++ b/sale_margin_security/__init__.py @@ -1 +1,2 @@ +from . import models from . import report diff --git a/sale_margin_security/models/__init__.py b/sale_margin_security/models/__init__.py new file mode 100644 index 00000000..6aacb753 --- /dev/null +++ b/sale_margin_security/models/__init__.py @@ -0,0 +1 @@ +from . import sale_order diff --git a/sale_margin_security/models/sale_order.py b/sale_margin_security/models/sale_order.py new file mode 100644 index 00000000..c29f9000 --- /dev/null +++ b/sale_margin_security/models/sale_order.py @@ -0,0 +1,25 @@ +# Copyright 2023 Carlos Dauden - Tecnativa +# Copyright 2023 Sergio Teruel - Tecnativa +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from odoo import fields, models + + +class SaleOrder(models.Model): + _inherit = "sale.order" + + margin = fields.Monetary(groups="sale_margin_security.group_sale_margin_security") + margin_percent = fields.Float( + groups="sale_margin_security.group_sale_margin_security" + ) + + +class SaleOrderLine(models.Model): + _inherit = "sale.order.line" + + margin = fields.Float(groups="sale_margin_security.group_sale_margin_security") + margin_percent = fields.Float( + groups="sale_margin_security.group_sale_margin_security" + ) + purchase_price = fields.Float( + groups="sale_margin_security.group_sale_margin_security" + ) diff --git a/sale_margin_security/report/sale_report.py b/sale_margin_security/report/sale_report.py index c2ec7f91..d215ce88 100644 --- a/sale_margin_security/report/sale_report.py +++ b/sale_margin_security/report/sale_report.py @@ -1,9 +1,10 @@ +# Copyright 2023 Carlos Dauden - Tecnativa +# Copyright 2023 Sergio Teruel - Tecnativa +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from odoo import fields, models class SaleReport(models.Model): _inherit = "sale.report" - margin = fields.Float( - groups="sale_margin_security.group_sale_margin_security", - ) + margin = fields.Float(groups="sale_margin_security.group_sale_margin_security")