Techsystech
/
account-financial-reporting
mirror of https://github.com/OCA/account-financial-reporting.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[FIX] fix operation on SimpleArray

pull/189/head
Sébastien BEAU 2016-04-28 01:29:22 +02:00 committed by Stéphane Bidoul
parent d976ede644
commit 3487411a5e
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mis_builder/models/mis_builder.py
View File

@ -298,6 +298,7 @@ class MisReportSubkpi(models.Model):
name = fields.Char(required=True) name = fields.Char(required=True)
expression_ids = fields.One2many('mis.report.kpi.expression', 'subkpi_id') expression_ids = fields.One2many('mis.report.kpi.expression', 'subkpi_id')
@api.multi
def unlink(self): def unlink(self):
for subkpi in self: for subkpi in self:
subkpi.expression_ids.unlink() subkpi.expression_ids.unlink()
@ -569,6 +570,9 @@ class MisReport(models.Model):
if kpi.multi: if kpi.multi:
vals = SimpleArray(vals) vals = SimpleArray(vals)
else:
vals = vals[0]
localdict[kpi.name] = vals localdict[kpi.name] = vals
res[kpi] = vals res[kpi] = vals
@ -788,7 +792,11 @@ class MisReportInstancePeriod(models.Model):
else: else:
drilldown = (subkpi_val is not None and drilldown = (subkpi_val is not None and
AEP.has_account_var(kpi.expression)) AEP.has_account_var(kpi.expression))
comment = kpi.name + " = " + kpi.expression_ids[idx].name if kpi.multi:
expression = kpi.expression_ids[idx].name
else:
expression = kpi.expression
comment = kpi.name + " = " + expression
vals.update({ vals.update({
'val': None if subkpi_val is AccountingNone 'val': None if subkpi_val is AccountingNone
else subkpi_val, else subkpi_val,