Merge branch 'odoo-production' into feature/integrasi_biteship

# Conflicts:
#	indoteknik_custom/security/ir.model.access.csv

1 files changed, 2 insertions, 2 deletions

diff --git a/indoteknik_custom/models/user_company_request.py b/indoteknik_custom/models/user_company_request.py
index 3de3d751..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:
@@ -102,7 +102,7 @@ class UserCompanyRequest(models.Model):
                 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