diff --git a/sale_discount_total/__manifest__.py b/sale_discount_total/__manifest__.py index ed3a2a453..c508e4bf6 100644 --- a/sale_discount_total/__manifest__.py +++ b/sale_discount_total/__manifest__.py @@ -21,7 +21,7 @@ ############################################################################# { 'name': 'Sale Discount on Total Amount', - 'version': '17.0.1.0.0', + 'version': '17.0.1.1.0', 'category': 'Sales Management', 'summary': "Discount on Total in Sale and Invoice With Discount Limit " "and Approval", diff --git a/sale_discount_total/doc/RELEASE_NOTES.md b/sale_discount_total/doc/RELEASE_NOTES.md index 203c3c755..d64707bf3 100644 --- a/sale_discount_total/doc/RELEASE_NOTES.md +++ b/sale_discount_total/doc/RELEASE_NOTES.md @@ -4,3 +4,9 @@ #### Version 17.0.1.0.0 #### ADD - Initial commit for Sale Discount On Total Amount + + +#### 14.03.2024 +#### Version 17.0.1.1.0 +#### ADD +- Added margin in sale orders diff --git a/sale_discount_total/models/sale_order.py b/sale_discount_total/models/sale_order.py index aab14959f..2db3caf6d 100644 --- a/sale_discount_total/models/sale_order.py +++ b/sale_discount_total/models/sale_order.py @@ -65,6 +65,21 @@ class SaleOrder(models.Model): amount_total = fields.Monetary(string='Total', store=True, readonly=True, compute='_amount_all', help="Total amount provided.") + margin_test = fields.Float(string="Margin", + compute='_compute_margin_test', ) + + @api.depends('amount_untaxed', 'amount_tax', 'amount_total') + def _compute_margin_test(self): + # Compute logic for margin if sale_margin is installed + if self.env['ir.module.module'].sudo().search( + [('name', '=', 'sale_margin'), ('state', '=', 'installed')]): + # If sale_margin is installed, calculate margin + for record in self: + print(record.margin, 'll') + record.margin_test = record.margin + else: + for record in self: + record.margin_test = False def action_confirm(self): """This function super action_confirm method""" diff --git a/sale_discount_total/static/description/index.html b/sale_discount_total/static/description/index.html index 3ccecee67..43a51a133 100644 --- a/sale_discount_total/static/description/index.html +++ b/sale_discount_total/static/description/index.html @@ -270,6 +270,21 @@

+
+
+
Version + 17.0.1.1.0|Released on:31st Dec 2024 +
+

+ Added Margin on sale orders +

+
+
diff --git a/sale_discount_total/views/sale_order_views.xml b/sale_discount_total/views/sale_order_views.xml index e282074d6..b83c6b50f 100644 --- a/sale_discount_total/views/sale_order_views.xml +++ b/sale_discount_total/views/sale_order_views.xml @@ -50,6 +50,7 @@ +