Merge branch 'commision' into production

1 files changed, 13 insertions, 2 deletions

diff --git a/indoteknik_custom/models/cust_commision.py b/indoteknik_custom/models/cust_commision.py
index eeb255cd..da345f04 100644
--- a/indoteknik_custom/models/cust_commision.py
+++ b/indoteknik_custom/models/cust_commision.py
@@ -12,6 +12,15 @@ class CustCommision(models.Model):
 
     partner_id = fields.Many2one('res.partner', String='Customer', required=True)
     commision_percent = fields.Float(string='Commision %', tracking=3)
+    target_1st = fields.Float(string='Target 1st', tracking=3)
+    target_2nd = fields.Float(string='Target 2nd', tracking=3)
+    achieve_1st = fields.Float(string='Achive 1st', tracking=3)
+    achieve_2nd = fields.Float(string='Achive 2nd', tracking=3)
+    commision_type = fields.Selection([
+        ('fee', 'Fee'),
+        ('cashback', 'Cashback'),
+        ('rebate', 'Rebate'),
+    ], string='Commision Type', required=True)
 
     @api.constrains('partner_id')
     def _check_partner_id(self):
@@ -20,6 +29,8 @@ class CustCommision(models.Model):
                 ('partner_id', '=', rec.partner_id.id),
                 ('id', '!=', rec.id)
             ])
-            if duplicate_partner:
-                raise UserError('Partner already exists')
+
+            for rec in duplicate_partner:
+                if self.commision_type == rec.commision_type:
+                    raise UserError('Partner already exists')
             
\ No newline at end of file