Fix CI.

* Update ticket.class.php

bad init in class

* Update ticket.class.php

* Update ticket.class.php

---------

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

.github/changed-lines-count-labeler.yml

@@ -1,3 +0,0 @@
-# Add this tag for any changes for more than 1 line
-"Pending analysis of PR (maintenance team)":
-  min: 1

.github/dependabot.yml

@@ -1,6 +1,19 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
 version: 2
 updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
+    allow:
+      # Allow production updates only (can do a AND, several entries are doing a OR)
+      - dependency-type: "production"
+      #- dependency-type: "direct"
+    exclude-paths:
+      - 'dev'
+      - 'tests/acceptance'
+      - 'tests/selenium'

.github/workflows/README.md

@@ -20,10 +20,10 @@ See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workf
 The other worklows are:
 -----------------------
 
-- stale-issues-safe	to autoclose old issues.
-- phpstan_baseline to update the phpstan baseline file.
-- cache-clean-pr to clean cache when closing a PR.
-
+- ci-stale-issues-safe	to autoclose old issues.
+- ci-phpstan_baseline to update the phpstan baseline file.
+- ci-cache-clean-pr to clean cache when closing a PR.
+- ci-test to make CI tests
 
 Some tests workflows are:
 ------------------------

.github/workflows/ci-cache-clean-pr.yml

@@ -6,6 +6,8 @@ on:
   pull_request:
     types: [closed]
   workflow_dispatch:
+
+
 jobs:
   cleanup:
     runs-on: ubuntu-latest
@@ -16,7 +18,7 @@ jobs:
       contents: read
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Cleanup
         run: |
           gh extension install actions/gh-actions-cache

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

@@ -1,6 +1,7 @@
 name: "CI-PULL-REQUEST"
 
 on: [pull_request]
+
 jobs:
   pre-commit:
     uses: ./.github/workflows/pre-commit.yml
@@ -25,15 +26,15 @@ jobs:
   #  uses: ./.github/workflows/windows-ci.yml
   #  with:
   #    gh_event: ${{ github.event_name }}
-  gh-travis:  # Runs travis script on github runner (not on travis)
-    if: false
-    # needs: [pre-commit, phan]
-    # needs: [windows-ci]
-    secrets: inherit
-    needs: [pre-commit, phan, phpstan]
-    uses: ./.github/workflows/gh-travis.yml
-    with:
-      gh_event: ${{ github.event_name }}
+  #gh-travis:  # Runs travis script on github runner (not on travis)
+  #  if: false
+  #  # needs: [pre-commit, phan]
+  #  # needs: [windows-ci]
+  #  secrets: inherit
+  #  needs: [pre-commit, phan, phpstan]
+  #  uses: ./.github/workflows/gh-travis.yml
+  #  with:
+  #    gh_event: ${{ github.event_name }}
 
 # Note (not tested, from https://github.com/orgs/community/discussions/38361)
 # To cancel jobs if one fails, the following action may help

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

@@ -1,6 +1,7 @@
 name: "CI-PUSH"
 
 on: [push]
+
 jobs:
   pre-commit:
     uses: ./.github/workflows/pre-commit.yml
@@ -25,15 +26,15 @@ jobs:
     uses: ./.github/workflows/windows-ci.yml
     with:
       gh_event: ${{ github.event_name }}
-  gh-travis:  # Runs travis script on github runner (not on travis)
-    if: false
-    # needs: [pre-commit, phan]
-    # needs: [windows-ci]
-    secrets: inherit
-    needs: [pre-commit, phan, phpstan]
-    uses: ./.github/workflows/gh-travis.yml
-    with:
-      gh_event: ${{ github.event_name }}
+  # gh-travis:  # Runs travis script on github runner (not on travis)
+  #   if: false
+  #   # needs: [pre-commit, phan]
+  #   # needs: [windows-ci]
+  #   secrets: inherit
+  #   needs: [pre-commit, phan, phpstan]
+  #   uses: ./.github/workflows/gh-travis.yml
+  #   with:
+  #     gh_event: ${{ github.event_name }}
 
 # Note (not tested, from https://github.com/orgs/community/discussions/38361)
 # To cancel jobs if one fails, the following action may help

.github/workflows/ci-phpstan_baseline.yml

@@ -33,13 +33,13 @@ jobs:
       pull-requests: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ env.PHP_VERSION }}
           coverage: none # disable xdebug, pcov
-          tools: phpstan:2.1.8, cs2pr
+          tools: phpstan:2.1.12, cs2pr
           extensions: calendar, json, imagick, gd, zip, mbstring, intl, opcache, imap,
               mysql, pgsql, sqlite3, ldap, xml, mcrypt
         env:

.github/workflows/ci-pr-devcamp.yaml.disabled

@@ -0,0 +1,45 @@
+# Action to prepare the github action
+# Go on Dolibarr Organization - Settings - Developer settings - GitHub App  (https://github.com/organizations/Dolibarr/settings/apps)
+# Create an App: Enter a name + In Home page URL use https://github.com/Dolibarr/dolibarr + Disable webhook
+# Set Permissions (see other app for list of permissions)
+# Click on generate the private keys
+# Click on Install application - choose the repository of the bot
+# Go on Organisation - Secret and variables and create a secret PR_SECRET_KEY and copy the content of received private key. Choose the repository access to "Repository Dolibarr".
+# Go on Organisation - Secret and variables and create a variable PR_APP_ID and copy the ID of the previously create ID. Choose the repository access to "Repository Dolibarr".
+#
+
+name: Set the tag with devcamp label during the session of a devcamp
+on:
+  pull_request_target:
+    types: [opened]
+
+
+permissions:
+  pull-requests: write
+  issues: write
+
+jobs:
+  add-label-devcamp:
+    runs-on: ubuntu-latest
+
+    steps:
+    #- name: Install GitHub CLI
+    #  run: sudo apt-get install gh
+
+    - name: Generate a token
+      id: generate-token
+      uses: actions/create-github-app-token@v2
+      with:
+        app-id: ${{ vars.PR_APP_ID }}
+        private-key: ${{ secrets.PR_SECRET_KEY }}
+
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Assign label
+      env:
+        GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
+        url: ${{ github.event.pull_request.html_url }}
+      run: |
+        echo "env.url=${{env.url}}"
+        gh pr edit "${{env.url}}" --add-label "Event: DevCamp 2025 XXX"

.github/workflows/ci-tag-check.yml.disabled

@@ -0,0 +1,24 @@
+# See syntax file on https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
+name: "Check tag branch"
+
+on:
+  push:
+    tags:
+      - "18.*"
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Verify tag is on main
+        run: |
+          TAG_COMMIT=$(git rev-list -n 1 $GITHUB_REF)
+          if ! git branch --contains $TAG_COMMIT | grep -q "18.0"; then
+            echo "The tag must be on branch 18.0"
+            exit 1
+          fi

.github/workflows/gh-travis.yml.disabled

@@ -27,15 +27,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
-      # matrix:
-      #   php-version:
+      matrix:
+        php-version:
       #  # PHPStan requires PHP >= 7.2.
       #    #- "7.2"
-      #    - "8.2"
+        - "8.2"
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       - name: Checkout travis file
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Run .travis.yml build script
         uses: ktomk/run-travis-yml@v1
         with:

.github/workflows/phan.yml

@@ -1,4 +1,7 @@
 ---
+# This is a basic workflow to check code with PHPSTAN tool
+name: Phan
+
 on:
   # workflow called by the parent workflow ci.yml
   workflow_call:
@@ -12,15 +15,15 @@ on:
 concurrency:
   group: phan-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
+
 env:
   gh_event: ${{ inputs.gh_event || github.event_name }}
   PHAN_CONFIG: dev/tools/phan/config.php
   PHAN_BASELINE: dev/tools/phan/baseline.txt
-  PHAN_MIN_PHP: 7.0
+  PHAN_MIN_PHP: 7.2
   PHAN_QUICK: ${{ github.event.schedule && '' || '--quick' }}
   GITHUB_JSON: ${{ toJSON(github) }} # Helps in debugging Github Action
 
-name: phan
 jobs:
   phan:
     name: Run phan
@@ -30,26 +33,14 @@ jobs:
       github.repository == 'Dolibarr/dolibarr'
       || github.event.schedule == false
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: 8.2
           coverage: none # disable xdebug, pcov
-          tools: cs2pr,phan
+          tools: phan
       - name: Run Phan analysis
         run: |
           # shellcheck disable=2086
-          phan $PHAN_QUICK -k "$PHAN_CONFIG" -B "$PHAN_BASELINE" --analyze-twice --minimum-target-php-version "$PHAN_MIN_PHP" --output-mode=checkstyle -o _phan.xml
-      - name: Add results to PR
-        if: ${{ always() }}
-        run: |
-          cs2pr --prepend-filename --prepend-source --notices-as-warnings _phan.xml
-      - name: Provide phan log as artifact
-        uses: actions/upload-artifact@v4
-        if: ${{ always() }}
-        with:
-          name: phan-srcrt
-          # path: ${{ github.workspace }}/phan.log
-          path: ${{ github.workspace }}/_phan.xml
-          retention-days: 2
+          phan $PHAN_QUICK -k "$PHAN_CONFIG" -B "$PHAN_BASELINE" --analyze-twice --minimum-target-php-version "$PHAN_MIN_PHP" --output-mode=github

.github/workflows/phpstan.yml

@@ -1,6 +1,7 @@
 ---
 # This is a basic workflow to check code with PHPSTAN tool
 name: PHPStan
+
 # Controls when the workflow will run
 on:
   # workflow called by the parent workflow ci.yml
@@ -13,8 +14,9 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: stan-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: phpstan-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
+
 env:
   gh_event: ${{ inputs.gh_event || github.event_name }}
   CACHE_KEY_PART: ${{ ( inputs.gh_event == 'pull_request' || github.event_name == 'pull_request' ) && format('{0}-{1}', github.base_ref, github.head_ref) || github.ref_name }}
@@ -35,7 +37,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       # Get PHP and addons
       - name: Setup PHP
         id: setup-php
@@ -43,7 +45,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           coverage: none # disable xdebug, pcov
-          tools: phpstan:2.1.8, cs2pr
+          tools: phpstan:2.1.12, cs2pr
           extensions: calendar, json, imagick, gd, zip, mbstring, intl, opcache, imap,
             mysql, pgsql, sqlite3, ldap, xml, mcrypt
 
@@ -79,7 +81,7 @@ jobs:
           key: phpstan-cache-${{ matrix.php-version }}-${{ env.CACHE_KEY_PART }}-${{
             github.run_id }}
       - name: Provide phpstan log as artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: ${{ always() }}
         with:
           name: phpstan-srcrt

.github/workflows/pre-commit.yml

@@ -1,5 +1,6 @@
 ---
 name: pre-commit
+
 on:
   # workflow called by the parent workflow ci.yml
   workflow_call:
@@ -16,6 +17,7 @@ concurrency:
   cancel-in-progress: true
 env:
   gh_event: ${{ inputs.gh_event || github.event_name }}
+
 jobs:
   pre-commit:
     runs-on: ubuntu-latest
@@ -28,7 +30,7 @@ jobs:
       #  if: false
 
       # Checkout git sources to analyze
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       # Try to get the list of modified files into steps.changed-php.outputs.all_changed_files
       #- name: Get changed files
@@ -66,7 +68,7 @@ jobs:
         run: |-
           [ -r requirements.txt ] || [ -r pyproject.toml ] || touch requirements.txt
       # Install python and pre-commit tool
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           cache: pip
           python-version: "3.11"
@@ -164,7 +166,7 @@ jobs:
           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@v4
+        uses: actions/upload-artifact@v5
         if: ${{ ! cancelled() }}
         with:
           name: precommit-logs

.github/workflows/test.yaml

@@ -1,30 +0,0 @@
-name: Test github actions
-on:
-  workflow_dispatch:
-  pull_request:
-    types: [opened, reopened, synchronize]
-  push:
-
-env:
-  ENVGHT: ${{ secrets.GITHUB_TOKEN }}
-  ENVGHU: ${{ github.token }}
-  TEST_ACCESS_KEY: ${{ secrets.TEST_ACCESS_KEY }}
-  TEST_VAR_REPO: ${{ vars.TEST_VAR_REPO }}
-  TEST_VAR_ORGA: ${{ vars.TEST_VAR_ORGA }}
-  ENVLOCAL: "varenvlocal"
-
-jobs:
-  testjob:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Log
-        run: |
-          echo "Run action by ${{ github.actor }}"
-          echo "github.token=${{ github.token }}"
-          echo "secrets.GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}"
-          echo "GITHUB_EVENT_PATH=$GITHUB_EVENT_PATH"
-          echo "repo-token: ${{secrets.GITHUB_TOKEN}}"
-          echo "secret repository TEST_ACCESS_KEY: ${{secrets.TEST_ACCESS_KEY}}"
-          echo "variable repository : ${{vars.TEST_VAR_REPO}}"
-          echo "variable organization : ${{vars.TEST_VAR_ORGA}}"
-          echo "ENVLOCAL: ${{env.ENVLOCAL}}"

.github/workflows/windows-ci.yml

@@ -1,5 +1,6 @@
 ---
 name: Win CI
+
 # yamllint disable-line rule:truthy
 on:
   # workflow called by the parent workflow ci.yml
@@ -25,6 +26,7 @@ env:
   PHP_INI_SCAN_DIR: C:\myphpini
   CKEY: win-ci-2
   GITHUB_JSON: ${{ toJSON(github) }} # Helps in debugging Github Action
+
 jobs:
   win-test:
     strategy:
@@ -35,7 +37,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
@@ -57,7 +59,7 @@ jobs:
         id: cache
         uses: actions/cache/restore@v4
         env:
-          HASH: ${{ hashFiles('htdocs/install/**', 'htdocs/filefunc.inc.php') }}
+          HASH: ${{ hashFiles('htdocs/install/**', 'htdocs/filefunc.inc.php', 'htdocs/version.inc.php') }}
           KEY_ROOT: ${{ matrix.os }}-${{ env.ckey }}-${{ matrix.php_version }}
         with:
           # See https://github.com/actions/cache/issues/1275#issuecomment-1925217178
@@ -171,7 +173,7 @@ jobs:
           in: ${{ env.PHPUNIT_LOG }}
 
       - name: Provide dolibarr and phpunit logs as artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: ${{ ! cancelled() }}
         with:
           name: win-ci-logs

.gitignore

@@ -52,6 +52,7 @@ dev/build/node_modules/
 node_modules/
 
 vendor/
+php-vendor
 tmp/
 
 #yarn

.pre-commit-config.yaml

@@ -137,6 +137,8 @@ repos:
         files: \.(php)$
         args: [--standard=dev/setup/codesniffer/ruleset.xml]
       - id: php-cs
+        exclude: |
+          (?x)^(htdocs/includes/.*)$
         files: \.(php)$
         args:
           [

.travis.yml

@@ -41,10 +41,10 @@ jobs:
   include:
     - stage: PHP min and max
       if: type = push
-      php: '7.1'
+      php: '7.2'
       env:
       - DB=postgresql
-      - TRAVIS_PHP_VERSION=7.1
+      - TRAVIS_PHP_VERSION=7.2
     - stage: PHP min and max
       if: type = pull_request OR type = push
       php: '8.4'
@@ -85,6 +85,9 @@ before_install:
   if [ "$TRAVIS_PHP_VERSION" = '7.1' ]; then
   	sudo apt install unzip apache2 php7.1 php7.1-cli php7.1-curl php7.1-mysql php7.1-pgsql php7.1-gd php7.1-imap php7.1-intl php7.1-ldap php7.1-xml php7.1-mbstring php7.1-xml php7.1-zip libapache2-mod-php7.1
   fi
+  if [ "$TRAVIS_PHP_VERSION" = '7.2' ]; then
+  	sudo apt install unzip apache2 php7.2 php7.2-cli php7.2-curl php7.2-mysql php7.2-pgsql php7.2-gd php7.2-imap php7.2-intl php7.2-ldap php7.2-xml php7.2-mbstring php7.2-xml php7.2-zip libapache2-mod-php7.2
+  fi
   if [ "$TRAVIS_PHP_VERSION" = '8.1' ]; then
   	sudo apt install unzip apache2 php8.1 php8.1-cli php8.1-curl php8.1-mysql php8.1-pgsql php8.1-gd php8.1-imap php8.1-intl php8.1-ldap php8.1-xml php8.1-mbstring php8.1-xml php8.1-zip libapache2-mod-php8.1
   fi
@@ -109,8 +112,8 @@ before_install:
     #ps fauxww | grep postgres
     ls /etc/postgresql/13/main/
 
-    sudo sed -i -e '/local.*peer/s/postgres/all/' -e 's/peer\|md5/trust/g' /etc/postgresql/13/main/pg_hba.conf
-    sudo cat /etc/postgresql/13/main/pg_hba.conf
+    sudo sed -i -e '/local.*peer/s/postgres/all/' -e 's/peer\|md5/trust/g' /etc/postgresql/14/main/pg_hba.conf
+    sudo cat /etc/postgresql/14/main/pg_hba.conf
 
     sudo service postgresql restart
 
@@ -131,6 +134,9 @@ install:
   if [ "$TRAVIS_PHP_VERSION" = '7.1' ]; then
     sudo update-alternatives --set php /usr/bin/php7.1
   fi
+  if [ "$TRAVIS_PHP_VERSION" = '7.2' ]; then
+    sudo update-alternatives --set php /usr/bin/php7.2
+  fi
   if [ "$TRAVIS_PHP_VERSION" = '8.1' ]; then
     sudo update-alternatives --set php /usr/bin/php8.1
   fi
@@ -522,6 +528,9 @@ script:
     php upgrade.php 21.0.0 22.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade21002200.log || cat $TRAVIS_BUILD_DIR/upgrade21002200.log
     php upgrade2.php 21.0.0 22.0.0 > $TRAVIS_BUILD_DIR/upgrade21002200-2.log || cat $TRAVIS_BUILD_DIR/upgrade21002200-2.log
     php step5.php 21.0.0 22.0.0 > $TRAVIS_BUILD_DIR/upgrade21002200-3.log || cat $TRAVIS_BUILD_DIR/upgrade21002200-3.log
+    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
     set +e
     echo
 

.tx/config

@@ -44,12 +44,6 @@ source_file = htdocs/langs/en_US/blockedlog.lang
 source_lang = en_US
 type        = MOZILLAPROPERTIES
 
-[o:dolibarr-association:p:dolibarr:r:bookmarks]
-file_filter = htdocs/langs/<lang>/bookmarks.lang
-source_file = htdocs/langs/en_US/bookmarks.lang
-source_lang = en_US
-type        = MOZILLAPROPERTIES
-
 [o:dolibarr-association:p:dolibarr:r:boxes]
 file_filter = htdocs/langs/<lang>/boxes.lang
 source_file = htdocs/langs/en_US/boxes.lang
@@ -104,12 +98,6 @@ source_file = htdocs/langs/en_US/datapolicy.lang
 source_lang = en_US
 type        = MOZILLAPROPERTIES
 
-[o:dolibarr-association:p:dolibarr:r:deliveries]
-file_filter = htdocs/langs/<lang>/deliveries.lang
-source_file = htdocs/langs/en_US/deliveries.lang
-source_lang = en_US
-type        = MOZILLAPROPERTIES
-
 [o:dolibarr-association:p:dolibarr:r:dict]
 file_filter = htdocs/langs/<lang>/dict.lang
 source_file = htdocs/langs/en_US/dict.lang
@@ -146,12 +134,6 @@ source_file = htdocs/langs/en_US/exports.lang
 source_lang = en_US
 type        = MOZILLAPROPERTIES
 
-[o:dolibarr-association:p:dolibarr:r:help]
-file_filter = htdocs/langs/<lang>/help.lang
-source_file = htdocs/langs/en_US/help.lang
-source_lang = en_US
-type        = MOZILLAPROPERTIES
-
 [o:dolibarr-association:p:dolibarr:r:holiday]
 file_filter = htdocs/langs/<lang>/holiday.lang
 source_file = htdocs/langs/en_US/holiday.lang
@@ -284,12 +266,6 @@ source_file = htdocs/langs/en_US/partnership.lang
 source_lang = en_US
 type        = MOZILLAPROPERTIES
 
-[o:dolibarr-association:p:dolibarr:r:paybox]
-file_filter = htdocs/langs/<lang>/paybox.lang
-source_file = htdocs/langs/en_US/paybox.lang
-source_lang = en_US
-type        = MOZILLAPROPERTIES
-
 [o:dolibarr-association:p:dolibarr:r:paypal]
 file_filter = htdocs/langs/<lang>/paypal.lang
 source_file = htdocs/langs/en_US/paypal.lang
@@ -380,6 +356,12 @@ source_file = htdocs/langs/en_US/stripe.lang
 source_lang = en_US
 type        = MOZILLAPROPERTIES
 
+[o:dolibarr-association:p:dolibarr:r:subtotals]
+file_filter = htdocs/langs/<lang>/subtotals.lang
+source_file = htdocs/langs/en_US/subtotals.lang
+source_lang = en_US
+type        = MOZILLAPROPERTIES
+
 [o:dolibarr-association:p:dolibarr:r:supplier_proposal]
 file_filter = htdocs/langs/<lang>/supplier_proposal.lang
 source_file = htdocs/langs/en_US/supplier_proposal.lang

COPYRIGHT

@@ -53,7 +53,7 @@ TCPDI                  1.1.0         LGPL-3+ / Apache 2.0        Yes
 bacon, dasprid, swiss-qr-bill, kmukku, symfony/validator
 
 JS libraries:
-Ace                    1.4.14        BSD                         Yes             JS library to get code syntaxique coloration in a textarea.
+Ace                    1.43.12       BSD                         Yes             JS library to get code syntaxique coloration in a textarea (Must take src dir into https://github.com/ajaxorg/ace-builds/).
 ChartJS                3.7.1         MIT License                 Yes             JS library for graph
 CKEditor               4.22.1        LGPL-2.1+                   Yes             Editor WYSIWYG
 jQuery                 3.6.4         MIT License                 Yes             JS library

ChangeLog

@@ -2,6 +2,78 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
+***** ChangeLog for 23.0.0 compared to 22.0 *****
+
+For users:
+----------
+
+
+
+For developers:
+---------------
+* Introducing the TRIGGER_PREFIX property to force developers to use unique triggerkey per business object, limit also code to business CRUD events and identity when it is not.
+
+
+
+WARNING:
+--------
+The following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
+* The deprecated column egroupware_id has been dropped.
+* The property $sumpayed (duplicated of $totalpaid), $sumdeposit (duplicate of $totaldeposits) and $sumcreditnote (duplicate of $totalcreditnotes) has
+  been removed (there are replaced with the property that was a duplication of (same for $sumpayed_multicurrency, $sumdeposit_multicurrency, $sumcreditnote_multicurrency).
+* Parameters $maxlen and $notooltip of Contract have been inverted to follow the standard. It was breaking the common use of getNomUrl() but if you were using the parameter
+  maxlen (rare) by using the old signature, result may be a tooltip that is no more visible on ref printed by you module.
+* Removed array $MAP_ID_TO_CODE that was a duplicate of array "array_flip($categ->MAP_ID)"
+* The signature of the Sale order ->cancel() method and shipment ->cancel() has been modified to introduce the $user param like for other methods that modify a status.
+* Adding new document templates must be done by adding files into the mymodule/core/modules/xxx/doc directory. Adding files into custom directory with the
+  same path than the core path without using a mymodule directory is now forbidden.
+* The directory theme/common/octicons has been removed
+* The library timepicker.js has been removed. Was not used by Dolibarr.
+* Because of new TRIGGER_PREFIX property triggers SUPPLIER_PRODUCT_BUYPRICE_XXX are renamed to PRODUCT_BUYPRICE_XXX.
+* Function img_pdf() has been removed. Replace it with img_picto('', 'pdf.png') if you were using it.
+* The method run_trigger() was deprecated 10+ years ago in favor of runTrigger(). It has been removed. Change your trigger file if you still use it.
+* Property ->picto of module descriptors must contains the image extension if it is not a font awesome tag. Example: $this->picto="mymoduleimg.png";
+* Stock movement API GET method output variable names have been harmonized with POST input parameter names
+
+
+***** ChangeLog for 22.0.2 compared to 22.0.1 *****
+
+FIX: ContratLigne::fetch() returns 1 even if the line doesn't exist (#35324)
+FIX: #34678
+FIX: #35142 FIX: #35143
+FIX: #35154 - Massaction createbills in reception list don't mind about order and/or thirdparty currency (#35156)
+FIX: #35181 Cancelled purchase orders now shown as such in Project Overview (#35186)
+FIX: #35407 After updating to version 22, local taxes were no longer applied (#35408)
+FIX: #35425 (#35426)
+FIX: accountancy general ledger: bad handling of hook return (#34029)
+FIX: Add security test for show terminal selection if no terminal selected when invoice.php is call (#34717)
+FIX: allow to create First Situation Invoice (#35228)
+FIX: api orders : forward database error on failure (backport commit d9e81cb) (#35478)
+FIX: Can't edit tags of a user.
+FIX: can't reset intracomm transport mode
+FIX: can't save setup of odt template for stock
+FIX: check commande liste validate (#35479)
+FIX: color of late warning for nb of bank account reconciliation lines
+FIX: Correct the calculation of the amount of the current period between the period provided (#35083)
+FIX: Date planned of delivery is not propagated from order to shipment
+FIX: Edit of email in emailing. Property messtype not set.
+FIX: extra field list depend on parent list when editing a card (#35165)
+FIX: fallback of "from" email when sending email in member module
+FIX: missing token to disable custom group category for compta report (page /htdocs/accountancy/admin/categories_list.php) (#35084)
+FIX: Generation of member cards (file not found and substitution broken)
+FIX: invoice not set to closed when we add a credit note to close it
+FIX: missing check constant PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS (#33277)
+FIX: missing entity filter (#35461)
+FIX: missing quick edit for extrafields (backport commit 4fc66c6) (#35160)
+FIX: Missing sentence part (#35144)
+FIX: Remove perms to access commerce tab when the only active permission is fournisseur:lire (#35467)
+FIX: Restore decimal quantity for stock correction/transfer
+FIX: save the packaging qty on update buying price (#35234)
+FIX: set global mysoc and load langs in API access (#35041)
+FIX: Societe - Problem of date on outstanding opened late (#35266)
+FIX: vat detection when country of buyer is unknown.
+FIX: wrong extrafield template in create mode (#35241) (#35470)
+
 
 ***** ChangeLog for 22.0.1 compared to 22.0.0 *****
 
@@ -24,6 +96,8 @@ FIX: Missing a column on group permissions
 FIX: several minor troubles with modulebuilder
 FIX: Test on mandatory product or thirdparty barcode
 FIX: trigger mailmanspip when un/linking categories
+FIX: Security when using Advanced Target page of emailing (feature hidden in v21, default in v22+). Possible
+     SQL injection by users with permission to make and send mass emailing.
 
 
 ***** ChangeLog for 22.0.0 compared to 21.0 *****
@@ -142,7 +216,7 @@ NEW: Add note public and private on order export
 NEW: Finish dev for API_ENABLE_COUNT_CALLS (count of API use is visible on user API key field)
 
 For developers:
-----------
+---------------
 NEW: Add an API endpoint to get properties of a single line of an order (#34045)
 NEW: add const to not include default CSS in top_htmlhead with DISABLE_CSS_DEFAULT_THEME
 NEW: add const to not include default lib_head.js in top_htmlhead with DISABLE_LIB_HEAD_JS
@@ -169,7 +243,6 @@ NEW: expense report API deny
 
 WARNING:
 --------
-
 The following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
 * The use of GETPOST function is not allowed inside extrafields conditions or any strings that contains dynamic code evaluated with dol_eval().
 * The deprecated variable $trigger_name (duplicate of variable $triggersendname) has been removed. You must use $triggersendname everywhere now.
@@ -189,7 +262,7 @@ The following changes may create regressions for some external modules, but were
 ***** ChangeLog for 21.0.4 compared to 21.0.3 *****
 FIX: #35147 SQL Error on Beluga Export when ExpenseReport is enabled (#35149)
 FIX: error when using a code too large in dictionary
-FIX: Security when using feature Advanced Target of emailing (hidden in v21, default in v22+). Possible
+FIX: Security when using Advanced Target page of emailing (feature hidden in v21, default in v22+). Possible
      SQL injection by users with permission to make and send mass emailing.
 
 
@@ -218,7 +291,6 @@ FIX: trigger mailmanspip when un/linking categories
 SEC: Remove functions accepting callable params - Reported by phdwg1410 - CVE-2024-40137
 
 
-
 ***** ChangeLog for 21.0.2 compared to 21.0.1 *****
 
 FIX: 21.0: $height and $width can be ints, but also 'auto' (#34636)
@@ -1204,6 +1276,7 @@ FIX: when qty is not an integer, apply price() (#31138)
 FIX: Wrong default PDF model when creating the second situation invoice (#30843)
 FIX: wrong subprice if price base type is TTC (#30887)
 
+
 ***** ChangeLog for 19.0.3 compared to 19.0.2 *****
 FIX: #29403 HRM - Unable to delete a skill in a job Profile (#29779)
 FIX: #29439 incomplete API return (#29796)
@@ -1767,7 +1840,39 @@ The following changes may create regressions for some external modules, but were
 * The load of hook context productdao has been removed before calling loadvirtualstock. Modules must use the context of main parent page or 'all' for all cases.
 * booking.class.php was removed, please have a look at calendar.class.php
 
+***** ChangeLog for 18.0.8 compared to 18.0.7 *****
+35 files changed, 647 insertions(+), 298 deletions(-)
+
+FIX: #34746 - More complete fix for CVE-2024-40137
+FIX: Correct the calculation of the amount of the current period between the period provided (#35083)
+FIX: Add security test for show terminal selection if no terminal selected when invoice.php is call (#34717)
+FIX: Add security test for show terminal selection if no terminal selected when invoice.php is call
+FIX: missing quick edit for extrafields (baclport commit 4fc66c6) (#35160)
+FIX: Missing sentence part (#35144)
+FIX: set global mysoc and load langs in API access (#35041)
+FIX: set global mysoc and load langs in API access
+FIX: reset mysoc and langs only if entity of API has changed
+FIX: accountancy general ledger: bad handling of hook return (#34029)
+FIX: accountancy general ledger: bad handling of hook return
+FIX: accountancy balance: bad handling of hook return
+FIX: - Fix missing token for disable custom group category for compta report (page /htdocs/accountancy/admin/categories_list.php) (#35084)
+FIX: The combo of custom groups has disappeared (backport v19) (#35016)
+FIX: #34893 (#34897)
+FIX: #34893
+FIX: change error code to USERNOTALLOWEDTOCHANGEPASS
+FIX: asset: could not select invoice in disposal pop-in (#34725)
+FIX: 17.0 SQL syntax error and/or constraint error when calling Facture::update() after a clone (e.g. in a trigger) (#34778)
+FIX: 17.0: when you clone an invoice that was created from a template invoice, the clone should not be linked to the template invoice (#34777)
+FIX: pre-send mail mass action: keep __EMAIL__ substitution (#34522)
+FIX: pre-send mail mass action: keep __EMAIL__ substitution
+FIX: comment
+FIX: massaction email tpl: keep preset
+FIX: loop interrupt if an error occurs in sendEmailsRemindersOnInvoiceDueDate (#34657)
+FIX: #34654
+
 ***** ChangeLog for 18.0.7 compared to 18.0.6 *****
+138 files changed, 1622 insertions(+), 530 deletions(-)
+
 FIX: 17.0 API endpoints "PUT": prevent overwriting all extrafields if only some are supplied in the request cf. PR #29237
 FIX: 17.0 - collisions in cache for dol_getIdFromCode
 FIX: 17.0 - missing error handling for FactureRec::fetch in card-rec.php

dev/build/docker-dev/README.md

@@ -1,9 +1,9 @@
-# How to use it ?
+# How to use or run Dolibarr with Docker (for a development environment) ?
+
+The docker-compose.yml file is a sample of a config file to use to build and run Dolibarr in the 
+current workspace with Docker. This docker image is intended for **development usage**. 
+For a production usage you should consider official packages on https://hub.docker.com/r/dolibarr/dolibarr.
 
-The docker-compose.yml file is a sample of a config file to use to build and run
-Dolibarr in the current workspace with Docker. This docker image is intended for
-**development usage**. For production usage you should consider other
-contributor reference like https://hub.docker.com/r/dolibarr/dolibarr.
 
 Before build/run, define the variable HOST_USER_ID as following:
 
@@ -22,18 +22,13 @@ or
 
         docker compose -f docker-compose.yml -f postgres.yml up
 
-This will run 4 containers Docker : Dolibarr, MariaDB, PhpMyAdmin and MailDev.
-In the case of PostgreSQL, only Dolibarr, MailDev and the PostgreSQL database
-will be running.
+This will run the following Docker containers : Dolibarr, MariaDB, MailDev.
+In the case of PostgreSQL, only Dolibarr, MailDev and the PostgreSQL database will be running.
 
-The URL to go to the Dolibarr is :
+The URL to go to the installed Dolibarr is :
 
         http://0.0.0.0
 
-The URL to go to PhpMyAdmin is (login/password is root/root) :
-
-        http://0.0.0.0:8080
-
 In Dolibarr configuration Email let PHP mail function, To see all mail send by
 Dolibarr go to maildev
 
@@ -42,6 +37,7 @@ Dolibarr go to maildev
 Setup the database connection during the installation process, please use
 mariadb or postgres (name of the database container) as database host.
 
+
 ## Setup your custom modules
 
 You can setup your own modules from your development folder by using volume
@@ -61,8 +57,4 @@ will automatically be synced with your development environment.
 Then, you can start by extending one of the commands above, for instance for
 mariadb:
 
-        docker compose \
-            -f docker-compose.yml \
-            -f postgres.yml \
-            -f yourmodule.yml \
-            up
+        docker compose -f docker-compose.yml -f postgres.yml -f yourmodule.yml up

dev/build/docker/README.md

@@ -1,18 +1,21 @@
-# How to use run Dolibarr with docker ?
+# How to use or run Dolibarr with Docker ?
 
 
-## For a fast run of a demo of the local version, you can build the docker image from this current repository by running
+## For a fast run of a demo of the local version, you can build the docker image from the source repository by running
 
+	git clone https://github.com/Dolibarr/dolibarr.git dolibarr 
+	
+	cd dolibarr/docker
 
-sudo docker-compose build
+	sudo docker-compose build
 
-sudo -s
+	sudo -s
 
-export HOST_USER_ID=$(id -u)
-export HOST_GROUP_ID=$(id -g)
-export MYSQL_ROOT_PWD=$(tr -dc A-Za-z0-9 </dev/urandom | head -c 13; echo)
-
-docker-compose up -d
+	export HOST_USER_ID=$(id -u)
+	export HOST_GROUP_ID=$(id -g)
+	export MYSQL_ROOT_PWD=$(tr -dc A-Za-z0-9 </dev/urandom | head -c 13; echo)
+	
+	docker-compose up -d
 
 
 Warning: There is no persistency of data. This process is for dev purpose only.
@@ -20,4 +23,6 @@ Warning: There is no persistency of data. This process is for dev purpose only.
 
 ## For a more robust or a production usage
 
-If you want to execute an official Docker package, you can find it and read the doc on ihttps://hub.docker.com/r/dolibarr/dolibarr 
+If you want to execute an official Docker package, you can find it and read the doc on 
+
+*https://hub.docker.com/r/dolibarr/dolibarr*

dev/build/exe/doliwamp/README.md

@@ -3,11 +3,8 @@
 DoliWamp is a special all in one package installer for Windows (Dolibarr+Mysql+Apache+PHP). 
 It's a dedicated Dolibarr version for Windows newbies with no technical knowledge. This package will install or upgrade Dolibarr but also all prerequisites like the web server, and the database in one auto-install process.
 
-This directory contains files used by *makepack-dolibarr.pl* script to build the all-in-on .EXE package DoliWamp, ready
-to be distributed (for Windows).
-The build of .exe files need to have some windows executable files already installed (Apache, MariaDb). The package to install to get this files are defined into the file *doliwamp.iss* (searhc line starting with "; Value OK:")
-
-If you have technical knowledge in web administration and plan to share your server instance (Apache, Mysql or PHP) with other projects than Dolibarr or want to use Dolibarr other components (PostgreSQL), you should not use this assistant and make a manual installation of Dolibarr on your existing server by downloading the standard package (.tgz or .zip file).
+If you have technical knowledge in web administration and plan to share your server instance (Apache, Mysql or PHP) with other projects than Dolibarr, or want to use Dolibarr with a different technical layer (PostgreSQL instead of MariaDB for exemple), you should not use this auto-installer assistant and make a manual installation of Dolibarr on your existing server by downloading the standard package (the .zip file).
 
 
-!!! See file ../../makepack-howto.md
+This directory contains files used by *makepack-dolibarr.pl* script to build DoliWamp, the all-in-one .EXE package of Dolibarr, ready to be distributed on Windows (See file ../../makepack-howto.md)
+The build of .exe files need to have some windows executable files already installed (Apache, MariaDb). The package to install to get this files are defined into the file *doliwamp.iss* (search line starting with "; Value OK:")

dev/build/generate_filelist_xml.php

@@ -49,9 +49,20 @@ $includecustom = 0;
 $includeconstants = array();
 $buildzip = 0;
 
+print '***** '.$script_file.' *****'."\n";
+
 if (empty($argv[1])) {
 	print "Usage:   ".$script_file." release=auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value] [buildzip=1]\n";
-	print "Example: ".$script_file." release=6.0.0 includecustom=1 includeconstant=FR:INVOICE_CAN_ALWAYS_BE_REMOVED:0 includeconstant=all:MAILING_NO_USING_PHPMAIL:1\n";
+	print "Example: ".$script_file." release=6.0.0 includecustom=1 includeconstant=ES:CONST_XX_IS_ON includeconstant=all:MAILING_NO_USING_PHPMAIL:1\n";
+	print "\n";
+	print "Generate the file filelist-x.y.z[-mybuild].xml with signature of files. ";
+	print "The file always includes the 3 sections:\n";
+	print "- dolibarr_htdocs_dir\n";
+	print "- dolibarr_scripts_dir\n";
+	print "- dolibarr_unalterable_files (only files inside the scope of the unalterable module)\n";
+	print "and if a specific setup/parameter need to be included into the signature for check:\n";
+	print "- dolibarr_constants\n";
+	print "\n";
 	exit(1);
 }
 
@@ -68,20 +79,17 @@ while ($i < $argc) {
 	if (!empty($result["includecustom"])) {
 		$includecustom = $result["includecustom"];
 	}
-	if (!empty($result["includeconstant"])) {
-		$includeconstants[$i] = $result["includeconstant"];
-	}
-	if (!empty($result["buildzip"])) {
-		$buildzip = 1;
-	}
 	if (preg_match('/includeconstant=/', strval($argv[$i]))) {
 		$tmp = explode(':', $result['includeconstant'], 3);			// $includeconstant has been set with previous parse_str()
 		if (count($tmp) != 3) {
 			print "Error: Bad parameter includeconstant=".$result['includeconstant'] ."\n";
-			exit -1;
+			exit(1);
 		}
 		$includeconstants[$tmp[0]][$tmp[1]] = $tmp[2];
 	}
+	if (!empty($result["buildzip"])) {
+		$buildzip = 1;
+	}
 	$i++;
 }
 
@@ -97,7 +105,7 @@ $savrelease = $release;
 $tmpver = explode('-', $release, 2);
 if ($tmpver[0] == 'auto') {
 	$release = DOL_VERSION;
-	if ($tmpver[1] && $tmpver[0] == 'auto') {
+	if (!empty($tmpver[1]) && $tmpver[0] == 'auto') {
 		$release .= '-'.$tmpver[1];
 	}
 }
@@ -126,10 +134,10 @@ if (empty($includecustom)) {
 	}
 }
 
-print "Working on files into          : ".DOL_DOCUMENT_ROOT."\n";
-print "Release                        : ".$release."\n";
-print "Include custom in signature    : ".$includecustom."\n";
-print "Include constants in signature : ";
+print "Working on files into           : ".DOL_DOCUMENT_ROOT."\n";
+print "Release                         : ".$release."\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) {
 	foreach ($tmp as $constname => $constvalue) {
 		print $constname.'='.$constvalue." ";
@@ -155,9 +163,12 @@ $gitcommit = 'seetag';
 $branchname = preg_replace('/^(\d+\.\d+)\..*$/', '\1', $release);	// Keep only x.y into x.y.z
 $fileforgit = dirname(dirname(dirname(__FILE__))).'/.git/refs/heads/'.$branchname;
 print "Try to get last commit ID from file ".$fileforgit."\n";
-$fileforgitcontent = file_get_contents($fileforgit);
+$fileforgitcontent = '';
+if (file_exists($fileforgit)) {
+	$fileforgitcontent = file_get_contents($fileforgit);
+}
 if (empty($fileforgitcontent)) {
-	print "Failed to get the last commit ID. Are you on the branch for the release (branch name '.$branchname.') ?\n";
+	print "Failed to get the last commit ID (are you on the branch for the release branch name ".$branchname." ?). We will use an empty value for gitcommit.\n";
 }
 $gitcommit = trim($fileforgitcontent);
 
@@ -180,7 +191,7 @@ fputs($fp, '<dolibarr_htdocs_dir includecustom="'.$includecustom.'">'."\n");
 
 // Define qualified files (must be same than into generate_filelist_xml.php and in api_setup.class.php)
 $regextoinclude = '\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|bak|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$';
-$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|conf|install|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$';  // Exclude dirs
+$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|escpos-php\/doc|escpos-php\/example|escpos-php\/test|conf|install|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$';  // Exclude dirs
 $files = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
 
 $dir = '';
@@ -263,82 +274,75 @@ $checksumconcat = array();
 
 fputs($fp, '<dolibarr_unalterable_files version="'.$release.'">'."\n");
 
-$regextoinclude = '(\.php|\.sql)$';
-$regextoexclude = '';  // Exclude dirs
-$files = dol_dir_list(dirname(__FILE__).'/../../htdocs/blockedlog', 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
-$dir = '';
-foreach ($files as $filetmp) {
-	$file = $filetmp['fullname'];
-	$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
-	$newdir = str_replace(dirname(__FILE__).'/../../htdocs', '', dirname($file));
-	if ($newdir != $dir) {
+// Array of dir/files to include in the section
+$arrayofunalterablefiles = array(
+	array('dir' => dirname(__FILE__).'/../../htdocs/', 'file' => 'version.inc.php'),
+	array('dir' => dirname(__FILE__).'/../../htdocs/blockedlog', 'file' => 'all', 'regextoinclude' => '(\.php|\.sql)$', 'regextoexclude' => ''),
+	array('dir' => dirname(__FILE__).'/../../htdocs/install/mysql/tables', 'file' => 'all', 'regextoinclude' => 'llx_blockedlog.*(\.php|\.sql)$', 'regextoexclude' => ''),
+	array('dir' => dirname(__FILE__).'/../../htdocs/core/triggers', 'file' => 'interface_50_modBlockedlog_ActionsBlockedLog.class.php'),
+	array('dir' => dirname(__FILE__).'/../../htdocs/core/class', 'file' => 'all', 'regextoinclude' => '(interfaces.class.php|commontrigger.class.php)$', 'regextoexclude' => ''),
+	array('dir' => dirname(__FILE__).'/../../htdocs/takepos', 'file' => 'receipt.php')
+);
+
+foreach ($arrayofunalterablefiles as $entry) {
+	if ($entry['file'] == 'all') {
+		$regextoinclude = $entry['regextoinclude'];
+		$regextoexclude = $entry['regextoexclude'];
+		$files = dol_dir_list($entry['dir'], 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
+		$dir = '';
+		foreach ($files as $filetmp) {
+			$file = $filetmp['fullname'];
+			$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
+			$newdir = str_replace(dirname(__FILE__).'/../../htdocs', '', dirname($file));
+			if ($newdir != $dir) {
+				if ($needtoclose) {
+					fputs($fp, '  </dir>'."\n");
+					$needtoclose = 0;
+				}
+				fputs($fp, '  <dir name="'.$newdir.'">'."\n");
+				$dir = $newdir;
+				$needtoclose = 1;
+			}
+			if (filetype($file) == "file") {
+				$md5 = md5_file($file);
+				$checksumconcat[] = $md5;
+				fputs($fp, '    <md5file name="'.basename($file).'" size="'.filesize($file).'">'.$md5.'</md5file>'."\n");
+			}
+		}
 		if ($needtoclose) {
 			fputs($fp, '  </dir>'."\n");
 			$needtoclose = 0;
 		}
-		fputs($fp, '  <dir name="'.$newdir.'">'."\n");
-		$dir = $newdir;
-		$needtoclose = 1;
-	}
-	if (filetype($file) == "file") {
-		$md5 = md5_file($file);
-		$checksumconcat[] = $md5;
-		fputs($fp, '    <md5file name="'.basename($file).'" size="'.filesize($file).'">'.$md5.'</md5file>'."\n");
-	}
-}
-if ($needtoclose) {
-	fputs($fp, '  </dir>'."\n");
-	$needtoclose = 0;
-}
-// Add the SQL file
-$regextoinclude = 'llx_blockedlog.*(\.php|\.sql)$';
-$regextoexclude = '';  // Exclude dirs
-$files = dol_dir_list(dirname(__FILE__).'/../../htdocs/install/mysql/tables', 'files', 0, $regextoinclude, $regextoexclude, 'fullname');
-foreach ($files as $filetmp) {
-	$file = $filetmp['fullname'];
-	$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
-	$newdir = str_replace(dirname(__FILE__).'/../../htdocs', '', dirname($file));
-	if ($newdir != $dir) {
+	} else {
+		$file = $entry['dir'].'/'.$entry['file'];
+		$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
+		$newdir = str_replace(dirname(__FILE__).'/../../htdocs', '', dirname($file));
+		if (!file_exists($file)) {
+			print "Error file ".$file." does not exists.";
+			exit(1);
+		}
+		if ($newdir != $dir) {
+			if ($needtoclose) {
+				fputs($fp, '  </dir>'."\n");
+				$needtoclose = 0;
+			}
+			fputs($fp, '  <dir name="'.$newdir.'">'."\n");
+			$dir = $newdir;
+			$needtoclose = 1;
+		}
+		if (filetype($file) == "file") {
+			$md5 = md5_file($file);
+			$checksumconcat[] = $md5;
+			fputs($fp, '    <md5file name="'.basename($file).'" size="'.filesize($file).'">'.$md5.'</md5file>'."\n");
+		}
 		if ($needtoclose) {
 			fputs($fp, '  </dir>'."\n");
 			$needtoclose = 0;
 		}
-		fputs($fp, '  <dir name="'.$newdir.'">'."\n");
-		$dir = $newdir;
-		$needtoclose = 1;
-	}
-	if (filetype($file) == "file") {
-		$md5 = md5_file($file);
-		$checksumconcat[] = $md5;
-		fputs($fp, '    <md5file name="'.basename($file).'" size="'.filesize($file).'">'.$md5.'</md5file>'."\n");
 	}
 }
-if ($needtoclose) {
-	fputs($fp, '  </dir>'."\n");
-	$needtoclose = 0;
-}
-// Add the trigger file
-$file = dirname(__FILE__).'/../../htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php';
-$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
-$newdir = str_replace(dirname(__FILE__).'/../../htdocs', '', dirname($file));
-if ($newdir != $dir) {
-	if ($needtoclose) {
-		fputs($fp, '  </dir>'."\n");
-		$needtoclose = 0;
-	}
-	fputs($fp, '  <dir name="'.$newdir.'">'."\n");
-	$dir = $newdir;
-	$needtoclose = 1;
-}
-if (filetype($file) == "file") {
-	$md5 = md5_file($file);
-	$checksumconcat[] = $md5;
-	fputs($fp, '    <md5file name="'.basename($file).'" size="'.filesize($file).'">'.$md5.'</md5file>'."\n");
-}
-if ($needtoclose) {
-	fputs($fp, '  </dir>'."\n");
-	$needtoclose = 0;
-}
+
+
 fputs($fp, '</dolibarr_unalterable_files>'."\n");
 
 asort($checksumconcat); // Sort list of checksum
@@ -353,22 +357,26 @@ fputs($fp, '</dolibarr_unalterable_files_checksum>'."\n\n");
 fputs($fp, '</checksum_list>'."\n");
 fclose($fp);
 
+print "\n";
+
 if (empty($buildzip)) {
-	print "File ".$outputfile." generated\n";
+	print "File ".$outputfile." generated.\n";
 } else {
 	if ($buildzip == '1' || $buildzip == 'zip') {
 		$result = dol_compress_file($outputfile, $outputfile.'.zip', 'zip');
 		if ($result > 0) {
 			dol_delete_file($outputfile);
-			print "File ".$outputfile.".zip generated\n";
+			print "File ".$outputfile.".zip generated.\n";
 		}
 	} elseif ($buildzip == '2' || $buildzip == 'gz') {
 		$result = dol_compress_file($outputfile, $outputfile.'.gz', 'gz');
 		if ($result > 0) {
 			dol_delete_file($outputfile);
-			print "File ".$outputfile.".gz generated\n";
+			print "File ".$outputfile.".gz generated.\n";
 		}
 	}
 }
 
+print "\n";
+
 exit(0);

dev/build/makepack-dolibarr.pl

@@ -163,14 +163,14 @@ $BUILDROOT="$TEMP/buildroot";
 
 
 # Get version $MAJOR, $MINOR and $BUILD
-$result = open( IN, "<" . $SOURCE . "/htdocs/filefunc.inc.php" );
-if ( !$result ) { die "Error: Can't open descriptor file " . $SOURCE . "/htdocs/filefunc.inc.php\n"; }
+$result = open( IN, "<" . $SOURCE . "/htdocs/version.inc.php" );
+if ( !$result ) { die "Error: Can't open descriptor file " . $SOURCE . "/htdocs/version.inc.php\n"; }
 while (<IN>) {
 	if ( $_ =~ /define\('DOL_VERSION',\s*'([\d\.a-z\-]+)'\)/ ) { $PROJVERSION = $1; break; }
 }
 close IN;
 ($MAJOR,$MINOR,$BUILD)=split(/\./,$PROJVERSION,3);
-if ($MINOR eq '') { die "Error can't detect version into ".$SOURCE . "/htdocs/filefunc.inc.php"; }
+if ($MINOR eq '') { die "Error can't detect version into ".$SOURCE . "/htdocs/version.inc.php"; }
 
 # Set vars for packaging
 $FILENAME            = "$PROJECT";
@@ -446,6 +446,15 @@ if ($nboftargetok) {
 
 	   	print 'Create xml check file with md5 checksum with command php '.$SOURCE.'/dev/build/generate_filelist_xml.php release='.$MAJOR.'.'.$MINOR.'.'.$BUILD."\n";
 	  	$ret=`php $SOURCE/dev/build/generate_filelist_xml.php release=$MAJOR.$MINOR.$BUILD`;
+		my $retcode=$?;
+		if ($retcode!=0)
+		{
+				print "Error running generate_filelist_xml.php please check\n";
+				print $ret;
+				print "Canceled.\n";
+				exit;
+		}
+
 	  	print $ret."\n";
 	  	# Copy to final dir
 	  	$NEWDESTI=$DESTI;

dev/build/makepack-howto.md

@@ -24,10 +24,9 @@ Prerequisites to build autoexe DoliWamp package from Linux (solution seems broke
 
 - Add path to ISCC.exe into the PATH windows var (You can do this by launching wine cmd, then regedit and add entry int `HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment\PATH`)
 
-- To manually build the .exe from Windows :
+- To manually build the .exe from Windows (Note: running from makepack-dolibarr.pl script is however recommended):
 
-  Note: running from makepack-dolibarr.pl script is however recommended
-  open file dev/build/exe/doliwamp.iss and click on button "Compile".
+  Open the file dev/build/exe/doliwamp.iss and click on button "Compile".
   The .exe file will be build into directory build.
 
 
@@ -58,7 +57,8 @@ Prerequisites to build autoexe DoliWamp package from Windows:
 
 This section describes steps made by Dolibarr packaging team to make a beta version of Dolibarr, step by step.
 
-- Check all files are committed.
+- Check that all files on local working repository are committed.
+
 - Update version/info in ChangeLog, for this you can:
 
 To generate a changelog of a **major new version** x.y.0 (from a repo on branch develop), you can do
@@ -92,7 +92,7 @@ git log x.y.z-1.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //
 
 - Run `makepack-dolibarr.pl` to check the generation of all packages. No need to publish them.
 
-- Post a news message on dolibarr.org about the freeze by cloning a past news + relay the news url on social networks
+- Post a news message on dolibarr.org about the freeze by cloning a past news + relay the news url on social networks. Include the content of the previously generated ChangeLog file into the news.
 
 - Create a branch x.y (but only when version seems stable enough).
 
@@ -108,18 +108,18 @@ We suppose the branch x.y has already been created during the beta (see previous
 
 - Check there is no pending open security issue: List can be found here: https://github.com/Dolibarr/dolibarr/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22Priority%20-%20Critical%20or%20Security%22
 
-- Check all files are committed.
+- Check that all files on local working repository are committed.
 
 - Update version/info in ChangeLog, for this:
 
-To generate a changelog of a **major new version** x.0.0 (from a repo on branch develop), you can do
+To generate a changelog of a **major new version** x.0.0 (from a repo on branch develop or x.y):
 
 ```
 cd ~/git/dolibarr
 git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/changelogtocopy
 ```
 
-To generate a changelog of a **intermediate new version** x.y.0 (from a repo on branch x.y), you can do
+To generate a changelog of a **intermediate new version** x.y.0 (from a repo on branch x.y);
 
 ```
 cd ~/git/dolibarr_x.y

dev/dolibarr_changes.txt

@@ -234,7 +234,7 @@ In htdocs/includes/tecnickcom/tcpdf/tcpdf.php
 
 PHP TCPDI:
 ----------
-Add file fpdf_tpl.php 1.2
+Add file fpdf_tpl.php 1.2.3
 
 Add file tcpdi.php
 

dev/examples/zapier/package.json

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

dev/initdata/generate-invoice.php

@@ -26,7 +26,7 @@
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test si mode batch
 $sapi_type = php_sapi_name();
@@ -41,12 +41,26 @@ require __DIR__. '/../../htdocs/master.inc.php';
 require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php";
 require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
 
+// Global variables
+$version = DOL_VERSION;
+
 
 /*
- * Parameters
+ * Main
  */
 
-define('GEN_NUMBER_FACTURE', $argv[1] ?? 1);
+@set_time_limit(0);
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".implode(',', $argv));
+
+if (empty($argv[1])) {
+	print "Usage:  $script_file  nbofrecord\n";
+	print "Usage:  $script_file  100\n";
+	print "\n";
+	exit(1);
+}
+
+define('GEN_NUMBER_FACTURE', ((int) $argv[1]) ?? 1);
 $year = 2016;
 $dates = array(mktime(12, 0, 0, 1, 3, $year),
 	mktime(12, 0, 0, 1, 9, $year),
@@ -100,7 +114,7 @@ $dates = array(mktime(12, 0, 0, 1, 3, $year),
 	mktime(12, 0, 0, 12, 13, $year),
 );
 
-$ret=$user->fetch('', 'admin');
+$ret = $user->fetch('', 'admin');
 if (! $ret > 0) {
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
 	exit;

dev/initdata/generate-order.php

@@ -27,7 +27,7 @@
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test si mode batch
 $sapi_type = php_sapi_name();
@@ -47,12 +47,28 @@ include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 require_once DOL_DOCUMENT_ROOT."/commande/class/commande.class.php";
 
+// Global variables
+$version = DOL_VERSION;
+
 
 /*
- * Parameter
+ * Main
  */
 
-define('GEN_NUMBER_COMMANDE', $argv[1] ?? 10);
+
+@set_time_limit(0);
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".implode(',', $argv));
+
+if (empty($argv[1])) {
+	print "Usage:  $script_file  nbofrecord\n";
+	print "Usage:  $script_file  100\n";
+	print "\n";
+	exit(1);
+}
+
+define('GEN_NUMBER_COMMANDE', ((int) $argv[1]) ?? 10);
+
 $year = 2016;
 $dates = array(mktime(12, 0, 0, 1, 3, $year),
 	mktime(12, 0, 0, 1, 9, $year),
@@ -106,7 +122,7 @@ $dates = array(mktime(12, 0, 0, 1, 3, $year),
 	mktime(12, 0, 0, 12, 13, $year),
 );
 
-$ret=$user->fetch('', 'admin');
+$ret = $user->fetch('', 'admin');
 if ($ret <= 0) {
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
 	exit;

dev/initdata/generate-product.php

@@ -27,7 +27,7 @@
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test si mode batch
 $sapi_type = php_sapi_name();
@@ -46,15 +46,28 @@ include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 
+// Global variables
+$version = DOL_VERSION;
+
 
 /*
- * Parameters
+ * Main
  */
 
-define('GEN_NUMBER_PRODUIT', $argv[1] ?? 100);
+@set_time_limit(0);
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".implode(',', $argv));
 
+if (empty($argv[1])) {
+	print "Usage:  $script_file  nbofrecord\n";
+	print "Usage:  $script_file  100\n";
+	print "\n";
+	exit(1);
+}
 
-$ret=$user->fetch('', 'admin');
+define('GEN_NUMBER_PRODUIT', ((int) $argv[1]) ?? 100);
+
+$ret = $user->fetch('', 'admin');
 if (! $ret > 0) {
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
 	exit;
@@ -106,15 +119,22 @@ if ($resql) {
 print "Generates ".GEN_NUMBER_PRODUIT." products\n";
 for ($s = 0; $s < GEN_NUMBER_PRODUIT; $s++) {
 	print "Product ".$s;
+
 	$produit = new Product($db);
 	$produit->type = mt_rand(0, 1);
-	$produit->status = 1;
+	$produit->status = mt_rand(0, 1);
+	$produit->status_buy = mt_rand(0, 1);
+	$produit->finished = mt_rand(0, 1);
+	$produit->stockable_product = mt_rand(0, 1);
+
 	$produit->ref = ($produit->type ? 'S' : 'P').time().$s;
 	$produit->label = 'Label '.time().$s;
-	$produit->description = 'Description '.time().$s;
+	$produit->description = 'This is a long description of '.$produit->ref;
 	$produit->price = mt_rand(1, 999.99);
 	$produit->tva_tx = "20.0";
-	$ret=$produit->create($user);
+
+	$ret = $produit->create($user);
+
 	if ($ret < 0) {
 		print "Error $ret - ".$produit->error."\n";
 	} else {

dev/initdata/generate-proposal.php

@@ -27,7 +27,7 @@
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test si mode batch
 $sapi_type = php_sapi_name();
@@ -44,11 +44,27 @@ require_once DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php";
 require_once DOL_DOCUMENT_ROOT."/commande/class/commande.class.php";
 require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
 
+// Global variables
+$version = DOL_VERSION;
+
+
 /*
- * Parameters
+ * Main
  */
 
-define('GEN_NUMBER_PROPAL', $argv[1] ?? 10);
+@set_time_limit(0);
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".implode(',', $argv));
+
+if (empty($argv[1])) {
+	print "Usage:  $script_file  nbofrecord\n";
+	print "Usage:  $script_file  100\n";
+	print "\n";
+	exit(1);
+}
+
+define('GEN_NUMBER_PROPAL', ((int) $argv[1]) ?? 10);
+
 $year = 2016;
 $dates = array(mktime(12, 0, 0, 1, 3, $year),
 	mktime(12, 0, 0, 1, 9, $year),
@@ -102,7 +118,7 @@ $dates = array(mktime(12, 0, 0, 1, 3, $year),
 	mktime(12, 0, 0, 12, 13, $year),
 );
 
-$ret=$user->fetch('', 'admin');
+$ret = $user->fetch('', 'admin');
 if (! $ret > 0) {
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
 	exit;

dev/initdata/generate-thirdparty.php

@@ -49,15 +49,29 @@ include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 $listoftown = array("Auray","Baden","Vannes","Pirouville","Haguenau","Souffelweiersheim","Illkirch-Graffenstaden","Lauterbourg","Picauville","Sainte-Mère Eglise","Le Bono");
 $listoflastname = array("Joe","Marc","Steve","Laurent","Nico","Isabelle","Dorothee","Saby","Brigitte","Karine","Jose-Anne","Celine","Virginie");
 
+// Global variables
+$version = DOL_VERSION;
+
 
 /*
- * Parameter
+ * Main
  */
 
-define('GEN_NUMBER_SOCIETE', $argv[1] ?? 10);
+@set_time_limit(0);
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
+dol_syslog($script_file." launched with arg ".implode(',', $argv));
+
+if (empty($argv[1])) {
+	print "Usage:  $script_file  nbofrecord\n";
+	print "Usage:  $script_file  100\n";
+	print "\n";
+	exit(1);
+}
+
+define('GEN_NUMBER_SOCIETE', ((int) $argv[1]) ?? 10);
 
 
-$ret=$user->fetch('', 'admin');
+$ret = $user->fetch('', 'admin');
 if (! $ret > 0) {
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
 	exit;

dev/initdata/import-products.php

@@ -41,15 +41,15 @@ require $path."../../htdocs/master.inc.php";
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
-$delimiter=',';
-$enclosure='"';
-$linelength=10000;
-$escape='/';
+$delimiter = ',';
+$enclosure = '"';
+$linelength = 10000;
+$escape = '/';
 
 // Global variables
-$version=DOL_VERSION;
-$confirmed=1;
-$error=0;
+$version = DOL_VERSION;
+$confirmed = 1;
+$error = 0;
 
 
 /*
@@ -71,15 +71,15 @@ if (empty($mode) || ! in_array($mode, array('test','confirm','confirmforced')) |
 	print "Usage:  $script_file (test|confirm|confirmforced) filepath.csv [defaultlang] [startlinenb] [endlinenb]\n";
 	print "Usage:  $script_file test myfilepath.csv fr_FR 2 1002\n";
 	print "\n";
-	exit(-1);
+	exit(1);
 }
 if (! file_exists($filepath)) {
 	print "Error: File ".$filepath." not found.\n";
 	print "\n";
-	exit(-1);
+	exit(1);
 }
 
-$ret=$user->fetch('', 'admin');
+$ret = $user->fetch('', 'admin');
 if (! $ret > 0) {
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
 	exit;

dev/initdata/import-thirdparties.php

@@ -41,15 +41,15 @@ require $path."../../htdocs/master.inc.php";
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
-$delimiter=',';
-$enclosure='"';
-$linelength=10000;
-$escape='/';
+$delimiter = ',';
+$enclosure = '"';
+$linelength = 10000;
+$escape = '/';
 
 // Global variables
-$version=DOL_VERSION;
-$confirmed=1;
-$error=0;
+$version = DOL_VERSION;
+$confirmed = 1;
+$error = 0;
 
 
 /*
@@ -71,15 +71,15 @@ if (empty($mode) || ! in_array($mode, array('test','confirm','confirmforced')) |
 	print "Usage:  $script_file (test|confirm|confirmforced) filepath.csv [startlinenb] [endlinenb]\n";
 	print "Usage:  $script_file test myfilepath.csv 2 1002\n";
 	print "\n";
-	exit(-1);
+	exit(1);
 }
 if (! file_exists($filepath)) {
 	print "Error: File ".$filepath." not found.\n";
 	print "\n";
-	exit(-1);
+	exit(1);
 }
 
-$ret=$user->fetch('', 'admin');
+$ret = $user->fetch('', 'admin');
 if (! $ret > 0) {
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
 	exit;

dev/initdata/import-users.php

@@ -41,15 +41,15 @@ require $path."../../htdocs/master.inc.php";
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
-$delimiter=',';
-$enclosure='"';
-$linelength=10000;
-$escape='/';
+$delimiter = ',';
+$enclosure = '"';
+$linelength = 10000;
+$escape = '/';
 
 // Global variables
-$version=DOL_VERSION;
-$confirmed=1;
-$error=0;
+$version = DOL_VERSION;
+$confirmed = 1;
+$error = 0;
 
 
 /*
@@ -71,12 +71,12 @@ if (empty($mode) || ! in_array($mode, array('test','confirm','confirmforced')) |
 	print "Usage:  $script_file (test|confirm|confirmforced) filepath.csv [startlinenb] [endlinenb]\n";
 	print "Usage:  $script_file test myfilepath.csv 2 1002\n";
 	print "\n";
-	exit(-1);
+	exit(1);
 }
 if (! file_exists($filepath)) {
 	print "Error: File ".$filepath." not found.\n";
 	print "\n";
-	exit(-1);
+	exit(1);
 }
 
 $ret=$user->fetch('', 'admin');

dev/initdata/purge-data.php

@@ -32,7 +32,7 @@ $path=__DIR__.'/';
 // Test si mode batch
 if (substr($sapi_type, 0, 3) == 'cgi') {
 	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+	exit(1);
 }
 
 // Recupere root dolibarr
@@ -187,13 +187,13 @@ if (empty($mode) || ! in_array($mode, array('test','confirm'))) {
 	print "Usage:  $script_file (test|confirm) (all|option) (all|YYYY-MM-DD) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
 	print "\n";
 	print "option can be ".implode(',', array_keys($sqls))."\n";
-	exit(-1);
+	exit(1);
 }
 if (empty($option)) {
 	print "Usage:  $script_file (test|confirm) (all|option) (all|YYYY-MM-DD) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
 	print "\n";
 	print "option must be defined with a value in list ".implode(',', array_keys($sqls))."\n";
-	exit(-1);
+	exit(1);
 }
 if ($option != 'all') {
 	$listofoptions=explode(',', $option);
@@ -202,7 +202,7 @@ if ($option != 'all') {
 			print "Usage:  $script_file (test|confirm) (all|option) (all|YYYY-MM-DD) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
 			print "\n";
 			print "option '".$cursoroption."' must be in list ".implode(',', array_keys($sqls))."\n";
-			exit(-1);
+			exit(1);
 		}
 	}
 }
@@ -211,7 +211,7 @@ if (empty($date) || (! preg_match('/\d\d\d\d\-\d\d\-\d\d$/', $date) && $date !=
 	print "Usage:  $script_file (test|confirm) (all|option) (all|YYYY-MM-DD) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
 	print "\n";
 	print "date can be 'all' or 'YYYY-MM-DD' to delete record before YYYY-MM-DD\n";
-	exit(-1);
+	exit(1);
 }
 
 if ($date == 'all') {

dev/initdemo/mysqldump_dolibarr_22.0.0.sql

@@ -65051,7 +65051,7 @@ INSERT INTO `llx_const` VALUES
 (11890,'MAIN_AGENDA_ACTIONAUTO_USER_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),
 (11891,'MAIN_AGENDA_ACTIONAUTO_USER_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),
 (11892,'MAIN_AGENDA_ACTIONAUTO_USER_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),
-(11893,'MAIN_AGENDA_ACTIONAUTO_USER_NEW_PASSWORD',1,'dolcrypt:AES-256-CTR:9eebc9ac2c57a4ec:ww==','chaine',0,'','2023-03-01 16:57:33'),
+(11893,'MAIN_AGENDA_ACTIONAUTO_USER_NEW_PASSWORD',1,'1','chaine',0,'','2023-03-01 16:57:33'),
 (11894,'MAIN_AGENDA_ACTIONAUTO_USER_ENABLEDISABLE',1,'1','chaine',0,'','2023-03-01 16:57:33'),
 (11895,'MAIN_AGENDA_ACTIONAUTO_BOM_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),
 (11896,'MAIN_AGENDA_ACTIONAUTO_BOM_UNVALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),
@@ -65205,7 +65205,6 @@ INSERT INTO `llx_const` VALUES
 (14411,'MARKETPLACE_BUYER_ORDER_CONFIRMATION_TEMPLATE',1,'-1','chaine',0,'','2025-02-05 14:08:06'),
 (14412,'MARKETPLACE_SELLERS_ORDER_CONFIRMATION_TEMPLATE',1,'-1','chaine',0,'','2025-02-05 14:08:06'),
 (14413,'MARKETPLACE_MINIMUM_PAYOUT_AMOUNT',1,'50','chaine',0,'','2025-02-05 14:08:06'),
-(14417,'MARKETPLACE_SECRET_KEY',1,'dolcrypt:AES-256-CTR:a113efb19906f2be:q6ZG+E22cA==','chaine',0,'','2025-02-05 14:09:55'),
 (14459,'MARKETPLACE_PAYMENT_IN_FRAME',1,'1','chaine',0,'','2025-02-05 14:33:21'),
 (14491,'HELLOASSO_BANK_ACCOUNT_FOR_PAYMENTS',1,'6','chaine',0,'','2025-02-06 12:52:19'),
 (14521,'MAIN_MAIL_SENDMODE_PASSWORDRESET',1,'default','chaine',0,'','2025-02-12 18:07:29'),
@@ -65251,7 +65250,7 @@ INSERT INTO `llx_const` VALUES
 (15001,'PROPALE_VALIDITY_DURATION',1,'15','chaine',0,'','2025-03-03 02:52:32'),
 (15002,'PROPOSAL_FREE_TEXT',1,'Ceci est <a href=\"https://www.dolibarr.org\">un lien</a>','chaine',0,'','2025-03-03 02:52:32'),
 (15004,'PDF_SECURITY_ENCRYPTION',1,'0','chaine',1,'','2025-03-03 02:53:28'),
-(15007,'MARKETPLACE_PUBLIC_API_KEY',1,'dolcrypt:AES-256-CTR:d515f8d303aad816:+32sG1DvuxkMOYlMzFOY6Y1VhKf5r+dvMfz2e+6EjHU=','chaine',0,'','2025-03-03 16:22:48'),
+(15007,'MARKETPLACE_PUBLIC_API_KEY',1,'demokey','chaine',0,'','2025-03-03 16:22:48'),
 (15011,'MAIN_ENABLE_COMMUNITY_REPO',1,'1','chaine',1,'','2025-03-03 16:54:48'),
 (15020,'MAIN_ENABLE_DOLISTORE',1,'0','chaine',1,'','2025-03-04 22:03:12'),
 (15161,'MAIN_MODULE_OPENIDCONNECT',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2025-03-06 15:18:21'),
@@ -65304,7 +65303,7 @@ INSERT INTO `llx_const` VALUES
 (15630,'MULTICURRENCY_APP_ID',1,'knJn9aj77LqcGtHp9m6rRWB5iD1yhfRO','chaine',0,'','2025-03-21 12:43:49'),
 (15726,'EMAILING_USE_ADVANCED_SELECTOR',1,'1','chaine',0,'','2025-03-25 11:08:47'),
 (15731,'CONTRACT_ALLOW_ONLINESIGN',1,'0','chaine',0,'','2025-03-25 12:47:09'),
-(15746,'MULTICURRENCY_APP_KEY',1,'dolcrypt:AES-256-CTR:a972ff0c9e92c932:dqOrWexGkIENOk0Fen4hKMCN+jxY2ou0EDwmV1pk2uQ=','chaine',0,'','2025-03-25 15:03:23'),
+(15746,'MULTICURRENCY_APP_KEY',1,'demokey','chaine',0,'','2025-03-25 15:03:23'),
 (15747,'MULTICURRENCY_APP_ENDPOINT',1,'https://api.apilayer.com/currency_data/live?base=__MULTICURRENCY_APP_SOURCE__','chaine',0,'','2025-03-25 15:03:23'),
 (15752,'MAIN_AGENDA_ACTIONAUTO_COMPANY_RIB_CREATE',1,'1','chaine',0,NULL,'2025-03-25 19:50:16'),
 (15753,'MAIN_AGENDA_ACTIONAUTO_COMPANY_RIB_MODIFY',1,'1','chaine',0,NULL,'2025-03-25 19:50:16'),
@@ -65447,12 +65446,12 @@ INSERT INTO `llx_const` VALUES
 (17506,'ACCOUNTING_PRODUCT_MODE',1,'ACCOUNTANCY_SELL','chaine',0,'','2025-04-03 18:15:02'),
 (17586,'FACTURE_ADDON',1,'mod_facture_mars','chaine',0,'','2025-04-05 14:25:19'),
 (17777,'AI_API_SERVICE',1,'mistral','chaine',0,'','2025-04-07 23:24:36'),
-(17778,'AI_API_CHATGPT_KEY',1,'dolcrypt:AES-256-CTR:9613a045bab6c491:GZp61Q3TMSMF/iTVCl/0QXXkGcMsTJetGBR5Zy6nLac=','chaine',0,'','2025-04-07 23:24:36'),
+(17778,'AI_API_CHATGPT_KEY',1,'demokey','chaine',0,'','2025-04-07 23:24:36'),
 (17779,'AI_API_CHATGPT_URL',1,'https://api.openai.com/v1/','chaine',0,'','2025-04-07 23:24:36'),
 (17780,'AI_API_GROQ_URL',1,'https://api.groq.com/openai/','chaine',0,'','2025-04-07 23:24:36'),
-(17781,'AI_API_MISTRAL_KEY',1,'dolcrypt:AES-256-CTR:1abe518475f89cfa:LNtWUSvYyIf8LQ/JEtpuu2ZrorjJMUxRFZG4VmmEn7o=','chaine',0,'','2025-04-07 23:24:36'),
+(17781,'AI_API_MISTRAL_KEY',1,'demokey','chaine',0,'','2025-04-07 23:24:36'),
 (17782,'AI_API_MISTRAL_URL',1,'https://api.mistral.ai/v1/','chaine',0,'','2025-04-07 23:24:36'),
-(17783,'AI_API_CUSTOM_KEY',1,'dolcrypt:AES-256-CTR:9733d785d0113ed2:+KXzk7ILKPq99LL2g9dpxGlprEWAScO26jEeFnpJBxQ=','chaine',0,'','2025-04-07 23:24:36'),
+(17783,'AI_API_CUSTOM_KEY',1,'demokey','chaine',0,'','2025-04-07 23:24:36'),
 (17784,'AI_API_CUSTOM_URL',1,'https://mydomainofapi.com/v1','chaine',0,'','2025-04-07 23:24:36'),
 (17788,'SOCIETE_RIB_ALLOW_ONLINESIGN',1,'1','chaine',0,'','2025-04-08 08:59:48'),
 (17803,'SOCIETE_ENABLE_PUBLIC',1,'1','chaine',1,'','2025-04-08 10:55:06'),
@@ -65506,7 +65505,7 @@ INSERT INTO `llx_const` VALUES
 (18204,'MAIN_INFO_SOCIETE_OBJECT',1,'A company demo to show how Dolibarr ERP CRM is wonderfull','chaine',0,'','2025-04-16 19:50:19'),
 (18205,'SOCIETE_FISCAL_MONTH_START',1,'4','chaine',0,'','2025-04-16 19:50:19'),
 (18206,'FACTURE_TVAOPTION',1,'1','chaine',0,'','2025-04-16 19:50:19'),
-(18234,'MAIN_MODULE_DOLISTORE_API_KEY',1,'dolcrypt:AES-256-CTR:d4169f5ecebe9852:mSXcyJujXRYwvP1DmsaFgevA','chaine',1,'','2025-04-17 10:04:08'),
+(18234,'MAIN_MODULE_DOLISTORE_API_KEY',1,'dolistorepublicapi','chaine',1,'','2025-04-17 10:04:08'),
 (18241,'PROJET_VISIBILITY',1,'0','chaine',0,'','2025-04-18 11:17:47'),
 (18242,'PROJECT_ENABLE_PUBLIC',1,'1','chaine',0,'','2025-04-18 11:17:47'),
 (18243,'PROJECT_DEFAULT_OPPORTUNITY_STATUS_FOR_ONLINE_LEAD',1,'-1','chaine',0,'','2025-04-18 11:17:47'),
@@ -65517,7 +65516,7 @@ INSERT INTO `llx_const` VALUES
 (18256,'EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT',1,'34','chaine',0,'','2025-04-18 11:21:49'),
 (18257,'SERVICE_BOOTH_LOCATION',1,'0','chaine',0,'','2025-04-18 11:21:49'),
 (18258,'SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION',1,'0','chaine',0,'','2025-04-18 11:21:49'),
-(18260,'EVENTORGANIZATION_SECUREKEY',1,'dolcrypt:AES-256-CTR:83f6e644d47eaf29:GIDq0w==','chaine',0,'','2025-04-18 13:46:59'),
+(18260,'EVENTORGANIZATION_SECUREKEY',1,'demokey','chaine',0,'','2025-04-18 13:46:59'),
 (18271,'MAIN_ENABLE_OVERWRITE_TRANSLATION',1,'1','chaine',0,'','2025-04-21 12:59:49'),
 (18273,'RESOURCE_USED_IN_EVENT_CHECK',1,'1','chaine',0,'','2025-04-22 17:20:40'),
 (18275,'MAIN_MENU_STANDARD',1,'eldy_menu.php','chaine',0,'','2025-04-24 12:08:27'),
@@ -65556,8 +65555,6 @@ INSERT INTO `llx_const` VALUES
 (18588,'TAWKTO_WIDGET_ID',1,'123','chaine',0,'','2025-05-12 08:36:50'),
 (18678,'SELLYOURSAAS_ALLOW_SELECTION_OF_SERVICE',1,'1','chaine',0,'','2025-05-26 12:57:33'),
 (18719,'SELLYOURSAAS_ALLOW_RESELLER_PROGRAM',1,'1','chaine',0,'','2025-05-26 13:41:52'),
-(18722,'STRIPE_TEST_PUBLISHABLE_KEY',1,'dolcrypt:AES-256-CTR:d484ce93b5b8497d:T5UVYovfd4RjjYBmTt7Xipdly/dt5R7A/7TwBytAV6E=','chaine',0,'','2025-05-26 15:26:42'),
-(18723,'STRIPE_TEST_SECRET_KEY',1,'dolcrypt:AES-256-CTR:eebc90c2ac9810a9:87fh2hsZr7l+dExy/ngsDP25FaoEkRfHkjdqKGulFBU=','chaine',0,'','2025-05-26 15:26:42'),
 (18724,'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS',1,'4','chaine',0,'','2025-05-26 15:26:42'),
 (18725,'STRIPE_USER_ACCOUNT_FOR_ACTIONS',1,'0','chaine',0,'','2025-05-26 15:26:42'),
 (18726,'STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS',1,'0','chaine',0,'','2025-05-26 15:26:42'),
@@ -65824,12 +65821,12 @@ LOCK TABLES `llx_contrat_extrafields` WRITE;
 /*!40000 ALTER TABLE `llx_contrat_extrafields` DISABLE KEYS */;
 INSERT INTO `llx_contrat_extrafields` VALUES
 (1,'2023-01-19 12:39:56',2,NULL,NULL,NULL,'done',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(5,'2025-01-03 14:13:54',8,NULL,'DOLICLOUD','testldr1-ABC','processing','127.0.0.1','2025-01-03 15:13:54',NULL,'127.0.0.1',NULL,NULL,NULL,'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36 - fr-FR,fr;q=0.9,en-US;q=0.8,en;q=0.7',NULL,'2025-01-18 15:13:54',NULL,NULL,NULL,NULL,NULL,'testldr1d.with1.home.lan','osuo724k4hqa','dolcrypt:AES-256-CTR:ce01e4a8ade3c2ee:Rn1kmDfhbw0Eb8zpBI8=','0','testldr1d.with1.home.lan','dbntq7Wk89Mt','3306','dbuZe76P3B70','dolcrypt:AES-256-CTR:e0775c31971de7f3:YsE0Bi6lWG63zd537qc=',NULL,NULL,NULL,'Europe/Paris',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(6,'2025-01-03 14:17:40',9,NULL,'DOLICLOUD','testldr1-ABC','processing','127.0.0.1','2025-01-03 15:17:40',NULL,'127.0.0.1',NULL,NULL,NULL,'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36 - fr-FR,fr;q=0.9,en-US;q=0.8,en;q=0.7',NULL,'2025-01-18 15:17:40',NULL,NULL,NULL,NULL,NULL,'testldre.with1.home.lan','osuky642i38n','dolcrypt:AES-256-CTR:402192d99e39c190:5DrzVbVS5kac7ZQUchU=','0','testldre.with1.home.lan','dbnd3X892MlO','3306','dbuCbWmMi7O8','dolcrypt:AES-256-CTR:b22360d10ff565a0:DXpgecqzOn7X/3PQCo0=',NULL,NULL,NULL,'Europe/Paris',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(7,'2025-03-25 23:57:06',7,NULL,'DOLICLOUD','testldr1b-ABC','undeployed','127.0.0.1','2025-01-03 15:08:56',NULL,'127.0.0.1',NULL,NULL,NULL,'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36 - fr-FR,fr;q=0.9,en-US;q=0.8,en;q=0.7',NULL,'2025-01-23 15:08:56','2025-01-03 15:26:46','127.0.0.1',NULL,NULL,NULL,'testldr1c.with1.home.lan','osu6viclw5if','dolcrypt:AES-256-CTR:281a87e3e9c5fccb:O/N7kTAeXiZaHqlEupE=','0','testldr1c.with1.home.lan','dbnrC5ydd7GC','3306','dbub5pLDMaTw','dolcrypt:AES-256-CTR:2e4a79eda1bf538a:PS7p579ZNsDQAycuq8o=',NULL,NULL,NULL,'Europe/Paris',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(8,'2025-01-03 14:26:46',5,NULL,'DOLICLOUD','testldr1-ABC','undeployed','127.0.0.1','2025-01-03 14:59:56',NULL,'127.0.0.1',NULL,NULL,NULL,'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36 - fr-FR,fr;q=0.9,en-US;q=0.8,en;q=0.7',NULL,'2025-01-18 14:59:56','2025-01-03 15:26:46','127.0.0.1',NULL,NULL,NULL,'testldr1.with1.home.lan','osu07jp64r9z','dolcrypt:AES-256-CTR:d94d86baf2f8483b:Op7TNgxhUwrSgbilZDo=','0','testldr1.with1.home.lan','dbnL4N55fzF6','3306','dbuH73bA3QfX','dolcrypt:AES-256-CTR:535b648bbae2f12a:VEc+yVQFXPbxOqhIItQ=',NULL,NULL,NULL,'Europe/Paris',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(9,'2025-03-25 21:53:24',6,NULL,'DOLICLOUD','testldr1-ABC','undeployed','127.0.0.1','2025-01-03 15:05:10',NULL,'127.0.0.1',NULL,NULL,NULL,'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36 - fr-FR,fr;q=0.9,en-US;q=0.8,en;q=0.7',NULL,'2026-01-19 15:05:10','2025-01-03 15:27:11','127.0.0.1',NULL,NULL,NULL,'testldr1b.with1.home.lan','osu7xkedfm24','dolcrypt:AES-256-CTR:fa3d910f3fbfdad2:o+C4Ksn2W5veGS5R5Ag=','0','testldr1b.with1.home.lan','dbnVmeQT2M8i','3306','dbuK7VsLk5c8','dolcrypt:AES-256-CTR:ccb4d385381f4b4b:lDR/2Y6QjlNt3onLr3U=',NULL,NULL,NULL,'Europe/Paris',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(10,'2025-01-28 16:39:40',10,NULL,'DOLICLOUD','Azerty01','processing','127.0.0.1','2025-01-28 17:39:40',NULL,'127.0.0.1',NULL,NULL,NULL,'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36 - fr-FR,fr;q=0.9,en-US;q=0.8,en;q=0.7',NULL,'2025-02-12 17:39:40',NULL,NULL,NULL,NULL,NULL,'aaa.with1.home.lan','osuy6m0f5xtl','dolcrypt:AES-256-CTR:54fed010c0ce1d1c:8eXkLuQl7gNbC9RZEPM=','0','aaa.with1.home.lan','dbnSE8YB6jGm','3306','dbu8MhF1Dwcl','dolcrypt:AES-256-CTR:44f9f66acc719394:Bi7LNv+Vf6cf2ySF2aw=',NULL,NULL,NULL,'Europe/Paris',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(5,'2025-01-03 14:13:54',8,NULL,'DOLICLOUD','testldr1-ABC','processing','127.0.0.1','2025-01-03 15:13:54',NULL,'127.0.0.1',NULL,NULL,NULL,'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36 - fr-FR,fr;q=0.9,en-US;q=0.8,en;q=0.7',NULL,'2025-01-18 15:13:54',NULL,NULL,NULL,NULL,NULL,'testldr1d.with1.home.lan','osuo724k4hqa','demokey','0','testldr1d.with1.home.lan','dbntq7Wk89Mt','3306','dbuZe76P3B70','demokey',NULL,NULL,NULL,'Europe/Paris',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(6,'2025-01-03 14:17:40',9,NULL,'DOLICLOUD','testldr1-ABC','processing','127.0.0.1','2025-01-03 15:17:40',NULL,'127.0.0.1',NULL,NULL,NULL,'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36 - fr-FR,fr;q=0.9,en-US;q=0.8,en;q=0.7',NULL,'2025-01-18 15:17:40',NULL,NULL,NULL,NULL,NULL,'testldre.with1.home.lan','osuky642i38n','demokey','0','testldre.with1.home.lan','dbnd3X892MlO','3306','dbuCbWmMi7O8','demokey',NULL,NULL,NULL,'Europe/Paris',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(7,'2025-03-25 23:57:06',7,NULL,'DOLICLOUD','testldr1b-ABC','undeployed','127.0.0.1','2025-01-03 15:08:56',NULL,'127.0.0.1',NULL,NULL,NULL,'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36 - fr-FR,fr;q=0.9,en-US;q=0.8,en;q=0.7',NULL,'2025-01-23 15:08:56','2025-01-03 15:26:46','127.0.0.1',NULL,NULL,NULL,'testldr1c.with1.home.lan','osu6viclw5if','demokey','0','testldr1c.with1.home.lan','dbnrC5ydd7GC','3306','dbub5pLDMaTw','demokey',NULL,NULL,NULL,'Europe/Paris',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(8,'2025-01-03 14:26:46',5,NULL,'DOLICLOUD','testldr1-ABC','undeployed','127.0.0.1','2025-01-03 14:59:56',NULL,'127.0.0.1',NULL,NULL,NULL,'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36 - fr-FR,fr;q=0.9,en-US;q=0.8,en;q=0.7',NULL,'2025-01-18 14:59:56','2025-01-03 15:26:46','127.0.0.1',NULL,NULL,NULL,'testldr1.with1.home.lan','osu07jp64r9z','demokey','0','testldr1.with1.home.lan','dbnL4N55fzF6','3306','dbuH73bA3QfX','demokey',NULL,NULL,NULL,'Europe/Paris',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(9,'2025-03-25 21:53:24',6,NULL,'DOLICLOUD','testldr1-ABC','undeployed','127.0.0.1','2025-01-03 15:05:10',NULL,'127.0.0.1',NULL,NULL,NULL,'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36 - fr-FR,fr;q=0.9,en-US;q=0.8,en;q=0.7',NULL,'2026-01-19 15:05:10','2025-01-03 15:27:11','127.0.0.1',NULL,NULL,NULL,'testldr1b.with1.home.lan','osu7xkedfm24','demokey','0','testldr1b.with1.home.lan','dbnVmeQT2M8i','3306','dbuK7VsLk5c8','demokey',NULL,NULL,NULL,'Europe/Paris',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(10,'2025-01-28 16:39:40',10,NULL,'DOLICLOUD','Azerty01','processing','127.0.0.1','2025-01-28 17:39:40',NULL,'127.0.0.1',NULL,NULL,NULL,'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36 - fr-FR,fr;q=0.9,en-US;q=0.8,en;q=0.7',NULL,'2025-02-12 17:39:40',NULL,NULL,NULL,NULL,NULL,'aaa.with1.home.lan','osuy6m0f5xtl','demokey','0','aaa.with1.home.lan','dbnSE8YB6jGm','3306','dbu8MhF1Dwcl','demokey',NULL,NULL,NULL,'Europe/Paris',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (13,'2025-06-26 17:54:04',14,NULL,NULL,NULL,'0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0',NULL,NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_contrat_extrafields` ENABLE KEYS */;
 UNLOCK TABLES;
@@ -78962,10 +78959,10 @@ INSERT INTO `llx_societe_rib` VALUES
 (2,1,'ban',10,'2023-02-06 14:28:24','2025-04-08 08:59:57','NLTechno','aaaa','','','','','LIABLT2XXXX',NULL,'FR76 1223 9000 0740 4608 0100 091',NULL,'','','',1,NULL,NULL,NULL,'sepamandate','societe/10/Mandat SEPA 10-NLTechno-UMR-CU1212-0005-2-1675704504.pdf','UMR-CU1212-0005-2-1675704504',NULL,'FRST',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,'',1,NULL,NULL,'',NULL,NULL,NULL,NULL,NULL),
 (3,1,'ban',33,'2023-02-21 21:33:04','2023-02-22 00:33:04','aaainlux','aaa','','','','','aaa',NULL,'aaa',NULL,'','','',1,NULL,NULL,NULL,NULL,NULL,'UMR-2302212133-3-CU2212-00026',NULL,'FRST',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,'',1,NULL,NULL,'',NULL,NULL,NULL,NULL,NULL),
 (4,1,'card',33,'2023-02-21 22:26:00','2023-02-22 01:26:00','aa','',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,'aa',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,'',1,2032,'FR',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(5,1,'ban',1,'2023-03-08 06:41:28','2025-06-26 22:04:48','Indian SAS RIB','dfgdfgfd','','','','','LIABLT2XXXX',NULL,'dolcrypt:AES-256-CTR:6c5e3bcfba8c0873:sGWo/KYhvG8bw/oDC1uxal95cpvQLuKdzDGk86DYpdV2',NULL,'','','',1,NULL,NULL,NULL,NULL,NULL,'RUM-2303080641-5-CU1212-0007',NULL,'FRST',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,'',1,NULL,NULL,'',NULL,NULL,NULL,NULL,NULL),
-(6,1,'ban',39,'2025-01-03 16:11:35','2025-01-03 15:11:37','test','test','','','','','LIABLT2XXXX',NULL,'dolcrypt:AES-256-CTR:d0fbb5f8f1882d9f:QruV8ONPL6fQK4ew6aDzI4VSdBU=',NULL,'','','',1,NULL,NULL,NULL,NULL,NULL,'8ANKF3PEOTZ53TR4','2025-01-03','RCUR',NULL,NULL,'sepa_debit',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,'pm_1QdCXECxfvxGwHdwPnN4agJk',0,'mandate_1QdCXECxfvxGwHdwIdo2yLTd',NULL,'cus_test@sk_test_xxx',NULL,NULL,NULL,'StripeTest',NULL),
-(7,1,'ban',39,'2025-01-03 16:21:39','2025-01-03 15:21:56','Bank Testldr1','test2','','','','','',NULL,'dolcrypt:AES-256-CTR:2143648571f74d32:ohNxpDnLCHNMP97+7XVn5i7zLNc=',NULL,'','','',0,NULL,NULL,NULL,NULL,NULL,'SDB8CASXISKK0R7L','2025-01-03','FRST',NULL,NULL,'sepa_debit',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,'pm_1QdChDCxfvxGwHdw57zEzGtC',1,'mandate_1QdChDCxfvxGwHdwvIt0244D',NULL,'cus_test@sk_test_xxx',NULL,NULL,NULL,'StripeTest',NULL),
-(9,1,'ban',62,'2025-06-26 21:41:42','2025-06-26 21:41:42','Banque ddd','Banque ddd','','','','','aaa',NULL,'dolcrypt:AES-256-CTR:ef6a60cae760f8d1:Q8YW',NULL,'','','',1,NULL,NULL,NULL,NULL,NULL,'RUM-2506262141-9-CU2506-0003',NULL,'FRST',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,'',1,NULL,NULL,'',NULL,NULL,NULL,NULL,NULL);
+(5,1,'ban',1,'2023-03-08 06:41:28','2025-06-26 22:04:48','Indian SAS RIB','dfgdfgfd','','','','','LIABLT2XXXX',NULL,'val1',NULL,'','','',1,NULL,NULL,NULL,NULL,NULL,'RUM-2303080641-5-CU1212-0007',NULL,'FRST',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,'',1,NULL,NULL,'',NULL,NULL,NULL,NULL,NULL),
+(6,1,'ban',39,'2025-01-03 16:11:35','2025-01-03 15:11:37','test','test','','','','','LIABLT2XXXX',NULL,'val2',NULL,'','','',1,NULL,NULL,NULL,NULL,NULL,'8ANKF3PEOTZ53TR4','2025-01-03','RCUR',NULL,NULL,'sepa_debit',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,'pm_1QdCXECxfvxGwHdwPnN4agJk',0,'mandate_1QdCXECxfvxGwHdwIdo2yLTd',NULL,'cus_test@sk_test_xxx',NULL,NULL,NULL,'StripeTest',NULL),
+(7,1,'ban',39,'2025-01-03 16:21:39','2025-01-03 15:21:56','Bank Testldr1','test2','','','','','',NULL,'val3',NULL,'','','',0,NULL,NULL,NULL,NULL,NULL,'SDB8CASXISKK0R7L','2025-01-03','FRST',NULL,NULL,'sepa_debit',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,'pm_1QdChDCxfvxGwHdw57zEzGtC',1,'mandate_1QdChDCxfvxGwHdwvIt0244D',NULL,'cus_test@sk_test_xxx',NULL,NULL,NULL,'StripeTest',NULL),
+(9,1,'ban',62,'2025-06-26 21:41:42','2025-06-26 21:41:42','Banque ddd','Banque ddd','','','','','aaa',NULL,'val4',NULL,'','','',1,NULL,NULL,NULL,NULL,NULL,'RUM-2506262141-9-CU2506-0003',NULL,'FRST',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,'',1,NULL,NULL,'',NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_societe_rib` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -79918,13 +79915,13 @@ CREATE TABLE `llx_user` (
 LOCK TABLES `llx_user` WRITE;
 /*!40000 ALTER TABLE `llx_user` DISABLE KEYS */;
 INSERT INTO `llx_user` VALUES
-(1,'2012-07-08 13:20:11','2025-03-13 09:13:00',NULL,NULL,'aeinstein',0,'','',NULL,1,NULL,NULL,'$2y$10$lIvMb5RJjxqmd6OxnZLqvuLZGOXj3gxIQhZQUqcY8fQTyh0cTtUpa',NULL,'dolcrypt:AES-256-CTR:10fbb3f05469219f:vCpWlcfDIoN6yOj2yGQ1WsOCfB8i2cjEKOAhNzPwf/A=','Einstein','Albert','','123456789','','','','aeinstein@example.com','','[]','',0,NULL,NULL,NULL,'','2017-10-05 08:32:44','2017-10-03 11:43:50',NULL,'',1,'alberteinstein.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'aaaaff','',NULL,0,'',0,NULL,NULL,NULL,44.00000000,'man','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,NULL),
+(1,'2012-07-08 13:20:11','2025-03-13 09:13:00',NULL,NULL,'aeinstein',0,'','',NULL,1,NULL,NULL,'$2y$10$lIvMb5RJjxqmd6OxnZLqvuLZGOXj3gxIQhZQUqcY8fQTyh0cTtUpa',NULL,'demokey','Einstein','Albert','','123456789','','','','aeinstein@example.com','','[]','',0,NULL,NULL,NULL,'','2017-10-05 08:32:44','2017-10-03 11:43:50',NULL,'',1,'alberteinstein.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'aaaaff','',NULL,0,'',0,NULL,NULL,NULL,44.00000000,'man','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,NULL),
 (2,'2012-07-08 13:54:48','2025-05-05 12:08:56',NULL,NULL,'demo',1,'','',NULL,1,NULL,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Doe','David','Trainee','09123123','','','','daviddoe@example.com','','[]','',0,NULL,NULL,NULL,'','2018-07-30 23:10:54','2018-07-30 23:04:17',NULL,'',1,'person9.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,'',0,NULL,NULL,NULL,35.00000000,'man','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,NULL),
 (3,'2012-07-11 16:18:59','2025-05-05 14:48:17',NULL,NULL,'pcurie',1,'','',NULL,1,NULL,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Curie','Pierre','','','','','','pcurie@example.com','','[]','',0,NULL,NULL,2,'','2014-12-21 17:38:55',NULL,NULL,'',1,'dolicloud_avent_saas.png',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,'',0,NULL,NULL,NULL,39.00000000,'','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,NULL),
 (4,'2015-01-23 17:52:27','2025-05-05 14:48:18',NULL,NULL,'bbookkeeper',1,'','',NULL,1,NULL,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Bookkeeper','Bob','Bookkeeper','','','','','bbookkeeper@example.com','','{\"skype\":\"skypebbookkeeper\"}','',0,17,6,NULL,'','2015-02-25 10:18:41','2015-01-23 17:53:20',NULL,'',1,'person8.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,'',0,NULL,NULL,NULL,16.00000000,'man','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,NULL),
 (10,'2017-10-03 11:47:41','2023-03-15 15:07:13',NULL,NULL,'mcurie',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Curie','Marie','','','','','','mcurie@example.com','','[]','',0,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'mariecurie.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'ffaaff','',NULL,0,NULL,0,NULL,NULL,NULL,44.00000000,'woman',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (11,'2017-10-05 09:07:52','2023-03-15 15:07:13',NULL,NULL,'zzeceo',1,NULL,'',NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Zeceo','Zack','President - CEO','','','','','zzeceo@example.com','','{\"facebook\":\"\",\"skype\":\"\",\"twitter\":\"\",\"linkedin\":\"\",\"instagram\":\"\",\"snapchat\":\"\",\"googleplus\":\"\",\"youtube\":\"\",\"whatsapp\":\"\",\"tumblr\":\"\",\"vero\":\"\",\"viadeo\":\"\",\"slack\":\"\",\"xing\":\"\",\"meetup\":\"\",\"pinterest\":\"\",\"flickr\":\"\",\"500px\":\"\",\"giphy\":\"\",\"gifycat\":\"\",\"dailymotion\":\"\",\"vimeo\":\"\",\"periscope\":\"\",\"twitch\":\"\",\"discord\":\"\",\"wikipedia\":\"\",\"reddit\":\"\",\"quora\":\"\",\"tripadvisor\":\"\",\"mastodon\":\"\",\"diaspora\":\"\",\"viber\":\"\",\"github\":\"\"}','',0,NULL,NULL,NULL,'','2017-10-05 22:48:08','2017-10-05 21:18:46',NULL,'',1,'person4.jpeg',NULL,NULL,NULL,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,NULL,0,NULL,NULL,NULL,39.00000000,NULL,'','2019-06-10 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(12,'2017-10-05 09:09:46','2025-03-27 23:27:43',NULL,12,'admin',0,'','',NULL,1,NULL,NULL,'$2y$10$MiDs0GVn0ksYbOHw8XgAf.oEihYvLI0ZYd0PSVq7/6ret6gifWSh6',NULL,'dolcrypt:AES-256-CTR:10fbb3f05469219f:5nJ/t5SbepR61dTsy2pTYfGEZS5j+bj3Ds0FN0OVM5M=','Adminson','Alice','Admin Technical','','','','','laurent@destailleur.fr','','[]','Alice - 123',1,NULL,NULL,NULL,'kmlk','2025-07-10 13:00:34','2025-07-09 16:26:18',NULL,'',1,NULL,NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,'',0,2700.00000000,NULL,NULL,39.00000000,'woman','',NULL,NULL,'generic_user_odt','1985-09-15',NULL,NULL,NULL,NULL,NULL,'127.0.0.1','127.0.0.1','2025-03-27 23:27:43',NULL,NULL,'',NULL,'2025-03-27 23:27:38',NULL),
+(12,'2017-10-05 09:09:46','2025-03-27 23:27:43',NULL,12,'admin',0,'','',NULL,1,NULL,NULL,'$2y$10$MiDs0GVn0ksYbOHw8XgAf.oEihYvLI0ZYd0PSVq7/6ret6gifWSh6',NULL,'demokey','Adminson','Alice','Admin Technical','','','','','laurent@destailleur.fr','','[]','Alice - 123',1,NULL,NULL,NULL,'kmlk','2025-07-10 13:00:34','2025-07-09 16:26:18',NULL,'',1,NULL,NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,'',0,2700.00000000,NULL,NULL,39.00000000,'woman','',NULL,NULL,'generic_user_odt','1985-09-15',NULL,NULL,NULL,NULL,NULL,'127.0.0.1','127.0.0.1','2025-03-27 23:27:43',NULL,NULL,'',NULL,'2025-03-27 23:27:38',NULL),
 (13,'2017-10-05 21:29:35','2025-04-15 13:30:44',NULL,NULL,'ccommercy',1,'','',NULL,1,NULL,NULL,'$2y$10$KTaKE0NyYyJSCogsxtwR.eADst17XYMrOWlsFfVLR60IbjANIVLHK',NULL,NULL,'Commercy','Coraly','Commercial leader','','','','','ccommercy@example.com','','{\"facebook\":\"\",\"skype\":\"\",\"twitter\":\"\",\"linkedin\":\"\",\"instagram\":\"\",\"snapchat\":\"\",\"googleplus\":\"\",\"youtube\":\"\",\"whatsapp\":\"\",\"tumblr\":\"\",\"vero\":\"\",\"viadeo\":\"\",\"slack\":\"\",\"xing\":\"\",\"meetup\":\"\",\"pinterest\":\"\",\"flickr\":\"\",\"500px\":\"\",\"giphy\":\"\",\"gifycat\":\"\",\"dailymotion\":\"\",\"vimeo\":\"\",\"periscope\":\"\",\"twitch\":\"\",\"discord\":\"\",\"wikipedia\":\"\",\"reddit\":\"\",\"quora\":\"\",\"tripadvisor\":\"\",\"mastodon\":\"\",\"diaspora\":\"\",\"viber\":\"\",\"github\":\"\"}','',0,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'person7.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,'',0,1890.00000000,NULL,NULL,25.00000000,'woman','','2018-09-11 00:00:00',NULL,NULL,'1998-12-08',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,NULL),
 (14,'2017-10-05 21:33:33','2023-03-15 15:07:36',NULL,NULL,'sscientol',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Scientol','Sam','Scientist leader','','','','','sscientol@example.com','','[]','',0,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'person3.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,NULL,0,3500.00000000,NULL,NULL,39.00000000,NULL,NULL,'2018-07-03 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (16,'2017-10-05 22:47:52','2025-01-30 14:37:22',NULL,NULL,'ccommerson',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Charle1','Commerson','Sale representative','','','','','ccommerson@example.com','','[]','',0,NULL,NULL,NULL,'','2017-10-05 23:46:24','2017-10-05 23:37:31',NULL,'',0,'person1.jpeg',NULL,NULL,13,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,NULL,0,2900.00000000,NULL,NULL,39.00000000,NULL,NULL,'2019-09-01 00:00:00',NULL,NULL,'1976-02-05',NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
@@ -80120,7 +80117,7 @@ INSERT INTO `llx_user_param` VALUES
 (12,1,'MAIN_BOXES_11','1'),
 (12,1,'MAIN_BOXES_2','1'),
 (12,1,'MAIN_BOXES_27','1'),
-(12,1,'MAIN_LANG_DEFAULT','fr_FR'),
+(12,1,'MAIN_LANG_DEFAULT','auto'),
 (12,1,'MAIN_SELECTEDFIELDS_/dolibarr_4.0/htdocs/adherents/list.php','d.zip,d.ref,d.lastname,d.firstname,d.company,d.login,d.morphy,t.libelle,d.email,d.datefin,d.statut,'),
 (12,1,'MAIN_SELECTEDFIELDS_accountancycustomerlist','l.rowid,f.ref,f.datef,p.ref,l.total_ht,l.tva_tx,s.nom,co.label,s.tva_intra,aa.data_suggest,aa.account_number,'),
 (12,1,'MAIN_SELECTEDFIELDS_accountancysupplierlines','l.rowid,f.ref,f.datef,p.ref,l.description,l.total_ht,l.tva_tx,s.nom,co.label,s.tva_intra,aa.account_number,'),

dev/initdemo/sftpget_and_loaddump.php

@@ -84,7 +84,7 @@ if (empty($sourceserver) || empty($server) || empty($login) || empty($sourcefile
 	print "Usage: $script_file login@server:/src/file.(sql|gz|bz2) passssh databaseserver databasename loginbase passbase\n";
 	print "Return code: 0 if success, <>0 if error\n";
 	print "Warning, this script may take a long time.\n";
-	exit(-1);
+	exit(1);
 }
 
 
@@ -106,7 +106,7 @@ $connection = ssh2_connect($server, 22);
 if ($connection) {
 	if (!@ssh2_auth_password($connection, $login, $password)) {
 		dol_syslog("Could not authenticate with username ".$login." . and password ".preg_replace('/./', '*', $password), LOG_ERR);
-		exit(-5);
+		exit(5);
 	} else {
 		//$stream = ssh2_exec($connection, '/usr/bin/php -i');
 		/*
@@ -143,7 +143,7 @@ if ($connection) {
 	}
 } else {
 	print 'Failed to connect to ssh2 to '.$server;
-	exit(-6);
+	exit(6);
 }
 
 

dev/initdemo/updatedemo.php

@@ -72,7 +72,7 @@ print "Update dates to current year for database name = ".$db->database_name."\n
 if (empty($confirm)) {
 	print "Usage: $script_file confirm\n";
 	print "Return code: 0 if success, <>0 if error\n";
-	exit(-1);
+	exit(1);
 }
 
 

dev/setup/apache/virtualhost

@@ -2,33 +2,33 @@
 	#php_admin_value sendmail_path "/usr/sbin/sendmail -t -i"
 	#php_admin_value mail.force_extra_parameters "-f postmaster@mydomain.com"
 	#php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f postmaster@mydomain.com"
-	
+
 	php_admin_value open_basedir /tmp/:/home/.../htdocs:/home/.../dolibarr_documents:
 
-	
+
 	# Add this to use a custom apparmor profile when using apache php handler
 	<IfModule mod_apparmor.c>
 	AADefaultHatName sellyoursaas-instances
 	</IfModule>
 
-    
+
     # The URLs of the web site
 	ServerName myvirtualalias
 	ServerAlias myvirtualalias
-	
+
 	UseCanonicalName On
-	
+
 	KeepAlive On
 	KeepAliveTimeout 5
 	MaxKeepAliveRequests 20
-	
+
 	AddDefaultCharset UTF-8
-	
-	
+
+
 	# Detect if we are using DoliDroid
 	#SetEnvIf User-Agent DoliDroid dolidroid
-	
-	
+
+
 	# The directory and permissions for the web site
 	DocumentRoot "/home/.../htdocs"
 	<Directory /home/.../htdocs/>
@@ -36,24 +36,19 @@
 	   	Options       -Indexes -MultiViews +FollowSymLinks -ExecCGI
 	   	Require all granted
 
-		# To restrict access by a HTTP basic auth	   
+		# To restrict access by a HTTP basic auth
 	   	#AuthType Basic
        	#AuthName "Authenticate to backoffice"
        	#AuthUserFile /etc/apache2/.htpasswd
        	#require valid-user
 	</Directory>
 
-	# Leaving /public and /api, /dav, .well_known but also wrappers for document, viewimage and public json/img accessible to everyone
+	# Leaving /public, /dav and /.well_known directory accessible to everyone
     <Directory /home/admin/wwwroot/dolibarr/htdocs/public/>
         AuthType None
         Satisfy any
         Require all granted
     </Directory>
-    <Directory /home/admin/wwwroot/dolibarr/htdocs/api/>
-        AuthType None
-        Satisfy any
-        Require all granted
-    </Directory>
     <Directory /home/admin/wwwroot/dolibarr/htdocs/dav/>
         AuthType None
         Satisfy any
@@ -64,6 +59,14 @@
         Satisfy any
         Require all granted
     </Directory>
+
+    # You may also want to allow access to everyone to wrappers for api, document, viewimage, manifest and public json/img
+    # but if you can avoid it, it is better.
+    <Files /home/admin/wwwroot/dolibarr/htdocs/api/index.php>
+        AuthType None
+        Satisfy any
+        Require all granted
+    </Files>
     <Files ~ "(document\.php|viewimage\.php|\.js\.php|\.json\.php|\.js|\.css\.php|\.css|\.gif|\.png|\.svg|\.woff2|favicon\.ico)$">
         AuthType None
         Satisfy any
@@ -71,11 +74,11 @@
     </Files>
 
 
-	# Log directives        
+	# Log directives
 	ErrorLog /var/log/apache2/myvirtualalias_error_log
 	TransferLog /var/log/apache2/myvirtualalias_access_log
-	
-		
+
+
 	# Compress is done on resources of type php pages, text file export, css and javascript
 	AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript application/x-javascript
 	AddType text/javascript .jgz
@@ -92,21 +95,21 @@
 	ExpiresByType text/javascript A2592000
 	ExpiresByType application/x-javascript A2592000
 	ExpiresByType application/javascript A2592000
-	
-	
+
+
 	# To enable the SSL if the certificate file exists
 	<IfFile "/etc/letsencrypt/live/www.mydomain.com/cert.pem">
 		SSLEngine On
-		
+
 		# If both key and certificate are stored in the same file, only the
 		# SSLCertificateFile directive is needed.
 		SSLCertificateFile    /etc/letsencrypt/live/www.mydomain.com/cert.pem
 		SSLCertificateKeyFile /etc/letsencrypt/live/www.mydomain.com/privkey.pem
 		SSLCertificateChainFile /etc/letsencrypt/live/www.mydomain.com/chain.pem
-		
+
 		#RewriteEngine   on
 		#RewriteCond     %{SERVER_PORT} ^80$
 		#RewriteRule     ^(.*)$ https://%{SERVER_NAME}$1 [L,R]
 	</IfFile>
-	
+
 </VirtualHost>

dev/setup/codesniffer/ruleset.xml

@@ -28,8 +28,15 @@
 
 	<rule ref="Internal.NoCodeFound" />
 
-
 	<!-- Rules from Generic Standard -->
+	<!--
+	<rule ref="PSR12.Files.OpenTag">
+        <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">
@@ -134,7 +141,7 @@
 
 	<rule ref="Generic.Formatting.SpaceAfterCast" />
 
-	<rule ref="Generic.Functions.CallTimePassByReference" />
+	<!-- <rule ref="Generic.Functions.CallTimePassByReference" /> This rule does not exists anymore -->
 
 	<rule ref="Generic.Functions.FunctionCallArgumentSpacing" />
 

dev/setup/git/README.md

@@ -0,0 +1,5 @@
+To enable a default git commit template:
+git config --local commit.template gitmessage
+
+To enable the git hook pre-commit, to make CI validation at commit:
+See the file pre-commit/README.md

dev/setup/git/hooks/msg-commit

@@ -0,0 +1,12 @@
+#!/bin/sh
+# Hook to force a prefix on commits
+
+commit_msg_file=$1
+first_line=$(head -n1 "$commit_msg_file")
+
+if echo "$first_line" | grep -Eqi '^(QUAL|SEC|PERF|FIX|CLOSE|NEW|Clean code|Debug[CSS)'; then
+	exit 0
+else
+	echo "The commit message must start with QUAL, SEC, PERF, FIX, CLOSE, NEW, Clean code, Debug, CSS ..."
+	exit 1
+fi

dev/setup/git/hooks/pre-commit

@@ -12,10 +12,10 @@ HERE="$(cd "$(dirname "$0")" && pwd)"
 ARGS+=(--hook-dir "$HERE" -- "$@")
 
 if [ -x "$INSTALL_PYTHON" ]; then
-    exec "$INSTALL_PYTHON" -mpre_commit "${ARGS[@]}" 1>&2
+	exec "$INSTALL_PYTHON" -mpre_commit "${ARGS[@]}" 1>&2
 elif command -v pre-commit > /dev/null; then
-    exec pre-commit "${ARGS[@]}" 1>&2
+	exec pre-commit "${ARGS[@]}" 1>&2
 else
-    echo 'pre-commit not found.  Did you forget to activate your virtualenv?' 1>&2
-    exit 1
+	echo 'pre-commit not found.  Did you forget to activate your virtualenv?' 1>&2
+	exit 1
 fi

dev/setup/logrotate.d/logrotate_dolibarr_log

@@ -0,0 +1,12 @@
+# Example of logrotate file to put into /etc/logrotate.d to make the rotation of
+# the dolibarr log files.
+/home/admin/wwwroot/dolibarr_documents/*.log {
+        su admin www-data
+        daily
+        rotate 7
+        compress
+        delaycompress
+        missingok
+        notifempty
+        create 660 admin www-data
+}

dev/setup/phpunit/setup_conf.sh

@@ -44,10 +44,10 @@ function save_db_cache() (
 	# DETERMINE VERSION
 	cd "${TRAVIS_BUILD_DIR}/htdocs/install" || exit 1
 
-	# Get the target version from the filefunc.inc.php file
-	target_version=$(sed -n "s/.*define('DOL_VERSION',[[:space:]]*'\\([0-9.]*\\).*/\\1/p" ../filefunc.inc.php) ; echo $target_version
+	# Get the target version from the version.inc.php file
+	target_version=$(sed -n "s/.*define('DOL_VERSION',[[:space:]]*'\\([0-9.]*\\).*/\\1/p" ../version.inc.php) ; echo $target_version
 	# Default in case that failed
-	target_version=${target_version:=20.0.0}
+	target_version=${target_version:=22.0.0}
 
 	# Sequence of versions for upgrade process (to be completed)
 	VERSIONS=("3.5.0" "3.6.0" "3.7.0" "3.8.0" "3.9.0")

dev/tools/api/macos/README

@@ -0,0 +1,33 @@
+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. 
+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

@@ -124,28 +124,28 @@ $urlgit = 'https://github.com/Dolibarr/dolibarr/blob/develop/';
 $output_arrproj = array();
 $output_arrdep = array();
 if ($dirscc != 'disabled') {
-	$commandcheck = ($dirscc ? $dirscc.'/' : '').'scc . --exclude-dir=htdocs/includes,htdocs/custom,htdocs/theme/common/fontawesome-5,htdocs/theme/common/octicons';
+	$commandcheck = ($dirscc ? $dirscc.'/' : '').'scc . --exclude-dir=htdocs/custom,htdocs/includes,htdocs/public/includes,htdocs/theme/common/fontawesome-5,htdocs/public/theme/common/fontawesome-5 --cocomo-project-type semi-detached';
 	print 'Execute SCC to count lines of code in project: '.$commandcheck."\n";
 	$resexecproj = 0;
 	exec($commandcheck, $output_arrproj, $resexecproj);
 
 
 	// Count lines of code of dependencies
-	$commandcheck = ($dirscc ? $dirscc.'/' : '').'scc htdocs/includes htdocs/theme/common/fontawesome-5 htdocs/theme/common/octicons';
+	$commandcheck = ($dirscc ? $dirscc.'/' : '').'scc htdocs/includes htdocs/public/includes htdocs/theme/common/fontawesome-5 htdocs/public/theme/common/fontawesome-5 --cocomo-project-type semi-detached';
 	print 'Execute SCC to count lines of code in dependencies: '.$commandcheck."\n";
 	$resexecdep = 0;
 	exec($commandcheck, $output_arrdep, $resexecdep);
 }
 
 // Get technical debt with PHPStan
-$output_arrtd = array();
+$output_arrver = array();
 if ($dirphpstan != 'disabled') {
 	$commandcheck = ($dirphpstan ? $dirphpstan.'/' : '').'phpstan --version';
 	print 'Execute PHPStan to get the version: '.$commandcheck."\n";
-	$resexectd = 0;
-	exec($commandcheck, $output_arrtd, $resexectd);
+	$resexecver = 0;
+	exec($commandcheck, $output_arrver, $resexecver);
 }
-$phpstanversion = $output_arrtd[0];
+$phpstanversion = $output_arrver[0];
 
 $output_arrtd = array();
 if ($dirphpstan != 'disabled') {
@@ -156,6 +156,15 @@ if ($dirphpstan != 'disabled') {
 }
 
 // Get technical debt with Phan
+$output_arrverphan = array();
+if ($dirphpstan != 'disabled') {
+	$commandcheck = ($dir_phan ? $dir_phan.DIRECTORY_SEPARATOR : '') .'phan --version';
+	print 'Execute Phan to get the version: '.$commandcheck."\n";
+	$resexecverphan = 0;
+	exec($commandcheck, $output_arrverphan, $resexecverphan);
+}
+$phpphanversion = $output_arrverphan[0];
+
 $output_phan_json = array();
 $res_exec_phan = 0;
 if ($dir_phan != 'disabled') {
@@ -212,13 +221,13 @@ foreach (array('proj', 'dep') as $source) {
 			$arrayofmetrics[$source]['Bytes'] = $reg[1];
 		}
 
-		if (preg_match('/^(.*)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)$/', $line, $reg)) {
-			$arrayoflineofcode[$source][$reg[1]]['Files'] = $reg[2];
-			$arrayoflineofcode[$source][$reg[1]]['Lines'] = $reg[3];
-			$arrayoflineofcode[$source][$reg[1]]['Blanks'] = $reg[4];
-			$arrayoflineofcode[$source][$reg[1]]['Comments'] = $reg[5];
-			$arrayoflineofcode[$source][$reg[1]]['Code'] = $reg[6];
-			$arrayoflineofcode[$source][$reg[1]]['Complexity'] = $reg[7];
+		if (preg_match('/^(.*)\s+([\d,]+)\s+([\d,]+)\s+([\d,]+)\s+([\d,]+)\s+([\d,]+)\s+([\d,]+)$/', $line, $reg)) {
+			$arrayoflineofcode[$source][$reg[1]]['Files'] = str_replace(array(',', ' '), array('', ''), $reg[2]);
+			$arrayoflineofcode[$source][$reg[1]]['Lines'] = str_replace(array(',', ' '), array('', ''), $reg[3]);
+			$arrayoflineofcode[$source][$reg[1]]['Blanks'] = str_replace(array(',', ' '), array('', ''), $reg[4]);
+			$arrayoflineofcode[$source][$reg[1]]['Comments'] = str_replace(array(',', ' '), array('', ''), $reg[5]);
+			$arrayoflineofcode[$source][$reg[1]]['Code'] = str_replace(array(',', ' '), array('', ''), $reg[6]);
+			$arrayoflineofcode[$source][$reg[1]]['Complexity'] = str_replace(array(',', ' '), array('', ''), $reg[7]);
 		}
 	}
 
@@ -245,19 +254,20 @@ foreach (array('proj', 'dep') as $source) {
 }
 
 
+// Get stats on nb of commits
+/*
 $nbofmonth = 2;
 $delay = (3600 * 24 * 30 * $nbofmonth);
 
-// Get stats on nb of commits
 $commandcheck = "git log --all --shortstat --no-renames --no-merges --use-mailmap --pretty=".escapeshellarg('format:%cI;%H;%aN;%aE;%ce;%s')." --since=".dol_print_date(dol_now() - $delay, '%Y-%m-%d'); // --since=  --until=...
 print 'Execute git log to get list of commits: '.$commandcheck."\n";
 $output_arrglpu = array();
 $resexecglpu = 0;
 //exec($commandcheck, $output_arrglpu, $resexecglpu);
-
+*/
 
 // Get git information for security alerts
-$nbofmonth = 3;
+$nbofmonth = 6;
 $delay = (3600 * 24 * 30 * $nbofmonth);
 $arrayofalerts = array();
 
@@ -266,14 +276,14 @@ print 'Execute git log to get commits related to security: '.$commandcheck."\n";
 $output_arrglpu = array();
 $resexecglpu = 0;
 exec($commandcheck, $output_arrglpu, $resexecglpu);
-foreach ($output_arrglpu as $val) {
+foreach ($output_arrglpu as $valgitlog) {		// The most recent lines are first.
 	// Parse the line to split interesting data
-	$tmpval = cleanVal2($val);
+	$tmpval = cleanVal2($valgitlog);
 
-	if (preg_match('/(#yogosha|CVE|Sec:|Sec\s|Sec$)/i', $tmpval['title'])) {	// Recommended git comment:  "Sec: Fix #..."
+	if (preg_match('/(#yogosha|CVE[\s\-]*\d|Sec:|Sec\s|Sec$)/i', $tmpval['title'])) {	// Recommended git comment:  "Sec: Fix #..."
 		$alreadyfound = '';
 		$alreadyfoundcommitid = '';
-		foreach ($arrayofalerts as $val) {
+		foreach ($arrayofalerts as $val) {	// Loop on already found alerts
 			if ($val['issueidyogosha'] && $val['issueidyogosha'] == $tmpval['issueidyogosha']) {	// Already in list
 				$alreadyfound = 'yogosha';
 				$alreadyfoundcommitid = $val['commitid'];
@@ -289,7 +299,9 @@ foreach ($output_arrglpu as $val) {
 				$alreadyfoundcommitid = $val['commitid'];
 				break;
 			}
-			if ($val['title'] && $val['title'] == $tmpval['title']) {	// Already in list
+			if ($val['title'] && $tmpval['title'] &&
+				(strpos($val['title'], $tmpval['title']) === 0 || strpos($val['title'], $tmpval['title']) > 0
+				|| strpos($tmpval['title'], $val['title']) === 0 || strpos($tmpval['title'], $val['title']) > 0)) {	// Already in list
 				$alreadyfound = 'title';
 				$alreadyfoundcommitid = $val['commitid'];
 				break;
@@ -337,70 +349,22 @@ foreach ($output_arrglpu as $val) {
 			/*var_dump($tmpval['commitid'].' '.$alreadyfoundcommitid);
 			var_dump($arrayofalerts[$alreadyfoundcommitid]['branch']);
 			var_dump($tmpval);*/
+
+			$arrayofalerts[$alreadyfoundcommitid]['commitidbis'][] = $tmpval['commitid'];	// Concat the new commitid to the list of commitidbis array of the already found case.
+
+			if (empty($arrayofalerts[$alreadyfoundcommitid]['issueid']) && !empty($tmpval['issueid'])) {	// If not Github was defined, we set it.
+				$arrayofalerts[$alreadyfoundcommitid]['issueid'] = $tmpval['issueid'];
+			}
+
+			if ($arrayofalerts[$alreadyfoundcommitid]['title'] != $tmpval['title']) {		// Concat label of the new line to the already found one (if it differs)
+				$arrayofalerts[$alreadyfoundcommitid]['title'] .= ', '.preg_replace('/\.$/', '', $tmpval['title']);
+			}
+
 			$arrayofalerts[$alreadyfoundcommitid]['branch'] = array_merge($arrayofalerts[$alreadyfoundcommitid]['branch'], $tmpval['branch']);
-
-			$arrayofalerts[$alreadyfoundcommitid]['commitidbis'][] = $tmpval['commitid'];
 		}
 	}
 }
 
-
-/*
-//$urlgit = 'https://api.github.com/search/issues?q=is:pr+repo:Dolibarr/dolibarr+created:>'.dol_print_date(dol_now() - $delay, "%Y-%m");
-$urlgit = 'https://api.github.com/search/commits?q=repo:Dolibarr/dolibarr+yogosha+created:>'.dol_print_date(dol_now() - $delay, "%Y-%m");
-
-// Count lines of code of application
-$newurl = $urlgit.'+CVE';
-$result = getURLContent($newurl);
-print 'Execute GET on github for '.$newurl."\n";
-if ($result && $result['http_code'] == 200) {
-	$arrayofalerts1 = json_decode($result['content']);
-
-	foreach ($arrayofalerts1->items as $val) {
-		$tmpval = cleanVal($val);
-		if (preg_match('/CVE/i', $tmpval['title'])) {
-			$arrayofalerts[$tmpval['number']] = $tmpval;
-		}
-	}
-} else {
-	print 'Error: failed to get github response';
-	exit(-1);
-}
-
-$newurl = $urlgit.'+yogosha';
-$result = getURLContent($newurl);
-print 'Execute GET on github for '.$newurl."\n";
-if ($result && $result['http_code'] == 200) {
-	$arrayofalerts2 = json_decode($result['content']);
-
-	foreach ($arrayofalerts2->items as $val) {
-		$tmpval = cleanVal($val);
-		if (preg_match('/yogosha:/i', $tmpval['title'])) {
-			$arrayofalerts[$tmpval['number']] = $tmpval;
-		}
-	}
-} else {
-	print 'Error: failed to get github response';
-	exit(-1);
-}
-
-$newurl = $urlgit.'+Sec:';
-$result = getURLContent($newurl);
-print 'Execute GET on github for '.$newurl."\n";
-if ($result && $result['http_code'] == 200) {
-	$arrayofalerts3 = json_decode($result['content']);
-	foreach ($arrayofalerts3->items as $val) {
-		$tmpval = cleanVal($val);
-		if (preg_match('/Sec:/i', $tmpval['title'])) {
-			$arrayofalerts[$tmpval['number']] = $tmpval;
-		}
-	}
-} else {
-	print 'Error: failed to get github response';
-	exit(-1);
-}
-*/
-
 $timeend = time();
 
 
@@ -724,12 +688,6 @@ $html .= <<<END
 END;
 
 
-$html .= '<!-- ';
-foreach ($output_arrglpu as $line) {
-	$html .= $line."\n";
-}
-$html .= ' -->';
-
 $html .= '</div>';
 
 $html .= '</section>'."\n";
@@ -784,19 +742,19 @@ $html .= '</div>';
 $html .= '</section>'."\n";
 
 
-// Project value
+// Project value (COCOMO Model, use Basic / Semi-detached
 
 $html .= '<section class="chapter" id="projectvalue">'."\n";
 $html .= '<h2><span class="fas fa-dollar-sign pictofixedwidth"></span>Project value</h2>'."\n";
 
 $html .= '<div class="boxallwidth">'."\n";
 $html .= '<div class="box inline-box back1">';
-$html .= 'COCOMO value<br><span class="small opacitymedium">(Basic organic model)</span><br>';
+$html .= 'COCOMO value<br><span class="small opacitymedium">(Basic/Semi-detached model)</span><br>';
 $html .= '<b>$'.formatNumber((empty($arraycocomo['proj']['currency']) ? 0 : $arraycocomo['proj']['currency']) + (empty($arraycocomo['dep']['currency']) ? 0 : $arraycocomo['dep']['currency']), 2).'</b>';
 $html .= '</div>';
 if (array_key_exists('proj', $arraycocomo)) {
 	$html .= '<div class="box inline-box back2">';
-	$html .= 'COCOMO effort<br><span class="small opacitymedium">(Basic organic model)</span><br>';
+	$html .= 'COCOMO effort<br><span class="small opacitymedium">(Basic/Semi-detached model)</span><br>';
 	$html .= '<b>'.formatNumber($arraycocomo['proj']['people'] * $arraycocomo['proj']['effort'] + $arraycocomo['dep']['people'] * $arraycocomo['dep']['effort']);
 	$html .= ' months people</b>';
 	$html .= '</div>';
@@ -877,7 +835,7 @@ if (count($output_phan_json) != 0) {
 $title_security_short = "Last security issues";
 $title_security = ($project ? "[".$project."] " : "").$title_security_short;
 
-$html .= '<section class="chapter" id="linesofcode">'."\n";
+$html .= '<section class="chapter" id="securityalerts">'."\n";
 $html .= '<h2><span class="fas fa-code pictofixedwidth"></span>'.$title_security_short.' <span class="opacitymedium">(last '.($nbofmonth != 1 ? $nbofmonth.' months' : 'month').')</span></h2>'."\n";
 
 $html .= '<div class="boxallwidth">'."\n";
@@ -953,7 +911,7 @@ foreach ($arrayofalerts as $key => $alert) {
 	}
 	$html .= '</td>';
 
-	// Description
+	// Title - Description
 	$html .= '<td class="tdoverflowmax300" title="'.dol_escape_htmltag($alert['title']).'">'.dol_escape_htmltag($alert['title']).'</td>';
 
 	// Branches
@@ -974,7 +932,7 @@ $html .= '</div>';
 $html .= '</div>';
 
 $html .= '<br>';
-$html .= 'Note:Search is done in git repository on regexstring #yogosha|CVE|Sec:|Sec\s<br>';
+$html .= 'Note:Search is done in git repository on regex string "#yogosha|CVE[\s\-]*\d|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>';
@@ -1082,7 +1040,7 @@ if ($dir_phan != 'disabled') {
     ]});
 ';
 	$html .= '<section class="chapter" id="technicaldebtphan">'."\n";
-	$html .= '<h2><span class="fas fa-book-dead pictofixedwidth"></span>Technical debt <span class="opacitymedium">(PHAN '.$phan_nblines.' warnings)</span></h2>'."\n";
+	$html .= '<h2><span class="fas fa-book-dead pictofixedwidth"></span>Technical debt <span class="opacitymedium">('.$phpphanversion.' -> '.$phan_nblines.' warnings)</span></h2>'."\n";
 
 	$html .= '<div class="boxallwidth">'."\n";
 	$html .= '<div class="div-table-responsive">'."\n";
@@ -1179,7 +1137,7 @@ function cleanVal2($val)
 	$tmpval['issueid'] = '';
 	$tmpval['issueidyogosha'] = '';
 	$tmpval['issueidcve'] = '';
-	$tmpval['title'] = array_key_exists(5, $tmp) ? $tmp[5] : '';
+	$tmpval['title'] = array_key_exists(5, $tmp) ? preg_replace('/\.$/', '', $tmp[5]) : '';
 	$tmpval['created_at'] = array_key_exists(0, $tmp) ? $tmp[0] : '';
 	$tmpval['updated_at'] = '';
 
@@ -1188,7 +1146,7 @@ function cleanVal2($val)
 		$tmpval['issueid'] = $reg[1];
 	}
 	if (preg_match('/CVE([0-9\-\s]+)/', $tmpval['title'], $reg)) {
-		$tmpval['issueidcve'] = preg_replace('/^\-/', '', trim($reg[1]));
+		$tmpval['issueidcve'] = preg_replace('/^\-/', '', preg_replace('/\s+/', '-', trim($reg[1])));
 	}
 	if (preg_match('/#yogosha(\d+)/i', $tmpval['title'], $reg)) {
 		$tmpval['issueidyogosha'] = $reg[1];

dev/tools/codespell/codespell-ignore.txt

@@ -13,7 +13,7 @@ zar
 # Need as part of some PHP keys for some array variables
 referer
 
-# Name of contributores
+# Name of contributors
 noe
 udo
 tim
@@ -90,7 +90,7 @@ espace
 methode
 datee
 
-# Some string found because it is part text that is html entities escaped into files
+# Some string found because it is part of text that is html entities escaped into files
 tre
 activ
 

dev/tools/github_commits_byversion.sh

@@ -32,8 +32,8 @@ fi
 
 
 # Determine release to check
-Releases=("3.9" "4.0" "5.0" "6.0" "7.0" "8.0" "9.0" "10.0" "11.0" "12.0" "13.0" "14.0" "15.0" "16.0" "17.0" "18.0" "19.0" "20.0")
-target_version=$(sed -n "s/.*define('DOL_VERSION',[[:space:]]*'\\([0-9]*\\.[0-9]*\\).*/\\1/p" htdocs/filefunc.inc.php)
+Releases=("3.9" "4.0" "5.0" "6.0" "7.0" "8.0" "9.0" "10.0" "11.0" "12.0" "13.0" "14.0" "15.0" "16.0" "17.0" "18.0" "19.0" "20.0" "21.0" "22.0")
+target_version=$(sed -n "s/.*define('DOL_VERSION',[[:space:]]*'\\([0-9]*\\.[0-9]*\\).*/\\1/p" htdocs/version.inc.php)
 
 # Default target version in case getting it from filefunc.inc failed
 target_version=${target_version:=20.0}

dev/tools/phan/baseline.txt

@@ -9,66 +9,39 @@
  */
 return [
     // # Issue statistics:
-    // PhanUndeclaredProperty : 440+ occurrences
+    // PhanUndeclaredProperty : 420+ occurrences
     // PhanTypeMismatchProperty : 100+ occurrences
-    // PhanUndeclaredGlobalVariable : 90+ occurrences
-    // PhanTypeMismatchArgument : 85+ occurrences
-    // PhanTypeMismatchArgumentNullable : 30+ occurrences
-    // PhanTypeExpectedObjectPropAccess : 20+ occurrences
-    // PhanTypeInvalidDimOffset : 20+ occurrences
-    // PhanTypeMismatchDimFetch : 15+ occurrences
-    // PhanUndeclaredConstant : 15+ occurrences
-    // PhanTypeMismatchArgumentProbablyReal : 9 occurrences
-    // PhanUndeclaredMethod : 9 occurrences
-    // PhanPossiblyUndeclaredGlobalVariable : 6 occurrences
-    // PhanTypeArraySuspiciousNull : 6 occurrences
-    // PhanTypeComparisonFromArray : 6 occurrences
-    // PhanPluginUndeclaredVariableIsset : 5 occurrences
-    // PhanParamTooMany : 4 occurrences
+    // PhanTypeMismatchArgument : 65+ occurrences
+    // PhanUndeclaredGlobalVariable : 60+ occurrences
+    // PhanTypeMismatchArgumentNullable : 20+ occurrences
+    // PhanTypeInvalidDimOffset : 15+ occurrences
+    // PhanTypeMismatchDimFetch : 10+ occurrences
+    // PhanUndeclaredMethod : 7 occurrences
+    // PhanTypeArraySuspiciousNull : 5 occurrences
+    // PhanTypeExpectedObjectPropAccess : 5 occurrences
     // PhanPluginDuplicateArrayKey : 4 occurrences
-    // PhanPluginDuplicateExpressionBinaryOp : 4 occurrences
-    // PhanTypeMismatchDimAssignment : 2 occurrences
-    // PhanTypeMismatchReturn : 2 occurrences
-    // PhanTypeSuspiciousStringExpression : 2 occurrences
+    // PhanPluginUndeclaredVariableIsset : 2 occurrences
+    // PhanPossiblyUndeclaredGlobalVariable : 2 occurrences
+    // PhanTypeMismatchArgumentProbablyReal : 2 occurrences
+    // PhanParamTooMany : 1 occurrence
     // PhanPossiblyUndeclaredVariable : 1 occurrence
     // PhanTypeExpectedObjectPropAccessButGotNull : 1 occurrence
-    // PhanTypeMismatchArgumentNullableInternal : 1 occurrence
+    // PhanTypeMismatchReturn : 1 occurrence
 
     // Currently, file_suppressions and directory_suppressions are the only supported suppressions
     'file_suppressions' => [
-        'htdocs/accountancy/class/accountancyexport.class.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/api/class/api_setup.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchReturn'],
-        'htdocs/asset/class/asset.class.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanTypeInvalidDimOffset'],
-        'htdocs/asset/class/assetdepreciationoptions.class.php' => ['PhanTypeInvalidDimOffset'],
-        'htdocs/asset/class/assetmodel.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/asset/tpl/depreciation_options_edit.tpl.php' => ['PhanUndeclaredProperty'],
-        'htdocs/asset/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
-        'htdocs/barcode/printsheet.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
-        'htdocs/bom/bom_card.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
-        'htdocs/bom/tpl/objectline_create.tpl.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'htdocs/bom/tpl/objectline_edit.tpl.php' => ['PhanUndeclaredProperty'],
-        'htdocs/bom/tpl/objectline_view.tpl.php' => ['PhanUndeclaredProperty'],
-        'htdocs/bookcal/availabilities_card.php' => ['PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/bookcal/calendar_card.php' => ['PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/bookcal/class/availabilities.class.php' => ['PhanUndeclaredMethod', 'PhanUndeclaredProperty'],
         'htdocs/bookcal/class/calendar.class.php' => ['PhanUndeclaredMethod', 'PhanUndeclaredProperty'],
         'htdocs/categories/viewcat.php' => ['PhanUndeclaredProperty'],
-        'htdocs/collab/index.php' => ['PhanUndeclaredProperty'],
         'htdocs/comm/action/index.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchProperty'],
-        'htdocs/comm/action/pertype.php' => ['PhanTypeComparisonFromArray', 'PhanTypeExpectedObjectPropAccess', 'PhanTypeMismatchDimFetch'],
-        'htdocs/comm/action/peruser.php' => ['PhanTypeComparisonFromArray', 'PhanTypeMismatchArgument'],
+        'htdocs/comm/action/pertype.php' => ['PhanTypeExpectedObjectPropAccess'],
+        'htdocs/comm/action/peruser.php' => ['PhanTypeMismatchArgument'],
         'htdocs/comm/card.php' => ['PhanTypeMismatchArgument'],
         'htdocs/comm/mailing/index.php' => ['PhanUndeclaredProperty'],
         'htdocs/comm/mailing/targetemailing.php' => ['PhanUndeclaredProperty'],
-        'htdocs/comm/propal/card.php' => ['PhanTypeMismatchProperty'],
         'htdocs/comm/propal/list.php' => ['PhanUndeclaredProperty'],
-        'htdocs/comm/propal/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
-        'htdocs/commande/class/api_orders.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/commande/class/commande.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/commande/customer.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/commande/list.php' => ['PhanUndeclaredProperty'],
         'htdocs/commande/list_det.php' => ['PhanTypeInvalidDimOffset'],
-        'htdocs/commande/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/compta/bank/account_statement_document.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/compta/bank/class/account.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/compta/bank/class/paymentvarious.class.php' => ['PhanTypeMismatchArgument'],
@@ -76,16 +49,12 @@ return [
         'htdocs/compta/bank/various_payment/card.php' => ['PhanUndeclaredProperty'],
         'htdocs/compta/bank/various_payment/document.php' => ['PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/compta/bank/various_payment/info.php' => ['PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/compta/cashcontrol/cashcontrol_card.php' => ['PhanPluginDuplicateExpressionBinaryOp'],
         'htdocs/compta/clients.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/compta/facture/card-rec.php' => ['PhanTypeMismatchArgument'],
         'htdocs/compta/facture/card.php' => ['PhanUndeclaredProperty'],
-        'htdocs/compta/facture/class/api_invoices.class.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/compta/facture/class/facture-rec.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/compta/facture/class/facture.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/compta/localtax/card.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/compta/localtax/clients.php' => ['PhanTypeExpectedObjectPropAccess', 'PhanTypeMismatchArgument'],
         'htdocs/compta/localtax/index.php' => ['PhanTypeMismatchArgument'],
         'htdocs/compta/localtax/list.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/compta/paiement/card.php' => ['PhanUndeclaredProperty'],
@@ -99,26 +68,24 @@ return [
         'htdocs/compta/tva/class/paymentvat.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/compta/tva/clients.php' => ['PhanTypeArraySuspiciousNull', 'PhanTypeInvalidDimOffset', 'PhanTypeMismatchArgument'],
         'htdocs/compta/tva/index.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/compta/tva/quadri_detail.php' => ['PhanTypeArraySuspiciousNull', 'PhanTypeInvalidDimOffset', 'PhanTypeMismatchArgument'],
-        'htdocs/contrat/card.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/core/actions_addupdatedelete.inc.php' => ['PhanTypeMismatchDimFetch', 'PhanUndeclaredProperty'],
+        'htdocs/compta/tva/quadri_detail.php' => ['PhanTypeMismatchArgument'],
+        'htdocs/core/actions_addupdatedelete.inc.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/actions_massactions.inc.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/actions_sendmails.inc.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/core/actions_sendmails.inc.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/ajax/ajaxdirtree.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchProperty', 'PhanUndeclaredGlobalVariable'],
         'htdocs/core/ajax/selectobject.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/core/class/CMailFile.class.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/class/canvas.class.php' => ['PhanParamTooMany', 'PhanUndeclaredMethod'],
+        'htdocs/core/class/canvas.class.php' => ['PhanUndeclaredMethod'],
         'htdocs/core/class/ccountry.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/class/cgenericdic.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/class/commonobject.class.php' => ['PhanParamTooMany', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredProperty'],
+        'htdocs/core/class/commonobject.class.php' => ['PhanParamTooMany', 'PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/core/class/commonpeople.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/class/conf.class.php' => ['PhanTypeMismatchArgumentNullableInternal', 'PhanTypeMismatchProperty'],
+        'htdocs/core/class/conf.class.php' => ['PhanTypeMismatchProperty'],
         'htdocs/core/class/ctyperesource.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/class/dolgraph.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/class/emailsenderprofile.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/class/extrafields.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/class/html.formcompany.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/class/html.formfile.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/class/html.formmail.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/core/class/notify.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/class/openid.class.php' => ['PhanTypeMismatchArgument'],
@@ -128,16 +95,13 @@ return [
         'htdocs/core/lib/company.lib.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/core/lib/files.lib.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/lib/functions2.lib.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/lib/pdf.lib.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
+        'htdocs/core/lib/pdf.lib.php' => ['PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
         'htdocs/core/lib/product.lib.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/lib/project.lib.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/lib/xcal.lib.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/menus/standard/auguria.lib.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/asset/mod_asset_advanced.php' => ['PhanUndeclaredProperty'],
-        'htdocs/core/modules/barcode/mod_barcode_product_standard.php' => ['PhanTypeMismatchArgument'],
-        'htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/bom/mod_bom_advanced.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
-        'htdocs/core/modules/cheque/doc/pdf_blochet.class.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         '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'],
@@ -155,7 +119,7 @@ return [
         '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', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchProperty'],
+        'htdocs/core/modules/import/import_csv.modules.php' => ['PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchProperty'],
         'htdocs/core/modules/import/import_xlsx.modules.php' => ['PhanTypeMismatchProperty'],
         'htdocs/core/modules/member/modules_cards.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/modules/mrp/doc/pdf_vinci.modules.php' => ['PhanUndeclaredProperty'],
@@ -174,7 +138,6 @@ return [
         'htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php' => ['PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php' => ['PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'],
         'htdocs/core/modules/syslog/mod_syslog_file.php' => ['PhanPluginDuplicateArrayKey'],
-        'htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php' => ['PhanTypeMismatchArgumentNullable'],
         'htdocs/core/modules/workstation/mod_workstation_advanced.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/multicompany_page.php' => ['PhanTypeMismatchArgument'],
         'htdocs/core/tpl/extrafields_view.tpl.php' => ['PhanUndeclaredProperty'],
@@ -185,14 +148,7 @@ return [
         'htdocs/core/tpl/resource_view.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/datapolicy/class/datapolicycron.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/delivery/class/delivery.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/don/admin/donation.php' => ['PhanUndeclaredMethod'],
-        'htdocs/don/class/don.class.php' => ['PhanParamTooMany'],
-        'htdocs/don/document.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/don/info.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/don/list.php' => ['PhanTypeMismatchProperty'],
-        'htdocs/don/note.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/emailcollector/class/emailcollector.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/eventorganization/class/conferenceorboothattendee.class.php' => ['PhanUndeclaredMethod', 'PhanUndeclaredProperty'],
         'htdocs/eventorganization/conferenceorbooth_list.php' => ['PhanTypeMismatchArgument'],
@@ -200,19 +156,14 @@ return [
         'htdocs/expedition/card.php' => ['PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/expedition/class/expedition.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/expensereport/card.php' => ['PhanUndeclaredProperty'],
-        'htdocs/expensereport/class/expensereport.class.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable'],
-        'htdocs/expensereport/payment/card.php' => ['PhanUndeclaredGlobalVariable'],
+        'htdocs/expensereport/class/expensereport.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/expensereport/payment/info.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/expensereport/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
-        'htdocs/externalsite/frames.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/fichinter/card-rec.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/fichinter/class/api_interventions.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/fichinter/class/fichinterrec.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/fichinter/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/filefunc.inc.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/fourn/class/api_supplier_orders.class.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/fourn/class/fournisseur.commande.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/fourn/commande/card.php' => ['PhanTypeMismatchDimAssignment', 'PhanTypeSuspiciousStringExpression', 'PhanUndeclaredProperty'],
+        'htdocs/fourn/commande/card.php' => ['PhanUndeclaredProperty'],
         'htdocs/fourn/facture/card-rec.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/fourn/facture/card.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchProperty'],
         'htdocs/fourn/facture/rapport.php' => ['PhanTypeMismatchArgument'],
@@ -220,7 +171,6 @@ return [
         'htdocs/holiday/card_group.php' => ['PhanTypeMismatchArgument'],
         'htdocs/holiday/list.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/hrm/class/evaluation.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/hrm/class/evaluationdet.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/hrm/class/job.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/hrm/class/position.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/hrm/class/skill.class.php' => ['PhanUndeclaredProperty'],
@@ -237,7 +187,6 @@ return [
         'htdocs/loan/document.php' => ['PhanUndeclaredProperty'],
         'htdocs/loan/note.php' => ['PhanUndeclaredProperty'],
         'htdocs/loan/payment/payment.php' => ['PhanUndeclaredProperty'],
-        'htdocs/mrp/class/mo.class.php' => ['PhanTypeMismatchProperty'],
         'htdocs/mrp/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/multicurrency/class/api_multicurrencies.class.php' => ['PhanTypeMismatchArgument'],
         'htdocs/multicurrency/class/multicurrency.class.php' => ['PhanTypeExpectedObjectPropAccess'],
@@ -254,8 +203,7 @@ return [
         'htdocs/product/reassort.php' => ['PhanTypeExpectedObjectPropAccessButGotNull'],
         'htdocs/product/stock/info.php' => ['PhanUndeclaredProperty'],
         'htdocs/product/stock/list.php' => ['PhanUndeclaredProperty'],
-        'htdocs/product/stock/movement_card.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/product/stock/movement_list.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
+        'htdocs/product/stock/movement_list.php' => ['PhanPluginUndeclaredVariableIsset', 'PhanUndeclaredProperty'],
         'htdocs/product/stock/productlot_card.php' => ['PhanUndeclaredProperty'],
         'htdocs/product/stock/stats/commande_fournisseur.php' => ['PhanUndeclaredProperty'],
         'htdocs/product/stock/stats/expedition.php' => ['PhanUndeclaredProperty'],
@@ -263,16 +211,12 @@ return [
         'htdocs/product/stock/stats/reception.php' => ['PhanUndeclaredProperty'],
         'htdocs/product/stock/stocktransfer/class/stocktransferline.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/product/stock/tpl/stockcorrection.tpl.php' => ['PhanUndeclaredProperty'],
-        'htdocs/product/stock/tpl/stocktransfer.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/projet/admin/project.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'htdocs/projet/card.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/projet/tasks.php' => ['PhanTypeMismatchArgument'],
         'htdocs/projet/tasks/time.php' => ['PhanTypeInvalidDimOffset', 'PhanUndeclaredProperty'],
         'htdocs/projet/tasks/tpl/linkedobjectblock.tpl.php' => ['PhanUndeclaredProperty'],
-        'htdocs/public/eventorganization/subscriptionok.php' => ['PhanUndeclaredGlobalVariable'],
-        'htdocs/public/members/new.php' => ['PhanUndeclaredGlobalVariable'],
         'htdocs/public/payment/newpayment.php' => ['PhanUndeclaredProperty'],
-        'htdocs/public/payment/paymentok.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanUndeclaredGlobalVariable'],
         'htdocs/public/project/suggestbooth.php' => ['PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/public/project/suggestconference.php' => ['PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/public/project/viewandvote.php' => ['PhanUndeclaredGlobalVariable'],
@@ -280,7 +224,7 @@ return [
         'htdocs/public/webportal/tpl/menu.tpl.php' => ['PhanUndeclaredProperty'],
         'htdocs/reception/card.php' => ['PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/reception/class/reception.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/reception/list.php' => ['PhanTypeMismatchArgumentNullable', 'PhanUndeclaredProperty'],
+        'htdocs/reception/list.php' => ['PhanUndeclaredProperty'],
         'htdocs/recruitment/class/recruitmentcandidature.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/recruitment/class/recruitmentjobposition.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php' => ['PhanUndeclaredProperty'],
@@ -293,7 +237,7 @@ return [
         'htdocs/recruitment/recruitmentjobposition_card.php' => ['PhanUndeclaredProperty'],
         'htdocs/recruitment/recruitmentjobposition_document.php' => ['PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
         'htdocs/recruitment/recruitmentjobposition_note.php' => ['PhanUndeclaredGlobalVariable', 'PhanUndeclaredProperty'],
-        'htdocs/salaries/paiement_salary.php' => ['PhanUndeclaredProperty'],
+        'htdocs/salaries/payment_salary.php' => ['PhanUndeclaredProperty'],
         'htdocs/salaries/virement_request.php' => ['PhanUndeclaredProperty'],
         'htdocs/societe/ajax/company.php' => ['PhanUndeclaredProperty'],
         'htdocs/societe/class/societe.class.php' => ['PhanTypeMismatchProperty'],
@@ -301,7 +245,6 @@ return [
         '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/index.php' => ['PhanPluginUndeclaredVariableIsset'],
         'htdocs/takepos/invoice.php' => ['PhanPossiblyUndeclaredGlobalVariable', 'PhanUndeclaredGlobalVariable'],
         'htdocs/takepos/split.php' => ['PhanPluginUndeclaredVariableIsset'],
         'htdocs/ticket/card.php' => ['PhanUndeclaredProperty'],
@@ -319,19 +262,7 @@ return [
         'htdocs/webportal/class/html.formcardwebportal.class.php' => ['PhanTypeMismatchArgument', 'PhanUndeclaredProperty'],
         'htdocs/webportal/class/html.formlistwebportal.class.php' => ['PhanUndeclaredProperty'],
         'htdocs/webportal/class/webportalpropal.class.php' => ['PhanUndeclaredProperty'],
-        'htdocs/webservices/server_actioncomm.php' => ['PhanUndeclaredProperty'],
-        'htdocs/webservices/server_category.php' => ['PhanUndeclaredProperty'],
-        'htdocs/webservices/server_contact.php' => ['PhanUndeclaredProperty'],
-        'htdocs/webservices/server_invoice.php' => ['PhanUndeclaredProperty'],
-        'htdocs/webservices/server_order.php' => ['PhanTypeInvalidDimOffset', 'PhanTypeMismatchArgument', 'PhanTypeSuspiciousStringExpression', 'PhanUndeclaredProperty'],
-        'htdocs/webservices/server_payment.php' => ['PhanUndeclaredProperty'],
-        'htdocs/webservices/server_productorservice.php' => ['PhanUndeclaredProperty'],
         'htdocs/webservices/server_project.php' => ['PhanUndeclaredProperty'],
-        'htdocs/webservices/server_supplier_invoice.php' => ['PhanUndeclaredProperty'],
-        'htdocs/webservices/server_thirdparty.php' => ['PhanUndeclaredProperty'],
-        'htdocs/webservices/server_user.php' => ['PhanUndeclaredProperty'],
-        'htdocs/website/websiteaccount_card.php' => ['PhanUndeclaredProperty'],
-        'internal' => ['PhanUndeclaredConstant'],
     ],
     // 'directory_suppressions' => ['src/directory_name' => ['PhanIssueName1', 'PhanIssueName2']] can be manually added if needed.
     // (directory_suppressions will currently be ignored by subsequent calls to --save-baseline, but may be preserved in future Phan releases)

dev/tools/phan/config.php

@@ -1,6 +1,6 @@
 <?php
 /* 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 is the phan config file used by .github/workflows/phan.yml
  */
@@ -35,7 +35,8 @@ $sanitizeRegex
 			'restricthtmlallowclass',
 			'restricthtmlallowunvalid',
 			'restricthtmlnolink',
-			'restricthtmlallowlinkscript'
+			'restricthtmlallowlinkscript',
+			'url',
 		)
 	).')*$/';
 

dev/tools/phan/stubs/ftp.phan_php

@@ -1,53 +1,93 @@
 <?php
-// These stubs were generated by the phan stub generator.
-// @phan-stub-for-extension ftp@7.4.12
 
 namespace {
-function ftp_alloc($ftp, $size, &$response = null) {}
-function ftp_append($ftp, $remote_file, $local_file, $mode = null) {}
-function ftp_cdup($ftp) {}
-function ftp_chdir($ftp, $directory) {}
-function ftp_chmod($ftp, $mode, $filename) {}
-function ftp_close($ftp) {}
-function ftp_connect($host, $port = null, $timeout = null) {}
-function ftp_delete($ftp, $file) {}
-function ftp_exec($ftp, $command) {}
-function ftp_fget($ftp, $fp, $remote_file, $mode = null, $resumepos = null) {}
-function ftp_fput($ftp, $remote_file, $fp, $mode = null, $startpos = null) {}
-function ftp_get($ftp, $local_file, $remote_file, $mode = null, $resume_pos = null) {}
-function ftp_get_option($ftp, $option) {}
-function ftp_login($ftp, $username, $password) {}
-function ftp_mdtm($ftp, $filename) {}
-function ftp_mkdir($ftp, $directory) {}
-function ftp_mlsd($ftp, $directory) {}
-function ftp_nb_continue($ftp) {}
-function ftp_nb_fget($ftp, $fp, $remote_file, $mode = null, $resumepos = null) {}
-function ftp_nb_fput($ftp, $remote_file, $fp, $mode = null, $startpos = null) {}
-function ftp_nb_get($ftp, $local_file, $remote_file, $mode = null, $resume_pos = null) {}
-function ftp_nb_put($ftp, $remote_file, $local_file, $mode = null, $startpos = null) {}
-function ftp_nlist($ftp, $directory) {}
-function ftp_pasv($ftp, $pasv) {}
-function ftp_put($ftp, $remote_file, $local_file, $mode = null, $startpos = null) {}
-function ftp_pwd($ftp) {}
-function ftp_quit($ftp) {}
-function ftp_raw($ftp, $command) {}
-function ftp_rawlist($ftp, $directory, $recursive = null) {}
-function ftp_rename($ftp, $src, $dest) {}
-function ftp_rmdir($ftp, $directory) {}
-function ftp_set_option($ftp, $option, $value) {}
-function ftp_site($ftp, $cmd) {}
-function ftp_size($ftp, $filename) {}
-function ftp_ssl_connect($host, $port = null, $timeout = null) {}
-function ftp_systype($ftp) {}
-const FTP_ASCII = 1;
-const FTP_AUTORESUME = -1;
-const FTP_AUTOSEEK = 1;
-const FTP_BINARY = 2;
-const FTP_FAILED = 0;
-const FTP_FINISHED = 1;
-const FTP_IMAGE = 2;
-const FTP_MOREDATA = 2;
-const FTP_TEXT = 1;
-const FTP_TIMEOUT_SEC = 0;
-const FTP_USEPASVADDRESS = 2;
+    const FTP_ASCII = 1;
+    const FTP_TEXT = 1;
+    const FTP_BINARY = 2;
+    const FTP_IMAGE = 2;
+    const FTP_AUTORESUME = -1;
+    const FTP_TIMEOUT_SEC = 0;
+    const FTP_AUTOSEEK = 1;
+    const FTP_USEPASVADDRESS = 2;
+    const FTP_FAILED = 0;
+    const FTP_FINISHED = 1;
+    const FTP_MOREDATA = 2;
+
+    function ftp_connect(string $hostname, int $port = 21, int $timeout = 90): FTP\Connection|false {}
+    function ftp_ssl_connect(string $hostname, int $port = 21, int $timeout = 90): FTP\Connection|false {}
+
+    function ftp_login(FTP\Connection $ftp, string $username, #[\SensitiveParameter] string $password): bool {}
+    function ftp_pwd(FTP\Connection $ftp): string|false {}
+    function ftp_cdup(FTP\Connection $ftp): bool {}
+    function ftp_chdir(FTP\Connection $ftp, string $directory): bool {}
+    function ftp_exec(FTP\Connection $ftp, string $command): bool {}
+
+    /**
+     * @return array<int, string>|null
+     */
+    function ftp_raw(FTP\Connection $ftp, string $command): ?array {}
+    function ftp_mkdir(FTP\Connection $ftp, string $directory): string|false {}
+    function ftp_rmdir(FTP\Connection $ftp, string $directory): bool {}
+    function ftp_chmod(FTP\Connection $ftp, int $permissions, string $filename): int|false {}
+
+    /** @param string $response */
+    function ftp_alloc(FTP\Connection $ftp, int $size, &$response = null): bool {}
+
+    /**
+     * @return array<int, string>|false
+     */
+    function ftp_nlist(FTP\Connection $ftp, string $directory): array|false {}
+
+    /**
+     * @return array<int, string>|false
+     */
+    function ftp_rawlist(FTP\Connection $ftp, string $directory, bool $recursive = false): array|false {}
+
+    /**
+     * @return array<int, array>|false
+     */
+    function ftp_mlsd(FTP\Connection $ftp, string $directory): array|false {}
+
+    function ftp_systype(FTP\Connection $ftp): string|false {}
+
+    /** @param resource $stream */
+    function ftp_fget(FTP\Connection $ftp, $stream, string $remote_filename, int $mode = FTP_BINARY, int $offset = 0): bool {}
+
+    /** @param resource $stream */
+    function ftp_nb_fget(FTP\Connection $ftp, $stream, string $remote_filename, int $mode = FTP_BINARY, int $offset = 0): int {}
+    function ftp_pasv(FTP\Connection $ftp, bool $enable): bool {}
+    function ftp_get(FTP\Connection $ftp, string $local_filename, string $remote_filename, int $mode = FTP_BINARY, int $offset = 0): bool {}
+    function ftp_nb_get(FTP\Connection $ftp, string $local_filename, string $remote_filename, int $mode = FTP_BINARY, int $offset = 0): int|false {}
+    function ftp_nb_continue(FTP\Connection $ftp): int {}
+
+    /** @param resource $stream */
+    function ftp_fput(FTP\Connection $ftp, string $remote_filename, $stream, int $mode = FTP_BINARY, int $offset = 0): bool {}
+
+    /** @param resource $stream */
+    function ftp_nb_fput(FTP\Connection $ftp, string $remote_filename, $stream, int $mode = FTP_BINARY, int $offset = 0): int {}
+    function ftp_put(FTP\Connection $ftp, string $remote_filename, string $local_filename, int $mode = FTP_BINARY, int $offset = 0): bool {}
+    function ftp_append(FTP\Connection $ftp, string $remote_filename, string $local_filename, int $mode = FTP_BINARY): bool {}
+    function ftp_nb_put(FTP\Connection $ftp, string $remote_filename, string $local_filename, int $mode = FTP_BINARY, int $offset = 0): int|false {}
+    function ftp_size(FTP\Connection $ftp, string $filename): int {}
+    function ftp_mdtm(FTP\Connection $ftp, string $filename): int {}
+    function ftp_rename(FTP\Connection $ftp, string $from, string $to): bool {}
+    function ftp_delete(FTP\Connection $ftp, string $filename): bool {}
+    function ftp_site(FTP\Connection $ftp, string $command): bool {}
+    function ftp_close(FTP\Connection $ftp): bool {}
+
+    function ftp_quit(FTP\Connection $ftp): bool {}
+
+    /** @param int|bool $value */
+    function ftp_set_option(FTP\Connection $ftp, int $option, $value): true {}
+    function ftp_get_option(FTP\Connection $ftp, int $option): int|bool {}
+}
+
+namespace FTP {
+    /**
+     * @strict-properties
+     * @not-serializable
+     */
+    final class Connection
+    {
+    }
 }

dev/tools/phpstan/phpstan_v1_apstats.neon

@@ -66,8 +66,14 @@ parameters:
 	reportMagicMethods: false
 	reportMagicProperties: false
 	treatPhpDocTypesAsCertain: false
+	# if you want to exclude something, generate the baseline to do that, add here give only pattern that does not give the opportunity to introduce new errors
+	# or pattern to avoid false positive of some bugged or allowed phpstan checks
 	ignoreErrors:
 		- '#.*phan-var#'
+		- '#^Expression "''…" on a separate line does not do anything#'
+		- '#Empty array passed to foreach#'
+		- '#Unable to resolve the template type T#'
+		- '#in empty\(\) always exists and is always falsy#'
 		- '#is always#'
 	internalErrorsCountLimit: 50
 	cache:

dev/tools/rector/README.md

@@ -16,15 +16,15 @@ composer install
 
 #### Usage
 
-##### To make changes (Add --dry-run for test mode only)
+##### To make changes (remove --dry-run for real run)
 ```shell
 cd dev/tools/rector
-./vendor/bin/rector process --dry-run
+./vendor/bin/rector process --debug --dry-run
 ```
 
 ##### To make changes on a given directory
 
 ```shell
 cd dev/tools/rector
-./vendor/bin/rector process [--dry-run] [--clear-cache] ../../../htdocs/core/
+./vendor/bin/rector process --debug [--dry-run] [--clear-cache] ../../../htdocs/core/
 ```

dev/tools/rector/rector.php

@@ -18,7 +18,7 @@
 /**
  *   	\file       dev/tools/rector/rector.php
  *		\ingroup    core
- *		\brief      Toolt to run rector
+ *		\brief      Tool to run rector
  *
  *		cd dev/tools/rector
  *		./vendor/bin/rector process [--dry-run] [--clear-cache] ../../../htdocs/core/
@@ -33,17 +33,22 @@ use Rector\Set\ValueObject\SetList;
 
 return static function (RectorConfig $rectorConfig): void {
 	$rectorConfig->phpVersion(PhpVersion::PHP_71);
-	//$rectorConfig->indent(' ', 4);
+	$rectorConfig->indent(' ', 4);
 
 	// Traits seems not supported correctly by rector without declaring them as bootstrapFiles
 	$arrayoftraitfiles = array(
 		__DIR__ . '/../../../htdocs/core/class/commonincoterm.class.php',
 		__DIR__ . '/../../../htdocs/core/class/commonpeople.class.php',
-		__DIR__ . '/../../../htdocs/core/class/commonsocialnetworks.class.php'
+		__DIR__ . '/../../../htdocs/core/class/commonsignedobject.class.php',
+		__DIR__ . '/../../../htdocs/core/class/commonsocialnetworks.class.php',
+		__DIR__ . '/../../../htdocs/core/class/commontrigger.class.php',
+		__DIR__ . '/../../../htdocs/core/class/doldeprecationhandler.class.php',
+		__DIR__ . '/../../../htdocs/subtotals/class/commonsubtotal.class.php',
 	);
 	$rectorConfig->bootstrapFiles($arrayoftraitfiles);
 
 	$rectorConfig->paths([
+		__DIR__ . '/../../../dev/',
 		__DIR__ . '/../../../htdocs/',
 		__DIR__ . '/../../../scripts/',
 		__DIR__ . '/../../../test/phpunit/',
@@ -54,7 +59,8 @@ return static function (RectorConfig $rectorConfig): void {
 		'**/custom/**',
 		'**/vendor/**',
 		'**/rector/**',		// Disable this line to test the "test.php" file.
-		__DIR__ . '/../../../htdocs/custom/',
+		__DIR__ . '/../../../dev/tools/phan/stubs/*',
+		__DIR__ . '/../../../htdocs/custom/*',
 		__DIR__ . '/../../../htdocs/install/doctemplates/*'
 		//'test.php',
 	]);
@@ -82,12 +88,18 @@ return static function (RectorConfig $rectorConfig): void {
 	$rectorConfig->rule(Dolibarr\Rector\Renaming\EmptyUserRightsToFunction::class);
 	$rectorConfig->rule(Dolibarr\Rector\Renaming\GlobalToFunction::class);
 	$rectorConfig->rule(Dolibarr\Rector\Renaming\UserRightsToFunction::class);
-	//$rectorConfig->rule(Dolibarr\Rector\Renaming\UsePositiveExit::class);
+	$rectorConfig->rule(Dolibarr\Rector\Renaming\UsePositiveExit::class);
 
 
 	// This fix <> into != but it breaks other rules, so added at end.
-	$rectorConfig->rule(Rector\CodeQuality\Rector\NotEqual\CommonNotEqualRector::class);
+	//$rectorConfig->rule(Rector\CodeQuality\Rector\NotEqual\CommonNotEqualRector::class);
 
+	/*
+	$rectorConfig->skip([
+		Rector\BetterPhpDocParser\PhpDocParser\BetterPhpDocParser::class,
+		Dolibarr\Rector\Renaming\GlobalToFunction::class
+	]);
+	*/
 
 	// Add all predefined rules to migrate to up to php 71.
 	// Warning this break tab spacing of arrays on several lines

dev/tools/rector/src/Renaming/GlobalToFunction.php

@@ -63,7 +63,7 @@ class GlobalToFunction extends AbstractRector
 			'Change $conf->global to getDolGlobal in context (1) conf->global Operator Value or (2) function(conf->global...)',
 			[new CodeSample(
 				'$conf->global->CONSTANT',
-				'getDolGlobalInt(\'CONSTANT\')'
+				'getDolGlobalString|Int(\'CONSTANT\')'
 				)]
 			);
 	}
@@ -228,14 +228,36 @@ class GlobalToFunction extends AbstractRector
 			return new Concat($leftConcat, $rightConcat);
 		}
 
+		// If a && b and a or b is conf->global, we replace a or/and b
 		if ($node instanceof BooleanAnd) {
-			$nodes = $this->resolveTwoNodeMatch($node);
-			if (!isset($nodes)) {
-				return;
+			// Transformation sur le nœud gauche
+			$changedone = 0;
+			if ($this->isGlobalVar($node->left)) {
+				$constName = $this->getConstName($node->left);
+				if (empty($constName)) {
+					return;
+				}
+				$node->left = new FuncCall(
+					new Name('getDolGlobalString'),
+					[new Arg($constName)]
+					);
+				$changedone++;
+			}
+			if ($this->isGlobalVar($node->right)) {
+				$constName = $this->getConstName($node->right);
+				if (empty($constName)) {
+					return;
+				}
+				$node->right = new FuncCall(
+					new Name('getDolGlobalString'),
+					[new Arg($constName)]
+					);
+				$changedone++;
 			}
 
-			/** @var Equal $node */
-			$node = $nodes->getFirstExpr();
+			if ($changedone) {
+				return $node;
+			}
 		}
 
 
@@ -270,9 +292,42 @@ class GlobalToFunction extends AbstractRector
 			return;
 		}
 
+		// Now we process a comparison
 		$isconfglobal = $this->isGlobalVar($node->left);
 		if (!$isconfglobal) {
-			// The left side is not conf->global->xxx, so we leave
+			$isconfglobal = $this->isGlobalVar($node->right);
+			if (!$isconfglobal) {
+				// The left side and right side is not conf->global->xxx, so we leave
+				return;
+			}
+			// Right side is conf->global->xxx, but we can't know if we must use getDolGlobalInt or String,
+			// so we use getDolGlobalString if comparison is ==
+			if ($typeofcomparison == 'Equal') {
+				$constName = $this->getConstName($node->right);
+				if (empty($constName)) {
+					return;
+				}
+
+				// Test the type after the comparison conf->global->xxx to know the name of function
+				$typeleft = $node->left->getType();
+				switch ($typeleft) {
+					case 'Scalar_LNumber':
+						$funcName = 'getDolGlobalInt';
+						break;
+					case 'Scalar_String':
+						$funcName = 'getDolGlobalString';
+						break;
+					default:	// Can be Expr_FuncCall
+						$funcName = 'getDolGlobalString';
+						break;
+				}
+
+				$node->right = new FuncCall(
+						new Name($funcName),
+						[new Arg($constName)]
+						);
+				return $node;
+			}
 			return;
 		}
 
@@ -360,36 +415,6 @@ class GlobalToFunction extends AbstractRector
 		}
 	}
 
-	/**
-	 * Get nodes with check empty
-	 *
-	 * @param BooleanAnd $booleanAnd A BooleandAnd
-	 * @return    TwoNodeMatch|null
-	 */
-	private function resolveTwoNodeMatch(BooleanAnd $booleanAnd): ?TwoNodeMatch
-	{
-		return $this->binaryOpManipulator->matchFirstAndSecondConditionNode(
-			$booleanAnd,
-			// Function to check if we are in the case $conf->global->... == $value
-			function (Node $node): bool {
-				if (!$node instanceof Equal) {
-					return \false;
-				}
-				return $this->isGlobalVar($node->left);
-			},
-			// !empty(...) || isset(...)
-			function (Node $node): bool {
-				if ($node instanceof BooleanNot && $node->expr instanceof Empty_) {
-					return $this->isGlobalVar($node->expr->expr);
-				}
-				if (!$node instanceof Isset_) {
-					return $this->isGlobalVar($node);
-				}
-				return \true;
-			}
-			);
-	}
-
 	/**
 	 * Check if node is a global access with format conf->global->XXX
 	 *

dev/translation/dynamic_translation_keys.lst

@@ -24,6 +24,10 @@ DATAPOLICY_TIERS_NIPROSPECT_NICLIENT
 DATAPOLICY_TIERS_PROSPECT
 DATAPOLICY_TIERS_PROSPECT_CLIENT
 
+#
+TOKEN_EXPIRE_AT
+TOKEN_EXPIRED
+
 # fournisseur
 CodePaymentTerm
 IdPaymentTerm
@@ -36,6 +40,15 @@ Reservation
 CompletePage
 PortionOfPage
 
+#
+AccountancyGroupCAPIT
+AccountancyGroupEXPENSE
+AccountancyGroupFINAN
+AccountancyGroupIMMO
+AccountancyGroupINCOME
+AccountancyGroupSTOCK
+AccountancyGroupTHIRDPARTY
+
 # Others
 ACCOUNTING_ACCOUNT_CUSTOMER
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc
@@ -95,6 +108,14 @@ ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT
 ACCOUNTING_VAT_PAY_ACCOUNT
 ACCOUNTING_VAT_SOLD_ACCOUNT
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT
+
+AI_API_MODEL_AUDIO
+AI_API_MODEL_IMAGE
+AI_API_MODEL_TEXT
+AI_API_MODEL_TRANSCRIPT
+AI_API_MODEL_TRANSLATE
+AI_API_MODEL_VIDEO
+
 AGENDA_EVENT_CURRENT_COLOR
 AGENDA_EVENT_FUTURE_COLOR
 AGENDA_EVENT_PAST_COLOR

dev/translation/ignore_translation_keys.lst

@@ -96,8 +96,6 @@ AADE_WEBSERVICE_USER
 API
 Accept
 AccountancyErrorMismatchLetteringCode
-AccountingAccount
-AccountingCode
 AccountingJournalType
 ActionAC_
 ActionAC_ALL_
@@ -147,14 +145,12 @@ Banque
 Barcode
 BarcodeDesc
 BarcodeStickersMask
-BatchInformationNotfound
 BillOfMaterialsLine
 BlockLogNeedAmountsValue
 BlockLogNeedElement
 BlockedLogAuthorityNeededToStoreYouFingerprintsInNonAlterableRemote
 BlockedLogAuthorityUrl
 BlockedLogSetup
-BookCalSystem
 Bookings
 BoxTitleLast
 BoxTitleLatest
@@ -179,7 +175,6 @@ Child of
 ClassNotFound
 Clear
 ClickToDial
-Clients
 Clone
 CloneAffectation
 CloneChanges
@@ -202,8 +197,6 @@ ConfirmActionMyObject
 ConfirmActionTarget
 ConfirmCloneMyObject
 ConfirmCloneTask
-ConfirmCreateAdherent
-ConfirmDeleteAdherent
 ConfirmDeleteIndividual
 ConfirmDeleteReport
 ConfirmDeleteWebsiteAccount
@@ -267,7 +260,6 @@ Dictionaries
 DictionaryEmpty
 DictionaryNameUpdated
 Directory
-DisabledByOptionADD_UNSPLASH_LOGIN_BACKGROUND
 Document
 Documentation
 Dolibarr
@@ -291,7 +283,6 @@ EmailcollectorFilter
 EmailingTargetSelector
 Empty
 End
-EnterAnIP
 EnterNameOfDictionnaryToDeleteDesc
 Entries
 ErrSCAAuthentication
@@ -309,7 +300,6 @@ ErrorBadSocialNetworkValue
 ErrorBadStatus
 ErrorBadValue
 ErrorBadValueForBatch
-ErrorBadValueForDate
 ErrorCanNotDeleteDir
 ErrorCantSplitAUsedDiscount
 ErrorChartOfAccountSystemNotSelected
@@ -334,7 +324,6 @@ ErrorFailedToGetListOfNotificationsToSend
 ErrorFailedToLoadBankAccount
 ErrorFailedToLoadDiscount
 ErrorFailedToSetNewPassword
-ErrorFaviconMustBeASquaredImage
 ErrorFileNameInvalid
 ErrorImportOfChartLimitedToCurrentChart
 ErrorMAIN_ROUNDING_RULE_TOTCanMAIN_MAX_DECIMALS_TOT
@@ -362,7 +351,6 @@ ErrorTechnicalError
 ErrorThirdPartyIdIsMandatory
 ErrorTicketIsNotValid
 ErrorTitreAlreadyExists
-ErrorUpdatingUsersCP
 ErrorUserFetch
 ErrorValueMustBeInteger
 ErrorValueTooHigh
@@ -412,7 +400,6 @@ Filename
 FilteredFrom
 Flashy
 ForcedByGlobalSetup
-Form for public lead registration has not been enabled
 Free
 FreeLegalTextOnReceptions
 FrequencyPer_
@@ -434,7 +421,6 @@ Gzip
 HTTPBasicPassword
 HelpAbandonProductReturned
 HideVersionLink
-HolidayStarted
 Hook
 Hooks
 IBANNotDefined
@@ -620,7 +606,6 @@ PaymentCondition
 PaymentConditionShort
 PaymentDonation
 PaymentHigherThanReminderToPaySupplier
-PaymentSalary
 PaymentSendToStripeTerminal
 PaymentType
 PaymentTypeShort
@@ -637,17 +622,13 @@ Poll
 Posts
 PredefinedInterventional
 PrevRangeToThisRange
-PreviousFingerprint
 Print
 PrintDriver
 PrintModule
 PrintUserConfDesc
 PrinterId
 PrinterIdEmpty
-PrinterLocation
-PrinterNameEmpty
 PrinterParameterEmpty
-Printers
 Printing
 ProductCodeDesc
 ProductFournisseurPrice
@@ -811,7 +792,6 @@ Templates
 TestPrinterTemplate
 TestTemplateToPrinter
 Theme
-ThirdpartyHasNoDefaultBanAccount
 ThisIsInformationOnDocumentToSign
 ThisScreenAllowsYouToSignDocFrom
 TicketCategoryShort
@@ -821,7 +801,6 @@ TicketTypeShort
 TimeOnly
 Timezone
 ToGetBack
-ToPay
 Token
 Tooltip
 TooltipEditAndRevertStockMovement
@@ -848,8 +827,6 @@ UpdateUser
 UpgradeHasBeenUnlocked
 Url
 Use of API for currency update is disabled by option MULTICURRENCY_DISABLE_SYNC_CURRENCYLAYER
-UserRemovedFromGroup
-UserSetInGroup
 VCard
 Vacant
 ValidateAndSign
@@ -875,7 +852,6 @@ Widgets
 Windows
 WorkingBoard
 Workload
-WrongAmount
 XDebug
 XmlCorrupted
 Y
@@ -1032,10 +1008,6 @@ PDF/A-3b
 PartnershipSentByEMail
 PdfTitle
 ProcessingError
-PurchaseOrder
-PurchaseOrders
-ReceptionSentByEMail
-ReceptionValidated
 Recruited
 Ref. Product
 RefNewContract
@@ -1043,7 +1015,6 @@ Stable
 Suggested
 TicketMessageMailSignatureText
 TicketSetupPage
-Tiers
 Timeline
 Transfer
 TryAnotherConnectionMode

dev/translation/sanity_check_trans_missing_unused.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 #
 # Find unused translations pretty fast...
+# Go into the root of the git directory, then launch the shell.
 #
 # Principle:
 #
@@ -35,7 +36,7 @@ DYNAMIC_KEYS_FILE=${TMP}/dynamic_keys
 MISSING_AND_UNUSED_FILE=${TMP}/missing_and_unused
 MISSING_FILE=${TMP}/missing
 UNUSED_FILE=${TMP}/unused
-EXPECTED_REGEX='(Country..|ExportDataset_.*|Language_.._..|MonthVeryShort\d\d|PaperFormat.*||Permission.*|ProfId\d(..)?|unit.*)'
+EXPECTED_REGEX='(Country..|ExportDataset_.*|Language_.._..|MonthVeryShort\d\d|PaperFormat.*||Permission.*|ProfId\d(..)?|TypeContact_shipping_external_.*|unit.*)'
 DYNAMIC_KEYS_SRC_FILE=${MYDIR}/dynamic_translation_keys.lst
 EXCLUDE_KEYS_SRC_FILE=${MYDIR}/ignore_translation_keys.lst
 DUPLICATE_KEYS_SRC_FILE=${MYDIR}/duplicate_translation_keys.lst

htdocs/.gitignore

@@ -21,7 +21,6 @@
 /cabinetmed*
 /webmail*
 /conf/conf.php
-/subtotal*
 /abricot*
 /nomenclature*
 /of/

htdocs/accountancy/admin/account.php

@@ -3,7 +3,7 @@
  * Copyright (C) 2013-2025	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		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
@@ -61,7 +61,7 @@ $search_import_key = GETPOST('search_import_key', 'alpha');
 $search_reconcilable = GETPOST("search_reconcilable", 'int');
 $search_centralized = GETPOST("search_centralized", 'int');
 $search_active = GETPOST("search_active", 'int');
-$toselect = GETPOST('toselect', 'array');
+$toselect = GETPOST('toselect', 'array:int');
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $confirm = GETPOST('confirm', 'alpha');
 
@@ -98,20 +98,22 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
+$object = new AccountingAccount($db);
+
 $arrayfields = array(
 	'aa.account_number' => array('label' => "AccountNumber", 'checked' => '1'),
 	'aa.label' => array('label' => "Label", 'checked' => '1'),
-	'aa.labelshort' => array('label' => "LabelToShow", 'checked' => '1'),
+	'aa.labelshort' => array('label' => "ShortLabel", 'checked' => '1'),
 	'aa.account_parent' => array('label' => "Accountparent", 'checked' => '1'),
 	'aa.pcg_type' => array('label' => "Pcgtype", 'checked' => '1', 'help' => 'PcgtypeDesc'),
 	'categories' => array('label' => "AccountingCategories", 'checked' => '-1', 'help' => 'AccountingCategoriesDesc'),
 	'aa.reconcilable' => array('label' => "Reconcilable", 'checked' => '1'),
-	'aa.centralized' => array('label' => "Centralized", 'checked' => '1'),
+	'aa.centralized' => array('label' => "Centralized", 'checked' => '1', 'help' => 'CentralizedAccountHelp'),
 	'aa.import_key' => array('label' => "ImportId", 'checked' => '-1', 'help' => ''),
 	'aa.active' => array('label' => "Activated", 'checked' => '1')
 );
 
-if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
+if (!getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING')) {
 	unset($arrayfields['categories']);
 	unset($arrayfields['aa.reconcilable']);
 }
@@ -350,7 +352,7 @@ $nbtotalofrecords = '';
 if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
 	$resql = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($resql);
-	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > (int) $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
@@ -429,7 +431,7 @@ if ($resql) {
 	$newcardbutton = dolGetButtonTitle($langs->trans('Addanaccount'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/accountancy/admin/card.php?action=create', '', $permissiontoadd);
 
 
-	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<form method="POST" id="searchFormList" action="'.dolBuildUrl($_SERVER["PHP_SELF"]).'">';
 	if ($optioncss != '') {
 		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	}
@@ -557,12 +559,10 @@ if ($resql) {
 	}
 
 	// Reconcilable
-	if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
-		if (!empty($arrayfields['aa.reconcilable']['checked'])) {
-			print '<td class="liste_titre center">';
-			print $form->selectyesno('search_reconcilable', $search_reconcilable, 1, false, 1, 1, 'search_status onrightofpage width75');
-			print '</td>';
-		}
+	if (!empty($arrayfields['aa.reconcilable']['checked'])) {
+		print '<td class="liste_titre center">';
+		print $form->selectyesno('search_reconcilable', $search_reconcilable, 1, false, 1, 1, 'search_status onrightofpage width75');
+		print '</td>';
 	}
 
 	// Centralized
@@ -574,10 +574,11 @@ if ($resql) {
 
 	// Active
 	if (!empty($arrayfields['aa.active']['checked'])) {
-		print '<td class="liste_titre center">';
+		print '<td class="liste_titre center parentonrightofpage">';
 		print $form->selectyesno('search_active', $search_active, 1, false, 1, 1, 'search_status onrightofpage width75');
 		print '</td>';
 	}
+
 	// Action column
 	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 		print '<td class="liste_titre center maxwidthsearch">';
@@ -614,12 +615,14 @@ if ($resql) {
 		print_liste_field_titre($arrayfields['aa.account_parent']['label'], $_SERVER["PHP_SELF"], "aa.account_parent", "", $param, '', $sortfield, $sortorder, 'left ');
 		$totalarray['nbfield']++;
 	}
+	// Main group
 	if (!empty($arrayfields['aa.pcg_type']['checked'])) {
-		print_liste_field_titre($arrayfields['aa.pcg_type']['label'], $_SERVER["PHP_SELF"], 'aa.pcg_type,aa.account_number', '', $param, '', $sortfield, $sortorder, '', $arrayfields['aa.pcg_type']['help'], 1);
+		print_liste_field_titre($arrayfields['aa.pcg_type']['label'], $_SERVER["PHP_SELF"], 'aa.pcg_type,aa.account_number', '', $param, '', $sortfield, $sortorder, 'right ', $arrayfields['aa.pcg_type']['help'].'::-1', 1);
 		$totalarray['nbfield']++;
 	}
+	// Number of custom groups
 	if (!empty($arrayfields['categories']['checked'])) {
-		print_liste_field_titre($arrayfields['categories']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, '', $arrayfields['categories']['help'], 1);
+		print_liste_field_titre($arrayfields['categories']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, '', $arrayfields['categories']['help'].'::-1', 1);
 		$totalarray['nbfield']++;
 	}
 
@@ -629,21 +632,19 @@ if ($resql) {
 	print $hookmanager->resPrint;
 
 	if (!empty($arrayfields['aa.import_key']['checked'])) {
-		print_liste_field_titre($arrayfields['aa.import_key']['label'], $_SERVER["PHP_SELF"], 'aa.import_key', '', $param, '', $sortfield, $sortorder, '', $arrayfields['aa.import_key']['help'], 1);
+		print_liste_field_titre($arrayfields['aa.import_key']['label'], $_SERVER["PHP_SELF"], 'aa.import_key', '', $param, '', $sortfield, $sortorder, '', $arrayfields['aa.import_key']['help'].'::-1', 1);
 		$totalarray['nbfield']++;
 	}
-	if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
-		if (!empty($arrayfields['aa.reconcilable']['checked'])) {
-			print_liste_field_titre($arrayfields['aa.reconcilable']['label'], $_SERVER["PHP_SELF"], 'aa.reconcilable', '', $param, '', $sortfield, $sortorder, 'center ');
-			$totalarray['nbfield']++;
-		}
+	if (!empty($arrayfields['aa.reconcilable']['checked'])) {
+		print_liste_field_titre($arrayfields['aa.reconcilable']['label'], $_SERVER["PHP_SELF"], 'aa.reconcilable', '', $param, '', $sortfield, $sortorder, 'center ');
+		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['aa.centralized']['checked'])) {
-		print_liste_field_titre($arrayfields['aa.centralized']['label'], $_SERVER["PHP_SELF"], 'aa.centralized', '', $param, '', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['aa.centralized']['label'], $_SERVER["PHP_SELF"], 'aa.centralized', '', $param, '', $sortfield, $sortorder, '', $arrayfields['aa.centralized']['help'].'::-1', 1);
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['aa.active']['checked'])) {
-		print_liste_field_titre($arrayfields['aa.active']['label'], $_SERVER["PHP_SELF"], 'aa.active', '', $param, '', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['aa.active']['label'], $_SERVER["PHP_SELF"], 'aa.active', '', $param, '', $sortfield, $sortorder, 'center ');
 		$totalarray['nbfield']++;
 	}
 	// Action column
@@ -759,7 +760,7 @@ if ($resql) {
 		}
 		// Custom accounts
 		if (!empty($arrayfields['categories']['checked'])) {
-			print "<td>";
+			print '<td class="right">';
 			// TODO Get all custom groups labels the account is in
 			print dol_escape_htmltag($obj->fk_accounting_category);
 			print "</td>\n";
@@ -783,23 +784,21 @@ if ($resql) {
 			}
 		}
 
-		if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
-			// Activated or not reconciliation on an accounting account
-			if (!empty($arrayfields['aa.reconcilable']['checked'])) {
-				print '<td class="center">';
-				if (empty($obj->reconcilable)) {
-					print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=enable&mode=1&token='.newToken().'">';
-					print img_picto($langs->trans("Disabled"), 'switch_off');
-					print '</a>';
-				} else {
-					print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=disable&mode=1&token='.newToken().'">';
-					print img_picto($langs->trans("Activated"), 'switch_on');
-					print '</a>';
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
+		// Activated or not reconciliation on an accounting account
+		if (!empty($arrayfields['aa.reconcilable']['checked'])) {
+			print '<td class="center">';
+			if (empty($obj->reconcilable)) {
+				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=enable&page='.$page.'&mode=1&token='.newToken().'">';
+				print img_picto($langs->trans("Disabled"), 'switch_off');
+				print '</a>';
+			} else {
+				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=disable&page='.$page.'&mode=1&token='.newToken().'">';
+				print img_picto($langs->trans("Activated"), 'switch_on');
+				print '</a>';
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
 		}
 
@@ -807,11 +806,11 @@ if ($resql) {
 		if (!empty($arrayfields['aa.centralized']['checked'])) {
 			print '<td class="center">';
 			if (empty($obj->centralized)) {
-				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=enable&mode=2&token='.newToken().'">';
+				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=enable&page='.$page.'&mode=2&token='.newToken().'">';
 				print img_picto($langs->trans("Disabled"), 'switch_off');
 				print '</a>';
 			} else {
-				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=disable&mode=2&token='.newToken().'">';
+				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=disable&page='.$page.'&mode=2&token='.newToken().'">';
 				print img_picto($langs->trans("Activated"), 'switch_on');
 				print '</a>';
 			}
@@ -825,11 +824,11 @@ if ($resql) {
 		if (!empty($arrayfields['aa.active']['checked'])) {
 			print '<td class="center">';
 			if (empty($obj->active)) {
-				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=enable&mode=0&token='.newToken().'">';
+				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=enable&page='.$page.'&mode=0&token='.newToken().'">';
 				print img_picto($langs->trans("Disabled"), 'switch_off');
 				print '</a>';
 			} else {
-				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=disable&mode=0&token='.newToken().'">';
+				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=disable&page='.$page.'&mode=0&token='.newToken().'">';
 				print img_picto($langs->trans("Activated"), 'switch_on');
 				print '</a>';
 			}

htdocs/accountancy/admin/accountmodel.php

@@ -12,7 +12,7 @@
  * 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       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
@@ -92,6 +92,8 @@ $search_country_id = GETPOST('search_country_id', 'int');
 if ($user->socid > 0) {
 	accessforbidden();
 }
+
+$permissiontoeditchart = $user->hasRight('accounting', 'chartofaccount');
 if (!$user->hasRight('accounting', 'chartofaccount')) {
 	accessforbidden();
 }
@@ -143,7 +145,6 @@ $tabhelp = array();
 $tabhelp[31] = array('pcg_version' => $langs->trans("EnterAnyCode"));
 
 
-
 /*
  * Actions
  */
@@ -198,32 +199,15 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 	// Si verif ok et action add, on ajoute la ligne
 	if ($ok && GETPOST('actionadd', 'alpha')) {
 		$newid = 0;
-		if ($tabrowid[$id]) {
-			// Get free id for insert
-			$sql = "SELECT MAX(".$db->sanitize($tabrowid[$id]).") as newid FROM ".$db->sanitize($tabname[$id]);
-			$result = $db->query($sql);
-			if ($result) {
-				$obj = $db->fetch_object($result);
-				$newid = ($obj->newid + 1);
-			} else {
-				dol_print_error($db);
-			}
-		}
 
 		// Add new entry
 		$sql = "INSERT INTO ".$db->sanitize($tabname[$id])." (";
 		// List of fields
-		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) {
-			$sql .= $db->sanitize($tabrowid[$id]).",";
-		}
 		$sql .= $db->sanitize($tabfieldinsert[$id]);
 		$sql .= ",active)";
 		$sql .= " VALUES(";
 
 		// List of values
-		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) {
-			$sql .= $newid.",";
-		}
 		$i = 0;
 		foreach ($listfieldinsert as $f => $value) {
 			if ($value == 'price' || preg_match('/^amount/i', $value) || $value == 'taux') {
@@ -259,19 +243,10 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 
 	// Si verif ok et action modify, on modifie la ligne
 	if ($ok && GETPOST('actionmodify', 'alpha')) {
-		if ($tabrowid[$id]) {
-			$rowidcol = $tabrowid[$id];
-		} else {
-			$rowidcol = "rowid";
-		}
-
 		// Modify entry
 		$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET ";
 		// Modifie valeur des champs
-		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify)) {
-			$sql .= $db->sanitize($tabrowid[$id])." = ";
-			$sql .= "'".$db->escape($rowid)."', ";
-		}
+
 		$i = 0;
 		foreach ($listfieldmodify as $field) {
 			if ($field == 'price' || preg_match('/^amount/i', $field) || $field == 'taux') {
@@ -290,7 +265,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 			}
 			$i++;
 		}
-		$sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
+		$sql .= " WHERE rowid = ".((int) $rowid);
 
 		dol_syslog("actionmodify", LOG_DEBUG);
 		//print $sql;
@@ -301,14 +276,9 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 	}
 }
 
-if ($action == 'confirm_delete' && $confirm == 'yes') {       // delete
-	if ($tabrowid[$id]) {
-		$rowidcol = $tabrowid[$id];
-	} else {
-		$rowidcol = "rowid";
-	}
-
-	$sql = "DELETE from ".$db->sanitize($tabname[$id])." WHERE ".$db->sanitize($rowidcol)." = ".((int) $rowid);
+// delete
+if ($action == 'confirm_delete' && $confirm == 'yes' && $permissiontoeditchart) {
+	$sql = "DELETE from ".$db->sanitize($tabname[$id])." WHERE rowid = ".((int) $rowid);
 
 	dol_syslog("delete", LOG_DEBUG);
 	$result = $db->query($sql);
@@ -322,7 +292,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes') {       // delete
 }
 
 // activate
-if ($action == 'activate') {
+if ($action == 'activate' && $permissiontoeditchart) {
 	$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET active = 1 WHERE rowid = ".((int) $rowid);
 	$result = $db->query($sql);
 	if (!$result) {
@@ -331,7 +301,7 @@ if ($action == 'activate') {
 }
 
 // disable
-if ($action == $acts[1]) {
+if ($action == $acts[1] && $permissiontoeditchart) {
 	$sql = "UPDATE ".$db->sanitize($tabname[$id])." SET active = 0 WHERE rowid = ".((int) $rowid);
 	$result = $db->query($sql);
 	if (!$result) {
@@ -359,7 +329,7 @@ print load_fiche_titre($titre, $linkback, 'title_accountancy');
 
 // Confirmation de la suppression de la ligne
 if ($action == 'delete') {
-	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.urlencode((string) ($page)).'&' : '').'sortfield='.urlencode((string) ($sortfield)).'&sortorder='.urlencode((string) ($sortorder)).'&rowid='.urlencode((string) ($rowid)).'&code='.urlencode((string) ($code)).'&id='.urlencode((string) ($id)), $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
+	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);
 }
 
 
@@ -607,36 +577,34 @@ if ($resql) {
 					}
 				}
 
-				// Can an entry be erased or disabled ?
-				$iserasable = 1;
-				$canbedisabled = 1;
-				$canbemodified = 1; // true by default
+				// $url = $_SERVER["PHP_SELF"].'?token='.newToken().($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) : '');
+				// $url .= '&'.$param.'&';
 
-				$url = $_SERVER["PHP_SELF"].'?token='.newToken().($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) : '');
-				$url .= '&'.$param.'&';
+				$query = [];
+				// decode and add param to query
+				parse_str($param, $query);
+				$query = array_merge($query, [
+					'action' => '',
+					'page' => $page,
+					'sortfield' => $sortfield,
+					'sortorder' => $sortorder,
+					'rowid' => (!empty($obj->rowid) ? $obj->rowid : (!empty($obj->code) ? $obj->code : '')),
+					'code' => $obj->code,
+				]);
 
 				// Active
 				print '<td class="center nowrap">';
-				if ($canbedisabled) {
-					print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
-				} else {
-					print $langs->trans("AlwaysActive");
-				}
+				$query['action'] = $acts[$obj->active];
+				print '<a href="'.dolBuildUrl($_SERVER["PHP_SELF"], $query, true).'">'.$actl[$obj->active].'</a>';
 				print "</td>";
 
 				// Modify link
-				if ($canbemodified) {
-					print '<td class="center"><a class="reposition editfielda" href="'.$url.'action=edit&token='.newToken().'">'.img_edit().'</a></td>';
-				} else {
-					print '<td>&nbsp;</td>';
-				}
+				$query['action'] = 'edit';
+				print '<td class="center"><a class="reposition editfielda" href="'.dolBuildUrl($_SERVER["PHP_SELF"], $query, true).'">'.img_edit().'</a></td>';
 
 				// Delete link
-				if ($iserasable) {
-					print '<td class="center"><a href="'.$url.'action=delete&token='.newToken().'">'.img_delete().'</a></td>';
-				} else {
-					print '<td>&nbsp;</td>';
-				}
+				$query['action'] = 'delete';
+				print '<td class="center"><a href="'.dolBuildUrl($_SERVER["PHP_SELF"], $query, true).'">'.img_delete().'</a></td>';
 
 				print "</tr>\n";
 			}
@@ -700,16 +668,8 @@ function fieldListAccountModel($fieldlist, $obj = null, $tabname = '', $context
 				print '</td>';
 			}
 		} elseif ($fieldlist[$field] == 'type_cdr') {
-			if ($fieldlist[$field] == 'type_cdr') {
-				print '<td class="center">';
-			} else {
-				print '<td>';
-			}
-			if ($fieldlist[$field] == 'type_cdr') {
-				print $form->selectarray($fieldlist[$field], array(0 => $langs->trans('None'), 1 => $langs->trans('AtEndOfMonth'), 2 => $langs->trans('CurrentNext')), (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : ''));
-			} else {
-				print $form->selectyesno($fieldlist[$field], (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : ''), 1);
-			}
+			print '<td class="center">';
+			print $form->selectarray($fieldlist[$field], array(0 => $langs->trans('None'), 1 => $langs->trans('AtEndOfMonth'), 2 => $langs->trans('CurrentNext')), (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : ''));
 			print '</td>';
 		} elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
 			print '<td><input type="text" class="flat" value="'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '').'" size="10" name="'.$fieldlist[$field].'"></td>';

htdocs/accountancy/admin/card.php

@@ -1,9 +1,9 @@
 <?php
-/* Copyright (C) 2013-2014  Olivier Geffroy     <jeff@jeffinfo.com>
- * Copyright (C) 2013-2024  Alexandre Spangaro  <aspangaro@easya.solutions>
- * Copyright (C) 2014       Florian Henry       <florian.henry@open-concept.pro>
- * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
- * Copyright (C) 2025		MDW							<mdeweerd@users.noreply.github.com>
+/* Copyright (C) 2013-2014  Olivier Geffroy         <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2024  Alexandre Spangaro      <aspangaro@easya.solutions>
+ * 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>
  *
  * 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
@@ -77,7 +77,7 @@ if (GETPOST('cancel', 'alpha')) {
 	exit;
 }
 
-if ($action == 'add' && $user->hasRight('accounting', 'chartofaccount')) {
+if ($action == 'add' /* && $user->hasRight('accounting', 'chartofaccount') // already checked */) {
 	if (!$cancel) {
 		if (!$account_number) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountNumber")), null, 'errors');
@@ -132,7 +132,7 @@ if ($action == 'add' && $user->hasRight('accounting', 'chartofaccount')) {
 			}
 		}
 	}
-} elseif ($action == 'edit' && $user->hasRight('accounting', 'chartofaccount')) {
+} elseif ($action == 'edit' /* && $user->hasRight('accounting', 'chartofaccount') // already checked */) {
 	if (!$cancel) {
 		if (!$account_number) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountNumber")), null, 'errors');
@@ -245,7 +245,7 @@ if ($action == 'create') {
 	print '<td><input name="label" size="70" value="'.$object->label.'"></td></tr>';
 
 	// Label short
-	print '<tr><td>'.$langs->trans("LabelToShow").'</td>';
+	print '<tr><td>'.$langs->trans("ShortLabel").'</td>';
 	print '<td><input name="labelshort" size="70" value="'.$object->labelshort.'"></td></tr>';
 
 	// Account parent
@@ -314,15 +314,15 @@ if ($action == 'create') {
 
 			// Account number
 			print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("AccountNumber").'</span></td>';
-			print '<td><input name="account_number" size="30" value="'.$object->account_number.'"></td></tr>';
+			print '<td><input class="minwidth300" name="account_number" value="'.$object->account_number.'"></td></tr>';
 
 			// Label
 			print '<tr><td><span class="fieldrequired">'.$langs->trans("Label").'</span></td>';
-			print '<td><input name="label" size="70" value="'.$object->label.'"></td></tr>';
+			print '<td><input class="minwidth500" name="label" value="'.$object->label.'"></td></tr>';
 
 			// Label short
-			print '<tr><td>'.$langs->trans("LabelToShow").'</td>';
-			print '<td><input name="labelshort" size="70" value="'.$object->labelshort.'"></td></tr>';
+			print '<tr><td>'.$langs->trans("ShortLabel").'</td>';
+			print '<td><input class="minwidth300" name="labelshort" value="'.$object->labelshort.'"></td></tr>';
 
 			// Account parent
 			print '<tr><td>'.$langs->trans("Accountparent").'</td>';
@@ -386,7 +386,7 @@ if ($action == 'create') {
 			print '<td colspan="2">'.$object->label.'</td></tr>';
 
 			// Label to show
-			print '<tr><td class="titlefield">'.$langs->trans("LabelToShow").'</td>';
+			print '<tr><td class="titlefield">'.$langs->trans("ShortLabel").'</td>';
 			print '<td colspan="2">'.$object->labelshort.'</td></tr>';
 
 			// Account parent
@@ -419,11 +419,11 @@ if ($action == 'create') {
 			 */
 			print '<div class="tabsAction">';
 
-			if ($user->hasRight('accounting', 'chartofaccount')) {
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=update&token='.newToken().'&id='.$object->id.'">'.$langs->trans('Modify').'</a>';
-			} else {
-				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Modify').'</a>';
-			}
+			// if ($user->hasRight('accounting', 'chartofaccount')) { // already checked
+			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=update&token='.newToken().'&id='.$object->id.'">'.$langs->trans('Modify').'</a>';
+			// } else {
+			// 	print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Modify').'</a>';
+			// }
 
 			// Delete
 			$permissiontodelete = $user->hasRight('accounting', 'chartofaccount');

htdocs/accountancy/admin/categories_list.php

@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2004-2023  Laurent Destailleur      <eldy@users.sourceforge.net>
- * Copyright (C) 2011-2024  Alexandre Spangaro       <aspangaro@easya.solutions>
- * Copyright (C) 2024       Frédéric France             <frederic.france@free.fr>
+/* 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>
  *
  * This program is free software; you can redistribute it and/or modify

htdocs/accountancy/admin/defaultaccounts.php

@@ -7,6 +7,7 @@
  * Copyright (C) 2014		Juanjo Menent				<jmenent@2byte.es>
  * Copyright (C) 2015		Jean-François Ferry			<jfefe@aternatik.fr>
  * Copyright (C) 2024		Frédéric France             <frederic.france@free.fr>
+ * Copyright (C) 2025		Vincent de Grandporé        <vincent@de-grandpre.quebec>
  *
  * 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
@@ -102,9 +103,20 @@ $list_account[] = 'ACCOUNTING_VAT_BUY_ACCOUNT';
 
 $list_account[] = 'ACCOUNTING_VAT_PAY_ACCOUNT';
 
+$list_account[] = 'ACCOUNTING_LT1_SOLD_ACCOUNT';
+$list_account[] = 'ACCOUNTING_LT1_BUY_ACCOUNT';
+$list_account[] = 'ACCOUNTING_LT1_PAY_ACCOUNT';
+$list_account[] = 'ACCOUNTING_LT2_SOLD_ACCOUNT';
+$list_account[] = 'ACCOUNTING_LT2_BUY_ACCOUNT';
+$list_account[] = 'ACCOUNTING_LT2_PAY_ACCOUNT';
+
 if (getDolGlobalString('ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE')) {
 	$list_account[] = 'ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT';
 	$list_account[] = 'ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT';
+	$list_account[] = 'ACCOUNTING_LT1_BUY_REVERSE_CHARGES_CREDIT';
+	$list_account[] = 'ACCOUNTING_LT1_BUY_REVERSE_CHARGES_DEBIT';
+	$list_account[] = 'ACCOUNTING_LT2_BUY_REVERSE_CHARGES_CREDIT';
+	$list_account[] = 'ACCOUNTING_LT2_BUY_REVERSE_CHARGES_DEBIT';
 }
 if (isModEnabled('bank')) {
 	$list_account[] = 'ACCOUNTING_ACCOUNT_TRANSFER_CASH';
@@ -124,6 +136,11 @@ if (isModEnabled('loan')) {
 	$list_account[] = 'LOAN_ACCOUNTING_ACCOUNT_INSURANCE';
 }
 $list_account[] = 'ACCOUNTING_ACCOUNT_SUSPENSE';
+if (isModEnabled('invoice') || isModEnabled('supplier_invoice')) {
+	$list_account[] = '---Discounts---';
+	$list_account[] = 'ACCOUNTING_ACCOUNT_DISCOUNT_GRANTED';
+	$list_account[] = 'ACCOUNTING_ACCOUNT_DISCOUNT_RECEIVED';
+}
 if (isModEnabled('societe')) {
 	$list_account[] = '---Deposits---';
 }
@@ -280,8 +297,14 @@ foreach ($list_account as $key) {
 			print img_picto('', 'service', 'class="pictofixedwidth"');
 		} elseif (preg_match('/^ACCOUNTING_VAT_PAY_ACCOUNT/', $key)) {
 			print img_picto('', 'payment_vat', 'class="pictofixedwidth"');
+		} elseif (preg_match('/^ACCOUNTING_LT1_PAY_ACCOUNT/', $key)) {
+			print img_picto('', 'payment_vat', 'class="pictofixedwidth"');
+		} elseif (preg_match('/^ACCOUNTING_LT2_PAY_ACCOUNT/', $key)) {
+			print img_picto('', 'payment_vat', 'class="pictofixedwidth"');
 		} elseif (preg_match('/^ACCOUNTING_VAT/', $key)) {
 			print img_picto('', 'vat', 'class="pictofixedwidth"');
+		} elseif (preg_match('/^ACCOUNTING_LT/', $key)) {
+			print img_picto('', 'vat', 'class="pictofixedwidth"');
 		} elseif (preg_match('/^ACCOUNTING_ACCOUNT_CUSTOMER/', $key)) {
 			print img_picto('', 'bill', 'class="pictofixedwidth"');
 		} elseif (preg_match('/^LOAN_ACCOUNTING_ACCOUNT/', $key)) {

htdocs/accountancy/admin/fiscalyear.php

@@ -131,7 +131,7 @@ $nbtotalofrecords = '';
 if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > (int) $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
@@ -202,7 +202,7 @@ if ($result) {
 			if (getDolGlobalString('ACCOUNTANCY_FISCALYEAR_DEFAULT') == (int) $fiscalyearstatic->ref) {
 				print img_picto($langs->trans("Default"), 'on');
 			} else {
-				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdefault&token='.newToken().'&value='.urlencode($fiscalyearstatic->ref).'&label='.urlencode($fiscalyearstatic->label).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("SetAsDefault"), 'off').'</a>';
+				print '<a class="reposition" href="'.dolBuildUrl($_SERVER["PHP_SELF"], ['action' => 'setdefault', 'value' => $fiscalyearstatic->ref, 'label'=>$fiscalyearstatic->label], true).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("SetAsDefault"), 'off').'</a>';
 			}
 			print '</td>';
 

htdocs/accountancy/admin/fiscalyear_card.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2014-2024  Alexandre Spangaro  <aspangaro@easya.solutions>
- * Copyright (C) 2018-2024  Frédéric France     <frederic.france@free.fr>
+ * Copyright (C) 2018-2025  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2025		MDW					<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -82,7 +82,7 @@ $permissiontoadd = $user->hasRight('accounting', 'fiscalyear', 'write');
 if ($user->socid > 0) {
 	accessforbidden();
 }
-if (!$permissiontoadd) {
+if (!$permissiontoadd) { // after this test $permissiontoadd is always true
 	accessforbidden();
 }
 
@@ -97,7 +97,7 @@ if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 
-if ($action == 'confirm_delete' && $confirm == "yes" && $permissiontoadd) {
+if ($action == 'confirm_delete' && $confirm == "yes" /* && $permissiontoadd // always true */) {
 	$result = $object->delete($user);
 	if ($result >= 0) {
 		header("Location: fiscalyear.php");
@@ -105,7 +105,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $permissiontoadd) {
 	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
-} elseif ($action == 'add' && $permissiontoadd) {
+} elseif ($action == 'add' /* && $permissiontoadd // always true */) {
 	if (!GETPOST('cancel', 'alpha')) {
 		$error = 0;
 
@@ -147,7 +147,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $permissiontoadd) {
 		header("Location: ./fiscalyear.php");
 		exit();
 	}
-} elseif ($action == 'update' && $permissiontoadd) {
+} elseif ($action == 'update' /* && $permissiontoadd // always true */) {
 	// Update record
 	if (!GETPOST('cancel', 'alpha')) {
 		$result = $object->fetch($id);
@@ -169,7 +169,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $permissiontoadd) {
 		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 		exit();
 	}
-} elseif ($action == 'reopen' && $permissiontoadd && getDolGlobalString('ACCOUNTING_CAN_REOPEN_CLOSED_PERIOD')) {
+} elseif ($action == 'reopen' /* && $permissiontoadd // always true */ && getDolGlobalString('ACCOUNTING_CAN_REOPEN_CLOSED_PERIOD')) {
 	$result = $object->fetch($id);
 
 	$object->status = GETPOSTINT('status');
@@ -202,7 +202,7 @@ llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-accountancy page-fis
 if ($action == 'create') {
 	print load_fiche_titre($title, '', 'object_'.$object->picto);
 
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<form method="POST" action="'.dolBuildUrl($_SERVER["PHP_SELF"]).'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 
@@ -334,7 +334,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// ------------------------------------------------------------
 	$linkback = '<a href="'.DOL_URL_ROOT.'/accountancy/admin/fiscalyear.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	dol_banner_tab($object, 'label', $linkback, 1, 'label', 'label', $morehtmlref);
 
 
 	print '<div class="fichecenter">';
@@ -342,6 +342,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">'."\n";
 
+	// Id
+	print "<tr>";
+	print '<td class="titlefield">'.$langs->trans("Id").'</td><td>';
+	print $object->id;
+	print '</td></tr>';
+
 	// Label
 	print '<tr><td class="tdtop">';
 	print $form->editfieldkey("Label", 'label', $object->label, $object, 0, 'alpha:32');

htdocs/accountancy/admin/index.php

@@ -176,78 +176,100 @@ if ($action == 'updatemode') {
 	}
 }
 
-if ($action == 'update2') {
+if ($action == 'update') {
 	$error = 0;
 
-	if (!$error) {
-		foreach ($list as $constname) {
-			$constvalue = GETPOST($constname, 'alpha');
-			if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
-				$error++;
-			}
-		}
-		if ($error) {
-			setEventMessages($langs->trans("Error"), null, 'errors');
-		}
+	foreach ($list as $constname) {
+		$constvalue = GETPOST($constname, 'alpha');
 
-		// option in section binding
-		foreach ($list_binding as $constname) {
-			$constvalue = GETPOST($constname, 'alpha');
-
-			if ($constname == 'ACCOUNTING_DATE_START_BINDING') {
-				$constvalue = dol_mktime(0, 0, 0, GETPOSTINT($constname.'month'), GETPOSTINT($constname.'day'), GETPOSTINT($constname.'year'));
-			}
-
-			if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
-				$error++;
-			}
-		}
-
-		// options in section other
-		if (GETPOSTISSET('ACCOUNTING_LETTERING_NBLETTERS')) {
-			if (!dolibarr_set_const($db, 'ACCOUNTING_LETTERING_NBLETTERS', GETPOST('ACCOUNTING_LETTERING_NBLETTERS'), 'chaine', 0, '', $conf->entity)) {
-				$error++;
-			}
-		}
-
-		// Export options
-		$modelcsv = GETPOSTINT('ACCOUNTING_EXPORT_MODELCSV');
-
-		if (!empty($modelcsv)) {
-			if (!dolibarr_set_const($db, 'ACCOUNTING_EXPORT_MODELCSV', $modelcsv, 'chaine', 0, '', $conf->entity)) {
-				$error++;
-			}
-			//if ($modelcsv==AccountancyExport::$EXPORT_TYPE_QUADRATUS || $modelcsv==AccountancyExport::$EXPORT_TYPE_CIEL) {
-			//	dolibarr_set_const($db, 'ACCOUNTING_EXPORT_FORMAT', 'txt', 'chaine', 0, '', $conf->entity);
-			//}
-		} else {
+		if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
 			$error++;
 		}
+	}
 
-		foreach ($main_option as $constname) {
-			$constvalue = GETPOST($constname, 'alpha');
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+}
 
-			if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+if ($action == 'update_binding') {
+	$error = 0;
+
+	foreach ($list_binding as $constname) {
+		$constvalue = GETPOST($constname, 'alpha');
+
+		if ($constname == 'ACCOUNTING_DATE_START_BINDING') {
+			$constvalue = dol_mktime(0, 0, 0, GETPOSTINT($constname.'month'), GETPOSTINT($constname.'day'), GETPOSTINT($constname.'year'));
+		}
+
+		if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+			$error++;
+		}
+	}
+
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+}
+
+if ($action == 'update_advanced') {
+	$error = 0;
+
+	if (GETPOSTISSET('ACCOUNTING_LETTERING_NBLETTERS')) {
+		if (!dolibarr_set_const($db, 'ACCOUNTING_LETTERING_NBLETTERS', GETPOST('ACCOUNTING_LETTERING_NBLETTERS'), 'chaine', 0, '', $conf->entity)) {
+			$error++;
+		}
+	}
+
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+}
+
+if ($action == 'update_export') {
+	$error = 0;
+
+	// Export options
+	$modelcsv = GETPOSTINT('ACCOUNTING_EXPORT_MODELCSV');
+
+	// reload
+	$configuration = $accountancyexport->getTypeConfig();
+	$listparam = $configuration['param'];
+
+	if (!empty($modelcsv)) {
+		if (!dolibarr_set_const($db, 'ACCOUNTING_EXPORT_MODELCSV', $modelcsv, 'chaine', 0, '', $conf->entity)) {
+			$error++;
+		}
+		//if ($modelcsv==AccountancyExport::$EXPORT_TYPE_QUADRATUS || $modelcsv==AccountancyExport::$EXPORT_TYPE_CIEL) {
+		//	dolibarr_set_const($db, 'ACCOUNTING_EXPORT_FORMAT', 'txt', 'chaine', 0, '', $conf->entity);
+		//}
+	} else {
+		$error++;
+	}
+
+	foreach ($main_option as $constname) {
+		$constvalue = GETPOST($constname, 'alpha');
+
+		if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+			$error++;
+		}
+	}
+
+	foreach ($listparam[$modelcsv] as $key => $value) {
+		$constante = $key;
+
+		if (strpos($constante, 'ACCOUNTING') !== false) {
+			$constvalue = GETPOST($key, 'alpha');
+			if (!dolibarr_set_const($db, $constante, $constvalue, 'chaine', 0, '', $conf->entity)) {
 				$error++;
 			}
 		}
-
-		foreach ($listparam[$modelcsv] as $key => $value) {
-			$constante = $key;
-
-			if (strpos($constante, 'ACCOUNTING') !== false) {
-				$constvalue = GETPOST($key, 'alpha');
-				if (!dolibarr_set_const($db, $constante, $constvalue, 'chaine', 0, '', $conf->entity)) {
-					$error++;
-				}
-			}
-		}
-
-		if (!$error) {
-			// reload
-			$configuration = $accountancyexport->getTypeConfig();
-			$listparam = $configuration['param'];
-		}
 	}
 
 	if (!$error) {
@@ -313,6 +335,34 @@ if ($action == 'setdisablebindingonexpensereports') {
 	}
 }
 
+if ($action == 'setdisabletransferonassets') {
+	$setdisabletransferonassets = GETPOSTINT('value');
+	$res = dolibarr_set_const($db, "ACCOUNTING_DISABLE_TRANSFER_ON_ASSETS", $setdisabletransferonassets, 'yesno', 0, '', $conf->entity);
+	if (!($res > 0)) {
+		$error++;
+	}
+
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'mesgs');
+	}
+}
+
+if ($action == 'setdisabletransferondiscounts') {
+	$setdisabletransferondiscounts = GETPOSTINT('value');
+	$res = dolibarr_set_const($db, "ACCOUNTING_DISABLE_TRANSFER_ON_DISCOUNTS", $setdisabletransferondiscounts, 'yesno', 0, '', $conf->entity);
+	if (!($res > 0)) {
+		$error++;
+	}
+
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'mesgs');
+	}
+}
+
 if ($action == 'setenablelettering') {
 	$setenablelettering = GETPOSTINT('value');
 	$res = dolibarr_set_const($db, "ACCOUNTING_ENABLE_LETTERING", $setenablelettering, 'yesno', 0, '', $conf->entity);
@@ -456,19 +506,19 @@ if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1) {
 	print '</form>';
 
 
-	print '<br><br><br>';
+	print '<br><br>';
 }
 
 
 // Show form main options
 print $formSetup->generateOutput(true);
 
-print '<br><br><br>';
+print '<br><br>';
 
 
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="update2">';
+print '<input type="hidden" name="action" value="update_binding">';
 print '<input type="hidden" name="page_y" value="">';
 
 // Binding params
@@ -498,7 +548,7 @@ foreach ($list_binding as $key) {
 			1=>$langs->trans("ThirdPartyName") . ' - ' . $langs->trans("NumPiece"),
 			2=>$langs->trans("ThirdPartyName")
 		);
-		print $form->selectarray($key, $array, getDolGlobalInt('ACCOUNTING_LABEL_OPERATION_ON_TRANSFER', 0), 0, 0, 0, '', 0, 0, 0, '', 'onrightofpage width200');
+		print $form->selectarray($key, $array, getDolGlobalInt('ACCOUNTING_LABEL_OPERATION_ON_TRANSFER', 0), 0, 0, 0, '', 0, 0, 0, '', 'onrightofpage width300');
 	} else {
 		print '<input type="text" class="maxwidth100" id="'.$key.'" name="'.$key.'" value="'.getDolGlobalString($key).'">';
 	}
@@ -546,6 +596,32 @@ if (getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS')) {
 }
 print '</tr>';
 
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("ACCOUNTING_DISABLE_TRANSFER_ON_ASSETS").'</td>';
+if (getDolGlobalString('ACCOUNTING_DISABLE_TRANSFER_ON_ASSETS')) {
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setdisabletransferonassets&value=0">';
+	print img_picto($langs->trans("Activated"), 'switch_on', '', 0, 0, 0, '', 'warning');
+	print '</a></td>';
+} else {
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setdisabletransferonassets&value=1">';
+	print img_picto($langs->trans("Disabled"), 'switch_off');
+	print '</a></td>';
+}
+print '</tr>';
+
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("ACCOUNTING_DISABLE_TRANSFER_ON_DISCOUNTS").'</td>';
+if (getDolGlobalString('ACCOUNTING_DISABLE_TRANSFER_ON_DISCOUNTS')) {
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setdisabletransferondiscounts&value=0">';
+	print img_picto($langs->trans("Activated"), 'switch_on', '', 0, 0, 0, '', 'warning');
+	print '</a></td>';
+} else {
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&action=setdisabletransferondiscounts&value=1">';
+	print img_picto($langs->trans("Disabled"), 'switch_off');
+	print '</a></td>';
+}
+print '</tr>';
+
 if (!getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS')) {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("ACCOUNTANCY_ER_DATE_RECORD").'</td>';
@@ -577,7 +653,8 @@ print '</tr>';
 print '</table>';
 print '</div>';
 
-print '<div class="center"><input type="submit" class="button reposition" value="'.dol_escape_htmltag($langs->trans('Save')).'" name="button"></div>';
+print '<div class="center"><input type="submit" class="button button-edit reposition" name="button" value="'.dol_escape_htmltag($langs->trans('Save')).'"></div>';
+print '</form>';
 
 // Show numbering options
 print '<br><br>';
@@ -692,12 +769,17 @@ foreach ($arrayofmodules as $module) {
 }
 print '</table>';
 print '</div>';
-
+print '</form>';
 
 // Show advanced options
 print '<br><br>';
 
 // Advanced params
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="update_advanced">';
+print '<input type="hidden" name="page_y" value="">';
+
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
@@ -736,7 +818,7 @@ if (getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING')) {
 	print '<input class="flat right" name="ACCOUNTING_LETTERING_NBLETTERS" id="ACCOUNTING_LETTERING_NBLETTERS" value="' . $nbletter . '" type="number" step="1" min="2" max="3" >' . "\n";
 	print '</tr>';
 
-	// Auto Lettering when transfer in accountancy is realized
+	// Auto matching when transfer in accountancy is realized
 	print '<tr class="oddeven">';
 	print '<td>';
 	print $form->textwithpicto($langs->trans("ACCOUNTING_ENABLE_AUTOLETTERING"), $langs->trans("ACCOUNTING_ENABLE_AUTOLETTERING_DESC")) . '</td>';
@@ -785,11 +867,17 @@ print '</div>';
 
 
 print '<div class="center"><input type="submit" class="button button-edit reposition" name="button" value="'.$langs->trans('Save').'"></div>';
+print '</form>';
+
 
 print '<br><br>';
 
 
 // Export options
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="update_export">';
+print '<input type="hidden" name="page_y" value="">';
 
 print "\n".'<script type="text/javascript">'."\n";
 print 'jQuery(document).ready(function () {'."\n";
@@ -835,8 +923,6 @@ print '    });'."\n";
 print '})'."\n";
 print '</script>'."\n";
 
-// Main Options
-
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td colspan="2">'.$langs->trans('ExportOptions').'</td>';
@@ -898,7 +984,6 @@ if ($num2) {
 
 print '<div class="center"><input type="submit" class="button reposition" value="'.dol_escape_htmltag($langs->trans('Save')).'" name="button"></div>';
 
-
 print '</form>';
 
 // End of page

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       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
@@ -366,12 +366,9 @@ llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-accountancy page-adm
 
 $titre = $langs->trans("DictionarySetup");
 $linkback = '';
-if ($id) {
-	$titre .= ' - '.$langs->trans($tablib[$id]);
-	$titlepicto = 'title_accountancy';
-} else {
-	$titlepicto = '';
-}
+
+$titre .= ' - '.$langs->trans($tablib[$id]);
+$titlepicto = 'title_accountancy';
 
 print load_fiche_titre($titre, $linkback, $titlepicto);
 
@@ -384,309 +381,297 @@ if ($action == 'delete') {
 /*
  * Show a dictionary
  */
-if ($id) {
-	// Complete requete recherche valeurs avec critere de tri
-	$sql = $tabsql[$id];
-	$sql .= " WHERE a.entity = ".((int) $conf->entity);
 
-	// If sort order is "country", we use country_code instead
-	if ($sortfield == 'country') {
-		$sortfield = 'country_code';
-	}
-	$sql .= $db->order($sortfield, $sortorder);
-	$sql .= $db->plimit($listlimit + 1, $offset);
+// Complete requete recherche valeurs avec critere de tri
+$sql = $tabsql[$id];
+$sql .= " WHERE a.entity = ".((int) $conf->entity);
 
+// If sort order is "country", we use country_code instead
+if ($sortfield == 'country') {
+	$sortfield = 'country_code';
+}
+$sql .= $db->order($sortfield, $sortorder);
+$sql .= $db->plimit($listlimit + 1, $offset);
+
+$fieldlist = explode(',', $tabfield[$id]);
+
+print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
+
+print '<div class="div-table-responsive">';
+print '<table class="noborder centpercent">';
+
+// Form to add a new line
+if ($tabname[$id]) {
 	$fieldlist = explode(',', $tabfield[$id]);
 
-	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
+	// 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
+		$valuetoshow = ucfirst($fieldlist[$field]); // By default
+		$valuetoshow = $langs->trans($valuetoshow); // try to translate
+		$class = "left";
+		if ($fieldlist[$field] == 'code') {
+			$valuetoshow = $langs->trans("Code");
+		}
+		if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
+			$valuetoshow = $langs->trans("Label");
+		}
+		if ($fieldlist[$field] == 'nature') {
+			$valuetoshow = $langs->trans("NatureOfJournal");
+		}
 
-	print '<div class="div-table-responsive">';
-	print '<table class="noborder centpercent">';
-
-	// Form to add a new line
-	if ($tabname[$id]) {
-		$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
-			$valuetoshow = ucfirst($fieldlist[$field]); // By default
-			$valuetoshow = $langs->trans($valuetoshow); // try to translate
-			$class = "left";
-			if ($fieldlist[$field] == 'code') {
-				$valuetoshow = $langs->trans("Code");
-			}
-			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
-				$valuetoshow = $langs->trans("Label");
-			}
-			if ($fieldlist[$field] == 'nature') {
-				$valuetoshow = $langs->trans("NatureOfJournal");
+		if ($valuetoshow != '') {
+			print '<td class="'.$class.'">';
+			if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) {
+				print '<a href="'.$tabhelp[$id][$value].'">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
+			} elseif (!empty($tabhelp[$id][$value])) {
+				print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
+			} else {
+				print $valuetoshow;
 			}
+			print '</td>';
+		}
+	}
 
-			if ($valuetoshow != '') {
-				print '<td class="'.$class.'">';
-				if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) {
-					print '<a href="'.$tabhelp[$id][$value].'">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
-				} elseif (!empty($tabhelp[$id][$value])) {
-					print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
-				} else {
-					print $valuetoshow;
+	print '<td>';
+	print '<input type="hidden" name="id" value="'.$id.'">';
+	print '</td>';
+	print '<td></td>';
+	print '<td></td>';
+	print '<td></td>';
+	print '</tr>';
+
+	// Line to enter new values
+	print '<tr class="oddeven nodrag nodrop nohover">';
+
+	$obj = new stdClass();
+	// If data was already input, we define them in obj to populate input fields.
+	if (GETPOST('actionadd', 'alpha')) {
+		foreach ($fieldlist as $key => $val) {
+			if (GETPOST($val) != '') {
+				$obj->$val = GETPOST($val);
+			}
+		}
+	}
+
+	$tmpaction = 'create';
+	$parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
+	$reshook = $hookmanager->executeHooks('createDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+	$error = $hookmanager->error;
+	$errors = $hookmanager->errors;
+
+	if (empty($reshook)) {
+		fieldListJournal($fieldlist, $obj, $tabname[$id], 'add');
+	}
+
+	print '<td colspan="4" class="right">';
+	print '<input type="submit" class="button button-add" name="actionadd" value="'.$langs->trans("Add").'">';
+	print '</td>';
+	print "</tr>";
+
+	print '<tr><td colspan="7">&nbsp;</td></tr>'; // Keep &nbsp; to have a line with enough height
+}
+
+
+
+// List of available record in database
+dol_syslog("htdocs/admin/dict", LOG_DEBUG);
+$resql = $db->query($sql);
+if ($resql) {
+	$num = $db->num_rows($resql);
+	$i = 0;
+
+	$param = '&id='.((int) $id);
+	if ($search_country_id > 0) {
+		$param .= '&search_country_id='.urlencode((string) ($search_country_id));
+	}
+	$paramwithsearch = $param;
+	$paramwithsearch .= '&sortorder='.$sortorder;
+	$paramwithsearch .= '&sortfield='.$sortfield;
+
+	if (GETPOST('from', 'alpha')) {
+		$paramwithsearch .= '&from='.GETPOST('from', 'alpha');
+	}
+
+	// There is several pages
+	if ($num > $listlimit) {
+		print '<tr class="none"><td class="right" colspan="'.(3 + count($fieldlist)).'">';
+		print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit ? 1 : 0), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page + 1).'</span></li>');
+		print '</td></tr>';
+	}
+
+	// Title line with search boxes
+	/*print '<tr class="liste_titre_filter liste_titre_add">';
+	print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre center">';
+	$searchpicto=$form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+	print '</tr>';
+	*/
+
+	// 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
+		$class = "left";
+		$sortable = 1;
+		$valuetoshow = '';
+		/*
+		$tmparray=getLabelOfField($fieldlist[$field]);
+		$valuetoshow=$tmp['valuetoshow'];
+		$align=$tmp['align'];
+		$sortable=$tmp['sortable'];
+		*/
+		$valuetoshow = ucfirst($fieldlist[$field]); // By default
+		$valuetoshow = $langs->trans($valuetoshow); // try to translate
+		if ($fieldlist[$field] == 'code') {
+			$valuetoshow = $langs->trans("Code");
+		}
+		if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
+			$valuetoshow = $langs->trans("Label");
+		}
+		if ($fieldlist[$field] == 'nature') {
+			$valuetoshow = $langs->trans("NatureOfJournal");
+		}
+
+		// Affiche nom du champ
+		print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), $param, "", $sortfield, $sortorder, $class.' ');
+	}
+	print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page ? 'page='.$page.'&' : ''), $param, '', $sortfield, $sortorder, 'center ');
+	print getTitleFieldOfList('');
+	print getTitleFieldOfList('');
+	print getTitleFieldOfList('');
+	print '</tr>';
+
+	if ($num) {
+		// Lines with values
+		while ($i < $num) {
+			$obj = $db->fetch_object($resql);
+			//print_r($obj);
+			print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
+			if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code))) {
+				$tmpaction = 'edit';
+				$parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
+				$reshook = $hookmanager->executeHooks('editDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+				$error = $hookmanager->error;
+				$errors = $hookmanager->errors;
+
+				// Show fields
+				if (empty($reshook)) {
+					fieldListJournal($fieldlist, $obj, $tabname[$id], 'edit');
 				}
+
+				print '<td class="center" colspan="4">';
+				print '<input type="hidden" name="page" value="'.$page.'">';
+				print '<input type="hidden" name="rowid" value="'.$rowid.'">';
+				print '<input type="submit" class="button button-edit" name="actionmodify" value="'.$langs->trans("Modify").'">';
+				print '<input type="submit" class="button button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'">';
+				print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
+				print '</td>';
+			} else {
+				$tmpaction = 'view';
+				$parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
+				$reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+
+				$error = $hookmanager->error;
+				$errors = $hookmanager->errors;
+
+				if (empty($reshook)) {
+					$langs->load("accountancy");
+					foreach ($fieldlist as $field => $value) {
+						$class = "left";
+						$tmpvar = $fieldlist[$field];
+						$valuetoshow = $obj->$tmpvar;
+						if ($valuetoshow == 'all') {
+							$valuetoshow = $langs->trans('All');
+						} elseif ($fieldlist[$field] == 'nature' && $tabname[$id] == MAIN_DB_PREFIX.'accounting_journal') {
+							$key = $langs->trans("AccountingJournalType".strtoupper($obj->nature));
+							$valuetoshow = ($obj->nature && $key != "AccountingJournalType".strtoupper($langs->trans($obj->nature)) ? $key : $obj->{$fieldlist[$field]});
+						} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'accounting_journal') {
+							$valuetoshow = $langs->trans($obj->label);
+						}
+
+						$class = 'tddict';
+						// Show value for field
+						print '<!-- '.$fieldlist[$field].' --><td class="'.$class.'">'.dol_escape_htmltag($valuetoshow).'</td>';
+					}
+				}
+
+				// Can an entry be erased or disabled ?
+				$iserasable = 1;
+				$canbedisabled = 1;
+				$canbemodified = 1; // true by default
+				if (isset($obj->code) && $id != 10) {
+					if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i', $obj->code))) {
+						$iserasable = 0;
+						$canbedisabled = 0;
+					}
+				}
+
+				$canbemodified = $iserasable;
+
+				$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) : '');
+				$url .= '&'.$param;
+				$url .= '&';
+
+				// Active
+				print '<td class="nowrap center">';
+				if ($canbedisabled) {
+					print '<a href="'.$url.'action='.$acts[$obj->active].'&token='.newToken().'">'.$actl[$obj->active].'</a>';
+				} else {
+					print $langs->trans("AlwaysActive");
+				}
+				print "</td>";
+
+				// Modify link
+				if ($canbemodified) {
+					print '<td class="center"><a class="reposition editfielda" href="'.$url.'action=edit&token='.newToken().'">'.img_edit().'</a></td>';
+				} else {
+					print '<td>&nbsp;</td>';
+				}
+
+				// Delete link
+				if ($iserasable) {
+					print '<td class="center">';
+					if ($user->admin) {
+						print '<a href="'.$url.'action=delete&token='.newToken().'">'.img_delete().'</a>';
+					}
+					//else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
+					print '</td>';
+				} else {
+					print '<td>&nbsp;</td>';
+				}
+
+				print '<td></td>';
+
 				print '</td>';
 			}
+
+			print "</tr>\n";
+			$i++;
 		}
-
-		print '<td>';
-		print '<input type="hidden" name="id" value="'.$id.'">';
-		print '</td>';
-		print '<td></td>';
-		print '<td></td>';
-		print '<td></td>';
-		print '</tr>';
-
-		// Line to enter new values
-		print '<tr class="oddeven nodrag nodrop nohover">';
-
-		$obj = new stdClass();
-		// If data was already input, we define them in obj to populate input fields.
-		if (GETPOST('actionadd', 'alpha')) {
-			foreach ($fieldlist as $key => $val) {
-				if (GETPOST($val) != '') {
-					$obj->$val = GETPOST($val);
-				}
-			}
-		}
-
-		$tmpaction = 'create';
-		$parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
-		$reshook = $hookmanager->executeHooks('createDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
-		$error = $hookmanager->error;
-		$errors = $hookmanager->errors;
-
-		if (empty($reshook)) {
-			fieldListJournal($fieldlist, $obj, $tabname[$id], 'add');
-		}
-
-		print '<td colspan="4" class="right">';
-		print '<input type="submit" class="button button-add" name="actionadd" value="'.$langs->trans("Add").'">';
-		print '</td>';
-		print "</tr>";
-
-		print '<tr><td colspan="7">&nbsp;</td></tr>'; // Keep &nbsp; to have a line with enough height
 	}
-
-
-
-	// List of available record in database
-	dol_syslog("htdocs/admin/dict", LOG_DEBUG);
-	$resql = $db->query($sql);
-	if ($resql) {
-		$num = $db->num_rows($resql);
-		$i = 0;
-
-		$param = '&id='.((int) $id);
-		if ($search_country_id > 0) {
-			$param .= '&search_country_id='.urlencode((string) ($search_country_id));
-		}
-		$paramwithsearch = $param;
-		if ($sortorder) {
-			$paramwithsearch .= '&sortorder='.$sortorder;
-		}
-		if ($sortfield) {
-			$paramwithsearch .= '&sortfield='.$sortfield;
-		}
-		if (GETPOST('from', 'alpha')) {
-			$paramwithsearch .= '&from='.GETPOST('from', 'alpha');
-		}
-
-		// There is several pages
-		if ($num > $listlimit) {
-			print '<tr class="none"><td class="right" colspan="'.(3 + count($fieldlist)).'">';
-			print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit ? 1 : 0), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page + 1).'</span></li>');
-			print '</td></tr>';
-		}
-
-		// Title line with search boxes
-		/*print '<tr class="liste_titre_filter liste_titre_add">';
-		print '<td class="liste_titre"></td>';
-		print '<td class="liste_titre"></td>';
-		print '<td class="liste_titre"></td>';
-		print '<td class="liste_titre"></td>';
-		print '<td class="liste_titre"></td>';
-		print '<td class="liste_titre"></td>';
-		print '<td class="liste_titre center">';
-		$searchpicto=$form->showFilterButtons();
-		print $searchpicto;
-		print '</td>';
-		print '</tr>';
-		*/
-
-		// 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
-			$showfield = 1; // By default
-			$class = "left";
-			$sortable = 1;
-			$valuetoshow = '';
-			/*
-			$tmparray=getLabelOfField($fieldlist[$field]);
-			$showfield=$tmp['showfield'];
-			$valuetoshow=$tmp['valuetoshow'];
-			$align=$tmp['align'];
-			$sortable=$tmp['sortable'];
-			*/
-			$valuetoshow = ucfirst($fieldlist[$field]); // By default
-			$valuetoshow = $langs->trans($valuetoshow); // try to translate
-			if ($fieldlist[$field] == 'code') {
-				$valuetoshow = $langs->trans("Code");
-			}
-			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
-				$valuetoshow = $langs->trans("Label");
-			}
-			if ($fieldlist[$field] == 'nature') {
-				$valuetoshow = $langs->trans("NatureOfJournal");
-			}
-
-			// Affiche nom du champ
-			if ($showfield) {
-				print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), $param, "", $sortfield, $sortorder, $class.' ');
-			}
-		}
-		print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page ? 'page='.$page.'&' : ''), $param, '', $sortfield, $sortorder, 'center ');
-		print getTitleFieldOfList('');
-		print getTitleFieldOfList('');
-		print getTitleFieldOfList('');
-		print '</tr>';
-
-		if ($num) {
-			// Lines with values
-			while ($i < $num) {
-				$obj = $db->fetch_object($resql);
-				//print_r($obj);
-				print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
-				if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code))) {
-					$tmpaction = 'edit';
-					$parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
-					$reshook = $hookmanager->executeHooks('editDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
-					$error = $hookmanager->error;
-					$errors = $hookmanager->errors;
-
-					// Show fields
-					if (empty($reshook)) {
-						fieldListJournal($fieldlist, $obj, $tabname[$id], 'edit');
-					}
-
-					print '<td class="center" colspan="4">';
-					print '<input type="hidden" name="page" value="'.$page.'">';
-					print '<input type="hidden" name="rowid" value="'.$rowid.'">';
-					print '<input type="submit" class="button button-edit" name="actionmodify" value="'.$langs->trans("Modify").'">';
-					print '<input type="submit" class="button button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'">';
-					print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
-					print '</td>';
-				} else {
-					$tmpaction = 'view';
-					$parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]);
-					$reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
-
-					$error = $hookmanager->error;
-					$errors = $hookmanager->errors;
-
-					if (empty($reshook)) {
-						$langs->load("accountancy");
-						foreach ($fieldlist as $field => $value) {
-							$showfield = 1;
-							$class = "left";
-							$tmpvar = $fieldlist[$field];
-							$valuetoshow = $obj->$tmpvar;
-							if ($valuetoshow == 'all') {
-								$valuetoshow = $langs->trans('All');
-							} elseif ($fieldlist[$field] == 'nature' && $tabname[$id] == MAIN_DB_PREFIX.'accounting_journal') {
-								$key = $langs->trans("AccountingJournalType".strtoupper($obj->nature));
-								$valuetoshow = ($obj->nature && $key != "AccountingJournalType".strtoupper($langs->trans($obj->nature)) ? $key : $obj->{$fieldlist[$field]});
-							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'accounting_journal') {
-								$valuetoshow = $langs->trans($obj->label);
-							}
-
-							$class = 'tddict';
-							// Show value for field
-							if ($showfield) {
-								print '<!-- '.$fieldlist[$field].' --><td class="'.$class.'">'.dol_escape_htmltag($valuetoshow).'</td>';
-							}
-						}
-					}
-
-					// Can an entry be erased or disabled ?
-					$iserasable = 1;
-					$canbedisabled = 1;
-					$canbemodified = 1; // true by default
-					if (isset($obj->code) && $id != 10) {
-						if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i', $obj->code))) {
-							$iserasable = 0;
-							$canbedisabled = 0;
-						}
-					}
-
-					$canbemodified = $iserasable;
-
-					$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 .= '&';
-
-					// Active
-					print '<td class="nowrap center">';
-					if ($canbedisabled) {
-						print '<a href="'.$url.'action='.$acts[$obj->active].'&token='.newToken().'">'.$actl[$obj->active].'</a>';
-					} else {
-						print $langs->trans("AlwaysActive");
-					}
-					print "</td>";
-
-					// Modify link
-					if ($canbemodified) {
-						print '<td class="center"><a class="reposition editfielda" href="'.$url.'action=edit&token='.newToken().'">'.img_edit().'</a></td>';
-					} else {
-						print '<td>&nbsp;</td>';
-					}
-
-					// Delete link
-					if ($iserasable) {
-						print '<td class="center">';
-						if ($user->admin) {
-							print '<a href="'.$url.'action=delete&token='.newToken().'">'.img_delete().'</a>';
-						}
-						//else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
-						print '</td>';
-					} else {
-						print '<td>&nbsp;</td>';
-					}
-
-					print '<td></td>';
-
-					print '</td>';
-				}
-
-				print "</tr>\n";
-				$i++;
-			}
-		}
-	} else {
-		dol_print_error($db);
-	}
-
-	print '</table>';
-	print '</div>';
-
-	print '</form>';
+} else {
+	dol_print_error($db);
 }
 
+print '</table>';
+print '</div>';
+
+print '</form>';
+
+
 print '<br>';
 
 // End of page

htdocs/accountancy/admin/productaccount.php

@@ -28,6 +28,14 @@
  * \brief		To define accounting account on product / service
  */
 require '../../main.inc.php';
+/**
+ * @var Conf $conf
+ * @var DoliDB $db
+ * @var HookManager $hookmanager
+ * @var Societe $mysoc
+ * @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.formcategory.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
@@ -39,15 +47,6 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
-/**
- * @var Conf $conf
- * @var DoliDB $db
- * @var HookManager $hookmanager
- * @var Societe $mysoc
- * @var Translate $langs
- * @var User $user
- */
-
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "compta", "accountancy", "products"));
 
@@ -199,15 +198,13 @@ if ($action == 'update' && $permissiontobind) {
 	}
 
 	if (!empty($toselect) && $massaction === 'changeaccount') {
-		//$msg = '<div><span class="accountingprocessing">' . $langs->trans("Processing") . '...</span></div>';
 		$ok = 0;
 		$ko = 0;
 		$msg = '';
 		$sql = '';
-		if (!empty($toselect) && in_array($accounting_product_mode, $accounting_product_modes)) {
+		if (!empty($toselect) && in_array($accounting_product_mode, $accounting_product_modes)) {	// @phpstan-ignore-line Bug phpstan thinking that empty(array()) is always true
 			$accounting = new AccountingAccount($db);
 
-			//$msg .= '<div><span class="accountingprocessing">' . count($toselect) . ' ' . $langs->trans("SelectedLines") . '</span></div>';
 			$arrayofdifferentselectedvalues = array();
 
 			$cpt = 0;
@@ -424,7 +421,7 @@ $nbtotalofrecords = '';
 if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
 	$resql = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($resql);
-	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > (int) $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}

htdocs/accountancy/admin/subaccount.php

@@ -2,7 +2,7 @@
 /* Copyright (C) 2013-2016  Olivier Geffroy         <jeff@jeffinfo.com>
  * Copyright (C) 2013-2024  Alexandre Spangaro      <aspangaro@easya.solutions>
  * Copyright (C) 2016-2018  Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2024       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2024-2025  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2025		MDW						<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -41,15 +41,16 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array("accountancy", "admin", "bills", "compta", "errors", "hrm", "salaries"));
 
-$mesg = '';
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
-$id = GETPOSTINT('id');
-$rowid = GETPOSTINT('rowid');
+
 $massaction = GETPOST('massaction', 'aZ09');
 $optioncss = GETPOST('optioncss', 'alpha');
 $mode = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
-$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'accountingsubaccountlist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search
+
+$id = GETPOSTINT('id');
+$rowid = GETPOSTINT('rowid');
 
 $search_subaccount = GETPOST('search_subaccount', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
@@ -298,7 +299,7 @@ $nbtotalofrecords = '';
 if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
 	$resql = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($resql);
-	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > (int) $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
@@ -335,7 +336,7 @@ if ($resql) {
 	// List of mass actions available
 	$arrayofmassactions = array();
 
-	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<form method="POST" id="searchFormList" action="'.dolBuildUrl($_SERVER["PHP_SELF"]).'">';
 	if ($optioncss != '') {
 		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	}

htdocs/accountancy/bookkeeping/balance.php

@@ -2,7 +2,7 @@
 /* Copyright (C) 2016       Olivier Geffroy         <jeff@jeffinfo.com>
  * Copyright (C) 2016       Florian Henry           <florian.henry@open-concept.pro>
  * Copyright (C) 2016-2025  Alexandre Spangaro      <alexandre@inovea-conseil.com>
- * Copyright (C) 2018-2024  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2018-2025  Frédéric France         <frederic.france@free.fr>
  * Copyright (C) 2024       MDW                     <mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -318,7 +318,7 @@ if ($action != 'export') {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 
-	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<form method="POST" id="searchFormList" action="'.dolBuildUrl($_SERVER["PHP_SELF"]).'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" id="action" value="list">';
 	print '<input type="hidden" name="export_type" id="export_type" value="">';
@@ -352,7 +352,7 @@ if ($action != 'export') {
 			$newcardbutton .= dolGetButtonTitle($langs->trans('AccountBalance')." - ".$langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/balance.php?type=sub' . $url_param, '', 1, array('morecss' => 'marginleftonly'));
 		}
 
-		$newcardbutton .= dolGetButtonTitle($langs->trans('ExportToCsv'), '', 'fa fa-file-csv paddingleft', $_SERVER['PHP_SELF'], 'exportcsvbutton', 1, array('morecss' => 'marginleftonly'));
+		$newcardbutton .= dolGetButtonTitle($langs->trans("Export").' (' . getDolGlobalString('ACCOUNTING_EXPORT_FORMAT').')', '', 'fa fa-file-csv paddingleft', $_SERVER['PHP_SELF'], 'exportcsvbutton', 1, array('morecss' => 'marginleftonly'));
 
 		print '<script type="text/javascript">
 		jQuery(document).ready(function() {

htdocs/accountancy/bookkeeping/card.php

@@ -198,6 +198,11 @@ if (empty($reshook)) {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("AccountAccountingShort")), null, 'errors');
 			$action = '';
 		}
+		$subledger_account_str = is_array($subledger_account) ? reset($subledger_account) : (string) $subledger_account;
+		if (!checkGeneralAccountAllowsAuxiliary($db, $accountingaccount_number, $subledger_account_str)) {
+			$error++;
+			setEventMessages($langs->trans("ErrorAccountNotCentralized"). ". " . $langs->trans("RemoveSubsidiaryAccountOrAdjustTheGeneralAccount"), null, 'errors');
+		}
 
 		if (!$error) {
 			if (GETPOSTINT('doc_datemonth') && GETPOSTINT('doc_dateday') && GETPOSTINT('doc_dateyear')) {
@@ -446,44 +451,14 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'clonebookkeepingwriting' && $permissiontoadd) {
+	if ($action == 'clonebookkeepingwriting' && $confirm == "yes" && $permissiontoadd) {
+		// Reread the values sent by the validated form
 		$piece_num = GETPOST('piece_num', 'alpha');
-		$formaccounting = new FormAccounting($db);
+		$journal_code = GETPOST('code_journal', 'alpha');
 
-		$form = new Form($db);
-		$input1 = $form->selectDate('', 'clonedate', 0, 0, 0, "create_mvt", 1, 1);
-		$input2 = $formaccounting->select_journal($journal_code, 'code_journal', 0, 0, 1, 1).'</td>';
-		$inputHidden = '<input type="hidden" name="piece_num_hidden" id="piece_num_hidden" value="'.$piece_num.'">';
+		// Reconstruct the selected date
+		$clonedate = dol_mktime(0, 0, 0, GETPOSTINT('clonedatemonth'), GETPOSTINT('clonedateday'), GETPOSTINT('clonedateyear'));
 
-		$formquestion = array(
-			array(
-				'type' => 'date',
-				'name' => 'clonedate',
-				'label' => '<span class="fieldrequired">' . $langs->trans("Docdate") . '</span>',
-				'value' => $input1
-			)
-		);
-
-		if (getDolGlobalString('ACCOUNTING_CLONING_ENABLE_INPUT_JOURNAL')) {
-			$formquestion[] = array(
-				'type' => 'text',
-				'name' => 'code_journal',
-				'label' => '<span class="fieldrequired">' . $langs->trans("Codejournal") . '</span>',
-				'value' => $input2
-			);
-		}
-
-		print $form->formconfirm(
-			$_SERVER["PHP_SELF"],
-			$langs->trans("ConfirmMassCloneBookkeepingWriting"),
-			$langs->trans("ConfirmMassCloneBookkeepingWritingQuestion", count($toselect)),
-			"clonebookkeepingwriting",
-			$formquestion,
-			'', 0, 300, 1000, 1
-		);
-	}
-
-	if ($action == 'preclonebookkeepingwriting' && $confirm == "yes" && $permissiontoadd) {
 		$result = $object->newClone($piece_num, $journal_code, $clonedate);
 
 		if ($result == -1) {
@@ -492,7 +467,7 @@ if (empty($reshook)) {
 
 		if (!$error) {
 			$db->commit();
-			header("Location: " . $_SERVER['PHP_SELF'] . "?piece_num=" . $object->getNextNumMvt() - 1);
+			header("Location: " . $_SERVER['PHP_SELF'] . "?piece_num=" . ($object->getNextNumMvt() - 1));
 			exit();
 		} else {
 			$db->rollback();
@@ -520,6 +495,29 @@ if ($action == 'delete') {
 	print $formconfirm;
 }
 
+// Update fields properties in realtime
+if (!empty($conf->use_javascript_ajax)) {
+	print "\n" . '<script type="text/javascript">';
+	print '$(document).ready(function () {
+			function toggleSubledger() {
+				var isCentral = $("#accountingaccount_number option:selected").data("centralized");
+				console.log("the selected general ledger account is centralised?", isCentral);
+				if (isCentral) {
+					$("#subledger_account, #subledger_label").prop("disabled", false);
+				} else {
+					$("#subledger_account, #subledger_label").prop("disabled", true);
+				}
+			}
+
+			toggleSubledger();
+
+			$("#accountingaccount_number").on("change", toggleSubledger);
+			$("#accountingaccount_number").on("select2:select", toggleSubledger);
+		';
+	print '	});' . "\n";
+	print '	</script>' . "\n";
+}
+
 if ($action == 'create') {
 	print load_fiche_titre($title);
 
@@ -606,12 +604,7 @@ if ($action == 'create') {
 			print load_fiche_titre($langs->trans("UpdateMvts"), $backlink);
 		}*/
 
-		$head = array();
-		$h = 0;
-		$head[$h][0] = DOL_URL_ROOT."/accountancy/bookkeeping/card.php".'?piece_num='.((int) $object->piece_num).($mode ? '&mode='.$mode : '').($type ? '&type='.$type : '').'&backtopage='.urlencode($backtopage);
-		$head[$h][1] = $langs->trans("Transaction");
-		$head[$h][2] = 'transaction';
-		$h++;
+		$head = accounting_transaction_prepare_head($object, $mode, $type, $backtopage);
 
 		print dol_get_fiche_head($head, 'transaction', '', -1);
 
@@ -629,6 +622,46 @@ if ($action == 'create') {
 
 		dol_banner_tab($object, 'ref', $backlink, 1, 'piece_num', 'piece_num', $morehtmlref);
 
+
+		if ($action == 'clonebookkeepingwriting' && $confirm != 'yes' && $permissiontoadd) {
+			$piece_num = GETPOST('piece_num', 'alpha');
+			$formaccounting = new FormAccounting($db);
+
+			$form = new Form($db);
+			$input1 = $form->selectDate('', 'clonedate', 0, 0, 0, "", 1, 1);
+			$input2 = $formaccounting->select_journal($journal_code, 'code_journal', 0, 0, 1, 1);
+
+			$formquestion = array(
+				array(
+					'type' => 'other',
+					'name' => 'clonedate',
+					'label' => '<span class="fieldrequired">' . $langs->trans("Docdate") . '</span>',
+					'value' => $input1
+				)
+			);
+
+			$formquestion[] = array('type' => 'hidden', 'name' => 'piece_num', 'value' => $piece_num);
+
+			if (getDolGlobalString('ACCOUNTING_CLONING_ENABLE_INPUT_JOURNAL')) {
+				$formquestion[] = array(
+					'type' => 'text',
+					'name' => 'code_journal',
+					'label' => '<span class="fieldrequired">' . $langs->trans("Codejournal") . '</span>',
+					'value' => $input2
+				);
+			}
+
+			print $form->formconfirm(
+				$_SERVER["PHP_SELF"],
+				$langs->trans("ConfirmMassCloneBookkeepingWriting"),
+				$langs->trans("ConfirmMassCloneBookkeepingWritingQuestion", 1),
+				"clonebookkeepingwriting",
+				$formquestion,
+				'', 0, 300, 1000, 0
+			);
+		}
+
+
 		print '<div class="fichecenter">';
 
 		print '<div class="fichehalfleft">';
@@ -1001,7 +1034,7 @@ if ($action == 'create') {
 							print '<input type="text" class="maxwidth150" name="subledger_account" value="'.(GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account).'" placeholder="'.dol_escape_htmltag($langs->trans("SubledgerAccount")).'">';
 						}
 						// Add also input for subledger label
-						print '<br><input type="text" class="maxwidth150" name="subledger_label" value="'.(GETPOSTISSET("subledger_label") ? GETPOST("subledger_label", "alpha") : $line->subledger_label).'" placeholder="'.dol_escape_htmltag($langs->trans("SubledgerAccountLabel")).'">';
+						print '<br><input type="text" class="maxwidth150" name="subledger_label" id="subledger_label" value="'.(GETPOSTISSET("subledger_label") ? GETPOST("subledger_label", "alpha") : $line->subledger_label).'" placeholder="'.dol_escape_htmltag($langs->trans("SubledgerAccountLabel")).'">';
 						print '</td>';
 						print '<td><input type="text" class="minwidth200" name="label_operation" value="'.(GETPOSTISSET("label_operation") ? GETPOST("label_operation", "alpha") : $line->label_operation).'"></td>';
 						print '<td class="right"><input type="text" class="right width50" name="debit" value="'.(GETPOSTISSET("debit") ? GETPOST("debit", "alpha") : price($line->debit)).'"></td>';
@@ -1028,7 +1061,7 @@ if ($action == 'create') {
 							} else {
 								print '<input type="text" class="maxwidth150" name="subledger_account" value="" placeholder="' . dol_escape_htmltag($langs->trans("SubledgerAccount")) . '">';
 							}
-							print '<br><input type="text" class="maxwidth150" name="subledger_label" value="" placeholder="' . dol_escape_htmltag($langs->trans("SubledgerAccountLabel")) . '">';
+							print '<br><input type="text" class="maxwidth150" name="subledger_label" id="subledger_label" value="" placeholder="' . dol_escape_htmltag($langs->trans("SubledgerAccountLabel")) . '">';
 							print '</td>';
 							print '<td><input type="text" class="minwidth200" name="label_operation" value="' . dol_escape_htmltag($label_operation) . '"/></td>';
 							print '<td class="right"><input type="text" class="right width50" name="debit" value=""/></td>';

htdocs/accountancy/bookkeeping/export.php

@@ -55,7 +55,7 @@ $langs->loadLangs(array("accountancy", "compta"));
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
-$toselect = GETPOST('toselect', 'array');
+$toselect = GETPOST('toselect', 'array:int');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'bookkeepinglist';
 
 $socid = GETPOSTINT('socid');
@@ -764,7 +764,7 @@ if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
 		dol_print_error($db);
 	}
 
-	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > (int) $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
@@ -877,7 +877,7 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction($massaction, $arrayofmassactions);
 
-print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+print '<form method="POST" id="searchFormList" action="'.dolBuildUrl($_SERVER["PHP_SELF"]).'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="list">';
 if ($optioncss != '') {
@@ -1046,7 +1046,7 @@ if (!empty($arrayfields['t.credit']['checked'])) {
 	print '<input type="text" class="flat" name="search_credit" size="4" value="'.dol_escape_htmltag($search_credit).'">';
 	print '</td>';
 }
-// Lettering code
+// Matching code
 if (!empty($arrayfields['t.lettering_code']['checked'])) {
 	print '<td class="liste_titre center">';
 	print '<input type="text" size="3" class="flat" name="search_lettering_code" value="'.dol_escape_htmltag($search_lettering_code).'"/>';
@@ -1399,7 +1399,7 @@ while ($i < min($num, $limit)) {
 		$totalarray['val']['totalcredit'] += $line->credit;
 	}
 
-	// Lettering code
+	// Matching code
 	if (!empty($arrayfields['t.lettering_code']['checked'])) {
 		print '<td class="center">'.$line->lettering_code.'</td>';
 		if (!$i) {

htdocs/accountancy/bookkeeping/list.php

@@ -63,8 +63,8 @@ $massdate = dol_mktime(0, 0, 0, GETPOSTINT('massdatemonth'), GETPOSTINT('massdat
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
-$toselect = GETPOST('toselect', 'array');
-$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'bookkeepinglist';
+$toselect = GETPOST('toselect', 'array:int');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php'));
 
 // Search Parameters
 $search_mvt_num = GETPOST('search_mvt_num', 'alpha');
@@ -785,7 +785,7 @@ if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
 		dol_print_error($db);
 	}
 
-	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > (int) $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
@@ -853,7 +853,7 @@ if (GETPOSTINT('nomassaction') || in_array($massaction, array('preunletteringaut
 }
 $massactionbutton = $form->selectMassAction($massaction, $arrayofmassactions);
 
-print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+print '<form method="POST" id="searchFormList" action="'.dolBuildUrl($_SERVER["PHP_SELF"]).'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="list">';
 if ($optioncss != '') {
@@ -1055,7 +1055,7 @@ if (!empty($arrayfields['t.credit']['checked'])) {
 	print '<input type="text" class="flat" name="search_credit" size="4" value="'.dol_escape_htmltag($search_credit).'">';
 	print '</td>';
 }
-// Lettering code
+// Matching code
 if (!empty($arrayfields['t.lettering_code']['checked'])) {
 	print '<td class="liste_titre center">';
 	print '<input type="text" size="3" class="flat" name="search_lettering_code" value="'.dol_escape_htmltag($search_lettering_code).'"/>';
@@ -1306,6 +1306,7 @@ while ($i < min($num, $limit)) {
 	// Document ref
 	$modulepart = '';	// may be used by include*.tpl.php
 	if (!empty($arrayfields['t.doc_ref']['checked'])) {
+		$documentlink = '';
 		$objectstatic = null;
 
 		if ($line->doc_type === 'customer_invoice') {
@@ -1317,7 +1318,7 @@ while ($i < min($num, $limit)) {
 			//$modulepart = 'facture';
 
 			$filename = dol_sanitizeFileName($line->doc_ref);
-			$filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
+			$filedir = $conf->invoice->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
 			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
 			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
 		} elseif ($line->doc_type === 'supplier_invoice') {
@@ -1436,7 +1437,7 @@ while ($i < min($num, $limit)) {
 		$totalarray['val']['totalcredit'] += $line->credit;
 	}
 
-	// Lettering code
+	// Matching code
 	if (!empty($arrayfields['t.lettering_code']['checked'])) {
 		print '<td class="center">'.$line->lettering_code.'</td>';
 		if (!$i) {

htdocs/accountancy/bookkeeping/listbyaccount.php

@@ -3,7 +3,7 @@
  * 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) 2018-2024	Frédéric France			<frederic.france@free.fr>
+ * 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>
  *
@@ -60,7 +60,7 @@ $socid = GETPOSTINT('socid');
 $mode = (GETPOST('mode', 'alpha') ? GETPOST('mode', 'alpha') : 'customer'); // Only for tab view
 $massaction = GETPOST('massaction', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
-$toselect = GETPOST('toselect', 'array');
+$toselect = GETPOST('toselect', 'array:int');
 $type = GETPOST('type', 'alpha');
 if ($type == 'sub') {
 	$context_default = 'bookkeepingbysubaccountlist';
@@ -463,11 +463,17 @@ if (empty($reshook)) {
 
 	// Actions
 	if ($action === 'exporttopdf' && $permissiontoadd) {
-		$object->fetchAllByAccount($sortorder, $sortfield, 0, 0, $filter);
+		if ($type == "sub") {
+			$object->fetchAllByAccount($sortorder, $sortfield, 0, 0, $filter, 'AND', 1);
+		} else {
+			$object->fetchAllByAccount($sortorder, $sortfield, 0, 0, $filter);
+		}
 		require_once DOL_DOCUMENT_ROOT . '/core/modules/accountancy/doc/pdf_ledger.modules.php';
 		$pdf = new pdf_ledger($db);
 		$pdf->fromDate = $search_date_start;
 		$pdf->toDate = $search_date_end;
+		$pdf->ledgerType = $type;
+
 		$result = $pdf->write_file($object, $langs);
 
 		if ($result < 0) {
@@ -860,7 +866,7 @@ if (GETPOSTINT('nomassaction') || in_array($massaction, array('preunletteringaut
 }
 $massactionbutton = $form->selectMassAction($massaction, $arrayofmassactions);
 
-print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+print '<form method="POST" id="searchFormList" action="'.dolBuildUrl($_SERVER["PHP_SELF"]).'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="list">';
 if ($optioncss != '') {
@@ -895,14 +901,14 @@ if (empty($reshook)) {
 			$newcardbutton .= dolGetButtonTitle($langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?type=sub&' . $url_param, '', 1, array('morecss' => 'marginleftonly'));
 		}
 	}
-	$newcardbutton .= dolGetButtonTitle($langs->trans('ExportToPdf'), '', 'fa fa-file-pdf paddingleft', $_SERVER['PHP_SELF'] . '?action=exporttopdf&' . $url_param, '', 1, array('morecss' => 'marginleftonly'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ExportToPdf'), '', 'fa fa-file-pdf paddingleft', $_SERVER['PHP_SELF'] . '?action=exporttopdf'.(!empty($type) ? '&type=sub' : '').'&' . $url_param, '', 1, array('morecss' => 'marginleftonly'));
 
 	$newcardbutton .= dolGetButtonTitleSeparator();
 
 	$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=create'.(!empty($type) ? '&type=sub' : '').'&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
 }
 
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+if ($contextpage != $_SERVER["PHP_SELF"]) {
 	$param .= '&contextpage='.urlencode($contextpage);
 }
 if ($limit > 0 && $limit != $conf->liste_limit) {
@@ -1004,16 +1010,8 @@ if ($type == 'sub') {
 }
 
 if (empty($socid)) {
-	$stringforfirstkey = $langs->trans("KeyboardShortcut");
-	if ($conf->browser->name == 'chrome') {
-		$stringforfirstkey .= ' ALT +';
-	} elseif ($conf->browser->name == 'firefox') {
-		$stringforfirstkey .= ' ALT + SHIFT +';
-	} else {
-		$stringforfirstkey .= ' CTL +';
-	}
-	$moreforfilter .= '&nbsp;&nbsp;&nbsp;<a id="previous_account" accesskey="p" title="' . $stringforfirstkey . ' p" class="classfortooltip" href="#"><i class="fa fa-chevron-left"></i></a>';
-	$moreforfilter .= '&nbsp;&nbsp;&nbsp;<a id="next_account" accesskey="n" title="' . $stringforfirstkey . ' n" class="classfortooltip" href="#"><i class="fa fa-chevron-right"></i></a>';
+	$moreforfilter .= '&nbsp;&nbsp;&nbsp;<a id="previous_account" accesskey="p" title="' . $conf->browser->stringforfirstkey . ' p" class="classfortooltip" href="#"><i class="fa fa-chevron-left"></i></a>';
+	$moreforfilter .= '&nbsp;&nbsp;&nbsp;<a id="next_account" accesskey="n" title="' . $conf->browser->stringforfirstkey . ' n" class="classfortooltip" href="#"><i class="fa fa-chevron-right"></i></a>';
 	$moreforfilter .= <<<SCRIPT
 <script type="text/javascript">
 	jQuery(document).ready(function() {
@@ -1104,7 +1102,7 @@ if (!empty($arrayfields['t.doc_ref']['checked'])) {
 if (!empty($arrayfields['t.label_operation']['checked'])) {
 	print '<td class="liste_titre"><input type="text" size="7" class="flat" name="search_label_operation" value="'.dol_escape_htmltag($search_label_operation).'"/></td>';
 }
-// Lettering code
+// Matching code
 if (!empty($arrayfields['t.lettering_code']['checked'])) {
 	print '<td class="liste_titre center">';
 	print '<input type="text" size="3" class="flat" name="search_lettering_code" value="'.$search_lettering_code.'"/>';
@@ -1528,7 +1526,7 @@ while ($i < min($num, $limit)) {
 		}
 	}
 
-	// Lettering code
+	// Matching code
 	if (!empty($arrayfields['t.lettering_code']['checked'])) {
 		print '<td class="center">'.dol_escape_htmltag((string) $line->lettering_code).'</td>';
 		if (!$i) {

htdocs/accountancy/class/accountancycategory.class.php

@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2016		Jamal Elbaz			<jamelbaz@gmail.pro>
  * Copyright (C) 2016-2017	Alexandre Spangaro	<aspangaro@open-dsi.fr>
- * Copyright (C) 2018-2024	Frédéric France     <frederic.france@free.fr>
+ * Copyright (C) 2018-2025  Frédéric France     <frederic.france@free.fr>
  * Copyright (C) 2024-2025	MDW					<mdeweerd@users.noreply.github.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -69,47 +69,47 @@ class AccountancyCategory // extends CommonObject
 	public $id;
 
 	/**
-	 * @var string Accountancy code
+	 * @var ?string Accountancy code
 	 */
 	public $code;
 
 	/**
-	 * @var string Accountancy Category label
+	 * @var ?string Accountancy Category label
 	 */
 	public $label;
 
 	/**
-	 * @var string Accountancy range account
+	 * @var ?string Accountancy range account
 	 */
 	public $range_account;
 
 	/**
-	 * @var int Sens of the account:  0: credit - debit, 1: debit - credit
+	 * @var ?int Sens of the account:  0: credit - debit, 1: debit - credit
 	 */
 	public $sens;
 
 	/**
-	 * @var int Category type of accountancy
+	 * @var ?int Category type of accountancy
 	 */
 	public $category_type;
 
 	/**
-	 * @var string Formula
+	 * @var ?string Formula
 	 */
 	public $formula;
 
 	/**
-	 * @var int     Position
+	 * @var ?int     Position
 	 */
 	public $position;
 
 	/**
-	 * @var int country id
+	 * @var ?int country id
 	 */
 	public $fk_country;
 
 	/**
-	 * @var int Is active
+	 * @var ?int Is active
 	 */
 	public $active;
 
@@ -399,7 +399,6 @@ class AccountancyCategory // extends CommonObject
 	 */
 	public function delete($user, $notrigger = 0)
 	{
-		global $conf, $langs;
 		$error = 0;
 
 		$sql = "DELETE FROM ".$this->db->prefix().$this->table_element;
@@ -438,6 +437,7 @@ class AccountancyCategory // extends CommonObject
 	public function display($id)
 	{
 		global $conf;
+
 		$sql = "SELECT t.rowid, t.account_number, t.label";
 		$sql .= " FROM ".$this->db->prefix()."accounting_account as t";
 		$sql .= " WHERE t.fk_accounting_category = ".((int) $id);

htdocs/accountancy/class/accountancyexport.class.php

@@ -85,6 +85,8 @@ class AccountancyExport
 	public static $EXPORT_TYPE_GESTIMUMV5 = 135;
 	/** @var int */
 	public static $EXPORT_TYPE_ISUITEEXPERT = 200;
+	/** @var int */
+	public static $EXPORT_TYPE_ISTEA = 205;
 	// Generic FEC after that
 	/** @var int */
 	public static $EXPORT_TYPE_FEC = 1000;
@@ -161,6 +163,7 @@ class AccountancyExport
 			self::$EXPORT_TYPE_GESTIMUMV3 => $langs->trans('Modelcsv_Gestinumv3'),
 			self::$EXPORT_TYPE_GESTIMUMV5 => $langs->trans('Modelcsv_Gestinumv5'),
 			self::$EXPORT_TYPE_ISUITEEXPERT => 'Export iSuite Expert',
+			self::$EXPORT_TYPE_ISTEA => $langs->trans('Modelcsv_ISTEA'),
 		);
 
 		$listofgenericformatexport = array(
@@ -223,6 +226,7 @@ class AccountancyExport
 			self::$EXPORT_TYPE_FEC => 'fec',
 			self::$EXPORT_TYPE_FEC2 => 'fec2',
 			self::$EXPORT_TYPE_ISUITEEXPERT => 'isuiteexpert',
+			self::$EXPORT_TYPE_ISTEA => 'istea',
 		);
 
 		global $hookmanager;
@@ -317,6 +321,10 @@ class AccountancyExport
 					'label' => 'iSuite Expert',
 					'ACCOUNTING_EXPORT_FORMAT' => 'csv',
 				),
+				self::$EXPORT_TYPE_ISTEA => array(
+					'label' => 'ISTEA',
+					'ACCOUNTING_EXPORT_FORMAT' => 'csv',
+				),
 			),
 			'cr' => array(
 				'1' => $langs->trans("Unix"),
@@ -539,6 +547,9 @@ class AccountancyExport
 			case self::$EXPORT_TYPE_ISUITEEXPERT:
 				$this->exportiSuiteExpert($TData, $exportFile);
 				break;
+			case self::$EXPORT_TYPE_ISTEA:
+				$this->exportISTEA($TData, $exportFile);
+				break;
 			default:
 				global $hookmanager;
 				$parameters = array('format' => $formatexportset, 'exportFile' => $exportFile);
@@ -1345,6 +1356,63 @@ class AccountancyExport
 		}
 	}
 
+	/**
+	 * Export format : ISTEA
+	 *
+	 * @param 	BookKeepingLine[] 		$objectLines 			data
+	 * @param 	?resource	$exportFile				[=null] File resource to export or print if null
+	 * @return	void
+	 */
+	public function exportISTEA($objectLines, $exportFile = null)
+	{
+		global $conf;
+
+		$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
+		$tiers = [];
+		foreach ($objectLines as $line) {
+			if ($line->subledger_account && substr($line->subledger_account, 0, 1) == '4') {
+				$tiers[$line->piece_num] = $line->subledger_label;
+			}
+		}
+
+		foreach ($objectLines as $line) {
+			$date_document = dol_print_date($line->doc_date, '%d/%m/%Y');
+
+			/*** preparation du champ label operation pour istea ***/
+			// retrecissement du champs car ISTEA n'affiche pas bcp de caract<63>re.
+			$search = array('Paiement fournisseur ', 'Virement ', 'Paiement ');
+			$replace = array('Paiemt fourn ','Virt ','Paiemt ');
+			$label_operation = str_replace($search, $replace, $line->label_operation);
+			// encadrement par des ' si le champs contient le separateur
+			$label_operation = preg_match('/'.$separator.'/', $label_operation) ? "'".$label_operation."'" : $label_operation;
+
+			$tab = array();
+			// export configurable
+			$tab[] = $line->piece_num;	// colonne 1 : numero de piece	ISTEA
+			$tab[] = $date_document;	// colonne 2 : date				ISTEA
+			$tab[] = $line->doc_ref;	// colonne 3 : reference piece 	ISTEA
+			$tab[] = array_key_exists($line->piece_num, $tiers) ? $tiers[$line->piece_num] : '';	// colonne 4 : nom tiers	ISTEA
+			$tab[] = length_accountg(($line->subledger_account && (substr($line->subledger_account, 0, 2) == substr($line->numero_compte, 0, 2))) ? $line->subledger_account : $line->numero_compte);	// colonne 5 : numero de compte	ISTEA
+			$tab[] = length_accountg($line->subledger_account ? $line->subledger_account : $line->numero_compte);	// colonne 6 : numero de compte
+			$tab[] = length_accountg($line->subledger_account ? $line->numero_compte : '');	// G					// colonne 7 : numero de compte principal (divers paiement ou 40100000 ou 41100000)
+			$tab[] = ($line->doc_type == 'bank') ? $label_operation : ($line->subledger_account ? $line->subledger_label : $line->label_compte);	// colonne 8 : label de l'operation		ISTEA
+			$tab[] = $label_operation;	// colonne 9 : label de l'operation (semble non prise en compte par ISTEA)
+			$tab[] = price2num($line->debit);	// colonne 10 : debit		ISTEA
+			$tab[] = price2num($line->credit);	// colonne 11 : credit		ISTEA
+			$tab[] = $line->code_journal;		// colonne 12 : journal		ISTEA
+
+			$output = mb_convert_encoding('"'.implode('"'.$separator.'"', $tab).'"'.$this->end_line, 'ISO-8859-1');
+			if ($exportFile) {
+				fwrite($exportFile, $output);
+			} else {
+				print $output;
+			}
+		}
+	}
+
 	/**
 	 * Export format : FEC
 	 * Last review for this format : 2023/10/12 Alexandre Spangaro (aspangaro@open-dsi.fr)
@@ -1406,20 +1474,21 @@ class AccountancyExport
 				$date_limit_payment = dol_print_date($line->date_lim_reglement, '%Y%m%d');
 
 				$refInvoice = '';
+				$invoice = null;
 				if ($line->doc_type == 'customer_invoice') {
 					// Customer invoice
 					require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 					$invoice = new Facture($this->db);
 					$invoice->fetch($line->fk_doc);
 
-					$refInvoice = $invoice->ref;
+					$refInvoice = (string) $invoice->ref;
 				} elseif ($line->doc_type == 'supplier_invoice') {
 					// Supplier invoice
 					require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 					$invoice = new FactureFournisseur($this->db);
 					$invoice->fetch($line->fk_doc);
 
-					$refInvoice = $invoice->ref_supplier;
+					$refInvoice = (string) $invoice->ref_supplier;
 				}
 
 				$tab = array();
@@ -1508,10 +1577,9 @@ class AccountancyExport
 							if (!getDolGlobalInt('ACCOUNTING_EXPORT_REMOVE_EXPENSEREPORT_SOURCE_FILE')) {
 								$objectDirPath = !empty($conf->expensereport->multidir_output[$conf->entity]) ? $conf->expensereport->multidir_output[$conf->entity] : $conf->expensereport->dir_output;
 							}
-						} elseif ($line->doc_type == 'supplier_invoice') {
+						} elseif ($line->doc_type == 'supplier_invoice' && $invoice instanceof FactureFournisseur) {
 							if (!getDolGlobalInt('ACCOUNTING_EXPORT_REMOVE_SUPPLIERINVOICE_SOURCE_FILE')) {
 								'@phan-var-force FactureFournisseur $invoice';
-								/** @var FactureFournisseur $invoice */
 								$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'), '/');
 							}
@@ -1626,20 +1694,21 @@ class AccountancyExport
 				$date_limit_payment = dol_print_date($line->date_lim_reglement, '%Y%m%d');
 
 				$refInvoice = '';
+				$invoice = null;
 				if ($line->doc_type == 'customer_invoice') {
 					// Customer invoice
 					require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 					$invoice = new Facture($this->db);
 					$invoice->fetch($line->fk_doc);
 
-					$refInvoice = $invoice->ref;
+					$refInvoice = (string) $invoice->ref;
 				} elseif ($line->doc_type == 'supplier_invoice') {
 					// Supplier invoice
 					require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 					$invoice = new FactureFournisseur($this->db);
 					$invoice->fetch($line->fk_doc);
 
-					$refInvoice = $invoice->ref_supplier;
+					$refInvoice = (string) $invoice->ref_supplier;
 				}
 
 				$tab = array();
@@ -1728,10 +1797,9 @@ class AccountancyExport
 							if (!getDolGlobalInt('ACCOUNTING_EXPORT_REMOVE_EXPENSEREPORT_SOURCE_FILE')) {
 								$objectDirPath = !empty($conf->expensereport->multidir_output[$conf->entity]) ? $conf->expensereport->multidir_output[$conf->entity] : $conf->expensereport->dir_output;
 							}
-						} elseif ($line->doc_type == 'supplier_invoice') {
+						} elseif ($line->doc_type == 'supplier_invoice' && $invoice instanceof FactureFournisseur) {
 							if (!getDolGlobalInt('ACCOUNTING_EXPORT_REMOVE_SUPPLIERINVOICE_SOURCE_FILE')) {
 								'@phan-var-force FactureFournisseur $invoice';
-								/** @var FactureFournisseur $invoice */
 								$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'), '/');
 							}

htdocs/accountancy/class/accountancyreport.class.php

@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2024		Alexandre Spangaro			<alexandre@inovea-conseil.com>
+/* Copyright (C) 2024		Alexandre Spangaro		<alexandre@inovea-conseil.com>
+ * 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
@@ -66,22 +67,22 @@ class AccountancyReport // extends CommonObject
 	public $id;
 
 	/**
-	 * @var string Accountancy code
+	 * @var ?string Accountancy code
 	 */
 	public $code;
 
 	/**
-	 * @var string Accountancy Category label
+	 * @var ?string Accountancy Category label
 	 */
 	public $label;
 
 	/**
-	 * @var int country id
+	 * @var ?int country id
 	 */
 	public $fk_country;
 
 	/**
-	 * @var int Is active
+	 * @var ?int Is active
 	 */
 	public $active;
 
@@ -229,7 +230,6 @@ class AccountancyReport // extends CommonObject
 	 */
 	public function update($user = null, $notrigger = 0)
 	{
-		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters

htdocs/accountancy/class/accountingaccount.class.php

@@ -1,11 +1,11 @@
 <?php
-/* Copyright (C) 2013-2014  Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2024  Alexandre Spangaro   <aspangaro@easya.solutions>
- * Copyright (C) 2013-2021  Florian Henry        <florian.henry@open-concept.pro>
- * Copyright (C) 2014       Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2015       Ari Elbaz (elarifr)  <github@accedinfo.com>
- * Copyright (C) 2018-2024  Frédéric France      <frederic.france@free.fr>
- * Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
+/* Copyright (C) 2013-2014  Olivier Geffroy         <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2024  Alexandre Spangaro      <aspangaro@easya.solutions>
+ * Copyright (C) 2013-2021  Florian Henry           <florian.henry@open-concept.pro>
+ * Copyright (C) 2014       Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 2015       Ari Elbaz (elarifr)     <github@accedinfo.com>
+ * Copyright (C) 2018-2025  Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2024		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
@@ -80,17 +80,17 @@ class AccountingAccount extends CommonObject
 	public $datec;
 
 	/**
-	 * @var string pcg version
+	 * @var ?string pcg version
 	 */
 	public $fk_pcg_version;
 
 	/**
-	 * @var string pcg type
+	 * @var ?string pcg type
 	 */
 	public $pcg_type;
 
 	/**
-	 * @var string account number
+	 * @var ?string account number
 	 */
 	public $account_number;
 
@@ -115,12 +115,12 @@ class AccountingAccount extends CommonObject
 	public $status;
 
 	/**
-	 * @var string Label of account
+	 * @var ?string Label of account
 	 */
 	public $label;
 
 	/**
-	 * @var string Label short of account
+	 * @var ?string Label short of account
 	 */
 	public $labelshort;
 
@@ -358,7 +358,7 @@ class AccountingAccount extends CommonObject
 
 		$sql = "UPDATE " . $this->db->prefix() . $this->table_element;
 		$sql .= " SET fk_pcg_version = " . ($this->fk_pcg_version ? "'" . $this->db->escape($this->fk_pcg_version) . "'" : "null");
-		$sql .= " , pcg_type = " . ($this->pcg_type ? "'" . $this->db->escape($this->pcg_type) . "'" : "null");
+		$sql .= " , pcg_type = '" . $this->db->escape($this->pcg_type) . "'";
 		$sql .= " , account_number = '" . $this->db->escape($this->account_number) . "'";
 		$sql .= " , account_parent = " . (int) $this->account_parent;
 		$sql .= " , label = " . ($this->label ? "'" . $this->db->escape($this->label) . "'" : "''");
@@ -436,16 +436,14 @@ class AccountingAccount extends CommonObject
 		if ($result > 0) {
 			$this->db->begin();
 
-			if (!$error) {
-				$sql = "DELETE FROM " . $this->db->prefix() . $this->table_element;
-				$sql .= " WHERE rowid=" . ((int) $this->id);
+			$sql = "DELETE FROM " . $this->db->prefix() . $this->table_element;
+			$sql .= " WHERE rowid=" . ((int) $this->id);
 
-				dol_syslog(get_class($this) . "::delete sql=" . $sql);
-				$resql = $this->db->query($sql);
-				if (!$resql) {
-					$error++;
-					$this->errors[] = "Error " . $this->db->lasterror();
-				}
+			dol_syslog(get_class($this) . "::delete sql=" . $sql);
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$error++;
+				$this->errors[] = "Error " . $this->db->lasterror();
 			}
 
 			// Commit or rollback
@@ -737,7 +735,7 @@ class AccountingAccount extends CommonObject
 	 * @param 	FactureLigne|SupplierInvoiceLine	$factureDet 		Facture Det
 	 * @param 	array<string,int>					$accountingAccount 	Array of Accounting account
 	 * @param 	string 								$type 				Customer / Supplier
-	 * @return	array{suggestedaccountingaccountbydefaultfor:string,suggestedaccountingaccountfor:string,suggestedid:?int,code_l:string,code_p:string,code_t:string}|int<-1,-1>	Array of accounting accounts suggested or < 0 if technical error.
+	 * @return	array{suggestedaccountingaccountbydefaultfor:''|'eec'|'eecwithoutvatnumber'|'eecwithvat'|'export',suggestedaccountingaccountfor:'deposit'|'eec'|'eecwithoutvatnumber'|'eecwithvat'|'export'|'prodserv'|'thirdparty',suggestedid:?int,code_l:string,code_p:?string,code_t:string}|int<-1,-1>	Array of accounting accounts suggested or < 0 if technical error.
 	 * 																	'suggestedaccountingaccountbydefaultfor'=>Will be used for the label to show on tooltip for account by default on any product
 	 * 																	'suggestedaccountingaccountfor'=>Is the account suggested for this product
 	 */
@@ -889,10 +887,10 @@ class AccountingAccount extends CommonObject
 						return -1;
 					}
 
-					$code_l = $accountdeposittoventilated->ref;
+					$code_l = (string) $accountdeposittoventilated->ref;
 					$code_p = '';
 					$code_t = '';
-					$suggestedid = $accountdeposittoventilated->rowid;
+					$suggestedid = (int) $accountdeposittoventilated->rowid;
 					$suggestedaccountingaccountfor = 'deposit';
 				}
 
@@ -908,10 +906,10 @@ class AccountingAccount extends CommonObject
 						} elseif ($type == 'supplier') {
 							$accountdeposittoventilated->fetch(0, getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT'), 1);
 						}
-						$code_l = $accountdeposittoventilated->ref;
+						$code_l = (string) $accountdeposittoventilated->ref;
 						$code_p = '';
 						$code_t = '';
-						$suggestedid = $accountdeposittoventilated->rowid;
+						$suggestedid = (int) $accountdeposittoventilated->rowid;
 						$suggestedaccountingaccountfor = 'deposit';
 					}
 				}

htdocs/accountancy/class/accountingjournal.class.php

@@ -1,8 +1,9 @@
 <?php
-/* Copyright (C) 2017-2022  OpenDSI     <support@open-dsi.fr>
+/* Copyright (C) 2017-2022	OpenDSI						<support@open-dsi.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       Alexandre Janniaux <alexandre.janniaux@gmail.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>
  *
  * 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
@@ -217,7 +218,7 @@ class AccountingJournal extends CommonObject
 
 		$result = '';
 
-		$url = DOL_URL_ROOT.'/accountancy/admin/journals_list.php?id=35';
+		$url = dolBuildUrl(DOL_URL_ROOT.'/accountancy/admin/journals_list.php', ['id' => 35]);
 
 		$label = '<u>'.$langs->trans("ShowAccountingJournal").'</u>';
 		if (!empty($this->code)) {
@@ -375,7 +376,24 @@ class AccountingJournal extends CommonObject
 		} elseif (empty($reshook)) {
 			switch ($this->nature) {
 				case 1: // Various Journal
-					$data = $this->getAssetData($user, $type, $date_start, $date_end, $in_bookkeeping);
+					if (isModEnabled('asset') && !getDolGlobalInt('ACCOUNTING_DISABLE_TRANSFER_ON_ASSETS')) {
+						$tmp = $this->getAssetData($user, $type, $date_start, $date_end, $in_bookkeeping);
+						if (is_array($tmp)) {
+							$data = array_merge($data, $tmp);
+						}
+					}
+					if (isModEnabled('invoice') && !getDolGlobalInt('ACCOUNTING_DISABLE_TRANSFER_ON_DISCOUNTS')) {
+						$tmp = $this->getDiscountCustomer($user, $type, $date_start, $date_end, $in_bookkeeping);
+						if (is_array($tmp)) {
+							$data = array_merge($data, $tmp);
+						}
+					}
+					if (isModEnabled('supplier_invoice') && !getDolGlobalInt('ACCOUNTING_DISABLE_TRANSFER_ON_DISCOUNTS')) {
+						$tmp = $this->getDiscountSupplier($user, $type, $date_start, $date_end, $in_bookkeeping);
+						if (is_array($tmp)) {
+							$data = array_merge($data, $tmp);
+						}
+					}
 					break;
 					//              case 2: // Sells Journal
 					//              case 3: // Purchases Journal
@@ -429,6 +447,7 @@ class AccountingJournal extends CommonObject
 		$sql .= " FROM " . MAIN_DB_PREFIX . "asset_depreciation as ad";
 		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "asset as a ON a.rowid = ad.fk_asset";
 		$sql .= " WHERE a.entity IN (" . getEntity('asset', 0) . ')'; // We don't share object for accountancy, we use source object sharing
+		$sql .= " AND a.status > 0";
 		if ($in_bookkeeping == 'already') {
 			$sql .= " AND EXISTS (SELECT iab.fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping AS iab WHERE iab.fk_docdet = ad.rowid AND doc_type = 'asset')";
 		} elseif ($in_bookkeeping == 'notyet') {
@@ -507,7 +526,7 @@ class AccountingJournal extends CommonObject
 
 			$element = array(
 				'ref' => dol_trunc($element_static->ref, 16, 'right', 'UTF-8', 1),
-				'error' => array_key_exists('error', $pre_data_info) ? $pre_data_info['error'] : '',
+				'error' => array_key_exists('error', $pre_data_info) ? $pre_data_info['error'] : '',  // @phpstan-ignore-line
 				'blocks' => array(),
 			);
 
@@ -524,7 +543,7 @@ class AccountingJournal extends CommonObject
 					$account_infos = $this->getAccountingAccountInfos($account);
 
 					if ($type == 'view') {
-						$account_to_show = length_accounta($account);
+						$account_to_show = length_accountg($account);
 						if (($account_to_show == "") || $account_to_show == 'NotDefined') {
 							$account_to_show = '<span class="error">' . $langs->trans("AssetInAccountNotDefined") . '</span>';
 						}
@@ -644,7 +663,7 @@ class AccountingJournal extends CommonObject
 									$account_infos = $this->getAccountingAccountInfos($account);
 
 									if ($type == 'view') {
-										$account_to_show = length_accounta($account);
+										$account_to_show = length_accountg($account);
 										if (($account_to_show == "") || $account_to_show == 'NotDefined') {
 											$account_to_show = '<span class="error">' . $langs->trans("AssetInAccountNotDefined") . '</span>';
 										}
@@ -711,6 +730,614 @@ class AccountingJournal extends CommonObject
 		return $journal_data;
 	}
 
+	/**
+	 *  Get customer discount (escompte) data for various journal
+	 *
+	 * @param	User						$user				User who get infos
+	 * @param	'view'|'bookkeeping'|'csv'	$type				Type data returned ('view', 'bookkeeping', 'csv')
+	 * @param	?int						$date_start			Filter 'start date'
+	 * @param	?int						$date_end			Filter 'end date'
+	 * @param	'already'|'notyet'			$in_bookkeeping		Filter 'in bookkeeping' ('already', 'notyet')
+	 * @return	int<-1,-1>|array<int,array{ref:string,error:?string,blocks:array<array<array{date:string,piece:string,account_accounting:string,subledger_account:string,label_operation:string,debit:string,credit:string}|array{doc_date:''|int,date_lim_reglement:string,doc_ref:string,date_creation:int,doc_type:string,fk_doc:int|string,fk_docdet:int|string,thirdparty_code:string,subledger_account:string,subledger_label:string,numero_compte:string,label_compte:string,label_operation:string,montant:string,sens:string,debit:int|float|string,credit:int|float|string,code_journal:string,journal_label:string,piece_num:string,import_key:string,fk_user_author:string,entity:string}>>}>    Return integer <0 if KO, array
+	 */
+	public function getDiscountCustomer(User $user, $type = 'view', $date_start = null, $date_end = null, $in_bookkeeping = 'notyet')
+	{
+		global $conf, $langs;
+
+		require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+
+		$langs->loadLangs(array('bills'));
+
+		// Clean parameters
+		if (empty($type)) {
+			$type = 'view';
+		}
+		if (empty($in_bookkeeping)) {
+			$in_bookkeeping = 'notyet';
+		}
+
+		// Build SQL - Customer invoices closed by discount
+		$sql = "SELECT f.rowid, f.ref, f.datef, f.fk_soc, f.total_ttc";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+		$sql .= " WHERE f.entity IN (".getEntity('invoice', 0).')'; // We don't share object for accountancy, we use source object sharing
+		$sql .= " AND f.fk_statut > 0";
+		if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {	// Non common setup
+			$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_REPLACEMENT.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_SITUATION.")";
+		} else {
+			$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_REPLACEMENT.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_DEPOSIT.",".Facture::TYPE_SITUATION.")";
+		}
+		$sql .= " AND f.close_code = 'discount_vat'";
+		if ($date_start && $date_end) {
+			$sql .= " AND f.datef >= '".$this->db->idate($date_start)."' AND f.datef <= '".$this->db->idate($date_end)."'";
+		}
+		if (getDolGlobalString('ACCOUNTING_DATE_START_BINDING')) {
+			$sql .= " AND f.datef >= '".$this->db->idate(getDolGlobalInt('ACCOUNTING_DATE_START_BINDING'))."'";
+		}
+		if ($in_bookkeeping == 'already') {
+			$sql .= " AND EXISTS (SELECT 1 FROM ".MAIN_DB_PREFIX."accounting_bookkeeping ab";
+			$sql .= "              WHERE ab.doc_type = 'customer_invoice' AND ab.fk_doc = f.rowid AND ab.piece_num LIKE 'OD-ESC-%')";
+		} elseif ($in_bookkeeping == 'notyet') {
+			$sql .= " AND NOT EXISTS (SELECT 1 FROM ".MAIN_DB_PREFIX."accounting_bookkeeping ab";
+			$sql .= "                  WHERE ab.doc_type = 'customer_invoice' AND ab.fk_doc = f.rowid AND ab.piece_num LIKE 'OD-ESC-%')";
+		}
+		$sql .= " ORDER BY f.datef";
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->errors[] = $this->db->lasterror();
+			return -1;
+		}
+
+		$journal = $this->code;
+		$journal_label_formatted = $langs->transnoentities($this->label);
+		$now = dol_now();
+
+		$journal_data = array();
+		$invoice_static = new Facture($this->db);
+		$customer_static = new Societe($this->db);
+
+		// Accounting accounts
+		$acc_disc_granted = getDolGlobalString('ACCOUNTING_ACCOUNT_DISCOUNT_GRANTED');
+		$acc_vat_coll_def = getDolGlobalString('ACCOUNTING_VAT_BUY_ACCOUNT');			// Normal to apply vat default account for buy with customer's discount
+
+		while ($obj = $this->db->fetch_object($resql)) {
+			if ($invoice_static->fetch((int) $obj->rowid) <= 0) {
+				continue;
+			}
+
+			$customer_static->fetch($invoice_static->socid);
+			$account_customer_general = !empty($customer_static->accountancy_code_customer_general) ? $customer_static->accountancy_code_customer_general : getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER');
+			$account_customer_subsidiary = !empty($customer_static->code_compta_client) ? $customer_static->code_compta_client : '';
+
+			$piece_link = $invoice_static->getNomUrl(1, 'withlabel');
+
+			// Discounted amount including tax
+			$paid    = (float) price2num($invoice_static->getSommePaiement(), 'MT');
+			$usedcn  = (float) price2num($invoice_static->getSumOfCreditNotesUsed(), 'MT');
+			$useddep = (float) price2num($invoice_static->getSumDepositsUsed(), 'MT');
+			$ttc_inv = (float) price2num($invoice_static->total_ttc, 'MT');
+			$escompte_ttc = (float) price2num(max(0, $ttc_inv - $paid - $usedcn - $useddep), 'MT');
+			if ($escompte_ttc <= 0) {
+				continue;
+			}
+
+			$bookkeeping_static = new BookKeeping($this->db);
+			$label_discount = $bookkeeping_static->accountingLabelForOperation($customer_static->getNomUrl(1, 'customer'), $invoice_static->ref, $langs->trans('DiscountGranted'));
+
+			// Distribution including VAT by rate
+			$ttcByRate = array();
+			$totalTTC = 0.0;
+			foreach ((array) $invoice_static->lines as $li) {
+				$ttc = (float) $li->total_ttc;
+				if (!$ttc) {
+					continue;
+				}
+				$key = number_format((float) $li->tva_tx, 3, '.', '');
+				if (!isset($ttcByRate[$key])) {
+					$ttcByRate[$key] = 0.0;
+				}
+				$ttcByRate[$key] += $ttc;
+				$totalTTC += $ttc;
+			}
+			if ($totalTTC <= 0) {
+				$ttcByRate = array("0.000" => $escompte_ttc);
+				$totalTTC = $escompte_ttc;
+			}
+
+			$element = array(
+				'ref'   => dol_trunc($invoice_static->ref, 16, 'right', 'UTF-8', 1),
+				'error' => '',
+				'blocks' => array(),
+			);
+
+			$docdate = $this->db->jdate($obj->datef);
+			$docdate_fmt = dol_print_date($docdate, 'day');
+
+			$sumTTC = 0.0;
+			$i = 0;
+			$n = count($ttcByRate);
+			foreach ($ttcByRate as $rateStr => $ttcRateOnInvoice) {
+				$i++;
+				$rate = (float) $rateStr;
+
+				$ttc_part = (float) $escompte_ttc * ($ttcRateOnInvoice / $totalTTC);
+				if ($i == $n) {
+					$ttc_part = (float) price2num($escompte_ttc - $sumTTC, 'MT');
+				} else {
+					$ttc_part = (float) price2num($ttc_part, 'MT');
+					$sumTTC = (float) price2num($sumTTC + $ttc_part, 'MT');
+				}
+
+				if ($rate > 0) {
+					$ht_part  = (float) price2num($ttc_part / (1 + $rate / 100), 'MT');
+					$tva_part = (float) price2num($ttc_part - $ht_part, 'MT');
+				} else {
+					$ht_part = $ttc_part;
+					$tva_part = 0.0;
+				}
+
+				// VAT deductible account (by rate if available)
+				// TODO write function to search the same vat code like the invoice
+				$acc_vat_coll = $acc_vat_coll_def;
+
+				$lines_view = array();
+				$lines_book = array();
+
+				// Discount granted
+				$acc_info_discountgranted = $this->getAccountingAccountInfos($acc_disc_granted);
+				if ($type == 'view') {
+					$lines_view[] = array(
+						'date' => $docdate_fmt,
+						'piece' => $piece_link,
+						'account_accounting' => length_accountg($acc_disc_granted),
+						'subledger_account' => '',
+						'label_operation' => $label_discount." - " .$langs->transnoentitiesnoconv('HT') . " (".$rateStr."%)",
+						'debit' => price($ht_part),
+						'credit' => '',
+					);
+				} elseif ($type == 'bookkeeping' && $acc_info_discountgranted['found']) {
+					$lines_book[] = array(
+						'doc_date' => $docdate,
+						'date_lim_reglement' => '',
+						'doc_ref' => $invoice_static->ref,
+						'date_creation' => $now,
+						'doc_type' => 'customer_invoice',
+						'fk_doc' => $invoice_static->id,
+						'fk_docdet' => 0,
+						'thirdparty_code' => $customer_static->code_client,
+						'subledger_account' => '',
+						'subledger_label' => '',
+						'numero_compte' => $acc_disc_granted,
+						'label_compte' => $acc_info_discountgranted['label'],
+						'label_operation' => $label_discount." - " .$langs->transnoentitiesnoconv('HT') . " (".$rateStr."%)",
+						'montant' => $ht_part,
+						'sens' => 'D',
+						'debit' => $ht_part,
+						'credit' => 0,
+						'code_journal' => $journal,
+						'journal_label' => $journal_label_formatted,
+						'piece_num' => 'OD-ESC-'.$invoice_static->ref,
+						'import_key' => '',
+						'fk_user_author' => $user->id,
+						'entity' => $conf->entity,
+					);
+				}
+
+				// VAT
+				if ($tva_part > 0) {
+					$acc_info_vatbuy = $this->getAccountingAccountInfos($acc_vat_coll);
+					if ($type == 'view') {
+						$lines_view[] = array(
+							'date' => $docdate_fmt,
+							'piece' => $piece_link,
+							'account_accounting' => length_accountg($acc_vat_coll),
+							'subledger_account' => '',
+							'label_operation' => $label_discount." - " .$langs->transnoentitiesnoconv('VAT') . " (".$rateStr."%)",
+							'debit' => price($tva_part),
+							'credit' => '',
+						);
+					} elseif ($type == 'bookkeeping' && $acc_info_vatbuy['found']) {
+						$lines_book[] = array(
+							'doc_date' => $docdate,
+							'date_lim_reglement' => '',
+							'doc_ref' => $invoice_static->ref,
+							'date_creation' => $now,
+							'doc_type' => 'customer_invoice',
+							'fk_doc' => $invoice_static->id,
+							'fk_docdet' => 0,
+							'thirdparty_code' => $customer_static->code_client,
+							'subledger_account' => '',
+							'subledger_label' => '',
+							'numero_compte' => $acc_vat_coll,
+							'label_compte' => $acc_info_vatbuy['label'],
+							'label_operation' => $label_discount." - " .$langs->transnoentitiesnoconv('VAT') . " (".$rateStr."%)",
+							'montant' => $tva_part,
+							'sens' => 'D',
+							'debit' => $tva_part,
+							'credit' => 0,
+							'code_journal' => $journal,
+							'journal_label' => $journal_label_formatted,
+							'piece_num' => 'OD-ESC-'.$invoice_static->ref,
+							'import_key' => '',
+							'fk_user_author' => $user->id,
+							'entity' => $conf->entity,
+						);
+					}
+				}
+
+				// Thirdparty
+				$acc_info_customeraccount = $this->getAccountingAccountInfos($account_customer_general);
+				if ($type == 'view') {
+					$lines_view[] = array(
+						'date' => $docdate_fmt,
+						'piece' => $piece_link,
+						'account_accounting' => length_accountg($account_customer_general),
+						'subledger_account' => length_accounta($account_customer_subsidiary),
+						'label_operation' => $label_discount.' - '.$langs->transnoentitiesnoconv('Customer'),
+						'debit' => '',
+						'credit' => price($ttc_part),
+					);
+					$element['blocks'][] = $lines_view;
+				} elseif ($type == 'bookkeeping' && $acc_info_customeraccount['found']) {
+					$lines_book[] = array(
+						'doc_date' => $docdate,
+						'date_lim_reglement' => '',
+						'doc_ref' => $invoice_static->ref,
+						'date_creation' => $now,
+						'doc_type' => 'customer_invoice',
+						'fk_doc' => $invoice_static->id,
+						'fk_docdet' => 0,
+						'thirdparty_code' => $customer_static->code_client,
+						'subledger_account' => $account_customer_subsidiary,
+						'subledger_label' => $customer_static->name,
+						'numero_compte' => $account_customer_general,
+						'label_compte' => $acc_info_customeraccount['label'],
+						'label_operation' => $label_discount.' - '.$langs->transnoentitiesnoconv('Customer'),
+						'montant' => $ttc_part,
+						'sens' => 'C',
+						'debit' => 0,
+						'credit' => $ttc_part,
+						'code_journal' => $journal,
+						'journal_label' => $journal_label_formatted,
+						'piece_num' => 'OD-ESC-'.$invoice_static->ref,
+						'import_key' => '',
+						'fk_user_author' => $user->id,
+						'entity' => $conf->entity,
+					);
+					$element['blocks'][] = $lines_book;
+				} else { // CSV
+					$element['blocks'][] = array(
+						$docdate,                         // Date
+						$invoice_static->ref,             // Piece
+						length_accountg($acc_disc_granted), // Account
+						$label_discount." (".$rateStr."%)",   // Label
+						price($ht_part),                  // Debit
+						'',                               // Credit
+					);
+					if ($tva_part > 0) {
+						$element['blocks'][] = array(
+							$docdate, $invoice_static->ref, length_accountg($acc_vat_coll), $label_discount." ". $langs->transnoentitiesnoconv('VAT') . " (".$rateStr."%)", price($tva_part), ''
+						);
+					}
+					$element['blocks'][] = array(
+						$docdate, $invoice_static->ref, length_accountg($account_customer_general), $label_discount.' - '.$langs->transnoentitiesnoconv('Customer'), '', price($ttc_part)
+					);
+				}
+			}
+
+			$journal_data[(int) $invoice_static->id] = $element;
+		}
+
+		return $journal_data;
+	}
+
+	/**
+	 *  Get supplier discount (escompte) data for various journal
+	 *
+	 * @param	User						$user				User who get infos
+	 * @param	'view'|'bookkeeping'|'csv'	$type				Type data returned ('view', 'bookkeeping', 'csv')
+	 * @param	?int						$date_start			Filter 'start date'
+	 * @param	?int						$date_end			Filter 'end date'
+	 * @param	'already'|'notyet'			$in_bookkeeping		Filter 'in bookkeeping' ('already', 'notyet')
+	 * @return	int<-1,-1>|array<int,array{ref:string,error:?string,blocks:array<array<array{date:string,piece:string,account_accounting:string,subledger_account:string,label_operation:string,debit:string,credit:string}|array{doc_date:''|int,date_lim_reglement:string,doc_ref:string,date_creation:int,doc_type:string,fk_doc:int|string,fk_docdet:int|string,thirdparty_code:string,subledger_account:string,subledger_label:string,numero_compte:string,label_compte:string,label_operation:string,montant:string,sens:string,debit:int|float|string,credit:int|float|string,code_journal:string,journal_label:string,piece_num:string,import_key:string,fk_user_author:string,entity:string}>>}>    Return integer <0 if KO, array
+	 */
+	public function getDiscountSupplier(User $user, $type = 'view', $date_start = null, $date_end = null, $in_bookkeeping = 'notyet')
+	{
+		global $conf, $langs;
+
+		require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+
+		$langs->loadLangs(array('suppliers'));
+
+		// Clean parameters
+		if (empty($type)) {
+			$type = 'view';
+		}
+		if (empty($in_bookkeeping)) {
+			$in_bookkeeping = 'notyet';
+		}
+
+		// SQL - Supplier invoices closed by discount
+		$sql = "SELECT ff.rowid, ff.ref, ff.datef, ff.fk_soc, ff.total_ttc";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as ff";
+		$sql .= " WHERE ff.entity IN (".getEntity('facture_fourn', 0).")"; // We don't share object for accountancy
+		$sql .= " AND ff.fk_statut > 0";
+		if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
+			$sql .= " AND ff.type IN (".FactureFournisseur::TYPE_STANDARD.",".FactureFournisseur::TYPE_REPLACEMENT.",".FactureFournisseur::TYPE_CREDIT_NOTE.",".FactureFournisseur::TYPE_SITUATION.")";
+		} else {
+			$sql .= " AND ff.type IN (".FactureFournisseur::TYPE_STANDARD.",".FactureFournisseur::TYPE_REPLACEMENT.",".FactureFournisseur::TYPE_CREDIT_NOTE.",".FactureFournisseur::TYPE_DEPOSIT.",".FactureFournisseur::TYPE_SITUATION.")";
+		}
+		$sql .= " AND ff.close_code = 'discount_vat'";
+		if ($date_start && $date_end) {
+			$sql .= " AND ff.datef >= '".$this->db->idate($date_start)."' AND ff.datef <= '".$this->db->idate($date_end)."'";
+		}
+		if (getDolGlobalString('ACCOUNTING_DATE_START_BINDING')) {
+			$sql .= " AND ff.datef >= '".$this->db->idate(getDolGlobalInt('ACCOUNTING_DATE_START_BINDING'))."'";
+		}
+		if ($in_bookkeeping == 'already') {
+			$sql .= " AND EXISTS (SELECT 1 FROM ".MAIN_DB_PREFIX."accounting_bookkeeping ab";
+			$sql .= "              WHERE ab.doc_type = 'supplier_invoice' AND ab.fk_doc = ff.rowid AND ab.piece_num LIKE 'OD-ESC-FRS-%')";
+		} elseif ($in_bookkeeping == 'notyet') {
+			$sql .= " AND NOT EXISTS (SELECT 1 FROM ".MAIN_DB_PREFIX."accounting_bookkeeping ab";
+			$sql .= "                  WHERE ab.doc_type = 'supplier_invoice' AND ab.fk_doc = ff.rowid AND ab.piece_num LIKE 'OD-ESC-FRS-%')";
+		}
+		$sql .= " ORDER BY ff.datef";
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->errors[] = $this->db->lasterror();
+			return -1;
+		}
+
+		$journal = $this->code;
+		$journal_label_formatted = $langs->transnoentities($this->label);
+		$now = dol_now();
+
+		$journal_data = array();
+		$invoicesupplier_static = new FactureFournisseur($this->db);
+		$supplier_static = new Societe($this->db);
+
+		// Accounting accounts
+		$acc_disc_recv    = getDolGlobalString('ACCOUNTING_ACCOUNT_DISCOUNT_RECEIVED');
+		$acc_vat_ded_def  = getDolGlobalString('ACCOUNTING_VAT_SOLD_ACCOUNT');			// Normal to apply vat default account for sold with supplier's discount
+
+		while ($obj = $this->db->fetch_object($resql)) {
+			if ($invoicesupplier_static->fetch((int) $obj->rowid) <= 0) {
+				continue;
+			}
+
+			$supplier_static->fetch($invoicesupplier_static->socid);
+			$account_supplier_general = !empty($supplier_static->accountancy_code_supplier_general) ? $supplier_static->accountancy_code_supplier_general : getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER');
+			$account_supplier_subsidiary = !empty($supplier_static->code_compta_fournisseur) ? $supplier_static->code_compta_fournisseur : '';
+
+			$piece_link = $invoicesupplier_static->getNomUrl(1, 'withlabel');
+
+			// Discounted amount including tax
+			$paid    = (float) price2num($invoicesupplier_static->getSommePaiement(), 'MT');
+			$usedcn  = (float) price2num($invoicesupplier_static->getSumOfCreditNotesUsed(), 'MT');
+			$useddep = (float) price2num($invoicesupplier_static->getSumDepositsUsed(), 'MT');
+			$ttc_inv = (float) price2num($invoicesupplier_static->total_ttc, 'MT');
+			$escompte_ttc = (float) price2num(max(0, $ttc_inv - $paid - $usedcn - $useddep), 'MT');
+			if ($escompte_ttc <= 0) {
+				continue;
+			}
+
+			$bookkeeping_static = new BookKeeping($this->db);
+			$label_discount = $bookkeeping_static->accountingLabelForOperation($supplier_static->getNomUrl(1, 'supplier'), $invoicesupplier_static->ref, $langs->trans('DiscountReceived'));
+
+			// Distribution including VAT by rate
+			$ttcByRate = array();
+			$totalTTC = 0.0;
+			foreach ((array) $invoicesupplier_static->lines as $li) {
+				$ttc = (float) $li->total_ttc;
+				if (!$ttc) {
+					continue;
+				}
+				$key = number_format((float) $li->tva_tx, 3, '.', '');
+				if (!isset($ttcByRate[$key])) {
+					$ttcByRate[$key] = 0.0;
+				}
+				$ttcByRate[$key] += $ttc;
+				$totalTTC += $ttc;
+			}
+			if ($totalTTC <= 0) {
+				$ttcByRate = array("0.000" => $escompte_ttc);
+				$totalTTC = $escompte_ttc;
+			}
+
+			$element = array(
+				'ref'   => dol_trunc($invoicesupplier_static->ref, 16, 'right', 'UTF-8', 1),
+				'error' => '',
+				'blocks' => array(),
+			);
+
+			$docdate = $this->db->jdate($obj->datef);
+			$docdate_fmt = dol_print_date($docdate, 'day');
+
+			$sumTTC = 0.0;
+			$i = 0;
+			$n = count($ttcByRate);
+			foreach ($ttcByRate as $rateStr => $ttcRateOnInvoice) {
+				$i++;
+				$rate = (float) $rateStr;
+
+				$ttc_part = $escompte_ttc * ($ttcRateOnInvoice / $totalTTC);
+				if ($i == $n) {
+					$ttc_part = (float) price2num($escompte_ttc - $sumTTC, 'MT');
+				} else {
+					$ttc_part = (float) price2num($ttc_part, 'MT');
+					$sumTTC = (float) price2num($sumTTC + $ttc_part, 'MT');
+				}
+
+				if ($rate > 0) {
+					$ht_part  = (float) price2num($ttc_part / (1 + $rate / 100), 'MT');
+					$tva_part = (float) price2num($ttc_part - $ht_part, 'MT');
+				} else {
+					$ht_part = $ttc_part;
+					$tva_part = 0.0;
+				}
+
+				// VAT collected account (by rate if available)
+				// TODO write function to search the same vat code like the supplier invoice
+				$acc_vat_ded = $acc_vat_ded_def;
+
+				$lines_view = array();
+				$lines_book = array();
+
+				// Thirdparty
+				$acc_info_supplieraccount = $this->getAccountingAccountInfos($account_supplier_general);
+				if ($type == 'view') {
+					$lines_view[] = array(
+						'date' => $docdate_fmt,
+						'piece' => $piece_link,
+						'account_accounting' => length_accountg($account_supplier_general),
+						'subledger_account' => length_accounta($account_supplier_subsidiary),
+						'label_operation' => $label_discount.' - '.$langs->transnoentitiesnoconv('Supplier'),
+						'debit' => price($ttc_part),
+						'credit' => '',
+					);
+				} elseif ($type == 'bookkeeping' && $acc_info_supplieraccount['found']) {
+					$lines_book[] = array(
+						'doc_date' => $docdate,
+						'date_lim_reglement' => '',
+						'doc_ref' => $invoicesupplier_static->ref,
+						'date_creation' => $now,
+						'doc_type' => 'supplier_invoice',
+						'fk_doc' => $invoicesupplier_static->id,
+						'fk_docdet' => 0,
+						'thirdparty_code' => $supplier_static->code_fournisseur,
+						'subledger_account' => $account_supplier_subsidiary,
+						'subledger_label' => $supplier_static->name,
+						'numero_compte' => $account_supplier_general,
+						'label_compte' => $acc_info_supplieraccount['label'],
+						'label_operation' => $label_discount.' - '.$langs->transnoentitiesnoconv('Supplier'),
+						'montant' => $ttc_part,
+						'sens' => 'D',
+						'debit' => $ttc_part,
+						'credit' => 0,
+						'code_journal' => $journal,
+						'journal_label' => $journal_label_formatted,
+						'piece_num' => 'OD-ESC-FRS-'.$invoicesupplier_static->ref,
+						'import_key' => '',
+						'fk_user_author' => $user->id,
+						'entity' => $conf->entity,
+					);
+				}
+
+				// Discount received
+				$acc_info_discountreceived = $this->getAccountingAccountInfos($acc_disc_recv);
+				if ($type == 'view') {
+					$lines_view[] = array(
+						'date' => $docdate_fmt,
+						'piece' => $piece_link,
+						'account_accounting' => length_accountg($acc_disc_recv),
+						'subledger_account' => '',
+						'label_operation' => $label_discount." - " .$langs->transnoentitiesnoconv('HT') . " (".$rateStr."%)",
+						'debit' => '',
+						'credit' => price($ht_part),
+					);
+				} elseif ($type == 'bookkeeping' && $acc_info_discountreceived['found']) {
+					$lines_book[] = array(
+						'doc_date' => $docdate,
+						'date_lim_reglement' => '',
+						'doc_ref' => $invoicesupplier_static->ref,
+						'date_creation' => $now,
+						'doc_type' => 'supplier_invoice',
+						'fk_doc' => $invoicesupplier_static->id,
+						'fk_docdet' => 0,
+						'thirdparty_code' => $supplier_static->code_fournisseur,
+						'subledger_account' => '',
+						'subledger_label' => '',
+						'numero_compte' => $acc_disc_recv,
+						'label_compte' => $acc_info_discountreceived['label'],
+						'label_operation' => $label_discount." - " .$langs->transnoentitiesnoconv('HT') . " (".$rateStr."%)",
+						'montant' => $ht_part,
+						'sens' => 'C',
+						'debit' => 0,
+						'credit' => $ht_part,
+						'code_journal' => $journal,
+						'journal_label' => $journal_label_formatted,
+						'piece_num' => 'OD-ESC-FRS-'.$invoicesupplier_static->ref,
+						'import_key' => '',
+						'fk_user_author' => $user->id,
+						'entity' => $conf->entity,
+					);
+				}
+
+				// VAT
+				if ($tva_part > 0) {
+					$acc_info_vatbuy = $this->getAccountingAccountInfos($acc_vat_ded);
+					if ($type == 'view') {
+						$lines_view[] = array(
+							'date' => $docdate_fmt,
+							'piece' => $piece_link,
+							'account_accounting' => length_accountg($acc_vat_ded),
+							'subledger_account' => '',
+							'label_operation' => $label_discount." - " .$langs->transnoentitiesnoconv('VAT') . " (".$rateStr."%)",
+							'debit' => '',
+							'credit' => price($tva_part),
+						);
+						$element['blocks'][] = $lines_view;
+					} elseif ($type == 'bookkeeping' && $acc_info_vatbuy['found']) {
+						$lines_book[] = array(
+							'doc_date' => $docdate,
+							'date_lim_reglement' => '',
+							'doc_ref' => $invoicesupplier_static->ref,
+							'date_creation' => $now,
+							'doc_type' => 'supplier_invoice',
+							'fk_doc' => $invoicesupplier_static->id,
+							'fk_docdet' => 0,
+							'thirdparty_code' => $supplier_static->code_fournisseur,
+							'subledger_account' => '',
+							'subledger_label' => '',
+							'numero_compte' => $acc_vat_ded,
+							'label_compte' => $acc_info_vatbuy['label'],
+							'label_operation' => $label_discount." - " .$langs->transnoentitiesnoconv('VAT') . " (".$rateStr."%)",
+							'montant' => $tva_part,
+							'sens' => 'C',
+							'debit' => 0,
+							'credit' => $tva_part,
+							'code_journal' => $journal,
+							'journal_label' => $journal_label_formatted,
+							'piece_num' => 'OD-ESC-FRS-'.$invoicesupplier_static->ref,
+							'import_key' => '',
+							'fk_user_author' => $user->id,
+							'entity' => $conf->entity,
+						);
+						$element['blocks'][] = $lines_book;
+					}
+				} else {
+					// si TVA = 0, pousser les 2 lignes view/bookkeeping déjà constituées
+					if ($type == 'view') {
+						$element['blocks'][] = $lines_view;
+					} elseif ($type == 'bookkeeping') {
+						$element['blocks'][] = $lines_book;
+					} else { // csv
+						$element['blocks'][] = array($docdate, $invoicesupplier_static->ref, length_accountg($account_supplier_general), $label_discount.' - '.$langs->transnoentitiesnoconv('Supplier'), price($ttc_part), '');
+						$element['blocks'][] = array($docdate, $invoicesupplier_static->ref, length_accountg($acc_disc_recv), $label_discount.' ('.$rateStr.'%)', '', price($ht_part));
+					}
+				}
+
+				// CSV
+				if ($type == 'csv') {
+					$element['blocks'][] = array(
+						$docdate, $invoicesupplier_static->ref, length_accountg($acc_vat_ded), $label_discount." ". $langs->transnoentitiesnoconv('VAT') . " (".$rateStr."%)", '', $tva_part > 0 ? price($tva_part) : ''
+					);
+				}
+			}
+
+			$journal_data[(int) $invoicesupplier_static->id] = $element;
+		}
+
+		return $journal_data;
+	}
+
 	/**
 	 *  Write bookkeeping
 	 *
@@ -986,7 +1613,7 @@ class AccountingJournal extends CommonObject
 				self::$accounting_account_cached[$account] = array(
 					'found' => true,
 					'label' => $accountingaccount->label,
-					'code_formatted_1' => length_accounta(html_entity_decode($account)),
+					'code_formatted_1' => length_accountg(html_entity_decode($account)),
 					'label_formatted_1' => mb_convert_encoding(dol_trunc($accountingaccount->label, 32), 'ISO-8859-1'),
 					'label_formatted_2' => dol_trunc($accountingaccount->label, 32),
 				);
@@ -994,7 +1621,7 @@ class AccountingJournal extends CommonObject
 				self::$accounting_account_cached[$account] = array(
 					'found' => false,
 					'label' => '',
-					'code_formatted_1' => length_accounta(html_entity_decode($account)),
+					'code_formatted_1' => length_accountg(html_entity_decode($account)),
 					'label_formatted_1' => '',
 					'label_formatted_2' => '',
 				);

htdocs/accountancy/class/bookkeeping.class.php

@@ -49,11 +49,6 @@ class BookKeeping extends CommonObject
 	 */
 	public $table_element = 'accounting_bookkeeping';
 
-	/**
-	 * @var int 	Entity
-	 */
-	public $entity;
-
 	/**
 	 * @var BookKeepingLine[] Lines
 	 */
@@ -75,27 +70,27 @@ class BookKeeping extends CommonObject
 	public $date_lim_reglement;
 
 	/**
-	 * @var string 	Doc type
+	 * @var ?string 	Doc type
 	 */
 	public $doc_type;
 
 	/**
-	 * @var string 	Doc ref
+	 * @var ?string 	Doc ref
 	 */
 	public $doc_ref;
 
 	/**
-	 * @var int 	ID
+	 * @var ?int 	ID
 	 */
 	public $fk_doc;
 
 	/**
-	 * @var int 	ID
+	 * @var ?int 	ID
 	 */
 	public $fk_docdet;
 
 	/**
-	 * @var string 	Thirdparty code
+	 * @var ?string 	Thirdparty code
 	 */
 	public $thirdparty_code;
 
@@ -110,69 +105,69 @@ class BookKeeping extends CommonObject
 	public $subledger_label;
 
 	/**
-	 * @var string  doc_type
+	 * @var ?string  doc_type
 	 */
 	public $numero_compte;
 
 	/**
-	 * @var string label compte
+	 * @var ?string label compte
 	 */
 	public $label_compte;
 
 	/**
-	 * @var string label operation
+	 * @var ?string label operation
 	 */
 	public $label_operation;
 
 	/**
-	 * @var float FEC:Debit
+	 * @var ?float FEC:Debit
 	 */
 	public $debit;
 
 	/**
-	 * @var float FEC:Credit
+	 * @var ?float FEC:Credit
 	 */
 	public $credit;
 
 	/**
-	 * @var float FEC:Amount (Not necessary)
+	 * @var ?float FEC:Amount (Not necessary)
 	 * @deprecated No more used (we have info into debit/credit and sens)
 	 */
 	public $montant;
 
 	/**
-	 * @var float FEC:Amount (Not necessary)
+	 * @var ?float FEC:Amount (Not necessary)
 	 * @deprecated No more used (we have info into debit/credit and sens)
 	 */
 	public $amount;
 
 	/**
-	 * @var string FEC:Sens (Not necessary)
+	 * @var ?string FEC:Sens (Not necessary)
 	 */
 	public $sens;
 
 	/**
-	 * @var int ID
+	 * @var ?int ID
 	 */
 	public $fk_user_author;
 
 	/**
-	 * @var string key for import
+	 * @var ?string key for import
 	 */
 	public $import_key;
 
 	/**
-	 * @var string code journal
+	 * @var ?string code journal
 	 */
 	public $code_journal;
 
 	/**
-	 * @var string label journal
+	 * @var ?string label journal
 	 */
 	public $journal_label;
 
 	/**
-	 * @var int accounting transaction id
+	 * @var ?int accounting transaction id
 	 */
 	public $piece_num;
 
@@ -600,7 +595,8 @@ class BookKeeping extends CommonObject
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-		$url = DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$this->piece_num;
+		$baseurl = DOL_URL_ROOT.'/accountancy/bookkeeping/card.php';
+		$query = ['piece_num' => $this->piece_num];
 
 		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
@@ -609,9 +605,10 @@ class BookKeeping extends CommonObject
 				$add_save_lastsearch_values = 1;
 			}
 			if ($add_save_lastsearch_values) {
-				$url .= '&save_lastsearch_values=1';
+				$query += ['save_lastsearch_values' => 1];
 			}
 		}
+		$url = dolBuildUrl($baseurl, $query);
 
 		$linkclose = '';
 		if (empty($notooltip)) {
@@ -1060,7 +1057,7 @@ class BookKeeping extends CommonObject
 			$sql .= " AND t.subledger_account IS NOT NULL";
 			$sql .= " AND t.subledger_account <> ''";
 			$sortfield = 't.subledger_account'.($sortfield ? ','.$sortfield : '');
-			$sortorder = 'ASC'.($sortfield ? ','.$sortfield : '');
+			$sortorder = 'ASC'.($sortorder ? ','.$sortorder : '');
 		} else {
 			$sortfield = 't.numero_compte'.($sortfield ? ','.$sortfield : '');
 			$sortorder = 'ASC'.($sortorder ? ','.$sortorder : '');
@@ -1421,16 +1418,15 @@ class BookKeeping extends CommonObject
 			$sql .= " AND t.subledger_account <> ''";
 			$sql .= " GROUP BY t.numero_compte, t.subledger_account, t.subledger_label";
 			$sortfield = 't.subledger_account'.($sortfield ? ','.$sortfield : '');
-			$sortorder = 'ASC'.($sortfield ? ','.$sortfield : '');
+			$sortorder = 'ASC'.($sortorder ? ','.$sortorder : '');
 		} else {
 			$sql .= ' GROUP BY t.numero_compte';
 			$sortfield = 't.numero_compte'.($sortfield ? ','.$sortfield : '');
 			$sortorder = 'ASC'.($sortorder ? ','.$sortorder : '');
 		}
 
-		if (!empty($sortfield)) {
-			$sql .= $this->db->order($sortfield, $sortorder);
-		}
+		$sql .= $this->db->order($sortfield, $sortorder);
+
 		if (!empty($limit)) {
 			$sql .= $this->db->plimit($limit + 1, $offset);
 		}
@@ -1828,7 +1824,7 @@ class BookKeeping extends CommonObject
 		$this->db->begin();
 
 		// Call triggers
-		if (! $error && ! $notrigger) {
+		if (!$notrigger) {
 			$result = $this->call_trigger('BOOKKEEPING_DELETE', $user);
 			if ($result < 0) {
 				$error++;
@@ -2301,14 +2297,12 @@ class BookKeeping extends CommonObject
 				}
 			}
 		} elseif ($direction == 1) {
-			if (!$error) {
-				$sql = 'DELETE FROM '.$this->db->prefix().$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num).' AND entity = ' .((int) $conf->entity);
-				$resql = $this->db->query($sql);
-				if (!$resql) {
-					$error++;
-					$this->errors[] = 'Error '.$this->db->lasterror();
-					dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
-				}
+			$sql = 'DELETE FROM '.$this->db->prefix().$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num).' AND entity = ' .((int) $conf->entity);
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$error++;
+				$this->errors[] = 'Error '.$this->db->lasterror();
+				dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			}
 
 			if (!$error) {
@@ -3547,7 +3541,7 @@ class BookKeeping extends CommonObject
 	 */
 	public function newCloneMass($toselect, $code_journal, $docdate)
 	{
-		global $langs;
+		global $langs, $user;
 
 		$error = 0;
 		$this->db->begin();
@@ -3601,22 +3595,55 @@ class BookKeeping extends CommonObject
 						if ($bookKeeping->fetch($toselectid)) {
 							$code_journal = getDolGlobalString('ACCOUNTING_CLONING_ENABLE_INPUT_JOURNAL') ? $code_journal : $bookKeeping->code_journal;
 							$journal_label = getDolGlobalString('ACCOUNTING_CLONING_ENABLE_INPUT_JOURNAL') ? $accountingJournal->label : $bookKeeping->journal_label;
-							$sql = "SELECT piece_num, label_operation, numero_compte, label_compte, doc_type, code_journal, fk_user_author, doc_ref, fk_doc, fk_docdet, debit, credit, journal_label, sens, montant ";
-							$sql .= "FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping WHERE rowid = " . ((int) $toselectid);
+							$sql = "SELECT piece_num, label_operation, numero_compte, label_compte, subledger_account, subledger_label, doc_type, code_journal, fk_user_author, doc_ref, fk_doc, fk_docdet, debit, credit, journal_label, sens, montant";
+							$sql .= " FROM ".$this->db->prefix()."accounting_bookkeeping WHERE rowid = " . ((int) $toselectid);
 
 							$resql = $this->db->query($sql);
 							if ($resql) {
 								while ($obj = $this->db->fetch_object($resql)) {
 									$docRef = $langs->trans("CloneOf", $obj->doc_ref);
 
-									$sql_insert = "INSERT INTO ".$this->db->prefix()."accounting_bookkeeping";
-									$sql_insert .= " (piece_num, label_operation, numero_compte, label_compte, doc_type, code_journal, doc_date,";
-									$sql_insert .= " fk_user_author, doc_ref, fk_doc, fk_docdet, debit, credit, journal_label, sens, montant";
+									$sql_insert = "INSERT INTO ".$this->db->prefix()."accounting_bookkeeping (";
+									$sql_insert .= " piece_num";
+									$sql_insert .= ", label_operation";
+									$sql_insert .= ", numero_compte";
+									$sql_insert .= ", label_compte";
+									$sql_insert .= ", subledger_account";
+									$sql_insert .= ", subledger_label";
+									$sql_insert .= ", doc_type";
+									$sql_insert .= ", code_journal";
+									$sql_insert .= ", doc_date";
+									$sql_insert .= ", date_creation";
+									$sql_insert .= ", fk_user_author";
+									$sql_insert .= ", doc_ref";
+									$sql_insert .= ", fk_doc";
+									$sql_insert .= ", fk_docdet";
+									$sql_insert .= ", debit";
+									$sql_insert .= ", credit";
+									$sql_insert .= ", journal_label";
+									$sql_insert .= ", sens";
+									$sql_insert .= ", montant";
 									$sql_insert .= ")";
-									$sql_insert .= " VALUES (" . ((int) $pieceNumNext) . ", '" . $this->db->escape($obj->label_operation) . "', '" . $this->db->escape($obj->numero_compte) . "',";
-									$sql_insert .= " '" . $this->db->escape($obj->label_compte) . "', '" . $this->db->escape($obj->doc_type) . "', '" . $this->db->escape($code_journal) . "', '" . $this->db->idate($docdate)."',";
-									$sql_insert .= " '" . $this->db->escape($obj->fk_user_author) . "', '" . $this->db->escape($docRef) . "', " . ((int) $obj->fk_doc) . ", " . ((int) $obj->fk_docdet) . ",";
-									$sql_insert .= " " . (float) $obj->debit . ", " . (float) $obj->credit . ", '" . $this->db->escape($journal_label) . "', '" . $this->db->escape($obj->sens) . "', " . (float) $obj->montant;
+									$sql_insert .= " VALUES (";
+									$sql_insert .=  $pieceNumNext;
+									$sql_insert .= ", '" . $this->db->escape($obj->label_operation) . "'";
+									$sql_insert .= ", '" . $this->db->escape($obj->numero_compte) . "'";
+									$sql_insert .= ", '" . $this->db->escape($obj->label_compte) . "'";
+									$sql_insert .= ", '" . $this->db->escape($obj->subledger_account) . "'";
+									$sql_insert .= ", '" . $this->db->escape($obj->subledger_label) . "'";
+									$sql_insert .= ", ''";
+									$sql_insert .= ", '" . $this->db->escape($code_journal) . "'";
+									$sql_insert .= ", '" . $this->db->idate($docdate)."'";
+									$sql_insert .= ", '" . $this->db->idate($now)."'";
+									$sql_insert .= ", ".($user->id > 0 ? ((int) $user->id) : "NULL");
+									$sql_insert .= ", '" . $this->db->escape($docRef) . "'";
+									$sql_insert .= ", 0";
+									$sql_insert .= ", 0";
+									$sql_insert .= ", " . (float) $obj->debit;
+									$sql_insert .= ", " . (float) $obj->credit;
+									$sql_insert .= ", '" . $this->db->escape($journal_label) . "'";
+									$sql_insert .= ", '" . $this->db->escape($obj->sens) . "'";
+									$sql_insert .= ", " . (float) $obj->montant;
 									$sql_insert .= ")";
 
 									$resqlInsert = $this->db->query($sql_insert);

htdocs/accountancy/class/lettering.class.php

@@ -557,7 +557,7 @@ class Lettering extends BookKeeping
 				$group_error++;
 			}
 
-			// Lettering/Unlettering the group of bookkeeping lines
+			// Matching/Unmatching the group of bookkeeping lines
 			if (!$group_error && $do_it) {
 				if ($unlettering) {
 					$result = $this->deleteLettering($bookkeeping_lines);
@@ -929,6 +929,10 @@ class Lettering extends BookKeeping
 			// Save list when is the first step of the recursive recursive function
 			$save_link_by_element = $link_by_element;
 			$save_element_by_link = $element_by_link;
+		} else {
+			// To satisfy static analysis (phpstan)
+			$save_link_by_element = null;
+			$save_element_by_link = null;
 		}
 
 		do {

htdocs/accountancy/closure/index.php

@@ -146,7 +146,7 @@ if (empty($reshook)) {
 			if ($result > 0) {
 				setEventMessages($langs->trans("AllMovementsWereRecordedAsValidated"), null, 'mesgs');
 
-				header("Location: " . $_SERVER['PHP_SELF'] . (isset($current_fiscal_period) ? '?fiscal_period_id=' . $current_fiscal_period['id'] : ''));
+				header("Location: " . $_SERVER['PHP_SELF'] . '?fiscal_period_id=' . $current_fiscal_period['id']);
 				exit;
 			} else {
 				setEventMessages($langs->trans("NotAllMovementsCouldBeRecordedAsValidated"), null, 'errors');
@@ -176,7 +176,7 @@ if (empty($reshook)) {
 				} else {
 					setEventMessages($langs->trans("AccountancyClosureCloseSuccessfully"), null, 'mesgs');
 
-					header("Location: " . $_SERVER['PHP_SELF'] . (isset($current_fiscal_period) ? '?fiscal_period_id=' . $current_fiscal_period['id'] : ''));
+					header("Location: " . $_SERVER['PHP_SELF'] . '?fiscal_period_id=' . $current_fiscal_period['id']);
 					exit;
 				}
 			}
@@ -192,7 +192,7 @@ if (empty($reshook)) {
 			} else {
 				setEventMessages($langs->trans("AccountancyClosureInsertAccountingReversalSuccessfully"), null, 'mesgs');
 
-				header("Location: " . $_SERVER['PHP_SELF'] . (isset($current_fiscal_period) ? '?fiscal_period_id=' . $current_fiscal_period['id'] : ''));
+				header("Location: " . $_SERVER['PHP_SELF'] . '?fiscal_period_id=' . $current_fiscal_period['id']);
 				exit;
 			}
 		}
@@ -345,7 +345,7 @@ $fiscal_period_nav_text = $langs->trans("FiscalPeriod");
 $fiscal_period_nav_text .= '&nbsp;<a href="' . (isset($last_fiscal_period) ? $_SERVER["PHP_SELF"] . '?fiscal_period_id=' . $last_fiscal_period['id'] : '#" class="disabled') . '">' . img_previous() . '</a>';
 $fiscal_period_nav_text .= '&nbsp;<a href="' . (isset($next_fiscal_period) ? $_SERVER["PHP_SELF"] . '?fiscal_period_id=' . $next_fiscal_period['id'] : '#" class="disabled') . '">' . img_next() . '</a>';
 if (!empty($current_fiscal_period)) {
-	$fiscal_period_nav_text .= $current_fiscal_period['label'].' &nbsp;(' . (isset($current_fiscal_period) ? dol_print_date($current_fiscal_period['date_start'], 'day') . '&nbsp;-&nbsp;' . dol_print_date($current_fiscal_period['date_end'], 'day') . ')' : '');
+	$fiscal_period_nav_text .= $current_fiscal_period['label'].' &nbsp;(' . dol_print_date($current_fiscal_period['date_start'], 'day') . '&nbsp;-&nbsp;' . dol_print_date($current_fiscal_period['date_end'], 'day') . ')';
 }
 
 print load_fiche_titre($langs->trans("Closure") . " - " . $fiscal_period_nav_text, '', 'title_accountancy');

htdocs/accountancy/customer/lines.php

@@ -49,6 +49,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array("bills", "compta", "accountancy", "productbatch", "products"));
 
+$action = GETPOST('action');
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 $account_parent = GETPOST('account_parent');
@@ -112,6 +113,7 @@ $contextpage = 'accountancycustomerlines';
 $hookmanager->initHooks([$contextpage ]);
 $formaccounting = new FormAccounting($db);
 
+$object = new stdClass();
 
 $arrayfields = array(
 	'fd.rowid' 				=> array('label' => "LineId", 				'position' => 1, 'checked' => '1', 'enabled' => '1'),
@@ -129,6 +131,7 @@ $arrayfields = array(
 // @phpstan-ignore-next-line
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
+
 /*
  * Actions
  */
@@ -355,7 +358,7 @@ $nbtotalofrecords = '';
 if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > (int) $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}

htdocs/accountancy/customer/list.php

@@ -29,7 +29,14 @@
  * \brief 		Ventilation page from customers invoices
  */
 require '../../main.inc.php';
-
+/**
+ * @var Conf $conf
+ * @var DoliDB $db
+ * @var HookManager $hookmanager
+ * @var Societe $mysoc
+ * @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.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
@@ -40,14 +47,6 @@ 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.'/core/lib/company.lib.php';
 
-/**
- * @var Conf $conf
- * @var DoliDB $db
- * @var HookManager $hookmanager
- * @var Societe $mysoc
- * @var Translate $langs
- * @var User $user
- */
 
 // Load translation files required by the page
 $langs->loadLangs(array("bills", "companies", "compta", "accountancy", "other", "productbatch", "products"));
@@ -55,15 +54,12 @@ $langs->loadLangs(array("bills", "companies", "compta", "accountancy", "other",
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
-$toselect = GETPOST('toselect', 'array');
+$toselect = GETPOST('toselect', 'array:aZ09');	// Value can be 'X_Y'
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'accountancycustomerlist'; // To manage different context of search
 $optioncss = GETPOST('optioncss', 'alpha');
 
 $default_account = GETPOSTINT('default_account');
 
-// Select Box
-$mesCasesCochees = GETPOST('toselect', 'array');
-
 // Search Getpost
 $search_societe = GETPOST('search_societe', 'alpha');
 $search_lineid = GETPOST('search_lineid', 'alpha');		// Can be '> 100'
@@ -206,21 +202,20 @@ if (empty($reshook)) {
 if ($massaction == 'ventil' && $user->hasRight('accounting', 'bind', 'write')) {
 	$msg = '';
 
-	//print '<div><span style="color:red">' . $langs->trans("Processing") . '...</span></div>';
-	if (!empty($mesCasesCochees)) {
-		$msg = '<div>'.$langs->trans("SelectedLines").': '.count($mesCasesCochees).'</div>';
+	if (!empty($toselect)) {
+		$msg = '<div>'.$langs->trans("SelectedLines").': '.count($toselect).'</div>';
 		$msg .= '<div class="detail">';
 		$cpt = 0;
 		$ok = 0;
 		$ko = 0;
 
-		foreach ($mesCasesCochees as $maLigneCochee) {
+		foreach ($toselect as $maLigneCochee) {
 			$maLigneCourante = explode("_", $maLigneCochee);
 			$monId = $maLigneCourante[0];
 			$monCompte = GETPOSTINT('codeventil'.$monId);
 
 			if ($monCompte <= 0) {
-				$msg .= '<div><span style="color:red">'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NoAccountSelected").'</span></div>';
+				$msg .= '<div><span class="error">'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NoAccountSelected").'</span></div>';
 				$ko++;
 			} else {
 				$sql = " UPDATE ".MAIN_DB_PREFIX."facturedet";
@@ -401,7 +396,7 @@ $nbtotalofrecords = '';
 if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > (int) $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}

htdocs/accountancy/expensereport/lines.php

@@ -298,7 +298,7 @@ $nbtotalofrecords = '';
 if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > (int) $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}

htdocs/accountancy/expensereport/list.php

@@ -51,14 +51,10 @@ $langs->loadLangs(array("bills", "companies", "compta", "accountancy", "other",
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
-$toselect = GETPOST('toselect', 'array');
+$toselect = GETPOST('toselect', 'array:aZ09');	// Value can be 'X_Y'
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'accountancyexpensereportlist'; // To manage different context of search
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
-
-// Select Box
-$mesCasesCochees = GETPOST('toselect', 'array');
-
 // Search Getpost
 $search_login = GETPOST('search_login', 'alpha');
 $search_lineid = GETPOST('search_lineid', 'alpha');
@@ -199,14 +195,14 @@ if (empty($reshook)) {
 if ($massaction == 'ventil' && $user->hasRight('accounting', 'bind', 'write')) {
 	$msg = '';
 
-	if (!empty($mesCasesCochees)) {
-		$msg = '<div>'.$langs->trans("SelectedLines").': '.count($mesCasesCochees).'</div>';
+	if (!empty($toselect)) {
+		$msg = '<div>'.$langs->trans("SelectedLines").': '.count($toselect).'</div>';
 		$msg .= '<div class="detail">';
 		$cpt = 0;
 		$ok = 0;
 		$ko = 0;
 
-		foreach ($mesCasesCochees as $maLigneCochee) {
+		foreach ($toselect as $maLigneCochee) {
 			$maLigneCourante = explode("_", $maLigneCochee);
 			$monId = $maLigneCourante[0];
 			$monCompte = GETPOSTINT('codeventil'.$monId);
@@ -330,7 +326,7 @@ $nbtotalofrecords = '';
 if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > (int) $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}

htdocs/accountancy/journal/bankjournal.php

@@ -196,6 +196,21 @@ if ($only_rappro == 2) {
 $sql .= " ORDER BY b.datev";
 //print $sql;
 
+// Preload payment account codes by payment type from c_paiement
+$accountancy_code_by_payment = array();
+$sql2 = "SELECT code, accountancy_code";
+$sql2 .= " FROM ".MAIN_DB_PREFIX."c_paiement";
+$sql2 .= " WHERE entity IN (".getEntity('c_paiement').")";
+$sql2 .= " AND active = 1";
+$resql = $db->query($sql2);
+if ($resql) {
+	while ($objp = $db->fetch_object($resql)) {
+		if (!empty($objp->code) && !empty($objp->accountancy_code)) {
+			$accountancy_code_by_payment[$objp->code] = $objp->accountancy_code;
+		}
+	}
+}
+
 $object = new Account($db);
 $paymentstatic = new Paiement($db);
 $paymentsupplierstatic = new PaiementFourn($db);
@@ -295,6 +310,11 @@ if ($result) {
 		// Set accountancy code for bank
 		$compta_bank = $obj->account_number;
 
+		// Determining the bank account by payment method
+		if (!empty($obj->fk_type) && !empty($accountancy_code_by_payment[$obj->fk_type])) {
+			$compta_bank = $accountancy_code_by_payment[$obj->fk_type];
+		}
+
 		// Set accountancy code for thirdparty (example: '411CU...' or '411' if no subledger account defined on customer)
 		$compta_soc = 'NotDefined';
 		$accountancy_code_general = 'NotDefined';
@@ -362,6 +382,32 @@ if ($result) {
 			$amounttouse = $obj->amount_main_currency;
 		}
 
+		// in case option FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS is on, payment could be for more than one third-partie
+		// so we have to find which part of the payment is affected to each third-parties
+		// (because in this case $obj-amount = the total of the paiement and not the paiement for each third-parties)
+		if (getDolGlobalString('FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS') && ($lineisapurchase == 1 || $lineisasale == 1) ) {
+			if ($lineisapurchase == 1) {
+				$sqlamount = "SELECT SUM(pf.amount) as amount";
+				$sqlamount .= " FROM ".MAIN_DB_PREFIX."paiementfourn_facturefourn AS pf";
+				$sqlamount .= " INNER JOIN ".MAIN_DB_PREFIX."paiementfourn AS p ON pf.fk_paiementfourn = p.rowid";
+				$sqlamount .= " RIGHT JOIN ".MAIN_DB_PREFIX."facture AS f ON pf.fk_facturefourn = f.rowid";
+				$sqlamount .= " WHERE p.fk_bank = ".((int) $obj->rowid);
+				$sqlamount .= " AND f.fk_soc = ".((int) $obj->socid);
+			} else {
+				$sqlamount = "SELECT SUM(pf.amount) as amount";
+				$sqlamount .= " FROM ".MAIN_DB_PREFIX."paiement_facture AS pf";
+				$sqlamount .= " INNER JOIN ".MAIN_DB_PREFIX."paiement AS p ON pf.fk_paiement = p.rowid";
+				$sqlamount .= " RIGHT JOIN ".MAIN_DB_PREFIX."facture AS f ON pf.fk_facture = f.rowid";
+				$sqlamount .= " WHERE p.fk_bank = ".((int) $obj->rowid);
+				$sqlamount .= " AND f.fk_soc = ".((int) $obj->socid);
+			}
+			$resultamount = $db->query($sqlamount);
+			if ($resultamount) {
+				$objamount = $db->fetch_object($resultamount);
+				if (!empty($objamount->amount)) $amounttouse = $objamount->amount;
+			}
+		}
+
 		// get_url may return -1 which is not traversable
 		if (is_array($links) && count($links) > 0) {
 			// Test if entry is for a social contribution, salary or expense report.
@@ -427,10 +473,17 @@ if ($result) {
 					$societestatic->email = $tabcompany[$obj->rowid]['email'];
 					$tabpay[$obj->rowid]["soclib"] = $societestatic->getNomUrl(1, '', 30);
 					if ($compta_soc) {
-						if (empty($tabtp[$obj->rowid][$compta_soc])) {
-							$tabtp[$obj->rowid][$compta_soc] = $amounttouse;
-						} else {
-							$tabtp[$obj->rowid][$compta_soc] += $amounttouse;
+						// because we are in 2 loop (loop on the line from the sql queries and loop on $links)
+						// and in case of option FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS is on,
+						// we will pass here n times for each payment line
+						// so we have to add $amoutouse only if the line $links[$key] correspond to the payment line we are in used ( socid correspondinf at the payment line $links)
+						// if FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS is off we add $amounttouse
+						if (!getDolGlobalString('FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS') || $obj->socid == $links[$key]['url_id']){
+							if (empty($tabtp[$obj->rowid][$compta_soc])) {
+								$tabtp[$obj->rowid][$compta_soc] = $amounttouse;
+							} else {
+								$tabtp[$obj->rowid][$compta_soc] += $amounttouse;
+							}
 						}
 					}
 				} elseif ($links[$key]['type'] == 'user') {
@@ -626,7 +679,7 @@ if ($result) {
 		}
 
 		// If no links were found to know the amount on thirdparty, we try to guess it.
-		// This may happens on bank entries without the links lines to 'company'.
+		// This may happen on bank entries without the links lines to 'company'.
 		if (empty($tabtp[$obj->rowid]) && !empty($tabmoreinfo[$obj->rowid]['withdraw'])) {	// If we don't find 'company' link because it is an old 'withdraw' record
 			foreach ($links as $key => $val) {
 				if ($links[$key]['type'] == 'payment') {

htdocs/accountancy/journal/expensereportsjournal.php

@@ -583,7 +583,7 @@ if ($action == 'exportcsv' && !$error) {		// ISO and not UTF8 !
 				print '"'.$date.'"'.$sep;
 				print '"'.$val["ref"].'"'.$sep;
 				print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
-				print '"'.csvClean($bookkeepingstatic->accountingLabelForOperation($userstatic->name, '', $langs->trans("VAT").implode($def_tva[$key][$k]).' %')).'"'.$sep;
+				print '"'.csvClean($bookkeepingstatic->accountingLabelForOperation($userstatic->name, '', $langs->trans("VAT").(isset($def_tva[$key]) ? implode($def_tva[$key][$k]) : '').' %')).'"'.$sep;
 				print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
 				print '"'.($mt < 0 ? price(-$mt) : '').'"';
 				print "\n";

htdocs/accountancy/journal/purchasesjournal.php

@@ -9,6 +9,7 @@
  * Copyright (C) 2018-2025  Frédéric France				<frederic.france@free.fr>
  * Copyright (C) 2018		Eric Seigne					<eric.seigne@cap-rel.fr>
  * Copyright (C) 2024-2025	MDW							<mdeweerd@users.noreply.github.com>
+ * Copyright (C) 2025		Vincent de Grandporé        <vincent@de-grandpre.quebec>
  *
  * 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
@@ -139,7 +140,7 @@ if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))
 }
 
 $sql = "SELECT f.rowid, f.ref as ref, f.type, f.datef as df, f.libelle as label, f.ref_supplier, f.date_lim_reglement as dlr, f.close_code, f.vat_reverse_charge,";
-$sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.tva as total_tva, fd.total_localtax1, fd.total_localtax2, fd.tva_tx, fd.total_ttc, fd.vat_src_code, fd.info_bits,";
+$sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.tva as total_tva, fd.total_localtax1, fd.total_localtax2, fd.tva_tx, fd.localtax1_tx, fd.localtax2_tx, fd.total_ttc, fd.vat_src_code, fd.info_bits,";
 $sql .= " p.default_vat_code AS product_buy_default_vat_code, p.tva_tx as product_buy_vat, p.localtax1_tx as product_buy_localvat1, p.localtax2_tx as product_buy_localvat2,";
 $sql .= " co.code as country_code, co.label as country_label,";
 $sql .= " s.rowid as socid, s.nom as name, s.fournisseur, s.code_client, s.code_fournisseur, s.fk_pays,";
@@ -225,6 +226,12 @@ $cptfour = getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER', 'NotDefined');
 $cpttva = getDolGlobalString('ACCOUNTING_VAT_BUY_ACCOUNT', 'NotDefined');
 $rcctva = getDolGlobalString('ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT', 'NotDefined');
 $rcdtva = getDolGlobalString('ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT', 'NotDefined');
+$cptlocaltax1 = getDolGlobalString('ACCOUNTING_LT1_BUY_ACCOUNT', 'NotDefined');
+$rcclocaltax1 = getDolGlobalString('ACCOUNTING_LT1_BUY_REVERSE_CHARGES_CREDIT', 'NotDefined');
+$rcdlocaltax1 = getDolGlobalString('ACCOUNTING_LT1_BUY_REVERSE_CHARGES_DEBIT', 'NotDefined');
+$cptlocaltax2 = getDolGlobalString('ACCOUNTING_LT2_BUY_ACCOUNT', 'NotDefined');
+$rcclocaltax2 = getDolGlobalString('ACCOUNTING_LT2_BUY_REVERSE_CHARGES_CREDIT', 'NotDefined');
+$rcdlocaltax2 = getDolGlobalString('ACCOUNTING_LT2_BUY_REVERSE_CHARGES_DEBIT', 'NotDefined');
 $noTaxDispatchingKeepWithLines = getDolGlobalInt('ACCOUNTING_PURCHASES_DO_NOT_DISPATCH_TAXES'); //If enabled, Tax will NOT get split off from the base entry and credited to a separate tax account (good for non-VAT countries like USA)
 $country_code_in_EEC = getCountriesInEEC();		// This make a database call but there is a cache done into $conf->cache['country_code_in_EEC']
 
@@ -257,13 +264,19 @@ if ($result) {
 			$vatdata_cache[$tax_id] = $vatdata;
 		}
 		$compta_tva = (!empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva);
-		$compta_localtax1 = (!empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva);
-		$compta_localtax2 = (!empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva);
+		$compta_localtax1 = (!empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cptlocaltax1);
+		$compta_localtax2 = (!empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cptlocaltax2);
 		$compta_counterpart_tva_npr = getDolGlobalString('ACCOUNTING_COUNTERPART_VAT_NPR', 'NotDefined');
 
 		// Define an array to display all VAT rates that use this accounting account $compta_tva
 		if (price2num($obj->tva_tx) || !empty($obj->vat_src_code)) {
 			$def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : '')] = (vatrate($obj->tva_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''));
+			if ($obj->localtax1_tx > 0.0) {
+				$def_tva[$obj->rowid][$compta_localtax1][vatrate($obj->localtax1_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : '').' LT1'] = (vatrate($obj->localtax1_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''));
+			}
+			if ($obj->localtax2_tx > 0.0) {
+				$def_tva[$obj->rowid][$compta_localtax2][vatrate($obj->localtax2_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : '').' LT2'] = (vatrate($obj->localtax2_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''));
+			}
 		}
 
 		//$line = new SupplierInvoiceLine($db);
@@ -301,10 +314,10 @@ if ($result) {
 			$rcvatdata = getTaxesFromId($obj->product_buy_vat . ($obj->product_buy_default_vat_code ? ' (' . $obj->product_buy_default_vat_code . ')' : ''), $mysoc, $mysoc, 0);
 			$rcc_compta_tva = (!empty($vatdata['accountancy_code_vat_reverse_charge_credit']) ? $vatdata['accountancy_code_vat_reverse_charge_credit'] : $rcctva);
 			$rcd_compta_tva = (!empty($vatdata['accountancy_code_vat_reverse_charge_debit']) ? $vatdata['accountancy_code_vat_reverse_charge_debit'] : $rcdtva);
-			$rcc_compta_localtax1 = (!empty($vatdata['accountancy_code_vat_reverse_charge_credit']) ? $vatdata['accountancy_code_vat_reverse_charge_credit'] : $rcctva);
-			$rcd_compta_localtax1 = (!empty($vatdata['accountancy_code_vat_reverse_charge_debit']) ? $vatdata['accountancy_code_vat_reverse_charge_debit'] : $rcdtva);
-			$rcc_compta_localtax2 = (!empty($vatdata['accountancy_code_vat_reverse_charge_credit']) ? $vatdata['accountancy_code_vat_reverse_charge_credit'] : $rcctva);
-			$rcd_compta_localtax2 = (!empty($vatdata['accountancy_code_vat_reverse_charge_debit']) ? $vatdata['accountancy_code_vat_reverse_charge_debit'] : $rcdtva);
+			$rcc_compta_localtax1 = (!empty($vatdata['accountancy_code_vat_reverse_charge_credit']) ? $vatdata['accountancy_code_vat_reverse_charge_credit'] : $rcclocaltax1);
+			$rcd_compta_localtax1 = (!empty($vatdata['accountancy_code_vat_reverse_charge_debit']) ? $vatdata['accountancy_code_vat_reverse_charge_debit'] : $rcdlocaltax1);
+			$rcc_compta_localtax2 = (!empty($vatdata['accountancy_code_vat_reverse_charge_credit']) ? $vatdata['accountancy_code_vat_reverse_charge_credit'] : $rcclocaltax2);
+			$rcd_compta_localtax2 = (!empty($vatdata['accountancy_code_vat_reverse_charge_debit']) ? $vatdata['accountancy_code_vat_reverse_charge_debit'] : $rcdlocaltax2);
 			if (price2num($obj->product_buy_vat) || !empty($obj->product_buy_default_vat_code)) {
 				$vat_key = vatrate($obj->product_buy_vat) . ($obj->product_buy_default_vat_code ? ' (' . $obj->product_buy_default_vat_code . ')' : '');
 				$val_value = $vat_key;

htdocs/accountancy/journal/sellsjournal.php

@@ -10,6 +10,7 @@
  * Copyright (C) 2014		Raphaël Doursenaud			<rdoursenaud@gpcsolutions.fr>
  * 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		Vincent de Grandporé        <vincent@de-grandpre.quebec>
  *
  * 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
@@ -140,7 +141,7 @@ if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))
 }
 
 $sql = "SELECT f.rowid, f.ref, f.type, f.situation_cycle_ref, f.datef as df, f.ref_client, f.date_lim_reglement as dlr, f.close_code, f.retained_warranty, f.revenuestamp, f.situation_final,";
-$sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.total_tva, fd.total_localtax1, fd.total_localtax2, fd.tva_tx, fd.total_ttc, fd.situation_percent, fd.vat_src_code, fd.info_bits,";
+$sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.total_tva, fd.total_localtax1, fd.total_localtax2, fd.tva_tx, fd.localtax1_tx, fd.localtax2_tx, fd.total_ttc, fd.situation_percent, fd.vat_src_code, fd.info_bits,";
 $sql .= " s.rowid as socid, s.nom as name, s.code_client, s.code_fournisseur,";
 if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 	$sql .= " spe.accountancy_code_customer_general,";
@@ -223,6 +224,8 @@ $vatdata_cache = array();
 // Variables
 $cptcli = getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER', 'NotDefined');
 $cpttva = getDolGlobalString('ACCOUNTING_VAT_SOLD_ACCOUNT', 'NotDefined');
+$cptlocaltax1 = getDolGlobalString('ACCOUNTING_LT1_SOLD_ACCOUNT', 'NotDefined');
+$cptlocaltax2 = getDolGlobalString('ACCOUNTING_LT2_SOLD_ACCOUNT', 'NotDefined');
 
 $result = $db->query($sql);
 if ($result) {
@@ -262,12 +265,18 @@ if ($result) {
 			$vatdata_cache[$tax_id] = $vatdata;
 		}
 		$compta_tva = (!empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cpttva);
-		$compta_localtax1 = (!empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cpttva);
-		$compta_localtax2 = (!empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cpttva);
+		$compta_localtax1 = (!empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cptlocaltax1);
+		$compta_localtax2 = (!empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cptlocaltax2);
 
 		// Define the array to store the detail of each vat rate and code for lines
 		if (price2num($obj->tva_tx) || !empty($obj->vat_src_code)) {
 			$def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : '')] = (vatrate($obj->tva_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''));
+			if ($obj->localtax1_tx > 0.0) {
+				$def_tva[$obj->rowid][$compta_localtax1][vatrate($obj->localtax1_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : '').' LT1'] = (vatrate($obj->localtax1_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''));
+			}
+			if ($obj->localtax2_tx > 0.0) {
+				$def_tva[$obj->rowid][$compta_localtax2][vatrate($obj->localtax2_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : '').' LT2'] = (vatrate($obj->localtax2_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''));
+			}
 		}
 
 		// Create a compensation rate for situation invoice.