From 2d482c3ac05c0454e1a449ac71dc239b01c0f83c Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Mon, 15 Feb 2016 13:18:30 +0100 Subject: [PATCH 1/2] [ADD] analytic_entries_report_fiscalyear --- .travis.yml | 1 + analytic_entries_report_fiscalyear/README.rst | 59 ++++++++ .../__init__.py | 4 + .../__openerp__.py | 22 +++ analytic_entries_report_fiscalyear/i18n/nl.po | 52 +++++++ .../models/__init__.py | 4 + .../models/analytic_entries_report.py | 127 ++++++++++++++++++ .../static/description/icon.png | Bin 0 -> 9455 bytes .../tests/__init__.py | 4 + ...test_analytic_entries_report_fiscalyear.py | 15 +++ .../views/analytics_entry_report.xml | 36 +++++ 11 files changed, 324 insertions(+) create mode 100644 analytic_entries_report_fiscalyear/README.rst create mode 100644 analytic_entries_report_fiscalyear/__init__.py create mode 100644 analytic_entries_report_fiscalyear/__openerp__.py create mode 100644 analytic_entries_report_fiscalyear/i18n/nl.po create mode 100644 analytic_entries_report_fiscalyear/models/__init__.py create mode 100644 analytic_entries_report_fiscalyear/models/analytic_entries_report.py create mode 100644 analytic_entries_report_fiscalyear/static/description/icon.png create mode 100644 analytic_entries_report_fiscalyear/tests/__init__.py create mode 100644 analytic_entries_report_fiscalyear/tests/test_analytic_entries_report_fiscalyear.py create mode 100644 analytic_entries_report_fiscalyear/views/analytics_entry_report.xml diff --git a/.travis.yml b/.travis.yml index 7b629510..09961cce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,6 +37,7 @@ before_install: install: - git clone https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH} + - pip install sqlparse - travis_install_nightly script: diff --git a/analytic_entries_report_fiscalyear/README.rst b/analytic_entries_report_fiscalyear/README.rst new file mode 100644 index 00000000..4292bc96 --- /dev/null +++ b/analytic_entries_report_fiscalyear/README.rst @@ -0,0 +1,59 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :alt: License: AGPL-3 + +===================================================== +Analytic Entries Statistics per fiscal period or year +===================================================== + +Standard statistics over analytic entries don't allow grouping per fiscal year +or period. This is partly because this concept doesn't fit analytic entries +completely, as they don't necessarily are connected to a fiscal period. + +This addon overrides the standard analytic entries statistics to figure out the +fiscal period based on the linked move line and falls back to the date if +there's none. + +Usage +===== + +After installation of this module, you'll find filters for the fiscal year and +period. + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/91/8.0 + +For further information, please visit: + +* https://www.odoo.com/forum/help-1 + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed feedback +`here `_. + +Credits +======= + +Contributors +------------ + +* Holger Brunn + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/analytic_entries_report_fiscalyear/__init__.py b/analytic_entries_report_fiscalyear/__init__.py new file mode 100644 index 00000000..915f58d4 --- /dev/null +++ b/analytic_entries_report_fiscalyear/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# © 2015 Therp BV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from . import models diff --git a/analytic_entries_report_fiscalyear/__openerp__.py b/analytic_entries_report_fiscalyear/__openerp__.py new file mode 100644 index 00000000..3c10b656 --- /dev/null +++ b/analytic_entries_report_fiscalyear/__openerp__.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# © 2015 Therp BV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +{ + "name": "Analytic Entries Statistics per fiscal period or year", + "version": "8.0.1.0.1", + "license": "AGPL-3", + "author": "Odoo Community Association (OCA),Therp BV", + "website": "https://github.com/OCA/account-financial-reporting", + "category": "Accounting & Finance", + "depends": [ + 'account', + ], + "data": [ + "views/analytics_entry_report.xml", + ], + "external_dependencies": { + 'python': [ + 'sqlparse', + ], + }, +} diff --git a/analytic_entries_report_fiscalyear/i18n/nl.po b/analytic_entries_report_fiscalyear/i18n/nl.po new file mode 100644 index 00000000..295e4106 --- /dev/null +++ b/analytic_entries_report_fiscalyear/i18n/nl.po @@ -0,0 +1,52 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * analytic_entries_report_fiscalyear +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 6.1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-01-17 17:49+0000\n" +"PO-Revision-Date: 2014-01-17 17:49+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: analytic_entries_report_fiscalyear +#: field:analytic.entries.report,period_id:0 +msgid "Fiscal period" +msgstr "Fiscale periode" + +#. module: analytic_entries_report_fiscalyear +#: view:analytic.entries.report:0 +msgid "Period" +msgstr "Periode" + +#. module: analytic_entries_report_fiscalyear +#: view:analytic.entries.report:0 +msgid "Fiscal year-1" +msgstr "Boekjaar-1" + +#. module: analytic_entries_report_fiscalyear +#: view:analytic.entries.report:0 +#: field:analytic.entries.report,fiscalyear_id:0 +msgid "Fiscal year" +msgstr "Boekjaar" + +#. module: analytic_entries_report_fiscalyear +#: model:ir.model,name:analytic_entries_report_fiscalyear.model_analytic_entries_report +msgid "Analytic Entries Statistics" +msgstr "Kostenplaats boekingen analyses" + +#. module: analytic_entries_report_fiscalyear +#: view:analytic.entries.report:0 +msgid "Period-1" +msgstr "Periode-1" + +#. module: analytic_entries_report_fiscalyear +#: view:analytic.entries.report:0 +msgid "Fiscal periods" +msgstr "Fiscale perioden" diff --git a/analytic_entries_report_fiscalyear/models/__init__.py b/analytic_entries_report_fiscalyear/models/__init__.py new file mode 100644 index 00000000..2ea8aa50 --- /dev/null +++ b/analytic_entries_report_fiscalyear/models/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# © 2015 Therp BV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from . import analytic_entries_report diff --git a/analytic_entries_report_fiscalyear/models/analytic_entries_report.py b/analytic_entries_report_fiscalyear/models/analytic_entries_report.py new file mode 100644 index 00000000..105bf559 --- /dev/null +++ b/analytic_entries_report_fiscalyear/models/analytic_entries_report.py @@ -0,0 +1,127 @@ +# -*- coding: utf-8 -*- +# © 2015 Therp BV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +import collections +try: + import sqlparse +except ImportError as err: + import logging + logging.debug(err) +import datetime +from psycopg2.extensions import AsIs +from dateutil.relativedelta import relativedelta +from openerp import api, models, fields + + +class AnalyticEntriesReport(models.Model): + _inherit = 'analytic.entries.report' + + fiscalyear_id = fields.Many2one('account.fiscalyear', 'Fiscal year') + period_id = fields.Many2one('account.period', 'Fiscal period') + + def init(self, cr): + """Here, we try to be less invasive than the usual blunt overwrite of + the sql view""" + # added joins to account_period & account_move_line + # added appropriate fields to select list and group by + super(AnalyticEntriesReport, self).init(cr) + cr.execute("select pg_get_viewdef(%s::regclass)", (self._table,)) + for statement in sqlparse.parse(cr.fetchone()[0]): + current_keyword = None + for token in statement: + if token.is_keyword: + current_keyword = token + if isinstance(token, sqlparse.sql.IdentifierList) and\ + current_keyword.value == 'SELECT': + last = None + for last in token: + pass + token.insert_after(last, sqlparse.sql.Token( + sqlparse.tokens.Generic, + ',coalesce(ml.period_id, p.id) as period_id,' + 'coalesce(p_from_move.fiscalyear_id, p.fiscalyear_id) ' + 'as fiscalyear_id' + )) + if isinstance( + token, + (sqlparse.sql.IdentifierList, sqlparse.sql.Parenthesis) + ) and current_keyword.value == 'FROM': + def find_table(token): + if isinstance(token, sqlparse.sql.Identifier) and\ + token.get_real_name() == 'account_analytic_line': + return token + if not isinstance(token, collections.Iterable): + return + for child_token in token: + result = find_table(child_token) + if result: + return result + + table = find_table(token) + assert table + + table.parent.insert_after(table, sqlparse.sql.Token( + sqlparse.tokens.Generic, + ' left outer join account_period p ' + 'on p.special = False and p.date_start <= a.date ' + 'and p.date_stop >= a.date ' + 'left outer join account_move_line ml ' + 'on a.move_id = ml.id ' + 'left outer join account_period p_from_move ' + 'on ml.period_id = p_from_move.id ')) + if isinstance(token, sqlparse.sql.IdentifierList) and\ + current_keyword.value == 'GROUP BY': + last = None + for last in token: + pass + token.insert_after(last, sqlparse.sql.Token( + sqlparse.tokens.Generic, + ', coalesce(p_from_move.fiscalyear_id,' + 'p.fiscalyear_id),' + 'coalesce(ml.period_id, p.id)')) + cr.execute("create or replace view %s as (%s)", + (AsIs(self._table), AsIs(str(statement)[:-1]))) + + @api.model + def read_group(self, domain, fields, groupby, offset=0, limit=None, + orderby=False, lazy=True): + '''Override read_group to respect filters whose domain can't be + computed on the client side''' + adjusted_domain = [] + + for proposition in domain: + if not isinstance(proposition, tuple) and\ + not isinstance(proposition, list) or\ + len(proposition) != 3: + # we can't use expression.is_leaf here because of our custom + # operator + adjusted_domain.append(proposition) + continue + field, operator, value = proposition + if field == 'fiscalyear_id' and operator == 'offset': + date = datetime.date.today() + relativedelta(years=value) + fiscalyear_id = self.env['account.fiscalyear'].find(dt=date) + adjusted_domain.append(('fiscalyear_id', '=', fiscalyear_id)) + elif field == 'period_id' and operator == 'offset': + current_period = self.env['account.period'].with_context( + account_period_prefer_normal=True).find() + + direction = '>=' + if value < 0: + direction = '<=' + + periods = current_period.search( + [ + ('date_start', direction, current_period.date_start), + ('special', '=', False), + ], limit=(abs(value) + 1) or 1, order='date_start ' + + ('asc' if direction == '>=' else 'desc') + ) + + adjusted_domain.append(('period_id', '=', periods[value].id)) + else: + adjusted_domain.append(proposition) + + return super(AnalyticEntriesReport, self).read_group( + adjusted_domain, fields, groupby, + offset=offset, limit=limit, orderby=orderby, lazy=lazy) diff --git a/analytic_entries_report_fiscalyear/static/description/icon.png b/analytic_entries_report_fiscalyear/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/analytic_entries_report_fiscalyear/tests/__init__.py b/analytic_entries_report_fiscalyear/tests/__init__.py new file mode 100644 index 00000000..4a7d8f76 --- /dev/null +++ b/analytic_entries_report_fiscalyear/tests/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# © 2016 Therp BV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from . import test_analytic_entries_report_fiscalyear diff --git a/analytic_entries_report_fiscalyear/tests/test_analytic_entries_report_fiscalyear.py b/analytic_entries_report_fiscalyear/tests/test_analytic_entries_report_fiscalyear.py new file mode 100644 index 00000000..251fb9af --- /dev/null +++ b/analytic_entries_report_fiscalyear/tests/test_analytic_entries_report_fiscalyear.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +# © 2016 Therp BV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from openerp.tests.common import TransactionCase + + +class TestAnalyticEntriesReportFiscalyear(TransactionCase): + def test_analytic_entries_report_fiscalyear(self): + self.env['analytic.entries.report'].read_group( + [ + ('fiscalyear_id', 'offset', 0), + ('period_id', 'offset', 0), + ], + ['period_id'], + ['period_id']) diff --git a/analytic_entries_report_fiscalyear/views/analytics_entry_report.xml b/analytic_entries_report_fiscalyear/views/analytics_entry_report.xml new file mode 100644 index 00000000..4bd9721d --- /dev/null +++ b/analytic_entries_report_fiscalyear/views/analytics_entry_report.xml @@ -0,0 +1,36 @@ + + + + + analytic.entries.report + + + + + + + + + analytic.entries.report + + + + + + + + + + + + + + + {'search_default_filter_fiscalyear':1, 'group_by_no_leaf':1, 'search_default_Account':1} + + + From 9293c8cf8f0295f63db5957847353f5cea68836c Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Tue, 25 Feb 2020 12:11:37 +0100 Subject: [PATCH 2/2] [RFR] make operator code reusable --- .../models/analytic_entries_report.py | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/analytic_entries_report_fiscalyear/models/analytic_entries_report.py b/analytic_entries_report_fiscalyear/models/analytic_entries_report.py index 105bf559..812322a5 100644 --- a/analytic_entries_report_fiscalyear/models/analytic_entries_report.py +++ b/analytic_entries_report_fiscalyear/models/analytic_entries_report.py @@ -83,10 +83,7 @@ class AnalyticEntriesReport(models.Model): (AsIs(self._table), AsIs(str(statement)[:-1]))) @api.model - def read_group(self, domain, fields, groupby, offset=0, limit=None, - orderby=False, lazy=True): - '''Override read_group to respect filters whose domain can't be - computed on the client side''' + def _apply_custom_operators(self, domain): adjusted_domain = [] for proposition in domain: @@ -98,11 +95,11 @@ class AnalyticEntriesReport(models.Model): adjusted_domain.append(proposition) continue field, operator, value = proposition - if field == 'fiscalyear_id' and operator == 'offset': + if field.endswith('fiscalyear_id') and operator == 'offset': date = datetime.date.today() + relativedelta(years=value) fiscalyear_id = self.env['account.fiscalyear'].find(dt=date) - adjusted_domain.append(('fiscalyear_id', '=', fiscalyear_id)) - elif field == 'period_id' and operator == 'offset': + adjusted_domain.append((field, '=', fiscalyear_id)) + elif field.endswith('period_id') and operator == 'offset': current_period = self.env['account.period'].with_context( account_period_prefer_normal=True).find() @@ -118,10 +115,18 @@ class AnalyticEntriesReport(models.Model): ('asc' if direction == '>=' else 'desc') ) - adjusted_domain.append(('period_id', '=', periods[value].id)) + adjusted_domain.append((field, '=', periods[value].id)) else: adjusted_domain.append(proposition) + return adjusted_domain + + @api.model + def read_group(self, domain, fields, groupby, offset=0, limit=None, + orderby=False, lazy=True): + '''Override read_group to respect filters whose domain can't be + computed on the client side''' + adjusted_domain = self._apply_custom_operators(domain) return super(AnalyticEntriesReport, self).read_group( adjusted_domain, fields, groupby, offset=offset, limit=limit, orderby=orderby, lazy=lazy)