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 ++++++++
 indoteknik_custom/views/user_form_merchant.xml    |  77 +++++++++++++++
 indoteknik_custom/views/user_merchant_request.xml | 112 ++++++++++++++++++++++
 3 files changed, 227 insertions(+)
 create mode 100644 indoteknik_custom/views/user_form_merchant.xml
 create mode 100644 indoteknik_custom/views/user_merchant_request.xml

(limited to 'indoteknik_custom/views')

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>
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
diff --git a/indoteknik_custom/views/user_merchant_request.xml b/indoteknik_custom/views/user_merchant_request.xml
new file mode 100644
index 00000000..c67daae4
--- /dev/null
+++ b/indoteknik_custom/views/user_merchant_request.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="user_merchant_request_tree" model="ir.ui.view">
+        <field name="name">user.merchant.request.tree</field>
+        <field name="model">user.merchant.request</field>
+         <field name="arch" type="xml">
+            <tree create="1" default_order="create_date desc">
+                <field name="user_id"/>
+                <field name="merchant_id"/>
+                <field name="state_merchant" decoration-success="state_merchant == 'approved'" decoration-danger="state_merchant == 'reject'" widget="badge" optional="show"/>
+                <field name="create_date"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="user_merchant_request_form" model="ir.ui.view">
+    <field name="name">user.merchant.request.form</field>
+    <field name="model">user.merchant.request</field>
+    <field name="arch" type="xml">
+        <form create="0">
+            <header>
+                <button name="button_approve"
+                        string="Approve Merchant"
+                        attrs="{'invisible': [('state_merchant', 'in', ['approved','reject'])]}"
+                        type="object"
+                        class="oe_highlight"/>
+                <button name="button_reject"
+                        string="Reject"
+                        attrs="{'invisible': [('state_merchant', 'in', ['approved','reject'])]}"
+                        type="object"
+                        groups="purchase.group_purchase_manager"
+                        class="oe_highlight"/>
+                <field name="state_merchant" widget="statusbar"
+                       statusbar_visible="draft,approved"
+                       statusbar_colors='{"reject":"red"}'/>
+            </header>
+            <sheet>
+                <group>
+                    <group>
+                        <field name="user_id" readonly="1"/>
+                        <field name="merchant_id"/>
+                    </group>
+                </group>
+            </sheet>
+            <div class="oe_chatter">
+                <field name="message_ids" widget="mail_thread"/>
+            </div>
+        </form>
+    </field>
+</record>
+
+
+
+
+    <!-- Wizard for Reject Reason -->
+<record id="view_reject_reason_wizard_merchant_form" model="ir.ui.view">
+    <field name="name">reject.reason.wizard.merchant.form</field>
+    <field name="model">reject.reason.wizard.merchant</field>
+    <field name="arch" type="xml">
+        <form string="Reject Reason">
+            <group>
+                <field name="reason_reject" widget="text"/>
+            </group>
+            <footer>
+                <button string="Confirm" type="object" name="confirm_reject" class="btn-primary"/>
+                <button string="Cancel" class="btn-secondary" special="cancel"/>
+            </footer>
+        </form>
+    </field>
+</record>
+
+<record id="action_reject_reason_wizard_merchant" model="ir.actions.act_window">
+    <field name="name">Reject Reason</field>
+    <field name="res_model">reject.reason.wizard.merchant</field>
+    <field name="view_mode">form</field>
+    <field name="target">new</field>
+</record>
+
+
+<record id="view_confirm_approval_wizard_merchant_form" model="ir.ui.view">
+    <field name="name">confirm.approval.wizard.merchant.form</field>
+    <field name="model">confirm.approval.wizard.merchant</field>
+    <field name="arch" type="xml">
+        <form string="Konfirmasi Approval">
+            <group>
+                <p>Apakah Anda yakin ingin mengapprove merchant ini?</p>
+            </group>
+            <footer>
+                <button string="Batal" class="btn-secondary" special="cancel"/>
+                <button string="Konfirmasi" type="object" name="confirm_approval" class="btn-primary"/>
+            </footer>
+        </form>
+    </field>
+</record>
+
+
+
+    <record id="action_user_merchant_request" model="ir.actions.act_window">
+        <field name="name">User Merchant Request</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">user.merchant.request</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+        id="menu_user_merchant_request"
+        name="User Merchant Request"
+        parent="contacts.menu_contacts"
+        sequence="3"
+        action="action_user_merchant_request"
+    />
+</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/res_partner.xml        | 16 ++++++++++------
 indoteknik_custom/views/user_form_merchant.xml | 16 ++++++++++------
 2 files changed, 20 insertions(+), 12 deletions(-)

(limited to 'indoteknik_custom/views')

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" />
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_company_request.xml  | 19 ++++++++++++-------
 indoteknik_custom/views/user_form_merchant.xml    |  5 +++--
 indoteknik_custom/views/user_merchant_request.xml |  4 ++--
 3 files changed, 17 insertions(+), 11 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/user_company_request.xml b/indoteknik_custom/views/user_company_request.xml
index 1c80e923..a4a9d842 100644
--- a/indoteknik_custom/views/user_company_request.xml
+++ b/indoteknik_custom/views/user_company_request.xml
@@ -54,12 +54,17 @@
         <field name="res_model">user.company.request</field>
         <field name="view_mode">tree,form</field>
     </record>
+    <menuitem id="res_partner_menu_user"
+          name="User Request"
+          parent="contacts.menu_contacts"
+          groups="base.group_system"
+          sequence="3"/>
+
+<menuitem id="menu_user_company_request"
+          name="User Company Request"
+          parent="res_partner_menu_user"
+          sequence="4"
+          action="action_user_company_request"
+          groups="base.group_system"/>
 
-    <menuitem
-        id="menu_user_company_request"
-        name="User Company Request"
-        parent="contacts.menu_contacts"
-        sequence="3"
-        action="action_user_company_request"
-    />
 </odoo>
\ No newline at end of file
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"
     />
 
diff --git a/indoteknik_custom/views/user_merchant_request.xml b/indoteknik_custom/views/user_merchant_request.xml
index c67daae4..e4f309fd 100644
--- a/indoteknik_custom/views/user_merchant_request.xml
+++ b/indoteknik_custom/views/user_merchant_request.xml
@@ -105,8 +105,8 @@
     <menuitem
         id="menu_user_merchant_request"
         name="User Merchant Request"
-        parent="contacts.menu_contacts"
-        sequence="3"
+        parent="res_partner_menu_user"
+        sequence="2"
         action="action_user_merchant_request"
     />
 </odoo>
\ No newline at end of file
-- 
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')

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')

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 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')

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 ++++++++++++++++++--------
 indoteknik_custom/views/user_form_merchant.xml | 14 ++++----
 2 files changed, 39 insertions(+), 21 deletions(-)

(limited to 'indoteknik_custom/views')

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


From 558130bbf48c33ddfa6080450c80bc8801a570f0 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 22 May 2025 15:34:03 +0700
Subject: form-merchant & quotation tampilan

---
 indoteknik_custom/views/sale_order.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index e0085eeb..5af3f4a2 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -102,6 +102,7 @@
                     <t t-esc="' to '" />
                     <field name="eta_date" readonly="1" />
                     <field name="expected_ready_to_ship" />
+                    <field name="ready_to_ship_status_detail"/>
                     <field name="flash_sale" />
                     <field name="margin_after_delivery_purchase" />
                     <field name="percent_margin_after_delivery_purchase" />
-- 
cgit v1.2.3


From dbf09bbf792809e84d2d0330a992e42b3a5c6994 Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Fri, 23 May 2025 09:38:02 +0700
Subject: Revert "Merge branch 'odoo-backup' of
 https://bitbucket.org/altafixco/indoteknik-addons into odoo-backup"

This reverts commit 43313db30da73b87843425c01c723f66ee982886, reversing
changes made to f6f59e660af6c4229ada54f7313d68867df1ba15.
---
 indoteknik_custom/views/sale_order.xml                   | 15 +++++++--------
 indoteknik_custom/views/stock_picking.xml                |  1 -
 indoteknik_custom/views/user_pengajuan_tempo_request.xml |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 2191acf4..92d13fa7 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -96,11 +96,11 @@
                     <attribute name="invisible">1</attribute>
                 </field>
                 <field name="user_id" position="after">
-                    <field name="hold_outgoing" readonly="1"/>
-                    <field name="date_hold" readonly="1" widget="datetime"/>
-                    <field name="date_unhold" readonly="1" widget="datetime"/>
-                    <field name="helper_by_id" readonly="1"/>
-                    <field name="compute_fullfillment" invisible="1"/>
+                    <field name="hold_outgoing" readonly="1" />
+                    <field name="date_hold" readonly="1" widget="datetime" />
+                    <field name="date_unhold" readonly="1" widget="datetime" />
+                    <field name="helper_by_id" readonly="1" />
+                    <field name="compute_fullfillment" invisible="1" />
                 </field>
                 <field name="tag_ids" position="after">
 <<<<<<< HEAD
@@ -316,9 +316,8 @@
                 </field>
                 <field name="payment_term_id" position="attributes">
                     <attribute name="attrs">
-                        {'readonly': ['|', ('approval_status', 'in', ['pengajuan1', 'pengajuan2', 'approved']),
-                                      ('state', 'not in',
-                                       ['cancel', 'draft'])]}
+                        {'readonly': [('approval_status', '=', 'approved'), ('state', 'not in',
+                                                                             ['cancel', 'draft'])]}
                     </attribute>
                 </field>
 
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 02959d69..ae77ab9a 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -19,7 +19,6 @@
                     <field name="note" optional="hide"/>
                     <field name="date_reserved" optional="hide"/>
                     <field name="state_reserve" optional="hide"/>
-                    <field name="sj_return_date" optional="hide"/>
                     <field name="state_packing" widget="badge" decoration-success="state_packing == 'packing_done'" decoration-danger="state_packing == 'not_packing'" optional="hide"/>
                     <field name="final_seq"/>
                     <field name="state_approve_md" widget="badge" decoration-success="state_approve_md == 'done'" decoration-warning="state_approve_md == 'pending'" optional="hide"/>
diff --git a/indoteknik_custom/views/user_pengajuan_tempo_request.xml b/indoteknik_custom/views/user_pengajuan_tempo_request.xml
index 898d5b2a..339ce8db 100644
--- a/indoteknik_custom/views/user_pengajuan_tempo_request.xml
+++ b/indoteknik_custom/views/user_pengajuan_tempo_request.xml
@@ -426,7 +426,7 @@
     <menuitem
         id="menu_user_pengajuan_tempo_request"
         name="User Pengajuan Tempo Request"
-        parent="account.menu_finance_receivables"
+        parent="res_partner_menu_user"
         sequence="3"
         action="action_user_pengajuan_tempo_request"
     />
-- 
cgit v1.2.3


From f66710c029d678ecf580808b5aee3821c90d9598 Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Fri, 23 May 2025 09:38:49 +0700
Subject: Revert "Merge branch 'CR/form-merchant' into odoo-backup"

This reverts commit f6f59e660af6c4229ada54f7313d68867df1ba15, reversing
changes made to 68378dd2fb8d61b282a672ca0f09033d15d82283.
---
 indoteknik_custom/views/res_partner.xml           |  60 ------------
 indoteknik_custom/views/sale_order.xml            |  13 ---
 indoteknik_custom/views/user_form_merchant.xml    | 109 ---------------------
 indoteknik_custom/views/user_merchant_request.xml | 112 ----------------------
 4 files changed, 294 deletions(-)
 delete mode 100644 indoteknik_custom/views/user_form_merchant.xml
 delete mode 100644 indoteknik_custom/views/user_merchant_request.xml

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 5160523f..cb9fa3ac 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -190,66 +190,6 @@
                         </group>
                     </page>
                 </notebook>
-                <notebook>
-                    <page string="Merchant">
-                        <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" />
-                                <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 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="description" />-->
-                            </group>
-                        </group>
-                    </page>
-                </notebook>
             </field>
         </record>
     </data>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 92d13fa7..a599a7b8 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -103,7 +103,6 @@
                     <field name="compute_fullfillment" invisible="1" />
                 </field>
                 <field name="tag_ids" position="after">
-<<<<<<< HEAD
                     <field name="eta_date_start"/>
                     <t t-esc="' to '"/>
                     <field name="eta_date" readonly="1"/>
@@ -113,18 +112,6 @@
                     <field name="percent_margin_after_delivery_purchase"/>
                     <field name="total_weight"/>
                     <field name="pareto_status"/>
-=======
-                    <field name="eta_date_start" />
-                    <t t-esc="' to '" />
-                    <field name="eta_date" readonly="1" />
-                    <field name="expected_ready_to_ship" />
-                    <field name="ready_to_ship_status_detail"/>
-                    <field name="flash_sale" />
-                    <field name="margin_after_delivery_purchase" />
-                    <field name="percent_margin_after_delivery_purchase" />
-                    <field name="total_weight" />
-                    <field name="pareto_status" />
->>>>>>> CR/form-merchant
                 </field>
                 <field name="analytic_account_id" position="after">
                     <field name="customer_type" readonly="1"/>
diff --git a/indoteknik_custom/views/user_form_merchant.xml b/indoteknik_custom/views/user_form_merchant.xml
deleted file mode 100644
index ae5a0f9f..00000000
--- a/indoteknik_custom/views/user_form_merchant.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?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 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" />
-                            <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_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="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="res_partner_menu_user"-->
-<!--        sequence="1"-->
-<!--        action="action_user_form_merchant"-->
-<!--    />-->
-
-</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/user_merchant_request.xml b/indoteknik_custom/views/user_merchant_request.xml
deleted file mode 100644
index e4f309fd..00000000
--- a/indoteknik_custom/views/user_merchant_request.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<odoo>
-    <record id="user_merchant_request_tree" model="ir.ui.view">
-        <field name="name">user.merchant.request.tree</field>
-        <field name="model">user.merchant.request</field>
-         <field name="arch" type="xml">
-            <tree create="1" default_order="create_date desc">
-                <field name="user_id"/>
-                <field name="merchant_id"/>
-                <field name="state_merchant" decoration-success="state_merchant == 'approved'" decoration-danger="state_merchant == 'reject'" widget="badge" optional="show"/>
-                <field name="create_date"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="user_merchant_request_form" model="ir.ui.view">
-    <field name="name">user.merchant.request.form</field>
-    <field name="model">user.merchant.request</field>
-    <field name="arch" type="xml">
-        <form create="0">
-            <header>
-                <button name="button_approve"
-                        string="Approve Merchant"
-                        attrs="{'invisible': [('state_merchant', 'in', ['approved','reject'])]}"
-                        type="object"
-                        class="oe_highlight"/>
-                <button name="button_reject"
-                        string="Reject"
-                        attrs="{'invisible': [('state_merchant', 'in', ['approved','reject'])]}"
-                        type="object"
-                        groups="purchase.group_purchase_manager"
-                        class="oe_highlight"/>
-                <field name="state_merchant" widget="statusbar"
-                       statusbar_visible="draft,approved"
-                       statusbar_colors='{"reject":"red"}'/>
-            </header>
-            <sheet>
-                <group>
-                    <group>
-                        <field name="user_id" readonly="1"/>
-                        <field name="merchant_id"/>
-                    </group>
-                </group>
-            </sheet>
-            <div class="oe_chatter">
-                <field name="message_ids" widget="mail_thread"/>
-            </div>
-        </form>
-    </field>
-</record>
-
-
-
-
-    <!-- Wizard for Reject Reason -->
-<record id="view_reject_reason_wizard_merchant_form" model="ir.ui.view">
-    <field name="name">reject.reason.wizard.merchant.form</field>
-    <field name="model">reject.reason.wizard.merchant</field>
-    <field name="arch" type="xml">
-        <form string="Reject Reason">
-            <group>
-                <field name="reason_reject" widget="text"/>
-            </group>
-            <footer>
-                <button string="Confirm" type="object" name="confirm_reject" class="btn-primary"/>
-                <button string="Cancel" class="btn-secondary" special="cancel"/>
-            </footer>
-        </form>
-    </field>
-</record>
-
-<record id="action_reject_reason_wizard_merchant" model="ir.actions.act_window">
-    <field name="name">Reject Reason</field>
-    <field name="res_model">reject.reason.wizard.merchant</field>
-    <field name="view_mode">form</field>
-    <field name="target">new</field>
-</record>
-
-
-<record id="view_confirm_approval_wizard_merchant_form" model="ir.ui.view">
-    <field name="name">confirm.approval.wizard.merchant.form</field>
-    <field name="model">confirm.approval.wizard.merchant</field>
-    <field name="arch" type="xml">
-        <form string="Konfirmasi Approval">
-            <group>
-                <p>Apakah Anda yakin ingin mengapprove merchant ini?</p>
-            </group>
-            <footer>
-                <button string="Batal" class="btn-secondary" special="cancel"/>
-                <button string="Konfirmasi" type="object" name="confirm_approval" class="btn-primary"/>
-            </footer>
-        </form>
-    </field>
-</record>
-
-
-
-    <record id="action_user_merchant_request" model="ir.actions.act_window">
-        <field name="name">User Merchant Request</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">user.merchant.request</field>
-        <field name="view_mode">tree,form</field>
-    </record>
-
-    <menuitem
-        id="menu_user_merchant_request"
-        name="User Merchant Request"
-        parent="res_partner_menu_user"
-        sequence="2"
-        action="action_user_merchant_request"
-    />
-</odoo>
\ No newline at end of file
-- 
cgit v1.2.3