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, 16 insertions, 8 deletions

diff --git a/indoteknik_api/models/res_users.py b/indoteknik_api/models/res_users.py
index 37441d7f..015b9e0e 100644
--- a/indoteknik_api/models/res_users.py
+++ b/indoteknik_api/models/res_users.py
@@ -1,5 +1,5 @@
 from odoo import models
-
+from odoo.http import request
 
 class ResUsers(models.Model):
     _inherit = 'res.users'
@@ -15,8 +15,14 @@ class ResUsers(models.Model):
             'director': 3
         }
         partner_tempo = False
+        is_tempo_request = request.env['user.pengajuan.tempo.request'].search([('user_company_id', '=', main_partner.id)], limit=1)
+        tempo_progres = (
+            'review' if is_tempo_request.state_tempo in ('draft', 'approval_sales', 'approval_finance') else
+            'rejected' if is_tempo_request.state_tempo == 'reject' else
+            'approve' if is_tempo_request.state_tempo == 'approval_director' else ''
+        )
         if main_partner:
-            partner_tempo = main_partner.get_check_tempo_partner()
+            partner_tempo = True if 'tempo' in main_partner.get_check_payment_term().lower() else False
         
         data = {
             'id': res_user.id,
@@ -36,7 +42,8 @@ class ResUsers(models.Model):
                 'so_approval': main_partner.use_so_approval,
                 'only_ready_stock': main_partner.use_only_ready_stock
             },
-            'partner_tempo': partner_tempo
+            'partner_tempo': partner_tempo,
+            'tempo_progres': tempo_progres
         }
         
         return data
@@ -56,14 +63,15 @@ class ResUsers(models.Model):
             'district': None,
             'sub_district': None,
             'zip': user.zip or '',
-            'company_type_id': user.company_type_id.id or None,
-            'industry_id': user.industry_id.id or None,
+            'company_type_id': user.company_type_id.id or '',
+            'industry_id': user.industry_id.id or '',
             'tax_name': user.nama_wajib_pajak or '',
             'npwp': user.npwp or '',
+            'sppkp': user.sppkp or '',
             'rajaongkir_city_id': user.kecamatan_id.rajaongkir_id or 0,
-            'alamat_wajib_pajak': user.alamat_lengkap_text or None,
-            'alamat_bisnis': user.street or None,
-            'companyType': user.customer_type or 'nonpkp',
+            'alamat_wajib_pajak': user.alamat_lengkap_text or '',
+            'alamat_bisnis': user.street or '',
+            'company_type': user.customer_type or 'nonpkp',
             'longtitude': user.longtitude or None,
             'latitude': user.latitude or None,
             'address_map': user.address_map or None,