From 42992832305f036ef96936b73fd1ddcd21826fc0 Mon Sep 17 00:00:00 2001 From: Cybrosys Technologies Date: Tue, 31 Dec 2024 15:36:16 +0530 Subject: [PATCH] Dec 31: [FIX] Bug Fixed 'sale_discount_total' --- sale_discount_total/__manifest__.py | 4 +-- sale_discount_total/doc/RELEASE_NOTES.md | 5 +++ sale_discount_total/models/sale_order.py | 14 ++++++++ .../static/description/index.html | 32 ++++++++++++++++++- .../views/sale_order_views.xml | 1 + 5 files changed, 53 insertions(+), 3 deletions(-) diff --git a/sale_discount_total/__manifest__.py b/sale_discount_total/__manifest__.py index 96ca21a7f..75c44769b 100644 --- a/sale_discount_total/__manifest__.py +++ b/sale_discount_total/__manifest__.py @@ -21,7 +21,7 @@ ############################################################################# { 'name': 'Sale Discount on Total Amount', - 'version': '18.0.1.0.0', + 'version': '18.0.1.1.0', 'category': 'Sales Management', 'summary': "Discount on Total in Sale and Invoice With Discount Limit " "and Approval", @@ -36,7 +36,7 @@ 'maintainer': 'Cybrosys Techno Solutions', 'website': "https://www.cybrosys.com", 'live_test_url': 'https://www.youtube.com/watch?v=CigmHe9iC4s&feature=youtu.be', - 'depends': ['sale_management', 'account'], + 'depends': ['sale_management', 'account',], 'data': [ 'views/res_config_settings_views.xml', 'views/sale_order_views.xml', diff --git a/sale_discount_total/doc/RELEASE_NOTES.md b/sale_discount_total/doc/RELEASE_NOTES.md index 2f2a62a0e..218f8f375 100644 --- a/sale_discount_total/doc/RELEASE_NOTES.md +++ b/sale_discount_total/doc/RELEASE_NOTES.md @@ -4,3 +4,8 @@ #### Version 18.0.1.0.0 #### ADD - Initial commit for Sale Discount On Total Amount + +#### 31.12.2024 +#### Version 18.0.1.1.0 +#### ADD +- Added margin on sale Orders \ No newline at end of file diff --git a/sale_discount_total/models/sale_order.py b/sale_discount_total/models/sale_order.py index 939254e89..8c37c6046 100644 --- a/sale_discount_total/models/sale_order.py +++ b/sale_discount_total/models/sale_order.py @@ -65,6 +65,20 @@ 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 eb7042701..674dd61d2 100644 --- a/sale_discount_total/static/description/index.html +++ b/sale_discount_total/static/description/index.html @@ -729,7 +729,37 @@ style="color:#7A7979;"> + + +
+
+ + +
+
+

+ Latest Release 18.0.1.1.0 +

+ + 31st December, 2024 + +
+
+
+
+
+ Add +
+
+
+
    +
  • + Added Margin on sale order
diff --git a/sale_discount_total/views/sale_order_views.xml b/sale_discount_total/views/sale_order_views.xml index f58f9a2a0..e15f88dbd 100644 --- a/sale_discount_total/views/sale_order_views.xml +++ b/sale_discount_total/views/sale_order_views.xml @@ -50,6 +50,7 @@ +