From a449b36eb0a4a15d40bd32ee6f0280177e8aee0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jarmo=20Kortetj=C3=A4rvi?= Date: Fri, 24 Jan 2025 10:20:06 +0200 Subject: [PATCH] [MIG] l10n_fi_payment_terms: Migration to 17.0 --- l10n_fi_payment_terms/README.rst | 16 ++-- l10n_fi_payment_terms/__init__.py | 1 - l10n_fi_payment_terms/__manifest__.py | 8 +- .../data/payment_terms_finnish.xml | 74 ++++--------------- l10n_fi_payment_terms/i18n/fi.po | 69 +++-------------- .../i18n/l10n_fi_payment_terms.pot | 62 ++-------------- l10n_fi_payment_terms/models/__init__.py | 1 - l10n_fi_payment_terms/models/payment_term.py | 7 -- l10n_fi_payment_terms/readme/CONTRIBUTORS.md | 2 +- l10n_fi_payment_terms/readme/DESCRIPTION.md | 4 - l10n_fi_payment_terms/readme/HISTORY.md | 6 ++ .../static/description/index.html | 50 +++++++------ 12 files changed, 79 insertions(+), 221 deletions(-) delete mode 100644 l10n_fi_payment_terms/models/__init__.py delete mode 100644 l10n_fi_payment_terms/models/payment_term.py diff --git a/l10n_fi_payment_terms/README.rst b/l10n_fi_payment_terms/README.rst index d6252aa8..3dddda12 100644 --- a/l10n_fi_payment_terms/README.rst +++ b/l10n_fi_payment_terms/README.rst @@ -34,13 +34,9 @@ Common Finnish invoice payment terms. **Added Payment terms** -- IMMEDIATE - 7 days - 10 days - 14 days -- 21 days -- 30 days -- 45 days - 60 days - 90 days @@ -57,6 +53,14 @@ Configuration Changelog ========= +17.0.1.0.0 (2025-01-24) +----------------------- + +- [MIGRATION] from 14.0 to 17.0 +- Removed "Immediate payment", "21 Days", "30 Days", "45 Days" as + redundant +- Removed the "code" field that was added to payment terms + 14.0.1.0.0 (2021-06-04) ----------------------- @@ -78,12 +82,12 @@ Credits Authors ------- -* Tawasta +* Futural Contributors ------------ -- Jarmo Kortetjärvi +- Jarmo Kortetjärvi - Miku Laitinen Other credits diff --git a/l10n_fi_payment_terms/__init__.py b/l10n_fi_payment_terms/__init__.py index 0650744f..e69de29b 100644 --- a/l10n_fi_payment_terms/__init__.py +++ b/l10n_fi_payment_terms/__init__.py @@ -1 +0,0 @@ -from . import models diff --git a/l10n_fi_payment_terms/__manifest__.py b/l10n_fi_payment_terms/__manifest__.py index c647a075..3e706f91 100644 --- a/l10n_fi_payment_terms/__manifest__.py +++ b/l10n_fi_payment_terms/__manifest__.py @@ -1,7 +1,7 @@ ############################################################################## # -# Author: Oy Tawasta OS Technologies Ltd. -# Copyright 2015 Oy Tawasta OS Technologies Ltd. (http://www.tawasta.fi) +# Author: Futural Oy +# Copyright 2015 Futural Oy (https://futural.fi) # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -21,10 +21,10 @@ { "name": "Finnish Payment Terms", "summary": "Common Finnish invoice payment terms", - "version": "14.0.1.0.0", + "version": "17.0.1.0.0", "category": "Localization", "website": "https://github.com/OCA/l10n-finland", - "author": "Tawasta, Odoo Community Association (OCA)", + "author": "Futural, Odoo Community Association (OCA)", "license": "AGPL-3", "application": False, "installable": True, diff --git a/l10n_fi_payment_terms/data/payment_terms_finnish.xml b/l10n_fi_payment_terms/data/payment_terms_finnish.xml index 6780008f..260d370e 100644 --- a/l10n_fi_payment_terms/data/payment_terms_finnish.xml +++ b/l10n_fi_payment_terms/data/payment_terms_finnish.xml @@ -1,103 +1,59 @@ - - - Immediate Payment - immediate - Immediate Payment - 1 - - + + + 7 Days - 7_days 7 Days - 2 10 Days - 10_days 10 Days - 3 14 Days - 14_days 14 Days - 4 - - - - - 21 Days - 21_days - 21 Days - 5 - - - - - 30 Days - 30_days - 30 Days - 6 - - - - - 45 Days - 45_days - 45 Days - 7 + + + + + + + 60 Days - 60_days 60 Days - 8 90 Days - 90_days 90 Days - 9 diff --git a/l10n_fi_payment_terms/i18n/fi.po b/l10n_fi_payment_terms/i18n/fi.po index 2f2f0886..ab1a7b8c 100644 --- a/l10n_fi_payment_terms/i18n/fi.po +++ b/l10n_fi_payment_terms/i18n/fi.po @@ -4,97 +4,48 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" +"Project-Id-Version: Odoo Server 17.0-20240924\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-11 12:46+0000\n" -"PO-Revision-Date: 2021-05-11 15:47+0300\n" -"Last-Translator: Jarmo Kortetjärvi \n" +"POT-Creation-Date: 2025-01-24 08:19+0000\n" +"PO-Revision-Date: 2025-01-24 08:19+0000\n" +"Last-Translator: \n" "Language-Team: \n" -"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: \n" "Plural-Forms: \n" -"X-Generator: Poedit 2.3\n" #. module: l10n_fi_payment_terms #: model:account.payment.term,name:l10n_fi_payment_terms.account_payment_term_10_days -#: model:account.payment.term,note:l10n_fi_payment_terms.account_payment_term_10_days +#: model_terms:account.payment.term,note:l10n_fi_payment_terms.account_payment_term_10_days msgid "10 Days" msgstr "10 päivää netto" #. module: l10n_fi_payment_terms #: model:account.payment.term,name:l10n_fi_payment_terms.account_payment_term_14_days -#: model:account.payment.term,note:l10n_fi_payment_terms.account_payment_term_14_days +#: model_terms:account.payment.term,note:l10n_fi_payment_terms.account_payment_term_14_days msgid "14 Days" msgstr "14 päivää netto" -#. module: l10n_fi_payment_terms -#: model:account.payment.term,name:l10n_fi_payment_terms.account_payment_term_21_days -#: model:account.payment.term,note:l10n_fi_payment_terms.account_payment_term_21_days -msgid "21 Days" -msgstr "21 päivää netto" - -#. module: l10n_fi_payment_terms -#: model:account.payment.term,name:l10n_fi_payment_terms.account_payment_term_30_days -#: model:account.payment.term,note:l10n_fi_payment_terms.account_payment_term_30_days -msgid "30 Days" -msgstr "30 päivää netto" - -#. module: l10n_fi_payment_terms -#: model:account.payment.term,name:l10n_fi_payment_terms.account_payment_term_45_days -#: model:account.payment.term,note:l10n_fi_payment_terms.account_payment_term_45_days -msgid "45 Days" -msgstr "45 päivää netto" - #. module: l10n_fi_payment_terms #: model:account.payment.term,name:l10n_fi_payment_terms.account_payment_term_60_days -#: model:account.payment.term,note:l10n_fi_payment_terms.account_payment_term_60_days +#: model_terms:account.payment.term,note:l10n_fi_payment_terms.account_payment_term_60_days msgid "60 Days" msgstr "60 päivää netto" #. module: l10n_fi_payment_terms #: model:account.payment.term,name:l10n_fi_payment_terms.account_payment_term_7_days -#: model:account.payment.term,note:l10n_fi_payment_terms.account_payment_term_7_days +#: model_terms:account.payment.term,note:l10n_fi_payment_terms.account_payment_term_7_days msgid "7 Days" msgstr "7 päivää netto" #. module: l10n_fi_payment_terms #: model:account.payment.term,name:l10n_fi_payment_terms.account_payment_term_90_days -#: model:account.payment.term,note:l10n_fi_payment_terms.account_payment_term_90_days +#: model_terms:account.payment.term,note:l10n_fi_payment_terms.account_payment_term_90_days msgid "90 Days" msgstr "90 päivää netto" -#. module: l10n_fi_payment_terms -#: model:ir.model.fields,field_description:l10n_fi_payment_terms.field_account_payment_term__display_name -msgid "Display Name" -msgstr "" - -#. module: l10n_fi_payment_terms -#: model:ir.model.fields,field_description:l10n_fi_payment_terms.field_account_payment_term__id -msgid "ID" -msgstr "" - -#. module: l10n_fi_payment_terms -#: model:account.payment.term,name:l10n_fi_payment_terms.account_payment_term_immediate -#: model:account.payment.term,note:l10n_fi_payment_terms.account_payment_term_immediate -msgid "Immediate Payment" -msgstr "HETI" - -#. module: l10n_fi_payment_terms -#: model:ir.model.fields,field_description:l10n_fi_payment_terms.field_account_payment_term____last_update -msgid "Last Modified on" -msgstr "" - #. module: l10n_fi_payment_terms #: model:ir.model,name:l10n_fi_payment_terms.model_account_payment_term msgid "Payment Terms" msgstr "Maksuehdot" - -#. module: l10n_fi_payment_terms -#: model:ir.model.fields,field_description:l10n_fi_payment_terms.field_account_payment_term__code -msgid "Unique code" -msgstr "Uniikki koodi" - -#~ msgid "Sequence" -#~ msgstr "Järjestys" diff --git a/l10n_fi_payment_terms/i18n/l10n_fi_payment_terms.pot b/l10n_fi_payment_terms/i18n/l10n_fi_payment_terms.pot index 3e3160cf..76dacf83 100644 --- a/l10n_fi_payment_terms/i18n/l10n_fi_payment_terms.pot +++ b/l10n_fi_payment_terms/i18n/l10n_fi_payment_terms.pot @@ -4,90 +4,38 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 14.0\n" -"Report-Msgid-Bugs-To: \n" -"Last-Translator: \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" #. module: l10n_fi_payment_terms #: model:account.payment.term,name:l10n_fi_payment_terms.account_payment_term_10_days -#: model:account.payment.term,note:l10n_fi_payment_terms.account_payment_term_10_days +#: model_terms:account.payment.term,note:l10n_fi_payment_terms.account_payment_term_10_days msgid "10 Days" msgstr "" #. module: l10n_fi_payment_terms #: model:account.payment.term,name:l10n_fi_payment_terms.account_payment_term_14_days -#: model:account.payment.term,note:l10n_fi_payment_terms.account_payment_term_14_days +#: model_terms:account.payment.term,note:l10n_fi_payment_terms.account_payment_term_14_days msgid "14 Days" msgstr "" -#. module: l10n_fi_payment_terms -#: model:account.payment.term,name:l10n_fi_payment_terms.account_payment_term_21_days -#: model:account.payment.term,note:l10n_fi_payment_terms.account_payment_term_21_days -msgid "21 Days" -msgstr "" - -#. module: l10n_fi_payment_terms -#: model:account.payment.term,name:l10n_fi_payment_terms.account_payment_term_30_days -#: model:account.payment.term,note:l10n_fi_payment_terms.account_payment_term_30_days -msgid "30 Days" -msgstr "" - -#. module: l10n_fi_payment_terms -#: model:account.payment.term,name:l10n_fi_payment_terms.account_payment_term_45_days -#: model:account.payment.term,note:l10n_fi_payment_terms.account_payment_term_45_days -msgid "45 Days" -msgstr "" - #. module: l10n_fi_payment_terms #: model:account.payment.term,name:l10n_fi_payment_terms.account_payment_term_60_days -#: model:account.payment.term,note:l10n_fi_payment_terms.account_payment_term_60_days +#: model_terms:account.payment.term,note:l10n_fi_payment_terms.account_payment_term_60_days msgid "60 Days" msgstr "" #. module: l10n_fi_payment_terms #: model:account.payment.term,name:l10n_fi_payment_terms.account_payment_term_7_days -#: model:account.payment.term,note:l10n_fi_payment_terms.account_payment_term_7_days +#: model_terms:account.payment.term,note:l10n_fi_payment_terms.account_payment_term_7_days msgid "7 Days" msgstr "" #. module: l10n_fi_payment_terms #: model:account.payment.term,name:l10n_fi_payment_terms.account_payment_term_90_days -#: model:account.payment.term,note:l10n_fi_payment_terms.account_payment_term_90_days +#: model_terms:account.payment.term,note:l10n_fi_payment_terms.account_payment_term_90_days msgid "90 Days" msgstr "" -#. module: l10n_fi_payment_terms -#: model:ir.model.fields,field_description:l10n_fi_payment_terms.field_account_payment_term__display_name -msgid "Display Name" -msgstr "" - -#. module: l10n_fi_payment_terms -#: model:ir.model.fields,field_description:l10n_fi_payment_terms.field_account_payment_term__id -msgid "ID" -msgstr "" - -#. module: l10n_fi_payment_terms -#: model:account.payment.term,name:l10n_fi_payment_terms.account_payment_term_immediate -#: model:account.payment.term,note:l10n_fi_payment_terms.account_payment_term_immediate -msgid "Immediate Payment" -msgstr "" - -#. module: l10n_fi_payment_terms -#: model:ir.model.fields,field_description:l10n_fi_payment_terms.field_account_payment_term____last_update -msgid "Last Modified on" -msgstr "" - #. module: l10n_fi_payment_terms #: model:ir.model,name:l10n_fi_payment_terms.model_account_payment_term msgid "Payment Terms" msgstr "" - -#. module: l10n_fi_payment_terms -#: model:ir.model.fields,field_description:l10n_fi_payment_terms.field_account_payment_term__code -msgid "Unique code" -msgstr "" diff --git a/l10n_fi_payment_terms/models/__init__.py b/l10n_fi_payment_terms/models/__init__.py deleted file mode 100644 index 0516b76b..00000000 --- a/l10n_fi_payment_terms/models/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from . import payment_term diff --git a/l10n_fi_payment_terms/models/payment_term.py b/l10n_fi_payment_terms/models/payment_term.py deleted file mode 100644 index c0be68fe..00000000 --- a/l10n_fi_payment_terms/models/payment_term.py +++ /dev/null @@ -1,7 +0,0 @@ -from odoo import fields, models - - -class PaymentTerm(models.Model): - _inherit = "account.payment.term" - - code = fields.Char("Unique code") diff --git a/l10n_fi_payment_terms/readme/CONTRIBUTORS.md b/l10n_fi_payment_terms/readme/CONTRIBUTORS.md index 3c848022..8de3537e 100644 --- a/l10n_fi_payment_terms/readme/CONTRIBUTORS.md +++ b/l10n_fi_payment_terms/readme/CONTRIBUTORS.md @@ -1,2 +1,2 @@ -- Jarmo Kortetjärvi \<\> +- Jarmo Kortetjärvi \<\> - Miku Laitinen \<\> diff --git a/l10n_fi_payment_terms/readme/DESCRIPTION.md b/l10n_fi_payment_terms/readme/DESCRIPTION.md index 64568656..502c9204 100644 --- a/l10n_fi_payment_terms/readme/DESCRIPTION.md +++ b/l10n_fi_payment_terms/readme/DESCRIPTION.md @@ -4,12 +4,8 @@ Common Finnish invoice payment terms. **Added Payment terms** -- IMMEDIATE - 7 days - 10 days - 14 days -- 21 days -- 30 days -- 45 days - 60 days - 90 days diff --git a/l10n_fi_payment_terms/readme/HISTORY.md b/l10n_fi_payment_terms/readme/HISTORY.md index 36140f35..04d51dbf 100644 --- a/l10n_fi_payment_terms/readme/HISTORY.md +++ b/l10n_fi_payment_terms/readme/HISTORY.md @@ -1,3 +1,9 @@ +## 17.0.1.0.0 (2025-01-24) + +- \[MIGRATION\] from 14.0 to 17.0 +- Removed "Immediate payment", "21 Days", "30 Days", "45 Days" as redundant +- Removed the "code" field that was added to payment terms + ## 14.0.1.0.0 (2021-06-04) - \[MIGRATION\] from 13.0 to 14.0 diff --git a/l10n_fi_payment_terms/static/description/index.html b/l10n_fi_payment_terms/static/description/index.html index eba96dff..73a9fb0f 100644 --- a/l10n_fi_payment_terms/static/description/index.html +++ b/l10n_fi_payment_terms/static/description/index.html @@ -377,13 +377,9 @@

Finnish Payment Terms

Added Payment terms

    -
  • IMMEDIATE
  • 7 days
  • 10 days
  • 14 days
    • -
  • 21 days
    • -
  • 30 days
    • -
  • 45 days
  • 60 days
  • 90 days
@@ -392,18 +388,19 @@

Finnish Payment Terms