Merge branch 'production' into purchasing-job

1 files changed, 15 insertions, 2 deletions

diff --git a/indoteknik_custom/models/solr/apache_solr_queue.py b/indoteknik_custom/models/solr/apache_solr_queue.py
index 07274295..1b51538f 100644
--- a/indoteknik_custom/models/solr/apache_solr_queue.py
+++ b/indoteknik_custom/models/solr/apache_solr_queue.py
@@ -18,6 +18,7 @@ class ApacheSolrQueue(models.Model):
         ('not_found', 'Record not found')
     ], 'Execute Status')
     execute_date = fields.Datetime('Execute Date')
+    description = fields.Text('Description')
 
     def _compute_display_name(self):
         for rec in self:
@@ -38,6 +39,16 @@ class ApacheSolrQueue(models.Model):
             if elapsed_time > max_exec_time:
                 break
             rec.execute_queue()
+            
+    def open_target_record(self):
+        return {
+            'name': '',
+            'view_mode': 'form',
+            'res_model': self.res_model,
+            'target': 'current',
+            'type': 'ir.actions.act_window',
+            'res_id': self.res_id
+        }
 
     def execute_queue(self):
         for rec in self:
@@ -48,7 +59,8 @@ class ApacheSolrQueue(models.Model):
                 _logger.info(f'Execute Queue: {res_model}.{function_name}() -> {res_id}')
 
                 domain = [('id', '=', res_id)]
-                if res_model in ['product.template']:
+                model_incl_archive = ['product.template', 'promotion.program.line']
+                if res_model in model_incl_archive:
                     domain.append(('active', 'in', [True, False]))
 
                 model_instance = self.env[res_model].search(domain)
@@ -57,7 +69,8 @@ class ApacheSolrQueue(models.Model):
                     rec.execute_status = 'success'
                 else:
                     rec.execute_status = 'not_found'
-            except:
+            except Exception as e:
+                rec.description = e
                 rec.execute_status = 'failed'
             rec.execute_date = datetime.utcnow()
             self.env.cr.commit()