From 130390b0c4c8c37f5a69d3833f5f1ad9e60e787d Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 21 Nov 2024 14:01:16 +0700
Subject: push

---
 .../views/form_vendor_approval_multi_approve.xml   | 31 +++++++++++
 .../views/form_vendor_approval_multi_reject.xml    | 31 +++++++++++
 indoteknik_custom/views/sale_order.xml             |  2 +-
 indoteknik_custom/views/vendor_approval.xml        | 62 +++++++++++++---------
 4 files changed, 101 insertions(+), 25 deletions(-)
 create mode 100644 indoteknik_custom/views/form_vendor_approval_multi_approve.xml
 create mode 100644 indoteknik_custom/views/form_vendor_approval_multi_reject.xml

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/form_vendor_approval_multi_approve.xml b/indoteknik_custom/views/form_vendor_approval_multi_approve.xml
new file mode 100644
index 00000000..d9be107e
--- /dev/null
+++ b/indoteknik_custom/views/form_vendor_approval_multi_approve.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="view_va_multi_approve_form" model="ir.ui.view">
+            <field name="name">VA Multi Approve</field>
+            <field name="model">va.multi.approve</field>
+            <field name="arch" type="xml">
+                <form>
+                    <sheet>
+                        <group>
+                           <span>Apakah Anda Yakin Ingin Approve Vendor Approval?</span> 
+                        </group>
+                    </sheet>
+                    <footer>
+                        <button name="save_multi_approve_va" string="Update" type="object" default_focus="1" class="oe_highlight"/>
+                        <button string="Cancel" class="btn btn-secondary" special="cancel" />
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_va_multi_approve" model="ir.actions.act_window">
+            <field name="name">VA Multi Approve</field>
+            <field name="res_model">va.multi.approve</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_va_multi_approve_form"/>
+            <field name="target">new</field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/form_vendor_approval_multi_reject.xml b/indoteknik_custom/views/form_vendor_approval_multi_reject.xml
new file mode 100644
index 00000000..666de261
--- /dev/null
+++ b/indoteknik_custom/views/form_vendor_approval_multi_reject.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="view_va_multi_reject_form" model="ir.ui.view">
+            <field name="name">VA Multi Reject</field>
+            <field name="model">va.multi.reject</field>
+            <field name="arch" type="xml">
+                <form>
+                    <sheet>
+                        <group>
+                           <span>Apakah Anda Yakin Ingin Reject Vendor Approval?</span> 
+                        </group>
+                    </sheet>
+                    <footer>
+                        <button name="save_multi_reject_va" string="Update" type="object" default_focus="1" class="oe_highlight"/>
+                        <button string="Cancel" class="btn btn-secondary" special="cancel" />
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_va_multi_reject" model="ir.actions.act_window">
+            <field name="name">VA Multi Reject</field>
+            <field name="res_model">va.multi.reject</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_va_multi_reject_form"/>
+            <field name="target">new</field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 3a3b1c81..e12130de 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -82,7 +82,7 @@
                     <field name="email" required="1"/>
                     <field name="unreserve_id"/>
                     <field name="due_id" readonly="1"/>
-                    <field name="vendor_approval_id" readonly="1"/>
+                    <field name="vendor_approval_id" readonly="1" widget="many2many_tags"/>
                     <field name="source_id" domain="[('id', 'in', [32, 59, 60, 61])]" required="1"/>
                     <button name="override_allow_create_invoice"
                             string="Override Create Invoice"
diff --git a/indoteknik_custom/views/vendor_approval.xml b/indoteknik_custom/views/vendor_approval.xml
index 605edfbf..80458b58 100644
--- a/indoteknik_custom/views/vendor_approval.xml
+++ b/indoteknik_custom/views/vendor_approval.xml
@@ -11,27 +11,18 @@
                     <field name="order_id"/>
                     <field name="partner_id"/>
                     <field name="state"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="vendor_approval_line_tree" model="ir.ui.view">
-            <field name="name">vendor.approval.line.tree</field>
-            <field name="model">vendor.approval.line</field>
-            <field name="arch" type="xml">
-                <tree>
                     <field name="product_id"/>
-                    <field name="sales_price"/>
-                    <field name="product_uom_qty"/>
-                    <field name="sales_tax_id"/>
-                    <field name="margin_after"/>
+                    <field name="sales_price" optional="hide"/>
+                    <field name="product_uom_qty" optional="hide"/>
+                    <field name="sales_tax_id" optional="hide"/>
+                    <field name="margin_after" optional="hide"/>
                     <field name="vendor_id"/>
                     <field name="vendor_md_id"/>
-                    <field name="purchase_price"/>
-                    <field name="purchase_price_md"/>
-                    <field name="margin_before"/>
-                    <field name="purchase_tax_id"/>
-                    <field name="percent_margin_difference"/>
+                    <field name="purchase_price" optional="hide"/>
+                    <field name="purchase_price_md" optional="hide"/>
+                    <field name="margin_before" optional="hide"/>
+                    <field name="purchase_tax_id" optional="hide"/>
+                    <field name="percent_margin_difference" optional="hide"/>
                 </tree>
             </field>
         </record>
@@ -60,13 +51,22 @@
                                 <field name="order_id" readonly="1"/>
                                 <field name="state" readonly="1"/>
                                 <field name="create_date_so" readonly="1"/>
+                                <field name="product_id"/>
+                                <field name="sales_price"/>
+                                <field name="product_uom_qty"/>
+                                <field name="sales_tax_id"/>
+                            </group>
+                            <group>
+                                <field name="margin_after"/>
+                                <field name="vendor_id"/>
+                                <field name="vendor_md_id"/>
+                                <field name="purchase_price"/>
+                                <field name="purchase_price_md"/>
+                                <field name="margin_before"/>
+                                <field name="purchase_tax_id"/>
+                                <field name="percent_margin_difference"/>
                             </group>
                         </group>
-                        <notebook>
-                            <page string="SO Line">
-                                <field name="vendor_approval_line" readonly="1"/>    
-                            </page>
-                        </notebook>
                     </sheet>
                     <div class="oe_chatter">
                         <field name="message_follower_ids" widget="mail_followers"/>
@@ -77,7 +77,7 @@
         </record>
 
         <record id="vendor_approval_view_search" model="ir.ui.view">
-            <field name="name">vendor.approval.search.view</field> <!-- Made the name more descriptive -->
+            <field name="name">vendor.approval.search.view</field>
             <field name="model">vendor.approval</field>
             <field name="arch" type="xml">
                 <search string="Search Vendor Approval">
@@ -102,5 +102,19 @@
             sequence="4"
             action="vendor_approval_action"
         />
+        <record id="vendor_approval_multi_approve_ir_actions_server" model="ir.actions.server">
+            <field name="name">Approve</field>
+            <field name="model_id" ref="model_vendor_approval"/>
+            <field name="binding_model_id" ref="model_vendor_approval"/>
+            <field name="state">code</field>
+            <field name="code">action = records.open_form_multi_approve()</field>
+        </record>
+        <record id="vendor_approval_multi_reject_ir_actions_server" model="ir.actions.server">
+            <field name="name">Reject</field>
+            <field name="model_id" ref="model_vendor_approval"/>
+            <field name="binding_model_id" ref="model_vendor_approval"/>
+            <field name="state">code</field>
+            <field name="code">action = records.open_form_multi_reject()</field>
+        </record>
     </data>    
 </odoo>
-- 
cgit v1.2.3


From 3f3fd6fcaa74cf3e3dd6e73d7ddb95ff537742b8 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Tue, 26 Nov 2024 13:44:33 +0700
Subject: push

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/vendor_approval.xml b/indoteknik_custom/views/vendor_approval.xml
index 80458b58..359c67d4 100644
--- a/indoteknik_custom/views/vendor_approval.xml
+++ b/indoteknik_custom/views/vendor_approval.xml
@@ -5,12 +5,12 @@
             <field name="name">vendor.approval.tree</field>
             <field name="model">vendor.approval</field>
             <field name="arch" type="xml">
-                <tree default_order="create_date desc" create="0">
+                <tree default_order="create_date desc" create="0" editable="bottom">
                     <field name="number"/>
                     <field name="create_date_so"/>
                     <field name="order_id"/>
                     <field name="partner_id"/>
-                    <field name="state"/>
+                    <field name="state" readonly="1" widget="badge" decoration-danger="state == 'cancel'" decoration-success="state == 'done'"/>
                     <field name="product_id"/>
                     <field name="sales_price" optional="hide"/>
                     <field name="product_uom_qty" optional="hide"/>
-- 
cgit v1.2.3


From 0080b6b1da5f181cee32fae7bb5166ce65165374 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Fri, 29 Nov 2024 09:53:07 +0700
Subject: cr note product promotion

---
 indoteknik_custom/views/product_template.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/product_template.xml b/indoteknik_custom/views/product_template.xml
index 5a509ebd..b6599137 100755
--- a/indoteknik_custom/views/product_template.xml
+++ b/indoteknik_custom/views/product_template.xml
@@ -24,6 +24,12 @@
                 <field name="public_categ_ids" position="attributes">
                     <attribute name="required">0</attribute>
                 </field>
+                <div name="options" position="inside">
+                    <div>
+                        <field name="merchandise_ok"/>
+                        <label for="merchandise_ok"/>
+                    </div>
+                </div>
                 <field name="public_categ_ids" position="attributes">
                     <attribute name="options">{'no_create': True}</attribute>
                 </field>
-- 
cgit v1.2.3