Sync config from odoo-elabore-ci:16.0

2025-09-17 13:39:41 +00:00
55 changed files with 920 additions and 344 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -0,0 +1,20 @@
+# 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
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -0,0 +1,188 @@
+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
--- a/.gitea/workflows/pre-commit.yml
+++ b/.gitea/workflows/pre-commit.yml
@@ -0,0 +1,42 @@
+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
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,150 @@
+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
--- a/.prettierrc.yml
+++ b/.prettierrc.yml
@@ -0,0 +1,8 @@
+# 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"
--- a/.pylintrc
+++ b/.pylintrc
@@ -0,0 +1,123 @@
+
+
+[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
--- a/.pylintrc-mandatory
+++ b/.pylintrc-mandatory
@@ -0,0 +1,98 @@
+
+[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
--- a/.ruff.toml
+++ b/.ruff.toml
@@ -0,0 +1,31 @@
+
+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
--- a/project_assignees/models/init.py
+++ b/project_assignees/models/init.py
@@ -1 +1,2 @@
-from . import project_task
+
+from . import project_task
--- a/project_assignees/models/project_task.py
+++ b/project_assignees/models/project_task.py
@@ -1,7 +1,9 @@
+
 from odoo import models, fields


 class Task(models.Model):
    _inherit = "project.task"

-    assignee_ids = fields.Many2many("res.users", "assignee_ids_rel", string="Assignees")
+    assignee_ids = fields.Many2many('res.users', 'assignee_ids_rel', string='Assignees')
+
--- a/project_average_acceptable_time/manifest.py
+++ b/project_average_acceptable_time/manifest.py
@@ -65,7 +65,11 @@ This module is maintained by Elabore.

 """,
    # any module necessary for this one to work correctly
-    "depends": ["base", "project", "project_user_default_project"],
+    "depends": [
+        "base",
+        "project",
+        "project_user_default_project"
+    ],
    "qweb": [
        # "static/src/xml/*.xml",
    ],
@@ -73,7 +77,10 @@ This module is maintained by Elabore.
        "python": [],
    },
    # always loaded
-    "data": ["views/project_project.xml", "views/portal_home_template.xml"],
+    "data": [
+        "views/project_project.xml",
+        "views/portal_home_template.xml"
+    ],
    # only loaded in demonstration mode
    "demo": [],
    "js": [],
--- a/project_average_acceptable_time/controllers/init.py
+++ b/project_average_acceptable_time/controllers/init.py
@@ -1 +1,2 @@
-from . import custom_portal
+
+from . import custom_portal
--- a/project_average_acceptable_time/controllers/custom_portal.py
+++ b/project_average_acceptable_time/controllers/custom_portal.py
@@ -7,19 +7,15 @@ from odoo.addons.portal.controllers.portal import CustomerPortal
 class CustomCustomerPortal(CustomerPortal):
    @route(["/my/account"], type="http", auth="user", website=True)
    def account(self, redirect=None, **post):
-        self.OPTIONAL_BILLING_FIELDS.append(
-            "average_acceptable_time"
-        )  # unecessary save in res partner, but necessary to avoid error on form post
+        self.OPTIONAL_BILLING_FIELDS.append("average_acceptable_time") #unecessary save in res partner, but necessary to avoid error on form post

        response = super(CustomCustomerPortal, self).account(redirect, **post)
-
+        
        if post and request.httprequest.method == "POST":
            error, error_message = self.details_form_validate(post)
            if not error:
                user = request.env.user
                if user.default_project_id and post["average_acceptable_time"]:
-                    user.default_project_id.average_acceptable_time = post[
-                        "average_acceptable_time"
-                    ]
-
+                    user.default_project_id.average_acceptable_time = post["average_acceptable_time"]
+                    
        return response
--- a/project_average_acceptable_time/models/init.py
+++ b/project_average_acceptable_time/models/init.py
@@ -1,2 +1,3 @@
+
 from . import project_project
-from . import res_partner
+from . import res_partner
--- a/project_average_acceptable_time/models/project_project.py
+++ b/project_average_acceptable_time/models/project_project.py
@@ -1,7 +1,10 @@
+
 from odoo import models, fields, _, api


 class Project(models.Model):
    _inherit = "project.project"

-    average_acceptable_time = fields.Float("Average acceptable time")
+    average_acceptable_time = fields.Float('Average acceptable time')
+
+    
--- a/project_average_acceptable_time/models/res_partner.py
+++ b/project_average_acceptable_time/models/res_partner.py
@@ -1,9 +1,10 @@
+
 from odoo import models, fields, _, api


 class ResPartner(models.Model):
    _inherit = "res.partner"

-    average_acceptable_time = fields.Float(
-        "Average acceptable time"
-    )  # not used, but necessary to post custom field from /my/account
+    average_acceptable_time = fields.Float('Average acceptable time') # not used, but necessary to post custom field from /my/account
+
+    
--- a/project_link_from_invoice/init.py
+++ b/project_link_from_invoice/init.py
@@ -1 +1,2 @@
+
 from . import models
--- a/project_link_from_invoice/manifest.py
+++ b/project_link_from_invoice/manifest.py
@@ -65,7 +65,12 @@ This module is maintained by Elabore.

 """,
    # any module necessary for this one to work correctly
-    "depends": ["base", "project", "account", "sale"],
+    "depends": [
+        "base",
+        "project",
+        "account",
+        "sale"
+    ],
    "qweb": [
        # "static/src/xml/*.xml",
    ],
--- a/project_link_from_invoice/models/init.py
+++ b/project_link_from_invoice/models/init.py
@@ -1 +1,2 @@
-from . import account_move
+
+from . import account_move
--- a/project_link_from_invoice/models/account_move.py
+++ b/project_link_from_invoice/models/account_move.py
@@ -1,46 +1,38 @@
+
 from odoo import models, fields, api


 class AccountMove(models.Model):
    _inherit = "account.move"

-    project_ids = fields.Many2many(
-        "project.project", name="Projects", compute="get_related_project_ids"
-    )
-    project_count = fields.Integer("Project Count", compute="get_related_project_ids")
-    projects_name = fields.Char("Project(s)", compute="get_related_project_ids")
+    project_ids = fields.Many2many('project.project', name="Projects", compute='get_related_project_ids')
+    project_count = fields.Integer("Project Count", compute='get_related_project_ids')
+    projects_name = fields.Char('Project(s)', compute='get_related_project_ids')

    def action_open_projects(self):
-        """
-        Open related projects, in form or tree view depending on project numbers
-        """
+        '''
+            Open related projects, in form or tree view depending on project numbers
+        '''
        project_ids = self.project_ids.ids
-        action = self.env["ir.actions.actions"]._for_xml_id(
-            "project.open_view_project_all"
-        )
+        action = self.env["ir.actions.actions"]._for_xml_id("project.open_view_project_all")

        if self.project_count == 1:
-            action["res_id"] = project_ids[0]
-            action["views"] = [[False, "form"]]
+            action['res_id'] = project_ids[0]
+            action['views'] = [[False, "form"]]
        else:
-            action["views"] = [[False, "tree"], [False, "form"]]
-
-        action["domain"] = [("id", "in", project_ids)]
-
-        del action["target"]  # to display breadcrumbs
+            action['views'] = [[False, "tree"], [False, "form"]]
+        
+        action['domain'] = [('id', 'in', project_ids)]

+        del action['target'] #to display breadcrumbs
+        
        return action

-    @api.depends("line_ids.sale_line_ids")
+
+    @api.depends('line_ids.sale_line_ids')
    def get_related_project_ids(self):
        for move in self:
-            projects = (
-                self.env["project.task"]
-                .search(
-                    [("sale_order_id", "in", move.line_ids.sale_line_ids.order_id.ids)]
-                )
-                .project_id
-            )
+            projects = self.env['project.task'].search([('sale_order_id','in',move.line_ids.sale_line_ids.order_id.ids)]).project_id
            move.project_ids = projects.ids
-            move.projects_name = " ; ".join([p.name for p in projects])
-            move.project_count = len(projects)
+            move.projects_name = ' ; '.join([p.name for p in projects])
+            move.project_count = len(projects)
--- a/project_name_from_lead/init.py
+++ b/project_name_from_lead/init.py
@@ -1 +1,2 @@
-from . import models
+
+from . import models
--- a/project_name_from_lead/manifest.py
+++ b/project_name_from_lead/manifest.py
@@ -33,4 +33,4 @@
    # and independently installed.  Used for synergetic or glue modules.
    "auto_install": False,
    "application": False,
-}
+}
--- a/project_name_from_lead/models/init.py
+++ b/project_name_from_lead/models/init.py
@@ -1 +1 @@
-from . import sale_order, crm_lead
+from . import sale_order, crm_lead
--- a/project_name_from_lead/models/crm_lead.py
+++ b/project_name_from_lead/models/crm_lead.py
@@ -1,19 +1,17 @@
 from odoo import models

-
 class Lead(models.Model):
-    _inherit = "crm.lead"
+    _inherit = 'crm.lead'

    def write(self, vals):
-        """update project name if project created from lead"""
+        """update project name if project created from lead        
+        """
        for lead in self:
-            if "name" in vals:
-                sale = self.env["sale.order"].search([("opportunity_id", "=", lead.id)])
+            if 'name' in vals:
+                sale = self.env['sale.order'].search([('opportunity_id','=',lead.id)])
                if sale:
-                    project = self.env["project.project"].search(
-                        [("sale_order_id", "=", sale.id)]
-                    )
+                    project = self.env['project.project'].search([('sale_order_id','=',sale.id)])
                    if project:
-                        project.name = vals["name"]
+                        project.name = vals['name']

        return super(Lead, self).write(vals)
--- a/project_name_from_lead/models/sale_order.py
+++ b/project_name_from_lead/models/sale_order.py
@@ -8,5 +8,5 @@ class SaleOrderLine(models.Model):
    def _timesheet_create_project_prepare_values(self):
        values = super(SaleOrderLine, self)._timesheet_create_project_prepare_values()
        if self.order_id and self.order_id.opportunity_id:
-            values["name"] = self.order_id.opportunity_id.name
-        return values
+            values['name'] = self.order_id.opportunity_id.name        
+        return values
--- a/project_name_from_quote/init.py
+++ b/project_name_from_quote/init.py
@@ -1 +1,2 @@
-from . import models
+
+from . import models
--- a/project_name_from_quote/manifest.py
+++ b/project_name_from_quote/manifest.py
@@ -33,4 +33,4 @@
    # and independently installed.  Used for synergetic or glue modules.
    "auto_install": False,
    "application": False,
-}
+}
--- a/project_name_from_quote/models/init.py
+++ b/project_name_from_quote/models/init.py
@@ -1 +1 @@
-from . import sale_order
+from . import sale_order
--- a/project_name_from_quote/models/sale_order.py
+++ b/project_name_from_quote/models/sale_order.py
@@ -8,4 +8,4 @@ class SaleOrderLine(models.Model):
    def _timesheet_create_project_prepare_values(self):
        values = super(SaleOrderLine, self)._timesheet_create_project_prepare_values()
        values["name"] = self.order_id.so_title
-        return values
+        return values
--- a/project_parent_task/manifest.py
+++ b/project_parent_task/manifest.py
@@ -83,4 +83,4 @@ This module is maintained by Elabore.
    # and independently installed.  Used for synergetic or glue modules.
    "auto_install": False,
    "application": False,
-}
+}
--- a/project_request_data/manifest.py
+++ b/project_request_data/manifest.py
@@ -89,4 +89,4 @@ This module is maintained by Elabore.
    # and independently installed.  Used for synergetic or glue modules.
    "auto_install": False,
    "application": False,
-}
+}
--- a/project_request_data/models/init.py
+++ b/project_request_data/models/init.py
@@ -1,3 +1,3 @@
 from . import task_service
 from . import request_type
-from . import project_task
+from . import project_task
--- a/project_request_data/models/project_task.py
+++ b/project_request_data/models/project_task.py
@@ -1,8 +1,9 @@
+
 from odoo import models, fields


 class Task(models.Model):
    _inherit = "project.task"

-    service_id = fields.Many2one("task.service", string="Service")
-    request_type_id = fields.Many2one("request.type", string="Request Type")
+    service_id = fields.Many2one('task.service', string='Service')
+    request_type_id = fields.Many2one('request.type', string='Request Type')
--- a/project_request_data/models/request_type.py
+++ b/project_request_data/models/request_type.py
@@ -5,5 +5,5 @@ class RequestType(models.Model):
    _name = "request.type"
    _description = "Request Type"

-    name = fields.Char("name", required=True)
-    sequence = fields.Integer()
+    name = fields.Char('name', required=True)
+    sequence = fields.Integer()
--- a/project_request_data/models/task_service.py
+++ b/project_request_data/models/task_service.py
@@ -5,5 +5,5 @@ class TaskService(models.Model):
    _name = "task.service"
    _description = "Task service"

-    name = fields.Char("name", required=True)
-    sequence = fields.Integer()
+    name = fields.Char('name', required=True)
+    sequence = fields.Integer()
--- a/project_task_billable_hours/manifest.py
+++ b/project_task_billable_hours/manifest.py
@@ -11,9 +11,13 @@
    "category": "Tools",
    "summary": "In task kanban view, display remaining billable hours instead of remaining hours",
    "description": "",
-    "depends": ["project", "hr_timesheet", "project_working_time_task_portal"],
+    "depends": [
+        "project",
+        "hr_timesheet",
+        "project_working_time_task_portal"
+    ],
    "data": [
-        "views/project_task_views.xml",
+        "views/project_task_views.xml",        
    ],
    "installable": True,
    "application": False,
--- a/project_task_portal_form/manifest.py
+++ b/project_task_portal_form/manifest.py
@@ -83,4 +83,4 @@ This module is maintained by Elabore.
    # and independently installed.  Used for synergetic or glue modules.
    "auto_install": False,
    "application": False,
-}
+}
--- a/project_task_portal_form/controllers/init.py
+++ b/project_task_portal_form/controllers/init.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-

-from . import portal_task_creation
+from . import portal_task_creation
--- a/project_task_portal_form/controllers/portal_task_creation.py
+++ b/project_task_portal_form/controllers/portal_task_creation.py
@@ -11,9 +11,9 @@ class PortalTaskCreation(CustomerPortal):
        "name",
        "service_id",
        "request_type_id",
-        "small_description",  # not in v14
-        "access",  # not in v14
-        "bug_report",  # not in v14
+        "small_description", #not in v14
+        "access", #not in v14
+        "bug_report", #not in v14
        "priority",
    ]

@@ -26,16 +26,24 @@ class PortalTaskCreation(CustomerPortal):
            "partner": partner,
        }
        return self._get_page_view_values(
-            partner, access_token, values, "my_task_creation_history", False, **kwargs
+            partner,
+            access_token,
+            values,
+            "my_task_creation_history",
+            False,
+            **kwargs
        )

    def _get_task_priorities(self):
        priorities = []
-        for id, name in request.env["project.task"]._fields["priority"].selection:
-            value = {"id": id, "name": name}
+        for id, name in request.env['project.task']._fields['priority'].selection:
+            value = {
+                "id": id,
+                "name": name
+            }
            priorities.append(value)
        return priorities
-
+    
    @http.route(
        ["/task/form"],
        type="http",
@@ -43,9 +51,7 @@ class PortalTaskCreation(CustomerPortal):
        website=True,
    )
    def portal_task_creation(self, access_token=None, redirect=None, **kw):
-        values = self._taskform_get_page_view_values(
-            request.env.user.partner_id, access_token, **kw
-        )
+        values = self._taskform_get_page_view_values(request.env.user.partner_id, access_token, **kw)
        request_types = request.env["request.type"].sudo().search([])
        task_services = request.env["task.service"].sudo().search([])
        priorities = self._get_task_priorities()
@@ -60,9 +66,7 @@ class PortalTaskCreation(CustomerPortal):
                "error_message": error_message,
            }
        )
-        return request.render(
-            "project_task_portal_form.portal_task_creation_form", values
-        )
+        return request.render("project_task_portal_form.portal_task_creation_form", values)

    def _compute_form_data(self, data):
        values = {}
@@ -74,23 +78,17 @@ class PortalTaskCreation(CustomerPortal):
                values[field] = data.pop(field)
        description = ""
        if values.get("small_description", False):
-            description = (
-                description + "<b>DESCRIPTION:</b><br/>" + values["small_description"]
-            )
-            del values["small_description"]
+            description = description + "<b>DESCRIPTION:</b><br/>" + values["small_description"] 
+            del values['small_description']
        if values.get("access", False):
-            description = (
-                description + "<br/><br/><b>ACCESS:</b><br/>" + values["access"]
-            )
-            del values["access"]
+            description = description + "<br/><br/><b>ACCESS:</b><br/>" + values["access"] 
+            del values['access']
        if values.get("bug_report", False):
-            description = (
-                description + "<br/><br/><b>BUG REPORT:</b><br/>" + values["bug_report"]
-            )
-            del values["bug_report"]
+            description = description + "<br/><br/><b>BUG REPORT:</b><br/>" + values["bug_report"]
+            del values['bug_report']        

        values["description"] = description
-        values["attachments"] = request.httprequest.files.getlist("attachment")
+        values["attachments"] = request.httprequest.files.getlist("attachment")        

        return values

@@ -98,7 +96,7 @@ class PortalTaskCreation(CustomerPortal):
        ["/task/create"],
        type="http",
        auth="public",
-        methods=["POST"],
+        methods=['POST'],
        website=True,
    )
    def create_task(self, **kwargs):
@@ -109,21 +107,21 @@ class PortalTaskCreation(CustomerPortal):
        values["partner_id"] = user.partner_id.id
        values["user_ids"] = [(6, 0, [user.id])]

+
+
        files = values.get("attachments", False)
-        del values["attachments"]
+        del values['attachments']      

        # Create task
-        task_id = (
-            request.env["project.task"].sudo().create(values)
-        )  # use sudo to avoid access error on resource calendar when user_id is set
+        task_id = request.env["project.task"].sudo().create(values) #use sudo to avoid access error on resource calendar when user_id is set

        # Add attachments
        for file in files:
            attachment_value = {
-                "name": file.filename,
-                "datas": base64.encodestring(file.read()),
-                "res_model": "project.task",
-                "res_id": task_id,
-            }
-            request.env["ir.attachment"].sudo().create(attachment_value)
+                    'name': file.filename,
+                    'datas': base64.encodestring(file.read()),                    
+                    'res_model': "project.task",
+                    'res_id': task_id,
+                }
+            request.env['ir.attachment'].sudo().create(attachment_value)
        return request.render("project_task_portal_form.portal_task_created", {})
--- a/project_timebox/manifest.py
+++ b/project_timebox/manifest.py
@@ -90,4 +90,4 @@ This module is maintained by Elabore.
    # and independently installed.  Used for synergetic or glue modules.
    "auto_install": False,
    "application": False,
-}
+}
--- a/project_timebox/models/init.py
+++ b/project_timebox/models/init.py
@@ -1,2 +1,2 @@
 from . import timebox
-from . import project_task
+from . import project_task
--- a/project_timebox/models/project_task.py
+++ b/project_timebox/models/project_task.py
@@ -1,8 +1,9 @@
+
 from odoo import models, fields


 class Task(models.Model):
    _inherit = "project.task"

-    timebox_min_id = fields.Many2one("timebox", string="Timebox Min")
-    timebox_max_id = fields.Many2one("timebox", string="Timebox Max")
+    timebox_min_id = fields.Many2one('timebox', string='Timebox Min')
+    timebox_max_id = fields.Many2one('timebox', string='Timebox Max')
--- a/project_timebox/models/timebox.py
+++ b/project_timebox/models/timebox.py
@@ -5,5 +5,5 @@ class Task(models.Model):
    _name = "timebox"
    _description = "Timebox"

-    name = fields.Char("name", required=True)
-    sequence = fields.Integer()
+    name = fields.Char('name', required=True)
+    sequence = fields.Integer()
--- a/project_usability_misc/init.py
+++ b/project_usability_misc/init.py
@@ -1 +1 @@
-# Empty __init__.py file for the project_usability_misc module.
+# Empty __init__.py file for the project_usability_misc module.
--- a/project_user_default_project/manifest.py
+++ b/project_user_default_project/manifest.py
@@ -62,8 +62,7 @@ This module is maintained by Elabore.
 """,
    # any module necessary for this one to work correctly
    "depends": [
-        "base",
-        "project",
+        "base", "project",
    ],
    "qweb": [
        # "static/src/xml/*.xml",
@@ -84,4 +83,4 @@ This module is maintained by Elabore.
    # and independently installed.  Used for synergetic or glue modules.
    "auto_install": False,
    "application": False,
-}
+}
--- a/project_user_default_project/models/init.py
+++ b/project_user_default_project/models/init.py
@@ -1 +1 @@
-from . import res_users
+from . import res_users
--- a/project_user_default_project/models/res_users.py
+++ b/project_user_default_project/models/res_users.py
@@ -1,7 +1,6 @@
 from odoo import _, api, fields, models

-
 class Users(models.Model):
    _inherit = "res.users"

-    default_project_id = fields.Many2one("project.project", string="Default Project")
+    default_project_id = fields.Many2one('project.project', string='Default Project')
--- a/project_working_time_task_portal/init.py
+++ b/project_working_time_task_portal/init.py
@@ -1 +1 @@
-from . import models
+from . import models
--- a/project_working_time_task_portal/manifest.py
+++ b/project_working_time_task_portal/manifest.py
@@ -25,7 +25,7 @@
    "data": [
        "views/hr_timesheet_portal.xml",
        "views/hr_timesheet_view_task_form2.xml",
-        "views/portal_tasks_list.xml",
+        "views/portal_tasks_list.xml"
    ],
    "assets": {
        "web.assets_frontend": [
--- a/project_working_time_task_portal/i18n/fr.po
+++ b/project_working_time_task_portal/i18n/fr.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 16.0\n"
+"Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-07-08 13:43+0000\n"
-"PO-Revision-Date: 2025-07-08 15:45+0200\n"
+"POT-Creation-Date: 2023-12-04 09:37+0000\n"
+"PO-Revision-Date: 2023-12-04 09:37+0000\n"
 "Last-Translator: \n"
 "Language-Team: \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>"

 #. module: project_working_time_task_portal
-#: model:ir.model,name:project_working_time_task_portal.model_account_analytic_line
-msgid "Analytic Line"
-msgstr "Ligne analytique"
+#: 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_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
 #: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
@@ -47,25 +62,9 @@ msgid "Billable Effective Hours"
 msgstr "Heures passées 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: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"
+#: model:ir.model.fields,field_description:project_working_time_task_portal.field_project_task__subtask_billable_effective_hours
+msgid "Subtask Billable Effective Hours"
+msgstr "Heures passées facturables Sous-tâches"

 #. module: project_working_time_task_portal
 #: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
@@ -76,43 +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_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
 msgid "Non Billable Effective Hours"
-msgstr "Heures passées non facturables"
-
-#. 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:ir.model.fields,field_description:project_working_time_task_portal.field_project_task__subtask_billable_effective_hours
-msgid "Subtask Billable Effective Hours"
-msgstr "Heures passées facturables Sous-tâches"
-
-#. 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 Effective 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_effective_hours
-#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
-msgid "Total Billable Effective 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 ""
+msgstr "Heures passées non facturables"
--- a/project_working_time_task_portal/models/init.py
+++ b/project_working_time_task_portal/models/init.py
@@ -1 +1 @@
-from . import project_task, account_analytic_line
+from . import billable_time, account_analytic_line
--- a/project_working_time_task_portal/models/account_analytic_line.py
+++ b/project_working_time_task_portal/models/account_analytic_line.py
@@ -5,10 +5,9 @@
 from odoo import models
 from odoo.osv import expression

-
 class AccountAnalyticLine(models.Model):
-    _inherit = "account.analytic.line"
+    _inherit = 'account.analytic.line'

    def _timesheet_get_portal_domain(self):
        domain = super()._timesheet_get_portal_domain()
-        return expression.AND([domain, [("exclude_from_sale_order", "=", False)]])
+        return expression.AND([domain, [('exclude_from_sale_order', '=', False)]])
--- a/project_working_time_task_portal/models/billable_time.py
+++ b/project_working_time_task_portal/models/billable_time.py
@@ -0,0 +1,87 @@
+from odoo import models, fields, api, _
+from odoo.tools.float_utils import float_compare
+
+
+class Task(models.Model):
+    _inherit = "project.task"
+
+    billable_effective_hours = fields.Float(
+        compute="_compute_billable_effective_hours",
+        string="Billable Effective Hours",
+        store=True,
+        compute_sudo=True,
+    )
+
+    non_billable_effective_hours = fields.Float(
+        compute="_compute_non_billable_effective_hours",
+        string="Non Billable Effective Hours",
+        store=True,
+    )
+
+    billable_remaining_hours = fields.Float(
+        compute="_compute_billable_remaining_hours",
+        string="Billable Remaining Hours",
+        store=True,
+        help="Total Billable remaining time (without exclude_from_sale_order timesheet lines), can be re-estimated periodically by the assignee of the task."
+    )
+
+    billable_progress = fields.Float(
+        compute="_compute_billable_progress_hours",
+        string="Billable Progress",
+        store=True,
+        group_operator="avg",
+    )
+
+    subtask_billable_effective_hours = fields.Float(
+        compute="_compute_subtask_billable_effective_hours",
+        string="Subtask Billable Effective Hours",
+        store=True,
+        compute_sudo=True,
+        recursive=True,
+    )
+
+    @api.depends('timesheet_ids.unit_amount')
+    def _compute_billable_effective_hours(self):
+        if not any(self._ids):
+            for task in self:
+                filtered_timesheets = task.timesheet_ids.filtered(lambda t: not t.exclude_from_sale_order)
+                task.billable_effective_hours = sum(filtered_timesheets.mapped('unit_amount'))
+            return
+      
+        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
+            ['unit_amount', 'task_id'], 
+            ['task_id']
+        )
+
+        timesheets_per_task = {res['task_id'][0]: res['unit_amount'] for res in timesheet_read_group}
+        for task in self:
+            task.billable_effective_hours = timesheets_per_task.get(task.id, 0.0)
+
+    @api.depends('effective_hours','billable_effective_hours')
+    def _compute_non_billable_effective_hours(self):
+        for task in self:
+            task.non_billable_effective_hours = task.effective_hours - task.billable_effective_hours
+
+    @api.depends('billable_effective_hours', 'subtask_billable_effective_hours', 'planned_hours')
+    def _compute_billable_remaining_hours(self):
+        for task in self:
+            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')
+    def _compute_subtask_billable_effective_hours(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)
+
+    @api.depends('billable_effective_hours', 'subtask_billable_effective_hours', 'planned_hours')
+    def _compute_billable_progress_hours(self):
+        for task in self:
+            if (task.planned_hours > 0.0):
+                task_total_hours = task.billable_effective_hours + task.subtask_billable_effective_hours
+                if float_compare(task_total_hours, task.planned_hours, precision_digits=2) >= 0:
+                    task.billable_progress = 100
+                else:
+                    task.billable_progress = round(100.0 * task_total_hours / task.planned_hours, 2)
+            else:
+                task.billable_progress = 0.0
--- a/project_working_time_task_portal/models/project_task.py
+++ b/project_working_time_task_portal/models/project_task.py
@@ -1,136 +0,0 @@
-from odoo import api, fields, models
-from odoo.tools.float_utils import float_compare
-
-
-class Task(models.Model):
-    _inherit = "project.task"
-
-    billable_effective_hours = fields.Float(
-        compute="_compute_billable_effective_hours",
-        string="Billable Effective Hours",
-        store=True,
-        compute_sudo=True,
-    )
-
-    non_billable_effective_hours = fields.Float(
-        compute="_compute_non_billable_effective_hours",
-        string="Non Billable Effective Hours",
-        store=True,
-    )
-
-    billable_remaining_hours = fields.Float(
-        compute="_compute_billable_remaining_hours",
-        string="Billable Remaining Hours",
-        store=True,
-        help="Total Billable remaining time (without exclude_from_sale_order timesheet lines), can be re-estimated periodically by the assignee of the task.",
-    )
-
-    billable_progress = fields.Float(
-        compute="_compute_billable_progress_hours",
-        string="Billable Progress",
-        store=True,
-        group_operator="avg",
-    )
-
-    subtask_billable_effective_hours = fields.Float(
-        compute="_compute_subtask_billable_effective_hours",
-        string="Subtask Billable Effective Hours",
-        store=True,
-        compute_sudo=True,
-        recursive=True,
-    )
-
-    total_billable_effective_hours = fields.Float(
-        compute="_compute_total_billable_effective_hours",
-        string="Total Billable Effective Hours",
-        store=True,
-        compute_sudo=True,
-    )
-
-    @api.depends("timesheet_ids.unit_amount")
-    def _compute_billable_effective_hours(self):
-        if not any(self._ids):
-            for task in self:
-                filtered_timesheets = task.timesheet_ids.filtered(
-                    lambda t: not t.exclude_from_sale_order
-                )
-                task.billable_effective_hours = sum(
-                    filtered_timesheets.mapped("unit_amount")
-                )
-            return
-
-        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
-            ["unit_amount", "task_id"],
-            ["task_id"],
-        )
-
-        timesheets_per_task = {
-            res["task_id"][0]: res["unit_amount"] for res in timesheet_read_group
-        }
-        for task in self:
-            task.billable_effective_hours = timesheets_per_task.get(task.id, 0.0)
-
-    @api.depends("effective_hours", "billable_effective_hours")
-    def _compute_non_billable_effective_hours(self):
-        for task in self:
-            task.non_billable_effective_hours = (
-                task.effective_hours - task.billable_effective_hours
-            )
-
-    @api.depends(
-        "billable_effective_hours", "subtask_billable_effective_hours", "planned_hours"
-    )
-    def _compute_billable_remaining_hours(self):
-        for task in self:
-            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",
-    )
-    def _compute_subtask_billable_effective_hours(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
-            )
-
-    @api.depends(
-        "billable_effective_hours", "subtask_billable_effective_hours", "planned_hours"
-    )
-    def _compute_billable_progress_hours(self):
-        for task in self:
-            if task.planned_hours > 0.0:
-                task_total_hours = (
-                    task.billable_effective_hours
-                    + task.subtask_billable_effective_hours
-                )
-                if (
-                    float_compare(
-                        task_total_hours, task.planned_hours, precision_digits=2
-                    )
-                    >= 0
-                ):
-                    task.billable_progress = 100
-                else:
-                    task.billable_progress = round(
-                        100.0 * task_total_hours / task.planned_hours, 2
-                    )
-            else:
-                task.billable_progress = 0.0
-
-    @api.depends("billable_effective_hours", "subtask_billable_effective_hours")
-    def _compute_total_billable_effective_hours(self):
-        for task in self:
-            task.total_billable_effective_hours = (
-                task.billable_effective_hours + task.subtask_billable_effective_hours
-            )
--- a/project_working_time_task_portal/views/hr_timesheet_view_task_form2.xml
+++ b/project_working_time_task_portal/views/hr_timesheet_view_task_form2.xml
@@ -19,13 +19,6 @@
                </span>
                <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='total_hours_spent']" position="after">
-	      <span>
-                    <label class="font-weight-bold" for="total_billable_effective_hours" string="Total Billable Effective Hours" attrs="{'invisible': ['|', ('planned_hours', '=', 0.0), ('encode_uom_in_days', '=', True)]}"/>
-                    <label class="font-weight-bold" for="total_billable_effective_hours" string="Total Billable Effective Days" attrs="{'invisible': ['|', ('planned_hours', '=', 0.0), ('encode_uom_in_days', '=', False)]}"/>
-                </span>
-                <field name="total_billable_effective_hours" widget="timesheet_uom" class="oe_subtotal_footer_separator" attrs="{'invisible' : [('planned_hours', '=', 0.0)]}" nolabel="1"/>
-	    </xpath>
            <xpath expr="//field[@name='remaining_hours']" position="after">
                <span>
                    <label class="font-weight-bold" for="billable_remaining_hours" string="Billable Remaining Hours" attrs="{'invisible': ['|', ('planned_hours', '=', 0.0), ('encode_uom_in_days', '=', True)]}"/>
@@ -36,4 +29,4 @@
        </field>
    </record>

-</odoo>
+</odoo>