WIP LNE

* Remove 'supplier_invoice' from old path array

* Update module path in arrayforoldpath

Sorry Eldy, I was confused. You are absolutely right, it is already corrected.

* Replace localtax2 assignment with get_localtax function


Error when creating an invoice with personal income tax from project times. The rate does not apply

* Refactor localtax1 calculation using get_localtax

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

.gitattributes

@@ -39,20 +39,20 @@
 
 
 # Export ignores to generate clean production tarballs
-/build              export-ignore
 /dev                export-ignore
 /doc                export-ignore
 /test               export-ignore
+/.github            export-ignore
+/.phan              export-ignore
+/.tx                export-ignore
 .buildpath          export-ignore
-/build.xml          export-ignore
 .codeclimate.yml    export-ignore
-Dockerfile          export-ignore
 .dockerignore       export-ignore
 .editorconfig       export-ignore
 .gitattributes      export-ignore
 .gitignore          export-ignore
 .mailmap            export-ignore
-.scrutinizer.yml    export-ignore
+.pre-commit-config.yaml export-ignore
 .settings           export-ignore
 .travis.yml         export-ignore
-.tx                 export-ignore
+Dockerfile          export-ignore

.github/CONTRIBUTING.md

@@ -136,9 +136,9 @@ If your PR is a change on interface, you must also paste a screenshot showing th
 
 #### Examples
 <pre>
-FIX|Fix #456 Short description (where #456 is number of bug fix, if it exists. In upper case to appear into ChangeLog)
+FIX|Fix #456 Short description (where #456 is number of bug fix, if an issue ID exists, or #xxx456 with xxx as the name of the VDP platform in lower case for security issues. The "Fix" must be in upper case to appear into ChangeLog)
 or
-CLOSE|Close #456 Short description (where #456 is number of feature request, if it exists. In upper case to appear into ChangeLog)
+CLOSE|Close #456 Short description (where #456 is number of feature request, if it exists. The "Close" must be in upper case to appear into ChangeLog)
 or
 NEW|New|QUAL|Qual|PERF|Perf Short description (In upper case to appear into ChangeLog, use this if you add a feature not tracked, otherwise use CLOSE #xxx)
 or

.github/workflows/ci-on-release.yml

@@ -0,0 +1,24 @@
+name: "CI-RELEASE"
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  trigger-docker:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Generate a token
+        id: generate-token
+        uses: actions/create-github-app-token@v2
+        with:
+          app-id: ${{ vars.RELEASE_DOCKER_ID }}
+          private-key: ${{ secrets.RELEASE_DOCKER_SECRET }}
+
+      - uses: peter-evans/repository-dispatch@v4
+        with:
+          token: ${{ steps.generate-token.outputs.token }}
+          repository: Dolibarr/dolibarr-docker
+          event-type: new-release
+          client-payload: '{"version": "${{ github.event.release.tag_name }}"}'

.github/workflows/ci-phpstan_baseline.yml

@@ -47,7 +47,7 @@ jobs:
       # Restore old cache
       - name: Restore phpstan cache
         id: cache
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         with:
           path: ./.github/tmp
           key: phpstan-cache-${{ env.PHP_VERSION }}-${{ env.CACHE_KEY_PART }}-${{

.github/workflows/phan.yml

@@ -13,7 +13,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: phan-${{ github.workflow }}-${{ github.ref }}
+  group: phan-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 env:
@@ -34,13 +34,33 @@ jobs:
       || github.event.schedule == false
     steps:
       - uses: actions/checkout@v6
+
+      # Another method to get the list of changed files
+      # It sets the variable steps.changed-php.outputs.all_changed_files for other steps
+      - name: Get all changed php files (if PR)
+        id: changed-php
+        if: env.gh_event == 'pull_request'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./.github/scripts/get_changed_php.sh
+
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: 8.2
           coverage: none # disable xdebug, pcov
-          tools: phan
+          tools: phan:5.5.2
+
       - name: Run Phan analysis
+        if: "! cancelled() && steps.changed-php.outputs.any_changed == 'true'"
+        env:
+          ALL_CHANGED_FILES: ${{ steps.changed-php.outputs.all_changed_files }}
+        # shellcheck disable=2086
         run: |
           # shellcheck disable=2086
-          phan $PHAN_QUICK -k "$PHAN_CONFIG" -B "$PHAN_BASELINE" --analyze-twice --minimum-target-php-version "$PHAN_MIN_PHP" --output-mode=github
+          > /tmp/phpstan-files.txt
+          for f in $ALL_CHANGED_FILES; do echo "$f" >> /tmp/phan-files.txt; done
+          cat /tmp/phan-files.txt
+          echo phan --file-list /tmp/phan-files.txt $PHAN_QUICK -k "$PHAN_CONFIG" -B "$PHAN_BASELINE" --analyze-twice --minimum-target-php-version "$PHAN_MIN_PHP" --output-mode=github
+          #echo phan $PHAN_QUICK -k "$PHAN_CONFIG" -B "$PHAN_BASELINE" --analyze-twice --minimum-target-php-version "$PHAN_MIN_PHP" --output-mode=github
+          phan --file-list /tmp/phan-files.txt $PHAN_QUICK -k "$PHAN_CONFIG" -B "$PHAN_BASELINE" --analyze-twice --minimum-target-php-version "$PHAN_MIN_PHP" --output-mode=github

.github/workflows/phpstan.yml

@@ -52,7 +52,7 @@ jobs:
       # Restore old cache
       - name: Restore phpstan cache
         id: cache
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         with:
           path: ./.github/tmp
           key: phpstan-cache-${{ matrix.php-version }}-${{ env.CACHE_KEY_PART }}-${{
@@ -62,31 +62,61 @@ jobs:
             phpstan-cache-${{ matrix.php-version }}-${{ github.head_ref }}-
             phpstan-cache-${{ matrix.php-version }}-${{ github.base_ref }}-
             phpstan-cache-${{ matrix.php-version }}-
+
       - name: Show debug into
         run: cd ./.github/tmp && ls -al
 
+      # Another method to get the list of changed files
+      # It sets the variable steps.changed-php.outputs.all_changed_files for other steps
+      - name: Get all changed php files (if PR)
+        id: changed-php
+        if: env.gh_event == 'pull_request'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./.github/scripts/get_changed_php.sh
+
+      #- name: Get changed PHP files
+      #  id: files
+      #  run: |
+      #    git fetch origin ${{ github.base_ref }}
+      #    FILES=$(git diff --name-only "origin/${{ github.base_ref }}...HEAD" | grep '\.php$' || true)
+      #    {
+      #      echo "files<<EOF"
+      #      echo "$FILES"
+      #      echo "EOF"
+      #    } > "$GITHUB_OUTPUT"
+
       # Run PHPStan
       - name: Run PHPStan
         id: phpstan
+        if: "! cancelled() && steps.changed-php.outputs.any_changed == 'true'"
+        env:
+          ALL_CHANGED_FILES: ${{ steps.changed-php.outputs.all_changed_files }}
+        # shellcheck disable=2086
         run: |
-          phpstan -vvv analyse --error-format=checkstyle --memory-limit 7G -a dev/build/phpstan/bootstrap_action.php | tee _stan.xml | cs2pr --graceful-warnings
+          # shellcheck disable=2086
+          > /tmp/phpstan-files.txt
+          echo "$ALL_CHANGED_FILES" >> /tmp/phpstan-files.txt
+          cat /tmp/phpstan-files.txt
+          phpstan -vvv analyse --error-format=checkstyle --memory-limit 7G -a dev/build/phpstan/bootstrap_action.php ${ALL_CHANGED_FILES} | tee _stan.xml | cs2pr --graceful-warnings
         # continue-on-error: true
 
       # Save cache
       - name: Save phpstan cache
-        uses: actions/cache/save@v4
+        uses: actions/cache/save@v5
         if: ${{ success() || ( ! cancelled() && steps.cache.outputs.cache-hit != 'true' ) }}
         with:
           path: ./.github/tmp
           key: phpstan-cache-${{ matrix.php-version }}-${{ env.CACHE_KEY_PART }}-${{
             github.run_id }}
       - name: Provide phpstan log as artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         if: ${{ always() }}
         with:
           name: phpstan-srcrt
           path: ${{ github.workspace }}/_stan.xml
           retention-days: 2
+
       # Run PHPStan generate baseline
       # - name: Run PHPStan generate baseline
       #   id: phpstan-baseline

.github/workflows/pre-commit.yml

@@ -12,8 +12,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: pre-commit-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref
-    }}
+  group: pre-commit-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 env:
   gh_event: ${{ inputs.gh_event || github.event_name }}
@@ -75,7 +74,7 @@ jobs:
       - run: python -m pip install pre-commit
 
       # Restore previous cache of precommit
-      - uses: actions/cache/restore@v4
+      - uses: actions/cache/restore@v5
         with:
           path: ~/.cache/pre-commit/
           key: pre-commit-4|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
@@ -110,15 +109,15 @@ jobs:
           tools: phpcs
 
       # Install perltidy and perlcritic
-      - name: Install perltidy and perlcritic
-        run: sudo apt-get update && sudo apt-get install -y perltidy libperl-critic-perl
+      #- name: Install perltidy and perlcritic
+      #  run: sudo apt-get update && sudo apt-get install -y perltidy libperl-critic-perl
 
       # Run all the precommit tools (defined into pre-commit-config.yaml).
       # We can force exclusion of some of them here.
       - name: Run pre-commit hooks
         env:
           # SKIP is used by pre-commit to not execute certain hooks
-          SKIP: no-commit-to-branch,php-cs,php-cbf,trailing-whitespace,end-of-file-fixer
+          SKIP: no-commit-to-branch,php-cs,php-cbf,trailing-whitespace,end-of-file-fixer,shellcheck
         run: |
           set -o pipefail
           pre-commit gc
@@ -163,14 +162,14 @@ jobs:
           in: ${{ env.RAW_LOG }}
 
       # Save the precommit cache
-      - uses: actions/cache/save@v4
+      - uses: actions/cache/save@v5
         if: ${{ ! cancelled() }}
         with:
           path: ~/.cache/pre-commit/
           key: pre-commit-4|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
       # Upload result log files of precommit into the Artifact shared store
       - name: Provide log as artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         if: ${{ ! cancelled() }}
         with:
           name: precommit-logs

.github/workflows/windows-ci.yml

@@ -57,7 +57,7 @@ jobs:
       # Restore cache
       - name: Restore cache
         id: cache
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         env:
           HASH: ${{ hashFiles('htdocs/install/**', 'htdocs/filefunc.inc.php', 'htdocs/version.inc.php') }}
           KEY_ROOT: ${{ matrix.os }}-${{ env.ckey }}-${{ matrix.php_version }}
@@ -173,7 +173,7 @@ jobs:
           in: ${{ env.PHPUNIT_LOG }}
 
       - name: Provide dolibarr and phpunit logs as artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         if: ${{ ! cancelled() }}
         with:
           name: win-ci-logs
@@ -187,7 +187,7 @@ jobs:
 
       # Save cache
       - name: Save cache
-        uses: actions/cache/save@v4
+        uses: actions/cache/save@v5
         if: ${{ ! cancelled() }}
         with:
           # See https://github.com/actions/cache/issues/1275#issuecomment-1925217178

.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 ---
-exclude: (?x)^( htdocs/includes/ckeditor/.*|(\.(?!github/workflows)[^/]*/.*))$
+exclude: (?x)^( htdocs/includes/ckeditor/.*|htdocs/public/includes/ckeditor/.*|htdocs/public/includes/jquery/.*|(\.(?!github/workflows)[^/]*/.*))$
 repos:
   # Several miscellaneous checks and fix (on yaml files, end of files fix)
   - repo: https://github.com/pre-commit/pre-commit-hooks
@@ -65,10 +65,10 @@ repos:
       - id: gitleaks
 
   # Check github actions
-  - repo: https://github.com/rhysd/actionlint
-    rev: v1.7.8
-    hooks:
-      - id: actionlint
+  #- repo: https://github.com/rhysd/actionlint
+  #  rev: v1.7.8
+  #  hooks:
+  #    - id: actionlint
 
   # Beautify shell scripts
   - repo: https://github.com/lovesegfault/beautysh.git
@@ -245,11 +245,11 @@ repos:
           - ned
 
   # Check some shell scripts
-  - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.11.0.1
-    hooks:
-      - id: shellcheck
-        args: [-W, "100"]
+  #- repo: https://github.com/shellcheck-py/shellcheck-py
+  #  rev: v0.11.0.1
+  #  hooks:
+  #    - id: shellcheck
+  #      args: [-W, "100"]
 
   # Check sql file syntax
   - repo: https://github.com/sqlfluff/sqlfluff
@@ -275,20 +275,21 @@ repos:
           |htdocs/modulebuilder/template/sql/.*\.sql
           )$
 
-  - repo: https://github.com/perltidy/perltidy
-    rev: '20250105.03'
-    hooks:
-      - id: perltidy
-        # virtualmin excuded - reason https://github.com/Dolibarr/dolibarr/pull/36370#issuecomment-3565101823
-        exclude: (?x)^
-          (dev/build/perl/virtualmin/dolibarr.pl
-          )$
-        args: [ --tabs, --nola ]
-  - repo: https://github.com/henryykt/pre-commit-perl
-    rev: v0.0.5
-    hooks:
-      - id: perlcritic
-        # virtualmin excuded - reason https://github.com/Dolibarr/dolibarr/pull/36370#issuecomment-3565101823
-        exclude: (?x)^
-          (dev/build/perl/virtualmin/dolibarr.pl
-          )$
+  #- repo: https://github.com/perltidy/perltidy
+  #  rev: '20250105.03'
+  #  hooks:
+  #    - id: perltidy
+  #      # virtualmin excuded - reason https://github.com/Dolibarr/dolibarr/pull/36370#issuecomment-3565101823
+  #      exclude: (?x)^
+  #        (dev/build/perl/virtualmin/dolibarr.pl
+  #        )$
+  #      args: [ --tabs, --nola ]
+
+  #- repo: https://github.com/henryykt/pre-commit-perl
+  #  rev: v0.0.5
+  #  hooks:
+  #    - id: perlcritic
+  #      # virtualmin excluded - reason https://github.com/Dolibarr/dolibarr/pull/36370#issuecomment-3565101823
+  #      exclude: (?x)^
+  #        (dev/build/perl/virtualmin/dolibarr.pl
+  #        )$

.travis.yml

@@ -531,13 +531,16 @@ script:
     php upgrade.php 22.0.0 23.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade22002300.log || cat $TRAVIS_BUILD_DIR/upgrade22002300.log
     php upgrade2.php 22.0.0 23.0.0 > $TRAVIS_BUILD_DIR/upgrade22002300-2.log || cat $TRAVIS_BUILD_DIR/upgrade22002300-2.log
     php step5.php 22.0.0 23.0.0 > $TRAVIS_BUILD_DIR/upgrade22002300-3.log || cat $TRAVIS_BUILD_DIR/upgrade22002300-3.log
+    php upgrade.php 23.0.0 24.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade23002400.log || cat $TRAVIS_BUILD_DIR/upgrade23002400.log
+    php upgrade2.php 23.0.0 24.0.0 > $TRAVIS_BUILD_DIR/upgrade23002400-2.log || cat $TRAVIS_BUILD_DIR/upgrade23002400-2.log
+    php step5.php 23.0.0 24.0.0 > $TRAVIS_BUILD_DIR/upgrade23002400-3.log || cat $TRAVIS_BUILD_DIR/upgrade23002400-3.log
     set +e
     echo
 
   - |
-    echo Show some debug info like table content or log
-    #echo '\d llx_adherent' | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis'
-    cat $TRAVIS_BUILD_DIR/upgrade18001900.log
+    echo Show some debug info, like table content, or migration log from some versions
+    echo '\d llx_blockedlog' | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis'
+    cat $TRAVIS_BUILD_DIR/upgrade500600.log
     cat $TRAVIS_BUILD_DIR/upgrade19002000.log
     echo
 
@@ -557,6 +560,7 @@ script:
     php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_RECEPTION,MAIN_MODULE_RECRUITMENT >> $TRAVIS_BUILD_DIR/enablemodule.log
     php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_KnowledgeManagement,MAIN_MODULE_EventOrganization,MAIN_MODULE_PARTNERSHIP >> $TRAVIS_BUILD_DIR/enablemodule.log
     php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_EmailCollector >> $TRAVIS_BUILD_DIR/enablemodule.log
+    php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_BlockedLog >> $TRAVIS_BUILD_DIR/enablemodule.log
     echo $?
     cd -
     set +e
@@ -570,6 +574,8 @@ script:
     # Execute phpunit, check its exit status and that the phpunit output shows a test summary
     phpunit -d memory_limit=-1 -c test/phpunit/phpunittest.xml test/phpunit/AllTests.php | tee /dev/tty | grep -qE "(OK .*[0-9]+ tests.*[0-9]+ assertions|Tests: [0-9]+)" ; phpunitresult=$((PIPESTATUS[0]?PIPESTATUS[0]:PIPESTATUS[2]))
     echo "Phpunit return code = $phpunitresult"
+    echo "Content of end of apache error.log"
+    sudo tail -n 200 /var/log/apache2/travis_error_log
     # Comment next line if you want to go to the end to see the dolibarr.log file.
     [ $phpunitresult == 0 ] || exit $phpunitresult
     echo

ChangeLog

@@ -162,6 +162,7 @@ NEW: Add API for Holidays/Leaves
 NEW: add api for members statistics (#35851)
 NEW: add api List VAT (#35920)
 NEW: add api_paiements.class.php (#34756)
+NEW: document API builddoc product
 NEW: Add contact management on project Api (#35459)
 NEW: Add contact support on products in REST API (#35925)
 NEW: Add country ID resolution from country code for thirdparty api (#36345)
@@ -182,6 +183,7 @@ NEW: API User - Remove user from group (#35453)
 NEW: Implement listTimespent method in api_projects.class.php (#36093)
 NEW: qual fixes on api contract (#36066)
 NEW: stock API GET movement (#36193)
+NEW: action to clone ticket
 
 
 WARNING:
@@ -212,6 +214,85 @@ The following changes may create regressions for some external modules, but were
 * $conf use into "computed formulae" of etrafields is now deprecated (not yet forbidden). You can replace use of $conf->currency by the new method getCurrency() and $conf->global->xxx by getDolGlobalString('xxx').
 * $user->rights->module->perms is also deprecated. You can use $user->hasRight() instead.
 * The API endpoint /proposals/{id}/contact/{contactid}/{type}/{source} is now {id}/contact/{contactid}/{type} to match same behaviour than order and invoices.
+* The API endpoint /interventions/{id}/reopen hase been removed in favor of /interventions/{id}/settodraft
+* If the module geoipmaxmind is used, you must resubmit the geoip data file as it is now stored differently.
+
+
+***** ChangeLog for 22.0.4 compared to 22.0.3 *****
+FIX: $param is the 5th parameter of print_liste_field_titre ($moreparam) (#36250)
+FIX: 17.0: perweek.php resets task progress to 0% when: (#36401)
+FIX: 18.0: GETPOSTDATE and buildParamDate assumed HTTP param names 'minute' and 'second' instead of 'min' and 'sec'
+FIX: 19.0 - attachments upload dir for invoices not always determined correctly (doesn't always take multi-entity into account) (#36302)
+FIX: #33148 - partial payments are taken into account in EPC QR codes (#36338)
+FIX: #33899 API Timespent Service Field
+FIX: #35061
+FIX: #35096 #36393 Add minimal fields required asthe class is used by
+FIX: #35141 (#36390)
+FIX: #35375 Accountancy - SQL error on empty filter account category
+FIX: #35655 API Contract Creation Fails for Non-Admin Users in Version 22.0.2
+FIX: #36090 Accountancy - Inconsistent date on various journal
+FIX: #36149 (#36150)
+FIX: #36310 Accountancy - Data - Wrong account labels (cache) on write bookkeeping action (#36410)
+FIX: #36334 - reload invoice data before pdf-creation in process of generating a new member contribution (#36335)
+FIX: #36347 (#36358)
+FIX: #36368 - avoid overlaying of EPC-QR Code and payment information (#36369)
+FIX: #36576 - date creation is empty on import
+FIX: Accountancy - #36090 Inconsistent date on various journal
+FIX: Accountancy - No limit on chart of account to define category on account
+FIX: Accountancy - Not propose to write operation on draft asset
+FIX: Accountancy - Problem calculating exercises with different tax periods on fixed assets
+FIX: Accountancy - Problem calculating fiscal year with different periods on fixed assets
+FIX: Accountancy - Reverse accounting account in depreciation expense entries for fixed assets
+FIX: Accountancy - Verify fiscal year on last hour to enable the integration of asset entries
+FIX: allow a situation with credit to be removed from cycle
+FIX: API task getTimeSpent to actually return data
+FIX: avoid php warning error (#36330), avoid php warnings (#36301), (#36411)
+FIX: Can Validated Holidays When Negative Balance
+FIX: Concat of PDF to invoices (#36329)
+FIX: create API temp directory in Dolibarr API constructor
+FIX: DA027383: permissions not checked on HRM evaluation card (#36328) (#36399)
+FIX: do not force rowid to int (#36412)
+FIX: Email Collector Module: manage error when imap_fetchstructure return false. Previously it generated warning and fatal error because the returned value was not of type class
+FIX: empty origin type passed to addline when creating invoices from expeditions using massaction (confirm_createbills) (#36413)
+FIX: expense report card: do not show bank account if user cannot see them
+FIX: expense report card: use correct bank module designator for detection
+FIX: Export of extrafield in organized events
+FIX: fix #36401 (for v17.0) doesn't work in v18.0+ because of variable renaming
+FIX: | Fixing addPayment /invoices/id/payments
+FIX: getEntity use element instead table_element (#36405)
+FIX: Implementation of multi-company compatibility with inventory/warehouse management
+FIX: info on supplier payment card on v22 and payment link
+FIX: keep user who validate proposal on update (#36257)
+FIX: List is filtered on task status when it should not
+FIX: Missing AND on fields filter on evaluation class
+FIX: missing p.default_vat_code in product import profile.
+FIX: Missing Product ref in Bom stats
+FIX: Mo::deleteLine() - stock movement correction (#34733)
+FIX: Multicompany compatibility with "project_task"
+FIX: not remove value of others extra-fields on update extras action
+FIX: Object should be cloned here (#36289)
+FIX: PR#36401 fixed a missing GETPOSTISSET() but the check involves a variable ($taskid) that was renamed ($tmptaskid) in 18.0
+FIX: (propal): Incorrect HT/TTC recalculation when editing proposal lines #36514
+FIX: (propal): values lost when editing HT price
+FIX: propal shipping and availability update (v18+)
+FIX: re-create API temp dir after purging temp files
+FIX: remove situation invoice from cycle
+FIX: remove useless condition to create credit on situation invoice (#35786)
+FIX: Search all for supplier proposals via object reference
+FIX: Selection of email when prefilled from a template
+FIX: SQL error for LIST_OF_QUALIFIED_INVOICES_LIMIT_DEFINED
+FIX: subtotal feature button availability according setup
+FIX: TakePOS Missing Thirdparty Id when getting more products (#36341)
+FIX: (tasks): dates in gantt view
+FIX: undefined variables on create invoice card from order (backport from v19) or shipment card (backport from v20)
+FIX: use array_intersect instead in_array
+FIX: warning on select
+FIX: wrong $param parameter position (#36265)
+SEC: 7ed0af2a138a34e7c7005b95c85ffc791976a6cf
+SEC: empty commit for CI automata
+SEC: FIX: #36430 permissions not checked on other tabs of HRM evaluation card
+SEC: fix IDOR attack on employee evaluation. Missing permission test https://github.com/atm-florianm/dolibarr/commit/7ed0af2a138a34e7c7005b95c85ffc791976a6cf
+SEC: permissions not checked on other tabs of HRM evaluation card
 
 
 ***** ChangeLog for 22.0.3 compared to 22.0.2 *****

SECURITY.md

@@ -12,12 +12,12 @@ Security report are valid only on any current stable version for the last 5 majo
 
 To report a vulnerability, for a private report, you can:
 
-- Send your report on Vulnerability Disclosure Program (VDP): Link will be updated soon (recommended for everybody)
+- Send your report as an issue on https://github.com/Dolibarr/dolibarr/issues or on GitHub Vulnerability Disclosure Program tool (VDP): https://github.com/Dolibarr/dolibarr/security/advisories (recommended)
 <!--
 - Send your report on Vulnerability Disclosure Program (VDP) [https://app.yogosha.com/cvd/dolibarr/10VxeNx6Ui3rSEhAgX63US](https://app.yogosha.com/cvd/dolibarr/10VxeNx6Ui3rSEhAgX63US) (recommended for everybody)
 - Or if you have permissions, use GitHub security advisory at [https://github.com/Dolibarr/dolibarr/security/advisories/new](https://github.com/Dolibarr/dolibarr/security/advisories/new)
 -->
-- Or send an email to security@dolibarr.org with clear textual description of the report along with steps to reproduce the issue, include attachments such as screenshots or proof of concept code as necessary.
+- Or send an email to security@dolibarr.org with clear textual description of the report along with steps to reproduce the issue, include attachments such as screenshots or proof of concept code as necessary (in such a case, the issue may be created by the developer that will fix the vulnerability or the Release Manager).
 
 
 ## Hunting vulnerabilities on Dolibarr
@@ -114,3 +114,8 @@ Scope is the web application (backoffice) and the APIs.
 * Invalid or missing SPF (Sender Policy Framework) records (Incomplete or missing SPF/DKIM/DMARC)
 * Physical or social engineering attempts or issues that require physical access to a victim’s computer/device
 * Vulnerabilities of type XSS exploited by using javascript into a website page of the website module or by using php code into a website page (being able to set javascript or php code is the expected behaviour in the website module), except if the user does not have the permission to edit page or php code.
+
+
+## Be informed of a new vulnerability
+
+You can get more information on how to be informed on a new vulnerability on the page https://wiki.dolibarr.org/index.php/Security_information

dev/build/.gitignore

@@ -7,3 +7,4 @@
 /dolibarr-*.zip
 /*.exe
 /html
+/*.bak

dev/build/debian/README.howto

@@ -299,12 +299,12 @@ If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VER
 
 * Edit orig.tar.gz file to remove
 - debian
-- htdocs/includes/ckeditor
-- htdocs/includes/jquery/css
-- htdocs/includes/jquery/js
-- htdocs/includes/jquery/plugins/flot
-- htdocs/includes/jquery/plugins/multiselect
-- htdocs/includes/jquery/plugins/datatables
+- htdocs/public/includes/ckeditor
+- htdocs/public/includes/jquery/css
+- htdocs/public/includes/jquery/js
+- htdocs/public/includes/jquery/plugins/flot
+- htdocs/public/includes/jquery/plugins/multiselect
+- htdocs/public/includes/jquery/plugins/datatables
 - htdocs/includes/jszip
 - htdocs/includes/mike42
 - htdocs/includes/phpoffice

dev/build/debian/copyright

@@ -61,7 +61,7 @@ License: GPL-3+
 
 ------------------------------------------------------------
 
-Files: htdocs/includes/ckeditor/*
+Files: htdocs/public/includes/ckeditor/*
 Copyright: 2003-2012 CKSource - Frederico Knabben
 License: GPL-2+
  The ckeditor is triple licensed under the GNU General Public License (GPL),
@@ -190,7 +190,7 @@ License: CC-By-SA
 
 ------------------------------------------------------------
 
-Files: htdocs/includes/jquery/*
+Files: htdocs/public/includes/jquery/*
 Copyright: JQuery team
 https://www.jquery.com
 License: GPL-2+ or MIT

dev/build/debian/rules

@@ -97,10 +97,9 @@ override_dh_install:
 #	rm -fr htdocs/includes/nusoap
 #	rm -fr htdocs/includes/odtphp/zip/pclzip
 	# clean from all JS-CSS embedded libraries (we use package dependencies instead)
-#	rm -fr htdocs/includes/ckeditor
-#	rm -fr htdocs/includes/jquery/js
-#	rm -fr htdocs/includes/jquery/css
-#	rm -fr htdocs/includes/jquery/plugins/flot
+#	rm -fr htdocs/public/includes/ckeditor
+#	rm -fr htdocs/public/includes/jquery/js
+#	rm -fr htdocs/public/includes/jquery/css
 	# clean from all embedded fonts (we use package dependencies instead)
 #	rm -fr htdocs/includes/fonts
 

dev/build/debian/source/lintian-overrides

@@ -1,16 +1,16 @@
 # Remove warning, we want to keep both standard and minified sources.
-dolibarr: source-contains-prebuilt-javascript-object htdocs/includes/jquery/*
+dolibarr: source-contains-prebuilt-javascript-object htdocs/public/includes/jquery/*
 dolibarr: source-contains-prebuilt-javascript-object htdocs/includes/jsgantt/*
 dolibarr: source-contains-prebuilt-javascript-object htdocs/includes/jstz/*
 # Those are false positives, the files are their own sources since
 # they are not minified
-source-is-missing htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/*.js
-source-is-missing htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/*.js
-source-is-missing htdocs/includes/ckeditor/ckeditor/lang/*.js
-source-is-missing htdocs/includes/ckeditor/ckeditor/plugins/*/dialogs/*.js
-source-is-missing htdocs/includes/ckeditor/ckeditor/plugins/*/filter/*.js
-source-is-missing htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/default.js
-source-is-missing htdocs/includes/restler/framework/Luracast/Restler/explorer/lib/*.js
+source-is-missing htdocs/public/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/*.js
+source-is-missing htdocs/public/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/*.js
+source-is-missing htdocs/public/includes/ckeditor/ckeditor/lang/*.js
+source-is-missing htdocs/public/includes/ckeditor/ckeditor/plugins/*/dialogs/*.js
+source-is-missing htdocs/public/includes/ckeditor/ckeditor/plugins/*/filter/*.js
+source-is-missing htdocs/public/includes/ckeditor/ckeditor/plugins/templates/templates/default.js
+source-is-missing htdocs/public/includes/restler/framework/Luracast/Restler/explorer/lib/*.js
 # Those are false positives, the files are their own sources since
 # they are data files
 source-is-missing htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.json

dev/build/docker-dev/mariadb.yml

@@ -30,5 +30,3 @@ services:
         networks:
             - internal-pod
             - external-pod
-
-

dev/build/exe/doliwamp/doliwamp.iss

@@ -21,7 +21,7 @@ AppVerName=__FILENAMEEXEDOLIWAMP__
 ; Replace key with DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
 OutputBaseFilename=__FILENAMEEXEDOLIWAMP__
 ; ----- End of change
-;OutputManifestFile=build\doliwampbuild.log
+;OutputManifestFile=dev\build\doliwampbuild.log
 ; Define full path from which all relative path are defined
 ; You must modify this to put here your dolibarr root directory
 SourceDir=..\..\..\..
@@ -48,28 +48,28 @@ ChangesEnvironment=no
 CreateUninstallRegKey=yes
 ;UseSetupLdr=no
 ;UninstallDisplayIcon={app}\bidon
-OutputDir=build
+OutputDir=dev\build
 ShowLanguageDialog=auto
 ShowUndisplayableLanguages=no
 LanguageDetectionMethod=uilanguage
 ;SignedUninstaller=yes
 
 [Languages]
-Name: "en"; MessagesFile: "compiler:Default.isl,build\exe\doliwamp\Languages\MyEnglish.isl"
-Name: "br"; MessagesFile: "compiler:Languages\Portuguese.isl,build\exe\doliwamp\Languages\MyBrazilianPortuguese.isl"
-Name: "ca"; MessagesFile: "compiler:Languages\Catalan.isl,build\exe\doliwamp\Languages\MyCatalan.isl"
-Name: "da"; MessagesFile: "compiler:Languages\Danish.isl,build\exe\doliwamp\Languages\MyDanish.isl"
-Name: "es"; MessagesFile: "compiler:Languages\Spanish.isl,build\exe\doliwamp\Languages\MySpanish.isl"
-Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl,build\exe\doliwamp\Languages\MyDutch.isl"
-Name: "fi"; MessagesFile: "compiler:Languages\Finnish.isl,build\exe\doliwamp\Languages\MyFinnish.isl"
-Name: "fr"; MessagesFile: "compiler:Languages\French.isl,build\exe\doliwamp\Languages\MyFrench.isl"
-Name: "ge"; MessagesFile: "compiler:Languages\German.isl,build\exe\doliwamp\Languages\MyGerman.isl"
-Name: "it"; MessagesFile: "compiler:Languages\Italian.isl,build\exe\doliwamp\Languages\MyItalian.isl"
-Name: "nb"; MessagesFile: "compiler:Languages\Norwegian.isl,build\exe\doliwamp\Languages\MyNorwegian.isl"
-Name: "po"; MessagesFile: "compiler:Languages\Polish.isl,build\exe\doliwamp\Languages\MyPolish.isl"
-Name: "pt"; MessagesFile: "compiler:Languages\Portuguese.isl,build\exe\doliwamp\Languages\MyPortuguese.isl"
-Name: "ru"; MessagesFile: "compiler:Languages\Russian.isl,build\exe\doliwamp\Languages\MyRussian.isl"
-Name: "sv"; MessagesFile: "compiler:Languages\Slovenian.isl,build\exe\doliwamp\Languages\MySlovenian.isl"
+Name: "en"; MessagesFile: "compiler:Default.isl,dev\build\exe\doliwamp\Languages\MyEnglish.isl"
+Name: "br"; MessagesFile: "compiler:Languages\Portuguese.isl,dev\build\exe\doliwamp\Languages\MyBrazilianPortuguese.isl"
+Name: "ca"; MessagesFile: "compiler:Languages\Catalan.isl,dev\build\exe\doliwamp\Languages\MyCatalan.isl"
+Name: "da"; MessagesFile: "compiler:Languages\Danish.isl,dev\build\exe\doliwamp\Languages\MyDanish.isl"
+Name: "es"; MessagesFile: "compiler:Languages\Spanish.isl,dev\build\exe\doliwamp\Languages\MySpanish.isl"
+Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl,dev\build\exe\doliwamp\Languages\MyDutch.isl"
+Name: "fi"; MessagesFile: "compiler:Languages\Finnish.isl,dev\build\exe\doliwamp\Languages\MyFinnish.isl"
+Name: "fr"; MessagesFile: "compiler:Languages\French.isl,dev\build\exe\doliwamp\Languages\MyFrench.isl"
+Name: "ge"; MessagesFile: "compiler:Languages\German.isl,dev\build\exe\doliwamp\Languages\MyGerman.isl"
+Name: "it"; MessagesFile: "compiler:Languages\Italian.isl,dev\build\exe\doliwamp\Languages\MyItalian.isl"
+Name: "nb"; MessagesFile: "compiler:Languages\Norwegian.isl,dev\build\exe\doliwamp\Languages\MyNorwegian.isl"
+Name: "po"; MessagesFile: "compiler:Languages\Polish.isl,dev\build\exe\doliwamp\Languages\MyPolish.isl"
+Name: "pt"; MessagesFile: "compiler:Languages\Portuguese.isl,dev\build\exe\doliwamp\Languages\MyPortuguese.isl"
+Name: "ru"; MessagesFile: "compiler:Languages\Russian.isl,dev\build\exe\doliwamp\Languages\MyRussian.isl"
+Name: "sv"; MessagesFile: "compiler:Languages\Slovenian.isl,dev\build\exe\doliwamp\Languages\MySlovenian.isl"
 
 [Tasks]
 ;Name: "autostart"; Description: "Automatically launch DoliWamp server on startup. If you check this option, Services will be installed as automatic. Otherwise, services will be installed as manual and will start and stop with the service manager."; GroupDescription: "Auto Start:" ;Flags: unchecked;
@@ -84,19 +84,19 @@ Name: "{app}\bin\apache\apache2.4.51\logs"
 
 [Files]
 ; Stop/start
-Source: "build\exe\doliwamp\stopdoliwamp.bat"; DestDir: "{app}\"; Flags: ignoreversion; AfterInstall: close()
-Source: "build\exe\doliwamp\startdoliwamp.bat"; DestDir: "{app}\"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\install_services.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\uninstall_services.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\removefiles.bat"; DestDir: "{app}\"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\rundoliwamp.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\rundolihelp.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\rundoliadmin.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\mysqlinitpassword.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\mysqltestinstall.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\startdoliwamp_manual_donotuse.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\builddemosslfiles.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversion;
+Source: "dev\build\exe\doliwamp\stopdoliwamp.bat"; DestDir: "{app}\"; Flags: ignoreversion; AfterInstall: close()
+Source: "dev\build\exe\doliwamp\startdoliwamp.bat"; DestDir: "{app}\"; Flags: ignoreversion;
+Source: "dev\build\exe\doliwamp\install_services.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
+Source: "dev\build\exe\doliwamp\uninstall_services.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
+Source: "dev\build\exe\doliwamp\removefiles.bat"; DestDir: "{app}\"; Flags: ignoreversion;
+Source: "dev\build\exe\doliwamp\rundoliwamp.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
+Source: "dev\build\exe\doliwamp\rundolihelp.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
+Source: "dev\build\exe\doliwamp\rundoliadmin.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
+Source: "dev\build\exe\doliwamp\mysqlinitpassword.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
+Source: "dev\build\exe\doliwamp\mysqltestinstall.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
+Source: "dev\build\exe\doliwamp\startdoliwamp_manual_donotuse.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
+Source: "dev\build\exe\doliwamp\builddemosslfiles.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
+Source: "dev\build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversion;
 
 ; Apache, Php, Mysql
 ; Put here path of Wampserver applications
@@ -117,16 +117,16 @@ Source: "scripts\*.*"; DestDir: "{app}\www\dolibarr\scripts"; Flags: ignoreversi
 Source: "*.*"; DestDir: "{app}\www\dolibarr"; Flags: ignoreversion; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,default.properties,install.lock"
 
 ; Config files
-Source: "build\exe\doliwamp\dolibarr.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.4.51\conf"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mariadb\mariadb10.6.5"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php7.4.26"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\index.php.install"; DestDir: "{app}\www"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\install.forced.php.install"; DestDir: "{app}\www\dolibarr\htdocs\install"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\openssl.conf"; DestDir: "{app}"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\ca_demo_dolibarr.crt"; DestDir: "{app}"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\ca_demo_dolibarr.key"; DestDir: "{app}"; Flags: ignoreversion;
+Source: "dev\build\exe\doliwamp\dolibarr.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion;
+Source: "dev\build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.4.51\conf"; Flags: ignoreversion;
+Source: "dev\build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion;
+Source: "dev\build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mariadb\mariadb10.6.5"; Flags: ignoreversion;
+Source: "dev\build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php7.4.26"; Flags: ignoreversion;
+Source: "dev\build\exe\doliwamp\index.php.install"; DestDir: "{app}\www"; Flags: ignoreversion;
+Source: "dev\build\exe\doliwamp\install.forced.php.install"; DestDir: "{app}\www\dolibarr\htdocs\install"; Flags: ignoreversion;
+Source: "dev\build\exe\doliwamp\openssl.conf"; DestDir: "{app}"; Flags: ignoreversion;
+Source: "dev\build\exe\doliwamp\ca_demo_dolibarr.crt"; DestDir: "{app}"; Flags: ignoreversion;
+Source: "dev\build\exe\doliwamp\ca_demo_dolibarr.key"; DestDir: "{app}"; Flags: ignoreversion;
 
 ; Licence
 Source: "COPYRIGHT"; DestDir: "{app}"; Flags: ignoreversion;

dev/build/generate_filelist_xml.php

@@ -40,6 +40,9 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 
 define('DOL_DOCUMENT_ROOT', dirname(dirname($path)).'/htdocs');
 
+//$algo = 'md5';		// Old algorithm
+$algo = 'sha256';
+
 require_once $path."../../htdocs/master.inc.php";
 require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
 
@@ -180,6 +183,7 @@ if ($checklock && empty($checksource)) {
 if ($release) {
 	print "Working on files into           : ".DOL_DOCUMENT_ROOT."\n";
 	print "Version of target release       : ".$release."\n";
+	print "Algo                            : ".$algo."\n";
 	print "Include custom dir in signature : ".(empty($includecustom) ? 'no' : 'yes')."\n";
 	print "Include constants in signature  : ".(empty($includeconstants) ? 'none' : '');
 	foreach ($includeconstants as $countrycode => $tmp) {
@@ -188,6 +192,7 @@ if ($release) {
 		}
 	}
 	print "\n";
+	print "\n";
 }
 if ($checklock) {
 	print "Working on files into               : ".DOL_DOCUMENT_ROOT."\n";
@@ -231,7 +236,7 @@ if ($release) {
 	$gitcommit = trim($fileforgitcontent);
 
 	fputs($fp, '<?xml version="1.0" encoding="UTF-8" ?>'."\n");
-	fputs($fp, '<checksum_list version="'.$release.'" date="'.dol_print_date(dol_now(), 'dayhourrfc').'" generator="'.$script_file.'" gitcommit="'.$gitcommit.'">'."\n");
+	fputs($fp, '<checksum_list version="'.$release.'" date="'.dol_print_date(dol_now(), 'dayhourrfc').'" generator="'.$script_file.'" algo="'.$algo.'" gitcommit="'.$gitcommit.'">'."\n");
 
 	foreach ($includeconstants as $countrycode => $tmp) {
 		fputs($fp, '<dolibarr_constants country="'.$countrycode.'">'."\n");
@@ -265,9 +270,9 @@ if ($release) {
 			$needtoclose = 1;
 		}
 		if (filetype($file) == "file") {
-			$md5 = md5_file($file);
-			$checksumconcat[] = $md5;
-			fputs($fp, '    <md5file name="'.basename($file).'" size="'.filesize($file).'">'.$md5.'</md5file>'."\n");
+			$hashoffile = hash_file($algo, $file);
+			$checksumconcat[] = $hashoffile;
+			fputs($fp, '    <'.$algo.'file name="'.basename($file).'" size="'.filesize($file).'">'.$hashoffile.'</'.$algo.'file>'."\n");
 		}
 	}
 	if ($needtoclose) {
@@ -277,10 +282,10 @@ if ($release) {
 	fputs($fp, '</dolibarr_htdocs_dir>'."\n");
 
 	asort($checksumconcat); // Sort list of checksum
-	$md5htdocsdir = md5(join(',', $checksumconcat));
+	$hashhtdocsdir = hash($algo, join(',', $checksumconcat));
 
 	fputs($fp, '<dolibarr_htdocs_dir_checksum>'."\n");
-	fputs($fp, $md5htdocsdir."\n");
+	fputs($fp, $hashhtdocsdir."\n");
 	fputs($fp, '</dolibarr_htdocs_dir_checksum>'."\n\n");
 
 
@@ -308,9 +313,9 @@ if ($release) {
 			$needtoclose = 1;
 		}
 		if (filetype($file) == "file") {
-			$md5 = md5_file($file);
-			$checksumconcat[] = $md5;
-			fputs($fp, '    <md5file name="'.basename($file).'" size="'.filesize($file).'">'.$md5.'</md5file>'."\n");
+			$hashoffile = hash_file($algo, $file);
+			$checksumconcat[] = $hashoffile;
+			fputs($fp, '    <'.$algo.'file name="'.basename($file).'" size="'.filesize($file).'">'.$hashoffile.'</'.$algo.'file>'."\n");
 		}
 	}
 	if ($needtoclose) {
@@ -320,10 +325,10 @@ if ($release) {
 	fputs($fp, '</dolibarr_scripts_dir>'."\n");
 
 	asort($checksumconcat); // Sort list of checksum
-	$md5scriptsdir = md5(join(',', $checksumconcat));
+	$hashscriptsdir = hash($algo, join(',', $checksumconcat));
 
 	fputs($fp, '<dolibarr_scripts_dir_checksum>'."\n");
-	fputs($fp, $md5scriptsdir."\n");
+	fputs($fp, $hashscriptsdir."\n");
 	fputs($fp, '</dolibarr_scripts_dir_checksum>'."\n\n");
 }
 
@@ -371,10 +376,10 @@ foreach ($arrayofunalterablefiles as $entry) {
 				$needtoclose = 1;
 			}
 			if (filetype($file) == "file") {
-				$md5 = md5_file($file);
-				$checksumconcat[] = $md5;
+				$hashoffile = hash_file($algo, $file);
+				$checksumconcat[] = $hashoffile;
 				if ($release) {
-					fputs($fp, '    <md5file name="'.basename($file).'" size="'.filesize($file).'">'.$md5.'</md5file>'."\n");
+					fputs($fp, '    <'.$algo.'file name="'.basename($file).'" size="'.filesize($file).'">'.$hashoffile.'</'.$algo.'file>'."\n");
 				}
 			}
 		}
@@ -407,10 +412,10 @@ foreach ($arrayofunalterablefiles as $entry) {
 			$needtoclose = 1;
 		}
 		if (filetype($file) == "file") {
-			$md5 = md5_file($file);
-			$checksumconcat[] = $md5;
+			$hashoffile = hash_file($algo, $file);
+			$checksumconcat[] = $hashoffile;
 			if ($release) {
-				fputs($fp, '    <md5file name="'.basename($file).'" size="'.filesize($file).'">'.$md5.'</md5file>'."\n");
+				fputs($fp, '    <'.$algo.'file name="'.basename($file).'" size="'.filesize($file).'">'.$hashoffile.'</'.$algo.'file>'."\n");
 			}
 		}
 		if ($needtoclose) {
@@ -423,13 +428,13 @@ foreach ($arrayofunalterablefiles as $entry) {
 }
 
 asort($checksumconcat); // Sort list of checksum
-$md5unalterable_files = md5(join(',', $checksumconcat));
+$hashunalterable_files = hash($algo, join(',', $checksumconcat));
 
 if ($release) {
 	fputs($fp, '</dolibarr_unalterable_files>'."\n");
 
 	fputs($fp, '<dolibarr_unalterable_files_checksum>'."\n");
-	fputs($fp, $md5unalterable_files."\n");
+	fputs($fp, $hashunalterable_files."\n");
 	fputs($fp, '</dolibarr_unalterable_files_checksum>'."\n\n");
 
 	// End of file
@@ -443,9 +448,9 @@ print "\n";
 if ($release) {
 	if (empty($buildzip)) {
 		print "File ".$outputfile." generated.\n";
-		print "Signature for htdocs files: ".$md5htdocsdir."\n";
-		print "Signature for scripts files: ".$md5scriptsdir."\n";
-		print "Signature for the ".count($checksumconcat)." unalterable files: ".$md5unalterable_files."\n";
+		print "Signature for htdocs files: ".$hashhtdocsdir."\n";
+		print "Signature for scripts files: ".$hashscriptsdir."\n";
+		print "Signature for the ".count($checksumconcat)." unalterable files: ".$hashunalterable_files."\n";
 	} else {
 		if ($buildzip == '1' || $buildzip == 'zip') {
 			$result = dol_compress_file($outputfile, $outputfile.'.zip', 'zip');
@@ -464,7 +469,7 @@ if ($release) {
 }
 
 if ($checklock) {
-	print "Signature for unalterable files: ".$md5unalterable_files."\n";
+	print "Signature for unalterable files: ".$algo." ".$hashunalterable_files."\n";
 
 	$lockedfile = DOL_DOCUMENT_ROOT.'/../dev/lockedfiles.txt';
 	$checksuminlockedfile = '';
@@ -475,15 +480,15 @@ if ($checklock) {
 		// Now we check the content of lockedfiles.txt
 		$arraylocked = file($lockedfile);
 		foreach ($arraylocked as $line) {
-			$tmparray = preg_split("/\s+/", $line, 3);
-			if ($tmparray[0] == $checklockmajorversion) {
-				$checksuminlockedfile = $tmparray[2];
+			$tmparray = preg_split("/\s+/", $line, 4);
+			if ($tmparray[0] == $checklockmajorversion && $tmparray[2] == $algo) {
+				$checksuminlockedfile = $tmparray[3];
 			}
 		}
 		if (empty($checksuminlockedfile)) {
-			print "The major version ".$checklockmajorversion." is not locked on the scope ".$checksource." (file found but no matching entry found into dev/lockedfiles.txt).\n";
-		} elseif ($checksuminlockedfile != $md5unalterable_files) {
-			print "The major version ".$checklockmajorversion." is locked on scope '".$checksource."' to checksum ".$checksuminlockedfile."\n";
+			print "The major version ".$checklockmajorversion." is not locked on the scope '".$checksource."' (file found but no matching entry found into dev/lockedfiles.txt).\n";
+		} elseif ($checksuminlockedfile != $hashunalterable_files) {
+			print "The major version ".$checklockmajorversion." is locked on scope '".$checksource."' to checksum ".$algo." ".$checksuminlockedfile."\n";
 			if ($checklockmajorversion != $checksource) {
 				print "The checksum now differs from the locked one, so we return an error.\n";
 				print "\n";

dev/build/makepack-dolibarr.pl

@@ -2,7 +2,7 @@
 #----------------------------------------------------------------------------
 # \file         dev/build/makepack-dolibarr.pl
 # \brief        Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
-# \author       (c)2004-2023 Laurent Destailleur  <eldy@users.sourceforge.net>
+# \author       (c)2004-2025 Laurent Destailleur  <eldy@users.sourceforge.net>
 #
 # This is list of constant you can set to have generated packages moved into a specific dir:
 #DESTIBETARC='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/lastbuild'
@@ -14,33 +14,34 @@
 #----------------------------------------------------------------------------
 ## no critic (InputOutput::ProhibitExplicitStdin,InputOutput::RequireBriefOpen)
 
-use strict;
+#use strict;
 use warnings;
 use Cwd;
 use Term::ANSIColor;
 
 # Change this to defined target for option 98 and 99
-$PROJECT = "dolibarr";
+my $PROJECT = "dolibarr";
 
-$PUBLISHBETARC =
+my $PUBLISHBETARC =
 "$ENV{'DESTIASSOLOGIN'}\@vmprod1.dolibarr.org:/home/dolibarr/asso.dolibarr.org/dolibarr_documents/website/www.dolibarr.org/files";
-$PUBLISHSTABLE =
+my $PUBLISHSTABLE =
   "$ENV{'DESTISFLOGIN'}\@frs.sourceforge.net:/home/frs/project/dolibarr";
 
 # due to implicit origin on git commands, example: implicit origin, lionel upstream, eric dolibarr
-$GITREMOTENAME = "$ENV{'GITREMOTENAME'}";
+my $GITREMOTENAME = "$ENV{'GITREMOTENAME'}";
 
 #@LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","EXEDOLIWAMP","SNAPSHOT");   # Possible packages
-@LISTETARGET = (
+my @LISTETARGET = (
 	"TGZ",          "ZIP",          "RPM_GENERIC", "RPM_FEDORA",
 	"RPM_MANDRIVA", "RPM_OPENSUSE", "DEB",         "EXEDOLIWAMP",
 	"SNAPSHOT"
 );    # Possible packages
-%REQUIREMENTPUBLISH = (
+my %REQUIREMENTPUBLISH = (
 	"SF"   => "git ssh rsync",
 	"ASSO" => "git ssh rsync"
 );
-%REQUIREMENTTARGET = (    # Tool requirement for each package
+my %REQUIREMENTTARGET = (    # Tool requirement for each package
+	"-CHKSUM"      => "",
 	"TGZ"          => "tar",
 	"ZIP"          => "7z",
 	"XZ"           => "xz",
@@ -53,18 +54,18 @@ $GITREMOTENAME = "$ENV{'GITREMOTENAME'}";
 	"EXEDOLIWAMP"  => "ISCC.exe",
 	"SNAPSHOT"     => "tar"
 );
-%ALTERNATEPATH = (
+my %ALTERNATEPATH = (
 	"7z"           => "7-ZIP",
 	"makensis.exe" => "NSIS"
 );
 
-$RPMSUBVERSION = "auto";    # auto use value found into BUILD
+my $RPMSUBVERSION = "auto";    # auto use value found into BUILD
 if ( -d "/usr/src/redhat" )   { $RPMDIR = "/usr/src/redhat"; }      # redhat
 if ( -d "/usr/src/packages" ) { $RPMDIR = "/usr/src/packages"; }    # opensuse
 if ( -d "/usr/src/RPM" )      { $RPMDIR = "/usr/src/RPM"; }         # mandrake
 
 use vars qw/ $REVISION $VERSION /;
-$VERSION = "4.0";
+my $VERSION = "4.0";
 
 #------------------------------------------------------------------------------
 # MAIN
@@ -114,8 +115,8 @@ if ( !$ENV{"DESTIBETARC"} || !$ENV{"DESTISTABLE"} ) {
 	print "On Linux:\n";
 	print "export DESTIBETARC='/tmp'; export DESTISTABLE='/tmp';\n";
 	print "On Windows:\n";
-	print "set DESTIBETARC=c:/tmp\n";
-	print "set DESTISTABLE=c:/tmp\n";
+	print "set DESTIBETARC=c:/temp\n";
+	print "set DESTISTABLE=c:/temp\n";
 	print "\n";
 	print "Example in .bashrc:\n";
 	print
@@ -137,6 +138,15 @@ if ( !$ENV{"GITREMOTENAME"} ) {
 	print
 "Error: environment variable GITREMOTENAME does not exist. You can set it to 'origin' or any other git remote name.\n";
 	print "$PROG.$Extension aborted.\n";
+	print "\n";
+	print "You can set it with\n";
+	print "On Linux:\n";
+	print "export GITREMOTENAME='origin'";
+	print "On Windows:\n";
+	print "set GITREMOTENAME=origin\n";
+	print "\n";
+	print "Example in .bashrc:\n";
+	print "export GITREMOTENAME='origin'\n";
 	sleep 2;
 	exit 1;
 }
@@ -189,7 +199,7 @@ open( my $IN, "<", $SOURCE . "/htdocs/version.inc.php" )
 while (<$IN>) {
 	if ( $_ =~ /define\('DOL_MAJOR_VERSION',\s*'([\d\.a-z\-]+)'\)/ ) {
 		$MAJORVERSION = $1;
-		break;
+		last;
 	}
 }
 close $IN;
@@ -200,7 +210,7 @@ open( my $IN2, "<", $SOURCE . "/htdocs/filefunc.inc.php" )
 while (<$IN2>) {
 	if ( $_ =~ /define\('DOL_MINOR_VERSION',\s*'([\d\.a-z\-]+)'\)/ ) {
 		$MINORVERSION = $1;
-		break;
+		last;
 	}
 }
 close $IN2;
@@ -386,6 +396,7 @@ foreach my $target ( sort keys %CHOOSEDTARGET ) {
 		}
 		$atleastonerpm = 1;
 	}
+
 	foreach my $req ( split( /[,\s]/, $REQUIREMENTTARGET{$target} ) ) {
 
 		# Test
@@ -540,7 +551,7 @@ if ($nboftargetok) {
 		chdir("$SOURCE");
 
 		print "Clean $SOURCE/htdocs/includes/autoload.php\n";
-		$ret = `rm -f  $SOURCE/htdocs/includes/autoload.php`;
+		unlink("$SOURCE/htdocs/includes/autoload.php");
 
 		$ret = `git ls-files . --exclude-standard --others`;
 		if ($ret) {
@@ -805,19 +816,19 @@ if ($nboftargetok) {
 		$ret = `rm -f  $BUILDROOT/$PROJECT/htdocs/includes/geoip/sample*.*`;
 		$ret = `rm -f  $BUILDROOT/$PROJECT/htdocs/includes/bin`;
 		$ret =
-`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/ckeditor/adapters`
+`rm -fr $BUILDROOT/$PROJECT/htdocs/public/includes/ckeditor/ckeditor/adapters`
 		  ;    # Keep this removal in case we embed libraries
 		$ret =
-		  `rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/ckeditor/samples`
+		  `rm -fr $BUILDROOT/$PROJECT/htdocs/public/includes/ckeditor/ckeditor/samples`
 		  ;    # Keep this removal in case we embed libraries
-		$ret = `rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`
+		$ret = `rm -fr $BUILDROOT/$PROJECT/htdocs/public/includes/ckeditor/_source`
 		  ; # _source must be kept into tarball for official debian, not for the rest
 		$ret = `rm -f  $BUILDROOT/$PROJECT/htdocs/includes/composer`;
 		$ret = `rm -f  $BUILDROOT/$PROJECT/htdocs/includes/doctrine`;
 		$ret =
-`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
+`rm -f  $BUILDROOT/$PROJECT/htdocs/public/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
 		$ret =
-`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/select2/release.sh`;
+`rm -f  $BUILDROOT/$PROJECT/htdocs/public/includes/jquery/plugins/select2/release.sh`;
 		$ret =
 		  `rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/doc`;
 		$ret =
@@ -923,7 +934,7 @@ if ($nboftargetok) {
 
 			$ret = `rm -fr $BUILDROOT/$FILENAMETGZ/dev/build/exe`;
 			$ret =
-			  `rm -fr $BUILDROOT/$FILENAMETGZ/htdocs/includes/ckeditor/_source`
+			  `rm -fr $BUILDROOT/$FILENAMETGZ/htdocs/public/includes/ckeditor/_source`
 			  ; # We can't remove it with exclude file, we need it for some tarball packages
 
 			print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz...\n";
@@ -960,7 +971,7 @@ if ($nboftargetok) {
 
 			$ret = `rm -fr $BUILDROOT/$FILENAMEXZ/dev/build/exe`;
 			$ret =
-			  `rm -fr $BUILDROOT/$FILENAMEXZ/htdocs/includes/ckeditor/_source`
+			  `rm -fr $BUILDROOT/$FILENAMEXZ/htdocs/public/includes/ckeditor/_source`
 			  ; # We can't remove it with exclude file, we need it for some tarball packages
 
 			print "Compress $FILENAMEXZ into $FILENAMEXZ.xz...\n";
@@ -999,7 +1010,7 @@ if ($nboftargetok) {
 
 			$ret = `rm -fr $BUILDROOT/$FILENAMEZIP/dev/build/exe`;
 			$ret =
-			  `rm -fr $BUILDROOT/$FILENAMEZIP/htdocs/includes/ckeditor/_source`
+			  `rm -fr $BUILDROOT/$FILENAMEZIP/htdocs/public/includes/ckeditor/_source`
 			  ; # We can't remove it with exclude file, we need it for some tarball packages
 
 			print "Compress $FILENAMEZIP into $FILENAMEZIP.zip...\n";
@@ -1051,7 +1062,7 @@ if ($nboftargetok) {
 			$ret = `$cmd`;
 
        # Removed files we don't need (already removed before)
-       #$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/htdocs/includes/ckeditor/_source`;
+       #$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/htdocs/public/includes/ckeditor/_source`;
 
 			print "Set permissions on files/dir\n";
 			$ret = `chmod -R 755 $BUILDROOT/$FILENAMETGZ2`;
@@ -1250,17 +1261,17 @@ if ($nboftargetok) {
 
 			# Removed duplicate license files
 			$ret =
-`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source/LICENSE.md`;
+`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/public/includes/ckeditor/ckeditor/_source/LICENSE.md`;
 			$ret =
-`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source/plugins/scayt/LICENSE.md`;
+`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/public/includes/ckeditor/ckeditor/_source/plugins/scayt/LICENSE.md`;
 			$ret =
-`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source/plugins/wsc/LICENSE.md`;
+`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/public/includes/ckeditor/ckeditor/_source/plugins/wsc/LICENSE.md`;
 			$ret =
-`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/LICENSE.md`;
+`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/public/includes/ckeditor/ckeditor/LICENSE.md`;
 			$ret =
-`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/plugins/scayt/LICENSE.md`;
+`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/public/includes/ckeditor/ckeditor/plugins/scayt/LICENSE.md`;
 			$ret =
-`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/plugins/wsc/LICENSE.md`;
+`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/public/includes/ckeditor/ckeditor/plugins/wsc/LICENSE.md`;
 			$ret =
 			  `rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/php-iban/LICENSE`;
 			$ret =
@@ -1283,7 +1294,7 @@ if ($nboftargetok) {
 `rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/mobiledetect/mobiledetectlib/LICENSE.txt`;
 
 # Removed files we don't need (already removed)
-#$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source`;
+#$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/public/includes/ckeditor/ckeditor/_source`;
 			$ret = `rm -fr $BUILDROOT/$PROJECT.tmp/.codeclimate.yml`;
 			$ret = `rm -fr $BUILDROOT/$PROJECT.tmp/.pre-commit-config.yaml`;
 			$ret = `rm -fr $BUILDROOT/$PROJECT.tmp/.vscode`;

dev/build/makepack-dolibarrmodule.pl

@@ -7,24 +7,24 @@
 #----------------------------------------------------------------------------
 ## no critic (InputOutput::ProhibitExplicitStdin,InputOutput::RequireBriefOpen)
 
-use strict;
+#use strict;
 use warnings;
 use Cwd;
 use Term::ANSIColor;
 
-$OWNER = "ldestailleur";
-$GROUP = "ldestailleur";
+my $OWNER = "ldestailleur";
+my $GROUP = "ldestailleur";
 
-@LISTETARGET       = ("ZIP");    # Possible packages
-%REQUIREMENTTARGET = (           # Tool requirement for each package
+my @LISTETARGET       = ("ZIP");    # Possible packages
+my %REQUIREMENTTARGET = (           # Tool requirement for each package
 	"TGZ" => "tar",
 	"ZIP" => "7z"
 );
-%ALTERNATEPATH = ();
+my %ALTERNATEPATH = ();
 
 use vars qw/ $REVISION $VERSION /;
-$REVISION = '1.0';
-$VERSION  = "3.5 (build $REVISION)";
+my $REVISION = '1.0';
+my $VERSION  = "3.5 (build $REVISION)";
 
 #------------------------------------------------------------------------------
 # MAIN
@@ -184,7 +184,7 @@ foreach my $PROJECT (@PROJECTLIST) {
 	while (<$IN>) {
 		if ( $_ =~ /this->version\s*=\s*'([\d\.]+)'/ ) {
 			$PROJVERSION = $1;
-			break;
+			last;
 		}
 	}
 	close $IN;

dev/build/perl/virtualmin/dolibarr.pl

@@ -250,7 +250,7 @@ if ($upgrade) {
 	&copy_source_dest_as_domain_user($d, $oldcfile, $cfile);
 	&copy_source_dest_as_domain_user($d, $olddocdir, $docdir);
 	&copy_source_dest_as_domain_user($d, $oldaltdir, $altdir);
-	
+
 	# First page (Update database schema)
 	local @params = ( [ "action", "upgrade" ],
 			  [ "versionfrom", $upgrade->{'version'} ],
@@ -258,7 +258,7 @@ if ($upgrade) {
 	 		 );
 	local $err = &call_dolibarr_wizard_page(\@params, "upgrade", $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
-	
+
 	# Second page (Migrate some data)
 	local @params = ( [ "action", "upgrade" ],
 			  [ "versionfrom", $upgrade->{'version'} ],
@@ -266,7 +266,7 @@ if ($upgrade) {
 			 );
 	local $err = &call_dolibarr_wizard_page(\@params, "upgrade2", $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
-	
+
 	# Third page (Update version number)
 	local @params = ( [ "action", "upgrade" ],
 			  [ "versionfrom", $upgrade->{'version'} ],
@@ -276,12 +276,12 @@ if ($upgrade) {
 	local $p = $ver >= 3.8 ? "step5" : "etape5";
 	local $err = &call_dolibarr_wizard_page(\@params, $p, $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
-	
+
 	# Remove the installation directory. (deprecated)
 	# local $dinstall = "$opts->{'dir'}/install";
 	# $dinstall  =~ s/\/$//;
 	# $out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall));
-	
+
 	}
 else {
 	# First page (Db connection and config file creation)
@@ -306,13 +306,13 @@ else {
 	local $p = $ver >= 3.8 ? "step1" : "etape1";
 	local $err = &call_dolibarr_wizard_page(\@params, $p, $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
-	
+
 	# Second page (Populate database)
 	local @params = ( [ "action", "set" ] );
 	local $p = $ver >= 3.8 ? "step2" : "etape2";
 	local $err = &call_dolibarr_wizard_page(\@params, $p, $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
-	
+
 	# Third page (Add administrator account)
 	local @params = ( [ "action", "set" ],
 			  [ "login", "admin" ],
@@ -323,17 +323,17 @@ else {
 	local $p = $ver >= 3.8 ? "step5" : "etape5";
 	local $err = &call_dolibarr_wizard_page(\@params, $p, $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
-	
+
 	# Remove the installation directory (deprecated)
 	# local $dinstall = "$opts->{'dir'}/install";
 	# $dinstall  =~ s/\/$//;
 	# $out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall));
-	
+
 	# Protect config file
 	&set_permissions_as_domain_user($d, 0644, $cfile);
 	&set_permissions_as_domain_user($d, 0755, $cfiledir);
 	}
- 
+
 # Return a URL for the user
 local $rp = $opts->{'dir'};
 $rp =~ s/^$d->{'home'}\///;
@@ -443,7 +443,7 @@ return 2;
 
 sub script_dolibarr_db_conn_desc
 {
-my $db_conn_desc = 
+my $db_conn_desc =
     { 'conf/conf.php' =>
         {
            'dbpass' =>

dev/build/phpstan/phpstan-baseline.neon

@@ -6,12 +6,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/accountancy/admin/categories.php
 
-		-
-			message: '#^If condition is always true\.$#'
-			identifier: if.alwaysTrue
-			count: 2
-			path: ../../../htdocs/accountancy/admin/categories_list.php
-
 		-
 			message: '#^Loose comparison using \=\= between 32 and 32 will always evaluate to true\.$#'
 			identifier: equal.alwaysTrue
@@ -36,24 +30,12 @@ parameters:
 			count: 1
 			path: ../../../htdocs/accountancy/admin/journals_list.php
 
-		-
-			message: '#^If condition is always true\.$#'
-			identifier: if.alwaysTrue
-			count: 1
-			path: ../../../htdocs/accountancy/admin/productaccount.php
-
 		-
 			message: '#^Right side of && is always true\.$#'
 			identifier: booleanAnd.rightAlwaysTrue
 			count: 1
 			path: ../../../htdocs/accountancy/admin/productaccount.php
 
-		-
-			message: '#^If condition is always true\.$#'
-			identifier: if.alwaysTrue
-			count: 1
-			path: ../../../htdocs/accountancy/admin/report_list.php
-
 		-
 			message: '#^Loose comparison using \=\= between 45 and 45 will always evaluate to true\.$#'
 			identifier: equal.alwaysTrue
@@ -450,12 +432,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/admin/emailcollector_card.php
 
-		-
-			message: '#^Variable \$contextpage in empty\(\) always exists and is not falsy\.$#'
-			identifier: empty.variable
-			count: 1
-			path: ../../../htdocs/admin/emailcollector_list.php
-
 		-
 			message: '#^Left side of && is always true\.$#'
 			identifier: booleanAnd.leftAlwaysTrue
@@ -492,12 +468,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/admin/fediverse.php
 
-		-
-			message: '#^Variable \$result might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/admin/fediverse.php
-
 		-
 			message: '#^If condition is always true\.$#'
 			identifier: if.alwaysTrue
@@ -564,12 +534,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/admin/hrm.php
 
-		-
-			message: '#^Variable \$object might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/admin/hrm.php
-
 		-
 			message: '#^If condition is always true\.$#'
 			identifier: if.alwaysTrue
@@ -828,12 +792,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/admin/security_file.php
 
-		-
-			message: '#^Variable \$smsfile might not be defined\.$#'
-			identifier: variable.undefined
-			count: 5
-			path: ../../../htdocs/admin/sms.php
-
 		-
 			message: '#^Loose comparison using \=\= between ''add'' and ''add'' will always evaluate to true\.$#'
 			identifier: equal.alwaysTrue
@@ -2310,12 +2268,6 @@ parameters:
 			count: 5
 			path: ../../../htdocs/compta/accounting-files.php
 
-		-
-			message: '#^Variable \$mc might not be defined\.$#'
-			identifier: variable.undefined
-			count: 5
-			path: ../../../htdocs/compta/accounting-files.php
-
 		-
 			message: '#^Variable \$modulepart might not be defined\.$#'
 			identifier: variable.undefined
@@ -2592,12 +2544,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/compta/bank/treso.php
 
-		-
-			message: '#^Variable \$mc might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/compta/bank/treso.php
-
 		-
 			message: '#^Call to function is_array\(\) with array will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
@@ -2661,7 +2607,7 @@ parameters:
 		-
 			message: '#^Loose comparison using \=\= between ''card'' and ''card'' will always evaluate to true\.$#'
 			identifier: equal.alwaysTrue
-			count: 1
+			count: 2
 			path: ../../../htdocs/compta/cashcontrol/cashcontrol_card.php
 
 		-
@@ -2679,7 +2625,7 @@ parameters:
 		-
 			message: '#^Loose comparison using \=\= between ''create''\|''start'' and ''close'' will always evaluate to false\.$#'
 			identifier: equal.alwaysFalse
-			count: 2
+			count: 1
 			path: ../../../htdocs/compta/cashcontrol/cashcontrol_card.php
 
 		-
@@ -3288,12 +3234,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/compta/paiement/card.php
 
-		-
-			message: '#^Variable \$mc might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/compta/paiement/card.php
-
 		-
 			message: '#^Ternary operator condition is always false\.$#'
 			identifier: ternary.alwaysFalse
@@ -6679,7 +6619,7 @@ parameters:
 			path: ../../../htdocs/core/lib/functions2.lib.php
 
 		-
-			message: '#^Call to function function_exists\(\) with ''imagecreatefromgif''\|''imagecreatefromjpeg''\|''imagecreatefrompng''\|''imagecreatefromwbmp''\|''imagecreatefromwebp'' will always evaluate to true\.$#'
+			message: '#^Call to function function_exists\(\) with ''imagecreatefromavif''\|''imagecreatefromgif''\|''imagecreatefromjpeg''\|''imagecreatefrompng''\|''imagecreatefromwbmp''\|''imagecreatefromwebp'' will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
 			count: 3
 			path: ../../../htdocs/core/lib/images.lib.php
@@ -6885,7 +6825,7 @@ parameters:
 		-
 			message: '#^Left side of \|\| is always true\.$#'
 			identifier: booleanOr.leftAlwaysTrue
-			count: 4
+			count: 3
 			path: ../../../htdocs/core/menus/standard/eldy.lib.php
 
 		-
@@ -7356,24 +7296,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/import/import_csv.modules.php
 
-		-
-			message: '#^Property ModeleImports\:\:\$errors \(array\<string\>\) does not accept array\<array\<string, mixed\>\|string\>\.$#'
-			identifier: assign.propertyType
-			count: 3
-			path: ../../../htdocs/core/modules/import/import_csv.modules.php
-
-		-
-			message: '#^Property ModeleImports\:\:\$errors \(array\<string\>\) does not accept array\<array\<string, string\>\|string\>\.$#'
-			identifier: assign.propertyType
-			count: 3
-			path: ../../../htdocs/core/modules/import/import_csv.modules.php
-
-		-
-			message: '#^Property ModeleImports\:\:\$warnings \(array\<string\>\) does not accept array\<array\<string, mixed\>\|string\>\.$#'
-			identifier: assign.propertyType
-			count: 1
-			path: ../../../htdocs/core/modules/import/import_csv.modules.php
-
 		-
 			message: '#^Variable \$key might not be defined\.$#'
 			identifier: variable.undefined
@@ -7422,24 +7344,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/import/import_xlsx.modules.php
 
-		-
-			message: '#^Property ModeleImports\:\:\$errors \(array\<string\>\) does not accept array\<array\<string, mixed\>\|string\>\.$#'
-			identifier: assign.propertyType
-			count: 3
-			path: ../../../htdocs/core/modules/import/import_xlsx.modules.php
-
-		-
-			message: '#^Property ModeleImports\:\:\$errors \(array\<string\>\) does not accept array\<array\<string, string\>\|string\>\.$#'
-			identifier: assign.propertyType
-			count: 3
-			path: ../../../htdocs/core/modules/import/import_xlsx.modules.php
-
-		-
-			message: '#^Property ModeleImports\:\:\$warnings \(array\<string\>\) does not accept array\<array\<string, mixed\>\|string\>\.$#'
-			identifier: assign.propertyType
-			count: 1
-			path: ../../../htdocs/core/modules/import/import_xlsx.modules.php
-
 		-
 			message: '#^Variable \$where might not be defined\.$#'
 			identifier: variable.undefined
@@ -7908,12 +7812,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/oauth/generic_oauthcallback.php
 
-		-
-			message: '#^Variable \$state might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/core/modules/oauth/github_oauthcallback.php
-
 		-
 			message: '#^Strict comparison using \=\=\= between null and null will always evaluate to true\.$#'
 			identifier: identical.alwaysTrue
@@ -8148,12 +8046,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/multicompany_page.php
 
-		-
-			message: '#^Variable \$mc might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/core/multicompany_page.php
-
 		-
 			message: '#^Negated boolean expression is always false\.$#'
 			identifier: booleanNot.alwaysFalse
@@ -8406,12 +8298,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/website.inc.php
 
-		-
-			message: '#^Variable \$mc might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/cron/card.php
-
 		-
 			message: '#^Call to function is_array\(\) with array will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
@@ -9096,18 +8982,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/fourn/class/fournisseur.commande.class.php
 
-		-
-			message: '#^Call to function property_exists\(\) with \$this\(CommandeFournisseur\) and ''socid'' will always evaluate to true\.$#'
-			identifier: function.alreadyNarrowedType
-			count: 1
-			path: ../../../htdocs/fourn/class/fournisseur.commande.class.php
-
-		-
-			message: '#^Call to function property_exists\(\) with \$this\(CommandeFournisseur\) and ''total_tva'' will always evaluate to true\.$#'
-			identifier: function.alreadyNarrowedType
-			count: 1
-			path: ../../../htdocs/fourn/class/fournisseur.commande.class.php
-
 		-
 			message: '#^If condition is always true\.$#'
 			identifier: if.alwaysTrue
@@ -10185,7 +10059,7 @@ parameters:
 		-
 			message: '#^If condition is always true\.$#'
 			identifier: if.alwaysTrue
-			count: 12
+			count: 10
 			path: ../../../htdocs/imports/import.php
 
 		-
@@ -13728,12 +13602,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/public/stripe/ipn.php
 
-		-
-			message: '#^Variable \$mc might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/public/stripe/ipn.php
-
 		-
 			message: '#^Ternary operator condition is always true\.$#'
 			identifier: ternary.alwaysTrue
@@ -14568,12 +14436,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/salaries/virement_request.php
 
-		-
-			message: '#^Variable \$mc might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/societe/admin/societe.php
-
 		-
 			message: '#^Call to function is_object\(\) with Societe will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
@@ -14604,12 +14466,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/societe/canvas/company/tpl/card_view.tpl.php
 
-		-
-			message: '#^Variable \$socid might not be defined\.$#'
-			identifier: variable.undefined
-			count: 3
-			path: ../../../htdocs/societe/canvas/company/tpl/card_view.tpl.php
-
 		-
 			message: '#^Variable \$objcanvas might not be defined\.$#'
 			identifier: variable.undefined
@@ -14814,12 +14670,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/societe/paymentmodes.php
 
-		-
-			message: '#^Left side of && is always true\.$#'
-			identifier: booleanAnd.leftAlwaysTrue
-			count: 1
-			path: ../../../htdocs/societe/paymentmodes.php
-
 		-
 			message: '#^Negated boolean expression is always true\.$#'
 			identifier: booleanNot.alwaysTrue
@@ -15486,12 +15336,6 @@ parameters:
 			count: 7
 			path: ../../../htdocs/user/card.php
 
-		-
-			message: '#^Variable \$mc might not be defined\.$#'
-			identifier: variable.undefined
-			count: 3
-			path: ../../../htdocs/user/card.php
-
 		-
 			message: '#^Call to function method_exists\(\) with \$this\(User\) and ''getLibStatut'' will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
@@ -15642,12 +15486,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/user/document.php
 
-		-
-			message: '#^Variable \$mc might not be defined\.$#'
-			identifier: variable.undefined
-			count: 3
-			path: ../../../htdocs/user/group/card.php
-
 		-
 			message: '#^Loose comparison using \!\= between '''' and '''' will always evaluate to false\.$#'
 			identifier: notEqual.alwaysFalse
@@ -15666,36 +15504,12 @@ parameters:
 			count: 1
 			path: ../../../htdocs/user/group/list.php
 
-		-
-			message: '#^Variable \$mc might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/user/group/list.php
-
-		-
-			message: '#^Variable \$mc might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/user/group/perms.php
-
-		-
-			message: '#^Variable \$mc might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/user/hierarchy.php
-
 		-
 			message: '#^Variable \$mode in empty\(\) always exists and is not falsy\.$#'
 			identifier: empty.variable
 			count: 1
 			path: ../../../htdocs/user/hierarchy.php
 
-		-
-			message: '#^Variable \$mc might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/user/home.php
-
 		-
 			message: '#^Offset ''u\.salary'' on array\{u\.salary\: \(float\|int\)\} in isset\(\) always exists and is not nullable\.$#'
 			identifier: isset.offset
@@ -15708,12 +15522,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/user/list.php
 
-		-
-			message: '#^Variable \$mc might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: ../../../htdocs/user/list.php
-
 		-
 			message: '#^Variable \$searchCategoryUserList in empty\(\) always exists and is not falsy\.$#'
 			identifier: empty.variable

dev/build/rpm/dolibarr_fedora.spec

@@ -103,7 +103,7 @@ cui hai bisogno ed essere facile da usare.
 %{__cp} -pr dev/build/tgz/*     $RPM_BUILD_ROOT%{_datadir}/%{name}/dev/build/tgz
 %{__cp} -pr htdocs  $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__cp} -pr scripts $RPM_BUILD_ROOT%{_datadir}/%{name}
-%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/ckeditor/_source
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/public/includes/ckeditor/_source
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/nusoap
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/fonts
 

dev/build/rpm/dolibarr_generic.spec

@@ -167,7 +167,7 @@ cui hai bisogno ed essere facile da usare.
 %{__cp} -pr dev/build/tgz/*     $RPM_BUILD_ROOT%{_datadir}/%{name}/dev/build/tgz
 %{__cp} -pr htdocs  $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__cp} -pr scripts $RPM_BUILD_ROOT%{_datadir}/%{name}
-%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/ckeditor/_source
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/public/includes/ckeditor/_source
 %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/nusoap
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/fonts

dev/build/rpm/dolibarr_mandriva.spec

@@ -102,7 +102,7 @@ cui hai bisogno ed essere facile da usare.
 %{__cp} -pr dev/build/tgz/*     $RPM_BUILD_ROOT%{_datadir}/%{name}/dev/build/tgz
 %{__cp} -pr htdocs  $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__cp} -pr scripts $RPM_BUILD_ROOT%{_datadir}/%{name}
-%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/ckeditor/_source
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/public/includes/ckeditor/_source
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/fonts
 
 # Lang

dev/build/rpm/dolibarr_opensuse.spec

@@ -102,7 +102,7 @@ cui hai bisogno ed essere facile da usare.
 %{__cp} -pr dev/build/tgz/*     $RPM_BUILD_ROOT%{_datadir}/%{name}/dev/build/tgz
 %{__cp} -pr htdocs  $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__cp} -pr scripts $RPM_BUILD_ROOT%{_datadir}/%{name}
-%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/ckeditor/_source
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/public/includes/ckeditor/_source
 %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/fonts
 
 # Lang

dev/dolibarr_changes.txt

@@ -263,7 +263,19 @@ with
 
 PHP JQUERYFILETREE:
 -------------------
-* Remove directory htdocs/includes/jquery/plugins/jqueryFileTree/connectors
+* Remove directory htdocs/public/includes/jquery/plugins/jqueryFileTree/connectors
+
+
+
+PHP Mobile_DETECT:
+------------------
+Remplacer:
+
+array $headers = null,
+
+par
+
+$headers = null,
 
 
 

dev/examples/ldap/README

@@ -1,4 +1,4 @@
 README (english)
 --------------------------------
 This directory contains some sample files to test ldap command on command line.
-They are used to help developmement and debugging of Dolibarr LDAP features.
+They are used to help developmement and debugging of Dolibarr LDAP features.

dev/examples/ldap/ldapadd_sample2.txt

@@ -8,4 +8,4 @@
 
 dn: ou=contacts,dc=my-domain,dc=com
 objectClass: organizationalUnit
-ou: contacts
+ou: contacts

dev/examples/ldap/ldapsearch_sample1.txt

@@ -24,6 +24,5 @@
 #  ldapsearch -h hostname -p 389 -x -D "cn=manager,o=somecompany.com" -w password -b "ou=people,dc=teclib,dc=infra"
 #  ldapsearch -h hostname -p 389 -x -D "cn=manager,o=somecompany.com" -w password -b "o=somecompany.com" "(objectclass=*)"
 #
-# Example to test a ldap search: 
+# Example to test a ldap search:
 #  ldapsearch -h hostname -p 389 -x -z 5 -b 'OU=Collaborateurs,OU=Utilisateurs,OU=MyCompany,DC=bocal,DC=lan' -D 'CN=UserAdmin,OU=Informatique,OU=Utilisateurs,OU=MyCompany,DC=bocal,DC=lan' -w password
-

dev/examples/mail/dolibarr_mail_attachementwithimageHTML.txt

@@ -65,4 +65,4 @@ o9CFUO94RUiiEpmahN6IfgQXpQJUft9yuDseAluyCkKif5QkQA3IvwVYD2mv0R1uc9gY
 fZt0uru+Tc93cnQQ82A5KVrVVvvahsyxtQFRMOgFLl8ct3wu6NVPyQPby9YUk2J4dpQr
 R5X+bCaMew5mDNsdjMV95GesdhT3n3y32Az+XZsuecMoxePVX5S+GRSu/9XVL9Z+w7Ki
 
---468358388441498ebb24096bfda88a45--
+--468358388441498ebb24096bfda88a45--

dev/examples/mail/dolibarr_mail_universal.txt

@@ -46,4 +46,4 @@ Content-Transfer-Encoding: quoted-printable
 
 ... attach-file ...
 
---------------090104020208060008040809-- (end multipart/mixed)
+--------------090104020208060008040809-- (end multipart/mixed)

dev/examples/mail/source_email_from_thirdparty.txt

@@ -45,4 +45,4 @@ VEImZGI9b2Rvb192OCc+UGFydG5lciBBZ3JvbGFpdDwvYT48L3NtYWxsPjwvc3Bhbj4K
 
 --===============8764907306434163361==--
 
---===============4543832834454763172==--
+--===============4543832834454763172==--

dev/examples/mail/source_email_ticket_1_to_create.txt

@@ -71,7 +71,7 @@ Content-Type: text/plain; charset="UTF-8"
 
 adfsdfsdfds
 
--- 
+--
 Laurent.
 ------------------------------------------------------------------------------------
 Twitter: https://www.twitter.com/eldy10

dev/examples/zapier/README.md

@@ -3,4 +3,3 @@
 Take a look at the dolibarr wiki page of Zapier module:
 
 https://wiki.dolibarr.org/index.php?title=Module_Zapier
-

dev/examples/zapier/action.json

@@ -1,56 +1,25 @@
 {
-    "table_rowid": "id",
-    "id": 6764,
-    "ref": null,
-    "type_id": "5",
-    "type_code": "AC_RDV",
-    "type": null,
-    "type_color": null,
-    "code": null,
-    "label": "azerty",
-    "datec": null,
-    "datem": null,
-    "authorid": null,
-    "usermodid": null,
-    "datep": 1555365600,
-    "datef": 1555538399,
-    "durationp": 172799,
-    "fulldayevent": 1,
-    "punctual": 1,
-    "percentage": "-1",
-    "location": "",
-    "transparency": 1,
-    "priority": 0,
-    "userassigned": {
-        "1": {
-            "id": "1",
-            "transparency": 1
-        }
-    },
-    "userownerid": "1",
-    "userdoneid": null,
-    "usertodo": null,
-    "userdone": null,
-    "socid": null,
-    "contactid": null,
-    "elementtype": "",
-    "icalname": null,
-    "icalcolor": null,
-    "actions": [],
-    "email_msgid": null,
-    "email_from": null,
-    "email_sender": null,
-    "email_to": null,
-    "email_tocc": null,
-    "email_tobcc": null,
-    "email_subject": null,
-    "errors_to": null,
-    "import_key": null,
-    "linkedObjectsIds": null,
-    "fk_project": 0,
-    "modelpdf": null,
-    "note_public": null,
-    "note_private": null,
-    "note": "wxcvbn",
-    "duree": 0
-}
+	"table_rowid" : "id",
+	"id" : 6764,
+	"type_id" : "5",
+	"type_code" : "AC_RDV",
+	"label" : "azerty",
+	"datep" : 1555365600,
+	"datef" : 1555538399,
+	"durationp" : 172799,
+	"fulldayevent" : 1,
+	"punctual" : 1,
+	"percentage" : "-1",
+	"transparency" : 1,
+	"priority" : 0,
+	"userassigned" : {
+		"1" : {
+			"id" : "1",
+			"transparency" : 1
+		}
+	},
+	"userownerid" : "1",
+	"fk_project" : 0,
+	"note" : "wxcvbn",
+	"duree" : 0
+}

dev/examples/zapier/package.json

@@ -15,7 +15,7 @@
     "npm": ">=5.6.0"
   },
   "dependencies": {
-    "zapier-platform-core": "17.5.0"
+    "zapier-platform-core": "18.1.1"
   },
   "devDependencies": {
     "mocha": "^5.2.0",

dev/initdemo/initdemo.sh

@@ -46,6 +46,8 @@ passwd=$6
 if [ "$confirm" != "confirm" ]
 then
 	echo "----- $0 -----"
+	echo "Usage: initdemo.sh confirm "
+	echo " or"
 	echo "Usage: initdemo.sh confirm [mysqldump_dolibarr_x.x.x.sql database port login pass]"
 	exit
 fi
@@ -56,6 +58,8 @@ command -v dialog >/dev/null 2>&1 || {
 	echo "Error: command dialog not found. On Linux, you can install it with: apt install dialog"
 	exit
 }
+DIALOG=${DIALOG:=dialog}
+DIALOG="$DIALOG --ascii-lines"
 
 
 # ----------------------------- if no params on command line
@@ -67,8 +71,7 @@ then
 	dumpfile=$(basename "$dumpfile")
 
 	# ----------------------------- input file
-	DIALOG=${DIALOG:=dialog}
-	DIALOG="$DIALOG --ascii-lines"
+
 	fichtemp=$(mktemp 2>/dev/null) || fichtemp=/tmp/test$$
 	# shellcheck disable=2064,2172
 	trap "rm -f $fichtemp" 0 1 2 5 15
@@ -85,8 +88,6 @@ then
 	rm "$fichtemp"
 
 	# ----------------------------- database name
-	DIALOG=${DIALOG:=dialog}
-	DIALOG="$DIALOG --ascii-lines"
 	fichtemp=$(mktemp 2>/dev/null) || fichtemp=/tmp/test$$
 	# shellcheck disable=2064,2172
 	trap "rm -f '$fichtemp'" 0 1 2 5 15
@@ -103,13 +104,10 @@ then
 	rm "$fichtemp"
 
 	# ---------------------------- database port
-	DIALOG=${DIALOG:=dialog}
 	fichtemp=$(mktemp 2>/dev/null) || fichtemp=/tmp/test$$
 	# shellcheck disable=2064,2172
 	trap "rm -f '$fichtemp'" 0 1 2 5 15
-	$DIALOG --title "Init Dolibarr with demo values" --clear \
-		--inputbox "Mysql port (ex: 3306):" 16 55 3306 2> "$fichtemp"
-
+	$DIALOG --title "Init Dolibarr with demo values" --clear --inputbox "Mysql port (ex: 3306):" 16 55 3306 2> "$fichtemp"
 	valret=$?
 
 	case $valret in
@@ -123,13 +121,10 @@ then
 	rm "$fichtemp"
 
 	# ---------------------------- compte admin mysql
-	DIALOG=${DIALOG:=dialog}
 	fichtemp=$(mktemp 2>/dev/null) || fichtemp=/tmp/test$$
 	# shellcheck disable=2064,2172
 	trap "rm -f '$fichtemp'" 0 1 2 5 15
-	$DIALOG	 --title "Init Dolibarr with demo values" --clear \
-		--inputbox "Mysql user login (ex: root):" 16 55 root 2> "$fichtemp"
-
+	$DIALOG	 --title "Init Dolibarr with demo values" --clear --inputbox "Mysql user login (ex: root):" 16 55 root 2> "$fichtemp"
 	valret=$?
 
 	case $valret in
@@ -143,13 +138,10 @@ then
 	rm "$fichtemp"
 
 	# ---------------------------- password admin mysql (root)
-	DIALOG=${DIALOG:=dialog}
 	fichtemp=$(mktemp 2>/dev/null) || fichtemp=/tmp/test$$
 	# shellcheck disable=2064,2172
 	trap "rm -f '$fichtemp'" 0 1 2 5 15
-	$DIALOG --title "Init Dolibarr with demo values" --clear \
-		--passwordbox "Password for Mysql user login :" 16 55 2> "$fichtemp"
-
+	$DIALOG --title "Init Dolibarr with demo values" --clear --passwordbox "Password for Mysql user login :" 16 55 2> "$fichtemp"
 	valret=$?
 
 	case $valret in
@@ -169,9 +161,7 @@ then
 
 
 	# ---------------------------- confirmation
-	DIALOG=${DIALOG:=dialog}
-	$DIALOG --title "Init Dolibarr with demo values" --clear \
-		--yesno "Do you confirm ? \n Dump file : '$dumpfile' \n Dump dir : '$mydir' \n Document dir : '$documentdir' \n Mysql database : '$base' \n Mysql port : '$port' \n Mysql login: '$admin' \n Mysql password : --hidden--" 15 55
+	$DIALOG --title "Init Dolibarr with demo values" --clear --yesno "Do you confirm ? \n Dump file : '$dumpfile' \n Dump dir : '$mydir' \n Document dir : '$documentdir' \n Mysql database : '$base' \n Mysql port : '$port' \n Mysql login: '$admin' \n Mysql password : --hidden--" 15 55
 
 	case $? in
 		0)      echo "Ok, start process..." ;;
@@ -211,26 +201,21 @@ export documentdir
 documentdir=$(< "$mydir/../../htdocs/conf/conf.php" grep '^\$dolibarr_main_data_root' | sed -e 's/$dolibarr_main_data_root=//' | sed -e 's/;//' | sed -e "s/'//g" | sed -e 's/"//g')
 if [ "$documentdir" != "" ]
 then
-	"$DIALOG" --title "Reset document directory" --clear \
-		--inputbox "DELETE and recreate document directory '$documentdir/':" 16 55 n 2> "$fichtemp"
-
+	$DIALOG --title "Reset document directory" --clear --yesno "DELETE and recreate document directory '$documentdir/':" 16 55
 	valret=$?
 
 	case $valret in
 		0)
-			rep=$(cat "$fichtemp") ;;
+			#  YES
+			echo "RECREATE $documentdir"
+			echo "  rm -fr '$documentdir/'*"
+			rm -fr "${documentdir:?}/"* ;;
 		1)
 			exit ;;
 		255)
 			exit ;;
 	esac
 
-	echo "rep=$rep"
-	if [ "$rep" = "y" ]; then
-		echo "rm -fr '$documentdir/'*"
-		rm -fr "${documentdir:?}/"*
-	fi
-
 	echo "cp -pr '$mydir/documents_demo/'* '$documentdir/'"
 	cp -pr "$mydir/documents_demo/"* "$documentdir/"
 

dev/initdemo/savedemo.sh

@@ -256,6 +256,7 @@ export list="
 --ignore-table=$base.llx_c_ticketsup_type
 --ignore-table=$base.llx_cabinetmed_c_banques
 --ignore-table=$base.llx_cabinetmed_c_examconclusion
+--ignore-table=$base.llx_cabinetmed_cons
 --ignore-table=$base.llx_cabinetmed_cons_extrafields
 --ignore-table=$base.llx_cabinetmed_diaglec
 --ignore-table=$base.llx_cabinetmed_examaut
@@ -269,6 +270,7 @@ export list="
 --ignore-table=$base.llx_congespayes_events
 --ignore-table=$base.llx_congespayes_logs
 --ignore-table=$base.llx_congespayes_users
+--ignore-table=$base.llx_deplacement
 --ignore-table=$base.llx_dolicloud_customers
 --ignore-table=$base.llx_dolicloud_stats
 --ignore-table=$base.llx_dolicloud_emailstemplates

dev/lockedfiles.txt

@@ -2,6 +2,6 @@
 This file is the list of the signatures of some set of files locked to block a commit if files are tried to be modified for a given version.
 It is used by the CI or the script to check and guarantee that no change is done on a given scope of files.
 
-Version		Scope						Signature (generated by dev/build/generate_filelist_xml.php) that must remain unchanged for this couple version/scope
+Version		Scope						Algo	Signature (generated by dev/build/generate_filelist_xml.php) that must remain unchanged for this couple version/scope
 
-x.0.0		unalterable_files			123456
+x.0.0		unalterable_files			sha256	123456

dev/resources/dbmodel/README

@@ -1,2 +1,2 @@
 This directory contains the file with the graphical database structure.
-It can be read with MySQL Workbench software. 
+It can be read with MySQL Workbench software.

dev/resources/iso-normes/EORI.txt

@@ -2,5 +2,5 @@ EORI
 
 https://en.wikipedia.org/wiki/EORI_number
 
-in Dolibarr avaiable since v13 
+in Dolibarr avaiable since v13
 - it is set to field 'profid5'

dev/resources/iso-normes/accountancy/accountancy_rules.txt

@@ -18,5 +18,3 @@ Et ça marche à l’inverse avec un fournisseur sauf que l’on est en 775000 a
 
 Un compte comptable de Tiers vente = Acount Receivable
 Un compte comptable de Tiers achat = Acount Payable
-
- 

dev/resources/iso-normes/address_format.txt

@@ -3,4 +3,3 @@ Address format
 https://bitboost.com/ref/international-address-formats.html#Formats
 
 https://www.upu.int/en/Postal-Solutions/Programmes-Services/Addressing-Solutions
-

dev/resources/iso-normes/banking/iban_iso-13616_fr.txt

@@ -117,5 +117,3 @@ IBAN : FR54 3000 4031 2800 032T 56H9 125
     Division :
     3000403128000322956179125152754 / 97 =
     3000403128000322956179125152753 reste 1.
-
-

dev/resources/iso-normes/code_nace.txt

@@ -1,4 +1,4 @@
-NACE 
+NACE
 
 https://ec.europa.eu/eurostat/ramon/nomenclatures/index.cfm?TargetUrl=LST_CLS_DLD&StrNom=NACE_REV2&StrLanguageCode=EN&StrLayoutCode=
 

dev/resources/iso-normes/countries_iso-3166_en.txt

@@ -3,7 +3,7 @@
 # The list is updated whenever a change to the official code list in ISO 3166-1 is effected by the ISO 3166/MA.
 # It lists 240 official short names and code elements. One line of text contains one entry.
 # A country name and its code element are separated by a semicolon (;).
-# https://www.iso.org/iso-3166-country-codes.html 
+# https://www.iso.org/iso-3166-country-codes.html
 
 # https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes
 # ISO-3166:         https://en.wikipedia.org/wiki/ISO_3166-1

dev/resources/iso-normes/intracommreport/schema_deb.xsd

@@ -136,4 +136,4 @@
 <xsd:element name="regionCode" type="xsd:string"/>
 <xsd:element name="date" type="xsd:date"/>
 <xsd:element name="time" type="xsd:time"/>
-</xsd:schema>
+</xsd:schema>

dev/resources/iso-normes/languages_iso-639.txt

@@ -52,12 +52,12 @@ GUARANI         GN     AMERINDIAN
 GUJARATI        GU     INDIAN
 
 HAUSA           HA     NEGRO-AFRICAN
-HEBREW          HE     SEMITIC [*Changed 1989 from original ISO 639:1988, IW] 
+HEBREW          HE     SEMITIC [*Changed 1989 from original ISO 639:1988, IW]
 HINDI           HI     INDIAN
 HUNGARIAN       HU     FINNO-UGRIC
 
 ICELANDIC       IS     GERMANIC
-INDONESIAN      ID     OCEANIC/INDONESIAN [*Changed 1989 from original ISO 639:1988, IN] 
+INDONESIAN      ID     OCEANIC/INDONESIAN [*Changed 1989 from original ISO 639:1988, IN]
 INTERLINGUA     IA     INTERNATIONAL AUX.
 INTERLINGUE     IE     INTERNATIONAL AUX.
 INUKTITUT       IU     [        ]
@@ -159,7 +159,7 @@ WOLOF           WO     NEGRO-AFRICAN
 
 XHOSA           XH     NEGRO-AFRICAN
 
-YIDDISH         YI     GERMANIC [*Changed 1989 from original ISO 639:1988, JI] 
+YIDDISH         YI     GERMANIC [*Changed 1989 from original ISO 639:1988, JI]
 YORUBA          YO     NEGRO-AFRICAN
 
 ZHUANG          ZA     [       ]
@@ -211,7 +211,7 @@ GALICIAN        GL     ROMANCE
 GUARANI         GN     AMERINDIAN
 GUJARATI        GU     INDIAN
 HAUSA           HA     NEGRO-AFRICAN
-HEBREW          HE     SEMITIC [*Changed 1989 from original ISO 639:1988, IW] 
+HEBREW          HE     SEMITIC [*Changed 1989 from original ISO 639:1988, IW]
 HINDI           HI     INDIAN
 CROATIAN        HR     SLAVIC
 HUNGARIAN       HU     FINNO-UGRIC
@@ -219,7 +219,7 @@ ARMENIAN        HY     INDO-EUROPEAN (OTHER)
 INTERLINGUA     IA     INTERNATIONAL AUX.
 INTERLINGUE     IE     INTERNATIONAL AUX.
 INUPIAK         IK     ESKIMO
-INDONESIAN      ID     OCEANIC/INDONESIAN [*Changed 1989 from original ISO 639:1988, IN] 
+INDONESIAN      ID     OCEANIC/INDONESIAN [*Changed 1989 from original ISO 639:1988, IN]
 ICELANDIC       IS     GERMANIC
 ITALIAN         IT     ROMANCE
 INUKTITUT       IU     [        ]
@@ -304,7 +304,7 @@ VIETNAMESE      VI     ASIAN
 VOLAPUK         VO     INTERNATIONAL AUX.
 WOLOF           WO     NEGRO-AFRICAN
 XHOSA           XH     NEGRO-AFRICAN
-YIDDISH         YI     GERMANIC [*Changed 1989 from original ISO 639:1988, JI] 
+YIDDISH         YI     GERMANIC [*Changed 1989 from original ISO 639:1988, JI]
 YORUBA          YO     NEGRO-AFRICAN
 ZHUANG          ZA     [       ]
 CHINESE         ZH     ASIAN
@@ -362,7 +362,7 @@ GERMAN          DE      GERMANIC
 ICELANDIC       IS      GERMANIC
 NORWEGIAN       NO      GERMANIC
 SWEDISH         SV      GERMANIC
-YIDDISH         YI      GERMANIC [*Changed 1989 from original ISO 639:1988, JI] 
+YIDDISH         YI      GERMANIC [*Changed 1989 from original ISO 639:1988, JI]
 
 AFAN (OROMO)    OM      HAMITIC
 AFAR            AA      HAMITIC
@@ -420,7 +420,7 @@ YORUBA          YO      NEGRO-AFRICAN
 ZULU            ZU      NEGRO-AFRICAN
 
 FIJI            FJ      OCEANIC/INDONESIAN
-INDONESIAN      ID      OCEANIC/INDONESIAN [*Changed 1989 from original ISO 639:1988, IN] 
+INDONESIAN      ID      OCEANIC/INDONESIAN [*Changed 1989 from original ISO 639:1988, IN]
 JAVANESE        JV      OCEANIC/INDONESIAN
 MALAGASY        MG      OCEANIC/INDONESIAN
 MALAY           MS      OCEANIC/INDONESIAN
@@ -444,7 +444,7 @@ SPANISH         ES      ROMANCE
 
 AMHARIC         AM      SEMITIC
 ARABIC          AR      SEMITIC
-HEBREW          HE      SEMITIC [*Changed 1989 from original ISO 639:1988, IW] 
+HEBREW          HE      SEMITIC [*Changed 1989 from original ISO 639:1988, IW]
 MALTESE         MT      SEMITIC
 TIGRINYA        TI      SEMITIC
 

dev/resources/iso-normes/tax/vat_number_names.txt

@@ -5,4 +5,4 @@ terms
 (fr) TVA = Taxe sur la Valeur Ajouté
 (es) NIF / CIF
 (de) USt / MwSt = UmsatzSteuer / Mehrwertsteuer
-(it) IVA 
+(it) IVA

dev/resources/iso-normes/tax/world_tax_rates.txt

@@ -5,6 +5,6 @@ https://www.taxrates.cc/index.html
 https://en.wikipedia.org/wiki/List_of_countries_by_tax_rates
 
 For India: VAT=IGST / CGST=Localtax1 / SGST=Localtax2
-see: 
+see:
   https://cleartax.in/s/what-is-sgst-cgst-igst
   https://www.mastersindia.co/blog/what-is-cgst-sgst-igst-and-ugst/

dev/setup/apache/README

@@ -3,4 +3,4 @@ README (English)
 
 If your web hosting does not allow you to place the folder "documents" outside
 the site root, add the htaccess.txt in the root directory of
-folder "documents" by renaming it into .htaccess
+folder "documents" by renaming it into .htaccess

dev/setup/codesniffer/Sniffs/Dolibarr/CheckIsModEnabledArgumentSniff.php

@@ -0,0 +1,103 @@
+<?php
+/* Copyright (C) 2025       Frédéric France         <frederic.france@free.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace codesniffer\Sniffs\Dolibarr;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * CheckIsModEnabledArgumentSniff
+ */
+class CheckIsModEnabledArgumentSniff implements Sniff
+{
+	// Nom de la fonction cible
+	protected $targetFunction = 'ismodenabled';
+
+	protected $deprecatedModulesNames = [
+		'actioncomm' => 'agenda',
+		'adherent' => 'member',
+		'adherent_type' => 'member_type',
+		'banque' => 'bank',
+		'categorie' => 'category',
+		'commande' => 'order',
+		'contrat' => 'contract',
+		'entrepot' => 'stock',
+		'expedition' => 'shipping',
+		'facture' => 'invoice',
+		'ficheinter' => 'intervention',
+		'product_fournisseur_price' => 'productsupplierprice',
+		'product_price' => 'productprice',
+		'projet'  => 'project',
+		'propale' => 'propal',
+		'socpeople' => 'contact',
+	];
+
+	/**
+	 * register
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		// We are listening function calls (T_STRING)
+		return [T_STRING];
+	}
+
+	/**
+	 * process
+	 *
+	 * @param  File $phpcsFile file to process
+	 * @param  mixed $stackPtr pointer
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		if (strtolower($tokens[$stackPtr]['content']) !== strtolower($this->targetFunction)) {
+			return;
+		}
+
+		// Check that it is a function call (followed by '(')
+		$openParen = $phpcsFile->findNext(T_WHITESPACE, $stackPtr + 1, null, true);
+		if ($tokens[$openParen]['code'] !== T_OPEN_PARENTHESIS) {
+			return;
+		}
+
+		// We are looking for the first 'useful' token after the parenthesis
+		$firstArgTokenPtr = $phpcsFile->findNext(T_WHITESPACE, $openParen + 1, null, true);
+
+		// If the function is called without arguments (isModEnabled()), we stop
+		if ($tokens[$firstArgTokenPtr]['code'] === T_CLOSE_PARENTHESIS) {
+			return;
+		}
+
+		// check value of argument
+		$argContent = str_replace(["'", '"'], '', $tokens[$firstArgTokenPtr]['content']);
+		$argCode = $tokens[$firstArgTokenPtr]['code'];
+
+		if (array_key_exists($argContent, $this->deprecatedModulesNames)) {
+			$phpcsFile->addError(
+				'The function "%s" has deprecated argument ("%s") to replace with "%s".',
+				$firstArgTokenPtr,
+				'DeprecatedArgument',
+				[$tokens[$stackPtr]['content'], $argContent, $this->deprecatedModulesNames[$argContent]]
+			);
+		}
+	}
+}

dev/setup/codesniffer/Sniffs/Dolibarr/LanguageOfCommentsSniff.php

@@ -0,0 +1,112 @@
+<?php
+/* Copyright (C) 2025       Frédéric France         <frederic.france@free.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+namespace codesniffer\Sniffs\Dolibarr;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * LanguageOfCommentsSniff
+ */
+class LanguageOfCommentsSniff implements Sniff
+{
+	// List of words that betray a comment in French
+	public $frenchWords = [
+		' additionner ',
+		' arrondir ',
+		' avec ',
+		' calculer ',
+		' chaine ',
+		' chaîne ',
+		' chercher ',
+		' chiffre ',
+		' chiffres ',
+		// ' commande ',
+		' commandes ',
+		' compteur ',
+		' compteurs ',
+		' contrats ',
+		' depuis ',
+		' diviser ',
+		' donnée ',
+		' entier ',
+		// ' facture ', // avoid french name of dolibarr object
+		' factures ',
+		' ligne ',
+		' lignes ',
+		' modèle ',
+		' niveau ',
+		' niveaux ',
+		' nombre ',
+		' parametrage ',
+		' paramétrage ',
+		' pourcentage ',
+		' produit ',
+		' produits ',
+		' quand ',
+		' rechercher ',
+		' sinon ',
+		' stocker ',
+		' soustraire ',
+		' sujet ',
+		' sujets ',
+		' suppression ',
+		' utilisateur ',
+		' utilisateurs ',
+		' valeur ',
+		' valeurs ',
+	];
+
+	/**
+	 * Which tokens to listen ?
+	 * T_COMMENT = comments // or #
+	 * T_DOC_COMMENT_STRING = text in block comments
+	 * @return int[]
+	 */
+	public function register()
+	{
+		return [
+			T_COMMENT,
+			T_DOC_COMMENT_STRING,
+		];
+	}
+
+	/**
+	 * process
+	 *
+	 * @param  File $phpcsFile file to process
+	 * @param  mixed $stackPtr pointer
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+		$content = $tokens[$stackPtr]['content'];
+
+		// Basic cleanup (lowercase for comparison)
+		$contentLower = strtolower($content);
+
+		foreach ($this->frenchWords as $word) {
+			if (strpos($contentLower, $word) !== false) {
+				$error = "The comment appears to be in French (word detected: '%s'). Please write in English.";
+				$data  = [trim($word)];
+				$phpcsFile->addWarning($error, $stackPtr, 'FrenchDetected', $data);
+				return; // We stop at the first occurrence.
+			}
+		}
+	}
+}

dev/setup/codesniffer/php.ini

@@ -1,7 +1,7 @@
 [PHP]
 
 ; ************************
-: Need a special php.ini to allow usage of 
+: Need a special php.ini to allow usage of
 ; ************************
 
 ;;;;;;;;;;;;;;;;;;;

dev/setup/codesniffer/ruleset.xml

@@ -21,6 +21,11 @@
 	<exclude-pattern>/\.git/</exclude-pattern>
 	<exclude-pattern>/\.cache/</exclude-pattern>
 
+	<!-- Custom rules -->
+	<config name="installed_paths" value="/dev/setup/codesniffer" />
+	<rule ref="codesniffer.Dolibarr.LanguageOfComments"/>
+	<rule ref="codesniffer.Dolibarr.CheckIsModEnabledArgument"/>
+
 	<!-- List of all tests -->
 
 
@@ -31,12 +36,12 @@
 	<!-- Rules from Generic Standard -->
 	<!--
 	<rule ref="PSR12.Files.OpenTag">
-        <properties>
-            <property name="ignoreIndent" value="true"/>
-        </properties>
-    </rule>
+		<properties>
+			<property name="ignoreIndent" value="true"/>
+		</properties>
+	</rule>
 	<exclude name="PSR12.WhiteSpace.ScopeIndent"/>
-    -->
+	-->
 
 	<!-- We want to allow empty statement: It allows to put some code comments into the else for examples -->
 	<rule ref="Generic.CodeAnalysis.EmptyStatement">
@@ -76,16 +81,16 @@
 		<severity>0</severity>
 	</rule>
 
-    <!-- Lower severity on warnings we do not want to show in the pre-commit reports -->
-    <rule ref="Generic.Files.LineLength.TooLong">
+	<!-- Lower severity on warnings we do not want to show in the pre-commit reports -->
+	<rule ref="Generic.Files.LineLength.TooLong">
 		<severity>4</severity>
-    </rule>
-    <rule ref="Generic.Metrics.CyclomaticComplexity.TooHigh">
+	</rule>
+	<rule ref="Generic.Metrics.CyclomaticComplexity.TooHigh">
 		<severity>4</severity>
-    </rule>
-    <rule ref="Generic.Metrics.NestingLevel.TooHigh">
+	</rule>
+	<rule ref="Generic.Metrics.NestingLevel.TooHigh">
 		<severity>4</severity>
-    </rule>
+	</rule>
 
 
 	<!-- Warnings on TODO -->

dev/setup/codetemplates/codetemplates.xml

@@ -7,7 +7,7 @@
  */</template><template autoinsert="true" context="phpcomment" deleted="false" description="Comment for created constructors" enabled="true" id="org.eclipse.php.ui.editor.templates.php.codetemplates.constructorcomment" name="constructorcomment">/**
  * ${tags}
  */</template><template autoinsert="true" context="phpcomment" deleted="false" description="Comment for created PHP files" enabled="true" id="org.eclipse.php.ui.editor.templates.php.codetemplates.filecomment" name="filecomment">/**
- * 
+ *
  */
 </template><template autoinsert="true" context="phpcomment" deleted="false" description="Comment for created types" enabled="true" id="org.eclipse.php.ui.editor.templates.php.codetemplates.typecomment" name="typecomment">/**
  * @author ${user}
@@ -47,7 +47,7 @@ ${cursor}</template><template autoinsert="false" context="php" deleted="false" d
 	case ${value}:
 	${cursor};
 	break;
-	
+
 	default:
 		;
 	break;
@@ -66,21 +66,21 @@ ${cursor}</template><template autoinsert="false" context="php" deleted="false" d
 </template><template autoinsert="false" context="php" deleted="false" description="lambda function statement (closure)" enabled="true" id="org.eclipse.php.ui.editor.templates.php.closure" name="closure">function (${parameters}) use (${lexical_variables}) {
 	${cursor};
 }
-</template><template autoinsert="false" context="php" deleted="false" description="class statement" enabled="true" id="org.eclipse.php.ui.editor.templates.php.cls" name="cls">class ${class_name} 
+</template><template autoinsert="false" context="php" deleted="false" description="class statement" enabled="true" id="org.eclipse.php.ui.editor.templates.php.cls" name="cls">class ${class_name}
 {
-	function ${function_name}() 
+	function ${function_name}()
     {
 		${cursor};
 	}
 }
-</template><template autoinsert="false" context="php" deleted="false" description="class statement" enabled="true" id="org.eclipse.php.ui.editor.templates.php.class" name="class">class ${class_name} 
+</template><template autoinsert="false" context="php" deleted="false" description="class statement" enabled="true" id="org.eclipse.php.ui.editor.templates.php.class" name="class">class ${class_name}
 {
-	function ${function_name}() 
+	function ${function_name}()
     {
 		${cursor};
 	}
 }
-</template><template autoinsert="false" context="php" deleted="false" description="if statement" enabled="true" id="org.eclipse.php.ui.editor.templates.php.if" name="if">if (${condition}) 
+</template><template autoinsert="false" context="php" deleted="false" description="if statement" enabled="true" id="org.eclipse.php.ui.editor.templates.php.if" name="if">if (${condition})
 {
 	${cursor};
 }
@@ -115,7 +115,7 @@ if (${dollar}${dirh}) {
 	${cursor};
 }
 </template><template autoinsert="false" context="php" deleted="false" description="Trap code output" enabled="true" id="org.eclipse.php.ui.editor.templates.php.my_gc" name="my_gc">ob_start();
-	
+
 ${cursor};
 
 ${dollar}${contents} = ob_get_contents();
@@ -142,4 +142,4 @@ ${cursor}
     &lt;/body&gt;
     &lt;/noframes&gt;
 &lt;/frameset&gt;
-&lt;/html&gt;</template></templates>
+&lt;/html&gt;</template></templates>

dev/setup/multitail/.multitailrc

@@ -9,4 +9,4 @@ cs_re:red:.*ERR.*
 cs_re:white,yellow:.*WARNING.*
 cs_re:green,yellow:.*NOTICE.*
 cs_re:green:.*INFO.*
-cs_re:white:.*DEBUG.*
+cs_re:white:.*DEBUG.*

dev/setup/xdebug/README

@@ -16,4 +16,4 @@ xdebug.show_local_vars=off
 xdebug.profiler_output_dir=/var/tmp
 xdebug.profiler_append=0
 
-Then xdebug profiling can be enabled by adding XDEBUG_PROFILE=1 on URL. 
+Then xdebug profiling can be enabled by adding XDEBUG_PROFILE=1 on URL.

dev/skeletons/README.md

@@ -1 +1 @@
-Files and tools of a skeleton to build a module were moved into htdocs/modulebuilder/template
+Files and tools of a skeleton to build a module were moved into htdocs/modulebuilder/template

dev/tools/api/macos/README

@@ -5,29 +5,27 @@ README (English)
 RapidAPI
 ##############
 
-RapidAPI for Mac is a full-featured HTTP client that let's you test and describe the APIs you build or consume. 
+RapidAPI for Mac is a full-featured HTTP client that let's you test and describe the APIs you build or consume.
 It has a beautiful native macOS interface to compose requests, inspect server responses, generate client code and export API definitions.
 
 https://paw.cloud/
 
 
-                                                                                
-                          @@@                                                   
-                      (@@@@@@             @@@@@@@@@@@@@@@@@@@@@@@@@%            
-                     @@@@@@,              @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@,       
-                    @@@@@                 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@     
-          (@@@@@@(      @@@@@@@@          @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@   
-       @@@@@@@@@@@@@@@@@@@@@@@@@@@@*      @@@@@@@@@@@.      /@@@@@@@@@@@@@@@@@( 
-     @@@@@@@@@@@@@@@@@@@@@@@@@@@@@*       @@@@@@@@@@@.            @@@@@@@@@@@@@ 
+
+                          @@@
+                      (@@@@@@             @@@@@@@@@@@@@@@@@@@@@@@@@%
+                     @@@@@@,              @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@,
+                    @@@@@                 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+          (@@@@@@(      @@@@@@@@          @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+       @@@@@@@@@@@@@@@@@@@@@@@@@@@@*      @@@@@@@@@@@.      /@@@@@@@@@@@@@@@@@(
+     @@@@@@@@@@@@@@@@@@@@@@@@@@@@@*       @@@@@@@@@@@.            @@@@@@@@@@@@@
     @@@@@@@@@@@@@@@@@@@@@@@@@@@@@         @@@@@@@@@@@              /@@@@@@@@@@@@
     @@@@@@@@@@@@@@@@@@@@@@@@@@@@          @@@@@@@@@@@               @@@@@@@@@@@@
     @@@@@@@@@@@@@@@@@@@@@@@@@@@@          @@@@@@@@@@@               @@@@@@@@@@@@
     @@@@@@@@@@@@@@@@@@@@@@@@@@@@#         @@@@@@@@@@@              @@@@@@@@@@@@&
-    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@        @@@@@@@@@@@            @@@@@@@@@@@@@@ 
-     @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@     @@@@@@@@@@@  &@@@@@@@@@@@@@@@@@@@@@@  
-      @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@      @@@@@@@@@@@  &@@@@@@@@@@@@@@@@@@@@/   
-        @@@@@@@@@@@@@@@@@@@@@@@@@@&      .@@@@@@@@@@@  &@@@@@@@@@@@@@@@@@@/     
-         (@@@@@@@@@@@@@@@@@@@@@@@        .@@@@@@@@@@@  &@@@@@@@@@@@@@@@(        
+    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@        @@@@@@@@@@@            @@@@@@@@@@@@@@
+     @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@     @@@@@@@@@@@  &@@@@@@@@@@@@@@@@@@@@@@
+      @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@      @@@@@@@@@@@  &@@@@@@@@@@@@@@@@@@@@/
+        @@@@@@@@@@@@@@@@@@@@@@@@@@&      .@@@@@@@@@@@  &@@@@@@@@@@@@@@@@@@/
+         (@@@@@@@@@@@@@@@@@@@@@@@        .@@@@@@@@@@@  &@@@@@@@@@@@@@@@(
             @@@@@        @@@@@           .@@@@@@@@@@@  @@@@@@@@@@@*
-            
-            

dev/tools/apstats.php

@@ -61,7 +61,7 @@ if (empty($argv[1])) {
 $outputpath = $argv[1];
 $outputdir = dirname($outputpath);
 $outputfile = basename($outputpath);
-$outputfilerss = preg_replace('/\.\w+$/i', '', $outputfile).'-security.rss';
+$outputfilerss = preg_replace('/\.\w+$/i', '', $outputfile).'-security.rss';	// Replace the .html by -security.rss
 
 if (!is_dir($outputdir)) {
 	print 'Error: dir '.$outputdir.' does not exists or is not writable'."\n";
@@ -271,7 +271,7 @@ $nbofmonth = 6;
 $delay = (3600 * 24 * 30 * $nbofmonth);
 $arrayofalerts = array();
 
-$commandcheck = "git log --all --shortstat --no-renames --use-mailmap --pretty=".escapeshellarg('format:%cI;%H;%aN;%aE;%ce;%s')." --since=".escapeshellarg(dol_print_date(dol_now() - $delay, '%Y-%m-%d'))." | grep -i -E ".escapeshellarg("(#yogosha|CVE|Sec:|Sec |Sec$)");
+$commandcheck = "git log --all --shortstat --no-renames --use-mailmap --pretty=".escapeshellarg('format:%cI;%H;%aN;%aE;%ce;%s')." --since=".escapeshellarg(dol_print_date(dol_now() - $delay, '%Y-%m-%d'))." | grep -i -E ".escapeshellarg("(#ghsa|#yogosha|CVE|Sec:|Sec |^Sec$)");
 print 'Execute git log to get commits related to security: '.$commandcheck."\n";
 $output_arrglpu = array();
 $resexecglpu = 0;
@@ -280,12 +280,12 @@ foreach ($output_arrglpu as $valgitlog) {		// The most recent lines are first.
 	// Parse the line to split interesting data
 	$tmpval = cleanVal2($valgitlog);
 
-	if (preg_match('/(#yogosha|CVE[\s\-]*\d|Sec:|Sec\s|Sec$)/i', $tmpval['title'])) {	// Recommended git comment:  "Sec: Fix #..."
+	if (preg_match('/(#ghsa|#yogosha|CVE[\s\-]*\d|Sec:|Sec\s|^Sec$)/i', $tmpval['title'])) {	// Recommended git comment:  "Fix #..."
 		$alreadyfound = '';
 		$alreadyfoundcommitid = '';
 		foreach ($arrayofalerts as $val) {	// Loop on already found alerts
-			if ($val['issueidyogosha'] && $val['issueidyogosha'] == $tmpval['issueidyogosha']) {	// Already in list
-				$alreadyfound = 'yogosha';
+			if ($val['issueidvdp'] && $val['issueidvdp'] == $tmpval['issueidvdp']) {	// Already in list
+				$alreadyfound = 'vdp';
 				$alreadyfoundcommitid = $val['commitid'];
 				break;
 			}
@@ -841,10 +841,10 @@ $html .= '<h2><span class="fas fa-code pictofixedwidth"></span>'.$title_security
 $html .= '<div class="boxallwidth">'."\n";
 $html .= '<div class="div-table-responsive">'."\n";
 $html .= '<table class="list_technical_debt centpercent">'."\n";
-$html .= '<tr class="trgroup"><td>Commit ID</td><td>Date</td><td style="white-space: nowrap">Reported on<br>Yogosha</td><td style="white-space: nowrap">Reported on<br>GIT</td><td style="white-space: nowrap"><a href="https://www.cve.org/CVERecord/SearchResults?query=dolibarr">Reported on<br>CVE</a></td><td>Title</td><td>Branch of fix</td></tr>'."\n";
+$html .= '<tr class="trgroup"><td>Commit ID</td><td>Date</td><td style="white-space: nowrap">Reported on a<br>VDP (GHSA, Yogosha...)</td><td style="white-space: nowrap">Reported on<br>GitHub issues</td><td style="white-space: nowrap"><a href="https://www.cve.org/CVERecord/SearchResults?query=dolibarr">Reported on<br>CVE</a></td><td>Title</td><td>Branch of fix</td></tr>'."\n";
 foreach ($arrayofalerts as $key => $alert) {
 	$cve = '';
-	$yogosha = empty($alert['issueidyogosha']) ? '' : $alert['issueidyogosha'];
+	$vdp = empty($alert['issueidvdp']) ? '' : $alert['issueidvdp'];
 	$arrayofalerts[$key]['url_commit'] = 'https://github.com/Dolibarr/dolibarr/commit/'.$alert['commitid'];
 	if (!empty($alert['issueid'])) {
 		$arrayofalerts[$key]['url_issue'] = 'https://github.com/Dolibarr/dolibarr/issues/'.$alert['issueid'];
@@ -853,7 +853,7 @@ foreach ($arrayofalerts as $key => $alert) {
 		$cve = preg_replace('/\s+/', '-', trim($alert['issueidcve']));
 		$arrayofalerts[$key]['url_cve'] = 'https://nvd.nist.gov/vuln/detail/CVE-'.$cve;
 	}
-	$arrayofalerts[$key]['title'] = ($project ? "[".$project."] " : "").'Security alert - '.($yogosha ? ' Yogosha #'.$yogosha.' - ' : '').($cve ? 'CVE-'.$cve.' - ' : '');
+	$arrayofalerts[$key]['title'] = ($project ? "[".$project."] " : "").'Security alert - '.($vdp ? ' VDP #'.$vdp.' - ' : '').($cve ? 'CVE-'.$cve.' - ' : '');
 	$arrayofalerts[$key]['title'] .= 'Fix committed as: '.dol_trunc($alert['commitid'], 8);
 
 	$arrayofalerts[$key]['description'] = '<![CDATA[Security alert<br>';
@@ -880,13 +880,11 @@ foreach ($arrayofalerts as $key => $alert) {
 	$html .= preg_replace('/T.*$/', '', $alert['created_at']);
 	$html .= '</td>';
 
-	// Yogosha ID
+	// VDP ID
 	$html .= '<td style="white-space: nowrap">';
-	if (!empty($alert['issueidyogosha'])) {
-		//$html .= '<a target="_blank" href="https://yogosha.com?'.$alert['issueidyogosha'].'">';
-		$html .= '#yogosha'.$alert['issueidyogosha'];
-		$arrayofalerts[$key]['description'] .= "\n<br>".'Yogosha ID #'.$alert['issueidyogosha'];
-		//$html .= '</a>';
+	if (!empty($alert['issueidvdp'])) {
+		$html .= '#'.$alert['issueidvdp'];
+		$arrayofalerts[$key]['description'] .= "\n<br>".'VDP ID #'.$alert['issueidvdp'];
 	} else {
 		//$html .= '<span class="opacitymedium">public issue</span>';
 	}
@@ -932,7 +930,7 @@ $html .= '</div>';
 $html .= '</div>';
 
 $html .= '<br>';
-$html .= 'Note:Search is done in git repository on regex string "#yogosha|CVE[\s\-]*\d|Sec:|Sec\s" (not case sensitive)<br>';
+$html .= 'Note:Search is done in git repository on regex string "#ghsa|#yogosha|CVE[\s\-]*\d|Sec:|Sec |^Sec\s" (not case sensitive)<br>';
 $html .= 'You can use this URL for RSS notifications: <a href="/'.$outputfilerss.'">'.$outputfilerss.'</a><br><br>';
 
 $html .= '</section>';
@@ -973,6 +971,18 @@ if ($fh) {
 	}
 	fwrite($fh, '</image>'."\n");
 
+
+	// Loop on arrayofalert to remove alerts that are on develop
+	foreach ($arrayofalerts as $tmpkey => $alert) {
+		$arrayuniquetmp = array_unique($alert['branch']);
+		if (count($arrayuniquetmp) == 1 && in_array('develop', $arrayuniquetmp)) {
+			// The alert has been fixed into develop only, so we discard it for RSS alert
+			print 'The alert with key '.$tmpkey.' is fixed into branch develop only, so we discard it for RSS'."\n";
+			unset($arrayofalerts[$tmpkey]);
+		}
+	}
+
+	// Loop on array of alerts on stable branches
 	foreach ($arrayofalerts as $alert) {
 		$alert['url_commit'] = 'https://github.com/Dolibarr/dolibarr/commit/'.$alert['commitid'];
 
@@ -1135,7 +1145,7 @@ function cleanVal2($val)
 	$tmpval['commitid'] = $tmp[1];
 	$tmpval['url'] = '';
 	$tmpval['issueid'] = '';
-	$tmpval['issueidyogosha'] = '';
+	$tmpval['issueidvdp'] = '';
 	$tmpval['issueidcve'] = '';
 	$tmpval['title'] = array_key_exists(5, $tmp) ? preg_replace('/\.$/', '', $tmp[5]) : '';
 	$tmpval['created_at'] = array_key_exists(0, $tmp) ? $tmp[0] : '';
@@ -1148,8 +1158,11 @@ function cleanVal2($val)
 	if (preg_match('/CVE([0-9\-\s]+)/', $tmpval['title'], $reg)) {
 		$tmpval['issueidcve'] = preg_replace('/^\-/', '', preg_replace('/\s+/', '-', trim($reg[1])));
 	}
-	if (preg_match('/#yogosha(\d+)/i', $tmpval['title'], $reg)) {
-		$tmpval['issueidyogosha'] = $reg[1];
+	if (preg_match('/#(yogosha\d+)/i', $tmpval['title'], $reg)) {
+		$tmpval['issueidvdp'] = strtolower($reg[1]);
+	}
+	if (preg_match('/#(ghsa[a-z\-\d]+)/i', $tmpval['title'], $reg)) {
+		$tmpval['issueidvdp'] = strtolower($reg[1]);
 	}
 
 	return $tmpval;

dev/tools/fixsnakeCaseToCamelCase.sh

@@ -128,5 +128,3 @@ for f in ${TFile[@]}; do
 
 	done
 done
-
-

dev/tools/phan/baseline.txt

@@ -9,19 +9,18 @@
  */
 return [
     // # Issue statistics:
-    // PhanUndeclaredProperty : 420+ occurrences
-    // PhanTypeMismatchProperty : 95+ occurrences
+    // PhanUndeclaredProperty : 410+ occurrences
     // PhanTypeMismatchArgument : 65+ occurrences
-    // PhanUndeclaredGlobalVariable : 60+ occurrences
+    // PhanUndeclaredGlobalVariable : 55+ occurrences
     // PhanTypeMismatchArgumentNullable : 20+ occurrences
+    // PhanTypeMismatchProperty : 20+ occurrences
     // PhanTypeInvalidDimOffset : 15+ occurrences
     // PhanTypeMismatchDimFetch : 10+ occurrences
-    // PhanUndeclaredMethod : 6 occurrences
     // PhanTypeArraySuspiciousNull : 5 occurrences
     // PhanTypeExpectedObjectPropAccess : 5 occurrences
+    // PhanUndeclaredMethod : 5 occurrences
     // PhanPluginDuplicateArrayKey : 4 occurrences
     // PhanPluginUndeclaredVariableIsset : 2 occurrences
-    // PhanPossiblyUndeclaredGlobalVariable : 2 occurrences
     // PhanTypeMismatchArgumentProbablyReal : 2 occurrences
     // PhanParamTooMany : 1 occurrence
     // PhanPossiblyUndeclaredVariable : 1 occurrence
@@ -30,8 +29,6 @@ return [
 
     // Currently, file_suppressions and directory_suppressions are the only supported suppressions
     'file_suppressions' => [
-        'htdocs/bookcal/class/calendar.class.php' => ['PhanUndeclaredMethod', 'PhanUndeclaredProperty'],
-        'htdocs/categories/viewcat.php' => ['PhanUndeclaredProperty'],
         'htdocs/comm/action/index.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchProperty'],
         'htdocs/comm/action/pertype.php' => ['PhanTypeExpectedObjectPropAccess'],
         'htdocs/comm/action/peruser.php' => ['PhanTypeMismatchArgument'],
@@ -51,7 +48,6 @@ return [
         'htdocs/compta/bank/various_payment/info.php' => ['PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/compta/clients.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/compta/facture/card-rec.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/compta/facture/card.php' => ['PhanUndeclaredProperty'],
         'htdocs/compta/facture/class/facture-rec.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/compta/facture/class/facture.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/compta/localtax/card.php' => ['PhanUndeclaredGlobalVariable'],
@@ -104,7 +100,7 @@ return [
         'htdocs/core/modules/cheque/modules_chequereceipts.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/commande/doc/pdf_einstein.modules.php' => ['PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
-        'htdocs/core/modules/contract/doc/pdf_strato.modules.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
+        'htdocs/core/modules/contract/doc/pdf_strato.modules.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/delivery/doc/pdf_storm.modules.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/core/modules/delivery/doc/pdf_typhon.modules.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/core/modules/delivery/mod_delivery_saphir.php' => ['PhanUndeclaredProperty'],
@@ -116,14 +112,11 @@ return [
         'htdocs/core/modules/facture/doc/pdf_octopus.modules.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/core/modules/holiday/mod_holiday_immaculate.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/hrm/mod_evaluation_advanced.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/import/import_csv.modules.php' => ['PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchProperty'],
-        'htdocs/core/modules/import/import_xlsx.modules.php' => ['PhanTypeMismatchProperty'],
+        'htdocs/core/modules/import/import_csv.modules.php' => ['PhanPossiblyUndeclaredVariable'],
         'htdocs/core/modules/member/modules_cards.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/mrp/doc/pdf_vinci.modules.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/mrp/mod_mo_advanced.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/oauth/github_oauthcallback.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/modules/propale/doc/pdf_azur.modules.php' => ['PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
@@ -149,7 +142,6 @@ return [
         'htdocs/delivery/class/delivery.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/emailcollector/class/emailcollector.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/eventorganization/class/conferenceorboothattendee.class.php' => ['PhanUndeclaredMethod', 'PhanUndeclaredProperty'],
-        'htdocs/eventorganization/conferenceorbooth_list.php' => ['PhanTypeMismatchArgument'],
         'htdocs/eventorganization/core/actions_massactions_mail.inc.php' => ['PhanUndeclaredProperty'],
         'htdocs/expedition/card.php' => ['PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/expedition/class/expedition.class.php' => ['PhanUndeclaredProperty'],
@@ -239,11 +231,11 @@ return [
         'htdocs/salaries/virement_request.php' => ['PhanUndeclaredProperty'],
         'htdocs/societe/ajax/company.php' => ['PhanUndeclaredProperty'],
         'htdocs/societe/class/societe.class.php' => ['PhanTypeMismatchProperty'],
-        'htdocs/societe/paymentmodes.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgument'],
+        'htdocs/societe/paymentmodes.php' => ['PhanTypeMismatchArgument'],
         'htdocs/supplier_proposal/card.php' => ['PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/supplier_proposal/class/api_supplier_proposals.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/supplier_proposal/class/supplier_proposal.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/takepos/invoice.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable'],
+        'htdocs/takepos/invoice.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/takepos/split.php' => ['PhanPluginUndeclaredVariableIsset'],
         'htdocs/ticket/card.php' => ['PhanUndeclaredProperty'],
         'htdocs/ticket/class/actions_ticket.class.php' => ['PhanUndeclaredProperty'],

dev/tools/phan/config.php

@@ -227,6 +227,24 @@ return [
 	'backward_compatibility_checks' => false,
 	'simplify_ast' => true,
 	'analyzed_file_extensions' => ['php','inc'],
+	/*'included_extension_subset' => [
+		'curl',
+		'dom',
+		'filter',
+		'gd',
+		'imap',
+		'intl',
+		'json',
+		'libxml',
+		'mbstring',
+		'mysqli',
+		'opcache',
+		'openssl',
+		'session',
+		'sqlite3',
+		'xml',
+		'zip'
+	],*/
 	'globals_type_map' => [
 		'_Avery_Labels' => 'array<string,array{name:string,paper-size:string|array{0:float,1:float},orientation:string,metric:string,marginLeft:float,marginTop:float,NX:int,NY:int,SpaceX:float,SpaceY:float,width:float,height:float,font-size:int,custom_x:float,custom_y:float}>',
 		'action' => 'string',
@@ -439,6 +457,7 @@ return [
 		'PhanTypeObjectUnsetDeclaredProperty',
 		'PhanTypePossiblyInvalidDimOffset',			// a lot of false positive, in most cases, we want to keep the code as it is
 		// 'PhanPluginUnknownArrayFunctionReturnType',	// a lot of false positive, in most cases, we want to keep the code as it is
+		'PhanTypeMismatchArgumentSuperType', 	// a lot of false positive, in most cases, we want to keep the code as it is
 
 		'PhanPluginWhitespaceTab',		// Dolibarr uses tabs
 		'PhanPluginCanUsePHP71Void',	// Dolibarr is maintaining 7.0 compatibility

dev/tools/phan/config_extended.php

@@ -74,6 +74,7 @@ $config['suppress_issue_types'] = [
 		'PhanTypeObjectUnsetDeclaredProperty',
 		'PhanTypePossiblyInvalidDimOffset',		// a lot of false positive, in most cases, we want to keep the code as it is
 		'PhanPluginUnknownArrayFunctionReturnType',	// a lot of false positive, in most cases, we want to keep the code as it is
+		'PhanTypeMismatchArgumentSuperType', 	// a lot of false positive, in most cases, we want to keep the code as it is
 
 		'PhanPluginWhitespaceTab',		// Dolibarr used tabs
 		'PhanPluginCanUsePHP71Void',	// Dolibarr is maintaining 7.0 compatibility

dev/tools/phpstan/phpstan_v1_apstats.neon

@@ -1,4 +1,5 @@
 parameters:
+	phpVersion: 80200 # PHP 8.2
 	tmpDir: ./.github/tmp
 	parallel:
 		# Commented some of the settings, reminding the defaults:
@@ -46,12 +47,15 @@ parameters:
 		- htdocs/includes/tecnickcom/*
 		- htdocs/includes/webklex/*
 		- htdocs/core/class/lessc.class.php
-	checkAlwaysTrueCheckTypeFunctionCall: false
-	checkAlwaysTrueInstanceof: false
-	checkAlwaysTrueStrictComparison: false
+	# checkAlwaysTrueCheckTypeFunctionCall: false
+	# checkAlwaysTrueInstanceof: false
+	# checkAlwaysTrueStrictComparison: false
+	polluteScopeWithLoopInitialAssignments: false
+	polluteScopeWithAlwaysIterableForeach: false
 	checkClassCaseSensitivity: true
 	checkFunctionArgumentTypes: true
 	checkFunctionNameCase: true
+	checkInternalClassCaseSensitivity: true
 	checkArgumentsPassedByReference: true
 	checkMaybeUndefinedVariables: true
 	checkNullables: false
@@ -61,8 +65,6 @@ parameters:
 	reportMaybes: false
 	reportMaybesInMethodSignatures: false
 	reportStaticMethodSignatures: false
-	polluteScopeWithLoopInitialAssignments: true
-	polluteScopeWithAlwaysIterableForeach: true
 	reportMagicMethods: false
 	reportMagicProperties: false
 	treatPhpDocTypesAsCertain: false
@@ -74,6 +76,8 @@ parameters:
 		- '#Empty array passed to foreach#'
 		- '#Unable to resolve the template type T#'
 		- '#in empty\(\) always exists and is always falsy#'
+		- '#in empty\(\) always exists and is not falsy#'
+		- '#in isset() is not nullable#'
 		- '#is always#'
 	internalErrorsCountLimit: 50
 	cache:

dev/tools/rector/.gitignore

@@ -1,2 +1,2 @@
 /test.php
-/vendor
+/vendor

dev/tools/resize_window.sh

@@ -36,4 +36,3 @@ then
 	wmctrl -i -r $1 -e 0,0,0,$width,$height
 	echo Size of windows $1 modified to $width x $height
 fi
-

dev/tools/test/facturex-pdfextractxml.py

@@ -93,5 +93,3 @@ if __name__ == '__main__':
     options, arguments = parser.parse_args()
     sys.argv[:] = arguments
     main(options, arguments)
-    
-    

dev/tools/test/namespacemig/README.md

@@ -1,4 +1,4 @@
 Test to migrate Dolibarr to namespace "Dolibarr".
 
 Script bbb.php is a script of an external module with current code writing. 
-It must works after migration. 
+It must works after migration. 

dev/translation/README

@@ -14,7 +14,7 @@ https://www.transifex.com/dolibarr-association/dolibarr/dashboard/
 Installation of Transifex Client:
 ---------------------------------
 for Linux OS
-to install or to update transifex client: 
+to install or to update transifex client:
 sudo pip install --upgrade transifex-client
 
 

dev/translation/ignore_translation_keys.lst

@@ -939,7 +939,6 @@ Don
 ECM
 EmptyMessageNotAllowedError
 ErrorInputRequired
-ErrorLDAPFunctionsAreDisabledOnThisPHP
 ErrorUpdating
 Extra
 FailedToConnectToSFTPAfterSSHAuthentication
@@ -1014,7 +1013,6 @@ TicketMessageMailSignatureText
 TicketSetupPage
 Timeline
 Transfer
-TryAnotherConnectionMode
 UndefinedKey
 UnknownType
 UpdateMember

dev/translation/txpull.sh

@@ -65,4 +65,3 @@ fi
 echo Think to launch also:
 echo "> dev/tools/fixaltlanguages.sh fix all"
 #echo "For v11: Replace also regex \(.*(sponge|cornas|eratosthene|cyan).*\) with '' on *.lang files"
-

doc/index.html

@@ -19,4 +19,4 @@ But if you are looking for other resources (downloads, documentation, addons, ..
 * <a href="https://www.dolistore.com">DoliStore (official addons/plugins market place)</a><br>
 
 </body>
-</html>
+</html>

doc/install/README-DE

@@ -8,14 +8,14 @@ Download / Herunterladen
 
 * Dolibarr ERP/CRM kann man über die offizielle Dolibarr Website
 
-    https://www.dolibarr.org/downloads 
-    
+    https://www.dolibarr.org/downloads
+
   oder direkt bei Sourceforge
-  
+
     https://sourceforge.net/projects/dolibarr/files/
-  
+
   herunterladen.
-  
+
 
 
 
@@ -26,10 +26,10 @@ Installation / Hilfe
 * Für eine kurze Einleitung schau in die README.md Datei im Hauptverzeichnis.
 
 * Umfangreiche Dokumentationen sind im Dolibarr Wiki zu finden:
-    https://wiki.dolibarr.org/index.php/Hauptseite 
-    
-* eine Deutsche Community bietet der Dolibarr e.V. unter 
-    https://www.dolibarr.de/ 
+    https://wiki.dolibarr.org/index.php/Hauptseite
+
+* eine Deutsche Community bietet der Dolibarr e.V. unter
+    https://www.dolibarr.de/
 
 
 
@@ -38,8 +38,6 @@ Installation / Hilfe
 Zusatzmodule
 ------------------------------------
 
-* Die meisten externen Module/Themen sind über den offiziellen DoliStore verfügbar: 
+* Die meisten externen Module/Themen sind über den offiziellen DoliStore verfügbar:
 
     https://www.dolistore.com/de/
-    
-

htdocs/accountancy/admin/account.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2016	Olivier Geffroy			<jeff@jeffinfo.com>
- * Copyright (C) 2013-2025	Alexandre Spangaro		<alexandre@inovea-conseil.com>
+ * Copyright (C) 2013-2026	Alexandre Spangaro		<alexandre@inovea-conseil.com>
  * Copyright (C) 2016-2018	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024-2025  Frédéric France			<frederic.france@free.fr>
@@ -27,11 +27,6 @@
 
 // Load Dolibarr environment
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
-
 /**
  * @var Conf $conf
  * @var DoliDB $db
@@ -39,6 +34,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
  * @var Translate $langs
  * @var User $user
  */
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('accountancy', 'admin', 'bills', 'compta', 'salaries'));
@@ -440,7 +439,9 @@ if ($resql) {
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+	print '<input type="hidden" name="page_y" value="">';
 
 	// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
 	print_barre_liste($langs->trans('ListAccounts'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'accounting_account', 0, $newcardbutton, '', $limit, 0, 0, 1);
@@ -467,7 +468,7 @@ if ($resql) {
 			$obj = $db->fetch_object($resqlchart);
 			if ($obj) {
 				$labeltoshow = $obj->country_code.' - '.$obj->pcg_version.' - '.$obj->label;
-				$htmltoshow = picto_from_langcode($obj->country_code).' '.$obj->country_code.' - '.$obj->pcg_version.' - '.$obj->label;
+				$htmltoshow = picto_from_langcode($obj->country_code).' '.$obj->country_code.' - '.$obj->pcg_version.' <span class="opacitymedium">- '.$obj->label.'</span>';
 				print '<option value="'.$obj->rowid.'" data-html="'.dolPrintHTMLForAttribute($htmltoshow).'"';
 				print ($pcgver == $obj->rowid) ? ' selected' : '';
 				print '>'.$labeltoshow.'</option>';
@@ -842,11 +843,11 @@ if ($resql) {
 		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 			print '<td class="center nowraponall">';
 			// if ($permissiontoadd) { // test is always true
-			print '<a class="editfielda" href="./card.php?action=update&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?'.$param).'">';
+			print '<a class="editfielda" href="./card.php?action=update&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?'.$param.'&page='.$page).'">';
 			print img_edit();
 			print '</a>';
 			print '&nbsp;';
-			print '<a class="marginleftonly" href="./card.php?action=delete&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?'.$param).'">';
+			print '<a class="marginleftonly" href="./card.php?action=delete&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?'.$param.'&page='.$page).'">';
 			print img_delete();
 			print '</a>';
 			print '&nbsp;';

htdocs/accountancy/admin/accountmodel.php

@@ -8,11 +8,11 @@
  * Copyright (C) 2011       Remy Younes             <ryounes@gmail.com>
  * Copyright (C) 2012-2015  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2012       Christophe Battarel     <christophe.battarel@ltairis.fr>
- * Copyright (C) 2011-2024  Alexandre Spangaro      <aspangaro@easya.solutions>
+ * Copyright (C) 2011-2026  Alexandre Spangaro      <alexandre@inovea-conseil.com>
  * Copyright (C) 2015       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2016       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
- * Copyright (C) 2024-2025  Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024-2026  Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024-2026	MDW						<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -196,7 +196,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities("Country")), null, 'errors');
 	}
 
-	// Si verif ok et action add, on ajoute la ligne
+	// In case of 'actionadd' and with valid parameters, add the line
 	if ($ok && GETPOST('actionadd', 'alpha')) {
 		$newid = 0;
 
@@ -241,11 +241,11 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		}
 	}
 
-	// Si verif ok et action modify, on modifie la ligne
+	// In case of 'actionmodify' and with valid parameters, modify the line
 	if ($ok && GETPOST('actionmodify', 'alpha')) {
 		// Modify entry
 		$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET ";
-		// Modifie valeur des champs
+		// Change field's value
 
 		$i = 0;
 		foreach ($listfieldmodify as $field) {
@@ -268,7 +268,6 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		$sql .= " WHERE rowid = ".((int) $rowid);
 
 		dol_syslog("actionmodify", LOG_DEBUG);
-		//print $sql;
 		$resql = $db->query($sql);
 		if (!$resql) {
 			setEventMessages($db->error(), null, 'errors');
@@ -327,13 +326,13 @@ $linkback = '';
 print load_fiche_titre($titre, $linkback, 'title_accountancy');
 
 
-// Confirmation de la suppression de la ligne
+// Confirmation of line deletion
 if ($action == 'delete') {
 	print $form->formconfirm(dolBuildUrl($_SERVER["PHP_SELF"], ['page'=> $page, 'sortfield' => $sortfield, 'sortorder' => $sortorder, 'rowid' => $rowid, 'code' => $code, 'id' => $id]), $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
 }
 
 
-// Complete requete recherche valeurs avec critere de tri
+// Complete the values search query with the sort order
 $sql = $tabsql[$id];
 
 if ($search_country_id > 0) {
@@ -351,7 +350,6 @@ if ($sortfield == 'country') {
 }
 $sql .= $db->order($sortfield, $sortorder);
 $sql .= $db->plimit($listlimit + 1, $offset);
-//print $sql;
 
 $fieldlist = explode(',', $tabfield[$id]);
 
@@ -368,8 +366,8 @@ $fieldlist = explode(',', $tabfield[$id]);
 // Line for title
 print '<tr class="liste_titre">';
 foreach ($fieldlist as $field => $value) {
-	// Determine le nom du champ par rapport aux noms possibles
-	// dans les dictionnaires de donnees
+	// Determine the field name based on the possible names
+	// in the data dictionaries
 	$valuetoshow = ucfirst($fieldlist[$field]); // By default
 	$valuetoshow = $langs->trans($valuetoshow); // try to translate
 	$class = "left";
@@ -393,7 +391,6 @@ foreach ($fieldlist as $field => $value) {
 	if ($fieldlist[$field] == 'pcg_version' || $fieldlist[$field] == 'fk_pcg_version') {
 		$valuetoshow = $langs->trans("Pcg_version");
 	}
-	//var_dump($value);
 
 	if ($valuetoshow != '') {
 		print '<td class="'.$class.'">';
@@ -588,8 +585,7 @@ if ($resql) {
 					'page' => $page,
 					'sortfield' => $sortfield,
 					'sortorder' => $sortorder,
-					'rowid' => (!empty($obj->rowid) ? $obj->rowid : (!empty($obj->code) ? $obj->code : '')),
-					'code' => $obj->code,
+					'rowid' => (!empty($obj->rowid) ? $obj->rowid : '')
 				]);
 
 				// Active

htdocs/accountancy/admin/card.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2014  Olivier Geffroy         <jeff@jeffinfo.com>
- * Copyright (C) 2013-2024  Alexandre Spangaro      <aspangaro@easya.solutions>
+ * Copyright (C) 2013-2026  Alexandre Spangaro      <alexandre@inovea-conseil.com>
  * Copyright (C) 2014       Florian Henry           <florian.henry@open-concept.pro>
  * Copyright (C) 2024-2025  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.com>
@@ -72,7 +72,7 @@ $object = new AccountingAccount($db);
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$urltogo = $backtopage ? $backtopage : DOL_URL_ROOT.'/accountancy/admin/account.php';
+	$urltogo = (!empty($backtopage) ? $backtopage : DOL_URL_ROOT.'/accountancy/admin/account.php');
 	header("Location: ".$urltogo);
 	exit;
 }
@@ -126,7 +126,7 @@ if ($action == 'add' /* && $user->hasRight('accounting', 'chartofaccount') // al
 			}
 			if (!$error) {
 				setEventMessages("RecordCreatedSuccessfully", null, 'mesgs');
-				$urltogo = $backtopage ? $backtopage : DOL_URL_ROOT.'/accountancy/admin/account.php';
+				$urltogo = (!empty($backtopage) ? $backtopage : DOL_URL_ROOT.'/accountancy/admin/account.php');
 				header("Location: " . $urltogo);
 				exit;
 			}
@@ -169,7 +169,7 @@ if ($action == 'add' /* && $user->hasRight('accounting', 'chartofaccount') // al
 			$result = $object->update($user);
 
 			if ($result > 0) {
-				$urltogo = $backtopage ? $backtopage : ($_SERVER["PHP_SELF"] . "?id=" . $id);
+				$urltogo = (!empty($backtopage) ? $backtopage : ($_SERVER["PHP_SELF"] . "?id=" . $id));
 				header("Location: " . $urltogo);
 				exit();
 			} elseif ($result == -2) {
@@ -179,7 +179,7 @@ if ($action == 'add' /* && $user->hasRight('accounting', 'chartofaccount') // al
 			}
 		}
 	} else {
-		$urltogo = $backtopage ? $backtopage : ($_SERVER["PHP_SELF"]."?id=".$id);
+		$urltogo = (!empty($backtopage) ? $backtopage : ($_SERVER["PHP_SELF"]."?id=".$id));
 		header("Location: ".$urltogo);
 		exit();
 	}
@@ -190,7 +190,8 @@ if ($action == 'add' /* && $user->hasRight('accounting', 'chartofaccount') // al
 		$result = $object->delete($user);
 
 		if ($result > 0) {
-			header("Location: account.php");
+			$urltogo = (!empty($backtopage) ? $backtopage : DOL_URL_ROOT.'/accountancy/admin/account.php');
+			header("Location: ".$urltogo);
 			exit;
 		}
 	}

htdocs/accountancy/admin/categories_list.php

@@ -1,8 +1,8 @@
 <?php
 /* Copyright (C) 2004-2023	Laurent Destailleur			<eldy@users.sourceforge.net>
  * Copyright (C) 2011-2025	Alexandre Spangaro			<alexandre@inovea-conseil.com>
- * Copyright (C) 2024		Frédéric France				<frederic.france@free.fr>
- * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2026  Frédéric France				<frederic.france@free.fr>
+ * Copyright (C) 2024-2026	MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -209,7 +209,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		setEventMessages($langs->transnoentities('ErrorFieldMustBeANumeric', $langs->transnoentities("Position")), null, 'errors');
 	}
 
-	// Si verif ok et action add, on ajoute la ligne
+	// In case of 'actionadd' and with valid parameters, add the line
 	if ($ok && GETPOST('actionadd', 'alpha')) {
 		$newid = 0;
 
@@ -280,7 +280,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 
 		// Modify entry
 		$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET ";
-		// Modifie valeur des champs
+		// Modify field values
 		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify)) {
 			$sql .= $db->sanitize($tabrowid[$id])." = ";
 			$sql .= "'".$db->escape($rowid)."', ";
@@ -465,9 +465,7 @@ $paramwithsearch = $param;
 if ($sortorder) {
 	$paramwithsearch .= '&sortorder='.urlencode($sortorder);
 }
-if ($sortfield) {
-	$paramwithsearch .= '&sortfield='.urlencode($sortfield);
-}
+$paramwithsearch .= '&sortfield='.urlencode($sortfield);
 if (GETPOST('from', 'alpha')) {
 	$paramwithsearch .= '&from='.urlencode(GETPOST('from', 'alpha'));
 }
@@ -495,8 +493,8 @@ if ($tabname[$id]) {
 		print '<td></td>';
 	}
 	foreach ($fieldlist as $field => $value) {
-		// Determine le nom du champ par rapport aux noms possibles
-		// dans les dictionnaires de donnees
+		// Determine the field name based on the possible names
+		// in the data dictionaries.
 		$valuetoshow = ucfirst($fieldlist[$field]); // By default
 		$valuetoshow = $langs->trans($valuetoshow); // try to translate
 		$class = "left";
@@ -825,9 +823,7 @@ if ($resql) {
 					}
 				}
 				$url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(!empty($obj->rowid) ? $obj->rowid : (!empty($obj->code) ? $obj->code : '')).'&code='.(!empty($obj->code) ? urlencode($obj->code) : '');
-				if ($param) {
-					$url .= '&'.$param;
-				}
+				$url .= '&'.$param;
 				$url .= '&';
 
 				$canbemodified = $iserasable;

htdocs/accountancy/admin/fiscalyear.php

@@ -24,11 +24,6 @@
 
 // Load Dolibarr environment
 require '../../main.inc.php';
-
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/fiscalyear.class.php';
-
 /**
  * @var Conf $conf
  * @var DoliDB $db
@@ -36,6 +31,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/fiscalyear.class.php';
  * @var Translate $langs
  * @var User $user
  */
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/fiscalyear.class.php';
 
 $action = GETPOST('action', 'aZ09');
 
@@ -123,7 +121,8 @@ llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-accountancy page-adm
 
 $sql = "SELECT f.rowid, f.label, f.date_start, f.date_end, f.statut as status, f.entity";
 $sql .= " FROM ".MAIN_DB_PREFIX."accounting_fiscalyear as f";
-$sql .= " WHERE f.entity = ".$conf->entity;
+$sql .= " WHERE f.entity = ".((int) $conf->entity);
+
 $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records

htdocs/accountancy/admin/fiscalyear_card.php

@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2014-2024  Alexandre Spangaro  <aspangaro@easya.solutions>
+/* Copyright (C) 2014-2026	Alexandre Spangaro	<alexandre@inovea-conseil.com>
  * Copyright (C) 2018-2025  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2025		MDW					<mdeweerd@users.noreply.github.com>
  *
@@ -25,10 +25,6 @@
 
 // Load Dolibarr environment
 require '../../main.inc.php';
-
-require_once DOL_DOCUMENT_ROOT.'/core/lib/fiscalyear.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/fiscalyear.class.php';
-
 /**
  * @var Conf $conf
  * @var DoliDB $db
@@ -36,13 +32,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/fiscalyear.class.php';
  * @var Translate $langs
  * @var User $user
  */
+require_once DOL_DOCUMENT_ROOT.'/core/lib/fiscalyear.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/fiscalyear.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "compta"));
 
 // Get parameters
 $id = GETPOSTINT('id');
-$ref = GETPOST('ref', 'alpha');
+$ref = GETPOST('ref', 'alpha') ? GETPOST('ref', 'alpha') : GETPOST('label', 'alpha');
 
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -62,17 +60,16 @@ $extrafields = new ExtraFields($db);
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'.
 
 // List of status
+/*
 static $tmpstatus2label = array(
-		'0' => 'OpenFiscalYear',
-		'1' => 'CloseFiscalYear'
-);
-$status2label = array(
-		'' => ''
+	'0' => 'OpenFiscalYear',
+	'1' => 'CloseFiscalYear'
 );
+$status2label = array('' => '');
 foreach ($tmpstatus2label as $key => $val) {
 	$status2label[$key] = $langs->trans($val);
 }
-
+*/
 $date_start = dol_mktime(0, 0, 0, GETPOSTINT('fiscalyearmonth'), GETPOSTINT('fiscalyearday'), GETPOSTINT('fiscalyearyear'));
 $date_end = dol_mktime(0, 0, 0, GETPOSTINT('fiscalyearendmonth'), GETPOSTINT('fiscalyearendday'), GETPOSTINT('fiscalyearendyear'));
 
@@ -128,16 +125,19 @@ if ($action == 'confirm_delete' && $confirm == "yes" /* && $permissiontoadd // a
 			$db->begin();
 
 			$id = $object->create($user);
-
 			if ($id > 0) {
 				$db->commit();
-
-				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-				exit();
+				header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+				exit;
 			} else {
 				$db->rollback();
 
-				setEventMessages($object->error, $object->errors, 'errors');
+				// Handle overlap error
+				if ($id == -5 && !empty($object->errors[0])) {
+					setEventMessages($langs->trans($object->error, $object->errors[0]), null, 'errors');
+				} else {
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
 				$action = 'create';
 			}
 		} else {
@@ -145,7 +145,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" /* && $permissiontoadd // a
 		}
 	} else {
 		header("Location: ./fiscalyear.php");
-		exit();
+		exit;
 	}
 } elseif ($action == 'update' /* && $permissiontoadd // always true */) {
 	// Update record
@@ -158,16 +158,20 @@ if ($action == 'confirm_delete' && $confirm == "yes" /* && $permissiontoadd // a
 		$object->status = GETPOSTINT('status');
 
 		$result = $object->update($user);
-
 		if ($result > 0) {
-			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-			exit();
+			header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+			exit;
 		} else {
-			setEventMessages($object->error, $object->errors, 'errors');
+			// Handle overlap error
+			if ($result == -5 && !empty($object->errors[0])) {
+				setEventMessages($langs->trans($object->error, $object->errors[0]), null, 'errors');
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
 		}
 	} else {
-		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-		exit();
+		header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+		exit;
 	}
 } elseif ($action == 'reopen' /* && $permissiontoadd // always true */ && getDolGlobalString('ACCOUNTING_CAN_REOPEN_CLOSED_PERIOD')) {
 	$result = $object->fetch($id);
@@ -211,7 +215,9 @@ if ($action == 'create') {
 	print '<table class="border centpercent tableforfieldcreate">'."\n";
 
 	// Label
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td><input name="label" size="32" value="'.GETPOST('label', 'alpha').'"></td></tr>';
+	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td>';
+	print '<input name="label" size="32" value="'.GETPOST('label', 'alpha').'">';
+	print '</td></tr>';
 
 	// Date start
 	print '<tr><td class="fieldrequired">'.$langs->trans("DateStart").'</td><td>';
@@ -257,6 +263,7 @@ if (($id || $ref) && $action == 'edit') {
 	print '<form method="POST" name="update" action="'.$_SERVER["PHP_SELF"].'">'."\n";
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
+	print '<input type="hidden" name="status" value="' . $object->status . '">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
 	if ($backtopage) {
 		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
@@ -340,6 +347,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<div class="fichecenter">';
 	print '<div class="fichehalfleft">';
 	print '<div class="underbanner clearboth"></div>';
+
 	print '<table class="border centpercent tableforfield">'."\n";
 
 	// Id
@@ -370,6 +378,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '</td></tr>';
 
 	print '</table>';
+
 	print '</div>';
 	print '</div>';
 

htdocs/accountancy/admin/fiscalyear_info.php

@@ -24,10 +24,6 @@
 
 // Load Dolibarr environment
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/fiscalyear.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/fiscalyear.class.php';
-
 /**
  * @var Conf $conf
  * @var DoliDB $db
@@ -35,10 +31,21 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/fiscalyear.class.php';
  * @var Translate $langs
  * @var User $user
  */
+require_once DOL_DOCUMENT_ROOT.'/core/lib/fiscalyear.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/fiscalyear.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "compta"));
 
+$id = GETPOSTINT('id');
+$ref = GETPOST('ref', 'alpha') ? GETPOST('ref', 'alpha') : GETPOST('label', 'alpha');
+
+$object = new Fiscalyear($db);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be 'include', not 'include_once'.
+
 // Security check
 if ($user->socid > 0) {
 	accessforbidden();
@@ -47,10 +54,17 @@ if (!$user->hasRight('accounting', 'fiscalyear', 'write')) {
 	accessforbidden();
 }
 
-$id = GETPOSTINT('id');
+
+/*
+ * Actions
+ */
+
+// None
 
 
-// View
+/*
+ * View
+ */
 
 $title = $langs->trans("Fiscalyear")." - ".$langs->trans("Info");
 
@@ -59,19 +73,18 @@ $help_url = 'EN:Module_Double_Entry_Accounting#Setup|FR:Module_Comptabilit&eacut
 llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-accountancy page-admin_fiscalyear_info');
 
 if ($id) {
-	$object = new Fiscalyear($db);
 	$object->fetch($id);
 	$object->info($id);
 
 	$head = fiscalyear_prepare_head($object);
 
-	print dol_get_fiche_head($head, 'info', $langs->trans("Fiscalyear"), -1, $object->picto);
+	print dol_get_fiche_head($head, 'info', $langs->trans("Fiscalyear"), -1, $object->picto, 0, '', '', 0, '', 1);
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/accountancy/admin/fiscalyear.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '';
 
-	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	dol_banner_tab($object, 'label', $linkback, 1, 'label', 'label', $morehtmlref);
 
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';

htdocs/accountancy/admin/index.php

@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2014	Olivier Geffroy			<jeff@jeffinfo.com>
  * Copyright (C) 2013-2014	Florian Henry			<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2025	Alexandre Spangaro		<alexandre@inovea-conseil.com>
+ * Copyright (C) 2013-2026	Alexandre Spangaro		<alexandre@inovea-conseil.com>
  * Copyright (C) 2014-2015	Ari Elbaz (elarifr)		<github@accedinfo.com>
  * Copyright (C) 2014		Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2014		Juanjo Menent			<jmenent@2byte.es>
@@ -32,13 +32,6 @@
 
 // Load Dolibarr environment
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancyexport.class.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsetup.class.php';
-
 /**
  * @var Conf $conf
  * @var DoliDB $db
@@ -47,6 +40,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsetup.class.php';
  * @var Translate $langs
  * @var User $user
  */
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancyexport.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsetup.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "bills", "admin", "accountancy", "other"));
@@ -482,33 +481,28 @@ print '<br>';
 
 
 // Case of the parameter ACCOUNTING_MODE
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="updatemode">';
 
-if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1) {
-	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="action" value="updatemode">';
+print '<table class="noborder centpercent">';
 
-	print '<table class="noborder centpercent">';
+print '<tr class="liste_titre">';
+print '<td colspan="2">'.$langs->trans('OptionMode').'</td>';
+print "</tr>\n";
+print '<tr class="oddeven"><td class="nowraponall"><input type="radio" id="accounting_mode_1" name="accounting_mode" value="CREANCES-DETTES"'.($accounting_mode != 'RECETTES-DEPENSES' ? ' checked' : '').'><label for="accounting_mode_1"> '.$langs->trans('OptionModeVirtual').'</label> ('.$langs->trans('Default').')</td>';
+print '<td><span class="opacitymedium">'.nl2br($langs->trans('ACCOUNTING_USE_NON_TREASURY_Desc')).'</span>';
+print "</td></tr>\n";
+print '<tr class="oddeven"><td class="nowraponall"><input type="radio" id="accounting_mode_2" name="accounting_mode" value="RECETTES-DEPENSES"'.($accounting_mode == 'RECETTES-DEPENSES' ? ' checked' : '').'><label for="accounting_mode_2"> '.$langs->trans('OptionModeTrue').'</label></td>';
+print '<td><span class="opacitymedium">'.nl2br($langs->trans('ACCOUNTING_USE_TREASURY_Desc'))."</span>";
+print "</td></tr>\n";
 
-	print '<tr class="liste_titre">';
-	print '<td colspan="2">'.$langs->trans('OptionMode').'</td>';
-	print "</tr>\n";
-	print '<tr class="oddeven"><td class="nowraponall"><input type="radio" id="accounting_mode_1" name="accounting_mode" value="CREANCES-DETTES"'.($accounting_mode != 'RECETTES-DEPENSES' ? ' checked' : '').'><label for="accounting_mode_1"> '.$langs->trans('OptionModeVirtual').'</label> ('.$langs->trans('Default').')</td>';
-	print '<td><span class="opacitymedium">'.nl2br($langs->trans('ACCOUNTING_USE_NON_TREASURY_Desc')).'</span>';
-	print "</td></tr>\n";
-	print '<tr class="oddeven"><td class="nowraponall"><input type="radio" id="accounting_mode_2" name="accounting_mode" value="RECETTES-DEPENSES"'.($accounting_mode == 'RECETTES-DEPENSES' ? ' checked' : '').'><label for="accounting_mode_2"> '.$langs->trans('OptionModeTrue').'</label></td>';
-	print '<td><span class="opacitymedium">'.nl2br($langs->trans('ACCOUNTING_USE_TREASURY_Desc'))."</span>";
-	print "</td></tr>\n";
+print "</table>\n";
 
-	print "</table>\n";
-
-	print '<div class="center"><input type="submit" class="button button-edit" name="button" value="'.$langs->trans('Save').'"></div>';
-	print '</form>';
-
-
-	print '<br><br>';
-}
+print '<div class="center"><input type="submit" class="button button-edit" name="button" value="'.$langs->trans('Save').'"></div>';
+print '</form>';
 
+print '<br><br>';
 
 // Show form main options
 print $formSetup->generateOutput(true);
@@ -660,7 +654,7 @@ print '</form>';
 print '<br><br>';
 
 // Accountancy Numbering model
-$dirmodels = array_merge(array('/'), $conf->modules_parts['models']);
+$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';

htdocs/accountancy/admin/journals_list.php

@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2017-2024  Alexandre Spangaro   <aspangaro@easya.solutions>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
- * Copyright (C) 2024-2025  Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024-2026  Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024-2026	MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -194,7 +194,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		$ok = 0;
 	}
 
-	// Si verif ok et action add, on ajoute la ligne
+	// In case of 'actionadd' and with valid parameters, add the line
 	if ($ok && GETPOST('actionadd', 'alpha')) {
 		$newid = 0;  // Initialise before if for static analysis
 		if ($tabrowid[$id]) {
@@ -251,7 +251,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		}
 	}
 
-	// Si verif ok et action modify, on modifie la ligne
+	// If check ok and action modify, we modify the line
 	if ($ok && GETPOST('actionmodify', 'alpha')) {
 		if ($tabrowid[$id]) {
 			$rowidcol = $tabrowid[$id];
@@ -261,7 +261,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 
 		// Modify entry
 		$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET ";
-		// Modifie valeur des champs
+		// Modify the field values
 		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify)) {
 			$sql .= $db->sanitize($tabrowid[$id])." = ";
 			$sql .= "'".$db->escape($rowid)."', ";
@@ -373,7 +373,7 @@ $titlepicto = 'title_accountancy';
 print load_fiche_titre($titre, $linkback, $titlepicto);
 
 
-// Confirmation de la suppression de la ligne
+// Generate a form to confirm the deletion of the row
 if ($action == 'delete') {
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$code.'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
 }
@@ -382,7 +382,7 @@ if ($action == 'delete') {
  * Show a dictionary
  */
 
-// Complete requete recherche valeurs avec critere de tri
+// Complete the search query with sort criteria
 $sql = $tabsql[$id];
 $sql .= " WHERE a.entity = ".((int) $conf->entity);
 
@@ -409,8 +409,8 @@ if ($tabname[$id]) {
 	// Line for title
 	print '<tr class="liste_titre">';
 	foreach ($fieldlist as $field => $value) {
-		// Determine le nom du champ par rapport aux noms possibles
-		// dans les dictionnaires de donnees
+		// Determine the field name based on the possible names
+		// in the data dictionaries.
 		$valuetoshow = ucfirst($fieldlist[$field]); // By default
 		$valuetoshow = $langs->trans($valuetoshow); // try to translate
 		$class = "left";
@@ -522,8 +522,8 @@ if ($resql) {
 	// Title of lines
 	print '<tr class="liste_titre liste_titre_add">';
 	foreach ($fieldlist as $field => $value) {
-		// Determine le nom du champ par rapport aux noms possibles
-		// dans les dictionnaires de donnees
+		// Determine the field name based on the possible names
+		// in the data dictionaries.
 		$class = "left";
 		$sortable = 1;
 		$valuetoshow = '';

htdocs/accountancy/admin/productaccount.php

@@ -6,7 +6,7 @@
  * Copyright (C) 2015       Ari Elbaz (elarifr) <github@accedinfo.com>
  * Copyright (C) 2021       Gauthier VERDOL     <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
- * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2024-2025  Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -202,7 +202,7 @@ if ($action == 'update' && $permissiontobind) {
 		$ko = 0;
 		$msg = '';
 		$sql = '';
-		if (!empty($toselect) && in_array($accounting_product_mode, $accounting_product_modes)) {	// @phpstan-ignore-line Bug phpstan thinking that empty(array()) is always true
+		if (in_array($accounting_product_mode, $accounting_product_modes)) {
 			$accounting = new AccountingAccount($db);
 
 			$arrayofdifferentselectedvalues = array();
@@ -466,9 +466,9 @@ if ($resql) {
 	if ($search_current_account_valid && $search_current_account_valid != '-1') {
 		$param .= "&search_current_account_valid=".urlencode($search_current_account_valid);
 	}
-	if ($accounting_product_mode) {
-		$param .= '&accounting_product_mode='.urlencode($accounting_product_mode);
-	}
+	// if ($accounting_product_mode) { // can't be empty see line 91-93
+	$param .= '&accounting_product_mode='.urlencode($accounting_product_mode);
+	// }
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 	if ($optioncss != '') {
@@ -552,10 +552,12 @@ if ($resql) {
 
 	if ($massaction == 'set_default_account') {
 		$formquestion = array();
-		$formquestion[] = array('type' => 'other',
+		$formquestion[] = array(
+			'type' => 'other',
 			'name' => 'set_default_account',
 			'label' => $langs->trans("AccountancyCode"),
-			'value' => $form->select_account('', 'default_account', 1, array(), 0, 0, 'maxwidth200 maxwidthonsmartphone', 'cachewithshowemptyone'));
+			'value' => $form->select_account('', 'default_account', 1, array(), 0, 0, 'maxwidth200 maxwidthonsmartphone', 'cachewithshowemptyone')
+		);
 		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmPreselectAccount"), $langs->trans("ConfirmPreselectAccountQuestion", $nbselected), "confirm_set_default_account", $formquestion, 1, 0, 200, 500, 1);
 	}
 
@@ -563,7 +565,7 @@ if ($resql) {
 	$moreforfilter = '';
 	if (isModEnabled('category') && $user->hasRight('categorie', 'lire')) {
 		$formcategory = new FormCategory($db);
-		$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PRODUCT, $searchCategoryProductList, 'minwidth300', $searchCategoryProductList ? $searchCategoryProductList : 0);
+		$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PRODUCT, $searchCategoryProductList, 'minwidth300', $searchCategoryProductList ? $searchCategoryProductOperator : 0);
 	}
 
 	// Show/hide child products. Hidden by default
@@ -662,7 +664,7 @@ if ($resql) {
 	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($resql);
 
-		// Ref produit as link
+		// Product ref as link
 		$product_static->ref = $obj->ref;
 		$product_static->id = $obj->rowid;
 		$product_static->type = $obj->product_type;
@@ -907,49 +909,48 @@ if ($resql) {
 	}
 	print '</table>';
 	print '</div>';
+	?>
+	<script type="text/javascript">
+		jQuery(document).ready(function() {
+			function init_savebutton() {
+				console.log("We check if at least one line is checked")
 
-	print '<script type="text/javascript">
-        jQuery(document).ready(function() {
-        	function init_savebutton()
-        	{
-	            console.log("We check if at least one line is checked")
+				atleastoneselected = 0;
+				jQuery(".checkforselect").each(function(index) {
+					/* console.log( index + ": " + $( this ).text() ); */
+					if ($(this).is(':checked')) atleastoneselected++;
+				});
 
-    			atleastoneselected=0;
-	    		jQuery(".checkforselect").each(function( index ) {
-	  				/* console.log( index + ": " + $( this ).text() ); */
-	  				if ($(this).is(\':checked\')) atleastoneselected++;
-	  			});
+				if (atleastoneselected) jQuery("#changeaccount").removeAttr('disabled');
+				else jQuery("#changeaccount").attr('disabled', 'disabled');
+				if (atleastoneselected) jQuery("#changeaccount").attr('class', 'button');
+				else jQuery("#changeaccount").attr('class', 'button');
+			}
 
-	            if (atleastoneselected) jQuery("#changeaccount").removeAttr(\'disabled\');
-	            else jQuery("#changeaccount").attr(\'disabled\',\'disabled\');
-	            if (atleastoneselected) jQuery("#changeaccount").attr(\'class\',\'button\');
-	            else jQuery("#changeaccount").attr(\'class\',\'button\');
-        	}
-
-        	jQuery(".checkforselect").change(function() {
-        		init_savebutton();
-        	});
-        	jQuery(".productforselect").change(function() {
-				console.log($(this).attr("id")+" "+$(this).val());
+			jQuery(".checkforselect").change(function() {
+				init_savebutton();
+			});
+			jQuery(".productforselect").change(function() {
+				console.log($(this).attr("id") + " " + $(this).val());
 				if ($(this).val() && $(this).val() != -1) {
-					$(".productforselect"+$(this).attr("id")).prop(\'checked\', true);
+					$(".productforselect"+$(this).attr("id")).prop('checked', true);
 				} else {
-					$(".productforselect"+$(this).attr("id")).prop(\'checked\', false);
+					$(".productforselect"+$(this).attr("id")).prop('checked', false);
 				}
-        		init_savebutton();
-        	});
+				init_savebutton();
+			});
 
-        	init_savebutton();
+			init_savebutton();
 
-            jQuery("#search_current_account").keyup(function() {
-        		if (jQuery("#search_current_account").val() != \'\')
-                {
-                    console.log("We set a value of account to search "+jQuery("#search_current_account").val()+", so we disable the other search criteria on account");
-                    jQuery("#search_current_account_valid").val(-1);
-                }
-        	});
-        });
-        </script>';
+			jQuery("#search_current_account").keyup(function() {
+				if (jQuery("#search_current_account").val() != '') {
+					console.log("We set a value of account to search " + jQuery("#search_current_account").val() + ", so we disable the other search criteria on account");
+					jQuery("#search_current_account_valid").val(-1);
+				}
+			});
+		});
+	</script>
+	<?php
 
 	print '</form>';
 

htdocs/accountancy/admin/report_list.php

@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
- * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2024-2026  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2026		MDW						<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -183,7 +184,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		}
 	}
 
-	// Si verif ok et action add, on ajoute la ligne
+	// In case of 'actionadd' and with valid parameters, add the line
 	if ($ok && GETPOST('actionadd', 'alpha')) {
 		$newid = 0;
 
@@ -254,7 +255,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 
 		// Modify entry
 		$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET ";
-		// Modifie valeur des champs
+		// Modify field values
 		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify)) {
 			$sql .= $db->sanitize($tabrowid[$id])." = ";
 			$sql .= "'".$db->escape($rowid)."', ";
@@ -427,8 +428,8 @@ if ($tabname[$id]) {
 		print '<td></td>';
 	}
 	foreach ($fieldlist as $field => $value) {
-		// Determine le nom du champ par rapport aux noms possibles
-		// dans les dictionnaires de donnees
+		// Determine the field name based on the possible names
+		// in the data dictionaries.
 		$valuetoshow = ucfirst($fieldlist[$field]); // By default
 		$valuetoshow = $langs->trans($valuetoshow); // try to translate
 		$class = "left";
@@ -680,9 +681,7 @@ if ($resql) {
 					}
 				}
 				$url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(!empty($obj->rowid) ? $obj->rowid : (!empty($obj->code) ? $obj->code : '')).'&code='.(!empty($obj->code) ? urlencode($obj->code) : '');
-				if ($param) {
-					$url .= '&'.$param;
-				}
+				$url .= '&'.$param;
 				$url .= '&';
 
 				$canbemodified = $iserasable;

htdocs/accountancy/bookkeeping/balance.php

@@ -235,8 +235,8 @@ if ($action == 'export' && $user->hasRight('accounting', 'mouvements', 'lire'))
 
 	if ($exportType === 'csv') {
 		$sep = getDolGlobalString('ACCOUNTING_EXPORT_SEPARATORCSV');
-		$filename = 'balance';
-		$type_export = 'balance';
+		$filename = 'balance';		// Used by the tpl
+		$type_export = 'balance';	// Used by the tpl
 		include DOL_DOCUMENT_ROOT.'/accountancy/tpl/export_journal.tpl.php';
 
 		foreach ($object->lines as $line) {

htdocs/accountancy/bookkeeping/card.php

@@ -34,6 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/lettering.class.php';
@@ -738,7 +739,38 @@ if ($action == 'create') {
 			print '<input type="submit" class="button button-edit smallpaddingimp" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		} else {
-			print $object->doc_ref;
+			// Get information of an element
+			if ($object->doc_type === 'customer_invoice' && !empty($object->fk_doc)) {
+				$invoicestatic = new Facture($db);
+				$result = $invoicestatic->fetch($object->fk_doc);
+
+				if ($result > 0) {
+					$label_element = $invoicestatic->getNomUrl(1);
+				} else {
+					$label_element = $object->doc_ref;
+				}
+			} elseif ($object->doc_type === 'supplier_invoice' && !empty($object->fk_doc)) {
+				$supplierinvoicestatic = new FactureFournisseur($db);
+				$result = $supplierinvoicestatic->fetch($object->fk_doc);
+
+				if ($result > 0) {
+					$label_element = $supplierinvoicestatic->getNomUrl(1);
+				} else {
+					$label_element = $object->doc_ref;
+				}
+			} elseif ($object->doc_type === 'expense_report' && !empty($object->fk_doc)) {
+				$expensereportstatic = new ExpenseReport($db);
+				$result = $expensereportstatic->fetch($object->fk_doc);
+
+				if ($result > 0) {
+					$label_element = $expensereportstatic->getNomUrl(1);
+				} else {
+					$label_element = $object->doc_ref;
+				}
+			} else {
+				$label_element = $object->doc_ref;
+			}
+			print $label_element;
 		}
 		print '</td>';
 		print '</tr>';
@@ -804,7 +836,13 @@ if ($action == 'create') {
 			print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		} else {
-			print $object->code_journal;
+			// Get information of a journal
+			$accountingjournalstatic = new AccountingJournal($db);
+			$accountingjournalstatic->fetch(0, $object->code_journal);
+			$journal = $accountingjournalstatic->code;
+			$journal_label = $accountingjournalstatic->label;
+
+			print $accountingjournalstatic->getNomUrl(1, 1, 1);
 		}
 		print '</td>';
 		print '</tr>';

htdocs/accountancy/bookkeeping/export.php

@@ -30,6 +30,13 @@
 
 // Load Dolibarr environment
 require '../../main.inc.php';
+/**
+ * @var Conf $conf
+ * @var DoliDB $db
+ * @var HookManager $hookmanager
+ * @var Translate $langs
+ * @var User $user
+ */
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancyexport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/lettering.class.php';
@@ -41,14 +48,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
-/**
- * @var Conf $conf
- * @var DoliDB $db
- * @var HookManager $hookmanager
- * @var Translate $langs
- * @var User $user
- */
-
 // Load translation files required by the page
 $langs->loadLangs(array("accountancy", "compta"));
 
@@ -851,15 +850,26 @@ if ($action == 'export_file') {
 		|| getDolGlobalString('ACCOUNTING_EXPORT_MODELCSV') == AccountancyExport::$EXPORT_TYPE_FEC
 		|| getDolGlobalString('ACCOUNTING_EXPORT_MODELCSV') == AccountancyExport::$EXPORT_TYPE_FEC2
 	) {
+		$except = array();
+		if (getDolGlobalInt('ACCOUNTING_EXPORT_REMOVE_INVOICE_SOURCE_FILE')) {
+			$except[] = $langs->trans('Invoice');
+		}
+		if (getDolGlobalInt('ACCOUNTING_EXPORT_REMOVE_EXPENSEREPORT_SOURCE_FILE')) {
+			$except[] = $langs->trans('ExpenseReport');
+		}
+		if (getDolGlobalInt('ACCOUNTING_EXPORT_REMOVE_SUPPLIERINVOICE_SOURCE_FILE')) {
+			$except[] = $langs->trans('SupplierInvoice');
+		}
+
 		$form_question['notifiedexportfull'] = array(
 			'name' => 'notifiedexportfull',
 			'type' => 'checkbox',
-			'label' => $langs->trans('NotifiedExportFull'),
+			'label' => $langs->trans('NotifiedExportFull').(empty($except) ? '' : ' <spanc class="opacitymedium">('.$langs->trans("except").' '.implode(', ', $except).')</span>'),
 			'value' => 'false',
 		);
 	}
 
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans("ExportFilteredList").'...', $langs->trans('ConfirmExportFile'), 'export_fileconfirm', $form_question, '', 1, 390, 700);
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans("ExportFilteredList").'...', '', 'export_fileconfirm', $form_question, '', 1, 390, 700);
 }
 
 // Print form confirm

htdocs/accountancy/bookkeeping/list.php

@@ -31,6 +31,13 @@
 
 // Load Dolibarr environment
 require '../../main.inc.php';
+/**
+ * @var Conf $conf
+ * @var DoliDB $db
+ * @var HookManager $hookmanager
+ * @var Translate $langs
+ * @var User $user
+ */
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfiscalyear.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
@@ -42,16 +49,8 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/lettering.class.php';
 
-/**
- * @var Conf $conf
- * @var DoliDB $db
- * @var HookManager $hookmanager
- * @var Translate $langs
- * @var User $user
- */
-
 // Load translation files required by the page
-$langs->loadLangs(array("accountancy", "compta"));
+$langs->loadLangs(array("accountancy", "categories", "compta", "other"));
 
 // Get Parameters
 $socid = GETPOSTINT('socid');
@@ -339,7 +338,12 @@ if (empty($reshook)) {
 				$listofaccountsforgroup2[] = "'".$db->escape((string) $tmpval['account_number'])."'";
 			}
 		}
-		$filter['t.search_accounting_code_in'] = implode(',', $listofaccountsforgroup2);
+		if (!empty($listofaccountsforgroup2)) {
+			$filter['t.search_accounting_code_in'] = implode(',', $listofaccountsforgroup2);
+		} else {
+			$filter['t.search_accounting_code_in'] = "''";
+			setEventMessages($langs->trans("ThisCategoryHasNoItems"), null, 'warnings');
+		}
 		$param .= '&search_account_category='.urlencode((string) ($search_account_category));
 	}
 	if (!empty($search_accountancy_code)) {
@@ -484,6 +488,7 @@ if (empty($reshook)) {
 	$uploaddir = $conf->societe->dir_output;
 
 	global $error;
+	/** @var int $error */
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
 	if (!$error && $action == 'deletebookkeepingwriting' && $confirm == "yes" && $user->hasRight('accounting', 'mouvements', 'supprimer')) {
@@ -742,13 +747,13 @@ if (count($filter) > 0) {
 			$sqlwhere[] = natural_search($key, $value, 1, 1);
 		} elseif ($key == 't.reconciled_option') {
 			$sqlwhere[] = 't.lettering_code IS NULL';
-		} elseif ($key == 't.code_journal' && !empty($value)) {
+		} elseif ($key == 't.code_journal' && !empty($value)) {					// @phpstan-ignore-line false positive on !empty
 			if (is_array($value)) {
 				$sqlwhere[] = natural_search("t.code_journal", implode(',', $value), 3, 1);
 			} else {
 				$sqlwhere[] = natural_search("t.code_journal", $value, 3, 1);
 			}
-		} elseif ($key == 't.search_accounting_code_in' && !empty($value)) {
+		} elseif ($key == 't.search_accounting_code_in' && !empty($value)) {	// @phpstan-ignore-line false positive on !empty
 			$sqlwhere[] = 't.numero_compte IN ('.$db->sanitize($value, 1).')';
 		} else {
 			$sqlwhere[] = natural_search($key, $value, 0, 1);
@@ -1267,17 +1272,19 @@ while ($i < min($num, $limit)) {
 
 	// Piece number
 	if (!empty($arrayfields['t.piece_num']['checked'])) {
-		print '<td>';
+		print '<td class="nowraponall">';
 		$object->id = $line->id;
 		$object->piece_num = $line->piece_num;
 		$object->ref = $line->ref;
 		print $object->getNomUrl(1, '', 0, '', 1);
+		print '<span class="hideonsmartphone">';
 		if (!empty($line->date_export)) {
 			print img_picto($langs->trans("DateExport").": ".dol_print_date($line->date_export, 'dayhour')." (".$langs->trans("TransactionExportDesc").")", 'fa-file-export', 'class="paddingleft pictofixedwidth opacitymedium"');
 		}
 		if (!empty($line->date_validation)) {
 			print img_picto($langs->trans("DateValidation").": ".dol_print_date($line->date_validation, 'dayhour')." (".$langs->trans("TransactionBlockedLockedDesc").")", 'fa-lock', 'class="paddingleft pictofixedwidth opacitymedium"');
 		}
+		print '</span>';
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;

htdocs/accountancy/bookkeeping/listbyaccount.php

@@ -2,7 +2,7 @@
 /* Copyright (C) 2016		Neil Orley				<neil.orley@oeris.fr>
  * Copyright (C) 2013-2016	Olivier Geffroy			<jeff@jeffinfo.com>
  * Copyright (C) 2013-2020	Florian Henry			<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2025	Alexandre Spangaro		<alexandre@inovea-conseil.com>
+ * Copyright (C) 2013-2026	Alexandre Spangaro		<alexandre@inovea-conseil.com>
  * Copyright (C) 2018-2025  Frédéric France			<frederic.france@free.fr>
  * Copyright (C) 2024-2025	MDW						<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2025		Nicolas Barrouillet		<nicolas@pragma-tech.fr>
@@ -49,7 +49,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
  */
 
 // Load translation files required by the page
-$langs->loadLangs(array("accountancy", "compta"));
+$langs->loadLangs(array("accountancy", "categories", "compta", "other"));
 
 $journal_code = GETPOST('code_journal', 'alpha');
 $account = GETPOST("account", 'int');
@@ -359,7 +359,12 @@ if (empty($reshook)) {
 				$listofaccountsforgroup2[] = "'".$db->escape((string) $tmpval['account_number'])."'";
 			}
 		}
-		$filter['t.search_accounting_code_in'] = implode(',', $listofaccountsforgroup2);
+		if (!empty($listofaccountsforgroup2)) {
+			$filter['t.search_accounting_code_in'] = implode(',', $listofaccountsforgroup2);
+		} else {
+			$filter['t.search_accounting_code_in'] = "''";
+			setEventMessages($langs->trans("ThisCategoryHasNoItems"), null, 'warnings');
+		}
 		$param .= '&search_account_category='.urlencode((string) ($search_account_category));
 	}
 	if (!empty($search_accountancy_code_start)) {
@@ -1415,17 +1420,19 @@ while ($i < min($num, $limit)) {
 	}
 	// Piece number
 	if (!empty($arrayfields['t.piece_num']['checked'])) {
-		print '<td>';
+		print '<td class="nowraponall">';
 		$object->id = $line->id;
 		$object->piece_num = $line->piece_num;
 		$object->ref = $line->ref;
 		print $object->getNomUrl(1, '', 0, '', 1);
+		print '<span class="hideonsmartphone">';
 		if (!empty($line->date_export)) {
 			print img_picto($langs->trans("DateExport").": ".dol_print_date($line->date_export, 'dayhour')." (".$langs->trans("TransactionExportDesc").")", 'fa-file-export', 'class="paddingleft pictofixedwidth opacitymedium"');
 		}
 		if (!empty($line->date_validation)) {
 			print img_picto($langs->trans("DateValidation").": ".dol_print_date($line->date_validation, 'dayhour')." (".$langs->trans("TransactionBlockedLockedDesc").")", 'fa-lock', 'class="paddingleft pictofixedwidth opacitymedium"');
 		}
+		print '</span>';
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;

htdocs/accountancy/class/accountancycategory.class.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2016		Jamal Elbaz			<jamelbaz@gmail.pro>
- * Copyright (C) 2016-2017	Alexandre Spangaro	<aspangaro@open-dsi.fr>
+ * Copyright (C) 2016-2025	Alexandre Spangaro		<alexandre@inovea-conseil.com>
  * Copyright (C) 2018-2025  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
  *
@@ -438,8 +438,11 @@ class AccountancyCategory // extends CommonObject
 	{
 		global $conf;
 
+		$pcgver = getDolGlobalInt('CHARTOFACCOUNTS');
+
 		$sql = "SELECT t.rowid, t.account_number, t.label";
 		$sql .= " FROM ".$this->db->prefix()."accounting_account as t";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON t.fk_pcg_version = asy.pcg_version AND asy.rowid = ".((int) $pcgver);
 		$sql .= " WHERE t.fk_accounting_category = ".((int) $id);
 		$sql .= " AND t.entity = ".$conf->entity;
 

htdocs/accountancy/class/accountancyexport.class.php

@@ -14,7 +14,7 @@
  * Copyright (C) 2020		Guillaume Alexandre			<guillaume@tag-info.fr>
  * Copyright (C) 2022		Joachim Kueter				<jkueter@gmx.de>
  * Copyright (C) 2022		Progiseize					<a.bisotti@progiseize.fr>
- * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2026	MDW							<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -230,7 +230,7 @@ class AccountancyExport
 		);
 
 		global $hookmanager;
-		$code = $formatcode[$type];
+		$code = $formatcode[$type] ?? '';
 		$parameters = array('type' => $type);
 		$reshook = $hookmanager->executeHooks('getFormatCode', $parameters, $code);
 
@@ -382,12 +382,12 @@ class AccountancyExport
 	 */
 	public function export(&$TData, $formatexportset, $withAttachment = 0, $downloadMode = 1, $outputMode = 1, $noouput = 1)
 	{
-		global $db, $conf, $langs;	// The tpl file use $db
-		global $search_date_end; 	// Used into /accountancy/tpl/export_journal.tpl.php
+		global $db, $conf, $langs;				// Used into /accountancy/tpl/export_journal.tpl.php
+		global $search_date_end, $hookmanager;	// Used into /accountancy/tpl/export_journal.tpl.php
 
 		// Define name of file to save
-		$filename = 'general_ledger-'.$this->getFormatCode($formatexportset);
-		$type_export = 'general_ledger';
+		$filename = 'general_ledger-'.$this->getFormatCode($formatexportset);		// Used into /accountancy/tpl/export_journal.tpl.php
+		$type_export = 'general_ledger';											// Used into /accountancy/tpl/export_journal.tpl.php
 
 		$completefilename = '';
 		$exportFile = null;
@@ -422,7 +422,8 @@ class AccountancyExport
 			top_httphead($mimetype, 1);
 		}
 
-		include DOL_DOCUMENT_ROOT.'/accountancy/tpl/export_journal.tpl.php';
+		// Set var $completefilename and add HTTP header.
+		include DOL_DOCUMENT_ROOT.'/accountancy/tpl/export_journal.tpl.php';	// TODO Fix this: A tpl is for rendering data on output. For including common code, we must use .inc.php
 
 		if ($outputMode == 1 || $outputMode == 2) {
 			if ($outputMode == 1) {
@@ -884,7 +885,7 @@ class AccountancyExport
 	/**
 	 * Export format : Quadratus (Format ASCII)
 	 * Format since 2015 compatible QuadraCOMPTA
-	 * Last review for this format : 2023/10/12 Alexandre Spangaro (aspangaro@open-dsi.fr)
+	 * Last review for this format : 2025/12/21 Alexandre Spangaro (alexandre@inovea-conseil.com)
 	 *
 	 * Information on format: https://docplayer.fr/20769649-Fichier-d-entree-ascii-dans-quadracompta.html
 	 * Help to import in Quadra: https://wiki.dolibarr.org/index.php?title=Module_Comptabilit%C3%A9_en_Partie_Double#Import_vers_CEGID_Quadra
@@ -902,8 +903,13 @@ class AccountancyExport
 
 		$end_line = "\r\n";
 
+		$conf->cache['archiveFileList_notfound'] = array();
+
 		// We should use dol_now function not time however this is wrong date to transfer in accounting
+		$i = 0;
 		foreach ($objectLines as $line) {
+			$i++;
+
 			// Clean some data
 			$line->doc_ref = dol_string_unaccent($line->doc_ref);
 
@@ -931,11 +937,11 @@ class AccountancyExport
 				$tab['lib_compte'] = str_pad(self::trunc($line->subledger_label, 30), 30);
 
 				if ($line->doc_type == 'customer_invoice') {
-					$tab['lib_alpha'] = strtoupper(str_pad('C'.self::trunc(dol_string_unaccent($line->subledger_label), 6), 7));
+					$tab['lib_alpha'] = strtoupper(self::trunc(dol_string_unaccent($line->subledger_label), 7));
 					$tab['filler'] = str_repeat(' ', 52);
 					$tab['coll_compte'] = str_pad(self::trunc(getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER'), 8), 8);
 				} elseif ($line->doc_type == 'supplier_invoice') {
-					$tab['lib_alpha'] = strtoupper(str_pad('F'.self::trunc(dol_string_unaccent($line->subledger_label), 6), 7));
+					$tab['lib_alpha'] = strtoupper(self::trunc(dol_string_unaccent($line->subledger_label), 7));
 					$tab['filler'] = str_repeat(' ', 52);
 					$tab['coll_compte'] = str_pad(self::trunc(getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER'), 8), 8);
 				} else {
@@ -1034,12 +1040,14 @@ class AccountancyExport
 			$tab['num_piece3'] = str_pad(substr(self::trunc($line->doc_ref, 20), -10), 10);
 			$tab['reserved'] = str_repeat(' ', 10); // position 159
 			$tab['currency_amount'] = str_repeat(' ', 13); // position 169
+
 			// get document file
 			$attachmentFileName = '';
 			if ($withAttachment == 1) {
 				$attachmentFileKey = trim((string) $line->piece_num);
 
 				if (!isset($archiveFileList[$attachmentFileKey])) {
+					// We complete the $archiveFileList to add the file to the existing list (first entry was filled when function was called, we add here the next one)
 					$objectDirPath = '';
 					$objectFileName = dol_sanitizeFileName($line->doc_ref);
 					if ($line->doc_type == 'customer_invoice') {
@@ -1053,33 +1061,45 @@ class AccountancyExport
 						$objectDirPath = !empty($conf->fournisseur->facture->multidir_output[$conf->entity]) ? $conf->fournisseur->facture->multidir_output[$conf->entity] : $conf->fournisseur->facture->dir_output;
 						$objectDirPath .= '/'.rtrim(get_exdir($invoice->id, 2, 0, 0, $invoice, 'invoice_supplier'), '/');
 					}
-					$arrayofinclusion = array();
-					// If it is a supplier invoice, we want to use last uploaded file
-					$arrayofinclusion[] = '^'.preg_quote($objectFileName, '/').(($line->doc_type == 'supplier_invoice') ? '.+' : '').'\.pdf$';
-					$fileFoundList = dol_dir_list($objectDirPath.'/'.$objectFileName, 'files', 0, implode('|', $arrayofinclusion), '(\.meta|_preview.*\.png)$', 'date', SORT_DESC, 0, 1);
-					if (!empty($fileFoundList)) {
-						$attachmentFileNameTrunc = str_pad(self::trunc((string) $line->piece_num, 8), 8, '0', STR_PAD_LEFT);
-						foreach ($fileFoundList as $fileFound) {
-							if (strstr($fileFound['name'], $objectFileName)) {
-								// skip native invoice pdfs (canelle)
-								// We want to retrieve an attachment representative of the supplier invoice, not a fake document generated by Dolibarr.
-								if ($line->doc_type == 'supplier_invoice') {
-									if ($fileFound['name'] === $objectFileName.'.pdf') {
+
+					if ($objectDirPath && empty($conf->cache['archiveFileList_notfound'][$attachmentFileKey])) {
+						$arrayofinclusion = array();
+						// If it is a supplier invoice, we want to use last uploaded file
+						$arrayofinclusion[] = '^'.preg_quote($objectFileName, '/').(($line->doc_type == 'supplier_invoice') ? '.+' : '').'\.pdf$';
+
+						$fileFoundPath = '';
+						$fileFoundList = dol_dir_list($objectDirPath.'/'.$objectFileName, 'files', 0, implode('|', $arrayofinclusion), '(\.meta|_preview.*\.png)$', 'date', SORT_DESC, 0, 1);
+
+						if (!empty($fileFoundList)) {
+							$attachmentFileNameTrunc = str_pad(self::trunc((string) $line->piece_num, 8), 8, '0', STR_PAD_LEFT);
+
+							foreach ($fileFoundList as $fileFound) {
+								if (strstr($fileFound['name'], $objectFileName)) {
+									// skip native invoice pdfs (canelle)
+									// We want to retrieve an attachment representative of the supplier invoice, not a fake document generated by Dolibarr.
+									if ($line->doc_type == 'supplier_invoice') {
+										if ($fileFound['name'] === $objectFileName.'.pdf') {
+											continue;
+										}
+									} elseif ($fileFound['name'] !== $objectFileName.'.pdf') {
 										continue;
 									}
-								} elseif ($fileFound['name'] !== $objectFileName.'.pdf') {
-									continue;
-								}
-								$fileFoundPath = $objectDirPath.'/'.$objectFileName.'/'.$fileFound['name'];
-								if (file_exists($fileFoundPath)) {
-									$archiveFileList[$attachmentFileKey] = array(
-										'path' => $fileFoundPath,
-										'name' => $attachmentFileNameTrunc.'.pdf',
-									);
-									break;
+									$fileFoundPath = $objectDirPath.'/'.$objectFileName.'/'.$fileFound['name'];
+									if (file_exists($fileFoundPath)) {
+										$archiveFileList[$attachmentFileKey] = array(
+											'path' => $fileFoundPath,
+											'name' => $attachmentFileNameTrunc.'.pdf',
+										);
+										break;
+									}
 								}
 							}
 						}
+
+						if (empty($fileFoundPath)) {
+							// Use also a cache if no file were found
+							$conf->cache['archiveFileList_notfound'][$attachmentFileKey] = 1;
+						}
 					}
 				}
 
@@ -1087,6 +1107,7 @@ class AccountancyExport
 					$attachmentFileName = $archiveFileList[$attachmentFileKey]['name'];
 				}
 			}
+
 			if (dol_strlen((string) $attachmentFileName) == 12) {
 				$tab['attachment'] = $attachmentFileName; // position 182
 			} else {
@@ -1370,7 +1391,7 @@ class AccountancyExport
 		$separator = ';';
 		$end_line = "\n";
 
-		// parcours du tableau pour recuperation des numero de compte des tiers pour pouvoir les fournir dans la bonne ligne pour istea
+		// Extract the Third party account numbers from the table to provide the correct line for ISTEA
 		$tiers = [];
 		foreach ($objectLines as $line) {
 			if ($line->subledger_account && substr($line->subledger_account, 0, 1) == '4') {
@@ -1462,11 +1483,16 @@ class AccountancyExport
 			print $output;
 		}
 
+		$conf->cache['archiveFileList_notfound'] = array();
+
+		$i = 0;
 		foreach ($objectLines as $line) {
 			if ($line->debit == 0 && $line->credit == 0) {
 				//var_dump($line->id);
 				//unset($array[$line]);
 			} else {
+				$i++;
+
 				$date_creation = dol_print_date($line->date_creation, '%Y%m%d');
 				$date_document = dol_print_date($line->doc_date, '%Y%m%d');
 				$date_lettering = dol_print_date($line->date_lettering, '%Y%m%d');
@@ -1475,6 +1501,8 @@ class AccountancyExport
 
 				$refInvoice = '';
 				$invoice = null;
+				// TODO The fetch of invoice is just to get the ->id, ->ref (and ->ref_supplier for supplier invoice) so
+				// may be we can get them into the $objectLines and reuse a generic static objectinstead ?
 				if ($line->doc_type == 'customer_invoice') {
 					// Customer invoice
 					require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -1567,6 +1595,7 @@ class AccountancyExport
 					$attachmentFileKey = trim((string) $line->piece_num);
 
 					if (!isset($archiveFileList[$attachmentFileKey])) {
+						// We complete the $archiveFileList to add the file to the existing list (first entry was filled when function was called, we add here the next one)
 						$objectDirPath = '';
 						$objectFileName = dol_sanitizeFileName($line->doc_ref);
 						if ($line->doc_type == 'customer_invoice') {
@@ -1584,33 +1613,45 @@ class AccountancyExport
 								$objectDirPath .= '/' . rtrim(get_exdir($invoice->id, 2, 0, 0, $invoice, 'invoice_supplier'), '/');
 							}
 						}
-						$arrayofinclusion = array();
-						// If it is a supplier invoice, we want to use last uploaded file
-						$arrayofinclusion[] = '^'.preg_quote($objectFileName, '/').(($line->doc_type == 'supplier_invoice') ? '.+' : '').'\.pdf$';
-						$fileFoundList = dol_dir_list($objectDirPath.'/'.$objectFileName, 'files', 0, implode('|', $arrayofinclusion), '(\.meta|_preview.*\.png)$', 'date', SORT_DESC, 0, 1);
-						if (!empty($fileFoundList)) {
-							$attachmentFileNameTrunc = $line->doc_ref;
-							foreach ($fileFoundList as $fileFound) {
-								if (strstr($fileFound['name'], $objectFileName)) {
-									// skip native invoice pdfs (canelle)
-									// We want to retrieve an attachment representative of the supplier invoice, not a fake document generated by Dolibarr.
-									if ($line->doc_type == 'supplier_invoice') {
-										if ($fileFound['name'] === $objectFileName.'.pdf') {
+
+						if ($objectDirPath && empty($conf->cache['archiveFileList_notfound'][$attachmentFileKey])) {
+							$arrayofinclusion = array();
+							// If it is a supplier invoice, we want to use last uploaded file
+							$arrayofinclusion[] = '^'.preg_quote($objectFileName, '/').(($line->doc_type == 'supplier_invoice') ? '.+' : '').'\.pdf$';
+
+							$fileFoundPath = '';	// The path of last file found
+							$fileFoundList = dol_dir_list($objectDirPath.'/'.$objectFileName, 'files', 0, implode('|', $arrayofinclusion), '(\.meta|_preview.*\.png)$', 'date', SORT_DESC, 0, 1);
+
+							if (!empty($fileFoundList)) {
+								$attachmentFileNameTrunc = $line->doc_ref;
+
+								foreach ($fileFoundList as $fileFound) {
+									if (strstr($fileFound['name'], $objectFileName)) {
+										// skip native invoice pdfs (canelle)
+										// We want to retrieve an attachment representative of the supplier invoice, not a fake document generated by Dolibarr.
+										if ($line->doc_type == 'supplier_invoice') {
+											if ($fileFound['name'] === $objectFileName.'.pdf') {
+												continue;
+											}
+										} elseif ($fileFound['name'] !== $objectFileName.'.pdf') {
 											continue;
 										}
-									} elseif ($fileFound['name'] !== $objectFileName.'.pdf') {
-										continue;
-									}
-									$fileFoundPath = $objectDirPath.'/'.$objectFileName.'/'.$fileFound['name'];
-									if (file_exists($fileFoundPath)) {
-										$archiveFileList[$attachmentFileKey] = array(
-											'path' => $fileFoundPath,
-											'name' => $attachmentFileNameTrunc.'.pdf',
-										);
-										break;
+										$fileFoundPath = $objectDirPath.'/'.$objectFileName.'/'.$fileFound['name'];
+										if (file_exists($fileFoundPath)) {
+											$archiveFileList[$attachmentFileKey] = array(
+												'path' => $fileFoundPath,
+												'name' => $attachmentFileNameTrunc.'.pdf',
+											);
+											break;
+										}
 									}
 								}
 							}
+
+							if (empty($fileFoundPath)) {
+								// Use also a cache if no file were found
+								$conf->cache['archiveFileList_notfound'][$attachmentFileKey] = 1;
+							}
 						}
 					}
 
@@ -1683,10 +1724,15 @@ class AccountancyExport
 			print $output;
 		}
 
+		$conf->cache['archiveFileList_notfound'] = array();
+
+		$i = 0;
 		foreach ($objectLines as $line) {
 			if ($line->debit == 0 && $line->credit == 0) {
 				//unset($array[$line]);
 			} else {
+				$i++;
+
 				$date_creation = dol_print_date($line->date_creation, '%Y%m%d');
 				$date_document = dol_print_date($line->doc_date, '%Y%m%d');
 				$date_lettering = dol_print_date($line->date_lettering, '%Y%m%d');
@@ -1695,6 +1741,8 @@ class AccountancyExport
 
 				$refInvoice = '';
 				$invoice = null;
+				// TODO The fetch of invoice is just to get the ->id, ->ref (and ->ref_supplier for supplier invoice) so
+				// may be we can get them into the $objectLines and reuse a generic static objectinstead ?
 				if ($line->doc_type == 'customer_invoice') {
 					// Customer invoice
 					require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -1787,6 +1835,7 @@ class AccountancyExport
 					$attachmentFileKey = trim((string) $line->piece_num);
 
 					if (!isset($archiveFileList[$attachmentFileKey])) {
+						// We complete the $archiveFileList to add the file to the existing list (first entry was filled when function was called, we add here the next one)
 						$objectDirPath = '';
 						$objectFileName = dol_sanitizeFileName($line->doc_ref);
 						if ($line->doc_type == 'customer_invoice') {
@@ -1804,33 +1853,45 @@ class AccountancyExport
 								$objectDirPath .= '/' . rtrim(get_exdir($invoice->id, 2, 0, 0, $invoice, 'invoice_supplier'), '/');
 							}
 						}
-						$arrayofinclusion = array();
-						// If it is a supplier invoice, we want to use last uploaded file
-						$arrayofinclusion[] = '^'.preg_quote($objectFileName, '/').(($line->doc_type == 'supplier_invoice') ? '.+' : '').'\.pdf$';
-						$fileFoundList = dol_dir_list($objectDirPath.'/'.$objectFileName, 'files', 0, implode('|', $arrayofinclusion), '(\.meta|_preview.*\.png)$', 'date', SORT_DESC, 0, 1);
-						if (!empty($fileFoundList)) {
-							$attachmentFileNameTrunc = $line->doc_ref;
-							foreach ($fileFoundList as $fileFound) {
-								if (strstr($fileFound['name'], $objectFileName)) {
-									// skip native invoice pdfs (canelle)
-									// We want to retrieve an attachment representative of the supplier invoice, not a fake document generated by Dolibarr.
-									if ($line->doc_type == 'supplier_invoice') {
-										if ($fileFound['name'] === $objectFileName.'.pdf') {
+
+						if ($objectDirPath && empty($conf->cache['archiveFileList_notfound'][$attachmentFileKey])) {
+							$arrayofinclusion = array();
+							// If it is a supplier invoice, we want to use last uploaded file
+							$arrayofinclusion[] = '^'.preg_quote($objectFileName, '/').(($line->doc_type == 'supplier_invoice') ? '.+' : '').'\.pdf$';
+
+							$fileFoundPath = '';	// The path of last file found
+							$fileFoundList = dol_dir_list($objectDirPath.'/'.$objectFileName, 'files', 0, implode('|', $arrayofinclusion), '(\.meta|_preview.*\.png)$', 'date', SORT_DESC, 0, 1);
+
+							if (!empty($fileFoundList)) {
+								$attachmentFileNameTrunc = $line->doc_ref;
+
+								foreach ($fileFoundList as $fileFound) {
+									if (strstr($fileFound['name'], $objectFileName)) {
+										// skip native invoice pdfs (canelle)
+										// We want to retrieve an attachment representative of the supplier invoice, not a fake document generated by Dolibarr.
+										if ($line->doc_type == 'supplier_invoice') {
+											if ($fileFound['name'] === $objectFileName.'.pdf') {
+												continue;
+											}
+										} elseif ($fileFound['name'] !== $objectFileName.'.pdf') {
 											continue;
 										}
-									} elseif ($fileFound['name'] !== $objectFileName.'.pdf') {
-										continue;
-									}
-									$fileFoundPath = $objectDirPath.'/'.$objectFileName.'/'.$fileFound['name'];
-									if (file_exists($fileFoundPath)) {
-										$archiveFileList[$attachmentFileKey] = array(
-											'path' => $fileFoundPath,
-											'name' => $attachmentFileNameTrunc.'.pdf',
-										);
-										break;
+										$fileFoundPath = $objectDirPath.'/'.$objectFileName.'/'.$fileFound['name'];
+										if (file_exists($fileFoundPath)) {
+											$archiveFileList[$attachmentFileKey] = array(
+												'path' => $fileFoundPath,
+												'name' => $attachmentFileNameTrunc.'.pdf',
+											);
+											break;
+										}
 									}
 								}
 							}
+
+							if (empty($fileFoundPath)) {
+								// Use also a cache if no file were found
+								$conf->cache['archiveFileList_notfound'][$attachmentFileKey] = 1;
+							}
 						}
 					}
 
@@ -2691,7 +2752,7 @@ class AccountancyExport
 			$tab[] = substr($date, 3, 2);
 			$tab[] = substr($date, 0, 2);
 			$tab[] = $line->doc_ref;
-			//Conversion de chaine UTF8 en Latin9
+			// Convert the UTF-8 string in latin9
 			$tab[] = mb_convert_encoding(str_replace(' - Compte auxiliaire', '', $line->label_operation), "Windows-1252", 'UTF-8');
 
 			//Calcul de la longueur des numéros de comptes

htdocs/accountancy/class/accountingaccount.class.php

@@ -72,6 +72,11 @@ class AccountingAccount extends CommonObject
 	 */
 	public $rowid;
 
+	/**
+	 * @var string Ref
+	 */
+	public $ref;
+
 	/**
 	 * Date creation record (datec)
 	 *

htdocs/accountancy/class/accountingjournal.class.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2017-2022	OpenDSI						<support@open-dsi.fr>
- * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2024-2026	MDW							<mdeweerd@users.noreply.github.com>
  * Copyright (C) 2024-2025	Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2024		Alexandre Janniaux			<alexandre.janniaux@gmail.com>
  * Copyright (C) 2025		Alexandre Spangaro			<alexandre@inovea-conseil.com>
@@ -1323,7 +1323,7 @@ class AccountingJournal extends CommonObject
 						$element['blocks'][] = $lines_book;
 					}
 				} else {
-					// si TVA = 0, pousser les 2 lignes view/bookkeeping déjà constituées
+					// When VAT = 0, push the 2 lines view/bookkeeping already prepared
 					if ($type == 'view') {
 						$element['blocks'][] = $lines_view;
 					} elseif ($type == 'bookkeeping') {