From b8e210a6445fe1b98fa9f7ceab15c32c383a9537 Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Wed, 31 Mar 2021 10:31:33 +0200 Subject: [PATCH 1/9] [ADD] account_fiscal_year_auto_create : new module to create automatically new fiscal years --- account_fiscal_year_auto_create/README.rst | 8 +++ account_fiscal_year_auto_create/__init__.py | 1 + .../__manifest__.py | 21 +++++++ .../data/ir_cron.xml | 21 +++++++ account_fiscal_year_auto_create/l18n/fr.po | 35 ++++++++++++ .../models/__init__.py | 1 + .../models/account_fiscal_year.py | 56 +++++++++++++++++++ .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 25 +++++++++ .../tests/__init__.py | 1 + .../tests/test_module.py | 54 ++++++++++++++++++ 11 files changed, 224 insertions(+) create mode 100644 account_fiscal_year_auto_create/README.rst create mode 100644 account_fiscal_year_auto_create/__init__.py create mode 100644 account_fiscal_year_auto_create/__manifest__.py create mode 100644 account_fiscal_year_auto_create/data/ir_cron.xml create mode 100644 account_fiscal_year_auto_create/l18n/fr.po create mode 100644 account_fiscal_year_auto_create/models/__init__.py create mode 100644 account_fiscal_year_auto_create/models/account_fiscal_year.py create mode 100644 account_fiscal_year_auto_create/readme/CONTRIBUTORS.rst create mode 100644 account_fiscal_year_auto_create/readme/DESCRIPTION.rst create mode 100644 account_fiscal_year_auto_create/tests/__init__.py create mode 100644 account_fiscal_year_auto_create/tests/test_module.py diff --git a/account_fiscal_year_auto_create/README.rst b/account_fiscal_year_auto_create/README.rst new file mode 100644 index 00000000..bc7d401d --- /dev/null +++ b/account_fiscal_year_auto_create/README.rst @@ -0,0 +1,8 @@ +================================= +Fiscal Years - Automatic Creation +================================= + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/account_fiscal_year_auto_create/__init__.py b/account_fiscal_year_auto_create/__init__.py new file mode 100644 index 00000000..0650744f --- /dev/null +++ b/account_fiscal_year_auto_create/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/account_fiscal_year_auto_create/__manifest__.py b/account_fiscal_year_auto_create/__manifest__.py new file mode 100644 index 00000000..d5f217d9 --- /dev/null +++ b/account_fiscal_year_auto_create/__manifest__.py @@ -0,0 +1,21 @@ +# Copyright (C) 2021 - Today: GRAP (http://www.grap.coop) +# @author: Sylvain LE GAL (https://twitter.com/legalsylvain) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +{ + "name": "Fiscal Years - Automatic Creation", + "summary": "Automatically create new fiscal years, based on the datas" + " of the last fiscal years", + "version": "12.0.1.0.1", + "category": "Accounting", + "author": "GRAP,Odoo Community Association (OCA)", + "maintainers": ["legalsylvain"], + "website": "http://www.github.com/OCA/account-financial-tools", + "license": "AGPL-3", + "depends": [ + "account", + ], + "data": [ + "data/ir_cron.xml", + ], +} diff --git a/account_fiscal_year_auto_create/data/ir_cron.xml b/account_fiscal_year_auto_create/data/ir_cron.xml new file mode 100644 index 00000000..55e7f1ab --- /dev/null +++ b/account_fiscal_year_auto_create/data/ir_cron.xml @@ -0,0 +1,21 @@ + + + + + + Auto Create Fiscal Years + + + code + model.cron_auto_create() + 1 + days + + -1 + + + diff --git a/account_fiscal_year_auto_create/l18n/fr.po b/account_fiscal_year_auto_create/l18n/fr.po new file mode 100644 index 00000000..094710bc --- /dev/null +++ b/account_fiscal_year_auto_create/l18n/fr.po @@ -0,0 +1,35 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_fiscal_year_auto_create +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-03-31 08:41+0000\n" +"PO-Revision-Date: 2021-03-31 08:41+0000\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: account_fiscal_year_auto_create +#: model:ir.actions.server,name:account_fiscal_year_auto_create.cron_fiscal_year_auto_create_ir_actions_server +#: model:ir.cron,cron_name:account_fiscal_year_auto_create.cron_fiscal_year_auto_create +#: model:ir.cron,name:account_fiscal_year_auto_create.cron_fiscal_year_auto_create +msgid "Auto Create Fiscal Years" +msgstr "Création automatique d'année fiscales" + +#. module: account_fiscal_year_auto_create +#: code:addons/account_fiscal_year_auto_create/models/account_fiscal_year.py:45 +#, python-format +msgid "FY %s - %s" +msgstr "AF %s - %s" + +#. module: account_fiscal_year_auto_create +#: model:ir.model,name:account_fiscal_year_auto_create.model_account_fiscal_year +msgid "Fiscal Year" +msgstr "Exercice fiscal" + diff --git a/account_fiscal_year_auto_create/models/__init__.py b/account_fiscal_year_auto_create/models/__init__.py new file mode 100644 index 00000000..562a420f --- /dev/null +++ b/account_fiscal_year_auto_create/models/__init__.py @@ -0,0 +1 @@ +from . import account_fiscal_year diff --git a/account_fiscal_year_auto_create/models/account_fiscal_year.py b/account_fiscal_year_auto_create/models/account_fiscal_year.py new file mode 100644 index 00000000..45c11651 --- /dev/null +++ b/account_fiscal_year_auto_create/models/account_fiscal_year.py @@ -0,0 +1,56 @@ +# Copyright (C) 2021 - Today: GRAP (http://www.grap.coop) +# @author: Sylvain LE GAL (https://twitter.com/legalsylvain) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from datetime import datetime +from dateutil.relativedelta import relativedelta + +from odoo import _, api, models + + +class AccountFiscalYear(models.Model): + _inherit = "account.fiscal.year" + + @api.model + def cron_auto_create(self): + companies = self.env["res.company"].search([]) + for company in companies: + last_fiscal_year = self.search( + [('company_id', '=', company.id)], + order="date_to desc", limit=1) + + if last_fiscal_year and ( + last_fiscal_year.date_to < + datetime.now().date() + relativedelta(days=1) + ): + self.create(last_fiscal_year._prepare_next_fiscal_year()) + + @api.multi + def _prepare_next_fiscal_year(self): + self.ensure_one() + # try to generate a new name, based on the previous + # name replacing YYYY pattern by YYYY+1 value + # - "FY 2018" will be replace by "FY 2019" + # - "FY 2018-2019" will be replace by "FY 2019-2020" + new_name = self.name.replace( + str((self.date_to.year)), str((self.date_to.year + 1)) + ).replace( + str((self.date_from.year)), str((self.date_from.year + 1)) + ) + if self.search([ + ("name", "=", new_name), + ("company_id", "=", self.company_id.id) + ]): + # the replace process fail to guess a correct unique name + new_name = _("FY %s - %s") % ( + str(self.date_to), str(self.date_from) + ) + # compute new dates, handling leap years + new_date_from = self.date_to + relativedelta(days=1) + new_date_to = new_date_from + relativedelta(years=1, days=-1) + return { + "name": new_name, + "company_id": self.company_id.id, + "date_from": new_date_from.strftime("%Y-%m-%d"), + "date_to": new_date_to.strftime("%Y-%m-%d"), + } diff --git a/account_fiscal_year_auto_create/readme/CONTRIBUTORS.rst b/account_fiscal_year_auto_create/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..9f76a75b --- /dev/null +++ b/account_fiscal_year_auto_create/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Sylvain LE GAL diff --git a/account_fiscal_year_auto_create/readme/DESCRIPTION.rst b/account_fiscal_year_auto_create/readme/DESCRIPTION.rst new file mode 100644 index 00000000..94e93455 --- /dev/null +++ b/account_fiscal_year_auto_create/readme/DESCRIPTION.rst @@ -0,0 +1,25 @@ +This module extends the functionality of Accounting Odoo module, to +auto generate fiscal years. + +Once installed, a cron is running each day. It will create, for each company, +a new fiscal year, if it is the last day of the current fiscal year. + +This module is interesting specially in multi company context, to avoid annoying setup every year. + +The fiscal year created has a classical "12 monthes" duration, but the accountant +can modify it, once created. + +Exemple +~~~~~~~ + +If a company has it last fiscal year, defined as: + +- ``name``: FY 2021-2022 +- ``date_from``: 2021-06-01 +- ``date_to``: 2022-05-31 + +When the cron will be executed on May 31, 2022, it will create the following fiscal year: + +- ``name``: FY 2022-2023 +- ``date_from``: 2022-06-01 +- ``date_to``: 2023-05-31 diff --git a/account_fiscal_year_auto_create/tests/__init__.py b/account_fiscal_year_auto_create/tests/__init__.py new file mode 100644 index 00000000..d9b96c4f --- /dev/null +++ b/account_fiscal_year_auto_create/tests/__init__.py @@ -0,0 +1 @@ +from . import test_module diff --git a/account_fiscal_year_auto_create/tests/test_module.py b/account_fiscal_year_auto_create/tests/test_module.py new file mode 100644 index 00000000..8c1658cc --- /dev/null +++ b/account_fiscal_year_auto_create/tests/test_module.py @@ -0,0 +1,54 @@ +# Copyright (C) 2021 - Today: GRAP (http://www.grap.coop) +# @author: Sylvain LE GAL (https://twitter.com/legalsylvain) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo.tests.common import TransactionCase + +from datetime import date, datetime + + +class TestModule(TransactionCase): + + def setUp(self): + super().setUp() + self.AccountFiscalYear = self.env["account.fiscal.year"] + self.company = self.env["res.company"].create({ + "name": "Demo Company (account_fiscal_year_auto_create)", + }) + + # create a fiscal year + self.last_year = datetime.now().year - 1 + self.last_fiscal_year = self.AccountFiscalYear.create({ + "name": "FY %d" % (self.last_year), + "date_from": date(self.last_year, 1, 1).strftime("%Y-%m-%d"), + "date_to": date(self.last_year, 12, 31).strftime("%Y-%m-%d"), + "company_id": self.company.id, + }) + + def test_cron(self): + existing_fiscal_years = self.AccountFiscalYear.search([]) + self.AccountFiscalYear.cron_auto_create() + + # Run cron should create a new fiscal year + new_fiscal_year = self.AccountFiscalYear.search([ + ("id", "not in", existing_fiscal_years.ids) + ]) + self.assertTrue(new_fiscal_year) + self.assertEqual( + new_fiscal_year.name, "FY %d" % (self.last_year + 1)) + self.assertEqual( + new_fiscal_year.date_from, date(self.last_year + 1, 1, 1)) + self.assertEqual( + new_fiscal_year.date_from, date(self.last_year + 1, 1, 1)) + self.assertEqual( + new_fiscal_year.name, "FY %d" % (self.last_year + 1)) + + # Rerun cron should not create a new fiscal year + existing_fiscal_years = self.AccountFiscalYear.search([]) + self.AccountFiscalYear.cron_auto_create() + + # Run cron should create a new fiscal year + new_fiscal_year = self.AccountFiscalYear.search([ + ("id", "not in", existing_fiscal_years.ids) + ]) + self.assertFalse(new_fiscal_year) From fc9c1baa325a3a70e79364d4b304c854efe126b2 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Wed, 28 Jul 2021 13:30:57 +0000 Subject: [PATCH 2/9] [UPD] Update account_fiscal_year_auto_create.pot --- .../i18n/account_fiscal_year_auto_create.pot | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 account_fiscal_year_auto_create/i18n/account_fiscal_year_auto_create.pot diff --git a/account_fiscal_year_auto_create/i18n/account_fiscal_year_auto_create.pot b/account_fiscal_year_auto_create/i18n/account_fiscal_year_auto_create.pot new file mode 100644 index 00000000..cdbc5c25 --- /dev/null +++ b/account_fiscal_year_auto_create/i18n/account_fiscal_year_auto_create.pot @@ -0,0 +1,33 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_fiscal_year_auto_create +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.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: account_fiscal_year_auto_create +#: model:ir.actions.server,name:account_fiscal_year_auto_create.cron_fiscal_year_auto_create_ir_actions_server +#: model:ir.cron,cron_name:account_fiscal_year_auto_create.cron_fiscal_year_auto_create +#: model:ir.cron,name:account_fiscal_year_auto_create.cron_fiscal_year_auto_create +msgid "Auto Create Fiscal Years" +msgstr "" + +#. module: account_fiscal_year_auto_create +#: code:addons/account_fiscal_year_auto_create/models/account_fiscal_year.py:45 +#, python-format +msgid "FY %s - %s" +msgstr "" + +#. module: account_fiscal_year_auto_create +#: model:ir.model,name:account_fiscal_year_auto_create.model_account_fiscal_year +msgid "Fiscal Year" +msgstr "" + From 4fd09fd2f4edbdfd75e5ec996e9b3782c0f94cc4 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Wed, 28 Jul 2021 16:25:19 +0000 Subject: [PATCH 3/9] [UPD] README.rst --- account_fiscal_year_auto_create/README.rst | 97 ++++ .../static/description/index.html | 437 ++++++++++++++++++ 2 files changed, 534 insertions(+) create mode 100644 account_fiscal_year_auto_create/static/description/index.html diff --git a/account_fiscal_year_auto_create/README.rst b/account_fiscal_year_auto_create/README.rst index bc7d401d..2cca26ff 100644 --- a/account_fiscal_year_auto_create/README.rst +++ b/account_fiscal_year_auto_create/README.rst @@ -6,3 +6,100 @@ Fiscal Years - Automatic Creation !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--financial--tools-lightgray.png?logo=github + :target: https://github.com/OCA/account-financial-tools/tree/12.0/account_fiscal_year_auto_create + :alt: OCA/account-financial-tools +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/account-financial-tools-12-0/account-financial-tools-12-0-account_fiscal_year_auto_create + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/92/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module extends the functionality of Accounting Odoo module, to +auto generate fiscal years. + +Once installed, a cron is running each day. It will create, for each company, +a new fiscal year, if it is the last day of the current fiscal year. + +This module is interesting specially in multi company context, to avoid annoying setup every year. + +The fiscal year created has a classical "12 monthes" duration, but the accountant +can modify it, once created. + +Exemple +~~~~~~~ + +If a company has it last fiscal year, defined as: + +- ``name``: FY 2021-2022 +- ``date_from``: 2021-06-01 +- ``date_to``: 2022-05-31 + +When the cron will be executed on May 31, 2022, it will create the following fiscal year: + +- ``name``: FY 2022-2023 +- ``date_from``: 2022-06-01 +- ``date_to``: 2023-05-31 + +**Table of contents** + +.. contents:: + :local: + +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 `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* GRAP + +Contributors +~~~~~~~~~~~~ + +* Sylvain LE GAL + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +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. + +.. |maintainer-legalsylvain| image:: https://github.com/legalsylvain.png?size=40px + :target: https://github.com/legalsylvain + :alt: legalsylvain + +Current `maintainer `__: + +|maintainer-legalsylvain| + +This module is part of the `OCA/account-financial-tools `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_fiscal_year_auto_create/static/description/index.html b/account_fiscal_year_auto_create/static/description/index.html new file mode 100644 index 00000000..2b1f1298 --- /dev/null +++ b/account_fiscal_year_auto_create/static/description/index.html @@ -0,0 +1,437 @@ + + + + + + +Fiscal Years - Automatic Creation + + + +
+

Fiscal Years - Automatic Creation

+ + +

Beta License: AGPL-3 OCA/account-financial-tools Translate me on Weblate Try me on Runbot

+

This module extends the functionality of Accounting Odoo module, to +auto generate fiscal years.

+

Once installed, a cron is running each day. It will create, for each company, +a new fiscal year, if it is the last day of the current fiscal year.

+

This module is interesting specially in multi company context, to avoid annoying setup every year.

+

The fiscal year created has a classical “12 monthes” duration, but the accountant +can modify it, once created.

+
+

Exemple

+

If a company has it last fiscal year, defined as:

+
    +
  • name: FY 2021-2022
    • +
  • date_from: 2021-06-01
    • +
  • date_to: 2022-05-31
    • +
+

When the cron will be executed on May 31, 2022, it will create the following fiscal year:

+
    +
  • name: FY 2022-2023
    • +
  • date_from: 2022-06-01
    • +
  • date_to: 2023-05-31
    • +
+

Table of contents

+ +
+

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.

+

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

+
+ +
+
+

Authors

+
    +
  • GRAP
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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.

+

Current maintainer:

+

legalsylvain

+

This module is part of the OCA/account-financial-tools project on GitHub.

+

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

+
+
+ + From 679942a0869cd101d98e13199b52a8a04c2fe90d Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Wed, 28 Jul 2021 16:25:20 +0000 Subject: [PATCH 4/9] [ADD] icon.png --- .../static/description/icon.png | Bin 0 -> 9455 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 account_fiscal_year_auto_create/static/description/icon.png diff --git a/account_fiscal_year_auto_create/static/description/icon.png b/account_fiscal_year_auto_create/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 From 35d029d57a75ea231b2b84a206b2663a4e5b9986 Mon Sep 17 00:00:00 2001 From: Pascal GOUHIER Date: Tue, 3 Aug 2021 16:14:17 +0000 Subject: [PATCH 5/9] Added translation using Weblate (French) --- account_fiscal_year_auto_create/i18n/fr.po | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 account_fiscal_year_auto_create/i18n/fr.po diff --git a/account_fiscal_year_auto_create/i18n/fr.po b/account_fiscal_year_auto_create/i18n/fr.po new file mode 100644 index 00000000..10f3ccd5 --- /dev/null +++ b/account_fiscal_year_auto_create/i18n/fr.po @@ -0,0 +1,33 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_fiscal_year_auto_create +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" + +#. module: account_fiscal_year_auto_create +#: model:ir.actions.server,name:account_fiscal_year_auto_create.cron_fiscal_year_auto_create_ir_actions_server +#: model:ir.cron,cron_name:account_fiscal_year_auto_create.cron_fiscal_year_auto_create +#: model:ir.cron,name:account_fiscal_year_auto_create.cron_fiscal_year_auto_create +msgid "Auto Create Fiscal Years" +msgstr "" + +#. module: account_fiscal_year_auto_create +#: code:addons/account_fiscal_year_auto_create/models/account_fiscal_year.py:45 +#, python-format +msgid "FY %s - %s" +msgstr "" + +#. module: account_fiscal_year_auto_create +#: model:ir.model,name:account_fiscal_year_auto_create.model_account_fiscal_year +msgid "Fiscal Year" +msgstr "" From 1e1f60ed929237a3e73469b5aae4a44b926e0b63 Mon Sep 17 00:00:00 2001 From: Pascal GOUHIER Date: Tue, 3 Aug 2021 16:15:52 +0000 Subject: [PATCH 6/9] Translated using Weblate (French) Currently translated at 100.0% (3 of 3 strings) Translation: account-financial-tools-12.0/account-financial-tools-12.0-account_fiscal_year_auto_create Translate-URL: https://translation.odoo-community.org/projects/account-financial-tools-12-0/account-financial-tools-12-0-account_fiscal_year_auto_create/fr/ --- account_fiscal_year_auto_create/i18n/fr.po | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/account_fiscal_year_auto_create/i18n/fr.po b/account_fiscal_year_auto_create/i18n/fr.po index 10f3ccd5..34ea5145 100644 --- a/account_fiscal_year_auto_create/i18n/fr.po +++ b/account_fiscal_year_auto_create/i18n/fr.po @@ -6,28 +6,30 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2021-08-03 18:49+0000\n" +"Last-Translator: Pascal GOUHIER \n" "Language-Team: none\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 4.3.2\n" #. module: account_fiscal_year_auto_create #: model:ir.actions.server,name:account_fiscal_year_auto_create.cron_fiscal_year_auto_create_ir_actions_server #: model:ir.cron,cron_name:account_fiscal_year_auto_create.cron_fiscal_year_auto_create #: model:ir.cron,name:account_fiscal_year_auto_create.cron_fiscal_year_auto_create msgid "Auto Create Fiscal Years" -msgstr "" +msgstr "Créer Automatiquement Les Exercices Fiscaux" #. module: account_fiscal_year_auto_create #: code:addons/account_fiscal_year_auto_create/models/account_fiscal_year.py:45 #, python-format msgid "FY %s - %s" -msgstr "" +msgstr "AF %s - %s" #. module: account_fiscal_year_auto_create #: model:ir.model,name:account_fiscal_year_auto_create.model_account_fiscal_year msgid "Fiscal Year" -msgstr "" +msgstr "Exercice Fiscal" From 88840c2df8868e03f67240a407f3580b22c33f64 Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Fri, 4 Nov 2022 00:00:49 +0100 Subject: [PATCH 7/9] [IMP] account_fiscal_year_auto_create: black, isort, prettier --- .../__manifest__.py | 2 +- .../data/ir_cron.xml | 11 ++-- .../models/account_fiscal_year.py | 25 ++++----- .../tests/test_module.py | 51 +++++++++---------- .../addons/account_fiscal_year_auto_create | 1 + .../account_fiscal_year_auto_create/setup.py | 6 +++ 6 files changed, 48 insertions(+), 48 deletions(-) create mode 120000 setup/account_fiscal_year_auto_create/odoo/addons/account_fiscal_year_auto_create create mode 100644 setup/account_fiscal_year_auto_create/setup.py diff --git a/account_fiscal_year_auto_create/__manifest__.py b/account_fiscal_year_auto_create/__manifest__.py index d5f217d9..3c626186 100644 --- a/account_fiscal_year_auto_create/__manifest__.py +++ b/account_fiscal_year_auto_create/__manifest__.py @@ -10,7 +10,7 @@ "category": "Accounting", "author": "GRAP,Odoo Community Association (OCA)", "maintainers": ["legalsylvain"], - "website": "http://www.github.com/OCA/account-financial-tools", + "website": "https://github.com/OCA/account-financial-tools", "license": "AGPL-3", "depends": [ "account", diff --git a/account_fiscal_year_auto_create/data/ir_cron.xml b/account_fiscal_year_auto_create/data/ir_cron.xml index 55e7f1ab..38807d7d 100644 --- a/account_fiscal_year_auto_create/data/ir_cron.xml +++ b/account_fiscal_year_auto_create/data/ir_cron.xml @@ -1,21 +1,20 @@ - + - Auto Create Fiscal Years - - + + code model.cron_auto_create() 1 days - + -1 - + diff --git a/account_fiscal_year_auto_create/models/account_fiscal_year.py b/account_fiscal_year_auto_create/models/account_fiscal_year.py index 45c11651..09694f7e 100644 --- a/account_fiscal_year_auto_create/models/account_fiscal_year.py +++ b/account_fiscal_year_auto_create/models/account_fiscal_year.py @@ -3,6 +3,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from datetime import datetime + from dateutil.relativedelta import relativedelta from odoo import _, api, models @@ -16,12 +17,11 @@ class AccountFiscalYear(models.Model): companies = self.env["res.company"].search([]) for company in companies: last_fiscal_year = self.search( - [('company_id', '=', company.id)], - order="date_to desc", limit=1) + [("company_id", "=", company.id)], order="date_to desc", limit=1 + ) if last_fiscal_year and ( - last_fiscal_year.date_to < - datetime.now().date() + relativedelta(days=1) + last_fiscal_year.date_to < datetime.now().date() + relativedelta(days=1) ): self.create(last_fiscal_year._prepare_next_fiscal_year()) @@ -33,18 +33,13 @@ class AccountFiscalYear(models.Model): # - "FY 2018" will be replace by "FY 2019" # - "FY 2018-2019" will be replace by "FY 2019-2020" new_name = self.name.replace( - str((self.date_to.year)), str((self.date_to.year + 1)) - ).replace( - str((self.date_from.year)), str((self.date_from.year + 1)) - ) - if self.search([ - ("name", "=", new_name), - ("company_id", "=", self.company_id.id) - ]): + str(self.date_to.year), str(self.date_to.year + 1) + ).replace(str(self.date_from.year), str(self.date_from.year + 1)) + if self.search( + [("name", "=", new_name), ("company_id", "=", self.company_id.id)] + ): # the replace process fail to guess a correct unique name - new_name = _("FY %s - %s") % ( - str(self.date_to), str(self.date_from) - ) + new_name = _("FY %s - %s") % (str(self.date_to), str(self.date_from)) # compute new dates, handling leap years new_date_from = self.date_to + relativedelta(days=1) new_date_to = new_date_from + relativedelta(years=1, days=-1) diff --git a/account_fiscal_year_auto_create/tests/test_module.py b/account_fiscal_year_auto_create/tests/test_module.py index 8c1658cc..203fc7f7 100644 --- a/account_fiscal_year_auto_create/tests/test_module.py +++ b/account_fiscal_year_auto_create/tests/test_module.py @@ -2,53 +2,52 @@ # @author: Sylvain LE GAL (https://twitter.com/legalsylvain) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo.tests.common import TransactionCase - from datetime import date, datetime +from odoo.tests.common import TransactionCase + class TestModule(TransactionCase): - def setUp(self): super().setUp() self.AccountFiscalYear = self.env["account.fiscal.year"] - self.company = self.env["res.company"].create({ - "name": "Demo Company (account_fiscal_year_auto_create)", - }) + self.company = self.env["res.company"].create( + { + "name": "Demo Company (account_fiscal_year_auto_create)", + } + ) # create a fiscal year self.last_year = datetime.now().year - 1 - self.last_fiscal_year = self.AccountFiscalYear.create({ - "name": "FY %d" % (self.last_year), - "date_from": date(self.last_year, 1, 1).strftime("%Y-%m-%d"), - "date_to": date(self.last_year, 12, 31).strftime("%Y-%m-%d"), - "company_id": self.company.id, - }) + self.last_fiscal_year = self.AccountFiscalYear.create( + { + "name": "FY %d" % (self.last_year), + "date_from": date(self.last_year, 1, 1).strftime("%Y-%m-%d"), + "date_to": date(self.last_year, 12, 31).strftime("%Y-%m-%d"), + "company_id": self.company.id, + } + ) def test_cron(self): existing_fiscal_years = self.AccountFiscalYear.search([]) self.AccountFiscalYear.cron_auto_create() # Run cron should create a new fiscal year - new_fiscal_year = self.AccountFiscalYear.search([ - ("id", "not in", existing_fiscal_years.ids) - ]) + new_fiscal_year = self.AccountFiscalYear.search( + [("id", "not in", existing_fiscal_years.ids)] + ) self.assertTrue(new_fiscal_year) - self.assertEqual( - new_fiscal_year.name, "FY %d" % (self.last_year + 1)) - self.assertEqual( - new_fiscal_year.date_from, date(self.last_year + 1, 1, 1)) - self.assertEqual( - new_fiscal_year.date_from, date(self.last_year + 1, 1, 1)) - self.assertEqual( - new_fiscal_year.name, "FY %d" % (self.last_year + 1)) + self.assertEqual(new_fiscal_year.name, "FY %d" % (self.last_year + 1)) + self.assertEqual(new_fiscal_year.date_from, date(self.last_year + 1, 1, 1)) + self.assertEqual(new_fiscal_year.date_from, date(self.last_year + 1, 1, 1)) + self.assertEqual(new_fiscal_year.name, "FY %d" % (self.last_year + 1)) # Rerun cron should not create a new fiscal year existing_fiscal_years = self.AccountFiscalYear.search([]) self.AccountFiscalYear.cron_auto_create() # Run cron should create a new fiscal year - new_fiscal_year = self.AccountFiscalYear.search([ - ("id", "not in", existing_fiscal_years.ids) - ]) + new_fiscal_year = self.AccountFiscalYear.search( + [("id", "not in", existing_fiscal_years.ids)] + ) self.assertFalse(new_fiscal_year) diff --git a/setup/account_fiscal_year_auto_create/odoo/addons/account_fiscal_year_auto_create b/setup/account_fiscal_year_auto_create/odoo/addons/account_fiscal_year_auto_create new file mode 120000 index 00000000..77a626fe --- /dev/null +++ b/setup/account_fiscal_year_auto_create/odoo/addons/account_fiscal_year_auto_create @@ -0,0 +1 @@ +../../../../account_fiscal_year_auto_create \ No newline at end of file diff --git a/setup/account_fiscal_year_auto_create/setup.py b/setup/account_fiscal_year_auto_create/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/account_fiscal_year_auto_create/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From d8d2534a762836a34c2b8fb6c6e94636ae286beb Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Fri, 4 Nov 2022 00:10:13 +0100 Subject: [PATCH 8/9] [MIG] account_fiscal_year_auto_create: from 12.0 to 16.0. - depends on new OCA module account_fiscal_year - bump version - use new python convention --- .../__manifest__.py | 4 +-- .../data/ir_cron.xml | 2 +- account_fiscal_year_auto_create/l18n/fr.po | 35 ------------------- .../models/account_fiscal_year.py | 7 ++-- .../tests/test_module.py | 3 +- 5 files changed, 9 insertions(+), 42 deletions(-) delete mode 100644 account_fiscal_year_auto_create/l18n/fr.po diff --git a/account_fiscal_year_auto_create/__manifest__.py b/account_fiscal_year_auto_create/__manifest__.py index 3c626186..a97a3506 100644 --- a/account_fiscal_year_auto_create/__manifest__.py +++ b/account_fiscal_year_auto_create/__manifest__.py @@ -6,14 +6,14 @@ "name": "Fiscal Years - Automatic Creation", "summary": "Automatically create new fiscal years, based on the datas" " of the last fiscal years", - "version": "12.0.1.0.1", + "version": "16.0.1.0.1", "category": "Accounting", "author": "GRAP,Odoo Community Association (OCA)", "maintainers": ["legalsylvain"], "website": "https://github.com/OCA/account-financial-tools", "license": "AGPL-3", "depends": [ - "account", + "account_fiscal_year", ], "data": [ "data/ir_cron.xml", diff --git a/account_fiscal_year_auto_create/data/ir_cron.xml b/account_fiscal_year_auto_create/data/ir_cron.xml index 38807d7d..46b4e35b 100644 --- a/account_fiscal_year_auto_create/data/ir_cron.xml +++ b/account_fiscal_year_auto_create/data/ir_cron.xml @@ -8,7 +8,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). Auto Create Fiscal Years - + code model.cron_auto_create() 1 diff --git a/account_fiscal_year_auto_create/l18n/fr.po b/account_fiscal_year_auto_create/l18n/fr.po deleted file mode 100644 index 094710bc..00000000 --- a/account_fiscal_year_auto_create/l18n/fr.po +++ /dev/null @@ -1,35 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * account_fiscal_year_auto_create -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 12.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-03-31 08:41+0000\n" -"PO-Revision-Date: 2021-03-31 08:41+0000\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: account_fiscal_year_auto_create -#: model:ir.actions.server,name:account_fiscal_year_auto_create.cron_fiscal_year_auto_create_ir_actions_server -#: model:ir.cron,cron_name:account_fiscal_year_auto_create.cron_fiscal_year_auto_create -#: model:ir.cron,name:account_fiscal_year_auto_create.cron_fiscal_year_auto_create -msgid "Auto Create Fiscal Years" -msgstr "Création automatique d'année fiscales" - -#. module: account_fiscal_year_auto_create -#: code:addons/account_fiscal_year_auto_create/models/account_fiscal_year.py:45 -#, python-format -msgid "FY %s - %s" -msgstr "AF %s - %s" - -#. module: account_fiscal_year_auto_create -#: model:ir.model,name:account_fiscal_year_auto_create.model_account_fiscal_year -msgid "Fiscal Year" -msgstr "Exercice fiscal" - diff --git a/account_fiscal_year_auto_create/models/account_fiscal_year.py b/account_fiscal_year_auto_create/models/account_fiscal_year.py index 09694f7e..145dc5fc 100644 --- a/account_fiscal_year_auto_create/models/account_fiscal_year.py +++ b/account_fiscal_year_auto_create/models/account_fiscal_year.py @@ -25,7 +25,6 @@ class AccountFiscalYear(models.Model): ): self.create(last_fiscal_year._prepare_next_fiscal_year()) - @api.multi def _prepare_next_fiscal_year(self): self.ensure_one() # try to generate a new name, based on the previous @@ -39,7 +38,11 @@ class AccountFiscalYear(models.Model): [("name", "=", new_name), ("company_id", "=", self.company_id.id)] ): # the replace process fail to guess a correct unique name - new_name = _("FY %s - %s") % (str(self.date_to), str(self.date_from)) + new_name = _( + "FY %(date_to)s - %(date_from)s", + date_to=str(self.date_to), + date_from=str(self.date_from), + ) # compute new dates, handling leap years new_date_from = self.date_to + relativedelta(days=1) new_date_to = new_date_from + relativedelta(years=1, days=-1) diff --git a/account_fiscal_year_auto_create/tests/test_module.py b/account_fiscal_year_auto_create/tests/test_module.py index 203fc7f7..379af291 100644 --- a/account_fiscal_year_auto_create/tests/test_module.py +++ b/account_fiscal_year_auto_create/tests/test_module.py @@ -29,10 +29,10 @@ class TestModule(TransactionCase): ) def test_cron(self): + # Run cron should create a new fiscal year existing_fiscal_years = self.AccountFiscalYear.search([]) self.AccountFiscalYear.cron_auto_create() - # Run cron should create a new fiscal year new_fiscal_year = self.AccountFiscalYear.search( [("id", "not in", existing_fiscal_years.ids)] ) @@ -46,7 +46,6 @@ class TestModule(TransactionCase): existing_fiscal_years = self.AccountFiscalYear.search([]) self.AccountFiscalYear.cron_auto_create() - # Run cron should create a new fiscal year new_fiscal_year = self.AccountFiscalYear.search( [("id", "not in", existing_fiscal_years.ids)] ) From 235273d6f8ec2cfba2a69a8779d295c43131e9f2 Mon Sep 17 00:00:00 2001 From: Sylvain LE GAL Date: Fri, 4 Nov 2022 09:29:11 +0100 Subject: [PATCH 9/9] [FIX] typo in DESCRIPTION.rst Co-authored-by: David Beal --- account_fiscal_year_auto_create/readme/DESCRIPTION.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_fiscal_year_auto_create/readme/DESCRIPTION.rst b/account_fiscal_year_auto_create/readme/DESCRIPTION.rst index 94e93455..525ccd60 100644 --- a/account_fiscal_year_auto_create/readme/DESCRIPTION.rst +++ b/account_fiscal_year_auto_create/readme/DESCRIPTION.rst @@ -9,7 +9,7 @@ This module is interesting specially in multi company context, to avoid annoying The fiscal year created has a classical "12 monthes" duration, but the accountant can modify it, once created. -Exemple +Example ~~~~~~~ If a company has it last fiscal year, defined as: