diff --git a/account_banking_pain_base/__manifest__.py b/account_banking_pain_base/__manifest__.py index 00b65e0dd..48152ff72 100644 --- a/account_banking_pain_base/__manifest__.py +++ b/account_banking_pain_base/__manifest__.py @@ -1,13 +1,13 @@ # Copyright 2013-2016 Akretion - Alexis de Lattre -# Copyright 2014-2017 Tecnativa - Pedro M. Baeza # Copyright 2016 Tecnativa - Antonio Espinosa # Copyright 2021 Tecnativa - Carlos Roca +# Copyright 2014-2022 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). { "name": "Account Banking PAIN Base Module", "summary": "Base module for PAIN file generation", - "version": "15.0.1.0.3", + "version": "15.0.2.0.0", "license": "AGPL-3", "author": "Akretion, Noviat, Tecnativa, Odoo Community Association (OCA)", "website": "https://github.com/OCA/bank-payment", @@ -18,7 +18,6 @@ "security/security.xml", "views/account_payment_line.xml", "views/account_payment_order.xml", - "views/bank_payment_line_view.xml", "views/account_payment_mode.xml", "views/res_config_settings.xml", "views/account_payment_method.xml", diff --git a/account_banking_pain_base/i18n/account_banking_pain_base.pot b/account_banking_pain_base/i18n/account_banking_pain_base.pot index b94ee2bd8..419b67e1f 100644 --- a/account_banking_pain_base/i18n/account_banking_pain_base.pot +++ b/account_banking_pain_base/i18n/account_banking_pain_base.pot @@ -60,11 +60,6 @@ msgstr "" msgid "Bank" msgstr "" -#. module: account_banking_pain_base -#: model:ir.model,name:account_banking_pain_base.model_bank_payment_line -msgid "Bank Payment Lines" -msgstr "" - #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_order__batch_booking msgid "Batch Booking" @@ -134,7 +129,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__category_purpose -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__category_purpose msgid "Category Purpose" msgstr "" @@ -407,8 +401,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__category_purpose #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__purpose -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__category_purpose -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__purpose msgid "" "If neither your bank nor your local regulations oblige you to set the " "category purpose, leave the field empty." @@ -532,7 +524,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__local_instrument -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__local_instrument msgid "Local Instrument" msgstr "" @@ -686,7 +677,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__priority -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__priority msgid "Priority" msgstr "" @@ -707,7 +697,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__purpose -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__purpose msgid "Purpose" msgstr "" @@ -847,7 +836,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__priority -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__priority msgid "" "This field will be used as 'Instruction Priority' in the generated PAIN " "file." diff --git a/account_banking_pain_base/i18n/ca.po b/account_banking_pain_base/i18n/ca.po index 154e33563..17cf25d19 100644 --- a/account_banking_pain_base/i18n/ca.po +++ b/account_banking_pain_base/i18n/ca.po @@ -65,11 +65,6 @@ msgstr "" msgid "Bank" msgstr "" -#. module: account_banking_pain_base -#: model:ir.model,name:account_banking_pain_base.model_bank_payment_line -msgid "Bank Payment Lines" -msgstr "" - #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_order__batch_booking msgid "Batch Booking" @@ -139,7 +134,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__category_purpose -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__category_purpose msgid "Category Purpose" msgstr "" @@ -331,11 +325,11 @@ msgstr "" #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_order__charge_bearer msgid "" "Following service level : transaction charges are to be applied following " -"the rules agreed in the service level and/or scheme (SEPA Core messages must" -" use this). Shared : transaction charges on the debtor side are to be borne " +"the rules agreed in the service level and/or scheme (SEPA Core messages must " +"use this). Shared : transaction charges on the debtor side are to be borne " "by the debtor, transaction charges on the creditor side are to be borne by " -"the creditor. Borne by creditor : all transaction charges are to be borne by" -" the creditor. Borne by debtor : all transaction charges are to be borne by " +"the creditor. Borne by creditor : all transaction charges are to be borne by " +"the creditor. Borne by debtor : all transaction charges are to be borne by " "the debtor." msgstr "" @@ -412,8 +406,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__category_purpose #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__purpose -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__category_purpose -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__purpose msgid "" "If neither your bank nor your local regulations oblige you to set the " "category purpose, leave the field empty." @@ -537,7 +529,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__local_instrument -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__local_instrument msgid "Local Instrument" msgstr "" @@ -691,7 +682,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__priority -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__priority msgid "Priority" msgstr "" @@ -712,7 +702,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__purpose -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__purpose msgid "Purpose" msgstr "" @@ -852,10 +841,8 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__priority -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__priority msgid "" -"This field will be used as 'Instruction Priority' in the generated PAIN " -"file." +"This field will be used as 'Instruction Priority' in the generated PAIN file." msgstr "" #. module: account_banking_pain_base @@ -869,7 +856,9 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_mode__initiating_party_identifier msgid "" -"This will be used as the 'Initiating Party Identifier' in the PAIN files generated by Odoo. If not defined, Initiating Party Identifier from company will be used.\n" +"This will be used as the 'Initiating Party Identifier' in the PAIN files " +"generated by Odoo. If not defined, Initiating Party Identifier from company " +"will be used.\n" "Common format (13): \n" "- Country code (2, optional)\n" "- Company idenfier (N, VAT)\n" @@ -887,7 +876,9 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_mode__initiating_party_issuer msgid "" -"This will be used as the 'Initiating Party Issuer' in the PAIN files generated by Odoo. If not defined, Initiating Party Issuer from company will be used.\n" +"This will be used as the 'Initiating Party Issuer' in the PAIN files " +"generated by Odoo. If not defined, Initiating Party Issuer from company will " +"be used.\n" "Common format (13): \n" "- Country code (2, optional)\n" "- Company idenfier (N, VAT)\n" diff --git a/account_banking_pain_base/i18n/de.po b/account_banking_pain_base/i18n/de.po index cc3702e1a..311c49475 100644 --- a/account_banking_pain_base/i18n/de.po +++ b/account_banking_pain_base/i18n/de.po @@ -68,11 +68,6 @@ msgstr "" msgid "Bank" msgstr "" -#. module: account_banking_pain_base -#: model:ir.model,name:account_banking_pain_base.model_bank_payment_line -msgid "Bank Payment Lines" -msgstr "Bankzahlungszeilen" - #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_order__batch_booking msgid "Batch Booking" @@ -143,7 +138,6 @@ msgstr "Cash Management Transfer" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__category_purpose -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__category_purpose msgid "Category Purpose" msgstr "Kategorie Zweck" @@ -435,8 +429,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__category_purpose #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__purpose -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__category_purpose -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__purpose msgid "" "If neither your bank nor your local regulations oblige you to set the " "category purpose, leave the field empty." @@ -568,7 +560,6 @@ msgstr "Bonus-Zahlung" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__local_instrument -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__local_instrument msgid "Local Instrument" msgstr "Lokale Instrumente" @@ -675,8 +666,7 @@ msgstr "" #: code:addons/account_banking_pain_base/models/account_payment_order.py:0 #, fuzzy, python-format msgid "Payment Line has reference '%s'." -msgstr "" -"Das 'Referenz '%s'berechnet werden." +msgstr "Das 'Referenz '%s'berechnet werden." #. module: account_banking_pain_base #: model:ir.model,name:account_banking_pain_base.model_account_payment_line @@ -728,7 +718,6 @@ msgstr "elektronische Zahlung" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__priority -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__priority msgid "Priority" msgstr "Priorität" @@ -749,7 +738,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__purpose -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__purpose #, fuzzy msgid "Purpose" msgstr "Kategorie Zweck" @@ -889,14 +877,13 @@ msgstr "" #. module: account_banking_pain_base #: code:addons/account_banking_pain_base/models/account_payment_order.py:0 #, python-format -msgid "The type of the field '%s' is %s. It should be a string or unicode." +msgid "" +"The type of the field '%(field)s' is %(value)s. It should be a string or " +"unicode." msgstr "" -"Der Typ des Feldes '%s' ist %s. Es sollte eine Zeichenfolge oder ein Unicode " -"sein." #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__priority -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__priority msgid "" "This field will be used as 'Instruction Priority' in the generated PAIN file." msgstr "" @@ -1042,6 +1029,15 @@ msgstr "" msgid "ePayment" msgstr "elektronische Zahlung" +#~ msgid "Bank Payment Lines" +#~ msgstr "Bankzahlungszeilen" + +#, python-format +#~ msgid "The type of the field '%s' is %s. It should be a string or unicode." +#~ msgstr "" +#~ "Der Typ des Feldes '%s' ist %s. Es sollte eine Zeichenfolge oder ein " +#~ "Unicode sein." + #~ msgid "Instant Transfer" #~ msgstr "Sofortige Übertragung" diff --git a/account_banking_pain_base/i18n/es.po b/account_banking_pain_base/i18n/es.po index a05b6b150..ffcb29ad6 100644 --- a/account_banking_pain_base/i18n/es.po +++ b/account_banking_pain_base/i18n/es.po @@ -67,11 +67,6 @@ msgstr "" msgid "Bank" msgstr "" -#. module: account_banking_pain_base -#: model:ir.model,name:account_banking_pain_base.model_bank_payment_line -msgid "Bank Payment Lines" -msgstr "Líneas de pago bancario" - #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_order__batch_booking msgid "Batch Booking" @@ -142,7 +137,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__category_purpose -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__category_purpose msgid "Category Purpose" msgstr "" @@ -426,8 +420,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__category_purpose #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__purpose -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__category_purpose -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__purpose msgid "" "If neither your bank nor your local regulations oblige you to set the " "category purpose, leave the field empty." @@ -556,7 +548,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__local_instrument -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__local_instrument msgid "Local Instrument" msgstr "Instrumento local" @@ -662,8 +653,7 @@ msgstr "" #: code:addons/account_banking_pain_base/models/account_payment_order.py:0 #, fuzzy, python-format msgid "Payment Line has reference '%s'." -msgstr "" -"Línea de pago con referencia '%s'." +msgstr "Línea de pago con referencia '%s'." #. module: account_banking_pain_base #: model:ir.model,name:account_banking_pain_base.model_account_payment_line @@ -715,7 +705,6 @@ msgstr "Pago SEPA" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__priority -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__priority msgid "Priority" msgstr "Prioridad" @@ -736,7 +725,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__purpose -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__purpose msgid "Purpose" msgstr "" @@ -873,12 +861,13 @@ msgstr "" #. module: account_banking_pain_base #: code:addons/account_banking_pain_base/models/account_payment_order.py:0 #, python-format -msgid "The type of the field '%s' is %s. It should be a string or unicode." -msgstr "El tipo del campo '%s' es %s. Debería ser una cadena o unicode." +msgid "" +"The type of the field '%(field)s' is %(value)s. It should be a string or " +"unicode." +msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__priority -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__priority msgid "" "This field will be used as 'Instruction Priority' in the generated PAIN file." msgstr "" @@ -1023,6 +1012,13 @@ msgstr "" msgid "ePayment" msgstr "" +#~ msgid "Bank Payment Lines" +#~ msgstr "Líneas de pago bancario" + +#, python-format +#~ msgid "The type of the field '%s' is %s. It should be a string or unicode." +#~ msgstr "El tipo del campo '%s' es %s. Debería ser una cadena o unicode." + #~ msgid "pain.001.001.02" #~ msgstr "pain.001.001.02" diff --git a/account_banking_pain_base/i18n/es_AR.po b/account_banking_pain_base/i18n/es_AR.po index 27499af96..d8df801bc 100644 --- a/account_banking_pain_base/i18n/es_AR.po +++ b/account_banking_pain_base/i18n/es_AR.po @@ -65,11 +65,6 @@ msgstr "Anualidad" msgid "Bank" msgstr "Banco" -#. module: account_banking_pain_base -#: model:ir.model,name:account_banking_pain_base.model_bank_payment_line -msgid "Bank Payment Lines" -msgstr "Líneas de pago bancario" - #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_order__batch_booking msgid "Batch Booking" @@ -139,7 +134,6 @@ msgstr "Transferencia de Gestión de Efectivo" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__category_purpose -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__category_purpose msgid "Category Purpose" msgstr "Propósito de la Categoría" @@ -336,17 +330,17 @@ msgstr "Según el acuerdo de servicio" #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_order__charge_bearer msgid "" "Following service level : transaction charges are to be applied following " -"the rules agreed in the service level and/or scheme (SEPA Core messages must" -" use this). Shared : transaction charges on the debtor side are to be borne " +"the rules agreed in the service level and/or scheme (SEPA Core messages must " +"use this). Shared : transaction charges on the debtor side are to be borne " "by the debtor, transaction charges on the creditor side are to be borne by " -"the creditor. Borne by creditor : all transaction charges are to be borne by" -" the creditor. Borne by debtor : all transaction charges are to be borne by " +"the creditor. Borne by creditor : all transaction charges are to be borne by " +"the creditor. Borne by debtor : all transaction charges are to be borne by " "the debtor." msgstr "" "Según el acuerdo de servicio: los costes de la transacción se aplicarán " -"siguiendo las reglas acordadas en el nivel de servicio y/o en el esquema (" -"las remesas SEPA Core deben usar esta opción). Compartidos: los costes de la " -"transacción en la parte del acreedor están a cargo del acreedor, y los " +"siguiendo las reglas acordadas en el nivel de servicio y/o en el esquema " +"(las remesas SEPA Core deben usar esta opción). Compartidos: los costes de " +"la transacción en la parte del acreedor están a cargo del acreedor, y los " "costes de la transacción del lado del deudor estarán a cargo del deudor. A " "cargo del acreedor: todos los costes de la transacción estarán a cargo del " "acreedor. A cargo del deudor: Todos los costes de la transacción estarán a " @@ -428,8 +422,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__category_purpose #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__purpose -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__category_purpose -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__purpose msgid "" "If neither your bank nor your local regulations oblige you to set the " "category purpose, leave the field empty." @@ -559,7 +551,6 @@ msgstr "Pago de Préstamo" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__local_instrument -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__local_instrument msgid "Local Instrument" msgstr "Instrumento Local" @@ -715,7 +706,6 @@ msgstr "Pago del Precio" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__priority -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__priority msgid "Priority" msgstr "Prioridad" @@ -736,7 +726,6 @@ msgstr "Compra Venta de Servicios" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__purpose -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__purpose msgid "Purpose" msgstr "Propósito" @@ -878,15 +867,15 @@ msgstr "" #. module: account_banking_pain_base #: code:addons/account_banking_pain_base/models/account_payment_order.py:0 #, python-format -msgid "The type of the field '%s' is %s. It should be a string or unicode." -msgstr "El tipo del campo '%s' es %s. Debería ser una cadena o unicode." +msgid "" +"The type of the field '%(field)s' is %(value)s. It should be a string or " +"unicode." +msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__priority -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__priority msgid "" -"This field will be used as 'Instruction Priority' in the generated PAIN " -"file." +"This field will be used as 'Instruction Priority' in the generated PAIN file." msgstr "" "Este campo se usará como 'Prioridad de instrucción' en el archivo PAIN " "generado." @@ -904,7 +893,9 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_mode__initiating_party_identifier msgid "" -"This will be used as the 'Initiating Party Identifier' in the PAIN files generated by Odoo. If not defined, Initiating Party Identifier from company will be used.\n" +"This will be used as the 'Initiating Party Identifier' in the PAIN files " +"generated by Odoo. If not defined, Initiating Party Identifier from company " +"will be used.\n" "Common format (13): \n" "- Country code (2, optional)\n" "- Company idenfier (N, VAT)\n" @@ -931,7 +922,9 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_mode__initiating_party_issuer msgid "" -"This will be used as the 'Initiating Party Issuer' in the PAIN files generated by Odoo. If not defined, Initiating Party Issuer from company will be used.\n" +"This will be used as the 'Initiating Party Issuer' in the PAIN files " +"generated by Odoo. If not defined, Initiating Party Issuer from company will " +"be used.\n" "Common format (13): \n" "- Country code (2, optional)\n" "- Company idenfier (N, VAT)\n" @@ -1027,3 +1020,10 @@ msgstr "Retenciones" #: model:ir.model.fields.selection,name:account_banking_pain_base.selection__account_payment_line__category_purpose__epay msgid "ePayment" msgstr "Pago Electrónico" + +#~ msgid "Bank Payment Lines" +#~ msgstr "Líneas de pago bancario" + +#, python-format +#~ msgid "The type of the field '%s' is %s. It should be a string or unicode." +#~ msgstr "El tipo del campo '%s' es %s. Debería ser una cadena o unicode." diff --git a/account_banking_pain_base/i18n/fr.po b/account_banking_pain_base/i18n/fr.po index 91a365416..e9a11e9b5 100644 --- a/account_banking_pain_base/i18n/fr.po +++ b/account_banking_pain_base/i18n/fr.po @@ -69,11 +69,6 @@ msgstr "Annuité" msgid "Bank" msgstr "Banque" -#. module: account_banking_pain_base -#: model:ir.model,name:account_banking_pain_base.model_bank_payment_line -msgid "Bank Payment Lines" -msgstr "Lignes de paiement bancaire" - #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_order__batch_booking msgid "Batch Booking" @@ -143,7 +138,6 @@ msgstr "Transfert de gestion de trésorerie" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__category_purpose -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__category_purpose msgid "Category Purpose" msgstr "Objectif de la catégorie" @@ -422,8 +416,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__category_purpose #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__purpose -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__category_purpose -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__purpose msgid "" "If neither your bank nor your local regulations oblige you to set the " "category purpose, leave the field empty." @@ -552,7 +544,6 @@ msgstr "Remboursement de prêt" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__local_instrument -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__local_instrument msgid "Local Instrument" msgstr "" @@ -707,7 +698,6 @@ msgstr "Paiement du prix" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__priority -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__priority msgid "Priority" msgstr "Priorité" @@ -728,7 +718,6 @@ msgstr "Achat vente de services" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__purpose -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__purpose msgid "Purpose" msgstr "Objectif" @@ -865,13 +854,13 @@ msgstr "" #. module: account_banking_pain_base #: code:addons/account_banking_pain_base/models/account_payment_order.py:0 #, python-format -msgid "The type of the field '%s' is %s. It should be a string or unicode." +msgid "" +"The type of the field '%(field)s' is %(value)s. It should be a string or " +"unicode." msgstr "" -"Le type du champ '%s' est %s. Il devrait être de type string ou unicode." #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__priority -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__priority msgid "" "This field will be used as 'Instruction Priority' in the generated PAIN file." msgstr "" @@ -993,6 +982,14 @@ msgstr "Retenue" msgid "ePayment" msgstr "ePaiement" +#~ msgid "Bank Payment Lines" +#~ msgstr "Lignes de paiement bancaire" + +#, python-format +#~ msgid "The type of the field '%s' is %s. It should be a string or unicode." +#~ msgstr "" +#~ "Le type du champ '%s' est %s. Il devrait être de type string ou unicode." + #~ msgid "Cannot compute the '%s' of the Payment Line with reference '%s'." #~ msgstr "" #~ "Impossible de calculer le '%s' de la ligne de paiement ayant la référence " diff --git a/account_banking_pain_base/i18n/hr.po b/account_banking_pain_base/i18n/hr.po index 66d3fe941..473edb10e 100644 --- a/account_banking_pain_base/i18n/hr.po +++ b/account_banking_pain_base/i18n/hr.po @@ -68,11 +68,6 @@ msgstr "" msgid "Bank" msgstr "" -#. module: account_banking_pain_base -#: model:ir.model,name:account_banking_pain_base.model_bank_payment_line -msgid "Bank Payment Lines" -msgstr "Stavke izvoda" - #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_order__batch_booking msgid "Batch Booking" @@ -143,7 +138,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__category_purpose -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__category_purpose msgid "Category Purpose" msgstr "" @@ -420,8 +414,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__category_purpose #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__purpose -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__category_purpose -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__purpose msgid "" "If neither your bank nor your local regulations oblige you to set the " "category purpose, leave the field empty." @@ -547,7 +539,6 @@ msgstr "PLaćanje poreza" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__local_instrument -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__local_instrument msgid "Local Instrument" msgstr "" @@ -703,7 +694,6 @@ msgstr "SEPA plaćanje" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__priority -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__priority msgid "Priority" msgstr "Prioritet" @@ -724,7 +714,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__purpose -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__purpose msgid "Purpose" msgstr "" @@ -858,12 +847,13 @@ msgstr "" #. module: account_banking_pain_base #: code:addons/account_banking_pain_base/models/account_payment_order.py:0 #, python-format -msgid "The type of the field '%s' is %s. It should be a string or unicode." +msgid "" +"The type of the field '%(field)s' is %(value)s. It should be a string or " +"unicode." msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__priority -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__priority msgid "" "This field will be used as 'Instruction Priority' in the generated PAIN file." msgstr "" @@ -986,6 +976,9 @@ msgstr "" msgid "ePayment" msgstr "" +#~ msgid "Bank Payment Lines" +#~ msgstr "Stavke izvoda" + #~ msgid "pain.001.001.02" #~ msgstr "pain.001.001.02" diff --git a/account_banking_pain_base/i18n/it.po b/account_banking_pain_base/i18n/it.po index ad106163a..a97378a1c 100644 --- a/account_banking_pain_base/i18n/it.po +++ b/account_banking_pain_base/i18n/it.po @@ -70,11 +70,6 @@ msgstr "Annualità" msgid "Bank" msgstr "Banca" -#. module: account_banking_pain_base -#: model:ir.model,name:account_banking_pain_base.model_bank_payment_line -msgid "Bank Payment Lines" -msgstr "Linee pagamento banca" - #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_order__batch_booking #, fuzzy @@ -150,7 +145,6 @@ msgstr "Cash Management Transfer" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__category_purpose -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__category_purpose #, fuzzy msgid "Category Purpose" msgstr "Category Purpose" @@ -446,8 +440,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__category_purpose #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__purpose -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__category_purpose -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__purpose msgid "" "If neither your bank nor your local regulations oblige you to set the " "category purpose, leave the field empty." @@ -577,7 +569,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__local_instrument -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__local_instrument msgid "Local Instrument" msgstr "" @@ -681,8 +672,7 @@ msgstr "" #: code:addons/account_banking_pain_base/models/account_payment_order.py:0 #, fuzzy, python-format msgid "Payment Line has reference '%s'." -msgstr "" -"Linea di pagamento con riferimento '%s'." +msgstr "Linea di pagamento con riferimento '%s'." #. module: account_banking_pain_base #: model:ir.model,name:account_banking_pain_base.model_account_payment_line @@ -734,7 +724,6 @@ msgstr "Pagamento SEPA" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__priority -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__priority msgid "Priority" msgstr "Priorità" @@ -755,7 +744,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__purpose -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__purpose msgid "Purpose" msgstr "" @@ -888,12 +876,13 @@ msgstr "" #. module: account_banking_pain_base #: code:addons/account_banking_pain_base/models/account_payment_order.py:0 #, python-format -msgid "The type of the field '%s' is %s. It should be a string or unicode." +msgid "" +"The type of the field '%(field)s' is %(value)s. It should be a string or " +"unicode." msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__priority -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__priority msgid "" "This field will be used as 'Instruction Priority' in the generated PAIN file." msgstr "" @@ -1015,6 +1004,9 @@ msgstr "" msgid "ePayment" msgstr "" +#~ msgid "Bank Payment Lines" +#~ msgstr "Linee pagamento banca" + #~ msgid "Free" #~ msgstr "Gratis" diff --git a/account_banking_pain_base/i18n/nb_NO.po b/account_banking_pain_base/i18n/nb_NO.po index 4df17574f..8e2126fdc 100644 --- a/account_banking_pain_base/i18n/nb_NO.po +++ b/account_banking_pain_base/i18n/nb_NO.po @@ -68,11 +68,6 @@ msgstr "" msgid "Bank" msgstr "" -#. module: account_banking_pain_base -#: model:ir.model,name:account_banking_pain_base.model_bank_payment_line -msgid "Bank Payment Lines" -msgstr "" - #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_order__batch_booking msgid "Batch Booking" @@ -143,7 +138,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__category_purpose -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__category_purpose msgid "Category Purpose" msgstr "" @@ -419,8 +413,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__category_purpose #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__purpose -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__category_purpose -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__purpose msgid "" "If neither your bank nor your local regulations oblige you to set the " "category purpose, leave the field empty." @@ -545,7 +537,6 @@ msgstr "Betalingsordre" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__local_instrument -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__local_instrument msgid "Local Instrument" msgstr "" @@ -701,7 +692,6 @@ msgstr "Betalingsordre" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__priority -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__priority msgid "Priority" msgstr "" @@ -722,7 +712,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__purpose -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__purpose msgid "Purpose" msgstr "" @@ -856,12 +845,13 @@ msgstr "" #. module: account_banking_pain_base #: code:addons/account_banking_pain_base/models/account_payment_order.py:0 #, python-format -msgid "The type of the field '%s' is %s. It should be a string or unicode." +msgid "" +"The type of the field '%(field)s' is %(value)s. It should be a string or " +"unicode." msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__priority -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__priority msgid "" "This field will be used as 'Instruction Priority' in the generated PAIN file." msgstr "" diff --git a/account_banking_pain_base/i18n/nl.po b/account_banking_pain_base/i18n/nl.po index 000793c93..f7b3679a5 100644 --- a/account_banking_pain_base/i18n/nl.po +++ b/account_banking_pain_base/i18n/nl.po @@ -70,11 +70,6 @@ msgstr "Annuiteiten" msgid "Bank" msgstr "Bank" -#. module: account_banking_pain_base -#: model:ir.model,name:account_banking_pain_base.model_bank_payment_line -msgid "Bank Payment Lines" -msgstr "Bank betaalregels" - #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_order__batch_booking msgid "Batch Booking" @@ -145,7 +140,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__category_purpose -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__category_purpose msgid "Category Purpose" msgstr "Doel categorie" @@ -428,8 +422,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__category_purpose #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__purpose -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__category_purpose -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__purpose msgid "" "If neither your bank nor your local regulations oblige you to set the " "category purpose, leave the field empty." @@ -559,7 +551,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__local_instrument -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__local_instrument msgid "Local Instrument" msgstr "Lokaal Instrument" @@ -717,7 +708,6 @@ msgstr "SEPA betaling" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__priority -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__priority msgid "Priority" msgstr "Prioriteit" @@ -738,7 +728,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__purpose -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__purpose msgid "Purpose" msgstr "" @@ -879,12 +868,13 @@ msgstr "" #. module: account_banking_pain_base #: code:addons/account_banking_pain_base/models/account_payment_order.py:0 #, python-format -msgid "The type of the field '%s' is %s. It should be a string or unicode." -msgstr "Het type van veld '%s' is %s. Dit moet een string of unicode zijn." +msgid "" +"The type of the field '%(field)s' is %(value)s. It should be a string or " +"unicode." +msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__priority -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__priority msgid "" "This field will be used as 'Instruction Priority' in the generated PAIN file." msgstr "" @@ -1025,6 +1015,13 @@ msgstr "" msgid "ePayment" msgstr "" +#~ msgid "Bank Payment Lines" +#~ msgstr "Bank betaalregels" + +#, python-format +#~ msgid "The type of the field '%s' is %s. It should be a string or unicode." +#~ msgstr "Het type van veld '%s' is %s. Dit moet een string of unicode zijn." + #~ msgid "pain.001.001.02" #~ msgstr "pain.001.001.02" diff --git a/account_banking_pain_base/i18n/pt_BR.po b/account_banking_pain_base/i18n/pt_BR.po index 3d65163a3..6c07bdd79 100644 --- a/account_banking_pain_base/i18n/pt_BR.po +++ b/account_banking_pain_base/i18n/pt_BR.po @@ -67,11 +67,6 @@ msgstr "" msgid "Bank" msgstr "" -#. module: account_banking_pain_base -#: model:ir.model,name:account_banking_pain_base.model_bank_payment_line -msgid "Bank Payment Lines" -msgstr "Linhas de pagamento bancária" - #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_order__batch_booking msgid "Batch Booking" @@ -142,7 +137,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__category_purpose -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__category_purpose msgid "Category Purpose" msgstr "" @@ -415,8 +409,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__category_purpose #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__purpose -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__category_purpose -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__purpose msgid "" "If neither your bank nor your local regulations oblige you to set the " "category purpose, leave the field empty." @@ -540,7 +532,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__local_instrument -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__local_instrument msgid "Local Instrument" msgstr "" @@ -644,8 +635,7 @@ msgstr "" #: code:addons/account_banking_pain_base/models/account_payment_order.py:0 #, fuzzy, python-format msgid "Payment Line has reference '%s'." -msgstr "" -"Linha de pagamento com referência '%s'" +msgstr "Linha de pagamento com referência '%s'" #. module: account_banking_pain_base #: model:ir.model,name:account_banking_pain_base.model_account_payment_line @@ -696,7 +686,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__priority -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__priority msgid "Priority" msgstr "" @@ -717,7 +706,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__purpose -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__purpose msgid "Purpose" msgstr "" @@ -850,12 +838,13 @@ msgstr "" #. module: account_banking_pain_base #: code:addons/account_banking_pain_base/models/account_payment_order.py:0 #, python-format -msgid "The type of the field '%s' is %s. It should be a string or unicode." +msgid "" +"The type of the field '%(field)s' is %(value)s. It should be a string or " +"unicode." msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__priority -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__priority msgid "" "This field will be used as 'Instruction Priority' in the generated PAIN file." msgstr "" @@ -977,6 +966,9 @@ msgstr "" msgid "ePayment" msgstr "" +#~ msgid "Bank Payment Lines" +#~ msgstr "Linhas de pagamento bancária" + #~ msgid "Cannot compute the '%s' of the Payment Line with reference '%s'." #~ msgstr "" #~ "Não foi possível calcular a '%s' da linha de pagamento com referência '%s'" diff --git a/account_banking_pain_base/i18n/sl.po b/account_banking_pain_base/i18n/sl.po index a7ed52512..2f62389c4 100644 --- a/account_banking_pain_base/i18n/sl.po +++ b/account_banking_pain_base/i18n/sl.po @@ -67,11 +67,6 @@ msgstr "" msgid "Bank" msgstr "" -#. module: account_banking_pain_base -#: model:ir.model,name:account_banking_pain_base.model_bank_payment_line -msgid "Bank Payment Lines" -msgstr "Postavke bančnih plačil" - #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_order__batch_booking msgid "Batch Booking" @@ -142,7 +137,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__category_purpose -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__category_purpose msgid "Category Purpose" msgstr "" @@ -415,8 +409,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__category_purpose #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__purpose -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__category_purpose -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__purpose msgid "" "If neither your bank nor your local regulations oblige you to set the " "category purpose, leave the field empty." @@ -541,7 +533,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__local_instrument -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__local_instrument msgid "Local Instrument" msgstr "" @@ -698,7 +689,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__priority -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__priority msgid "Priority" msgstr "Prioriteta" @@ -719,7 +709,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__purpose -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__purpose msgid "Purpose" msgstr "" @@ -855,12 +844,13 @@ msgstr "" #. module: account_banking_pain_base #: code:addons/account_banking_pain_base/models/account_payment_order.py:0 #, python-format -msgid "The type of the field '%s' is %s. It should be a string or unicode." -msgstr "Tip polja '%s' je %s. Moral bi biti niz ali unicode." +msgid "" +"The type of the field '%(field)s' is %(value)s. It should be a string or " +"unicode." +msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__priority -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__priority msgid "" "This field will be used as 'Instruction Priority' in the generated PAIN file." msgstr "" @@ -1003,6 +993,13 @@ msgstr "" msgid "ePayment" msgstr "" +#~ msgid "Bank Payment Lines" +#~ msgstr "Postavke bančnih plačil" + +#, python-format +#~ msgid "The type of the field '%s' is %s. It should be a string or unicode." +#~ msgstr "Tip polja '%s' je %s. Moral bi biti niz ali unicode." + #~ msgid "Cannot compute the '%s' of the Payment Line with reference '%s'." #~ msgstr "Ne morem izračunati '%s' plačilne postavke s sklicem '%s'." diff --git a/account_banking_pain_base/i18n/sv.po b/account_banking_pain_base/i18n/sv.po index 5e02df127..10347ecad 100644 --- a/account_banking_pain_base/i18n/sv.po +++ b/account_banking_pain_base/i18n/sv.po @@ -64,11 +64,6 @@ msgstr "" msgid "Bank" msgstr "" -#. module: account_banking_pain_base -#: model:ir.model,name:account_banking_pain_base.model_bank_payment_line -msgid "Bank Payment Lines" -msgstr "" - #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_order__batch_booking msgid "Batch Booking" @@ -138,7 +133,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__category_purpose -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__category_purpose msgid "Category Purpose" msgstr "" @@ -278,18 +272,6 @@ msgstr "" msgid "Derivatives" msgstr "" -#. module: account_banking_pain_base -#: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__display_name -#: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_method__display_name -#: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_mode__display_name -#: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_order__display_name -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__display_name -#: model:ir.model.fields,field_description:account_banking_pain_base.field_res_bank__display_name -#: model:ir.model.fields,field_description:account_banking_pain_base.field_res_company__display_name -#: model:ir.model.fields,field_description:account_banking_pain_base.field_res_config_settings__display_name -msgid "Display Name" -msgstr "" - #. module: account_banking_pain_base #: model:ir.model.fields.selection,name:account_banking_pain_base.selection__account_payment_line__category_purpose__divi #: model:ir.model.fields.selection,name:account_banking_pain_base.selection__account_payment_line__purpose__divd @@ -342,11 +324,11 @@ msgstr "" #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_order__charge_bearer msgid "" "Following service level : transaction charges are to be applied following " -"the rules agreed in the service level and/or scheme (SEPA Core messages must" -" use this). Shared : transaction charges on the debtor side are to be borne " +"the rules agreed in the service level and/or scheme (SEPA Core messages must " +"use this). Shared : transaction charges on the debtor side are to be borne " "by the debtor, transaction charges on the creditor side are to be borne by " -"the creditor. Borne by creditor : all transaction charges are to be borne by" -" the creditor. Borne by debtor : all transaction charges are to be borne by " +"the creditor. Borne by creditor : all transaction charges are to be borne by " +"the creditor. Borne by debtor : all transaction charges are to be borne by " "the debtor." msgstr "" @@ -407,18 +389,6 @@ msgstr "" msgid "Housing Tax" msgstr "" -#. module: account_banking_pain_base -#: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__id -#: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_method__id -#: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_mode__id -#: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_order__id -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__id -#: model:ir.model.fields,field_description:account_banking_pain_base.field_res_bank__id -#: model:ir.model.fields,field_description:account_banking_pain_base.field_res_company__id -#: model:ir.model.fields,field_description:account_banking_pain_base.field_res_config_settings__id -msgid "ID" -msgstr "" - #. module: account_banking_pain_base #: model:ir.model.fields.selection,name:account_banking_pain_base.selection__account_payment_line__communication_type__iso msgid "ISO" @@ -435,8 +405,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__category_purpose #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__purpose -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__category_purpose -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__purpose msgid "" "If neither your bank nor your local regulations oblige you to set the " "category purpose, leave the field empty." @@ -532,18 +500,6 @@ msgstr "" msgid "Labor Insurance" msgstr "" -#. module: account_banking_pain_base -#: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line____last_update -#: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_method____last_update -#: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_mode____last_update -#: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_order____last_update -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line____last_update -#: model:ir.model.fields,field_description:account_banking_pain_base.field_res_bank____last_update -#: model:ir.model.fields,field_description:account_banking_pain_base.field_res_company____last_update -#: model:ir.model.fields,field_description:account_banking_pain_base.field_res_config_settings____last_update -msgid "Last Modified on" -msgstr "" - #. module: account_banking_pain_base #: model:ir.model.fields.selection,name:account_banking_pain_base.selection__account_payment_line__purpose__licf msgid "License Fee" @@ -572,7 +528,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__local_instrument -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__local_instrument msgid "Local Instrument" msgstr "" @@ -726,7 +681,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__priority -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__priority msgid "Priority" msgstr "" @@ -747,7 +701,6 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,field_description:account_banking_pain_base.field_account_payment_line__purpose -#: model:ir.model.fields,field_description:account_banking_pain_base.field_bank_payment_line__purpose msgid "Purpose" msgstr "" @@ -880,15 +833,15 @@ msgstr "" #. module: account_banking_pain_base #: code:addons/account_banking_pain_base/models/account_payment_order.py:0 #, python-format -msgid "The type of the field '%s' is %s. It should be a string or unicode." +msgid "" +"The type of the field '%(field)s' is %(value)s. It should be a string or " +"unicode." msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_line__priority -#: model:ir.model.fields,help:account_banking_pain_base.field_bank_payment_line__priority msgid "" -"This field will be used as 'Instruction Priority' in the generated PAIN " -"file." +"This field will be used as 'Instruction Priority' in the generated PAIN file." msgstr "" #. module: account_banking_pain_base @@ -902,7 +855,9 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_mode__initiating_party_identifier msgid "" -"This will be used as the 'Initiating Party Identifier' in the PAIN files generated by Odoo. If not defined, Initiating Party Identifier from company will be used.\n" +"This will be used as the 'Initiating Party Identifier' in the PAIN files " +"generated by Odoo. If not defined, Initiating Party Identifier from company " +"will be used.\n" "Common format (13): \n" "- Country code (2, optional)\n" "- Company idenfier (N, VAT)\n" @@ -920,7 +875,9 @@ msgstr "" #. module: account_banking_pain_base #: model:ir.model.fields,help:account_banking_pain_base.field_account_payment_mode__initiating_party_issuer msgid "" -"This will be used as the 'Initiating Party Issuer' in the PAIN files generated by Odoo. If not defined, Initiating Party Issuer from company will be used.\n" +"This will be used as the 'Initiating Party Issuer' in the PAIN files " +"generated by Odoo. If not defined, Initiating Party Issuer from company will " +"be used.\n" "Common format (13): \n" "- Country code (2, optional)\n" "- Company idenfier (N, VAT)\n" diff --git a/account_banking_pain_base/models/__init__.py b/account_banking_pain_base/models/__init__.py index af5bbf1f2..4f1503393 100644 --- a/account_banking_pain_base/models/__init__.py +++ b/account_banking_pain_base/models/__init__.py @@ -1,6 +1,5 @@ from . import account_payment_line from . import account_payment_order -from . import bank_payment_line from . import account_payment_mode from . import res_company from . import res_config_settings diff --git a/account_banking_pain_base/models/account_payment_line.py b/account_banking_pain_base/models/account_payment_line.py index 8753b263d..2e3d03147 100644 --- a/account_banking_pain_base/models/account_payment_line.py +++ b/account_banking_pain_base/models/account_payment_line.py @@ -1,9 +1,9 @@ # Copyright 2013-2016 Akretion - Alexis de Lattre -# Copyright 2014 Serv. Tecnol. Avanzados - Pedro M. Baeza # Copyright 2021 Tecnativa - Carlos Roca +# Copyright 2014-2022 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). -from odoo import fields, models +from odoo import api, fields, models class AccountPaymentLine(models.Model): @@ -171,3 +171,10 @@ class AccountPaymentLine(models.Model): communication_type = fields.Selection( selection_add=[("ISO", "ISO")], ondelete={"ISO": "cascade"} ) + + @api.model + def _get_payment_line_grouping_fields(self): + """Add specific PAIN fields to the grouping criteria.""" + res = super()._get_payment_line_grouping_fields() + res += ["priority", "local_instrument", "category_purpose", "purpose"] + return res diff --git a/account_banking_pain_base/models/account_payment_order.py b/account_banking_pain_base/models/account_payment_order.py index 4380e291c..753db771d 100644 --- a/account_banking_pain_base/models/account_payment_order.py +++ b/account_banking_pain_base/models/account_payment_order.py @@ -1,7 +1,7 @@ # Copyright 2013-2016 Akretion - Alexis de Lattre -# Copyright 2014 Serv. Tecnol. Avanzados - Pedro M. Baeza # Copyright 2016 Antiun Ingenieria S.L. - Antonio Espinosa # Copyright 2021 Tecnativa - Carlos Roca +# Copyright 2014-2022 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). import logging @@ -606,11 +606,12 @@ class AccountPaymentOrder(models.Model): @api.model def generate_remittance_info_block(self, parent_node, line, gen_args): remittance_info = etree.SubElement(parent_node, "RmtInf") - if line.communication_type == "normal": + communication_type = line.payment_line_ids[:1].communication_type + if communication_type == "normal": remittance_info_unstructured = etree.SubElement(remittance_info, "Ustrd") remittance_info_unstructured.text = self._prepare_field( "Remittance Unstructured Information", - "line.communication", + "line.payment_reference", {"line": line}, 140, gen_args=gen_args, @@ -632,7 +633,7 @@ class AccountPaymentOrder(models.Model): creditor_ref_info_type_issuer = etree.SubElement( creditor_ref_info_type, "Issr" ) - creditor_ref_info_type_issuer.text = line.communication_type + creditor_ref_info_type_issuer.text = communication_type creditor_reference = etree.SubElement( creditor_ref_information, "CdtrRef" ) @@ -651,13 +652,13 @@ class AccountPaymentOrder(models.Model): creditor_ref_info_type_issuer = etree.SubElement( creditor_ref_info_type, "Issr" ) - creditor_ref_info_type_issuer.text = line.communication_type + creditor_ref_info_type_issuer.text = communication_type creditor_reference = etree.SubElement(creditor_ref_information, "Ref") creditor_reference.text = self._prepare_field( "Creditor Structured Reference", - "line.communication", + "line.payment_reference", {"line": line}, 35, gen_args=gen_args, diff --git a/account_banking_pain_base/models/bank_payment_line.py b/account_banking_pain_base/models/bank_payment_line.py deleted file mode 100644 index 0079b5fda..000000000 --- a/account_banking_pain_base/models/bank_payment_line.py +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2013-2016 Akretion - Alexis de Lattre -# Copyright 2021 Tecnativa - Carlos Roca -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). - -from odoo import api, fields, models - - -class BankPaymentLine(models.Model): - _inherit = "bank.payment.line" - - priority = fields.Selection(related="payment_line_ids.priority", string="Priority") - local_instrument = fields.Selection( - related="payment_line_ids.local_instrument", string="Local Instrument" - ) - category_purpose = fields.Selection( - related="payment_line_ids.category_purpose", string="Category Purpose" - ) - purpose = fields.Selection(related="payment_line_ids.purpose") - - @api.model - def same_fields_payment_line_and_bank_payment_line(self): - res = super().same_fields_payment_line_and_bank_payment_line() - res += ["priority", "local_instrument", "category_purpose", "purpose"] - return res diff --git a/account_banking_pain_base/views/bank_payment_line_view.xml b/account_banking_pain_base/views/bank_payment_line_view.xml deleted file mode 100644 index 247de1783..000000000 --- a/account_banking_pain_base/views/bank_payment_line_view.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - pain.base.bank.payment.line.form - bank.payment.line - - - - - - - - - - - - pain.base.bank.payment.line.tree - bank.payment.line - - - - - - - - -