<iman> update merchant

2 files changed, 72 insertions, 29 deletions

diff --git a/indoteknik_custom/models/user_form_merchant.py b/indoteknik_custom/models/user_form_merchant.py
index 83ed2eeb..dd143381 100644
--- a/indoteknik_custom/models/user_form_merchant.py
+++ b/indoteknik_custom/models/user_form_merchant.py
@@ -28,9 +28,19 @@ class UserFormMerchant(models.Model):
     email_finance = fields.Char(string='Email Finance')
     phone = fields.Char(string='No. Telepon Perusahaan')
     mobile = fields.Char(string='No. Handphone')
-    bisnis_type = fields.Char(string='Bisnis Type')
+    bisnis_type = fields.Selection([
+        ('1', 'PT'),
+        ('2', 'CV'),
+        ('3', 'Perorangan'),
+    ])
     website = fields.Char(string='Website')
-    category_perusahaan = fields.Char(string='Kategori Perusahaan')
+    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)'),
+    ])
     description = fields.Text(string='Deskripsi')
 
     # imformasi Vendor
@@ -48,7 +58,11 @@ class UserFormMerchant(models.Model):
     tempo_duration = 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.Char(string='Terhitung Sejak')
+    terhitung_sejak = fields.Selection([
+        ('1', 'Terima PO'),
+        ('2', 'Barang Dikirimkan'),
+        ('3', 'Tukar Faktur'),
+    ])
 
 
 
@@ -57,22 +71,24 @@ class UserFormMerchant(models.Model):
     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.Char(string='Garansi')
+    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)')
 
 
-
-
-
-    file_dokumenKtpDirut = fields.Binary(string="KTP Dirut/Direktur", tracking=True, track_visibility="onchange")
-    file_kartuNama = fields.Binary(string="Kartu Nama", tracking=True, track_visibility="onchange")
-    file_npwp = fields.Binary(string="NPWP", tracking=True, track_visibility="onchange")
-    file_sppkp = fields.Binary(string="SPPKP", tracking=True, track_visibility="onchange")
-    file_suratPernyataan = fields.Binary(string="Surat Pernyataan Nomor Rekening", tracking=True, track_visibility="onchange")
-    file_fotoKantor = fields.Binary(string="Foto Gudang / Kantor Bagian Depan", tracking=True, track_visibility="onchange")
-    file_dataProduk = fields.Binary(string="Data Produk (Item Name, Gambar, Deskripsi)", tracking=True, track_visibility="onchange")
-    file_pricelist = fields.Binary(string="Pricelist", tracking=True, track_visibility="onchange")
+    # 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.depends('name', 'name_merchant')
     def name_get(self):
diff --git a/indoteknik_custom/views/user_form_merchant.xml b/indoteknik_custom/views/user_form_merchant.xml
index 230b6425..cbb7c756 100644
--- a/indoteknik_custom/views/user_form_merchant.xml
+++ b/indoteknik_custom/views/user_form_merchant.xml
@@ -21,38 +21,65 @@
             <form create="0">
                 <sheet>
                     <group>
-                        <group>
+                        <group string="Informasi Perusahaan" >
                             <field name="name_merchant" />
+                            <field name="pejabat_name" />
                             <field name="pic_merchant" />
+                            <field name="pic_position" />
                             <field name="address" />
                             <field name="state" />
                             <field name="city" />
                             <field name="district" />
                             <field name="subDistrict" />
                             <field name="zip" />
-                        </group>
-                        <group>
                             <field name="bank_name" />
                             <field name="rekening_name" />
                             <field name="account_number" />
+                            <field name="email_company" widget="email"/>
+                            <field name="email_sales" widget="email"/>
+                            <field name="email_finance" widget="email"/>
+                            <field name="phone" widget="phone"/>
+                            <field name="mobile" widget="phone"/>
+                            <field name="bisnis_type" />
+                            <field name="website" />
+                            <field name="category_perusahaan" />
                         </group>
+                    </group>
+                    <group string="Informasi Vendor">
+                        <group>
+                            <field name="harga_tayang" />
+                            <field name="category_produk_ids" widget="many2many_tags"/>
+                            <field name="merk_dagang" />
+                            <field name="is_pengajuan_tempo" />
+                            <field name="tempo_duration" />
+                            <field name="kredit_limit" />
+                            <field name="waktu_pengiriman" />
+                            <field name="terhitung_sejak" />
+                        </group>
+
+                    </group>
+                    <group string="Syarat Perdagangan">
+                        <group>
+                            <field name="is_kembali_barang" />
+                            <field name="tenggat_waktu" />
+                            <field name="sertifikat_produk" />
+                            <field name="custom_sertifikat_produk" />
+                            <field name="tempo_garansi" />
+                            <field name="explain_garansi" />
+                            <field name="is_order_quantity" />
+
+                        </group>
+                    </group>
+                    <group string="Dokumen">
                         <group>
-                            <field name="file_dokumenKtpDirut" />
-                            <field name="file_kartuNama" />
                             <field name="file_npwp" />
                             <field name="file_sppkp" />
+                            <field name="file_dokumenKtpDirut" />
+                            <field name="file_kartuNama" />
                             <field name="file_suratPernyataan" />
                             <field name="file_fotoKantor" />
                             <field name="file_dataProduk" />
-                            <field name="file_pricelist" />
-                        </group>
-                        <group>
-                            <field name="email_company" widget="email"/>
-                            <field name="email_sales" widget="email"/>
-                            <field name="email_finance" widget="email"/>
-                            <field name="phone" widget="phone"/>
-                            <field name="mobile" widget="phone"/>
-                            <field name="harga_tayang" />
+                            <field name="file_pricelist"  />
                         </group>
                         <group>
                             <field name="description" />