Compare commits
1 Commits
16.0
...
project_us
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7b983265fa |
@@ -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
|
|
||||||
@@ -6,7 +6,7 @@
|
|||||||
<field name="inherit_id" ref="project.view_task_form2" />
|
<field name="inherit_id" ref="project.view_task_form2" />
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="//page[@name='extra_info']//field[@name='parent_id']" position="attributes">
|
<xpath expr="//page[@name='extra_info']//field[@name='parent_id']" position="attributes">
|
||||||
<attribute name="domain">[('project_id','=', project_id), ('stage_id.fold', '=', False)]</attribute>
|
<attribute name="domain">[('project_id','=', project_id)]</attribute>
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
"name": "project_working_time_task_portal",
|
"name": "project_working_time_task_portal",
|
||||||
"version": "16.0.1.0.5",
|
"version": "16.0.1.0.4",
|
||||||
"author": "Elabore",
|
"author": "Elabore",
|
||||||
"website": "https://elabore.coop",
|
"website": "https://elabore.coop",
|
||||||
"maintainer": "Boris Gallet",
|
"maintainer": "Boris Gallet",
|
||||||
|
|||||||
@@ -4,10 +4,10 @@
|
|||||||
#
|
#
|
||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: Odoo Server 16.0\n"
|
"Project-Id-Version: Odoo Server 14.0\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2025-11-18 16:44+0000\n"
|
"POT-Creation-Date: 2023-12-04 09:37+0000\n"
|
||||||
"PO-Revision-Date: 2025-11-18 16:44+0000\n"
|
"PO-Revision-Date: 2023-12-04 09:37+0000\n"
|
||||||
"Last-Translator: \n"
|
"Last-Translator: \n"
|
||||||
"Language-Team: \n"
|
"Language-Team: \n"
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
@@ -31,9 +31,24 @@ msgid "<strong>Subtask Planned Hours: </strong>"
|
|||||||
msgstr "<strong>Heures Planifiées Sous-tâches: </strong>"
|
msgstr "<strong>Heures Planifiées Sous-tâches: </strong>"
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
#. module: project_working_time_task_portal
|
||||||
#: model:ir.model,name:project_working_time_task_portal.model_account_analytic_line
|
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.portal_my_task_remaining_hours
|
||||||
msgid "Analytic Line"
|
msgid "Remaining Hours:"
|
||||||
msgstr "Ligne analytique"
|
msgstr "Heures restantes:"
|
||||||
|
|
||||||
|
#. module: project_working_time_task_portal
|
||||||
|
#: model:ir.model.fields,field_description:project_working_time_task_portal.field_project_task__billable_remaining_hours
|
||||||
|
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
||||||
|
msgid "Billable Remaining Hours"
|
||||||
|
msgstr "Heures restantes facturables"
|
||||||
|
#. module: project_working_time_task_portal
|
||||||
|
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.portal_tasks_list_inherit
|
||||||
|
msgid "Billable Hours"
|
||||||
|
msgstr "Heures facturables"
|
||||||
|
|
||||||
|
#. module: project_working_time_task_portal
|
||||||
|
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
||||||
|
msgid "Billable Remaining Days"
|
||||||
|
msgstr "Jours restants facturables"
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
#. module: project_working_time_task_portal
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
||||||
@@ -47,34 +62,9 @@ msgid "Billable Effective Hours"
|
|||||||
msgstr "Heures passées facturables"
|
msgstr "Heures passées facturables"
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
#. module: project_working_time_task_portal
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.portal_tasks_list_inherit
|
#: model:ir.model.fields,field_description:project_working_time_task_portal.field_project_task__subtask_billable_effective_hours
|
||||||
msgid "Billable Hours"
|
msgid "Subtask Billable Effective Hours"
|
||||||
msgstr "Heures facturables"
|
msgstr "Heures passées facturables Sous-tâches"
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model:ir.model.fields,field_description:project_working_time_task_portal.field_project_task__billable_progress
|
|
||||||
msgid "Billable Progress"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
|
||||||
msgid "Billable Remaining Days"
|
|
||||||
msgstr "Jours restants facturables"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model:ir.model.fields,field_description:project_working_time_task_portal.field_project_task__billable_remaining_hours
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
|
||||||
msgid "Billable Remaining Hours"
|
|
||||||
msgstr "Heures restantes facturables"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model:ir.model.fields,help:project_working_time_task_portal.field_project_task__total_billable_hours_spent
|
|
||||||
msgid ""
|
|
||||||
"Billable time spent on this task and its sub-tasks (and their own sub-"
|
|
||||||
"tasks)."
|
|
||||||
msgstr ""
|
|
||||||
"Temps facturable passé sur cette tâche et ses sous-tâches (et leurs propres sous-"
|
|
||||||
"tâches)."
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
#. module: project_working_time_task_portal
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
||||||
@@ -85,81 +75,4 @@ msgstr "Jours passés non facturables"
|
|||||||
#: model:ir.model.fields,field_description:project_working_time_task_portal.field_project_task__non_billable_effective_hours
|
#: model:ir.model.fields,field_description:project_working_time_task_portal.field_project_task__non_billable_effective_hours
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
||||||
msgid "Non Billable Effective Hours"
|
msgid "Non Billable Effective Hours"
|
||||||
msgstr "Heures passées non facturables"
|
msgstr "Heures passées non facturables"
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model:ir.model.fields,help:project_working_time_task_portal.field_project_task__total_non_billable_hours_spent
|
|
||||||
msgid ""
|
|
||||||
"Non billable time spent on this task and its sub-tasks (and their own sub-"
|
|
||||||
"tasks)."
|
|
||||||
msgstr ""
|
|
||||||
"Temps non facturable passé sur cette tâche et ses sous-tâches (et leurs propres sous-"
|
|
||||||
"tâches)."
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.portal_my_task_remaining_hours
|
|
||||||
msgid "Remaining Hours:"
|
|
||||||
msgstr "Heures restantes:"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model:ir.model.fields,field_description:project_working_time_task_portal.field_account_analytic_line__smart_search
|
|
||||||
#: model:ir.model.fields,field_description:project_working_time_task_portal.field_project_task__smart_search
|
|
||||||
msgid "Smart Search"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
|
||||||
msgid "Subtask Billable Effective Days"
|
|
||||||
msgstr "Sous-tâches jours passés facturables"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model:ir.model.fields,field_description:project_working_time_task_portal.field_project_task__subtask_billable_effective_hours
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
|
||||||
msgid "Subtask Billable Effective Hours"
|
|
||||||
msgstr "Sous-tâches heures passées facturables"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
|
||||||
msgid "Subtask Non Billable Effective Days"
|
|
||||||
msgstr "Sous-tâches jours passés non facturables"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model:ir.model.fields,field_description:project_working_time_task_portal.field_project_task__subtask_non_billable_effective_hours
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
|
||||||
msgid "Subtask Non Billable Effective Hours"
|
|
||||||
msgstr "Sous-tâches heures passées non facturables"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model:ir.model,name:project_working_time_task_portal.model_project_task
|
|
||||||
msgid "Task"
|
|
||||||
msgstr "Tâche"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
|
||||||
msgid "Total Billable Days"
|
|
||||||
msgstr "Total des jours facturables"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model:ir.model.fields,field_description:project_working_time_task_portal.field_project_task__total_billable_hours_spent
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
|
||||||
msgid "Total Billable Hours"
|
|
||||||
msgstr "Total des heures facturables"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model:ir.model.fields,help:project_working_time_task_portal.field_project_task__billable_remaining_hours
|
|
||||||
msgid ""
|
|
||||||
"Total Billable remaining time (without exclude_from_sale_order timesheet "
|
|
||||||
"lines), can be re-estimated periodically by the assignee of the task."
|
|
||||||
msgstr ""
|
|
||||||
"Nombre d'heures allouées moins le nombre d'heures passées facturées."
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
|
||||||
msgid "Total Non Billable Days"
|
|
||||||
msgstr "Total des jours non facturables"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model:ir.model.fields,field_description:project_working_time_task_portal.field_project_task__total_non_billable_hours_spent
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
|
||||||
msgid "Total Non Billable Hours"
|
|
||||||
msgstr "Total des heures non facturables"
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
from odoo import SUPERUSER_ID, api
|
|
||||||
|
|
||||||
def migrate(cr, version):
|
|
||||||
env = api.Environment(cr, SUPERUSER_ID, {})
|
|
||||||
|
|
||||||
tasks = env["project.task"].search([("stage_id.fold", "=", False)])
|
|
||||||
tasks._compute_billable_effective_hours()
|
|
||||||
@@ -9,6 +9,7 @@ class Task(models.Model):
|
|||||||
compute="_compute_billable_effective_hours",
|
compute="_compute_billable_effective_hours",
|
||||||
string="Billable Effective Hours",
|
string="Billable Effective Hours",
|
||||||
store=True,
|
store=True,
|
||||||
|
compute_sudo=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
non_billable_effective_hours = fields.Float(
|
non_billable_effective_hours = fields.Float(
|
||||||
@@ -35,41 +36,21 @@ class Task(models.Model):
|
|||||||
compute="_compute_subtask_billable_effective_hours",
|
compute="_compute_subtask_billable_effective_hours",
|
||||||
string="Subtask Billable Effective Hours",
|
string="Subtask Billable Effective Hours",
|
||||||
store=True,
|
store=True,
|
||||||
|
compute_sudo=True,
|
||||||
recursive=True,
|
recursive=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
subtask_non_billable_effective_hours = fields.Float(
|
@api.depends('timesheet_ids.unit_amount')
|
||||||
compute="_compute_subtask_non_billable_effective_hours",
|
|
||||||
string="Subtask Non Billable Effective Hours",
|
|
||||||
store=True,
|
|
||||||
recursive=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
total_billable_hours_spent = fields.Float(
|
|
||||||
"Total Billable Hours",
|
|
||||||
compute="_compute_total_billable_hours_spent",
|
|
||||||
store=True,
|
|
||||||
help="Billable time spent on this task and its sub-tasks (and their own sub-tasks).",
|
|
||||||
)
|
|
||||||
|
|
||||||
total_non_billable_hours_spent = fields.Float(
|
|
||||||
"Total Non Billable Hours",
|
|
||||||
compute="_compute_total_non_billable_hours_spent",
|
|
||||||
store=True,
|
|
||||||
help="Non billable time spent on this task and its sub-tasks (and their own sub-tasks).",
|
|
||||||
)
|
|
||||||
|
|
||||||
@api.depends('timesheet_ids.unit_amount', 'timesheet_ids.exclude_from_sale_order')
|
|
||||||
def _compute_billable_effective_hours(self):
|
def _compute_billable_effective_hours(self):
|
||||||
if not any(self._ids):
|
if not any(self._ids):
|
||||||
for task in self:
|
for task in self:
|
||||||
filtered_timesheets = task.timesheet_ids.filtered(lambda t: not t.exclude_from_sale_order)
|
filtered_timesheets = task.timesheet_ids.filtered(lambda t: not t.exclude_from_sale_order)
|
||||||
task.billable_effective_hours = sum(filtered_timesheets.mapped('unit_amount'))
|
task.billable_effective_hours = sum(filtered_timesheets.mapped('unit_amount'))
|
||||||
return
|
return
|
||||||
|
|
||||||
timesheet_read_group = self.env['account.analytic.line'].read_group(
|
timesheet_read_group = self.env['account.analytic.line'].read_group(
|
||||||
[('task_id', 'in', self.ids), ('exclude_from_sale_order', '=', False)], # We exclude the lines (timesheet) which are excluded from billing
|
[('task_id', 'in', self.ids), ('exclude_from_sale_order', '=', False)], # We exclude the lines (timesheet) which are excluded from billing
|
||||||
['unit_amount', 'task_id'],
|
['unit_amount', 'task_id'],
|
||||||
['task_id']
|
['task_id']
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -87,16 +68,12 @@ class Task(models.Model):
|
|||||||
for task in self:
|
for task in self:
|
||||||
task.billable_remaining_hours = task.planned_hours - task.billable_effective_hours - task.subtask_billable_effective_hours
|
task.billable_remaining_hours = task.planned_hours - task.billable_effective_hours - task.subtask_billable_effective_hours
|
||||||
|
|
||||||
|
|
||||||
@api.depends('child_ids.billable_effective_hours', 'child_ids.subtask_billable_effective_hours')
|
@api.depends('child_ids.billable_effective_hours', 'child_ids.subtask_billable_effective_hours')
|
||||||
def _compute_subtask_billable_effective_hours(self):
|
def _compute_subtask_billable_effective_hours(self):
|
||||||
for task in self:
|
for task in self:
|
||||||
task.subtask_billable_effective_hours = sum(child_task.billable_effective_hours + child_task.subtask_billable_effective_hours for child_task in task.child_ids)
|
task.subtask_billable_effective_hours = sum(child_task.billable_effective_hours + child_task.subtask_billable_effective_hours for child_task in task.child_ids)
|
||||||
|
|
||||||
@api.depends('child_ids.non_billable_effective_hours', 'child_ids.subtask_non_billable_effective_hours')
|
|
||||||
def _compute_subtask_non_billable_effective_hours(self):
|
|
||||||
for task in self:
|
|
||||||
task.subtask_non_billable_effective_hours = sum(child_task.non_billable_effective_hours + child_task.subtask_non_billable_effective_hours for child_task in task.child_ids)
|
|
||||||
|
|
||||||
@api.depends('billable_effective_hours', 'subtask_billable_effective_hours', 'planned_hours')
|
@api.depends('billable_effective_hours', 'subtask_billable_effective_hours', 'planned_hours')
|
||||||
def _compute_billable_progress_hours(self):
|
def _compute_billable_progress_hours(self):
|
||||||
for task in self:
|
for task in self:
|
||||||
@@ -107,18 +84,4 @@ class Task(models.Model):
|
|||||||
else:
|
else:
|
||||||
task.billable_progress = round(100.0 * task_total_hours / task.planned_hours, 2)
|
task.billable_progress = round(100.0 * task_total_hours / task.planned_hours, 2)
|
||||||
else:
|
else:
|
||||||
task.billable_progress = 0.0
|
task.billable_progress = 0.0
|
||||||
|
|
||||||
@api.depends('billable_effective_hours', 'subtask_billable_effective_hours')
|
|
||||||
def _compute_total_billable_hours_spent(self):
|
|
||||||
for task in self:
|
|
||||||
task.total_billable_hours_spent = (
|
|
||||||
task.billable_effective_hours + task.subtask_billable_effective_hours
|
|
||||||
)
|
|
||||||
|
|
||||||
@api.depends("non_billable_effective_hours", "subtask_non_billable_effective_hours")
|
|
||||||
def _compute_total_non_billable_hours_spent(self):
|
|
||||||
for task in self:
|
|
||||||
task.total_non_billable_hours_spent = (
|
|
||||||
task.non_billable_effective_hours + task.subtask_non_billable_effective_hours
|
|
||||||
)
|
|
||||||
@@ -9,56 +9,24 @@
|
|||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="//field[@name='effective_hours']" position="after">
|
<xpath expr="//field[@name='effective_hours']" position="after">
|
||||||
<span>
|
<span>
|
||||||
<label class="font-weight-bold" for="billable_effective_hours" string="Billable Effective Hours" attrs="{'invisible': ['|', ('non_billable_effective_hours', '=', 0.0), ('encode_uom_in_days', '=', True)]}"/>
|
<label class="font-weight-bold" for="billable_effective_hours" string="Billable Effective Hours" attrs="{'invisible': ['|', ('planned_hours', '=', 0.0), ('encode_uom_in_days', '=', True)]}"/>
|
||||||
<label class="font-weight-bold" for="billable_effective_hours" string="Billable Effective Days" attrs="{'invisible': ['|', ('non_billable_effective_hours', '=', 0.0), ('encode_uom_in_days', '=', False)]}"/>
|
<label class="font-weight-bold" for="billable_effective_hours" string="Billable Effective Days" attrs="{'invisible': ['|', ('planned_hours', '=', 0.0), ('encode_uom_in_days', '=', False)]}"/>
|
||||||
</span>
|
</span>
|
||||||
<field name="billable_effective_hours" widget="timesheet_uom" class="mt-2" attrs="{'invisible' : [('non_billable_effective_hours', '=', 0.0)]}" nolabel="1"/>
|
<field name="billable_effective_hours" widget="timesheet_uom" class="mt-2" attrs="{'invisible' : [('planned_hours', '=', 0.0)]}" nolabel="1"/>
|
||||||
<span>
|
<span>
|
||||||
<label class="font-weight-bold" for="non_billable_effective_hours" string="Non Billable Effective Hours" attrs="{'invisible': ['|', ('non_billable_effective_hours', '=', 0.0), ('encode_uom_in_days', '=', True)]}"/>
|
<label class="font-weight-bold" for="non_billable_effective_hours" string="Non Billable Effective Hours" attrs="{'invisible': ['|', ('planned_hours', '=', 0.0), ('encode_uom_in_days', '=', True)]}"/>
|
||||||
<label class="font-weight-bold" for="non_billable_effective_hours" string="Non Billable Effective Days" attrs="{'invisible': ['|', ('non_billable_effective_hours', '=', 0.0), ('encode_uom_in_days', '=', False)]}"/>
|
<label class="font-weight-bold" for="non_billable_effective_hours" string="Non Billable Effective Days" attrs="{'invisible': ['|', ('planned_hours', '=', 0.0), ('encode_uom_in_days', '=', False)]}"/>
|
||||||
</span>
|
</span>
|
||||||
<field name="non_billable_effective_hours" widget="timesheet_uom" class="mt-2" attrs="{'invisible' : [('non_billable_effective_hours', '=', 0.0)]}" nolabel="1"/>
|
<field name="non_billable_effective_hours" widget="timesheet_uom" class="mt-2" attrs="{'invisible' : [('planned_hours', '=', 0.0)]}" nolabel="1"/>
|
||||||
</xpath>
|
|
||||||
<xpath expr="//field[@name='subtask_effective_hours']" position="after">
|
|
||||||
<span>
|
|
||||||
<label class="font-weight-bold" for="subtask_billable_effective_hours" string="Subtask Billable Effective Hours" attrs="{'invisible': ['|', '|', ('allow_subtasks', '=', False), ('subtask_effective_hours', '=', 0.0), ('encode_uom_in_days', '=', True)]}"/>
|
|
||||||
<label class="font-weight-bold" for="subtask_billable_effective_hours" string="Subtask Billable Effective Days" attrs="{'invisible': ['|', '|', ('allow_subtasks', '=', False), ('subtask_effective_hours', '=', 0.0), ('encode_uom_in_days', '=', False)]}"/>
|
|
||||||
</span>
|
|
||||||
<field name="subtask_billable_effective_hours" widget="timesheet_uom" class="mt-2" attrs="{'invisible' : ['|', ('allow_subtasks', '=', False), ('subtask_effective_hours', '=', 0.0)]}" nolabel="1"/>
|
|
||||||
<span>
|
|
||||||
<label class="font-weight-bold" for="subtask_non_billable_effective_hours" string="Subtask Non Billable Effective Hours" attrs="{'invisible': ['|', '|', ('allow_subtasks', '=', False), ('subtask_effective_hours', '=', 0.0), ('encode_uom_in_days', '=', True)]}"/>
|
|
||||||
<label class="font-weight-bold" for="subtask_non_billable_effective_hours" string="Subtask Non Billable Effective Days" attrs="{'invisible': ['|', '|', ('allow_subtasks', '=', False), ('subtask_effective_hours', '=', 0.0), ('encode_uom_in_days', '=', False)]}"/>
|
|
||||||
</span>
|
|
||||||
<field name="subtask_non_billable_effective_hours" widget="timesheet_uom" class="mt-2" attrs="{'invisible' : ['|', ('allow_subtasks', '=', False), ('subtask_effective_hours', '=', 0.0)]}" nolabel="1"/>
|
|
||||||
</xpath>
|
|
||||||
<xpath expr="//field[@name='total_hours_spent']" position="after">
|
|
||||||
<span attrs="{'invisible' : ['|', ('allow_subtasks', '=', False), ('subtask_effective_hours', '=', 0.0)]}">
|
|
||||||
<label for="total_billable_hours_spent" string="Total Billable Hours"
|
|
||||||
attrs="{'invisible': [('encode_uom_in_days', '=', True)]}"/>
|
|
||||||
<label for="total_billable_hours_spent" string="Total Billable Days"
|
|
||||||
attrs="{'invisible': [('encode_uom_in_days', '=', False)]}"/>
|
|
||||||
</span>
|
|
||||||
<field name="total_billable_hours_spent" widget="timesheet_uom" nolabel="1"
|
|
||||||
attrs="{'invisible' : ['|', ('allow_subtasks', '=', False), ('subtask_effective_hours', '=', 0.0)]}" />
|
|
||||||
<span attrs="{'invisible' : ['|', ('allow_subtasks', '=', False), ('subtask_effective_hours', '=', 0.0)]}">
|
|
||||||
<label for="total_non_billable_hours_spent" string="Total Non Billable Hours"
|
|
||||||
attrs="{'invisible': [('encode_uom_in_days', '=', True)]}"/>
|
|
||||||
<label for="total_non_billable_hours_spent" string="Total Non Billable Days"
|
|
||||||
attrs="{'invisible': [('encode_uom_in_days', '=', False)]}"/>
|
|
||||||
</span>
|
|
||||||
<field name="total_non_billable_hours_spent" widget="timesheet_uom" nolabel="1"
|
|
||||||
attrs="{'invisible' : ['|', ('allow_subtasks', '=', False), ('subtask_effective_hours', '=', 0.0)]}" />
|
|
||||||
</xpath>
|
</xpath>
|
||||||
<xpath expr="//field[@name='remaining_hours']" position="after">
|
<xpath expr="//field[@name='remaining_hours']" position="after">
|
||||||
<span>
|
<span>
|
||||||
<label class="font-weight-bold text-danger" for="billable_remaining_hours" string="Billable Remaining Hours" attrs="{'invisible': ['|', '|', ('planned_hours', '=', 0.0), ('encode_uom_in_days', '=', True), ('billable_remaining_hours', '>=', 0)]}"/>
|
<label class="font-weight-bold" for="billable_remaining_hours" string="Billable Remaining Hours" attrs="{'invisible': ['|', ('planned_hours', '=', 0.0), ('encode_uom_in_days', '=', True)]}"/>
|
||||||
<label class="font-weight-bold" for="billable_remaining_hours" string="Billable Remaining Hours" attrs="{'invisible': ['|', '|', ('planned_hours', '=', 0.0), ('encode_uom_in_days', '=', True), ('billable_remaining_hours', '<', 0)]}"/>
|
<label class="font-weight-bold" for="billable_remaining_hours" string="Billable Remaining Days" attrs="{'invisible': ['|', ('planned_hours', '=', 0.0), ('encode_uom_in_days', '=', False)]}"/>
|
||||||
<label class="font-weight-bold text-danger" for="billable_remaining_hours" string="Billable Remaining Days" attrs="{'invisible': ['|', '|', ('planned_hours', '=', 0.0), ('encode_uom_in_days', '=', False), ('billable_remaining_hours', '>=', 0)]}"/>
|
|
||||||
<label class="font-weight-bold" for="billable_remaining_hours" string="Billable Remaining Days" attrs="{'invisible': ['|', '|', ('planned_hours', '=', 0.0), ('encode_uom_in_days', '=', False), ('billable_remaining_hours', '<', 0)]}"/>
|
|
||||||
</span>
|
</span>
|
||||||
<field name="billable_remaining_hours" widget="timesheet_uom" class="oe_subtotal_footer_separator" attrs="{'invisible' : [('planned_hours', '=', 0.0)]}" decoration-danger="billable_remaining_hours < 0" nolabel="1"/>
|
<field name="billable_remaining_hours" widget="timesheet_uom" class="oe_subtotal_footer_separator" attrs="{'invisible' : [('planned_hours', '=', 0.0)]}" nolabel="1"/>
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
</odoo>
|
</odoo>
|
||||||
Reference in New Issue
Block a user