From af01e4f9b196fb587104b6a5e55a6badfeb23d52 Mon Sep 17 00:00:00 2001 From: Lois Rilo Date: Tue, 17 Nov 2020 17:22:48 +0100 Subject: [PATCH] [13.0][IMP] partner_statement: * show partner name at the top. * simplify view logic for `name` and `ref` printing. * fallback to journal entry `ref` when the journal item has no `ref` set. * little query formatting changes to enhance readability. --- partner_statement/README.rst | 1 + partner_statement/__manifest__.py | 2 +- partner_statement/i18n/ca.po | 11 ++-- partner_statement/i18n/de.po | 11 ++-- partner_statement/i18n/es.po | 20 ++++--- partner_statement/i18n/es_AR.po | 39 ++++++------ partner_statement/i18n/fr.po | 14 +++-- partner_statement/i18n/hr_HR.po | 11 ++-- partner_statement/i18n/it.po | 14 +++-- partner_statement/i18n/nl.po | 38 ++++++------ partner_statement/i18n/nl_NL.po | 11 ++-- partner_statement/i18n/partner_statement.pot | 11 ++-- partner_statement/i18n/pt.po | 11 ++-- partner_statement/i18n/pt_BR.po | 14 +++-- partner_statement/i18n/ro.po | 14 +++-- partner_statement/readme/CONTRIBUTORS.rst | 1 + .../report/activity_statement.py | 60 ++++++++++--------- .../report/outstanding_statement.py | 13 +++- .../static/description/index.html | 1 + .../views/activity_statement.xml | 19 +++--- .../views/outstanding_statement.xml | 12 ++-- 21 files changed, 190 insertions(+), 138 deletions(-) diff --git a/partner_statement/README.rst b/partner_statement/README.rst index ef70fcc4..3e48d72f 100644 --- a/partner_statement/README.rst +++ b/partner_statement/README.rst @@ -113,6 +113,7 @@ Contributors * Miquel Raïch * Graeme Gellatly +* Lois Rilo Maintainers ~~~~~~~~~~~ diff --git a/partner_statement/__manifest__.py b/partner_statement/__manifest__.py index f37b56fd..dc546eee 100644 --- a/partner_statement/__manifest__.py +++ b/partner_statement/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Partner Statement", - "version": "13.0.1.0.0", + "version": "13.0.1.1.0", "category": "Accounting & Finance", "summary": "OCA Financial Reports", "author": "ForgeFlow, Odoo Community Association (OCA)", diff --git a/partner_statement/i18n/ca.po b/partner_statement/i18n/ca.po index c5767ed6..799dbc19 100644 --- a/partner_statement/i18n/ca.po +++ b/partner_statement/i18n/ca.po @@ -84,6 +84,12 @@ msgstr "" msgid "Partner Code:" 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 +msgid "Partner Name:" +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 @@ -375,11 +381,6 @@ msgstr "" msgid "Payable" msgstr "" -#. module: partner_statement -#: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document -msgid "Payment" -msgstr "" - #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.res_config_settings_view_form msgid "Please set defaults under Activity Statements." diff --git a/partner_statement/i18n/de.po b/partner_statement/i18n/de.po index 468b851f..1b4b0077 100644 --- a/partner_statement/i18n/de.po +++ b/partner_statement/i18n/de.po @@ -87,6 +87,12 @@ msgstr "" msgid "Partner Code:" msgstr "Der Partner hat keine offenen Posten." +#. 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 "" + #. 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 @@ -391,11 +397,6 @@ msgstr "" msgid "Payable" msgstr "" -#. module: partner_statement -#: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document -msgid "Payment" -msgstr "" - #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.res_config_settings_view_form #, fuzzy diff --git a/partner_statement/i18n/es.po b/partner_statement/i18n/es.po index f150dbb5..7bd63074 100644 --- a/partner_statement/i18n/es.po +++ b/partner_statement/i18n/es.po @@ -11,15 +11,15 @@ 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: 2019-07-23 01:43+0000\n" -"Last-Translator: Josep M \n" +"PO-Revision-Date: 2021-03-16 13:45+0000\n" +"Last-Translator: Ana Suárez \n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" "Language: es\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 3.7.1\n" +"X-Generator: Weblate 4.3.2\n" #. module: partner_statement #: code:addons/partner_statement/report/report_statement_common.py:0 @@ -87,6 +87,12 @@ msgstr "Fecha:" msgid "Partner Code:" msgstr "Código Cliente:" +#. 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 "Nombre Empresa:" + #. 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 @@ -382,11 +388,6 @@ msgstr "Estado de los pendientes de la cuenta del cliente" msgid "Payable" msgstr "A pagar" -#. module: partner_statement -#: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document -msgid "Payment" -msgstr "Pago" - #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.res_config_settings_view_form msgid "Please set defaults under Activity Statements." @@ -512,6 +513,9 @@ msgstr "en" msgid "or" msgstr "o" +#~ msgid "Payment" +#~ msgstr "Pago" + #~ msgid "report.partner_statement.activity_statement" #~ msgstr "report.partner_statement.activity_statement" diff --git a/partner_statement/i18n/es_AR.po b/partner_statement/i18n/es_AR.po index bbba35a5..d7a86f2a 100644 --- a/partner_statement/i18n/es_AR.po +++ b/partner_statement/i18n/es_AR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 13.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2020-08-12 00:59+0000\n" +"PO-Revision-Date: 2020-11-30 21:36+0000\n" "Last-Translator: Ignacio Buioli \n" "Language-Team: none\n" "Language: es_AR\n" @@ -82,6 +82,12 @@ msgstr "Fecha:" msgid "Partner Code:" msgstr "Código Cliente:" +#. 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 "Nombre del Socio:" + #. 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 @@ -196,7 +202,6 @@ msgstr "Creado en" #. module: partner_statement #: code:addons/partner_statement/report/report_statement_common.py:0 -#: code:addons/partner_statement/report/report_statement_common.py:0 #, python-format msgid "Current" msgstr "Actual" @@ -378,11 +383,6 @@ msgstr "Estado de los pendientes de la cuenta del cliente" msgid "Payable" msgstr "A pagar" -#. module: partner_statement -#: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document -msgid "Payment" -msgstr "Pago" - #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.res_config_settings_view_form msgid "Please set defaults under Activity Statements." @@ -443,13 +443,13 @@ msgstr "Proveedor" #. 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 " +"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." +"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 "" "El estado de la cuenta proporciona detalles de toda la actividad " "en las cuentas por cobrar y por pagar del cliente entre " @@ -463,10 +463,11 @@ 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." +"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 "" "El pendiente del estado de cuenta proporciona detalles de todas las cuentas " "pendientes por cobrar y por pagar hasta una fecha en particular. " @@ -476,7 +477,6 @@ msgstr "" #. module: partner_statement #: code:addons/partner_statement/report/report_statement_common.py:0 -#: code:addons/partner_statement/report/report_statement_common.py:0 #, python-format msgid "Total" msgstr "Total" @@ -507,3 +507,6 @@ 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 3613370b..c6857bbf 100644 --- a/partner_statement/i18n/fr.po +++ b/partner_statement/i18n/fr.po @@ -86,6 +86,12 @@ msgstr "Date:" msgid "Partner Code:" msgstr "code du partenaire :" +#. 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 "" + #. 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 @@ -382,11 +388,6 @@ msgstr "Relevé des arriérés du partenaire" msgid "Payable" msgstr "A payer" -#. module: partner_statement -#: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document -msgid "Payment" -msgstr "Paiement" - #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.res_config_settings_view_form msgid "Please set defaults under Activity Statements." @@ -508,6 +509,9 @@ msgstr "en" msgid "or" msgstr "ou" +#~ msgid "Payment" +#~ msgstr "Paiement" + #~ msgid "report.partner_statement.activity_statement" #~ msgstr "report.customer_activity_statement.statement" diff --git a/partner_statement/i18n/hr_HR.po b/partner_statement/i18n/hr_HR.po index 63cd84d7..c9e1cd85 100644 --- a/partner_statement/i18n/hr_HR.po +++ b/partner_statement/i18n/hr_HR.po @@ -86,6 +86,12 @@ msgstr "" msgid "Partner Code:" 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 +msgid "Partner Name:" +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 @@ -379,11 +385,6 @@ msgstr "" msgid "Payable" msgstr "" -#. module: partner_statement -#: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document -msgid "Payment" -msgstr "" - #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.res_config_settings_view_form msgid "Please set defaults under Activity Statements." diff --git a/partner_statement/i18n/it.po b/partner_statement/i18n/it.po index d24ced16..ecd2b40f 100644 --- a/partner_statement/i18n/it.po +++ b/partner_statement/i18n/it.po @@ -85,6 +85,12 @@ msgstr "Data:" msgid "Partner Code:" msgstr "Codice Partner:" +#. 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 "" + #. 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 @@ -379,11 +385,6 @@ msgstr "Dovuto del Partner" msgid "Payable" msgstr "Pagamenti" -#. module: partner_statement -#: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document -msgid "Payment" -msgstr "Pagamento" - #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.res_config_settings_view_form msgid "Please set defaults under Activity Statements." @@ -496,6 +497,9 @@ msgstr "in" msgid "or" msgstr "o" +#~ msgid "Payment" +#~ msgstr "Pagamento" + #~ msgid "report.partner_statement.activity_statement" #~ msgstr "report.partner_statement.activity_statement" diff --git a/partner_statement/i18n/nl.po b/partner_statement/i18n/nl.po index 1fcee7cd..1c9ee77a 100644 --- a/partner_statement/i18n/nl.po +++ b/partner_statement/i18n/nl.po @@ -9,74 +9,75 @@ msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-02-28 10:11+0000\n" -"PO-Revision-Date: 2018-02-28 10:11+0000\n" -"Last-Translator: Melroy van den Berg , 2018\n" +"PO-Revision-Date: 2020-12-16 02:19+0000\n" +"Last-Translator: Bosd \n" "Language-Team: Dutch (https://www.transifex.com/oca/teams/23907/nl/)\n" "Language: nl\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" +"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 Dagen" #. module: partner_statement #: code:addons/partner_statement/report/report_statement_common.py:0 #, python-format msgid "1 Month" -msgstr "" +msgstr "1 maand" #. module: partner_statement #: code:addons/partner_statement/report/report_statement_common.py:0 #, python-format msgid "121 Days +" -msgstr "" +msgstr "121 dagen +" #. module: partner_statement #: code:addons/partner_statement/report/report_statement_common.py:0 #, python-format msgid "2 Months" -msgstr "" +msgstr "2 maanden" #. module: partner_statement #: code:addons/partner_statement/report/report_statement_common.py:0 #, python-format msgid "3 Months" -msgstr "" +msgstr "3 maanden" #. module: partner_statement #: code:addons/partner_statement/report/report_statement_common.py:0 #, python-format msgid "31 - 60 Days" -msgstr "" +msgstr "31 - 60 Dagen" #. module: partner_statement #: code:addons/partner_statement/report/report_statement_common.py:0 #, python-format msgid "4 Months" -msgstr "" +msgstr "4 maanden" #. module: partner_statement #: code:addons/partner_statement/report/report_statement_common.py:0 #, python-format msgid "61 - 90 Days" -msgstr "" +msgstr "61 - 90 Dagen" #. module: partner_statement #: code:addons/partner_statement/report/report_statement_common.py:0 #, python-format msgid "91 - 120 Days" -msgstr "" +msgstr "91 - 120 Dagen" #. 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 "Datum:" #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document @@ -84,6 +85,12 @@ msgstr "" msgid "Partner Code:" 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 +msgid "Partner Name:" +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 @@ -375,11 +382,6 @@ msgstr "" msgid "Payable" msgstr "" -#. module: partner_statement -#: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document -msgid "Payment" -msgstr "" - #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.res_config_settings_view_form msgid "Please set defaults under Activity Statements." diff --git a/partner_statement/i18n/nl_NL.po b/partner_statement/i18n/nl_NL.po index c61ce5cc..956067a8 100644 --- a/partner_statement/i18n/nl_NL.po +++ b/partner_statement/i18n/nl_NL.po @@ -85,6 +85,12 @@ msgstr "" msgid "Partner Code:" 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 +msgid "Partner Name:" +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 @@ -378,11 +384,6 @@ msgstr "" msgid "Payable" msgstr "" -#. module: partner_statement -#: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document -msgid "Payment" -msgstr "" - #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.res_config_settings_view_form msgid "Please set defaults under Activity Statements." diff --git a/partner_statement/i18n/partner_statement.pot b/partner_statement/i18n/partner_statement.pot index b661aa26..2eec1e9a 100644 --- a/partner_statement/i18n/partner_statement.pot +++ b/partner_statement/i18n/partner_statement.pot @@ -79,6 +79,12 @@ msgstr "" msgid "Partner Code:" 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 +msgid "Partner Name:" +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 @@ -371,11 +377,6 @@ msgstr "" msgid "Payable" msgstr "" -#. module: partner_statement -#: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document -msgid "Payment" -msgstr "" - #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.res_config_settings_view_form msgid "Please set defaults under Activity Statements." diff --git a/partner_statement/i18n/pt.po b/partner_statement/i18n/pt.po index 7bc70446..cfee3535 100644 --- a/partner_statement/i18n/pt.po +++ b/partner_statement/i18n/pt.po @@ -85,6 +85,12 @@ msgstr "" msgid "Partner Code:" 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 +msgid "Partner Name:" +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 @@ -378,11 +384,6 @@ msgstr "" msgid "Payable" msgstr "" -#. module: partner_statement -#: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document -msgid "Payment" -msgstr "" - #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.res_config_settings_view_form msgid "Please set defaults under Activity Statements." diff --git a/partner_statement/i18n/pt_BR.po b/partner_statement/i18n/pt_BR.po index 11eddcad..f172fbc3 100644 --- a/partner_statement/i18n/pt_BR.po +++ b/partner_statement/i18n/pt_BR.po @@ -82,6 +82,12 @@ msgstr "Data:" msgid "Partner Code:" 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 "" + #. 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 @@ -376,11 +382,6 @@ msgstr "Extrato de Pendência do Parceiro" msgid "Payable" msgstr "Pagável" -#. module: partner_statement -#: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document -msgid "Payment" -msgstr "Pagamento" - #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.res_config_settings_view_form msgid "Please set defaults under Activity Statements." @@ -505,6 +506,9 @@ msgstr "em" msgid "or" msgstr "ou" +#~ msgid "Payment" +#~ msgstr "Pagamento" + #~ msgid "report.partner_statement.activity_statement" #~ msgstr "report.partner_statement.activity_statement" diff --git a/partner_statement/i18n/ro.po b/partner_statement/i18n/ro.po index 01813b12..b4655456 100644 --- a/partner_statement/i18n/ro.po +++ b/partner_statement/i18n/ro.po @@ -86,6 +86,12 @@ msgstr "Dată:" msgid "Partner Code:" msgstr "Cod Partener:" +#. 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 "" + #. 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 @@ -380,11 +386,6 @@ msgstr "Solduri restante partener" msgid "Payable" msgstr "Plătibil" -#. module: partner_statement -#: model_terms:ir.ui.view,arch_db:partner_statement.activity_statement_document -msgid "Payment" -msgstr "Plată" - #. module: partner_statement #: model_terms:ir.ui.view,arch_db:partner_statement.res_config_settings_view_form msgid "Please set defaults under Activity Statements." @@ -507,5 +508,8 @@ msgstr "în" 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 286b2c12..22ac2498 100644 --- a/partner_statement/readme/CONTRIBUTORS.rst +++ b/partner_statement/readme/CONTRIBUTORS.rst @@ -1,2 +1,3 @@ * Miquel Raïch * Graeme Gellatly +* Lois Rilo diff --git a/partner_statement/report/activity_statement.py b/partner_statement/report/activity_statement.py index f1de2b6c..adddb6f6 100644 --- a/partner_statement/report/activity_statement.py +++ b/partner_statement/report/activity_statement.py @@ -79,29 +79,32 @@ class ActivityStatement(models.AbstractModel): self._cr.mogrify( """ SELECT m.name AS move_id, l.partner_id, l.date, - CASE WHEN (aj.type IN ('sale', 'purchase')) - THEN l.name - ELSE '/' - END as name, - CASE WHEN (aj.type IN ('sale', 'purchase')) - THEN l.ref - WHEN (aj.type in ('bank', 'cash')) - THEN 'Payment' - ELSE '' - END as ref, - l.blocked, l.currency_id, l.company_id, - CASE WHEN (l.currency_id is not null AND l.amount_currency > 0.0) - THEN sum(l.amount_currency) - 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 * (-1)) - ELSE sum(l.credit) - END as credit, - CASE WHEN l.date_maturity is null - THEN l.date - ELSE l.date_maturity - END as date_maturity + CASE WHEN (aj.type IN ('sale', 'purchase')) + THEN l.name + ELSE '/' + END as name, + CASE + WHEN (aj.type IN ('sale', 'purchase')) AND l.name IS NOT NULL + THEN l.ref + WHEN aj.type IN ('sale', 'purchase') AND l.name IS NULL + THEN m.ref + WHEN (aj.type in ('bank', 'cash')) + THEN 'Payment' + ELSE '' + END as ref, + l.blocked, l.currency_id, l.company_id, + CASE WHEN (l.currency_id is not null AND l.amount_currency > 0.0) + THEN sum(l.amount_currency) + 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 * (-1)) + ELSE sum(l.credit) + END as credit, + CASE WHEN l.date_maturity is null + THEN l.date + ELSE l.date_maturity + END as date_maturity FROM account_move_line l JOIN account_move m ON (l.move_id = m.id) JOIN account_journal aj ON (l.journal_id = aj.id) @@ -115,10 +118,13 @@ class ActivityStatement(models.AbstractModel): THEN l.name ELSE '/' END, - CASE WHEN (aj.type IN ('sale', 'purchase')) - THEN l.ref - WHEN (aj.type in ('bank', 'cash')) - THEN 'Payment' + CASE + WHEN (aj.type IN ('sale', 'purchase')) AND l.name IS NOT NULL + THEN l.ref + WHEN aj.type IN ('sale', 'purchase') AND l.name IS NULL + THEN m.ref + WHEN (aj.type in ('bank', 'cash')) + THEN 'Payment' ELSE '' END, l.blocked, l.currency_id, l.amount_currency, l.company_id diff --git a/partner_statement/report/outstanding_statement.py b/partner_statement/report/outstanding_statement.py index ce1af302..f1ae61e8 100644 --- a/partner_statement/report/outstanding_statement.py +++ b/partner_statement/report/outstanding_statement.py @@ -17,7 +17,11 @@ class OutstandingStatement(models.AbstractModel): self._cr.mogrify( """ SELECT m.name AS move_id, l.partner_id, l.date, l.name, - l.ref, l.blocked, l.currency_id, l.company_id, + 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) @@ -62,8 +66,11 @@ class OutstandingStatement(models.AbstractModel): (pd.id IS NULL AND pc.id IS NULL) ) AND l.date <= %(date_end)s AND m.state IN ('posted') GROUP BY l.partner_id, m.name, l.date, l.date_maturity, l.name, - l.ref, l.blocked, l.currency_id, - l.balance, l.amount_currency, l.company_id + 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(), ), diff --git a/partner_statement/static/description/index.html b/partner_statement/static/description/index.html index 6f04676b..22a1653f 100644 --- a/partner_statement/static/description/index.html +++ b/partner_statement/static/description/index.html @@ -465,6 +465,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
diff --git a/partner_statement/views/activity_statement.xml b/partner_statement/views/activity_statement.xml index 5118afe6..36563bf5 100644 --- a/partner_statement/views/activity_statement.xml +++ b/partner_statement/views/activity_statement.xml @@ -21,6 +21,10 @@ Date:

+
+ Partner Name: +

+

Partner Code:

@@ -80,12 +84,15 @@ - + + + + @@ -94,16 +101,10 @@ > - - - - Payment - + diff --git a/partner_statement/views/outstanding_statement.xml b/partner_statement/views/outstanding_statement.xml index a6228db0..9752406f 100644 --- a/partner_statement/views/outstanding_statement.xml +++ b/partner_statement/views/outstanding_statement.xml @@ -22,6 +22,10 @@ Date:

+
+ Partner Name: +

+

Partner Code:

@@ -71,9 +75,12 @@ + + + @@ -82,9 +89,6 @@ > - - -