Merge branch 'approval_retur_picking' into production

# Conflicts:
#	indoteknik_custom/models/requisition.py
#	indoteknik_custom/views/requisition.xml

2 files changed, 31 insertions, 4 deletions

diff --git a/indoteknik_custom/views/approval_retur_picking.xml b/indoteknik_custom/views/approval_retur_picking.xml
new file mode 100644
index 00000000..5ce28e20
--- /dev/null
+++ b/indoteknik_custom/views/approval_retur_picking.xml
@@ -0,0 +1,27 @@
+<odoo>
+    <!-- Form View for Stock Return Note Wizard -->
+    <record id="view_stock_return_note_form" model="ir.ui.view">
+        <field name="name">approval.retur.picking.form</field>
+        <field name="model">approval.retur.picking</field>
+        <field name="arch" type="xml">
+            <form string="Add Return Note">
+                <group>
+                    <span>Ask Approval Retur?</span>
+                </group>
+                <footer>
+                    <button name="action_confirm_note_return" string="Confirm" type="object" class="btn-primary"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <!-- Action to Open the Wizard -->
+    <record id="action_stock_return_note_wizard" model="ir.actions.act_window">
+        <field name="name">Add Return Note</field>
+        <field name="res_model">approval.retur.picking</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_stock_return_note_form"/>
+        <field name="target">new</field>
+    </record>
+</odoo>
diff --git a/indoteknik_custom/views/requisition.xml b/indoteknik_custom/views/requisition.xml
index a866690d..7b066bca 100644
--- a/indoteknik_custom/views/requisition.xml
+++ b/indoteknik_custom/views/requisition.xml
@@ -52,10 +52,10 @@
             <form>
                 <header>
                     <button name="button_approve"
-                                    string="Approve"
-                                    type="object"
-                                    class="mr-2 oe_highlight"
-                                />
+                            string="Approve"
+                            type="object"
+                            class="mr-2 oe_highlight"
+                            />
                 </header>
                 <sheet string="Requisition">
                         <div class="oe_button_box" name="button_box"/>