From 7d5204a92422848f617af2d0e50d7069bf9f7824 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 30 Dec 2024 14:09:50 +0700
Subject: <iman> add form merchant

---
 indoteknik_custom/views/res_partner.xml | 38 +++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

(limited to 'indoteknik_custom/views/res_partner.xml')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 7b13fef7..5fcc7de5 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -80,6 +80,44 @@
                 <xpath expr="//field[@name='property_supplier_payment_term_id']" position="attributes">
                     <attribute name="readonly">1</attribute>
                 </xpath>
+                <notebook>
+                    <page string="Merchant">
+                        <group>
+                            <group>
+                                <field name="name_merchant" />
+                                <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" />
+                            </group>
+                            <group>
+                                <field name="file_dokumenKtpDirut" widget="pdf_viewer"/>
+                                <field name="file_kartuNama" widget="pdf_viewer"/>
+                                <field name="file_npwp" widget="pdf_viewer"/>
+                                <field name="file_sppkp" widget="pdf_viewer"/>
+                                <field name="file_suratPernyataan" widget="pdf_viewer"/>
+                                <field name="file_fotoKantor" widget="image"/>
+                            </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"/>
+                            </group>
+                            <group>
+                                <field name="description" />
+                            </group>
+                        </group>
+                    </page>
+                </notebook>
             </field>
         </record>
     </data>
-- 
cgit v1.2.3


From b2b458d4a642271b98f23403c74eb7aad06cd71d Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 2 Jan 2025 08:52:13 +0700
Subject: <iman> update merchant

---
 indoteknik_custom/views/res_partner.xml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'indoteknik_custom/views/res_partner.xml')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 5fcc7de5..d3ef2657 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -85,6 +85,7 @@
                         <group>
                             <group>
                                 <field name="name_merchant" />
+                                <field name="pic_merchant" />
                                 <field name="address_merchant" />
                                 <field name="state_merchant" />
                                 <field name="city_merchant" />
@@ -98,12 +99,14 @@
                                 <field name="account_number_merchant" />
                             </group>
                             <group>
-                                <field name="file_dokumenKtpDirut" widget="pdf_viewer"/>
-                                <field name="file_kartuNama" widget="pdf_viewer"/>
-                                <field name="file_npwp" widget="pdf_viewer"/>
-                                <field name="file_sppkp" widget="pdf_viewer"/>
-                                <field name="file_suratPernyataan" widget="pdf_viewer"/>
-                                <field name="file_fotoKantor" widget="image"/>
+                                <field name="file_dokumenKtpDirut" />
+                                <field name="file_kartuNama" />
+                                <field name="file_npwp" />
+                                <field name="file_sppkp" />
+                                <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"/>
@@ -111,6 +114,7 @@
                                 <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" />
-- 
cgit v1.2.3


From 6809954d3029c98766d323eda40e6bd1fda8be0a Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 21 Jan 2025 16:34:18 +0700
Subject: <iman> update merchant contact

---
 indoteknik_custom/views/res_partner.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indoteknik_custom/views/res_partner.xml')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 863b8514..1f497f7a 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -224,7 +224,7 @@
                                 <field name="harga_tayang" />
                             </group>
                             <group>
-                                <field name="description" />
+<!--                                <field name="description" />-->
                             </group>
                         </group>
                     </page>
-- 
cgit v1.2.3


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 +++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 14 deletions(-)

(limited to 'indoteknik_custom/views/res_partner.xml')

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>
-- 
cgit v1.2.3