diff --git a/account_payment_order/i18n/account_payment_order.pot b/account_payment_order/i18n/account_payment_order.pot index 57249e557..21d6f6500 100644 --- a/account_payment_order/i18n/account_payment_order.pot +++ b/account_payment_order/i18n/account_payment_order.pot @@ -160,7 +160,6 @@ msgstr "" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__amount_currency -#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__amount_currency #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_tree #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document msgid "Amount" @@ -168,7 +167,6 @@ msgstr "" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__amount_company_currency -#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__amount_company_currency msgid "Amount in Company Currency" msgstr "" @@ -199,7 +197,6 @@ msgid "Bank" msgstr "" #. module: account_payment_order -#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_bank_id #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document msgid "Bank Account" msgstr "" @@ -215,44 +212,11 @@ msgstr "" msgid "Bank Journal" msgstr "" -#. module: account_payment_order -#: model:ir.model.fields,field_description:account_payment_order.field_account_move_line__bank_payment_line_id -#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__bank_line_id -#: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form -msgid "Bank Payment Line" -msgstr "" - -#. module: account_payment_order -#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__name -msgid "Bank Payment Line Ref" -msgstr "" - -#. module: account_payment_order -#: model:ir.actions.act_window,name:account_payment_order.bank_payment_line_action -#: model:ir.model,name:account_payment_order.model_bank_payment_line -#: model:ir.ui.menu,name:account_payment_order.bank_payment_line_menu -#: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_tree -msgid "Bank Payment Lines" -msgstr "" - -#. module: account_payment_order -#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__bank_line_ids -#: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_form -#: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_tree -msgid "Bank Transactions" -msgstr "" - #. module: account_payment_order #: model:ir.model.fields,help:account_payment_order.field_account_move_line__partner_bank_id msgid "Bank account on which we should pay the supplier" msgstr "" -#. module: account_payment_order -#: code:addons/account_payment_order/models/bank_payment_line.py:0 -#, python-format -msgid "Can not reconcile: no move line for payment line %s of partner '%s'." -msgstr "" - #. module: account_payment_order #: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__state__cancel #: model_terms:ir.ui.view,arch_db:account_payment_order.account_invoice_payment_line_multi_form @@ -265,14 +229,6 @@ msgstr "" msgid "Cancel Payments" msgstr "" -#. module: account_payment_order -#: code:addons/account_payment_order/models/bank_payment_line.py:0 -#, python-format -msgid "" -"Cannot delete a payment order line whose payment order is in state '%s'. You" -" need to cancel it first." -msgstr "" - #. module: account_payment_order #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_create_form msgid "Choose Move Lines Filter Options" @@ -288,13 +244,11 @@ msgstr "" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__communication -#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__communication msgid "Communication" msgstr "" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__communication_type -#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__communication_type msgid "Communication Type" msgstr "" @@ -307,7 +261,6 @@ msgstr "" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__company_id #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__company_id -#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__company_id msgid "Company" msgstr "" @@ -362,7 +315,6 @@ msgstr "" #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__create_uid #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__create_uid #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__create_uid -#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__create_uid #: model_terms:ir.ui.view,arch_db:account_payment_order.view_attachment_simplified_form msgid "Created by" msgstr "" @@ -372,21 +324,18 @@ msgstr "" #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__create_date #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__create_date #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__create_date -#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__create_date msgid "Created on" msgstr "" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__company_currency_id #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__company_currency_id -#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__company_currency_id #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document msgid "Currency" msgstr "" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__currency_id -#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__currency_id msgid "Currency of the Payment Transaction" msgstr "" @@ -401,19 +350,6 @@ msgstr "" msgid "Debit Orders" msgstr "" -#. module: account_payment_order -#: code:addons/account_payment_order/models/account_payment_order.py:0 -#, python-format -msgid "Debit bank line %s" -msgstr "" - -#. module: account_payment_order -#: code:addons/account_payment_order/models/account_payment_order.py:0 -#: code:addons/account_payment_order/models/account_payment_order.py:0 -#, python-format -msgid "Debit order %s" -msgstr "" - #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__default_date_prefered msgid "Default Payment Execution Date" @@ -440,7 +376,6 @@ msgstr "" #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_method__display_name #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__display_name #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__display_name -#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__display_name #: model:ir.model.fields,field_description:account_payment_order.field_report_account_payment_order_print_account_payment_order_main__display_name #: model:ir.model.fields,field_description:account_payment_order.field_res_bank__display_name msgid "Display Name" @@ -521,14 +456,6 @@ msgstr "" msgid "Font awesome icon e.g. fa-tasks" msgstr "" -#. module: account_payment_order -#: code:addons/account_payment_order/models/bank_payment_line.py:0 -#, python-format -msgid "" -"For partner '%s', the account of the account move line to pay (%s) is " -"different from the account of of the transit move line (%s)." -msgstr "" - #. module: account_payment_order #: model:ir.model.fields,help:account_payment_order.field_account_payment_order__bank_account_link msgid "" @@ -573,7 +500,6 @@ msgstr "" #. module: account_payment_order #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search -#: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search msgid "Group By" msgstr "" @@ -593,7 +519,6 @@ msgstr "" #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_method__id #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode__id #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__id -#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__id #: model:ir.model.fields,field_description:account_payment_order.field_report_account_payment_order_print_account_payment_order_main__id #: model:ir.model.fields,field_description:account_payment_order.field_res_bank__id msgid "ID" @@ -649,7 +574,6 @@ msgstr "" #. module: account_payment_order #: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__inbound -#: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search msgid "Inbound" msgstr "" @@ -722,7 +646,6 @@ msgstr "" #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_method____last_update #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_mode____last_update #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order____last_update -#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line____last_update #: model:ir.model.fields,field_description:account_payment_order.field_report_account_payment_order_print_account_payment_order_main____last_update #: model:ir.model.fields,field_description:account_payment_order.field_res_bank____last_update msgid "Last Modified on" @@ -733,7 +656,6 @@ msgstr "" #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__write_uid #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__write_uid #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__write_uid -#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__write_uid msgid "Last Updated by" msgstr "" @@ -742,7 +664,6 @@ msgstr "" #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__write_date #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line_create__write_date #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__write_date -#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__write_date msgid "Last Updated on" msgstr "" @@ -811,12 +732,6 @@ msgstr "" msgid "Move Option" msgstr "" -#. module: account_payment_order -#: code:addons/account_payment_order/models/bank_payment_line.py:0 -#, python-format -msgid "Move line '%s' of partner '%s' has already been reconciled" -msgstr "" - #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__my_activity_date_deadline msgid "My Activity Deadline" @@ -875,13 +790,13 @@ msgid "Number of Actions" msgstr "" #. module: account_payment_order -#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__bank_line_count -msgid "Number of Bank Transactions" +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__move_count +msgid "Number of Journal Entries" msgstr "" #. module: account_payment_order -#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__move_count -msgid "Number of Journal Entries" +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__payment_count +msgid "Number of Payment Transactions" msgstr "" #. module: account_payment_order @@ -904,6 +819,11 @@ msgstr "" msgid "Number of unread messages" msgstr "" +#. module: account_payment_order +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment__old_bank_payment_line_name +msgid "Old Bank Payment Line Name" +msgstr "" + #. module: account_payment_order #: code:addons/account_payment_order/models/account_payment_order.py:0 #, python-format @@ -938,14 +858,8 @@ msgstr "" msgid "Options for Payment Orders" msgstr "" -#. module: account_payment_order -#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__order_id -msgid "Order" -msgstr "" - #. module: account_payment_order #: model:ir.model.fields.selection,name:account_payment_order.selection__account_payment_order__payment_type__outbound -#: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search msgid "Outbound" msgstr "" @@ -956,8 +870,6 @@ msgstr "" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__partner_id -#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__partner_id -#: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search #: model_terms:ir.ui.view,arch_db:account_payment_order.print_account_payment_order_document msgid "Partner" msgstr "" @@ -975,7 +887,6 @@ msgstr "" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__date -#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__date msgid "Payment Date" msgstr "" @@ -995,10 +906,14 @@ msgstr "" msgid "Payment File" msgstr "" +#. module: account_payment_order +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment__payment_line_ids +msgid "Payment Line" +msgstr "" + #. module: account_payment_order #: model:ir.actions.act_window,name:account_payment_order.account_payment_line_action #: model:ir.model,name:account_payment_order.model_account_payment_line -#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__payment_line_ids #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_form #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_line_tree msgid "Payment Lines" @@ -1066,16 +981,16 @@ msgid "Payment Reference" msgstr "" #. module: account_payment_order -#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__payment_type -#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__payment_type -#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__payment_type -msgid "Payment Type" +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__payment_ids +#: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_form +#: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_tree +msgid "Payment Transactions" msgstr "" #. module: account_payment_order -#: code:addons/account_payment_order/models/account_payment_order.py:0 -#, python-format -msgid "Payment bank line %s" +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__payment_type +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__payment_type +msgid "Payment Type" msgstr "" #. module: account_payment_order @@ -1084,10 +999,8 @@ msgid "Payment lines" msgstr "" #. module: account_payment_order -#: code:addons/account_payment_order/models/account_payment_order.py:0 -#: code:addons/account_payment_order/models/account_payment_order.py:0 -#, python-format -msgid "Payment order %s" +#: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__payment_ids +msgid "Payment transaction" msgstr "" #. module: account_payment_order @@ -1107,11 +1020,6 @@ msgstr "" msgid "Reference Type" msgstr "" -#. module: account_payment_order -#: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_form -msgid "Related Payment Lines" -msgstr "" - #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__activity_user_id msgid "Responsible User" @@ -1138,11 +1046,6 @@ msgstr "" msgid "Same or empty" msgstr "" -#. module: account_payment_order -#: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search -msgid "Search Bank Payment Lines" -msgstr "" - #. module: account_payment_order #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search msgid "Search Payment Orders" @@ -1180,13 +1083,11 @@ msgstr "" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_line__state #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_search -#: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_search msgid "State" msgstr "" #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__state -#: model:ir.model.fields,field_description:account_payment_order.field_bank_payment_line__state msgid "Status" msgstr "" @@ -1221,16 +1122,6 @@ msgstr "" msgid "The amount for Partner '%s' is negative or null (%.2f) !" msgstr "" -#. module: account_payment_order -#: model:ir.model.fields,help:account_payment_order.field_account_payment_order__bank_line_ids -msgid "" -"The bank payment lines are used to generate the payment file. They are " -"automatically created from transaction lines upon confirmation of the " -"payment order: one bank payment line can group several transaction lines if " -"the option 'Group Transactions in Payment Orders' is active on the payment " -"mode." -msgstr "" - #. module: account_payment_order #: code:addons/account_payment_order/models/account_move.py:0 #, python-format @@ -1284,11 +1175,6 @@ msgstr "" msgid "Total (Currency)" msgstr "" -#. module: account_payment_order -#: model_terms:ir.ui.view,arch_db:account_payment_order.bank_payment_line_tree -msgid "Total Amount" -msgstr "" - #. module: account_payment_order #: model:ir.model.fields,field_description:account_payment_order.field_account_payment_order__total_company_currency #: model_terms:ir.ui.view,arch_db:account_payment_order.account_payment_order_tree