Merge branch 'develop' into byproject

.pre-commit-config.yaml

@@ -43,7 +43,7 @@ repos:
       - id: end-of-file-fixer
       # Check that there are no completely merged file conflicts
       - id: check-merge-conflict
-        stages: [pre-commit, pre-rebase, pre-commit, pre-merge-commit]
+        stages: [commit, pre-rebase, pre-commit, pre-merge-commit]
       # Check that files with shebangs have the executable bit set (in git)
       - id: check-executables-have-shebangs
       # Check that shell files are executables
@@ -252,7 +252,7 @@ repos:
     rev: 3.1.0
     hooks:
       - id: sqlfluff-lint
-        stages: [pre-commit, manual]  # manual needed for ci
+        stages: [commit, manual]  # manual needed for ci
         exclude: (?x)^
           (dev/initdemo/mysqldump_.*\.sql
           |htdocs/core/menus/init_menu_auguria\.sql

.travis.yml

@@ -37,7 +37,7 @@ cache:
 jobs:
   fast_finish: true
   allow_failures:
-  - php: '8.3'
+  - php: '8.4'
   include:
     - stage: PHP min and max
       if: type = push
@@ -47,16 +47,16 @@ jobs:
       - TRAVIS_PHP_VERSION=7.1
     - stage: PHP min and max
       if: type = pull_request OR type = push
-      php: '8.2'
+      php: '8.3'
       env:
       - DB=mysql
-      - TRAVIS_PHP_VERSION=8.2
-    - stage: PHP 8.3
+      - TRAVIS_PHP_VERSION=8.3
+    - stage: PHP 8.4
       if: type = push AND branch = develop
-      php: '8.3'
+      php: '8.4'
       env:
       - DB=mysql
-      - TRAVIS_PHP_VERSION=8.3
+      - TRAVIS_PHP_VERSION=8.4
 
 notifications:
   email:
@@ -94,6 +94,9 @@ before_install:
   if [ "$TRAVIS_PHP_VERSION" = '8.3' ]; then
   	sudo apt install unzip apache2 php8.3 php8.3-cli php8.3-curl php8.3-mysql php8.3-pgsql php8.3-gd php8.3-imap php8.3-intl php8.3-ldap php8.3-xml php8.3-mbstring php8.3-xml php8.3-zip libapache2-mod-php8.3
   fi
+  if [ "$TRAVIS_PHP_VERSION" = '8.4' ]; then
+    sudo apt install unzip apache2 php8.4 php8.4-cli php8.4-curl php8.4-mysql php8.4-pgsql php8.4-gd php8.4-imap php8.4-intl php8.4-ldap php8.4-xml php8.4-mbstring php8.4-xml php8.4-zip libapache2-mod-php8.4
+  fi
 
 - |
   echo Install pgsql if run is for pgsql
@@ -164,7 +167,7 @@ install:
                         squizlabs/php_codesniffer ^3
   fi
   # phpunit 9 is required for php 8
-  if [ "$TRAVIS_PHP_VERSION" = '8.0' ] || [ "$TRAVIS_PHP_VERSION" = '8.1' ] || [ "$TRAVIS_PHP_VERSION" = '8.2' ] || [ "$TRAVIS_PHP_VERSION" = '8.3' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
+  if [ "$TRAVIS_PHP_VERSION" = '8.0' ] || [ "$TRAVIS_PHP_VERSION" = '8.1' ] || [ "$TRAVIS_PHP_VERSION" = '8.2' ] || [ "$TRAVIS_PHP_VERSION" = '8.3' ] || [ "$TRAVIS_PHP_VERSION" = '8.4' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
       sudo composer self-update 2.4.4
       composer -n require --ignore-platform-reqs phpunit/phpunit ^8 \
                                                  php-parallel-lint/php-parallel-lint ^1.2 \
@@ -354,6 +357,13 @@ script:
         --exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/maximebf \
         --exclude htdocs/includes/phpunit/ --exclude htdocs/includes/tecnickcom/tcpdf/include/barcodes --exclude htdocs/includes/webmozart --exclude htdocs/includes/webklex --blame .
     fi
+    if [ "$TRAVIS_PHP_VERSION" = "8.4" ]; then
+      parallel-lint -e php --exclude dev/tools/test/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \
+        --exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian \
+        --exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/php-parallel-lint --exclude htdocs/includes/symfony \
+        --exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/maximebf \
+        --exclude htdocs/includes/phpunit/ --exclude htdocs/includes/tecnickcom/tcpdf/include/barcodes --exclude htdocs/includes/webmozart --exclude htdocs/includes/webklex --blame .
+    fi
     set +e
     echo
 
@@ -373,6 +383,9 @@ script:
     if [ "$TRAVIS_PHP_VERSION" = "8.3" ]; then
       phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --severity=1 ${CACHE_OPT} --runtime-set ignore_warnings_on_exit true .;
     fi
+    if [ "$TRAVIS_PHP_VERSION" = "8.4" ]; then
+      phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --severity=1 ${CACHE_OPT} --runtime-set ignore_warnings_on_exit true .;
+    fi
     set +e
     echo
 
@@ -391,6 +404,9 @@ script:
     if [ "$TRAVIS_PHP_VERSION" = "8.3" ]; then
        var-dump-check --extensions php --tracy --exclude htdocs/includes --exclude test/ --exclude htdocs/public/test/ --exclude htdocs/core/lib/functions.lib.php .
     fi
+    if [ "$TRAVIS_PHP_VERSION" = "8.4" ]; then
+       var-dump-check --extensions php --tracy --exclude htdocs/includes --exclude test/ --exclude htdocs/public/test/ --exclude htdocs/core/lib/functions.lib.php .
+    fi
     set +e
     echo
 

ChangeLog

@@ -26,6 +26,7 @@ The following changes may create regressions for some external modules, but were
   be set (not allowed by PHP 8.2). A module can already return an array with key 'no_button_delete', 'no_button_edit', 'no_button_copy' for same purpose.
 * The old function dol_bc($var, $moreclass = '') has been removed. If you called it, just stop to call it.
 * The trigger code CATEGORY_LINK and CATEGORY_UNLINK has been replaced with code CATEGORY_MODIFY. You can read ->context['linkto'] or ->context['unlinkoff' to detect we want to make a link or unlink.
+* The property ->domiciliation and ->propio on bank accounts has been deprecated and replaced with property ->address and ->owner_name
 
 ***** ChangeLog for 20.0.1 compared to 20.0.0 *****
 

build/exe/doliwamp/index.php.install

@@ -562,12 +562,11 @@ a:hover {
 	<ul class="tools">
 		<li><a target="_blank" href="index.php?phpinfo=1">Phpinfo</a></li>
 		<li><a target="_blank" href="server-status">Server-status</a></li>
-		<li><a target="_blank" href="/dolibarr/support/index.php">{$langues[$langue]['askhelp']}</a></li>
 	</ul>
 
 
 	<ul id="foot">
-		<li><a href="https://www.nltechno.com/pages/dolibarrwinbin.php">DoliWamp project</a> was built from modified sources of <a href="http://www.wampserver.com">WampServer project</a> from Anaska</li>
+		<li>DoliWamp package was built from modified sources of <a href="http://www.wampserver.com">WampServer project</a> from Anaska</li>
 	</ul>
 </body>
 </html>

dev/setup/pre-commit/README.md

@@ -75,14 +75,16 @@ git commit -a -m "My message" --no-verify
 ```
 
 If you want to skip certain checks for whatever reason, you can set the SKIP
-environment variable:
+environment variable into the .git/hooks/pre-commit file:
 
 ```bash
-SKIP=no-commit-to-branch git commit -a -m "My message"
+export SKIP=no-commit-to-branch
+```
 
-or
+You can also switch output to text only, by setting the PRE_COMMIT_COLOR in .git/hooks/pre-commit file:
 
-export SKIP=no-commit-to-branch   # In your .bashrc or session.
+```bash
+export PRE_COMMIT_COLOR=never
 ```
 
 There is much more you can do with pre-commit, check out its

dev/tools/codespell/codespell-ignore.txt

@@ -89,6 +89,7 @@ datee
 # Translation keys
 addin
 amountin
+alltime
 
 # other
 blacklists