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

3 files changed, 44 insertions, 7 deletions

diff --git a/indoteknik_custom/views/apache_solr_queue.xml b/indoteknik_custom/views/apache_solr_queue.xml
index 7577e569..4c145b9f 100644
--- a/indoteknik_custom/views/apache_solr_queue.xml
+++ b/indoteknik_custom/views/apache_solr_queue.xml
@@ -4,13 +4,16 @@
         <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" />
+                <button type="object" name="open_target_record" string="" icon="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" />
                 <field name="function_name" readonly="1" />
-                <field name="execute_status" widget="badge" readonly="1"
+                <field 
+                    name="execute_status" 
+                    widget="badge" 
+                    readonly="1"
                     decoration-danger="execute_status == 'failed'" 
                     decoration-success="execute_status == 'success'"
                     decoration-primary="execute_status == 'not_found'"
diff --git a/indoteknik_custom/views/promotion/promotion_monitoring.xml b/indoteknik_custom/views/promotion/promotion_monitoring.xml
index b1f80276..88325c52 100644
--- a/indoteknik_custom/views/promotion/promotion_monitoring.xml
+++ b/indoteknik_custom/views/promotion/promotion_monitoring.xml
@@ -3,10 +3,13 @@
         <field name="name">Promotion Monitoring Tree</field>
         <field name="model">promotion.monitoring</field>
         <field name="arch" type="xml">
-            <tree>
+            <tree create="0">
                 <field name="product_id" />
+                <field name="manufacture_id" />
+                <field name="price" />
                 <field name="has_promo" />
-                <field name="count_promo" />
+                <field name="count_active" />
+                <field name="count_inactive" />
             </tree>
         </field>
     </record>
@@ -15,13 +18,16 @@
         <field name="name">Promotion Monitoring Form</field>
         <field name="model">promotion.monitoring</field>
         <field name="arch" type="xml">
-            <form>
+            <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_promo" />
+                            <field name="count_active" />
+                            <field name="count_inactive" />
                         </group>
                     </group>
                 </sheet>
@@ -29,6 +35,18 @@
         </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>
diff --git a/indoteknik_custom/views/promotion/promotion_program_line.xml b/indoteknik_custom/views/promotion/promotion_program_line.xml
index 280bdfba..025ea35a 100644
--- a/indoteknik_custom/views/promotion/promotion_program_line.xml
+++ b/indoteknik_custom/views/promotion/promotion_program_line.xml
@@ -21,9 +21,10 @@
                 <sheet>
                     <group>
                         <group>
-                            <field name="program_id" />
                             <field name="name" />
+                            <field name="program_id" />
                             <field name="promotion_type" />
+                            <field name="active" readonly="1" />
                         </group>
                         <group>
                             <field name="package_limit" />
@@ -71,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