Merge & fix conflicts

4 files changed, 98 insertions, 15 deletions

diff --git a/indoteknik_custom/views/delivery_order.xml b/indoteknik_custom/views/delivery_order.xml
new file mode 100644
index 00000000..da6a571c
--- /dev/null
+++ b/indoteknik_custom/views/delivery_order.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_delivery_order_form" model="ir.ui.view">
+        <field name="name">Delivery Order</field>
+        <field name="model">delivery.order</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <field name="name" invisible="1"/>
+                    <field
+                            name="delivery_order_line_ids"
+                            mode="tree"
+                    >
+                        <tree editable="bottom">
+                            <control>
+                                <create name="add_delivery_order_line_control" string="Add a delivery"/>
+                            </control>
+                            <field name="name" required="1"/>
+                            <field name="driver_id" readonly="1"/>
+                            <field name="departure_date" readonly="1"/>
+                            <field name="arrival_date" readonly="1"/>
+                            <field name="tracking_no"/>
+                        </tree>
+                    </field>
+                </sheet>
+                <footer>
+                    <button name="save_delivery" string="Submit" type="object" default_focus="1" class="oe_highlight"/>
+                    <button string="Cancel" class="btn btn-secondary" special="cancel" />
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_delivery_order" model="ir.actions.act_window">
+        <field name="name">Delivery Order</field>
+        <field name="res_model">delivery.order</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_delivery_order_form"/>
+        <field name="target">new</field>
+    </record>
+
+    <menuitem
+            action="action_delivery_order"
+            id="delivery_order"
+            parent="stock.menu_stock_warehouse_mgmt"
+            name="Delivery Order"
+            sequence="1"
+    />
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index 9e057c0d..754457da 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <record id="sequence_internal_use" model="ir.sequence">
-        <field name="name">Internal Use</field>
-        <field name="code">internal.use</field>
-        <field name="active">TRUE</field>
-        <field name="prefix">IU/%(year)s/</field>
-        <field name="padding">5</field>
-        <field name="number_next">1</field>
-        <field name="number_increment">1</field>
-    </record>
+    <data noupdate="1">
+        <record id="sequence_internal_use" model="ir.sequence">
+            <field name="name">Internal Use</field>
+            <field name="code">internal.use</field>
+            <field name="active">TRUE</field>
+            <field name="prefix">IU/%(year)s/</field>
+            <field name="padding">5</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</field>
+        </record>
+
+        <record id="sequence_stock_picking_code" model="ir.sequence">
+            <field name="name">Stock Picking Code</field>
+            <field name="code">stock.picking.code</field>
+            <field name="active">TRUE</field>
+            <field name="prefix">1%(y)s%(month)s</field>
+            <field name="padding">5</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</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 82058837..19182a6b 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -6,12 +6,6 @@
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
-                <button id="action_confirm" position="after">
-<!--                    <button name="sale_order_approve"-->
-<!--                            string="Ask Approval"-->
-<!--                            type="object"-->
-<!--                    />-->
-                </button>
                 <field name="payment_term_id" position="after">
                     <field name="approval_status" />
                 </field>
@@ -23,6 +17,9 @@
                     <field name="total_margin" groups="sales_team.group_sale_manager"/>
                     <field name="total_percent_margin" groups="sales_team.group_sale_manager"/>
                 </field>
+                <field name="effective_date" position="after">
+                    <field name="carrier_id"/>
+                </field>
             </field>
         </record>
     </data>
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 9081a58e..6ad2e4cd 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -23,6 +23,30 @@
                            }"
                     />
                 </field>
+
+                <page name="note" position="after">
+                    <page string="E-Faktur" name="efaktur" attrs="{'invisible': [['is_internal_use', '=', False]]}">
+                        <group>
+                            <group>
+                                <field name="efaktur_id" domain="[('is_used','=',False)]"/>
+                                <field name="is_efaktur_exported"/>
+                                <field name="date_efaktur_exported"/>
+                            </group>
+                        </group>
+                    </page>
+                    <page string="Delivery" name="delivery_order">
+                        <group>
+                            <group>
+                                <field name="driver_departure_date"/>
+                                <field name="driver_arrival_date"/>
+                                <field name="delivery_tracking_no"/>
+                                <field name="driver_id"/>
+                                <field name="picking_code"/>
+                            </group>
+                        </group>
+                    </page>
+                </page>
+                
             </field>
         </record>
     </data>