Merge branch 'production' into purchasing-job

# Conflicts:
#	indoteknik_custom/__manifest__.py
#	indoteknik_custom/models/__init__.py
#	indoteknik_custom/models/automatic_purchase.py
#	indoteknik_custom/models/purchase_order_line.py
#	indoteknik_custom/security/ir.model.access.csv
#	indoteknik_custom/views/automatic_purchase.xml
#	indoteknik_custom/views/purchase_order.xml

1 files changed, 52 insertions, 0 deletions

diff --git a/indoteknik_custom/views/logbook_sj.xml b/indoteknik_custom/views/logbook_sj.xml
new file mode 100644
index 00000000..9eb9aa12
--- /dev/null
+++ b/indoteknik_custom/views/logbook_sj.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_logbook_sj_form" model="ir.ui.view">
+        <field name="name">Logbook SJ</field>
+        <field name="model">logbook.sj</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <field name="name" invisible="1"/>
+                    <field
+                            name="logbook_sj_line"
+                            mode="tree"
+                    >
+                        <tree editable="bottom">
+                            <control>
+                                <create name="add_logbook_sj_line_control" string="Add a logbook"/>
+                            </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="carrier_id" readonly="1"/>
+                            <field name="tracking_no" readonly="1"/>
+                            <field name="partner_id" readonly="1"/>
+                        </tree>
+                    </field>
+                </sheet>
+                <footer>
+                    <button name="create_logbook_sj" 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_logbook_sj" model="ir.actions.act_window">
+        <field name="name">Logbook SJ</field>
+        <field name="res_model">logbook.sj</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_logbook_sj_form"/>
+        <field name="target">new</field>
+    </record>
+
+    <menuitem
+            action="action_logbook_sj"
+            id="logbook_sj"
+            parent="stock.menu_stock_warehouse_mgmt"
+            name="Logbook SJ"
+            sequence="1"
+    />
+</odoo>
\ No newline at end of file