(andri) fix

1 files changed, 18 insertions, 27 deletions

diff --git a/indoteknik_custom/models/user_company_request.py b/indoteknik_custom/models/user_company_request.py
index 0c192239..2261545f 100644
--- a/indoteknik_custom/models/user_company_request.py
+++ b/indoteknik_custom/models/user_company_request.py
@@ -75,7 +75,7 @@ class UserCompanyRequest(models.Model):
             if self.user_company_id.nama_wajib_pajak == self.user_company_id.name:
                 self.user_company_id.nama_wajib_pajak = is_internal_input
             self.user_company_id.name = is_internal_input
-        user_company_id = request.env['res.partner']
+        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)
@@ -92,32 +92,23 @@ class UserCompanyRequest(models.Model):
 
         if not self.is_approve and is_approve:
             if is_approve == 'approved':
-                company_rec = user_company_id if user_company_id else self.user_company_id
-                _logger.info('Company Record: %s', company_rec)
-                if not company_rec:
-                    raise UserError("Company record tidak ditemukan untuk set parent_id.")
-                
-                self.user_id.parent_id = company_rec.id
-                self.user_id.customer_type = company_rec.customer_type
-                self.user_id.npwp = company_rec.npwp
-                self.user_id.sppkp = company_rec.sppkp
-                self.user_id.nama_wajib_pajak = company_rec.nama_wajib_pajak
-                self.user_id.alamat_lengkap_text = company_rec.alamat_lengkap_text
-                self.user_id.industry_id = company_rec.industry_id.id if company_rec.industry_id else False
-                self.user_id.company_type_id = company_rec.company_type_id.id if company_rec.company_type_id else False
-                self.user_id.user_id = company_rec.user_id
-                self.user_id.property_account_receivable_id = company_rec.property_account_receivable_id
-                self.user_id.property_account_payable_id = company_rec.property_account_payable_id
-                self.user_id.property_payment_term_id = company_rec.property_payment_term_id
-                self.user_id.property_supplier_payment_term_id = company_rec.property_supplier_payment_term_id
-                # self.user_id.is_company = True
-                self.user_id.active = True
-                company_rec.active = True
-
-                if vals.get('is_switch_account') is True:
-                    user.send_company_switch_approve_mail()
-                else:
-                    user.send_company_request_approve_mail()
+                self.user_id.parent_id = user_company_id if user_company_id else self.user_company_id
+                self.user_id.customer_type = user_company_id.customer_type if user_company_id else self.user_company_id.customer_type
+                self.user_id.npwp = user_company_id.npwp if user_company_id else self.user_company_id.npwp
+                self.user_id.sppkp = user_company_id.sppkp if user_company_id else self.user_company_id.sppkp
+                self.user_id.nama_wajib_pajak = user_company_id.nama_wajib_pajak if user_company_id else self.user_company_id.nama_wajib_pajak
+                self.user_id.alamat_lengkap_text = user_company_id.alamat_lengkap_text if user_company_id else self.user_company_id.alamat_lengkap_text
+                self.user_id.industry_id = user_company_id.industry_id.id if user_company_id else self.user_company_id.industry_id
+                self.user_id.company_type_id = user_company_id.company_type_id.id if user_company_id else self.user_company_id.company_type_id
+                self.user_id.user_id = user_company_id.user_id if user_company_id else self.user_company_id.user_id
+                self.user_id.property_account_receivable_id = user_company_id.property_account_receivable_id if user_company_id else self.user_company_id.property_account_receivable_id
+                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:
                 # new_company = self.env['res.partner'].create({
                 #     'name': self.user_input