Revert "Merge branch 'CR/form-merchant' into odoo-backup"

This reverts commit f6f59e660af6c4229ada54f7313d68867df1ba15, reversing
changes made to 68378dd2fb8d61b282a672ca0f09033d15d82283.

1 files changed, 1 insertions, 183 deletions

diff --git a/indoteknik_custom/models/res_partner.py b/indoteknik_custom/models/res_partner.py
index ff07c94c..191a44c9 100644
--- a/indoteknik_custom/models/res_partner.py
+++ b/indoteknik_custom/models/res_partner.py
@@ -161,86 +161,6 @@ class ResPartner(models.Model):
                                        "this feature", tracking=3)
     telegram_id = fields.Char(string="Telegram")
 
-    # MERCHANT
-    # informasi perusahaan
-    name_merchant = fields.Char(string='Name')
-    pejabat_name = fields.Char(string='Pejabat Name')
-    pic_merchant = fields.Char(string='PIC Merchant', required=True)
-    pic_position = fields.Char(string='Jabatan PIC')
-    address_merchant = fields.Char(string='Alamat')
-    state_merchant = fields.Many2one('res.country.state', string='State')
-    city_merchant = fields.Many2one('vit.kota', string='Kota')
-    district_merchant = fields.Many2one('vit.kecamatan', string='Kecamatan')
-    subDistrict_merchant = fields.Many2one('vit.kelurahan', string='Kelurahan')
-    zip_merchant = fields.Char(string='Kode Pos')
-    bank_name_merchant = fields.Char(string='Nama Bank')
-    rekening_name_merchant = fields.Char(string='Nama Rekening')
-    account_number_merchant = fields.Char(string='Nomor Rekening Bank')
-    email_company_merchant = fields.Char(string='Email Perusahaan')
-    email_sales_merchant = fields.Char(string='Email Sales')
-    email_finance_merchant = fields.Char(string='Email Finance')
-    phone_merchant = fields.Char(string='No. Telepon Perusahaan')
-    mobile_merchant = fields.Char(string='No. Handphone')
-    bisnis_type = fields.Selection([
-        ('1', 'PT'),
-        ('2', 'CV'),
-        ('3', 'Perorangan'),
-    ])
-    website_merchant = fields.Char(string='Website')
-    category_perusahaan = fields.Selection([
-        ('1', 'Principal (Pemegang merk/Produsen)'),
-        ('2', 'Sole Distributor (Distributor Tunggal)'),
-        ('3', 'Authorized Distributor (Distributor Resmi)'),
-        ('4', 'Importer (Pengimpor Barang)'),
-        ('5', 'Wholesaler (Pedagang Besar)'),
-    ])
-    # Informasi Vendor
-    harga_tayang = fields.Char(string='Harga Tayang (HET)')
-    category_produk_ids_merchant = fields.Many2many(
-        'product.public.category',
-        string='Kategori Produk Merchant',
-        domain=lambda self: self._get_default_category_domain(),
-        relation='res_partner_category_produk_ids_merchant_rel'  # Nama tabel relasi berbeda
-    )
-
-    @api.model
-    def _get_default_category_domain(self):
-        return [('parent_id', '=', False)]
-
-    merk_dagang = fields.Char(string='Merk Dagang')
-    is_pengajuan_tempo = fields.Boolean(string='Apakah anda memiliki Form Pengajuan Tempo?')
-    tempo_duration_merchant = fields.Many2one('account.payment.term', string='Durasi Tempo')
-    kredit_limit = fields.Char(string='Kredit Limit')
-    waktu_pengiriman = fields.Char(string='Waktu Pengiriman')
-    terhitung_sejak = fields.Selection([
-        ('1', 'Terima PO'),
-        ('2', 'Barang Dikirimkan'),
-        ('3', 'Tukar Faktur'),
-    ])
-
-    # syarat dagang
-    is_kembali_barang = fields.Char(string='Syarat Pengembalian Barang')
-    tenggat_waktu = fields.Char(string='Tenggat Waktu Perubahan Harga')
-    sertifikat_produk = fields.Char(string='Dokumen/Sertifikat yang Dimiliki Oleh Brand')
-    custom_sertifikat_produk = fields.Char(string='Dokumen/Sertifikat Lainnya')
-    tempo_garansi = fields.Selection([
-        ('1', '6 Bulan Garansi'),
-        ('2', '1 Tahun Garansi'),
-        ('3', '2 Tahun Garansi'),
-    ])
-    explain_garansi = fields.Char(string='Garansi Yang Dimaksudkan')
-    is_order_quantity = fields.Char(string='Apakah Memiliki Minimum Order Quantity (MOQ)')
-
-    # dokumen
-    file_npwp = fields.Many2one('ir.attachment', string="NPWP Perusahaan", tracking=3)
-    file_sppkp = fields.Many2one('ir.attachment', string="SPPKP Perusahaan", tracking=3)
-    file_dokumenKtpDirut = fields.Many2one('ir.attachment', string="KTP Dirut/Direktur", tracking=3)
-    file_kartuNama = fields.Many2one('ir.attachment', string="Kartu Nama", tracking=3)
-    file_suratPernyataan = fields.Many2one('ir.attachment', string="Surat Pernyataan Nomor Rekening", tracking=3)
-    file_fotoKantor = fields.Many2one('ir.attachment', string="Foto Gudang / Kantor Bagian Depan", tracking=3)
-    file_dataProduk = fields.Many2one('ir.attachment', string="Data Produk (Item Name, Gambar, Deskripsi)", tracking=3)
-    file_pricelist = fields.Many2one('ir.attachment', string="Pricelist", tracking=3)
-
     @api.model
     def _default_payment_term(self):
         return self.env.ref('__export__.account_payment_term_26_484409e2').id
@@ -409,60 +329,6 @@ class ResPartner(models.Model):
             vals['dokumen_foto_kantor'] = vals.get('dokumen_foto_kantor', self.dokumen_foto_kantor)
             vals['dokumen_tempat_bekerja'] = vals.get('dokumen_tempat_bekerja', self.dokumen_tempat_bekerja)
 
-            # MERCHANT
-            # Informasi Perusahaan
-            vals['name_merchant'] = vals.get('name_merchant', self.name_merchant)
-            vals['pejabat_name'] = vals.get('pejabat_name', self.pejabat_name)
-            vals['pic_merchant'] = vals.get('pic_merchant', self.pic_merchant)
-            vals['pic_position'] = vals.get('pic_position', self.pic_position)
-            vals['address_merchant'] = vals.get('address_merchant', self.address_merchant)
-            vals['state_merchant'] = vals.get('state_merchant', self.state_merchant)
-            vals['city_merchant'] = vals.get('city_merchant', self.city_merchant)
-            vals['district_merchant'] = vals.get('district_merchant', self.district_merchant)
-            vals['subDistrict_merchant'] = vals.get('subDistrict_merchant', self.subDistrict_merchant)
-            vals['zip_merchant'] = vals.get('zip_merchant', self.zip_merchant)
-            vals['bank_name_merchant'] = vals.get('bank_name_merchant', self.bank_name_merchant)
-            vals['rekening_name_merchant'] = vals.get('rekening_name_merchant', self.rekening_name_merchant)
-            vals['account_number_merchant'] = vals.get('account_number_merchant', self.account_number_merchant)
-            vals['email_company_merchant'] = vals.get('email_company_merchant', self.email_company_merchant)
-            vals['email_sales_merchant'] = vals.get('email_sales_merchant', self.email_sales_merchant)
-            vals['email_finance_merchant'] = vals.get('email_finance_merchant', self.email_finance_merchant)
-            vals['phone_merchant'] = vals.get('phone_merchant', self.phone_merchant)
-            vals['mobile_merchant'] = vals.get('mobile_merchant', self.mobile_merchant)
-            vals['bisnis_type'] = vals.get('bisnis_type', self.bisnis_type)
-            vals['website_merchant'] = vals.get('website_merchant', self.website_merchant)
-            vals['category_perusahaan'] = vals.get('category_perusahaan', self.category_perusahaan)
-
-            #  Informasi Vendor
-            vals['harga_tayang'] = vals.get('harga_tayang', self.harga_tayang)
-            vals['category_produk_ids_merchant'] = vals.get('category_produk_ids_merchant', self.category_produk_ids_merchant)
-            vals['merk_dagang'] = vals.get('merk_dagang', self.merk_dagang)
-            vals['is_pengajuan_tempo'] = vals.get('is_pengajuan_tempo', self.is_pengajuan_tempo)
-            vals['tempo_duration_merchant'] = vals.get('tempo_duration_merchant', self.tempo_duration_merchant)
-            vals['kredit_limit'] = vals.get('kredit_limit', self.kredit_limit)
-            vals['waktu_pengiriman'] = vals.get('waktu_pengiriman', self.waktu_pengiriman)
-            vals['terhitung_sejak'] = vals.get('terhitung_sejak', self.terhitung_sejak)
-
-            #  Syarat Dagang
-            vals['is_kembali_barang'] = vals.get('is_kembali_barang', self.is_kembali_barang)
-            vals['tenggat_waktu'] = vals.get('tenggat_waktu', self.tenggat_waktu)
-            vals['sertifikat_produk'] = vals.get('sertifikat_produk', self.sertifikat_produk)
-            vals['custom_sertifikat_produk'] = vals.get('custom_sertifikat_produk', self.custom_sertifikat_produk)
-            vals['tempo_garansi'] = vals.get('tempo_garansi', self.tempo_garansi)
-            vals['explain_garansi'] = vals.get('explain_garansi', self.explain_garansi)
-            vals['is_order_quantity'] = vals.get('is_order_quantity', self.is_order_quantity)
-
-            # Dokumen
-            vals['file_dokumenKtpDirut'] = vals.get('file_dokumenKtpDirut', self.file_dokumenKtpDirut)
-            vals['file_kartuNama'] = vals.get('file_kartuNama', self.file_kartuNama)
-            vals['file_npwp'] = vals.get('file_npwp', self.file_npwp)
-            vals['file_sppkp'] = vals.get('file_sppkp', self.file_sppkp)
-            vals['file_suratPernyataan'] = vals.get('file_suratPernyataan', self.file_suratPernyataan)
-            vals['file_fotoKantor'] = vals.get('file_fotoKantor', self.file_fotoKantor)
-            vals['file_dataProduk'] = vals.get('file_dataProduk', self.file_dataProduk)
-            vals['file_pricelist'] = vals.get('file_pricelist', self.file_pricelist)
-            vals['description'] = vals.get('description', self.description)
-
             # Simpan hanya field yang perlu di-update pada child
             vals_for_child = {
                 'customer_type': vals.get('customer_type'),
@@ -534,55 +400,7 @@ class ResPartner(models.Model):
                 'dokumen_tempat_bekerja': vals.get('dokumen_tempat_bekerja'),
 
                 # internal_notes
-                'comment': vals.get('comment'),
-
-                # Merchant
-                'name_merchant': vals.get('name_merchant'),
-                'pejabat_name': vals.get('pejabat_name'),
-                'pic_merchant': vals.get('pic_merchant'),
-                'pic_position': vals.get('pic_position'),
-                'address_merchant': vals.get('address_merchant'),
-                'state_merchant': vals.get('state_merchant'),
-                'city_merchant': vals.get('city_merchant'),
-                'district_merchant': vals.get('district_merchant'),
-                'subDistrict_merchant': vals.get('subDistrict_merchant'),
-                'zip_merchant': vals.get('zip_merchant'),
-                'bank_name_merchant': vals.get('bank_name_merchant'),
-                'rekening_name_merchant': vals.get('rekening_name_merchant'),
-                'account_number_merchant': vals.get('account_number_merchant'),
-                'email_company_merchant': vals.get('email_company_merchant'),
-                'email_sales_merchant': vals.get('email_sales_merchant'),
-                'email_finance_merchant': vals.get('email_finance_merchant'),
-                'phone_merchant': vals.get('phone_merchant'),
-                'mobile_merchant': vals.get('mobile_merchant'),
-                'bisnis_type': vals.get('bisnis_type'),
-                'website_merchant': vals.get('website_merchant'),
-                'category_perusahaan': vals.get('category_perusahaan'),
-                'harga_tayang': vals.get('harga_tayang'),
-                'category_produk_ids_merchant': vals.get('category_produk_ids_merchant'),
-                'merk_dagang': vals.get('merk_dagang'),
-                'is_pengajuan_tempo': vals.get('is_pengajuan_tempo'),
-                'tempo_duration_merchant': vals.get('tempo_duration_merchant'),
-                'kredit_limit': vals.get('kredit_limit'),
-                'waktu_pengiriman': vals.get('waktu_pengiriman'),
-                'terhitung_sejak': vals.get('terhitung_sejak'),
-                'is_kembali_barang': vals.get('is_kembali_barang'),
-                'tenggat_waktu': vals.get('tenggat_waktu'),
-                'sertifikat_produk': vals.get('sertifikat_produk'),
-                'custom_sertifikat_produk': vals.get('custom_sertifikat_produk'),
-                'tempo_garansi': vals.get('tempo_garansi'),
-                'explain_garansi': vals.get('explain_garansi'),
-                'is_order_quantity': vals.get('is_order_quantity'),
-
-                'file_dokumenKtpDirut': vals.get('file_dokumenKtpDirut'),
-                'file_kartuNama': vals.get('file_kartuNama'),
-                'file_npwp': vals.get('file_npwp'),
-                'file_sppkp': vals.get('file_sppkp'),
-                'file_suratPernyataan': vals.get('file_suratPernyataan'),
-                'file_fotoKantor': vals.get('file_fotoKantor'),
-                'file_dataProduk': vals.get('file_dataProduk'),
-                'file_pricelist': vals.get('file_pricelist'),
-                'description': vals.get('description'),
+                'comment': vals.get('comment')
             }
 
             # Lakukan update pada semua child secara rekursif