diff options
| author | it-fixcomart <it@fixcomart.co.id> | 2024-12-06 17:08:46 +0700 |
|---|---|---|
| committer | it-fixcomart <it@fixcomart.co.id> | 2024-12-06 17:08:46 +0700 |
| commit | af85c0d2248728fe33675dcec6e513eefd6553a4 (patch) | |
| tree | f8d4aef19486ef22e990e02c12de904fd65c71cc | |
| parent | 0aad5455df5d36ef87ab1cbd52030a3cf0bef1d8 (diff) | |
<iman> update pengajuan tempo
| -rw-r--r-- | indoteknik_api/controllers/api_v1/partner.py | 97 | ||||
| -rw-r--r-- | indoteknik_api/models/res_partner.py | 23 | ||||
| -rw-r--r-- | indoteknik_api/models/res_users.py | 6 | ||||
| -rw-r--r-- | indoteknik_custom/models/res_partner.py | 3 | ||||
| -rw-r--r-- | indoteknik_custom/models/user_pengajuan_tempo.py | 6 | ||||
| -rw-r--r-- | indoteknik_custom/models/user_pengajuan_tempo_request.py | 45 | ||||
| -rw-r--r-- | indoteknik_custom/views/res_partner.xml | 1 | ||||
| -rw-r--r-- | indoteknik_custom/views/user_pengajuan_tempo.xml | 1 | ||||
| -rw-r--r-- | indoteknik_custom/views/user_pengajuan_tempo_request.xml | 6 |
9 files changed, 107 insertions, 81 deletions
diff --git a/indoteknik_api/controllers/api_v1/partner.py b/indoteknik_api/controllers/api_v1/partner.py index 0522e8e1..d8464add 100644 --- a/indoteknik_api/controllers/api_v1/partner.py +++ b/indoteknik_api/controllers/api_v1/partner.py @@ -308,22 +308,27 @@ class Partner(controller.Controller): 'tempoLimit': ['alias:tempo_limit'], # informasi perusahaan + 'direkturTittle': ['alias:direktur_tittle'], 'direkturName': ['alias:direktur_name'], 'direkturMobile': ['alias:direktur_mobile'], 'direkturEmail': ['alias:direktur_email'], + 'purchasingTittle': ['alias:purchasing_tittle'], 'purchasingName': ['alias:purchasing_name'], 'purchasingMobile': ['alias:purchasing_mobile'], 'purchasingEmail': ['alias:purchasing_email'], + 'financeTittle': ['alias:finance_tittle'], 'financeName': ['alias:finance_name'], 'financeMobile': ['alias:finance_mobile'], 'financeEmail': ['alias:finance_email'], # Pengiriman + 'PICTittle': ['alias:pic_tittle'], 'PICName': ['alias:pic_name'], 'streetPengiriman': ['alias:street_pengiriman'], 'statePengiriman': ['alias:state_id_pengiriman'], 'cityPengiriman': ['alias:city_id_pengiriman'], 'zipPengiriman': ['alias:zip_pengiriman'], + 'invoicePicTittle': ['alias:invoice_pic_tittle'], 'invoicePic': ['alias:invoice_pic'], 'streetInvoice': ['alias:street_invoice'], 'stateInvoice': ['alias:state_id_invoice'], @@ -384,37 +389,13 @@ class Partner(controller.Controller): category_ids = list(map(int, category_produk_ids.split(','))) pengajuan_tempo.category_produk_ids = [(6, 0, category_ids)] - every_weekday = True if kw.get('everyWeekday') == "true" else False - every_weekday_input = kw.get('everyWeekdayInput') - every_week = True if kw.get('everyWeek') == 'true' else False - every_week_input = kw.get('everyWeekInput') - tukar_invoice = True if kw.get('tukarInvoice') == 'true' else False tukar_invoice_input = kw.get('tukarInvoiceInput') - jadwal_tukar_invoice = "" - if every_weekday: - jadwal_tukar_invoice += f"setiap hari {every_weekday_input}" - if every_week: - jadwal_tukar_invoice += f", setiap {every_week_input}" - if tukar_invoice or tukar_invoice_input: - jadwal_tukar_invoice += f", {tukar_invoice_input}" - if jadwal_tukar_invoice: - pengajuan_tempo.tukar_invoice = jadwal_tukar_invoice - - every_weekday_pembayaran = True if kw.get('everyWeekdayPembayaran') == 'true' else False - every_weekday_input_pembayaran = kw.get('everyWeekdayInputPembayaran') - every_week_pembayaran = True if kw.get('everyWeekPembayaran') == 'true' else False - every_week_input_pembayaran = kw.get('everyWeekInputPembayaran') - tukar_invoice_pembayaran = True if kw.get('tukarInvoicePembayaran') == 'true' else False + if tukar_invoice_input: + pengajuan_tempo.tukar_invoice = tukar_invoice_input + tukar_invoice_input_pembayaran = kw.get('tukarInvoiceInputPembayaran') - jadwal_tukar_invoice_pembayaran = "" - if every_weekday_pembayaran: - jadwal_tukar_invoice_pembayaran += f"setiap hari {every_weekday_input_pembayaran}" - if every_week_pembayaran: - jadwal_tukar_invoice_pembayaran += f", setiap {every_week_input_pembayaran}" - if tukar_invoice_pembayaran or tukar_invoice_input_pembayaran: - jadwal_tukar_invoice_pembayaran += f", {tukar_invoice_input_pembayaran}" - if jadwal_tukar_invoice_pembayaran: - pengajuan_tempo.jadwal_bayar = jadwal_tukar_invoice_pembayaran + if tukar_invoice_input_pembayaran: + pengajuan_tempo.jadwal_bayar = tukar_invoice_input_pembayaran dokumen_kirim = [ 'Surat Tanda Terima Barang (STTB)', @@ -431,11 +412,10 @@ class Partner(controller.Controller): 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_barang_input: - input_items = [item.strip() for item in dokumen_kirim_barang_input.split(',')] - dokumen_kirim_barang.extend(item for item in input_items if item and item not in dokumen_kirim_barang) if dokumen_kirim_barang: pengajuan_tempo.dokumen_pengiriman = ', '.join(dokumen_kirim_barang) + if dokumen_kirim_barang_input: + pengajuan_tempo.dokumen_pengiriman_input = dokumen_kirim_barang_input dokumen = [ 'Invoice Pembelian', @@ -445,18 +425,9 @@ class Partner(controller.Controller): 'Good Receipt (GR)' ] - dokumen_invoice_ids = kw.get('dokumenPengirimanInvoice') - dokumen_invoice_input = kw.get('dokumenPengirimanInvoiceInput', '') - dokumen_invoice = "" - - if dokumen_invoice_ids: - dokumen_ids = list(map(int, dokumen_invoice_ids.split(','))) - dokumen_invoice = [dokumen[i] for i in dokumen_ids if 0 <= i < len(dokumen)] - if dokumen_invoice_input: - input_items = [item.strip() for item in dokumen_invoice_input.split(',')] - dokumen_invoice.extend(item for item in input_items if item and item not in dokumen_invoice) + dokumen_invoice = kw.get('dokumenPengirimanInvoice', '') if dokumen_invoice: - pengajuan_tempo.dokumen_invoice = ', '.join(dokumen_invoice) + pengajuan_tempo.dokumen_invoice = dokumen_invoice form_dokumen_data = kw.get('formDocs', False) if form_dokumen_data: @@ -477,37 +448,39 @@ class Partner(controller.Controller): 'mimetype': mimetype }) - if dokumen['documentName'] == 'dokumenNib' and dokumen['details']['base64'] != '' : - pengajuan_tempo.dokumen_nib = [(4, sppkp_attachment.id)] + if dokumen['documentName'] == 'dokumenNib': + pengajuan_tempo.dokumen_nib = [(6, 0, [sppkp_attachment.id])] - elif dokumen['documentName'] == 'dokumenNpwp' and dokumen['details']['base64'] != '' : - pengajuan_tempo.dokumen_npwp = [(4, sppkp_attachment.id)] + elif dokumen['documentName'] == 'dokumenNpwp': + pengajuan_tempo.dokumen_npwp = [(6, 0, [sppkp_attachment.id])] - elif dokumen['documentName'] == 'dokumenSppkp' and dokumen['details']['base64'] != '' : - pengajuan_tempo.dokumen_sppkp = [(4, sppkp_attachment.id)] + elif dokumen['documentName'] == 'dokumenSppkp': + pengajuan_tempo.dokumen_sppkp = [(6, 0, [sppkp_attachment.id])] - elif dokumen['documentName'] == 'dokumenAktaPerubahan' and dokumen['details']['base64'] != '' : - pengajuan_tempo.dokumen_akta_perubahan = [(4, sppkp_attachment.id)] + elif dokumen['documentName'] == 'dokumenAktaPerubahan': + pengajuan_tempo.dokumen_akta_perubahan = [(6, 0, [sppkp_attachment.id])] - elif dokumen['documentName'] == 'dokumenKtpDirut' and dokumen['details']['base64'] != '' : - pengajuan_tempo.dokumen_ktp_dirut = [(4, sppkp_attachment.id)] + elif dokumen['documentName'] == 'dokumenKtpDirut': + pengajuan_tempo.dokumen_ktp_dirut = [(6, 0, [sppkp_attachment.id])] - elif dokumen['documentName'] == 'dokumenAktaPendirian' and dokumen['details']['base64'] != '' : - pengajuan_tempo.dokumen_akta_pendirian = [(4, sppkp_attachment.id)] + elif dokumen['documentName'] == 'dokumenAktaPendirian': + pengajuan_tempo.dokumen_akta_pendirian = [(6, 0, [sppkp_attachment.id])] - elif dokumen['documentName'] == 'dokumenLaporanKeuangan' and dokumen['details']['base64'] != '' : - pengajuan_tempo.dokumen_laporan_keuangan = [(4, sppkp_attachment.id)] + elif dokumen['documentName'] == 'dokumenLaporanKeuangan': + pengajuan_tempo.dokumen_laporan_keuangan = [(6, 0, [sppkp_attachment.id])] - elif dokumen['documentName'] == 'dokumenFotoKantor' and dokumen['details']['base64'] != '' : - pengajuan_tempo.dokumen_foto_kantor = [(4, sppkp_attachment.id)] + elif dokumen['documentName'] == 'dokumenFotoKantor': + pengajuan_tempo.dokumen_foto_kantor = [(6, 0, [sppkp_attachment.id])] - elif dokumen['documentName'] == 'dokumen_tempat_bekerja' and dokumen['details']['base64'] != '' : - pengajuan_tempo.dokumen_tempat_bekerja = [(4, sppkp_attachment.id)] + elif dokumen['documentName'] == 'dokumenTempatBekerja': + pengajuan_tempo.dokumen_tempat_bekerja = [(6, 0, [sppkp_attachment.id])] - formatted_text = ''.join([' ' + char if char.isupper() and i != 0 else char for i, char in enumerate(dokumen['documentName'])]) + formatted_text = ''.join([' ' + char if char.isupper() and i != 0 else char for i, char in + enumerate(dokumen['documentName'])]) teks = formatted_text.strip().title() pengajuan_tempo.message_post(body=teks, attachment_ids=[sppkp_attachment.id]) + except json.JSONDecodeError: return http.Response(status=400, json_body={'error': 'Invalid JSON format for formDokumen'}) if tempo_request: diff --git a/indoteknik_api/models/res_partner.py b/indoteknik_api/models/res_partner.py index 7b3c8d47..f73101db 100644 --- a/indoteknik_api/models/res_partner.py +++ b/indoteknik_api/models/res_partner.py @@ -22,21 +22,6 @@ class ResPartner(models.Model): dokumen_pengiriman_list = [dokumen.strip() for dokumen in pengajuan_tempo_dokumen_pengiriman.split(',')] dokumen_pengiriman = [mapping_dokumen.get(dokumen, '4') for dokumen in dokumen_pengiriman_list] - dokumen = [ - ['Invoice Pembelian','0'], - ['Surat Jalan','1'], - ['Berita Acara Serah Terima (BAST)','2'], - ['Faktur Pajak','3'], - ['Good Receipt (GR)','4'] - ] - dokumen_invoice = [] - if pengajuan_tempo.dokumen_invoice: - pengajuan_tempo_dokumen_invoice = pengajuan_tempo.dokumen_invoice - mapping_dokumen = {item[0]: item[1] for item in dokumen} - dokumen_invoice_list = [dokumen.strip() for dokumen in pengajuan_tempo_dokumen_invoice.split(',')] - dokumen_invoice = [mapping_dokumen.get(dokumen, '4') for dokumen in dokumen_invoice_list] - - data = { 'name' : pengajuan_tempo.name_tempo.name, 'industry_id' : pengajuan_tempo.industry_id_tempo.id, @@ -55,22 +40,27 @@ class ResPartner(models.Model): 'category_produk': ','.join([str(cat.id) for cat in pengajuan_tempo.category_produk_ids]) if pengajuan_tempo.category_produk_ids else '', # Kontak Perusahaan + 'direktur_tittle': pengajuan_tempo.direktur_tittle if pengajuan_tempo.direktur_tittle else '', 'direktur_name' : pengajuan_tempo.direktur_name if pengajuan_tempo.direktur_name else '', 'direktur_mobile' : pengajuan_tempo.direktur_mobile if pengajuan_tempo.direktur_mobile else '', 'direktur_email' : pengajuan_tempo.direktur_email if pengajuan_tempo.direktur_email else '', + 'purchasing_tittle': pengajuan_tempo.purchasing_tittle if pengajuan_tempo.purchasing_tittle else '', 'purchasing_name' : pengajuan_tempo.purchasing_name if pengajuan_tempo.purchasing_name else '', 'purchasing_mobile' : pengajuan_tempo.purchasing_mobile if pengajuan_tempo.purchasing_mobile else '', 'purchasing_email' : pengajuan_tempo.purchasing_email if pengajuan_tempo.purchasing_email else '', + 'finance_tittle': pengajuan_tempo.finance_tittle if pengajuan_tempo.finance_tittle else '', 'finance_name' : pengajuan_tempo.finance_name if pengajuan_tempo.finance_name else '', 'finance_mobile' : pengajuan_tempo.finance_mobile if pengajuan_tempo.finance_mobile else '', 'finance_email' : pengajuan_tempo.finance_email if pengajuan_tempo.finance_email else '', # Pengiriman + 'PIC_tittle' : pengajuan_tempo.pic_tittle if pengajuan_tempo.pic_tittle else '', 'PIC_name' : pengajuan_tempo.pic_name if pengajuan_tempo.pic_name else '', '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 '', '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 '', @@ -78,7 +68,8 @@ class ResPartner(models.Model): '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_invoice' : ','.join(dokumen_invoice) if dokumen_invoice else '', + 'dokumen_pengiriman_input' : pengajuan_tempo.dokumen_pengiriman_input if pengajuan_tempo.dokumen_pengiriman_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, 'supplier_ids': [ diff --git a/indoteknik_api/models/res_users.py b/indoteknik_api/models/res_users.py index 0c7dd96f..93204a96 100644 --- a/indoteknik_api/models/res_users.py +++ b/indoteknik_api/models/res_users.py @@ -16,7 +16,11 @@ class ResUsers(models.Model): } partner_tempo = '' 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 '' + 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_payment_term() diff --git a/indoteknik_custom/models/res_partner.py b/indoteknik_custom/models/res_partner.py index b21b1965..d2395dc5 100644 --- a/indoteknik_custom/models/res_partner.py +++ b/indoteknik_custom/models/res_partner.py @@ -68,6 +68,7 @@ class ResPartner(models.Model): 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_invoice = fields.Char(string='Dokumen yang dilampirkan saat Pengiriman Invoice') # Dokumen @@ -238,6 +239,7 @@ class ResPartner(models.Model): 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) + vals['dokumen_pengiriman_input'] = vals.get('dokumen_pengiriman_input', self.dokumen_pengiriman_input) vals['dokumen_invoice'] = vals.get('dokumen_invoice', self.dokumen_invoice) # Dokumen @@ -296,6 +298,7 @@ class ResPartner(models.Model): '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'), diff --git a/indoteknik_custom/models/user_pengajuan_tempo.py b/indoteknik_custom/models/user_pengajuan_tempo.py index b527fa4c..046c4cc7 100644 --- a/indoteknik_custom/models/user_pengajuan_tempo.py +++ b/indoteknik_custom/models/user_pengajuan_tempo.py @@ -55,22 +55,27 @@ class UserPengajuanTempo(models.Model): return [('parent_id', '=', False)] # Kontak Perusahaan + direktur_tittle = fields.Char(string='tittle Direktur') direktur_name = fields.Char(string='Nama Lengkap Direktur') direktur_mobile = fields.Char(string='No. Telpon Direktur') direktur_email = fields.Char(string='Email Direktur') + purchasing_tittle = fields.Char(string='tittle Purchasing') purchasing_name = fields.Char(string='Nama Purchasing') purchasing_mobile = fields.Char(string='No. Telpon Purchasing') purchasing_email = fields.Char(string='Email Purchasing') + finance_tittle = fields.Char(string='tittle Finance') finance_name = fields.Char(string='Nama Finance') finance_mobile = fields.Char(string='No. Telpon Finance') finance_email = fields.Char(string='Email Finance') # Pengiriman + pic_tittle = fields.Char(string='Tittle PIC Penerimaan Barang') pic_name = fields.Char(string='Nama PIC Penerimaan Barang') 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') 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') @@ -78,6 +83,7 @@ class UserPengajuanTempo(models.Model): 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_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") diff --git a/indoteknik_custom/models/user_pengajuan_tempo_request.py b/indoteknik_custom/models/user_pengajuan_tempo_request.py index 2d4875fb..74eda31f 100644 --- a/indoteknik_custom/models/user_pengajuan_tempo_request.py +++ b/indoteknik_custom/models/user_pengajuan_tempo_request.py @@ -184,6 +184,50 @@ class UserPengajuanTempoRequest(models.Model): self.user_company_id.finance_mobile = self.pengajuan_tempo_id.finance_mobile self.user_company_id.finance_email = self.pengajuan_tempo_id.finance_email + # Data untuk kontak baru + contacts_data = [ + { + "type": "contact", + "name": self.pengajuan_tempo_id.direktur_name, + "email": self.pengajuan_tempo_id.direktur_email, + "phone": self.pengajuan_tempo_id.direktur_mobile, + }, + { + "type": "contact", + "name": self.pengajuan_tempo_id.purchasing_name, + "email": self.pengajuan_tempo_id.purchasing_email, + "phone": self.pengajuan_tempo_id.purchasing_mobile, + }, + { + "type": "contact", + "name": self.pengajuan_tempo_id.finance_name, + "email": self.pengajuan_tempo_id.finance_email, + "phone": self.pengajuan_tempo_id.finance_mobile, + }, + { + "type": "delivery", + "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_id": self.pengajuan_tempo_id.city_id_pengiriman.id, + "zip": self.pengajuan_tempo_id.zip_pengiriman, + }, + { + "type": "invoice", + "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_id": self.pengajuan_tempo_id.city_id_invoice.id, + }, + ] + + # Buat kontak baru untuk company_id + for contact_data in contacts_data: + self.env['res.partner'].create({ + "parent_id": self.user_company_id.id, # Hubungkan ke perusahaan + **contact_data, # Tambahkan data kontak + }) + # Pengiriman self.user_company_id.pic_name = self.pengajuan_tempo_id.pic_name self.user_company_id.street_pengiriman = self.pengajuan_tempo_id.street_pengiriman @@ -197,6 +241,7 @@ class UserPengajuanTempoRequest(models.Model): 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 + self.user_company_id.dokumen_pengiriman_input = self.pengajuan_tempo_id.dokumen_pengiriman_input self.user_company_id.dokumen_invoice = self.pengajuan_tempo_id.dokumen_invoice # Referensi diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml index 6ce340f3..91298319 100644 --- a/indoteknik_custom/views/res_partner.xml +++ b/indoteknik_custom/views/res_partner.xml @@ -141,6 +141,7 @@ <field name="tukar_invoice"/> <field name="jadwal_bayar"/> <field name="dokumen_pengiriman"/> + <field name="dokumen_pengiriman_input"/> <field name="dokumen_invoice"/> </group> </group> diff --git a/indoteknik_custom/views/user_pengajuan_tempo.xml b/indoteknik_custom/views/user_pengajuan_tempo.xml index 30d75fe8..a6360136 100644 --- a/indoteknik_custom/views/user_pengajuan_tempo.xml +++ b/indoteknik_custom/views/user_pengajuan_tempo.xml @@ -65,6 +65,7 @@ <field name="tukar_invoice"/> <field name="jadwal_bayar"/> <field name="dokumen_pengiriman"/> + <field name="dokumen_pengiriman_input"/> <field name="dokumen_invoice"/> </group> </group> diff --git a/indoteknik_custom/views/user_pengajuan_tempo_request.xml b/indoteknik_custom/views/user_pengajuan_tempo_request.xml index 17ae526c..2a3fc745 100644 --- a/indoteknik_custom/views/user_pengajuan_tempo_request.xml +++ b/indoteknik_custom/views/user_pengajuan_tempo_request.xml @@ -39,7 +39,7 @@ <field name="user_id" readonly="1"/> <field name="pengajuan_tempo_id"/> <field name="tempo_duration" attrs="{'readonly': [('state_tempo', '=', 'approval_director')]}"/> - <field name="tempo_limit" attrs="{'readonly': [('state_tempo', '=', 'approval_director')]}"/> + <field name="tempo_limit" attrs="{'readonly': [('state_tempo', '=', 'approval_director')]}" placeholder="Contoh format, misalnya '10000000'"/> </group> </group> </sheet> @@ -265,9 +265,11 @@ <tr><td style="padding-bottom: 16px;">Keputusan ini telah kami pertimbangkan secara matang berdasarkan beberapa faktor, diantaranya alasan tidak disetujuinya adalah ${object.reason_reject}</td></tr> <tr> <td style="padding-bottom: 16px; ">Kami memahami bahwa hal ini mungkin mengecewakan. Namun, kami berharap Anda dapat memahami kebijakan perusahaan kami.</td> + </tr><tr> + <td style="padding-bottom: 16px; ">Jangan khawatir anda dapat melakukan pembelian dengan metode pembayaran CBD (Cash Before Delivery) di website indoteknik.com.</td> </tr> - <tr><td style="padding-bottom: 16px;">Terima kasih atas pengertiannya.</td></tr> + <tr><td style="padding-bottom: 16px;">Terima kasih atas Perhatian & Pengertiannya.</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> |
