Compare commits
1 Commits
16.0
...
16.0-l10n_
Author | SHA1 | Date | |
---|---|---|---|
132128ea99 |
@@ -1,20 +0,0 @@
|
||||
# Configuration for known file extensions
|
||||
[*.{css,js,json,less,md,py,rst,sass,scss,xml,yaml,yml}]
|
||||
charset = utf-8
|
||||
end_of_line = lf
|
||||
indent_size = 4
|
||||
indent_style = space
|
||||
insert_final_newline = true
|
||||
trim_trailing_whitespace = true
|
||||
|
||||
[*.{json,yml,yaml,rst,md}]
|
||||
indent_size = 2
|
||||
|
||||
# Do not configure editor for libs and autogenerated content
|
||||
[{*/static/{lib,src/lib}/**,*/static/description/index.html,*/readme/../README.rst}]
|
||||
charset = unset
|
||||
end_of_line = unset
|
||||
indent_size = unset
|
||||
indent_style = unset
|
||||
insert_final_newline = false
|
||||
trim_trailing_whitespace = false
|
188
.eslintrc.yml
188
.eslintrc.yml
@@ -1,188 +0,0 @@
|
||||
env:
|
||||
browser: true
|
||||
es6: true
|
||||
|
||||
# See https://github.com/OCA/odoo-community.org/issues/37#issuecomment-470686449
|
||||
parserOptions:
|
||||
ecmaVersion: 2019
|
||||
|
||||
overrides:
|
||||
- files:
|
||||
- "**/*.esm.js"
|
||||
parserOptions:
|
||||
sourceType: module
|
||||
|
||||
# Globals available in Odoo that shouldn't produce errorings
|
||||
globals:
|
||||
_: readonly
|
||||
$: readonly
|
||||
fuzzy: readonly
|
||||
jQuery: readonly
|
||||
moment: readonly
|
||||
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
|
||||
rules:
|
||||
accessor-pairs: warn
|
||||
array-callback-return: warn
|
||||
callback-return: warn
|
||||
capitalized-comments:
|
||||
- warn
|
||||
- always
|
||||
- ignoreConsecutiveComments: true
|
||||
ignoreInlineComments: true
|
||||
complexity:
|
||||
- warn
|
||||
- 15
|
||||
constructor-super: warn
|
||||
dot-notation: warn
|
||||
eqeqeq: warn
|
||||
global-require: warn
|
||||
handle-callback-err: warn
|
||||
id-blacklist: warn
|
||||
id-match: warn
|
||||
init-declarations: error
|
||||
max-depth: warn
|
||||
max-nested-callbacks: warn
|
||||
max-statements-per-line: warn
|
||||
no-alert: warn
|
||||
no-array-constructor: warn
|
||||
no-caller: warn
|
||||
no-case-declarations: warn
|
||||
no-class-assign: warn
|
||||
no-cond-assign: error
|
||||
no-const-assign: error
|
||||
no-constant-condition: warn
|
||||
no-control-regex: warn
|
||||
no-debugger: error
|
||||
no-delete-var: warn
|
||||
no-div-regex: warn
|
||||
no-dupe-args: error
|
||||
no-dupe-class-members: error
|
||||
no-dupe-keys: error
|
||||
no-duplicate-case: error
|
||||
no-duplicate-imports: error
|
||||
no-else-return: warn
|
||||
no-empty-character-class: warn
|
||||
no-empty-function: error
|
||||
no-empty-pattern: error
|
||||
no-empty: warn
|
||||
no-eq-null: error
|
||||
no-eval: error
|
||||
no-ex-assign: error
|
||||
no-extend-native: warn
|
||||
no-extra-bind: warn
|
||||
no-extra-boolean-cast: warn
|
||||
no-extra-label: warn
|
||||
no-fallthrough: warn
|
||||
no-func-assign: error
|
||||
no-global-assign: error
|
||||
no-implicit-coercion:
|
||||
- warn
|
||||
- allow: ["~"]
|
||||
no-implicit-globals: warn
|
||||
no-implied-eval: warn
|
||||
no-inline-comments: warn
|
||||
no-inner-declarations: warn
|
||||
no-invalid-regexp: warn
|
||||
no-irregular-whitespace: warn
|
||||
no-iterator: warn
|
||||
no-label-var: warn
|
||||
no-labels: warn
|
||||
no-lone-blocks: warn
|
||||
no-lonely-if: error
|
||||
no-mixed-requires: error
|
||||
no-multi-str: warn
|
||||
no-native-reassign: error
|
||||
no-negated-condition: warn
|
||||
no-negated-in-lhs: error
|
||||
no-new-func: warn
|
||||
no-new-object: warn
|
||||
no-new-require: warn
|
||||
no-new-symbol: warn
|
||||
no-new-wrappers: warn
|
||||
no-new: warn
|
||||
no-obj-calls: warn
|
||||
no-octal-escape: warn
|
||||
no-octal: warn
|
||||
no-param-reassign: warn
|
||||
no-path-concat: warn
|
||||
no-process-env: warn
|
||||
no-process-exit: warn
|
||||
no-proto: warn
|
||||
no-prototype-builtins: warn
|
||||
no-redeclare: warn
|
||||
no-regex-spaces: warn
|
||||
no-restricted-globals: warn
|
||||
no-restricted-imports: warn
|
||||
no-restricted-modules: warn
|
||||
no-restricted-syntax: warn
|
||||
no-return-assign: error
|
||||
no-script-url: warn
|
||||
no-self-assign: warn
|
||||
no-self-compare: warn
|
||||
no-sequences: warn
|
||||
no-shadow-restricted-names: warn
|
||||
no-shadow: warn
|
||||
no-sparse-arrays: warn
|
||||
no-sync: warn
|
||||
no-this-before-super: warn
|
||||
no-throw-literal: warn
|
||||
no-undef-init: warn
|
||||
no-undef: error
|
||||
no-unmodified-loop-condition: warn
|
||||
no-unneeded-ternary: error
|
||||
no-unreachable: error
|
||||
no-unsafe-finally: error
|
||||
no-unused-expressions: error
|
||||
no-unused-labels: error
|
||||
no-unused-vars: error
|
||||
no-use-before-define: error
|
||||
no-useless-call: warn
|
||||
no-useless-computed-key: warn
|
||||
no-useless-concat: warn
|
||||
no-useless-constructor: warn
|
||||
no-useless-escape: warn
|
||||
no-useless-rename: warn
|
||||
no-void: warn
|
||||
no-with: warn
|
||||
operator-assignment: [error, always]
|
||||
prefer-const: warn
|
||||
radix: warn
|
||||
require-yield: warn
|
||||
sort-imports: warn
|
||||
spaced-comment: [error, always]
|
||||
strict: [error, function]
|
||||
use-isnan: error
|
||||
valid-jsdoc:
|
||||
- warn
|
||||
- prefer:
|
||||
arg: param
|
||||
argument: param
|
||||
augments: extends
|
||||
constructor: class
|
||||
exception: throws
|
||||
func: function
|
||||
method: function
|
||||
prop: property
|
||||
return: returns
|
||||
virtual: abstract
|
||||
yield: yields
|
||||
preferType:
|
||||
array: Array
|
||||
bool: Boolean
|
||||
boolean: Boolean
|
||||
number: Number
|
||||
object: Object
|
||||
str: String
|
||||
string: String
|
||||
requireParamDescription: false
|
||||
requireReturn: false
|
||||
requireReturnDescription: false
|
||||
requireReturnType: false
|
||||
valid-typeof: warn
|
||||
yoda: warn
|
@@ -1,42 +0,0 @@
|
||||
name: pre-commit
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches:
|
||||
- "16.0*"
|
||||
|
||||
jobs:
|
||||
pre-commit:
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: "3.11"
|
||||
- name: Get python version
|
||||
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
|
||||
# - uses: actions/cache@v4
|
||||
# with:
|
||||
# path: ~/.cache/pre-commit
|
||||
# key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
|
||||
- name: Install pre-commit
|
||||
run: pip install pre-commit
|
||||
- name: Run pre-commit
|
||||
run: pre-commit run --all-files --show-diff-on-failure --color=always
|
||||
env:
|
||||
# Consider valid a PR that changes README fragments but doesn't
|
||||
# change the README.rst file itself. It's not really a problem
|
||||
# because the bot will update it anyway after merge. This way, we
|
||||
# lower the barrier for functional contributors that want to fix the
|
||||
# readme fragments, while still letting developers get README
|
||||
# auto-generated (which also helps functionals when using runboat).
|
||||
# DOCS https://pre-commit.com/#temporarily-disabling-hooks
|
||||
SKIP: oca-gen-addon-readme
|
||||
- name: Check that all files generated by pre-commit are in git
|
||||
run: |
|
||||
newfiles="$(git ls-files --others --exclude-from=.gitignore)"
|
||||
if [ "$newfiles" != "" ] ; then
|
||||
echo "Please check-in the following files:"
|
||||
echo "$newfiles"
|
||||
exit 1
|
||||
fi
|
@@ -1,150 +0,0 @@
|
||||
exclude: |
|
||||
(?x)
|
||||
# NOT INSTALLABLE ADDONS
|
||||
# END NOT INSTALLABLE ADDONS
|
||||
# Files and folders generated by bots, to avoid loops
|
||||
^setup/|/static/description/index\.html$|
|
||||
# We don't want to mess with tool-generated files
|
||||
.svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/|^eslint.config.cjs|^prettier.config.cjs|
|
||||
# Maybe reactivate this when all README files include prettier ignore tags?
|
||||
^README\.md$|
|
||||
# Library files can have extraneous formatting (even minimized)
|
||||
/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/|
|
||||
# Ignore test files in addons
|
||||
/tests/samples/.*|
|
||||
# You don't usually want a bot to modify your legal texts
|
||||
(LICENSE.*|COPYING.*)
|
||||
default_language_version:
|
||||
python: python3
|
||||
node: "16.17.0"
|
||||
repos:
|
||||
- repo: local
|
||||
hooks:
|
||||
# These files are most likely copier diff rejection junks; if found,
|
||||
# review them manually, fix the problem (if needed) and remove them
|
||||
- id: forbidden-files
|
||||
name: forbidden files
|
||||
entry: found forbidden files; remove them
|
||||
language: fail
|
||||
files: "\\.rej$"
|
||||
- id: en-po-files
|
||||
name: en.po files cannot exist
|
||||
entry: found a en.po file
|
||||
language: fail
|
||||
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
|
||||
- repo: https://github.com/oca/maintainer-tools
|
||||
rev: f9b919b9868143135a9c9cb03021089cabba8223
|
||||
hooks:
|
||||
# update the NOT INSTALLABLE ADDONS section above
|
||||
- id: oca-update-pre-commit-excluded-addons
|
||||
- id: oca-fix-manifest-website
|
||||
entry:
|
||||
bash -c 'oca-fix-manifest-website "https://git.elabore.coop/elabore/$(basename
|
||||
$(git rev-parse --show-toplevel))"'
|
||||
- id: oca-gen-addon-readme
|
||||
entry:
|
||||
bash -c 'oca-gen-addon-readme
|
||||
--addons-dir=.
|
||||
--branch=$(git symbolic-ref
|
||||
refs/remotes/origin/HEAD | sed "s@^refs/remotes/origin/@@")
|
||||
--repo-name=$(basename $(git rev-parse --show-toplevel))
|
||||
--org-name="Elabore"
|
||||
--if-source-changed --keep-source-digest'
|
||||
|
||||
- repo: https://github.com/OCA/odoo-pre-commit-hooks
|
||||
rev: v0.1.4
|
||||
hooks:
|
||||
- id: oca-checks-odoo-module
|
||||
- id: oca-checks-po
|
||||
args:
|
||||
- --disable=po-pretty-format
|
||||
- repo: local
|
||||
hooks:
|
||||
- id: prettier
|
||||
name: prettier (with plugin-xml)
|
||||
entry: prettier
|
||||
args:
|
||||
- --write
|
||||
- --list-different
|
||||
- --ignore-unknown
|
||||
types: [text]
|
||||
files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$
|
||||
language: node
|
||||
additional_dependencies:
|
||||
- "prettier@2.7.1"
|
||||
- "@prettier/plugin-xml@2.2.0"
|
||||
- repo: local
|
||||
hooks:
|
||||
- id: eslint
|
||||
name: eslint
|
||||
entry: eslint
|
||||
args:
|
||||
- --color
|
||||
- --fix
|
||||
verbose: true
|
||||
types: [javascript]
|
||||
language: node
|
||||
additional_dependencies:
|
||||
- "eslint@8.24.0"
|
||||
- "eslint-plugin-jsdoc@"
|
||||
- repo: https://github.com/pre-commit/pre-commit-hooks
|
||||
rev: v5.0.0
|
||||
hooks:
|
||||
- id: trailing-whitespace
|
||||
# exclude autogenerated files
|
||||
exclude: /README\.rst$|\.pot?$
|
||||
- id: end-of-file-fixer
|
||||
# exclude autogenerated files
|
||||
exclude: /README\.rst$|\.pot?$
|
||||
- id: debug-statements
|
||||
- id: fix-encoding-pragma
|
||||
args: ["--remove"]
|
||||
- id: check-case-conflict
|
||||
- id: check-docstring-first
|
||||
- id: check-executables-have-shebangs
|
||||
- id: check-merge-conflict
|
||||
# exclude files where underlines are not distinguishable from merge conflicts
|
||||
exclude: /README\.rst$|^docs/.*\.rst$
|
||||
- id: check-symlinks
|
||||
- id: check-xml
|
||||
- id: mixed-line-ending
|
||||
args: ["--fix=lf"]
|
||||
- repo: https://github.com/PyCQA/docformatter
|
||||
rev: v1.7.7
|
||||
hooks:
|
||||
- id: docformatter
|
||||
args: [
|
||||
"--in-place", # modify the files
|
||||
"--recursive", # run on all the files
|
||||
"--wrap-summaries",
|
||||
"88", # max length of 1st line
|
||||
"--wrap-descriptions",
|
||||
"88", # max length of other lines
|
||||
"--pre-summary-newline", # new line before a long summary
|
||||
"--make-summary-multi-line", # force summary on multilines
|
||||
]
|
||||
additional_dependencies: ["tomli"] # if Python <3.11
|
||||
- repo: https://github.com/astral-sh/ruff-pre-commit
|
||||
rev: v0.12.0
|
||||
hooks:
|
||||
- id: ruff
|
||||
args: [--fix, --exit-non-zero-on-fix]
|
||||
- id: ruff-format
|
||||
- repo: https://github.com/OCA/pylint-odoo
|
||||
rev: v9.1.3
|
||||
hooks:
|
||||
- id: pylint_odoo
|
||||
name: pylint with optional checks
|
||||
args:
|
||||
- --rcfile=.pylintrc
|
||||
- --exit-zero
|
||||
verbose: true
|
||||
- id: pylint_odoo
|
||||
args:
|
||||
- --rcfile=.pylintrc-mandatory
|
@@ -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"
|
123
.pylintrc
123
.pylintrc
@@ -1,123 +0,0 @@
|
||||
|
||||
|
||||
[MASTER]
|
||||
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=Elabore
|
||||
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
|
||||
|
||||
# This .pylintrc contains optional AND mandatory checks and is meant to be
|
||||
# loaded in an IDE to have it check everything, in the hope this will make
|
||||
# optional checks more visible to contributors who otherwise never look at a
|
||||
# green travis to see optional checks that failed.
|
||||
# .pylintrc-mandatory containing only mandatory checks is used the pre-commit
|
||||
# config as a blocking check.
|
||||
|
||||
enable=anomalous-backslash-in-string,
|
||||
api-one-deprecated,
|
||||
api-one-multi-together,
|
||||
assignment-from-none,
|
||||
attribute-deprecated,
|
||||
class-camelcase,
|
||||
dangerous-default-value,
|
||||
dangerous-view-replace-wo-priority,
|
||||
development-status-allowed,
|
||||
duplicate-id-csv,
|
||||
duplicate-key,
|
||||
duplicate-xml-fields,
|
||||
duplicate-xml-record-id,
|
||||
eval-referenced,
|
||||
eval-used,
|
||||
incoherent-interpreter-exec-perm,
|
||||
license-allowed,
|
||||
manifest-author-string,
|
||||
manifest-deprecated-key,
|
||||
manifest-required-author,
|
||||
manifest-required-key,
|
||||
manifest-version-format,
|
||||
method-compute,
|
||||
method-inverse,
|
||||
method-required-super,
|
||||
method-search,
|
||||
openerp-exception-warning,
|
||||
pointless-statement,
|
||||
pointless-string-statement,
|
||||
print-used,
|
||||
redundant-keyword-arg,
|
||||
redundant-modulename-xml,
|
||||
reimported,
|
||||
relative-import,
|
||||
return-in-init,
|
||||
rst-syntax-error,
|
||||
sql-injection,
|
||||
too-few-format-args,
|
||||
translation-field,
|
||||
translation-required,
|
||||
unreachable,
|
||||
use-vim-comment,
|
||||
wrong-tabs-instead-of-spaces,
|
||||
xml-syntax-error,
|
||||
attribute-string-redundant,
|
||||
character-not-valid-in-resource-link,
|
||||
consider-merging-classes-inherited,
|
||||
context-overridden,
|
||||
create-user-wo-reset-password,
|
||||
dangerous-filter-wo-user,
|
||||
dangerous-qweb-replace-wo-priority,
|
||||
deprecated-data-xml-node,
|
||||
deprecated-openerp-xml-node,
|
||||
duplicate-po-message-definition,
|
||||
except-pass,
|
||||
file-not-used,
|
||||
invalid-commit,
|
||||
manifest-maintainers-list,
|
||||
missing-newline-extrafiles,
|
||||
missing-readme,
|
||||
missing-return,
|
||||
odoo-addons-relative-import,
|
||||
old-api7-method-defined,
|
||||
po-msgstr-variables,
|
||||
po-syntax-error,
|
||||
renamed-field-parameter,
|
||||
resource-not-exist,
|
||||
str-format-used,
|
||||
test-folder-imported,
|
||||
translation-contains-variable,
|
||||
translation-positional-used,
|
||||
unnecessary-utf8-coding-comment,
|
||||
website-manifest-key-not-valid-uri,
|
||||
xml-attribute-translatable,
|
||||
xml-deprecated-qweb-directive,
|
||||
xml-deprecated-tree-attribute,
|
||||
external-request-timeout,
|
||||
# messages that do not cause the lint step to fail
|
||||
consider-merging-classes-inherited,
|
||||
create-user-wo-reset-password,
|
||||
dangerous-filter-wo-user,
|
||||
deprecated-module,
|
||||
file-not-used,
|
||||
invalid-commit,
|
||||
missing-manifest-dependency,
|
||||
missing-newline-extrafiles,
|
||||
missing-readme,
|
||||
no-utf8-coding-comment,
|
||||
odoo-addons-relative-import,
|
||||
old-api7-method-defined,
|
||||
redefined-builtin,
|
||||
too-complex,
|
||||
unnecessary-utf8-coding-comment
|
||||
|
||||
|
||||
[REPORTS]
|
||||
msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg}
|
||||
output-format=colorized
|
||||
reports=no
|
@@ -1,98 +0,0 @@
|
||||
|
||||
[MASTER]
|
||||
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=Elabore
|
||||
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
|
||||
|
||||
enable=anomalous-backslash-in-string,
|
||||
api-one-deprecated,
|
||||
api-one-multi-together,
|
||||
assignment-from-none,
|
||||
attribute-deprecated,
|
||||
class-camelcase,
|
||||
dangerous-default-value,
|
||||
dangerous-view-replace-wo-priority,
|
||||
development-status-allowed,
|
||||
duplicate-id-csv,
|
||||
duplicate-key,
|
||||
duplicate-xml-fields,
|
||||
duplicate-xml-record-id,
|
||||
eval-referenced,
|
||||
eval-used,
|
||||
incoherent-interpreter-exec-perm,
|
||||
license-allowed,
|
||||
manifest-author-string,
|
||||
manifest-deprecated-key,
|
||||
manifest-required-author,
|
||||
manifest-required-key,
|
||||
manifest-version-format,
|
||||
method-compute,
|
||||
method-inverse,
|
||||
method-required-super,
|
||||
method-search,
|
||||
openerp-exception-warning,
|
||||
pointless-statement,
|
||||
pointless-string-statement,
|
||||
print-used,
|
||||
redundant-keyword-arg,
|
||||
redundant-modulename-xml,
|
||||
reimported,
|
||||
relative-import,
|
||||
return-in-init,
|
||||
rst-syntax-error,
|
||||
sql-injection,
|
||||
too-few-format-args,
|
||||
translation-field,
|
||||
translation-required,
|
||||
unreachable,
|
||||
use-vim-comment,
|
||||
wrong-tabs-instead-of-spaces,
|
||||
xml-syntax-error,
|
||||
attribute-string-redundant,
|
||||
character-not-valid-in-resource-link,
|
||||
consider-merging-classes-inherited,
|
||||
context-overridden,
|
||||
create-user-wo-reset-password,
|
||||
dangerous-filter-wo-user,
|
||||
dangerous-qweb-replace-wo-priority,
|
||||
deprecated-data-xml-node,
|
||||
deprecated-openerp-xml-node,
|
||||
duplicate-po-message-definition,
|
||||
except-pass,
|
||||
file-not-used,
|
||||
invalid-commit,
|
||||
manifest-maintainers-list,
|
||||
missing-newline-extrafiles,
|
||||
missing-readme,
|
||||
missing-return,
|
||||
odoo-addons-relative-import,
|
||||
old-api7-method-defined,
|
||||
po-msgstr-variables,
|
||||
po-syntax-error,
|
||||
renamed-field-parameter,
|
||||
resource-not-exist,
|
||||
str-format-used,
|
||||
test-folder-imported,
|
||||
translation-contains-variable,
|
||||
translation-positional-used,
|
||||
unnecessary-utf8-coding-comment,
|
||||
website-manifest-key-not-valid-uri,
|
||||
xml-attribute-translatable,
|
||||
xml-deprecated-qweb-directive,
|
||||
xml-deprecated-tree-attribute,
|
||||
external-request-timeout
|
||||
|
||||
[REPORTS]
|
||||
msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg}
|
||||
output-format=colorized
|
||||
reports=no
|
31
.ruff.toml
31
.ruff.toml
@@ -1,31 +0,0 @@
|
||||
|
||||
target-version = "py310"
|
||||
fix = true
|
||||
|
||||
[lint]
|
||||
extend-select = [
|
||||
"B",
|
||||
"C90",
|
||||
"E501", # line too long (default 88)
|
||||
"I", # isort
|
||||
"UP", # pyupgrade
|
||||
]
|
||||
extend-safe-fixes = ["UP008"]
|
||||
exclude = ["setup/*"]
|
||||
|
||||
[format]
|
||||
exclude = ["setup/*"]
|
||||
|
||||
[lint.per-file-ignores]
|
||||
"__init__.py" = ["F401", "I001"] # ignore unused and unsorted imports in __init__.py
|
||||
"__manifest__.py" = ["B018"] # useless expression
|
||||
|
||||
[lint.isort]
|
||||
section-order = ["future", "standard-library", "third-party", "odoo", "odoo-addons", "first-party", "local-folder"]
|
||||
|
||||
[lint.isort.sections]
|
||||
"odoo" = ["odoo"]
|
||||
"odoo-addons" = ["odoo.addons"]
|
||||
|
||||
[lint.mccabe]
|
||||
max-complexity = 16
|
@@ -3,7 +3,7 @@
|
||||
|
||||
{
|
||||
"name": "allow_negative_leave_and_allocation",
|
||||
"version": "16.0.1.0.2",
|
||||
"version": "16.0.1.0.1",
|
||||
"author": "Elabore",
|
||||
"website": "https://elabore.coop",
|
||||
"maintainer": "Elabore",
|
||||
|
@@ -15,4 +15,5 @@ class HrLeaveAllocation(models.Model):
|
||||
"(holiday_type='department' AND department_id IS NOT NULL) or "
|
||||
"(holiday_type='company' AND mode_company_id IS NOT NULL))",
|
||||
"The employee, department, company or employee category of this request is missing. Please make sure that your user login is linked to an employee."),
|
||||
('duration_check', "CHECK((allocation_type != 'regular'))", "The duration must be greater than 0."),
|
||||
]
|
@@ -1,55 +0,0 @@
|
||||
============================
|
||||
hr_timesheet_sheet_usability
|
||||
============================
|
||||
|
||||
Summary
|
||||
=======
|
||||
|
||||
Various changes to improve the usability of hr_timesheet_sheet application
|
||||
|
||||
Description
|
||||
===========
|
||||
|
||||
This module changes :
|
||||
- menu, menu order, menu access right
|
||||
- french translation
|
||||
of hr_timesheet_sheet module
|
||||
|
||||
Installation
|
||||
============
|
||||
|
||||
Use Odoo normal module installation procedure to install
|
||||
``hr_timesheet_sheet_usability``.
|
||||
|
||||
Known issues / Roadmap
|
||||
======================
|
||||
|
||||
None yet.
|
||||
|
||||
Bug Tracker
|
||||
===========
|
||||
|
||||
Bugs are tracked on `our issues website <https://github.com/elabore-coop/allow_negative_leave_and_allocation/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.
|
||||
|
||||
Credits
|
||||
=======
|
||||
|
||||
Contributors
|
||||
------------
|
||||
|
||||
* `Elabore <mailto:contact@elabore.coop>`
|
||||
|
||||
Funders
|
||||
-------
|
||||
|
||||
The development of this module has been financially supported by:
|
||||
* Elabore (https://elabore.coop)
|
||||
|
||||
|
||||
Maintainer
|
||||
----------
|
||||
|
||||
This module is maintained by Elabore.
|
@@ -1,19 +0,0 @@
|
||||
{
|
||||
"name": "hr_timesheet_sheet_usability",
|
||||
"version": "16.0.1.0.0",
|
||||
"description": "Various changes to improve the usability of hr_timesheet_sheet application",
|
||||
"summary": "",
|
||||
"author": "Elabore",
|
||||
"website": "https://github.com/Alusage/odoo-hr-addons",
|
||||
"license": "LGPL-3",
|
||||
"category": "Human Resources",
|
||||
"depends": [
|
||||
"base","hr_timesheet","hr_timesheet_sheet",
|
||||
],
|
||||
"data": [
|
||||
"views/hr_timesheet_sheet_menu.xml",
|
||||
"views/account_analytic_line_views.xml",
|
||||
],
|
||||
"installable": True,
|
||||
"application": False,
|
||||
}
|
@@ -1,80 +0,0 @@
|
||||
# Translation of Odoo Server.
|
||||
# This file contains the translation of the following modules:
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 16.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2025-06-19 09:03+0000\n"
|
||||
"PO-Revision-Date: 2025-06-19 09:03+0000\n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
"Language: fr\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
"Plural-Forms: \n"
|
||||
|
||||
#. module: hr_timesheet
|
||||
#: model:ir.actions.act_window,name:hr_timesheet.timesheet_action_all
|
||||
#: model:ir.ui.menu,name:hr_timesheet.timesheet_menu_activity_all
|
||||
msgid "All Timesheets"
|
||||
msgstr "Tous les temps"
|
||||
|
||||
#. module: hr_timesheet
|
||||
#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line
|
||||
#: model:ir.ui.menu,name:hr_timesheet.timesheet_menu_activity_mine
|
||||
#: model:ir.ui.menu,name:hr_timesheet.timesheet_menu_activity_user
|
||||
#: model_terms:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_line_search
|
||||
#: model_terms:ir.ui.view,arch_db:hr_timesheet.hr_timesheet_report_search
|
||||
msgid "My Timesheets"
|
||||
msgstr "Mes temps"
|
||||
|
||||
#. module: hr_timesheet
|
||||
#. odoo-python
|
||||
#: code:addons/hr_timesheet/models/hr_timesheet.py:0
|
||||
#: code:addons/hr_timesheet/models/project.py:0
|
||||
#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_by_project
|
||||
#: model:ir.actions.act_window,name:hr_timesheet.timesheet_action_from_employee
|
||||
#: model:ir.actions.report,name:hr_timesheet.timesheet_report
|
||||
#: model:ir.actions.report,name:hr_timesheet.timesheet_report_project
|
||||
#: model:ir.actions.report,name:hr_timesheet.timesheet_report_task
|
||||
#: model:ir.actions.report,name:hr_timesheet.timesheet_report_task_timesheets
|
||||
#: model:ir.model.fields,field_description:hr_timesheet.field_project_project__allow_timesheets
|
||||
#: model:ir.model.fields,field_description:hr_timesheet.field_project_task__timesheet_ids
|
||||
#: model:ir.ui.menu,name:hr_timesheet.menu_hr_time_tracking
|
||||
#: model:ir.ui.menu,name:hr_timesheet.menu_timesheets_reports_timesheet
|
||||
#: model:ir.ui.menu,name:hr_timesheet.timesheet_menu_root
|
||||
#: model_terms:ir.ui.view,arch_db:hr_timesheet.hr_department_view_kanban
|
||||
#: model_terms:ir.ui.view,arch_db:hr_timesheet.portal_layout
|
||||
#: model_terms:ir.ui.view,arch_db:hr_timesheet.portal_my_home_timesheet
|
||||
#: model_terms:ir.ui.view,arch_db:hr_timesheet.portal_my_task
|
||||
#: model_terms:ir.ui.view,arch_db:hr_timesheet.portal_my_timesheets
|
||||
#: model_terms:ir.ui.view,arch_db:hr_timesheet.project_invoice_form
|
||||
#: model_terms:ir.ui.view,arch_db:hr_timesheet.project_project_view_form_simplified_inherit_timesheet
|
||||
#: model_terms:ir.ui.view,arch_db:hr_timesheet.project_sharing_inherit_project_task_view_form
|
||||
#: model_terms:ir.ui.view,arch_db:hr_timesheet.report_timesheet
|
||||
#: model_terms:ir.ui.view,arch_db:hr_timesheet.report_timesheet_task
|
||||
#: model_terms:ir.ui.view,arch_db:hr_timesheet.res_config_settings_view_form
|
||||
#: model_terms:ir.ui.view,arch_db:hr_timesheet.timesheet_project_task_page
|
||||
#: model_terms:ir.ui.view,arch_db:hr_timesheet.timesheets_analysis_report_graph_employee
|
||||
#: model_terms:ir.ui.view,arch_db:hr_timesheet.timesheets_analysis_report_graph_project
|
||||
#: model_terms:ir.ui.view,arch_db:hr_timesheet.timesheets_analysis_report_graph_task
|
||||
#: model_terms:ir.ui.view,arch_db:hr_timesheet.view_hr_timesheet_line_graph
|
||||
#: model_terms:ir.ui.view,arch_db:hr_timesheet.view_hr_timesheet_line_pivot
|
||||
#: model_terms:ir.ui.view,arch_db:hr_timesheet.view_project_kanban_inherited
|
||||
#: model_terms:ir.ui.view,arch_db:hr_timesheet.view_task_form2_inherited
|
||||
#, python-format
|
||||
msgid "Timesheets"
|
||||
msgstr "Temps"
|
||||
|
||||
#. module: hr_timesheet_sheet
|
||||
#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_all_timesheets
|
||||
#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_all_timesheets
|
||||
msgid "All Timesheet Sheets"
|
||||
msgstr "Toutes les feuilles de temps"
|
||||
|
||||
#. module: hr_timesheet_sheet
|
||||
#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_my_timesheets
|
||||
msgid "My Timesheets"
|
||||
msgstr "Feuilles de temps"
|
@@ -1,26 +0,0 @@
|
||||
# Translation of Odoo Server.
|
||||
# This file contains the translation of the following modules:
|
||||
# * hr_timesheet_sheet_usability
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 16.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2025-09-15 08:39+0000\n"
|
||||
"PO-Revision-Date: 2025-09-15 08:39+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: hr_timesheet_sheet_usability
|
||||
#: model_terms:ir.ui.view,arch_db:hr_timesheet_sheet_usability.view_hr_timesheet_sheet_group_by_inherit
|
||||
msgid "Date de départ"
|
||||
msgstr ""
|
||||
|
||||
#. module: hr_timesheet_sheet_usability
|
||||
#: model_terms:ir.ui.view,arch_db:hr_timesheet_sheet_usability.view_hr_timesheet_sheet_group_by_inherit
|
||||
msgid "Timesheet by Date"
|
||||
msgstr ""
|
@@ -1,11 +0,0 @@
|
||||
<odoo>
|
||||
<!-- Hide menu "Timesheets to Submit" -->
|
||||
<record id="hr_timesheet_sheet.menu_act_hr_timesheet_line_to_submit" model="ir.ui.menu">
|
||||
<field name="active">False</field>
|
||||
</record>
|
||||
|
||||
<!-- Hide menu "My Timesheets to Submit" -->
|
||||
<record id="hr_timesheet_sheet.menu_act_hr_timesheet_line_to_submit_my" model="ir.ui.menu">
|
||||
<field name="active">False</field>
|
||||
</record>
|
||||
</odoo>
|
@@ -1,47 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<odoo>
|
||||
<!-- add date group by date in timesheet sheet view -->
|
||||
<record id="view_hr_timesheet_sheet_group_by_inherit" model="ir.ui.view">
|
||||
<field name="name">hr_timesheet.sheet.filter</field>
|
||||
<field name="model">hr_timesheet.sheet</field>
|
||||
<field
|
||||
name="inherit_id"
|
||||
ref="hr_timesheet_sheet.view_hr_timesheet_sheet_filter"
|
||||
/>
|
||||
<field name="arch" type="xml">
|
||||
<group position="inside">
|
||||
<filter string="Date de départ" name="groupby_date" domain="[]" context="{'group_by': 'date_start'}" help="Timesheet by Date"/>
|
||||
</group>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- Make menu "My Timesheets to Submit" visible only for managers -->
|
||||
<menuitem
|
||||
id="hr_timesheet_sheet.menu_hr_to_review"
|
||||
groups="hr_timesheet.group_timesheet_manager"
|
||||
name="To Review"
|
||||
parent="hr_timesheet.timesheet_menu_root"
|
||||
sequence="7"
|
||||
/>
|
||||
<menuitem
|
||||
id="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_to_review"
|
||||
groups="hr_timesheet.group_timesheet_manager"
|
||||
action="hr_timesheet_sheet.act_hr_timesheet_sheet_to_review"
|
||||
parent="hr_timesheet_sheet.menu_hr_to_review"
|
||||
sequence="11"
|
||||
/>
|
||||
|
||||
<!-- Move All timesheets menu under Timesheet menu -->
|
||||
<menuitem
|
||||
id="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_all_timesheets"
|
||||
parent="hr_timesheet_sheet.menu_hr_my_timesheets"
|
||||
/>
|
||||
|
||||
<!-- Cancel timesheet line menus move and restore their original placement from hr_timesheet module -->
|
||||
<record model="ir.ui.menu" id="hr_timesheet.timesheet_menu_activity_mine">
|
||||
<field name="parent_id" ref="hr_timesheet.menu_hr_time_tracking" />
|
||||
</record>
|
||||
<record model="ir.ui.menu" id="hr_timesheet.timesheet_menu_activity_user">
|
||||
<field name="parent_id" ref="hr_timesheet.timesheet_menu_root" />
|
||||
</record>
|
||||
</odoo>
|
2
l10n_fr_hr_holidays/.gitignore
vendored
Normal file
2
l10n_fr_hr_holidays/.gitignore
vendored
Normal file
@@ -0,0 +1,2 @@
|
||||
*.*~
|
||||
*pyc
|
41
l10n_fr_hr_holidays/README.rst
Normal file
41
l10n_fr_hr_holidays/README.rst
Normal file
@@ -0,0 +1,41 @@
|
||||
===================
|
||||
l10n_fr_hr_holidays
|
||||
===================
|
||||
|
||||
Manages French specificities for leaves and holidays, specialy for part-time employees.
|
||||
|
||||
Installation
|
||||
============
|
||||
|
||||
Use Odoo normal module installation procedure to install
|
||||
``l10n_fr_hr_holidays``.
|
||||
|
||||
Configuration
|
||||
=============
|
||||
|
||||
In settings, select the leaves type on wich you want to manage the french specificities.
|
||||
|
||||
Known issues / Roadmap
|
||||
======================
|
||||
|
||||
None yet.
|
||||
|
||||
Credits
|
||||
=======
|
||||
|
||||
Contributors
|
||||
------------
|
||||
|
||||
* `Elabore <mailto:contacnt@elabore.coop>`
|
||||
|
||||
Funders
|
||||
-------
|
||||
|
||||
The development of this module has been financially supported by:
|
||||
* Elabore (https://elabore.coop)
|
||||
|
||||
|
||||
Maintainer
|
||||
----------
|
||||
|
||||
This module is maintained by Elabore.
|
4
l10n_fr_hr_holidays/__init__.py
Normal file
4
l10n_fr_hr_holidays/__init__.py
Normal file
@@ -0,0 +1,4 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||
|
||||
from . import models
|
19
l10n_fr_hr_holidays/__manifest__.py
Normal file
19
l10n_fr_hr_holidays/__manifest__.py
Normal file
@@ -0,0 +1,19 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||
|
||||
{
|
||||
"name": "France - Time Off",
|
||||
"version": "16.0.1.0.0",
|
||||
"category": "Human Resources/Time Off",
|
||||
"countries": ["fr"],
|
||||
"summary": "Management of leaves for part-time workers in France",
|
||||
"depends": ["hr_holidays", "l10n_fr","resource"],
|
||||
"auto_install": True,
|
||||
"license": "LGPL-3",
|
||||
"data": [
|
||||
"views/res_config_settings_views.xml",
|
||||
],
|
||||
"demo": [
|
||||
"data/l10n_fr_hr_holidays_demo.xml",
|
||||
],
|
||||
}
|
57
l10n_fr_hr_holidays/data/l10n_fr_hr_holidays_demo.xml
Normal file
57
l10n_fr_hr_holidays/data/l10n_fr_hr_holidays_demo.xml
Normal file
@@ -0,0 +1,57 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<odoo>
|
||||
<record id="l10n_fr_part_time_calendar" model="resource.calendar">
|
||||
<field name="name">Part time</field>
|
||||
<field name="company_id" eval="False"/>
|
||||
<field name="hours_per_day">9</field>
|
||||
<field name="attendance_ids"
|
||||
eval="[(5, 0, 0),
|
||||
(0, 0, {'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'name': 'Monday Afternoon', 'dayofweek': '0', 'hour_from': 13, 'hour_to': 18.0, 'day_period': 'afternoon'}),
|
||||
(0, 0, {'name': 'Tuesday Morning', 'dayofweek': '1', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'name': 'Tuesday Afternoon', 'dayofweek': '1', 'hour_from': 13, 'hour_to': 18.0, 'day_period': 'afternoon'}),
|
||||
(0, 0, {'name': 'Thursday Morning', 'dayofweek': '3', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'name': 'Thursday Afternoon', 'dayofweek': '3', 'hour_from': 13, 'hour_to': 18.0, 'day_period': 'afternoon'}),
|
||||
]"
|
||||
/>
|
||||
</record>
|
||||
|
||||
<record id="l10n_fr_part_time_employee" model="hr.employee">
|
||||
<field name="company_id" ref="l10n_fr.demo_company_fr"/>
|
||||
<field name="active" eval="1"/>
|
||||
<field name="name">Mitchell Admin</field>
|
||||
<field name="user_id" ref="base.user_admin"/>
|
||||
<field name="resource_calendar_id" ref="l10n_fr_part_time_calendar"/>
|
||||
<field name="image_1920" eval="obj(ref('base.partner_admin')).image_1920" model="res.partner"/>
|
||||
</record>
|
||||
|
||||
<record id="l10n_fr_holiday_status_cl" model="hr.leave.type">
|
||||
<field name="name">Paid Time Off</field>
|
||||
<field name="company_id" ref="l10n_fr.demo_company_fr"/>
|
||||
<field name="requires_allocation">yes</field>
|
||||
<field name="employee_requests">no</field>
|
||||
<field name="leave_validation_type">both</field>
|
||||
<field name="allocation_validation_type">officer</field>
|
||||
<field name="responsible_ids" eval="[(4, ref('base.user_admin'))]"/>
|
||||
<field name="icon_id" ref="hr_holidays.icon_14"/>
|
||||
<field name="color">2</field>
|
||||
<field name="has_valid_allocation">True</field>
|
||||
</record>
|
||||
<record id="l10n_fr.demo_company_fr" model="res.company">
|
||||
<field name="l10n_fr_reference_leave_type" ref="l10n_fr_holiday_status_cl"/>
|
||||
</record>
|
||||
|
||||
<record id="l10n_fr_hr_holidays_allocation" model="hr.leave.allocation">
|
||||
<field name="name">Paid Time Off allocation</field>
|
||||
<field name="state">confirm</field>
|
||||
<field name="holiday_status_id" ref="l10n_fr_holiday_status_cl"/>
|
||||
<field name="number_of_days">20</field>
|
||||
<field name="date_from" eval="time.strftime('%Y-01-01')"/>
|
||||
<field name="date_to" eval="time.strftime('%Y-12-31')"/>
|
||||
<field name="employee_id" ref="l10n_fr_part_time_employee"/>
|
||||
<field name="employee_ids" eval="[(4, ref('l10n_fr_part_time_employee'))]"/>
|
||||
</record>
|
||||
<function model="hr.leave.allocation" name="action_validate">
|
||||
<value eval="[ref('l10n_fr_hr_holidays_allocation')]"/>
|
||||
</function>
|
||||
</odoo>
|
8
l10n_fr_hr_holidays/models/__init__.py
Normal file
8
l10n_fr_hr_holidays/models/__init__.py
Normal file
@@ -0,0 +1,8 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||
|
||||
from . import hr_leave
|
||||
from . import res_company
|
||||
from . import resource_calendar
|
||||
from . import res_config_settings
|
||||
from . import utils
|
188
l10n_fr_hr_holidays/models/hr_leave.py
Normal file
188
l10n_fr_hr_holidays/models/hr_leave.py
Normal file
@@ -0,0 +1,188 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||
|
||||
from dateutil.relativedelta import relativedelta
|
||||
from odoo import fields, models, _
|
||||
from odoo.exceptions import UserError
|
||||
|
||||
class HrLeave(models.Model):
|
||||
_inherit = 'hr.leave'
|
||||
|
||||
resource_calendar_id = fields.Many2one('resource.calendar', compute='_compute_resource_calendar_id', store=True, readonly=False, copy=False)
|
||||
company_id = fields.Many2one('res.company', compute='_compute_company_id', store=True)
|
||||
l10n_fr_date_to_changed = fields.Boolean()
|
||||
|
||||
def _compute_company_id(self):
|
||||
for holiday in self:
|
||||
holiday.company_id = holiday.employee_company_id \
|
||||
or holiday.mode_company_id \
|
||||
or holiday.department_id.company_id \
|
||||
or self.env.company
|
||||
|
||||
def _compute_resource_calendar_id(self):
|
||||
for leave in self:
|
||||
calendar = False
|
||||
if leave.holiday_type == 'employee':
|
||||
calendar = leave.employee_id.resource_calendar_id
|
||||
# YTI: Crappy hack: Move this to a new dedicated hr_holidays_contract module
|
||||
# We use the request dates to find the contracts, because date_from
|
||||
# and date_to are not set yet at this point. Since these dates are
|
||||
# used to get the contracts for which these leaves apply and
|
||||
# contract start- and end-dates are just dates (and not datetimes)
|
||||
# these dates are comparable.
|
||||
if 'hr.contract' in self.env and leave.employee_id:
|
||||
contracts = self.env['hr.contract'].search([
|
||||
'|', ('state', 'in', ['open', 'close']),
|
||||
'&', ('state', '=', 'draft'),
|
||||
('kanban_state', '=', 'done'),
|
||||
('employee_id', '=', leave.employee_id.id),
|
||||
('date_start', '<=', leave.request_date_to),
|
||||
'|', ('date_end', '=', False),
|
||||
('date_end', '>=', leave.request_date_from),
|
||||
])
|
||||
if contracts:
|
||||
# If there are more than one contract they should all have the
|
||||
# same calendar, otherwise a constraint is violated.
|
||||
calendar = contracts[:1].resource_calendar_id
|
||||
elif leave.holiday_type == 'department':
|
||||
calendar = leave.department_id.company_id.resource_calendar_id
|
||||
elif leave.holiday_type == 'company':
|
||||
calendar = leave.mode_company_id.resource_calendar_id
|
||||
leave.resource_calendar_id = calendar or self.env.company.resource_calendar_id
|
||||
|
||||
def _l10n_fr_leave_applies(self):
|
||||
# The french l10n is meant to be computed only in very specific cases:
|
||||
# - there is only one employee affected by the leave
|
||||
# - the company is french
|
||||
# - the leave_type is the reference leave_type of that company
|
||||
self.ensure_one()
|
||||
return self.employee_id and \
|
||||
self.company_id.country_id.code == 'FR' and \
|
||||
self.resource_calendar_id != self.company_id.resource_calendar_id and \
|
||||
self.holiday_status_id == self.company_id._get_fr_reference_leave_type()
|
||||
|
||||
def _get_fr_date_from_to(self, date_from, date_to):
|
||||
self.ensure_one()
|
||||
# What we need to compute is how much we will need to push date_to in order to account for the lost days
|
||||
# This gets even more complicated in two_weeks_calendars
|
||||
|
||||
# The following computation doesn't work for resource calendars in
|
||||
# which the employee works zero hours.
|
||||
if not (self.resource_calendar_id.attendance_ids):
|
||||
raise UserError(_("An employee cannot take a paid time off in a period they work no hours."))
|
||||
|
||||
if self.request_unit_half and self.request_date_from_period == 'am':
|
||||
# In normal workflows request_unit_half implies that date_from and date_to are the same
|
||||
# request_unit_half allows us to choose between `am` and `pm`
|
||||
# In a case where we work from mon-wed and request a half day in the morning
|
||||
# we do not want to push date_to since the next work attendance is actually in the afternoon
|
||||
date_from_weektype = str(self.env['resource.calendar.attendance'].get_week_type(date_from))
|
||||
date_from_dayofweek = str(date_from.weekday())
|
||||
# Get morning and afternoon attendances for that day
|
||||
attendances_am = self.resource_calendar_id.attendance_ids.filtered(lambda a:
|
||||
a.dayofweek == date_from_dayofweek
|
||||
and a.day_period == 'morning'
|
||||
and (not self.resource_calendar_id.two_weeks_calendar or a.week_type == date_from_weektype))
|
||||
attendances_pm = self.resource_calendar_id.attendance_ids.filtered(lambda a:
|
||||
a.dayofweek == date_from_dayofweek
|
||||
and a.day_period == 'afternoon'
|
||||
and (not self.resource_calendar_id.two_weeks_calendar or a.week_type == date_from_weektype))
|
||||
if attendances_am and not attendances_pm:
|
||||
# If the employee does not work in the afternoon, postpone date_to to the next working day
|
||||
next_date = date_from + relativedelta(days=1)
|
||||
while not self.resource_calendar_id._works_on_date(next_date):
|
||||
next_date += relativedelta(days=1)
|
||||
return (date_from, next_date)
|
||||
elif attendances_am and attendances_pm:
|
||||
# The employee also works in the afternoon, no postponement
|
||||
return (date_from, date_to)
|
||||
|
||||
# Special handling for two-weeks calendars
|
||||
if self.resource_calendar_id.two_weeks_calendar:
|
||||
# Count the number of days actually worked by the employee between date_from and date_to
|
||||
current_date = date_from
|
||||
days_count = 0
|
||||
while current_date <= date_to:
|
||||
if self.resource_calendar_id._works_on_date(current_date):
|
||||
days_count += 1
|
||||
current_date += relativedelta(days=1)
|
||||
# Adjust date_to so it matches the expected number of days
|
||||
# If the expected number of days is less than the period, reduce date_to
|
||||
if days_count > 0:
|
||||
# Find the date_to that gives the right number of worked days
|
||||
current_date = date_from
|
||||
counted = 0
|
||||
while counted < days_count:
|
||||
if self.resource_calendar_id._works_on_date(current_date):
|
||||
counted += 1
|
||||
if counted == days_count:
|
||||
break
|
||||
current_date += relativedelta(days=1)
|
||||
return (date_from, current_date)
|
||||
# Check calendars for working days until we find the right target, start at date_to + 1 day
|
||||
# Postpone date_target until the next working day
|
||||
date_start = date_from
|
||||
date_target = date_to
|
||||
# It is necessary to move the start date up to the first work day of
|
||||
# the employee calendar as otherwise days worked on by the company
|
||||
# calendar before the actual start of the leave would be taken into
|
||||
# account.
|
||||
while not self.resource_calendar_id._works_on_date(date_start):
|
||||
date_start += relativedelta(days=1)
|
||||
while not self.resource_calendar_id._works_on_date(date_target + relativedelta(days=1)):
|
||||
date_target += relativedelta(days=1)
|
||||
|
||||
# Undo the last day increment
|
||||
return (date_start, date_target)
|
||||
|
||||
def _compute_date_from_to(self):
|
||||
super()._compute_date_from_to()
|
||||
for leave in self:
|
||||
if leave._l10n_fr_leave_applies():
|
||||
new_date_from, new_date_to = leave._get_fr_date_from_to(leave.date_from, leave.date_to)
|
||||
if new_date_from != leave.date_from:
|
||||
leave.date_from = new_date_from
|
||||
if new_date_to != leave.date_to:
|
||||
leave.date_to = new_date_to
|
||||
leave.l10n_fr_date_to_changed = True
|
||||
else:
|
||||
leave.l10n_fr_date_to_changed = False
|
||||
|
||||
#@overwrite
|
||||
def _get_calendar(self):
|
||||
"""
|
||||
In France, paid time off for part-time employees is counted on the company's working days (not the employee's own schedule).
|
||||
The company's calendar must be used for the legal leave day count.
|
||||
"""
|
||||
self.ensure_one()
|
||||
if self._l10n_fr_leave_applies():
|
||||
return self.company_id.resource_calendar_id or self.env.company.resource_calendar_id
|
||||
return super()._get_calendar()
|
||||
|
||||
#@overwrite
|
||||
def _get_number_of_days_batch(self, date_from, date_to, employee_ids):
|
||||
"""
|
||||
Returns a dict with the number of legal leave days for each employee,
|
||||
based on the company's calendar. In France, part-time employees accrue and take leave on company working days,
|
||||
not only on their own working days. Handles half-day requests and rounds according to French rules.
|
||||
"""
|
||||
employee = self.env['hr.employee'].browse(employee_ids)
|
||||
# Force the company in the domain, as we are likely in a compute_sudo context
|
||||
domain = [
|
||||
('time_type', '=', 'leave'),
|
||||
('company_id', 'in', self.env.company.ids + self.env.context.get('allowed_company_ids', []))
|
||||
]
|
||||
calendar = self._get_calendar()
|
||||
result = employee._get_work_days_data_batch(date_from, date_to, calendar=calendar, domain=domain)
|
||||
for employee_id in result:
|
||||
# For non-French context: a half-day leave always counts as 0.5 day
|
||||
if self.request_unit_half and result[employee_id]['hours'] > 0 and not self._l10n_fr_leave_applies():
|
||||
result[employee_id]['days'] = 0.5
|
||||
# For French context: round the number of days to the nearest half-day (legal rule)
|
||||
elif self.request_unit_half and result[employee_id]['hours'] > 0 and self._l10n_fr_leave_applies():
|
||||
result[employee_id]['days'] = self._round_to_nearest_half(result[employee_id]['days'])
|
||||
return result
|
||||
|
||||
def _round_to_nearest_half(self, x):
|
||||
"""Round a float to the nearest 0.5."""
|
||||
return round(x * 2) / 2
|
19
l10n_fr_hr_holidays/models/res_company.py
Normal file
19
l10n_fr_hr_holidays/models/res_company.py
Normal file
@@ -0,0 +1,19 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||
|
||||
from odoo import fields, models, _
|
||||
from odoo.exceptions import ValidationError
|
||||
|
||||
|
||||
class ResCompany(models.Model):
|
||||
_inherit = 'res.company'
|
||||
|
||||
l10n_fr_reference_leave_type = fields.Many2one(
|
||||
'hr.leave.type',
|
||||
string='Company Paid Time Off Type')
|
||||
|
||||
def _get_fr_reference_leave_type(self):
|
||||
self.ensure_one()
|
||||
if not self.l10n_fr_reference_leave_type:
|
||||
raise ValidationError(_("You must first define a reference time off type for the company."))
|
||||
return self.l10n_fr_reference_leave_type
|
16
l10n_fr_hr_holidays/models/res_config_settings.py
Normal file
16
l10n_fr_hr_holidays/models/res_config_settings.py
Normal file
@@ -0,0 +1,16 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||
|
||||
from odoo import fields, models
|
||||
|
||||
class ResConfigSettings(models.TransientModel):
|
||||
_inherit = 'res.config.settings'
|
||||
|
||||
l10n_fr_reference_leave_type = fields.Many2one(
|
||||
'hr.leave.type',
|
||||
related='company_id.l10n_fr_reference_leave_type',
|
||||
readonly=False)
|
||||
|
||||
# backport from V170
|
||||
company_country_code = fields.Char(related="company_id.country_id.code", string="Company Country Code", readonly=True)
|
||||
|
26
l10n_fr_hr_holidays/models/resource_calendar.py
Normal file
26
l10n_fr_hr_holidays/models/resource_calendar.py
Normal file
@@ -0,0 +1,26 @@
|
||||
# -*- coding:utf-8 -*-
|
||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||
|
||||
from odoo import models
|
||||
from collections import defaultdict
|
||||
|
||||
class ResourceCalendar(models.Model):
|
||||
_inherit = 'resource.calendar'
|
||||
|
||||
def _works_on_date(self, date):
|
||||
self.ensure_one()
|
||||
|
||||
working_days = self._get_working_hours()
|
||||
dayofweek = str(date.weekday())
|
||||
if self.two_weeks_calendar:
|
||||
weektype = str(self.env['resource.calendar.attendance'].get_week_type(date))
|
||||
return working_days[weektype][dayofweek]
|
||||
return working_days[False][dayofweek]
|
||||
|
||||
def _get_working_hours(self):
|
||||
self.ensure_one()
|
||||
|
||||
working_days = defaultdict(lambda: defaultdict(lambda: False))
|
||||
for attendance in self.attendance_ids:
|
||||
working_days[attendance.week_type][attendance.dayofweek] = True
|
||||
return working_days
|
197
l10n_fr_hr_holidays/models/utils.py
Normal file
197
l10n_fr_hr_holidays/models/utils.py
Normal file
@@ -0,0 +1,197 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||
|
||||
import math
|
||||
from datetime import time
|
||||
from itertools import chain
|
||||
from pytz import utc
|
||||
|
||||
from odoo import fields
|
||||
from odoo.osv.expression import normalize_domain, is_leaf, NOT_OPERATOR
|
||||
from odoo.tools.float_utils import float_round
|
||||
|
||||
# Default hour per day value. The one should
|
||||
# only be used when the one from the calendar
|
||||
# is not available.
|
||||
HOURS_PER_DAY = 8
|
||||
# This will generate 16th of days
|
||||
ROUNDING_FACTOR = 16
|
||||
|
||||
|
||||
def make_aware(dt):
|
||||
""" Return ``dt`` with an explicit timezone, together with a function to
|
||||
convert a datetime to the same (naive or aware) timezone as ``dt``.
|
||||
"""
|
||||
if dt.tzinfo:
|
||||
return dt, lambda val: val.astimezone(dt.tzinfo)
|
||||
return dt.replace(tzinfo=utc), lambda val: val.astimezone(utc).replace(tzinfo=None)
|
||||
|
||||
|
||||
def string_to_datetime(value):
|
||||
""" Convert the given string value to a datetime in UTC. """
|
||||
return utc.localize(fields.Datetime.from_string(value))
|
||||
|
||||
|
||||
def datetime_to_string(dt):
|
||||
""" Convert the given datetime (converted in UTC) to a string value. """
|
||||
return fields.Datetime.to_string(dt.astimezone(utc))
|
||||
|
||||
|
||||
def float_to_time(hours):
|
||||
""" Convert a number of hours into a time object. """
|
||||
if hours == 24.0:
|
||||
return time.max
|
||||
fractional, integral = math.modf(hours)
|
||||
return time(int(integral), int(float_round(60 * fractional, precision_digits=0)), 0)
|
||||
|
||||
|
||||
def _boundaries(intervals, opening, closing):
|
||||
""" Iterate on the boundaries of intervals. """
|
||||
for start, stop, recs in intervals:
|
||||
if start < stop:
|
||||
yield (start, opening, recs)
|
||||
yield (stop, closing, recs)
|
||||
|
||||
def filter_domain_leaf(domain, field_check, field_name_mapping=None):
|
||||
"""
|
||||
filter_domain_lead only keep the leaves of a domain that verify a given check. Logical operators that involves
|
||||
a leaf that is undetermined (because it does not pass the check) are ignored.
|
||||
|
||||
each operator is a logic gate:
|
||||
- '&' and '|' take two entries and can be ignored if one of them (or the two of them) is undetermined
|
||||
-'!' takes one entry and can be ignored if this entry is undetermined
|
||||
|
||||
params:
|
||||
- domain: the domain that needs to be filtered
|
||||
- field_check: the function that the field name used in the leaf needs to verify to keep the leaf
|
||||
- field_name_mapping: dictionary of the form {'field_name': 'new_field_name', ...}. Occurences of 'field_name'
|
||||
in the first element of domain leaves will be replaced by 'new_field_name'. This is usefull when adapting a
|
||||
domain from one model to another when some field names do not match the names of the corresponding fields in
|
||||
the new model.
|
||||
returns: The filtered version of the domain
|
||||
"""
|
||||
domain = normalize_domain(domain)
|
||||
field_name_mapping = field_name_mapping or {}
|
||||
|
||||
stack = [] # stack of elements (leaf or operator) to conserve (reversing it gives a domain)
|
||||
ignored_elems = [] # history of ignored elements in the domain (not added to the stack)
|
||||
# if the top of the stack ignored_elems is:
|
||||
# - True: indicates that the last browsed elem has been ignored
|
||||
# - False: indicates that the last browsed elem has been added to the stack
|
||||
# When an operator is applied to some elements, they are removed from the ignored_elems stack
|
||||
# (and replaced by the ignored_elems flag of the operator)
|
||||
while domain:
|
||||
next_elem = domain.pop() # Browsing the domain backward simplifies the filtering
|
||||
if is_leaf(next_elem):
|
||||
field_name, op, value = next_elem
|
||||
if field_check(field_name):
|
||||
field_name = field_name_mapping.get(field_name, field_name)
|
||||
stack.append((field_name, op, value))
|
||||
ignored_elems.append(False)
|
||||
else:
|
||||
ignored_elems.append(True)
|
||||
elif next_elem == NOT_OPERATOR:
|
||||
ignore_operation = ignored_elems.pop()
|
||||
if not ignore_operation:
|
||||
stack.append(NOT_OPERATOR)
|
||||
ignored_elems.append(False)
|
||||
else:
|
||||
ignored_elems.append(True)
|
||||
else: # OR/AND operation
|
||||
ignore_operand1 = ignored_elems.pop()
|
||||
ignore_operand2 = ignored_elems.pop()
|
||||
if not ignore_operand1 and not ignore_operand2:
|
||||
stack.append(next_elem)
|
||||
ignored_elems.append(False)
|
||||
elif ignore_operand1 and ignore_operand2:
|
||||
ignored_elems.append(True)
|
||||
else:
|
||||
ignored_elems.append(False) # the AND/OR operation is replaced by one of its operand which cannot be ignored
|
||||
return list(reversed(stack))
|
||||
|
||||
class Intervals(object):
|
||||
""" Collection of ordered disjoint intervals with some associated records.
|
||||
Each interval is a triple ``(start, stop, records)``, where ``records``
|
||||
is a recordset.
|
||||
"""
|
||||
def __init__(self, intervals=()):
|
||||
self._items = []
|
||||
if intervals:
|
||||
# normalize the representation of intervals
|
||||
append = self._items.append
|
||||
starts = []
|
||||
recses = []
|
||||
for value, flag, recs in sorted(_boundaries(intervals, 'start', 'stop')):
|
||||
if flag == 'start':
|
||||
starts.append(value)
|
||||
recses.append(recs)
|
||||
else:
|
||||
start = starts.pop()
|
||||
if not starts:
|
||||
append((start, value, recses[0].union(*recses)))
|
||||
recses.clear()
|
||||
|
||||
def __bool__(self):
|
||||
return bool(self._items)
|
||||
|
||||
def __len__(self):
|
||||
return len(self._items)
|
||||
|
||||
def __iter__(self):
|
||||
return iter(self._items)
|
||||
|
||||
def __reversed__(self):
|
||||
return reversed(self._items)
|
||||
|
||||
def __or__(self, other):
|
||||
""" Return the union of two sets of intervals. """
|
||||
return Intervals(chain(self._items, other._items))
|
||||
|
||||
def __and__(self, other):
|
||||
""" Return the intersection of two sets of intervals. """
|
||||
return self._merge(other, False)
|
||||
|
||||
def __sub__(self, other):
|
||||
""" Return the difference of two sets of intervals. """
|
||||
return self._merge(other, True)
|
||||
|
||||
def _merge(self, other, difference):
|
||||
""" Return the difference or intersection of two sets of intervals. """
|
||||
result = Intervals()
|
||||
append = result._items.append
|
||||
|
||||
# using 'self' and 'other' below forces normalization
|
||||
bounds1 = _boundaries(self, 'start', 'stop')
|
||||
bounds2 = _boundaries(other, 'switch', 'switch')
|
||||
|
||||
start = None # set by start/stop
|
||||
recs1 = None # set by start
|
||||
enabled = difference # changed by switch
|
||||
for value, flag, recs in sorted(chain(bounds1, bounds2)):
|
||||
if flag == 'start':
|
||||
start = value
|
||||
recs1 = recs
|
||||
elif flag == 'stop':
|
||||
if enabled and start < value:
|
||||
append((start, value, recs1))
|
||||
start = None
|
||||
else:
|
||||
if not enabled and start is not None:
|
||||
start = value
|
||||
if enabled and start is not None and start < value:
|
||||
append((start, value, recs1))
|
||||
enabled = not enabled
|
||||
|
||||
return result
|
||||
|
||||
def sum_intervals(intervals):
|
||||
""" Sum the intervals duration (unit : hour)"""
|
||||
return sum(
|
||||
(stop - start).total_seconds() / 3600
|
||||
for start, stop, meta in intervals
|
||||
)
|
||||
|
||||
def timezone_datetime(time):
|
||||
if not time.tzinfo:
|
||||
time = time.replace(tzinfo=utc)
|
||||
return time
|
4
l10n_fr_hr_holidays/tests/__init__.py
Normal file
4
l10n_fr_hr_holidays/tests/__init__.py
Normal file
@@ -0,0 +1,4 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||
|
||||
from . import test_french_leaves
|
360
l10n_fr_hr_holidays/tests/test_french_leaves.py
Normal file
360
l10n_fr_hr_holidays/tests/test_french_leaves.py
Normal file
@@ -0,0 +1,360 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||
|
||||
from odoo.tests.common import TransactionCase, tagged
|
||||
|
||||
@tagged('post_install_l10n', 'post_install', '-at_install', 'french_leaves')
|
||||
class TestFrenchLeaves(TransactionCase):
|
||||
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
super().setUpClass()
|
||||
country_fr = cls.env.ref('base.fr')
|
||||
cls.company = cls.env['res.company'].create({
|
||||
'name': 'French Company',
|
||||
'country_id': country_fr.id,
|
||||
})
|
||||
|
||||
cls.employee = cls.env['hr.employee'].create({
|
||||
'name': 'Camille',
|
||||
'gender': 'other',
|
||||
'birthday': '1973-03-29',
|
||||
'country_id': country_fr.id,
|
||||
'company_id': cls.company.id,
|
||||
})
|
||||
|
||||
cls.time_off_type = cls.env['hr.leave.type'].create({
|
||||
'name': 'Time Off',
|
||||
'requires_allocation': 'no',
|
||||
'request_unit': 'half_day',
|
||||
})
|
||||
cls.company.write({
|
||||
'l10n_fr_reference_leave_type': cls.time_off_type.id,
|
||||
})
|
||||
|
||||
cls.base_calendar = cls.env['resource.calendar'].create({
|
||||
'name': 'default calendar',
|
||||
})
|
||||
|
||||
def test_no_differences(self):
|
||||
# Base case that should not have a different behaviour
|
||||
self.company.resource_calendar_id = self.base_calendar
|
||||
self.employee.resource_calendar_id = self.base_calendar
|
||||
|
||||
leave = self.env['hr.leave'].create({
|
||||
'name': 'Test',
|
||||
'holiday_status_id': self.time_off_type.id,
|
||||
'employee_id': self.employee.id,
|
||||
'request_date_from': '2021-09-06',
|
||||
'request_date_to': '2021-09-10',
|
||||
'company_id': self.company.id,
|
||||
'resource_calendar_id': self.employee.resource_calendar_id.id,
|
||||
})
|
||||
leave._compute_date_from_to()
|
||||
self.assertEqual(leave.number_of_days, 5, 'The number of days should be equal to 5.')
|
||||
leave.unlink()
|
||||
|
||||
def test_end_of_week(self):
|
||||
employee_calendar = self.env['resource.calendar'].create({
|
||||
'name': 'Employee Calendar',
|
||||
'attendance_ids': [
|
||||
(0, 0, {'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'name': 'Monday Afternoon', 'dayofweek': '0', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
(0, 0, {'name': 'Tuesday Morning', 'dayofweek': '1', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'name': 'Tuesday Afternoon', 'dayofweek': '1', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
(0, 0, {'name': 'Wednesday Morning', 'dayofweek': '2', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'name': 'Wednesday Afternoon', 'dayofweek': '2', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
],
|
||||
})
|
||||
self.company.resource_calendar_id = self.base_calendar
|
||||
self.employee.resource_calendar_id = employee_calendar
|
||||
|
||||
leave = self.env['hr.leave'].create({
|
||||
'name': 'Test',
|
||||
'holiday_status_id': self.time_off_type.id,
|
||||
'employee_id': self.employee.id,
|
||||
'request_date_from': '2021-09-06', #monday
|
||||
'request_date_to': '2021-09-08', #wednesday
|
||||
'company_id': self.company.id,
|
||||
'resource_calendar_id': self.employee.resource_calendar_id.id,
|
||||
})
|
||||
leave._compute_date_from_to()
|
||||
self.assertEqual(leave.number_of_days, 5, 'The number of days should be equal to 5.')
|
||||
leave.unlink()
|
||||
|
||||
def test_start_of_week(self):
|
||||
employee_calendar = self.env['resource.calendar'].create({
|
||||
'name': 'Employee Calendar',
|
||||
'attendance_ids': [
|
||||
(0, 0, {'name': 'Wednesday Morning', 'dayofweek': '2', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'name': 'Wednesday Afternoon', 'dayofweek': '2', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
(0, 0, {'name': 'Thursday Morning', 'dayofweek': '3', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'name': 'Thursday Afternoon', 'dayofweek': '3', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
(0, 0, {'name': 'Friday Morning', 'dayofweek': '4', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'name': 'Friday Afternoon', 'dayofweek': '4', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
],
|
||||
})
|
||||
self.company.resource_calendar_id = self.base_calendar
|
||||
self.employee.resource_calendar_id = employee_calendar
|
||||
|
||||
leave = self.env['hr.leave'].create({
|
||||
'name': 'Test',
|
||||
'holiday_status_id': self.time_off_type.id,
|
||||
'employee_id': self.employee.id,
|
||||
'request_date_from': '2021-09-08',
|
||||
'request_date_to': '2021-09-10',
|
||||
'company_id': self.company.id,
|
||||
'resource_calendar_id': self.employee.resource_calendar_id.id,
|
||||
})
|
||||
|
||||
leave._compute_date_from_to()
|
||||
self.assertEqual(leave.number_of_days, 5, 'The number of days should be equal to 5.')
|
||||
leave.unlink()
|
||||
|
||||
def test_last_day_half(self):
|
||||
employee_calendar = self.env['resource.calendar'].create({
|
||||
'name': 'Employee Calendar',
|
||||
'attendance_ids': [
|
||||
(0, 0, {'name': 'Wednesday Morning', 'dayofweek': '2', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'name': 'Wednesday Afternoon', 'dayofweek': '2', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
(0, 0, {'name': 'Thursday Morning', 'dayofweek': '3', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'name': 'Thursday Afternoon', 'dayofweek': '3', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
(0, 0, {'name': 'Friday Morning', 'dayofweek': '4', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'name': 'Friday Afternoon', 'dayofweek': '4', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
],
|
||||
})
|
||||
self.company.resource_calendar_id = self.base_calendar
|
||||
self.employee.resource_calendar_id = employee_calendar
|
||||
|
||||
leave = self.env['hr.leave'].create({
|
||||
'name': 'Test',
|
||||
'holiday_status_id': self.time_off_type.id,
|
||||
'employee_id': self.employee.id,
|
||||
'request_date_from': '2021-09-10', #friday
|
||||
'request_date_to': '2021-09-10',
|
||||
'request_unit_half': True,
|
||||
'request_date_from_period': 'am',
|
||||
'company_id': self.company.id,
|
||||
'resource_calendar_id': self.employee.resource_calendar_id.id,
|
||||
})
|
||||
leave._compute_date_from_to()
|
||||
# Since the employee works on the afternoon, the date_to is not post-poned
|
||||
self.assertEqual(leave.number_of_days, 0.5, 'The number of days should be equal to 0.5.')
|
||||
|
||||
leave.request_date_from_period = 'pm'
|
||||
|
||||
# This however should push the date_to
|
||||
self.assertEqual(leave.number_of_days, 2.5, 'The number of days should be equal to 2.5.')
|
||||
leave.unlink()
|
||||
|
||||
def test_full_time_am_day_half(self):
|
||||
employee_calendar = self.env['resource.calendar'].create({
|
||||
'name': 'Employee Calendar',
|
||||
'attendance_ids': [
|
||||
(0, 0, {'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'name': 'Monday Afternoon', 'dayofweek': '0', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
(0, 0, {'name': 'Tuesday Morning', 'dayofweek': '1', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'name': 'Tuesday Afternoon', 'dayofweek': '1', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
(0, 0, {'name': 'Wednesday Morning', 'dayofweek': '2', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'name': 'Wednesday Afternoon', 'dayofweek': '2', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
(0, 0, {'name': 'Thursday Morning', 'dayofweek': '3', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'name': 'Thursday Afternoon', 'dayofweek': '3', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
(0, 0, {'name': 'Friday Morning', 'dayofweek': '4', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
],
|
||||
})
|
||||
self.company.resource_calendar_id = self.base_calendar
|
||||
self.employee.resource_calendar_id = employee_calendar
|
||||
|
||||
leave = self.env['hr.leave'].create({
|
||||
'name': 'Test',
|
||||
'holiday_status_id': self.time_off_type.id,
|
||||
'employee_id': self.employee.id,
|
||||
'request_date_from': '2021-09-10', #friday
|
||||
'request_date_to': '2021-09-10',
|
||||
'request_unit_half': True,
|
||||
'request_date_from_period': 'am',
|
||||
'company_id': self.company.id,
|
||||
'resource_calendar_id': self.employee.resource_calendar_id.id,
|
||||
})
|
||||
leave._compute_date_from_to()
|
||||
# Since the employee works doesnt work the afternoon, the date_to is post-poned
|
||||
self.assertEqual(leave.number_of_days, 1, 'The number of days should be equal to 1.')
|
||||
leave.unlink()
|
||||
|
||||
def test_am_day_half(self):
|
||||
employee_calendar = self.env['resource.calendar'].create({
|
||||
'name': 'Employee Calendar',
|
||||
'attendance_ids': [
|
||||
(0, 0, {'name': 'Wednesday Morning', 'dayofweek': '2', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'name': 'Wednesday Afternoon', 'dayofweek': '2', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
(0, 0, {'name': 'Thursday Morning', 'dayofweek': '3', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'name': 'Thursday Afternoon', 'dayofweek': '3', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
(0, 0, {'name': 'Friday Morning', 'dayofweek': '4', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
],
|
||||
})
|
||||
self.company.resource_calendar_id = self.base_calendar
|
||||
self.employee.resource_calendar_id = employee_calendar
|
||||
|
||||
leave = self.env['hr.leave'].create({
|
||||
'name': 'Test',
|
||||
'holiday_status_id': self.time_off_type.id,
|
||||
'employee_id': self.employee.id,
|
||||
'request_date_from': '2021-09-24', #friday
|
||||
'request_date_to': '2021-09-24',
|
||||
'request_unit_half': True,
|
||||
'request_date_from_period': 'am',
|
||||
'company_id': self.company.id,
|
||||
'resource_calendar_id': self.employee.resource_calendar_id.id,
|
||||
})
|
||||
leave._compute_date_from_to()
|
||||
# Since the employee works doesnt work the afternoon, the date_to is post-poned
|
||||
self.assertEqual(leave.number_of_days, 3, 'The number of days should be equal to 3.')
|
||||
leave.unlink()
|
||||
|
||||
def test_calendar_with_holes(self):
|
||||
employee_calendar = self.env['resource.calendar'].create({
|
||||
'name': 'Employee Calendar',
|
||||
'attendance_ids': [
|
||||
(0, 0, {'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'name': 'Monday Afternoon', 'dayofweek': '0', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
(0, 0, {'name': 'Wednesday Morning', 'dayofweek': '2', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'name': 'Wednesday Afternoon', 'dayofweek': '2', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
(0, 0, {'name': 'Friday Morning', 'dayofweek': '4', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'name': 'Friday Afternoon', 'dayofweek': '4', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
],
|
||||
})
|
||||
self.company.resource_calendar_id = self.base_calendar
|
||||
self.employee.resource_calendar_id = employee_calendar
|
||||
|
||||
leave = self.env['hr.leave'].create({
|
||||
'name': 'Test',
|
||||
'holiday_status_id': self.time_off_type.id,
|
||||
'employee_id': self.employee.id,
|
||||
'request_date_from': '2021-09-06',
|
||||
'request_date_to': '2021-09-10',
|
||||
'company_id': self.company.id,
|
||||
'resource_calendar_id': self.employee.resource_calendar_id.id,
|
||||
})
|
||||
leave._compute_date_from_to()
|
||||
self.assertEqual(leave.number_of_days, 5, 'The number of days should be equal to 5.')
|
||||
leave.unlink()
|
||||
|
||||
def test_calendar_end_week_hole(self):
|
||||
employee_calendar = self.env['resource.calendar'].create({
|
||||
'name': 'Employee Calendar',
|
||||
'attendance_ids': [
|
||||
(0, 0, {'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'name': 'Monday Afternoon', 'dayofweek': '0', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
(0, 0, {'name': 'Wednesday Morning', 'dayofweek': '2', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'name': 'Wednesday Afternoon', 'dayofweek': '2', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
],
|
||||
})
|
||||
self.company.resource_calendar_id = self.base_calendar
|
||||
self.employee.resource_calendar_id = employee_calendar
|
||||
|
||||
leave = self.env['hr.leave'].create({
|
||||
'name': 'Test',
|
||||
'holiday_status_id': self.time_off_type.id,
|
||||
'employee_id': self.employee.id,
|
||||
'request_date_from': '2021-09-06',
|
||||
'request_date_to': '2021-09-08',
|
||||
'company_id': self.company.id,
|
||||
'resource_calendar_id': self.employee.resource_calendar_id.id,
|
||||
})
|
||||
leave._compute_date_from_to()
|
||||
self.assertEqual(leave.number_of_days, 5, 'The number of days should be equal to 5.')
|
||||
leave.unlink()
|
||||
|
||||
def test_2_weeks_calendar(self):
|
||||
company_calendar = self.env['resource.calendar'].create({
|
||||
'name': 'Company Calendar',
|
||||
'two_weeks_calendar': True,
|
||||
'attendance_ids': [
|
||||
(0, 0, {'week_type': '0', 'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'week_type': '0', 'name': 'Monday Afternoon', 'dayofweek': '0', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
(0, 0, {'week_type': '0', 'name': 'Tuesday Morning', 'dayofweek': '1', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'week_type': '0', 'name': 'Tuesday Afternoon', 'dayofweek': '1', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
(0, 0, {'week_type': '0', 'name': 'Wednesday Morning', 'dayofweek': '2', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'week_type': '0', 'name': 'Wednesday Afternoon', 'dayofweek': '2', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
(0, 0, {'week_type': '0', 'name': 'Thursday Morning', 'dayofweek': '3', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'week_type': '0', 'name': 'Thursday Afternoon', 'dayofweek': '3', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
(0, 0, {'week_type': '0', 'name': 'Friday Morning', 'dayofweek': '4', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'week_type': '0', 'name': 'Friday Afternoon', 'dayofweek': '4', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
|
||||
(0, 0, {'week_type': '1', 'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'week_type': '1', 'name': 'Monday Afternoon', 'dayofweek': '0', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
(0, 0, {'week_type': '1', 'name': 'Tuesday Morning', 'dayofweek': '1', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'week_type': '1', 'name': 'Tuesday Afternoon', 'dayofweek': '1', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
(0, 0, {'week_type': '1', 'name': 'Wednesday Morning', 'dayofweek': '2', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'week_type': '1', 'name': 'Wednesday Afternoon', 'dayofweek': '2', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
],
|
||||
})
|
||||
employee_calendar = self.env['resource.calendar'].create({
|
||||
'name': 'Employee Calendar',
|
||||
'attendance_ids': [
|
||||
(0, 0, {'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'name': 'Monday Afternoon', 'dayofweek': '0', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
(0, 0, {'name': 'Tuesday Morning', 'dayofweek': '1', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'name': 'Tuesday Afternoon', 'dayofweek': '1', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
(0, 0, {'name': 'Wednesday Morning', 'dayofweek': '2', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||
(0, 0, {'name': 'Wednesday Afternoon', 'dayofweek': '2', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||
],
|
||||
})
|
||||
self.company.resource_calendar_id = company_calendar
|
||||
self.employee.resource_calendar_id = employee_calendar
|
||||
|
||||
# Week type 0
|
||||
leave = self.env['hr.leave'].create({
|
||||
'name': 'Test',
|
||||
'holiday_status_id': self.time_off_type.id,
|
||||
'employee_id': self.employee.id,
|
||||
'request_date_from': '2021-09-06',
|
||||
'request_date_to': '2021-09-08',
|
||||
'company_id': self.company.id,
|
||||
'resource_calendar_id': self.employee.resource_calendar_id.id,
|
||||
})
|
||||
leave._compute_date_from_to()
|
||||
self.assertEqual(leave.number_of_days, 5, 'The number of days should be equal to 5.')
|
||||
leave.unlink()
|
||||
|
||||
# Week type 1
|
||||
leave = self.env['hr.leave'].create({
|
||||
'name': 'Test',
|
||||
'holiday_status_id': self.time_off_type.id,
|
||||
'employee_id': self.employee.id,
|
||||
'request_date_from': '2021-09-13',
|
||||
'request_date_to': '2021-09-15',
|
||||
'company_id': self.company.id,
|
||||
'resource_calendar_id': self.employee.resource_calendar_id.id,
|
||||
})
|
||||
leave._compute_date_from_to()
|
||||
self.assertEqual(leave.number_of_days, 3, 'The number of days should be equal to 3.')
|
||||
leave.unlink()
|
||||
|
||||
# Both ending with week type 1
|
||||
leave = self.env['hr.leave'].create({
|
||||
'name': 'Test',
|
||||
'holiday_status_id': self.time_off_type.id,
|
||||
'employee_id': self.employee.id,
|
||||
'request_date_from': '2021-09-06',
|
||||
'request_date_to': '2021-09-15',
|
||||
'company_id': self.company.id,
|
||||
'resource_calendar_id': self.employee.resource_calendar_id.id,
|
||||
})
|
||||
leave._compute_date_from_to()
|
||||
self.assertEqual(leave.number_of_days, 8, 'The number of days should be equal to 3.')
|
||||
leave.unlink()
|
||||
|
||||
# Both ending with week type 0
|
||||
leave = self.env['hr.leave'].create({
|
||||
'name': 'Test',
|
||||
'holiday_status_id': self.time_off_type.id,
|
||||
'employee_id': self.employee.id,
|
||||
'request_date_from': '2021-09-13',
|
||||
'request_date_to': '2021-09-22',
|
||||
'company_id': self.company.id,
|
||||
'resource_calendar_id': self.employee.resource_calendar_id.id,
|
||||
})
|
||||
leave._compute_date_from_to()
|
||||
self.assertEqual(leave.number_of_days, 8, 'The number of days should be equal to 3.')
|
||||
leave.unlink()
|
43
l10n_fr_hr_holidays/views/res_config_settings_views.xml
Normal file
43
l10n_fr_hr_holidays/views/res_config_settings_views.xml
Normal file
@@ -0,0 +1,43 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<odoo>
|
||||
<record id="res_config_settings_view_form" model="ir.ui.view">
|
||||
<field name="name">res.config.settings.view.form.inherit.hr</field>
|
||||
<field name="model">res.config.settings</field>
|
||||
<field name="priority" eval="70"/>
|
||||
<field name="inherit_id" ref="base.res_config_settings_view_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<div name="work_organization_setting_container" position="after">
|
||||
<field name="company_country_code" invisible="1"/>
|
||||
<h2>French Time Off Localization</h2>
|
||||
<div class="row mt16 o_settings_container" name="work_organization_setting_container">
|
||||
<div class="col-12 col-lg-6 o_setting_box" id="default_company_work_organization_setting">
|
||||
<div class="o_setting_right_pane">
|
||||
<label for="resource_calendar_id"/>
|
||||
<span class="fa fa-lg fa-building-o" title="Values set here are company-specific." role="img" aria-label="Values set here are company-specific." groups="base.group_multi_company"/>
|
||||
<div class="row">
|
||||
<div class="text-muted col-lg-8">
|
||||
Set the time off type used as the company Paid Time Off to compute part-timers leave duration
|
||||
</div>
|
||||
</div>
|
||||
<div class="content-group">
|
||||
<div class="mt16">
|
||||
<field name="l10n_fr_reference_leave_type" required="1"
|
||||
class="o_light_label"
|
||||
domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]"
|
||||
context="{'default_company_id': company_id}"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<menuitem id="hr_holidays_menu_configuration"
|
||||
name="Settings"
|
||||
parent="hr_holidays.menu_hr_holidays_configuration"
|
||||
sequence="10"
|
||||
action="hr.hr_config_settings_action"
|
||||
groups="base.group_system"/>
|
||||
</odoo>
|
Reference in New Issue
Block a user