<iman> update code pengajuan tempo

1 files changed, 13 insertions, 13 deletions

diff --git a/indoteknik_custom/models/user_company_request.py b/indoteknik_custom/models/user_company_request.py
index ea5ca09e..3de3d751 100644
--- a/indoteknik_custom/models/user_company_request.py
+++ b/indoteknik_custom/models/user_company_request.py
@@ -88,19 +88,19 @@ class UserCompanyRequest(models.Model):
 
         if not self.is_approve and is_approve:
             if is_approve == 'approved':
-                self.user_id.parent_id = user_company_id.id if user_company_id.id else self.user_company_id.id
-                self.user_id.customer_type = user_company_id.customer_type
-                self.user_id.npwp = user_company_id.npwp
-                self.user_id.sppkp = user_company_id.sppkp
-                self.user_id.nama_wajib_pajak = user_company_id.nama_wajib_pajak
-                self.user_id.alamat_lengkap_text = user_company_id.alamat_lengkap_text
-                self.user_id.industry_id = user_company_id.industry_id.id
-                self.user_id.company_type_id = user_company_id.company_type_id.id
-                self.user_id.user_id = user_company_id.user_id
-                self.user_id.property_account_receivable_id = user_company_id.property_account_receivable_id
-                self.user_id.property_account_payable_id = user_company_id.property_account_payable_id
-                self.user_id.property_payment_term_id = user_company_id.property_payment_term_id
-                self.user_id.property_supplier_payment_term_id = user_company_id.property_supplier_payment_term_id
+                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_company_id.active = True
                 user.send_company_request_approve_mail()
             else: