Merge branch 'production' into purchasing-job

3 files changed, 126 insertions, 0 deletions

diff --git a/indoteknik_custom/views/promotion/promotion_monitoring.xml b/indoteknik_custom/views/promotion/promotion_monitoring.xml
new file mode 100644
index 00000000..88325c52
--- /dev/null
+++ b/indoteknik_custom/views/promotion/promotion_monitoring.xml
@@ -0,0 +1,64 @@
+<odoo>
+    <record id="promotion_monitoring_tree" model="ir.ui.view">
+        <field name="name">Promotion Monitoring Tree</field>
+        <field name="model">promotion.monitoring</field>
+        <field name="arch" type="xml">
+            <tree create="0">
+                <field name="product_id" />
+                <field name="manufacture_id" />
+                <field name="price" />
+                <field name="has_promo" />
+                <field name="count_active" />
+                <field name="count_inactive" />
+            </tree>
+        </field>
+    </record>
+
+    <record id="promotion_monitoring_form" model="ir.ui.view">
+        <field name="name">Promotion Monitoring Form</field>
+        <field name="model">promotion.monitoring</field>
+        <field name="arch" type="xml">
+            <form create="0" edit="0">
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="product_id" />
+                            <field name="manufacture_id" />
+                            <field name="price" />
+                            <field name="has_promo" />
+                            <field name="count_active" />
+                            <field name="count_inactive" />
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="promotion_monitoring_view_search" model="ir.ui.view">
+        <field name="name">promotion.monitoring.search</field>
+        <field name="model">promotion.monitoring</field>
+        <field name="mode">primary</field>
+        <field name="arch" type="xml">
+            <search string="Search">
+                <field name="product_id" />
+                <field name="manufacture_id" />
+            </search>
+        </field>
+    </record>
+
+    <record id="promotion_monitoring_action" model="ir.actions.act_window">
+        <field name="name">Promotion Monitoring</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">promotion.monitoring</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+        id="menu_promotion_monitoring"
+        name="Monitoring"
+        parent="indoteknik_custom.menu_promotion_program_parent"
+        sequence="3"
+        action="promotion_monitoring_action"
+    />
+</odoo>
\ No newline at end of file
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..025ea35a 100644
--- a/indoteknik_custom/views/promotion/promotion_program_line.xml
+++ b/indoteknik_custom/views/promotion/promotion_program_line.xml
@@ -22,7 +22,9 @@
                     <group>
                         <group>
                             <field name="name" />
+                            <field name="program_id" />
                             <field name="promotion_type" />
+                            <field name="active" readonly="1" />
                         </group>
                         <group>
                             <field name="package_limit" />
@@ -70,4 +72,19 @@
         sequence="2"
         action="promotion_program_line_action"
     />
+
+    <data noupdate="1">
+        <record id="cron_program_line_solr_flag_solr" model="ir.cron">
+            <field name="name">Program Line: Solr Flag to Queue</field>
+            <field name="interval_number">1</field>
+            <field name="interval_type">hours</field>
+            <field name="numbercall">-1</field>
+            <field name="doall" eval="False"/>
+            <field name="model_id" ref="model_promotion_program_line"/>
+            <field name="code">model.solr_flag_to_queue()</field>
+            <field name="state">code</field>
+            <field name="priority">55</field>
+            <field name="active">True</field>
+        </record>
+    </data>
 </odoo>
\ No newline at end of file