From c1adf834e9a30fd572f575dcf9935bd6cd70f4ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Tue, 17 May 2016 10:31:37 +0200 Subject: [PATCH] [IMP] mis_builder: lint --- mis_builder/README.rst | 1 + mis_builder/models/mis_report.py | 12 +++++---- mis_builder/static/src/js/mis_builder.js | 28 ++++++++++---------- mis_builder/static/src/xml/mis_widget.xml | 4 +-- mis_builder/tests/mis.report.csv | 4 +-- mis_builder/tests/mis.report.instance.csv | 4 +-- mis_builder/tests/mis.report.query.csv | 2 +- mis_builder/wizard/mis_builder_dashboard.xml | 2 +- 8 files changed, 30 insertions(+), 27 deletions(-) diff --git a/mis_builder/README.rst b/mis_builder/README.rst index b76c0431..4ea2e57d 100644 --- a/mis_builder/README.rst +++ b/mis_builder/README.rst @@ -64,6 +64,7 @@ Known issues / Roadmap ====================== * V9 thoughts: + * select accounts by tag (see also select accounts by type below) * how to handle multi-company consolidation now that consolidation children are gone? * what replaces root accounts / account charts in v9? nothing it seems, so diff --git a/mis_builder/models/mis_report.py b/mis_builder/models/mis_report.py index 0d9e397e..ebdb78ef 100644 --- a/mis_builder/models/mis_report.py +++ b/mis_builder/models/mis_report.py @@ -529,7 +529,8 @@ class MisReportKpi(models.Model): def _inverse_expression(self): for kpi in self: if kpi.multi: - raise UserError('Can not update a multi kpi from the kpi line') + raise UserError(_('Can not update a multi kpi from ' + 'the kpi line')) if kpi.expression_ids: kpi.expression_ids[0].write({ 'name': kpi.expression, @@ -973,10 +974,11 @@ class MisReport(models.Model): elif isinstance(vals[0], DataError): vals = (vals[0],) * col.colspan else: - raise UserError("Probably not your fault... but I'm " - "really curious to know how you " - "managed to raise this error so " - "I can handle one more corner case!") + raise UserError(_("Probably not your fault... but I'm " + "really curious to know how you " + "managed to raise this error so " + "I can handle one more corner " + "case!")) if len(drilldown_args) != col.colspan: drilldown_args = [None] * col.colspan kpi_matrix.set_values( diff --git a/mis_builder/static/src/js/mis_builder.js b/mis_builder/static/src/js/mis_builder.js index 5fc85fe8..22277261 100644 --- a/mis_builder/static/src/js/mis_builder.js +++ b/mis_builder/static/src/js/mis_builder.js @@ -22,8 +22,8 @@ var MisReport = form_common.FormWidget.extend({ }, reload_widget: function() { - var self = this - self.mis_report_instance_id = self.getParent().datarecord.id + var self = this; + self.mis_report_instance_id = self.getParent().datarecord.id; if (self.mis_report_instance_id) { self.generate_content(); } @@ -32,7 +32,7 @@ var MisReport = form_common.FormWidget.extend({ start: function() { this._super.apply(this, arguments); var self = this; - self.mis_report_instance_id = self.getParent().datarecord.id + self.mis_report_instance_id = self.getParent().datarecord.id; if (self.mis_report_instance_id) { self.getParent().dataset.context['no_destroy'] = true; } @@ -40,7 +40,7 @@ var MisReport = form_common.FormWidget.extend({ get_context: function() { var self = this; - var context = {} + var context = {}; if (this.mis_report_instance_id){ context['active_ids'] = [this.mis_report_instance_id]; } @@ -48,8 +48,8 @@ var MisReport = form_common.FormWidget.extend({ }, print: function() { - var self = this - var context = new data.CompoundContext(self.build_context(), self.get_context()|| {}) + var self = this; + var context = new data.CompoundContext(self.build_context(), self.get_context()|| {}); new Model("mis.report.instance").call( "print_pdf", [self.mis_report_instance_id], @@ -59,8 +59,8 @@ var MisReport = form_common.FormWidget.extend({ }); }, export_pdf: function() { - var self = this - var context = new data.CompoundContext(self.build_context(), self.get_context()|| {}) + var self = this; + var context = new data.CompoundContext(self.build_context(), self.get_context()|| {}); new Model("mis.report.instance").call( "export_xls", [self.mis_report_instance_id], @@ -70,8 +70,8 @@ var MisReport = form_common.FormWidget.extend({ }); }, display_settings: function() { - var self = this - var context = new data.CompoundContext(self.build_context(), self.get_context()|| {}) + var self = this; + var context = new data.CompoundContext(self.build_context(), self.get_context()|| {}); new Model("mis.report.instance").call( "display_settings", [self.mis_report_instance_id], @@ -81,8 +81,8 @@ var MisReport = form_common.FormWidget.extend({ }); }, generate_content: function() { - var self = this - var context = new data.CompoundContext(self.build_context(), self.get_context()|| {}) + var self = this; + var context = new data.CompoundContext(self.build_context(), self.get_context()|| {}); new Model("mis.report.instance").call( "compute", [self.mis_report_instance_id], @@ -132,9 +132,9 @@ ActionManager.include({ * export, ... */ dialog_stop: function (reason) { - var self = this + var self = this; if (self.dialog_widget && self.dialog_widget.dataset && self.dialog_widget.dataset.context) { - var context = self.dialog_widget.dataset.context + var context = self.dialog_widget.dataset.context; if (!context['no_destroy']) { this._super.apply(this, arguments); } diff --git a/mis_builder/static/src/xml/mis_widget.xml b/mis_builder/static/src/xml/mis_widget.xml index e5c92c5c..e720722d 100644 --- a/mis_builder/static/src/xml/mis_widget.xml +++ b/mis_builder/static/src/xml/mis_widget.xml @@ -25,7 +25,7 @@ - +
@@ -47,7 +47,7 @@ - + diff --git a/mis_builder/tests/mis.report.csv b/mis_builder/tests/mis.report.csv index 51b55125..761c37a3 100644 --- a/mis_builder/tests/mis.report.csv +++ b/mis_builder/tests/mis.report.csv @@ -1,2 +1,2 @@ -"id","description","kpi_ids/id","name","query_ids/id" -"mis_report_test","","mis_report_kpi_test","Test report","mis_report_query_test" \ No newline at end of file +"id","description","kpi_ids/id","name","query_ids/id" +"mis_report_test","","mis_report_kpi_test","Test report","mis_report_query_test" diff --git a/mis_builder/tests/mis.report.instance.csv b/mis_builder/tests/mis.report.instance.csv index 96f035f4..73776865 100644 --- a/mis_builder/tests/mis.report.instance.csv +++ b/mis_builder/tests/mis.report.instance.csv @@ -1,2 +1,2 @@ -"id","date","description","name","period_ids/id","report_id/id" -"mis_report_instance_test","2014-07-31","","Test-report-instance without company","mis_report_instance_period_test","mis_report_test" \ No newline at end of file +"id","date","description","name","period_ids/id","report_id/id" +"mis_report_instance_test","2014-07-31","","Test-report-instance without company","mis_report_instance_period_test","mis_report_test" diff --git a/mis_builder/tests/mis.report.query.csv b/mis_builder/tests/mis.report.query.csv index ccbdf789..6ef1ac21 100644 --- a/mis_builder/tests/mis.report.query.csv +++ b/mis_builder/tests/mis.report.query.csv @@ -1,2 +1,2 @@ "id","date_field/id","domain","field_ids/id","model_id/id","name" -"mis_report_query_test","analytic.field_account_analytic_line_date","","analytic.field_account_analytic_line_amount","analytic.model_account_analytic_line","test" \ No newline at end of file +"mis_report_query_test","analytic.field_account_analytic_line_date","","analytic.field_account_analytic_line_amount","analytic.model_account_analytic_line","test" diff --git a/mis_builder/wizard/mis_builder_dashboard.xml b/mis_builder/wizard/mis_builder_dashboard.xml index 99802637..fbbb0bab 100644 --- a/mis_builder/wizard/mis_builder_dashboard.xml +++ b/mis_builder/wizard/mis_builder_dashboard.xml @@ -30,4 +30,4 @@ - \ No newline at end of file +