summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorit-fixcomart <it@fixcomart.co.id>2025-03-06 11:34:45 +0700
committerit-fixcomart <it@fixcomart.co.id>2025-03-06 11:34:45 +0700
commit3696d94c52234025390ef92ef8928bee34d0de5b (patch)
treef40f076c12bf5c4f0ca1bee512571c17c1bf9c72
parent502d44ac6ecc8bbeeea35a205f326d0c56980934 (diff)
<iman> update code
-rw-r--r--indoteknik_api/controllers/api_v1/partner.py9
-rw-r--r--indoteknik_custom/models/user_pengajuan_tempo.py1
-rw-r--r--indoteknik_custom/models/user_pengajuan_tempo_request.py21
3 files changed, 24 insertions, 7 deletions
diff --git a/indoteknik_api/controllers/api_v1/partner.py b/indoteknik_api/controllers/api_v1/partner.py
index 9bb015c4..1d19f03d 100644
--- a/indoteknik_api/controllers/api_v1/partner.py
+++ b/indoteknik_api/controllers/api_v1/partner.py
@@ -311,7 +311,7 @@ class Partner(controller.Controller):
company_name = kw.get('name', pengajuan_tempo.name_tempo.name)
partner_id = request.env['res.partner'].search([('name', 'like', company_name)], limit=1)
user_account = self.get_user_by_email(user.email)
- dokumen_prosedur = kw.get('dokumen_prosedur', False)
+ dokumen_prosedur = kw.get('formDokumenProsedur') if kw.get('formDokumenProsedur') != 'false' else False
params = self.get_request_params(kw, {
@@ -405,11 +405,12 @@ class Partner(controller.Controller):
# Prosedur Pengiriman
if dokumen_prosedur:
- mimetype, _ = mimetypes.guess_type(dokumen_prosedur['details']['name'])
+ dokumen_prosedur = json.loads(dokumen_prosedur)
+ mimetype, _ = mimetypes.guess_type(dokumen_prosedur['name'])
mimetype = mimetype or 'application/octet-stream'
- data = base64.b64decode(dokumen_prosedur['details']['base64'])
+ data = base64.b64decode(dokumen_prosedur['base64'])
sppkp_attachment = request.env['ir.attachment'].create({
- 'name': dokumen_prosedur['details']['name'],
+ 'name': dokumen_prosedur['name'],
'type': 'binary',
'datas': base64.b64encode(data),
'res_model': 'user.pengajuan.tempo',
diff --git a/indoteknik_custom/models/user_pengajuan_tempo.py b/indoteknik_custom/models/user_pengajuan_tempo.py
index d10e7e81..0b3ab63d 100644
--- a/indoteknik_custom/models/user_pengajuan_tempo.py
+++ b/indoteknik_custom/models/user_pengajuan_tempo.py
@@ -99,6 +99,7 @@ class UserPengajuanTempo(models.Model):
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")
+ dokumen_prosedur = fields.Many2many('ir.attachment', 'dokumen_prosedur_rel', string="Dokumen Prosedur", tracking=True)
# Referensi
supplier_ids = fields.Many2many('user.pengajuan.tempo.line', string="Suppliers")
diff --git a/indoteknik_custom/models/user_pengajuan_tempo_request.py b/indoteknik_custom/models/user_pengajuan_tempo_request.py
index 72580001..abcb6f2f 100644
--- a/indoteknik_custom/models/user_pengajuan_tempo_request.py
+++ b/indoteknik_custom/models/user_pengajuan_tempo_request.py
@@ -132,7 +132,14 @@ class UserPengajuanTempoRequest(models.Model):
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)
-
+ dokumen_prosedur = fields.Many2many(
+ 'ir.attachment',
+ 'dokumen_prosedur_rel',
+ string="Dokumen Prosedur",
+ related='pengajuan_tempo_id.dokumen_prosedur',
+ readonly=False,
+ tracking=3
+ )
#Referensi
supplier_ids = fields.Many2many('user.pengajuan.tempo.line',related='pengajuan_tempo_id.supplier_ids', string="Suppliers", readonly=False)
@@ -299,7 +306,7 @@ class UserPengajuanTempoRequest(models.Model):
'invoice_pic_tittle','invoice_pic_mobile', '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')
+ 'is_same_address', 'is_same_address_street','dokumen_prosedur')
def _onchange_related_fields_pengiriman(self):
if self.pengajuan_tempo_id:
# Perbarui nilai di pengajuan_tempo_id
@@ -328,6 +335,7 @@ class UserPengajuanTempoRequest(models.Model):
self.pengajuan_tempo_id.dokumen_invoice = self.dokumen_invoice
self.pengajuan_tempo_id.is_same_address = self.is_same_address
self.pengajuan_tempo_id.is_same_address_street = self.is_same_address_street
+ self.pengajuan_tempo_id.dokumen_prosedur = self.dokumen_prosedur
@api.onchange('supplier_ids')
def _onchange_supplier_ids(self):
@@ -341,7 +349,6 @@ class UserPengajuanTempoRequest(models.Model):
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
@@ -513,6 +520,7 @@ class UserPengajuanTempoRequest(models.Model):
{
"type": "delivery",
"name": self.pengajuan_tempo_id.pic_name,
+ "phone": self.pengajuan_tempo_id.pic_mobile,
"street": self.pengajuan_tempo_id.street_pengiriman,
"state_id": self.pengajuan_tempo_id.state_id_pengiriman.id,
"kota_id": self.pengajuan_tempo_id.city_id_pengiriman.id,
@@ -523,6 +531,7 @@ class UserPengajuanTempoRequest(models.Model):
{
"type": "invoice",
"name": self.pengajuan_tempo_id.invoice_pic,
+ "phone": self.pengajuan_tempo_id.invoice_pic_mobile,
"street": self.pengajuan_tempo_id.street_invoice,
"state_id": self.pengajuan_tempo_id.state_id_invoice.id,
"kota_id": self.pengajuan_tempo_id.city_id_invoice.id,
@@ -587,6 +596,10 @@ class UserPengajuanTempoRequest(models.Model):
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
+ self.user_company_id.dokumen_prosedur = self.pengajuan_tempo_id.dokumen_prosedur[0] if self.pengajuan_tempo_id.dokumen_prosedur else []
+ if self.user_company_id.dokumen_prosedur:
+ self.user_company_id.message_post(body='Dokumen Prosedur',
+ attachment_ids=[self.user_company_id.dokumen_prosedur.id])
# Referensi
self.user_company_id.supplier_ids = self.pengajuan_tempo_id.supplier_ids
@@ -596,6 +609,8 @@ class UserPengajuanTempoRequest(models.Model):
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])
+
+
self.user_company_id.dokumen_sppkp = self.pengajuan_tempo_id.dokumen_sppkp[0] if self.pengajuan_tempo_id.dokumen_sppkp else []
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])