pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] acc_pay_*_patch: correct payment status on invoices portal

Browse Source 
The logic of following acc_pay code if there was a tx and following
account code if there was no tx was no wrong but was simplified too much,
losing 'Reversed' and 'Cancelled' state if there was any tx linked to
the invoice.

closes odoo/odoo#111139

X-original-commit: 8ae3413e42e2591934593d61a899df88fadbba45
Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>
This commit is contained in:
Victor Feyens
2023-01-26 19:56:07 +01:00
parent 76c68d79dd
commit 7781d94cf9
2 changed files with 47 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_payment_invoice_online_payment_patch/i18n/account_payment_extension.pot
+41 -27
View File
@@ -1,13 +1,13 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * account_payment_extension
# * account_payment_invoice_online_payment_patch
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0+e\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-01-17 15:34+0000\n"
"PO-Revision-Date: 2023-01-17 15:34+0000\n"
"POT-Creation-Date: 2023-01-26 13:32+0000\n"
"PO-Revision-Date: 2023-01-26 13:32+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,83 +15,97 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
#. module: account_payment_extension
#: model_terms:ir.ui.view,arch_db:account_payment_extension.portal_my_invoices_payment
#. module: account_payment_invoice_online_payment_patch
#: model_terms:ir.ui.view,arch_db:account_payment_invoice_online_payment_patch.portal_my_invoices_payment
msgid ""
"<span class=\"badge rounded-pill text-bg-danger\"><i class=\"fa fa-fw fa-"
"remove\"/><span class=\"d-none d-md-inline\"> Cancelled</span></span>"
msgstr ""
#. module: account_payment_invoice_online_payment_patch
#: model_terms:ir.ui.view,arch_db:account_payment_invoice_online_payment_patch.portal_my_invoices_payment
msgid ""
"<span class=\"badge rounded-pill text-bg-info\"><i class=\"fa fa-fw fa-"
"clock-o\" aria-label=\"Opened\" title=\"Opened\" role=\"img\"/><span "
"class=\"d-none d-md-inline\"> Waiting for Payment</span></span>"
msgstr ""
#. module: account_payment_extension
#: model_terms:ir.ui.view,arch_db:account_payment_extension.portal_my_invoices_payment
#. module: account_payment_invoice_online_payment_patch
#: model_terms:ir.ui.view,arch_db:account_payment_invoice_online_payment_patch.portal_my_invoices_payment
msgid ""
"<span class=\"badge rounded-pill text-bg-info\"><i class=\"fa fa-fw fa-"
"clock-o\"/><span class=\"d-none d-md-inline\"> Waiting for "
"Payment</span></span>"
msgstr ""
#. module: account_payment_extension
#: model_terms:ir.ui.view,arch_db:account_payment_extension.portal_my_invoices_payment
#. module: account_payment_invoice_online_payment_patch
#: model_terms:ir.ui.view,arch_db:account_payment_invoice_online_payment_patch.portal_my_invoices_payment
msgid ""
"<span class=\"badge rounded-pill text-bg-primary\"><i class=\"fa fa-fw fa-"
"check\"/><span class=\"d-none d-md-inline\"> Authorized</span></span>"
msgstr ""
#. module: account_payment_extension
#: model_terms:ir.ui.view,arch_db:account_payment_extension.portal_my_invoices_payment
#. module: account_payment_invoice_online_payment_patch
#: model_terms:ir.ui.view,arch_db:account_payment_invoice_online_payment_patch.portal_my_invoices_payment
msgid ""
"<span class=\"badge rounded-pill text-bg-success\"><i class=\"fa fa-fw fa-"
"check\" aria-label=\"Paid\" title=\"Paid\" role=\"img\"/><span "
"class=\"d-none d-md-inline\"> Paid</span></span>"
msgstr ""
#. module: account_payment_extension
#: model_terms:ir.ui.view,arch_db:account_payment_extension.portal_my_invoices_payment
#. module: account_payment_invoice_online_payment_patch
#: model_terms:ir.ui.view,arch_db:account_payment_invoice_online_payment_patch.portal_my_invoices_payment
msgid ""
"<span class=\"badge rounded-pill text-bg-success\"><i class=\"fa fa-fw fa-"
"check\" aria-label=\"Reversed\" title=\"Reversed\" role=\"img\"/><span "
"class=\"d-none d-md-inline\"> Reversed</span></span>"
msgstr ""
#. module: account_payment_extension
#: model_terms:ir.ui.view,arch_db:account_payment_extension.portal_my_invoices_payment
#. module: account_payment_invoice_online_payment_patch
#: model_terms:ir.ui.view,arch_db:account_payment_invoice_online_payment_patch.portal_my_invoices_payment
msgid ""
"<span class=\"badge rounded-pill text-bg-success\"><i class=\"fa fa-fw fa-"
"check\"/><span class=\"d-none d-md-inline\"> Paid</span></span>"
msgstr ""
#. module: account_payment_extension
#: model_terms:ir.ui.view,arch_db:account_payment_extension.portal_my_invoices_payment
#. module: account_payment_invoice_online_payment_patch
#: model_terms:ir.ui.view,arch_db:account_payment_invoice_online_payment_patch.portal_my_invoices_payment
msgid ""
"<span class=\"badge rounded-pill text-bg-success\"><i class=\"fa fa-fw fa-"
"check\"/><span class=\"d-none d-md-inline\"> Reversed</span></span>"
msgstr ""
#. module: account_payment_invoice_online_payment_patch
#: model_terms:ir.ui.view,arch_db:account_payment_invoice_online_payment_patch.portal_my_invoices_payment
msgid ""
"<span class=\"badge rounded-pill text-bg-warning\"><i class=\"fa fa-fw fa-"
"remove\" aria-label=\"Cancelled\" title=\"Cancelled\" role=\"img\"/><span "
"class=\"d-none d-md-inline\"> Cancelled</span></span>"
msgstr ""
#. module: account_payment_extension
#: model_terms:ir.ui.view,arch_db:account_payment_extension.portal_my_invoices_payment
#. module: account_payment_invoice_online_payment_patch
#: model_terms:ir.ui.view,arch_db:account_payment_invoice_online_payment_patch.portal_my_invoices_payment
msgid ""
"<span class=\"badge rounded-pill text-bg-warning\"><span class=\"d-none "
"d-md-inline\"> Pending</span></span>"
msgstr ""
#. module: account_payment_extension
#: model:ir.model,name:account_payment_extension.model_res_config_settings
#. module: account_payment_invoice_online_payment_patch
#: model:ir.model,name:account_payment_invoice_online_payment_patch.model_res_config_settings
msgid "Config Settings"
msgstr ""
#. module: account_payment_extension
#: model_terms:ir.ui.view,arch_db:account_payment_extension.res_config_settings_view_form
#. module: account_payment_invoice_online_payment_patch
#: model_terms:ir.ui.view,arch_db:account_payment_invoice_online_payment_patch.res_config_settings_view_form
msgid "Invoice Online Payment"
msgstr ""
#. module: account_payment_extension
#: model:ir.model,name:account_payment_extension.model_account_move
#. module: account_payment_invoice_online_payment_patch
#: model:ir.model,name:account_payment_invoice_online_payment_patch.model_account_move
msgid "Journal Entry"
msgstr ""
#. module: account_payment_extension
#: model:ir.model.fields,field_description:account_payment_extension.field_res_config_settings__pay_invoices_online
#. module: account_payment_invoice_online_payment_patch
#: model:ir.model.fields,field_description:account_payment_invoice_online_payment_patch.field_res_config_settings__pay_invoices_online
msgid "Pay Invoices Online"
msgstr ""
addons/account_payment_invoice_online_payment_patch/views/account_portal_templates.xml
+6
View File
@@ -23,6 +23,12 @@
<t t-if="invoice.state == 'posted' and invoice.payment_state in ('paid', 'in_payment') or last_tx.state == 'done'">
<span class="badge rounded-pill text-bg-success"><i class="fa fa-fw fa-check"></i><span class="d-none d-md-inline"> Paid</span></span>
</t>
<t t-if="invoice.state == 'posted' and invoice.payment_state == 'reversed'">
<span class="badge rounded-pill text-bg-success"><i class="fa fa-fw fa-check"></i><span class="d-none d-md-inline"> Reversed</span></span>
</t>
<t t-if="invoice.state == 'cancel'">
<span class="badge rounded-pill text-bg-danger"><i class="fa fa-fw fa-remove"></i><span class="d-none d-md-inline"> Cancelled</span></span>
</t>
</t>
<t t-else="">
<!-- c/p of account -->