From c4a557f4d1e28284e1040fa9d8e0caee79fed965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Fri, 18 Jul 2014 16:44:17 +0200 Subject: [PATCH 001/184] [ADD] mis_builder: a module to build "Management Information System"-style reports Such reports combine accounting and operational data. This initial commit is a first proof-of-concept prototype. --- mis_builder/__init__.py | 24 ++ mis_builder/__openerp__.py | 53 +++ mis_builder/models/__init__.py | 24 ++ mis_builder/models/mis_builder.py | 466 ++++++++++++++++++++++ mis_builder/security/ir.model.access.csv | 1 + mis_builder/static/src/img/icon.png | Bin 0 -> 3464 bytes mis_builder/static/src/js/mis_builder.js | 26 ++ mis_builder/static/src/xml/mis_widget.xml | 18 + mis_builder/views/mis_builder.xml | 158 ++++++++ 9 files changed, 770 insertions(+) create mode 100644 mis_builder/__init__.py create mode 100644 mis_builder/__openerp__.py create mode 100644 mis_builder/models/__init__.py create mode 100644 mis_builder/models/mis_builder.py create mode 100644 mis_builder/security/ir.model.access.csv create mode 100644 mis_builder/static/src/img/icon.png create mode 100644 mis_builder/static/src/js/mis_builder.js create mode 100644 mis_builder/static/src/xml/mis_widget.xml create mode 100644 mis_builder/views/mis_builder.xml diff --git a/mis_builder/__init__.py b/mis_builder/__init__.py new file mode 100644 index 000000000000..db1c497e15a2 --- /dev/null +++ b/mis_builder/__init__.py @@ -0,0 +1,24 @@ +#============================================================================== +# = +# mis_builder module for OpenERP, Management Information System Builder +# Copyright (C) 2014 ACSONE SA/NV () +# = +# This file is a part of mis_builder +# = +# mis_builder is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License v3 or later +# as published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# = +# mis_builder is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License v3 or later for more details. +# = +# You should have received a copy of the GNU Affero General Public License +# v3 or later along with this program. +# If not, see . +# = +#============================================================================== + +import models diff --git a/mis_builder/__openerp__.py b/mis_builder/__openerp__.py new file mode 100644 index 000000000000..097d261cb9a3 --- /dev/null +++ b/mis_builder/__openerp__.py @@ -0,0 +1,53 @@ +#============================================================================== +# = +# mis_builder module for OpenERP, Management Information System Builder +# Copyright (C) 2014 ACSONE SA/NV () +# = +# This file is a part of mis_builder +# = +# mis_builder is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License v3 or later +# as published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# = +# mis_builder is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License v3 or later for more details. +# = +# You should have received a copy of the GNU Affero General Public License +# v3 or later along with this program. +# If not, see . +# = +#============================================================================== +{ + 'name': 'mis builder', + 'version': '0.1', + 'category': 'Reporting', + 'description': """ + Management Information System Builder + """, + 'author': 'ACSONE SA/NV', + 'website': 'http://acsone.eu', + 'depends': ['account'], + 'data': [ + 'views/mis_builder.xml', + ], + 'test': [ + ], + 'demo': [ + ], + 'js': [ + 'static/src/js/*.js' + ], + 'qweb': [ + 'static/src/xml/*.xml' + ], + 'css': [ + 'static/src/css/*.css' + ], + 'installable': True, + 'application': True, + 'auto_install': False, + 'license': 'AGPL-3', +} diff --git a/mis_builder/models/__init__.py b/mis_builder/models/__init__.py new file mode 100644 index 000000000000..4d7f1bd571b0 --- /dev/null +++ b/mis_builder/models/__init__.py @@ -0,0 +1,24 @@ +#============================================================================== +# = +# mis_builder module for OpenERP, Management Information System Builder +# Copyright (C) 2014 ACSONE SA/NV () +# = +# This file is a part of mis_builder +# = +# mis_builder is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License v3 or later +# as published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# = +# mis_builder is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License v3 or later for more details. +# = +# You should have received a copy of the GNU Affero General Public License +# v3 or later along with this program. +# If not, see . +# = +#============================================================================== + +import mis_builder diff --git a/mis_builder/models/mis_builder.py b/mis_builder/models/mis_builder.py new file mode 100644 index 000000000000..8d5a0f6ea698 --- /dev/null +++ b/mis_builder/models/mis_builder.py @@ -0,0 +1,466 @@ +# vim: set fileencoding=utf-8 : +#============================================================================== +# = +# mis_builder module for OpenERP, Management Information System Builder +# Copyright (C) 2014 ACSONE SA/NV () +# = +# This file is a part of mis_builder +# = +# mis_builder is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License v3 or later +# as published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# = +# mis_builder is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License v3 or later for more details. +# = +# You should have received a copy of the GNU Affero General Public License +# v3 or later along with this program. +# If not, see . +# = +#============================================================================== + +from datetime import datetime, timedelta +from dateutil import parser +import traceback +from lxml import etree + +from openerp.osv import orm, fields +from openerp.tools.safe_eval import safe_eval +from openerp.tools.translate import _ +from openerp import tools + + +class AutoStruct(object): + + def __init__(self, **kwargs): + for k, v in kwargs.items(): + setattr(self, k, v) + + +def _get_selection_label(selection, value): + for v, l in selection: + if v == value: + return l + return '' + + +class mis_report_kpi(orm.Model): + """ A KPI is an element of a MIS report. + + In addition to a name and description, it has an expression + to compute it based on queries defined in the MIS report. + It also has various informations defining how to render it + (numeric or percentage or a string, a suffix, divider) and + how to render comparison of two values of the KPI. + KPI are ordered inside the MIS report, as some KPI expressions + can depend on other KPI that need to be computed before. + """ + + _name = 'mis.report.kpi' + + _columns = { + 'name': fields.char(size=32, required=True, + string='Name'), + 'description': fields.char(required=True, + string='Description', + translate=True), + 'expression': fields.char(required=True, + string='Expression'), + 'type': fields.selection([('num', _('Numeric')), + ('pct', _('Percentage')), + ('str', _('String'))], + required=True, + string='Type'), + 'divider': fields.selection([('1e-6', _('µ')), + ('1e-3', _('m')), + ('1e3', _('k')), + ('1e6', _('M'))], + string='Factor'), + 'dp': fields.integer(string='Rounding'), + 'suffix': fields.char(size=16, string='Unit'), + 'compare_method': fields.selection([('diff', _('Difference')), + ('pct', _('Percentage')), + ('none', _('None'))], + required=True, + string='Comparison Method'), + 'sequence': fields.integer(string='Sequence'), + 'report_id': fields.many2one('mis.report', string='Report'), + } + + _defaults = { + 'type': 'num', + 'divider': '1', + 'dp': 0, + 'compare_method': 'pct', + } + + _order = 'sequence' + + # TODO: constraint to check name is a valid python identifier + # TODO: onchange type pct -> force comparison method = diff + # TODO: onchange type str -> divider, dp, suffix, compare_method read only + + def _render(self, kpi, value): + """ render a KPI value as a unicode string, ready for display """ + if kpi.type == 'num': + return self._render_num(value, + kpi.divider, kpi.dp, kpi.suffix) + elif kpi.type == 'pct': + return self._render_num(value, + 100, kpi.dp, '%') + else: + return unicode(value) + + def _render_comparison(self, kpi, value, base_value): + """ render the comparison of two KPI values, ready for display """ + if value is None or base_value is None: + return '' + if kpi.type == 'pct': + return self._render_num(value - base_value, + 0.01, kpi.dp, _('pp'), + sign='+') + elif kpi.type == 'num': + if kpi.compare_method == 'diff': + return self._render_num(value - base_value, + kpi.divider, kpi.dp, kpi.suffix, + sign='+') + elif kpi.compare_method == 'pct' and base_value != 0: + return self._render_num(value / base_value - base_value, + 0.01, kpi.dp, '%', + sign='+') + return '' + + def _render_num(self, value, divider, dp, suffix, sign='-'): + divider_label = _get_selection_label( + self._columns['divider'].selection, divider) + fmt = '{:%s,.%df}%s%s' % (sign, dp, divider_label, suffix or '') + value = round(value / float(divider or 1), dp) or 0 + return fmt.format(value) + + +class mis_report_query(orm.Model): + """ A query to fetch data for a MIS report. + + A query works on a model and has a domain and list of fields to fetch. + At runtime, the domain is expanded with a "and" on the date/datetime field. + """ + + _name = 'mis.report.query' + + _columns = { + 'name': fields.char(size=32, required=True, + string='Name'), + 'model_id': fields.many2one('ir.model', required=True, + string='Model'), + 'field_ids': fields.many2many('ir.model.fields', required=True, + string='Fields to fetch'), + 'date_field': fields.many2one('ir.model.fields', required=True, + string='Date field', + domain=[('ttype', 'in', ('date', 'datetime'))]), + 'domain': fields.char(string='Domain'), + 'report_id': fields.many2one('mis.report', string='Report'), + } + + _order = 'name' + + +class mis_report(orm.Model): + """ A MIS report template (without period information) + + The MIS report holds: + * an implicit query fetching allow the account balances; + for each account, the balance is stored in a variable named + bal_{code} where {code} is the account code + * a list of explicit queries; the result of each query is + stored in a variable with same name as a query, containing as list + of data structures populated with attributes for each fields to fetch + * a list of KPI to be evaluated based on the variables resulting + from the balance and queries + """ + + _name = 'mis.report' + + _columns = { + 'name': fields.char(size=32, required=True, + string='Name', translate=True), + 'description': fields.char(required=False, + string='Description', translate=True), + 'query_ids': fields.one2many('mis.report.query', 'report_id', + string='Queries'), + 'kpi_ids': fields.one2many('mis.report.kpi', 'report_id', + string='KPI\'s'), + } + + +class mis_report_instance_period(orm.Model): + """ A MIS report instance has the logic to compute + a report template for a give date period. + + Periods have a duration (day, week, fiscal period) and + are defined as an offset relative to a pivot date. + """ + + def _get_dates(self, cr, uid, ids, field_names, arg, context=None): + if isinstance(ids, (int, long)): + ids = [ids] + res = {} + for c in self.browse(cr, uid, ids, context=context): + d = parser.parse(c.report_instance_id.pivot_date) + if c.type == 'd': + date_from = d + timedelta(days=c.offset) + date_to = date_from + timedelta(days=c.duration - 1) + date_from = date_from.strftime(tools.DEFAULT_SERVER_DATE_FORMAT) + date_to = date_to.strftime(tools.DEFAULT_SERVER_DATE_FORMAT) + period_ids = None + elif c.type == 'w': + date_from = d - timedelta(d.weekday()) + date_from = date_from + timedelta(days=c.offset * 7) + date_to = date_from + timedelta(days=(7 * c.duration) - 1) + date_from = date_from.strftime(tools.DEFAULT_SERVER_DATE_FORMAT) + date_to = date_to.strftime(tools.DEFAULT_SERVER_DATE_FORMAT) + period_ids = None + elif c.type == 'fp': + # TODO: filter on company_id + # TODO: date! + period_obj = self.pool['account.period'] + all_period_ids = period_obj.search(cr, uid, + [('special', '=', False)], + order='date_start', + context=context) + current_period_ids = period_obj.search(cr, uid, + [('special', '=', False), + ('date_start', '<=', d), + ('date_stop', '>=', d)], + context=context) + if not current_period_ids: + raise orm.except_orm(_("Error!"), + _("No current fiscal period for %s") % d) + p = all_period_ids.index(current_period_ids[0]) + c.offset + if p < 0 or p >= len(all_period_ids): + raise orm.except_orm(_("Error!"), + _("No such fiscal period for %s " + "with offset %d") % (d, c.offset)) + period_ids = all_period_ids[p:p + c.duration] + periods = period_obj.browse(cr, uid, period_ids, + context=context) + date_from = periods[0].date_start + date_to = periods[-1].date_stop + else: + raise orm.except_orm(_("Error!"), + _("Unimplemented period type %s") % + (c.type,)) + res[c.id] = { + 'date_from': date_from, + 'date_to': date_to, + 'period_from': period_ids and period_ids[0], + 'period_to': period_ids and period_ids[-1], + } + return res + + _name = 'mis.report.instance.period' + + _columns = { + 'name': fields.char(size=32, required=True, + string='Name', translate=True), + 'type': fields.selection([('d', _('Day')), + ('w', _('Week')), + ('fp', _('Fiscal Period')), + # ('fy', _('Fiscal Year')) + ], + required=True, + string='Period type'), + 'offset': fields.integer(string='Offset', + help='Offset from current period'), + 'duration': fields.integer(string='Duration', + help='Number of periods'), + 'date_from': fields.function(_get_dates, + type='date', + multi="dates", + string="From"), + 'date_to': fields.function(_get_dates, + type='date', + multi="dates", + string="To"), + 'period_from': fields.function(_get_dates, + type='many2one', obj='account.period', + multi="dates", string="From period"), + 'period_to': fields.function(_get_dates, + type='many2one', obj='account.period', + multi="dates", string="To period"), + 'sequence': fields.integer(string='Sequence'), + 'report_instance_id': fields.many2one('mis.report.instance', + string='Report Instance'), + } + + _defaults = { + 'offset':-1, + 'duration': 1, + } + + _order = 'sequence' + + # TODO: constraint duration >= 1 + + def _fetch_balances(self, cr, uid, c, context=None): + """ fetch the general account balances for the given period + + returns a dictionary {bal_: account.balance} + """ + account_obj = self.pool['account.account'] + + search_ctx = dict(context) + if c.period_from: + search_ctx.update({'period_from': c.period_from, + 'period_to': c.period_to}) + else: + search_ctx.update({'date_from': c.date_from, + 'date_to': c.date_to}) + + # TODO: initial balance? + # TODO: draft or posted? + account_ids = account_obj.search(cr, uid, []) + account_datas = account_obj.read(cr, uid, account_ids, + ['code', 'balance'], + context=search_ctx) + balances = {} + + for account_data in account_datas: + # TODO: normalize code (strip special chars) + # TODO: company_id in key + key = 'bal_' + account_data['code'] + assert key not in balances + balances[key] = account_data['balance'] + + return balances + + def _fetch_queries(self, cr, uid, c, context): + res = {} + + report = c.report_instance_id.report_id + for query in report.query_ids: + obj = self.pool[query.model_id.model] + domain = query.domain and safe_eval(query.domain) or [] + if query.date_field.ttype == 'date': + domain.extend([(query.date_field.name, '>=', c.date_from), + (query.date_field.name, '<=', c.date_to)]) + else: + # TODO: datetime support (convert date to utc midnight) + # datetime_from = utc_midnight(date_from) + # datetime_to = utc_midnight(date_to + 1) + # domain.extend([(query.date_field.name, '>=', datetime_from), + # (query.date_field.name, '<', datetime_to)]) + raise orm.except_orm(_('Error!'), _('Not implemented')) + field_names = [field.name for field in query.field_ids] + obj_ids = obj.search(cr, uid, domain, + context=context) + obj_datas = obj.read(cr, uid, obj_ids, field_names, + context=context) + res[query.name] = [AutoStruct(**d) for d in obj_datas] + + return res + + def _compute(self, cr, uid, c, context=None): + if context is None: + context = {} + + kpi_obj = self.pool['mis.report.kpi'] + + res = {} + + localdict = { + 'registry': self.pool, + 'sum': sum, + 'min': min, + 'max': max, + 'len': len, + 'avg': lambda l: sum(l) / float(len(l)), + } + localdict.update(self._fetch_balances(cr, uid, c, context=context)) + localdict.update(self._fetch_queries(cr, uid, c, context=context)) + + for kpi in c.report_instance_id.report.kpi_ids: + try: + kpi_val = safe_eval(kpi.expression, localdict) + except ZeroDivisionError: + kpi_val = None + kpi_val_rendered = '#DIV/0' + kpi_val_comment = traceback.format_exc() + except: + kpi_val = None + kpi_val_rendered = '#ERR' + kpi_val_comment = traceback.format_exc() + else: + kpi_val_rendered = kpi_obj._render(kpi, kpi_val) + kpi_val_comment = None + + localdict[kpi.name] = kpi_val + + res[kpi.name] = { + 'val': kpi_val, + 'val_r': kpi_val_rendered, + 'val_c': kpi_val_comment, + } + + return res + + +class mis_report_instance(orm.Model): + """ The MIS report instance combines compute and + display a MIS report template for a set of periods """ + + # TODO: mechanism to add comparison columns + + def _get_pivot_date(self, cr, uid, ids, field_name, arg, context=None): + res = {} + for r in self.browse(cr, uid, ids, context=context): + if r.date: + res[r.id] = r.date + else: + res[r.id] = fields.date.context_today(self, cr, uid, + context=context) + return res + + _name = 'mis.report.instance' + + _columns = { + 'name': fields.char(size=32, required=True, + string='Name', translate=True), + 'description': fields.char(required=False, + string='Description', translate=True), + 'date': fields.date(string='Base date', + help='Report base date ' + '(leave empty to use current date)'), + 'pivot_date': fields.function(_get_pivot_date, + type='date', + string="Pivot date"), + 'report_id': fields.many2one('mis.report', + required=True, + string='Report'), + 'period_ids': fields.one2many('mis.report.instance.period', + 'report_instance_id', + required=True, + string='Periods'), + } + + def compute(self, cr, uid, _ids, context=None): + assert isinstance(_ids, (int, long)) + + r = self.browse(cr, uid, _ids, context=context) + + res = {} + + rows = [] + for kpi in r.report_id.kpi_ids: + rows.append(dict(name=kpi.name, + description=kpi.description)) + res['rows'] = rows + + cols = [] + for period in r.period_ids: + col = dict(name=period.name) + res['cols'] = cols + + return res diff --git a/mis_builder/security/ir.model.access.csv b/mis_builder/security/ir.model.access.csv new file mode 100644 index 000000000000..8d4ee8635f52 --- /dev/null +++ b/mis_builder/security/ir.model.access.csv @@ -0,0 +1 @@ +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" diff --git a/mis_builder/static/src/img/icon.png b/mis_builder/static/src/img/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..833ce9211046568a692f342c1d62fb10e134d4df GIT binary patch literal 3464 zcmV;34R`X1P)uTd^nTfM4c zi!FU>b6k{{s#*t!0Y)AT0#LPOprmP+fYbAb*9e zbxgQGiP^S(fbDuE@N!QNK-@P zh^?p%ssgrT&K1O#|4~~udbSMw1Yme;5byTVl#py*as<^ouw8a_S6@Z)-g>Hk&_{Aj zeWNOe)t0Np7Rb&u;R01`8^m^@N*@#4A9$_j)!5C;5L@uS-gEW}813@GgizTWCw;*8 z5Gs3A1+f8JL0w5~eP3+`RK<-gmt*s1s5;6JROwcm&v~~G3=Ox{;%)CQK>>A#R9TDd z`o!1OR|k;1xBd}qc}!JNTfmkfY<(By6cet6qFicE=oe5Iq6!nBw!9s9z2{4@zi5Oy z2o&*zdD9D@v3zB7oY7AITehv&7ier3$m4EfC|*4N7kyn}FHi&82n?p$YOnXS_rEi| zIf!@1z**r!a_tgJAtV4QFMziA51%|$j5q$3Ww$H5091lpA79n*q5qBU%i=2=N(#A2 zRM`|K-Q_zD8R3C{b3Ygp_d~H(cPJL03Wy`S7G>hSb?61p=D{H7M(36SZx3&-z0SL1 zfK+R3NrDTUPOhzAp^_0^l~4JeKlu&+5Bp9fzA+gLW4A2>!2fdZi-A{q-2%s)QI^M6 zHth4i*+YC)V`(8U+U29NDZyx$?~uY;QLt@!uBth{1|YpZfO|u1dcbTCf+|&81{vNO z{Jfy=tL;)zL??8Sch^8H_1#)LyZUDg0kK^tv30T9G7r@6J9H|MShE!0vnQvWJN`Ef z_+QP$du(+>FUm!tf}%BnH+zO=^?ue0vV?e;i#gZihF(hn(QribF$>v^==y^wIztBeeh?X&kGxql{uMw_L;xPn zf};C@_*o}5o<}o)=WQRjM;&W`m;kAbwI$$yZUd;Okh7XMx9thfh=K_7V=Egyfj7IS zSHNheKdW~`$)HZ<`a~qFm~*An=8T}CJR<_CG^RE#uJ`QjpT+v1gK`AG^JL#S%`M1# znu|C6^voDAKljwFD5%IU0McFl^GcsRJF*9=d`RY)~KKye4_jy=m^5KOlqJ}rsX01BmT)L!$$LtF=zm!;eAga{}jt(?&p%&oX*`KxQpmX$|$GXoV z1kSGb0%1(D4~bM=C@vfG`CeCX^Pw`OvH^MitH9)Rkdk`L~e=9~hu z+nvC{%zBk{r|)a$>jmn7in^rL0j1NP-Jkqw_>skP5Cbw<-}l7vRY9J1q&TUhN5Q$X6Ww2F2($EtLvZ(rs5c&aP;(c^5tH>AC*=RkF z^?x70ySsnxDZrg6g>g3}HUWtY6!7540sp=3<~Zs7e$xAA?+m9Nt--TxAnOJHm)n$u zF9HmIw{|W-K=GEC5={ZOWYgcTL4D(1rQtD-=5qX7};4v)uur_TLwA3 zqo(5YxO9u^QYZG?ydC|=hFgPpJNlV(AehI11nDjx?)8Z{$i)R|SzG#vK=;Vrz*SX$ zA3H;MfT~Rymru3Vd}rL2aS>gbDT8^;yJKL-@a9^)9Rti2nzkwGZb~rP<)^YK-hKL@ zZ=r4TzX}aNgP`w@MExV8au{3wU2Xln+Ohy!E)ivgs(xAQY#J&6U-h>4|9H5qcIGDJ zTv9-`2Qb>{XTi7Pr-8<5_-S_N_+=zY1YUGl*09GOX-#|2GObDXEz`o9hJPww@$t+_eCa3rGnCZ9X%nO~5}ex_ zh_7xaSWA>>#4Nssg6p}$HyVwi6ZV55ax1U|v|o`!M%XxPnO62y0Y=!!@JFn5Dy$L3 zr=rJ2*&J#K_eD)B$7e-MpNK?M_0u39Av|k@jiXW1A`~_l?etT*KGTLv@AY@+nB1V_ zqKxrV&!(X^fK*!$Py2wQgu1(R!u2onhvavs7x09P$rp4?5;`Ua1F!ZxA6wOkh|SZh z{sB;oaF}SsT&*H4sMZ0;5os~PM$9rTjIfbcfE6)c6Oj|DdIaQS5p7hJJ)jjvOZbZH z1CH?HD*8iF*^MxysyB$pvnXw$7Gp<-$E-&_<6y{4Gp`4><6164No!^w$}f_`IaYY^|&p-&WTm-*6JFvJ2R^SwfH zU8YEi-MlQ@Uu_lPn+3tW!)P&9O_j$8hgC(pq7m~EfO*+?v?5jz^m!3hsA7w-K$VYG z=oZ!YGn44uBJudaf>Z|55#$^nIYjF#}*S;Pkjg$-2o zgotGQ>;ptT5By`+bMlHZ35CPX(a5=bC~Uk3ya%j_n&y2dsr>FE1EXF3&r~+We_dQE z`J6ZwFRAa7`xHcfqaqk#W5sOSzsrfqTF}1yz9_k|MC2~ut;~94w`k_uzd|7`(;^fO z=i)mW$tWkwll=>Y!%vBb9gUb?#{nK!Wv>H>r1u3#wbzi^8q8X257-@No7WgE;c-#@ z*fOmv9YCBhHz67^@3u@UcBY2RhoTYd_k{pvnO1u=V)ho%=CxMD)B+Sf7B$U3oji}V zIO_1|lbLIyUB39p0srnZlA!H1dxqO;KZN`{gk*EwD~YE1mBnO;t!lU_zOv!P{I+g2 zTBfO1#Hue6qRFUfF3*5q#3a-bK5RwIi!9Srlz&C!G^*Eu{4~^J)L9V|&Bu0|Wm z@6SL^is&t>nh=o%1>48NiX4wdta&Q>b3tl>t5xMs06rT3EbuETn-cz!1O9(b@AWHV zt|RuiAY3WbgCXvA8sq9?70bprG_!sVj! zMMYPI!r|XWO)HZD7N&;Lh`HQ~n4c-OeeE&LNp56C%qy&jbwkv&0)@O$(=7C&g;vD8 zG8!>2n>yZTXa0rjNSjB}-w#}u+Fg^|I!C@2B-NJhD-PaONAkh?Y5IQ`6JJ$7O + +

Yo!

+ + + + + + + +
+ + +
+ +
+ + \ No newline at end of file diff --git a/mis_builder/views/mis_builder.xml b/mis_builder/views/mis_builder.xml new file mode 100644 index 000000000000..6299c6d21623 --- /dev/null +++ b/mis_builder/views/mis_builder.xml @@ -0,0 +1,158 @@ + + + + + + mis.report.view.tree + mis.report + + + + + + + + + + mis.report.view.form + mis.report + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + mis.report.view.action + + mis.report + form + tree,form + + + + + + mis.report.instance.result.view.form + mis.report.instance + + +
+ +
+

+ +

+
+ + + + + + +
+ + + + + mis.report.instance.result.view.action + + mis.report.instance + form + form + new + + + + mis.report.instance.view.tree + mis.report.instance + + + + + + + + + + + mis.report.instance.view.form + mis.report.instance + + +
+ +
+
+
+

+ +

+
+
+
+ + + + + + + + + + + + + + + + + + + +
+ + + + + mis.report.instance.view.action + + mis.report.instance + form + tree,form + + + + + + From 9e64b91a081e4a6686e80476cbd3a43830550e2f Mon Sep 17 00:00:00 2001 From: Laetitia Gangloff Date: Fri, 18 Jul 2014 18:52:38 +0200 Subject: [PATCH 002/184] Add the possibility to set the result of report instance in a dashboard --- mis_builder/__init__.py | 1 + mis_builder/__openerp__.py | 1 + mis_builder/models/mis_builder.py | 2 +- mis_builder/static/src/js/mis_builder.js | 38 +++++----- mis_builder/static/src/xml/mis_widget.xml | 2 +- mis_builder/views/mis_builder.xml | 3 +- mis_builder/wizard/__init__.py | 24 ++++++ mis_builder/wizard/__init__.pyc | Bin 0 -> 233 bytes mis_builder/wizard/mis_builder_dashboard.py | 76 +++++++++++++++++++ mis_builder/wizard/mis_builder_dashboard.xml | 33 ++++++++ 10 files changed, 158 insertions(+), 22 deletions(-) create mode 100644 mis_builder/wizard/__init__.py create mode 100644 mis_builder/wizard/__init__.pyc create mode 100644 mis_builder/wizard/mis_builder_dashboard.py create mode 100644 mis_builder/wizard/mis_builder_dashboard.xml diff --git a/mis_builder/__init__.py b/mis_builder/__init__.py index db1c497e15a2..9a73ea2a8b76 100644 --- a/mis_builder/__init__.py +++ b/mis_builder/__init__.py @@ -22,3 +22,4 @@ #============================================================================== import models +from . import wizard diff --git a/mis_builder/__openerp__.py b/mis_builder/__openerp__.py index 097d261cb9a3..c119bf12513e 100644 --- a/mis_builder/__openerp__.py +++ b/mis_builder/__openerp__.py @@ -31,6 +31,7 @@ 'website': 'http://acsone.eu', 'depends': ['account'], 'data': [ + 'wizard/mis_builder_dashboard.xml', 'views/mis_builder.xml', ], 'test': [ diff --git a/mis_builder/models/mis_builder.py b/mis_builder/models/mis_builder.py index 8d5a0f6ea698..ee7eed07caeb 100644 --- a/mis_builder/models/mis_builder.py +++ b/mis_builder/models/mis_builder.py @@ -460,7 +460,7 @@ def compute(self, cr, uid, _ids, context=None): cols = [] for period in r.period_ids: - col = dict(name=period.name) + cols.append(dict(name=period.name, description=period.name)) res['cols'] = cols return res diff --git a/mis_builder/static/src/js/mis_builder.js b/mis_builder/static/src/js/mis_builder.js index 570098b65aff..f6709bf9e7ba 100644 --- a/mis_builder/static/src/js/mis_builder.js +++ b/mis_builder/static/src/js/mis_builder.js @@ -1,26 +1,26 @@ openerp.mis_builder = function(instance) { - - instance.mis_builder.MisReport = instance.web.form.FormWidget.extend({ - template: "mis_builder.MisReport", - - init: function() { + + instance.mis_builder.MisReport = instance.web.form.FormWidget.extend({ + template: "mis_builder.MisReport", + + init: function() { this._super.apply(this, arguments); this.mis_report_data = null; - }, - - start: function() { + }, + + start: function() { this._super.apply(this, arguments); - var self = this; + var self = this; new instance.web.Model("mis.report.instance").call( - "compute", - [self.getParent().dataset.context.active_id], - {'context': new instance.web.CompoundContext()} - ).then(function(result){ - self.mis_report_data = result; - self.renderElement(); + "compute", + [self.getParent().dataset.context.active_id], + {'context': new instance.web.CompoundContext()} + ).then(function(result){ + self.mis_report_data = result; + self.renderElement(); }); - }, - }); - - instance.web.form.custom_widgets.add('mis_report', 'instance.mis_builder.MisReport'); + }, + }); + + 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 796a7ad503ac..df19ef1b00d3 100644 --- a/mis_builder/static/src/xml/mis_widget.xml +++ b/mis_builder/static/src/xml/mis_widget.xml @@ -4,7 +4,7 @@ - diff --git a/mis_builder/views/mis_builder.xml b/mis_builder/views/mis_builder.xml index 6299c6d21623..64978a50a78f 100644 --- a/mis_builder/views/mis_builder.xml +++ b/mis_builder/views/mis_builder.xml @@ -119,7 +119,8 @@
-
diff --git a/mis_builder/wizard/__init__.py b/mis_builder/wizard/__init__.py new file mode 100644 index 000000000000..0e48b0b67452 --- /dev/null +++ b/mis_builder/wizard/__init__.py @@ -0,0 +1,24 @@ +#============================================================================== +# = +# mis_builder module for OpenERP, Management Information System Builder +# Copyright (C) 2014 ACSONE SA/NV () +# = +# This file is a part of mis_builder +# = +# mis_builder is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License v3 or later +# as published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# = +# mis_builder is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License v3 or later for more details. +# = +# You should have received a copy of the GNU Affero General Public License +# v3 or later along with this program. +# If not, see . +# = +#============================================================================== + +from . import mis_builder_dashboard diff --git a/mis_builder/wizard/__init__.pyc b/mis_builder/wizard/__init__.pyc new file mode 100644 index 0000000000000000000000000000000000000000..ada309ee575c514e83003a5b5cc37c3132ebc17d GIT binary patch literal 233 zcmY+7Q3}E^3_#QEM+E;A1TRp8*$aqx0zaHz{*<~DSLxQ$c8cE6^LPPM*oTJXB_WVk zerD74>RmT5MnQc~73Tz`WMBb024@Bg3#fTX2g3+FBP|G>iSjZSi#kYDvAsAI@WAu0 zL) +# = +# This file is a part of mis_builder +# = +# mis_builder is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License v3 or later +# as published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# = +# mis_builder is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License v3 or later for more details. +# = +# You should have received a copy of the GNU Affero General Public License +# v3 or later along with this program. +# If not, see . +# = +#============================================================================== + +from openerp.osv import orm, fields +from lxml import etree + + +class add_mis_report_instance_dashboard(orm.TransientModel): + _name = "add.mis.report.instance.dashboard.wizard" + + _columns = {'name': fields.char('Name', size=32, required=True), + 'dashboard_id': fields.many2one('ir.actions.act_window', string="Dashboard", required=True, + domain="[('res_model', '=', 'board.board')]"), + } + + def default_get(self, cr, uid, fields, context=None): + if context is None: + context = {} + if context.get('active_id'): + res = super(add_mis_report_instance_dashboard, self).default_get(cr, uid, fields, context=context) + # get report instance name + res['name'] = self.pool['mis.report.instance'].read(cr, uid, context['active_id'], ['name'])['name'] + return res + + def action_add_to_dashboard(self, cr, uid, ids, context=None): + if context is None: + context = {} + assert 'active_id' in context, "active_id missing in context" + wizard_data = self.browse(cr, uid, ids, context=context)[0] + # create the act_window corresponding to this report + view_id = self.pool['ir.model.data'].get_object_reference(cr, uid, 'mis_builder', 'mis_report_instance_result_view_form')[1] + report_result = self.pool['ir.actions.act_window'].create(cr, uid, {'name': 'mis.report.instance.result.view.action.%d' % context['active_id'], + 'res_model': 'mis.report.instance', + 'res_id': context['active_id'], + 'target': 'current', + 'view_mode': 'form', + 'view_id': view_id}) + # add this result in the selected dashboard + last_customization = self.pool['ir.ui.view.custom'].search(cr, uid, [('user_id', '=', uid), + ('ref_id', '=', wizard_data.dashboard_id.view_id.id)], limit=1) + arch = wizard_data.dashboard_id.view_id.arch + if last_customization: + arch = self.pool['ir.ui.view.custom'].read(cr, uid, last_customization[0], ['arch'])['arch'] + new_arch = etree.fromstring(arch) + column = new_arch.xpath("//column")[0] + column.append(etree.Element('action', {'context': str(context), + 'name': str(report_result), + 'string': wizard_data.name, + 'view_mode': 'form'})) + self.pool['ir.ui.view.custom'].create(cr, uid, {'user_id': uid, + 'ref_id': wizard_data.dashboard_id.view_id.id, + 'arch': etree.tostring(new_arch, pretty_print=True)}) + + return {'type': 'ir.actions.act_window_close', } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/mis_builder/wizard/mis_builder_dashboard.xml b/mis_builder/wizard/mis_builder_dashboard.xml new file mode 100644 index 000000000000..998026373505 --- /dev/null +++ b/mis_builder/wizard/mis_builder_dashboard.xml @@ -0,0 +1,33 @@ + + + + + + add.mis.report.instance.dashboard.wizard.view + add.mis.report.instance.dashboard.wizard + +
+ + + + +
+
+ + + + + + Add to dashboard + add.mis.report.instance.dashboard.wizard + form + form + + new + + + + \ No newline at end of file From 9befa379eabebfe30c88eef6cfe596f153eb618c Mon Sep 17 00:00:00 2001 From: Laetitia Gangloff Date: Mon, 21 Jul 2014 17:40:36 +0200 Subject: [PATCH 003/184] Add demo data. Set computed result. In instance add target_move (all or posted). Add onchange and check function on report --- mis_builder/__openerp__.py | 6 +- mis_builder/models/mis_builder.py | 97 +++++++++++++++---- mis_builder/static/src/xml/mis_widget.xml | 19 +++- mis_builder/tests/mis.report.csv | 2 + mis_builder/tests/mis.report.instance.csv | 2 + .../tests/mis.report.instance.period.csv | 7 ++ mis_builder/tests/mis.report.kpi.csv | 7 ++ mis_builder/tests/mis.report.query.csv | 2 + mis_builder/views/mis_builder.xml | 14 +-- 9 files changed, 126 insertions(+), 30 deletions(-) create mode 100644 mis_builder/tests/mis.report.csv create mode 100644 mis_builder/tests/mis.report.instance.csv create mode 100644 mis_builder/tests/mis.report.instance.period.csv create mode 100644 mis_builder/tests/mis.report.kpi.csv create mode 100644 mis_builder/tests/mis.report.query.csv diff --git a/mis_builder/__openerp__.py b/mis_builder/__openerp__.py index c119bf12513e..7de33a4063a0 100644 --- a/mis_builder/__openerp__.py +++ b/mis_builder/__openerp__.py @@ -36,7 +36,11 @@ ], 'test': [ ], - 'demo': [ + 'demo': ['tests/mis.report.kpi.csv', + 'tests/mis.report.query.csv', + 'tests/mis.report.csv', + 'tests/mis.report.instance.period.csv', + 'tests/mis.report.instance.csv', ], 'js': [ 'static/src/js/*.js' diff --git a/mis_builder/models/mis_builder.py b/mis_builder/models/mis_builder.py index ee7eed07caeb..3b06fa9aac32 100644 --- a/mis_builder/models/mis_builder.py +++ b/mis_builder/models/mis_builder.py @@ -26,6 +26,7 @@ from dateutil import parser import traceback from lxml import etree +import re from openerp.osv import orm, fields from openerp.tools.safe_eval import safe_eval @@ -76,11 +77,12 @@ class mis_report_kpi(orm.Model): string='Type'), 'divider': fields.selection([('1e-6', _('µ')), ('1e-3', _('m')), + ('1', _('1')), ('1e3', _('k')), ('1e6', _('M'))], string='Factor'), 'dp': fields.integer(string='Rounding'), - 'suffix': fields.char(size=16, string='Unit'), + 'suffix': fields.char(size=16, string='Suffix'), 'compare_method': fields.selection([('diff', _('Difference')), ('pct', _('Percentage')), ('none', _('None'))], @@ -99,9 +101,40 @@ class mis_report_kpi(orm.Model): _order = 'sequence' - # TODO: constraint to check name is a valid python identifier - # TODO: onchange type pct -> force comparison method = diff - # TODO: onchange type str -> divider, dp, suffix, compare_method read only + def _check_name(self, cr, uid, ids, context=None): + for record_name in self.read(cr, uid, ids, ['name']): + if not re.match("[_A-Za-z][_a-zA-Z0-9]*$", record_name['name']): + return False + return True + + _constraints = [ + (_check_name, 'The name must be a valid python identifier', ['name']), + ] + + def onchange_name(self, cr, uid, ids, name, context=None): + # check it is a valid python identifier + res = {} + if name and not re.match("[_A-Za-z][_a-zA-Z0-9]*$", name): + res['warning'] = {'title': 'Invalid name', 'message': 'The name must be a valid python identifier'} + return res + + def onchange_description(self, cr, uid, ids, description, context=None): + # construct name from description + clean = lambda varStr: re.sub('\W|^(?=\d)', '_', varStr) + res = {} + if description: + res = {'value': {'name': clean(description)}} + return res + + def onchange_type(self, cr, uid, ids, kpi_type, context=None): + res = {} + if kpi_type == 'pct': + res['value'] = {'compare_method': 'diff'} + elif kpi_type == 'str': + res['value'] = {'compare_method': 'none', + 'divider': '', + 'dp': 0} + return res def _render(self, kpi, value): """ render a KPI value as a unicode string, ready for display """ @@ -207,6 +240,11 @@ def _get_dates(self, cr, uid, ids, field_names, arg, context=None): if isinstance(ids, (int, long)): ids = [ids] res = {} + company_id = context.get('force_company') + if not company_id: + user = self.pool.get('res.users').read(cr, uid, uid, ['company_id'], context=context) + if user['company_id']: + company_id = user['company_id'][0] for c in self.browse(cr, uid, ids, context=context): d = parser.parse(c.report_instance_id.pivot_date) if c.type == 'd': @@ -223,17 +261,17 @@ def _get_dates(self, cr, uid, ids, field_names, arg, context=None): date_to = date_to.strftime(tools.DEFAULT_SERVER_DATE_FORMAT) period_ids = None elif c.type == 'fp': - # TODO: filter on company_id # TODO: date! period_obj = self.pool['account.period'] all_period_ids = period_obj.search(cr, uid, - [('special', '=', False)], + [('special', '=', False), ('company_id', '=', company_id)], order='date_start', context=context) current_period_ids = period_obj.search(cr, uid, [('special', '=', False), ('date_start', '<=', d), - ('date_stop', '>=', d)], + ('date_stop', '>=', d), + ('company_id', '=', company_id)], context=context) if not current_period_ids: raise orm.except_orm(_("Error!"), @@ -264,7 +302,7 @@ def _get_dates(self, cr, uid, ids, field_names, arg, context=None): _columns = { 'name': fields.char(size=32, required=True, - string='Name', translate=True), + string='Description', translate=True), 'type': fields.selection([('d', _('Day')), ('w', _('Week')), ('fp', _('Fiscal Period')), @@ -296,19 +334,23 @@ def _get_dates(self, cr, uid, ids, field_names, arg, context=None): } _defaults = { - 'offset':-1, + 'offset': -1, 'duration': 1, } _order = 'sequence' - # TODO: constraint duration >= 1 + _sql_constraints = [ + ('duration', 'CHECK (duration>0)', 'Wrong duration, it must be positive!') + ] def _fetch_balances(self, cr, uid, c, context=None): """ fetch the general account balances for the given period returns a dictionary {bal_: account.balance} """ + if context is None: + context = {} account_obj = self.pool['account.account'] search_ctx = dict(context) @@ -320,8 +362,12 @@ def _fetch_balances(self, cr, uid, c, context=None): 'date_to': c.date_to}) # TODO: initial balance? - # TODO: draft or posted? - account_ids = account_obj.search(cr, uid, []) + company_id = context.get('force_company') + if not company_id: + user = self.pool.get('res.users').read(cr, uid, uid, ['company_id'], context=context) + if user['company_id']: + company_id = user['company_id'][0] + account_ids = account_obj.search(cr, uid, [('company_id', '=', company_id)], context=context) account_datas = account_obj.read(cr, uid, account_ids, ['code', 'balance'], context=search_ctx) @@ -340,6 +386,11 @@ def _fetch_queries(self, cr, uid, c, context): res = {} report = c.report_instance_id.report_id + company_id = context.get('force_company') + if not company_id: + user = self.pool.get('res.users').read(cr, uid, uid, ['company_id'], context=context) + if user['company_id']: + company_id = user['company_id'][0] for query in report.query_ids: obj = self.pool[query.model_id.model] domain = query.domain and safe_eval(query.domain) or [] @@ -353,11 +404,10 @@ def _fetch_queries(self, cr, uid, c, context): # domain.extend([(query.date_field.name, '>=', datetime_from), # (query.date_field.name, '<', datetime_to)]) raise orm.except_orm(_('Error!'), _('Not implemented')) + domain.extend([('company_id', '=', company_id)]) field_names = [field.name for field in query.field_ids] - obj_ids = obj.search(cr, uid, domain, - context=context) - obj_datas = obj.read(cr, uid, obj_ids, field_names, - context=context) + obj_ids = obj.search(cr, uid, domain, context=context) + obj_datas = obj.read(cr, uid, obj_ids, field_names, context=context) res[query.name] = [AutoStruct(**d) for d in obj_datas] return res @@ -381,7 +431,7 @@ def _compute(self, cr, uid, c, context=None): localdict.update(self._fetch_balances(cr, uid, c, context=context)) localdict.update(self._fetch_queries(cr, uid, c, context=context)) - for kpi in c.report_instance_id.report.kpi_ids: + for kpi in c.report_instance_id.report_id.kpi_ids: try: kpi_val = safe_eval(kpi.expression, localdict) except ZeroDivisionError: @@ -443,12 +493,20 @@ def _get_pivot_date(self, cr, uid, ids, field_name, arg, context=None): 'report_instance_id', required=True, string='Periods'), + #'comparison_column': fields.many2many('mis.report.instance') + 'target_move': fields.selection([('posted', 'All Posted Entries'), + ('all', 'All Entries'), + ], 'Target Moves', required=True), + } + + _defaults = { + 'target_move': 'posted', } def compute(self, cr, uid, _ids, context=None): assert isinstance(_ids, (int, long)) - r = self.browse(cr, uid, _ids, context=context) + context['state'] = r.target_move res = {} @@ -459,8 +517,9 @@ def compute(self, cr, uid, _ids, context=None): res['rows'] = rows cols = [] + report_instance_period_obj = self.pool.get('mis.report.instance.period') for period in r.period_ids: - cols.append(dict(name=period.name, description=period.name)) + cols.append(dict(name=period.name, values=report_instance_period_obj._compute(cr, uid, period, context=context))) res['cols'] = cols return res diff --git a/mis_builder/static/src/xml/mis_widget.xml b/mis_builder/static/src/xml/mis_widget.xml index df19ef1b00d3..523e68056f85 100644 --- a/mis_builder/static/src/xml/mis_widget.xml +++ b/mis_builder/static/src/xml/mis_widget.xml @@ -1,17 +1,28 @@ diff --git a/mis_builder/tests/__init__.py b/mis_builder/tests/__init__.py index 17feb6eaff20..122d55b2aa26 100644 --- a/mis_builder/tests/__init__.py +++ b/mis_builder/tests/__init__.py @@ -30,5 +30,3 @@ 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 849e40f22ac5..9daba92e9b0f 100644 --- a/mis_builder/wizard/mis_builder_dashboard.py +++ b/mis_builder/wizard/mis_builder_dashboard.py @@ -85,5 +85,3 @@ def action_add_to_dashboard(self, cr, uid, ids, context=None): 'arch': etree.tostring(new_arch, pretty_print=True)}) return {'type': 'ir.actions.act_window_close', } - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 4101adb12506cb5d9feec28c70b3c9c27b1d32ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Tue, 28 Apr 2015 00:09:28 +0200 Subject: [PATCH 092/184] [IMP] mis_builder: rework periods computation * readability of algorithm * attempt to be correct in presence of multiple companies * attempt to be correct with initial balance computation * handle corner cases for initial balance --- mis_builder/models/aep.py | 135 +++++++++++++++++++++--------- mis_builder/models/mis_builder.py | 4 +- 2 files changed, 96 insertions(+), 43 deletions(-) diff --git a/mis_builder/models/aep.py b/mis_builder/models/aep.py index b09ab729bbb7..bc2f4021a854 100644 --- a/mis_builder/models/aep.py +++ b/mis_builder/models/aep.py @@ -178,48 +178,101 @@ def get_aml_domain_for_dates(self, date_start, date_end, mode): raise RuntimeError("") # TODO return [('date', '>=', date_start), ('date', '<=', date_end)] - def get_aml_domain_for_periods(self, period_start, period_end, mode): - period_obj = self.env['account.period'] - move_obj = self.env['account.move'] - domain_list = [] - if mode == MODE_VARIATION: - compute_period_ids = period_obj.build_ctx_periods( - period_start.id, - period_end.id) - domain_list.extend([('period_id', 'in', compute_period_ids)]) - else: - period_to = period_end - if mode == MODE_INITIAL: - # Processing to get the first period which isn't special - # before end period - move = move_obj\ - .search([('period_id.special', '=', False), - ('period_id.date_start', '<', - period_to.date_start)], - order="period_id desc", limit=1) - if move.id: - computed_period_to = move.period_id - else: - computed_period_to = period_obj.search( - [('company_id', '=', period_start.company_id.id)], - order='date_start desc', limit=1) - # Change start period to search correctly period from - period_to = computed_period_to - move = move_obj.search( - [('period_id.special', '=', True), - ('period_id.date_start', '<=', - period_to.date_start)], - order="period_id desc", limit=1) - if move.id: - computed_period_from = move.period_id + def _period_has_moves(self, period): + move_model = self.env['account.move'] + return bool(move_model.search([('period_id', '=', period.id)], + limit=1)) + + def _get_previous_opening_period(self, period, company_id): + period_model = self.env['account.period'] + periods = period_model.search( + [('date_start', '<=', period.date_start), + ('special', '=', True), + ('company_id', '=', company_id)], + order="date_start desc", + limit=1) + return periods and periods[0] + + def _get_previous_normal_period(self, period, company_id): + period_model = self.env['account.period'] + periods = period_model.search( + [('date_start', '<', period.date_start), + ('special', '=', False), + ('company_id', '=', company_id)], + order="date_start desc", + limit=1) + return periods and periods[0] + + def _get_first_normal_period(self, company_id): + period_model = self.env['account.period'] + periods = period_model.search( + [('special', '=', False), + ('company_id', '=', company_id)], + order="date_start asc", + limit=1) + return periods and periods[0] + + def _get_period_ids_between(self, period_from, period_to, company_id): + period_model = self.env['account.period'] + periods = period_model.search( + [('date_start', '>=', period_from.date_start), + ('date_stop', '<=', period_to.date_stop), + ('special', '=', False), + ('company_id', '=', company_id)]) + period_ids = [p.id for p in periods] + if period_from.special: + period_ids.append(period_from.id) + return period_ids + + def _get_period_company_ids(self, period_from, period_to): + period_model = self.env['account.period'] + periods = period_model.search( + [('date_start', '>=', period_from.date_start), + ('date_stop', '<=', period_to.date_stop), + ('special', '=', False)]) + return set([p.company_id.id for p in periods]) + + def _get_period_ids_for_mode(self, period_from, period_to, mode): + assert not period_from.special + assert not period_to.special + assert period_from.company_id == period_to.company_id + assert period_from.date_start <= period_to.date_start + period_ids = [] + for company_id in self._get_period_company_ids(period_from, period_to): + if mode == MODE_VARIATION: + period_ids.extend(self._get_period_ids_between( + period_from, period_to, company_id)) else: - computed_period_from = period_obj.search( - [('company_id', '=', period_start.company_id.id)], - order='date_start', limit=1) - compute_period_ids = period_obj.build_ctx_periods( - computed_period_from.id, period_to.id) - domain_list.extend([('period_id', 'in', compute_period_ids)]) - return domain_list + if mode == MODE_INITIAL: + period_to = self._get_previous_normal_period( + period_from, company_id) + # look for opening period with moves + opening_period = self._get_previous_opening_period( + period_from, company_id) + if opening_period and \ + self._period_has_moves(opening_period[0]): + # found opening period with moves + if opening_period.date_start == period_from.date_start and \ + mode == MODE_INITIAL: + # if the opening period has the same start date as + # period_from, the we'll find the initial balance + # in the initial period and that's it + period_ids.append(opening_period[0].id) + continue + period_from = opening_period[0] + else: + # no opening period with moves, + # use very first normal period + period_from = self._get_first_normal_period(company_id) + if period_to: + period_ids.extend(self._get_period_ids_between( + period_from, period_to, company_id)) + return period_ids + + def get_aml_domain_for_periods(self, period_from, period_to, mode): + period_ids = self._get_period_ids_for_mode( + period_from, period_to, mode) + return [('period_id', 'in', period_ids)] def do_queries(self, period_domain, period_domain_i, period_domain_e): aml_model = self.env['account.move.line'] diff --git a/mis_builder/models/mis_builder.py b/mis_builder/models/mis_builder.py index 37586042a12e..73932f1577df 100644 --- a/mis_builder/models/mis_builder.py +++ b/mis_builder/models/mis_builder.py @@ -412,8 +412,8 @@ def _get_dates(self, cr, uid, ids, field_names, arg, context=None): res[c.id] = { 'date_from': date_from, 'date_to': date_to, - 'period_from': period_ids and period_ids[0], - 'period_to': period_ids and period_ids[-1], + 'period_from': period_ids and period_ids[0] or False, + 'period_to': period_ids and period_ids[-1] or False, } return res From 38d34b95b18df95060b1fe1bc6dd3a7d5c75be1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Tue, 28 Apr 2015 12:57:31 +0200 Subject: [PATCH 093/184] [IMP] mis_builder: be more precise wrt the root account used This solve issues with empty account selectors in presence of multiple companies. --- mis_builder/models/aep.py | 62 +++++++++++++------------------ mis_builder/models/mis_builder.py | 33 +++++++++++----- mis_builder/views/mis_builder.xml | 1 + 3 files changed, 49 insertions(+), 47 deletions(-) diff --git a/mis_builder/models/aep.py b/mis_builder/models/aep.py index bc2f4021a854..500174ec4b95 100644 --- a/mis_builder/models/aep.py +++ b/mis_builder/models/aep.py @@ -62,10 +62,9 @@ def __init__(self, env): # before done_parsing: {(domain, mode): set(account_codes)} # after done_parsing: {(domain, mode): set(account_ids)} self._map_account_ids = defaultdict(set) - self._set_all_accounts = set() # set((domain, mode)) self._account_ids_by_code = defaultdict(set) - def _load_account_codes(self, account_codes, account_domain): + def _load_account_codes(self, account_codes, root_account): account_model = self.env['account.account'] # TODO: account_obj is necessary because _get_children_and_consol # does not work in new API? @@ -75,23 +74,35 @@ def _load_account_codes(self, account_codes, account_domain): for account_code in account_codes: if account_code in self._account_ids_by_code: continue - if '%' in account_code: + if account_code is None: + # by convention the root account is keyed as + # None in _account_ids_by_code, so it is consistent + # with what _parse_match_object returns for an + # empty list of account codes, ie [None] + exact_codes.add(root_account.code) + elif '%' in account_code: like_codes.add(account_code) else: exact_codes.add(account_code) for account in account_model.\ - search([('code', 'in', list(exact_codes))] + account_domain): + search([('code', 'in', list(exact_codes)), + ('parent_id', 'child_of', root_account.id)]): + if account.code == root_account.code: + code = None + else: + code = account.code if account.type in ('view', 'consolidation'): - self._account_ids_by_code[account.code].update( + self._account_ids_by_code[code].update( account_obj._get_children_and_consol( self.env.cr, self.env.uid, [account.id], self.env.context)) else: - self._account_ids_by_code[account.code].add(account.id) + self._account_ids_by_code[code].add(account.id) for like_code in like_codes: for account in account_model.\ - search([('code', 'like', like_code)] + account_domain): + search([('code', 'like', like_code), + ('parent_id', 'child_of', root_account.id)]): if account.type in ('view', 'consolidation'): self._account_ids_by_code[like_code].update( account_obj._get_children_and_consol( @@ -118,7 +129,7 @@ def _parse_match_object(self, mo): if account_codes.strip(): account_codes = [a.strip() for a in account_codes.split(',')] else: - account_codes = None + account_codes = [None] domain = domain or '[]' domain = tuple(safe_eval(domain)) return field, mode, account_codes, domain @@ -132,15 +143,12 @@ def parse_expr(self, expr): for mo in self.ACC_RE.finditer(expr): _, mode, account_codes, domain = self._parse_match_object(mo) key = (domain, mode) - if account_codes: - self._map_account_ids[key].update(account_codes) - else: - self._set_all_accounts.add(key) + self._map_account_ids[key].update(account_codes) - def done_parsing(self, account_domain): + def done_parsing(self, root_account): # load account codes and replace account codes by account ids in _map for key, account_codes in self._map_account_ids.items(): - self._load_account_codes(account_codes, account_domain) + self._load_account_codes(account_codes, root_account) account_ids = set() for account_code in account_codes: account_ids.update(self._account_ids_by_code[account_code]) @@ -255,7 +263,7 @@ def _get_period_ids_for_mode(self, period_from, period_to, mode): if opening_period.date_start == period_from.date_start and \ mode == MODE_INITIAL: # if the opening period has the same start date as - # period_from, the we'll find the initial balance + # period_from, then we'll find the initial balance # in the initial period and that's it period_ids.append(opening_period[0].id) continue @@ -296,23 +304,6 @@ def do_queries(self, period_domain, period_domain_i, period_domain_e): for acc in accs: self._data[key][acc['account_id'][0]] = \ (acc['debit'] or 0.0, acc['credit'] or 0.0) - # fetch sum of debit/credit for expressions with no account - for key in self._set_all_accounts: - domain, mode = key - if mode == MODE_VARIATION: - domain = list(domain) + period_domain - elif mode == MODE_INITIAL: - domain = list(domain) + period_domain_i - elif mode == MODE_END: - domain = list(domain) + period_domain_e - else: - raise RuntimeError("unexpected mode %s" % (mode,)) - accs = aml_model.read_group(domain, - ['debit', 'credit'], - []) - assert len(accs) == 1 - self._data[key][None] = \ - (accs[0]['debit'] or 0.0, accs[0]['credit'] or 0.0) def replace_expr(self, expr): """Replace accounting variables in an expression by their amount. @@ -326,11 +317,8 @@ def f(mo): key = (domain, mode) account_ids_data = self._data[key] v = 0.0 - for account_code in account_codes or [None]: - if account_code: - account_ids = self._account_ids_by_code[account_code] - else: - account_ids = [None] + for account_code in account_codes: + account_ids = self._account_ids_by_code[account_code] for account_id in account_ids: debit, credit = \ account_ids_data.get(account_id, (0.0, 0.0)) diff --git a/mis_builder/models/mis_builder.py b/mis_builder/models/mis_builder.py index 73932f1577df..767d40ca6550 100644 --- a/mis_builder/models/mis_builder.py +++ b/mis_builder/models/mis_builder.py @@ -483,13 +483,12 @@ def _get_dates(self, cr, uid, ids, field_names, arg, context=None): 'Period name should be unique by report'), ] - def drilldown(self, cr, uid, id, expr, context=None): - this = self.browse(cr, uid, id, context=context)[0] + def drilldown(self, cr, uid, _id, expr, context=None): + this = self.browse(cr, uid, _id, context=context)[0] env = Environment(cr, uid, {}) aep = AccountingExpressionProcessor(env) aep.parse_expr(expr) - aep.done_parsing([('company_id', '=', - this.report_instance_id.company_id.id)]) + aep.done_parsing(this.report_instance_id.root_account) domain = aep.get_aml_domain_for_expr(expr) if domain: # TODO: reuse compute_period_domain @@ -680,6 +679,19 @@ def _get_pivot_date(self, cr, uid, ids, field_name, arg, context=None): context=context) return res + def _get_root_account(self, cr, uid, ids, field_name, arg, context=None): + res = {} + account_obj = self.pool['account.account'] + for r in self.browse(cr, uid, ids, context=context): + account_ids = account_obj.search( + cr, uid, + [('parent_id', '=', False), + ('company_id', '=', r.company_id.id)], + context=context) + if len(account_ids) == 1: + res[r.id] = account_ids[0] + return res + _name = 'mis.report.instance' _columns = { @@ -704,6 +716,9 @@ def _get_pivot_date(self, cr, uid, ids, field_name, arg, context=None): ('all', 'All Entries'), ], 'Target Moves', required=True), 'company_id': fields.many2one('res.company', 'Company', required=True), + 'root_account': fields.function(_get_root_account, + type='many2one', obj='account.account', + string="Account chart"), } _defaults = { @@ -754,13 +769,11 @@ def _format_date(self, cr, uid, lang_id, date, context=None): tools.DEFAULT_SERVER_DATE_FORMAT), tformat) - def compute(self, cr, uid, _ids, context=None): - assert isinstance(_ids, (int, long)) + def compute(self, cr, uid, _id, context=None): + assert isinstance(_id, (int, long)) if context is None: context = {} - r = self.browse(cr, uid, _ids, context=context) - context['state'] = r.target_move - + r = self.browse(cr, uid, _id, context=context) content = OrderedDict() # empty line name for header header = OrderedDict() @@ -773,7 +786,7 @@ def compute(self, cr, uid, _ids, context=None): content[kpi.name] = {'kpi_name': kpi.description, 'cols': [], 'default_style': ''} - aep.done_parsing([('company_id', '=', r.company_id.id)]) + aep.done_parsing(r.root_account) report_instance_period_obj = self.pool.get( 'mis.report.instance.period') kpi_obj = self.pool.get('mis.report.kpi') diff --git a/mis_builder/views/mis_builder.xml b/mis_builder/views/mis_builder.xml index e4a34ae17653..f7e09a83e48d 100644 --- a/mis_builder/views/mis_builder.xml +++ b/mis_builder/views/mis_builder.xml @@ -139,6 +139,7 @@ + From 5bf009765dd2a52322496d85e5f1b52f22d9b778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Tue, 28 Apr 2015 15:57:52 +0200 Subject: [PATCH 094/184] [IMP] mis_builder: refactor to compute period only for modes actually used --- mis_builder/models/aep.py | 50 ++++++++++++++++--------------- mis_builder/models/mis_builder.py | 36 +++------------------- 2 files changed, 30 insertions(+), 56 deletions(-) diff --git a/mis_builder/models/aep.py b/mis_builder/models/aep.py index 500174ec4b95..9b77d525c5e4 100644 --- a/mis_builder/models/aep.py +++ b/mis_builder/models/aep.py @@ -157,17 +157,15 @@ def done_parsing(self, root_account): def get_aml_domain_for_expr(self, expr): """ Get a domain on account.move.line for an expression. - Only accounting expression in mode 'p' and 'e' are considered. - Prerequisite: done_parsing() must have been invoked. Returns a domain that can be used to search on account.move.line. + To be meaningful, this domain must be extended with a domain + obtained from get_aml_domain_for_dates() """ aml_domains = [] for mo in self.ACC_RE.finditer(expr): - field, mode, account_codes, domain = self._parse_match_object(mo) - if mode == MODE_INITIAL: - continue + field, _, account_codes, domain = self._parse_match_object(mo) aml_domain = list(domain) if account_codes: account_ids = set() @@ -181,11 +179,6 @@ def get_aml_domain_for_expr(self, expr): aml_domains.append(expression.normalize_domain(aml_domain)) return expression.OR(aml_domains) - def get_aml_domain_for_dates(self, date_start, date_end, mode): - if mode != MODE_VARIATION: - raise RuntimeError("") # TODO - return [('date', '>=', date_start), ('date', '<=', date_end)] - def _period_has_moves(self, period): move_model = self.env['account.move'] return bool(move_model.search([('period_id', '=', period.id)], @@ -277,27 +270,36 @@ def _get_period_ids_for_mode(self, period_from, period_to, mode): period_from, period_to, company_id)) return period_ids - def get_aml_domain_for_periods(self, period_from, period_to, mode): - period_ids = self._get_period_ids_for_mode( - period_from, period_to, mode) - return [('period_id', 'in', period_ids)] + def get_aml_domain_for_dates(self, date_from, date_to, + period_from, period_to, + mode, + target_move): + if period_from and period_to: + period_ids = self._get_period_ids_for_mode( + period_from, period_to, mode) + domain = [('period_id', 'in', period_ids)] + else: + domain = [('date', '>=', date_from), ('date', '<=', date_to)] + if target_move == 'posted': + domain.append(('move_id.state', '=', 'posted')) + return domain - def do_queries(self, period_domain, period_domain_i, period_domain_e): + def do_queries(self, date_from, date_to, period_from, period_to, + target_move): aml_model = self.env['account.move.line'] # {(domain, mode): {account_id: (debit, credit)}} self._data = defaultdict(dict) - # fetch sum of debit/credit, grouped by account_id + domain_by_mode = {} for key in self._map_account_ids: domain, mode = key - if mode == MODE_VARIATION: - domain = list(domain) + period_domain - elif mode == MODE_INITIAL: - domain = list(domain) + period_domain_i - elif mode == MODE_END: - domain = list(domain) + period_domain_e - else: - raise RuntimeError("unexpected mode %s" % (mode,)) + if mode not in domain_by_mode: + domain_by_mode[mode] = \ + self.get_aml_domain_for_dates(date_from, date_to, + period_from, period_to, + mode, target_move) + domain = list(domain) + domain_by_mode[mode] domain.append(('account_id', 'in', self._map_account_ids[key])) + # fetch sum of debit/credit, grouped by account_id accs = aml_model.read_group(domain, ['debit', 'credit', 'account_id'], ['account_id']) diff --git a/mis_builder/models/mis_builder.py b/mis_builder/models/mis_builder.py index 767d40ca6550..0912eac27b3b 100644 --- a/mis_builder/models/mis_builder.py +++ b/mis_builder/models/mis_builder.py @@ -37,9 +37,6 @@ from openerp.tools.translate import _ from .aep import AccountingExpressionProcessor -from .aep import MODE_VARIATION -from .aep import MODE_END -from .aep import MODE_INITIAL class AutoStruct(object): @@ -379,7 +376,6 @@ def _get_dates(self, cr, uid, ids, field_names, arg, context=None): all_period_ids = period_obj.search( cr, uid, [('special', '=', False), - '|', ('company_id', '=', False), ('company_id', '=', c.company_id.id)], order='date_start', context=context) @@ -388,7 +384,6 @@ def _get_dates(self, cr, uid, ids, field_names, arg, context=None): [('special', '=', False), ('date_start', '<=', d), ('date_stop', '>=', d), - '|', ('company_id', '=', False), ('company_id', '=', c.company_id.id)], context=context) if not current_period_ids: @@ -527,26 +522,6 @@ def drilldown(self, cr, uid, _id, expr, context=None): else: return False - def compute_period_domain(self, cr, uid, period_report, aep, mode, - context=None): - domain = [] - target_move = period_report.report_instance_id.target_move - if target_move == 'posted': - domain.append(('move_id.state', '=', target_move)) - if not period_report.period_from.id or not period_report.period_to.id: - aml_domain = aep\ - .get_aml_domain_for_periods(period_report.date_from, - period_report.date_to, - mode) - domain.extend(aml_domain) - elif period_report.period_from.id and period_report.period_to.id: - aml_domain = aep\ - .get_aml_domain_for_periods(period_report.period_from, - period_report.period_to, - mode) - domain.extend(aml_domain) - return domain - def _fetch_queries(self, cr, uid, c, context): res = {} report = c.report_instance_id.report_id @@ -589,16 +564,13 @@ def _compute(self, cr, uid, lang_id, c, aep, context=None): 'len': len, 'avg': lambda l: sum(l) / float(len(l)), } - domain_p = self.compute_period_domain(cr, uid, c, aep, MODE_VARIATION, - context=context) - domain_e = self.compute_period_domain(cr, uid, c, aep, MODE_END, - context=context) - domain_i = self.compute_period_domain(cr, uid, c, aep, MODE_INITIAL, - context=context) - aep.do_queries(domain_p, domain_i, domain_e) localdict.update(self._fetch_queries(cr, uid, c, context=context)) + aep.do_queries(c.date_from, c.date_to, + c.period_from, c.period_to, + c.report_instance_id.target_move) + compute_queue = c.report_instance_id.report_id.kpi_ids recompute_queue = [] while True: From 7e13cddca05b01d01c71f964ffcff7fdcced3afc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Tue, 28 Apr 2015 16:19:22 +0200 Subject: [PATCH 095/184] [IMP] mis_builder: refactor drilldown to reuse period computation and work for all modes --- mis_builder/models/aep.py | 30 ++++++++++++++++++-------- mis_builder/models/mis_builder.py | 36 +++++++------------------------ 2 files changed, 29 insertions(+), 37 deletions(-) diff --git a/mis_builder/models/aep.py b/mis_builder/models/aep.py index 9b77d525c5e4..d181fa023f36 100644 --- a/mis_builder/models/aep.py +++ b/mis_builder/models/aep.py @@ -154,7 +154,13 @@ def done_parsing(self, root_account): account_ids.update(self._account_ids_by_code[account_code]) self._map_account_ids[key] = list(account_ids) - def get_aml_domain_for_expr(self, expr): + def has_account_var(self, expr): + return bool(self.ACC_RE.match(expr)) + + def get_aml_domain_for_expr(self, expr, + date_from, date_to, + period_from, period_to, + target_move): """ Get a domain on account.move.line for an expression. Prerequisite: done_parsing() must have been invoked. @@ -164,20 +170,26 @@ def get_aml_domain_for_expr(self, expr): obtained from get_aml_domain_for_dates() """ aml_domains = [] + domain_by_mode = {} for mo in self.ACC_RE.finditer(expr): - field, _, account_codes, domain = self._parse_match_object(mo) + field, mode, account_codes, domain = self._parse_match_object(mo) aml_domain = list(domain) - if account_codes: - account_ids = set() - for account_code in account_codes: - account_ids.update(self._account_ids_by_code[account_code]) - aml_domain.append(('account_id', 'in', tuple(account_ids))) + account_ids = set() + for account_code in account_codes: + account_ids.update(self._account_ids_by_code[account_code]) + aml_domain.append(('account_id', 'in', tuple(account_ids))) if field == 'crd': aml_domain.append(('credit', '>', 0)) elif field == 'deb': aml_domain.append(('debit', '>', 0)) aml_domains.append(expression.normalize_domain(aml_domain)) - return expression.OR(aml_domains) + if mode not in domain_by_mode: + domain_by_mode[mode] = \ + self.get_aml_domain_for_dates(date_from, date_to, + period_from, period_to, + mode, target_move) + return expression.OR(aml_domains) + \ + expression.OR(domain_by_mode.values()) def _period_has_moves(self, period): move_model = self.env['account.move'] @@ -282,7 +294,7 @@ def get_aml_domain_for_dates(self, date_from, date_to, domain = [('date', '>=', date_from), ('date', '<=', date_to)] if target_move == 'posted': domain.append(('move_id.state', '=', 'posted')) - return domain + return expression.normalize_domain(domain) def do_queries(self, date_from, date_to, period_from, period_to, target_move): diff --git a/mis_builder/models/mis_builder.py b/mis_builder/models/mis_builder.py index 0912eac27b3b..04b75b4be0a1 100644 --- a/mis_builder/models/mis_builder.py +++ b/mis_builder/models/mis_builder.py @@ -482,33 +482,13 @@ def drilldown(self, cr, uid, _id, expr, context=None): this = self.browse(cr, uid, _id, context=context)[0] env = Environment(cr, uid, {}) aep = AccountingExpressionProcessor(env) - aep.parse_expr(expr) - aep.done_parsing(this.report_instance_id.root_account) - domain = aep.get_aml_domain_for_expr(expr) - if domain: - # TODO: reuse compute_period_domain - # compute date/period - period_ids = [] - date_from = None - date_to = None - period_obj = self.pool['account.period'] - target_move = this.report_instance_id.target_move - if target_move == 'posted': - domain.append(('move_id.state', '=', target_move)) - if this.period_from: - compute_period_ids = period_obj.build_ctx_periods( - cr, uid, this.period_from.id, this.period_to.id) - period_ids.extend(compute_period_ids) - else: - date_from = this.date_from - date_to = this.date_to - if period_ids: - if date_from: - domain.append('|') - domain.append(('period_id', 'in', period_ids)) - if date_from: - domain.extend([('date', '>=', date_from), - ('date', '<=', date_to)]) + if aep.has_account_var(expr): + aep.parse_expr(expr) + aep.done_parsing(this.report_instance_id.root_account) + domain = aep.get_aml_domain_for_expr( + expr, this.date_from, this.date_to, + this.period_from, this.period_to, + this.report_instance_id.target_move) return { 'name': expr + ' - ' + this.name, 'domain': domain, @@ -605,7 +585,7 @@ def _compute(self, cr, uid, lang_id, c, aep, context=None): kpi_style = None drilldown = (kpi_val is not None and - bool(aep.get_aml_domain_for_expr(kpi.expression))) + aep.has_account_var(kpi.expression)) res[kpi.name] = { 'val': kpi_val, From a1fd65262cbee1d87b7118ce318797ee83b33821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Tue, 28 Apr 2015 18:37:30 +0200 Subject: [PATCH 096/184] [FIX] mis_builder: fix detection of expression with accounting variables --- mis_builder/models/aep.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mis_builder/models/aep.py b/mis_builder/models/aep.py index d181fa023f36..44bd08292ba9 100644 --- a/mis_builder/models/aep.py +++ b/mis_builder/models/aep.py @@ -155,7 +155,7 @@ def done_parsing(self, root_account): self._map_account_ids[key] = list(account_ids) def has_account_var(self, expr): - return bool(self.ACC_RE.match(expr)) + return bool(self.ACC_RE.search(expr)) def get_aml_domain_for_expr(self, expr, date_from, date_to, From cf254c131fd1444bdcde50e893fa0516d4a52820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Wed, 29 Apr 2015 09:00:30 +0200 Subject: [PATCH 097/184] [IMP] mis_builder: query group by --- mis_builder/models/mis_builder.py | 25 ++++++++++++++++++++----- mis_builder/views/mis_builder.xml | 2 ++ 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/mis_builder/models/mis_builder.py b/mis_builder/models/mis_builder.py index 04b75b4be0a1..56f9b9649772 100644 --- a/mis_builder/models/mis_builder.py +++ b/mis_builder/models/mis_builder.py @@ -261,6 +261,11 @@ def onchange_field_ids(self, cr, uid, ids, field_ids, context=None): store={'mis.report.query': (lambda self, cr, uid, ids, c={}: ids, ['field_ids'], 20), }), + 'groupby': fields.boolean(string="Group by"), + 'groupby_field_ids': fields.many2many('ir.model.fields', + 'ir_model_fields_' + 'mis_report_query_groupby_rel', + string='Fields to group by'), 'date_field': fields.many2one('ir.model.fields', required=True, string='Date field', domain=[('ttype', 'in', @@ -521,11 +526,21 @@ def _fetch_queries(self, cr, uid, c, context): if obj._columns.get('company_id', False): domain.extend(['|', ('company_id', '=', False), ('company_id', '=', c.company_id.id)]) - field_names = [field.name for field in query.field_ids] - obj_ids = obj.search(cr, uid, domain, context=context) - obj_datas = obj.read( - cr, uid, obj_ids, field_names, context=context) - res[query.name] = [AutoStruct(**d) for d in obj_datas] + field_names = [f.name for f in query.field_ids] + if not query.groupby: + obj_ids = obj.search(cr, uid, domain, context=context) + obj_datas = obj.read( + cr, uid, obj_ids, field_names, context=context) + res[query.name] = [AutoStruct(**d) for d in obj_datas] + else: + groupby_field_names = [f.name for f in query.groupby_field_ids] + obj_datas = obj.read_group( + cr, uid, domain, field_names, groupby_field_names, + context=context) + if groupby_field_names or not obj_datas: + res[query.name] = [AutoStruct(**d) for d in obj_datas] + else: + res[query.name] = AutoStruct(**obj_datas[0]) return res def _compute(self, cr, uid, lang_id, c, aep, context=None): diff --git a/mis_builder/views/mis_builder.xml b/mis_builder/views/mis_builder.xml index f7e09a83e48d..cc6e65f2b748 100644 --- a/mis_builder/views/mis_builder.xml +++ b/mis_builder/views/mis_builder.xml @@ -36,6 +36,8 @@ + + From 32ce3109bba55d8c57aa8d85cb6ae2ce23c73231 Mon Sep 17 00:00:00 2001 From: "Adrien Peiffer (ACSONE)" Date: Thu, 30 Apr 2015 14:40:10 +0200 Subject: [PATCH 098/184] [IMP] mis_builder: Move menus in Accounting/Configuration/Financial Reports --- mis_builder/views/mis_builder.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mis_builder/views/mis_builder.xml b/mis_builder/views/mis_builder.xml index cc6e65f2b748..f93e1fcd0f0e 100644 --- a/mis_builder/views/mis_builder.xml +++ b/mis_builder/views/mis_builder.xml @@ -71,7 +71,7 @@ tree,form - + Export report instance result @@ -176,7 +176,7 @@ tree,form - + From ff68d74a85180c9462e3dd87c1d7ef9d1bf89d67 Mon Sep 17 00:00:00 2001 From: Laetitia Gangloff Date: Thu, 30 Apr 2015 15:51:06 +0200 Subject: [PATCH 099/184] add help in view, use NameError instead of ValueError --- mis_builder/models/mis_builder.py | 4 ++-- mis_builder/views/mis_builder.xml | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/mis_builder/models/mis_builder.py b/mis_builder/models/mis_builder.py index 56f9b9649772..3e4cf63864f6 100644 --- a/mis_builder/models/mis_builder.py +++ b/mis_builder/models/mis_builder.py @@ -144,7 +144,7 @@ def onchange_name(self, cr, uid, ids, name, context=None): res = {} if name and not _is_valid_python_var(name): res['warning'] = { - 'title': 'Invalid name', + 'title': 'Invalid name %s' % name, 'message': 'The name must be a valid python identifier'} return res @@ -578,7 +578,7 @@ def _compute(self, cr, uid, lang_id, c, aep, context=None): kpi_val = None kpi_val_rendered = '#DIV/0' kpi_val_comment += '\n\n%s' % (traceback.format_exc(),) - except ValueError: + except NameError: recompute_queue.append(kpi) kpi_val = None kpi_val_rendered = '#ERR' diff --git a/mis_builder/views/mis_builder.xml b/mis_builder/views/mis_builder.xml index f93e1fcd0f0e..7817829573c9 100644 --- a/mis_builder/views/mis_builder.xml +++ b/mis_builder/views/mis_builder.xml @@ -58,6 +58,33 @@ + + + + + + From 659d592e6a47aae3bd1ed9967977c921f25d8737 Mon Sep 17 00:00:00 2001 From: "Adrien Peiffer (ACSONE)" Date: Thu, 30 Apr 2015 16:20:45 +0200 Subject: [PATCH 100/184] [FIX] mis builder: Catch exception on ValueError and on NameError --- mis_builder/models/mis_builder.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mis_builder/models/mis_builder.py b/mis_builder/models/mis_builder.py index 3e4cf63864f6..61c82a69b5fc 100644 --- a/mis_builder/models/mis_builder.py +++ b/mis_builder/models/mis_builder.py @@ -29,7 +29,6 @@ import traceback import pytz - from openerp.api import Environment from openerp.osv import orm, fields from openerp import tools @@ -578,7 +577,7 @@ def _compute(self, cr, uid, lang_id, c, aep, context=None): kpi_val = None kpi_val_rendered = '#DIV/0' kpi_val_comment += '\n\n%s' % (traceback.format_exc(),) - except NameError: + except (NameError, ValueError): recompute_queue.append(kpi) kpi_val = None kpi_val_rendered = '#ERR' From 5325f46793b461053eb78a95b786a1d2f31cb1ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Fri, 1 May 2015 15:16:07 +0200 Subject: [PATCH 101/184] [IMP] mis_builder: remove unncessary code for managing sequences As far as I can tell this code is no necessary in 8.0 --- mis_builder/models/mis_builder.py | 54 ------------------------------- 1 file changed, 54 deletions(-) diff --git a/mis_builder/models/mis_builder.py b/mis_builder/models/mis_builder.py index 61c82a69b5fc..28af3ff0e01e 100644 --- a/mis_builder/models/mis_builder.py +++ b/mis_builder/models/mis_builder.py @@ -320,30 +320,6 @@ class mis_report(orm.Model): # TODO: kpi name cannot be start with query name - def create(self, cr, uid, vals, context=None): - # TODO: explain this - if 'kpi_ids' in vals: - mis_report_kpi_obj = self.pool.get('mis.report.kpi') - for idx, line in enumerate(vals['kpi_ids']): - if line[0] == 0: - line[2]['sequence'] = idx + 1 - else: - mis_report_kpi_obj.write( - cr, uid, [line[1]], {'sequence': idx + 1}, - context=context) - return super(mis_report, self).create(cr, uid, vals, context=context) - - def write(self, cr, uid, ids, vals, context=None): - # TODO: explain this - res = super(mis_report, self).write( - cr, uid, ids, vals, context=context) - mis_report_kpi_obj = self.pool.get('mis.report.kpi') - for report in self.browse(cr, uid, ids, context): - for idx, kpi in enumerate(report.kpi_ids): - mis_report_kpi_obj.write( - cr, uid, [kpi.id], {'sequence': idx + 1}, context=context) - return res - class mis_report_instance_period(orm.Model): @@ -696,36 +672,6 @@ def _get_root_account(self, cr, uid, ids, field_name, arg, context=None): context=c) } - def create(self, cr, uid, vals, context=None): - if not vals: - return context.get('active_id', None) - # TODO: explain this - if 'period_ids' in vals: - mis_report_instance_period_obj = self.pool.get( - 'mis.report.instance.period') - for idx, line in enumerate(vals['period_ids']): - if line[0] == 0: - line[2]['sequence'] = idx + 1 - else: - mis_report_instance_period_obj.write( - cr, uid, [line[1]], {'sequence': idx + 1}, - context=context) - return super(mis_report_instance, self).create(cr, uid, vals, - context=context) - - def write(self, cr, uid, ids, vals, context=None): - # TODO: explain this - res = super(mis_report_instance, self).write( - cr, uid, ids, vals, context=context) - mis_report_instance_period_obj = self.pool.get( - 'mis.report.instance.period') - for instance in self.browse(cr, uid, ids, context): - for idx, period in enumerate(instance.period_ids): - mis_report_instance_period_obj.write( - cr, uid, [period.id], {'sequence': idx + 1}, - context=context) - return res - def _format_date(self, cr, uid, lang_id, date, context=None): # format date following user language tformat = self.pool['res.lang'].read( From ec6a03d182a23c76aa2f6d9a1c1af713d8af785f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Fri, 1 May 2015 22:44:08 +0200 Subject: [PATCH 102/184] [FIX] mis_builder: do not raise inside function fields --- mis_builder/models/mis_builder.py | 54 ++++++++++++++++--------------- mis_builder/views/mis_builder.xml | 3 +- 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/mis_builder/models/mis_builder.py b/mis_builder/models/mis_builder.py index 28af3ff0e01e..6cc20ac6f1d1 100644 --- a/mis_builder/models/mis_builder.py +++ b/mis_builder/models/mis_builder.py @@ -335,6 +335,10 @@ def _get_dates(self, cr, uid, ids, field_names, arg, context=None): ids = [ids] res = {} for c in self.browse(cr, uid, ids, context=context): + date_from = False + date_to = False + period_ids = None + valid = False d = parser.parse(c.report_instance_id.pivot_date) if c.type == 'd': date_from = d + timedelta(days=c.offset) @@ -342,7 +346,7 @@ def _get_dates(self, cr, uid, ids, field_names, arg, context=None): date_from = date_from.strftime( tools.DEFAULT_SERVER_DATE_FORMAT) date_to = date_to.strftime(tools.DEFAULT_SERVER_DATE_FORMAT) - period_ids = None + valid = True elif c.type == 'w': date_from = d - timedelta(d.weekday()) date_from = date_from + timedelta(days=c.offset * 7) @@ -350,15 +354,9 @@ def _get_dates(self, cr, uid, ids, field_names, arg, context=None): date_from = date_from.strftime( tools.DEFAULT_SERVER_DATE_FORMAT) date_to = date_to.strftime(tools.DEFAULT_SERVER_DATE_FORMAT) - period_ids = None + valid = True elif c.type == 'fp': period_obj = self.pool['account.period'] - all_period_ids = period_obj.search( - cr, uid, - [('special', '=', False), - ('company_id', '=', c.company_id.id)], - order='date_start', - context=context) current_period_ids = period_obj.search( cr, uid, [('special', '=', False), @@ -366,29 +364,28 @@ def _get_dates(self, cr, uid, ids, field_names, arg, context=None): ('date_stop', '>=', d), ('company_id', '=', c.company_id.id)], context=context) - if not current_period_ids: - raise orm.except_orm(_("Error!"), - _("No current fiscal period for %s") - % d) - p = all_period_ids.index(current_period_ids[0]) + c.offset - if p < 0 or p >= len(all_period_ids): - raise orm.except_orm(_("Error!"), - _("No such fiscal period for %s " - "with offset %d") % (d, c.offset)) - period_ids = all_period_ids[p:p + c.duration] - periods = period_obj.browse(cr, uid, period_ids, - context=context) - date_from = periods[0].date_start - date_to = periods[-1].date_stop - else: - raise orm.except_orm(_("Error!"), - _("Unimplemented period type %s") % - (c.type,)) + if current_period_ids: + all_period_ids = period_obj.search( + cr, uid, + [('special', '=', False), + ('company_id', '=', c.company_id.id)], + order='date_start', + context=context) + p = all_period_ids.index(current_period_ids[0]) + c.offset + if p >= 0 and p + c.duration <= len(all_period_ids): + period_ids = all_period_ids[p:p + c.duration] + periods = period_obj.browse(cr, uid, period_ids, + context=context) + date_from = periods[0].date_start + date_to = periods[-1].date_stop + valid = True + res[c.id] = { 'date_from': date_from, 'date_to': date_to, 'period_from': period_ids and period_ids[0] or False, 'period_to': period_ids and period_ids[-1] or False, + 'valid': valid, } return res @@ -422,6 +419,9 @@ def _get_dates(self, cr, uid, ids, field_names, arg, context=None): 'period_to': fields.function(_get_dates, type='many2one', obj='account.period', multi="dates", string="To period"), + 'valid': fields.function(_get_dates, + type='boolean', + multi='dates', string='Valid'), 'sequence': fields.integer(string='Sequence'), 'report_instance_id': fields.many2one('mis.report.instance', string='Report Instance', @@ -712,6 +712,8 @@ def compute(self, cr, uid, _id, context=None): cr, uid, [('code', '=', lang)], context=context) for period in r.period_ids: + if not period.valid: + continue # add the column header header['']['cols'].append(dict( name=period.name, diff --git a/mis_builder/views/mis_builder.xml b/mis_builder/views/mis_builder.xml index 7817829573c9..6bbfa709f84e 100644 --- a/mis_builder/views/mis_builder.xml +++ b/mis_builder/views/mis_builder.xml @@ -172,7 +172,7 @@ - + @@ -183,6 +183,7 @@ + From cffcae36ada024eebc126e23bbd8469254581138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Fri, 1 May 2015 23:06:31 +0200 Subject: [PATCH 103/184] [IMP] mis_builder: improve documentation a bit --- mis_builder/models/aep.py | 10 +++++----- mis_builder/models/mis_builder.py | 18 ++++++------------ 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/mis_builder/models/aep.py b/mis_builder/models/aep.py index 44bd08292ba9..04ebaff48a06 100644 --- a/mis_builder/models/aep.py +++ b/mis_builder/models/aep.py @@ -19,18 +19,18 @@ class AccountingExpressionProcessor(object): * mode is i (initial balance), e (ending balance), p (moves over period) * accounts is a list of accounts, possibly containing % wildcards - * an optional domain on analytic lines allowing filters on eg analytic + * an optional domain on move lines allowing filters on eg analytic accounts or journal Examples: - * bal[70]: balance of moves on account 70 over the period - (it is the same as balp[70]); + * bal[70]: variation of the balance of moves on account 70 + over the period (it is the same as balp[70]); * bali[70,60]: initial balance of accounts 70 and 60; * bale[1%]: balance of accounts starting with 1 at end of period. How to use: * repeatedly invoke parse_expr() for each expression containing - accounting variables as described above; this let the processor + accounting variables as described above; this lets the processor group domains and modes and accounts; * when all expressions have been parsed, invoke done_parsing() to notify the processor that it can prepare to query (mainly @@ -41,7 +41,7 @@ class AccountingExpressionProcessor(object): for the given period. How it works: - * by accumulating the expressions before hand, it ensure to do the + * by accumulating the expressions before hand, it ensures to do the strict minimum number of queries to the database (for each period, one query per domain and mode); * it queries using the orm read_group which reduces to a query with diff --git a/mis_builder/models/mis_builder.py b/mis_builder/models/mis_builder.py index 6cc20ac6f1d1..2ea4654a2293 100644 --- a/mis_builder/models/mis_builder.py +++ b/mis_builder/models/mis_builder.py @@ -73,15 +73,13 @@ def _is_valid_python_var(name): class mis_report_kpi(orm.Model): - """ A KPI is an element of a MIS report. + """ A KPI is an element (ie a line) of a MIS report. In addition to a name and description, it has an expression to compute it based on queries defined in the MIS report. It also has various informations defining how to render it (numeric or percentage or a string, a suffix, divider) and how to render comparison of two values of the KPI. - KPI are ordered inside the MIS report, as some KPI expressions - can depend on other KPI that need to be computed before. """ _name = 'mis.report.kpi' @@ -288,21 +286,17 @@ def _check_name(self, cr, uid, ids, context=None): class mis_report(orm.Model): - """ A MIS report template (without period information) The MIS report holds: - * an implicit query fetching all the account balances; - for each account, the balance is stored in a variable named - bal_{code} where {code} is the account code - * an implicit query fetching all the account balances solde; - for each account, the balance solde is stored in a variable named - bals_{code} where {code} is the account code * a list of explicit queries; the result of each query is stored in a variable with same name as a query, containing as list - of data structures populated with attributes for each fields to fetch + of data structures populated with attributes for each fields to fetch; + when queries have the group by flag and no fields to group, it returns + a data structure with the summed fields * a list of KPI to be evaluated based on the variables resulting - from the balance and queries + from the balance and queries (KPI expressions can references queries + and accounting expression - see AccoutingExpressionProcessor) """ _name = 'mis.report' From 2c66fa61aaa17bc62355d2361d6ccd252bcb3243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Fri, 1 May 2015 23:33:43 +0200 Subject: [PATCH 104/184] [IMP] mis_builder: improve legend wording --- mis_builder/views/mis_builder.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/mis_builder/views/mis_builder.xml b/mis_builder/views/mis_builder.xml index 6bbfa709f84e..c9c87832ae79 100644 --- a/mis_builder/views/mis_builder.xml +++ b/mis_builder/views/mis_builder.xml @@ -60,26 +60,26 @@ - From d910987707030550cfac60280c013447a47fac44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 3 May 2015 13:27:28 +0200 Subject: [PATCH 110/184] [FIX] mis_builder: deleting mis.report cascade deletes mis.report.kpi --- mis_builder/models/mis_builder.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mis_builder/models/mis_builder.py b/mis_builder/models/mis_builder.py index cb30408e0ed3..0091a787291c 100644 --- a/mis_builder/models/mis_builder.py +++ b/mis_builder/models/mis_builder.py @@ -114,7 +114,8 @@ class mis_report_kpi(orm.Model): required=True, string='Comparison Method'), 'sequence': fields.integer(string='Sequence'), - 'report_id': fields.many2one('mis.report', string='Report'), + 'report_id': fields.many2one('mis.report', string='Report', + ondelete='cascade'), } _defaults = { From 71b340e46f6387190b829caf1d90568ff01d7c9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 3 May 2015 14:37:43 +0200 Subject: [PATCH 111/184] [IMP] mis_builder: refactor compute to display comparison columns after their corresponding period and better readability --- mis_builder/models/mis_builder.py | 103 +++++++++++++++----------- mis_builder/tests/test_mis_builder.py | 3 +- 2 files changed, 59 insertions(+), 47 deletions(-) diff --git a/mis_builder/models/mis_builder.py b/mis_builder/models/mis_builder.py index 0091a787291c..31b2bacc0a14 100644 --- a/mis_builder/models/mis_builder.py +++ b/mis_builder/models/mis_builder.py @@ -590,7 +590,6 @@ def _compute(self, cr, uid, lang_id, c, aep, context=None): 'val_r': kpi_val_rendered, 'val_c': kpi_val_comment, 'style': kpi_style, - 'default_style': kpi.default_css_style or None, 'suffix': kpi.suffix, 'dp': kpi.dp, 'is_percentage': kpi.type == 'pct', @@ -693,25 +692,20 @@ def compute(self, cr, uid, _id, context=None): assert isinstance(_id, (int, long)) if context is None: context = {} - r = self.browse(cr, uid, _id, context=context) - content = OrderedDict() - # empty line name for header - header = OrderedDict() - header[''] = {'kpi_name': '', 'cols': [], 'default_style': ''} - env = Environment(cr, uid, {}) + + this = self.browse(cr, uid, _id, context=context) + + kpi_obj = self.pool['mis.report.kpi'] + report_instance_period_obj = self.pool['mis.report.instance.period'] + + # prepare AccountingExpressionProcessor + env = Environment(cr, uid, context) aep = AccountingExpressionProcessor(env) - # initialize lines with kpi - for kpi in r.report_id.kpi_ids: + for kpi in this.report_id.kpi_ids: aep.parse_expr(kpi.expression) - content[kpi.name] = {'kpi_name': kpi.description, - 'cols': [], - 'default_style': ''} - aep.done_parsing(r.root_account) - report_instance_period_obj = self.pool.get( - 'mis.report.instance.period') - kpi_obj = self.pool.get('mis.report.kpi') + aep.done_parsing(this.root_account) - period_values = {} + # fetch user language only once (TODO: is it necessary?) lang = self.pool['res.users'].read( cr, uid, uid, ['lang'], context=context)['lang'] if not lang: @@ -719,7 +713,28 @@ def compute(self, cr, uid, _id, context=None): lang_id = self.pool['res.lang'].search( cr, uid, [('code', '=', lang)], context=context) - for period in r.period_ids: + # compute kpi values for each period + kpi_values_by_period_ids = {} + for period in this.period_ids: + if not period.valid: + continue + kpi_values = report_instance_period_obj._compute( + cr, uid, lang_id, period, aep, context=context) + kpi_values_by_period_ids[period.id] = kpi_values + + # prepare header and content + header = OrderedDict() + header[''] = {'kpi_name': '', + 'cols': [], + 'default_style': ''} + content = OrderedDict() + for kpi in this.report_id.kpi_ids: + content[kpi.name] = {'kpi_name': kpi.description, + 'cols': [], + 'default_style': kpi.default_css_style} + + # populate header and content + for period in this.period_ids: if not period.valid: continue # add the column header @@ -735,35 +750,33 @@ def compute(self, cr, uid, _id, context=None): context=context))) or period.period_from and period.period_from.name or period.date_from)) - # compute kpi values - values = report_instance_period_obj._compute( - cr, uid, lang_id, period, aep, context=context) - period_values[period.name] = values - for key in values: - content[key]['default_style'] = values[key]['default_style'] - content[key]['cols'].append(values[key]) + # add kpi values + kpi_values = kpi_values_by_period_ids[period.id] + for kpi_name in kpi_values: + content[kpi_name]['cols'].append(kpi_values[kpi_name]) - # add comparison column - for period in r.period_ids: + # add comparison columns for compare_col in period.comparison_column_ids: - # add the column header - header['']['cols'].append( - dict(name='%s - %s' % (period.name, compare_col.name), - date='')) - column1_values = period_values[period.name] - column2_values = period_values[compare_col.name] - for kpi in r.report_id.kpi_ids: - content[kpi.name]['cols'].append( - {'val_r': kpi_obj._render_comparison( - cr, - uid, - lang_id, - kpi, - column1_values[kpi.name]['val'], - column2_values[kpi.name]['val'], - period.normalize_factor, - compare_col.normalize_factor, - context=context)}) + compare_kpi_values = \ + kpi_values_by_period_ids.get(compare_col.id) + if compare_kpi_values: + # add the comparison column header + header['']['cols'].append( + dict(name='%s vs %s' % (period.name, compare_col.name), + date='')) + # add comparison values + for kpi in this.report_id.kpi_ids: + content[kpi.name]['cols'].append( + {'val_r': kpi_obj._render_comparison( + cr, + uid, + lang_id, + kpi, + kpi_values[kpi.name]['val'], + compare_kpi_values[kpi.name]['val'], + period.normalize_factor, + compare_col.normalize_factor, + context=context)}) return {'header': header, 'content': content} diff --git a/mis_builder/tests/test_mis_builder.py b/mis_builder/tests/test_mis_builder.py index eed12cb3954f..8bb261802b47 100644 --- a/mis_builder/tests/test_mis_builder.py +++ b/mis_builder/tests/test_mis_builder.py @@ -68,13 +68,12 @@ def test_fetch_query(self): OrderedDict([( u'total_test', {'kpi_name': u'total test', - 'default_style': None, + 'default_style': False, 'cols': [{ 'period_id': self.ref( 'mis_builder.mis_report_instance_period_test'), 'style': None, - 'default_style': None, 'suffix': False, 'expr': 'len(test)', 'val_c': 'total_test = len(test)', From 327bf3975cec501c957dd4ad4373d53f8371cdf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 3 May 2015 14:44:01 +0200 Subject: [PATCH 112/184] [FIX] mis_builder: order by sequence, id so d01eb513f is correct --- mis_builder/models/mis_builder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mis_builder/models/mis_builder.py b/mis_builder/models/mis_builder.py index 31b2bacc0a14..f54118f19fa8 100644 --- a/mis_builder/models/mis_builder.py +++ b/mis_builder/models/mis_builder.py @@ -126,7 +126,7 @@ class mis_report_kpi(orm.Model): 'sequence': 100, } - _order = 'sequence' + _order = 'sequence, id' def _check_name(self, cr, uid, ids, context=None): for record_name in self.read(cr, uid, ids, ['name']): @@ -442,7 +442,7 @@ def _get_dates(self, cr, uid, ids, field_names, arg, context=None): 'normalize_factor': 1, } - _order = 'sequence' + _order = 'sequence, id' _sql_constraints = [ ('duration', 'CHECK (duration>0)', From b2367abb38cb612cfee94c0506f2429f3be96e23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 3 May 2015 18:35:54 +0200 Subject: [PATCH 113/184] [FIX] mis_builder: propagate context --- mis_builder/models/mis_builder.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mis_builder/models/mis_builder.py b/mis_builder/models/mis_builder.py index f54118f19fa8..1c3a1b60321c 100644 --- a/mis_builder/models/mis_builder.py +++ b/mis_builder/models/mis_builder.py @@ -454,8 +454,10 @@ def _get_dates(self, cr, uid, ids, field_names, arg, context=None): ] def drilldown(self, cr, uid, _id, expr, context=None): + if context is None: + context = {} this = self.browse(cr, uid, _id, context=context)[0] - env = Environment(cr, uid, {}) + env = Environment(cr, uid, context) aep = AccountingExpressionProcessor(env) if aep.has_account_var(expr): aep.parse_expr(expr) From 272de956214f1b91484d2ef11cbb0087cf2735e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 3 May 2015 18:38:58 +0200 Subject: [PATCH 114/184] [IMP] mis_builder: tiny refactoring --- mis_builder/models/aep.py | 1 + mis_builder/models/mis_builder.py | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mis_builder/models/aep.py b/mis_builder/models/aep.py index 155088e76f42..4e6233dbe2a9 100644 --- a/mis_builder/models/aep.py +++ b/mis_builder/models/aep.py @@ -155,6 +155,7 @@ def done_parsing(self, root_account): account_ids.update(self._account_ids_by_code[account_code]) self._map_account_ids[key] = list(account_ids) + @classmethod def has_account_var(self, expr): return bool(self.ACC_RE.search(expr)) diff --git a/mis_builder/models/mis_builder.py b/mis_builder/models/mis_builder.py index 1c3a1b60321c..1421a020fbb9 100644 --- a/mis_builder/models/mis_builder.py +++ b/mis_builder/models/mis_builder.py @@ -35,7 +35,7 @@ from openerp.tools.safe_eval import safe_eval from openerp.tools.translate import _ -from .aep import AccountingExpressionProcessor +from .aep import AccountingExpressionProcessor as AEP class AutoStruct(object): @@ -457,9 +457,9 @@ def drilldown(self, cr, uid, _id, expr, context=None): if context is None: context = {} this = self.browse(cr, uid, _id, context=context)[0] - env = Environment(cr, uid, context) - aep = AccountingExpressionProcessor(env) - if aep.has_account_var(expr): + if AEP.has_account_var(expr): + env = Environment(cr, uid, context) + aep = AEP(env) aep.parse_expr(expr) aep.done_parsing(this.report_instance_id.root_account) domain = aep.get_aml_domain_for_expr( @@ -585,7 +585,7 @@ def _compute(self, cr, uid, lang_id, c, aep, context=None): kpi_style = None drilldown = (kpi_val is not None and - aep.has_account_var(kpi.expression)) + AEP.has_account_var(kpi.expression)) res[kpi.name] = { 'val': kpi_val, @@ -702,7 +702,7 @@ def compute(self, cr, uid, _id, context=None): # prepare AccountingExpressionProcessor env = Environment(cr, uid, context) - aep = AccountingExpressionProcessor(env) + aep = AEP(env) for kpi in this.report_id.kpi_ids: aep.parse_expr(kpi.expression) aep.done_parsing(this.root_account) From 08a72bb9aeb164b46369ddeb036504fce5b0413b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 3 May 2015 19:04:17 +0200 Subject: [PATCH 115/184] [FIX] mis_builder: OrderedDict serializes to json dict So this was relying on non-standard and unreliable feature of browsers to preserve order. --- mis_builder/models/mis_builder.py | 30 +++++++++++++---------- mis_builder/static/src/xml/mis_widget.xml | 6 ++++- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/mis_builder/models/mis_builder.py b/mis_builder/models/mis_builder.py index 1421a020fbb9..fe20f16d8e7c 100644 --- a/mis_builder/models/mis_builder.py +++ b/mis_builder/models/mis_builder.py @@ -22,7 +22,6 @@ # ############################################################################## -from collections import OrderedDict from datetime import datetime, timedelta from dateutil import parser import re @@ -725,22 +724,27 @@ def compute(self, cr, uid, _id, context=None): kpi_values_by_period_ids[period.id] = kpi_values # prepare header and content - header = OrderedDict() - header[''] = {'kpi_name': '', - 'cols': [], - 'default_style': ''} - content = OrderedDict() + header = [] + header.append({ + 'kpi_name': '', + 'cols': [] + }) + content = [] + rows_by_kpi_name = {} for kpi in this.report_id.kpi_ids: - content[kpi.name] = {'kpi_name': kpi.description, - 'cols': [], - 'default_style': kpi.default_css_style} + rows_by_kpi_name[kpi.name] = { + 'kpi_name': kpi.description, + 'cols': [], + 'default_style': kpi.default_css_style + } + content.append(rows_by_kpi_name[kpi.name]) # populate header and content for period in this.period_ids: if not period.valid: continue # add the column header - header['']['cols'].append(dict( + header[0]['cols'].append(dict( name=period.name, date=(period.duration > 1 or period.type == 'w') and _('from %s to %s' % @@ -755,7 +759,7 @@ def compute(self, cr, uid, _id, context=None): # add kpi values kpi_values = kpi_values_by_period_ids[period.id] for kpi_name in kpi_values: - content[kpi_name]['cols'].append(kpi_values[kpi_name]) + rows_by_kpi_name[kpi_name]['cols'].append(kpi_values[kpi_name]) # add comparison columns for compare_col in period.comparison_column_ids: @@ -763,12 +767,12 @@ def compute(self, cr, uid, _id, context=None): kpi_values_by_period_ids.get(compare_col.id) if compare_kpi_values: # add the comparison column header - header['']['cols'].append( + header[0]['cols'].append( dict(name='%s vs %s' % (period.name, compare_col.name), date='')) # add comparison values for kpi in this.report_id.kpi_ids: - content[kpi.name]['cols'].append( + rows_by_kpi_name[kpi.name]['cols'].append( {'val_r': kpi_obj._render_comparison( cr, uid, diff --git a/mis_builder/static/src/xml/mis_widget.xml b/mis_builder/static/src/xml/mis_widget.xml index bd0cd0cf271f..8e3ddd61d3b9 100644 --- a/mis_builder/static/src/xml/mis_widget.xml +++ b/mis_builder/static/src/xml/mis_widget.xml @@ -4,7 +4,11 @@
+
- +
+
+ +
+
From 7cf8c3009ae2ab42bab576605c550f84e09adedf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 3 May 2015 22:11:12 +0200 Subject: [PATCH 116/184] [FIX] mis_builder: mis_widget was broken --- mis_builder/static/src/xml/mis_widget.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mis_builder/static/src/xml/mis_widget.xml b/mis_builder/static/src/xml/mis_widget.xml index 8e3ddd61d3b9..5cfd999435e7 100644 --- a/mis_builder/static/src/xml/mis_widget.xml +++ b/mis_builder/static/src/xml/mis_widget.xml @@ -4,12 +4,12 @@ - +
-
- -
- 		+
+ +
+
From c2a4ff2de07900e9b54c2c73c91a37a541d1a8fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 3 May 2015 22:11:36 +0200 Subject: [PATCH 117/184] [FIX] mis_builder: blind attempt to fix xls report which does not even start anymore :( --- mis_builder/report/mis_builder_xls.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mis_builder/report/mis_builder_xls.py b/mis_builder/report/mis_builder_xls.py index f1b659c6b422..88dcd1cf02f0 100644 --- a/mis_builder/report/mis_builder_xls.py +++ b/mis_builder/report/mis_builder_xls.py @@ -87,7 +87,7 @@ def generate_xls_report(self, _p, _xs, data, objects, wb): header_name_list = [''] col_specs_template = {'': {'header': [1, 30, 'text', ''], 'header_date': [1, 1, 'text', '']}} - for col in data['header']['']['cols']: + for col in data['header'][0]['cols']: col_specs_template[col['name']] = {'header': [1, 30, 'text', col['name']], 'header_date': [1, 1, 'text', @@ -109,8 +109,7 @@ def generate_xls_report(self, _p, _xs, data, objects, wb): ws.set_horz_split_pos(row_pos) ws.set_vert_split_pos(1) - for key in data['content']: - line = data['content'][key] + for line in data['content']: col = 0 ws.write(row_pos, col, line['kpi_name'], self.mis_rh_cell_style) for value in line['cols']: From 46bfc16b5cdbfe1123ebdc487be02f98dffd24d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Mon, 4 May 2015 10:12:58 +0200 Subject: [PATCH 118/184] [FIX] mis_builder: excel export works again... strange --- mis_builder/models/mis_builder.py | 13 +++++++++++++ mis_builder/views/mis_builder.xml | 11 +---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/mis_builder/models/mis_builder.py b/mis_builder/models/mis_builder.py index fe20f16d8e7c..b6bf58718d94 100644 --- a/mis_builder/models/mis_builder.py +++ b/mis_builder/models/mis_builder.py @@ -689,6 +689,19 @@ def _format_date(self, cr, uid, lang_id, date, context=None): tools.DEFAULT_SERVER_DATE_FORMAT), tformat) + def preview(self, cr, uid, _id, context=None): + view_id = self.pool['ir.model.data'].get_object_reference( + cr, uid, 'mis_builder', 'mis_report_instance_result_view_form')[1] + return { + 'type': 'ir.actions.act_window', + 'res_model': 'mis.report.instance', + 'res_id': _id[0], + 'view_mode': 'form', + 'view_type': 'form', + 'view_id': view_id, + 'target': 'new', + } + def compute(self, cr, uid, _id, context=None): assert isinstance(_id, (int, long)) if context is None: diff --git a/mis_builder/views/mis_builder.xml b/mis_builder/views/mis_builder.xml index 8fb0704ba5f2..21acfdbf8d94 100644 --- a/mis_builder/views/mis_builder.xml +++ b/mis_builder/views/mis_builder.xml @@ -120,15 +120,6 @@ - - Preview - - mis.report.instance - form - form - new - - mis.report.instance.view.tree mis.report.instance @@ -160,7 +151,7 @@
-
From 2b7750628479f885a8b15aeba2db068923969b07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Mon, 4 May 2015 22:06:54 +0200 Subject: [PATCH 119/184] [IMP] mis_builder: add button icons and xls export from the report instance form --- mis_builder/views/mis_builder.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mis_builder/views/mis_builder.xml b/mis_builder/views/mis_builder.xml index 21acfdbf8d94..cda428593627 100644 --- a/mis_builder/views/mis_builder.xml +++ b/mis_builder/views/mis_builder.xml @@ -115,7 +115,7 @@
-