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

3 files changed, 48 insertions, 0 deletions

diff --git a/indoteknik_custom/views/apache_solr_queue.xml b/indoteknik_custom/views/apache_solr_queue.xml
index 13869b4c..7577e569 100644
--- a/indoteknik_custom/views/apache_solr_queue.xml
+++ b/indoteknik_custom/views/apache_solr_queue.xml
@@ -4,6 +4,8 @@
         <field name="model">apache.solr.queue</field>
         <field name="arch" type="xml">
             <tree editable="top" default_order="create_date desc">
+                <button type="object" name="open_target_record" class="fa fa-external-link" />
+                <field name="id" readonly="1" />
                 <field name="display_name" readonly="1" />
                 <field name="res_model" readonly="1" />
                 <field name="res_id" readonly="1" />
diff --git a/indoteknik_custom/views/promotion/promotion_product.xml b/indoteknik_custom/views/promotion/promotion_product.xml
new file mode 100644
index 00000000..eac42a45
--- /dev/null
+++ b/indoteknik_custom/views/promotion/promotion_product.xml
@@ -0,0 +1,45 @@
+<odoo>
+    <record id="promotion_product_tree" model="ir.ui.view">
+        <field name="name">Promotion Product Tree</field>
+        <field name="model">promotion.product</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="product_id" />
+                <field name="qty" />
+            </tree>
+        </field>
+    </record>
+
+    <record id="promotion_product_form" model="ir.ui.view">
+        <field name="name">Promotion Product Form</field>
+        <field name="model">promotion.product</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="program_line_id" />
+                            <field name="product_id" />
+                            <field name="qty" />
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="promotion_product_action" model="ir.actions.act_window">
+        <field name="name">Promotion Product</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">promotion.product</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+        id="menu_promotion_product"
+        name="Product"
+        parent="indoteknik_custom.menu_promotion_program_parent"
+        sequence="3"
+        action="promotion_product_action"
+    />
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/promotion/promotion_program_line.xml b/indoteknik_custom/views/promotion/promotion_program_line.xml
index 346a08c9..280bdfba 100644
--- a/indoteknik_custom/views/promotion/promotion_program_line.xml
+++ b/indoteknik_custom/views/promotion/promotion_program_line.xml
@@ -21,6 +21,7 @@
                 <sheet>
                     <group>
                         <group>
+                            <field name="program_id" />
                             <field name="name" />
                             <field name="promotion_type" />
                         </group>