Merge branch 'odoo-backup' into pum-v2

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

1 files changed, 7 insertions, 2 deletions

diff --git a/indoteknik_api/models/res_users.py b/indoteknik_api/models/res_users.py
index 015b9e0e..c4e19bf3 100644
--- a/indoteknik_api/models/res_users.py
+++ b/indoteknik_api/models/res_users.py
@@ -14,6 +14,11 @@ class ResUsers(models.Model):
             'manager': 2,
             'director': 3
         }
+        payment_term = (
+            main_partner.previous_payment_term_id
+            if main_partner.is_cbd_locked
+            else main_partner.property_payment_term_id
+        )
         partner_tempo = False
         is_tempo_request = request.env['user.pengajuan.tempo.request'].search([('user_company_id', '=', main_partner.id)], limit=1)
         tempo_progres = (
@@ -21,8 +26,8 @@ class ResUsers(models.Model):
             'rejected' if is_tempo_request.state_tempo == 'reject' else
             'approve' if is_tempo_request.state_tempo == 'approval_director' else ''
         )
-        if main_partner:
-            partner_tempo = True if 'tempo' in main_partner.get_check_payment_term().lower() else False
+        if payment_term:
+            partner_tempo = True if 'tempo' in payment_term.name.lower() else False
         
         data = {
             'id': res_user.id,