Merge branch 'production' into iman/switch-account

# Conflicts:
#	indoteknik_api/controllers/api_v1/user.py
#	indoteknik_custom/models/user_company_request.py

1 files changed, 5 insertions, 2 deletions

diff --git a/indoteknik_custom/models/account_move_due_extension.py b/indoteknik_custom/models/account_move_due_extension.py
index 23f8888c..6fc58cdd 100644
--- a/indoteknik_custom/models/account_move_due_extension.py
+++ b/indoteknik_custom/models/account_move_due_extension.py
@@ -1,6 +1,6 @@
 from odoo import models, api, fields
 from odoo.exceptions import AccessError, UserError, ValidationError
-from datetime import timedelta, date
+from datetime import timedelta, date, datetime
 import logging
 
 _logger = logging.getLogger(__name__)
@@ -31,7 +31,8 @@ class DueExtension(models.Model):
         ('21', '21 Hari'),
     ], string='Day Extension', help='Menambah Due Date yang sudah limit dari hari ini', tracking=True)
     counter = fields.Integer(string="Counter", compute='_compute_counter')
-
+    approve_by = fields.Many2one('res.users', string="Approve By", readonly=True)
+    date_approve = fields.Datetime(string="Date Approve", readonly=True)
     def _compute_counter(self):
         for due in self:
             due.counter = due.partner_id.counter
@@ -96,6 +97,8 @@ class DueExtension(models.Model):
         
         sales.action_confirm()
         self.order_id.due_id = self.id
+        self.approve_by = self.env.user.id
+        self.date_approve = datetime.utcnow()
         template = self.env.ref('indoteknik_custom.mail_template_due_extension_approve')
         template.send_mail(self.id, force_send=True)