Merge branch 'odoo-backup' into feature/feedback_bitehisp

1 files changed, 3 insertions, 16 deletions

diff --git a/indoteknik_custom/models/user_pengajuan_tempo_request.py b/indoteknik_custom/models/user_pengajuan_tempo_request.py
index abcb6f2f..565b0315 100644
--- a/indoteknik_custom/models/user_pengajuan_tempo_request.py
+++ b/indoteknik_custom/models/user_pengajuan_tempo_request.py
@@ -110,7 +110,7 @@ class UserPengajuanTempoRequest(models.Model):
     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)
@@ -119,7 +119,7 @@ class UserPengajuanTempoRequest(models.Model):
     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)
@@ -548,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'])