From 992619cde1b7d19ce29db2cd314e8b62c8bec978 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 22 Jan 2025 13:16:27 +0700
Subject: <iman> update tampilan merchant

---
 indoteknik_custom/views/res_partner.xml        | 46 ++++++++++++++++++--------
 indoteknik_custom/views/user_form_merchant.xml | 14 ++++----
 2 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 1f497f7a..19d4b940 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -190,40 +190,58 @@
                 <notebook>
                     <page string="Merchant">
                         <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_merchant" />
                                 <field name="state_merchant" />
                                 <field name="city_merchant" />
                                 <field name="district_merchant" />
                                 <field name="subDistrict_merchant" />
                                 <field name="zip_merchant" />
-                            </group>
-                            <group>
                                 <field name="bank_name_merchant" />
                                 <field name="rekening_name_merchant" />
                                 <field name="account_number_merchant" />
+                                <field name="email_company_merchant" widget="email"/>
+                                <field name="email_sales_merchant" widget="email"/>
+                                <field name="email_finance_merchant" widget="email"/>
+                                <field name="phone_merchant" widget="phone"/>
+                                <field name="mobile_merchant" widget="phone"/>
+                                <field name="bisnis_type"  />
+                                <field name="website_merchant"  />
+                                <field name="category_perusahaan"  />
                             </group>
-                            <group>
-                                <field name="file_dokumenKtpDirut" />
-                                <field name="file_kartuNama" />
+                            <group string="Syarat Perdagangan">
+                                <field name="is_kembali_barang"  />
+                                <field name="tenggat_waktu"  />
+                                <field name="sertifikat_produk"  />
+                                <field name="tempo_garansi"  />
+                                <field name="explain_garansi"  />
+                                <field name="is_order_quantity"  />
+                            </group>
+                            <group string="Informasi Vendor">
+                                <field name="harga_tayang" />
+                                <field name="category_produk_ids_merchant" widget="many2many_tags" />
+                                <field name="merk_dagang"  />
+                                <field name="is_pengajuan_tempo"  />
+                                <field name="tempo_duration_merchant"  />
+                                <field name="kredit_limit"  />
+                                <field name="waktu_pengiriman"  />
+                                <field name="terhitung_sejak"  />
+                            </group>
+                            <group string="Dokumen">
                                 <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_merchant" widget="email"/>
-                                <field name="email_sales_merchant" widget="email"/>
-                                <field name="email_finance_merchant" widget="email"/>
-                                <field name="phone_merchant" widget="phone"/>
-                                <field name="mobile_merchant" widget="phone"/>
-                                <field name="harga_tayang" />
-                            </group>
-                            <group>
 <!--                                <field name="description" />-->
                             </group>
                         </group>
diff --git a/indoteknik_custom/views/user_form_merchant.xml b/indoteknik_custom/views/user_form_merchant.xml
index cd3f1de3..ae5a0f9f 100644
--- a/indoteknik_custom/views/user_form_merchant.xml
+++ b/indoteknik_custom/views/user_form_merchant.xml
@@ -98,12 +98,12 @@
     </record>
 
 
-    <menuitem
-        id="menu_user_form_merchant"
-        name="User Form Merchant"
-        parent="res_partner_menu_user"
-        sequence="1"
-        action="action_user_form_merchant"
-    />
+<!--    <menuitem-->
+<!--        id="menu_user_form_merchant"-->
+<!--        name="User Form Merchant"-->
+<!--        parent="res_partner_menu_user"-->
+<!--        sequence="1"-->
+<!--        action="action_user_form_merchant"-->
+<!--    />-->
 
 </odoo>
\ No newline at end of file
-- 
cgit v1.2.3