diff options
| author | Indoteknik . <it@fixcomart.co.id> | 2025-06-18 10:58:54 +0700 |
|---|---|---|
| committer | Indoteknik . <it@fixcomart.co.id> | 2025-06-18 10:58:54 +0700 |
| commit | 2444a969b25334b233733b765c8cc13d5123ec7e (patch) | |
| tree | 61e7b6623e47a2dcda3d4beeac45a1b10ee09a21 | |
| parent | 80c9bc5e4590710a6b69b7d4728d21b2930b6d9b (diff) | |
| parent | 587547a2689b4d089302dfb50feb2f876f2633d0 (diff) | |
Merge branch 'odoo-backup' of https://bitbucket.org/altafixco/indoteknik-addons into odoo-backup
| -rw-r--r-- | indoteknik_custom/models/commision.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indoteknik_custom/models/commision.py b/indoteknik_custom/models/commision.py index d3392a0c..03d32d2d 100644 --- a/indoteknik_custom/models/commision.py +++ b/indoteknik_custom/models/commision.py @@ -177,8 +177,9 @@ class CustomerCommision(models.Model): ], string='Status') commision_percent = fields.Float(string='Commision %', tracking=3) commision_amt = fields.Float(string='Commision Amount', tracking=3) - cashback = fields.Float(string='Cashback', tracking=3) - total_commision = fields.Float(string='Total Commision', tracking=3) + cashback = fields.Float(string='Cashback', compute="compute_cashback") + total_commision = fields.Float(string='Total Commision', compute="compute_cashback") + total_cashback = fields.Float(string='Total Cashback') commision_amt_text = fields.Char(string='Commision Amount Text', compute='compute_delivery_amt_text') total_dpp = fields.Float(string='Total DPP', compute='_compute_total_dpp') commision_type = fields.Selection([ @@ -318,9 +319,6 @@ class CustomerCommision(models.Model): if self.commision_amt == 0: self.commision_amt = self.commision_percent * self.total_dpp // 100 - if self.commision_type == 'cashback': - self.cashback = self.commision_amt * 0.15 - self.total_commision = self.commision_amt * 0.85 @api.constrains('commision_amt') def _onchange_commision_amt(self): @@ -333,11 +331,13 @@ class CustomerCommision(models.Model): if self.total_dpp > 0 and self.commision_percent == 0: self.commision_percent = (self.commision_amt / self.total_dpp) * 100 - @api.constrains('commision_type') - def _onchange_commision_amt(self): + def compute_cashback(self): if self.commision_type == 'cashback' and self.commision_amt > 0: self.cashback = self.commision_amt * 0.15 self.total_commision = self.commision_amt * 0.85 + else: + self.cashback = 0 + self.total_commision = 0 def _compute_total_dpp(self): for data in self: |