[IMP] add cron for deleting temporary report, improve view and fix period creation
parent
161e3a34b2
commit
43fd454c24
|
@ -20,6 +20,7 @@
|
||||||
'data': [
|
'data': [
|
||||||
'wizard/mis_builder_dashboard.xml',
|
'wizard/mis_builder_dashboard.xml',
|
||||||
'views/mis_builder.xml',
|
'views/mis_builder.xml',
|
||||||
|
'datas/ir_cron.xml',
|
||||||
'security/ir.model.access.csv',
|
'security/ir.model.access.csv',
|
||||||
'security/mis_builder_security.xml',
|
'security/mis_builder_security.xml',
|
||||||
'report/report_mis_report_instance.xml',
|
'report/report_mis_report_instance.xml',
|
||||||
|
|
|
@ -0,0 +1,18 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<openerp>
|
||||||
|
<data noupdate="1">
|
||||||
|
|
||||||
|
<record id="ir_cron_crm_action" model="ir.cron">
|
||||||
|
<field name="name">Vaccum temporary report</field>
|
||||||
|
<field name="interval_number">4</field>
|
||||||
|
<field name="interval_type">hours</field>
|
||||||
|
<field name="numbercall">-1</field>
|
||||||
|
<field eval="False" name="doall"/>
|
||||||
|
<field eval="'mis.report.instance'" name="model"/>
|
||||||
|
<field eval="'_vacuum_report'" name="function"/>
|
||||||
|
<field eval="'(24,)'" name="args"/>
|
||||||
|
<field name="active" eval="True" />
|
||||||
|
</record>
|
||||||
|
|
||||||
|
</data>
|
||||||
|
</openerp>
|
|
@ -810,7 +810,6 @@ class MisReportInstancePeriod(models.Model):
|
||||||
('w', _('Week')),
|
('w', _('Week')),
|
||||||
('date_range', _('Date Range'))
|
('date_range', _('Date Range'))
|
||||||
],
|
],
|
||||||
required=True,
|
|
||||||
string='Period type')
|
string='Period type')
|
||||||
date_range_type_id = fields.Many2one(
|
date_range_type_id = fields.Many2one(
|
||||||
comodel_name='date.range.type', string='Date Range Type')
|
comodel_name='date.range.type', string='Date Range Type')
|
||||||
|
@ -864,6 +863,7 @@ class MisReportInstancePeriod(models.Model):
|
||||||
for record in self:
|
for record in self:
|
||||||
record.manual_date_from = record.date_range_id.date_start
|
record.manual_date_from = record.date_range_id.date_start
|
||||||
record.manual_date_to = record.date_range_id.date_end
|
record.manual_date_to = record.date_range_id.date_end
|
||||||
|
record.name = record.date_range_id.name
|
||||||
|
|
||||||
@api.multi
|
@api.multi
|
||||||
def _get_additional_move_line_filter(self):
|
def _get_additional_move_line_filter(self):
|
||||||
|
@ -1089,6 +1089,17 @@ class MisReportInstance(models.Model):
|
||||||
})
|
})
|
||||||
return res
|
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
|
@api.one
|
||||||
def copy(self, default=None):
|
def copy(self, default=None):
|
||||||
default = dict(default or {})
|
default = dict(default or {})
|
||||||
|
|
|
@ -296,9 +296,6 @@
|
||||||
<tree string="KPI's" colors="red:valid==False">
|
<tree string="KPI's" colors="red:valid==False">
|
||||||
<field name="sequence" widget="handle"/>
|
<field name="sequence" widget="handle"/>
|
||||||
<field name="name"/>
|
<field name="name"/>
|
||||||
<field name="type"/>
|
|
||||||
<field name="date_range_type_id"
|
|
||||||
attrs="{'invisible': [('type', '!=', 'date_range')], 'required': [('type', '=', 'date_range')]}"/>
|
|
||||||
<field name="date_from"/>
|
<field name="date_from"/>
|
||||||
<field name="date_to"/>
|
<field name="date_to"/>
|
||||||
<field name="valid" invisible="1"/>
|
<field name="valid" invisible="1"/>
|
||||||
|
@ -323,7 +320,7 @@
|
||||||
<field name="res_model">mis.report.instance</field>
|
<field name="res_model">mis.report.instance</field>
|
||||||
<field name="view_type">form</field>
|
<field name="view_type">form</field>
|
||||||
<field name="view_mode">tree,form</field>
|
<field name="view_mode">tree,form</field>
|
||||||
<field name="domain"></field>
|
<field name="domain">[('temporary', '=', False)]</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<menuitem id="mis_report_instance_view_menu" parent="account.menu_finance_reports" name="MIS Reports" action="mis_report_instance_view_action" sequence="101"/>
|
<menuitem id="mis_report_instance_view_menu" parent="account.menu_finance_reports" name="MIS Reports" action="mis_report_instance_view_action" sequence="101"/>
|
||||||
|
@ -376,19 +373,12 @@
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<form string="KPI's">
|
<form string="KPI's">
|
||||||
<sheet>
|
<sheet>
|
||||||
<div class="oe_title">
|
|
||||||
<div class="oe_edit_only">
|
|
||||||
<label for="name"/>
|
|
||||||
</div>
|
|
||||||
<h1>
|
|
||||||
<field name="name" placeholder="Name"/>
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
<group>
|
<group>
|
||||||
<field name="mode" widget="radio"/>
|
<field name="mode" widget="radio"/>
|
||||||
|
<field name="valid" invisible="1"/>
|
||||||
<group name="relative" attrs="{'invisible': [('mode', '!=', 'relative')]}" colspan="4">
|
<group name="relative" attrs="{'invisible': [('mode', '!=', 'relative')]}" colspan="4">
|
||||||
<group>
|
<group>
|
||||||
<field name="type"/>
|
<field name="type" attrs="{'required': [('mode', '=', 'relative')]}"/>
|
||||||
<field name="date_range_type_id"
|
<field name="date_range_type_id"
|
||||||
attrs="{'invisible': [('type', '!=', 'date_range')], 'required': [('type', '=', 'date_range')]}"/>
|
attrs="{'invisible': [('type', '!=', 'date_range')], 'required': [('type', '=', 'date_range')]}"/>
|
||||||
<field name="offset"/>
|
<field name="offset"/>
|
||||||
|
@ -406,6 +396,7 @@
|
||||||
<field name="manual_date_to"
|
<field name="manual_date_to"
|
||||||
attrs="{'required': [('mode', '=', 'fix')]}"/>
|
attrs="{'required': [('mode', '=', 'fix')]}"/>
|
||||||
</group>
|
</group>
|
||||||
|
<field name="name" placeholder="Name"/>
|
||||||
<field name="normalize_factor"/>
|
<field name="normalize_factor"/>
|
||||||
<field name="report_instance_id" invisible="1"/>
|
<field name="report_instance_id" invisible="1"/>
|
||||||
<field name="id" invisible="1"/>
|
<field name="id" invisible="1"/>
|
||||||
|
|
Loading…
Reference in New Issue