Merge branch 'production' into purchasing-job

# Conflicts:
#	indoteknik_custom/__manifest__.py
#	indoteknik_custom/models/__init__.py
#	indoteknik_custom/models/automatic_purchase.py
#	indoteknik_custom/models/purchase_order_line.py
#	indoteknik_custom/security/ir.model.access.csv
#	indoteknik_custom/views/automatic_purchase.xml
#	indoteknik_custom/views/purchase_order.xml

1 files changed, 12 insertions, 5 deletions

diff --git a/indoteknik_custom/models/commision.py b/indoteknik_custom/models/commision.py
index a9ad624c..955d1634 100644
--- a/indoteknik_custom/models/commision.py
+++ b/indoteknik_custom/models/commision.py
@@ -159,12 +159,14 @@ class CustomerCommision(models.Model):
     @api.constrains('commision_percent')
     def _onchange_commision_percent(self):
         print('masuk onchange commision percent')
-        self.commision_amt = self.commision_percent * self.total_dpp // 100
+        if self.commision_amt == 0:
+            self.commision_amt = self.commision_percent * self.total_dpp // 100
     
-    # @api.constrains('commision_amt')
-    # def _onchange_commision_amt(self):
-    #     print('masuk onchange commision amt')
-    #     self.commision_percent = (self.commision_amt / self.grand_total * 100)
+    @api.constrains('commision_amt')
+    def _onchange_commision_amt(self):
+        print('masuk onchange commision amt')
+        if self.commision_percent == 0:
+            self.commision_percent = (self.commision_amt / self.total_dpp * 100)
 
     def _compute_total_dpp(self):
         for data in self:
@@ -176,6 +178,11 @@ class CustomerCommision(models.Model):
     @api.model
     def create(self, vals):
         vals['number'] = self.env['ir.sequence'].next_by_code('customer.commision') or '0'
+        # if vals['commision_amt'] > 0:
+        #     commision_amt = vals['commision_amt']
+        #     total_dpp = vals['total_dpp']
+        #     commision_percent = commision_amt / total_dpp * 100
+        #     vals['commision_percent'] = commision_percent
         result = super(CustomerCommision, self).create(vals)
         return result