Merged in CR/form-merchant (pull request #310)odoo-production

odoo quotation view & merchant view

1 files changed, 27 insertions, 21 deletions

diff --git a/indoteknik_custom/models/user_pengajuan_tempo_request.py b/indoteknik_custom/models/user_pengajuan_tempo_request.py
index be4293a0..565b0315 100644
--- a/indoteknik_custom/models/user_pengajuan_tempo_request.py
+++ b/indoteknik_custom/models/user_pengajuan_tempo_request.py
@@ -108,16 +108,18 @@ class UserPengajuanTempoRequest(models.Model):
 
     # Pengiriman
     pic_tittle = fields.Char(string='Tittle PIC Penerimaan Barang', related='pengajuan_tempo_id.pic_tittle', store=True, readonly=False)
+    pic_mobile = fields.Char(string='Nomor HP PIC Penerimaan Barang', related='pengajuan_tempo_id.pic_mobile', store=True, readonly=False)
     pic_name = fields.Char(string='Nama PIC Penerimaan Barang', related='pengajuan_tempo_id.pic_name', store=True, readonly=False)
-    street_pengiriman = fields.Char(string="Alamat Perusahaan", related='pengajuan_tempo_id.street_pengiriman', store=True, readonly=False)
+    street_pengiriman = fields.Char(string="Alamat Pengiriman Barang", 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_mobile = fields.Char(string='Nomor HP PIC Penerimaan Invoice', related='pengajuan_tempo_id.invoice_pic_mobile', 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)
+    street_invoice = fields.Char(string="Alamat Pengiriman Invoice", 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)
@@ -130,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)
 
@@ -292,16 +301,17 @@ class UserPengajuanTempoRequest(models.Model):
             self.pengajuan_tempo_id.finance_mobile = self.finance_mobile
             self.pengajuan_tempo_id.finance_email = self.finance_email
 
-    @api.onchange('pic_tittle', 'pic_name', 'street_pengiriman', 'state_id_pengiriman', 'city_id_pengiriman',
+    @api.onchange('pic_tittle','pic_mobile', 'pic_name', 'street_pengiriman', 'state_id_pengiriman', 'city_id_pengiriman',
                   'zip_pengiriman', 'district_id_pengiriman', 'subDistrict_id_pengiriman'
-                  'invoice_pic_tittle', 'invoice_pic', 'street_invoice', 'state_id_invoice', 'city_id_invoice',
+                  '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
             self.pengajuan_tempo_id.pic_tittle = self.pic_tittle
+            self.pengajuan_tempo_id.pic_mobile = self.pic_mobile
             self.pengajuan_tempo_id.pic_name = self.pic_name
             self.pengajuan_tempo_id.street_pengiriman = self.street_pengiriman
             self.pengajuan_tempo_id.state_id_pengiriman = self.state_id_pengiriman
@@ -310,6 +320,7 @@ class UserPengajuanTempoRequest(models.Model):
             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_mobile = self.invoice_pic_mobile
             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
@@ -324,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):
@@ -337,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
@@ -509,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,
@@ -519,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,
@@ -535,20 +548,7 @@ class UserPengajuanTempoRequest(models.Model):
                     ('name', '=', contact_data['name'])
                 ], limit=1)
 
-                if existing_contact:
-                    # Pastikan tidak ada duplikasi nama dalam perusahaan yang sama
-                    duplicate_check = self.env['res.partner'].search([
-                        ('name', '=', contact_data['name']),
-                        ('id', '!=', existing_contact.id)  # Hindari update yang menyebabkan duplikasi global
-                    ], limit=1)
-
-                    if not duplicate_check:
-                        # Perbarui hanya field yang tidak menyebabkan konflik
-                        update_data = {k: v for k, v in contact_data.items() if k != 'name'}
-                        existing_contact.write(update_data)
-                    else:
-                        raise UserError(f"Skipping update for {contact_data['name']} due to existing duplicate.")
-                else:
+                if not existing_contact:
                     # Pastikan tidak ada partner lain dengan nama yang sama sebelum membuat baru
                     duplicate_check = self.env['res.partner'].search([
                         ('name', '=', contact_data['name'])
@@ -583,6 +583,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
@@ -592,6 +596,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])