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/user_form_merchant.xml | 77 ++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 indoteknik_custom/views/user_form_merchant.xml

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

diff --git a/indoteknik_custom/views/user_form_merchant.xml b/indoteknik_custom/views/user_form_merchant.xml
new file mode 100644
index 00000000..f4f91933
--- /dev/null
+++ b/indoteknik_custom/views/user_form_merchant.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="user_form_merchant_tree" model="ir.ui.view">
+        <field name="name">user.form.merchant.tree</field>
+        <field name="model">user.form.merchant</field>
+        <field name="arch" type="xml">
+            <tree create="1" default_order="create_date desc">
+                <field name="name_merchant"/>
+                <field name="email_company"/>
+                <field name="phone"/>
+                <field name="description"/>
+                <field name="create_date"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="user_form_merchant_form" model="ir.ui.view">
+        <field name="name">user.form.merchant.form</field>
+        <field name="model">user.form.merchant</field>
+        <field name="arch" type="xml">
+            <form create="0">
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="name_merchant" />
+                            <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" />
+                        </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" widget="email"/>
+                            <field name="email_sales" widget="email"/>
+                            <field name="email_finance" widget="email"/>
+                            <field name="phone" widget="phone"/>
+                            <field name="mobile" widget="phone"/>
+                        </group>
+                        <group>
+                            <field name="description" />
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_user_form_merchant" model="ir.actions.act_window">
+        <field name="name">User Form Merchant</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">user.form.merchant</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+        id="menu_user_form_merchant"
+        name="User Form Merchant"
+        parent="contacts.menu_contacts"
+        sequence="3"
+        action="action_user_form_merchant"
+    />
+
+</odoo>
\ No newline at end of file
-- 
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/user_form_merchant.xml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

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

diff --git a/indoteknik_custom/views/user_form_merchant.xml b/indoteknik_custom/views/user_form_merchant.xml
index f4f91933..c30f2756 100644
--- a/indoteknik_custom/views/user_form_merchant.xml
+++ b/indoteknik_custom/views/user_form_merchant.xml
@@ -23,6 +23,7 @@
                     <group>
                         <group>
                             <field name="name_merchant" />
+                            <field name="pic_merchant" />
                             <field name="address" />
                             <field name="state" />
                             <field name="city" />
@@ -36,12 +37,14 @@
                             <field name="account_number" />
                         </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" widget="email"/>
@@ -49,6 +52,7 @@
                             <field name="email_finance" widget="email"/>
                             <field name="phone" widget="phone"/>
                             <field name="mobile" widget="phone"/>
+                            <field name="harga_tayang" />
                         </group>
                         <group>
                             <field name="description" />
-- 
cgit v1.2.3


From bd6db8fa22dd602cfaffe0a4b44cc2a794fa1975 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 2 Jan 2025 14:18:46 +0700
Subject: <iman> update merchant menu

---
 indoteknik_custom/views/user_form_merchant.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/indoteknik_custom/views/user_form_merchant.xml b/indoteknik_custom/views/user_form_merchant.xml
index c30f2756..230b6425 100644
--- a/indoteknik_custom/views/user_form_merchant.xml
+++ b/indoteknik_custom/views/user_form_merchant.xml
@@ -70,11 +70,12 @@
         <field name="view_mode">tree,form</field>
     </record>
 
+
     <menuitem
         id="menu_user_form_merchant"
         name="User Form Merchant"
-        parent="contacts.menu_contacts"
-        sequence="3"
+        parent="res_partner_menu_user"
+        sequence="1"
         action="action_user_form_merchant"
     />
 
-- 
cgit v1.2.3


From c7f6d959e0e7a2e8adc45cff515f2b5666f3e732 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 20 Jan 2025 11:56:25 +0700
Subject: <iman> update merchant

---
 indoteknik_custom/views/user_form_merchant.xml | 55 +++++++++++++++++++-------
 1 file changed, 41 insertions(+), 14 deletions(-)

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

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


From ff20b62d6932c6be4ffb56f63f3c05be3aa72c06 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 21 Jan 2025 13:43:29 +0700
Subject: <iman> update merchant

---
 indoteknik_custom/views/user_form_merchant.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/indoteknik_custom/views/user_form_merchant.xml b/indoteknik_custom/views/user_form_merchant.xml
index cbb7c756..cd3f1de3 100644
--- a/indoteknik_custom/views/user_form_merchant.xml
+++ b/indoteknik_custom/views/user_form_merchant.xml
@@ -63,7 +63,7 @@
                             <field name="is_kembali_barang" />
                             <field name="tenggat_waktu" />
                             <field name="sertifikat_produk" />
-                            <field name="custom_sertifikat_produk" />
+<!--                            <field name="custom_sertifikat_produk" />-->
                             <field name="tempo_garansi" />
                             <field name="explain_garansi" />
                             <field name="is_order_quantity" />
@@ -82,7 +82,7 @@
                             <field name="file_pricelist"  />
                         </group>
                         <group>
-                            <field name="description" />
+<!--                            <field name="description" />-->
                         </group>
                     </group>
                 </sheet>
-- 
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/user_form_merchant.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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

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