Techsystech
/
OCA_Reporting_engine_17.0
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #398 into 12.0 

Signed-off-by legalsylvain
pull/399/head
OCA-git-bot 2020-05-08 14:51:37 +00:00
parent 183c531f09 b0bd76b539
commit ff28d7bcd9
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kpi_dashboard/models/kpi_dashboard.py
View File

@ -92,7 +92,9 @@ class KpiDashboardItem(models.Model):
name = fields.Char(required=True) name = fields.Char(required=True)
kpi_id = fields.Many2one("kpi.kpi") kpi_id = fields.Many2one("kpi.kpi")
dashboard_id = fields.Many2one("kpi.dashboard", required=True,) dashboard_id = fields.Many2one(
"kpi.dashboard", required=True, ondelete="cascade"
)
column = fields.Integer(required=True, default=1) column = fields.Integer(required=True, default=1)
row = fields.Integer(required=True, default=1) row = fields.Integer(required=True, default=1)
end_row = fields.Integer(store=True, compute='_compute_end_row') end_row = fields.Integer(store=True, compute='_compute_end_row')

2
kpi_dashboard_altair/models/kpi_kpi.py
View File

@ -8,7 +8,7 @@ try:
import pandas import pandas
import altair import altair
except ImportError: except ImportError:
logger.debug('Cannot import genshi.core') logger.debug('Cannot import altair or pandas')
class KpiKpi(models.Model): class KpiKpi(models.Model):