<hafid> fix conflict merge

1 files changed, 8 insertions, 2 deletions

diff --git a/indoteknik_custom/models/user_company_request.py b/indoteknik_custom/models/user_company_request.py
index 9216e8eb..284575aa 100644
--- a/indoteknik_custom/models/user_company_request.py
+++ b/indoteknik_custom/models/user_company_request.py
@@ -1,6 +1,9 @@
 from odoo import models, fields, api
 from odoo.exceptions import UserError
 from odoo.http import request
+import logging
+
+_logger = logging.getLogger(__name__)
 
 class UserCompanyRequest(models.Model):
     _name = 'user.company.request'
@@ -65,8 +68,8 @@ class UserCompanyRequest(models.Model):
         is_approve = vals.get('is_approve')
         is_internal_input = vals.get('internal_input')
         is_company_id = vals.get('user_company_id')
-        if self.is_approve and is_approve:
-            raise UserError('Tidak dapat mengubah approval yang sudah diisi')
+        # if self.is_approve and is_approve:
+        #     raise UserError('Tidak dapat mengubah approval yang sudah diisi')
 
         if is_internal_input:
             if self.user_company_id.nama_wajib_pajak == self.user_company_id.name:
@@ -75,6 +78,7 @@ class UserCompanyRequest(models.Model):
         user_company_id = []
         if is_company_id:
             user_company_id = request.env['res.partner'].search([('id', '=', is_company_id)], limit=1)
+            _logger.info('User Company ID: %s', user_company_id)
             # self.user_company_id.customer_type = self.similar_company_ids.customer_type
             # self.user_company_id.npwp = self.similar_company_ids.npwp
             # self.user_company_id.sppkp = self.similar_company_ids.sppkp
@@ -101,6 +105,8 @@ class UserCompanyRequest(models.Model):
                 self.user_id.property_account_payable_id = user_company_id.property_account_payable_id if user_company_id else self.user_company_id.property_account_payable_id
                 self.user_id.property_payment_term_id = user_company_id.property_payment_term_id if user_company_id else self.user_company_id.property_payment_term_id
                 self.user_id.property_supplier_payment_term_id = user_company_id.property_supplier_payment_term_id if user_company_id else self.user_company_id.property_supplier_payment_term_id
+                # self.user_id.is_company = True 
+                # self.user_id.active = True 
                 self.user_company_id.active = True
                 user.send_company_switch_approve_mail() if vals.get('is_switch_account') == True else user.send_company_request_approve_mail()
             else: