Merged in cr/mbak-wid (pull request #409)

Cr/mbak wid

2 files changed, 6 insertions, 4 deletions

diff --git a/indoteknik_custom/models/approval_payment_term.py b/indoteknik_custom/models/approval_payment_term.py
index 08d91738..7cab91f1 100644
--- a/indoteknik_custom/models/approval_payment_term.py
+++ b/indoteknik_custom/models/approval_payment_term.py
@@ -69,8 +69,8 @@ class ApprovalPaymentTerm(models.Model):
         return res
 
     def _track_changes_for_user_688(self, vals, old_values_dict):
-        if self.env.user.id != 688:
-            return
+        # if self.env.user.id != 688:
+        #     return
 
         tracked_fields = {"blocking_stage", "warning_stage", "property_payment_term_id"}
 
@@ -106,7 +106,8 @@ class ApprovalPaymentTerm(models.Model):
 
             if changes:
                 timestamp = fields.Datetime.now().strftime('%Y-%m-%d %H:%M:%S')
-                rec.change_log_688 = f"{timestamp} - Perubahan oleh Widya:\n" + "\n".join(changes)
+                user = self.env.user
+                rec.change_log_688 = f"{timestamp} - Perubahan oleh {user.name}:\n" + "\n".join(changes)
 
 
     @staticmethod
diff --git a/indoteknik_custom/models/dunning_run.py b/indoteknik_custom/models/dunning_run.py
index 5a6aebac..9feea1d1 100644
--- a/indoteknik_custom/models/dunning_run.py
+++ b/indoteknik_custom/models/dunning_run.py
@@ -1,6 +1,6 @@
 from odoo import models, api, fields
 from odoo.exceptions import AccessError, UserError, ValidationError
-from datetime import timedelta
+from datetime import timedelta, date
 import logging
 
 
@@ -149,4 +149,5 @@ class DunningRunLine(models.Model):
     total_amt = fields.Float(string='Total Amount')
     open_amt = fields.Float(string='Open Amount')
     due_date = fields.Date(string='Due Date')
+    payment_term = fields.Many2one('account.payment.term', related='invoice_id.invoice_payment_term_id', string='Payment Term')