Merge branch 'odoo-production' into CR/form-merchant

# Conflicts:
#	indoteknik_api/models/res_partner.py
#	indoteknik_api/models/res_users.py
#	indoteknik_custom/__manifest__.py
#	indoteknik_custom/models/__init__.py
#	indoteknik_custom/models/res_partner.py
#	indoteknik_custom/security/ir.model.access.csv
#	indoteknik_custom/views/res_partner.xml
#	indoteknik_custom/views/user_company_request.xml

1 files changed, 29 insertions, 13 deletions

diff --git a/indoteknik_custom/models/user_company_request.py b/indoteknik_custom/models/user_company_request.py
index dd9a35c1..af8a86ba 100644
--- a/indoteknik_custom/models/user_company_request.py
+++ b/indoteknik_custom/models/user_company_request.py
@@ -14,7 +14,7 @@ class UserCompanyRequest(models.Model):
         ('rejected', 'Reject'),
     ], string='Approval')
     similar_company_ids = fields.Many2many('res.partner', compute="_compute_similar_companies", string="Similar Companies")
-
+    is_switch_account = fields.Boolean( string='Switch Account', default=False)
     @api.depends('user_input')
     def _compute_similar_companies(self):
         for record in self:
@@ -64,6 +64,7 @@ class UserCompanyRequest(models.Model):
         user.parent_name = self.user_input
         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')
 
@@ -71,22 +72,37 @@ 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 = []
+        if is_company_id:
+            user_company_id = request.env['res.partner'].search([('id', '=', is_company_id)], limit=1)
+            # 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
+            # self.user_company_id.nama_wajib_pajak = self.similar_company_ids.nama_wajib_pajak
+            # self.user_company_id.alamat_lengkap_text = self.similar_company_ids.alamat_lengkap_text
+            # self.user_company_id.industry_id = self.similar_company_ids.industry_id
+            # self.user_company_id.company_type_id = self.similar_company_ids.company_type_id
+            # self.user_company_id.user_id = self.similar_company_ids.user_id
+            # self.user_company_id.property_account_receivable_id = self.similar_company_ids.property_account_receivable_id
+            # self.user_company_id.property_account_payable_id = self.similar_company_ids.property_account_payable_id
 
         if not self.is_approve and is_approve:
             if is_approve == 'approved':
-                self.user_id.parent_id = vals.get('user_company_id') if vals.get('user_company_id') else 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_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()
+                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