diff --git a/mis_builder/models/__init__.py b/mis_builder/models/__init__.py index 2c6b63fd..e632fa44 100644 --- a/mis_builder/models/__init__.py +++ b/mis_builder/models/__init__.py @@ -4,5 +4,5 @@ from . import mis_report from . import mis_report_instance -from . import mis_builder_style +from . import mis_report_style from . import aep diff --git a/mis_builder/models/mis_report.py b/mis_builder/models/mis_report.py index ef6bf03b..53519650 100644 --- a/mis_builder/models/mis_report.py +++ b/mis_builder/models/mis_report.py @@ -423,12 +423,12 @@ class MisReportKpi(models.Model): auto_expand_accounts = fields.Boolean(string='Display details by account') auto_expand_accounts_style = fields.Many2one( string="Style for account detail rows", - comodel_name="mis.report.kpi.style", + comodel_name="mis.report.style", required=False ) style = fields.Many2one( string="Row style", - comodel_name="mis.report.kpi.style", + comodel_name="mis.report.style", required=False ) style_expression = fields.Char( diff --git a/mis_builder/models/mis_builder_style.py b/mis_builder/models/mis_report_style.py similarity index 98% rename from mis_builder/models/mis_builder_style.py rename to mis_builder/models/mis_report_style.py index 91f831c1..f478ba8b 100644 --- a/mis_builder/models/mis_builder_style.py +++ b/mis_builder/models/mis_report_style.py @@ -8,7 +8,7 @@ from openerp import api, fields, models class MisReportKpiStyle(models.Model): - _name = 'mis.report.kpi.style' + _name = 'mis.report.style' @api.depends('indent_level') def check_positive_val(self): diff --git a/mis_builder/security/ir.model.access.csv b/mis_builder/security/ir.model.access.csv index 4888b10d..04325c52 100644 --- a/mis_builder/security/ir.model.access.csv +++ b/mis_builder/security/ir.model.access.csv @@ -13,5 +13,5 @@ access_mis_report_subkpi,access_mis_report_subkpi,model_mis_report_subkpi,accoun access_mis_report_subkpi,access_mis_report_subkpi,model_mis_report_subkpi,base.group_user,1,0,0,0 access_mis_report_kpi_expression,access_mis_report_kpi_expression,model_mis_report_kpi_expression,account.group_account_manager,1,1,1,1 access_mis_report_kpi_expression,access_mis_report_kpi_expression,model_mis_report_kpi_expression,base.group_user,1,0,0,0 -access_mis_report_kpi_style,access_mis_report_kpi_style,model_mis_report_kpi_style,account.group_account_manager,1,0,0,0 -access_mis_report_kpi_style,access_mis_report_kpi_style,model_mis_report_kpi_style,base.group_user,1,0,0,0 +access_mis_report_style,access_mis_report_style,model_mis_report_style,account.group_account_manager,1,0,0,0 +access_mis_report_style,access_mis_report_style,model_mis_report_style,base.group_user,1,0,0,0 diff --git a/mis_builder/views/mis_builder_style.xml b/mis_builder/views/mis_builder_style.xml index cc78ae1a..6d543eab 100644 --- a/mis_builder/views/mis_builder_style.xml +++ b/mis_builder/views/mis_builder_style.xml @@ -2,11 +2,27 @@ + + mis.report.style.view.tree + mis.report.style + + + + + + + + + + + + + mis.report.style.view.form - mis.report.kpi.style + mis.report.style -
+ @@ -28,5 +44,15 @@ + + MIS Report Styles + + mis.report.style + form + tree,form + + + +