Merge branch 'unreserved_permission' into production

# Conflicts:
#	indoteknik_custom/models/__init__.py
#	indoteknik_custom/security/ir.model.access.csv

3 files changed, 92 insertions, 0 deletions

diff --git a/indoteknik_custom/views/approval_unreserve.xml b/indoteknik_custom/views/approval_unreserve.xml
new file mode 100644
index 00000000..317b5276
--- /dev/null
+++ b/indoteknik_custom/views/approval_unreserve.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="view_approval_unreserve_tree" model="ir.ui.view">
+        <field name="name">approval.unreserve.tree</field>
+        <field name="model">approval.unreserve</field>
+        <field name="arch" type="xml">
+            <tree string="Approval Unreserve">
+                <field name="number"/>
+                <field name="request_date"/>
+                <field name="picking_id"/>
+                <field name="state"/>
+                <field name="user_id"/>
+            </tree>
+        </field>
+    </record>
+    
+    <record id="approval_unreserve_line_tree" model="ir.ui.view">
+        <field name="name">approval.unreserve.line.tree</field>
+        <field name="model">approval.unreserve.line</field>
+        <field name="arch" type="xml">
+            <tree editable="bottom">
+                <field name="move_id"/>
+                <field name="product_id"/>
+                <field name="dest_picking_id"/>
+                <field name="sales_id"/>
+                <field name="unreserve_qty"/>
+            </tree>
+        </field>
+    </record>
+    
+    <record id="approval_unreserve_form" model="ir.ui.view">
+        <field name="name">approval.unreserve.form</field>
+        <field name="model">approval.unreserve</field>
+        <field name="arch" type="xml">
+            <form create="false">
+                <header>
+                    <button name="action_submit_for_approval" type="object" string="Submit for Approval" attrs="{'invisible': [('state', '!=', 'draft')]}"/>
+                    <button name="action_approve" type="object" string="Approve" attrs="{'invisible': [('state', '!=', 'waiting_approval')]}"/>
+                    <button name="action_reject" type="object" string="Reject" attrs="{'invisible': [('state', '!=', 'waiting_approval')]}"/>
+                </header>
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="number" readonly="1"/>
+                            <field name="request_date" readonly="1"/>
+                            <field name="picking_id"/>
+                            <field name="user_id" readonly="1"/>
+                            <field name="state" readonly="1"/>
+                            <field name="approved_by" readonly="1"/>
+                            <field name="reason"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Lines">
+                            <field name="approval_line"/>    
+                        </page>
+                    </notebook>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
+                </div>
+            </form>
+        </field>
+    </record>
+
+    <record id="approval_unreserve_action" model="ir.actions.act_window">
+        <field name="name">Approval Unreserve</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">approval.unreserve</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+        id="menu_approval_unreserve"
+        name="Approval Unreserve"
+        parent="sale.product_menu_catalog"
+        sequence="4"
+        action="approval_unreserve_action"
+    />
+</odoo>
diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index b2768c71..dd501d8c 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -20,6 +20,16 @@
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
         </record>
+        
+        <record id="sequence_approval_unreserve" model="ir.sequence">
+            <field name="name">Approval Unreserve</field>
+            <field name="code">approval.unreserve</field>
+            <field name="active">TRUE</field>
+            <field name="prefix">AU/%(year)s/</field>
+            <field name="padding">5</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</field>
+        </record>
 
         <record id="sequence_logbook_sj" model="ir.sequence">
             <field name="name">Logbook SJ</field>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 5ef399c7..17faaa95 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -78,6 +78,7 @@
                     <field name="npwp" placeholder='99.999.999.9-999.999' required="1"/>
                     <field name="sppkp" attrs="{'required': [('customer_type', '=', 'pkp')]}"/>
                     <field name="email" required="1"/>
+                    <field name="unreserve_id"/>
                     <field name="due_id" readonly="1"/>
                     <field name="source_id" domain="[('id', 'in', [32, 59, 60, 61])]" required="1"/>
                     <button name="override_allow_create_invoice"