From 91bb3c8937641e90b14bc884328d26aeb829058c Mon Sep 17 00:00:00 2001 From: manu Date: Tue, 29 Mar 2022 13:03:00 +0200 Subject: [PATCH] [MIG]account_banking_pain_base: Migration to 15.0 --- account_banking_pain_base/README.rst | 13 +++--- account_banking_pain_base/__manifest__.py | 2 +- .../i18n/account_banking_pain_base.pot | 42 ++----------------- account_banking_pain_base/i18n/de.po | 2 +- account_banking_pain_base/i18n/es.po | 2 +- account_banking_pain_base/i18n/it.po | 2 +- account_banking_pain_base/i18n/nl.po | 2 +- account_banking_pain_base/i18n/pt_BR.po | 2 +- account_banking_pain_base/i18n/sl.po | 2 +- .../models/account_payment_line.py | 4 +- .../models/account_payment_mode.py | 3 -- .../models/account_payment_order.py | 13 +++--- .../models/res_company.py | 3 -- .../readme/CONTRIBUTORS.rst | 3 ++ .../static/description/index.html | 10 +++-- 15 files changed, 36 insertions(+), 69 deletions(-) diff --git a/account_banking_pain_base/README.rst b/account_banking_pain_base/README.rst index 2373f360d..aed9b6e2c 100644 --- a/account_banking_pain_base/README.rst +++ b/account_banking_pain_base/README.rst @@ -14,13 +14,13 @@ Account Banking PAIN Base Module :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fbank--payment-lightgray.png?logo=github - :target: https://github.com/OCA/bank-payment/tree/14.0/account_banking_pain_base + :target: https://github.com/OCA/bank-payment/tree/15.0/account_banking_pain_base :alt: OCA/bank-payment .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/bank-payment-14-0/bank-payment-14-0-account_banking_pain_base + :target: https://translation.odoo-community.org/projects/bank-payment-15-0/bank-payment-15-0-account_banking_pain_base :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/173/14.0 + :target: https://runbot.odoo-community.org/runbot/173/15.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -74,7 +74,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -106,6 +106,9 @@ Contributors * Pedro M. Baeza * Carlos Roca +* `Sygel `_: + + * Manuel Regidor Maintainers ~~~~~~~~~~~ @@ -120,6 +123,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/bank-payment `_ project on GitHub. +This module is part of the `OCA/bank-payment `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_banking_pain_base/__manifest__.py b/account_banking_pain_base/__manifest__.py index 4915322e4..1174941fa 100644 --- a/account_banking_pain_base/__manifest__.py +++ b/account_banking_pain_base/__manifest__.py @@ -7,7 +7,7 @@ { "name": "Account Banking PAIN Base Module", "summary": "Base module for PAIN file generation", - "version": "14.0.1.0.1", + "version": "15.0.1.0.1", "license": "AGPL-3", "author": "Akretion, Noviat, Tecnativa, Odoo Community Association (OCA)", "website": "https://github.com/OCA/bank-payment", 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 30a8c737f..b94ee2bd8 100644 --- a/account_banking_pain_base/i18n/account_banking_pain_base.pot +++ b/account_banking_pain_base/i18n/account_banking_pain_base.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 14.0\n" +"Project-Id-Version: Odoo Server 15.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" @@ -274,18 +274,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 @@ -403,18 +391,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" @@ -528,18 +504,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" @@ -876,7 +840,9 @@ 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 diff --git a/account_banking_pain_base/i18n/de.po b/account_banking_pain_base/i18n/de.po index c08b953cb..cc3702e1a 100644 --- a/account_banking_pain_base/i18n/de.po +++ b/account_banking_pain_base/i18n/de.po @@ -676,7 +676,7 @@ msgstr "" #, fuzzy, python-format msgid "Payment Line has reference '%s'." msgstr "" -"Das '%s' der Zahlungszeile kann nicht mit der Referenz '%s'berechnet werden." +"Das 'Referenz '%s'berechnet werden." #. module: account_banking_pain_base #: model:ir.model,name:account_banking_pain_base.model_account_payment_line diff --git a/account_banking_pain_base/i18n/es.po b/account_banking_pain_base/i18n/es.po index 2bee95d26..a05b6b150 100644 --- a/account_banking_pain_base/i18n/es.po +++ b/account_banking_pain_base/i18n/es.po @@ -663,7 +663,7 @@ msgstr "" #, fuzzy, python-format msgid "Payment Line has reference '%s'." msgstr "" -"No se puede procesar el campo '%s' de la línea de pago con referencia '%s'." +"Línea de pago con referencia '%s'." #. module: account_banking_pain_base #: model:ir.model,name:account_banking_pain_base.model_account_payment_line diff --git a/account_banking_pain_base/i18n/it.po b/account_banking_pain_base/i18n/it.po index 6b2f58841..88c1bda35 100644 --- a/account_banking_pain_base/i18n/it.po +++ b/account_banking_pain_base/i18n/it.po @@ -682,7 +682,7 @@ msgstr "" #, fuzzy, python-format msgid "Payment Line has reference '%s'." msgstr "" -"Non è possibile calcolare '%s' della linea di pagamento con riferimento '%s'." +"Linea di pagamento con riferimento '%s'." #. module: account_banking_pain_base #: model:ir.model,name:account_banking_pain_base.model_account_payment_line diff --git a/account_banking_pain_base/i18n/nl.po b/account_banking_pain_base/i18n/nl.po index 5d6bbbba6..000793c93 100644 --- a/account_banking_pain_base/i18n/nl.po +++ b/account_banking_pain_base/i18n/nl.po @@ -665,7 +665,7 @@ msgstr "" #: code:addons/account_banking_pain_base/models/account_payment_order.py:0 #, fuzzy, python-format msgid "Payment Line has reference '%s'." -msgstr "Kan de '%s' niet berekenen van de betaalregel met referentie '%s'." +msgstr "Betaalregel met referentie '%s'." #. module: account_banking_pain_base #: model:ir.model,name:account_banking_pain_base.model_account_payment_line diff --git a/account_banking_pain_base/i18n/pt_BR.po b/account_banking_pain_base/i18n/pt_BR.po index 4ef75bb91..3d65163a3 100644 --- a/account_banking_pain_base/i18n/pt_BR.po +++ b/account_banking_pain_base/i18n/pt_BR.po @@ -645,7 +645,7 @@ msgstr "" #, fuzzy, python-format msgid "Payment Line has reference '%s'." msgstr "" -"Não foi possível calcular a '%s' da linha de pagamento com referência '%s'" +"Linha de pagamento com referência '%s'" #. module: account_banking_pain_base #: model:ir.model,name:account_banking_pain_base.model_account_payment_line diff --git a/account_banking_pain_base/i18n/sl.po b/account_banking_pain_base/i18n/sl.po index e3b0500ba..a7ed52512 100644 --- a/account_banking_pain_base/i18n/sl.po +++ b/account_banking_pain_base/i18n/sl.po @@ -647,7 +647,7 @@ msgstr "" #: code:addons/account_banking_pain_base/models/account_payment_order.py:0 #, fuzzy, python-format msgid "Payment Line has reference '%s'." -msgstr "Ne morem izračunati '%s' plačilne postavke s sklicem '%s'." +msgstr "Plačilne postavke s sklicem '%s'." #. module: account_banking_pain_base #: model:ir.model,name:account_banking_pain_base.model_account_payment_line diff --git a/account_banking_pain_base/models/account_payment_line.py b/account_banking_pain_base/models/account_payment_line.py index e62dc92b4..8753b263d 100644 --- a/account_banking_pain_base/models/account_payment_line.py +++ b/account_banking_pain_base/models/account_payment_line.py @@ -11,7 +11,6 @@ class AccountPaymentLine(models.Model): priority = fields.Selection( [("NORM", "Normal"), ("HIGH", "High")], - string="Priority", default="NORM", help="This field will be used as 'Instruction Priority' in " "the generated PAIN file.", @@ -20,7 +19,7 @@ class AccountPaymentLine(models.Model): # will begin on November 2017, cf account_banking_sepa_credit_transfer # It is also used in some countries such as switzerland, # cf l10n_ch_pain_base that adds some entries in the selection field - local_instrument = fields.Selection([], string="Local Instrument") + local_instrument = fields.Selection([]) category_purpose = fields.Selection( [ # Full category purpose list found on: @@ -56,7 +55,6 @@ class AccountPaymentLine(models.Model): ("VATX", "VAT Payment"), ("WHLD", "WithHolding"), ], - string="Category Purpose", help="If neither your bank nor your local regulations oblige you to " "set the category purpose, leave the field empty.", ) diff --git a/account_banking_pain_base/models/account_payment_mode.py b/account_banking_pain_base/models/account_payment_mode.py index 139efdfe2..7c7d14603 100644 --- a/account_banking_pain_base/models/account_payment_mode.py +++ b/account_banking_pain_base/models/account_payment_mode.py @@ -10,7 +10,6 @@ class AccountPaymentMode(models.Model): _inherit = "account.payment.mode" initiating_party_issuer = fields.Char( - string="Initiating Party Issuer", size=35, help="This will be used as the 'Initiating Party Issuer' in the " "PAIN files generated by Odoo. If not defined, Initiating Party " @@ -21,7 +20,6 @@ class AccountPaymentMode(models.Model): "- Service suffix (N, issued by bank)", ) initiating_party_identifier = fields.Char( - string="Initiating Party Identifier", size=35, help="This will be used as the 'Initiating Party Identifier' in " "the PAIN files generated by Odoo. If not defined, Initiating Party " @@ -32,7 +30,6 @@ class AccountPaymentMode(models.Model): "- Service suffix (N, issued by bank)", ) initiating_party_scheme = fields.Char( - string="Initiating Party Scheme", size=35, help="This will be used as the 'Initiating Party Scheme Name' in " "the PAIN files generated by Odoo. This value is determined by the " diff --git a/account_banking_pain_base/models/account_payment_order.py b/account_banking_pain_base/models/account_payment_order.py index fd8cc402a..7b4027323 100644 --- a/account_banking_pain_base/models/account_payment_order.py +++ b/account_banking_pain_base/models/account_payment_order.py @@ -32,7 +32,6 @@ class AccountPaymentOrder(models.Model): ("CRED", "Borne by Creditor"), ("DEBT", "Borne by Debtor"), ], - string="Charge Bearer", default="SLEV", readonly=True, states={"draft": [("readonly", False)], "open": [("readonly", False)]}, @@ -48,7 +47,6 @@ class AccountPaymentOrder(models.Model): "debtor.", ) batch_booking = fields.Boolean( - string="Batch Booking", readonly=True, states={"draft": [("readonly", False)], "open": [("readonly", False)]}, tracking=True, @@ -202,15 +200,16 @@ class AccountPaymentOrder(models.Model): "\n".join( [error_msg_prefix] + error_msg_details_list + [error_msg_data] ) - ) + ) from None if not isinstance(value, str): raise UserError( _( - "The type of the field '%s' is %s. It should be a string " - "or unicode." + "The type of the field '%(field)s' is %(value)s. It should be a string " + "or unicode.", + field=field_name, + value=type(value), ) - % (field_name, type(value)) ) if not value: raise UserError( @@ -260,7 +259,7 @@ class AccountPaymentOrder(models.Model): "of the problem : %s" ) % str(e) - ) + ) from None return True def finalize_sepa_file_creation(self, xml_root, gen_args): diff --git a/account_banking_pain_base/models/res_company.py b/account_banking_pain_base/models/res_company.py index 86f812765..c81dc54e2 100644 --- a/account_banking_pain_base/models/res_company.py +++ b/account_banking_pain_base/models/res_company.py @@ -14,19 +14,16 @@ class ResCompany(models.Model): _inherit = "res.company" initiating_party_issuer = fields.Char( - string="Initiating Party Issuer", size=35, help="This will be used as the 'Initiating Party Issuer' in the " "PAIN files generated by Odoo.", ) initiating_party_identifier = fields.Char( - string="Initiating Party Identifier", size=35, help="This will be used as the 'Initiating Party Identifier' in " "the PAIN files generated by Odoo.", ) initiating_party_scheme = fields.Char( - string="Initiating Party Scheme", size=35, help="This will be used as the 'Initiating Party Scheme Name' in " "the PAIN files generated by Odoo.", diff --git a/account_banking_pain_base/readme/CONTRIBUTORS.rst b/account_banking_pain_base/readme/CONTRIBUTORS.rst index c878ad094..46fb01c72 100644 --- a/account_banking_pain_base/readme/CONTRIBUTORS.rst +++ b/account_banking_pain_base/readme/CONTRIBUTORS.rst @@ -13,3 +13,6 @@ * Pedro M. Baeza * Carlos Roca +* `Sygel `_: + + * Manuel Regidor diff --git a/account_banking_pain_base/static/description/index.html b/account_banking_pain_base/static/description/index.html index 3bf5c6a6a..64139aee0 100644 --- a/account_banking_pain_base/static/description/index.html +++ b/account_banking_pain_base/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/bank-payment Translate me on Weblate Try me on Runbot

+

Beta License: AGPL-3 OCA/bank-payment Translate me on Weblate Try me on Runbot

This module contains fields and functions that are used by the module for SEPA Credit Transfer (account_banking_sepa_credit_transfer) and SEPA Direct Debit (account_banking_sepa_direct_debit). This module doesn’t provide any @@ -423,7 +423,7 @@ and “Initiating Party Issuer”.

Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -feedback.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -456,6 +456,10 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
  • Carlos Roca
    • +
  • Sygel:
      +
    • Manuel Regidor
      • +
    +
    • @@ -465,7 +469,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

    OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

    -

    This module is part of the OCA/bank-payment project on GitHub.

    +

    This module is part of the OCA/bank-payment project on GitHub.

    You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.