Merge branch 'production' into unreserved_permission

# Conflicts:
#	indoteknik_custom/models/sale_order.py

1 files changed, 23 insertions, 3 deletions

diff --git a/indoteknik_custom/models/user_company_request.py b/indoteknik_custom/models/user_company_request.py
index 2467261a..d540b0f6 100644
--- a/indoteknik_custom/models/user_company_request.py
+++ b/indoteknik_custom/models/user_company_request.py
@@ -1,6 +1,6 @@
 from odoo import models, fields
 from odoo.exceptions import UserError
-
+from odoo.http import request
 
 class UserCompanyRequest(models.Model):
     _name = 'user.company.request'
@@ -15,6 +15,8 @@ class UserCompanyRequest(models.Model):
     ], string='Approval')
 
     def write(self, vals):
+        user = self.get_user_by_email(self.user_id.email)
+        user.parent_name = self.user_input
         is_approve = vals.get('is_approve')
         if self.is_approve and is_approve:
             raise UserError('Tidak dapat mengubah approval yang sudah diisi')
@@ -22,10 +24,28 @@ class UserCompanyRequest(models.Model):
         if not self.is_approve and is_approve:
             if is_approve == 'approved':
                 self.user_id.parent_id = self.user_company_id.id
+                self.user_id.customer_type = self.user_company_id.customer_type
+                self.user_id.npwp = self.user_company_id.npwp
+                self.user_id.sppkp = self.user_company_id.sppkp
+                self.user_id.nama_wajib_pajak = self.user_company_id.nama_wajib_pajak
+                self.user_id.alamat_lengkap_text = self.user_company_id.alamat_lengkap_text
+                self.user_id.industry_id = self.user_company_id.industry_id.id
+                self.user_id.company_type_id = self.user_company_id.company_type_id.id
+                self.user_id.user_id = self.user_company_id.user_id
+                self.user_id.property_account_receivable_id = self.user_company_id.property_account_receivable_id
+                self.user_id.property_account_payable_id = self.user_company_id.property_account_payable_id
+                self.user_company_id.active = True
+                user.send_company_request_approve_mail()
             else:
                 new_company = self.env['res.partner'].create({
                     'name': self.user_input
                 })
-                self.user_id.parent_id = new_company.id
+                # self.user_id.parent_id = new_company.id
+                user.send_company_request_reject_mail()
         return super(UserCompanyRequest, self).write(vals)
-    
\ No newline at end of file
+
+    def get_user_by_email(self, email):
+        return request.env['res.users'].search([
+            ('login', '=', email),
+            ('active', 'in', [True, False])
+        ])
\ No newline at end of file