From f3e1ac3b18f405f37d2ed669fb56723f9723f59c Mon Sep 17 00:00:00 2001 From: Rujia Liu Date: Tue, 30 Mar 2021 12:00:34 +1300 Subject: [PATCH] [MIG] partner_statement: Migration to 14.0 --- partner_statement/README.rst | 10 +- partner_statement/__manifest__.py | 3 +- partner_statement/i18n/partner_statement.pot | 66 ++++---- partner_statement/i18n/pt.po | 143 ++++++++++-------- .../report/activity_statement.py | 10 +- .../report/outstanding_statement.py | 106 ++++++------- .../report/report_statement_common.py | 95 +++++------- .../security/ir.model.access.csv | 3 + .../static/description/index.html | 6 +- .../tests/test_res_config_settings.py | 2 +- .../views/activity_statement.xml | 16 +- .../views/outstanding_statement.xml | 16 +- partner_statement/wizard/statement_common.py | 8 +- partner_statement/wizard/statement_wizard.xml | 74 ++++----- 14 files changed, 274 insertions(+), 284 deletions(-) create mode 100644 partner_statement/security/ir.model.access.csv diff --git a/partner_statement/README.rst b/partner_statement/README.rst index 3e48d72f..fd97708f 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. @@ -128,6 +128,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 41cd1861..5dafa7e1 100644 --- a/partner_statement/__manifest__.py +++ b/partner_statement/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Partner Statement", - "version": "13.0.1.2.2", + "version": "14.0.1.0.0", "category": "Accounting & Finance", "summary": "OCA Financial Reports", "author": "ForgeFlow, Odoo Community Association (OCA)", @@ -12,6 +12,7 @@ "depends": ["account"], "external_dependencies": {"python": ["dateutil"]}, "data": [ + "security/ir.model.access.csv", "security/statement_security.xml", "views/activity_statement.xml", "views/outstanding_statement.xml", diff --git a/partner_statement/i18n/partner_statement.pot b/partner_statement/i18n/partner_statement.pot index 2eec1e9a..e4b2b042 100644 --- a/partner_statement/i18n/partner_statement.pot +++ b/partner_statement/i18n/partner_statement.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 13.0\n" +"Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" @@ -67,6 +67,39 @@ msgstr "" msgid "91 - 120 Days" msgstr "" +#. module: partner_statement +#: model_terms:ir.ui.view,arch_db:partner_statement.statement_common_view +msgid "" +"Aging details can be shown in the report, expressed in aging\n" +" buckets, so the partner can review how much is open, due or overdue.\n" +" " +msgstr "" + +#. module: partner_statement +#: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_wizard_view +msgid "" +"The activity statement provides details of all activity on\n" +" a partner's receivables and payables between two selected dates. This includes all invoices,\n" +" refunds and payments. Any outstanding balance dated prior to the chosen statement\n" +" period will appear as a forward balance at the top of the statement. The list is\n" +" displayed in chronological order and is split by currencies.\n" +" \n" +"
\n" +"
" +msgstr "" + +#. module: partner_statement +#: model_terms:ir.ui.view,arch_db:partner_statement.outstanding_statement_wizard_view +msgid "" +"The outstanding statement provides details of all partner's outstanding\n" +" receivables and payables up to a particular date. This includes all unpaid invoices, unclaimed\n" +" refunds and outstanding payments. The list is displayed in chronological order and is\n" +" split by currencies.\n" +" \n" +"
\n" +"
" +msgstr "" + #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document #: model_terms:ir.ui.view,arch_db:partner_statement.outstanding_statement_document @@ -142,13 +175,6 @@ msgstr "" msgid "Aging Report at" msgstr "" -#. module: partner_statement -#: model_terms:ir.ui.view,arch_db:partner_statement.statement_common_view -msgid "" -"Aging details can be shown in the report, expressed in aging " -"buckets, so the partner can review how much is open, due or overdue." -msgstr "" - #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document msgid "Amount" @@ -230,6 +256,7 @@ msgstr "" #: model:ir.model.fields,field_description:partner_statement.field_outstanding_statement_wizard__display_name #: model:ir.model.fields,field_description:partner_statement.field_report_partner_statement_activity_statement__display_name #: model:ir.model.fields,field_description:partner_statement.field_report_partner_statement_outstanding_statement__display_name +#: model:ir.model.fields,field_description:partner_statement.field_res_config_settings__display_name #: model:ir.model.fields,field_description:partner_statement.field_statement_common__display_name #: model:ir.model.fields,field_description:partner_statement.field_statement_common_wizard__display_name msgid "Display Name" @@ -286,6 +313,7 @@ msgstr "" #: model:ir.model.fields,field_description:partner_statement.field_outstanding_statement_wizard__id #: model:ir.model.fields,field_description:partner_statement.field_report_partner_statement_activity_statement__id #: model:ir.model.fields,field_description:partner_statement.field_report_partner_statement_outstanding_statement__id +#: model:ir.model.fields,field_description:partner_statement.field_res_config_settings__id #: model:ir.model.fields,field_description:partner_statement.field_statement_common__id #: model:ir.model.fields,field_description:partner_statement.field_statement_common_wizard__id msgid "ID" @@ -296,6 +324,7 @@ msgstr "" #: model:ir.model.fields,field_description:partner_statement.field_outstanding_statement_wizard____last_update #: model:ir.model.fields,field_description:partner_statement.field_report_partner_statement_activity_statement____last_update #: model:ir.model.fields,field_description:partner_statement.field_report_partner_statement_outstanding_statement____last_update +#: model:ir.model.fields,field_description:partner_statement.field_res_config_settings____last_update #: model:ir.model.fields,field_description:partner_statement.field_statement_common____last_update #: model:ir.model.fields,field_description:partner_statement.field_statement_common_wizard____last_update msgid "Last Modified on" @@ -434,27 +463,6 @@ msgstr "" msgid "Supplier" msgstr "" -#. module: partner_statement -#: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_wizard_view -msgid "" -"The activity statement provides details of all activity on" -" a partner's receivables and payables between two " -"selected dates. This includes all invoices, refunds and " -"payments. Any outstanding balance dated prior to the chosen statement" -" period will appear as a forward balance at the top of " -"the statement. The list is displayed in chronological " -"order and is split by currencies." -msgstr "" - -#. module: partner_statement -#: model_terms:ir.ui.view,arch_db:partner_statement.outstanding_statement_wizard_view -msgid "" -"The outstanding statement provides details of all partner's outstanding" -" receivables and payables up to a particular date. This includes all" -" unpaid invoices, unclaimed refunds and outstanding payments. The " -"list is displayed in chronological order and is split by currencies." -msgstr "" - #. module: partner_statement #: code:addons/partner_statement/report/report_statement_common.py:0 #: code:addons/partner_statement/report/report_statement_common.py:0 diff --git a/partner_statement/i18n/pt.po b/partner_statement/i18n/pt.po index cfee3535..f3834ba6 100644 --- a/partner_statement/i18n/pt.po +++ b/partner_statement/i18n/pt.po @@ -9,115 +9,117 @@ msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-12-22 16:14+0000\n" -"PO-Revision-Date: 2017-12-22 16:14+0000\n" -"Last-Translator: Pedro Castro Silva , " -"2017\n" +"PO-Revision-Date: 2021-11-15 13:36+0000\n" +"Last-Translator: Pedro Castro Silva \n" "Language-Team: Portuguese (https://www.transifex.com/oca/teams/23907/pt/)\n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Weblate 4.3.2\n" #. module: partner_statement #: code:addons/partner_statement/report/report_statement_common.py:0 #, python-format msgid "1 - 30 Days" -msgstr "" +msgstr "1 - 30 Dias" #. module: partner_statement #: code:addons/partner_statement/report/report_statement_common.py:0 #, python-format msgid "1 Month" -msgstr "" +msgstr "1 Mês" #. module: partner_statement #: code:addons/partner_statement/report/report_statement_common.py:0 #, python-format msgid "121 Days +" -msgstr "" +msgstr "121 Dias +" #. module: partner_statement #: code:addons/partner_statement/report/report_statement_common.py:0 #, python-format msgid "2 Months" -msgstr "" +msgstr "2 Meses" #. module: partner_statement #: code:addons/partner_statement/report/report_statement_common.py:0 #, python-format msgid "3 Months" -msgstr "" +msgstr "3 Meses" #. module: partner_statement #: code:addons/partner_statement/report/report_statement_common.py:0 #, python-format msgid "31 - 60 Days" -msgstr "" +msgstr "31 - 60 Dias" #. module: partner_statement #: code:addons/partner_statement/report/report_statement_common.py:0 #, python-format msgid "4 Months" -msgstr "" +msgstr "4 Meses" #. module: partner_statement #: code:addons/partner_statement/report/report_statement_common.py:0 #, python-format msgid "61 - 90 Days" -msgstr "" +msgstr "61 - 90 Dias" #. module: partner_statement #: code:addons/partner_statement/report/report_statement_common.py:0 #, python-format msgid "91 - 120 Days" -msgstr "" +msgstr "91 - 120 Dias" #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document #: model_terms:ir.ui.view,arch_db:partner_statement.outstanding_statement_document msgid "Date:" -msgstr "" +msgstr "Data:" #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document #: model_terms:ir.ui.view,arch_db:partner_statement.outstanding_statement_document msgid "Partner Code:" -msgstr "" +msgstr "Código do Parceiro:" #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document #: model_terms:ir.ui.view,arch_db:partner_statement.outstanding_statement_document msgid "Partner Name:" -msgstr "" +msgstr "Nome do Parceiro:" #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document #: model_terms:ir.ui.view,arch_db:partner_statement.outstanding_statement_document msgid "The partner doesn't have due entries." -msgstr "" +msgstr "O parceiro não tem movimentos vencidos." #. module: partner_statement #: model:ir.model.fields,field_description:partner_statement.field_activity_statement_wizard__account_type #: model:ir.model.fields,field_description:partner_statement.field_outstanding_statement_wizard__account_type #: model:ir.model.fields,field_description:partner_statement.field_statement_common_wizard__account_type msgid "Account type" -msgstr "" +msgstr "Tipo de Conta" #. module: partner_statement #: model:ir.actions.report,name:partner_statement.action_print_activity_statement msgid "Activity Statement" -msgstr "" +msgstr "Extrato de Movimentos" #. module: partner_statement #: model:ir.model,name:partner_statement.model_activity_statement_wizard msgid "Activity Statement Wizard" -msgstr "" +msgstr "Assistente de Extrato de Movimentos" #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.res_config_settings_view_form msgid "Activity Statements show all transactions between two dates." msgstr "" +"Os Extratos de Movimentos mostram todas as transações compreendidas entre " +"duas datas." #. module: partner_statement #: model:ir.model.fields.selection,name:partner_statement.selection__activity_statement_wizard__aging_type__days @@ -125,7 +127,7 @@ msgstr "" #: model:ir.model.fields.selection,name:partner_statement.selection__res_config_settings__default_aging_type__days #: model:ir.model.fields.selection,name:partner_statement.selection__statement_common_wizard__aging_type__days msgid "Age by Days" -msgstr "" +msgstr "Antiguidade por Dias" #. module: partner_statement #: model:ir.model.fields.selection,name:partner_statement.selection__activity_statement_wizard__aging_type__months @@ -133,7 +135,7 @@ msgstr "" #: model:ir.model.fields.selection,name:partner_statement.selection__res_config_settings__default_aging_type__months #: model:ir.model.fields.selection,name:partner_statement.selection__statement_common_wizard__aging_type__months msgid "Age by Months" -msgstr "" +msgstr "Antiguidade por Meses" #. module: partner_statement #: model:ir.model.fields,field_description:partner_statement.field_activity_statement_wizard__aging_type @@ -141,12 +143,12 @@ msgstr "" #: model:ir.model.fields,field_description:partner_statement.field_res_config_settings__default_aging_type #: model:ir.model.fields,field_description:partner_statement.field_statement_common_wizard__aging_type msgid "Aging Method" -msgstr "" +msgstr "Método de Antiguidade" #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.aging_buckets msgid "Aging Report at" -msgstr "" +msgstr "Resumo de Antiguidades a" #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.statement_common_view @@ -154,11 +156,14 @@ msgid "" "Aging details can be shown in the report, expressed in aging " "buckets, so the partner can review how much is open, due or overdue." msgstr "" +"Os detalhes de antiguidade podem ser mostrados no relatório, expressos em " +"intervalos de antiguidade, para que o parceiro possa rever quanto está " +"aberto, devido ou vencido." #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document msgid "Amount" -msgstr "" +msgstr "Montante" #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document @@ -169,7 +174,7 @@ msgstr "Saldo" #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document msgid "Balance Forward" -msgstr "" +msgstr "Saldo à Data" #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.statement_common_view @@ -186,7 +191,7 @@ msgstr "Empresa" #. module: partner_statement #: model:ir.model,name:partner_statement.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Parâmetros de Configuração" #. module: partner_statement #: model:ir.model.fields,field_description:partner_statement.field_activity_statement_wizard__create_uid @@ -204,7 +209,7 @@ msgstr "Criado em" #: code:addons/partner_statement/report/report_statement_common.py:0 #, python-format msgid "Current" -msgstr "" +msgstr "Corrente" #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document @@ -216,20 +221,19 @@ msgstr "Data" #: model:ir.model.fields,field_description:partner_statement.field_activity_statement_wizard__date_end #: model:ir.model.fields,field_description:partner_statement.field_outstanding_statement_wizard__date_end #: model:ir.model.fields,field_description:partner_statement.field_statement_common_wizard__date_end -#, fuzzy msgid "Date End" -msgstr "Data" +msgstr "Data Final" #. module: partner_statement #: model:ir.model.fields,field_description:partner_statement.field_activity_statement_wizard__date_start msgid "Date Start" -msgstr "" +msgstr "Data de Início" #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document #: model_terms:ir.ui.view,arch_db:partner_statement.outstanding_statement_document msgid "Description" -msgstr "" +msgstr "Descrição" #. module: partner_statement #: model:ir.model.fields,field_description:partner_statement.field_activity_statement_wizard__display_name @@ -246,29 +250,28 @@ msgstr "Exibir nome" #: model:ir.model.fields,field_description:partner_statement.field_outstanding_statement_wizard__filter_partners_non_due #: model:ir.model.fields,field_description:partner_statement.field_statement_common_wizard__filter_partners_non_due msgid "Don't show partners with no due entries" -msgstr "" +msgstr "Não mostrar parceiros sem entradas vencidas" #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.outstanding_statement_document -#, fuzzy msgid "Due Date" -msgstr "Data" +msgstr "Data de Vencimento" #. module: partner_statement #: model:ir.model.fields,field_description:partner_statement.field_res_config_settings__group_activity_statement msgid "Enable OCA Activity Statements" -msgstr "" +msgstr "Ativar Extratos de Movimentos OCA" #. module: partner_statement #: model:ir.model.fields,field_description:partner_statement.field_res_config_settings__group_outstanding_statement msgid "Enable OCA Outstanding Statements" -msgstr "" +msgstr "Ativar Extratos de Pendentes OCA" #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document #: model_terms:ir.ui.view,arch_db:partner_statement.outstanding_statement_document msgid "Ending Balance" -msgstr "" +msgstr "Saldo Final" #. module: partner_statement #: model:ir.model.fields,field_description:partner_statement.field_activity_statement_wizard__filter_negative_balances @@ -276,12 +279,12 @@ msgstr "" #: model:ir.model.fields,field_description:partner_statement.field_res_config_settings__default_filter_negative_balances #: model:ir.model.fields,field_description:partner_statement.field_statement_common_wizard__filter_negative_balances msgid "Exclude Negative Balances" -msgstr "" +msgstr "Excluir Saldos Negativos" #. module: partner_statement #: model:ir.model.fields,field_description:partner_statement.field_res_config_settings__default_filter_partners_non_due msgid "Exclude partners with no due entries" -msgstr "" +msgstr "Excluir parceiros sem entradas vencidas" #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.statement_common_view @@ -325,82 +328,84 @@ msgstr "Última atualização por" #: model:ir.model.fields,field_description:partner_statement.field_outstanding_statement_wizard__name #: model:ir.model.fields,field_description:partner_statement.field_statement_common_wizard__name msgid "Name" -msgstr "" +msgstr "Nome" #. module: partner_statement #: model:ir.model.fields,field_description:partner_statement.field_activity_statement_wizard__number_partner_ids #: model:ir.model.fields,field_description:partner_statement.field_outstanding_statement_wizard__number_partner_ids #: model:ir.model.fields,field_description:partner_statement.field_statement_common_wizard__number_partner_ids msgid "Number Partner" -msgstr "" +msgstr "Nº do Parceiro" #. module: partner_statement #: code:addons/partner_statement/report/report_statement_common.py:0 #, python-format msgid "Older" -msgstr "" +msgstr "Mais Antigo" #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.outstanding_statement_document msgid "Open Amount" -msgstr "" +msgstr "Valor a Liq." #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.outstanding_statement_document msgid "Original" -msgstr "" +msgstr "Original" #. module: partner_statement #: model:ir.actions.report,name:partner_statement.action_print_outstanding_statement msgid "Outstanding Statement" -msgstr "" +msgstr "Extrato de Documentos Pendentes" #. module: partner_statement #: model:ir.model,name:partner_statement.model_outstanding_statement_wizard msgid "Outstanding Statement Wizard" -msgstr "" +msgstr "Assistente de Extrato de Documentos Pendentes" #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.res_config_settings_view_form msgid "Outstanding Statements show all transactions up to a date." msgstr "" +"Os Extratos de Documentos Pendentes mostram todas as transações até uma " +"certa data." #. module: partner_statement #: model:ir.actions.act_window,name:partner_statement.activity_statement_wizard_action #: model:ir.model,name:partner_statement.model_report_partner_statement_activity_statement msgid "Partner Activity Statement" -msgstr "" +msgstr "Extrato de Movimentos de Parceiro" #. module: partner_statement #: model:ir.actions.act_window,name:partner_statement.outstanding_statement_wizard_action #: model:ir.model,name:partner_statement.model_report_partner_statement_outstanding_statement msgid "Partner Outstanding Statement" -msgstr "" +msgstr "Extrato de Pendentes de Parceiro" #. module: partner_statement #: model:ir.model.fields.selection,name:partner_statement.selection__activity_statement_wizard__account_type__payable #: model:ir.model.fields.selection,name:partner_statement.selection__outstanding_statement_wizard__account_type__payable #: model:ir.model.fields.selection,name:partner_statement.selection__statement_common_wizard__account_type__payable msgid "Payable" -msgstr "" +msgstr "A Pagar" #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.res_config_settings_view_form msgid "Please set defaults under Activity Statements." -msgstr "" +msgstr "Por favor, defina os valores padrão em Extrato de Movimentos." #. module: partner_statement #: model:ir.model.fields.selection,name:partner_statement.selection__activity_statement_wizard__account_type__receivable #: model:ir.model.fields.selection,name:partner_statement.selection__outstanding_statement_wizard__account_type__receivable #: model:ir.model.fields.selection,name:partner_statement.selection__statement_common_wizard__account_type__receivable msgid "Receivable" -msgstr "" +msgstr "A Receber" #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document #: model_terms:ir.ui.view,arch_db:partner_statement.outstanding_statement_document msgid "Reference number" -msgstr "" +msgstr "Referência" #. module: partner_statement #: model:ir.model.fields,field_description:partner_statement.field_activity_statement_wizard__show_aging_buckets @@ -408,38 +413,38 @@ msgstr "" #: model:ir.model.fields,field_description:partner_statement.field_res_config_settings__default_show_aging_buckets #: model:ir.model.fields,field_description:partner_statement.field_statement_common_wizard__show_aging_buckets msgid "Show Aging Buckets" -msgstr "" +msgstr "Mostrar Interv. Antiguidade" #. module: partner_statement #: model:ir.model,name:partner_statement.model_statement_common msgid "Statement Reports Common" -msgstr "" +msgstr "Relatórios Comuns de Extrato" #. module: partner_statement #: model:ir.model,name:partner_statement.model_statement_common_wizard msgid "Statement Reports Common Wizard" -msgstr "" +msgstr "Assistente de Relatórios Comuns de Extrato" #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document msgid "Statement between" -msgstr "" +msgstr "Extrato entre" #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document #: model_terms:ir.ui.view,arch_db:partner_statement.outstanding_statement_document msgid "Statement of Account" -msgstr "" +msgstr "Extrato de Conta" #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.outstanding_statement_document msgid "Statement up to" -msgstr "" +msgstr "Exrtato até" #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document msgid "Supplier" -msgstr "" +msgstr "Fornecedor" #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_wizard_view @@ -452,6 +457,12 @@ msgid "" "top of the statement. The list is displayed in " "chronological order and is split by currencies." msgstr "" +"O extrato de conta fornece os detalhes de todos os movimentos sobre as " +"contas a receber e a pagar de um parceiro entre duas datas selecionadas. " +"Isto inclui todas as faturas, créditos e pagamentos. Qualquer saldo pendente " +"datado antes do período escolhido para o extrato aparecerá como um saldo à " +"data no topo da declaração. A lista é exibida em ordem cronológica e " +"dividida por moedas." #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.outstanding_statement_wizard_view @@ -462,34 +473,38 @@ msgid "" "payments. The list is displayed in chronological order and is split " "by currencies." msgstr "" +"O extrato de documentos pendentes fornece detalhes de todos os valores " +"pendentes do parceiro, a pagar ou a receber, até uma determinada data. Isto " +"inclui todas as faturas não pagas, créditos não reclamados e pagamentos " +"pendentes. A lista é exibida em ordem cronológica e dividida por moedas." #. module: partner_statement #: code:addons/partner_statement/report/report_statement_common.py:0 #, python-format msgid "Total" -msgstr "" +msgstr "Total" #. module: partner_statement #: model:res.groups,name:partner_statement.group_activity_statement msgid "Use activity statements" -msgstr "" +msgstr "Usar extratos de movimentos" #. module: partner_statement #: model:res.groups,name:partner_statement.group_outstanding_statement msgid "Use outstanding statements" -msgstr "" +msgstr "Usar extratos de pendentes" #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document msgid "and" -msgstr "" +msgstr "e" #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document #: model_terms:ir.ui.view,arch_db:partner_statement.aging_buckets #: model_terms:ir.ui.view,arch_db:partner_statement.outstanding_statement_document msgid "in" -msgstr "" +msgstr "em" #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.statement_common_view diff --git a/partner_statement/report/activity_statement.py b/partner_statement/report/activity_statement.py index a6be08bc..c7c52986 100644 --- a/partner_statement/report/activity_statement.py +++ b/partner_statement/report/activity_statement.py @@ -23,13 +23,15 @@ class ActivityStatement(models.AbstractModel): ELSE sum(l.debit) END as debit, CASE WHEN l.currency_id is not null AND l.amount_currency < 0.0 - THEN sum(-l.amount_currency) + THEN sum(l.amount_currency * (-1)) ELSE sum(l.credit) END as credit FROM account_move_line l + JOIN account_account aa ON (aa.id = l.account_id) + JOIN account_account_type at ON (at.id = aa.user_type_id) JOIN account_move m ON (l.move_id = m.id) WHERE l.partner_id IN %(partners)s - AND l.account_internal_type = %(account_type)s + AND at.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, l.company_id @@ -105,10 +107,12 @@ class ActivityStatement(models.AbstractModel): ELSE l.date_maturity END as date_maturity FROM account_move_line l + JOIN account_account aa ON (aa.id = l.account_id) + JOIN account_account_type at ON (at.id = aa.user_type_id) JOIN account_move m ON (l.move_id = m.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 at.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 7f406340..2cbd7846 100644 --- a/partner_statement/report/outstanding_statement.py +++ b/partner_statement/report/outstanding_statement.py @@ -16,76 +16,62 @@ class OutstandingStatement(models.AbstractModel): return str( self._cr.mogrify( """ - SELECT l.id, m.name AS move_id, l.partner_id, l.date, l.name, - l.blocked, l.currency_id, l.company_id, - CASE WHEN l.ref IS NOT NULL THEN l.ref ELSE m.ref END as ref, + SELECT l.id, m.name AS move_id, l.partner_id, l.date, l.name, + l.blocked, l.currency_id, l.company_id, + CASE WHEN l.ref IS NOT NULL + THEN l.ref + ELSE m.ref + END as ref, CASE WHEN (l.currency_id is not null AND l.amount_currency > 0.0) THEN avg(l.amount_currency) ELSE avg(l.debit) END as debit, CASE WHEN (l.currency_id is not null AND l.amount_currency < 0.0) - THEN avg(-l.amount_currency) + THEN avg(l.amount_currency * (-1)) ELSE avg(l.credit) END as credit, - (abs(COALESCE(l.balance, 0.0)) + sum( - coalesce(pr.pr_sign, 0.0) * coalesce(pr.amount, 0.0)) - ) * sign(COALESCE(l.balance, 0.0)) AS open_amount, - (abs(COALESCE(l.amount_currency, 0.0)) + sum( - coalesce(pr.pr_sign, 0.0) * CASE - WHEN pr.currency_id IS NOT NULL AND pr.currency_id = l.currency_id - THEN coalesce(pr.amount_currency, 0.0) - WHEN cur.id IS NOT NULL AND ROUND( - abs(COALESCE(l.balance, 0.0)), cur.decimal_places) > 0.0 - THEN ROUND(coalesce(pr.amount, 0.0) * - COALESCE(l.amount_currency, 0.0) / NULLIF(l.balance, 0.0), - cur.decimal_places) - ELSE ROUND(coalesce(pr.amount, 0.0) * - COALESCE(( - SELECT r.rate FROM res_currency_rate r - JOIN account_move_line aml - ON pr.credit_move_id = aml.id - WHERE r.currency_id = l.currency_id - AND r.name <= aml.date - AND (r.company_id IS NULL - OR r.company_id = l.company_id) - ORDER BY r.company_id, r.name DESC LIMIT 1), 1.0), - cur.decimal_places) - END) - ) * sign(COALESCE(l.amount_currency, 0.0)) AS open_amount_currency, + CASE WHEN l.balance > 0.0 + THEN l.balance - sum(coalesce(pd.amount, 0.0)) + 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.debit_amount_currency, 0.0)) + ELSE l.amount_currency + sum(coalesce(pc.credit_amount_currency, 0.0)) + END AS open_amount_currency, CASE WHEN l.date_maturity is null THEN l.date ELSE l.date_maturity END as date_maturity - FROM ( - SELECT l.*, CASE - WHEN l.debit = 0.0 AND l.credit = 0.0 AND l.currency_id IS NOT NULL - AND ROUND(COALESCE(l.amount_currency, 0.0), - cur.decimal_places) > 0.0 THEN 1 - WHEN l.debit = 0.0 AND l.credit = 0.0 AND l.currency_id IS NOT NULL - AND ROUND(COALESCE(l.amount_currency, 0.0), - cur.decimal_places) < 0.0 THEN -1 - WHEN l.balance > 0.0 THEN 1 ELSE -1 END as sign FROM account_move_line l - LEFT JOIN res_currency cur ON cur.id = l.currency_id - ) l - JOIN account_move m ON l.move_id = m.id - LEFT JOIN res_currency cur ON cur.id = l.currency_id - LEFT JOIN LATERAL (SELECT pr.*, - CASE WHEN pr.credit_move_id = l.id THEN l.sign - ELSE -l.sign END AS pr_sign - FROM account_partial_reconcile pr - WHERE pr.max_date <= %(date_end)s AND ( - (pr.debit_move_id = l.id) OR (pr.credit_move_id = l.id)) - ) as pr ON TRUE - WHERE l.partner_id IN %(partners)s - AND l.account_internal_type = %(account_type)s - AND ( - (pr.id IS NOT NULL AND pr.max_date <= %(date_end)s) OR - (pr.id IS NULL) - ) AND l.date <= %(date_end)s AND m.state IN ('posted') - GROUP BY l.id, l.partner_id, m.name, l.date, l.date_maturity, l.name, - CASE WHEN l.ref IS NOT NULL THEN l.ref ELSE m.ref END, - l.blocked, l.currency_id, l.balance, l.amount_currency, l.company_id + JOIN account_account aa ON (aa.id = l.account_id) + JOIN account_account_type at ON (at.id = aa.user_type_id) + JOIN account_move m ON (l.move_id = m.id) + LEFT JOIN (SELECT pr.* + FROM account_partial_reconcile pr + INNER JOIN account_move_line l2 + ON pr.credit_move_id = l2.id + WHERE l2.date <= %(date_end)s + ) as pd ON pd.debit_move_id = l.id + LEFT JOIN (SELECT pr.* + FROM account_partial_reconcile pr + INNER JOIN account_move_line l2 + ON pr.debit_move_id = l2.id + WHERE l2.date <= %(date_end)s + ) as pc ON pc.credit_move_id = l.id + WHERE l.partner_id IN %(partners)s AND at.type = %(account_type)s + AND ( + (pd.id IS NOT NULL AND + pd.max_date <= %(date_end)s) OR + (pc.id IS NOT NULL AND + pc.max_date <= %(date_end)s) OR + (pd.id IS NULL AND pc.id IS NULL) + ) AND l.date <= %(date_end)s AND m.state IN ('posted') + GROUP BY l.id, l.partner_id, m.name, l.date, l.date_maturity, l.name, + CASE WHEN l.ref IS NOT NULL + THEN l.ref + ELSE m.ref + END, + l.blocked, l.currency_id, l.balance, l.amount_currency, l.company_id """, locals(), ), @@ -121,9 +107,7 @@ class OutstandingStatement(models.AbstractModel): Q2.open_amount FROM Q2 JOIN res_company c ON (c.id = Q2.company_id) - JOIN res_currency cur ON cur.id = COALESCE(Q2.currency_id, c.currency_id) - WHERE c.id = %(company_id)s AND - round(Q2.open_amount, cur.decimal_places) != 0.0 + WHERE c.id = %(company_id)s AND Q2.open_amount != 0.0 """, locals(), ), diff --git a/partner_statement/report/report_statement_common.py b/partner_statement/report/report_statement_common.py index fbada72a..e48f83b5 100644 --- a/partner_statement/report/report_statement_common.py +++ b/partner_statement/report/report_statement_common.py @@ -38,66 +38,47 @@ class ReportStatementCommon(models.AbstractModel): return str( self._cr.mogrify( """ - SELECT l.partner_id, l.currency_id, l.company_id, l.move_id, - (abs(COALESCE(l.balance, 0.0)) + sum( - coalesce(pr.pr_sign, 0.0) * coalesce(pr.amount, 0.0)) - ) * sign(COALESCE(l.balance, 0.0)) AS open_due, - (abs(COALESCE(l.amount_currency, 0.0)) + sum( - coalesce(pr.pr_sign, 0.0) * CASE - WHEN pr.currency_id IS NOT NULL AND pr.currency_id = l.currency_id - THEN coalesce(pr.amount_currency, 0.0) - WHEN cur.id IS NOT NULL AND ROUND( - abs(COALESCE(l.balance, 0.0)), cur.decimal_places) > 0.0 - THEN ROUND(coalesce(pr.amount, 0.0) * - COALESCE(l.amount_currency, 0.0) / NULLIF(l.balance, 0.0), - cur.decimal_places) - ELSE ROUND(coalesce(pr.amount, 0.0) * - COALESCE(( - SELECT r.rate FROM res_currency_rate r - JOIN account_move_line aml - ON pr.credit_move_id = aml.id - WHERE r.currency_id = l.currency_id - AND r.name <= aml.date - AND (r.company_id IS NULL - OR r.company_id = l.company_id) - ORDER BY r.company_id, r.name DESC LIMIT 1), 1.0), - cur.decimal_places) - END) - ) * sign(COALESCE(l.amount_currency, 0.0)) AS open_due_currency, + SELECT l.partner_id, l.currency_id, l.company_id, l.move_id, + CASE WHEN l.balance > 0.0 + THEN l.balance - sum(coalesce(pd.amount, 0.0)) + 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.debit_amount_currency, 0.0)) + ELSE l.amount_currency + sum(coalesce(pc.credit_amount_currency, 0.0)) + END AS open_due_currency, CASE WHEN l.date_maturity is null THEN l.date ELSE l.date_maturity - END as date_maturity - FROM ( - SELECT l.*, CASE - WHEN l.debit = 0.0 AND l.credit = 0.0 AND l.currency_id IS NOT NULL - AND ROUND(COALESCE(l.amount_currency, 0.0), - cur.decimal_places) > 0.0 THEN 1 - WHEN l.debit = 0.0 AND l.credit = 0.0 AND l.currency_id IS NOT NULL - AND ROUND(COALESCE(l.amount_currency, 0.0), - cur.decimal_places) < 0.0 THEN -1 - WHEN l.balance > 0.0 THEN 1 ELSE -1 END as sign + END as date_maturity FROM account_move_line l - LEFT JOIN res_currency cur ON cur.id = l.currency_id - ) l - JOIN account_move m ON l.move_id = m.id - LEFT JOIN res_currency cur ON cur.id = l.currency_id - LEFT JOIN LATERAL (SELECT pr.*, - CASE WHEN pr.credit_move_id = l.id THEN l.sign - ELSE -l.sign END AS pr_sign - FROM account_partial_reconcile pr - WHERE pr.max_date <= %(date_end)s AND ( - (pr.debit_move_id = l.id) OR (pr.credit_move_id = l.id)) - ) as pr ON TRUE - WHERE l.partner_id IN %(partners)s - AND l.account_internal_type = %(account_type)s - AND ( - (pr.id IS NOT NULL AND pr.max_date <= %(date_end)s) OR - (pr.id IS NULL) - ) AND l.date <= %(date_end)s AND not l.blocked - AND m.state IN ('posted') - GROUP BY l.partner_id, l.currency_id, l.date, l.date_maturity, - l.amount_currency, l.balance, l.move_id, l.company_id, l.id + JOIN account_move m ON (l.move_id = m.id) + JOIN account_account aa ON (aa.id = l.account_id) + JOIN account_account_type at ON (at.id = aa.user_type_id) + LEFT JOIN (SELECT pr.* + FROM account_partial_reconcile pr + INNER JOIN account_move_line l2 + ON pr.credit_move_id = l2.id + WHERE l2.date <= %(date_end)s + ) as pd ON pd.debit_move_id = l.id + LEFT JOIN (SELECT pr.* + FROM account_partial_reconcile pr + INNER JOIN account_move_line l2 + ON pr.debit_move_id = l2.id + WHERE l2.date <= %(date_end)s + ) as pc ON pc.credit_move_id = l.id + WHERE l.partner_id IN %(partners)s AND at.type = %(account_type)s + AND ( + (pd.id IS NOT NULL AND + pd.max_date <= %(date_end)s) OR + (pc.id IS NOT NULL AND + pc.max_date <= %(date_end)s) OR + (pd.id IS NULL AND pc.id IS NULL) + ) AND l.date <= %(date_end)s AND not l.blocked + AND m.state IN ('posted') + GROUP BY l.partner_id, l.currency_id, l.date, l.date_maturity, + l.amount_currency, l.balance, l.move_id, + l.company_id, l.id """, locals(), ), @@ -307,8 +288,8 @@ class ReportStatementCommon(models.AbstractModel): ) @api.model - # flake8: noqa: C901 def _get_report_values(self, docids, data=None): + # flake8: noqa: C901 """ @return: returns a dict of parameters to pass to qweb report. the most important pair is {'data': res} which contains all diff --git a/partner_statement/security/ir.model.access.csv b/partner_statement/security/ir.model.access.csv new file mode 100644 index 00000000..f3a19dcc --- /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,access_activity_statement_wizard,model_activity_statement_wizard,account.group_account_invoice,1,1,1,0 +access_outstanding_statement_wizard,access_outstanding_statement_wizard,model_outstanding_statement_wizard,account.group_account_invoice,1,1,1,0 diff --git a/partner_statement/static/description/index.html b/partner_statement/static/description/index.html index 22a1653f..c966a93f 100644 --- a/partner_statement/static/description/index.html +++ b/partner_statement/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/account-financial-reporting Translate me on Weblate Try me on Runbot

+

Beta License: AGPL-3 OCA/account-financial-reporting Translate me on Weblate Try me on Runbot

This module extends the functionality of Invoicing to support the printing of customer and vendor statements. There are two types of statements, Activity and Outstanding. Aging details can be shown in the reports, expressed in aging buckets, so the customer or vendor can review how much is open, due or overdue.

@@ -449,7 +449,7 @@ outstanding payments. The list is displayed in chronological order and is split

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.

@@ -475,7 +475,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

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/tests/test_res_config_settings.py b/partner_statement/tests/test_res_config_settings.py index 919cccf7..02683de7 100644 --- a/partner_statement/tests/test_res_config_settings.py +++ b/partner_statement/tests/test_res_config_settings.py @@ -32,4 +32,4 @@ class TestResConfigSettings(TransactionCase): self.user_obj._has_group("partner_statement.group_activity_statement") ) res = self.env["ir.default"].get("activity.statement.wizard", "aging_type") - self.assertEquals(res, "months") + self.assertEqual(res, "months") diff --git a/partner_statement/views/activity_statement.xml b/partner_statement/views/activity_statement.xml index 36563bf5..721b7856 100644 --- a/partner_statement/views/activity_statement.xml +++ b/partner_statement/views/activity_statement.xml @@ -161,13 +161,11 @@ - + + Activity Statement + res.partner + partner_statement.activity_statement + qweb-pdf + partner_statement.activity_statement + diff --git a/partner_statement/views/outstanding_statement.xml b/partner_statement/views/outstanding_statement.xml index 9752406f..4fca43f4 100644 --- a/partner_statement/views/outstanding_statement.xml +++ b/partner_statement/views/outstanding_statement.xml @@ -157,13 +157,11 @@ - + + Outstanding Statement + res.partner + partner_statement.outstanding_statement + qweb-pdf + partner_statement.outstanding_statement + diff --git a/partner_statement/wizard/statement_common.py b/partner_statement/wizard/statement_common.py index d1072d52..df055700 100644 --- a/partner_statement/wizard/statement_common.py +++ b/partner_statement/wizard/statement_common.py @@ -11,16 +11,10 @@ class StatementCommon(models.AbstractModel): _name = "statement.common.wizard" _description = "Statement Reports Common Wizard" - def _get_company(self): - return ( - self.env["res.company"].browse(self.env.context.get("force_company")) - or self.env.company - ) - name = fields.Char() company_id = fields.Many2one( comodel_name="res.company", - default=_get_company, + default=lambda self: self.env.company, string="Company", required=True, ) diff --git a/partner_statement/wizard/statement_wizard.xml b/partner_statement/wizard/statement_wizard.xml index 9c3d41c7..84ec2762 100644 --- a/partner_statement/wizard/statement_wizard.xml +++ b/partner_statement/wizard/statement_wizard.xml @@ -3,24 +3,28 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). --> - - + + Partner Activity Statement + + activity.statement.wizard + form + + new + + + Partner Outstanding Statement + + outstanding.statement.wizard + form + + new + Statement Common Wizard View @@ -28,11 +32,11 @@
-
@@ -86,14 +90,14 @@ primary - - @@ -105,15 +109,15 @@ primary - -