From 44499e620d090b722989ad7eb1e9383c3e3c8158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Mon, 27 Apr 2015 19:11:44 +0200 Subject: [PATCH] [IMP] mis_builder: code cosmetics --- mis_builder/models/aep.py | 8 ++++---- mis_builder/report/mis_builder_xls.py | 2 -- mis_builder/static/src/css/custom.css | 2 +- mis_builder/static/src/js/mis_builder.js | 2 +- mis_builder/static/src/xml/mis_widget.xml | 2 +- mis_builder/tests/__init__.py | 2 -- mis_builder/wizard/mis_builder_dashboard.py | 2 -- 7 files changed, 7 insertions(+), 13 deletions(-) diff --git a/mis_builder/models/aep.py b/mis_builder/models/aep.py index 2cf457b6..b09ab729 100644 --- a/mis_builder/models/aep.py +++ b/mis_builder/models/aep.py @@ -101,7 +101,7 @@ class AccountingExpressionProcessor(object): else: self._account_ids_by_code[like_code].add(account.id) - def _parse_mo(self, mo): + def _parse_match_object(self, mo): """Split a match object corresponding to an accounting variable Returns field, mode, [account codes], [domain expression]. @@ -130,7 +130,7 @@ class AccountingExpressionProcessor(object): so when all expressions have been parsed, we know what to query. """ for mo in self.ACC_RE.finditer(expr): - _, mode, account_codes, domain = self._parse_mo(mo) + _, mode, account_codes, domain = self._parse_match_object(mo) key = (domain, mode) if account_codes: self._map_account_ids[key].update(account_codes) @@ -157,7 +157,7 @@ class AccountingExpressionProcessor(object): """ aml_domains = [] for mo in self.ACC_RE.finditer(expr): - field, mode, account_codes, domain = self._parse_mo(mo) + field, mode, account_codes, domain = self._parse_match_object(mo) if mode == MODE_INITIAL: continue aml_domain = list(domain) @@ -269,7 +269,7 @@ class AccountingExpressionProcessor(object): This method must be executed after do_queries(). """ def f(mo): - field, mode, account_codes, domain = self._parse_mo(mo) + field, mode, account_codes, domain = self._parse_match_object(mo) key = (domain, mode) account_ids_data = self._data[key] v = 0.0 diff --git a/mis_builder/report/mis_builder_xls.py b/mis_builder/report/mis_builder_xls.py index 82a71858..5ff29432 100644 --- a/mis_builder/report/mis_builder_xls.py +++ b/mis_builder/report/mis_builder_xls.py @@ -137,5 +137,3 @@ class mis_builder_xls(report_xls): mis_builder_xls('report.mis.report.instance.xls', 'mis.report.instance', parser=mis_builder_xls_parser) - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/mis_builder/static/src/css/custom.css b/mis_builder/static/src/css/custom.css index 333092d9..44be83a4 100644 --- a/mis_builder/static/src/css/custom.css +++ b/mis_builder/static/src/css/custom.css @@ -10,4 +10,4 @@ .openerp .mis_builder a:hover { /* underline links on hover to give a visual cue */ text-decoration: underline; -} \ No newline at end of file +} diff --git a/mis_builder/static/src/js/mis_builder.js b/mis_builder/static/src/js/mis_builder.js index fb0f773a..df369e06 100644 --- a/mis_builder/static/src/js/mis_builder.js +++ b/mis_builder/static/src/js/mis_builder.js @@ -45,4 +45,4 @@ openerp.mis_builder = function(instance) { }); instance.web.form.custom_widgets.add('mis_report', 'instance.mis_builder.MisReport'); -} \ No newline at end of file +} diff --git a/mis_builder/static/src/xml/mis_widget.xml b/mis_builder/static/src/xml/mis_widget.xml index b8a13176..bd0cd0cf 100644 --- a/mis_builder/static/src/xml/mis_widget.xml +++ b/mis_builder/static/src/xml/mis_widget.xml @@ -55,4 +55,4 @@ - \ No newline at end of file + diff --git a/mis_builder/tests/__init__.py b/mis_builder/tests/__init__.py index 17feb6ea..122d55b2 100644 --- a/mis_builder/tests/__init__.py +++ b/mis_builder/tests/__init__.py @@ -30,5 +30,3 @@ fast_suite = [ checks = [ test_mis_builder, ] - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/mis_builder/wizard/mis_builder_dashboard.py b/mis_builder/wizard/mis_builder_dashboard.py index 849e40f2..9daba92e 100644 --- a/mis_builder/wizard/mis_builder_dashboard.py +++ b/mis_builder/wizard/mis_builder_dashboard.py @@ -85,5 +85,3 @@ class add_mis_report_instance_dashboard(orm.TransientModel): 'arch': etree.tostring(new_arch, pretty_print=True)}) return {'type': 'ir.actions.act_window_close', } - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: