diff --git a/partner_statement/README.rst b/partner_statement/README.rst index 3e48d72f..e7be9282 100644 --- a/partner_statement/README.rst +++ b/partner_statement/README.rst @@ -14,13 +14,13 @@ Partner Statement :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--financial--reporting-lightgray.png?logo=github - :target: https://github.com/OCA/account-financial-reporting/tree/13.0/partner_statement + :target: https://github.com/OCA/account-financial-reporting/tree/14.0/partner_statement :alt: OCA/account-financial-reporting .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/account-financial-reporting-13-0/account-financial-reporting-13-0-partner_statement + :target: https://translation.odoo-community.org/projects/account-financial-reporting-14-0/account-financial-reporting-14-0-partner_statement :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/91/13.0 + :target: https://runbot.odoo-community.org/runbot/91/14.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -96,7 +96,7 @@ 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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -114,6 +114,9 @@ Contributors * Miquel Raïch * Graeme Gellatly * Lois Rilo +* `Tecnativa `_: + + * Víctor Martínez Maintainers ~~~~~~~~~~~ @@ -128,6 +131,6 @@ 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. -This module is part of the `OCA/account-financial-reporting `_ project on GitHub. +This module is part of the `OCA/account-financial-reporting `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/partner_statement/__manifest__.py b/partner_statement/__manifest__.py index 5c859a8a..463db187 100644 --- a/partner_statement/__manifest__.py +++ b/partner_statement/__manifest__.py @@ -3,16 +3,17 @@ { "name": "Partner Statement", - "version": "13.0.1.2.0", + "version": "14.0.1.0.0", "category": "Accounting & Finance", "summary": "OCA Financial Reports", - "author": "ForgeFlow, Odoo Community Association (OCA)", + "author": "ForgeFlow, Tecnativa, Odoo Community Association (OCA)", "website": "https://github.com/OCA/account-financial-reporting", "license": "AGPL-3", "depends": ["account"], "external_dependencies": {"python": ["dateutil"]}, "data": [ "security/statement_security.xml", + "security/ir.model.access.csv", "views/activity_statement.xml", "views/outstanding_statement.xml", "views/assets.xml", diff --git a/partner_statement/i18n/de.po b/partner_statement/i18n/de.po index 1b4b0077..1572d851 100644 --- a/partner_statement/i18n/de.po +++ b/partner_statement/i18n/de.po @@ -528,22 +528,3 @@ msgstr "in" #: model_terms:ir.ui.view,arch_db:partner_statement.statement_common_view msgid "or" msgstr "oder" - -#, fuzzy -#~| msgid "report.customer_activity_statement.statement" -#~ msgid "report.partner_statement.activity_statement" -#~ msgstr "report.customer_activity_statement.statement" - -#, fuzzy -#~| msgid "report.customer_activity_statement.statement" -#~ msgid "report.partner_statement.outstanding_statement" -#~ msgstr "report.customer_activity_statement.statement" - -#~ msgid "Balance Due" -#~ msgstr "Fälliger Saldo" - -#~ msgid "Date:" -#~ msgstr "Datum:" - -#~ msgid "Partner ref:" -#~ msgstr "Partner-Ref.:" diff --git a/partner_statement/i18n/es.po b/partner_statement/i18n/es.po index 7bd63074..469808b8 100644 --- a/partner_statement/i18n/es.po +++ b/partner_statement/i18n/es.po @@ -512,21 +512,3 @@ msgstr "en" #: model_terms:ir.ui.view,arch_db:partner_statement.statement_common_view msgid "or" msgstr "o" - -#~ msgid "Payment" -#~ msgstr "Pago" - -#~ msgid "report.partner_statement.activity_statement" -#~ msgstr "report.partner_statement.activity_statement" - -#~ msgid "report.partner_statement.outstanding_statement" -#~ msgstr "report.partner_statement.outstanding_statement" - -#~ msgid "Balance Due" -#~ msgstr "Saldo" - -#~ msgid "Date:" -#~ msgstr "Fecha:" - -#~ msgid "Partner ref:" -#~ msgstr "Ref. de Cliente:" diff --git a/partner_statement/i18n/es_AR.po b/partner_statement/i18n/es_AR.po index d7a86f2a..14a95334 100644 --- a/partner_statement/i18n/es_AR.po +++ b/partner_statement/i18n/es_AR.po @@ -507,6 +507,3 @@ msgstr "en" #: model_terms:ir.ui.view,arch_db:partner_statement.statement_common_view msgid "or" msgstr "o" - -#~ msgid "Payment" -#~ msgstr "Pago" diff --git a/partner_statement/i18n/fr.po b/partner_statement/i18n/fr.po index c6857bbf..f8a98341 100644 --- a/partner_statement/i18n/fr.po +++ b/partner_statement/i18n/fr.po @@ -508,21 +508,3 @@ msgstr "en" #: model_terms:ir.ui.view,arch_db:partner_statement.statement_common_view msgid "or" msgstr "ou" - -#~ msgid "Payment" -#~ msgstr "Paiement" - -#~ msgid "report.partner_statement.activity_statement" -#~ msgstr "report.customer_activity_statement.statement" - -#~ msgid "report.partner_statement.outstanding_statement" -#~ msgstr "report.customer_activity_statement.statement" - -#~ msgid "Balance Due" -#~ msgstr "Solde dû" - -#~ msgid "Date:" -#~ msgstr "Date :" - -#~ msgid "Partner ref:" -#~ msgstr "Réf. partenaire :" diff --git a/partner_statement/i18n/it.po b/partner_statement/i18n/it.po index ecd2b40f..0e90fd9a 100644 --- a/partner_statement/i18n/it.po +++ b/partner_statement/i18n/it.po @@ -496,12 +496,3 @@ msgstr "in" #: model_terms:ir.ui.view,arch_db:partner_statement.statement_common_view msgid "or" msgstr "o" - -#~ msgid "Payment" -#~ msgstr "Pagamento" - -#~ msgid "report.partner_statement.activity_statement" -#~ msgstr "report.partner_statement.activity_statement" - -#~ msgid "report.partner_statement.outstanding_statement" -#~ msgstr "report.partner_statement.outstanding_statement" diff --git a/partner_statement/i18n/pt_BR.po b/partner_statement/i18n/pt_BR.po index f172fbc3..63b3da20 100644 --- a/partner_statement/i18n/pt_BR.po +++ b/partner_statement/i18n/pt_BR.po @@ -505,12 +505,3 @@ msgstr "em" #: model_terms:ir.ui.view,arch_db:partner_statement.statement_common_view msgid "or" msgstr "ou" - -#~ msgid "Payment" -#~ msgstr "Pagamento" - -#~ msgid "report.partner_statement.activity_statement" -#~ msgstr "report.partner_statement.activity_statement" - -#~ msgid "report.partner_statement.outstanding_statement" -#~ msgstr "report.partner_statement.outstanding_statement" diff --git a/partner_statement/i18n/ro.po b/partner_statement/i18n/ro.po index b4655456..b98e8439 100644 --- a/partner_statement/i18n/ro.po +++ b/partner_statement/i18n/ro.po @@ -507,9 +507,3 @@ msgstr "în" #: model_terms:ir.ui.view,arch_db:partner_statement.statement_common_view msgid "or" msgstr "sau" - -#~ msgid "Payment" -#~ msgstr "Plată" - -#~ msgid "Date:" -#~ msgstr "Data:" diff --git a/partner_statement/readme/CONTRIBUTORS.rst b/partner_statement/readme/CONTRIBUTORS.rst index 22ac2498..ed16be90 100644 --- a/partner_statement/readme/CONTRIBUTORS.rst +++ b/partner_statement/readme/CONTRIBUTORS.rst @@ -1,3 +1,6 @@ * Miquel Raïch * Graeme Gellatly * Lois Rilo +* `Tecnativa `_: + + * Víctor Martínez diff --git a/partner_statement/report/activity_statement.py b/partner_statement/report/activity_statement.py index adddb6f6..3cb3fda2 100644 --- a/partner_statement/report/activity_statement.py +++ b/partner_statement/report/activity_statement.py @@ -14,6 +14,7 @@ class ActivityStatement(models.AbstractModel): _description = "Partner Activity Statement" def _initial_balance_sql_q1(self, partners, date_start, account_type): + # flake8: noqa return str( self._cr.mogrify( """ @@ -28,8 +29,10 @@ class ActivityStatement(models.AbstractModel): END as credit FROM account_move_line l JOIN account_move m ON (l.move_id = m.id) + JOIN account_account l_account ON l.account_id = l_account.id + JOIN account_account_type l_account_type ON l_account.user_type_id = l_account_type.id WHERE l.partner_id IN %(partners)s - AND l.account_internal_type = %(account_type)s + AND l_account_type.type = %(account_type)s AND l.date < %(date_start)s AND not l.blocked AND m.state IN ('posted') GROUP BY l.partner_id, l.currency_id, l.amount_currency, @@ -107,9 +110,11 @@ class ActivityStatement(models.AbstractModel): END as date_maturity FROM account_move_line l JOIN account_move m ON (l.move_id = m.id) + JOIN account_account l_account ON l.account_id = l_account.id + JOIN account_account_type l_account_type ON l_account.user_type_id = l_account_type.id JOIN account_journal aj ON (l.journal_id = aj.id) WHERE l.partner_id IN %(partners)s - AND l.account_internal_type = %(account_type)s + AND l_account_type.type = %(account_type)s AND %(date_start)s <= l.date AND l.date <= %(date_end)s AND m.state IN ('posted') diff --git a/partner_statement/report/outstanding_statement.py b/partner_statement/report/outstanding_statement.py index f1ae61e8..35a6f6b0 100644 --- a/partner_statement/report/outstanding_statement.py +++ b/partner_statement/report/outstanding_statement.py @@ -13,6 +13,7 @@ class OutstandingStatement(models.AbstractModel): def _display_lines_sql_q1(self, partners, date_end, account_type): partners = tuple(partners) + # flake8: noqa return str( self._cr.mogrify( """ @@ -35,8 +36,8 @@ class OutstandingStatement(models.AbstractModel): ELSE l.balance + sum(coalesce(pc.amount, 0.0)) END AS open_amount, CASE WHEN l.balance > 0.0 - THEN l.amount_currency - sum(coalesce(pd.amount_currency, 0.0)) - ELSE l.amount_currency + sum(coalesce(pc.amount_currency, 0.0)) + THEN l.amount_currency - sum(coalesce(pd.debit_amount_currency, 0.0)) + ELSE l.amount_currency + sum(coalesce(pc.debit_amount_currency, 0.0)) END AS open_amount_currency, CASE WHEN l.date_maturity is null THEN l.date @@ -44,6 +45,8 @@ class OutstandingStatement(models.AbstractModel): END as date_maturity FROM account_move_line l JOIN account_move m ON (l.move_id = m.id) + JOIN account_account l_account ON l.account_id = l_account.id + JOIN account_account_type l_account_type ON l_account.user_type_id = l_account_type.id LEFT JOIN (SELECT pr.* FROM account_partial_reconcile pr INNER JOIN account_move_line l2 @@ -57,7 +60,7 @@ class OutstandingStatement(models.AbstractModel): WHERE l2.date <= %(date_end)s ) as pc ON pc.credit_move_id = l.id WHERE l.partner_id IN %(partners)s - AND l.account_internal_type = %(account_type)s + AND l_account_type.type = %(account_type)s AND ( (pd.id IS NOT NULL AND pd.max_date <= %(date_end)s) OR diff --git a/partner_statement/report/report_statement_common.py b/partner_statement/report/report_statement_common.py index e4ac4819..afe53125 100644 --- a/partner_statement/report/report_statement_common.py +++ b/partner_statement/report/report_statement_common.py @@ -35,6 +35,7 @@ class ReportStatementCommon(models.AbstractModel): return {} def _show_buckets_sql_q1(self, partners, date_end, account_type): + # flake8: noqa return str( self._cr.mogrify( """ @@ -44,8 +45,8 @@ class ReportStatementCommon(models.AbstractModel): ELSE l.balance + sum(coalesce(pc.amount, 0.0)) END AS open_due, CASE WHEN l.balance > 0.0 - THEN l.amount_currency - sum(coalesce(pd.amount_currency, 0.0)) - ELSE l.amount_currency + sum(coalesce(pc.amount_currency, 0.0)) + THEN l.amount_currency - sum(coalesce(pd.debit_amount_currency, 0.0)) + ELSE l.amount_currency + sum(coalesce(pc.debit_amount_currency, 0.0)) END AS open_due_currency, CASE WHEN l.date_maturity is null THEN l.date @@ -53,6 +54,8 @@ class ReportStatementCommon(models.AbstractModel): END as date_maturity FROM account_move_line l JOIN account_move m ON (l.move_id = m.id) + JOIN account_account l_account ON l.account_id = l_account.id + JOIN account_account_type l_account_type ON l_account.user_type_id = l_account_type.id LEFT JOIN (SELECT pr.* FROM account_partial_reconcile pr INNER JOIN account_move_line l2 @@ -66,7 +69,7 @@ class ReportStatementCommon(models.AbstractModel): WHERE l2.date <= %(date_end)s ) as pc ON pc.credit_move_id = l.id WHERE l.partner_id IN %(partners)s - AND l.account_internal_type = %(account_type)s + AND l_account_type.type = %(account_type)s AND ( (pd.id IS NOT NULL AND pd.max_date <= %(date_end)s) OR diff --git a/partner_statement/security/ir.model.access.csv b/partner_statement/security/ir.model.access.csv new file mode 100644 index 00000000..146cee0e --- /dev/null +++ b/partner_statement/security/ir.model.access.csv @@ -0,0 +1,3 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_activity_statement_wizard,activity.statement.wizard,model_activity_statement_wizard,base.group_user,1,1,1,0 +access_outstanding_statement_wizard,outstanding.statement.wizard,model_outstanding_statement_wizard,base.group_user,1,1,1,0 diff --git a/partner_statement/static/description/index.html b/partner_statement/static/description/index.html index 22a1653f..b1fe4f9e 100644 --- a/partner_statement/static/description/index.html +++ b/partner_statement/static/description/index.html @@ -3,7 +3,7 @@ - + Partner Statement