Merge branch 'release' of bitbucket.org:altafixco/indoteknik-addons into release

3 files changed, 136 insertions, 0 deletions

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index ce70fdd8..49e594b1 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <data>
+        <record id="stock_picking_tree_view_inherit" model="ir.ui.view">
+            <field name="name">Stock Picking</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.vpicktree"/>
+            <field name="arch" type="xml">
+                <field name="json_popover" position="after">
+                    <field name="date_done"/>
+                    <field name="driver_departure_date"/>
+                    <field name="driver_arrival_date"/>
+                </field>
+            </field>
+        </record>
+
         <record id="stock_picking_form_view_inherit" model="ir.ui.view">
             <field name="name">Stock Picking</field>
             <field name="model">stock.picking</field>
diff --git a/indoteknik_custom/views/website_content.xml b/indoteknik_custom/views/website_content.xml
new file mode 100644
index 00000000..e071134d
--- /dev/null
+++ b/indoteknik_custom/views/website_content.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="website_content_tree" model="ir.ui.view">
+        <field name="name">website.content.tree</field>
+        <field name="model">website.content</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="channel_id"/>
+                <field name="sequence"/>
+                <field name="slide_type"/>
+                <field name="name"/>
+                <field name="url"/>
+                <field name="status"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="website_content_form" model="ir.ui.view">
+        <field name="name">website.content.form</field>
+        <field name="model">website.content</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="channel_id"/>
+                            <field name="sequence"/>
+                            <field name="slide_type"/>
+                            <field name="name"/>
+                            <field name="url"/>
+                            <field name="status"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="view_website_content_filter" model="ir.ui.view">
+            <field name="name">website.content.list.select</field>
+            <field name="model">website.content</field>
+            <field name="priority" eval="15"/>
+            <field name="arch" type="xml">
+                <search string="Search Content">
+                    <field name="name"/>
+               </search>
+            </field>
+        </record>
+
+    <record id="website_content_action" model="ir.actions.act_window">
+        <field name="name">Website Content</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">website.content</field>
+        <field name="search_view_id" ref="view_website_content_filter"/>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+            id="menu_website_content"
+            name="Website Content"
+            parent="website_sale.menu_orders"
+            sequence="3"
+            action="website_content_action"
+    />
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/website_content_channel.xml b/indoteknik_custom/views/website_content_channel.xml
new file mode 100644
index 00000000..d1bc23fc
--- /dev/null
+++ b/indoteknik_custom/views/website_content_channel.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="website_content_channel_tree" model="ir.ui.view">
+        <field name="name">website.content.channel.tree</field>
+        <field name="model">website.content.channel</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name"/>
+                <field name="visibility"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="website_content_channel_form" model="ir.ui.view">
+        <field name="name">website.content.channel.form</field>
+        <field name="model">website.content.channel</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="description_html"/>
+                            <field name="visibility"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="view_website_content_channel_filter" model="ir.ui.view">
+            <field name="name">website.content.channel.list.select</field>
+            <field name="model">website.content.channel</field>
+            <field name="priority" eval="15"/>
+            <field name="arch" type="xml">
+                <search string="Search Channel">
+                    <field name="name"/>
+               </search>
+            </field>
+        </record>
+
+    <record id="website_content_channel_action" model="ir.actions.act_window">
+        <field name="name">Website Content Channel</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">website.content.channel</field>
+        <field name="search_view_id" ref="view_website_content_channel_filter"/>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+            id="menu_website_content_channel"
+            name="Website Content Channel"
+            parent="website_sale.menu_orders"
+            sequence="2"
+            action="website_content_channel_action"
+    />
+</odoo>
\ No newline at end of file