OCA
/
account-financial-reporting
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[IMP] mis_builder: more lint

pull/189/head
Stéphane Bidoul 9 years ago
parent
3e68d3d435
commit
022b8a8998
2 changed files with 48 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      mis_builder/report/mis_report_instance_xlsx.py
  2. 103
      mis_builder/tests/test_mis_report_instance.py

2
mis_builder/report/mis_report_instance_xlsx.py
View File

@ -122,8 +122,6 @@ class MisBuilderXslx(ReportXlsx):
elif cell.val is None or cell.val is AccountingNone: elif cell.val is None or cell.val is AccountingNone:
val = '' val = ''
else: else:
_logger.info("*** %s %s %s", cell.row.label,
cell.subcol.label, cell.val)
val = cell.val / float(cell.style_props.get('divider', 1)) val = cell.val / float(cell.style_props.get('divider', 1))
sheet.write(row_pos, col_pos, val, cell_format) sheet.write(row_pos, col_pos, val, cell_format)
col_width[col_pos] = max(col_width[col_pos], col_width[col_pos] = max(col_width[col_pos],

103
mis_builder/tests/test_mis_report_instance.py
View File

@ -25,23 +25,21 @@ class TestMisReportInstance(common.TransactionCase):
self.report = self.env['mis.report'].create(dict( self.report = self.env['mis.report'].create(dict(
name='test report', name='test report',
subkpi_ids=[(0, 0, dict( subkpi_ids=[(0, 0, dict(
name='sk1',
description='subkpi 1',
sequence=1,
)), (0, 0, dict(
name='sk2',
description='subkpi 2',
sequence=2,
)),
],
name='sk1',
description='subkpi 1',
sequence=1,
)), (0, 0, dict(
name='sk2',
description='subkpi 2',
sequence=2,
))],
query_ids=[(0, 0, dict( query_ids=[(0, 0, dict(
name='partner',
model_id=partner_model_id,
field_ids=[(4, partner_debit_field_id, None)],
date_field=partner_create_date_field_id,
aggregate='sum',
)),
],
name='partner',
model_id=partner_model_id,
field_ids=[(4, partner_debit_field_id, None)],
date_field=partner_create_date_field_id,
aggregate='sum',
))],
)) ))
# kpi with accounting formulas # kpi with accounting formulas
self.env['mis.report.kpi'].create(dict( self.env['mis.report.kpi'].create(dict(
@ -50,13 +48,12 @@ class TestMisReportInstance(common.TransactionCase):
name='k1', name='k1',
multi=True, multi=True,
expression_ids=[(0, 0, dict( expression_ids=[(0, 0, dict(
name='bale[200%]',
subkpi_id=self.report.subkpi_ids[0].id,
)), (0, 0, dict(
name='balp[200%]',
subkpi_id=self.report.subkpi_ids[1].id,
)),
],
name='bale[200%]',
subkpi_id=self.report.subkpi_ids[0].id,
)), (0, 0, dict(
name='balp[200%]',
subkpi_id=self.report.subkpi_ids[1].id,
))],
)) ))
# kpi with accounting formula and query # kpi with accounting formula and query
self.env['mis.report.kpi'].create(dict( self.env['mis.report.kpi'].create(dict(
@ -65,13 +62,12 @@ class TestMisReportInstance(common.TransactionCase):
name='k2', name='k2',
multi=True, multi=True,
expression_ids=[(0, 0, dict( expression_ids=[(0, 0, dict(
name='balp[200%]',
subkpi_id=self.report.subkpi_ids[0].id,
)), (0, 0, dict(
name='partner.debit',
subkpi_id=self.report.subkpi_ids[1].id,
)),
],
name='balp[200%]',
subkpi_id=self.report.subkpi_ids[0].id,
)), (0, 0, dict(
name='partner.debit',
subkpi_id=self.report.subkpi_ids[1].id,
))],
)) ))
# kpi with a simple expression summing other multi-valued kpis # kpi with a simple expression summing other multi-valued kpis
self.env['mis.report.kpi'].create(dict( self.env['mis.report.kpi'].create(dict(
@ -88,13 +84,12 @@ class TestMisReportInstance(common.TransactionCase):
name='k3', name='k3',
multi=True, multi=True,
expression_ids=[(0, 0, dict( expression_ids=[(0, 0, dict(
name='AccountingNone',
subkpi_id=self.report.subkpi_ids[0].id,
)), (0, 0, dict(
name='1.0',
subkpi_id=self.report.subkpi_ids[1].id,
)),
],
name='AccountingNone',
subkpi_id=self.report.subkpi_ids[0].id,
)), (0, 0, dict(
name='1.0',
subkpi_id=self.report.subkpi_ids[1].id,
))],
)) ))
# kpi with a NameError (x not defined) # kpi with a NameError (x not defined)
self.env['mis.report.kpi'].create(dict( self.env['mis.report.kpi'].create(dict(
@ -103,13 +98,12 @@ class TestMisReportInstance(common.TransactionCase):
name='k5', name='k5',
multi=True, multi=True,
expression_ids=[(0, 0, dict( expression_ids=[(0, 0, dict(
name='x',
subkpi_id=self.report.subkpi_ids[0].id,
)), (0, 0, dict(
name='1.0',
subkpi_id=self.report.subkpi_ids[1].id,
)),
],
name='x',
subkpi_id=self.report.subkpi_ids[0].id,
)), (0, 0, dict(
name='1.0',
subkpi_id=self.report.subkpi_ids[1].id,
))],
)) ))
# create a report instance # create a report instance
self.report_instance = self.env['mis.report.instance'].create(dict( self.report_instance = self.env['mis.report.instance'].create(dict(
@ -117,17 +111,16 @@ class TestMisReportInstance(common.TransactionCase):
report_id=self.report.id, report_id=self.report.id,
company_id=self.env.ref('base.main_company').id, company_id=self.env.ref('base.main_company').id,
period_ids=[(0, 0, dict( period_ids=[(0, 0, dict(
name='p1',
mode='relative',
type='d',
subkpi_ids=[(4, self.report.subkpi_ids[0].id, None)],
)), (0, 0, dict(
name='p2',
mode='fix',
manual_date_from='2014-01-01',
manual_date_to='2014-12-31',
)),
],
name='p1',
mode='relative',
type='d',
subkpi_ids=[(4, self.report.subkpi_ids[0].id, None)],
)), (0, 0, dict(
name='p2',
mode='fix',
manual_date_from='2014-01-01',
manual_date_to='2014-12-31',
))],
)) ))
self.report_instance.period_ids[1].comparison_column_ids = \ self.report_instance.period_ids[1].comparison_column_ids = \
[(4, self.report_instance.period_ids[0].id, None)] [(4, self.report_instance.period_ids[0].id, None)]

Write Preview
Loading…
Cancel
Save