diff --git a/README.rst b/README.rst index d3793eb51f2d2c40357b32d44c90da37956191fb_UkVBRE1FLnJzdA==..f546a38b8faa0976b64f373f28ec63ac93e8549c_UkVBRE1FLnJzdA== 100644 --- a/README.rst +++ b/README.rst @@ -23,7 +23,7 @@ * Model (``model``): ``account.move.line``. - * Technical name (``report_name``): ``account_report.account_statement``. + * Technical name (``report_name``): ``account_report.report_account_statement``. * Parser (``parser``): ``account_report.reports.account_statement.Parser``. Optional; provides ``debit_sum``, ``credit_sum``, ``balance_sum``. diff --git a/__init__.py b/__init__.py index d3793eb51f2d2c40357b32d44c90da37956191fb_X19pbml0X18ucHk=..f546a38b8faa0976b64f373f28ec63ac93e8549c_X19pbml0X18ucHk= 100644 --- a/__init__.py +++ b/__init__.py @@ -2,4 +2,4 @@ from . import models, wizards -# from . import reports +from . import reports diff --git a/reports/account_statement.py b/reports/account_statement.py index d3793eb51f2d2c40357b32d44c90da37956191fb_cmVwb3J0cy9hY2NvdW50X3N0YXRlbWVudC5weQ==..f546a38b8faa0976b64f373f28ec63ac93e8549c_cmVwb3J0cy9hY2NvdW50X3N0YXRlbWVudC5weQ== 100644 --- a/reports/account_statement.py +++ b/reports/account_statement.py @@ -18,6 +18,6 @@ # ############################################################################## -from odoo.report.report_sxw import rml_parse as BaseOdooParser +from odoo import api, models @@ -22,9 +22,5 @@ -class Parser(BaseOdooParser): - """Parser of use to account statement reports which precomputes amount - sums directly usable by the report. - - This parser is meant to be used for "account.move.line" objects. - """ +class ReportAccountStatement(models.AbstractModel): + _name = 'report.account_report.report_account_statement' @@ -30,13 +26,7 @@ - def set_context(self, objects, data, ids, report_type=None): - """Override to precompute amount sums. - """ - - ret = super(Parser, self).set_context( - objects, data, ids, report_type=report_type - ) - + @api.model + def _get_report_values(self, docids, data=None): debit_sum = 0.0 credit_sum = 0.0 balance_sum = 0.0 @@ -39,9 +29,9 @@ debit_sum = 0.0 credit_sum = 0.0 balance_sum = 0.0 - for accentry in objects: - debit_sum += accentry.debit - credit_sum += accentry.credit - balance_sum += accentry.reporting_balance + for doc in docids: + debit_sum += doc.debit + credit_sum += doc.credit + balance_sum += doc.reporting_balance @@ -47,10 +37,6 @@ - self.localcontext.update( - { - "debit_sum": debit_sum, - "credit_sum": credit_sum, - "balance_sum": balance_sum, - } - ) - - return ret + return { + 'debit_sum': debit_sum, + 'credit_sum': credit_sum, + 'balance_sum': balance_sum, + }