[IMP] project_working_time_task_portal : recompute billable and non billable effective hours when timesheets exclude_from_sale_order is modified

.gitea/scripts/odoo-tests.sh

@@ -1,42 +0,0 @@
-#!/bin/bash
-#
-# Run the Python tests of the given Odoo modules.
-#
-# This script is meant to be executed *inside* an Elabore doodba image
-# (docker.0k.io/mirror/odoo:rc_<version>-ELABORE-LIGHT), with a
-# PostgreSQL service reachable at $PGHOST. The modules under test are
-# read from the current working directory (the checked-out repository),
-# which is prepended to the addons path so that the PR's code takes
-# precedence over the modules already baked in the image.
-#
-# Usage: odoo-tests.sh <module1,module2,...>
-
-set -euo pipefail
-
-modules="${1:?usage: odoo-tests.sh <module1,module2,...>}"
-
-export PGHOST=postgres
-export PGUSER=odoo
-export PGPASSWORD=odoopassword
-export PGDATABASE="test_$(basename "$PWD" | tr '.-' '__')"
-export WITHOUT_DEMO=all
-export DB_FILTER='.*'
-
-# Generate /opt/odoo/auto/odoo.conf from the environment and wait for
-# the database to accept connections.
-/opt/odoo/common/entrypoint
-
-# Odoo test-tags format: "/module1,/module2" (one leading slash).
-tags="/$(echo "$modules" | tr ',' ',/')"
-
-exec odoo \
-    --config=/opt/odoo/auto/odoo.conf \
-    --max-cron-threads=0 \
-    --limit-time-real=10000 \
-    --workers=0 \
-    --test-enable \
-    --stop-after-init \
-    --addons-path="$PWD,/opt/odoo/auto/addons" \
-    -d "$PGDATABASE" \
-    -i "$modules" \
-    --test-tags "$tags"

.gitea/workflows/pre-commit.yml

@@ -2,6 +2,8 @@ name: pre-commit
 
 on:
   pull_request:
+    branches:
+      - "16.0*"
 
 jobs:
   pre-commit:
@@ -13,10 +15,10 @@ jobs:
           python-version: "3.11"
       - name: Get python version
         run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
-      - uses: https://gitea.com/actions/cache@v3
+      # - uses: actions/cache@v4
-        with:
+      #   with:
-          path: ~/.cache/pre-commit
+      #     path: ~/.cache/pre-commit
-          key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
+      #     key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
       - name: Install pre-commit
         run: pip install pre-commit
       - name: Run pre-commit

.gitea/workflows/test.yml

@@ -1,79 +0,0 @@
-name: tests
-
-on:
-  pull_request:
-    branches:
-      - "16.0*"
-  workflow_dispatch:
-
-jobs:
-  test:
-    runs-on: odoo-ci
-    container:
-      image: docker.0k.io/mirror/odoo:rc_16.0-ELABORE-LIGHT
-    services:
-      postgres:
-        image: docker.0k.io/postgres:17.2.0-myc
-        env:
-          POSTGRES_USER: odoo
-          POSTGRES_PASSWORD: odoopassword
-          POSTGRES_DB: postgres
-    steps:
-      # The doodba image ships no Node.js, so actions/checkout@v4 cannot
-      # run here. The repository is private, so the job token is required.
-      - name: Checkout
-        env:
-          SECRET_GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
-          SECRET_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          set -eu
-          token="${GITEA_TOKEN:-${GITHUB_TOKEN:-${SECRET_GITEA_TOKEN:-${SECRET_GITHUB_TOKEN:-}}}}"
-          if [ -z "$token" ]; then
-            echo "::error::No job token available to clone the repository"
-            exit 1
-          fi
-          server="${GITHUB_SERVER_URL:-https://git.elabore.coop}"
-          repo="${GITHUB_REPOSITORY:?GITHUB_REPOSITORY is not set}"
-          ref="${GITHUB_REF:-${GITHUB_SHA:?neither GITHUB_REF nor GITHUB_SHA is set}}"
-          auth_url="$(printf '%s' "${server%/}/${repo}.git" |
-            sed -E "s#^https://#https://${token}@#")"
-          git init -q .
-          git config --global --add safe.directory "$PWD"
-          git remote add origin "$auth_url"
-          git fetch -q --depth=1 origin "$ref"
-          git checkout -q FETCH_HEAD
-
-      - name: Detect changed modules
-        id: changed
-        run: |
-          set -eu
-          if [ -n "${GITHUB_BASE_REF:-}" ]; then
-            git fetch -q --depth=1 origin "refs/heads/$GITHUB_BASE_REF"
-            base_rev="FETCH_HEAD"
-            scope="diff against $GITHUB_BASE_REF"
-          else
-            base_rev=""
-            scope="all installable modules (manual run)"
-          fi
-          if [ -n "$base_rev" ]; then
-            modules="$(
-              git diff --name-only "$base_rev" HEAD |
-                awk -F/ '{print $1}' | sort -u |
-                while read -r dir; do
-                  [ -f "$dir/__manifest__.py" ] && echo "$dir"
-                done | paste -sd, -
-            )"
-          else
-            modules="$(
-              for dir in */; do
-                dir="${dir%/}"
-                [ -f "$dir/__manifest__.py" ] && echo "$dir"
-              done | paste -sd, -
-            )"
-          fi
-          echo "modules=$modules" >> "$GITHUB_OUTPUT"
-          echo "Modules to test ($scope): ${modules:-<none>}"
-
-      - name: Run Odoo tests
-        if: steps.changed.outputs.modules != ''
-        run: bash .gitea/scripts/odoo-tests.sh "${{ steps.changed.outputs.modules }}"

.gitignore

@@ -1,88 +1,2 @@
-# Byte-compiled / optimized / DLL files
+*.*~
-__pycache__/
+*.pyc
-*.py[cod]
-/.venv
-/.pytest_cache
-/.ruff_cache
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-env/
-bin/
-build/
-develop-eggs/
-dist/
-eggs/
-lib64/
-parts/
-sdist/
-var/
-*.egg-info/
-.installed.cfg
-*.egg
-*.eggs
-
-# Windows installers
-*.msi
-
-# Debian packages
-*.deb
-
-# Redhat packages
-*.rpm
-
-# MacOS packages
-*.dmg
-*.pkg
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.coverage
-.cache
-nosetests.xml
-coverage.xml
-
-# Translations
-*.mo
-
-# Pycharm
-.idea
-
-# Eclipse
-.settings
-
-# Visual Studio cache/options directory
-.vs/
-.vscode
-
-# OSX Files
-.DS_Store
-
-# Django stuff:
-*.log
-
-# Mr Developer
-.mr.developer.cfg
-.project
-.pydevproject
-
-# Rope
-.ropeproject
-
-# Sphinx documentation
-docs/_build/
-
-# Backup files
-*~
-*.swp
-
-# OCA rules
-!static/lib/

.pre-commit-config.yaml

@@ -49,9 +49,12 @@ repos:
           $(git rev-parse --show-toplevel))"'
       - id: oca-gen-addon-readme
         entry:
-          bash -c 'oca-gen-addon-readme --addons-dir=. --branch=$(git symbolic-ref
+          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"
+          --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

project_working_time_task_portal/migrations/16.0.1.0.5/post-migration.py

@@ -5,3 +5,5 @@ def migrate(cr, version):
 
     tasks = env["project.task"].search([("stage_id.fold", "=", False)])
     tasks._compute_billable_effective_hours()
+
+    cr.commit()

project_working_time_task_portal/views/hr_timesheet_view_task_form2.xml

@@ -9,15 +9,15 @@
         <field name="arch" type="xml">
             <xpath expr="//field[@name='effective_hours']" position="after">
                 <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>
-                <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>
-                    <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>
-                <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>