diff --git a/.copier-answers.yml b/.copier-answers.yml
index c13a05f74d25a7f451a6203def4158b8766e38d7..3d5ab380632ead65f6d9b463d71109f86afd3790 100644
--- a/.copier-answers.yml
+++ b/.copier-answers.yml
@@ -1,8 +1,9 @@
# Do NOT update manually; changes here will be overwritten by Copier
-_commit: v1.14.2
+_commit: v1.20
_src_path: https://github.com/OCA/oca-addons-repo-template.git
-ci: false
-dependency_installation_mode: PIP
+additional_ruff_rules: []
+ci: GitHub
+convert_readme_fragments_to_markdown: true
generate_requirements_txt: false
github_check_license: false
github_ci_extra_env: {}
@@ -11,14 +12,15 @@ github_enable_makepot: false
github_enable_stale_action: false
github_enforce_dev_status_compatibility: false
include_wkhtmltopdf: false
+odoo_test_flavor: Both
odoo_version: 16.0
org_name: Le Filament
org_slug: lefilament
rebel_module_groups: []
-repo_description: null
-repo_name: Module Template
+repo_description: ''
+repo_name: ''
repo_slug: template_module
-repo_website: https://le-filament.com
-travis_apt_packages: []
-travis_apt_sources: []
+repo_website: https://le-filament.com
+use_pyproject_toml: true
+use_ruff: true
diff --git a/.eslintrc.yml b/.eslintrc.yml
index 9429bc688aab4993eae460767368f65089afa323..fed88d70d23ecb3297ea28854b320c4d62ee3c26 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -22,6 +22,7 @@ globals:
odoo: readonly
openerp: readonly
owl: readonly
+ luxon: readonly
# Styling is handled by Prettier, so we only need to enable AST rules;
# see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890
diff --git a/.flake8 b/.flake8
deleted file mode 100644
index e397e8ed4e3e7f7fe7785dd391bb80aa6d85575e..0000000000000000000000000000000000000000
--- a/.flake8
+++ /dev/null
@@ -1,12 +0,0 @@
-[flake8]
-max-line-length = 88
-max-complexity = 16
-# B = bugbear
-# B9 = bugbear opinionated (incl line length)
-select = C,E,F,W,B,B9
-# E203: whitespace before ':' (black behaviour)
-# E501: flake8 line length (covered by bugbear B950)
-# W503: line break before binary operator (black behaviour)
-ignore = E203,E501,W503
-per-file-ignores=
- __init__.py:F401
diff --git a/.gitignore b/.gitignore
index 9c283fd41f6cc3330653f1d90a820b85e23caf65..d99361a24aa02c2d19d8165c3a057b84bc575166 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ __pycache__/
*.py[cod]
/.venv
/.pytest_cache
+/.ruff_cache
# C extensions
*.so
@@ -23,6 +24,7 @@ var/
.installed.cfg
*.egg
*.eggs
+.copier-answers.yml
# Installer logs
pip-log.txt
diff --git a/.isort.cfg b/.isort.cfg
deleted file mode 100644
index 0ec187efd1bf802844749f508cda0c8f138970f9..0000000000000000000000000000000000000000
--- a/.isort.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-[settings]
-; see https://github.com/psf/black
-multi_line_output=3
-include_trailing_comma=True
-force_grid_wrap=0
-combine_as_imports=True
-use_parentheses=True
-line_length=88
-known_odoo=odoo
-known_odoo_addons=odoo.addons
-sections=FUTURE,STDLIB,THIRDPARTY,ODOO,ODOO_ADDONS,FIRSTPARTY,LOCALFOLDER
-default_section=THIRDPARTY
-ensure_newline_before_comments = True
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 10acf1e37e92961168f7539a4a84f689280f3710..3efb4d9157dc36d84e372eec5fc21e7f4a417a58 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,6 +12,10 @@ exclude: |
/static/(src/)?lib/|
# Repos using Sphinx to generate docs don't need prettying
^docs/_templates/.*\.html$|
+ # Don't bother non-technical authors with formatting issues in docs
+ readme/.*\.(rst|md)$|
+ # Ignore build and dist directories in addons
+ /build/|/dist/|
# You don't usually want a bot to modify your legal texts
(LICENSE.*|COPYING.*)
default_language_version:
@@ -33,27 +37,25 @@ repos:
language: fail
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
- repo: https://github.com/oca/maintainer-tools
- rev: 4cd2b852214dead80822e93e6749b16f2785b2fe
+ rev: f71041f22b8cd68cf7c77b73a14ca8d8cd190a60
hooks:
# update the NOT INSTALLABLE ADDONS section above
- id: oca-update-pre-commit-excluded-addons
- id: oca-fix-manifest-website
args: ["https://le-filament.com"]
- - repo: https://github.com/myint/autoflake
- rev: v1.6.1
- hooks:
- - id: autoflake
+ - id: oca-gen-addon-readme
args:
- - --expand-star-imports
- - --ignore-init-module-imports
- - --in-place
- - --remove-all-unused-imports
- - --remove-duplicate-keys
- - --remove-unused-variables
- - repo: https://github.com/psf/black
- rev: 22.8.0
+ - --addons-dir=.
+ - --branch=16.0
+ - --org-name=lefilament
+ - --repo-name=template_module
+ - --if-source-changed
+ - --keep-source-digest
+ - repo: https://github.com/OCA/odoo-pre-commit-hooks
+ rev: v0.0.25
hooks:
- - id: black
+ - id: oca-checks-odoo-module
+ - id: oca-checks-po
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.7.1
hooks:
@@ -95,27 +97,14 @@ repos:
- id: check-xml
- id: mixed-line-ending
args: ["--fix=lf"]
- - repo: https://github.com/asottile/pyupgrade
- rev: v2.38.2
- hooks:
- - id: pyupgrade
- args: ["--keep-percent-format"]
- - repo: https://github.com/PyCQA/isort
- rev: 5.12.0
- hooks:
- - id: isort
- name: isort except __init__.py
- args:
- - --settings=.
- exclude: /__init__\.py$
- - repo: https://github.com/PyCQA/flake8
- rev: 3.9.2
+ - repo: https://github.com/astral-sh/ruff-pre-commit
+ rev: v0.1.3
hooks:
- - id: flake8
- name: flake8
- additional_dependencies: ["flake8-bugbear==21.9.2"]
+ - id: ruff
+ args: [--fix, --exit-non-zero-on-fix]
+ - id: ruff-format
- repo: https://github.com/OCA/pylint-odoo
- rev: 7.0.2
+ rev: v8.0.19
hooks:
- id: pylint_odoo
name: pylint with optional checks
diff --git a/.prettierrc.yml b/.prettierrc.yml
deleted file mode 100644
index 5b6d4b361ace92f3877993bf2848fac190d8fab6..0000000000000000000000000000000000000000
--- a/.prettierrc.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Defaults for all prettier-supported languages.
-# Prettier will complete this with settings from .editorconfig file.
-bracketSpacing: false
-printWidth: 88
-proseWrap: always
-semi: true
-trailingComma: "es5"
-xmlWhitespaceSensitivity: "strict"
diff --git a/.pylintrc-mandatory b/.pylintrc-mandatory
index ed2c2171ffe63ac191e30ed0759c4b6211ad5f15..99064933ef82c469ba5fda5b2904447c05c99dbe 100644
--- a/.pylintrc-mandatory
+++ b/.pylintrc-mandatory
@@ -4,12 +4,12 @@ load-plugins=pylint_odoo
score=n
[ODOOLINT]
-readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
-manifest_required_authors=Le Filament
-manifest_required_keys=license
-manifest_deprecated_keys=description,active
-license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
-valid_odoo_versions=16.0
+readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
+manifest-required-authors=Le Filament
+manifest-required-keys=license
+manifest-deprecated-keys=description,active
+license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
+valid-odoo-versions=16.0
[MESSAGES CONTROL]
disable=all
diff --git a/.ruff.toml b/.ruff.toml
new file mode 100644
index 0000000000000000000000000000000000000000..0240c75f6a4ae4550f3473ad0a5faaef022bf6c7
--- /dev/null
+++ b/.ruff.toml
@@ -0,0 +1,30 @@
+
+target-version = "py310"
+fix = true
+
+[lint]
+extend-select = [
+ "B",
+ "C90",
+ "E501", # line too long (default 88)
+ "I", # isort
+ "UP", # pyupgrade
+]
+exclude = ["setup/*"]
+
+[format]
+exclude = ["setup/*"]
+
+[per-file-ignores]
+"__init__.py" = ["F401", "I001"] # ignore unused and unsorted imports in __init__.py
+"__manifest__.py" = ["B018"] # useless expression
+
+[isort]
+section-order = ["future", "standard-library", "third-party", "odoo", "odoo-addons", "first-party", "local-folder"]
+
+[isort.sections]
+"odoo" = ["odoo"]
+"odoo-addons" = ["odoo.addons"]
+
+[mccabe]
+max-complexity = 16
diff --git a/tools/date_utils.py b/tools/date_utils.py
index 0eb49dd7280665c8d986be94e5e1db2eb58febdb..91293053991c2dc274d831e1a1556974dec57185 100644
--- a/tools/date_utils.py
+++ b/tools/date_utils.py
@@ -1,31 +1,46 @@
# Copyright 2023 Le Filament (https://le-filament.com)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
+from datetime import date, datetime
import pytz
-from dateutil import tz
+
+from odoo import _, fields
+from odoo.exceptions import ValidationError
def local_to_utc(dt, timezone):
"""
Returns UTC datetime without timezone from local datetime without timezone
- :param datetime dt: local datetime without timezone to convert
+ :param datetime or date or string dt: local datetime without timezone to convert
:param string timezone: local timezone
@returns datetime: UTC datetime without timezone
"""
- local_tz = tz.gettz(timezone)
- local_dt = dt.replace(tzinfo=local_tz)
- utc_dt = local_dt.astimezone(pytz.timezone("UTC"))
- return utc_dt.replace(tzinfo=None)
+ if isinstance(dt, str):
+ dt = fields.Datetime().from_string(dt)
+ elif isinstance(dt, date):
+ dt = fields.Datetime().to_datetime(dt)
+ elif not isinstance(dt, datetime):
+ raise ValidationError(_("La valeur passée en paramètre n'est pas reconnue"))
+
+ return (
+ pytz.timezone(timezone).localize(dt).astimezone(pytz.UTC).replace(tzinfo=None)
+ )
def utc_to_local(dt, timezone):
"""
Returns local datetime without timezone from UTC datetime without timezone
- :param datetime dt: UTV datetime without timezone to convert
+ :param datetime or date or string dt: UTC datetime without timezone to convert
:param string timezone: local timezone
@returns datetime: local datetime without timezone
"""
- local_tz = tz.gettz(timezone)
- utc_dt = dt.replace(tzinfo=pytz.timezone("UTC"))
- local_dt = utc_dt.astimezone(local_tz)
- return local_dt.replace(tzinfo=None)
+ if isinstance(dt, str):
+ dt = fields.Datetime().from_string(dt)
+ elif isinstance(dt, date):
+ dt = fields.Datetime().to_datetime(dt)
+ elif not isinstance(dt, datetime):
+ raise ValidationError(_("La valeur passée en paramètre n'est pas reconnue"))
+
+ return (
+ pytz.UTC.localize(dt).astimezone(pytz.timezone(timezone)).replace(tzinfo=None)
+ )
diff --git a/views/api_backend.xml b/views/api_backend.xml
index 88e97163f8094f9add0758b0e3924683b8565dab..5dc63a4c7e8198a2d6161f0d83acf62c650c2d0f 100644
--- a/views/api_backend.xml
+++ b/views/api_backend.xml
@@ -18,7 +18,11 @@
/>
<div class="oe_title">
<h1>
- <field name="name" default_focus="1" placeholder="Name" />
+ <field
+ name="name"
+ default_focus="1"
+ placeholder="Name"
+ />
</h1>
</div>
<group>
diff --git a/wizard/api_json_response_wizard.py b/wizard/api_json_response_wizard.py
index 0fc4f058cd87dea75591924f064f24efb45af0ba..76f023aca8f748afc4ff9fe89e284e829aac0df4 100644
--- a/wizard/api_json_response_wizard.py
+++ b/wizard/api_json_response_wizard.py
@@ -9,7 +9,7 @@ class ApiJsonResponseWizard(models.TransientModel):
_name = "api.json.response.wizard"
_description = "API JSON response wizard"
- description = fields.Char(string="Description")
+ description = fields.Char()
json_response = fields.Text(string="Réponse")
# ------------------------------------------------------
diff --git a/wizard/api_json_response_wizard.xml b/wizard/api_json_response_wizard.xml
index fb426c35a713b54cc468f6b458b1fb115744b730..a55a261148730dd5fb943e40d8f8cc80a3128c13 100644
--- a/wizard/api_json_response_wizard.xml
+++ b/wizard/api_json_response_wizard.xml
@@ -10,14 +10,22 @@
<field name="description" readonly="1" />
</div>
<separator string="Réponse" />
- <field name="json_response" widget="json_viewer" readonly="1" />
+ <field
+ name="json_response"
+ widget="json_viewer"
+ readonly="1"
+ />
<footer>
<button
name="export_json"
type="object"
string="Télécharger la réponse"
/>
- <button class="btn-default" special="cancel" string="Fermer" />
+ <button
+ class="btn-default"
+ special="cancel"
+ string="Fermer"
+ />
</footer>
</sheet>
</form>