Merge pull request #106 from linkitspa/fix/double-so-confirm

[FIX] Fix the double SO confirmation due to hysterical clicks on the "Confirm" button.

.gitignore

@@ -1,3 +1,8 @@
+# IDEs files and dirs
+#
+.idea/
+.vscode/
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

sale_discount_total/__manifest__.py

@@ -22,7 +22,7 @@
 
 {
     'name': 'Sale Discount on Total Amount',
-    'version': '11.0.1.0.0',
+    'version': '11.0.1.0.1',
     'category': 'Sales Management',
     'summary': "Discount on Total in Sale and Invoice With Discount Limit and Approval",
     'author': 'Cybrosys Techno Solutions',

sale_discount_total/models/discount_approval.py

@@ -20,10 +20,11 @@
 #
 ###################################################################################
 
-from odoo import api, fields, models
+from odoo import _, api, fields, models
+from odoo.exceptions import UserError
 
 
-class sale_discount(models.Model):
+class SaleDiscount(models.Model):
     _inherit = 'sale.order'
 
     state = fields.Selection([
@@ -37,17 +38,20 @@ class sale_discount(models.Model):
 
     @api.multi
     def action_confirm(self):
+        if self._get_forbidden_state_confirm() & set(self.mapped('state')):
+            raise UserError(_("It is not allowed to confirm an order in the following states: %s")
+                            % (", ".join(self._get_forbidden_state_confirm())))
         discnt = 0.0
         no_line = 0.0
         for order in self:
-            if self.company_id.so_double_validation == 'two_step':
+            if order.company_id.so_double_validation == 'two_step':
                 for line in order.order_line:
                     no_line += 1
                     discnt += line.discount
                 discnt = (discnt / no_line)
                 if order.company_id.so_double_validation_limit and discnt > order.company_id.so_double_validation_limit:
                     order.state = 'waiting'
-                    return True
+                    continue
             order._action_confirm()
             if order.env['ir.config_parameter'].sudo().get_param('sale.auto_done_setting'):
                 order.action_done()
@@ -55,6 +59,9 @@ class sale_discount(models.Model):
 
     @api.multi
     def action_approve(self):
+        if self._get_forbidden_state_confirm() & set(self.mapped('state')):
+            raise UserError(_("It is not allowed to approve an order in the following states: %s")
+                            % (", ".join(self._get_forbidden_state_confirm())))
         self._action_confirm()
         if self.env['ir.config_parameter'].sudo().get_param('sale.auto_done_setting'):
             self.action_done()
@@ -110,4 +117,4 @@ class ResDiscountSettings(models.TransientModel):
 
     def set_values(self):
         super(ResDiscountSettings, self).set_values()
-        self.so_double_validation = 'two_step' if self.so_order_approval else 'one_step'
+        self.so_double_validation = 'two_step' if self.so_order_approval else 'one_step'