<iman> update pengajuan tempo

8 files changed, 290 insertions, 71 deletions

diff --git a/indoteknik_api/controllers/api_v1/partner.py b/indoteknik_api/controllers/api_v1/partner.py
index ebf5de08..c0088d38 100644
--- a/indoteknik_api/controllers/api_v1/partner.py
+++ b/indoteknik_api/controllers/api_v1/partner.py
@@ -138,6 +138,8 @@ class Partner(controller.Controller):
             'npwp': [],
             'alamat_lengkap_text': [],
             'street': [],
+            'email': [],
+            'mobile': []
         })
 
         # Mengambil id_user dari request
@@ -297,6 +299,8 @@ class Partner(controller.Controller):
             'street': ['alias:street_tempo'],
             'state': ['alias:state_id_tempo'],
             'city': ['alias:city_id_tempo'],
+            'district': ['alias:district_id_tempo'],
+            'subDistrict': ['alias:subDistrict_id_tempo'],
             'zip': ['alias:zip_tempo'],
             'mobile': ['alias:mobile_tempo'],
             'bankName': ['alias:bank_name_tempo'],
@@ -304,6 +308,8 @@ class Partner(controller.Controller):
             'accountNumber': ['alias:account_number_tempo'],
             'website': ['alias:website_tempo'],
             'estimasi': ['alias:estimasi_tempo'],
+            'portal': ['alias:portal'],
+            'bersedia': ['alias:bersedia'],
             'tempoDuration': ['alias:tempo_duration'],
             'tempoLimit': ['alias:tempo_limit'],
 
@@ -327,27 +333,38 @@ class Partner(controller.Controller):
             'streetPengiriman': ['alias:street_pengiriman'],
             'statePengiriman': ['alias:state_id_pengiriman'],
             'cityPengiriman': ['alias:city_id_pengiriman'],
+            'districtPengiriman': ['alias:district_id_pengiriman'],
+            'subDistrictPengiriman': ['alias:subDistrict_id_pengiriman'],
             'zipPengiriman': ['alias:zip_pengiriman'],
             'invoicePicTittle': ['alias:invoice_pic_tittle'],
             'invoicePic': ['alias:invoice_pic'],
             'streetInvoice': ['alias:street_invoice'],
             'stateInvoice': ['alias:state_id_invoice'],
             'cityInvoice': ['alias:city_id_invoice'],
+            'districtInvoice': ['alias:district_id_invoice'],
+            'subDistrictInvoice': ['alias:subDistrict_id_invoice'],
+            'zipInvoice': ['alias:zip_invoice'],
+            'isSameAddrees':['alias:is_same_address'],
+            'isSameAddreesStreet':['alias:is_same_address_street'],
         })
 
-        # Konversi nilai 'true' ke boolean True
-        is_same_address = kw.get('isSameAddrees', 'false').lower() == 'true'
-        is_same_address_street = kw.get('isSameAddreesStreet', 'false').lower() == 'true'
-
-        # Tambahkan nilai yang dikonversi ke params
-        if kw.get('isSameAddrees') != '':
-            params['value']['is_same_address'] = is_same_address
-        if kw.get('isSameAddreesStreet') != '':
-            params['value']['is_same_address_street'] = is_same_address_street
+        # # Konversi nilai 'true' ke boolean True
+        # is_same_address = kw.get('isSameAddrees', 'false').lower() == 'true'
+        # is_same_address_street = kw.get('isSameAddreesStreet', 'false').lower() == 'true'
+        #
+        # # Tambahkan nilai yang dikonversi ke params
+        # if 'isSameAddress' in kw:
+        #     params['value']['is_same_address'] = is_same_address
+        # if 'is_same_address_street' in kw:
+        #     params['value']['is_same_address_street'] = is_same_address_street
 
         if not params['valid']:
             return self.response(code=400, description=params)
-
+        if params['value']['portal']:
+            if params['value']['portal'] == 'ada':
+                params['value']['portal'] = True
+            else:
+                params['value']['portal'] = False
         # Filter data baru yang dikirim (non-kosong, boolean False tetap masuk)
         new_data = {key: value for key, value in params['value'].items() if value != ''}
 
@@ -413,13 +430,17 @@ class Partner(controller.Controller):
         ]
 
         dokumen_kirim_barang_ids = kw.get('dokumenPengiriman')
+        dokumen_kirim_input = kw.get('dokumenKirimInput', '')
         dokumen_kirim_barang_input = kw.get('dokumenPengirimanInput', '')
         dokumen_kirim_barang = []
 
         if dokumen_kirim_barang_ids:
             dokumen_kirim_ids = list(map(int, dokumen_kirim_barang_ids.split(',')))
             dokumen_kirim_barang = [dokumen_kirim[i] for i in dokumen_kirim_ids if 0 <= i < len(dokumen_kirim)]
-
+        if dokumen_kirim_input:
+            input_items = [item.strip() for item in dokumen_kirim_input.split(',')]
+            dokumen_kirim_barang.extend(item for item in input_items if item and item not in dokumen_kirim_barang)
+            pengajuan_tempo.dokumen_kirim_input = dokumen_kirim_input
         if dokumen_kirim_barang:
             pengajuan_tempo.dokumen_pengiriman = ', '.join(dokumen_kirim_barang)
         if dokumen_kirim_barang_input:
@@ -468,6 +489,18 @@ class Partner(controller.Controller):
                         if dokumen['documentName'] == 'dokumenNib':
                             pengajuan_tempo.dokumen_nib = [(6, 0, [sppkp_attachment.id])]
 
+                        elif dokumen['documentName'] == 'dokumenSiup':
+                            pengajuan_tempo.dokumen_siup = [(6, 0, [sppkp_attachment.id])]
+
+                        elif dokumen['documentName'] == 'dokumenTdp':
+                            pengajuan_tempo.dokumen_tdp = [(6, 0, [sppkp_attachment.id])]
+
+                        elif dokumen['documentName'] == 'dokumenSkdp':
+                            pengajuan_tempo.dokumen_skdp = [(6, 0, [sppkp_attachment.id])]
+
+                        elif dokumen['documentName'] == 'dokumenSkt':
+                            pengajuan_tempo.dokumen_skt = [(6, 0, [sppkp_attachment.id])]
+
                         elif dokumen['documentName'] == 'dokumenNpwp':
                             pengajuan_tempo.dokumen_npwp = [(6, 0, [sppkp_attachment.id])]
 
@@ -503,7 +536,7 @@ class Partner(controller.Controller):
             except json.JSONDecodeError:
                 return http.Response(status=400, json_body={'error': 'Invalid JSON format for formDokumen'})
 
-
+        if tempo_request:
             # pengajuan_tempo.user_id = id
             template = pengajuan_tempo.env.ref('indoteknik_custom.mail_template_res_user_company_request_tempo_review')
             template.send_mail(pengajuan_tempo.id, force_send=True)
diff --git a/indoteknik_api/models/res_partner.py b/indoteknik_api/models/res_partner.py
index f73101db..258d8143 100644
--- a/indoteknik_api/models/res_partner.py
+++ b/indoteknik_api/models/res_partner.py
@@ -28,6 +28,8 @@ class ResPartner(models.Model):
                 'street' : pengajuan_tempo.street_tempo,
                 'state' : pengajuan_tempo.state_id_tempo.id,
                 'city' : pengajuan_tempo.city_id_tempo.id,
+                'district' : pengajuan_tempo.district_id_tempo.id,
+                'subDistrict' : pengajuan_tempo.subDistrict_id_tempo.id,
                 'zip' : pengajuan_tempo.zip_tempo,
                 'mobile' : pengajuan_tempo.mobile_tempo,
                 'bank_name' : pengajuan_tempo.bank_name_tempo,
@@ -35,6 +37,8 @@ class ResPartner(models.Model):
                 'account_number' : pengajuan_tempo.account_number_tempo,
                 'website' : pengajuan_tempo.website_tempo if pengajuan_tempo.website_tempo else '',
                 'estimasi' : pengajuan_tempo.estimasi_tempo,
+                'bersedia' : pengajuan_tempo.bersedia,
+                'portal' : 'ada' if pengajuan_tempo.portal else 'tidak',
                 'tempo_duration' : pengajuan_tempo.tempo_duration.id,
                 'tempo_limit' : pengajuan_tempo.tempo_limit,
                 'category_produk': ','.join([str(cat.id) for cat in pengajuan_tempo.category_produk_ids]) if pengajuan_tempo.category_produk_ids else '',
@@ -59,16 +63,22 @@ class ResPartner(models.Model):
                 'street_pengiriman' : pengajuan_tempo.street_pengiriman if pengajuan_tempo.street_pengiriman else '',
                 'state_pengiriman' : pengajuan_tempo.state_id_pengiriman.id if pengajuan_tempo.state_id_pengiriman else '',
                 'city_pengiriman' : pengajuan_tempo.city_id_pengiriman.id if pengajuan_tempo.city_id_pengiriman  else '',
+                'district_pengiriman': pengajuan_tempo.district_id_pengiriman.id if pengajuan_tempo.district_id_pengiriman else '',
+                'subDistrict_pengiriman': pengajuan_tempo.subDistrict_id_pengiriman.id if pengajuan_tempo.subDistrict_id_pengiriman else '',
                 'zip_pengiriman' : pengajuan_tempo.zip_pengiriman if pengajuan_tempo.zip_pengiriman else '',
                 'invoice_pic_tittle' : pengajuan_tempo.invoice_pic_tittle if pengajuan_tempo.invoice_pic_tittle else '',
                 'invoice_pic' : pengajuan_tempo.invoice_pic if pengajuan_tempo.invoice_pic else '',
                 'street_invoice' : pengajuan_tempo.street_invoice if pengajuan_tempo.street_invoice else '',
                 'state_invoice' : pengajuan_tempo.state_id_invoice.id if pengajuan_tempo.state_id_invoice else '',
                 'city_invoice' : pengajuan_tempo.city_id_invoice.id if pengajuan_tempo.city_id_invoice else '',
+                'district_invoice': pengajuan_tempo.district_id_invoice.id if pengajuan_tempo.district_id_invoice else '',
+                'subDistrict_invoice': pengajuan_tempo.subDistrict_id_invoice.id if pengajuan_tempo.subDistrict_id_invoice else '',
+                'zip_invoice': pengajuan_tempo.zip_invoice if pengajuan_tempo.zip_invoice else '',
                 'tukar_invoice_input' : pengajuan_tempo.tukar_invoice if pengajuan_tempo.tukar_invoice else '',
                 'tukar_invoice_input_pembayaran' : pengajuan_tempo.jadwal_bayar if pengajuan_tempo.jadwal_bayar else '',
                 'dokumen_pengiriman' : ','.join(dokumen_pengiriman) if dokumen_pengiriman else '',
                 'dokumen_pengiriman_input' : pengajuan_tempo.dokumen_pengiriman_input if pengajuan_tempo.dokumen_pengiriman_input else '',
+                'dokumen_kirim_input' : pengajuan_tempo.dokumen_kirim_input if pengajuan_tempo.dokumen_kirim_input else '',
                 'dokumen_pengiriman_invoice' : pengajuan_tempo.dokumen_invoice if pengajuan_tempo.dokumen_invoice else '',
                 'is_same_addrees': pengajuan_tempo.is_same_address if pengajuan_tempo.is_same_address else False,
                 'is_same_addrees_street': pengajuan_tempo.is_same_address_street if pengajuan_tempo.is_same_address_street else False,
@@ -85,12 +95,6 @@ class ResPartner(models.Model):
                 ] if pengajuan_tempo.supplier_ids else '',
 
                 # Dokumen
-                'dokumen_nib':
-                    {
-                        'name': pengajuan_tempo.dokumen_nib.name,
-                        'base64': pengajuan_tempo.dokumen_nib.local_url,
-                    }
-                if pengajuan_tempo.dokumen_nib else '',
                 'dokumen_npwp':
                     {
                         'name': pengajuan_tempo.dokumen_npwp.name,
@@ -100,6 +104,31 @@ class ResPartner(models.Model):
                         'name': pengajuan_tempo.dokumen_sppkp.name,
                         'base64': pengajuan_tempo.dokumen_sppkp.local_url,
                     } if pengajuan_tempo.dokumen_sppkp else '',
+                'dokumen_nib':
+                    {
+                        'name': pengajuan_tempo.dokumen_nib.name,
+                        'base64': pengajuan_tempo.dokumen_nib.local_url,
+                    }if pengajuan_tempo.dokumen_nib else '',
+                'dokumen_siup':
+                    {
+                        'name': pengajuan_tempo.dokumen_siup.name,
+                        'base64': pengajuan_tempo.dokumen_siup.local_url,
+                    }if pengajuan_tempo.dokumen_siup else '',
+                'dokumen_tdp':
+                    {
+                        'name': pengajuan_tempo.dokumen_tdp.name,
+                        'base64': pengajuan_tempo.dokumen_tdp.local_url,
+                    }if pengajuan_tempo.dokumen_tdp else '',
+                'dokumen_skdp':
+                    {
+                        'name': pengajuan_tempo.dokumen_skdp.name,
+                        'base64': pengajuan_tempo.dokumen_skdp.local_url,
+                    }if pengajuan_tempo.dokumen_skdp else '',
+                'dokumen_skt':
+                    {
+                        'name': pengajuan_tempo.dokumen_skt.name,
+                        'base64': pengajuan_tempo.dokumen_skt.local_url,
+                    }if pengajuan_tempo.dokumen_skt else '',
                 'dokumen_akta_perubahan': {
                         'name': pengajuan_tempo.dokumen_akta_perubahan.name,
                         'base64': pengajuan_tempo.dokumen_akta_perubahan.local_url,
diff --git a/indoteknik_custom/models/res_partner.py b/indoteknik_custom/models/res_partner.py
index 835ac65d..93125bb9 100644
--- a/indoteknik_custom/models/res_partner.py
+++ b/indoteknik_custom/models/res_partner.py
@@ -35,6 +35,7 @@ class ResPartner(models.Model):
     account_name_tempo = fields.Char(string="Nama Rekening")
     account_number_tempo = fields.Char(string="Nomor Rekening Bank")
     website_tempo = fields.Char(string='Website')
+    portal = fields.Boolean(string='Portal Website')
     estimasi_tempo = fields.Char(string='Estimasi Pembelian Pertahun')
     tempo_duration = fields.Many2one('account.payment.term', string='Durasi Tempo')
     tempo_limit = fields.Char(string='Limit Tempo')
@@ -60,21 +61,30 @@ class ResPartner(models.Model):
     street_pengiriman = fields.Char(string="Alamat Perusahaan")
     state_id_pengiriman = fields.Many2one('res.country.state', string='State')
     city_id_pengiriman = fields.Many2one('vit.kota', string='City')
+    district_id_pengiriman = fields.Many2one('vit.kecamatan', string='Kecamatan')
+    subDistrict_id_pengiriman = fields.Many2one('vit.kelurahan', string='Kelurahan')
     zip_pengiriman = fields.Char(string="Zip")
     invoice_pic = fields.Char(string='Nama PIC Penerimaan Invoice')
     street_invoice = fields.Char(string="Alamat Perusahaan")
     state_id_invoice = fields.Many2one('res.country.state', string='State')
     city_id_invoice = fields.Many2one('vit.kota', string='City')
+    district_id_invoice = fields.Many2one('vit.kecamatan', string='Kecamatan')
+    subDistrict_id_invoice = fields.Many2one('vit.kelurahan', string='Kelurahan')
+    zip_invoice = fields.Char(string="Zip")
     tukar_invoice = fields.Char(string='Jadwal Penukaran Invoice')
     jadwal_bayar = fields.Char(string='Jadwal Pembayaran')
-    dokumen_pengiriman = fields.Char(string='Dokumen saat Pengiriman Barang')
-    dokumen_pengiriman_input = fields.Char(string='Dokumen saat Pengiriman Barang input')
+    dokumen_pengiriman = fields.Char(string='Dokumen Tanda Terima yang Diberikan Pada Saat Pengiriman Barang')
+    dokumen_pengiriman_input = fields.Char(string='Dokumen yang Dibawa Saat Pengiriman Barang')
     dokumen_invoice = fields.Char(string='Dokumen yang dilampirkan saat Pengiriman Invoice')
 
     # Dokumen
-    dokumen_nib = fields.Many2one('ir.attachment', string="NIB (SIUP/TDP/SKDP)", tracking=3, readonly=True,)
     dokumen_npwp = fields.Many2one('ir.attachment', string="NPWP Perusahaan", tracking=3, readonly=True)
     dokumen_sppkp = fields.Many2one('ir.attachment', string="SPPKP Perusahaan", tracking=3, readonly=True)
+    dokumen_nib = fields.Many2one('ir.attachment', string="NIB (SIUP/TDP/SKDP)", tracking=3, readonly=True,)
+    dokumen_siup = fields.Many2many('ir.attachment', 'pengajuan_dokumen_siup_rel', string="SIUP Perusahaan", tracking=True)
+    dokumen_tdp = fields.Many2many('ir.attachment', 'pengajuan_dokumen_tdp_rel', string="TDP Perusahaan", tracking=True)
+    dokumen_skdp = fields.Many2many('ir.attachment', 'pengajuan_dokumen_skdp_rel', string="SKDP Perusahaan",tracking=True)
+    dokumen_skt = fields.Many2many('ir.attachment', 'pengajuan_dokumen_skt_rel', string="SKT Perusahaan", tracking=True)
     dokumen_akta_perubahan = fields.Many2one('ir.attachment', string="Akta Perubahan", tracking=3, readonly=True)
     dokumen_ktp_dirut = fields.Many2one('ir.attachment', string="KTP Dirut/Direktur", tracking=3, readonly=True)
     dokumen_akta_pendirian = fields.Many2one('ir.attachment', string="Akta Pendirian", tracking=3, readonly=True)
@@ -210,6 +220,7 @@ class ResPartner(models.Model):
             vals['account_name_tempo'] = vals.get('account_name_tempo', self.account_name_tempo)
             vals['account_number_tempo'] = vals.get('account_number_tempo', self.account_number_tempo)
             vals['website_tempo'] = vals.get('website_tempo', self.website_tempo)
+            vals['portal'] = vals.get('portal', self.portal)
             vals['estimasi_tempo'] = vals.get('estimasi_tempo', self.estimasi_tempo)
             vals['tempo_duration'] = vals.get('tempo_duration', self.tempo_duration)
             vals['tempo_limit'] = vals.get('tempo_limit', self.tempo_limit)
@@ -231,11 +242,16 @@ class ResPartner(models.Model):
             vals['street_pengiriman'] = vals.get('street_pengiriman', self.street_pengiriman)
             vals['state_id_pengiriman'] = vals.get('state_id_pengiriman', self.state_id_pengiriman)
             vals['city_id_pengiriman'] = vals.get('city_id_pengiriman', self.city_id_pengiriman)
+            vals['district_id_pengiriman'] = vals.get('district_id_pengiriman', self.district_id_pengiriman)
+            vals['subDistrict_id_pengiriman'] = vals.get('subDistrict_id_pengiriman', self.subDistrict_id_pengiriman)
             vals['zip_pengiriman'] = vals.get('zip_pengiriman', self.zip_pengiriman)
             vals['invoice_pic'] = vals.get('invoice_pic', self.invoice_pic)
             vals['street_invoice'] = vals.get('street_invoice', self.street_invoice)
             vals['state_id_invoice'] = vals.get('state_id_invoice', self.state_id_invoice)
             vals['city_id_invoice'] = vals.get('city_id_invoice', self.city_id_invoice)
+            vals['district_id_invoice'] = vals.get('district_id_invoice', self.district_id_invoice)
+            vals['subDistrict_id_invoice'] = vals.get('subDistrict_id_invoice', self.subDistrict_id_invoice)
+            vals['zip_invoice'] = vals.get('zip_invoice', self.zip_invoice)
             vals['tukar_invoice'] = vals.get('tukar_invoice', self.tukar_invoice)
             vals['jadwal_bayar'] = vals.get('jadwal_bayar', self.jadwal_bayar)
             vals['dokumen_pengiriman'] = vals.get('dokumen_pengiriman', self.dokumen_pengiriman)
@@ -243,9 +259,13 @@ class ResPartner(models.Model):
             vals['dokumen_invoice'] = vals.get('dokumen_invoice', self.dokumen_invoice)
 
             # Dokumen
-            vals['dokumen_nib'] = vals.get('dokumen_nib', self.dokumen_nib)
             vals['dokumen_npwp'] = vals.get('dokumen_npwp', self.dokumen_npwp)
             vals['dokumen_sppkp'] = vals.get('dokumen_sppkp', self.dokumen_sppkp)
+            vals['dokumen_nib'] = vals.get('dokumen_nib', self.dokumen_nib)
+            vals['dokumen_siup'] = vals.get('dokumen_siup', self.dokumen_siup)
+            vals['dokumen_tdp'] = vals.get('dokumen_tdp', self.dokumen_tdp)
+            vals['dokumen_skdp'] = vals.get('dokumen_skdp', self.dokumen_skdp)
+            vals['dokumen_skt'] = vals.get('dokumen_skt', self.dokumen_skt)
             vals['dokumen_akta_perubahan'] = vals.get('dokumen_akta_perubahan', self.dokumen_akta_perubahan)
             vals['dokumen_ktp_dirut'] = vals.get('dokumen_ktp_dirut', self.dokumen_ktp_dirut)
             vals['dokumen_akta_pendirian'] = vals.get('dokumen_akta_pendirian', self.dokumen_akta_pendirian)
@@ -273,6 +293,7 @@ class ResPartner(models.Model):
                 'account_name_tempo': vals.get('account_name_tempo'),
                 'account_number_tempo': vals.get('account_number_tempo'),
                 'website_tempo': vals.get('website_tempo'),
+                'portal': vals.get('portal'),
                 'estimasi_tempo': vals.get('estimasi_tempo'),
                 'tempo_duration': vals.get('tempo_duration'),
                 'tempo_limit': vals.get('tempo_limit'),
@@ -290,19 +311,28 @@ class ResPartner(models.Model):
                 'street_pengiriman': vals.get('street_pengiriman'),
                 'state_id_pengiriman': vals.get('state_id_pengiriman'),
                 'city_id_pengiriman': vals.get('city_id_pengiriman'),
+                'district_id_pengiriman': vals.get('district_id_pengiriman'),
+                'subDistrict_id_pengiriman': vals.get('subDistrict_id_pengiriman'),
                 'zip_pengiriman': vals.get('zip_pengiriman'),
                 'invoice_pic': vals.get('invoice_pic'),
                 'street_invoice': vals.get('street_invoice'),
                 'state_id_invoice': vals.get('state_id_invoice'),
                 'city_id_invoice': vals.get('city_id_invoice'),
+                'district_id_invoice': vals.get('district_id_invoice'),
+                'subDistrict_id_invoice': vals.get('subDistrict_id_invoice'),
+                'zip_invoice': vals.get('zip_invoice'),
                 'tukar_invoice': vals.get('tukar_invoice'),
                 'jadwal_bayar': vals.get('jadwal_bayar'),
                 'dokumen_pengiriman': vals.get('dokumen_pengiriman'),
                 'dokumen_pengiriman_input': vals.get('dokumen_pengiriman_input'),
                 'dokumen_invoice': vals.get('dokumen_invoice'),
-                'dokumen_nib': vals.get('dokumen_nib'),
                 'dokumen_npwp': vals.get('dokumen_npwp'),
                 'dokumen_sppkp': vals.get('dokumen_sppkp'),
+                'dokumen_nib': vals.get('dokumen_nib'),
+                'dokumen_siup': vals.get('dokumen_siup'),
+                'dokumen_tdp': vals.get('dokumen_tdp'),
+                'dokumen_skdp': vals.get('dokumen_skdp'),
+                'dokumen_skt': vals.get('dokumen_skt'),
                 'dokumen_akta_perubahan': vals.get('dokumen_akta_perubahan'),
                 'dokumen_ktp_dirut': vals.get('dokumen_ktp_dirut'),
                 'dokumen_akta_pendirian': vals.get('dokumen_akta_pendirian'),
diff --git a/indoteknik_custom/models/user_pengajuan_tempo.py b/indoteknik_custom/models/user_pengajuan_tempo.py
index b347e75e..3d8fcb4f 100644
--- a/indoteknik_custom/models/user_pengajuan_tempo.py
+++ b/indoteknik_custom/models/user_pengajuan_tempo.py
@@ -39,12 +39,16 @@ class UserPengajuanTempo(models.Model):
     street_tempo = fields.Char(string="Alamat Perusahaan")
     state_id_tempo = fields.Many2one('res.country.state', string='State')
     city_id_tempo = fields.Many2one('vit.kota', string='City')
+    district_id_tempo = fields.Many2one('vit.kecamatan', string='Kecamatan')
+    subDistrict_id_tempo = fields.Many2one('vit.kelurahan', string='Kelurahan')
     zip_tempo = fields.Char(string="Zip")
     mobile_tempo = fields.Char(string="No. Telfon Perusahaan")
     bank_name_tempo = fields.Char(string="Nama Bank")
     account_name_tempo = fields.Char(string="Nama Rekening")
     account_number_tempo = fields.Char(string="Nomor Rekening Bank")
     website_tempo = fields.Char(string='Website')
+    portal = fields.Boolean(string='Portal Website')
+    bersedia = fields.Char(string='Website')
     estimasi_tempo = fields.Char(string='Estimasi Pembelian Pertahun')
     tempo_duration = fields.Many2one('account.payment.term', string='Durasi Tempo')
     tempo_limit = fields.Char(string='Limit Tempo')
@@ -74,16 +78,22 @@ class UserPengajuanTempo(models.Model):
     street_pengiriman = fields.Char(string="Alamat Perusahaan")
     state_id_pengiriman = fields.Many2one('res.country.state', string='State')
     city_id_pengiriman = fields.Many2one('vit.kota', string='City')
+    district_id_pengiriman = fields.Many2one('vit.kecamatan', string='Kecamatan')
+    subDistrict_id_pengiriman = fields.Many2one('vit.kelurahan', string='Kelurahan')
     zip_pengiriman = fields.Char(string="Zip")
     invoice_pic_tittle = fields.Char(string='Tittle PIC Penerimaan Invoice')
     invoice_pic = fields.Char(string='Nama PIC Penerimaan Invoice')
     street_invoice = fields.Char(string="Alamat Perusahaan")
     state_id_invoice = fields.Many2one('res.country.state', string='State')
     city_id_invoice = fields.Many2one('vit.kota', string='City')
+    district_id_invoice = fields.Many2one('vit.kecamatan', string='Kecamatan')
+    subDistrict_id_invoice = fields.Many2one('vit.kelurahan', string='Kelurahan')
+    zip_invoice = fields.Char(string="Zip")
     tukar_invoice = fields.Char(string='Jadwal Penukaran Invoice')
     jadwal_bayar = fields.Char(string='Jadwal Pembayaran')
-    dokumen_pengiriman = fields.Char(string='Dokumen saat Pengiriman Barang')
-    dokumen_pengiriman_input = fields.Char(string='Dokumen saat Pengiriman Barang input')
+    dokumen_pengiriman = fields.Char(string='Dokumen Tanda Terima yang Diberikan Pada Saat Pengiriman Barang')
+    dokumen_kirim_input = fields.Char(string='Dokumen lain yang diterima saat pengiriman barang')
+    dokumen_pengiriman_input = fields.Char(string='Dokumen yang Dibawa Saat Pengiriman Barang')
     dokumen_invoice = fields.Char(string='Dokumen yang dilampirkan saat Pengiriman Invoice')
     is_same_address = fields.Boolean(string="Same Address pengiriman invoicr dan alamat pengiriman barang")
     is_same_address_street = fields.Boolean(string="Same Address pengiriman barang dan alamat bisnis")
@@ -92,21 +102,25 @@ class UserPengajuanTempo(models.Model):
     supplier_ids = fields.Many2many('user.pengajuan.tempo.line', string="Suppliers")
 
     #Dokumen
-    dokumen_nib = fields.Many2many('ir.attachment', 'pengajuan_dokumen_nib_rel', string="NIB (SIUP/TDP/SKDP)", tracking=3, track_visibility="onchange")
-    dokumen_npwp = fields.Many2many('ir.attachment', 'pengajuan_dokumen_npwp_rel', string="NPWP Perusahaan", tracking=3)
-    dokumen_sppkp = fields.Many2many('ir.attachment', 'pengajuan_dokumen_sppkp_rel', string="SPPKP Perusahaan", tracking=3)
+    dokumen_nib = fields.Many2many('ir.attachment', 'pengajuan_dokumen_nib_rel', string="NIB", tracking=True, track_visibility="onchange")
+    dokumen_npwp = fields.Many2many('ir.attachment', 'pengajuan_dokumen_npwp_rel', string="NPWP Perusahaan", tracking=True)
+    dokumen_sppkp = fields.Many2many('ir.attachment', 'pengajuan_dokumen_sppkp_rel', string="SPPKP Perusahaan", tracking=True)
+    dokumen_siup = fields.Many2many('ir.attachment', 'pengajuan_dokumen_siup_rel', string="SIUP Perusahaan", tracking=True)
+    dokumen_tdp = fields.Many2many('ir.attachment', 'pengajuan_dokumen_tdp_rel', string="TDP Perusahaan", tracking=True)
+    dokumen_skdp = fields.Many2many('ir.attachment', 'pengajuan_dokumen_skdp_rel', string="SKDP Perusahaan", tracking=True)
+    dokumen_skt = fields.Many2many('ir.attachment', 'pengajuan_dokumen_skt_rel', string="SKT Perusahaan", tracking=True)
     dokumen_akta_perubahan = fields.Many2many('ir.attachment', 'pengajuan_dokumen_akta_perubahan_rel',
-                                              string="Akta Perubahan", tracking=3)
+                                              string="Akta Perubahan", tracking=True)
     dokumen_ktp_dirut = fields.Many2many('ir.attachment', 'pengajuan_dokumen_ktp_dirut_rel',
-                                         string="KTP Dirut/Direktur", tracking=3)
+                                         string="KTP Dirut/Direktur", tracking=True)
     dokumen_akta_pendirian = fields.Many2many('ir.attachment', 'pengajuan_dokumen_angkta_pendirian_rel',
-                                         string="Akta Pendirian", tracking=3)
+                                         string="Akta Pendirian", tracking=True)
     dokumen_laporan_keuangan = fields.Many2many('ir.attachment', 'pengajuan_dokumen_laporan_keuangan_rel',
-                                         string="Laporan Keuangan", tracking=3)
+                                         string="Laporan Keuangan", tracking=True)
     dokumen_foto_kantor = fields.Many2many('ir.attachment', 'pengajuan_dokumen_foto_kantor_rel',
-                                         string=" Foto Kantor (Tampak Depan)", tracking=3)
+                                         string=" Foto Kantor (Tampak Depan)", tracking=True)
     dokumen_tempat_bekerja = fields.Many2many('ir.attachment', 'pengajuan_dokumen_tempat_bekerja_rel',
-                                           string="Tempat Bekerja", tracking=3)
+                                           string="Tempat Bekerja", tracking=True)
 
     @api.depends('name', 'name_tempo')
     def name_get(self):
diff --git a/indoteknik_custom/models/user_pengajuan_tempo_request.py b/indoteknik_custom/models/user_pengajuan_tempo_request.py
index 452e4763..c181ab68 100644
--- a/indoteknik_custom/models/user_pengajuan_tempo_request.py
+++ b/indoteknik_custom/models/user_pengajuan_tempo_request.py
@@ -69,6 +69,7 @@ class UserPengajuanTempoRequest(models.Model):
     account_name_tempo = fields.Char(string="Nama Rekening", related='pengajuan_tempo_id.account_name_tempo', store=True, tracking=True, readonly=False)
     account_number_tempo = fields.Char(string="Nomor Rekening Bank", related='pengajuan_tempo_id.account_number_tempo', store=True, tracking=True, readonly=False)
     website_tempo = fields.Char(string='Website', related='pengajuan_tempo_id.website_tempo', store=True, tracking=True, readonly=False)
+    portal = fields.Boolean(string='Portal Website', related='pengajuan_tempo_id.portal', store=True, tracking=True, readonly=False)
     estimasi_tempo = fields.Char(string='Estimasi Pembelian Pertahun', related='pengajuan_tempo_id.estimasi_tempo', store=True, tracking=True, readonly=False)
     tempo_duration_origin = fields.Many2one('account.payment.term', string='Durasi Tempo', related='pengajuan_tempo_id.tempo_duration', store=True, tracking=True, readonly=False, domain=[('id', 'in', [24, 25, 29, 32])])
     tempo_limit_origin = fields.Char(string='Limit Tempo', related='pengajuan_tempo_id.tempo_limit' , store=True, tracking=True, readonly=False)
@@ -91,16 +92,21 @@ class UserPengajuanTempoRequest(models.Model):
     street_pengiriman = fields.Char(string="Alamat Perusahaan", related='pengajuan_tempo_id.street_pengiriman', store=True, readonly=False)
     state_id_pengiriman = fields.Many2one('res.country.state', string='State', related='pengajuan_tempo_id.state_id_pengiriman', store=True, readonly=False)
     city_id_pengiriman = fields.Many2one('vit.kota', string='City', related='pengajuan_tempo_id.city_id_pengiriman', store=True, readonly=False)
+    district_id_pengiriman = fields.Many2one('vit.kecamatan', string='Kecamatan',related='pengajuan_tempo_id.district_id_pengiriman', store=True, readonly=False)
+    subDistrict_id_pengiriman = fields.Many2one('vit.kelurahan', string='Kelurahan', related='pengajuan_tempo_id.subDistrict_id_pengiriman', store=True, readonly=False)
     zip_pengiriman = fields.Char(string="Zip", related='pengajuan_tempo_id.zip_pengiriman', store=True, readonly=False)
     invoice_pic_tittle = fields.Char(string='Tittle PIC Penerimaan Invoice', related='pengajuan_tempo_id.invoice_pic_tittle', store=True, readonly=False)
     invoice_pic = fields.Char(string='Nama PIC Penerimaan Invoice', related='pengajuan_tempo_id.invoice_pic', store=True, readonly=False)
     street_invoice = fields.Char(string="Alamat Perusahaan", related='pengajuan_tempo_id.street_invoice', store=True, readonly=False)
     state_id_invoice = fields.Many2one('res.country.state', string='State', related='pengajuan_tempo_id.state_id_invoice', store=True, readonly=False)
     city_id_invoice = fields.Many2one('vit.kota', string='City', related='pengajuan_tempo_id.city_id_invoice', store=True, readonly=False)
+    district_id_invoice = fields.Many2one('vit.kecamatan', string='Kecamatan', related='pengajuan_tempo_id.district_id_invoice', store=True, readonly=False)
+    subDistrict_id_invoice = fields.Many2one('vit.kelurahan', string='Kelurahan', related='pengajuan_tempo_id.subDistrict_id_invoice', store=True, readonly=False)
+    zip_invoice = fields.Char(string="Zip", related='pengajuan_tempo_id.zip_invoice', store=True, readonly=False)
     tukar_invoice = fields.Char(string='Jadwal Penukaran Invoice', related='pengajuan_tempo_id.tukar_invoice', store=True, readonly=False)
     jadwal_bayar = fields.Char(string='Jadwal Pembayaran', related='pengajuan_tempo_id.jadwal_bayar', store=True, readonly=False)
-    dokumen_pengiriman = fields.Char(string='Dokumen saat Pengiriman Barang', related='pengajuan_tempo_id.dokumen_pengiriman', store=True, readonly=False)
-    dokumen_pengiriman_input = fields.Char(string='Dokumen saat Pengiriman Barang input', related='pengajuan_tempo_id.dokumen_pengiriman_input', store=True, readonly=False)
+    dokumen_pengiriman = fields.Char(string='Dokumen Tanda Terima yang Diberikan Pada Saat Pengiriman Barang', related='pengajuan_tempo_id.dokumen_pengiriman', store=True, readonly=False)
+    dokumen_pengiriman_input = fields.Char(string='Dokumen yang dibawa saat pengiriman barang', related='pengajuan_tempo_id.dokumen_pengiriman_input', store=True, readonly=False)
     dokumen_invoice = fields.Char(string='Dokumen yang dilampirkan saat Pengiriman Invoice', related='pengajuan_tempo_id.dokumen_invoice', store=True, readonly=False)
     is_same_address = fields.Boolean(string="Same Address pengiriman invoicr dan alamat pengiriman barang", related='pengajuan_tempo_id.is_same_address', store=True, readonly=False)
     is_same_address_street = fields.Boolean(string="Same Address pengiriman barang dan alamat bisnis", related='pengajuan_tempo_id.is_same_address_street', store=True, readonly=False)
@@ -109,16 +115,6 @@ class UserPengajuanTempoRequest(models.Model):
     supplier_ids = fields.Many2many('user.pengajuan.tempo.line',related='pengajuan_tempo_id.supplier_ids', string="Suppliers", readonly=False)
 
     # Dokumen
-    dokumen_nib = fields.Many2many(
-        'ir.attachment',
-        'pengajuan_dokumen_nib_rel',
-        string="NIB (SIUP/TDP/SKDP)",
-        related='pengajuan_tempo_id.dokumen_nib',
-        readonly=False,
-        tracking=3,
-        track_visibility="onchange"
-    )
-
     dokumen_npwp = fields.Many2many(
         'ir.attachment',
         'pengajuan_dokumen_npwp_rel',
@@ -136,6 +132,53 @@ class UserPengajuanTempoRequest(models.Model):
         readonly=False,
         tracking=3
     )
+    dokumen_nib = fields.Many2many(
+        'ir.attachment',
+        'pengajuan_dokumen_nib_rel',
+        string="NIB",
+        related='pengajuan_tempo_id.dokumen_nib',
+        readonly=False,
+        tracking=3,
+        track_visibility="onchange"
+    )
+    dokumen_siup = fields.Many2many(
+        'ir.attachment',
+        'pengajuan_dokumen_siup_rel',
+        string="SIUP",
+        related='pengajuan_tempo_id.dokumen_siup',
+        readonly=False,
+        tracking=3,
+        track_visibility="onchange"
+    )
+
+    dokumen_tdp = fields.Many2many(
+        'ir.attachment',
+        'pengajuan_dokumen_tdp_rel',
+        string="TDP",
+        related='pengajuan_tempo_id.dokumen_tdp',
+        readonly=False,
+        tracking=3,
+        track_visibility="onchange"
+    )
+    dokumen_skdp = fields.Many2many(
+        'ir.attachment',
+        'pengajuan_dokumen_skdp_rel',
+        string="SKDP",
+        related='pengajuan_tempo_id.dokumen_skdp',
+        readonly=False,
+        tracking=3,
+        track_visibility="onchange"
+    )
+
+    dokumen_skt = fields.Many2many(
+        'ir.attachment',
+        'pengajuan_dokumen_skt_rel',
+        string="SKT",
+        related='pengajuan_tempo_id.dokumen_skt',
+        readonly=False,
+        tracking=3,
+        track_visibility="onchange"
+    )
 
     dokumen_akta_perubahan = fields.Many2many(
         'ir.attachment',
@@ -208,6 +251,7 @@ class UserPengajuanTempoRequest(models.Model):
             self.pengajuan_tempo_id.account_name_tempo = self.account_name_tempo
             self.pengajuan_tempo_id.account_number_tempo = self.account_number_tempo
             self.pengajuan_tempo_id.website_tempo = self.website_tempo
+            self.pengajuan_tempo_id.portal = self.portal
             self.pengajuan_tempo_id.estimasi_tempo = self.estimasi_tempo
             self.pengajuan_tempo_id.tempo_duration = self.tempo_duration_origin
             self.pengajuan_tempo_id.tempo_limit = self.tempo_limit_origin
@@ -229,8 +273,9 @@ class UserPengajuanTempoRequest(models.Model):
             self.pengajuan_tempo_id.finance_email = self.finance_email
 
     @api.onchange('pic_tittle', 'pic_name', 'street_pengiriman', 'state_id_pengiriman', 'city_id_pengiriman',
-                  'zip_pengiriman',
+                  'zip_pengiriman', 'district_id_pengiriman', 'subDistrict_id_pengiriman'
                   'invoice_pic_tittle', 'invoice_pic', 'street_invoice', 'state_id_invoice', 'city_id_invoice',
+                  'district_id_invoice', 'subDistrict_id_invoice', 'zip_invoice',
                   'tukar_invoice', 'jadwal_bayar', 'dokumen_pengiriman', 'dokumen_pengiriman_input', 'dokumen_invoice',
                   'is_same_address', 'is_same_address_street')
     def _onchange_related_fields_pengiriman(self):
@@ -241,12 +286,17 @@ class UserPengajuanTempoRequest(models.Model):
             self.pengajuan_tempo_id.street_pengiriman = self.street_pengiriman
             self.pengajuan_tempo_id.state_id_pengiriman = self.state_id_pengiriman
             self.pengajuan_tempo_id.city_id_pengiriman = self.city_id_pengiriman
+            self.pengajuan_tempo_id.district_id_pengiriman = self.district_id_pengiriman
+            self.pengajuan_tempo_id.subDistrict_id_pengiriman = self.subDistrict_id_pengiriman
             self.pengajuan_tempo_id.zip_pengiriman = self.zip_pengiriman
             self.pengajuan_tempo_id.invoice_pic_tittle = self.invoice_pic_tittle
             self.pengajuan_tempo_id.invoice_pic = self.invoice_pic
             self.pengajuan_tempo_id.street_invoice = self.street_invoice
             self.pengajuan_tempo_id.state_id_invoice = self.state_id_invoice
             self.pengajuan_tempo_id.city_id_invoice = self.city_id_invoice
+            self.pengajuan_tempo_id.district_id_invoice = self.district_id_invoice
+            self.pengajuan_tempo_id.subDistrict_id_invoice = self.subDistrict_id_invoice
+            self.pengajuan_tempo_id.zip_invoice = self.zip_invoice
             self.pengajuan_tempo_id.tukar_invoice = self.tukar_invoice
             self.pengajuan_tempo_id.jadwal_bayar = self.jadwal_bayar
             self.pengajuan_tempo_id.dokumen_pengiriman = self.dokumen_pengiriman
@@ -262,11 +312,16 @@ class UserPengajuanTempoRequest(models.Model):
 
     @api.onchange('dokumen_nib', 'dokumen_npwp', 'dokumen_sppkp', 'dokumen_akta_perubahan',
                   'dokumen_ktp_dirut', 'dokumen_akta_pendirian', 'dokumen_laporan_keuangan',
-                  'dokumen_foto_kantor', 'dokumen_tempat_bekerja')
+                  'dokumen_foto_kantor', 'dokumen_tempat_bekerja', 'dokumen_skdp', 'dokumen_skt', 'dokumen_siup',
+                  'dokumen_tdp')
     def _onchange_related_fields_dokumen(self):
         if self.pengajuan_tempo_id:
             # Perbarui nilai di pengajuan_tempo_id
             self.pengajuan_tempo_id.dokumen_nib = self.dokumen_nib
+            self.pengajuan_tempo_id.dokumen_siup = self.dokumen_siup
+            self.pengajuan_tempo_id.dokumen_tdp = self.dokumen_tdp
+            self.pengajuan_tempo_id.dokumen_skdp = self.dokumen_skdp
+            self.pengajuan_tempo_id.dokumen_skt = self.dokumen_skt
             self.pengajuan_tempo_id.dokumen_npwp = self.dokumen_npwp
             self.pengajuan_tempo_id.dokumen_sppkp = self.dokumen_sppkp
             self.pengajuan_tempo_id.dokumen_akta_perubahan = self.dokumen_akta_perubahan
@@ -388,6 +443,7 @@ class UserPengajuanTempoRequest(models.Model):
             self.user_company_id.account_name_tempo = self.pengajuan_tempo_id.account_name_tempo
             self.user_company_id.account_number_tempo = self.pengajuan_tempo_id.account_number_tempo
             self.user_company_id.website_tempo = self.pengajuan_tempo_id.website_tempo
+            self.user_company_id.portal = self.pengajuan_tempo_id.portal
             self.user_company_id.estimasi_tempo = self.pengajuan_tempo_id.estimasi_tempo
             self.user_company_id.tempo_duration = tempo_duration.id
             self.user_company_id.tempo_limit = limit_tempo
@@ -432,7 +488,9 @@ class UserPengajuanTempoRequest(models.Model):
                     "name": self.pengajuan_tempo_id.pic_name,
                     "street": self.pengajuan_tempo_id.street_pengiriman,
                     "state_id": self.pengajuan_tempo_id.state_id_pengiriman.id,
-                    "city": self.pengajuan_tempo_id.city_id_pengiriman.id,
+                    "kota_id": self.pengajuan_tempo_id.city_id_pengiriman.id,
+                    "kecamatan_id": self.pengajuan_tempo_id.district_id_pengiriman.id,
+                    "kelurahan_id": self.pengajuan_tempo_id.subDistrict_id_pengiriman.id,
                     "zip": self.pengajuan_tempo_id.zip_pengiriman,
                 },
                 {
@@ -440,7 +498,10 @@ class UserPengajuanTempoRequest(models.Model):
                     "name": self.pengajuan_tempo_id.invoice_pic,
                     "street": self.pengajuan_tempo_id.street_invoice,
                     "state_id": self.pengajuan_tempo_id.state_id_invoice.id,
-                    "city": self.pengajuan_tempo_id.city_id_invoice.id,
+                    "kota_id": self.pengajuan_tempo_id.city_id_invoice.id,
+                    "kecamatan_id": self.pengajuan_tempo_id.district_id_invoice.id,
+                    "kelurahan_id": self.pengajuan_tempo_id.subDistrict_id_invoice.id,
+                    "zip": self.pengajuan_tempo_id.zip_invoice.id,
                 },
             ]
 
@@ -456,11 +517,16 @@ class UserPengajuanTempoRequest(models.Model):
             self.user_company_id.street_pengiriman = self.pengajuan_tempo_id.street_pengiriman
             self.user_company_id.state_id_pengiriman = self.pengajuan_tempo_id.state_id_pengiriman
             self.user_company_id.city_id_pengiriman = self.pengajuan_tempo_id.city_id_pengiriman
+            self.user_company_id.district_id_pengiriman = self.pengajuan_tempo_id.district_id_pengiriman
+            self.user_company_id.subDistrict_id_pengiriman = self.pengajuan_tempo_id.subDistrict_id_pengiriman
             self.user_company_id.zip_pengiriman = self.pengajuan_tempo_id.zip_pengiriman
             self.user_company_id.invoice_pic = self.pengajuan_tempo_id.invoice_pic
             self.user_company_id.street_invoice = self.pengajuan_tempo_id.street_invoice
             self.user_company_id.state_id_invoice = self.pengajuan_tempo_id.state_id_invoice
             self.user_company_id.city_id_invoice = self.pengajuan_tempo_id.city_id_invoice
+            self.user_company_id.district_id_invoice = self.pengajuan_tempo_id.district_id_invoice
+            self.user_company_id.subDistrict_id_invoice = self.pengajuan_tempo_id.subDistrict_id_invoice
+            self.user_company_id.zip_invoice = self.pengajuan_tempo_id.zip_invoice
             self.user_company_id.tukar_invoice = self.pengajuan_tempo_id.tukar_invoice
             self.user_company_id.jadwal_bayar = self.pengajuan_tempo_id.jadwal_bayar
             self.user_company_id.dokumen_pengiriman = self.pengajuan_tempo_id.dokumen_pengiriman
@@ -471,10 +537,6 @@ class UserPengajuanTempoRequest(models.Model):
             self.user_company_id.supplier_ids = self.pengajuan_tempo_id.supplier_ids
 
             # Dokumen
-            self.user_company_id.dokumen_nib = self.pengajuan_tempo_id.dokumen_nib[0]
-            if self.user_company_id.dokumen_nib:
-                self.user_company_id.message_post(body='Dokumen NIB', attachment_ids=[self.user_company_id.dokumen_nib.id])
-
             self.user_company_id.dokumen_npwp = self.pengajuan_tempo_id.dokumen_npwp[0]
             if self.user_company_id.dokumen_npwp:
                 self.user_company_id.message_post(body='Dokumen NPWP', attachment_ids=[self.user_company_id.dokumen_npwp.id])
@@ -483,6 +545,26 @@ class UserPengajuanTempoRequest(models.Model):
             if self.user_company_id.dokumen_sppkp:
                 self.user_company_id.message_post(body='Dokumen SPPKP', attachment_ids=[self.user_company_id.dokumen_sppkp.id])
 
+            self.user_company_id.dokumen_nib = self.pengajuan_tempo_id.dokumen_nib[0]
+            if self.user_company_id.dokumen_nib:
+                self.user_company_id.message_post(body='Dokumen NIB', attachment_ids=[self.user_company_id.dokumen_nib.id])
+
+            self.user_company_id.dokumen_siup = self.pengajuan_tempo_id.dokumen_siup[0]
+            if self.user_company_id.dokumen_siup:
+                self.user_company_id.message_post(body='dokumen SIUP', attachment_ids=[self.user_company_id.dokumen_siup.id])
+
+            self.user_company_id.dokumen_tdp = self.pengajuan_tempo_id.dokumen_tdp[0]
+            if self.user_company_id.dokumen_tdp:
+                self.user_company_id.message_post(body='dokumen TDP', attachment_ids=[self.user_company_id.dokumen_tdp.id])
+
+            self.user_company_id.dokumen_skdp = self.pengajuan_tempo_id.dokumen_skdp[0]
+            if self.user_company_id.dokumen_skdp:
+                self.user_company_id.message_post(body='dokumen SKDP', attachment_ids=[self.user_company_id.dokumen_skdp.id])
+
+            self.user_company_id.dokumen_skt = self.pengajuan_tempo_id.dokumen_skt[0]
+            if self.user_company_id.dokumen_skt:
+                self.user_company_id.message_post(body='dokumen SKT', attachment_ids=[self.user_company_id.dokumen_skt.id])
+
             self.user_company_id.dokumen_akta_perubahan = self.pengajuan_tempo_id.dokumen_akta_perubahan[0] if self.pengajuan_tempo_id.dokumen_akta_perubahan else []
             if self.user_company_id.dokumen_akta_perubahan:
                 self.user_company_id.message_post(body='Dokumen Akta Perubahan',
diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 91298319..b1ec1d07 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -96,6 +96,7 @@
                                 <field name="account_name_tempo"/>
                                 <field name="account_number_tempo"/>
                                 <field name="website_tempo"/>
+                                <field name="portal"/>
                                 <field name="estimasi_tempo"/>
                                 <field name="tempo_duration"/>
                                 <field name="tempo_limit"/>
@@ -129,6 +130,8 @@
                                 <field name="street_pengiriman"/>
                                 <field name="state_id_pengiriman"/>
                                 <field name="city_id_pengiriman"/>
+                                <field name="district_id_pengiriman"/>
+                                <field name="subDistrict_id_pengiriman"/>
                                 <field name="zip_pengiriman"/>
                             </group>
                             <group>
@@ -136,6 +139,9 @@
                                 <field name="street_invoice"/>
                                 <field name="state_id_invoice"/>
                                 <field name="city_id_invoice"/>
+                                <field name="district_id_invoice"/>
+                                <field name="subDistrict_id_invoice"/>
+                                <field name="zip_invoice"/>
                             </group>
                             <group>
                                 <field name="tukar_invoice"/>
@@ -160,16 +166,20 @@
                         </group>
 
                         <group string="Dokumen">
-                            <field name="dokumen_nib" />
                             <field name="dokumen_npwp"  />
                             <field name="dokumen_sppkp"  />
+                            <field name="dokumen_nib" />
+                            <field name="dokumen_siup" widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
+                            <field name="dokumen_tdp" widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
+                            <field name="dokumen_skdp" widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
+                            <field name="dokumen_skt" widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
+                            <field name="dokumen_akta_pendirian"  />
                             <field name="dokumen_akta_perubahan"  />
+                            <field name="dokumen_tempat_bekerja"  />
+                            <field name="dokumen_foto_kantor"  />
                             <field name="dokumen_ktp_dirut" />
-                            <field name="dokumen_akta_pendirian"  />
                             <field name="dokumen_laporan_keuangan"  />
                             <field name="dokumen_ktp_dirut"  />
-                             <field name="dokumen_foto_kantor"  />
-                            <field name="dokumen_tempat_bekerja"  />
                         </group>
                     </page>
                 </notebook>
diff --git a/indoteknik_custom/views/user_pengajuan_tempo.xml b/indoteknik_custom/views/user_pengajuan_tempo.xml
index a6360136..5b9e51cc 100644
--- a/indoteknik_custom/views/user_pengajuan_tempo.xml
+++ b/indoteknik_custom/views/user_pengajuan_tempo.xml
@@ -14,12 +14,15 @@
                             <field name="street_tempo"/>
                             <field name="state_id_tempo"/>
                             <field name="city_id_tempo"/>
+                            <field name="district_id_tempo"/>
+                            <field name="subDistrict_id_tempo"/>
                             <field name="zip_tempo"/>
                             <field name="mobile_tempo"/>
                             <field name="bank_name_tempo"/>
                             <field name="account_name_tempo"/>
                             <field name="account_number_tempo"/>
                             <field name="website_tempo"/>
+                            <field name="portal"/>
                             <field name="estimasi_tempo"/>
                             <field name="tempo_duration"/>
                             <field name="tempo_limit"/>
@@ -53,6 +56,8 @@
                             <field name="street_pengiriman"/>
                             <field name="state_id_pengiriman"/>
                             <field name="city_id_pengiriman"/>
+                            <field name="district_id_pengiriman"/>
+                            <field name="subDistrict_id_pengiriman"/>
                             <field name="zip_pengiriman"/>
                         </group>
                         <group>
@@ -60,6 +65,9 @@
                             <field name="street_invoice"/>
                             <field name="state_id_invoice"/>
                             <field name="city_id_invoice"/>
+                            <field name="district_id_invoice"/>
+                            <field name="subDistrict_id_invoice"/>
+                            <field name="zip_invoice"/>
                         </group>
                         <group>
                             <field name="tukar_invoice"/>
@@ -84,16 +92,20 @@
                     </group>
 
                     <group string="Dokumen">
-                        <field name="dokumen_nib" widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
                         <field name="dokumen_npwp" widget="many2many_binary" />
                         <field name="dokumen_sppkp" widget="many2many_binary" />
+                        <field name="dokumen_nib" widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
+                        <field name="dokumen_siup" widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
+                        <field name="dokumen_tdp" widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
+                        <field name="dokumen_skdp" widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
+                        <field name="dokumen_skt" widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
+                        <field name="dokumen_akta_pendirian" widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
                         <field name="dokumen_akta_perubahan" widget="many2many_binary" />
+                        <field name="dokumen_tempat_bekerja" widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
+                         <field name="dokumen_foto_kantor" widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
                         <field name="dokumen_ktp_dirut" widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
-                        <field name="dokumen_akta_pendirian" widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
                         <field name="dokumen_laporan_keuangan" widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
                         <field name="dokumen_ktp_dirut" widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
-                         <field name="dokumen_foto_kantor" widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
-                        <field name="dokumen_tempat_bekerja" widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
                     </group>
                 </sheet>
                 <div class="oe_chatter">
diff --git a/indoteknik_custom/views/user_pengajuan_tempo_request.xml b/indoteknik_custom/views/user_pengajuan_tempo_request.xml
index 25907a67..2d21ae6c 100644
--- a/indoteknik_custom/views/user_pengajuan_tempo_request.xml
+++ b/indoteknik_custom/views/user_pengajuan_tempo_request.xml
@@ -91,6 +91,8 @@
                             <field name="street_pengiriman"/>
                             <field name="state_id_pengiriman"/>
                             <field name="city_id_pengiriman"/>
+                            <field name="district_id_pengiriman"/>
+                            <field name="subDistrict_id_pengiriman"/>
                             <field name="zip_pengiriman"/>
                         </group>
                         <group>
@@ -98,6 +100,9 @@
                             <field name="street_invoice"/>
                             <field name="state_id_invoice"/>
                             <field name="city_id_invoice"/>
+                            <field name="district_id_invoice"/>
+                            <field name="subDistrict_id_invoice"/>
+                            <field name="zip_invoice"/>
                         </group>
                         <group>
                             <field name="tukar_invoice"/>
@@ -119,17 +124,21 @@
                         </field>
                     </Page>
                     <Page string="Dokumen">
-                       <group string="Dokumen">
-                            <field name="dokumen_nib" widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
+                       <group >
                             <field name="dokumen_npwp"  widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
                             <field name="dokumen_sppkp"  widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
+                            <field name="dokumen_nib" widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
+                            <field name="dokumen_siup" widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
+                            <field name="dokumen_tdp" widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
+                            <field name="dokumen_skdp" widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
+                            <field name="dokumen_skt" widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
+                            <field name="dokumen_akta_pendirian"  widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
                             <field name="dokumen_akta_perubahan"  widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
+                            <field name="dokumen_tempat_bekerja"  widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
+                            <field name="dokumen_foto_kantor"  widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
                             <field name="dokumen_ktp_dirut" widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
-                            <field name="dokumen_akta_pendirian"  widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
                             <field name="dokumen_laporan_keuangan"  widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
                             <field name="dokumen_ktp_dirut"  widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
-                             <field name="dokumen_foto_kantor"  widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
-                            <field name="dokumen_tempat_bekerja"  widget="many2many_binary" options="{'no_create': True, 'no_open': False}"/>
                         </group>
                     </Page>
                 </notebook>
@@ -252,7 +261,7 @@
     <record id="mail_template_res_user_company_tempo_approved" model="mail.template">
             <field name="name">Users: Company Tempo Approved</field>
             <field name="model_id" ref="indoteknik_custom.model_user_pengajuan_tempo_request"/>
-            <field name="subject">Pengajuan Tempo kamu di Indoteknik.com Telah Disetujui!</field>
+            <field name="subject">Pengajuan Tempo Anda di Indoteknik.com Telah Disetujui!</field>
             <field name="email_from">"Indoteknik.com" &lt;noreply@indoteknik.com&gt;</field>
             <field name="reply_to">sales@indoteknik.com</field>
             <field name="email_to">${object.user_id.email | safe}</field>
@@ -285,15 +294,15 @@
                                         <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
                                             <tr><td style="padding-bottom: 24px;"><b>Hai. ${object.pengajuan_tempo_id.name_tempo.name},</b></td></tr>
 
-                                            <tr><td style="padding-bottom: 16px;">Kabar baik! Kami dengan senang hati menginformasikan bahwa pengajuan tempo pembayaran kamu di Indoteknik.com telah disetujui dengan detail sebagai berikut.</td></tr>
+                                            <tr><td style="padding-bottom: 16px;">Kabar baik! Kami dengan senang hati menginformasikan bahwa pengajuan tempo pembayaran anda di Indoteknik.com telah disetujui dengan detail sebagai berikut.</td></tr>
                                             <tr><td style="padding-bottom: 4px;"><b>Limit Pembayaran Tempo : Rp ${object.format_currency(object.user_id.tempo_limit)}</b></td></tr>
 
                                             <tr><td style="padding-bottom: 16px;"><b>Durasi Pembayaran Tempo : ${object.user_id.tempo_duration.name}</b></td></tr>
                                            <tr>
-                                                <td style="padding-bottom: 16px; ">Kamu dapat melakukan pembayaran sesuai dengan jangka waktu yang telah disepakati. Detail lengkap mengenai transaksi kamu, termasuk tanggal jatuh tempo &amp; Pengajuan Kenaikan Limit Tempo, dapat kamu lihat di akun <a href="https://indoteknik.com/my/profile">Profile Indoteknik.com</a> .</td>
+                                                <td style="padding-bottom: 16px; ">Anda dapat melakukan pembayaran sesuai dengan jangka waktu yang telah disepakati. Detail lengkap mengenai transaksi anda, termasuk tanggal jatuh tempo &amp; Pengajuan Kenaikan Limit Tempo, dapat anda lihat di akun <a href="https://indoteknik.com/my/profile">Profile Indoteknik.com</a> .</td>
                                             </tr>
 
-                                            <tr><td style="padding-bottom: 16px;">Terima kasih atas kepercayaan kamu kepada Indoteknik.com.</td></tr>
+                                            <tr><td style="padding-bottom: 16px;">Terima kasih atas kepercayaan anda kepada Indoteknik.com.</td></tr>
 
                                             <tr><td style="padding-bottom: 2px;"><b>Hormat kami,</b></td></tr>
                                             <tr><td style="padding-bottom: 2px;">PT. INDOTEKNIK DOTCOM GEMILANG</td></tr>