diff --git a/mis_builder/__openerp__.py b/mis_builder/__openerp__.py index a1cab4f4..39ba012e 100644 --- a/mis_builder/__openerp__.py +++ b/mis_builder/__openerp__.py @@ -20,6 +20,7 @@ 'data': [ 'wizard/mis_builder_dashboard.xml', 'views/mis_builder.xml', + 'datas/ir_cron.xml', 'security/ir.model.access.csv', 'security/mis_builder_security.xml', 'report/report_mis_report_instance.xml', diff --git a/mis_builder/datas/ir_cron.xml b/mis_builder/datas/ir_cron.xml new file mode 100644 index 00000000..f99d6959 --- /dev/null +++ b/mis_builder/datas/ir_cron.xml @@ -0,0 +1,18 @@ + + + + + + Vaccum temporary report + 4 + hours + -1 + + + + + + + + + diff --git a/mis_builder/models/mis_builder.py b/mis_builder/models/mis_builder.py index 42684029..1c3e3f7c 100644 --- a/mis_builder/models/mis_builder.py +++ b/mis_builder/models/mis_builder.py @@ -810,7 +810,6 @@ class MisReportInstancePeriod(models.Model): ('w', _('Week')), ('date_range', _('Date Range')) ], - required=True, string='Period type') date_range_type_id = fields.Many2one( comodel_name='date.range.type', string='Date Range Type') @@ -864,6 +863,7 @@ class MisReportInstancePeriod(models.Model): for record in self: record.manual_date_from = record.date_range_id.date_start record.manual_date_to = record.date_range_id.date_end + record.name = record.date_range_id.name @api.multi def _get_additional_move_line_filter(self): @@ -1089,6 +1089,17 @@ class MisReportInstance(models.Model): }) return res + @api.model + def _vacuum_report(self, hours=24): + clear_date = fields.Datetime.to_string( + datetime.datetime.now() - datetime.timedelta(hours=hours)) + reports = self.search([ + ('write_date', '<', clear_date), + ('temporary', '=', True), + ]) + _logger.debug('Vacuum %s Temporary MIS Builder Report', len(reports)) + return reports.unlink() + @api.one def copy(self, default=None): default = dict(default or {}) diff --git a/mis_builder/views/mis_builder.xml b/mis_builder/views/mis_builder.xml index 02452f1b..228e8c22 100644 --- a/mis_builder/views/mis_builder.xml +++ b/mis_builder/views/mis_builder.xml @@ -296,9 +296,6 @@ - - @@ -323,7 +320,7 @@ mis.report.instance form tree,form - + [('temporary', '=', False)] @@ -376,19 +373,12 @@
-
-
-
-

- -

-
+ - + @@ -406,6 +396,7 @@ +