Revert "Merge branch 'CR/form-merchant' into odoo-backup"

This reverts commit f6f59e660af6c4229ada54f7313d68867df1ba15, reversing
changes made to 68378dd2fb8d61b282a672ca0f09033d15d82283.

4 files changed, 0 insertions, 294 deletions

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