13.0 fix migration missing tms auto update (#33443 )

* tms field in llx_product is not updated to default timestamp * but that's not the only one ...
Fix user::load_previous_next_ref() with MULTICOMPANY_TRANSVERSE_MODE bad sql query (cartesian product replaced by INNER JOIN) (#31946 )
2025-12-05 17:18:13 +01:00 · 2025-03-13 23:01:52 +01:00 · 2024-11-16 18:19:59 +01:00 · 2024-11-16 18:10:08 +01:00 · 2024-10-29 15:44:55 +01:00 · 2024-10-29 15:44:25 +01:00
15149 changed files with 925590 additions and 1751706 deletions
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -4,10 +4,10 @@ languages:
  JavaScript: true
  PHP: true
 engines:
-  phpcodesniffer: true
+  phpcodesniffer: true  
 exclude_paths:
  - 'build/*'
  - 'dev/*'
  - 'doc/*'
  - 'test/*'
-  - 'htdocs/includes/*'
+  - 'htdocs/includes/*'
--- a/.editorconfig
+++ b/.editorconfig
@@ -22,7 +22,3 @@ indent_style = tab
 indent_style = tab
 [*.md]
 trim_trailing_whitespace = false
-[*.sql]
-indent_style = tab
-trim_trailing_whitespace = true
-indent_size = 4
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,7 +3,7 @@
 * text=auto


-# Explicitly declare text files we want to always be normalized and converted
+# Explicitly declare text files we want to always be normalized and converted 
 # to native line endings on checkout.
 *.php text eol=lf
 *.pl text eol=lf
@@ -11,32 +11,26 @@
 *.htm text eol=lf
 *.html text eol=lf
 *.js text eol=lf
-*.json text eol=lf
 *.css text eol=lf
 *.lang text eol=lf
 *.txt text eol=lf
 *.md text eol=lf
 *.pp text eol=lf
 *.sh text eol=lf
-*.yml text eol=lf
 *.yaml text eol=lf
-*.conf text eol=lf
-*.neon text eol=lf

 .bash_aliases text eol=lf

 # Denote all files that are truly binary and should not be modified.
 *.bmp binary
-*.frm binary
 *.ico binary
-*.jpeg binary
+*.png binary
 *.jpg binary
+*.odt binary
+*.odf binary
+*.frm binary
 *.MYD binary
 *.MYI binary
-*.odf binary
-*.odt binary
-*.png binary
-

 # Export ignores to generate clean production tarballs
 /build              export-ignore
--- a/.github/CODE_OF_CONDUCT.md
+++ b/.github/CODE_OF_CONDUCT.md
@@ -77,8 +77,8 @@ contact@dolibarr.org

 ## 10. License and attribution

-This Code of Conduct is distributed under a [Creative Commons Attribution-ShareAlike license](https://creativecommons.org/licenses/by-sa/3.0/).
+This Code of Conduct is distributed under a [Creative Commons Attribution-ShareAlike license](http://creativecommons.org/licenses/by-sa/3.0/).

-Portions of text derived from the [Django Code of Conduct](https://www.djangoproject.com/conduct/) and the [Geek Feminism Anti-Harassment Policy](https://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy).
+Portions of text derived from the [Django Code of Conduct](https://www.djangoproject.com/conduct/) and the [Geek Feminism Anti-Harassment Policy](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy).

-Retrieved on November 22, 2016 from [https://citizencodeofconduct.org/](http://citizencodeofconduct.org/)
+Retrieved on November 22, 2016 from [http://citizencodeofconduct.org/](http://citizencodeofconduct.org/)
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -4,21 +4,19 @@ How to contribute to Dolibarr
 Bug reports and feature requests
 --------------------------------

-<a name="not-a-support-forum"></a>*Note*: **GitHub Issues is not a support forum.** If you have questions about Dolibarr / need help using the software, please use [the forums](https://www.dolibarr.org/forum.php). Forums exist in different languages.
+<a name="not-a-support-forum"></a>*Note*: Issues are not a support forum. If you need help using the software, please use [the forums](https://www.dolibarr.org/forum.php). Forums exist in different languages.

 Issues are managed on [GitHub](https://github.com/Dolibarr/dolibarr/issues). 
-Default **language here is English**. So please prepare your contributions in English.
+Default language here is english. So please prepare your contributions in english.

 1. Please [use the search engine](https://help.github.com/articles/searching-issues) to check if nobody's already reported your problem.
 2. [Create an issue](https://help.github.com/articles/creating-an-issue). Choose an appropriate title. Prepend appropriately with Bug or Feature Request.
-3. Tell us the version you are using!   (look at  /htdocs/admin/system/dolibarr.php?  and check if you are using the latest version) 
-4. Write a report with as much detail as possible (Use [screenshots](https://help.github.com/articles/issue-attachments) or even screencasts and provide logging and debugging information whenever possible).
-5. Delete unnecessary submissions.
-6. **Check your Message at Preview before sending.**
+4. Tell us the version you are using!   (look at  /htdocs/admin/system/dolibarr.php?  and check if you are using the latest version) 
+3. Write a report with as much detail as possible (Use [screenshots](https://help.github.com/articles/issue-attachments) or even screencasts and provide logging and debugging informations whenever possible).



-<a name="code"></a>Submit code
+<a name="code"></a>Code
 ---------------------

 ### Basic workflow
@@ -26,34 +24,28 @@ Default **language here is English**. So please prepare your contributions in En
 1. [Fork](https://help.github.com/articles/fork-a-repo) the [GitHub repository](https://github.com/Dolibarr/dolibarr).
 2. Clone your fork.
 3. Choose a branch(See the [Branches](#branches) section below).
-4. Read our developer documentation on the [Dolibarr Wiki](https://wiki.dolibarr.org/index.php?title=Developer_documentation).
-5. Commit and push your changes.
-6. [Make a pull request](https://help.github.com/articles/creating-a-pull-request).
-
+4. Commit and push your changes.
+5. [Make a pull request](https://help.github.com/articles/creating-a-pull-request).

 <span id="branches" name="branches"></span>
 ### Branches

 Unless you're fixing a bug, all pull requests should be made against the *develop* branch.

-If you're fixing a bug, it is preferred that you cook your fix and pull request it against an oldest version affected.
+If you're fixing a bug, it is preferred that you cook your fix and pull request it
+against the oldest version affected that's still supported.

-We recommend to push it into N - 2 for N the latest version available, if not possible into version N - 1, and finally into develop.
-This is just a recommendation, currently, if you push a bug fix on a very old version, it is still merged and propagated into
-higher versions. 
-
-The rule N - 2 is just a tip if you don't know which version to choose to get the best the best compromise between ease of correction 
-and number of potential beneficiaries of the correction.
+We officially support versions N, N − 1 and N − 2 for N the latest version available.

+Choose your base branch accordingly.

 ### General rules
-Please don't edit the ChangeLog file. This file is generated from all commit messages during release process by the project manager.
-
+Please don't edit the ChangeLog file. File will be generated from all commit messages during release process by the project manager.

 ### <a name="commits"></a>Commits
 Use clear commit messages with the following structure:

-```plaintext
+```
 [KEYWORD] [ISSUENUM] DESC

 LONGDESC
@@ -71,13 +63,10 @@ where
 #### Keyword
 In uppercase if you want to have the log comment appears into the generated ChangeLog file.

-The keyword can be omitted if your commit does not fit in any of the following categories:
-
+The keyword can be ommitted if your commit does not fit in any of the following categories:
 - Fix/FIX: for a bug fix
+- New/NEW: for an unreferenced new feature (Opening a feature request and using close is prefered)
 - Close/CLOSE: for closing a referenced feature request
- New/NEW: for an unreferenced new feature (Opening a feature request and using close is preferred)
- Perf/PERF: for a performance enhancement
- Qual/QUAL: for quality code enhancement or re-engineering

 #### Issuenum
 If your commit fixes a referenced bug or feature request.
@@ -98,24 +87,22 @@ Feel free to express technical details, use cases or anything relevant to the cu

 This section can span multiple lines.

-If your PR is a change on interface, you must also paste a screenshot showing the new screen.
+Try to keep lines under 120 characters.

 #### Examples
 <pre>
 FIX|Fix #456 Short description (where #456 is number of bug fix, if it exists. In upper case to appear into ChangeLog)
 or
-CLOSE|Close #456 Short description (where #456 is number of feature request, if it exists. In upper case to appear into ChangeLog)
+NEW|New Short description (In upper case to appear into ChangeLog, use this if you add a feature not tracked, otherwise use CLOSE #456)
 or
-NEW|New|QUAL|Qual|PERF|Perf Short description (In upper case to appear into ChangeLog, use this if you add a feature not tracked, otherwise use CLOSE #456)
+CLOSE|Close #456 Short description (where #456 is number of feature request, if it exists. In upper case to appear into ChangeLog)
 or
 Short description (when the commit is not introducing feature nor closing a bug)

-Long description (Can span across multiple lines).
+Long description (Can span accross multiple lines).
 </pre>

-
 ### Pull Requests
-
 Pull Request (PR) process is the process to submit a change (enhancement, bug fix, ...) into the code of the project. There is some rules to know and
 a process to follow to optimize the chance to have PRs merged efficiently...

@@ -125,25 +112,22 @@ a process to follow to optimize the chance to have PRs merged efficiently...

 * When submitting a pull request, use same rule as [Commits](#commits) for the message. If your pull request only contains 1 commit, GitHub will be smart enough to fill it for you. Otherwise, please be a bit verbose about what you're providing.

-* A screenshot will be always required for any PR of change/addition of a GUI behaviour.
-
 Also, some code changes need a prior approbation:

-* if you want to include a new external library (into htdocs/includes directory), please ask before to the core project manager (mention @dolibarr-jedi in your issue) to see if such a library can be accepted.
+* if you want to include a new external library (into htdocs/includes directory), please ask before to the core project manager (mention @dolibarr-yoda in your issue) to see if such a library can be accepted.

-* if you add new tables or fields, you MUST first submit a standalone PR with the data structure changes you plan to add/modify (and only data structure changes). Start development only once this data structure has been accepted.
+* if you add a new table, you must first create a page on https://wiki.dolibarr.org/index.php/Category:Table_SQL (copy an existing page changing its name to see it into this index page). Then ask the project manager (@dolibarr-yoda) if the new data model you plan to add is compatible with curent and future works in progress and can be accepted as you suggest.

 Once a PR has been submitted, you may need to wait for its integration. It is common that the project leader let the PR open for a long delay to allow every developer discuss about the PR (A label is added in such a case).

-If the label of PR start with "Draft" or "WIP" (Work In Progress), it will not be analyzed for merging until you change the label of the PR (but it can be analyzed for discussion).
+If the label of PR start with "Draft" or "WIP" (Work In Progress), it will not be analyzed for merging until you change the label of PR (but it can be analyzed for discussion).

 If your PR has errors reported by the Continuous Integration Platform, it means your PR is not valid and nothing will be done with it. It will be kept open to allow developers to fix this, or it may be closed several month later. Don't expect anything on your PR if you have such errors, you MUST first fix the Continuous Integration error to have it taken into consideration.

 If the PR is valid, and is kept open for a long time, a tag will also be added on the PR to describe the status of your PR and why the PR is kept open. By putting your mouse on the tag, you will get a full explanation of the tag/status that explain why your PR has not been integrated yet.
 In most cases, it gives you information of things you have to do to have the PR taken into consideration (for example a change is requested, a conflict is expected to be solved, some questions were asked). If you have a yellow, red flag of purple flag, don't expect to have your PR validated. You must first provide the answer the tag ask you. The majority of open PR are waiting an action of the author of the PR.

-Statistics on Dolibarr project shows that 95% of submitted PR are reviewed and tagged. Average answer delay is also one of the best among Open source projects (just few days before having the Answer Tag set). This is one of the most important ratio of answered PR in Open Source world for a major project. Don't expect the core team to reach the 100%. 
-A so high ratio is very rare on a so popular project and with the increasing popularity of Dolibarr, this ratio will probably decrease in future to a more common level.
+Statistics on Dolibarr project shows that 95% of submitted PR are reviewed and tagged. Average answer delay is also one of the best among Open source projects (just few days before having the Answer Tag set). This is one of the most important ratio of answered PR in Open Source world for a major project. Don't expect the core team to reach the 100%. A so high ratio is very rare on a so popular project and with the increasing popularity of Dolibarr, this ratio will probably decrease in future to a more common level.


 ### Resources
@@ -157,7 +141,7 @@ All other translations are managed online at [Transifex](https://www.transifex.c

 Translations done on transifex are available in the next major release.

-Note: Sometimes, the source text (English) is modified. In such a case, the translation is reset. Transifex assume that if the original source
+Note: Sometimes, the source text (english) is modified. In such a case, the translation is reset. Transifex assume that if the original source
 has changed, the translation is surely no more correct so must be done again. But old translation is not lost and you can use the tab "History"
 to retrieve all old translation of a source text, and restore the translation in one click with no need to retranslate it if there is no need to.

--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -2,4 +2,4 @@

 open_collective: dolibarr
 custom: https://wiki.dolibarr.org/index.php/Subscribe
-github: [eldy]
+# github: [eldy]
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Create a report to help us fix something that is broken
+title: ''
+labels: Bug
+assignees: ''
+
+---
+
+# Instructions
+*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
+*Please:*
+- *replace the bracket enclosed texts with meaningful information*
+- *remove any unused sub-section*
+
+
+# Bug
+[*Short description*]
+
+## Environment
+- **Version**: [*Affected Dolibarr version(s)*]
+- **OS**: [*Server OS type and version*]
+- **Web server**: [*Webserver type and version*]
+- **PHP**: [*PHP version*]
+- **Database**: [*Database type and version*]
+- **URL(s)**: [*Affected URL(s)*]
+
+## Expected and actual behavior
+[*Verbose description*]
+
+## Steps to reproduce the behavior
+[*Verbose description*]
+
+## [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)
+[*Files*]
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,48 +0,0 @@
-name: Bug report
-description: Create a report to help us fix something that is broken
-labels: ["Bug"]
-
-body:
-  - type: markdown
-    attributes:
-      value: |
-        This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.
-
-  - type: textarea
-    id: bug
-    attributes:
-      label: Bug
-      description: Please give a short description of the bug
-    validations:
-      required: true
-
-  - type: input
-    id: environment-version
-    attributes:
-      label: Dolibarr Version
-      description: Affected Dolibarr version(s)
-      placeholder: 19.0, develop, ...
-
-  - type: input
-    id: environment-php
-    attributes:
-      label: Environment PHP
-      description: PHP version
-
-  - type: input
-    id: environment-database
-    attributes:
-      label: Environment Database
-      description: Database type and version
-
-  - type: textarea
-    id: reproduce
-    attributes:
-      label: Steps to reproduce the behavior and expected behavior
-      description: Verbose description
-
-  - type: textarea
-    id: files
-    attributes:
-      label: Attached files
-      description: Screenshots, screencasts, dolibarr.log, debugging information
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,27 @@
+---
+name: Feature request
+about: Suggest a new idea for this project
+title: ''
+labels: Feature request
+assignees: ''
+
+---
+
+# Instructions
+*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
+*Please:*
+- *replace the bracket enclosed texts with meaningful information*
+- *remove any unused sub-section*
+
+
+# Feature Request
+[*Short description*]
+
+## Use case
+[*Verbose description*]
+
+## Suggested implementation
+[*Verbose description*]
+
+## Suggested steps
+[*List of tasks to achieve goal*]
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,35 +0,0 @@
-name: Feature request
-description: Suggest a new idea for this project
-labels: ["Feature request"]
-
-body:
-  - type: markdown
-    attributes:
-      value: |
-        This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.
-
-  - type: textarea
-    id: feature-request
-    attributes:
-      label: Feature Request
-      description: Short description
-    validations:
-      required: true
-
-  - type: textarea
-    id: use-case
-    attributes:
-      label: Use case
-      description: Verbose description
-
-  - type: textarea
-    id: suggested-implementation
-    attributes:
-      label: Suggested implementation
-      description: Verbose description
-
-  - type: textarea
-    id: suggested-steps
-    attributes:
-      label: Suggested steps
-      description: List of tasks to achieve goal
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,27 +1,18 @@
 # Instructions
 *This is a template to help you make good pull requests. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
 *Please:*
- *only keep the "FIX", "CLOSE", "NEW", "PERF" or "QUAL" section* (use uppercase to have the PR appears into the ChangeLog, lowercase will not appears)
+- *only keep the "Fix", "Close" or "New" section*
 - *follow the project [contributing guidelines](/.github/CONTRIBUTING.md)*
- *replace the bracket enclosed texts with meaningful information*
+- *replace the bracket enclosed textswith meaningful informations*


-# FIX|Fix #[*issue_number Short description*]
+# Fix #[*issue_number Short description*]
 [*Long description*]


-# CLOSE|Close #[*issue_number Short description*]
+# Close #[*issue_number Short description*]
 [*Long description*]


-# NEW|New [*Short description*]
+# New [*Short description*]
 [*Long description*]
-
-
-# PERF|Perf #[*issue_number Short description*]
-[*Long description*]
-
-
-# QUAL|Qual #[*issue_number Short description*]
-[*Long description*]
-
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -1,16 +0,0 @@
-# Workflow run order
-
-To reduce run minutes, the following order is put in place:
-
-On PR & Merge, always run:
-
- pre-commit;
- phan.
-
-When both succeed, start:
-
- phpstan;
- Windows-ci;
- travis.
-
-See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#running-a-workflow-based-on-the-conclusion-of-another-workflow
--- a/.github/workflows/cache-clean-pr.yml
+++ b/.github/workflows/cache-clean-pr.yml
@@ -1,36 +0,0 @@
---
-name: Cleanup caches of a closed branch
-# See https://github.com/actions/cache/blob/main/tips-and-workarounds.md#force-deletion-of-caches-overriding-default-cache-eviction-policy
-on:
-  pull_request:
-    types: [closed]
-  workflow_dispatch:
-jobs:
-  cleanup:
-    runs-on: ubuntu-latest
-    permissions:
-      # `actions:write` permission is required to delete caches
-      #   See also: https://docs.github.com/en/rest/actions/cache?apiVersion=2022-11-28#delete-a-github-actions-cache-for-a-repository-using-a-cache-id
-      actions: write
-      contents: read
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-      - name: Cleanup
-        run: |
-          gh extension install actions/gh-actions-cache
-          REPO=${{ github.repository }}
-          BRANCH=refs/pull/${{ github.event.pull_request.number }}/merge
-          echo "Fetching list of cache key"
-          cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH | cut -f 1 )
-
-          ## Setting this to not fail the workflow while deleting cache keys. 
-          set +e
-          echo "Deleting caches..."
-          for cacheKey in $cacheKeysForPR
-          do
-              gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
-          done
-          echo "Done"
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,40 +0,0 @@
-name: "CI"
-
-on: [push, pull_request]
-jobs:
-  pre-commit:
-    uses: ./.github/workflows/pre-commit.yml
-    secrets: inherit
-    with:
-      gh_event: ${{ github.event_name }}
-  phan:
-    uses: ./.github/workflows/phan.yml
-    secrets: inherit
-    with:
-      gh_event: ${{ github.event_name }}
-  phpstan:
-    uses: ./.github/workflows/phpstan.yml
-    secrets: inherit
-    needs: [pre-commit, phan]
-    with:
-      gh_event: ${{ github.event_name }}
-  windows-ci:
-    needs: [pre-commit, phan]
-    secrets: inherit
-    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
-    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 failes, the following action may help
-#       - if: "failure()"
-#        uses: "andymckay/cancel-action@0.3"
--- a/.github/workflows/code_quality_qodana.yml.disabled
+++ b/.github/workflows/code_quality_qodana.yml.disabled
@@ -1,28 +0,0 @@
-name: Qodana
-on:
-  schedule:
-  - cron: "0 20 * * 1,3,5"
-  workflow_dispatch:
-    branches:
-      - develop
-#  push:
-#    branches:
-#      - develop
-
-permissions:
-  contents: read
-
-jobs:
-  qodana:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 1
-          #php-version: '7.1'
-      - name: 'Qodana Scan'
-        uses: JetBrains/qodana-action@v2023.2.1
-        #with:
-        #  php-version: '7.1'
-        env:
-          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
--- a/.github/workflows/doxygen-gh-pages.yml.disabled
+++ b/.github/workflows/doxygen-gh-pages.yml.disabled
@@ -1,38 +0,0 @@
-# See syntax file on https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
-name: Doxygen
-on:
-  schedule:
-  - cron: "0 15 * * *"
-  workflow_dispatch:
-    branches:
-      - develop
-permissions:
-  contents: write
-  
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Build
-        uses: DenverCoder1/doxygen-github-pages-action@v1.2.0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: gh-pages
-          folder: build/html
-          config_file: build/doxygen/dolibarr-doxygen.doxyfile
-
-#      - name: Deploy
-#        uses: JamesIves/github-pages-deploy-action@v4
-#        with:
-#          branch: gh-pages
-#          folder: build/html # The folder the action should deploy.
-#          target-folder: docs/html2
-          
-#jobs:
-#  doxygen:
-#    runs-on: ubuntu-latest
-#    steps:
-#      - name: 'Doxygen'
-#        uses: mattnotmitt/doxygen-action@1.9.5
-#        with:
-#          doxyfile-path: build/doxygen
--- a/.github/workflows/exakat.yml
+++ b/.github/workflows/exakat.yml
@@ -2,27 +2,16 @@
 name: "Exakat analysis"

 on:
-  # execute once a month, the 1st
  schedule:
-  - cron: "0 20 1 * *"
-  workflow_dispatch:
-    branches:
-      - develop
-
-permissions:
-  contents: read
+  - cron: "0 20 * * *"

 jobs:
  exakat:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 1
+    - uses: actions/checkout@v2
    - name: Exakat
      uses: docker://exakat/exakat-ga
      with:
-        ignore_rules: 'Classes/UseInstanceof,Constants/ConstantStrangeNames,Performances/PrePostIncrement,Functions/UndefinedFunctions,Functions/WrongNumberOfArguments,Functions/WrongTypeWithCall,Variables/UndefinedVariable,Classes/DontUnsetProperties,Classes/NonPpp,Classes/StaticMethodsCalledFromObject,Classes/UseClassOperator,Functions/UsesDefaultArguments,Php/NoClassInGlobal,Php/ShouldUseCoalesce,Php/WrongTypeForNativeFunction,Structures/AddZero,Structures/DropElseAfterReturn,Structures/IfWithSameConditions,Structures/MergeIfThen,Structures/NestedTernary,Structures/ElseIfElseif,Structures/ExitUsage,Structures/RepeatedPrint,Structures/RepeatedRegex,Structures/SameConditions,Structures/SwitchWithoutDefault,Structures/ShouldMakeTernary,Structures/UselessParenthesis,Structures/UseConstant'
-        ignore_dirs: '/htdocs/includes/,/htdocs/install/doctemplates/,/build/,/dev/,/doc/,/scripts/,/test/'
-        file_extensions: php
-        project_reports: Perfile
+        ignore_rules: 'Classes/UseInstanceof,Performances/PrePostIncrement,Functions/UndefinedFunctions,Functions/WrongNumberOfArguments,Functions/WrongTypeWithCall,Variables/UndefinedVariable,Classes/DontUnsetProperties,Classes/NonPpp,Classes/StaticMethodsCalledFromObject,Classes/UseClassOperator,Functions/UsesDefaultArguments,Php/NoClassInGlobal,Php/ShouldUseCoalesce,Php/WrongTypeForNativeFunction,Structures/AddZero,Structures/DropElseAfterReturn,Structures/IfWithSameConditions,Structures/MergeIfThen,Structures/ElseIfElseif,Structures/ExitUsage,Structures/RepeatedPrint,Structures/RepeatedRegex,Structures/SameConditions,Structures/SwitchWithoutDefault,Structures/ShouldMakeTernary,Structures/UselessParenthesis,Structures/UseConstant' 
+        ignore_dirs: '/htdocs/includes,/build,/dev,/doc,/scripts,/test'        
--- a/.github/workflows/gh-travis.yml
+++ b/.github/workflows/gh-travis.yml
@@ -1,49 +0,0 @@
---
-# This runs a travis script inside a github runner
-name: Travis
-# Controls when the workflow will run
-on:
-  # push:
-  # pull_request:
-  workflow_call:
-    inputs:
-      gh_event:
-        required: true
-        type: string
-  workflow_dispatch:
-
-concurrency:
-  group: travis-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref
-    }}
-  cancel-in-progress: true
-env:
-  gh_event: ${{ inputs.gh_event || github.event_name }}
-  GITHUB_JSON: ${{ toJSON(github) }}  # Helps in debugging Github Action
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  # This workflow contains a single job
-  gh-travis:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      # matrix:
-      #   php-version:
-      #  # PHPStan requires PHP >= 7.2.
-      #    #- "7.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
-      - name: Run .travis.yml build script
-        uses: ktomk/run-travis-yml@v1
-        with:
-          # run-job: travis  # name of a job in travis file
-          allow-failure: false
-          # file: .travis.yml
-          # steps: |  # Default: setup, before_install, install, before_script, script, after_script, before_deploy
-          #  install
-          #  script
-        # env:
-        #  TRAVIS_PHP_VERSION: ${{ matrix.php-version }}
--- a/.github/workflows/github_ci_php71_pgsql.yml.disabled
+++ b/.github/workflows/github_ci_php71_pgsql.yml.disabled
@@ -1,365 +0,0 @@
-name: GitHub CI PHP 7.1 Postgres
-
-on:
-  push:
-    branches:
-      - develop
-      - 1*
-      - 2*
-  pull_request:
-    types: [opened]
-
-permissions:
-  contents: read
-
-jobs:
-  github_ci_php71_pgsql:
-    runs-on: ubuntu-latest
-    services:
-      mysql:
-        image: mysql:5.7
-        env:
-          MYSQL_ROOT_PASSWORD: password
-        ports:
-        - 32574:3306
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_USER: postgres
-          POSTGRES_DB: postgres
-        # Set health checks to wait until postgres has started
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 5432:5432      
-
-    steps:
-    # git clone dolibarr into GITHUB_WORKSPACE = /home/runner/work/dolibarr/dolibarr
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 1
-        
-    - name: Version PHP
-      run: |
-        php -i | head -
-
-    - name: Install packages for PHP 7.1
-      run: |
-        sudo composer self-update 2.2.18
-        sudo chmod -R a+rwx /home/runner
-        composer -n config -g vendor-dir htdocs/includes
-
-        sudo add-apt-repository -y ppa:ondrej/php
-        sudo apt-get update
-        sudo apt-get install -y pgloader memcached
-        sudo apt install 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
-        sudo update-alternatives --set php /usr/bin/php7.1
-        php -i | head -
-        
-        cd $GITHUB_WORKSPACE
-        ls $GITHUB_WORKSPACE
-        composer -n require --ignore-platform-reqs phpunit/phpunit ^7.5 \
-                        php-parallel-lint/php-parallel-lint ^1 \
-                        php-parallel-lint/php-console-highlighter ^0 \
-                        php-parallel-lint/php-var-dump-check ~0.4 \
-                        squizlabs/php_codesniffer ^3
-        #For php7.3
-        #composer -n require phpunit/phpunit ^7.5 \
-        #                php-parallel-lint/php-parallel-lint ^1.2 \
-        #                php-parallel-lint/php-console-highlighter ^0 \
-        #                php-parallel-lint/php-var-dump-check ~0.4 \
-        #                squizlabs/php_codesniffer ^3
-        sudo rm -fr htdocs/includes/phpunit/php-code-coverage/src/Report/Html
-
-    - name: Adding path of binaries tools installed by composer to the PATH
-      run: | 
-        export PATH="$GITHUB_WORKSPACE/htdocs/includes/bin:$PATH"
-        echo $PATH
-        # We must have a directory bin created by the previous composer call
-        ls $GITHUB_WORKSPACE/htdocs/includes/bin
-
-    - name: Version information
-      run: |
-        composer -V
-        # Check Parallel-lint version
-        echo "Parallel-lint version"
-        htdocs/includes/bin/parallel-lint -V
-        # Check PHP CodeSniffer version
-        echo "PHPCS version"
-        htdocs/includes/bin/phpcs --version | head -
-        htdocs/includes/bin/phpcs -i | head -
-        # Check PHP Vardump check version
-        echo "PHP Vardump check version"
-        htdocs/includes/bin/var-dump-check --version
-        # Check PHPUnit version
-        echo "PHPUnit version"
-        htdocs/includes/bin/phpunit --version | head -
-        # Check Apache version
-        echo "Apache version"
-        apache2 -v | head -
-        # Check Database
-        echo "Database version"
-        mysql --version | head -
-        psql --version
-        echo "Check pgloader version"
-        pgloader --version
-        
-    - name: Create database
-      run: |
-        pwd
-        echo GITHUB_WORKSPACE = $GITHUB_WORKSPACE 
-        sudo apt-get install -y mysql-client
-        mysql --version | head -
-        mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "SELECT VERSION();"  | head -
-        mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "SHOW DATABASES"
-        
-        echo "Drop and create database"
-        mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'DROP DATABASE IF EXISTS travis;'
-        mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "CREATE DATABASE IF NOT EXISTS travis CHARACTER SET = 'utf8';"
-        mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "CREATE USER 'travis'@'127.0.0.1' IDENTIFIED BY 'password';"
-        mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;'
-        mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'FLUSH PRIVILEGES;'
-        
-        mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql  
-        
-        mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis -e "UPDATE llx_const set value = '0666' WHERE name = 'MAIN_UMASK';" 
-
-        echo "Init postgresql database"        
-        ps fauxww | grep postgres
-        ls /etc/postgresql/14/main/
-        sudo chmod -R a+rwx /etc/postgresql/14/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 /etc/init.d/postgresql restart
-
-        psql postgresql://postgres:postgres@127.0.0.1:5432 -l -A
-
-        psql postgresql://postgres:postgres@127.0.0.1:5432 -c 'create database travis;'
-
-        sudo mkdir -p /tmp/pgloader
-        sudo chmod -R a+rwx /tmp/pgloader/
-        
-        echo sudo pgloader mysql://root:password@127.0.0.1:32574/travis postgresql://postgres:postgres@127.0.0.1:5432/travis
-        sudo pgloader mysql://root:password@127.0.0.1:32574/travis postgresql://postgres:postgres@127.0.0.1:5432/travis
-        echo 'ALTER SEQUENCE llx_accountingaccount_rowid_seq RENAME TO llx_accounting_account_rowid_seq' | psql postgresql://postgres:postgres@127.0.0.1:5432/travis
-        echo 'ALTER SEQUENCE llx_accounting_account_rowid_seq RESTART WITH 1000001;' | psql postgresql://postgres:postgres@127.0.0.1:5432/travis
-
-        # Create pgsql compatibility functions
-        psql postgresql://postgres:postgres@127.0.0.1:5432/travis < htdocs/install/pgsql/functions/functions.sql
-
-    - name: Generate Dolibarr conf file
-      run: |
-        export CONF_FILE=$GITHUB_WORKSPACE/htdocs/conf/conf.php
-        echo "Setting up Dolibarr $CONF_FILE"
-        echo '<?php' > $CONF_FILE
-        echo '$'dolibarr_main_url_root=\'http://127.0.0.1\'';' >> $CONF_FILE
-        echo '$'dolibarr_main_document_root=\'/var/www/html\'';' >> $CONF_FILE
-        echo '$'dolibarr_main_data_root=\'/var/www/html/documents\'';' >> $CONF_FILE
-        echo '$'dolibarr_main_db_host=\'127.0.0.1\'';' >> $CONF_FILE
-        echo '$'dolibarr_main_db_name=\'travis\'';' >> $CONF_FILE
-        echo '$'dolibarr_main_db_user=\'postgres\'';' >> $CONF_FILE
-        echo '$'dolibarr_main_db_pass=\'postgres\'';' >> $CONF_FILE
-        echo '$'dolibarr_main_instance_unique_id=\'travis1234567890\'';' >> $CONF_FILE
-        echo '$'dolibarr_main_db_type=\'pgsql\'';' >> $CONF_FILE
-        echo '$'dolibarr_main_db_port=\'5432\'';' >> $CONF_FILE
-        echo '$'dolibarr_main_authentication=\'dolibarr\'';' >> $CONF_FILE
-        cat $CONF_FILE
-    - name: Generate install.forced.php file to test installation
-      run: |
-        export INSTALL_FORCED_FILE=$GITHUB_WORKSPACE/htdocs/install/install.forced.php
-        echo "Setting up Dolibarr $INSTALL_FORCED_FILE to test installation"
-        # Ensure we catch errors
-        set +e
-        echo '<?php' > $INSTALL_FORCED_FILE
-        echo '$'force_install_noedit=2';' >> $INSTALL_FORCED_FILE
-        echo '$'force_install_type=\'pgsql\'';' >> $INSTALL_FORCED_FILE
-        echo '$'force_install_dbserver=\'127.0.0.1\'';' >> $INSTALL_FORCED_FILE
-        echo '$'force_install_database=\'travis\'';' >> $INSTALL_FORCED_FILE
-        echo '$'force_install_databaselogin=\'postgres\'';' >> $INSTALL_FORCED_FILE
-        echo '$'force_install_databasepass=\'postgres\'';' >> $INSTALL_FORCED_FILE
-        echo '$'force_install_port=\'5432\'';' >> $INSTALL_FORCED_FILE
-        echo '$'force_install_prefix=\'llx_\'';' >> $INSTALL_FORCED_FILE
-        echo '$'force_install_createdatabase=false';' >> $INSTALL_FORCED_FILE
-        echo '$'force_install_createuser=false';' >> $INSTALL_FORCED_FILE
-        echo '$'force_install_mainforcehttps=false';' >> $INSTALL_FORCED_FILE
-        echo '$'force_install_main_data_root=\'/var/www/html\'';' >> $INSTALL_FORCED_FILE
-        cat $INSTALL_FORCED_FILE
-    
-    - name: Create document directory
-      run: |
-        echo "Create documents directory and set permissions"
-        # and admin/temp subdirectory needed for unit tests
-        sudo mkdir -p /var/www/html/documents/admin/temp
-        sudo chmod -R a+rwx /var/www/html/documents
-        sudo echo "***** First line of dolibarr.log" > /var/www/html/documents/dolibarr.log
-        sudo chmod a+rwx /var/www/html/documents/dolibarr.log
-  
-    - name: Copy app into /var/www
-      run: | 
-        sudo cp -r $GITHUB_WORKSPACE/htdocs/. /var/www/html
-        sudo mv /var/www/html/index.html /var/www/html/index.disabled.html
-        sudo ln -fs /var/www/html /var/www/htdocs
-        sudo cp -r $GITHUB_WORKSPACE/test/. /var/www/test
-        sudo cp -r $GITHUB_WORKSPACE/dev/. /var/www/dev
-        sudo cp -r $GITHUB_WORKSPACE/scripts/. /var/www/scripts
-
-    - name: Setup Apache
-      run: |
-        pwd
-        whoami
-        # install apache web server
-        a2query -s
-        a2query -m
-        ls /etc/apache2/sites-available
-        #sudo cp -f $GITHUB_WORKSPACE/build/travis-ci/apache-githubaction.conf /etc/apache2/sites-available/000-default.conf
-        #sudo sed -e "s?%GITHUB_WORKSPACE%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf
-        a2ensite 000-default
-        a2enmod php7.1
-        ls /etc/apache2/sites-enabled
-        sudo adduser $(whoami) www-data
-        sudo adduser $(whoami) root
-        sudo adduser root www-data
-        sudo chown -R www-data:www-data /etc/apache2/sites-available/
-        sudo chmod -R 777 /etc/apache2/sites-available/
-        sudo chown -R www-data:www-data /var/www/html/
-        ls -l /var/www/html
-        #ls -l /var/www/html/conf
-        #ls -l /var/www/html/install/
-        set +e
-        sudo cat /etc/apache2/sites-enabled/000-default.conf
-        sudo service apache2 restart
-        curl -I localhost
-    - name: Check Apache availability
-      run: |
-        echo "Checking webserver availability by a wget -O - --debug http://127.0.0.1"
-        # Ensure we stop on error with set -e
-        set +e
-        ls /var/log/apache2
-        #wget -O - --debug http://127.0.0.1/robots.txt
-        # The wget should return a page with line '<meta name="generator" content="Dolibarr installer">
-        wget -O - --debug http://127.0.0.1 > $GITHUB_WORKSPACE/test.html 2>&1
-        head -n 200 $GITHUB_WORKSPACE/test.html
-        
-        echo Logs are...
-        #sudo cat /tmp/install.log
-        sudo cat /var/log/apache2/access.log
-        sudo cat /var/log/apache2/error.log
-        sudo cat /var/log/apache2/other_vhosts_access.log
-        set +e
-
-    - name: Upgrading Dolibarr
-      run: |
-        # Ensure we catch errors. Set this to +e if you want to go to the end to see log files.
-        set -e
-        sudo chmod -R a+rwx $GITHUB_WORKSPACE
-        sudo chmod -R a+rwx /var/www
-        ls -l /var/www
-        cd /var/www/html/install
-
-        echo Execute upgrade, upgrade2 and step5 for each major version
-        php upgrade.php 3.5.0 3.6.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade350360.log
-        php upgrade2.php 3.5.0 3.6.0 > $GITHUB_WORKSPACE/upgrade350360-2.log
-        php step5.php 3.5.0 3.6.0 > $GITHUB_WORKSPACE/upgrade350360-3.log
-        php upgrade.php 3.6.0 3.7.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade360370.log
-        php upgrade2.php 3.6.0 3.7.0 > $GITHUB_WORKSPACE/upgrade360370-2.log
-        php step5.php 3.6.0 3.7.0 > $GITHUB_WORKSPACE/upgrade360370-3.log
-        php upgrade.php 3.7.0 3.8.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade370380.log
-        php upgrade2.php 3.7.0 3.8.0 > $GITHUB_WORKSPACE/upgrade370380-2.log
-        php step5.php 3.7.0 3.8.0 > $GITHUB_WORKSPACE/upgrade370380-3.log
-        php upgrade.php 3.8.0 3.9.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade380390.log
-        php upgrade2.php 3.8.0 3.9.0 > $GITHUB_WORKSPACE/upgrade380390-2.log
-        php step5.php 3.8.0 3.9.0 > $GITHUB_WORKSPACE/upgrade380390-3.log
-        php upgrade.php 3.9.0 4.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade390400.log
-        php upgrade2.php 3.9.0 4.0.0 > $GITHUB_WORKSPACE/upgrade390400-2.log
-        php step5.php 3.9.0 4.0.0 > $GITHUB_WORKSPACE/upgrade390400-3.log
-        php upgrade.php 4.0.0 5.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade400500.log
-        php upgrade2.php 4.0.0 5.0.0 > $GITHUB_WORKSPACE/upgrade400500-2.log
-        php step5.php 4.0.0 5.0.0 > $GITHUB_WORKSPACE/upgrade400500-3.log
-        php upgrade.php 5.0.0 6.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade500600.log
-        php upgrade2.php 5.0.0 6.0.0 > $GITHUB_WORKSPACE/upgrade500600-2.log
-        php step5.php 5.0.0 6.0.0 > $GITHUB_WORKSPACE/upgrade500600-3.log
-        php upgrade.php 6.0.0 7.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade600700.log
-        php upgrade2.php 6.0.0 7.0.0 > $GITHUB_WORKSPACE/upgrade600700-2.log
-        php step5.php 6.0.0 7.0.0 > $GITHUB_WORKSPACE/upgrade600700-3.log
-        
-        echo "\dt llx_c_paiement" | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis'
-        echo "\dt llx_c_payment_term" | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis'
-
-        php upgrade.php 7.0.0 8.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade700800.log
-        php upgrade2.php 7.0.0 8.0.0 > $GITHUB_WORKSPACE/upgrade700800-2.log
-        php step5.php 7.0.0 8.0.0 > $GITHUB_WORKSPACE/upgrade700800-3.log
-        php upgrade.php 8.0.0 9.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade800900.log
-        php upgrade2.php 8.0.0 9.0.0 > $GITHUB_WORKSPACE/upgrade800900-2.log
-        php step5.php 8.0.0 9.0.0 > $GITHUB_WORKSPACE/upgrade800900-3.log
-        php upgrade.php 9.0.0 10.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade9001000.log
-        php upgrade2.php 9.0.0 10.0.0 > $GITHUB_WORKSPACE/upgrade9001000-2.log
-        php step5.php 9.0.0 10.0.0 > $GITHUB_WORKSPACE/upgrade9001000-3.log
-        php upgrade.php 10.0.0 11.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade10001100.log
-        php upgrade2.php 10.0.0 11.0.0 > $GITHUB_WORKSPACE/upgrade10001100-2.log
-        php step5.php 10.0.0 11.0.0 > $GITHUB_WORKSPACE/upgrade10001100-3.log
-        php upgrade.php 11.0.0 12.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade11001200.log
-        php upgrade2.php 11.0.0 12.0.0 > $GITHUB_WORKSPACE/upgrade11001200-2.log
-        php step5.php 11.0.0 12.0.0 > $GITHUB_WORKSPACE/upgrade11001200-3.log
-        php upgrade.php 12.0.0 13.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade12001300.log
-        php upgrade2.php 12.0.0 13.0.0 > $GITHUB_WORKSPACE/upgrade12001300-2.log
-        php step5.php 12.0.0 13.0.0 > $GITHUB_WORKSPACE/upgrade12001300-3.log
-        php upgrade.php 13.0.0 14.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade13001400.log
-        php upgrade2.php 13.0.0 14.0.0 > $GITHUB_WORKSPACE/upgrade13001400-2.log
-        php step5.php 13.0.0 14.0.0 > $GITHUB_WORKSPACE/upgrade13001400-3.log
-        php upgrade.php 14.0.0 15.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade14001500.log
-        php upgrade2.php 14.0.0 15.0.0 > $GITHUB_WORKSPACE/upgrade14001500-2.log
-        php step5.php 14.0.0 15.0.0 > $GITHUB_WORKSPACE/upgrade14001500-3.log
-        php upgrade.php 15.0.0 16.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade15001600.log
-        php upgrade2.php 15.0.0 16.0.0 > $GITHUB_WORKSPACE/upgrade15001600-2.log
-        php step5.php 15.0.0 16.0.0 > $GITHUB_WORKSPACE/upgrade15001600-3.log
-        php upgrade.php 16.0.0 17.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade16001700.log
-        php upgrade2.php 16.0.0 17.0.0 > $GITHUB_WORKSPACE/upgrade16001700-2.log
-        php step5.php 16.0.0 17.0.0 > $GITHUB_WORKSPACE/upgrade16001700-3.log
-        php upgrade.php 17.0.0 18.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade17001800.log
-        php upgrade2.php 17.0.0 18.0.0 > $GITHUB_WORKSPACE/upgrade17001800-2.log
-        php step5.php 17.0.0 18.0.0 > $GITHUB_WORKSPACE/upgrade17001800-3.log
-        
-    - name: Result of migration scripts
-      if: always()
-      run: |
-        ls -alrt $GITHUB_WORKSPACE/
-        
-        echo Show content of last file
-        cat "$(ls -rt $GITHUB_WORKSPACE/ | tail -n1)"
-
-    - name: Enabling new modules
-      run: | 
-        # Enable modules not enabled into original dump
-        set -e
-        cd /var/www/html/install
-        php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_ProductBatch,MAIN_MODULE_SupplierProposal,MAIN_MODULE_STRIPE,MAIN_MODULE_ExpenseReport > $GITHUB_WORKSPACE/enablemodule.log
-        php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKET,MAIN_MODULE_ACCOUNTING,MAIN_MODULE_MRP >> $GITHUB_WORKSPACE/enablemodule.log
-        php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_RECEPTION,MAIN_MODULE_RECRUITMENT >> $GITHUB_WORKSPACE/enablemodule.log
-        php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_KnowledgeManagement,MAIN_MODULE_EventOrganization,MAIN_MODULE_PARTNERSHIP >> $GITHUB_WORKSPACE/enablemodule.log
-        php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_EmailCollector >> $GITHUB_WORKSPACE/enablemodule.log
-        echo $?
-        cd -
-
-    - name: Result of enabling modules scripts
-      if: always()
-      run: |
-        echo Show content of enablemodule.log file
-        cat $GITHUB_WORKSPACE/enablemodule.log
-
-    - name: Unit testing
-      run: |
-        # Ensure we catch errors. Set this to +e instead of -e if you want to go to the end to see dolibarr.log file.
-        set -e
-        cd /var/www/html
-        sudo chmod -R a+rwx /var/www/html/documents
-        includes/bin/phpunit -d memory_limit=-1 -c /var/www/test/phpunit/phpunittest.xml /var/www/test/phpunit/AllTests.php
-        phpunitresult=$?
-        echo "Phpunit return code = $phpunitresult"
-        set +e     
-
--- a/.github/workflows/github_ci_php81_mysql.yml.disabled
+++ b/.github/workflows/github_ci_php81_mysql.yml.disabled
@@ -1,334 +0,0 @@
-name: GitHub CI PHP 8.1 MySQL
-
-on:
-  push:
-    branches:
-      - develop
-      - 1*
-      - 2*
-  pull_request:
-    types: [opened]
-
-permissions:
-  contents: read
-
-jobs:
-  github_ci_php81_mysql:
-    runs-on: ubuntu-latest
-    services:
-      mysql:
-        image: mysql:5.7
-        env:
-          MYSQL_ROOT_PASSWORD: password
-        ports:
-        - 32574:3306
-
-    steps:
-    # git clone dolibarr into GITHUB_WORKSPACE = /home/runner/work/dolibarr/dolibarr
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 1
-        
-    - name: Version PHP
-      run: |
-        php -i | head -
-
-    - name: Install packages for PHP 8.1
-      run: |
-        sudo composer self-update 2.2.18
-        sudo chmod -R a+rwx /home/runner
-        composer -n config -g vendor-dir htdocs/includes
-        
-        sudo add-apt-repository -y ppa:ondrej/php
-        sudo apt-get update
-        sudo apt-get install -y pgloader memcached
-        sudo apt install 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
-        sudo update-alternatives --set php /usr/bin/php8.1
-        php -i | head -
-        
-        cd $GITHUB_WORKSPACE
-        ls $GITHUB_WORKSPACE
-        composer -n require --ignore-platform-reqs phpunit/phpunit ^8 \
-          php-parallel-lint/php-parallel-lint ^1.2 \
-          php-parallel-lint/php-console-highlighter ^0 \
-          php-parallel-lint/php-var-dump-check ~0.4 \
-          squizlabs/php_codesniffer ^3
-        sudo rm -fr htdocs/includes/phpunit/php-code-coverage/src/Report/Html
-
-    - name: Adding path of binaries tools installed by composer to the PATH
-      run: | 
-        export PATH="$GITHUB_WORKSPACE/htdocs/includes/bin:$PATH"
-        echo $PATH
-        # We must have a directory bin created by the previous composer call
-        ls $GITHUB_WORKSPACE/htdocs/includes/bin
-
-    - name: Version information
-      run: |
-        composer -V
-        # Check Parallel-lint version
-        echo "Parallel-lint version"
-        htdocs/includes/bin/parallel-lint -V
-        # Check PHP CodeSniffer version
-        echo "PHPCS version"
-        htdocs/includes/bin/phpcs --version | head -
-        htdocs/includes/bin/phpcs -i | head -
-        # Check PHP Vardump check version
-        echo "PHP Vardump check version"
-        htdocs/includes/bin/var-dump-check --version
-        # Check PHPUnit version
-        echo "PHPUnit version"
-        htdocs/includes/bin/phpunit --version | head -
-        # Check Apache version
-        echo "Apache version"
-        apache2 -v | head -
-        # Check Database
-        echo "Database version"
-        mysql --version | head -
-        psql --version
-        echo "Check pgloader version"
-        pgloader --version
-        
-    - name: Create database
-      run: |
-        pwd
-        echo GITHUB_WORKSPACE = $GITHUB_WORKSPACE 
-        sudo apt-get install -y mysql-client
-        mysql --version | head -
-        mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "SELECT VERSION();"  | head -
-        mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "SHOW DATABASES"
-        
-        echo "Drop and create database"
-        mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'DROP DATABASE IF EXISTS travis;'
-        mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "CREATE DATABASE IF NOT EXISTS travis CHARACTER SET = 'utf8';"
-        mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "CREATE USER 'travis'@'127.0.0.1' IDENTIFIED BY 'password';"
-        mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;'
-        mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'FLUSH PRIVILEGES;'
-        
-        mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql  
-
-        mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis -e "UPDATE llx_const set value = '0666' WHERE name = 'MAIN_UMASK';" 
-
-    - name: Generate Dolibarr conf file
-      run: |
-        export CONF_FILE=$GITHUB_WORKSPACE/htdocs/conf/conf.php
-        echo "Setting up Dolibarr $CONF_FILE"
-        echo '<?php' > $CONF_FILE
-        echo '$'dolibarr_main_url_root=\'http://127.0.0.1\'';' >> $CONF_FILE
-        echo '$'dolibarr_main_document_root=\'/var/www/html\'';' >> $CONF_FILE
-        echo '$'dolibarr_main_data_root=\'/var/www/html/documents\'';' >> $CONF_FILE
-        echo '$'dolibarr_main_db_host=\'127.0.0.1\'';' >> $CONF_FILE
-        echo '$'dolibarr_main_db_name=\'travis\'';' >> $CONF_FILE
-        echo '$'dolibarr_main_db_user=\'root\'';' >> $CONF_FILE
-        echo '$'dolibarr_main_db_pass=\'password\'';' >> $CONF_FILE
-        echo '$'dolibarr_main_instance_unique_id=\'travis1234567890\'';' >> $CONF_FILE
-        echo '$'dolibarr_main_db_type=\'mysqli\'';' >> $CONF_FILE
-        echo '$'dolibarr_main_db_port=\'32574\'';' >> $CONF_FILE
-        echo '$'dolibarr_main_authentication=\'dolibarr\'';' >> $CONF_FILE
-        cat $CONF_FILE
-    - name: Generate install.forced.php file to test installation
-      run: |
-        export INSTALL_FORCED_FILE=$GITHUB_WORKSPACE/htdocs/install/install.forced.php
-        echo "Setting up Dolibarr $INSTALL_FORCED_FILE to test installation"
-        # Ensure we catch errors
-        set +e
-        echo '<?php' > $INSTALL_FORCED_FILE
-        echo '$'force_install_noedit=2';' >> $INSTALL_FORCED_FILE
-        echo '$'force_install_type=\'mysqli\'';' >> $INSTALL_FORCED_FILE
-        echo '$'force_install_dbserver=\'127.0.0.1\'';' >> $INSTALL_FORCED_FILE
-        echo '$'force_install_database=\'travis\'';' >> $INSTALL_FORCED_FILE
-        echo '$'force_install_databaselogin=\'root\'';' >> $INSTALL_FORCED_FILE
-        echo '$'force_install_databasepass=\'password\'';' >> $INSTALL_FORCED_FILE
-        echo '$'force_install_port=\'32574\'';' >> $INSTALL_FORCED_FILE
-        echo '$'force_install_prefix=\'llx_\'';' >> $INSTALL_FORCED_FILE
-        echo '$'force_install_createdatabase=false';' >> $INSTALL_FORCED_FILE
-        echo '$'force_install_createuser=false';' >> $INSTALL_FORCED_FILE
-        echo '$'force_install_mainforcehttps=false';' >> $INSTALL_FORCED_FILE
-        echo '$'force_install_main_data_root=\'/var/www/html\'';' >> $INSTALL_FORCED_FILE
-        cat $INSTALL_FORCED_FILE
-    
-    - name: Create document directory
-      run: |
-        echo "Create documents directory and set permissions"
-        # and admin/temp subdirectory needed for unit tests
-        sudo mkdir -p /var/www/html/documents/admin/temp
-        sudo chmod -R a+rwx /var/www/html/documents
-        sudo echo "***** First line of dolibarr.log" > /var/www/html/documents/dolibarr.log
-        sudo chmod a+rwx /var/www/html/documents/dolibarr.log
-  
-    - name: Copy app into /var/www
-      run: | 
-        sudo cp -r $GITHUB_WORKSPACE/htdocs/. /var/www/html
-        sudo mv /var/www/html/index.html /var/www/html/index.disabled.html
-        sudo ln -fs /var/www/html /var/www/htdocs
-        sudo cp -r $GITHUB_WORKSPACE/test/. /var/www/test
-        sudo cp -r $GITHUB_WORKSPACE/dev/. /var/www/dev
-        sudo cp -r $GITHUB_WORKSPACE/scripts/. /var/www/scripts
-
-    - name: Setup Apache
-      run: |
-        pwd
-        whoami
-        # install apache web server
-        a2query -s
-        a2query -m
-        ls /etc/apache2/sites-available
-        #sudo cp -f $GITHUB_WORKSPACE/build/travis-ci/apache-githubaction.conf /etc/apache2/sites-available/000-default.conf
-        #sudo sed -e "s?%GITHUB_WORKSPACE%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf
-        a2ensite 000-default
-        a2enmod php8.1
-        ls /etc/apache2/sites-enabled
-        sudo adduser $(whoami) www-data
-        sudo adduser $(whoami) root
-        sudo adduser root www-data
-        sudo chown -R www-data:www-data /etc/apache2/sites-available/
-        sudo chmod -R 777 /etc/apache2/sites-available/
-        sudo chown -R www-data:www-data /var/www/html/
-        ls -l /var/www/html
-        #ls -l /var/www/html/conf
-        #ls -l /var/www/html/install/
-        set +e
-        sudo cat /etc/apache2/sites-enabled/000-default.conf
-        sudo service apache2 restart
-        curl -I localhost
-    - name: Check Apache availability
-      run: |
-        echo "Checking webserver availability by a wget -O - --debug http://127.0.0.1"
-        # Ensure we stop on error with set -e
-        set +e
-        ls /var/log/apache2
-        #wget -O - --debug http://127.0.0.1/robots.txt
-        # The wget should return a page with line '<meta name="generator" content="Dolibarr installer">
-        wget -O - --debug http://127.0.0.1 > $GITHUB_WORKSPACE/test.html 2>&1
-        head -n 200 $GITHUB_WORKSPACE/test.html
-        
-        echo Logs are...
-        #sudo cat /tmp/install.log
-        sudo cat /var/log/apache2/access.log
-        sudo cat /var/log/apache2/error.log
-        sudo cat /var/log/apache2/other_vhosts_access.log
-        set +e
-
-    - name: Upgrading Dolibarr
-      run: |
-        # Ensure we catch errors. Set this to +e if you want to go to the end to see log files.
-        set -e
-        sudo chmod -R a+rwx $GITHUB_WORKSPACE
-        sudo chmod -R a+rwx /var/www
-        ls -l /var/www
-        cd /var/www/html/install
-        echo Execute upgrade, upgrade2 and step5 for each major version
-        php upgrade.php 3.5.0 3.6.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade350360.log
-        php upgrade2.php 3.5.0 3.6.0 > $GITHUB_WORKSPACE/upgrade350360-2.log
-        php step5.php 3.5.0 3.6.0 > $GITHUB_WORKSPACE/upgrade350360-3.log
-        php upgrade.php 3.6.0 3.7.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade360370.log
-        php upgrade2.php 3.6.0 3.7.0 > $GITHUB_WORKSPACE/upgrade360370-2.log
-        php step5.php 3.6.0 3.7.0 > $GITHUB_WORKSPACE/upgrade360370-3.log
-        php upgrade.php 3.7.0 3.8.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade370380.log
-        php upgrade2.php 3.7.0 3.8.0 > $GITHUB_WORKSPACE/upgrade370380-2.log
-        php step5.php 3.7.0 3.8.0 > $GITHUB_WORKSPACE/upgrade370380-3.log
-        php upgrade.php 3.8.0 3.9.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade380390.log
-        php upgrade2.php 3.8.0 3.9.0 > $GITHUB_WORKSPACE/upgrade380390-2.log
-        php step5.php 3.8.0 3.9.0 > $GITHUB_WORKSPACE/upgrade380390-3.log
-        php upgrade.php 3.9.0 4.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade390400.log
-        php upgrade2.php 3.9.0 4.0.0 > $GITHUB_WORKSPACE/upgrade390400-2.log
-        php step5.php 3.9.0 4.0.0 > $GITHUB_WORKSPACE/upgrade390400-3.log
-        php upgrade.php 4.0.0 5.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade400500.log
-        php upgrade2.php 4.0.0 5.0.0 > $GITHUB_WORKSPACE/upgrade400500-2.log
-        php step5.php 4.0.0 5.0.0 > $GITHUB_WORKSPACE/upgrade400500-3.log
-        php upgrade.php 5.0.0 6.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade500600.log
-        php upgrade2.php 5.0.0 6.0.0 > $GITHUB_WORKSPACE/upgrade500600-2.log
-        php step5.php 5.0.0 6.0.0 > $GITHUB_WORKSPACE/upgrade500600-3.log
-        php upgrade.php 6.0.0 7.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade600700.log
-        php upgrade2.php 6.0.0 7.0.0 > $GITHUB_WORKSPACE/upgrade600700-2.log
-        php step5.php 6.0.0 7.0.0 > $GITHUB_WORKSPACE/upgrade600700-3.log
-        php upgrade.php 7.0.0 8.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade700800.log
-        php upgrade2.php 7.0.0 8.0.0 > $GITHUB_WORKSPACE/upgrade700800-2.log
-        php step5.php 7.0.0 8.0.0 > $GITHUB_WORKSPACE/upgrade700800-3.log
-        php upgrade.php 8.0.0 9.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade800900.log
-        php upgrade2.php 8.0.0 9.0.0 > $GITHUB_WORKSPACE/upgrade800900-2.log
-        php step5.php 8.0.0 9.0.0 > $GITHUB_WORKSPACE/upgrade800900-3.log
-        php upgrade.php 9.0.0 10.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade9001000.log
-        php upgrade2.php 9.0.0 10.0.0 > $GITHUB_WORKSPACE/upgrade9001000-2.log
-        php step5.php 9.0.0 10.0.0 > $GITHUB_WORKSPACE/upgrade9001000-3.log
-        php upgrade.php 10.0.0 11.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade10001100.log
-        php upgrade2.php 10.0.0 11.0.0 > $GITHUB_WORKSPACE/upgrade10001100-2.log
-        php step5.php 10.0.0 11.0.0 > $GITHUB_WORKSPACE/upgrade10001100-3.log
-        php upgrade.php 11.0.0 12.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade11001200.log
-        php upgrade2.php 11.0.0 12.0.0 > $GITHUB_WORKSPACE/upgrade11001200-2.log
-        php step5.php 11.0.0 12.0.0 > $GITHUB_WORKSPACE/upgrade11001200-3.log
-        php upgrade.php 12.0.0 13.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade12001300.log
-        php upgrade2.php 12.0.0 13.0.0 > $GITHUB_WORKSPACE/upgrade12001300-2.log
-        php step5.php 12.0.0 13.0.0 > $GITHUB_WORKSPACE/upgrade12001300-3.log
-        php upgrade.php 13.0.0 14.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade13001400.log
-        php upgrade2.php 13.0.0 14.0.0 > $GITHUB_WORKSPACE/upgrade13001400-2.log
-        php step5.php 13.0.0 14.0.0 > $GITHUB_WORKSPACE/upgrade13001400-3.log
-        php upgrade.php 14.0.0 15.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade14001500.log
-        php upgrade2.php 14.0.0 15.0.0 > $GITHUB_WORKSPACE/upgrade14001500-2.log
-        php step5.php 14.0.0 15.0.0 > $GITHUB_WORKSPACE/upgrade14001500-3.log
-        php upgrade.php 15.0.0 16.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade15001600.log
-        php upgrade2.php 15.0.0 16.0.0 > $GITHUB_WORKSPACE/upgrade15001600-2.log
-        php step5.php 15.0.0 16.0.0 > $GITHUB_WORKSPACE/upgrade15001600-3.log
-        php upgrade.php 16.0.0 17.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade16001700.log
-        php upgrade2.php 16.0.0 17.0.0 > $GITHUB_WORKSPACE/upgrade16001700-2.log
-        php step5.php 16.0.0 17.0.0 > $GITHUB_WORKSPACE/upgrade16001700-3.log
-        php upgrade.php 17.0.0 18.0.0 ignoredbversion > $GITHUB_WORKSPACE/upgrade17001800.log
-        php upgrade2.php 17.0.0 18.0.0 > $GITHUB_WORKSPACE/upgrade17001800-2.log
-        php step5.php 17.0.0 18.0.0 > $GITHUB_WORKSPACE/upgrade17001800-3.log
-        
-    - name: Result of migration scripts
-      if: always()
-      run: |
-        ls -alrt $GITHUB_WORKSPACE/
-        
-        echo Show content of last file
-        cat "$(ls -rt $GITHUB_WORKSPACE/ | tail -n1)"
-
-    - name: Enabling new modules
-      run: | 
-        # Enable modules not enabled into original dump
-        set -e
-        cd /var/www/html/install
-        php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_ProductBatch,MAIN_MODULE_SupplierProposal,MAIN_MODULE_STRIPE,MAIN_MODULE_ExpenseReport > $GITHUB_WORKSPACE/enablemodule.log
-        php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKET,MAIN_MODULE_ACCOUNTING,MAIN_MODULE_MRP >> $GITHUB_WORKSPACE/enablemodule.log
-        php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_RECEPTION,MAIN_MODULE_RECRUITMENT >> $GITHUB_WORKSPACE/enablemodule.log
-        php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_KnowledgeManagement,MAIN_MODULE_EventOrganization,MAIN_MODULE_PARTNERSHIP >> $GITHUB_WORKSPACE/enablemodule.log
-        php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_EmailCollector >> $GITHUB_WORKSPACE/enablemodule.log
-        echo $?
-        cd -
-
-    - name: Result of enabling modules scripts
-      if: always()
-      run: |
-        echo Show content of enablemodule.log file
-        cat $GITHUB_WORKSPACE/enablemodule.log
-
-    - name: Unit testing
-      run: |
-        # Ensure we catch errors. Set this to +e instead of -e if you want to go to the end to see dolibarr.log file.
-        set -e
-        cd /var/www/html
-        sudo chmod -R a+rwx /var/www/html/documents
-        includes/bin/phpunit -d memory_limit=-1 -c /var/www/test/phpunit/phpunittest.xml /var/www/test/phpunit/AllTests.php
-        phpunitresult=$?
-        echo "Phpunit return code = $phpunitresult"
-        set +e     
-
-    - name: Code quality check - Lint
-      if: github.event_name == 'push'
-      run: |
-        htdocs/includes/bin/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 .
-
-    - name: Code quality check - phpcs
-      if: github.event_name == 'push'
-      run: |
-         htdocs/includes/bin/phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .;     
-
-    - name: Code quality check - var-dump-check
-      if: github.event_name == 'push'
-      run: |
-        htdocs/includes/bin/var-dump-check --extensions php --tracy --exclude htdocs/includes --exclude test/ --exclude htdocs/public/test/ --exclude htdocs/core/lib/functions.lib.php .
-
--- a/.github/workflows/phan.yml
+++ b/.github/workflows/phan.yml
@@ -1,58 +0,0 @@
---
-on:
-  # pull_request:
-  # push:
-  # schedule:
-  #   # execute once a day, the 1st
-  #   - cron: 10 9 * * *
-  workflow_call:
-    inputs:
-      gh_event:
-        required: true
-        type: string
-  workflow_dispatch:
-
-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_QUICK: ${{ github.event.schedule && '' || '--quick' }}
-  GITHUB_JSON: ${{ toJSON(github) }} # Helps in debugging Github Action
-
-name: phan
-jobs:
-  phan:
-    name: Run phan
-    runs-on: ubuntu-latest
-    # Do not run schedule on forks
-    if: |
-      github.repository == 'Dolibarr/dolibarr'
-      || github.event.schedule == false
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 8.2
-          coverage: none # disable xdebug, pcov
-          tools: cs2pr,phan
-      - name: Run Phan analysis
-        run: |
-          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
--- a/.github/workflows/phpcs.yml.disabled
+++ b/.github/workflows/phpcs.yml.disabled
@@ -1,32 +0,0 @@
-name: "PHPCS"
-
-on:
-  push:
-  pull_request:
-    paths:
-      - "**.php"
-      - "phpcs.xml"
-      - ".github/workflows/phpcs.yml"
-
-jobs:
-  phpcs:
-    runs-on: ubuntu-latest
-    steps:
-      # Get git sources
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 50 # important!
-
-      # we may use whatever way to install phpcs, just specify the path on the next step
-      # however, curl seems to be the fastest
-      - name: Install PHP_CodeSniffer
-        run: |
-          curl -OL https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar
-          php phpcs.phar --version
-
-      - uses: thenabeel/action-phpcs@v8
-        with:
-          files: "**.php" # you may customize glob as needed
-          phpcs_path: php phpcs.phar
-          standard: dev/setup/codesniffer/ruleset.xml
-          fail_on_warnings: false
--- a/.github/workflows/phpstan.yml
+++ b/.github/workflows/phpstan.yml
@@ -1,88 +0,0 @@
---
-# This is a basic workflow to check code with PHPSTAN tool
-name: PHPStan
-# Controls when the workflow will run
-on:
-  # push:
-  # pull_request:
-  workflow_call:
-    inputs:
-      gh_event:
-        required: true
-        type: string
-  workflow_dispatch:
-
-concurrency:
-  group: stan-${{ 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 }}
-  GITHUB_JSON: ${{ toJSON(github) }}  # Helps in debugging Github Action
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  # This workflow contains a single job
-  php-stan:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        php-version:
-          # PHPStan requires PHP >= 7.2.
-          #- "7.2"
-          - '8.2'
-    # 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
-
-      # Get PHP and addons
-      - name: Setup PHP
-        id: setup-php
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          tools: phpstan, cs2pr
-          extensions: calendar, json, imagick, gd, zip, mbstring, intl, opcache, imap,
-            mysql, pgsql, sqlite3, ldap, xml, mcrypt
-
-      # Restore old cache
-      - name: Restore phpstan cache
-        id: cache
-        uses: actions/cache/restore@v4
-        with:
-          path: ./.github/tmp
-          key: phpstan-cache-${{ matrix.php-version }}-${{ env.CACHE_KEY_PART }}-${{
-            github.run_id }}
-          restore-keys: |
-            phpstan-cache-${{ matrix.php-version }}-${{ env.CACHE_KEY_PART }}-
-            phpstan-cache-${{ matrix.php-version }}-${{ github.head_ref }}-
-            phpstan-cache-${{ matrix.php-version }}-${{ github.base_ref }}-
-            phpstan-cache-${{ matrix.php-version }}-
-      - name: Show debug into
-        run: cd ./.github/tmp && ls -al
-
-      # Run PHPStan
-      - name: Run PHPStan
-        id: phpstan
-        run: |
-          phpstan -vvv analyse --error-format=checkstyle --memory-limit 7G -a build/phpstan/bootstrap_action.php | tee _stan.xml | cs2pr --graceful-warnings
-        # continue-on-error: true
-
-      # Save cache
-      - name: Save phpstan cache
-        uses: actions/cache/save@v4
-        if: ${{ success() || ( ! cancelled() && steps.cache.outputs.cache-hit != 'true' ) }}
-        with:
-          path: ./.github/tmp
-          key: phpstan-cache-${{ matrix.php-version }}-${{ env.CACHE_KEY_PART }}-${{
-            github.run_id }}
-      - name: Provide phpstan log as artifact
-        uses: actions/upload-artifact@v4
-        if: ${{ always() }}
-        with:
-          name: phpstan-srcrt
-          path: ${{ github.workspace }}/_stan.xml
-          retention-days: 2
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -1,144 +0,0 @@
---
-name: pre-commit
-on:
-  # pull_request:
-  # push:
-  workflow_call:
-    inputs:
-      gh_event:
-        required: true
-        type: string
-  workflow_dispatch:
-
-concurrency:
-  group: pre-commit-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref
-    }}
-  cancel-in-progress: true
-env:
-  gh_event: ${{ inputs.gh_event || github.event_name }}
-jobs:
-  pre-commit:
-    runs-on: ubuntu-latest
-    env:
-      RAW_LOG: pre-commit.log
-      CS_XML: pre-commit.xml
-    steps:
-      - name: Install required tools
-        run: sudo apt-get update && sudo apt-get install cppcheck
-        if: false
-
-      # The next uses the git API because there is no clone yet.
-      # It sets the variable steps.changed-php.outputs.all_changed_files for other steps
-      # This is faster for a big repo.
-      - name: Get all changed php files (if PR)
-        id: changed-php
-        uses: tj-actions/changed-files@v44
-        if: env.gh_event == 'pull_request'
-        with:
-          files: |
-            **.php
-
-      # Checkout git sources to analyze
-      - uses: actions/checkout@v4
-      # Action setup-python needs a requirements.txt or pyproject.toml
-      # This ensures one of them exists.
-      - name: Create requirements.txt if no requirements.txt or pyproject.toml
-        run: |-
-          [ -r requirements.txt ] || [ -r pyproject.toml ] || touch requirements.txt
-      # Install python and pre-commit tool
-      - uses: actions/setup-python@v5
-        with:
-          cache: pip
-          python-version: "3.11"
-      - run: python -m pip install pre-commit
-
-      # Restore previous cache of precommit
-      - uses: actions/cache/restore@v4
-        with:
-          path: ~/.cache/pre-commit/
-          key: pre-commit-4|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
-
-      # Run all the precommit tools (defined in pre-commit-config.yaml).
-      # We can force exclusion of some of them here.
-      - name: Run pre-commit hooks
-        env:
-          # SKIP is used by pre-commit to not execute certain hooks
-          SKIP: no-commit-to-branch,php-cs,php-cbf,trailing-whitespace,end-of-file-fixer
-        run: |
-          set -o pipefail
-          pre-commit gc
-          pre-commit run --show-diff-on-failure --color=always --all-files | tee ${RAW_LOG}
-
-      # The next uses git, which is slow for a bit repo.
-      # - name: Get all changed php files (if PR)
-      #   id: changed-php
-      #   uses: tj-actions/changed-files@v44
-      #   if: env.gh_event == 'pull_request'
-      #   with:
-      #     files: |
-      #        **.php
-
-      - name: Setup PHPCS
-        uses: shivammathur/setup-php@v2
-        # Install when we're going to run phpcs
-        if: |
-          ! cancelled() &&
-          (
-            steps.changed-php.outputs.any_changed == 'true'
-            ||
-            (
-              env.gh_event == 'push'
-              && (
-                   github.event.ref == 'refs/heads/develop'
-                 || endsWith(github.event.ref, '.0')
-              )
-            )
-          )
-        with:
-          php-version: 8.1
-          coverage: none # disable xdebug, pcov
-          tools: phpcs
-
-      - name: Run some pre-commit hooks on selected changed files only
-        if: "! cancelled() && steps.changed-php.outputs.any_changed == 'true'"
-        env:
-          ALL_CHANGED_FILES: ${{ steps.changed-php.outputs.all_changed_files }}
-        run: |
-          set -o pipefail
-          pre-commit run php-cs --files ${ALL_CHANGED_FILES} | tee -a ${RAW_LOG}
-
-      - name: Run some pre-commit hooks on all files on push to "main" branches
-        if: |
-          env.gh_event == 'push'
-          && (
-               github.event.ref == 'refs/heads/develop'
-             || endsWith(github.event.ref, '.0')
-          )
-        run: |
-          set -o pipefail
-          ln -sf ~/.cache .cache  # Absolute path in .pre-commit-config.yaml
-          pre-commit run --hook-stage manual -a php-cs-with-cache | tee -a ${RAW_LOG}
-          pre-commit run --hook-stage manual -a sqlfluff-lint | tee -a ${RAW_LOG}
-          ls -l ~/.cache/pre-commit/
-
-      - name: Convert Raw Log to Annotations
-        uses: mdeweerd/logToCheckStyle@v2024.3.5
-        if: ${{ failure() }}
-        with:
-          in: ${{ env.RAW_LOG }}
-
-      # Save the precommit cache
-      - uses: actions/cache/save@v4
-        if: ${{ ! cancelled() }}
-        with:
-          path: ~/.cache/pre-commit/
-          key: pre-commit-4|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
-      # Upload result log files of precommit into the Artifact shared store
-      - name: Provide log as artifact
-        uses: actions/upload-artifact@v4
-        if: ${{ ! cancelled() }}
-        with:
-          name: precommit-logs
-          path: |
-            ${{ env.RAW_LOG }}
-            ${{ env.CS_XML }}
--- a/.github/workflows/stale-issues-safe.yml
+++ b/.github/workflows/stale-issues-safe.yml
@@ -6,14 +6,9 @@ on:
  - cron: "0 21 * * *"
  issue_comment:
    types: [created]
-  workflow_dispatch:
-
-permissions: {} # none

 jobs:
  stale:
-    permissions:
-      issues: write
    runs-on: ubuntu-latest
    steps:
    - uses: Dolibarr/stale@staleunstale
@@ -26,3 +21,4 @@ jobs:
        days-before-close: 10
        operations-per-run: 100
        dry-run: false
+        
--- a/.github/workflows/stale-issues.yml.disabled
+++ b/.github/workflows/stale-issues.yml.disabled
@@ -0,0 +1,25 @@
+# See syntax file on https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
+name: "Close stale issues (bugs and feature requests)"
+
+on:
+  schedule:
+  - cron: "0 20 * * *"
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: Dolibarr/stale@master
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'This issue is stale because it has been open 1 year with no activity. If this is a bug, please comment to confirm it is still present on latest stable version. if this is a feature request, please comment to notify the request is still relevant and not yet covered by latest stable version. This issue may be closed automatically by stale bot in 15 days (you should still be able to re-open it if required).'
+        stale-issue-label: 'Issue Stale (automatic label)'
+        exempt-issue-label: 'Priority High / Blocking'
+        days-before-stale: 365
+        days-before-close: -1
+        operations-per-run: 100
+        #stale-pr-message: 'This PR is stale because it has been open 1 year with no activity. If this PR is still mergeable (no conflict, nor Continuous Integration errors), please comment to confirm this merge is still expected. Without comment, this issue will be closed automatically by stale bot in 15 days.'
+        stale-pr-label: 'PR Stale (automatic label)'
+        stale-pr-message: 
+        exempt-pr-label: 'Priority Top Strategic'
+        
--- a/.github/workflows/windows-ci.yml
+++ b/.github/workflows/windows-ci.yml
@@ -1,194 +0,0 @@
---
-name: Win CI
-# yamllint disable-line rule:truthy
-on:
-  # push:
-  # pull_request:
-  workflow_call:
-    inputs:
-      gh_event:
-        required: true
-        type: string
-  workflow_dispatch:
-
-concurrency:
-  group: win-ci-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref
-    }}
-  cancel-in-progress: true
-env:
-  gh_event: ${{ inputs.gh_event || github.event_name }}
-  PHPUNIT_LOG: phpunit_tests.log
-  DOLIBARR_LOG: documents/dolibarr.log
-  PHPSERVER_LOG: phpserver.log
-  PHPSERVER_DOMAIN_PORT: 127.0.0.1:8000  # could be 127.0.0.1:8000 if config modified
-  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 }}
-  PHP_INI_SCAN_DIR: C:\myphpini
-  CKEY: win-ci-2
-  GITHUB_JSON: ${{ toJSON(github) }} # Helps in debugging Github Action
-jobs:
-  win-test:
-    strategy:
-      matrix:
-        os: [windows-latest]
-        # php_version: [7.4, 8.0]  # Add more versions if needed
-        php_version: [7.4]  # Add more versions if needed
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php_version }}
-          # ini-values: post_max_size=256M, max_execution_time=180
-          extensions: >
-            calendar, gd, imagick, imap, intl, json, ldap, mbstring,
-            mcrypt, mysql, mysqli, opcache, pgsql, sqlite3, xml, zip
-          tools: >
-            composer,
-            phpunit:9.5
-          coverage: none
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # phpts: ts  # ts for thread-safe, default nts
-
-      # Restore cache
-      - name: Restore cache
-        id: cache
-        uses: actions/cache/restore@v4
-        env:
-          HASH: ${{ hashFiles('htdocs/install/**') }}
-          KEY_ROOT: ${{ matrix.os }}-${{ env.ckey }}-${{ matrix.php_version }}
-        with:
-          # See https://github.com/actions/cache/issues/1275#issuecomment-1925217178
-          enableCrossOsArchive: true 
-          path: |
-            ./db_init.sql
-            ./db_init.sql.md5
-            ./.cache/mariadb
-          key: ${{ env.KEY_ROOT }}-${{ env.HASH }}-${{ env.CACHE_KEY_PART }}-${{ github.run_id }}
-          restore-keys: |
-            ${{ env.KEY_ROOT }}-${{ env.HASH }}-${{ env.CACHE_KEY_PART }}-
-            ${{ env.KEY_ROOT }}-${{ env.HASH }}-${{ github.head_ref }}-
-            ${{ env.KEY_ROOT }}-${{ env.HASH }}-${{ github.base_ref }}-
-            ${{ env.KEY_ROOT }}-${{ env.HASH }}-
-            ${{ env.KEY_ROOT }}-
-
-      - name: Setup MariaDB
-        uses: frederic34/setup-mariadb@v1
-        with:
-          # mariadb-version: ${{ matrix.mariadb-version }}
-          database: travis  # Specify your database name
-
-      - name: Create local php.ini with open_basedir restrictions
-        shell: cmd
-        # Objective: separate step, and before database initialisation to verify open_basedir restrictions
-        run: |-
-          echo "BASEDIR=%CD%" >> %GITHUB_ENV%
-          ECHO "==== Show INI file usage before our configuration ==="
-          php --ini
-          ECHO "==== Set PHP_INI_SCAN_DIR to include the INI File we create ==="
-          mkdir %PHP_INI_SCAN_DIR%
-          SET INIFILE="%PHP_INI_SCAN_DIR%\dolibarr.ini"
-          SET HTDOCS_DIR=%CD%\htdocs
-          SET DATA_DIR=%CD%\documents
-          SET TEST_DIR=%CD%\test
-          SET INITDEMO_DIR=%CD%\dev\initdemo
-          ECHO "==== Create INI file to set open_basedir ==="
-          echo [php] > %INIFILE%
-          echo open_basedir^="%HTDOCS_DIR%;%DATA_DIR%;%TEST_DIR%;%INITDEMO_DIR%;%PHPROOT%" >> %INIFILE%
-          REM Unset PHP_INI_SCAN_DIR to disable open_basedir restritions (to limit debug effort)
-          REM SET PHP_INI_SCAN_DIR=
-          ECHO "==== Show contents of INI file to set open_basedir ==="
-          type %INIFILE%
-          ECHO "==== Verify it is used by PHP ==="
-          php --ini
-          REM TEST OPEN_BASEDIR restriction is not limiting wrongly
-          REM THE DATA_DIR MUST BE CREATED HERE - open_base does not allow it's creation
-          mkdir "%DATA_DIR%"
-          mkdir "%DATA_DIR%\mytest"
-          php -r "$d=implode(DIRECTORY_SEPARATOR,[__DIR__,'documents','mytest']);echo 'IS_DIR '.$d.' '.((int) is_dir($d)).PHP_EOL;"
-          php -r "$d=__DIR__.'\documents/mytest';echo 'TEST PATH IS SHOWN: '.$d.PHP_EOL;"
-          php -r "$d=__DIR__.'\documents/mytest';echo 'IS_DIR '.$d.' '.((int) is_dir($d)).PHP_EOL;"
-          ECHO "The above should show 2 successful tests"
-
-      - name: Run Bash script that Initialises the database
-        # Note this is bash (MSYS) on Windows
-        shell: bash
-        run: |
-          ECHO "#[group]Directory contents to verify cache files, ..."
-          ls -l
-          ECHO "#[endgroup]"
-          ECHO "==== Verify openbase_dir restriction"
-          php --ini
-          # Run bash script to initialise database
-          ECHO "==== Start 'setup_conf.sh' to setup database"
-          ${SHELL} -xv dev/setup/phpunit/setup_conf.sh
-          ## Updating test configuration to not stop on first failure (to see all errors) - need sed
-          sed -i -e 's/stopOnFailure="[^"]*"/stopOnFailure="false"/' test/phpunit/phpunittest.xml
-          ECHO "#[group]Directory contents after database setup to verify cache files, ..."
-          ls -l
-          ECHO "#[endgroup]"
-          # Export some tool paths to reuse the from CMD shell.
-          echo "TAIL=$(cygpath -w "$(which tail)")" >> "$GITHUB_ENV"
-          echo "GREP=$(cygpath -w "$(which grep)")" >> "$GITHUB_ENV"
-          echo "TEE=$(cygpath -w "$(which tee)")" >> "$GITHUB_ENV"
-          echo "BASEDIR=$(realpath .)" >> "$GITHUB_ENV"
-
-      - name: Run PHPUnit tests
-        # continue-on-error: true
-        shell: cmd
-        # setting up php.ini, starting the php server are currently in this step
-        run: |-
-          ECHO "==== Visually verify our dolibarr.INI file usage ==="
-          php --ini
-          ECHO "==== Add our web server information to the config file ==="
-          echo $dolibarr_main_url_root="http://${{ env.PHPSERVER_DOMAIN_PORT }}"; >> htdocs/conf/conf.php
-          ECHO "#[group]==== Dolibarr config file contents"
-          cat htdocs/conf/conf.php
-          ECHO "#[endgroup]"
-          ECHO "==== START PHP server"
-          start /B php -S %PHPSERVER_DOMAIN_PORT% -t htdocs >> %PHPSERVER_LOG% 2>&1
-          ECHO "#[group]==== Output from curl on PHP server"
-          curl "http://${{ env.PHPSERVER_DOMAIN_PORT }}"
-          ECHO "#[endgroup]"
-          ECHO "==== START PHPUNIT TESTS"
-          REM 'DOSKEY' USED to recover error code (no pipefile equivalent in windows?)
-          ( php "%PHPROOT%\phpunit" -d memory_limit=-1 -c %CD%\test\phpunit\phpunittest.xml "test\phpunit\AllTests.php" --exclude-group WindowsWaitingForFix & call doskey /exename=err err=%%^^errorlevel%% ) | "${{ env.TEE }}" "${{ env.PHPUNIT_LOG }}"
-          echo ""
-          echo "Ensure that PHPUNIT completed (no early exit from code)"
-          "${{ env.TAIL }}" -5 "${{ env.PHPUNIT_LOG }}" | "${{ env.GREP }}" -qE "(OK .*[0-9]+ tests.*[0-9]+ assertions|Tests: [0-9]+)"  || EXIT /B 1
-          echo "PHPUNIT seems to have completed with a test result, reuse the exit code"
-          for /f "tokens=2 delims==" %%A in ('doskey /m:err') do EXIT /B %%A
-
-      - name: Convert Raw Log to Annotations
-        uses: mdeweerd/logToCheckStyle@v2024.3.5
-        if: ${{ failure() }}
-        with:
-          in: ${{ env.PHPUNIT_LOG }}
-
-      - name: Provide dolibarr and phpunit logs as artifact
-        uses: actions/upload-artifact@v4
-        if: ${{ ! cancelled() }}
-        with:
-          name: win-ci-logs
-          path: |
-            ${{ env.PHPUNIT_LOG }}
-            ${{ env.DOLIBARR_LOG }}
-            ${{ env.PHPSERVER_LOG }}
-            db_init.sql
-            db_init.sql.md5
-          retention-days: 2
-
-      # Save cache
-      - name: Save cache
-        uses: actions/cache/save@v4
-        if: ${{ ! cancelled() }}
-        with:
-          # See https://github.com/actions/cache/issues/1275#issuecomment-1925217178
-          enableCrossOsArchive: true 
-          key: ${{ steps.cache.outputs.cache-primary-key }}
-          path: |
-            ./db_init.sql
-            ./db_init.sql.md5
-            ./.cache/mariadb
--- a/.gitignore
+++ b/.gitignore
@@ -14,11 +14,11 @@ default.properties
 /.pydevproject
 /.vscode
 .DS_Store
+.idea
 *.iml
 *.orig
 Thumbs.db
 /dolibarr_genesis.mp4
-.phpunit.result.cache
 # Log files
 dolibarr_install.log
 upgrade.log
@@ -42,17 +42,12 @@ htdocs/includes/sebastian/
 htdocs/includes/squizlabs/
 htdocs/includes/webmozart/
 htdocs/.well-known/apple-developer-merchantid-domain-association
-/factory/
-/output/

 # Node Modules
 build/yarn-error.log
 build/node_modules/
 node_modules/

-vendor/
-tmp/
-
 #yarn
 yarn.lock

@@ -60,32 +55,3 @@ yarn.lock
 package-lock.json

 doc/install.lock
-/.asciidoctorconfig.adoc
-
-.idea
-/composer.json
-/composer.lock
-
-# Local script, executed during pre-commit
-/local.sh
-
-# Local phpstan configuration
-/phpstan.neon
-/phpstan-baseline.neon
-
-# Logs
-/*.log
-
-# Vim swap files
-*.sw?
-
-# Generated by PHPUNIT.BAT
-/INI_PHPUNIT
-
-# ignore cache builds
-/build/phpstan/phpstan
-/build/phpstan/bootstrap_custom.php
-phpstan_custom.neon
-/.php-cs-fixer.cache
-/.php_cs.cache
-/.cache
--- a/.mailmap
+++ b/.mailmap
@@ -89,9 +89,3 @@ Baffir Abbes <bafbes@users.noreply.github.com> bafbes <bafbes@users.noreply.gith
 Kevin Guerrier <guerrier.k@gmail.com> GUERRIER Kevin <guerrier.k@gmail.com>
 Remy Younes <ryounes@gmail.com> remy <ryounes@gmail.com>
 Estephe Loridan <github@estephe.me> Estephe L. <github@estephe.me>
-Anthony Berton <anthony.berton@bb2a.fr> Anthony Berton <anthony.berton@bb2a.fr>
-Anthony Berton <anthony.berton@bb2a.fr> Berton Anthony <anthony.berton@bb2a.fr>
-Anthony Berton <anthony.berton@bb2a.fr> BB2A-Anthony <anthony.berton@bb2a.fr>
-Anthony Berton <anthony.berton@bb2a.fr> Anthony Berton <bertonanthony@gmail.com>
-Anthony Berton <anthony.berton@bb2a.fr> Berton Anthony <bertonanthony@gmail.com>
-Anthony Berton <anthony.berton@bb2a.fr> BB2A-Anthony <bertonanthony@gmail.com>
--- a/.phan/config.php
+++ b/.phan/config.php
@@ -1,4 +0,0 @@
-<?php
-/* Copyright (C) 2024		MDW							<mdeweerd@users.noreply.github.com>
- */
-return include __DIR__ . "/../dev/tools/phan/config.php";
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,265 +0,0 @@
---
-exclude: (?x)^( htdocs/includes/ckeditor/.*|(\.[^/]*/.*))$
-repos:
-  # Several miscellaneous checks and fix (on yaml files, end of files fix)
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
-    hooks:
-      # This hook tests the name of the branch and return an error if the name is
-      #  'develop' or an official version 'x.y'
-      # So you can't commit if your branch name is not a custom branch name.
-      # Using a custom branch name is good practice that makes it easier to manage PRs.
-      # You can skip this:
-      #  - Permanently:
-      #      export SKIP=no-commit-to-branch   # In your .bashrc or session.
-      #  - Only this for one commit:
-      #      SKIP=no-commit-to-branch git commit -a -m "My message"
-      #  - Skipping all checks for a commit:
-      #      git commit -a -m "My message" --no-verify
-      #      (Recommendation: run git commit -a .. once, then with `--no-verify`)
-      - id: no-commit-to-branch
-        args: [--branch, develop, --pattern, \d+.0]
-      # This checks that xml files are correct
-      - id: check-xml
-        exclude: |
-          (?x)^(htdocs/includes/.*)$
-      # This checks that yaml files are correct
-      - id: check-yaml
-        args: [--unsafe]
-      # This checks that json files are correct
-      - id: check-json
-      # Fixes Fix files that have DOS end of line endings
-      - id: mixed-line-ending
-        # alternative for dev/tools/fixdosfiles.sh
-        exclude: |
-          (?x)^(htdocs/includes/tecnickcom/tcpdf/fonts/.*
-               |.*/CRLF.*.php  # Files in swiftmailer
-               )$
-        args: [--fix=lf]
-      # Remove trailing whitespace
-      - id: trailing-whitespace
-        exclude_types: [markdown]
-      # Fix the end of file
-      - 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]
-      # Check that files with shebangs have the executable bit set (in git)
-      - id: check-executables-have-shebangs
-      # Check that shell files are executables
-      - id: check-shebang-scripts-are-executable
-        exclude:
-          (?x)^( dev/tools/dolibarr-postgres2mysql.php |test/other/test_serialize.php
-          |test/phpunit/textutf8.txt |test/phpunit/textiso.txt |htdocs/includes/.*
-          |htdocs/modulebuilder/template/.* |build/debian/dolibarr.postrm |build/debian/dolibarr.postinst
-          |build/debian/dolibarr.config )$
-      # Fix the first UTF8 byte
-      - id: fix-byte-order-marker
-      # Check that there are no files that have are the same when uppercased (conflict on windows)
-      - id: check-case-conflict
-
-  # Beautify shell scripts
-  - repo: https://github.com/gitleaks/gitleaks.git
-    rev: v8.16.1
-    hooks:
-      - id: gitleaks
-
-  # Beautify shell scripts
-  - repo: https://github.com/lovesegfault/beautysh.git
-    rev: v6.2.1
-    hooks:
-      - id: beautysh
-        exclude: |
-          (?x)^(dev/setup/git/hooks/pre-commit
-               )$
-        args: [--tab]
-
-  # Run local script
-  #
-  # For example, to update the license in edited files, you could add to local.sh:
-  #
-  #   ```shell
-  #   #!/bin/bash
-  #   MYDIR=$(dirname "$0")
-  #   git diff HEAD --name-only | grep -v includes | \
-  #       xargs "$MYDIR/dev/tools/updatelicense.php"
-  #   ```
-  - repo: local
-    hooks:
-      - name: Find missing/unused/duplicate language keys
-        id: check-translations
-        files: (?x)^(htdocs/langs/en_US/.*\.lang)
-        language: script
-        entry: ./dev/translation/sanity_check_trans_missing_unused.sh
-        pass_filenames: false
-        args: [list]
-      - id: local-precommit-script
-        name: Run local script before commit if it exists
-        language: system
-        entry: bash -c '[ ! -x local.sh ] || ./local.sh'
-        pass_filenames: false
-      - id: duplicate-lang-lines
-        stages: [manual]
-        name: Find duplicate language lines
-        files: (?x)^(htdocs/langs/en_US/.*\.lang)
-        language: script
-        entry: ./dev/tools/fixduplicatelanglines.sh
-        pass_filenames: false
-        args: [list]
-      - id: duplicate-lang-keys
-        stages: [manual]
-        name: Find duplicate language keys
-        files: (?x)^(htdocs/langs/en_US/.*\.lang)
-        language: script
-        entry: ./dev/tools/fixduplicatelangkey.sh
-        pass_filenames: false
-        args: [list]
-      - id: fix-alt-languages
-        stages: [manual]
-        name: Fix alt languages
-        # Selection: see fixaltlanguages.sh script
-        files: (?x)^(htdocs/langs/(e[lnstu]|k[akmno]|s[lqrv]|b[nrs]|c[asy]|n[bel]|[ip]t|a[mr]|d[ae]|f[ar]|h[ei]|m[sy]|t[ag]|u[kr]|gl|ja|lo|ru|vi|zh)_[^/]*/.*\.lang)
-        language: script
-        entry: ./dev/tools/fixaltlanguages_pre-commit.sh
-        pass_filenames: true
-
-  # Check PHP syntax
-  - repo: https://github.com/mdeweerd/pre-commit-php
-    rev: v1.6.8
-    hooks:
-      - id: php-cbf
-        files: \.(php)$
-        args: [--standard=dev/setup/codesniffer/ruleset.xml]
-      - id: php-cs
-        files: \.(php)$
-        args:
-          [
-            --standard=dev/setup/codesniffer/ruleset.xml,
-            --report=emacs,
-            --severity=5,
-            --no-colors,
-          ]
-      - alias: php-cs-with-cache
-        id: php-cs
-        # Configuration for ci - run on all files with cache
-        stages: [manual]
-        args:
-          [
-            --standard=dev/setup/codesniffer/ruleset.xml,
-            --report=emacs,
-            --severity=5,
-            --no-colors,
-            --cache=.cache/pre-commit/dolibarr-php-cs.cache,
-            .,
-          ]
-        pass_filenames: false # Run on all files
-      - id: php-lint
-      - id: php-stan
-        stages: [manual]
-        files: \.(php)$
-
-  # Prettier (format code, only for non common files)
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.3
-    hooks:
-      - id: prettier
-        stages: [manual]
-        exclude:
-          (?x)^( .*\.(phar |min\.css |lock) |htdocs/(includes|theme/common)/.*
-          )$
-        exclude_types:
-          - php
-          - executable
-          - binary
-          - shell
-          - javascript
-          - markdown
-          - html
-          - less
-          - plain-text
-          - scss
-          - css
-          - yaml
-
-  # Check format of yaml files
-  - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.33.0
-    hooks:
-      - id: yamllint
-        args:
-          - --no-warnings
-          - -d
-          - "{extends: relaxed, rules: {line-length: {max: 120}}}"
-
-  # Execute codespell to fix typo errors (setup of codespell into dev/tools/codespell/)
-  - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.6
-    hooks:
-      - id: codespell
-        # Due to a current limitation of configuration files,
-        # we can specify two dicts only on the CLI.
-        # You can update the contents of the exclude-file codespell-lines-ignore with the script
-        # dev/tools/codespell/addCodespellIgnores.sh
-        args:
-          - -D
-          - "-"
-          - -D
-          - dev/tools/codespell/codespell-dict.txt
-          - -I
-          - dev/tools/codespell/codespell-ignore.txt
-          - -x
-          - dev/tools/codespell/codespell-lines-ignore.txt
-        exclude_types: [image]
-        exclude: (?x)^(.phan/stubs/.*)$
-        additional_dependencies: [tomli]
-      - alias: codespell-lang-en_US
-        # Only for translations with specialised exceptions
-        # -D contains predefined conversion dictionaries
-        # -L is to ignore some words
-        id: codespell
-        files: ^htdocs/langs/en_US/.*$
-        args:
-          - -D
-          - "-"
-          - -D
-          - dev/tools/codespell/codespell-dict.txt
-          - -L
-          - informations,medias,uptodate,reenable,crypted,developpers
-          - -L
-          - creat,unitl,alltime,datas,referers
-          - -I
-          - dev/tools/codespell/codespell-ignore.txt
-          - -x
-          - dev/tools/codespell/codespell-lines-ignore.txt
-          - --uri-ignore-words-list
-          - ned
-
-  # Check some shell scripts
-  - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.9.0.6
-    hooks:
-      - id: shellcheck
-        args: [-W, "100"]
-
-  - repo: https://github.com/sqlfluff/sqlfluff
-    rev: 3.0.4
-    hooks:
-      - id: sqlfluff-lint
-        stages: [pre-commit, manual]  # manual needed for ci
-        exclude: (?x)^
-          (htdocs/includes/.*
-          |htdocs/install/doctemplates/websites/.*_template
-          |htdocs/core/menus/init_menu_auguria\.sql
-          |htdocs/install/doctemplates/websites/website_template-.*\.sql
-          |(htdocs/install/mysql/data/(llx_20_c_departements\.sql
-           |llx_accounting_account_.*\.sql)
-           |(htdocs/install/mysql/migration/3\.[256]\.0-.*\.sql)
-           )
-          |htdocs/install/mysql/migration/(1[0-5]|[456789])\.0\.0-.*\.sql
-          |htdocs/install/mysql/migration/3\.([0134789])\.0-.*\.sql
-          |htdocs/install/mysql/migration/repair\.sql
-          |htdocs/install/mysql/tables/llx_bookcal_availabilities-bookcal\.sql
-          |htdocs/install/mysql/tables/llx_categorie(_(account|actioncomm|contact|fournisseur|knowledgemanagement-knowledgemanagement|member|product|project|societe|ticket-ticket|user|warehouse|website_page-website)?\.key\.sql)
-          |htdocs/install/mysql/tables/llx_rights_def\.key\.sql
-          |htdocs/install/pgsql/functions/functions(-(don|loan|mailing|opensurvey|partnership|recruitment|website))?\.sql
-          )$
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -0,0 +1,221 @@
+# .scrutinizer.yml
+#build:
+#    - php-scrutinizer-run
+build:
+    nodes:
+        analysis:
+            tests:
+                override:
+                    - php-scrutinizer-run
+          
+imports:
+    - javascript
+    - php
+
+filter:
+    excluded_paths:
+        - build/*
+        - dev/*
+        - doc/*
+        - documents/*
+        - htdocs/includes/*
+        - node_modules/*
+        - test/*
+    paths: 
+        - htdocs/*
+        - scripts/*
+    
+tools:
+    # php_analyzer. Doc on https://scrutinizer-ci.com/docs/tools/php/php-analyzer/
+    php_analyzer:
+        enabled: true
+        extensions:
+            - php
+        dependency_paths: 
+            - htdocs/includes/
+        filter:
+            excluded_paths:
+                - build/*
+                - dev/*
+                - doc/*
+                - test/*
+                - htdocs/includes/*
+                - htdocs/core/class/lessc.class.php
+            paths:
+                - htdocs/
+                - scripts/
+        config:
+            parameter_reference_check:
+                enabled:              true
+            checkstyle:
+                enabled:              false
+                no_trailing_whitespace:  true
+                naming:
+                    enabled:              true
+                    local_variable:       ^[a-z][a-zA-Z0-9]*$
+                    abstract_class_name:  ^Abstract|Factory$
+                    utility_class_name:   Utils?$
+                    constant_name:        ^[A-Z][A-Z0-9]*(?:_[A-Z0-9]+)*$
+                    property_name:        ^[a-z][a-zA-Z0-9]*$
+                    method_name:          ^(?:[a-z]|__)[a-zA-Z0-9]*$
+                    parameter_name:       ^[a-z][a-zA-Z0-9]*$
+                    interface_name:       ^[A-Z][a-zA-Z0-9]*Interface$
+                    type_name:            ^[A-Z][a-zA-Z0-9]*$
+                    exception_name:       ^[A-Z][a-zA-Z0-9]*Exception$
+                    isser_method_name:    ^(?:is|has|should|may|supports)
+            unreachable_code:
+                enabled:              true
+            check_access_control:
+                enabled:              true
+            typo_checks:
+                enabled:              true
+            check_variables:
+                enabled:              true
+            check_calls:
+                enabled:              true
+                too_many_arguments:   true
+                missing_argument:     true
+                argument_type_checks:  lenient # Allowed Values: "disabled", "lenient", "strict"
+            suspicious_code:
+                enabled:              true
+                overriding_parameter:  false
+                overriding_closure_use:  true
+                parameter_closure_use_conflict:  true
+                parameter_multiple_times:  true
+                non_existent_class_in_instanceof_check:  true
+                non_existent_class_in_catch_clause:  true
+                assignment_of_null_return:  true
+                non_commented_switch_fallthrough:  true
+                non_commented_empty_catch_block:  true
+                overriding_private_members:  true
+                use_statement_alias_conflict:  true
+                precedence_in_condition_assignment:  true
+            dead_assignments:
+                enabled:              true
+            verify_php_doc_comments:
+                enabled:              false
+                parameters:           true
+                return:               true
+                suggest_more_specific_types:  true
+                ask_for_return_if_not_inferrable:  true
+                ask_for_param_type_annotation:  true
+            loops_must_use_braces:
+                enabled:              true
+            check_usage_context:
+                enabled:              true
+            simplify_boolean_return:
+                enabled:              false
+            phpunit_checks:
+                enabled:              false
+            reflection_checks:
+                enabled:              true
+
+            # Checks Common Precedence Mistakes
+            precedence_checks:
+                enabled:              true
+                assignment_in_condition:  true
+                comparison_of_bit_result:  true
+            basic_semantic_checks:
+                enabled:              true
+            # Disabled unused code. In most cases, we want to keep it.
+            unused_code:
+                enabled:              false		
+            deprecation_checks:
+                enabled:              true
+            useless_function_calls:
+                enabled:              true
+            metrics_lack_of_cohesion_methods:
+                enabled:              true
+            metrics_coupling:
+                enabled:              true
+                stable_code:
+                    namespace_prefixes:   []
+                    classes:              []
+            doctrine_parameter_binding:
+                enabled:              false
+            doctrine_entity_manager_injection:
+                enabled:              false
+            symfony_request_injection:
+                enabled:              false
+            doc_comment_fixes:
+                enabled:              true
+            reflection_fixes:
+                enabled:              false
+            use_statement_fixes:
+                enabled:              true
+                remove_unused:        true
+                # Whether you would like multiple imports in one USE statement to be preserved, e.g. ``use A, B;``.
+                preserve_multiple:    false
+                # Whether you would like to preserve blank lines between use statements.
+                preserve_blanklines:  false
+                order_alphabetically:  false
+         # To use specific config for a specific path, use path_configs: (see example on page https://scrutinizer-ci.com/docs/configuration/tool_config_structure)
+                        
+    # php_depend
+    php_pdepend:
+        enabled: false
+        configuration_file: null
+        suffixes:
+            - php
+        excluded_dirs: {  }
+        filter:
+            excluded_paths:
+                - 'build/*'
+                - 'dev/*'
+                - 'doc/*'
+                - 'test/*'
+                - 'htdocs/includes/*'
+            paths: {  }
+
+    # change tracking
+    php_changetracking:
+        enabled: false
+        bug_patterns:
+            - '\bfix(?:es|ed)?\b'
+        feature_patterns:
+            - '\badd(?:s|ed)?\b'
+            - '\bimplement(?:s|ed)?\b'
+        filter:
+            excluded_paths:
+                - 'build/*'
+                - 'dev/*'
+                - 'doc/*'
+                - 'test/*'
+                - 'htdocs/includes/*'
+            paths: {  }
+
+    # Similar code detection
+    php_sim:
+        enabled: false
+        min_mass: 30
+        filter:
+            excluded_paths:
+                - 'build/*'
+                - 'dev/*'
+                - 'doc/*'
+                - 'test/*'
+                - 'htdocs/includes/*'
+            paths: {  }
+            
+    # Coding-Style / Bug Detection
+    js_hint:
+        enabled: false
+        use_native_config: true
+        extensions:
+            - js
+        filter:
+            excluded_paths:
+                - 'build/*'
+                - 'dev/*'
+                - 'doc/*'
+                - 'test/*'
+                - 'htdocs/includes/*'
+            paths: {  }
+        config: {  }
+        path_configs: {  }
+
+
+before_commands: {  }
+after_commands: {  }
+artifacts: {  }
+build_failure_conditions: {  }
--- a/.stickler.yml
+++ b/.stickler.yml
@@ -0,0 +1,14 @@
+---
+linters:
+  phpcs:
+      standard: 'dev/setup/codesniffer/ruleset.xml'
+      extensions: 'php'
+      tab_width: 4
+      fixer: true
+
+fixers:
+    enable: true
+
+files:
+    ignore:
+        - 'htdocs/includes/*'
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,13 +2,12 @@
 # from Dolibarr GitHub repository.
 # For syntax, see https://docs.travis-ci.com/user/languages/php/

-# We use dist: focal = 20.04
+# We use dist: xenial to have php 5.6+ available
 os: linux
-dist: focal
+dist: xenial
+#dist: bionic

-language: generic
-
-#scan_logs: false
+language: php

 git:
  depth: 1
@@ -16,47 +15,47 @@ git:
 # Start on every boot
 services:
 - memcached
-#- mysql
+- mysql
 - postgresql

-
 addons:
-  mariadb: '10.5'
-
+  # Force postgresql to 9.4 (the oldest availablable on xenial)
+  postgresql: '9.4'
+  apt:
+    sources:
+    # To use the last version of pgloader, we add repo of postgresql with a name available in http://apt.postgresql.org/pub/repos/apt/
+    - pgdg-xenial
+    packages:
+    # We need a webserver to test the webservices
+    # Let's install Apache with.
+    - apache2
+    # mod_php is not supported by Travis. Add fcgi. We install FPM later on.
+    - libapache2-mod-fastcgi
+    # We need pgloader for import mysql database into pgsql
+    - pgloader

 env:
  global:
  # Set to true for very verbose output
-  - DEBUG=true
-
-cache:
-  directories:
-    - ~/.cache
-
+  - DEBUG=false

 jobs:
  fast_finish: true
-  allow_failures:
-  - php: '8.3'
+  #allow_failures:
+  #- php: nightly
  include:
-    - stage: PHP min and max
-      if: type = push
-      php: '7.1'
-      env:
-      - DB=postgresql
-      - TRAVIS_PHP_VERSION=7.1
-    - stage: PHP min and max
-      if: type = pull_request OR type = push
-      php: '8.2'
-      env:
-      - DB=mysql
-      - TRAVIS_PHP_VERSION=8.2
-    - stage: PHP 8.3
-      if: type = push AND branch = develop
-      php: '8.3'
-      env:
-      - DB=mysql
-      - TRAVIS_PHP_VERSION=8.3
+    - if: type = push
+      php: '5.6'
+      env: DB=postgresql
+    - if: type = pull_request OR type = push
+      php: '7.4.22'
+      env: DB=mysql
+    - if: type = push AND branch = develop
+      php: nightly 
+      env: DB=mysql
+    - if: type = push AND branch = 14.0
+      php: nightly 
+      env: DB=mysql

 notifications:
  email:
@@ -69,119 +68,60 @@ notifications:
    on_failure: always
    use_notice: true

-
 before_install:
 - |
-  echo "Remove awful phpenv and install packages"
-  sudo rm -fr ~/.phpenv
-  sudo rm -fr /root/.phpenv
-  sudo add-apt-repository -y ppa:ondrej/php
-  sudo apt-get update
-  echo TRAVIS_PHP_VERSION=$TRAVIS_PHP_VERSION
-
- |
-  echo Install packages for PHP
-  sudo apt-get install -y pgloader memcached
-  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" = '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
-  if [ "$TRAVIS_PHP_VERSION" = '8.2' ]; then
-  	sudo apt install unzip apache2 php8.2 php8.2-cli php8.2-curl php8.2-mysql php8.2-pgsql php8.2-gd php8.2-imap php8.2-intl php8.2-ldap php8.2-xml php8.2-mbstring php8.2-xml php8.2-zip libapache2-mod-php8.2
-  fi
-  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
-
- |
-  echo Install pgsql if run is for pgsql
-  if [ "$DB" = 'postgresql' ]; then
-    echo "Check pgloader version"
-    pgloader --version
-    #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 service postgresql restart
-
-    psql postgresql://postgres:postgres@127.0.0.1:5432 -l -A
-
-    psql postgresql://postgres:postgres@127.0.0.1:5432 -c 'create database travis;'
-    psql postgresql://postgres:postgres@127.0.0.1:5432 -c "CREATE USER travis WITH ENCRYPTED PASSWORD 'travis';"
-    psql postgresql://postgres:postgres@127.0.0.1:5432 -c 'GRANT ALL PRIVILEGES ON DATABASE travis TO travis;'
-
-    psql postgresql://postgres:postgres@127.0.0.1:5432 -l -A
-  fi
+  echo "Disabling Xdebug for composer"
+  export PHP_VERSION_NAME=$(phpenv version-name)
+  cp ~/.phpenv/versions/$PHP_VERSION_NAME/etc/conf.d/xdebug.ini /tmp/xdebug.ini
+  phpenv config-rm xdebug.ini
+  echo

 install:
 - |
-  if [ "$TRAVIS_PHP_VERSION" = '7.1' ]; then
-    sudo update-alternatives --set php /usr/bin/php7.1
-  fi
-  if [ "$TRAVIS_PHP_VERSION" = '8.1' ]; then
-    sudo update-alternatives --set php /usr/bin/php8.1
-  fi
-  if [ "$TRAVIS_PHP_VERSION" = '8.2' ]; then
-    sudo update-alternatives --set php /usr/bin/php8.2
-  fi
-  php -i | head -
-
- |
-  echo "Updating Composer config"
-  curl -sS https://getcomposer.org/installer -o /tmp/composer-setup.php
-  HASH=`curl -sS https://composer.github.io/installer.sig`
-  echo $HASH
-  php -r "if (hash_file('SHA384', '/tmp/composer-setup.php') === '$HASH') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
-  sudo php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer
-  sudo chmod -R a+rwx /usr/local/bin/composer
-
-  #sudo apt install composer
+  echo "Updating Composer"
+  rm $TRAVIS_BUILD_DIR/composer.json
+  rm $TRAVIS_BUILD_DIR/composer.lock
  composer -V
+  composer self-update
+  composer -n init
+  composer -n config vendor-dir htdocs/includes
  composer -n config -g vendor-dir htdocs/includes
  echo

 - |
-  echo "Update Composer version and Install tools - PHP Unit, Parallel Lint, PHP CodeSniffer, PHP Vardump check - for $TRAVIS_PHP_VERSION"
-  echo "(composer version 2.5 is bugged and generate phpunit error Exception: Serialization of 'Closure' is not allowed)"
-  if [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = '7.2' ]; then
-    sudo composer self-update 2.2.18
-    composer -n require phpunit/phpunit ^7.5 \
+  echo "Installing Composer dependencies - PHP Unit, Parallel Lint, PHP CodeSniffer - for $TRAVIS_PHP_VERSION"
+  if [ "$TRAVIS_PHP_VERSION" = '5.6' ]; then
+    composer -n require phpunit/phpunit ^5 \
                        php-parallel-lint/php-parallel-lint ^1 \
                        php-parallel-lint/php-console-highlighter ^0 \
-                        php-parallel-lint/php-var-dump-check ~0.4 \
                        squizlabs/php_codesniffer ^3
  fi
-  if [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = '7.4' ]; then
-    sudo composer self-update 2.2.18
-    composer -n require phpunit/phpunit ^7.5 \
+  if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = '7.2' ]; then
+    composer -n require phpunit/phpunit ^6 \
+                        php-parallel-lint/php-parallel-lint ^1 \
+                        php-parallel-lint/php-console-highlighter ^0 \
+                        squizlabs/php_codesniffer ^3
+  fi
+  if [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = '7.4' ] || [ "$TRAVIS_PHP_VERSION" = '7.4.22' ]; then
+    composer -n require phpunit/phpunit ^7 \
                        php-parallel-lint/php-parallel-lint ^1.2 \
                        php-parallel-lint/php-console-highlighter ^0 \
-                        php-parallel-lint/php-var-dump-check ~0.4 \
                        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
-      sudo composer self-update 2.4.4
-      composer -n require --ignore-platform-reqs phpunit/phpunit ^8 \
+  if [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
+      composer -n require --ignore-platform-reqs phpunit/phpunit ^7 \
                                                 php-parallel-lint/php-parallel-lint ^1.2 \
                                                 php-parallel-lint/php-console-highlighter ^0 \
-                                                 php-parallel-lint/php-var-dump-check ~0.4 \
                                                 squizlabs/php_codesniffer ^3
  fi
-
-  # Remove non expected files
-  rm -fr /home/travis/build/Dolibarr/dolibarr/htdocs/includes/phpunit/php-code-coverage/src/Report/Html/Renderer/Template/js
  echo

 - |
  echo "Adding path of binaries tools installed by composer to the PATH"
  export PATH="$TRAVIS_BUILD_DIR/htdocs/includes/bin:$PATH"
  echo $PATH
-  ls $TRAVIS_BUILD_DIR/htdocs/includes
+  ls $TRAVIS_BUILD_DIR/vendor
  ls $TRAVIS_BUILD_DIR/htdocs/includes/bin
  echo

@@ -189,11 +129,24 @@ install:

 before_script:
  - |
-    echo Start before_script
+    echo Start travis
    echo Current dir is `pwd`
    echo Home dir is `echo ~`
    echo TRAVIS_BUILD_DIR is $TRAVIS_BUILD_DIR

+  - |
+    echo "Re-enabling Xdebug for PHP CodeSniffer and PHP Unit"
+    phpenv config-add /tmp/xdebug.ini
+    echo
+
+  - |
+    echo "Setting up PHP"
+    echo
+    echo "Set timezone"
+    echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
+    phpenv rehash
+    echo
+
  - |
    echo "Versions information"
    echo
@@ -209,10 +162,6 @@ before_script:
    which phpcs
    phpcs --version | head -
    phpcs -i | head -
-    # Check PHP Vardump check version
-    echo "PHP Vardump check version"
-    which var_dump_check
-    var_dump_check --version
    # Check PHPUnit version
    echo "PHPUnit version"
    which phpunit
@@ -223,76 +172,53 @@ before_script:
    # Check Database
    echo "Database version"
    mysql --version | head -
+    mysql -e "SELECT VERSION();"  | head -
    psql --version
+    if [ "$DB" = 'postgresql' ]; then
+      echo "Check pgloader version"
+      pgloader --version
+    fi
+    echo

  - |
    echo "Setting up database"
    if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ] || [ "$DB" = 'postgresql' ]; then
-      echo "MySQL stop"
-      sudo systemctl stop mariadb.service
-      echo "MySQL restart without pass"
-      #sudo mysqld_safe --skip-grant-tables --socket=/tmp/aaa
-      sudo mysqld_safe --skip-grant-tables --socket=/tmp/aaa &
-      sleep 3
-      sudo ps fauxww
-      echo "MySQL set root password"
-      sudo mysql -u root -h 127.0.0.1 -e "FLUSH PRIVILEGES; CREATE DATABASE IF NOT EXISTS travis CHARACTER SET = 'utf8'; ALTER USER 'root'@'localhost' IDENTIFIED BY 'password'; CREATE USER 'root'@'127.0.0.1' IDENTIFIED BY 'password'; CREATE USER 'travis'@'127.0.0.1' IDENTIFIED BY 'password'; GRANT ALL PRIVILEGES ON travis.* TO root@127.0.0.1; GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1; FLUSH PRIVILEGES;"
-      echo "MySQL grant"
-      sudo mysql -u root -h 127.0.0.1 -ppassword -e 'FLUSH PRIVILEGES; GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1; FLUSH PRIVILEGES;'
-      echo "MySQL list current users"
-      sudo mysql -u root -h 127.0.0.1 -ppassword -e 'use mysql; select * from user;'
-      echo "List pid file"
-      sudo mysql -u root -h 127.0.0.1 -ppassword -e "show variables like '%pid%';"
-
-      #sudo kill `cat /var/lib/mysqld/mysqld.pid`
-      #sudo systemctl start mariadb
-
-      echo "MySQL grant"
-      sudo mysql -u root -h 127.0.0.1 -ppassword -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;'
-      echo "MySQL flush"
-      sudo mysql -u root -h 127.0.0.1 -ppassword -e 'FLUSH PRIVILEGES;'
-
-      echo "MySQL load sql"
-      sudo mysql -u root -h 127.0.0.1 -ppassword -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
+      echo "MySQL"
+      mysql -u root -e 'DROP DATABASE IF EXISTS travis;'
+      mysql -u root -e 'CREATE DATABASE IF NOT EXISTS travis;'
+      mysql -u root -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;'
+      mysql -u root -e 'FLUSH PRIVILEGES;'
+      mysql -u root -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
    fi
    if [ "$DB" = 'postgresql' ]; then
-      echo "PGSQL"
-      sudo mkdir -p /tmp/pgloader
-      sudo chmod -R a+rwx /tmp/pgloader/
-      sudo pgloader 'mysql://root:password@127.0.0.1/travis' 'postgresql://postgres:postgres@127.0.0.1:5432/travis'
-      echo 'ALTER SEQUENCE llx_accountingaccount_rowid_seq RENAME TO llx_accounting_account_rowid_seq' | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis'
-      echo 'ALTER SEQUENCE llx_accounting_account_rowid_seq RESTART WITH 1000001;' | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis'
-
-      #echo '\d llx_adherent' | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis'
-      #echo '\d llx_c_country' | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis'
-
-      # Create pgsql compatibility functions
-      psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis' < htdocs/install/pgsql/functions/functions.sql
+      #psql -c 'create database travis;' -U postgres
+      #psql travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
+      #pgloader mysql://root:pass@127.0.0.1/dolibarr_src postgresql://dolibarrowner:dolibarrownerpass@127.0.0.1/dolibarr_dest
+      echo pgloader mysql://root@127.0.0.1/travis postgresql://postgres@/travis
+      pgloader mysql://root@127.0.0.1/travis postgresql://postgres@/travis
+      echo 'ALTER SEQUENCE llx_accountingaccount_rowid_seq RENAME TO llx_accounting_account_rowid_seq' | psql -U postgres travis
+      echo 'ALTER SEQUENCE llx_accounting_account_rowid_seq RESTART WITH 1000001;' | psql -U postgres travis
    fi
    echo

  - |
    export CONF_FILE=htdocs/conf/conf.php
-    echo "Setting up Dolibarr '$CONF_FILE'"
+    echo "Setting up Dolibarr $CONF_FILE"
    echo '<?php' > $CONF_FILE
-    echo 'error_reporting(E_ALL);' >> $CONF_FILE
    echo '$'dolibarr_main_url_root=\'http://127.0.0.1\'';' >> $CONF_FILE
    echo '$'dolibarr_main_document_root=\'$TRAVIS_BUILD_DIR/htdocs\'';' >> $CONF_FILE
    echo '$'dolibarr_main_data_root=\'$TRAVIS_BUILD_DIR/documents\'';' >> $CONF_FILE
    echo '$'dolibarr_main_db_host=\'127.0.0.1\'';' >> $CONF_FILE
    echo '$'dolibarr_main_db_name=\'travis\'';' >> $CONF_FILE
+    echo '$'dolibarr_main_db_user=\'travis\'';' >> $CONF_FILE
    echo '$'dolibarr_main_instance_unique_id=\'travis1234567890\'';' >> $CONF_FILE
    if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then
      echo '$'dolibarr_main_db_type=\'mysqli\'';' >> $CONF_FILE
-      echo '$'dolibarr_main_db_port=3306';' >> $CONF_FILE
-      echo '$'dolibarr_main_db_user=\'root\'';' >> $CONF_FILE
-      echo '$'dolibarr_main_db_pass=\'password\'';' >> $CONF_FILE
+      echo '$'dolibarr_main_db_port=\'3306\'';' >> $CONF_FILE
    fi
    if [ "$DB" = 'postgresql' ]; then
      echo '$'dolibarr_main_db_type=\'pgsql\'';' >> $CONF_FILE
-      echo '$'dolibarr_main_db_port=5432';' >> $CONF_FILE
-      echo '$'dolibarr_main_db_user=\'postgres\'';' >> $CONF_FILE
-      echo '$'dolibarr_main_db_pass=\'postgres\'';' >> $CONF_FILE
+      echo '$'dolibarr_main_db_port=\'5432\'';' >> $CONF_FILE
    fi
    echo '$'dolibarr_main_authentication=\'dolibarr\'';' >> $CONF_FILE
    cat $CONF_FILE
@@ -300,276 +226,240 @@ before_script:

  - |
    echo "Create documents directory and set permissions"
-    # Add admin/temp subdirectory needed for unit tests
+    # and admin/temp subdirectory needed for unit tests
    mkdir -p $TRAVIS_BUILD_DIR/documents/admin/temp
    sudo chmod -R a+rwx $TRAVIS_BUILD_DIR/documents
    echo "***** First line of dolibarr.log" > $TRAVIS_BUILD_DIR/documents/dolibarr.log
    echo


+  - echo "Setting up Apache + FPM"
+  # enable php-fpm
+  - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf
  - |
-    echo "Setting up Apache"
-    sudo sed -i -e "s,www-data,travis,g" /etc/apache2/envvars
-    sudo cp -f build/travis-ci/apache.conf /etc/apache2/sites-available/000-default.conf
-    sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf
-    sudo cat /etc/apache2/sites-available/000-default.conf
-    sudo service apache2 restart
+    if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = '7.2' ] || [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = '7.4' ] || [ "$TRAVIS_PHP_VERSION" = '7.4.22' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
+      # Copy the included pool
+      sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf
+    fi
+  - sudo a2enmod rewrite actions fastcgi alias
+  - echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - sudo sed -i -e "s,www-data,travis,g" /etc/apache2/envvars
+  - sudo chown -R travis:travis /var/lib/apache2/fastcgi
+  - ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
+  # configure apache virtual hosts
+  - sudo cp -f build/travis-ci/apache.conf /etc/apache2/sites-available/000-default.conf
+  - sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf
+  - sudo cat /etc/apache2/sites-available/000-default.conf
+  - sudo service apache2 restart
+


 script:
-  - |
-    echo "Checking webserver availability by a wget -O - --debug http://127.0.0.1"
-    # Ensure we stop on error with set -e
-    set +e
-    # The wget should return a page with line '<meta name="generator" content="Dolibarr installer">
-    wget -O - --debug http://127.0.0.1 > test.html
-    head -n 200 test.html
-    sudo cat /var/log/apache2/travis_error_log
-    set +e
-    echo
+- |
+  echo "Checking webserver availability by a wget -O - http://127.0.0.1"
+  # Ensure we stop on error with set -e
+  set +e
+  # The wget should return a page with line '<meta name="generator" content="Dolibarr installer">
+  wget -O - http://127.0.0.1 > test.html
+  head test.html
+  sudo cat /var/log/apache2/travis_error_log
+  set +e
+  echo

-  - |
-    echo "Checking PHP syntax errors (only 1 version to not overload travis and avoid duplicate tests)"
-    # Ensure we catch errors
-    set -e
-    # Exclusions are defined in the ruleset.xml file
-    if [ "$TRAVIS_PHP_VERSION" = "8.1" ]; 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
-    if [ "$TRAVIS_PHP_VERSION" = "8.2" ]; 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
-    if [ "$TRAVIS_PHP_VERSION" = "8.3" ]; 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
+- |
+  echo "Checking PHP syntax errors (only 1 version to not overload travis and avoid duplicate tests)"
+  # Ensure we catch errors
+  set -e
+  #parallel-lint --exclude htdocs/includes --blame .
+  # Exclusions are defined in the ruleset.xml file
+  if [ "$TRAVIS_PHP_VERSION" = "7.4.22" ]; 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 --blame .
+  fi
+  set +e
+  echo

-  - |
-    echo "Checking coding style (only for 1 version to not overload travis and avoid duplicate tests)"
-    # Ensure we catch errors
-    set -e
-    CACHE_OPT="--cache=${HOME}/.cache/dolibarr-phpcs-${TRAVIS_PHP_VERSION}.cache"
-    # Exclusions are defined in the ruleset.xml file
-    #if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_PHP_VERSION" = "8.1" ]; then
-    if [ "$TRAVIS_PHP_VERSION" = "8.1" ]; 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.2" ]; 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.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
-    set +e
-    echo
+- |
+  echo "Checking coding style (only for Pull Requests builds and 1 version to not overload travis and avoid duplicate tests)"
+  # Ensure we catch errors
+  set -e
+  # Exclusions are defined in the ruleset.xml file
+  if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_PHP_VERSION" = "7.4.22" ]; then
+    phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .;
+  fi
+  set +e
+  echo

-  - |
-    echo "Checking missing debug (only for 1 version to not overload travis and avoid duplicate tests)"
-    # Ensure we catch errors
-    set -e
-    # Exclusions are defined in the ruleset.xml file
-    #if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_PHP_VERSION" = "8.1" ]; then
-    if [ "$TRAVIS_PHP_VERSION" = "8.1" ]; 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.2" ]; 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.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
-    set +e
-    echo
+- |
+  export INSTALL_FORCED_FILE=htdocs/install/install.forced.php
+  echo "Setting up Dolibarr $INSTALL_FORCED_FILE to test installation"
+  # Ensure we catch errors
+  set +e
+  echo '<?php ' > $INSTALL_FORCED_FILE
+  echo '$'force_install_noedit=2';' >> $INSTALL_FORCED_FILE
+  if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then
+    echo '$'force_install_type=\'mysqli\'';' >> $INSTALL_FORCED_FILE
+  fi
+  if [ "$DB" = 'postgresql' ]; then
+    echo '$'force_install_type=\'pgsql\'';' >> $INSTALL_FORCED_FILE
+  fi
+  echo '$'force_install_dbserver=\'127.0.0.1\'';' >> $INSTALL_FORCED_FILE
+  echo '$'force_install_database=\'travis\'';' >> $INSTALL_FORCED_FILE
+  echo '$'force_install_databaselogin=\'travis\'';' >> $INSTALL_FORCED_FILE
+  echo '$'force_install_databasepass=\'\'';' >> $INSTALL_FORCED_FILE
+  echo '$'force_install_port=\'5432\'';' >> $INSTALL_FORCED_FILE
+  echo '$'force_install_prefix=\'llx_\'';' >> $INSTALL_FORCED_FILE
+  echo '$'force_install_createdatabase=false';' >> $INSTALL_FORCED_FILE
+  echo '$'force_install_createuser=false';' >> $INSTALL_FORCED_FILE
+  echo '$'force_install_mainforcehttps=false';' >> $INSTALL_FORCED_FILE
+  echo '$'force_install_main_data_root=\'$TRAVIS_BUILD_DIR/htdocs\'';' >> $INSTALL_FORCED_FILE
+  #cat $INSTALL_FORCED_FILE

-  - |
-    export INSTALL_FORCED_FILE=htdocs/install/install.forced.php
-    echo "Setting up Dolibarr $INSTALL_FORCED_FILE to test installation"
-    # Ensure we catch errors
-    set +e
-    echo '<?php ' > $INSTALL_FORCED_FILE
-    echo 'error_reporting(E_ALL);' >> $INSTALL_FORCED_FILE
-    echo '$'force_install_noedit=2';' >> $INSTALL_FORCED_FILE
-    if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then
-      echo '$'force_install_type=\'mysqli\'';' >> $INSTALL_FORCED_FILE
-      echo '$'force_install_port=3306';' >> $INSTALL_FORCED_FILE
-    fi
-    if [ "$DB" = 'postgresql' ]; then
-      echo '$'force_install_type=\'pgsql\'';' >> $INSTALL_FORCED_FILE
-      echo '$'force_install_port=5432';' >> $INSTALL_FORCED_FILE
-    fi
-    echo '$'force_install_dbserver=\'127.0.0.1\'';' >> $INSTALL_FORCED_FILE
-    echo '$'force_install_database=\'travis\'';' >> $INSTALL_FORCED_FILE
-    echo '$'force_install_databaselogin=\'travis\'';' >> $INSTALL_FORCED_FILE
-    echo '$'force_install_databasepass=\'\'';' >> $INSTALL_FORCED_FILE
-    echo '$'force_install_prefix=\'llx_\'';' >> $INSTALL_FORCED_FILE
-    echo '$'force_install_createdatabase=false';' >> $INSTALL_FORCED_FILE
-    echo '$'force_install_createuser=false';' >> $INSTALL_FORCED_FILE
-    echo '$'force_install_mainforcehttps=false';' >> $INSTALL_FORCED_FILE
-    echo '$'force_install_main_data_root=\'$TRAVIS_BUILD_DIR/htdocs\'';' >> $INSTALL_FORCED_FILE
-    #cat $INSTALL_FORCED_FILE
-    echo
+#- |
+#  echo "Installing Dolibarr"
+#  cd htdocs/install
+#  php step1.php $TRAVIS_BUILD_DIR/htdocs > $TRAVIS_BUILD_DIR/install.log
+#  php step2.php set >> $TRAVIS_BUILD_DIR/install.log
+#  if [ "$?" -ne "0" ]; then
+#    echo "SORRY, AN ERROR OCCURED DURING INSTALLATION PROCESS"
+#    cat $TRAVIS_BUILD_DIR/install.log
+#    exit 1
+#  fi
+#  cd ../..
+#  rm $INSTALL_FORCED_FILE
+#  #cat $TRAVIS_BUILD_DIR/install.log
+# set +e
+#  echo

-  - |
-    echo "Upgrading Dolibarr"
-    # Ensure we catch errors with -e. Set this to +e if you want to go to the end to see log files.
-    # Note: We keep +e because with pgsql, one of upgrade process fails even if migration seems ok, so
-    # I disable stop on error to be able to continue.
-    set +e
-    cd htdocs/install
-    php upgrade.php 3.5.0 3.6.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade350360.log
-    php upgrade2.php 3.5.0 3.6.0 > $TRAVIS_BUILD_DIR/upgrade350360-2.log
-    php step5.php 3.5.0 3.6.0 > $TRAVIS_BUILD_DIR/upgrade350360-3.log
-    php upgrade.php 3.6.0 3.7.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade360370.log
-    php upgrade2.php 3.6.0 3.7.0 > $TRAVIS_BUILD_DIR/upgrade360370-2.log
-    php step5.php 3.6.0 3.7.0 > $TRAVIS_BUILD_DIR/upgrade360370-3.log
-    php upgrade.php 3.7.0 3.8.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade370380.log
-    php upgrade2.php 3.7.0 3.8.0 > $TRAVIS_BUILD_DIR/upgrade370380-2.log
-    php step5.php 3.7.0 3.8.0 > $TRAVIS_BUILD_DIR/upgrade370380-3.log
-    php upgrade.php 3.8.0 3.9.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade380390.log
-    php upgrade2.php 3.8.0 3.9.0 > $TRAVIS_BUILD_DIR/upgrade380390-2.log
-    php step5.php 3.8.0 3.9.0 > $TRAVIS_BUILD_DIR/upgrade380390-3.log
-    php upgrade.php 3.9.0 4.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade390400.log
-    php upgrade2.php 3.9.0 4.0.0 > $TRAVIS_BUILD_DIR/upgrade390400-2.log
-    php step5.php 3.9.0 4.0.0 > $TRAVIS_BUILD_DIR/upgrade390400-3.log
-    php upgrade.php 4.0.0 5.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade400500.log
-    php upgrade2.php 4.0.0 5.0.0 > $TRAVIS_BUILD_DIR/upgrade400500-2.log
-    php step5.php 4.0.0 5.0.0 > $TRAVIS_BUILD_DIR/upgrade400500-3.log
-    php upgrade.php 5.0.0 6.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade500600.log
-    php upgrade2.php 5.0.0 6.0.0 > $TRAVIS_BUILD_DIR/upgrade500600-2.log
-    php step5.php 5.0.0 6.0.0 > $TRAVIS_BUILD_DIR/upgrade500600-3.log
-    php upgrade.php 6.0.0 7.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade600700.log
-    php upgrade2.php 6.0.0 7.0.0 > $TRAVIS_BUILD_DIR/upgrade600700-2.log
-    php step5.php 6.0.0 7.0.0 > $TRAVIS_BUILD_DIR/upgrade600700-3.log
-    php upgrade.php 7.0.0 8.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade700800.log
-    php upgrade2.php 7.0.0 8.0.0 > $TRAVIS_BUILD_DIR/upgrade700800-2.log
-    php step5.php 7.0.0 8.0.0 > $TRAVIS_BUILD_DIR/upgrade700800-3.log
-    php upgrade.php 8.0.0 9.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade800900.log
-    php upgrade2.php 8.0.0 9.0.0 > $TRAVIS_BUILD_DIR/upgrade800900-2.log
-    php step5.php 8.0.0 9.0.0 > $TRAVIS_BUILD_DIR/upgrade800900-3.log
-    php upgrade.php 9.0.0 10.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade9001000.log
-    php upgrade2.php 9.0.0 10.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-2.log
-    php step5.php 9.0.0 10.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-3.log
-    php upgrade.php 10.0.0 11.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade10001100.log
-    php upgrade2.php 10.0.0 11.0.0 > $TRAVIS_BUILD_DIR/upgrade10001100-2.log
-    php step5.php 10.0.0 11.0.0 > $TRAVIS_BUILD_DIR/upgrade10001100-3.log
-    php upgrade.php 11.0.0 12.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade11001200.log
-    php upgrade2.php 11.0.0 12.0.0 > $TRAVIS_BUILD_DIR/upgrade11001200-2.log
-    php step5.php 11.0.0 12.0.0 > $TRAVIS_BUILD_DIR/upgrade11001200-3.log
-    php upgrade.php 12.0.0 13.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade12001300.log
-    php upgrade2.php 12.0.0 13.0.0 > $TRAVIS_BUILD_DIR/upgrade12001300-2.log
-    php step5.php 12.0.0 13.0.0 > $TRAVIS_BUILD_DIR/upgrade12001300-3.log
-    php upgrade.php 13.0.0 14.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade13001400.log
-    php upgrade2.php 13.0.0 14.0.0 > $TRAVIS_BUILD_DIR/upgrade13001400-2.log
-    php step5.php 13.0.0 14.0.0 > $TRAVIS_BUILD_DIR/upgrade13001400-3.log
-    php upgrade.php 14.0.0 15.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade14001500.log
-    php upgrade2.php 14.0.0 15.0.0 > $TRAVIS_BUILD_DIR/upgrade14001500-2.log
-    php step5.php 14.0.0 15.0.0 > $TRAVIS_BUILD_DIR/upgrade14001500-3.log
-    php upgrade.php 15.0.0 16.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade15001600.log
-    php upgrade2.php 15.0.0 16.0.0 > $TRAVIS_BUILD_DIR/upgrade15001600-2.log
-    php step5.php 15.0.0 16.0.0 > $TRAVIS_BUILD_DIR/upgrade15001600-3.log
-    php upgrade.php 16.0.0 17.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade16001700.log
-    php upgrade2.php 16.0.0 17.0.0 > $TRAVIS_BUILD_DIR/upgrade16001700-2.log
-    php step5.php 16.0.0 17.0.0 > $TRAVIS_BUILD_DIR/upgrade16001700-3.log
-    php upgrade.php 17.0.0 18.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade17001800.log
-    php upgrade2.php 17.0.0 18.0.0 > $TRAVIS_BUILD_DIR/upgrade17001800-2.log
-    php step5.php 17.0.0 18.0.0 > $TRAVIS_BUILD_DIR/upgrade17001800-3.log
-    php upgrade.php 18.0.0 19.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade18001900.log || cat $TRAVIS_BUILD_DIR/upgrade18001900.log
-    php upgrade2.php 18.0.0 19.0.0 > $TRAVIS_BUILD_DIR/upgrade18001900-2.log || cat $TRAVIS_BUILD_DIR/upgrade18001900-2.log
-    php step5.php 18.0.0 19.0.0 > $TRAVIS_BUILD_DIR/upgrade18001900-3.log || cat $TRAVIS_BUILD_DIR/upgrade18001900-3.log
-    php upgrade.php 19.0.0 20.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade19002000.log || cat $TRAVIS_BUILD_DIR/upgrade19002000.log
-    php upgrade2.php 19.0.0 20.0.0 > $TRAVIS_BUILD_DIR/upgrade19002000-2.log || cat $TRAVIS_BUILD_DIR/upgrade19002000-2.log
-    php step5.php 19.0.0 20.0.0 > $TRAVIS_BUILD_DIR/upgrade19002000-3.log || cat $TRAVIS_BUILD_DIR/upgrade19002000-3.log
-    set +e
-    echo
+- |
+  echo "Setting up database to test migrations"
+  if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ] || [ "$DB" = 'postgresql' ]; then
+    echo "MySQL"
+    mysql -e 'DROP DATABASE IF EXISTS travis;'
+    mysql -e 'CREATE DATABASE IF NOT EXISTS travis;'
+    mysql -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;'
+    mysql -e 'FLUSH PRIVILEGES;'
+    mysql -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
+  fi
+  if [ "$DB" = 'postgresql' ]; then
+    #pgsql travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
+    #pgloader mysql://root:pass@127.0.0.1/base postgresql://dolibarrowner@127.0.0.1/dolibarr
+    echo pgloader mysql://root@127.0.0.1/travis postgresql:///travis
+    pgloader mysql://root@127.0.0.1/travis postgresql:///travis
+    echo 'ALTER SEQUENCE llx_accountingaccount_rowid_seq RENAME TO llx_accounting_account_rowid_seq' | psql travis
+    echo 'ALTER SEQUENCE llx_accounting_account_rowid_seq RESTART WITH 1000001;' | psql travis
+    #echo 'select * from INFORMATION_SCHEMA.COLUMNS where table_name = 'llx_accountingaccount' | psql travis
+    #echo 'select * from information_schema.table_constraints;' | psql travis
+    #echo 'ALTER TABLE "llx_accounting_account" DROP CONSTRAINT "idx_16390_primary"' | psql travis
+  fi
+  echo

-  - |
-    echo Show some debug info like table content or log
-    #echo '\d llx_adherent' | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis'
-    cat $TRAVIS_BUILD_DIR/upgrade18001900.log
-    cat $TRAVIS_BUILD_DIR/upgrade19002000.log
-    echo
+- |
+  echo "Upgrading Dolibarr"
+  # Ensure we catch errors. Set this to +e if you want to go to the end to see log files.
+  set +e
+  cd htdocs/install
+  php upgrade.php 3.5.0 3.6.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade350360.log
+  php upgrade2.php 3.5.0 3.6.0 > $TRAVIS_BUILD_DIR/upgrade350360-2.log
+  php step5.php 3.5.0 3.6.0 > $TRAVIS_BUILD_DIR/upgrade350360-3.log
+  php upgrade.php 3.6.0 3.7.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade360370.log
+  php upgrade2.php 3.6.0 3.7.0 > $TRAVIS_BUILD_DIR/upgrade360370-2.log
+  php step5.php 3.6.0 3.7.0 > $TRAVIS_BUILD_DIR/upgrade360370-3.log
+  php upgrade.php 3.7.0 3.8.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade370380.log
+  php upgrade2.php 3.7.0 3.8.0 > $TRAVIS_BUILD_DIR/upgrade370380-2.log
+  php step5.php 3.7.0 3.8.0 > $TRAVIS_BUILD_DIR/upgrade370380-3.log
+  php upgrade.php 3.8.0 3.9.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade380390.log
+  php upgrade2.php 3.8.0 3.9.0 > $TRAVIS_BUILD_DIR/upgrade380390-2.log
+  php step5.php 3.8.0 3.9.0 > $TRAVIS_BUILD_DIR/upgrade380390-3.log
+  php upgrade.php 3.9.0 4.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade390400.log
+  php upgrade2.php 3.9.0 4.0.0 > $TRAVIS_BUILD_DIR/upgrade390400-2.log
+  php step5.php 3.9.0 4.0.0 > $TRAVIS_BUILD_DIR/upgrade390400-3.log
+  php upgrade.php 4.0.0 5.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade400500.log
+  php upgrade2.php 4.0.0 5.0.0 > $TRAVIS_BUILD_DIR/upgrade400500-2.log
+  php step5.php 4.0.0 5.0.0 > $TRAVIS_BUILD_DIR/upgrade400500-3.log
+  php upgrade.php 5.0.0 6.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade500600.log
+  php upgrade2.php 5.0.0 6.0.0 > $TRAVIS_BUILD_DIR/upgrade500600-2.log
+  php step5.php 5.0.0 6.0.0 > $TRAVIS_BUILD_DIR/upgrade500600-3.log
+  php upgrade.php 6.0.0 7.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade600700.log
+  php upgrade2.php 6.0.0 7.0.0 > $TRAVIS_BUILD_DIR/upgrade600700-2.log
+  php step5.php 6.0.0 7.0.0 > $TRAVIS_BUILD_DIR/upgrade600700-3.log
+  php upgrade.php 7.0.0 8.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade700800.log
+  php upgrade2.php 7.0.0 8.0.0 > $TRAVIS_BUILD_DIR/upgrade700800-2.log
+  php step5.php 7.0.0 8.0.0 > $TRAVIS_BUILD_DIR/upgrade700800-3.log
+  php upgrade.php 8.0.0 9.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade800900.log
+  php upgrade2.php 8.0.0 9.0.0 > $TRAVIS_BUILD_DIR/upgrade800900-2.log
+  php step5.php 8.0.0 9.0.0 > $TRAVIS_BUILD_DIR/upgrade800900-3.log
+  php upgrade.php 9.0.0 10.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade9001000.log
+  php upgrade2.php 9.0.0 10.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-2.log
+  php step5.php 9.0.0 10.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-3.log
+  php upgrade.php 10.0.0 11.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade10001100.log
+  php upgrade2.php 10.0.0 11.0.0 > $TRAVIS_BUILD_DIR/upgrade10001100-2.log
+  php step5.php 10.0.0 11.0.0 > $TRAVIS_BUILD_DIR/upgrade10001100-3.log
+  php upgrade.php 11.0.0 12.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade11001200.log
+  php upgrade2.php 11.0.0 12.0.0 > $TRAVIS_BUILD_DIR/upgrade11001200-2.log
+  php step5.php 11.0.0 12.0.0 > $TRAVIS_BUILD_DIR/upgrade11001200-3.log
+  php upgrade.php 12.0.0 13.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade12001300.log
+  php upgrade2.php 12.0.0 13.0.0 > $TRAVIS_BUILD_DIR/upgrade12001300-2.log
+  php step5.php 12.0.0 13.0.0 > $TRAVIS_BUILD_DIR/upgrade12001300-3.log
+  ls -alrt $TRAVIS_BUILD_DIR/

-  - |
-    echo Result of migration scripts
-    ls -alrt $TRAVIS_BUILD_DIR/
+- |
+  echo "Enabling new modules"
+  # Enable modules not enabled into original dump
+  cd htdocs/install
+  php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_PRODUCTBATCH,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_STRIPE > $TRAVIS_BUILD_DIR/enablemodule.log
+  php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKET,MAIN_MODULE_ACCOUNTING,MAIN_MODULE_MRP >> $TRAVIS_BUILD_DIR/enablemodule.log
+  php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_RECEPTION,MAIN_MODULE_RECRUITMENT >> $TRAVIS_BUILD_DIR/enablemodule.log
+  echo $?
+  cd -
+  set +e
+  echo
+  #cat /tmp/dolibarr_install.log
+  cat $TRAVIS_BUILD_DIR/enablemodule.log

-    echo Show content of last file
-    cat $TRAVIS_BUILD_DIR/"$(ls -rt $TRAVIS_BUILD_DIR/ | tail -n1)"
-
-  - |
-    echo "Enabling new modules"
-    # Enable modules not enabled into original dump
-    set -e
-    php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_ProductBatch,MAIN_MODULE_SupplierProposal,MAIN_MODULE_STRIPE,MAIN_MODULE_ExpenseReport > $TRAVIS_BUILD_DIR/enablemodule.log
-    php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKET,MAIN_MODULE_ACCOUNTING,MAIN_MODULE_MRP >> $TRAVIS_BUILD_DIR/enablemodule.log
-    php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_RECEPTION,MAIN_MODULE_RECRUITMENT >> $TRAVIS_BUILD_DIR/enablemodule.log
-    php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_KnowledgeManagement,MAIN_MODULE_EventOrganization,MAIN_MODULE_PARTNERSHIP >> $TRAVIS_BUILD_DIR/enablemodule.log
-    php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_EmailCollector >> $TRAVIS_BUILD_DIR/enablemodule.log
-    echo $?
-    cd -
-    set +e
-    echo
-    #cat /tmp/dolibarr_install.log
-    cat $TRAVIS_BUILD_DIR/enablemodule.log
-    echo
-
-  - |
-    echo "Unit testing"
-    # Ensure we catch errors with -e. Set this to +e instead of -e if you want to go to the end to see dolibarr.log file.
-    set -e
-    phpunit -d memory_limit=-1 -c test/phpunit/phpunittest.xml test/phpunit/AllTests.php
-    phpunitresult=$?
-    echo "Phpunit return code = $phpunitresult"
-    set +e
-    echo
+- |
+  echo "Unit testing"
+  # Ensure we catch errors. Set this to +e if you want to go to the end to see dolibarr.log file.
+  set -e
+  phpunit -d memory_limit=-1 -c test/phpunit/phpunittest.xml test/phpunit/AllTests.php
+  phpunitresult=$?
+  echo "Phpunit return code = $phpunitresult"
+  set +e

 after_script:
-  - |
-    echo "After script - Output last lines of dolibarr.log"
-    ls $TRAVIS_BUILD_DIR/documents
-    #cat $TRAVIS_BUILD_DIR/documents/dolibarr.log
-    sudo tail -n 50 $TRAVIS_BUILD_DIR/documents/dolibarr.log
-    echo "After script - Output last lines of apache error.log"
-    sudo ls /var/log/apache2
-    sudo tail -n 200 /var/log/apache2/travis_error_log
+- |
+  echo "After script - Output last lines of dolibarr.log"
+  ls $TRAVIS_BUILD_DIR/documents
+  #cat $TRAVIS_BUILD_DIR/documents/dolibarr.log
+  sudo tail -n 50 $TRAVIS_BUILD_DIR/documents/dolibarr.log

 after_success:
-  - |
-    echo Success
+- |
+  echo Success

 after_failure:
-  - |
-    echo Failure detected, so we show samples of log to help diagnose
-    # This part of code is executed only if the command that fails are enclosed with set +e
-    # Show upgrade log files
-    #for ficlog in `ls $TRAVIS_BUILD_DIR/*.log`
-    #do
-      #echo "Debugging information for file $ficlog"
-      #cat $ficlog
-    #done
-    # Show Apache log file
-    echo "Debugging information for file apache error.log"
-    sudo tail -n 200 /var/log/apache2/travis_error_log
-    if [ "$DEBUG" = true ]; then
-      # Dolibarr log file
-      echo "Debugging information for file dolibarr.log (latest 50 lines)"
-      tail -n 200 $TRAVIS_BUILD_DIR/documents/dolibarr.log
-      # Database log file
-      echo "Debugging information for file mysql error.log"
-      sudo tail -n 200 /var/log/mysql/error.log
-      # TODO: PostgreSQL log file
-      echo
-    fi
+- |
+  echo Failure detected, so we show samples of log to help diagnose
+  # This part of code is executed only if previous command that fails are enclosed with set +e
+  # Upgrade log files
+  for ficlog in `ls $TRAVIS_BUILD_DIR/*.log`
+  do
+    echo "Debugging informations for file $ficlog"
+    #cat $ficlog
+  done
+  # Apache log file
+  echo "Debugging informations for file apache error.log"
+  sudo cat /var/log/apache2/travis_error_log
+  if [ "$DEBUG" = true ]; then
+    # Dolibarr log file
+    echo "Debugging informations for file dolibarr.log (latest 50 lines)"
+    tail -n 50 $TRAVIS_BUILD_DIR/documents/dolibarr.log
+    # Database log file
+    echo "Debugging informations for file mysql error.log"
+    sudo tail -n 50 /var/log/mysql/error.log
+    # TODO: PostgreSQL log file
+    echo
+  fi
--- a/.tx/config
+++ b/.tx/config
@@ -1,430 +1,430 @@
 [main]
-host     = https://www.transifex.com
+host = https://www.transifex.com
 lang_map = uz: uz_UZ, sw: sw_SW, sr@latin: sr_RS

-[o:dolibarr-association:p:dolibarr:r:accountancy]
+[dolibarr.accountancy]
 file_filter = htdocs/langs/<lang>/accountancy.lang
 source_file = htdocs/langs/en_US/accountancy.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:admin]
+[dolibarr.admin]
 file_filter = htdocs/langs/<lang>/admin.lang
 source_file = htdocs/langs/en_US/admin.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:agenda]
+[dolibarr.agenda]
 file_filter = htdocs/langs/<lang>/agenda.lang
 source_file = htdocs/langs/en_US/agenda.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:assets]
+[dolibarr.assets]
 file_filter = htdocs/langs/<lang>/assets.lang
 source_file = htdocs/langs/en_US/assets.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:banks]
+[dolibarr.banks]
 file_filter = htdocs/langs/<lang>/banks.lang
 source_file = htdocs/langs/en_US/banks.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:bills]
+[dolibarr.bills]
 file_filter = htdocs/langs/<lang>/bills.lang
 source_file = htdocs/langs/en_US/bills.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:blockedlog]
+[dolibarr.blockedlog]
 file_filter = htdocs/langs/<lang>/blockedlog.lang
 source_file = htdocs/langs/en_US/blockedlog.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:bookmarks]
+[dolibarr.bookmarks]
 file_filter = htdocs/langs/<lang>/bookmarks.lang
 source_file = htdocs/langs/en_US/bookmarks.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:boxes]
+[dolibarr.boxes]
 file_filter = htdocs/langs/<lang>/boxes.lang
 source_file = htdocs/langs/en_US/boxes.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:cashdesk]
+[dolibarr.cashdesk]
 file_filter = htdocs/langs/<lang>/cashdesk.lang
 source_file = htdocs/langs/en_US/cashdesk.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:categories]
+[dolibarr.categories]
 file_filter = htdocs/langs/<lang>/categories.lang
 source_file = htdocs/langs/en_US/categories.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:commercial]
+[dolibarr.commercial]
 file_filter = htdocs/langs/<lang>/commercial.lang
 source_file = htdocs/langs/en_US/commercial.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:companies]
+[dolibarr.companies]
 file_filter = htdocs/langs/<lang>/companies.lang
 source_file = htdocs/langs/en_US/companies.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:compta]
+[dolibarr.compta]
 file_filter = htdocs/langs/<lang>/compta.lang
 source_file = htdocs/langs/en_US/compta.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:contracts]
+[dolibarr.contracts]
 file_filter = htdocs/langs/<lang>/contracts.lang
 source_file = htdocs/langs/en_US/contracts.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:cron]
+[dolibarr.cron]
 file_filter = htdocs/langs/<lang>/cron.lang
 source_file = htdocs/langs/en_US/cron.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:datapolicy]
-file_filter = htdocs/langs/<lang>/datapolicy.lang
-source_file = htdocs/langs/en_US/datapolicy.lang
-source_lang = en_US
-type        = MOZILLAPROPERTIES
-
-[o:dolibarr-association:p:dolibarr:r:deliveries]
+[dolibarr.deliveries]
 file_filter = htdocs/langs/<lang>/deliveries.lang
 source_file = htdocs/langs/en_US/deliveries.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:dict]
+[dolibarr.dict]
 file_filter = htdocs/langs/<lang>/dict.lang
 source_file = htdocs/langs/en_US/dict.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:donations]
+[dolibarr.donations]
 file_filter = htdocs/langs/<lang>/donations.lang
 source_file = htdocs/langs/en_US/donations.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:ecm]
+[dolibarr.ecm]
 file_filter = htdocs/langs/<lang>/ecm.lang
 source_file = htdocs/langs/en_US/ecm.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:errors]
+[dolibarr.errors]
 file_filter = htdocs/langs/<lang>/errors.lang
 source_file = htdocs/langs/en_US/errors.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:eventorganization]
-file_filter = htdocs/langs/<lang>/eventorganization.lang
-source_file = htdocs/langs/en_US/eventorganization.lang
-source_lang = en_US
-type        = MOZILLAPROPERTIES
-
-[o:dolibarr-association:p:dolibarr:r:exports]
+[dolibarr.exports]
 file_filter = htdocs/langs/<lang>/exports.lang
 source_file = htdocs/langs/en_US/exports.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:help]
+[dolibarr.externalsite]
+file_filter = htdocs/langs/<lang>/externalsite.lang
+source_file = htdocs/langs/en_US/externalsite.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
+[dolibarr.ftp]
+file_filter = htdocs/langs/<lang>/ftp.lang
+source_file = htdocs/langs/en_US/ftp.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
+[dolibarr.help]
 file_filter = htdocs/langs/<lang>/help.lang
 source_file = htdocs/langs/en_US/help.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:holiday]
+[dolibarr.holiday]
 file_filter = htdocs/langs/<lang>/holiday.lang
 source_file = htdocs/langs/en_US/holiday.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:hrm]
+[dolibarr.hrm]
 file_filter = htdocs/langs/<lang>/hrm.lang
 source_file = htdocs/langs/en_US/hrm.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:install]
-file_filter = htdocs/langs/<lang>/install.lang
-source_file = htdocs/langs/en_US/install.lang
-source_lang = en_US
-type        = MOZILLAPROPERTIES
-
-[o:dolibarr-association:p:dolibarr:r:interventions]
-file_filter = htdocs/langs/<lang>/interventions.lang
-source_file = htdocs/langs/en_US/interventions.lang
-source_lang = en_US
-type        = MOZILLAPROPERTIES
-
-[o:dolibarr-association:p:dolibarr:r:intracommreport]
+[dolibarr.intracommreport]
 file_filter = htdocs/langs/<lang>/intracommreport.lang
 source_file = htdocs/langs/en_US/intracommreport.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:knowledgemanagement]
-file_filter = htdocs/langs/<lang>/knowledgemanagement.lang
-source_file = htdocs/langs/en_US/knowledgemanagement.lang
+[dolibarr.install]
+file_filter = htdocs/langs/<lang>/install.lang
+source_file = htdocs/langs/en_US/install.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:languages-not-res]
+[dolibarr.interventions]
+file_filter = htdocs/langs/<lang>/interventions.lang
+source_file = htdocs/langs/en_US/interventions.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
+[dolibarr.languages-not-res]
 file_filter = htdocs/langs/<lang>/languages.lang
 source_file = htdocs/langs/en_US/languages.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:ldap]
+[dolibarr.ldap]
 file_filter = htdocs/langs/<lang>/ldap.lang
 source_file = htdocs/langs/en_US/ldap.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:loan]
+[dolibarr.link]
+file_filter = htdocs/langs/<lang>/link.lang
+source_file = htdocs/langs/en_US/link.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
+[dolibarr.loan]
 file_filter = htdocs/langs/<lang>/loan.lang
 source_file = htdocs/langs/en_US/loan.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:mailmanspip]
+[dolibarr.mailmanspip]
 file_filter = htdocs/langs/<lang>/mailmanspip.lang
 source_file = htdocs/langs/en_US/mailmanspip.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:mails]
+[dolibarr.mails]
 file_filter = htdocs/langs/<lang>/mails.lang
 source_file = htdocs/langs/en_US/mails.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:main]
+[dolibarr.main]
 file_filter = htdocs/langs/<lang>/main.lang
 source_file = htdocs/langs/en_US/main.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:margins]
+[dolibarr.margins]
 file_filter = htdocs/langs/<lang>/margins.lang
 source_file = htdocs/langs/en_US/margins.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:members]
+[dolibarr.members]
 file_filter = htdocs/langs/<lang>/members.lang
 source_file = htdocs/langs/en_US/members.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:modulebuilder]
+[dolibarr.modulebuilder]
 file_filter = htdocs/langs/<lang>/modulebuilder.lang
 source_file = htdocs/langs/en_US/modulebuilder.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:mrp]
+[dolibarr.mrp]
 file_filter = htdocs/langs/<lang>/mrp.lang
 source_file = htdocs/langs/en_US/mrp.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:multicurrency]
+[dolibarr.multicurrency]
 file_filter = htdocs/langs/<lang>/multicurrency.lang
 source_file = htdocs/langs/en_US/multicurrency.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:oauth]
+[dolibarr.oauth]
 file_filter = htdocs/langs/<lang>/oauth.lang
 source_file = htdocs/langs/en_US/oauth.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:opensurvey]
+[dolibarr.opensurvey]
 file_filter = htdocs/langs/<lang>/opensurvey.lang
 source_file = htdocs/langs/en_US/opensurvey.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:orders]
+[dolibarr.orders]
 file_filter = htdocs/langs/<lang>/orders.lang
 source_file = htdocs/langs/en_US/orders.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:other]
+[dolibarr.other]
 file_filter = htdocs/langs/<lang>/other.lang
 source_file = htdocs/langs/en_US/other.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:partnership]
-file_filter = htdocs/langs/<lang>/partnership.lang
-source_file = htdocs/langs/en_US/partnership.lang
-source_lang = en_US
-type        = MOZILLAPROPERTIES
-
-[o:dolibarr-association:p:dolibarr:r:paybox]
+[dolibarr.paybox]
 file_filter = htdocs/langs/<lang>/paybox.lang
 source_file = htdocs/langs/en_US/paybox.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:paypal]
+[dolibarr.paypal]
 file_filter = htdocs/langs/<lang>/paypal.lang
 source_file = htdocs/langs/en_US/paypal.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:printing]
+[dolibarr.printing]
 file_filter = htdocs/langs/<lang>/printing.lang
 source_file = htdocs/langs/en_US/printing.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:productbatch]
+[dolibarr.productbatch]
 file_filter = htdocs/langs/<lang>/productbatch.lang
 source_file = htdocs/langs/en_US/productbatch.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:products]
+[dolibarr.products]
 file_filter = htdocs/langs/<lang>/products.lang
 source_file = htdocs/langs/en_US/products.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:projects]
+[dolibarr.projects]
 file_filter = htdocs/langs/<lang>/projects.lang
 source_file = htdocs/langs/en_US/projects.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:propal]
+[dolibarr.propal]
 file_filter = htdocs/langs/<lang>/propal.lang
 source_file = htdocs/langs/en_US/propal.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:receiptprinter]
+[dolibarr.receiptprinter]
 file_filter = htdocs/langs/<lang>/receiptprinter.lang
 source_file = htdocs/langs/en_US/receiptprinter.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:receptions]
+[dolibarr.receptions]
 file_filter = htdocs/langs/<lang>/receptions.lang
 source_file = htdocs/langs/en_US/receptions.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:recruitment]
+[dolibarr.recruitment]
 file_filter = htdocs/langs/<lang>/recruitment.lang
 source_file = htdocs/langs/en_US/recruitment.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:resource]
+[dolibarr.resource]
 file_filter = htdocs/langs/<lang>/resource.lang
 source_file = htdocs/langs/en_US/resource.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:salaries]
+[dolibarr.salaries]
 file_filter = htdocs/langs/<lang>/salaries.lang
 source_file = htdocs/langs/en_US/salaries.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:sendings]
+[dolibarr.sendings]
 file_filter = htdocs/langs/<lang>/sendings.lang
 source_file = htdocs/langs/en_US/sendings.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:sms]
+[dolibarr.sms]
 file_filter = htdocs/langs/<lang>/sms.lang
 source_file = htdocs/langs/en_US/sms.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:stocks]
+[dolibarr.stocks]
 file_filter = htdocs/langs/<lang>/stocks.lang
 source_file = htdocs/langs/en_US/stocks.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:stripe]
+[dolibarr.stripe]
 file_filter = htdocs/langs/<lang>/stripe.lang
 source_file = htdocs/langs/en_US/stripe.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+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
-source_lang = en_US
-type        = MOZILLAPROPERTIES
-
-[o:dolibarr-association:p:dolibarr:r:suppliers]
+[dolibarr.suppliers]
 file_filter = htdocs/langs/<lang>/suppliers.lang
 source_file = htdocs/langs/en_US/suppliers.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:ticket]
+[dolibarr.supplier_proposal]
+file_filter = htdocs/langs/<lang>/supplier_proposal.lang
+source_file = htdocs/langs/en_US/supplier_proposal.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
+[dolibarr.ticket]
 file_filter = htdocs/langs/<lang>/ticket.lang
 source_file = htdocs/langs/en_US/ticket.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:trips]
+[dolibarr.trips]
 file_filter = htdocs/langs/<lang>/trips.lang
 source_file = htdocs/langs/en_US/trips.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:users]
+[dolibarr.users]
 file_filter = htdocs/langs/<lang>/users.lang
 source_file = htdocs/langs/en_US/users.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:website]
+[dolibarr.website]
 file_filter = htdocs/langs/<lang>/website.lang
 source_file = htdocs/langs/en_US/website.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:withdrawals]
+[dolibarr.withdrawals]
 file_filter = htdocs/langs/<lang>/withdrawals.lang
 source_file = htdocs/langs/en_US/withdrawals.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES

-[o:dolibarr-association:p:dolibarr:r:workflow]
+[dolibarr.workflow]
 file_filter = htdocs/langs/<lang>/workflow.lang
 source_file = htdocs/langs/en_US/workflow.lang
 source_lang = en_US
-type        = MOZILLAPROPERTIES
+type = MOZILLAPROPERTIES
+
+[dolibarr.zapier]
+file_filter = htdocs/langs/<lang>/zapier.lang
+source_file = htdocs/langs/en_US/zapier.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES

--- a/2
+++ b/2
@@ -1,7 +1,7 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007

- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

--- a/89
+++ b/89
@@ -1,88 +1,73 @@

-Copyright and license
----------------------
+License
+-------

-The Dolibarr software as a whole is distributed under the GNU General Public License as published by the Free Software Foundation;
-either version 3 of the License, or (at your option) any later version (GPL-3+). More information: https://www.gnu.org/licenses/gpl-3.0.txt.
-A copy of this license is available in the COPYING file.
-Dolibarr depends on third-party components and code snippets released under their own license (obviously, all compatible with the one of Dolibarr).
-These dependencies are listed in the bottom of this file.
+Dolibarr is released under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 3 of the License,
+or (at your option) any later version (GPL-3+).
+More information: https://www.gnu.org/licenses/gpl-3.0.txt

-
-The Dolibarr images resources (available in the doc directory) is distributed under the Creative Commons Attribution 4.0 International license (CC BY 4.0).
-
-
-The name Dolibarr is a trademark initially registered by Laurent Destailleur and ceased to the Dolibarr foundation. You can use the name Dolibarr
-for your own need as long as you follow the rules defined on the page https://wiki.dolibarr.org/index.php/Rules_to_use_the_brand_name_%22Dolibarr%22
-The use of the name DoliStore is also restricted to the same rules defined on https://wiki.dolibarr.org/index.php/Rules_to_use_the_brand_name_%22Dolibarr%22
-
-
-
-Licence of dependencies of third-party components used by Dolibarr (all compatible with the Licence of Dolibarr):
+Dolibarr uses some external libraries released under different licenses. This is compatibility summary:

 Component              Version       License                     GPL Compatible  Usage
 -------------------------------------------------------------------------------------
 PHP libraries:
-EvalMath               1.0           BSD                         Yes             Safe math expressions evaluation. Used by dynamic price only. TODO Replace with dol_eval ?
-Escpos-php             3.0           MIT License                 Yes             Thermal receipt printer library, for use with ESC/POS compatible printers
-GeoIP2                 0.2.0         Apache License 2.0          Yes             Lib to make geoip convert
-GeoPHP                 1.2           Modified BSD License        Yes             Lib to make geo convert
-MathPHP                2.8.1         MIT License                 Yes             Modern math library for PHP (only few files)
-Mobiledetect           2.8.41        MIT License                 Yes             Detect mobile devices browsers
-NuSoap                 0.9.16        LGPL 2.1+                   Yes             Library to develop SOAP Web services. From https://github.com/f00b4r/nusoap/tree/v0.9.16
+AdoDb-Date             0.36          Modified BSD License        Yes             Date convertion (not into rpm package)
+CKEditor               4.12.1        LGPL-2.1+                   Yes             Editor WYSIWYG
+EvalMath               1.0           BSD                         Yes             Safe math expressions evaluation
+Escpos-php             2.2           MIT License                 Yes             Thermal receipt printer library, for use with ESC/POS compatible printers
+GeoIP2                 0.2.0         LGPL-2.1+                   Yes             Lib to make geoip convert
+Mobiledetect           2.8.34        MIT License                 Yes             Detect mobile devices browsers
+NuSoap                 0.9.5         LGPL 2.1+                   Yes             Library to develop SOAP Web services (not into rpm and deb package)
 PEAR Mail_MIME         1.8.9         BSD                         Yes             NuSoap dependency
-ParseDown              1.7.4         MIT License                 Yes             Markdown parser
-PCLZip                 2.8.4         LGPL-3+                     Yes             Library to zip/unzip files
-PHPDebugBar            1.18.2        MIT License                 Yes             Used only by the module "debugbar" for developers
-PHPSpreadSheet         1.12.0        LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
-PHP-Iban               4.1.1         LGPL-3+                     Yes             Parse and validate IBAN (and IIBAN) bank account information in PHP
-PHP-Imap               2.7.2         MIT License                 Yes             Library to use IMAP with OAuth
+ParseDown              1.6           MIT License                 Yes             Markdown parser
+PCLZip                 2.8.4         LGPL-3+                     Yes             Library to zip/unzip files             
+PHPDebugBar            1.15.1        MIT License	             Yes             Used only by the module "debugbar" for developers
+PHPSpreadSheet         ?             LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
+php-iban               1.4.7         LGPL-3+                     Yes             Parse and validate IBAN (and IIBAN) bank account information in PHP
 PHPoAuthLib            0.8.2         MIT License                 Yes             Library to provide oauth1 and oauth2 to different service
 PHPPrintIPP            1.3           GPL-2+                      Yes             Library to send print IPP requests
-PrestaShop-WS-Lib      94feb5f       OSL-3.0                     No              Library providing API client for Prestashop.
-PSR/Logs               1.0           MIT License                 Yes             Library for logs (used by DebugBar)
-PSR/simple-cache       ?             MIT License                 Yes             Library for cache (used by PHPSpreadSheet)
+PSR/Logs			   1.0										                 Library for logs (used by DebugBar)
+PSR/simple-cache	   ?										                 Library for cache (used by PHPSpreadSheet)
 Restler                3.1.1         LGPL-3+                     Yes             Library to develop REST Web services (+ swagger-ui js lib into dir explorer)
-Sabre                  4.6.0         BSD                         Yes             DAV support
-Swift Mailer           5.4.2-DEV     MIT License                 Yes             Comprehensive mailing tools for PHP
-Symfony/var-dumper     ??? 			 MIT License                 Yes             Library to make var dump (used by DebugBar)
-Stripe                 10.7.0        MIT Licence                 Yes             Library for Stripe module
+Sabre                  3.2.2         BSD                         Yes             DAV support
+Swift Mailer           5.4.2-DEV     MIT license                 Yes             Comprehensive mailing tools for PHP
+Stripe                 6.43.1        MIT licence                 Yes             Library for Stripe module
 TCPDF                  6.3.2         LGPL-3+                     Yes             PDF generation
 TCPDI                  1.0.0         LGPL-3+ / Apache 2.0        Yes             FPDI replacement

-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.
-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
-jQuery UI              1.13.2        GPL and MIT License         Yes             JS library plugin UI
-jQuery select2         4.0.13        GPL and Apache License      Yes             JS library plugin for sexier multiselect. Warning: 4.0.6+ create troubles without patching css
+Ace                    1.4.8         BSD                         Yes             JS library to get code syntaxique coloration in a textarea.
+ChartJS				   2.9.4         MIT License                 Yes             JS library for graph
+jQuery                 3.5.1         MIT License                 Yes             JS library
+jQuery UI              1.12.1        GPL and MIT License         Yes             JS library plugin UI
+jQuery select2         4.0.13         GPL and Apache License      Yes             JS library plugin for sexier multiselect. Warning: 4.0.6+ create troubles without patching css
 jQuery blockUI         2.70.0        GPL and MIT License         Yes             JS library plugin blockUI (to use ajax popups)
 jQuery Colorpicker     1.1           MIT License                 Yes             JS library for color picker for a defined list of colors
 jQuery JCrop           0.9.8         GPL and MIT License         Yes             JS library plugin Crop (to crop images)
 jQuery Jeditable       1.7.1         GPL and MIT License         Yes             JS library plugin jeditable (to edit in place)
-jQuery jNotify         1.1.00        Apache License 2.0          Yes             JS library plugin jNotify (to use ajax popups)
+jQuery jNotify         1.1.00        Apache Software License 2.0 Yes             JS library plugin jNotify (to use ajax popups)
 jQuery jPicker         1.1.6         GPL and MIT License         Yes             JS library for color picker with not defined list of colors
 jQuery jqueryFileTree  1.0.1         GPL and MIT License         Yes             JS library for filetree
 jQuery jquerytreeview  1.4.1         MIT License                 Yes             JS library for filetree
 jQuery TableDnD        0.6           GPL and MIT License         Yes             JS library plugin TableDnD (to reorder table rows)
 jQuery Timepicker      1.1.0         GPL and MIT License         Yes             JS library Timepicker addon for Datepicker
-jsGanttImproved        2.8.10        BSD License                 Yes             JS library (to build Gantt reports)
-SwaggerUI              2.2.10        GPL-2+                      Yes             JS library to offer the REST API explorer
+jsGanttImproved        2.7.3         BSD License                 Yes             JS library (to build Gantt reports)
+JsTimezoneDetect       1.0.6         MIT License                 Yes             JS library to detect user timezone
+SwaggerUI			   2.0.24		 GPL-2+                      Yes             JS library to offer the REST API explorer

 Image libraries:
 Octicons               8.1           MIT                         Yes

 Font libraries:
-Fontawesome            5.13          Font Awesome Free Licence   Yes
+Fontawesome            5.13          Font Awesome Free licence   Yes


-For more licenses compatibility information: https://www.gnu.org/licenses/licenses.en.html
+For licenses compatibility informations:
+https://www.gnu.org/licenses/licenses.en.html


-Authors
+Copyright / Authors
 -------------------

 See page https://github.com/Dolibarr/dolibarr/graphs/contributors
--- a/3781
+++ b/3781
--- a/34
+++ b/34
@@ -1,34 +0,0 @@
-Developer Certificate of Origin
-Version 1.1
-
-Copyright (C) 2002 - Today, The Dolibarr team and its contributors.
-
-Everyone is permitted to copy and distribute verbatim copies of this
-license document, but changing it is not allowed.
-
-
-Developer's Certificate of Origin 1.1
-
-By making a contribution to this project, I certify that:
-
-(a) The contribution was created in whole or in part by me and I
-    have the right to submit it under the open source license
-    indicated in the file; or
-
-(b) The contribution is based upon previous work that, to the best
-    of my knowledge, is covered under an appropriate open source
-    license and I have the right under that license to submit that
-    work with modifications, whether created in whole or in part
-    by me, under the same open source license (unless I am
-    permitted to submit under a different license), as indicated
-    in the file; or
-
-(c) The contribution was provided directly to me by some other
-    person who certified (a), (b) or (c) and I have not modified
-    it.
-
-(d) I understand and agree that this project and the contribution
-    are public and that a record of the contribution (including all
-    personal information I submit with it, including my sign-off) is
-    maintained indefinitely and may be redistributed consistent with
-    this project or the open source license(s) involved.
--- a/README-FR.md
+++ b/README-FR.md
@@ -1,9 +1,7 @@
 # DOLIBARR ERP & CRM

 ![Downloads per day](https://img.shields.io/sourceforge/dw/dolibarr.svg)
-[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.1-8892BF.svg?style=flat-square)](https://php.net/)
-[![GitHub release](https://img.shields.io/github/v/release/Dolibarr/dolibarr)](https://github.com/Dolibarr/dolibarr)
-[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5521/badge)](https://bestpractices.coreinfrastructure.org/projects/5521)
+![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/develop.svg)

 Dolibarr ERP & CRM est un logiciel moderne pour gérer votre activité (société, association, auto-entrepreneurs, artisans).
 Il est simple d'utilisation et modulaire, vous permettant de n'activez que les fonctions dont vous avez besoin (contacts, fournisseurs, factures, commandes, stocks, agenda, ...).
@@ -58,21 +56,17 @@ Vous pouvez aussi utiliser un serveur Web et une base de données prise en charg

 Pour mettre à jour Dolibarr depuis une vieille version vers celle ci:

- Faites une sauvegarde de votre instance [voir ce tutorial](https://wiki.dolibarr.org/index.php/Installation_-_Upgrade#Upgrade_Dolibarr)
-
- Vérifiez que la nouvelle version est compatible avec la version PHP de votre serveur [voir PHP support](https://wiki.dolibarr.org/index.php/Releases).
-
 - Ecrasez les vieux fichiers dans le vieux répertoire 'dolibarr' par les fichiers
  fournis dans ce nouveau package.

 - Au prochain accès, Dolibarr proposera la page de "mise à jour" des données (si nécessaire).
  Si un fichier install.lock existe pour verrouiller le processus de mise à jour, il sera demandé de le supprimer manuellement (vous devriez trouver le fichier install.lock dans le répertoire utilisé pour stocker les documents générés ou transférés sur le serveur. Dans la plupart des cas, c'est le répertoire appelé "documents")

-Note: *Le processus de migration peut être lancé manuellement et plusieurs fois, sans risque, en appelant la page /install/*
+*Note: Le processus de migration peut être lancé manuellement et plusieurs fois, sans risque, en appelant la page /install/*

 ## CE QUI EST NOUVEAU

-Voir le fichier [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog).
+Voir fichier ChangeLog.

 ## CE QUE DOLIBARR PEUT FAIRE

@@ -88,17 +82,15 @@ Voir le fichier [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/Ch
 - Calendrier/Agenda partagé (avec export ical, vcal)
 - Suivi des opportunités et/ou projets (suivi de rentabilité incluant les factures, notes de frais, temps consommé valorisé, ...)
 - Gestion de contrats de services
- Gestion de stock et inventaires
+- Gestion de stock
 - Gestion des expéditions
- Gestion des demandes de congés
+- Gestion des demandes de congès
 - Gestion des notes de frais
- Gestion de recrutement
 - GED (Gestion Electronique de Documents)
- E-Mailings de masse
+- EMailings de masse
 - Réalisation de sondages
- Gestion d'adhérents
 - Point de vente/Caisse enregistreuse
- … (près de 100 modules disponibles en standard, près de 1000 autre sur la place de marché d'extensions)
+- …

 ### Autres modules

@@ -109,27 +101,27 @@ Voir le fichier [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/Ch
 - Support des codes barres
 - Calcul des marges
 - Connectivité LDAP
- Intégration de ClickToDial
+- Intégratn de ClickToDial
 - Intégration RSS
- Intégration Skype
- Intégration de système de paiements (PayPal, Stripe, Paybox...)
+- Intégation Skype
+- Intégration de système de paiements (Paypal, Stripe, Paybox...)
 - …

 ### Divers

 - Multi-langue.
 - Multi-utilisateurs avec différents niveaux de permissions par module.
- Multidevise.
+- Multi-devise.
 - Peux être multi-société par ajout du module externe multi-société.
 - Plusieurs thèmes visuels.
 - Application simple à utiliser.
- Requiert PHP et MariaDb, Mysql ou Postgresql (Voir versions exactes sur [https://wiki.dolibarr.org/index.php/Prérequis](https://wiki.dolibarr.org/index.php/Prérequis)).
+- Requiert PHP et MariaDb, Mysql ou Postgresql (Voir versions exactes sur https://wiki.dolibarr.org/index.php/Prérequis).
 - Compatible avec toutes les offres Cloud du marché respectant les prérequis de base de données et PHP.
 - APIs.
 - Génération PDF et ODT des éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
 - Code simple et facilement personnalisable (pas de framework lourd; mécanisme de hook et triggers).
 - Support natif de nombreuses fonctions spécifiques aux pays comme:
-  - La taxe espagnole TE et ISPF
+  - La tax espagnole TE et ISPF
  - Gestion de la TVA NPR (non perçue récupérable - pour les utilisateurs français des DOM-TOM)
  - La loi française Finance 2016 et logiciels de caisse
  - La double taxe canadienne
@@ -141,13 +133,13 @@ Voir le fichier [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/Ch

 ### Extension

-Dolibarr peut aussi être étendu à volonté avec l'ajout de modules/applications externes développées par des développeurs tiers, disponible sur [DoliStore](https://www.dolistore.com).
+Dolibarr peut aussi être étendu à volonté avec l'ajout de module/applications externes développées par des développeus tiers, disponible sur [DoliStore](https://www.dolistore.com).

 ## CE QUE DOLIBARR NE PEUT PAS (ENCORE) FAIRE

 Voici un liste de fonctionnalités pas encore gérées par Dolibarr:

- Dolibarr ne contient pas de module de génération de feuille de paie.
+- Dolibarr ne contient pas de module de Gestion de la paie.
 - Les tâches du module de gestion de projets n'ont pas de dépendances entre elle.
 - Dolibarr n'embarque pas de Webmail intégré nativement.
 - Dolibarr ne fait pas le café (pas encore).
@@ -160,7 +152,7 @@ La documentation utilisateur, développeur et traducteur est disponible sous for

 Ce projet existe grâce à ses nombreux contributeurs [[Contribuer](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)].

-[![Dolibarr](https://opencollective.com/dolibarr/contributors.svg?width=890&button=false)](https://github.com/Dolibarr/dolibarr/graphs/contributors)
+<a href="https://github.com/Dolibarr/dolibarr/graphs/contributors"><img src="https://opencollective.com/dolibarr/contributors.svg?width=890&button=false" /></a>

 ## CREDITS

@@ -170,15 +162,15 @@ Voir le fichier [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/CO

 ## ACTUALITES ET RESEAUX SOCIAUX

-Suivez le projet Dolibarr sur les réseaux francophones
+Suivez le projet Dolibarr project sur les réseaux francophones

 - [Facebook](https://www.facebook.com/dolibarr.fr)
- [X](https://www.twitter.com/dolibarr_france)
+- [Twitter](https://www.twitter.com/dolibarr_france)

 ou sur les réseaux anglophones

 - [Facebook](https://www.facebook.com/dolibarr)
- [X](https://www.twitter.com/dolibarr)
+- [Twitter](https://www.twitter.com/dolibarr)
 - [LinkedIn](https://www.linkedin.com/company/association-dolibarr)
 - [YouTube](https://www.youtube.com/user/DolibarrERPCRM)
 - [GitHub](https://github.com/Dolibarr/dolibarr)
--- a/README.md
+++ b/README.md
@@ -1,25 +1,25 @@
 # DOLIBARR ERP & CRM

 ![Downloads per day](https://img.shields.io/sourceforge/dw/dolibarr.svg)
-[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.1-8892BF.svg?style=flat-square)](https://php.net/)
+![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/develop.svg)
+[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%205.6-8892BF.svg?style=flat-square)](https://php.net/)
 [![GitHub release](https://img.shields.io/github/v/release/Dolibarr/dolibarr)](https://github.com/Dolibarr/dolibarr)
-[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5521/badge)](https://bestpractices.coreinfrastructure.org/projects/5521)

-Dolibarr ERP & CRM is a modern software package that helps manage your organization's activities (contacts, suppliers, invoices, orders, stocks, agenda…).
+Dolibarr ERP & CRM is a modern software package that helps manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda…).

-It's an Open-Source Software suite (written in PHP with JavaScript enhancements) designed for small, medium or large companies, foundations and freelancers.
+It's an Open Source Software suite (written in PHP with optional JavaScript enhancements) designed for small, medium or large companies, foundations and freelancers.

-You can freely use, study, modify or distribute it according to its license.
+You can freely use, study, modify or distribute it according to its licence.

-You can use it as a standalone application or as a web application to access it from the Internet or from a LAN.
+You can use it as a standalone application or as a web application to access it from the Internet or a LAN.

-Dolibarr has a large community ready to help you, free forums and [preferred partners ready to offer commercial support should you need it](https://partners.dolibarr.org)
+Dolibarr has a large community ready to help you, free forums and [officially preferred partners ready to offer commercial support should you need it](https://partners.dolibarr.org)

 ![ScreenShot](https://www.dolibarr.org/medias/dolibarr_screenshot1_1920x1080.jpg)

 ## LICENSE

-Dolibarr is released under the terms of the GNU General Public License as published by the Free Software Foundation; either Version 3 of the License, or (at your option) any later version (GPL-3+).
+Dolibarr is released under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version (GPL-3+).

 See the [COPYING](https://github.com/Dolibarr/dolibarr/blob/develop/COPYING) file for a full copy of the license.

@@ -29,34 +29,35 @@ Other licenses apply for some included dependencies. See [COPYRIGHT](https://git

 ### Simple setup

-If you have low technical skills and you're looking to install Dolibarr ERP/CRM with just a few clicks, you can use one of the packaged versions:
+If you have low technical skills and you're looking to install Dolibarr ERP/CRM in just a few clicks, you can use one of the packaged versions:

- [DoliWamp for Windows](https://wiki.dolibarr.org/index.php/Dolibarr_for_Windows_(DoliWamp))
+- [DoliWamp for Windows](https://wiki.dolibarr.org/index.php/Dolibarr_for_Windows_DoliWamp)
 - [DoliDeb for Debian](https://wiki.dolibarr.org/index.php/Dolibarr_for_Ubuntu_or_Debian)
- DoliRpm for Red Hat, Fedora, OpenSuse, Mandriva or Mageia
+- DoliRpm for Redhat, Fedora, OpenSuse, Mandriva or Mageia

 Releases can be downloaded from [official website](https://www.dolibarr.org/).

-### Recommended setup
+### Advanced setup

-You can use any web server supporting PHP (Apache, Nginx, ...) and a supported database (MariaDB, MySQL or PostgreSQL) to install the standard version.
+You can use a web server and a supported database (MariaDB, MySQL or PostgreSQL) to install the standard version.

+On GNU/Linux, first check if your distribution has already packaged Dolibarr.

-#### Generic install steps
+#### Generic install steps:

- Verify that your installed PHP version is supported [see PHP support](https://wiki.dolibarr.org/index.php/Releases).
+- Check that your installed PHP version is supported [see PHP support](https://wiki.dolibarr.org/index.php/Releases).

- Uncompress the downloaded .zip archive to copy the `dolibarr/htdocs` directory and all its files inside your web server root or get the files directly from GitHub (recommended if you know git as it makes it easier if you want to upgrade later):
+- Uncompress the downloaded .zip archive to copy the "dolibarr/htdocs" directory and all its files inside your web server root or get the files directly from GitHub (recommanded if you know git as it makes it easier if you want to upgrade later):

-  `git clone https://github.com/dolibarr/dolibarr -b x.y`     (where x.y is the main version like 9.0, 19.0, ...)
+  `git clone https://github.com/dolibarr/dolibarr -b x.y`     (where x.y is main version like 3.6, 9.0, ...)

- Set up your web server to use `dolibarr/htdocs` as root if your web server does not already define a directory to point to.
+- Set up your web server to use "*dolibarr/htdocs*" as root if your web server does not have an already defined directory to point to.

 - Create an empty `htdocs/conf/conf.php` file and set *write* permissions for your web server user (*write* permission will be removed once install is finished)

 - From your browser, go to the dolibarr "install/" page

-  The URL will depend on how your web configuration directs to your dolibarr installation. It may look like:
+  The URL will depends on how you web setup was setup to point to your dolibarr installation. It may looks like:

  `http://localhost/dolibarr/htdocs/install/`

@@ -70,146 +71,112 @@ You can use any web server supporting PHP (Apache, Nginx, ...) and a supported d

 - Follow the installer instructions

-### SaaS/Cloud Setup

-If you lack the time to install it yourself, consider exploring commercial 'ready-to-use' Cloud offerings (refer to https://saas.dolibarr.org). Keep in mind that this third option comes with associated costs.
+### Saas/Cloud setup
+
+If you don't have time to install it yourself, you can try some commercial 'ready to use' Cloud offers (See https://saas.dolibarr.org). However, this third solution is not free.
+

 ## UPGRADING

-Dolibarr supports upgrading, usually without the need for any (commercial) support (depending on if you use any commercial extensions). It supports upgrading all the way from any version after 2.8 without breakage. This is unique in the ERP ecosystem and a benefit our users highly appreciate!
-
-Follow these step-by-step instructions to seamlessly upgrade Dolibarr to the latest version:
-
- At first make a backup of your Dolibarr files & then [see](https://wiki.dolibarr.org/index.php/Installation_-_Upgrade#Upgrade_Dolibarr)
- Verify that your installed PHP version is supported by the new version [see PHP support](https://wiki.dolibarr.org/index.php/Releases).
- Overwrite all old files from the 'dolibarr' directory with files provided in the new version's package.
- At your next access, Dolibarr will redirect you to the "install/" page to follow the upgrade process.
+Dolibarr supports upgrading usually wihtout the need for any (commercial) support (depending on if you use any commercial extensions) and supports upgrading all the way from any version after 2.8 without breakage. This is unique in the ERP ecosystem and a benefit our users highly appreciate!
+ 
+- At first make a backup of your Dolibarr files & than [see](https://wiki.dolibarr.org/index.php/Installation_-_Upgrade#Upgrade_Dolibarr)
+- Check that your installed PHP version is supported by the new version [see PHP support](./doc/phpmatrix.md).
+- Overwrite all old files from 'dolibarr' directory with files provided into the new version's package.
+- At first next access, Dolibarr will redirect you to the "install/" page to follow the upgrade process.
  If an `install.lock` file exists to lock any other upgrade process, the application will ask you to remove the file manually (you should find the `install.lock` file in the directory used to store generated and uploaded documents, in most cases, it is the directory called "*documents*").

+
 ## WHAT'S NEW

 See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) file.

+
 ## FEATURES

 ### Main application/modules (all optional)

- Third-Parties Management: Customers, Prospects (Leads) and/or Suppliers + Contacts
- Members/Membership/Foundation management
-
- Product Management
-
- Products and/or Services catalogue
- Stock / Warehouse management + Inventory
- Barcodes
- Batches / Lots / Serials
- Product Variants
- Bill of Materials (BOM)
- Manufacturing Orders (MO)
-
- Customer/Sales Management
-
- Customers/Prospects + Contacts management
- Opportunities or Leads management
- Commercial proposals management (online signing)
- Customer Orders management
- Contracts/Subscription management
- Interventions management
- Ticket System (+ Knowledge management)
- Partnership management
+- Customers, Prospects (Leads) and/or Suppliers directory + Contacts
+- Members management 
+- Products and/or Services catalog
+- Commercial proposals management
+- Customer & Supplier Orders management
+- Invoices and payment management
 - Shipping management
- Customer Invoices/Credit notes and payment management
- Point of Sale (POS)
-
- Supplier/Purchase Management
-
- Suppliers/Vendors + Contacts
- Supplier (pricing) requests
- Purchase Orders management
- Delivery/Reception
- Supplier Invoices/Credit notes and payment management
- INCOTERMS
-
- Finance/Accounting
-
- Invoices/Payments
+- Warehouse/Stock management
+- Manufacturing Orders
 - Bank accounts management
- Direct debit and Credit transfer management (European SEPA)
+- Direct debit orders management (European SEPA)
 - Accounting management
- Donations management
- Loan management
- Margins
- Reports
-
- Collaboration
-
- Shared calendar/agenda (with `ical` and `vcal` import/export for third-party tools integration)
+- Shared calendar/agenda (with ical and vcal export for third party tools integration)
+- Opportunities or Leads management
 - Projects & Tasks management
- Event organization
- Ticket System
- Surveys
-
- HR - Human Resources Management
-
- Employee leave management
+- Contracts management
+- Interventions management
+- Employee's leave requests management
 - Expense reports
- Recruitment management
- Employee/staff management
 - Timesheets
+- Electronic Document Management (EDM)
+- Foundations members management
+- Point of Sale (POS)
+- …

 ### Other application/modules

- Electronic Document Management (EDM)
- Bookmarks
+- Bookmarks management
+- Donations management
 - Reporting
+- Surveys
 - Data export/import
- Barcodes
+- Barcodes support
+- Margin calculations
 - LDAP connectivity
 - ClickToDial integration
 - Mass emailing
 - RSS integration
- Social platforms linking
+- Skype integration
 - Payment platforms integration (PayPal, Stripe, Paybox...)
- Email-Collector
-
-(around 100 modules available by default, 1000+ addons at the official marketplace Dolistore.com)
+- …

 ### Other general features

- Multi-Language Support (Localization in most major languages)
- Multi-users and groups with finely-grained rights
+- Localization in most major languages
+- Multi-Language Support
+- Multi-Users and groups with finely grained rights
 - Multi-Currency
- Multi-Company (by adding an external module)
- Very user-friendly and easy to use
- Customizable dashboards
+- Multi-Company (by adding of an external module)
+
+- Very user friendly and easy to use
+- customizable Dashboard
 - Highly customizable: enable only the modules you need, add user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one)
+
 - APIs (REST, SOAP)
 - Code that is easy to understand, maintain and develop (PHP with no heavy framework; trigger and hook architecture)
- Support a lot of country-specific features:
-  - Spanish Tax RE and IRPF
+
+- Support a lot of country specific features:
+  - Spanish Tax RE and ISPF
  - French NPR VAT rate (VAT called "Non Perçue Récupérable" for DOM-TOM)
  - Canadian double taxes (federal/province) and other countries using cumulative VAT
  - Tunisian tax stamp
  - Argentina invoice numbering using A,B,C...
-  - Greece fetch customer vat details from AADE, all invoice types, MyData(external free module)
-  - ZATCA e-invoicing QR-Code
-  - Compatible with [European directives](https://europa.eu/legislation_summaries/taxation/l31057_en.htm) (2006/112/CE ... 2010/45/UE)
-  - Compatible with data privacy rules (Europe's GDPR, ...)
+  - Compatible with [European directives](http://europa.eu/legislation_summaries/taxation/l31057_en.htm) (2006/112/CE ... 2010/45/UE)
+  - Compatible with European GDPR rules
  - ...
 - Flexible PDF & ODT generation for invoices, proposals, orders...
- ...
+- …
+

 ### System Environment / Requirements

- PHP
- MariaDB, MySQL or PostgreSQL
+- Works with PHP 5.6-7.4 and MariaDB 5.0.3+, MySQL 5.0.3+ or PostgreSQL 8.1.4+ (See exact requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite))
 - Compatible with all Cloud solutions that match PHP & MySQL or PostgreSQL prerequisites.

-See exact requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite)

 ### Extending

-Dolibarr can be extended with a lot of other external applications or modules from third-party developers available at the [DoliStore](https://www.dolistore.com).
+Dolibarr can be extended with a lot of other external application or modules from third party developers available at the [DoliStore](https://www.dolistore.com).
+

 ## WHAT DOLIBARR CAN'T DO YET

@@ -217,21 +184,24 @@ These are features that Dolibarr does **not** yet fully support:

 - Tasks dependencies in projects
 - Payroll module
- Native embedded Webmail, but you can send email to contacts in Dolibarr with e.g. offers, invoices, etc.
+- No native embedded Webmail, but you can send email to contacts in Dolibarr with e.g. offers, invoices, etc.
 - Dolibarr can't do coffee (yet)

+
 ## DOCUMENTATION

-Administrator, user, developer and translator's documentation are available along with other community resources in the [Wiki](https://wiki.dolibarr.org).
+Administrator, user, developer and translator's documentations are available along with other community resources in the [Wiki](https://wiki.dolibarr.org).
+

 ## CONTRIBUTING

-This project exists thanks to all the people who contribute.
-Please read the instructions on how to contribute (report a bug/error, a feature request, send code, ...)  [[Contributing](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)]
+This project exists thanks to all the people who contribute. 
+Please read the instructions how to contribute (report a bug/error, a feature request, send code ...)  [[Contribute](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)]

-A View on Contributors:
+A view on Contributors:
+
+<a href="https://github.com/Dolibarr/dolibarr/graphs/contributors"><img src="https://opencollective.com/dolibarr/contributors.svg?width=890&button=false" /></a>

-[![Dolibarr](https://opencollective.com/dolibarr/contributors.svg?width=890&button=false)](https://github.com/Dolibarr/dolibarr/graphs/contributors)

 ## CREDITS

@@ -239,17 +209,19 @@ Dolibarr is the work of many contributors over the years and uses some fine PHP

 See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) file.

+
 ## NEWS AND SOCIAL NETWORKS

 Follow Dolibarr project on:

 - [Facebook](https://www.facebook.com/dolibarr)
- [X](https://x.com/dolibarr)
+- [Twitter](https://www.twitter.com/dolibarr)
 - [LinkedIn](https://www.linkedin.com/company/association-dolibarr)
- [Reddit](https://www.reddit.com/r/Dolibarr_ERP_CRM/)
 - [YouTube](https://www.youtube.com/user/DolibarrERPCRM)
 - [GitHub](https://github.com/Dolibarr/dolibarr)

+
 ### Sponsors

 Support this project by becoming a sponsor. Your logo will show up here. 🙏 [[Become a sponsor/backer](https://opencollective.com/dolibarr#backer)]
+
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -2,32 +2,28 @@

 This file contains some policies about the security reports on Dolibarr ERP CRM project, one of the most popular Open Source ERP and CRM in the world.

-
 ## Supported Versions for security reports

-Security report are valid only on current stable version (see https://dolibarr.org web site to get current stable version) or on development version (branch "develop" on https://github.com/Dolibarr/dolibarr).
+| Version   | Supported          |
+| --------- | ------------------ |
+| <= 12.*   | :x:                |
+| >= 13.*   | :white_check_mark: |


 ## Reporting a Vulnerability

-To report a vulnerability, for a private report, you can:
-
- Send your report on Vulnerability Disclosure Program (VDP) [https://app.yogosha.com/cvd/dolibarr/10VxeNx6Ui3rSEhAgX63US](https://app.yogosha.com/cvd/dolibarr/10VxeNx6Ui3rSEhAgX63US) (recommended for everybody)
-<!--
- Or if you have permissions, use GitHub security advisory at [https://github.com/Dolibarr/dolibarr/security/advisories/new](https://github.com/Dolibarr/dolibarr/security/advisories/new)
-->
- Or send an email to security@dolibarr.org with clear textual description of the report along with steps to reproduce the issue, include attachments such as screenshots or proof of concept code as necessary.
+To report a vulnerability, please use GitHub security advisory (alternatively send an email to security@dolibarr.org)


 ## Hunting vulnerabilities on Dolibarr

-We believe that the future of software is online SaaS. This means software are more and more critical and no technology is perfect. Working with skilled security researchers is crucial in identifying weaknesses in our technology.
+We believe that future of software is online SaaS. This means software are more and more critical and no technology is perfect. Working with skilled security researchers is crucial in identifying weaknesses in our technology.

 If you believe you've found a security bug in our service, we are happy to work with you to resolve the issue promptly and ensure you are fairly rewarded for your discovery.

-Any type of denial-of-service attack is strictly forbidden, as well as any interference with network equipment and Dolibarr infrastructure.
+Any type of denial of service attacks is strictly forbidden, as well as any interference with network equipment and Dolibarr infrastructure.

-We recommend to install Dolibarr ERP CRM on your own server (as most Open Source software, download and use is free: [https://www.dolibarr.org/download](https://www.dolibarr.org/download)) to get access on every side of application.
+We recommand to install Dolibarr ERP CRM on your own server (as most Open Source software, download and use is free: https://www.dolibarr.org/download) to get access on every side of application.

 ### User Agent

@@ -35,81 +31,73 @@ If you try to find bug on Dolibarr, we recommend to append to your user-agent he

 ### Account access

-You can install the web application yourself on your own platform/server so you get full access to application and sources. Download the zip of the files to put in your own web server virtual host from [https://www.dolibarr.org/download](https://www.dolibarr.org/download)
+You can install the web application yourself on your own platform/server so you get full access to application and sources. Download the zip of the files to put into your own web server virtual host from https://www.dolibarr.org/download


 ## Eligibility and Responsible Disclosure

-We are happy to thank everyone who submits valid reports which help us improve the security of Dolibarr, however only those that meet the following eligibility requirements will be "validated reports" (if not, we may close the report without any answer):
+We are happy to thank everyone who submits valid reports which help us improve the security of Dolibarr however, only those that meet the following eligibility requirements will be "validated reports" (if not, we may close the report without any answer):

 You must be the first reporter of the vulnerability (duplicate reports are closed).

-You must avoid tests that could cause degradation or interruption of our service (refrain from using automated tools, and limit yourself about requests per second), that's why we recommend to install software on your own platform.
+You must send a clear textual description of the report along with steps to reproduce the issue, include attachments such as screenshots or proof of concept code as necessary.
+
+You must avoid tests that could cause degradation or interruption of our service (refrain from using automated tools, and limit yourself about requests per second), that's why we recommand to install softwate on your own platform.

 You must not leak, manipulate, or destroy any user data of third parties to find your vulnerability.

-Reports are processed around once a month.
-

 ## Scope for qualified vulnerabilities

 ONLY vulnerabilities discovered, when the following setup on test platform is used, are "valid":

-* The version to analyze must be the last version available in the "develop" branch. Reports on vulnerabilities already fixed (so already reported) in the develop branch will not be validated.   
-* $dolibarr_main_prod must be set to 1 in conf.php
-* $dolibarr_nocsrfcheck must be kept to the value 0 in conf.php (this is the default value)
+* $dolibarr_main_prod must be set to 1 into conf.php
+* $dolibarr_nocsrfcheck must be kept to the value 0 into conf.php (this is the default value)
 * $dolibarr_main_force_https must be set to something else than 0.
-* Some constant must be set in the backoffice menu Home - Setup - Other
-  - MAIN_SECURITY_CSRF_WITH_TOKEN must be set to 3 
-  - MAIN_RESTRICTHTML_ONLY_VALID_HTML = 1
-  - MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY = 1
-  - MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES = 1 
-  - MAIN_DISALLOW_URL_INTO_DESCRIPTIONS = 1 (only relative links are allowed in descriptions/notes), or 2 (no links are allowed in descriptions/notes)
-  CSRF attacks and HTML injections are accepted but double check this setup that is experimental setup that already fix a lot of case and soon enabled by default.
-* ONLY security reports on modules provided by default and with the "stable" status are valid (troubles in "experimental", "development" or external modules are not valid vulnerabilities).
+* The constant MAIN_SECURITY_CSRF_WITH_TOKEN must be set to 1 into backoffice menu Home - Setup - Other (this protection should be set to 1 soon by default)
+* The module DebugBar and ModuleBuilder must NOT be enabled (by default, this module is not enabled. This is a developer tool)
+* ONLY security reports on modules provided by default and with the "stable" status are valid (troubles into "experimental", "developement" or external modules are not valid vulnerabilities).
 * The root of web server must link to htdocs and the documents directory must be outside of the web server root (this is the default when using the default installer but may differs with external installer).
-* The web server setup must be done so that only the documents directory is in write mode and directory listing is not allowed. The directory path htdocs/ must be read-only.
-* The modules DebugBar and ModuleBuilder must NOT be enabled. (by default, these modules are not enabled. They are developer tools)
-* Fail2ban rules for rate limit on the login page, forgotten password page, API calls and all public pages (/public/*) must be installed as recommended in the section "About - Admin tools - Section Access limits and mitigation".
+* The web server setup must be done so only the documents directory is in write mode. The root directory called htdocs must be readonly.
+* CSRF attacks are accepted when using a POST URL, but when using GET URL, they are validated only for creating, updating or deleting data resctricted from pages restricted to admin users.
+* Ability for a high level user to edit web site pages into the CMS by including HTML or Javascript is an expected feature. Vulnerabilities into the website module are validated only if HTML or Javascript injection can be done by a non allowed user.

-Scope is the web application (backoffice) and the APIs.
+Scope is the web application (back office) and the APIs.


-## Examples of vulnerabilities that are Qualified for reporting.
+## Qualifying vulnerabilities for Bug bounty programs

 * Remote code execution (RCE)
 * Local files access and manipulation (LFI, RFI, XXE, SSRF, XSPA)
-* Code injections (JS, SQL, PHP). HTML are covered only for fields that are not description, notes or comments fields (where rich content is allowed on purpose).
-* Cross-Site Scripting (XSS), except from setup page of module "External web site" (allowing any content here, editable by admin user only, is accepted on purpose) and except 
-  in the module "Web site" when permission to edit website content is allowed (injecting any data in this case is allowed too).
+* Code injections (HTML, JS, SQL, PHP, ...)
+* Cross-Site Scripting (XSS)
 * Cross-Site Requests Forgery (CSRF) with real security impact (when using GET URLs, CSRF are qualified only for creating, updating or deleting data from pages restricted to admin users)
 * Open redirect
 * Broken authentication & session management
-* Insecure direct object references (IDOR)
-* Cross-Origin Resource Sharing (CORS) with real security impact
+* Insecure direct object references
+* CORS with real security impact
 * Horizontal and vertical privilege escalation
 * "HTTP Host Header" XSS
-* Software version disclosure (for non-admin users only)
-* Stack traces or path disclosure (for non-admin users only)
-* Ability for a high-level user to edit web site pages in the CMS by including HTML or JavaScript is an expected feature. Vulnerabilities in the website module are validated only 
-  if HTML or JavaScript injection can be done by a non-allowed user.
+* Software version disclosure (for non admin users only)
+* Stack traces or path disclosure (for non admin users only)


-## Examples of vulnerabilities that are Non-qualified for reporting.
+## Non-qualifying vulnerabilities for Bug bounty programs, but qualified for reporting

-* Any vulnerabilities due to a configuration different than the one defined in chapter "Scope for qualified vulnerabilities".
-* Directory Listing (this is a bad setup of the web server, not a problem into the application)
 * "Self" XSS
-* Clickjacking/UI redressing
-* Presence of autocomplete attribute on web forms
-* Logout and other instances of low-severity Cross-Site Request Forgery
-* Reports from automated web vulnerability scanners (Acunetix, Vega, etc.) that have not been validated
-* Reports on features on modules flagged as "deprecated", "experimental" or "development" if the module needs to be enabled for that (this is not the case on production).
-* Software or libraries versions, private IP disclosure, Stack traces or path disclosure when logged-in user is admin.
-* Vulnerabilities affecting outdated browsers or platforms, or vulnerabilities inside browsers themself.
-* Brute force attacks on login page, password forgotten page or any public pages (/public/*) are not qualified if the recommended fail2ban rules were not installed.  
 * SSL/TLS best practices
-* Invalid or missing SPF (Sender Policy Framework) records (Incomplete or missing SPF/DKIM/DMARC)
+* Denial of Service attacks
+* Clickjacking/UI redressing
 * Physical or social engineering attempts or issues that require physical access to a victim’s computer/device
-* Vulnerabilities of type XSS exploited by using javascript into a website page (with permission to edit website pages) or by using php code into a website page
-  using the permission to edit php code are not qualified, except if this allow to get higher privileges (being able to set javascript or php code is the expected behaviour).
+* Presence of autocomplete attribute on web forms
+* Vulnerabilities affecting outdated browsers or platforms
+* Logout and other instances of low-severity Cross-Site Request Forgery
+* Missing cookie flags
+* Missing security-related HTTP headers which do not lead directly to a vulnerability
+* Reports from automated web vulnerability scanners (Acunetix, Vega, etc.) that have not been validated
+* Invalid or missing SPF (Sender Policy Framework) records (Incomplete or missing SPF/DKIM/DMARC)
+* Reports on features flagged as "experimental" or "development"
+* Software version or private IP disclosure when logged user is admin
+* Stack traces or path disclosure when logged user is admin
+* Any vulnerabilities due to a configuration different than the one defined into chapter "Scope for qualified vulnerabilities".
+
--- a/build/README
+++ b/build/README
@@ -7,18 +7,36 @@ Building packages
 ##################################################

 All sub-directories of "build" directory contains files (setup or binary tools) required to build automatically Dolibarr packages.
-The build directory and all its contents is absolutely not required to make Dolibarr working. 
-It is here only to build Dolibarr packages, and those generated packages will not contains this "build" directory.
-

 There are several tools:

--------------------------------------------------------------------------------------------------

 - To build full Dolibarr packages, launch the script
 > Launch command perl makepack-dolibarr.pl

-See makepack-howto.txt for prerequisites.
+--------------------------------------------------------------------------------------------------
+
+
+Prerequisites to build tgz, debian, rpm package:
+
+> apt-get install tar dpkg dpatch p7zip-full rpm zip
+
+
+--------------------------------------------------------------------------------------------------
+
+Prerequisites to build autoexe DoliWamp package:
+> apt-get install wine q4wine
+> Launch "wine cmd" to check a drive Z: pointing to / exists.
+> Install InnoSetup
+   For example by running isetup-5.5.8.exe (https://www.jrsoftware.org)  https://files.jrsoftware.org/is/5/
+> Install WampServer into "C:\wamp64" to have Apache, PHP and MariaDB
+   For example by running wampserver3.2.0_x64.exe (https://www.wampserver.com). 
+   See file build/exe/doliwamp.iss to know the doliwamp version currently setup.
+> Add path to ISCC into PATH windows var:
+  Launch wine cmd, then regedit and add entry int HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment\PATH
+> To build manually the .exe from Windows (running from makepack-dolibarr.pl script is however recommanded), 
+  open file build/exe/doliwamp.iss and click on button "Compile".
+  The .exe file will be build into directory build.

 --------------------------------------------------------------------------------------------------
  
@@ -34,12 +52,16 @@ See makepack-howto.txt for prerequisites.

 --------------------------------------------------------------------------------------------------

- To build developer documentation, launch the script
+- To build developper documentation, launch the script
 > perl dolibarr-doxygen-build.pl


 --------------------------------------------------------------------------------------------------

+Note: 
+The build directory and all its contents is absolutely not required to make Dolibarr working. 
+It is here only to build Dolibarr packages, and those generated packages will not contains this "build" directory.
+

 You can find in "build", following sub-directories:

--- a/build/composer/README
+++ b/build/composer/README
@@ -1,40 +1,19 @@
--- HOW TO USE COMPOSER
-
-* Switch to the minimal version of PHP
-
-	update-alternatives --config php
-

 * To list packages 

-	cd htdocs/includes/diroflib
-	composer install
-	composer show -i
+composer show -i

-
-* To upgrade a lib with composer using the composer.json of the library only:
+* To test upgrade of a lib with composer:

 Remove entry in composer.lock
-
-	cd htdocs/includes/diroflib
-	rm composer.lock
-
 Edit composer.json to change version to "x.y.z"
+composer -v update --root-reqs --no-dev --no-autoloader --dry-run ccampbell/chromephp

-    composer -v update --root-reqs --no-dev --ignore-platform-reqs
-	composer -v update --root-reqs --no-dev --ignore-platform-reqs [--no-autoloader] [--dry-run] ccampbell/chromephp
-
-
-* To upgrade a lib with composer using the composer.json of Dolibarr:
+* To upgrade a lib with composer:

 Remove entry in composer.lock
-
-	cd /
-	mv composer.json.disabled composer.json
-	rm composer.lock
-
 Edit composer.json to change version to "x.y.z"
+composer -v update --root-reqs --no-dev --no-autoloader ccampbell/chromephp
+

-    composer -v update --root-reqs --no-dev --ignore-platform-reqs
-	composer -v update --root-reqs --no-dev --ignore-platform-reqs [--no-autoloader] [--dry-run] ccampbell/chromephp

--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -51,17 +51,16 @@ export DEBEMAIL="eldy@destailleur.fr"

 export QUILT_PATCHES=debian/patches

-
-# Note: alioth.debian.org is outdated --> https://alioth-archive.debian.org/  -->  https://salsa.debian.org/public 
- * Create an account login
- * Update your ~/.ssh/config file to add:
- Host svn.debian.org git.debian.org bzr.debian.org hg.debian.org darcs.debian.org arch.debian.org
+# To use Alioth.debian.org
+* Create an account login
+* Update your ~/.ssh/config file to add:
+Host svn.debian.org git.debian.org bzr.debian.org hg.debian.org darcs.debian.org arch.debian.org
 	User eldy-guest
 	IdentityFile ~/.ssh/id_rsa
- * Check login on page https://alioth.debian.org/users/login
- Ex: https://alioth.debian.org/users/eldy-guest
- * Setup your ssh as described into page: http://wiki.debian.org/Alioth/SSH
- * Ask to be included into project collab-maint: http://alioth.debian.org/projects/collab-maint/
+* Check login on page https://alioth.debian.org/users/login
+Ex: https://alioth.debian.org/users/eldy-guest
+* Setup your ssh as described into page: http://wiki.debian.org/Alioth/SSH
+* Ask to be included into project collab-maint: http://alioth.debian.org/projects/collab-maint/



@@ -81,9 +80,9 @@ export QUILT_PATCHES=debian/patches
 # dpkg -l                                List all packages
 # dpkg -b                                To build binary only package
 # dpkg -c package.deb                    List content of package
-# dpkg -I package.deb                    Give information on package
+# dpkg -I package.deb                    Give informations on package
 # dpkg -i package.deb                    Install a package
-# dpkg-reconfigure -plow package         Reconfigure package
+# dpkg-reconfigure -plow package		 Reconfigure package
 # dpkg -L packagename                    List content of installed package 
 # dpkg -r packagename                    Remove config files and interactive saved answers
 # dpkg -s packagename                    Give status of installed package
@@ -91,7 +90,7 @@ export QUILT_PATCHES=debian/patches
 #
 # dpkg-buildpackage -us -uc              Build a source and binary package
 #
-# gdebi package.deb                      Install a package + dependencies
+# gdebi package.deb						 Install a package + dependencies



@@ -99,21 +98,21 @@ export QUILT_PATCHES=debian/patches

 - Post an ITP with reportbugs :
 > reportbug -B debian --email username@domain.tld wnpp
-See page https://www.debian.org/devel/wnpp/#l1 for example of ITP requests contents.
+See page http://www.debian.org/devel/wnpp/#l1 for example of ITP requests contents.

 - Wait until you received bug number.
  For first ITP submission of Dolibarr, bug id was 634783.

 - Check bug is into database by searching with id on 
-  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634783
+  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634783
  
 - Add a line for upstream into file changelog with bug number

 - Call for a mentor on ML debian-mentors to upload packages

 - Once package is uploaded, following URL are available:
-https://packages.qa.debian.org/package.html
-https://bugs.debian.org/package
+http://packages.qa.debian.org/package.html
+http://bugs.debian.org/package


 ##### Modify severity of a bug ticket
@@ -173,7 +172,7 @@ or
 > ls /srv/chroot

 Puis pour se connecter et préparer l'environnement 
-> schroot -c name_of_chroot  (example schroot -c unstable-amd64-sbuild)
+> schroot -c name_of_chroot  (exemple schroot -c unstable-amd64-sbuild)
 > cat /etc/debian_chroot       to check which debian branch we are into
 > apt-get install vim dialog
 > vi /usr/sbin/policy-rc.d     and replace return code 101 (not allowed) into 0 (ok)
@@ -249,7 +248,7 @@ ou
 > git-buildpackage -us -uc --git-ignore-branch --git-upstream-branch=[upstream|upstream-x.y.z]

 Note: To build an old version, do: git checkout oldtagname -b newbranchname; git-buildpackage -us -uc --git-debian-branch=newbranchname --git-upstream-branch=[upstream|upstream-3.5.x]
-Note: You can use git-buildpackage -us -uc --git-ignore-new  if you want to test build with uncommitted file
+Note: You can use git-buildpackage -us -uc --git-ignore-new  if you want to test build with uncommited file
 Note: You can use git-buildpackage -us -uc -d                if you want to test build when dependencies does not match 
 Note: Package is built into directory ../build-area
 Note: To compare 2 packages: debdiff package1.dsc package2.dsc
@@ -345,7 +344,7 @@ To update dolibarr debian package when only files not into debian has changed:

 * Checkout the branch you want to work on: master of debian/...  
 * Manually, add patches into debian/patches and update the file debian/series, or do the 2 steps with "quilt import filepatch.patch"
-* You can test patching of series with "quilt push" (autant de fois que de patch). Avec "quilt pop -a", on revient a l'état du upstream sans les patch.
+* You can test patching of serie with "quilt push" (autant de fois que de patch). Avec "quilt pop -a", on revient a l'état du upstream sans les patch.
 * Update the debian/changelog to add entry of change.

 Once files has been prepared, it's time to test:
@@ -357,7 +356,7 @@ ou
 > git-buildpackage -us -uc --git-ignore-branch --git-upstream-branch=[upstream|upstream-jessie|upstream-3.5.x|3.5.5]

 Note: To build an old version, do: git checkout oldtagname -b newbranchname; git-buildpackage -us -uc --git-debian-branch=newbranchname --git-upstream-branch=[upstream|upstream-jessie|upstream-3.5.x|3.5.5]
-Note: You can use git-buildpackage -us -uc --git-ignore-new  if you want to test build with uncommitted file
+Note: You can use git-buildpackage -us -uc --git-ignore-new  if you want to test build with uncommited file
 Note: You can use git-buildpackage -us -uc -d                if you want to test build when dependencies does not match 
 Note: Package is built into directory ../build-area
 Note: To compare 2 packages: debdiff package1.dsc package2.dsc
--- a/build/debian/apache/.htaccess
+++ b/build/debian/apache/.htaccess
@@ -8,7 +8,7 @@ Denied from all
 </IfVersion>


-# OPTIMIZE: To use cache on static pages (A259200 = 1 month, A7200 = 2 hours, A691600 = 8 days = recommended for static resources).
+# OPTIMIZE: To use cache on static pages (A259200 = 1 month, A7200 = 2 hours, A691600 = 8 days = recommanded for static resources).
 # Note that you must also enable the module mod_expires.
 #ExpiresActive On
 #ExpiresByType image/x-icon A2592000
--- a/build/debian/compat
+++ b/build/debian/compat
@@ -1 +1 @@
-10
+7
--- a/build/debian/control
+++ b/build/debian/control
@@ -19,6 +19,7 @@ Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm |
    php-pear, php-mail-mime,
 #    php-tcpdf,
 #    libfpdf-tpl-php, php-fpdf,
+#    libphp-adodb,
 #    libnusoap-php,
 #    libphp-pclzip,
 # Required javascript libraries
@@ -32,7 +33,7 @@ Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm |
 Recommends: apache2 | lighttpd | httpd,
    mariadb-server | virtual-mysql-server,
 # Required PHP extensions for debian 9 but we can't add them into a Depends, it does not exists on debian 7 and 8
-    php-xml, php-mbstring, php-intl
+    php-xml, php-mbstring
 Suggests: www-browser, php5-geoip
 Description: Web based software to manage a company or foundation
 Dolibarr ERP & CRM is an easy to use open source/free software package for 
--- a/build/debian/copyright
+++ b/build/debian/copyright
@@ -61,10 +61,35 @@ License: GPL-3+

 ------------------------------------------------------------

+Files: htdocs/includes/adodbtime/*
+Copyright: 2003-2005, John Lim
+           unknown, jackbbs
+License: BSD-3-Clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ .
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ .
+ Neither the name of the John Lim nor the names of its contributors may be
+ used to endorse or promote products derived from this software without
+ specific prior written permission.
+Comment:
+ Those files are not shipped in the binary package since we use
+ the library as packaged in "libphp-adodb".
+
+
+------------------------------------------------------------
+
 Files: htdocs/includes/ckeditor/*
 Copyright: 2003-2012 CKSource - Frederico Knabben
 License: GPL-2+
- The ckeditor is triple licensed under the GNU General Public License (GPL),
+ The ckeditor is tripple licensed under the GNU General Public License (GPL),
 GNU Lesser General Public License (LGPL), and Mozilla Public License (MPL).
 In Debian, it is distributed under the GNU General Public License (GPL).
 .
--- a/build/debian/dolibarr.config
+++ b/build/debian/dolibarr.config
@@ -2,8 +2,6 @@
 # Debian install package run: config, preinst, prerm, postinst, postrm
 #

-# shellcheck disable=1091,2034
-
 set -e


@@ -50,7 +48,7 @@ echo "Ask for web server to setup"
 db_input critical dolibarr/reconfigure-webserver || true

 if db_go ; then
-	okcancel="1"
+    okcancel="1"
 else
 	okcancel="0"
 fi
--- a/build/debian/dolibarr.postinst
+++ b/build/debian/dolibarr.postinst
@@ -1,8 +1,6 @@
 #!/bin/sh
 # postinst script for dolibarr

-# shellcheck disable=1091,2086,2154
-
 set -e

 # summary of how this script can be called:
@@ -21,25 +19,25 @@ if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
 fi

 setup_empty_conf() {
-	echo Create empty file $config
-	mkdir -p /etc/dolibarr
-	touch /etc/dolibarr/conf.php
-	chown root:www-data /etc/dolibarr/conf.php
-	chmod 660 /etc/dolibarr/conf.php
+	echo Create empty file $config		
+    mkdir -p /etc/dolibarr
+    touch /etc/dolibarr/conf.php
+    chown root:www-data /etc/dolibarr/conf.php
+    chmod 660 /etc/dolibarr/conf.php
 }

 is_new_upstream_version() {
-	# $1 can be empty (not installed) and will result in a true value
-	# for the check
-	old_version=$(echo "$1" | sed -e 's/-[^-]*$//' -e 's/^[0-9]*://')
-	new_version=$(dpkg-query -f '${Version}' -W dolibarr | \
-		sed -e 's/-[^-]*$//' -e 's/^[0-9]*://')
-	test "$old_version" != "$new_version"
+    # $1 can be empty (not installed) and will result in a true value
+    # for the check
+    old_version=$(echo "$1" | sed -e 's/-[^-]*$//' -e 's/^[0-9]*://')
+    new_version=$(dpkg-query -f '${Version}' -W dolibarr | \
+		  sed -e 's/-[^-]*$//' -e 's/^[0-9]*://')
+    test "$old_version" != "$new_version"
 }

 enable_install_upgrade_wizard() {
 	echo Enable install wizard by removing install.lock file if present
-	rm -f /var/lib/dolibarr/documents/install.lock
+    rm -f /var/lib/dolibarr/documents/install.lock
 }


@@ -48,24 +46,24 @@ php_install() {
 		# php5endmod exists for ubuntu only
 		echo "Enable php module mysqli with php5enmod"
 		php5enmod mysqli
-	fi
+    fi
 }

 apache_install() {
 	webserver=$1
-
+	
 	# Enable Apache 2 alias module
 	if which a2enmod >/dev/null 2>&1 ;then
 		echo "Enable apache module alias with a2enmod"
 		a2enmod alias
 	fi
-
+	
 	# Enable dolibarr conf
 	if which a2enconf >/dev/null 2>&1 ;then
 		# a2enconf exists for ubuntu only
 		echo "Enable link for Apache config file with a2enconf"
 		a2enconf dolibarr
-	else
+	else 
 		if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then
 			echo "Add link for Apache config file"
 			ln -s /etc/$webserver/conf-available/dolibarr.conf /etc/$webserver/conf.d/dolibarr.conf
@@ -103,7 +101,7 @@ case "$1" in
 	configure)
 		if [ -z "$2" ]; then
 			echo First install
-			#setup_empty_conf
+		    #setup_empty_conf
 		else
 			echo This is not a first install
 		fi
@@ -111,17 +109,17 @@ case "$1" in
 		php_install
 		apache_install
 		lighttpd_install
-
+		
 		# Remove lock file
 		if is_new_upstream_version "$2"; then
-			enable_install_upgrade_wizard
+		    enable_install_upgrade_wizard
 		fi
-
-		# Create document directory for uploaded data files
-		mkdir -p $docdir
-		chown -R www-data:www-data $docdir
-		chmod -R 775 $docdir
-		chmod -R g+s $docdir
+				
+        # Create document directory for uploaded data files
+        mkdir -p $docdir
+        chown -R www-data:www-data $docdir
+        chmod -R 775 $docdir
+        chmod -R g+s $docdir

 		# Copy install config file (with matching Debian values) into target directory
 		superuserlogin=''
@@ -138,16 +136,17 @@ case "$1" in
 			cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig
 		fi
 		chown -R root:www-data $installconfig
-		chmod -R 660 $installconfig
+	   	chmod -R 660 $installconfig

 		# If a conf already exists and its content was already completed by installer
 		if [ ! -s $config ] || ! grep -q "File generated by" $config
 		then
 			# Create an empty conf.php with permission to web server
 			setup_empty_conf
-			#else
+		#else
 			# File already exist. We add params not found.
 			#echo Add new params to overwrite path to use shared libraries/fonts
+			#grep -q -c "dolibarr_lib_ADODB_PATH" $config    || [ ! -d "/usr/share/php/adodb" ]  || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config
 			##grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
 			#grep -q -c "dolibarr_lib_NUSOAP_PATH" $config   || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
 			#grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
@@ -156,18 +155,18 @@ case "$1" in
 			#grep -q -c "dolibarr_js_JQUERY" $config         || [ ! -d "/usr/share/javascript/jquery" ]    || echo "<?php \$dolibarr_js_JQUERY='/javascript/jquery'; ?>" >> $config
 			#grep -q -c "dolibarr_js_JQUERY_UI" $config      || [ ! -d "/usr/share/javascript/jquery-ui" ] || echo "<?php \$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; ?>" >> $config
 			#grep -q -c "dolibarr_js_JQUERY_FLOT" $config    || [ ! -d "/usr/share/javascript/flot" ]      || echo "<?php \$dolibarr_js_JQUERY_FLOT='/javascript/flot'; ?>" >> $config
-			#grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config
+			#grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "<?php \$dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf'; ?>" >> $config			
 		fi
-
+	
 		db_get dolibarr/reconfigure-webserver
-
+	
 		webservers="$RET"
-
+	
 		# Set up web server.
 		for webserver in $webservers ; do
 			webserver=${webserver%,}
 			echo Complete config of server $webserver
-
+			
 			# Detect webuser and webgroup
 			webuser=
 			webgroup=
@@ -183,7 +182,7 @@ case "$1" in

 			# Set permissions to web server
 			chown -R $webuser:$webgroup /usr/share/dolibarr
-			chown -R root:$webgroup $config
+            chown -R root:$webgroup $config
 		done

 		# Restart web server.
@@ -195,33 +194,33 @@ case "$1" in
 				apache_install $webserver
 			fi
 			# Reload webserver in any case, configuration might have changed
-			# Redirection of 3 is needed because Debconf uses it and it might
+			# Redirection of 3 is needed because Debconf uses it and it might 
 			# be inherited by webserver. See bug #446324.
-			if [ -f /etc/init.d/$webserver ] ; then
-				if [ -x /usr/sbin/invoke-rc.d ]; then
-					echo Restart web server $server using invoke-rc.d
-					# This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...)
-					invoke-rc.d $webserver reload 3>/dev/null || true
-				else
-					echo Restart web server $server using $server reload
-					/etc/init.d/$webserver reload 3>/dev/null || true
-				fi
-			fi
+	        if [ -f /etc/init.d/$webserver ] ; then
+	            if [ -x /usr/sbin/invoke-rc.d ]; then
+    	            echo Restart web server $server using invoke-rc.d
+	    		    # This works with Debian (5.05,...) and Ubuntu (9.10,10.04,...)
+	                invoke-rc.d $webserver reload 3>/dev/null || true
+	            else
+	                echo Restart web server $server using $server reload
+	                /etc/init.d/$webserver reload 3>/dev/null || true
+	            fi
+	        fi
 		done

-
+		
 		echo ----------
 		echo "Call Dolibarr page http://localhost/dolibarr/ to complete the setup and use Dolibarr."
 		echo ----------
-		;;
+	;;

 	abort-upgrade|abort-remove|abort-deconfigure)
-		;;
+	;;

 	*)
 		echo "postinst called with unknown argument $1" >&2
 		exit 0
-		;;
+	;;
 esac

 #DEBHELPER#
--- a/build/debian/dolibarr.postrm
+++ b/build/debian/dolibarr.postrm
@@ -3,8 +3,6 @@
 #
 # see: dh_installdeb(1)

-# shellcheck disable=1091,2006,2034,2086,2089,2090
-
 #set -e
 set +e

@@ -32,8 +30,8 @@ lighttpd_remove() {
 		fi
 		# See bug #448682
 		if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then
-			echo "postrm Manually deleting lighttpd/dolibarr configuration link"
-			rm /etc/lighttpd/conf-enabled/50-dolibarr.conf
+		    echo "postrm Manually deleting lighttpd/dolibarr configuration link"
+		    rm /etc/lighttpd/conf-enabled/50-dolibarr.conf
 		fi
 	fi
 }
@@ -48,7 +46,7 @@ apache_remove() {


 if [ -f /usr/share/debconf/confmodule ]; then
-	. /usr/share/debconf/confmodule
+    . /usr/share/debconf/confmodule
 fi

 db_version 2.0
@@ -64,12 +62,12 @@ lockfile="$docdir/install.lock"

 case "$1" in

-		# Call when we upgrade
+    # Call when we upgrade
 	upgrade)
 		echo "postrm upgrade"
-		;;
+	;;

-		# Call when we uninstall
+    # Call when we uninstall
 	remove)
 		echo "postrm remove"
 		rm -f $lockfile
@@ -87,7 +85,7 @@ case "$1" in
 			else
 				apache_remove $webserver
 			fi
-			# Redirection of 3 is needed because Debconf uses it and it might
+			# Redirection of 3 is needed because Debconf uses it and it might 
 			# be inherited by webserver. See bug #446324.
 			if [ -f /etc/init.d/$webserver ] ; then
 				if [ -x /usr/sbin/invoke-rc.d ]; then
@@ -97,9 +95,9 @@ case "$1" in
 				fi
 			fi
 		done
-		;;
+	;;

-		# Call when we uninstall and purge
+    # Call when we uninstall and purge
 	purge)
 		echo "postrm purge"

@@ -113,7 +111,7 @@ case "$1" in
 		set +e
 		db_get dolibarr/postrm
 		set -e
-
+	
 		if [ "$RET" = "true" ] ; then
 			echo postrm Mysql database deletion
 			# Get database configuration
@@ -133,7 +131,7 @@ case "$1" in
 			dbadmin="$superuserlogin"
 			dbadmpass="$superuserpassword"
 			dbtype="mysql"
-
+			
 			# To delete a mysql user (disabled)
 			# Needs:        $dbuser    - the user name to create (or replace).
 			#               $dballow   - what hosts to allow (defaults to %).
@@ -146,7 +144,7 @@ case "$1" in
 			#               mysql
 			#               /usr/share/wwwconfig-coomon/mysql.get
 			#. /usr/share/wwwconfig-common/${dbtype}-dropuser.sh
-
+			
 			# To delete database
 			# Needs:        $dbname    - the database that user should have access to.
 			#               $dbserver  - the server to connect to.
@@ -160,85 +158,85 @@ case "$1" in
 			# Define mysqlcmd
 			if [ -z "$dbserver" ] || [ "$dbserver" = "localhost" ]; then
 				hostopt=""
-				dbserver=localhost
+			    dbserver=localhost
 			else
-				case "$dbserver" in
-					:*)
-						dbsocket=`echo $dbserver | sed -e 's/^://'`
-						hostopt="-S $dbsocket"
-						;;
-					*)
-						hostopt="-h $dbserver"
-						;;
-				esac
+			    case "$dbserver" in
+				:*)
+				    dbsocket=`echo $dbserver | sed -e 's/^://'`
+				    hostopt="-S $dbsocket"
+				    ;;
+				*)
+				    hostopt="-h $dbserver"
+				    ;;
+			    esac
 			fi
 			if [ -z "$dbadmpass" ] ; then
-				log="${log}No password used."
-				passopt=""
+			    log="${log}No password used."
+			    passopt=""
 			else
-				passopt="--password='"`echo "$dbadmpass" | sed -e "s/'/'"'"'"'"'"'"'/g"`"'"
+			    passopt="--password='"`echo "$dbadmpass" | sed -e "s/'/'"'"'"'"'"'"'/g"`"'"
 			fi
 			mysqlcmd="mysql $hostopt $passopt -u $dbadmin"
 			mysqlcmdnopass="mysql $hostopt -u $dbadmin"
-
-			# Now run the drop user
+			
+		    # Now run the drop user
 			if eval $mysqlcmd -f -e "\"DROP USER '$dbuser'@'localhost';\"" ; then
 				echo postrm Database login $dbuser@localhost removed
 			else
-				error="Unable to run $mysqlcmdnopass -f -e \"DROP USER '$dbuser'@'localhost';\""
+			    error="Unable to run $mysqlcmdnopass -f -e \"DROP USER '$dbuser'@'localhost';\""
 				echo postrm $error
 			fi
 			if eval $mysqlcmd -f -e "\"DROP USER '$dbuser'@'%';\"" ; then
 				echo postrm Database login $dbuser@% removed
 			else
-				error="Unable to run $mysqlcmdnopass -f -e \"DROP USER '$dbuser'@'%';\""
+			    error="Unable to run $mysqlcmdnopass -f -e \"DROP USER '$dbuser'@'%';\""
 				echo postrm $error
 			fi

-			# Now run the drop commands
-			if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
-				log="${log}Dropping database $dbname."
+		    # Now run the drop commands
+		    if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
+				log="${log}Droping database $dbname."
 				if eval $mysqlcmd -f -e "\"DROP DATABASE $dbname;\"" ; then
-					if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
-						error="Database $dbname NOT successfully dropped. You have to do it manually."
-						echo postrm $error
-					else
-						status=drop
-					fi
+				    if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
+					error="Database $dbname NOT successfully droped. You have to do it manually."
+					echo postrm $error
+				    else
+					status=drop
+				    fi
 				else
-					error="Unable to run the drop database script."
+				    error="Unable to run the drop database script."
 					echo postrm $error
 				fi
-			else
+		    else
 				status=nothing
 				log="${log}Database $dbname already not exists."
-			fi
-
-			echo "postrm Remove directory $docdir"
-			rm -rf $docdir ;
+		    fi

+		    echo "postrm Remove directory $docdir"
+		    rm -rf $docdir ; 
+ 
 		else
-			echo "postrm Delete of dolibarr database and uploaded files not wanted"
+			echo "postrm Delete of dolibarr database and uploaded files not wanted" 
 		fi
-
+	
 		rm -rf /etc/dolibarr

 		# We clean variable (we ignore errors because db_reset can fails if var was never set)
-		set +e
+        set +e
 		db_reset dolibarr/reconfigure-webserver
 		db_reset dolibarr/postrm
-		set -e
+        set -e

 		#db_purge
-		;;
+	;;

 	failed-upgrade|abort-install|abort-upgrade|disappear)
-		;;
+	;;

 	*)
 		echo "postrm called with unknown argument $1" >&2
 		exit 0
-		;;
+	;;
 esac

 #DEBHELPER#
--- a/build/debian/get-orig-source.sh
+++ b/build/debian/get-orig-source.sh
@@ -1,13 +1,11 @@
 #!/bin/sh

-# shellcheck disable=2034,2086,2103,2164
-
 tmpdir=$(mktemp -d)


 # Download source file
 if [ -n "$1" ]; then
-	uscan_opts="--download-version=$1"
+    uscan_opts="--download-version=$1"
 fi
 #uscan --noconf --force-download --no-symlink --verbose --destdir=$tmpdir $uscan_opts

--- a/build/debian/install.forced.php.install
+++ b/build/debian/install.forced.php.install
@@ -31,6 +31,7 @@ $force_install_distrib='debian';
 // - not removed from package (see rm in rules file),
 // - declared into dependencies (see Depends in control file)
 //$force_dolibarr_lib_TCPDF_PATH='';
+//$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
 //$force_dolibarr_lib_GEOIP_PATH='';
 //$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
 //$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
--- a/build/debian/patches/use-etc-dolibarr-conf.patch
+++ b/build/debian/patches/use-etc-dolibarr-conf.patch
@@ -33,5 +33,5 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +$conffile = "/etc/dolibarr/conf.php";
 +$conffiletoshow = "/etc/dolibarr/conf.php";
 
- $short_options = "c:h";
- $long_options = array(
+ 
+ // Load conf file if it is already defined
--- a/build/debian/rules
+++ b/build/debian/rules
@@ -4,7 +4,7 @@
 export DH_VERBOSE=1
 export DH_OPTIONS=-v

-#export DH_COMPAT=7    # This is the debhelper compatibility version to use, now defined into compat file
+#export DH_COMPAT=7    # This is the debhelper compatability version to use, now defined into compat file


 %:
@@ -19,10 +19,6 @@ override_dh_auto_clean:
 override_dh_auto_build:
 # Do nothing. Added to disable launchpad to use bugged dh_auto_build search for ant

-# Force the compression format for control files
-override_dh_builddeb:
-	dh_builddeb -- -Zxz
-
 #override_dh_compress:
 #	dh_compress --no-act -X.png

@@ -93,6 +89,7 @@ override_dh_install:
 	rm -fr build/zip
 	
 	# clean from all PHP embedded libraries (we use package dependencies instead)
+#	rm -fr htdocs/includes/adodbtime
 #	rm -fr htdocs/includes/geoip
 #	rm -fr htdocs/includes/nusoap
 #	rm -fr htdocs/includes/odtphp/zip/pclzip
@@ -128,4 +125,4 @@ override_dh_fixperms:
 	# Give rights to the webserver on the upload directory
 	chown www-data:www-data debian/dolibarr/var/lib/dolibarr/documents
 	chmod 2775 debian/dolibarr/var/lib/dolibarr/documents
-
+	
--- a/build/debian/source/include-binaries
+++ b/build/debian/source/include-binaries
@@ -0,0 +1,2 @@
+htdocs/install/doctemplates/websites/website_template-corporate.zip
+htdocs/install/doctemplates/websites/website_template-stellar.zip
--- a/build/debian/source/options
+++ b/build/debian/source/options
@@ -1,5 +0,0 @@
-# Force use of gzip compression by dpkg-buildpackage for the tarball *.debian.tar.gz
-# See also option --compression from command line of dpkg-buildpackage
-# Format for the control files are defined into the rules file in override_dh_builddeb section
-compression = "gzip"
-#compression-level = 9
--- a/build/dmg/dolimamp/install.forced.php
+++ b/build/dmg/dolimamp/install.forced.php
@@ -1,17 +1,16 @@
 <?php
-
-$force_install_message = 'KeepDefaultValuesMamp';
-$force_install_main_data_root = '/Applications/MAMP/dolibarr_documents';
-$force_install_type = 'mysqli';
-$force_install_dbserver = 'localhost';
-$force_install_port = '8889';
-$force_install_database = 'dolibarr';
-$force_install_createdatabase = '1';
-$force_install_databaselogin = 'dolibarrmysql';
-$force_install_databasepass = 'root';
-$force_install_createuser = '1';
-$force_install_databaserootlogin = 'root';
-$force_install_databaserootpass = 'root';
-$force_install_dolibarrlogin = 'admin';
-$force_install_nophpinfo = '1';
-$force_install_lockinstall = '444';
+$force_install_message='KeepDefaultValuesMamp';
+$force_install_main_data_root='/Applications/MAMP/dolibarr_documents';
+$force_install_type='mysqli';
+$force_install_dbserver='localhost';
+$force_install_port='8889';
+$force_install_database='dolibarr';
+$force_install_createdatabase='1';
+$force_install_databaselogin='dolibarrmysql';
+$force_install_databasepass='root';
+$force_install_createuser='1';
+$force_install_databaserootlogin='root';
+$force_install_databaserootpass='root';
+$force_install_dolibarrlogin='admin';
+$force_install_nophpinfo='1';
+$force_install_lockinstall='444';
--- a/build/docker-dev/Dockerfile
+++ b/build/docker-dev/Dockerfile
@@ -1,61 +0,0 @@
-FROM php:8.1-apache-bullseye
-
-ENV PHP_INI_DATE_TIMEZONE 'UTC'
-ENV PHP_INI_MEMORY_LIMIT 256M
-
-RUN apt-get update -y \
-    && apt-get install -y --no-install-recommends \
-        libfreetype6-dev \
-        libjpeg62-turbo-dev \
-        libjpeg62-turbo \
-        libpng-dev \
-        libpng16-16 \
-        libldap2-dev \
-        libxml2-dev \
-        libzip-dev \
-        zlib1g-dev \
-        libicu-dev \
-        g++ \
-        default-mysql-client \
-        unzip \
-        curl \
-        apt-utils \
-        msmtp \
-        msmtp-mta \
-        mailutils \
-    && apt-get autoremove -y \
-    && rm -rf /var/lib/apt/lists/* \
-    && docker-php-ext-configure gd --with-freetype --with-jpeg \
-    && docker-php-ext-install -j$(nproc) calendar intl mysqli pdo_mysql gd soap zip \
-    && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
-    && docker-php-ext-install -j$(nproc) ldap && \
-    mv ${PHP_INI_DIR}/php.ini-development ${PHP_INI_DIR}/php.ini
-
-RUN mkdir /var/documents
-RUN chown www-data:www-data /var/documents
-
-COPY docker-run.sh /usr/local/bin/
-RUN chmod +x /usr/local/bin/docker-run.sh
-
-RUN pecl install xdebug && docker-php-ext-enable xdebug
-RUN echo 'zend_extension="/usr/local/lib/php/extensions/no-debug-non-zts-20180731/xdebug.so"' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.mode=debug' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.start_with_request=yes' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.client_host=host.docker.internal' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.client_port=9003' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.discover_client_host=true' >> ${PHP_INI_DIR}/php.ini
-#RUN echo 'xdebug.log="/tmp/xdebug.log"' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.idekey="netbeans-xdebug"' >> ${PHP_INI_DIR}/php.ini
-
-# set up sendmail config, to use maildev
-RUN echo "account default" > /etc/msmtprc
-RUN echo "auth off" >> /etc/msmtprc
-RUN echo "port 1025" >> /etc/msmtprc
-RUN echo "host mail" >> /etc/msmtprc
-RUN echo "from local@localdomain.com" >> /etc/msmtprc
-RUN echo "domain localhost.localdomain" >> /etc/msmtprc
-RUN echo "sendmail_path=/usr/bin/msmtp -t" >> /usr/local/etc/php/conf.d/php-sendmail.ini
-
-EXPOSE 80
-
-ENTRYPOINT ["docker-run.sh"]
--- a/build/docker-dev/README.md
+++ b/build/docker-dev/README.md
@@ -1,34 +0,0 @@
-# How to use it ?
-
-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/tuxgasy/dolibarr 
-
-Before build/run, define the variable HOST_USER_ID as following:
-
-        export HOST_USER_ID=$(id -u)
-
-Go in repository build/docker :
-
-        cd build/docker
-
-And then, you can run :
-
-        docker-compose up
-
-This will run 4 containers Docker : Dolibarr, MariaDB, PhpMyAdmin and MailDev.
-
-The URL to go to the 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
-
-        http://0.0.0.0:8081
-
-Setup the database connection during the installation process, please use mariadb (name of the database container) as database host.
-Setup documents folder, during the installation process, to /var/documents
--- a/build/docker-dev/docker-compose.yml
+++ b/build/docker-dev/docker-compose.yml
@@ -1,62 +0,0 @@
-version: '3'
-
-networks:
-    internal-pod:
-        internal: true
-    external-pod:
-        internal: false
-
-services:
-    mariadb:
-        image: mariadb:latest
-        environment:
-            MYSQL_ROOT_PASSWORD: rootpassfordev
-            MYSQL_DATABASE: dolibarr
-        ports:
-            - "3306:3306"
-        networks:
-            - internal-pod
-            - external-pod
-
-    phpmyadmin:
-        image: phpmyadmin/phpmyadmin
-        environment:
-            PMA_HOST: mariadb
-        depends_on:
-            - mariadb
-        ports:
-            - "8080:80"
-        networks:
-            - internal-pod
-            - external-pod
-
-    web:
-        build: .
-        environment:
-            HOST_USER_ID: $HOST_USER_ID
-            PHP_INI_DATE_TIMEZONE: $PHP_INI_DATE_TIMEZONE
-            PHP_INI_MEMORY_LIMIT: $PHP_INI_MEMORY_LIMIT
-        volumes:
-            - ../../htdocs:/var/www/html/
-            - ../../documents:/var/documents
-        ports:
-            - "80:80"
-            - "9000:9000"
-        depends_on:
-            - mariadb
-            - mail
-        networks:
-            - internal-pod
-            - external-pod
-        extra_hosts:
-            - "localhost.localdomain:127.0.0.1"
-            - "host.docker.internal:host-gateway"
-
-    mail:
-        image: maildev/maildev
-        ports:
-            - "8081:1080"
-            - "25:1025"
-        networks:
-            - internal-pod
-            - external-pod
--- a/build/docker-dev/docker-run.sh
+++ b/build/docker-dev/docker-run.sh
@@ -1,24 +0,0 @@
-#!/bin/bash
-# Script used by the Dockerfile.
-# See README.md to know how to create a Dolibarr env with docker
-
-usermod -u "${HOST_USER_ID}" www-data
-groupmod -g "${HOST_USER_ID}" www-data
-
-chgrp -hR www-data /var/www/html
-chmod g+rwx /var/www/html/conf
-
-if [ ! -d /var/documents ]; then
-	echo "[docker-run] => create volume directory /var/documents ..."
-	mkdir -p /var/documents
-fi
-echo "[docker-run] => Set Permission to www-data for /var/documents"
-chown -R www-data:www-data /var/documents
-
-echo "[docker-run] => update '${PHP_INI_DIR}/conf.d/dolibarr-php.ini'"
-cat <<EOF > "${PHP_INI_DIR}/conf.d/dolibarr-php.ini"
-date.timezone = ${PHP_INI_DATE_TIMEZONE:-UTC}
-memory_limit = ${PHP_INI_MEMORY_LIMIT:-256M}
-EOF
-
-exec apache2-foreground
--- a/build/docker-dev/mariadb/Dockerfile
+++ b/build/docker-dev/mariadb/Dockerfile
@@ -1,3 +0,0 @@
-FROM mariadb:latest
-# Enable commented out UTF8 charset/collation options
-RUN sed '/utf8/ s/^#//' /etc/mysql/mariadb.cnf >/tmp/t && mv /tmp/t /etc/mysql/mariadb.cnf
--- a/build/docker-dev/.dockerignore
+++ b/build/docker-dev/.dockerignore
--- a/build/docker/.github/workflows/build.yml
+++ b/build/docker/.github/workflows/build.yml
@@ -1,36 +0,0 @@
-name: build
-on:
-    push:
-        branches:
-            - master
-    schedule:
-        - cron: '0 0 * * 6'
-
-jobs:
-    build-docker-images:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v3
-            - uses: docker/setup-buildx-action@v2
-            - env:
-                DOCKER_BUILD: 1
-                DOCKER_PUSH: 1
-              run: |
-                echo ${{ secrets.DOCKER_HUB_PASSWORD }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
-                ./update.sh
-
-    update-readme:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v3
-            - run: |
-                docker run --rm -t \
-                -v $(pwd):/src \
-                -e DOCKER_USER=${{ secrets.DOCKER_HUB_USERNAME }} \
-                -e DOCKER_PASS=${{ secrets.DOCKER_HUB_PASSWORD }} \
-                -e PUSHRM_PROVIDER=dockerhub \
-                -e PUSHRM_FILE=/src/README.md \
-                -e PUSHRM_SHORT='Docker image for Dolibarr with auto installer on first boot.' \
-                -e PUSHRM_TARGET=docker.io/tuxgasy/dolibarr \
-                -e PUSHRM_DEBUG=1 \
-                chko/docker-pushrm:1
--- a/build/docker/.github/workflows/test.yml
+++ b/build/docker/.github/workflows/test.yml
@@ -1,27 +0,0 @@
-name: test
-on:
-    push:
-        branches:
-            - master
-    pull_request:
-
-jobs:
-    check-update:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v3
-            - run: |
-                ./update.sh
-                git diff --exit-code
-
-    check-build:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v3
-            - env:
-                DOLI_INSTALL_AUTO: 0
-              run: |
-                ./update.sh
-                docker build -t tuxgasy/dolibarr:develop images/develop
-                docker run -d -p 127.0.0.1:80:80 --name dolibarr tuxgasy/dolibarr:develop
-                docker ps | grep -q dolibarr
--- a/build/docker/.gitignore
+++ b/build/docker/.gitignore
@@ -1,3 +0,0 @@
-.idea/
-.volumes/
-docker-compose-links/
--- a/build/docker/Dockerfile
+++ b/build/docker/Dockerfile
@@ -1,43 +1,64 @@
-FROM php:8.2-apache-bookworm
-
-LABEL maintainer="Yann Le Doaré <services@linuxconsole.org>"
+FROM php:7.3-apache

 ENV PHP_INI_DATE_TIMEZONE 'UTC'
 ENV PHP_INI_MEMORY_LIMIT 256M
-ENV PHP_INI_UPLOAD_MAX_FILESIZE 2M
-ENV PHP_INI_POST_MAX_SIZE 8M
-ENV PHP_INI_ALLOW_URL_FOPEN 0

 RUN apt-get update -y \
-    && apt-get dist-upgrade -y \
    && apt-get install -y --no-install-recommends \
-        libc-client-dev \
        libfreetype6-dev \
        libjpeg62-turbo-dev \
-        libkrb5-dev \
-        libldap2-dev \
+        libjpeg62-turbo \
        libpng-dev \
-        libpq-dev \
+        libpng16-16 \
+        libldap2-dev \
        libxml2-dev \
        libzip-dev \
+        zlib1g-dev \
+        libicu-dev \
+        g++ \
        default-mysql-client \
-        postgresql-client \
-        cron \
+        unzip \
+        curl \
+        apt-utils \
+        msmtp \
+        msmtp-mta \
+        mailutils \
    && apt-get autoremove -y \
-    && docker-php-ext-configure gd --with-freetype --with-jpeg \
+    && rm -rf /var/lib/apt/lists/* \
+    && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
    && docker-php-ext-install -j$(nproc) calendar intl mysqli pdo_mysql gd soap zip \
-    && docker-php-ext-configure pgsql -with-pgsql \
-    && docker-php-ext-install pdo_pgsql pgsql \
-    && docker-php-ext-configure ldap --with-libdir=lib/$(gcc -dumpmachine)/ \
-    && docker-php-ext-install -j$(nproc) ldap \
-    && docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
-    && docker-php-ext-install imap \
-    && mv ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini \
-    && rm -rf /var/lib/apt/lists/*
+    && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
+    && docker-php-ext-install -j$(nproc) ldap && \
+    mv ${PHP_INI_DIR}/php.ini-development ${PHP_INI_DIR}/php.ini
+
+RUN mkdir /var/documents
+RUN chown www-data:www-data /var/documents
+
+COPY docker-run.sh /usr/local/bin/
+RUN chmod +x /usr/local/bin/docker-run.sh
+
+RUN pecl install xdebug && docker-php-ext-enable xdebug
+RUN echo 'zend_extension="/usr/local/lib/php/extensions/no-debug-non-zts-20180731/xdebug.so"' >> ${PHP_INI_DIR}/php.ini
+RUN echo 'xdebug.remote_autostart=1' >> ${PHP_INI_DIR}/php.ini
+RUN echo 'xdebug.remote_enable=1' >> ${PHP_INI_DIR}/php.ini
+RUN echo 'xdebug.default_enable=1' >> ${PHP_INI_DIR}/php.ini
+#RUN echo 'xdebug.remote_host=docker.host' >> ${PHP_INI_DIR}/php.ini
+RUN echo 'xdebug.remote_port=9000' >> ${PHP_INI_DIR}/php.ini
+RUN echo 'xdebug.remote_connect_back=1' >> ${PHP_INI_DIR}/php.ini
+RUN echo 'xdebug.profiler_enable=0' >> ${PHP_INI_DIR}/php.ini
+RUN echo 'xdebug.remote_log="/tmp/xdebug.log"' >> ${PHP_INI_DIR}/php.ini
+#RUN echo 'localhost docker.host' >> /etc/hosts
+
+# set up sendmail config, to use maildev
+RUN echo "account default" > /etc/msmtprc
+RUN echo "auth off" >> /etc/msmtprc
+RUN echo "port 25" >> /etc/msmtprc
+RUN echo "host mail" >> /etc/msmtprc
+RUN echo "from local@localdomain.com" >> /etc/msmtprc
+RUN echo "domain localhost.localdomain" >> /etc/msmtprc
+RUN echo "sendmail_path=/usr/bin/msmtp -t" >> /usr/local/etc/php/conf.d/php-sendmail.ini
+RUN echo "localhost localhost.localdomain" >> /etc/hosts

 EXPOSE 80

-COPY docker-run.sh /usr/local/bin/
 ENTRYPOINT ["docker-run.sh"]
-
-CMD ["apache2-foreground"]
--- a/build/docker/README.md
+++ b/build/docker/README.md
@@ -1,6 +1,34 @@
 # How to use it ?

-export HOST_USER_ID=$(id -u)
-export MYSQL_ROOT_PWD=$(tr -dc A-Za-z0-9 </dev/urandom | head -c 13; echo)
+The docker-compose.yml file is used to build and run Dolibarr in the current workspace.
+This docker image intended for developpement usage.
+For production usage you should consider other contributor reference like https://hub.docker.com/r/tuxgasy/dolibarr 

-docker-compose up -d
+Before build/run, define the variable HOST_USER_ID as following:
+
+        export HOST_USER_ID=$(id -u)
+
+Go in repository build/docker :
+
+        cd build/docker
+
+And then, you can run :
+
+        docker-compose up
+
+This will run 4 containers Docker : Dolibarr, MariaDB, PhpMyAdmin and MailDev.
+
+The URL to go to the 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
+
+        http://0.0.0.0:8081
+
+Setup the database connection during the installation process, please use mariadb (name of the database container) as database host.
+Setup documents folder, during the installation process, to /var/documents
--- a/build/docker/docker-compose.yml
+++ b/build/docker/docker-compose.yml
@@ -1,38 +1,57 @@
-# This docker-compose.yml file is used to build and test quickly
-# a specific version of Dolibarr
-#
-# Before build, define the variable DOLI_VERSION as following:
-# $ export DOLI_VERSION=4.0.4
-# And then, you can run :
-# $ docker-compose up
-#
-# More information about Docker-compose : https://docs.docker.com/compose/
+version: '3'

-version: "3"
+networks:
+    internal-pod:
+        internal: true
+    external-pod:
+        internal: false

 services:
    mariadb:
-        container_name: dolibarr-mariadb-dev
        image: mariadb:latest
        environment:
-            MYSQL_ROOT_PASSWORD: $MYSQL_ROOT_PWD
-            MYSQL_DATABASE: "dolibarr-prod"
-
-    web:
-        container_name: dolibarr-web-dev
-        build: .
-
-        volumes:
-         - ../../htdocs:/var/www/html/
-         - ../../documents:/var/www/html/documents
+            MYSQL_ROOT_PASSWORD: root
+            MYSQL_DATABASE: dolibarr
+        ports:
+            - "3306:3306"
+        networks:
+            - internal-pod
+            - external-pod

+    phpmyadmin:
+        image: phpmyadmin/phpmyadmin
+        environment:
+            PMA_HOST: mariadb
        depends_on:
            - mariadb
-        environment:
-            WWW_USER_ID: 1000
-            WWW_GROUP_ID: 1000
-            DOLI_ROOT_PASSWORD: $MYSQL_ROOT_PWD
-            DOLI_DATABASE: "dolibarr-prod"
-            DOLI_DB_SERVER: "mariadb"
        ports:
            - "8080:80"
+        networks:
+            - internal-pod
+            - external-pod
+
+    web:
+        build: .
+        environment:
+            HOST_USER_ID: $HOST_USER_ID
+        volumes:
+            - ../../htdocs:/var/www/html/
+            - ../../documents:/var/documents
+        ports:
+            - "80:80"
+            - "9000:9000"
+        depends_on:
+            - mariadb
+            - mail
+        networks:
+            - internal-pod
+            - external-pod
+
+    mail:
+        image: maildev/maildev
+        ports:
+            - "8081:80"
+            - "25:25"
+        networks:
+            - internal-pod
+            - external-pod
--- a/build/docker/docker-run.sh
+++ b/build/docker/docker-run.sh
@@ -1,26 +1,22 @@
 #!/bin/bash
-# Script used by the Dockerfile.
-# See README.md to know how to create a Dolibarr env with docker

-usermod -u "${HOST_USER_ID}" www-data
-groupmod -g "${HOST_USER_ID}" www-data
+usermod -u ${HOST_USER_ID} www-data
+groupmod -g ${HOST_USER_ID} www-data

 chgrp -hR www-data /var/www/html
 chmod g+rwx /var/www/html/conf

 if [ ! -d /var/documents ]; then
 	echo "[docker-run] => create volume directory /var/documents ..."
-	mkdir -p /var/documents
+  	mkdir -p /var/documents
 fi
 echo "[docker-run] => Set Permission to www-data for /var/documents"
 chown -R www-data:www-data /var/documents

-echo "[docker-run] => update '${PHP_INI_DIR}/conf.d/dolibarr-php.ini'"
-cat <<EOF > "${PHP_INI_DIR}/conf.d/dolibarr-php.ini"
-date.timezone = ${PHP_INI_DATE_TIMEZONE:-UTC}
-memory_limit = ${PHP_INI_MEMORY_LIMIT:-256M}
+if [ ! -f /usr/local/etc/php/php.ini ]; then
+  cat <<EOF > /usr/local/etc/php/php.ini
+date.timezone = $PHP_INI_DATE_TIMEZONE
 EOF
-
-cp /var/www/html/install/install.forced.docker.php /var/www/html/install/install.forced.php
+fi

 exec apache2-foreground
--- a/build/docker/mariadb/Dockerfile
+++ b/build/docker/mariadb/Dockerfile
@@ -0,0 +1,3 @@
+FROM mariadb:latest
+# Enable comented out UTF8 charset/collation options
+RUN sed '/utf8/ s/^#//' /etc/mysql/mariadb.cnf >/tmp/t && mv /tmp/t /etc/mysql/mariadb.cnf
--- a/build/doxygen/dolibarr-doxygen-build.pl
+++ b/build/doxygen/dolibarr-doxygen-build.pl
@@ -1,9 +1,9 @@
 #!/usr/bin/perl
 #--------------------------------------------------------------------
-# Start the generation of the development documentation with doxygen
+# Lance la generation de la doc dev doxygen
 #--------------------------------------------------------------------

-# Determine the patho of this script
+# Detecte repertoire du script
 ($DIR=$0) =~ s/([^\/\\]+)$//;
 $DIR||='.';
 $DIR =~ s/([^\/\\])[\\\/]+$/$1/;
@@ -17,9 +17,9 @@ use Cwd;
 my $dir = getcwd;

 print "Current dir is: $dir\n";
-#print "Running dir for doxygen must be: $DIR\n";
+print "Running dir for doxygen must be: $DIR\n";

-if (! -s "build/doxygen/$CONFFILE")
+if (! -s $CONFFILE)
 {
    print "Error: current directory for building Dolibarr doxygen documentation is not correct.\n";
    print "\n";
@@ -30,7 +30,7 @@ if (! -s "build/doxygen/$CONFFILE")
    exit 1;   
 }

-$SOURCE=".";
+$SOURCE="../..";

 # Get version $MAJOR, $MINOR and $BUILD
 $result = open( IN, "< " . $SOURCE . "/htdocs/filefunc.inc.php" );
@@ -47,8 +47,8 @@ $version=$MAJOR.".".$MINOR.".".$BUILD;


 print "Running doxygen for version ".$version.", please wait...\n";
-print "cat build/doxygen/$CONFFILE | sed -e 's/x\.y\.z/".$version."/' | doxygen $OPTIONS - 2>&1\n";
-$result=`cat build/doxygen/$CONFFILE | sed -e 's/x\.y\.z/$version/' | doxygen $OPTIONS - 2>&1`;
+print "cat $CONFFILE | sed -e 's/x\.y\.z/".$version."/' | doxygen $OPTIONS - 2>&1\n";
+$result=`cat $CONFFILE | sed -e 's/x\.y\.z/$version/' | doxygen $OPTIONS - 2>&1`;

 print $result;

--- a/build/doxygen/dolibarr-doxygen.doxyfile
+++ b/build/doxygen/dolibarr-doxygen.doxyfile
@@ -1,17 +1,14 @@
-# Doxyfile 1.8.16
+# Doxyfile 1.7.3

 # This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
+# doxygen (www.doxygen.org) for a project
 #
-# All text after a double hash (##) is considered a comment and is placed in
-# front of the TAG it is preceding.
-#
-# All text after a single hash (#) is considered a comment and will be ignored.
+# All text after a hash (#) is considered a comment and will be ignored
 # The format is:
-# TAG = value [value, ...]
-# For lists, items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (\" \").
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")

 #---------------------------------------------------------------------------
 # Project related configuration options
@@ -41,7 +38,7 @@ PROJECT_NUMBER = x.y.z
 # If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.

-OUTPUT_DIRECTORY = build
+OUTPUT_DIRECTORY = ../../build

 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
 # 4096 sub-directories (in 2 levels) under the output directory of each output
@@ -117,7 +114,7 @@ FULL_PATH_NAMES = YES
 # If left blank the directory from which doxygen is run is used as the
 # path to strip.

-STRIP_FROM_PATH = "/home/dolibarr/doxygen.dolibarr.org/"
+STRIP_FROM_PATH = "../.."

 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
 # the path mentioned in the documentation of a class, which tells
@@ -220,8 +217,7 @@ OPTIMIZE_OUTPUT_VHDL = NO
 # (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions
 # you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.

-#EXTENSION_MAPPING = example=PHP
-EXTENSION_MAPPING =
+EXTENSION_MAPPING = 

 # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
 # to include (a tag file for) the STL sources as input, then you should
@@ -283,15 +279,15 @@ TYPEDEF_HIDES_STRUCT = NO
 # For small to medium size projects (<1000 input files) the default value is
 # probably good enough. For larger projects a too small cache size can cause
 # doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penalty.
+# causing a significant performance penality.
 # If the system has enough physical memory increasing the cache will improve the
 # performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will roughly double the
+# a logarithmic scale so increasing the size by one will rougly double the
 # memory usage. The cache size is given by this formula:
 # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
 # corresponding to a cache size of 2^16 = 65536 symbols

-#SYMBOL_CACHE_SIZE = 0
+SYMBOL_CACHE_SIZE = 0

 #---------------------------------------------------------------------------
 # Build related configuration options
@@ -452,7 +448,7 @@ GENERATE_TODOLIST = NO
 # disable (NO) the test list. This list is created by putting \test
 # commands in the documentation.

-GENERATE_TESTLIST = NO
+GENERATE_TESTLIST = YES

 # The GENERATE_BUGLIST tag can be used to enable (YES) or
 # disable (NO) the bug list. This list is created by putting \bug
@@ -491,7 +487,7 @@ SHOW_USED_FILES = YES
 # then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
 # in the documentation. The default is NO.

-#SHOW_DIRECTORIES = YES
+SHOW_DIRECTORIES = YES

 # Set the SHOW_FILES tag to NO to disable the generation of the Files page.
 # This will remove the Files entry from the Quick Index and from the
@@ -575,7 +571,7 @@ WARN_FORMAT = "$file:$line: $text"
 # and error messages should be written. If left blank the output is written
 # to stderr.

-WARN_LOGFILE = build/html/doxygen_warnings.log
+WARN_LOGFILE = doxygen_warnings.log

 #---------------------------------------------------------------------------
 # configuration options related to the input files
@@ -586,7 +582,7 @@ WARN_LOGFILE = build/html/doxygen_warnings.log
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.

-INPUT = htdocs scripts
+INPUT = ../../htdocs ../../scripts

 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -603,7 +599,6 @@ INPUT_ENCODING = UTF-8
 # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
 # *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90

-#FILE_PATTERNS = *.php *.pl *.sql *.example
 FILE_PATTERNS = *.php *.pl

 # The RECURSIVE tag can be used to turn specify whether or not subdirectories
@@ -616,7 +611,7 @@ RECURSIVE = YES
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.

-EXCLUDE = build dev doc document documents htdocs/conf/conf.php htdocs/custom htdocs/document htdocs/documents htdocs/includes htdocs/install/doctemplates
+EXCLUDE = ../../build ../../dev ../../doc ../../document ../../documents ../../htdocs/conf/conf.php ../../htdocs/custom ../../htdocs/document ../../htdocs/documents ../../htdocs/includes

 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or
 # directories that are symbolic links (a Unix filesystem feature) are excluded
@@ -630,7 +625,7 @@ EXCLUDE_SYMLINKS = YES
 # against the file with absolute path, so to exclude all test directories
 # for example use the pattern */test/*

-EXCLUDE_PATTERNS = */CVS/*
+EXCLUDE_PATTERNS = */CVS/* *google* *pibarcode*

 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
@@ -644,27 +639,27 @@ EXCLUDE_SYMBOLS =
 # directories that contain example code fragments that are included (see
 # the \include command).

-#EXAMPLE_PATH = htdocs/modulebuilder/template 
+EXAMPLE_PATH = ../../htdocs/modulebuilder/template 

 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
 # and *.h) to filter out the source-files in the directories. If left
 # blank all files are included.

-#EXAMPLE_PATTERNS = *.php
+EXAMPLE_PATTERNS = *.php

 # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
 # searched for input files to be used with the \include or \dontinclude
 # commands irrespective of the value of the RECURSIVE tag.
 # Possible values are YES and NO. If left blank NO is used.

-#EXAMPLE_RECURSIVE = NO
+EXAMPLE_RECURSIVE = NO

 # The IMAGE_PATH tag can be used to specify one or more files or
 # directories that contain image that are included in the documentation (see
 # the \image command).

-IMAGE_PATH = doc/images
+IMAGE_PATH = ../../doc/images

 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
@@ -767,7 +762,7 @@ ALPHABETICAL_INDEX = YES
 # the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
 # in which this list will be split (can be a number in the range [1..20])

-#COLS_IN_ALPHA_INDEX = 5
+COLS_IN_ALPHA_INDEX = 5

 # In case all classes in a project start with a common prefix, all
 # classes will be put under the same header in the alphabetical index.
@@ -780,16 +775,14 @@ IGNORE_PREFIX =
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------

-# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
-# The default value is: YES.
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# generate HTML output.

 GENERATE_HTML = YES

-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `html' will be used as the default path.

 HTML_OUTPUT = html

@@ -804,14 +797,14 @@ HTML_FILE_EXTENSION = .html
 # standard header.

 # Does not work with 1.7.3
-#HTML_HEADER = build/doxygen/doxygen_header.html
+#HTML_HEADER = doxygen_header.html

 # The HTML_FOOTER tag can be used to specify a personal HTML footer for
 # each generated HTML page. If it is left blank doxygen will generate a
 # standard footer.

 # Does not work with 1.7.3
-HTML_FOOTER = build/doxygen/doxygen_footer.html
+HTML_FOOTER = doxygen_footer.html

 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading
 # style sheet that is used by each HTML page. It can be used to
@@ -857,18 +850,7 @@ HTML_TIMESTAMP = YES
 # files or namespaces will be aligned in HTML using tables. If set to
 # NO a bullet list will be used.

-#HTML_ALIGN_MEMBERS = YES
-
-# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
-# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
-# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
-# like the Qt help browser.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_MENUS     = NO
+HTML_ALIGN_MEMBERS = YES

 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the
@@ -876,7 +858,7 @@ HTML_DYNAMIC_MENUS     = NO
 # JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
 # Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).

-HTML_DYNAMIC_SECTIONS = NO
+HTML_DYNAMIC_SECTIONS = YES

 # If the GENERATE_DOCSET tag is set to YES, additional index files
 # will be generated that can be used as input for Apple's Xcode 3
@@ -1021,7 +1003,7 @@ QHG_LOCATION =
 # the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
 # the help appears.

-GENERATE_ECLIPSEHELP = NO
+GENERATE_ECLIPSEHELP = YES

 # A unique identifier for the eclipse help plugin. When installing the plugin
 # the directory name containing the HTML and XML files should also have
@@ -1053,7 +1035,7 @@ GENERATE_TREEVIEW = NO
 # By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
 # and Class Hierarchy pages using a tree view instead of an ordered list.

-#USE_INLINE_TREES = NO
+USE_INLINE_TREES = NO

 # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
 # used to set the initial width (in pixels) of the frame in which the tree
@@ -1090,7 +1072,7 @@ FORMULA_TRANSPARENT = YES
 # typically be disabled. For large projects the javascript based search engine
 # can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.

-SEARCHENGINE = YES
+SEARCHENGINE = NO

 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
 # implemented using a PHP enabled web server instead of at the web client
@@ -1100,7 +1082,7 @@ SEARCHENGINE = YES
 # full text search. The disadvances is that it is more difficult to setup
 # and does not have live searching capabilities.

-SERVER_BASED_SEARCH = YES
+SERVER_BASED_SEARCH = NO

 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
@@ -1278,13 +1260,13 @@ XML_OUTPUT = xml
 # which can be used by a validating XML parser to check the
 # syntax of the XML files.

-#XML_SCHEMA = 
+XML_SCHEMA = 

 # The XML_DTD tag can be used to specify an XML DTD,
 # which can be used by a validating XML parser to check the
 # syntax of the XML files.

-#XML_DTD = 
+XML_DTD = 

 # If the XML_PROGRAMLISTING tag is set to YES Doxygen will
 # dump the program listings (including syntax highlighting
@@ -1449,7 +1431,7 @@ EXTERNAL_GROUPS = YES
 # The PERL_PATH should be the absolute path and name of the perl script
 # interpreter (i.e. the result of `which perl').

-#PERL_PATH = /usr/bin/perl
+PERL_PATH = /usr/bin/perl

 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
@@ -1471,7 +1453,7 @@ CLASS_DIAGRAMS = NO
 # the mscgen tool resides. If left empty the tool is assumed to be found in the
 # default search path.

-#MSCGEN_PATH = 
+MSCGEN_PATH = 

 # If set to YES, the inheritance and collaboration graphs will hide
 # inheritance and usage relations if the target is undocumented
@@ -1503,7 +1485,7 @@ DOT_NUM_THREADS = 0
 # DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
 # containing the font.

-#DOT_FONTNAME = FreeSans.ttf
+DOT_FONTNAME = FreeSans.ttf

 # The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
 # The default size is 10pt.
@@ -1652,7 +1634,3 @@ GENERATE_LEGEND = YES
 # the various graphs.

 DOT_CLEANUP = YES
-
-
-FULL_SIDEBAR = NO
-HTML_EXTRA_STYLESHEET = build/doxygen/doxygen-awesome.css
--- a/build/doxygen/doxygen-awesome.css
+++ b/build/doxygen/doxygen-awesome.css
--- a/build/doxygen/doxygen_header.html
+++ b/build/doxygen/doxygen_header.html
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>Dolibarr source code documentation</title>
+<title>$title</title>
 <!--  from dolibarr.org -->
 <meta http-equiv="Content-Type" content="text/html" charset=utf-8 />
 <meta name="verify-v1"
--- a/build/exe/doliwamp/.gitignore
+++ b/build/exe/doliwamp/.gitignore
@@ -1 +1 @@
-/doliwamp.tmp.iss*
+/doliwamp.tmp.iss
--- a/build/exe/doliwamp/Languages/MyCatalan.isl
+++ b/build/exe/doliwamp/Languages/MyCatalan.isl
@@ -43,5 +43,5 @@ DoliWampWillStartApacheMysql=L'instal·lador DoliWamp intentarà iniciar o reini
 OldVersionFoundAndMoveInNew=S'ha trobat una versió antiga de base de dades i ha estat moguda per a ser utilitzada per la nova versió de Dolibarr
 OldVersionFoundButFailedToMoveInNew=S'ha trobat una versió antiga de base de dades, però no es pot moure per a ser utilitzada per la nova versió de Dolibarr

-DLLMissing=La teva instal·lació windows no té el component "Microsoft Visual C++ Redistributable for Visual Studio 2017". Instal·la primer la versió de 32-bit (vcredist_x86.exe) (pots trobar-la a https://www.microsoft.com/en-us/download/) i reiniciar després la instal·lació/actualització de DoliWamp.
+DLLMissing=La teva instal·lació windows no té el component "Microsoft Visual C++ Redistributable for Visual Studio 2012". Instal·la primer la versió de 32-bit (vcredist_x86.exe) (pots trobar-la a https://www.microsoft.com/en-us/download/) i reiniciar després la instal·lació/actualització de DoliWamp.
 ContinueAnyway=Continua igualment (el procés d'instal·lació podria fallar sense aquest prerequisit)
--- a/build/exe/doliwamp/Languages/MyEnglish.isl
+++ b/build/exe/doliwamp/Languages/MyEnglish.isl
@@ -11,38 +11,38 @@ LaunchProgram=Launch %1
 AssocFileExtension=&Associate %1 with the %2 file extension
 AssocingFileExtension=Associating %1 with the %2 file extension...

-YouWillInstallDoliWamp=You will install DoliWamp (so Dolibarr plus all required third-party software like Apache, MySQL and PHP) on your computer.
-ThisAssistantInstallOrUpgrade=WARNING: Using an ERP CRM installed on a local computer can be dangerous: if your computer breaks down, you can lose all your data. Do this if you are ready to manage backups yourself seriously. If not, use an installation in SaaS instead (see https://saas.dolibarr.org).
-IfYouHaveTechnicalKnowledge=Moreover, if you have technical knowledge and want to manage Apache, MySQL and PHP yourself, you should not use this assistant and instead make a manual installation of Dolibarr on your existing server with Apache, MySQL and PHP.
-ButIfYouLook=But if you are looking for an automatic setup on your local computer, you're on the right path...
-DoYouWantToStart=Do you want to start the installation process?
+YouWillInstallDoliWamp=You will install DoliWamp (so Dolibarr + all required third party software like Apache, Mysql and PHP) on your computer.
+ThisAssistantInstallOrUpgrade=WARNING: Using an ERP CRM installed on a local computer can be dangerous: if your computer break down, you can lose all your data. Do this if you are ready to manage backup yourself seriously. If not, use an installation in Saas instead (see https://saas.dolibarr.org).
+IfYouHaveTechnicalKnowledge=Moreover, if you have technical knowledges and want to manage your Apache, Mysql and PHP yourself, you should not use this assistant and make a manual installation of Dolibarr on your existing server with Apache, Mysql and PHP.
+ButIfYouLook=But if you look for an automatic setup on your local computer, you''re on the good way...
+DoYouWantToStart=Do you want to start installation process ?

 TechnicalParameters=Technical parameters
-IfFirstInstall=If this is the first install, please specify some technical parameters. If you don't understand, are not sure, or are doing an upgrade, just keep the default values.
+IfFirstInstall=If first install, please specify some technical parameters. If you don't understand, are not sure, or are doing an upgrade, just leave the default values.

 ; WARNING !!! STRINGS HERE MUST BE LOWER THAN 60 CHARACTERS
-SMTPServer=SMTP server (your own or ISP SMTP server, first install only):
-ApachePort=Apache port (first install only, common choice is 80):
-MySqlPort=MySQL port (first install only, common choice is 3306):
-MySqlPassword=MySQL server and database password you want for root (first install only):
+SMTPServer=SMTP server (your own or ISP SMTP server, first install only) :
+ApachePort=Apache port (first install only, common choice is 80) :
+MySqlPort=MySql port (first install only, common choice is 3306) :
+MySqlPassword=MySql server and database password you want for root (first install only):

-FailedToDeleteLock=Failed to delete the file %1/www/dolibarr/install.lock. You can ignore this warning but you may have to remove the file manually later when asked. Click OK to continue...
+FailedToDeleteLock=Failed to delete the file %1/www/dolibarr/install.lock. You can ignore warning but you may have to remove it manually later when asked. Click OK to continue...

-PortAlreadyInUse=Port %1 seems to already be in use. You should cancel to go back and choose another value for %2 port. Cancel choice and choose another value?
+PortAlreadyInUse=Port %1 seems to be already in use. You should cancel to go back and choose another value for %2 port. Cancel choice and choose another value ?

-FirefoxDetected=Firefox has been detected on your computer. Would you like to use it as the default browser for Dolibarr?
-ChromeDetected=Chrome has been detected on your computer. Would you like to use it as the default browser for Dolibarr?
-MicrosoftEdgeDetected=Microsoft Edge has been detected on your computer. Would you like to use it as the default browser for Dolibarr?
-ChooseDefaultBrowser=Please choose your default browser (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...). If you are not sure, just click Open:
+FirefoxDetected=Firefox has been detected on your computer. Would you like to use it as the default browser for Dolibarr ?
+ChromeDetected=Chrome has been detected on your computer. Would you like to use it as the default browser for Dolibarr ?
+MicrosoftEdgeDetected=Microsoft Edge has been detected on your computer. Would you like to use it as the default browser for Dolibarr ?
+ChooseDefaultBrowser=Please choose your default browser (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...). If you are not sure, just click Open :

 LaunchNow=Launch Dolibarr now

-ProgramHasBeenRemoved=Dolibarr's program files have been removed. However, all your data files are still in directory %1. You must remove this directory manually for a complete uninstall.
+ProgramHasBeenRemoved=Dolibarr program files have been removed. However, all your data files are still in directory %1. You must remove this directory manually for a complete uninstall.

-DoliWampWillStartApacheMysql=DoliWamp installer will now start or restart Apache and MySQL. This may take from several seconds to one minute. Start to install or upgrade the web and database server required by Dolibarr?
+DoliWampWillStartApacheMysql=DoliWamp installer will now start or restart Apache and Mysql, this may last from several seconds to one minute after this confirmation. Start to install or upgrade the web and database server required by Dolibarr ?

-OldVersionFoundAndMoveInNew=An old database version has been found and moved to be used by the new Dolibarr version
-OldVersionFoundButFailedToMoveInNew=An old database version has been found but could not be moved to be used with the new Dolibarr version
+OldVersionFoundAndMoveInNew=An old database version has been found and moved to be used by new Dolibarr version
+OldVersionFoundButFailedToMoveInNew=An old database version has been found but could not be moved to be used with new Dolibarr version

-DLLMissing=Your Windows installation is missing The "Microsoft Visual C++ Redistributable for Visual Studio 2017" component. Please install the 32-bit version (vcredist_x86.exe) first (you can find it at https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170) and restart DoliWamp installation/upgrade after.
-ContinueAnyway=Continue anyway (install process may fail without this prerequisite)
+DLLMissing=Your Windows installation is missing The "Micrsoft Visual C++ Redistributable for Visual Studio 2012" component. Please install the 32-bit version (vcredist_x86.exe) first (you can find it at https://www.microsoft.com/en-us/download/) and restart DoliWamp installation/upgrade after.
+ContinueAnyway=Continue anyway (install process may fails without this prerequisite)
--- a/build/exe/doliwamp/Languages/MyFrench.isl
+++ b/build/exe/doliwamp/Languages/MyFrench.isl
@@ -44,5 +44,5 @@ DoliWampWillStartApacheMysql=L'installeur DoliWamp va maintenant d
 OldVersionFoundAndMoveInNew=Une ancienne version de base a <20>t<EFBFBD> trouv<75>e et d<>plac<61>e pour fonctionner avec la nouvelle version de Dolibarr.
 OldVersionFoundButFailedToMoveInNew=Une ancienne version de base a <20>t<EFBFBD> trouv<75>e mais ne peut <20>tre d<>plac<61>e pour <20>tre utilis<69>e avec la nouvelle version de Dolibarr.

-DLLMissing=L'installation de votre Windows est incompl<70>te. Il manque le composant "Micrsoft Visual C++ Redistributable for Visual Studio 2017". Installer la version 32-bit (vcredist_x86.exe) d'abord (vous pourrez le trouver <20> https://www.microsoft.com/fr-fr/download/) puis relancer l'installation de DoliWamp apr<70>s.
+DLLMissing=L'installation de votre Windows est incompl<70>te. Il manque le composant "Micrsoft Visual C++ Redistributable for Visual Studio 2012". Installer la version 32-bit (vcredist_x86.exe) d'abord (vous pourrez le trouver <20> https://www.microsoft.com/fr-fr/download/) puis relancer l'installation de DoliWamp apr<70>s.
 ContinueAnyway=Continuer malgr<67> tout (le process d'installaton <20>chouera)
--- a/build/exe/doliwamp/Languages/MyGerman.isl
+++ b/build/exe/doliwamp/Languages/MyGerman.isl
@@ -43,5 +43,5 @@ DoliWampWillStartApacheMysql=Die DoliWamp-Installation wird nun starten oder Apa
 OldVersionFoundAndMoveInNew=Eine alte Datenbankversion wurde gefunden und verschoben, um von der neuen Dolibarr-Version verwendet zu werden.
 OldVersionFoundButFailedToMoveInNew=Eine alte Datenbankversion wurde gefunden, konnte jedoch nicht verschoben werden, um mit der neuen Dolibarr-Version verwendet zu werden.

-DLLMissing=Your Windows installation is missing The "Micrsoft Visual C++ Redistributable for Visual Studio 2017" component. Please install the 32-bit version (vcredist_x86.exe) first (you can find it at https://www.microsoft.com/en-us/download/) and restart DoliWamp installation/upgrade after.
+DLLMissing=Your Windows installation is missing The "Micrsoft Visual C++ Redistributable for Visual Studio 2012" component. Please install the 32-bit version (vcredist_x86.exe) first (you can find it at https://www.microsoft.com/en-us/download/) and restart DoliWamp installation/upgrade after.
 ContinueAnyway=Fahren Sie trotzdem fort (der Installationsvorgang kann ohne diese Voraussetzung fehlschlagen).
--- a/build/exe/doliwamp/Languages/MySpanish.isl
+++ b/build/exe/doliwamp/Languages/MySpanish.isl
@@ -43,5 +43,5 @@ DoliWampWillStartApacheMysql=El instalador DoliWamp intentará iniciar o reinici
 OldVersionFoundAndMoveInNew=Se ha encontrado una versión antigua de base de datos y ha sido movida para ser utilizada por la nueva versión de Dolibarr
 OldVersionFoundButFailedToMoveInNew=Se ha encontrado una versión antigua de base de datos, pero no se pudo mover para ser utilizada por la nueva versión de Dolibarr
 	  	 
-DLLMissing=Su instalación Windows no tiene el componente "Microsoft Visual C++ Redistributable for Visual Studio 2017". Instale primero la versión de 32-bit (vcredist_x86.exe) (puedes encontrarlo en https://www.microsoft.com/en-us/download/) y reiniciar después la instalación/actualización de DoliWamp.
+DLLMissing=Su instalación Windows no tiene el componente "Microsoft Visual C++ Redistributable for Visual Studio 2012". Instale primero la versión de 32-bit (vcredist_x86.exe) (puedes encontrarlo en https://www.microsoft.com/en-us/download/) y reiniciar después la instalación/actualización de DoliWamp.
 ContinueAnyway=Continua igualmente (el proceso de instalación podría fallar sin este prerequisito)
--- a/build/exe/doliwamp/Makefile
+++ b/build/exe/doliwamp/Makefile
@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------#
-# Makefile to build UsedPort exe
+# Makefile
 #-------------------------------------------------------------------#
 # 1.0     Laurent Destailleur     Creation 
 #-------------------------------------------------------------------#
--- a/build/exe/doliwamp/README.md
+++ b/build/exe/doliwamp/README.md
@@ -9,5 +9,3 @@ The build of .exe files need to have some windows executable files already insta

 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).

-
-!!! See file ../makepack-howto.txt
--- a/build/exe/doliwamp/UsedPort.cpp
+++ b/build/exe/doliwamp/UsedPort.cpp
@@ -253,7 +253,6 @@ int main(int argc, char **argv)
 //----------------
 int noarg,curseurarg,help=0,invalide=0;
 char option;
-char *endptr;

 for (noarg=1;noarg<argc;noarg++) {
 	if (((argv[noarg][0])=='/') || ((argv[noarg][0])=='-')) {
@@ -262,7 +261,7 @@ for (noarg=1;noarg<argc;noarg++) {
 		if (strlen(argv[noarg]) < 3) { ++noarg; curseurarg=0; }
 		switch (option) {
 			case 's': strncpy(Host,argv[noarg]+curseurarg,sizeof(Host)); break;
-			case 'p': Port=strtol(argv[noarg] + curseurarg, &endptr, 10); break;					// Get port from "-p80" (curseurarg = 2) or "-p 80" (curseurarg = 0)
+			case 'p': Port=atoi(argv[noarg]+curseurarg); break;
 			case '?': help=-1;break;											// Help
 			case 'h': help=-1;break;											// Help
 			case 'v': help=-1;break;											// Help
@@ -271,20 +270,6 @@ for (noarg=1;noarg<argc;noarg++) {
 	}
 }

-// Check for conversion errors
-if (*endptr != '\0') {
-    // Handle error: Invalid input format
-    printf("Invalid port number format\n");
-    exit(-1);
-}
-
-// Check for overflow
-if (Port < 0 || Port > INT_MAX) {
-    // Handle error: Port number out of range
-    printf("Port number out of range\n");
-    exit(-1);
-}
-
 help=!(Port > 0);

 // Show usage
--- a/build/exe/doliwamp/config.inc.php.install
+++ b/build/exe/doliwamp/config.inc.php.install
@@ -1,4 +1,5 @@
 <?php
+
 /* !!! DO NOT EDIT THIS FILE, EDIT config.inc.php INSTEAD !!! */

 // vim: expandtab sw=4 ts=4 sts=4:
@@ -138,7 +139,7 @@ $cfg['UseDbSearch']             = TRUE;   // whether to enable the "database sea
 $cfg['IgnoreMultiSubmitErrors'] = FALSE;  // if set to true, PMA continues computing multiple-statement queries
                                          // even if one of the queries failed
 $cfg['VerboseMultiSubmit']      = TRUE;   // if set to true, PMA will show the affected rows of EACH statement on
-                                          // multiple-statement queries. See the libraries/import.php file for
+                                          // multiple-statement queries. See the libraries/import.php file for 
                                          // hardcoded defaults on how many queries a statement may contain!
 $cfg['AllowArbitraryServer']    = FALSE;  // allow login to any user entered server in cookie based auth

@@ -194,7 +195,7 @@ $cfg['CharEditing']           = 'input';
                                        //  textarea - allows newlines in fields
 $cfg['InsertRows']            = 2;      // How many rows can be inserted at one time

-$cfg['ForeignKeyDropdownOrder'] =       // Sort order for items in a foreign-key dropdown box.
+$cfg['ForeignKeyDropdownOrder'] =       // Sort order for items in a foreign-key dropdown box. 
    array( 'content-id', 'id-content'); // 'content' is the referenced data, 'id' is the key value.
 $cfg['ForeignKeyMaxLimit'] = 100;       // A dropdown will be used if fewer items are present

@@ -487,7 +488,7 @@ $cfg['ShowBrowseComments']  = TRUE;         // shows stored relation-comments in
 $cfg['ShowPropertyComments']= TRUE;         // shows stored relation-comments in 'table property' mode.
 $cfg['RepeatCells']         = 100;          // repeat header names every X cells? (0 = deactivate)

-$cfg['EditInWindow']        = TRUE;         // Set to TRUE if Edit link should open the query to edit in the query window (assuming Javascript is enabled), and to FALSE if we should edit in the right panel
+$cfg['EditInWindow']        = TRUE;         // Set to TRUE if Edit link should open the query to edit in the query window (assuming Javascript is enabled), and to FALSE if we should edit in the right panel 
 $cfg['QueryWindowWidth']    = 550;          // Width of Query window
 $cfg['QueryWindowHeight']   = 310;          // Height of Query window
 $cfg['QueryHistoryDB']      = FALSE;         // Set to TRUE if you want DB-based query history.
@@ -560,7 +561,7 @@ $cfg['SQLQuery']['Refresh']   = TRUE;       // Refresh the results page
 */
 $cfg['UploadDir']             = '';         // Directory for uploaded files that can be executed by
                                            // phpMyAdmin. For example './upload'. Leave empty for
-                                            // no upload directory support. Use %u for username
+                                            // no upload directory support. Use %u for username 
                                            // inclusion.
 $cfg['SaveDir']               = '';         // Directory where phpMyAdmin can save exported data on
                                            // server. For example './save'. Leave empty for no save
@@ -644,7 +645,7 @@ $cfg['ColumnTypes'] = array(
 );

 // Attributes
-// Note: the "ON UPDATE CURRENT_TIMESTAMP" attribute is added dynamically
+// Note: the "ON UPDATE CURRENT_TIMESTAMP" attribute is added dynamically 
 // for MySQL >= 4.1.2, in libraries/tbl_properties.inc.php

 $cfg['AttributeTypes'] = array(
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -24,14 +24,15 @@ OutputBaseFilename=__FILENAMEEXEDOLIWAMP__
 ;OutputManifestFile=build\doliwampbuild.log
 ; Define full path from which all relative path are defined
 ; You must modify this to put here your dolibarr root directory
+;SourceDir=Z:\home\ldestailleur\git\dolibarrxxx
 SourceDir=..\..\..
 AppId=doliwamp
-AppPublisher=DoliCloud
-AppPublisherURL=https://www.dolicloud.com
+AppPublisher=NLTechno
+AppPublisherURL=https://www.nltechno.com
 AppSupportURL=https://www.dolibarr.org
 AppUpdatesURL=https://www.dolibarr.org
 AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql software.
-AppCopyright=Copyright (C) 2008-2022 Laurent Destailleur (DoliCloud), Fabian Rodriguez (Le Goût du Libre)
+AppCopyright=Copyright (C) 2008-2020 Laurent Destailleur (NLTechno), Fabian Rodriguez (Le Goût du Libre)
 DefaultDirName=c:\dolibarr
 DefaultGroupName=Dolibarr
 ;LicenseFile=COPYING
@@ -80,7 +81,7 @@ Name: "desktopicon"; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:
 Name: "{app}\logs"
 Name: "{app}\tmp"
 Name: "{app}\dolibarr_documents"
-Name: "{app}\bin\apache\apache2.4.51\logs"
+Name: "{app}\bin\apache\apache2.4.41\logs"

 [Files]
 ; Stop/start
@@ -98,12 +99,19 @@ Source: "build\exe\doliwamp\startdoliwamp_manual_donotuse.bat.install"; DestDir:
 Source: "build\exe\doliwamp\builddemosslfiles.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversion;

-; Apache, Php, Mysql
+; PhpMyAdmin, Apache, Php, Mysql
 ; Put here path of Wampserver applications
-; Value OK: apache 2.4.51, php 7.4.26, mariadb10.6.5 (wampserver3.2.6_x64.exe)
-Source: "C:\wamp64\bin\apache\apache2.4.51\*.*"; DestDir: "{app}\bin\apache\apache2.4.51"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
-Source: "C:\wamp64\bin\php\php7.4.26\*.*"; DestDir: "{app}\bin\php\php7.4.26"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
-Source: "C:\wamp64\bin\mariadb\mariadb10.6.5\*.*"; DestDir: "{app}\bin\mariadb\mariadb10.6.5"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
+; Value OK: apache 2.2.6,  php 5.2.5 (5.2.11, 5.3.0 and 5.3.1 fails if php_exif, php_pgsql, php_zip is on), mysql 5.0.45
+; Value OK: apache 2.2.11, php 5.3.0 (if no php_exif, php_pgsql, php_zip), mysql 5.0.45
+; Value OK: apache 2.4.9,  php 5.5.12, mysql 5.0.45 instead of 5.6.17 (wampserver2.5-Apache-2.4.9-Mysql-5.6.17-php5.5.12-32b.exe)
+; Value OK: apache 2.4.41, php 7.3.12, mariadb10.4.10 (wampserver3.2.0_x64.exe)
+Source: "C:\wamp64\apps\phpmyadmin4.9.2\*.*"; DestDir: "{app}\apps\phpmyadmin4.9.2"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log,darkblue_orange"
+;Source: "C:\Program Files\Wamp\bin\apache\apache2.4.9\*.*"; DestDir: "{app}\bin\apache\apache2.4.9"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
+Source: "C:\wamp64\bin\apache\apache2.4.41\*.*"; DestDir: "{app}\bin\apache\apache2.4.41"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
+;Source: "C:\Program Files\Wamp\bin\php\php5.5.12\*.*"; DestDir: "{app}\bin\php\php5.5.12"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
+Source: "C:\wamp64\bin\php\php7.3.12\*.*"; DestDir: "{app}\bin\php\php7.3.12"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
+;Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
+Source: "C:\wamp64\bin\mariadb\mariadb10.4.10\*.*"; DestDir: "{app}\bin\mariadb\mariadb10.4.10"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"

 ; Mysql data files (does not overwrite if exists)
 ; We must copy them because the tool mysql_install_db.exe to generate them at first install does not return to prompt so make install hang
@@ -117,11 +125,15 @@ Source: "scripts\*.*"; DestDir: "{app}\www\dolibarr\scripts"; Flags: ignoreversi
 Source: "*.*"; DestDir: "{app}\www\dolibarr"; Flags: ignoreversion; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,default.properties,install.lock"

 ; Config files
+Source: "build\exe\doliwamp\phpmyadmin.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\dolibarr.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.4.51\conf"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\config.inc.php.install"; DestDir: "{app}\apps\phpmyadmin4.1.14"; Flags: ignoreversion;
+;Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.4.9\conf"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.4.41\conf"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mariadb\mariadb10.6.5"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php7.4.26"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mariadb\mariadb10.4.10"; Flags: ignoreversion;
+;Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php5.5.12"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php7.3.12"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\index.php.install"; DestDir: "{app}\www"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\install.forced.php.install"; DestDir: "{app}\www\dolibarr\htdocs\install"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\openssl.conf"; DestDir: "{app}"; Flags: ignoreversion;
@@ -184,6 +196,7 @@ var destFileA: String;
 var srcContents: String;
 var browser: String;
 var mysqlVersion: String;
+var phpmyadminVersion: String;
 var phpDllCopy: String;
 var batFile: String;

@@ -227,9 +240,13 @@ procedure InitializeWizard();
 begin

  //version des applis, a modifier pour chaque version de WampServer 2
-  apacheVersion := '2.4.51';
-  phpVersion := '7.4.26' ;
-  mysqlVersion := '10.6.5';
+  //apacheVersion := '2.4.9';
+  //phpVersion := '5.5.12' ;
+  apacheVersion := '2.4.41';
+  phpVersion := '7.3.12' ;
+  //mysqlVersion := '5.0.45';
+  mysqlVersion := '10.4.10';
+  phpmyadminVersion := '4.1.14';

  smtpServer := 'localhost';
  apachePort := '80';
@@ -363,9 +380,9 @@ begin

 	
 	// Migration of database
-//	datadir := pathWithSlashes+'/bin/mariadb/mariadb10.6.5/data';
-//    exedirold := pathWithSlashes+'/bin/mariadb/mariadb10.6.5/';
-//    exedirnew := pathWithSlashes+'/bin/mariadb/mariadb10.6.5/';
+//	datadir := pathWithSlashes+'/bin/mariadb/marradb10.4.10/data';
+//    exedirold := pathWithSlashes+'/bin/mariadb/marradb10.4.10/';
+//    exedirnew := pathWithSlashes+'/bin/mariadb/marradb10.4.10/';
 		
    // If we have a new database version, we should only copy old my.ini file into new directory
    // and change only all basedir= strings to use new version. Like this, data dir is still correct.
@@ -582,17 +599,6 @@ begin
 		    end;
 		  end;

-	      if browser = 'iexplore.exe' then
-	      begin
-		    if FileExists (pfPath+'/Microsoft/Edge/Application/msedge.exe')  then
-		    begin
-		      if MsgBox(CustomMessage('MicrosoftEdgeDetected'),mbConfirmation,MB_YESNO) = IDYES then
-		      begin
-		        browser := pfPath+'/Microsoft/Edge/Application/msedge.exe';
-		      end;
-		    end;
-		  end;
-
 	      if browser = 'iexplore.exe' then
 	      begin
            if FileExists (pfPath+'/Internet Explorer/iexplore.exe')  then
@@ -629,6 +635,27 @@ begin
      begin

 		
+		    //----------------------------------------------
+		    // Create file alias phpmyadmin (always)
+		    //----------------------------------------------
+		
+		    destFile := pathWithSlashes+'/alias/phpmyadmin.conf';
+		    srcFile := pathWithSlashes+'/alias/phpmyadmin.conf.install';
+		
+		    if FileExists(srcFile) then
+		    begin
+		      LoadStringFromFile (srcFile, srcContents);
+		
+		      //installDir et version de phpmyadmin
+		      StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
+		      StringChangeEx (srcContents, 'WAMPPHPMYADMINVERSION', phpmyadminVersion, True);
+		
+		      SaveStringToFile(destFile,srcContents, False);
+		    end;
+		    DeleteFile(srcFile);
+		
+		
+		
 		    //----------------------------------------------
 		    // Create file alias dolibarr (if not exists)
 		    //----------------------------------------------
@@ -664,6 +691,35 @@ begin
 		
 		
 		
+		    //----------------------------------------------
+		    // Create file configuration for phpmyadmin (if not exists)
+		    //----------------------------------------------
+		
+		    destFile := pathWithSlashes+'/apps/phpmyadmin'+phpmyadminVersion+'/config.inc.php';
+		    srcFile := pathWithSlashes+'/apps/phpmyadmin'+phpmyadminVersion+'/config.inc.php.install';
+		
+		    if FileExists(srcFile) then
+		    begin
+	  	      if not FileExists (destFile) then
+		      begin
+	            LoadStringFromFile (srcFile, srcContents);
+	            StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
+	            StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
+	            SaveStringToFile(destFile,srcContents, False);
+		      end
+		      else
+		      begin
+		        // We must replace to use format 2.4 of apache
+	            DeleteFile(destFile);
+	            LoadStringFromFile (srcFile, srcContents);
+	            StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
+	            StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
+	            SaveStringToFile(destFile,srcContents, False);
+		      end;
+		    end;
+		
+		
+		
 		    //----------------------------------------------
 		    // Create file httpd.conf (if not exists)
 		    //----------------------------------------------
@@ -1026,7 +1082,7 @@ Filename: "{app}\rundoliwamp.bat"; Description: {cm:LaunchNow}; Flags: shellexec

 [UninstallDelete]
 Type: files; Name: "{app}\*.*"
-Type: files; Name: "{app}\bin\mariadb\mariadb10.6.5\*.*"
+Type: files; Name: "{app}\bin\mariadb\mariadb10.4.10\*.*"
 Type: filesandordirs; Name: "{app}\alias"
 Type: filesandordirs; Name: "{app}\apps"
 Type: filesandordirs; Name: "{app}\bin\apache"
--- a/build/exe/doliwamp/index.php.install
+++ b/build/exe/doliwamp/index.php.install
@@ -3,7 +3,7 @@
 // Page created by Shepard [Fabian Pijcke] <Shepard8@laposte.net>
 // Arno Esterhuizen <arno.esterhuizen@gmail.com>
 // and Romain Bourdon <romain@anaska.com>
-//
+//  
 // icones by Mark James <http://www.famfamfam.com/lab/icons/silk/>
 //
 // Modified from WampServer project by Laurent Destailleur (NLTechno)
@@ -260,7 +260,7 @@ if (isset($_GET['askhelp']))
 // Show PHPInfo
 if (isset($_GET['phpinfo']))
 {
-	phpinfo(INFO_GENERAL|INFO_MODULES);
+	phpinfo();
 	exit();
 }

@@ -274,27 +274,27 @@ if (isset($_GET['img']))
        header("Content-type: image/png");
        echo base64_decode($pngFolder);
        exit();
-
+        
        case 'pngFolderGo' :
        header("Content-type: image/png");
        echo base64_decode($pngFolderGo);
        exit();
-
+        
        case 'pngLogo' :
        header("Content-type: image/png");
        echo base64_decode($pngLogo);
        exit();
-
+        
        case 'pngPlugin' :
        header("Content-type: image/png");
        echo base64_decode($pngPlugin);
        exit();
-
+        
        case 'pngWrench' :
        header("Content-type: image/png");
        echo base64_decode($pngWrench);
        exit();
-
+        
        case 'favicon' :
        header("Content-type: image/x-icon");
        echo base64_decode($favicon);
@@ -304,15 +304,22 @@ if (isset($_GET['img']))



-// Definition of language and texts
+// Definition de la langue et des textes 

-if (isset ($_GET['lang'])) {
-	$langue = preg_replace('/[^a-z_]/i', '', $_GET['lang']);
-} elseif (preg_match("/^fr/", $_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+if (isset ($_GET['lang']))
+{
+	$langue = $_GET['lang'];
+}
+elseif (preg_match("/^fr/", $_SERVER['HTTP_ACCEPT_LANGUAGE']))
+{
 	$langue = 'fr';
-} elseif (preg_match("/^es/", $_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+}
+elseif (preg_match("/^es/", $_SERVER['HTTP_ACCEPT_LANGUAGE']))
+{
 	$langue = 'es';
-} else {
+}
+else
+{
 	$langue = 'en';
 }

@@ -320,27 +327,31 @@ if (isset ($_GET['lang'])) {
 // Read PHP extensions
 $loaded_extensions = get_loaded_extensions();
 $phpExtContents='';
-foreach ($loaded_extensions as $extension) {
+foreach ($loaded_extensions as $extension)
 	$phpExtContents .= "<li>${extension}</li>";
-}


+	
 // Read alias directory
 $listoffile=array();
 $aliasarray=array();
 $aliasContents='';
-if (is_dir($aliasDir)) {
+if (is_dir($aliasDir))
+{
    $handle=opendir($aliasDir);
-    if (is_resource($handle)) {
-        while ($file = readdir($handle)) {
+    if (is_resource($handle))
+    {
+        while ($file = readdir($handle)) 
+        {
    		$listoffiles[]=$file;
    	}
    }
 	sort($listoffiles);
-
-	foreach($listoffiles as $file) {
+	
+	foreach($listoffiles as $file) 
+	{
 	    if (is_file($aliasDir.$file) && preg_match('/\.conf/',$file))
-	    {
+	    {		
 		    $msg = '';

 			$aliasContents.='<tr><td><ul class="aliases">';
@@ -350,7 +361,7 @@ if (is_dir($aliasDir)) {
 			if (preg_match('/dolibarr/i',$file)) $aliasContents .= $file.'</a></li></ul></td><td>http://localhost'.($apachePort != 80?':'.$apachePort:'').'/'.$file.'/</td><td>http://<i>ipofyourserver</i>'.($apachePort != 80?':'.$apachePort:'').'/'.$file.'/</td></tr>';
 			elseif (preg_match('/phpmyadmin/i',$file)) $aliasContents .= $file.'</a></li></ul></td><td>http://localhost'.($apachePort != 80?':'.$apachePort:'').'/'.$file.'/</td><td>'.$langues[$langue]['NotAvailable'].'</td></tr>';
 			else $aliasContents .= $file.'</a></li></ul></td> <td> </td><td>'.$langues[$langue]['NotAvailable'].'</td></tr>';
-
+			
 			$aliasarray[]=$file;
 	    }
    }
@@ -358,35 +369,37 @@ if (is_dir($aliasDir)) {
 }
 if (!isset($aliasContents))
 	$aliasContents = '<tr><td colspan="3">'.$langues[$langue]['txtNoAlias'].'</td></tr>';
-
+	

 // Read projects in www dir
 $listoffiles=array();
 $handle=opendir(".");
-if (is_resource($handle)) {
-    while ($file = readdir($handle))
+if (is_resource($handle))
+{
+    while ($file = readdir($handle)) 
    {
    	$listoffiles[]=$file;
    }
    closedir($handle);
 }

-foreach($listoffiles as $file) {
-	if (is_dir($file) && !in_array($file,$projectsListIgnore) && !in_array($file,$aliasarray))
-	{
+foreach($listoffiles as $file)
+{
+	if (is_dir($file) && !in_array($file,$projectsListIgnore) && !in_array($file,$aliasarray)) 
+	{		
 		$projectContents .= '<tr><td><ul class="projects">';
-
+		
 		$projectContents .= '<li><a href="'.$file.'/">';
 		$projectContents .= $file.'</a>';
 		$projectContents .= '</li>';
-
+		
 		$projectContents .= '</ul></td><td>http://localhost'.($apachePort != 80?':'.$apachePort:'').'/'.$file.'/)'.'</td><td>'.$langues[$langue]['NotAvailable'].'</td></tr>';
 	}
 }

-if (!isset($projectContents)) {
+if (!isset($projectContents))
 	$projectContents = '<tr><td colspan="3">'.$langues[$langue]['txtNoProjet'].'</td></tr>';
-}
+


 $nameServer=getenv("COMPUTERNAME");
@@ -509,7 +522,7 @@ a:hover {
 	font-size: 0.85em;
 }
 </style>
-
+    
 	<link rel="shortcut icon" href="index.php?img=favicon" type="image/ico" />
 </head>

@@ -533,7 +546,7 @@ a:hover {
 		<dd>${apacheVersion} &nbsp;</dd>
 		<dt>{$langues[$langue]['versp']}</dt>
 		<dd>${phpVersion} &nbsp;</dd>
-		<dt>{$langues[$langue]['phpExt']}</dt>
+		<dt>{$langues[$langue]['phpExt']}</dt> 
 		<dd>
 			<ul>
 			${phpExtContents}
@@ -554,8 +567,8 @@ a:hover {
 	</td><td valign="middle">
 	{$langues[$langue]['FromInternet']}
 	</td></tr>
-	${aliasContents}
-	${projectContents}
+	${aliasContents}			
+	${projectContents}			
 	</table>

 	<h2>{$langues[$langue]['titrePage']}</h2>
--- a/build/exe/doliwamp/php.ini.install
+++ b/build/exe/doliwamp/php.ini.install
@@ -251,7 +251,7 @@ safe_mode_protected_env_vars = LD_LIBRARY_PATH
 ; and below.  This directive makes most sense if used in a per-directory
 ; or per-virtualhost web server configuration file. This directive is
 ; *NOT* affected by whether Safe Mode is turned On or Off.
-open_basedir = "WAMPROOT;C:\WINDOWS\TEMP"
+open_basedir = "WAMPROOT"

 ; This directive allows you to disable certain functions for security reasons.
 ; It receives a comma-delimited list of function names. This directive is
--- a/build/generate_filelist_xml.php
+++ b/build/generate_filelist_xml.php
@@ -22,18 +22,16 @@
 * 		\brief      This script create a xml checksum file
 */

-if (!defined('NOREQUIREDB')) {
-	define('NOREQUIREDB', '1');	// Do not create database handler $db
-}
+if (! defined('NOREQUIREDB')) define('NOREQUIREDB', '1');	// Do not create database handler $db

 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path = dirname(__FILE__).'/';
+$path=dirname(__FILE__).'/';

 // Test if batch mode
 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);
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    exit;
 }

 require_once $path."../htdocs/master.inc.php";
@@ -44,85 +42,71 @@ require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
 * Main
 */

-$includecustom = 0;
-$includeconstants = array();
-$buildzip = 0;
+$includecustom=0;
+$includeconstants=array();

 if (empty($argv[1])) {
-	print "Usage:   ".$script_file." release=autostable|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";
-	exit(1);
+    print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\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";
+    exit -1;
 }

+parse_str($argv[1]);

-$i = 0;
+$i=0;
 $result = array();
 while ($i < $argc) {
 	if (!empty($argv[$i])) {
 		parse_str($argv[$i], $result);	// set all params $release, $includecustom, $includeconstant, $buildzip ...
 	}
-	if (!empty($result["release"])) {
-		$release = $result["release"];
-	}
-	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;
-		}
-		$includeconstants[$tmp[0]][$tmp[1]] = $tmp[2];
-	}
-	$i++;
+	if (preg_match('/includeconstant=/', $argv[$i])) {
+    	$tmp=explode(':', $includeconstant, 3);			// $includeconstant has been set with previous parse_str()
+        if (count($tmp) != 3) {
+        	print "Error: Bad parameter includeconstant=".$includeconstant."\n";
+            exit -1;
+        }
+        $includeconstants[$tmp[0]][$tmp[1]] = $tmp[2];
+    }
+    $i++;
 }

 if (empty($release)) {
-	print "Error: Missing release parameter\n";
-	print "Usage: ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
-	exit(2);
+    print "Error: Missing release paramater\n";
+    print "Usage: ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
+    exit -1;
 }

 $savrelease = $release;

 // If release is auto, we take current version
-$tmpver = explode('-', $release, 2);
+$tmpver=explode('-', $release, 2);
 if ($tmpver[0] == 'auto' || $tmpver[0] == 'autostable') {
-	$release = DOL_VERSION;
-	if ($tmpver[1] && $tmpver[0] == 'auto') {
-		$release .= '-'.$tmpver[1];
-	}
+    $release=DOL_VERSION;
+    if ($tmpver[1] && $tmpver[0] == 'auto') $release.='-'.$tmpver[1];
 }

 if (empty($includecustom)) {
-	$tmpverbis = explode('-', $release, 2);
-	if (empty($tmpverbis[1]) || $tmpver[0] == 'autostable') {
-		if (DOL_VERSION != $tmpverbis[0] && $savrelease != 'auto') {
-			print 'Error: When parameter "includecustom" is not set and there is no suffix in release parameter, version declared into filefunc.in.php ('.DOL_VERSION.') must be exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
-			print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
-			exit(3);
-		}
-	} else {
-		$tmpverter = explode('-', DOL_VERSION, 2);
-		if ($tmpverter[0] != $tmpverbis[0]) {
-			print 'Error: When parameter "includecustom" is not set, version declared into filefunc.in.php ('.DOL_VERSION.') must have value without prefix ('.$tmpverter[0].') that is exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
-			print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
-			exit(4);
-		}
-	}
+    $tmpverbis=explode('-', $release, 2);
+    if (empty($tmpverbis[1]) || $tmpver[0] == 'autostable') {
+        if (DOL_VERSION != $tmpverbis[0] && $savrelease != 'auto') {
+            print 'Error: When parameter "includecustom" is not set and there is no suffix in release parameter, version declared into filefunc.in.php ('.DOL_VERSION.') must be exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
+            print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
+            exit -1;
+        }
+    } else {
+        $tmpverter=explode('-', DOL_VERSION, 2);
+        if ($tmpverter[0] != $tmpverbis[0]) {
+            print 'Error: When parameter "includecustom" is not set, version declared into filefunc.in.php ('.DOL_VERSION.') must have value without prefix ('.$tmpverter[0].') that is exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
+            print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
+            exit -1;
+        }
+    }
 } else {
-	if (!preg_match('/'.preg_quote(DOL_VERSION, '/').'-/', $release)) {
-		print 'Error: When parameter "includecustom" is set, version declared into filefunc.inc.php ('.DOL_VERSION.') must be used with a suffix into "release" parameter (ex: '.DOL_VERSION.'-mydistrib).'."\n";
-		print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
-		exit(5);
-	}
+    if (! preg_match('/'.preg_quote(DOL_VERSION, '/').'-/', $release)) {
+        print 'Error: When parameter "includecustom" is set, version declared into filefunc.inc.php ('.DOL_VERSION.') must be used with a suffix into "release" parameter (ex: '.DOL_VERSION.'-mydistrib).'."\n";
+        print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
+        exit -1;
+    }
 }

 print "Working on files into          : ".DOL_DOCUMENT_ROOT."\n";
@@ -130,37 +114,37 @@ print "Release                        : ".$release."\n";
 print "Include custom in signature    : ".$includecustom."\n";
 print "Include constants in signature : ";
 foreach ($includeconstants as $countrycode => $tmp) {
-	foreach ($tmp as $constname => $constvalue) {
-		print $constname.'='.$constvalue." ";
-	}
+    foreach ($tmp as $constname => $constvalue) {
+        print $constname.'='.$constvalue." ";
+    }
 }
 print "\n";

 //$outputfile=dirname(__FILE__).'/../htdocs/install/filelist-'.$release.'.xml';
-$outputdir = dirname(dirname(__FILE__)).'/htdocs/install';
-print 'Delete current files '.$outputdir.'/filelist*.xml*'."\n";
-dol_delete_file($outputdir.'/filelist*.xml*', 0, 1, 1);
+$outputdir=dirname(dirname(__FILE__)).'/htdocs/install';
+print 'Delete current files '.$outputdir.'/filelist*.xml'."\n";
+dol_delete_file($outputdir.'/filelist*.xml', 0, 1, 1);

-$checksumconcat = array();
+$checksumconcat=array();

-$outputfile = $outputdir.'/filelist-'.$release.'.xml';
+$outputfile=$outputdir.'/filelist-'.$release.'.xml';
 $fp = fopen($outputfile, 'w');
 if (empty($fp)) {
 	print 'Failed to open file '.$outputfile."\n";
-	exit(6);
+	exit(-1);
 }

 fputs($fp, '<?xml version="1.0" encoding="UTF-8" ?>'."\n");
 fputs($fp, '<checksum_list version="'.$release.'" date="'.dol_print_date(dol_now(), 'dayhourrfc').'" generator="'.$script_file.'">'."\n");

 foreach ($includeconstants as $countrycode => $tmp) {
-	fputs($fp, '<dolibarr_constants country="'.$countrycode.'">'."\n");
-	foreach ($tmp as $constname => $constvalue) {
-		$valueforchecksum = (empty($constvalue) ? '0' : $constvalue);
-		$checksumconcat[] = $valueforchecksum;
-		fputs($fp, '    <constant name="'.$constname.'">'.$valueforchecksum.'</constant>'."\n");
-	}
-	fputs($fp, '</dolibarr_constants>'."\n");
+    fputs($fp, '<dolibarr_constants country="'.$countrycode.'">'."\n");
+    foreach ($tmp as $constname => $constvalue) {
+        $valueforchecksum=(empty($constvalue)?'0':$constvalue);
+        $checksumconcat[]=$valueforchecksum;
+        fputs($fp, '    <constant name="'.$constname.'">'.$valueforchecksum.'</constant>'."\n");
+    }
+    fputs($fp, '</dolibarr_constants>'."\n");
 }

 fputs($fp, '<dolibarr_htdocs_dir includecustom="'.$includecustom.'">'."\n");
@@ -170,30 +154,29 @@ $iterator1 = new RecursiveIteratorIterator($dir_iterator1);
 // Need to ignore document custom etc. Note: this also ignore natively symbolic links.
 $files = new RegexIterator($iterator1, '#^(?:[A-Z]:)?(?:/(?!(?:'.($includecustom?'':'custom\/|').'documents\/|conf\/|install\/))[^/]+)+/[^/]+\.(?:php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$#i');
 */
-// 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
+$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|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
 $files = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude, 'fullname');

-$dir = '';
-$needtoclose = 0;
+$dir='';
+$needtoclose=0;
 foreach ($files as $filetmp) {
-	$file = $filetmp['fullname'];
-	//$newdir = str_replace(dirname(__FILE__).'/../htdocs', '', dirname($file));
-	$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
-	if ($newdir != $dir) {
-		if ($needtoclose) {
-			fputs($fp, '  </dir>'."\n");
-		}
-		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");
-	}
+    $file = $filetmp['fullname'];
+    //$newdir = str_replace(dirname(__FILE__).'/../htdocs', '', dirname($file));
+    $newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
+    if ($newdir!=$dir) {
+    	if ($needtoclose) {
+            fputs($fp, '  </dir>'."\n");
+    	}
+        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");
+    }
 }
 fputs($fp, '  </dir>'."\n");
 fputs($fp, '</dolibarr_htdocs_dir>'."\n");
@@ -205,7 +188,7 @@ fputs($fp, md5(join(',', $checksumconcat))."\n");
 fputs($fp, '</dolibarr_htdocs_dir_checksum>'."\n");


-$checksumconcat = array();
+$checksumconcat=array();

 fputs($fp, '<dolibarr_script_dir version="'.$release.'">'."\n");

@@ -215,29 +198,28 @@ $iterator2 = new RecursiveIteratorIterator($dir_iterator2);
 // Need to ignore document custom etc. Note: this also ignore natively symbolic links.
 $files = new RegexIterator($iterator2, '#^(?:[A-Z]:)?(?:/(?!(?:custom|documents|conf|install))[^/]+)+/[^/]+\.(?:php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$#i');
 */
-$regextoinclude = '\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
-$regextoexclude = '(custom|documents|conf|install)$';  // Exclude dirs
+$regextoinclude='\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
+$regextoexclude='(custom|documents|conf|install)$';  // Exclude dirs
 $files = dol_dir_list(dirname(__FILE__).'/../scripts/', 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
-$dir = '';
-$needtoclose = 0;
+$dir='';
+$needtoclose=0;
 foreach ($files as $filetmp) {
-	$file = $filetmp['fullname'];
-	//$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
-	$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
-	$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
-	if ($newdir != $dir) {
-		if ($needtoclose) {
-			fputs($fp, '  </dir>'."\n");
-		}
-		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");
-	}
+    $file = $filetmp['fullname'];
+    //$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
+    $newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
+    $newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
+    if ($newdir!=$dir) {
+        if ($needtoclose)
+            fputs($fp, '  </dir>'."\n");
+        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");
+    }
 }
 fputs($fp, '  </dir>'."\n");
 fputs($fp, '</dolibarr_script_dir>'."\n");
@@ -250,22 +232,6 @@ fputs($fp, '</dolibarr_script_dir_checksum>'."\n");
 fputs($fp, '</checksum_list>'."\n");
 fclose($fp);

-if (empty($buildzip)) {
-	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";
-		}
-	} 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." generated\n";

 exit(0);
--- a/build/launchpad/README
+++ b/build/launchpad/README
@@ -49,7 +49,7 @@ If you want to build/test package locally:
    Use URL pattern (stable):
    For stable: http://www.dolibarr.org/files/lastbuild/package_debian-ubuntu/dolibarr_x.z.*.tar.gz
    
- For Dev, you can also add link series to GIT HEAD.
+- For Dev, you can also add link serie to GIT HEAD.
 - For stable, you can init from command line
 	cd bzr/dolibarr-stable
    bzr init
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -2,7 +2,7 @@
 #----------------------------------------------------------------------------
 # \file         build/makepack-dolibarr.pl
 # \brief        Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
-# \author       (c)2004-2023 Laurent Destailleur  <eldy@users.sourceforge.net>
+# \author       (c)2004-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
 #
 # This is list of constant you can set to have generated packages moved into a specific dir: 
 #DESTIBETARC='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/lastbuild'
@@ -65,7 +65,7 @@ $DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/;

 $SOURCE="$DIR/..";
 $DESTI="$SOURCE/build";
-if ($SOURCE !~ /^\// && $SOURCE !~ /^[a-z]:/i)
+if ($SOURCE !~ /^\//)
 {
 	print "Error: Launch the script $PROG.$Extension with its full path from /.\n";
 	print "$PROG.$Extension aborted.\n";
@@ -76,23 +76,15 @@ if (! $ENV{"DESTIBETARC"} || ! $ENV{"DESTISTABLE"})
 {
 	print "Error: Missing environment variables.\n";
 	print "You must define the environment variable DESTIBETARC and DESTISTABLE to point to the\ndirectories where you want to save the generated packages.\n";
-	print "$PROG.$Extension aborted.\n";
-	print "\n";
-	print "You can set them with\n";
-	print "On Linux:\n";
-	print "export DESTIBETARC='/tmp'; export DESTISTABLE='/tmp';\n";
-	print "On Windows:\n";
-	print "set DESTIBETARC=c:/tmp\n";
-	print "set DESTISTABLE=c:/tmp\n";
-	print "\n";
 	print "Example: DESTIBETARC='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/lastbuild'\n";
 	print "Example: DESTISTABLE='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/stable'\n";
+	print "$PROG.$Extension aborted.\n";
 	sleep 2;
 	exit 1;
 }
 if (! -d $ENV{"DESTIBETARC"} || ! -d $ENV{"DESTISTABLE"})
 {
-	print "Error: Directory of environment variable DESTIBETARC ($ENV{'DESTIBETARC'}) or DESTISTABLE ($ENV{'DESTISTABLE'}) does not exist.\n";
+	print "Error: Directory of environment variable DESTIBETARC or DESTISTABLE does not exist.\n";
 	print "$PROG.$Extension aborted.\n";
 	sleep 2;
 	exit 1;
@@ -102,7 +94,7 @@ if (! -d $ENV{"DESTIBETARC"} || ! -d $ENV{"DESTISTABLE"})
 # --------------
 if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS='linux'; $CR=''; }
 elsif (-d "/etc" && -d "/Users") { $OS='macosx'; $CR=''; }
-elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i || "$^O" =~ /msys/i) { $OS='windows'; $CR="\r"; }
+elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i) { $OS='windows'; $CR="\r"; }
 if (! $OS) {
 	print "Error: Can't detect your OS.\n";
 	print "Can't continue.\n";
@@ -369,12 +361,12 @@ if ($nboftargetok) {
 		}
 		if (! $BUILD || $BUILD eq '0-rc')	# For a major version
 		{
-			print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log `git rev-list --boundary '.$MAJOR.'.'.$MINOR.'..origin/develop | grep ^- | cut -c2- | head -n 1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\|PERF\|SEC\|QUAL\|CLOSE\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/CLOSE/NEW/g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
+			print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log `git rev-list --boundary '.$MAJOR.'.'.$MINOR.'..origin/develop | grep ^- | cut -c2- | head -n 1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\|CLOSE\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/CLOSE/NEW/g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
 		}
 		else			# For a maintenance release
 		{
-			#print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-1).'.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\|PERF\|SEC\|QUAL\|CLOSE\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/CLOSE/NEW/g\'| sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
-			print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-1).'.. | grep -v "Merge branch" | grep -v "Merge pull" | grep "^ " | sed -e "s/^[0-9a-z]* *//" | grep -e \'^FIX\|NEW\|PERF\|SEC\|QUAL\|CLOSE\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/CLOSE/NEW/g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
+			#print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-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/CLOSE/NEW/g\'| sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
+			print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-1).'.. | grep -v "Merge branch" | grep -v "Merge pull" | grep "^ " | sed -e "s/^[0-9a-z]* *//" | grep -e \'^FIX\|NEW\|CLOSE\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/CLOSE/NEW/g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
 		}
 		print "\n";
 		if (! $ret)
@@ -398,7 +390,7 @@ if ($nboftargetok) {
 		$olddir=getcwd();
 		chdir("$SOURCE");
 		
-		print "Clean $SOURCE/htdocs/includes/autoload.php\n";
+		print "Clean $SOURCE/htdocs\n";
 		$ret=`rm -f  $SOURCE/htdocs/includes/autoload.php`;
 		
 		$ret=`git ls-files . --exclude-standard --others`;
@@ -507,9 +499,8 @@ if ($nboftargetok) {
 		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/cache.manifest`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
-		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.nova*`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
-		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.pgsql`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;

 		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mssql/README`;
@@ -524,13 +515,12 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/ansible`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/codesniffer`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/codetemplates`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/examples/ldap`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/examples/zapier`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/dbmodel`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/initdata`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/initdemo`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/resources/dbmodel`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/resources/iso-normes`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/resources/licence`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/iso-normes`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/ldap`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/mail`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/multitail`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/phpcheckstyle`;
@@ -538,8 +528,6 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/security`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/tools/php-cs-fixer/vendor`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/tools/rector/vendor`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/uml`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/vagrant`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/xdebug`;
@@ -583,7 +571,6 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/factory*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/forceproject*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/lead*`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/langs/*/README.md`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/management*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/multicompany*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/ndf*`;
@@ -595,7 +582,9 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/timesheet*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/webmail*`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/common/fontawesome-5/svgs`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/oblyon*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/allscreen*`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/theme/common/octicons/LICENSE`;
 		
 		# Removed other test files
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`;
@@ -625,26 +614,21 @@ if ($nboftargetok) {
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/scripts`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/src`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/test`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/samples`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/php-iban/docs`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/sabre/sabre/*/tests`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/stripe/tests`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/stripe/LICENSE`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/examples`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-*`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-*`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_*`;
        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/utils`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/examples`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/vendor`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/webmozart`;
        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/autoload.php`;
-        
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/sabre/sabre/bin`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/sabre/sabre/*/bin`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/sabre/sabre/*/*/bin`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/sabre/sabre/*/*/*/bin`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/sabre/sabre/*/*/*/*/bin`;
 	}

 	# Build package for each target
@@ -688,7 +672,7 @@ if ($nboftargetok) {
 				mkdir($DESTI.'/standard');
 				if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; } 
 			}
-
+			
 			print "Remove target $FILENAMETGZ.tgz...\n";
 			unlink("$NEWDESTI/$FILENAMETGZ.tgz");

@@ -904,7 +888,7 @@ if ($nboftargetok) {

 			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
 			$ret=`rm -fr $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build`;
-
+			
 			print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp\n";
 			$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp\"";
 			$ret=`$cmd`;
@@ -1059,23 +1043,22 @@ if ($nboftargetok) {
 			print "Go into directory $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n";
 			chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build");
 			#$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
-			$cmd="dpkg-buildpackage -us -uc --compression=gzip";
+			$cmd="dpkg-buildpackage -us -uc";
 			print "Launch DEB build ($cmd)\n";
 			$ret=`$cmd 2>&1 3>&1`;
 			print $ret."\n";

 			chdir("$olddir");
-
+			
 			print "You can check bin package with lintian --pedantic -E -I \"$NEWDESTI/${FILENAMEDEB}_all.deb\"\n";
 			print "You can check src package with lintian --pedantic -E -I \"$NEWDESTI/${FILENAMEDEB}.dsc\"\n";
-
+			
 			# Move to final dir
 			print "Move *_all.deb *.dsc *.orig.tar.gz *.changes to $NEWDESTI\n";
 			$ret=`mv $BUILDROOT/*_all.deb "$NEWDESTI/"`;
 			$ret=`mv $BUILDROOT/*.dsc "$NEWDESTI/"`;
 			$ret=`mv $BUILDROOT/*.orig.tar.gz "$NEWDESTI/"`;
-			#$ret=`mv $BUILDROOT/*.debian.tar.xz "$NEWDESTI/"`;		# xz file is generated when build/debian/sources/option 
-			$ret=`mv $BUILDROOT/*.debian.tar.gz "$NEWDESTI/"`;
+			$ret=`mv $BUILDROOT/*.debian.tar.xz "$NEWDESTI/"`;
 			$ret=`mv $BUILDROOT/*.changes "$NEWDESTI/"`;
 			next;
 		}
@@ -1092,52 +1075,28 @@ if ($nboftargetok) {
     		print "Remove target $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe...\n";
    		unlink "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe";
 
- 			if ($OS eq 'windows') {
- 				print "Check that ISCC.exe is in your PATH.\n";
-			} else {
- 				print "Check that in your Wine setup, you have created a Z: drive that point to your / directory.\n";
-			}
-			
+ 			print "Check that in your Wine setup, you have created a Z: drive that point to your / directory.\n";
+
 			$SOURCEBACK=$SOURCE;
 			$SOURCEBACK =~ s/\//\\/g;

-    		print "Prepare file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\" from \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"\n";
-    		
-    		#$ret=`cat "$SOURCE/build/exe/doliwamp/doliwamp.iss" | sed -e 's/__FILENAMEEXEDOLIWAMP__/$FILENAMEEXEDOLIWAMP/g' > "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`;
-    		open(IN, '<' . $SOURCE."/build/exe/doliwamp/doliwamp.iss") or die $!;
-			open(OUT, '>' . "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss") or die $!;
-			while(<IN>)
-			{
-			    $_ =~ s/__FILENAMEEXEDOLIWAMP__/$FILENAMEEXEDOLIWAMP/g;
-			    print OUT $_;
-			}
-			close(IN);
-			close(OUT);
+    		print "Prepare file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss from \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"\n";
+    		$ret=`cat "$SOURCE/build/exe/doliwamp/doliwamp.iss" | sed -e 's/__FILENAMEEXEDOLIWAMP__/$FILENAMEEXEDOLIWAMP/g' > "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`;

-    		print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\" on OS $OS\n";
-    		
- 			if ($OS eq 'windows') {
-	    		$cmd= "ISCC.exe \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"";
-	    	} else {
-	    		#$cmd= "wine ISCC.exe \"Z:$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"";
-	    	}
+    		print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"\n";
+    		$cmd= "wine ISCC.exe \"Z:$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"";
 			print "$cmd\n";
 			$ret= `$cmd`;
-			print "ret=$ret\n";
+			#print "$ret\n";

 			# Move to final dir
 			print "Move \"$SOURCE\\build\\$FILENAMEEXEDOLIWAMP.exe\" to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n";
    		rename("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe","$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe");
            print "Move $SOURCE/build/$FILENAMEEXEDOLIWAMP.exe to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n";
-            
-            use File::Copy;
-
-            #$ret=`mv "$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe" "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"`;
-            $ret=move("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe", "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe");
+            $ret=`mv "$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe" "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"`;
            
            print "Remove tmp file $SOURCE/build/exe/doliwamp/doliwamp.tmp.iss\n";
-            #$ret=`rm "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`;
-            $ret=unlink("$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss");
+            $ret=`rm "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`;
            
    		next;
    	}
@@ -1157,8 +1116,7 @@ if ($nboftargetok) {
 			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_all.deb"=>'Dolibarr installer for Debian-Ubuntu (DoliDeb)',
 			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_amd64.changes"=>'none',		# none means it won't be published on SF
 			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}.dsc"=>'none',					# none means it won't be published on SF
-			#"$DESTI/package_debian-ubuntu/${FILENAMEDEB}.debian.tar.xz"=>'none',		# none means it won't be published on SF
-			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}.debian.tar.gz"=>'none',		# none means it won't be published on SF
+			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}.debian.tar.xz"=>'none',		# none means it won't be published on SF
 			"$DESTI/package_debian-ubuntu/${FILENAMEDEBSHORT}.orig.tar.gz"=>'none',		# none means it won't be published on SF
 			"$DESTI/package_windows/$FILENAMEEXEDOLIWAMP.exe"=>'Dolibarr installer for Windows (DoliWamp)',
 			"$DESTI/standard/$FILENAMETGZ.tgz"=>'Dolibarr ERP-CRM',
@@ -1285,7 +1243,7 @@ if ($nboftargetok) {

 print "\n----- Summary -----\n";
 foreach my $target (sort keys %CHOOSEDTARGET) {
-	if ($target eq '-CHKSUM') { print "Checksum was generated\n"; next; }
+	if ($target eq '-CHKSUM') { print "Checksum was generated"; next; }
 	if ($CHOOSEDTARGET{$target} < 0) {
 		print "Package $target not built (bad requirement).\n";
 	} else {
--- a/build/makepack-dolibarrmodule.pl
+++ b/build/makepack-dolibarrmodule.pl
@@ -293,7 +293,6 @@ foreach my $PROJECT (@PROJECTLIST) {
 		    }
 		    print "Clean $BUILDROOT\n";
 		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/.cache`;
-		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/.git`;
 		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/.project`;
 		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/.settings`;
 		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/index.php`;
--- a/build/makepack-dolibarrtheme.pl
+++ b/build/makepack-dolibarrtheme.pl
@@ -258,7 +258,7 @@ foreach my $target (keys %CHOOSEDTARGET) {
    if ($CHOOSEDTARGET{$target} < 0) {
        print "Package $target not built (bad requirement).\n";
    } else {
-        print "Package $target built successfully in $DESTI\n";
+        print "Package $target built succeessfully in $DESTI\n";
    }
 }

--- a/build/makepack-howto.txt
+++ b/build/makepack-howto.txt
@@ -1,61 +1,19 @@
 ----- Dolibarr Makepack How To -----
 This documentation describe steps to build a BETA or RELEASE versions
-of Dolibarr. There is a chapter for BETA version and a chapter for RELEASE version.
-
-
-***** Prerequisites For Linux *****
-
-Prerequisites to build tgz, debian and rpm packages:
-> apt-get install perl tar dpkg dpatch p7zip-full rpm zip php-cli
-
-Prerequisites to build autoexe DoliWamp package from Linux (solution seems broken since Ubuntu 20.04):
-> apt-get install wine q4wine
-> Launch "wine cmd" to check a drive Z: pointing to / exists.
-> Install InnoSetup
-   For example by running isetup-5.5.8.exe (https://www.jrsoftware.org)  https://files.jrsoftware.org/is/5/
-> Install WampServer into "C:\wamp64" to have Apache, PHP and MariaDB
-   For example by running wampserver3.2.6_x64.exe (https://www.wampserver.com).
-   See file build/exe/doliwamp.iss to know the doliwamp version currently setup.
-> Add path to ISCC into PATH windows var:
-  Launch wine cmd, then regedit and add entry int HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment\PATH
-> To build manually the .exe from Windows (running from makepack-dolibarr.pl script is however recommended),
-  open file build/exe/doliwamp.iss and click on button "Compile".
-  The .exe file will be build into directory build.
-
-
-***** Prerequisites For Windows *****
-
-Prerequisites to build autoexe DoliWamp package from Windows:
-
-> Install Perl for Windows (https://strawberryperl.com/)
-> Install isetup-5.5.8.exe (https://www.jrsoftware.org)
-> Install Microsoft Visual C++ Redistributable 2017 (https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170)
-> Install WampServer-3.2.6-64.exe (Apache 2.4.51, PHP 7.4.26, MariaDB 10.6.5 for example. Version must match the values found into doliwamp.iss)
-> Install GIT for Windows (https://git-scm.com/ => You must choose option "Add Git bash profile", "Git commit as-is")
-> Install Dolibarr current version:
-  git clone https://github.com/dolibarr/dolibarr  or  git clone --branch X.Y https://github.com/dolibarr/dolibarr
-
-> Add the path of PHP (C:\wamp64\bin\php\php7.4.26) and InnoSetup (C:\Program Files (x86)\Inno Setup 5) into the %PATH% of Windows.
-
-> Create a config file c:\dolibarr\dolibarr\htdocs\conf\conf.php with content
-  <?php
-  $dolibarr_main_document_root="c:\dolibarr\dolibarr\htdocs";
-  $dolibarr_main_url_root='http://localhost';
-
+of Dolibarr. There is a chapter for BETA version and a chapter for 
+RELEASE version.

 ***** Actions to do a BETA *****
-
-This files describe steps made by Dolibarr packaging team to make a
+This files describe steps made by Dolibarr packaging team to make a 
 beta version of Dolibarr, step by step.

- Check all files 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 "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/aaa"
-To generate a changelog of a major new version x.y.0 (from a repo on branch x.y repo), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent x.y.0) | 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/aaa"
+- Check all files are commited.
+- Update version/info in ChangeLog. 
+To generate a changelog of a major new version x.y.0 (from develop repo), you can do "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/aaa"
+To generate a changelog of a major new version x.y.0 (from x.y repo), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent x.y.0) | 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/aaa"
 To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-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/aaa"
-Recopy the content of the output file into the file ChangeLog.
- Note: To know number of lines changes: git diff --shortstat A B
- Update version number with x.y.z-w in file htdocs/filefunc.inc.php
+- To know number of lines changes: git diff --shortstat A B
+- Update version number with x.y.z-w in htdocs/filefunc.inc.php
 - Commit all changes.

 - Run makepack-dolibarr.pl to generate all packages.
@@ -66,32 +24,32 @@ Recopy the content of the output file into the file ChangeLog.
  (/home/dolibarr/wwwroot/files/lastbuild).

 - Post a news on dolibarr.org/dolibarr.fr + social networks
+- Send mail on mailings-list


 ***** Actions to do a RELEASE *****
-
-This files describe steps made by Dolibarr packaging team to make a
+This files describe steps made by Dolibarr packaging team to make a 
 complete release of Dolibarr, step by step.

- Check all files 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 "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/aaa"
-To generate a changelog of a major new version x.y.0 (from a repo pn branch x.y), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent x.y.0) | 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/aaa"
+- Check all files are commited.
+- Update version/info in ChangeLog. 
+To generate a changelog of a major new version x.y.0 (from develop repo), you can do "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/aaa"
+To generate a changelog of a major new version x.y.0 (from x.y repo), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent x.y.0) | 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/aaa"
 To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-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/aaa"
-Recopy the content of the output file into the file ChangeLog.
- Note: To know the number of lines changes: git diff --shortstat A B
- Update version number with x.y.z in file htdocs/filefunc.inc.php
+- To know number of lines changes: git diff --shortstat A B
+- Update version number with x.y.z in htdocs/filefunc.inc.php
 - Commit all changes.

 - Run makepack-dolibarr.pl to generate all packages.

 - Check content of built packages.

- Run makepack-dolibarr.pl again with option to publish files on
+- Run makepack-dolibarr.pl again with option to publish files on 
  dolibarr foundation server (Dir /home/dolibarr/wwwroot/files/stable on www.dolibarr.org).
- Run makepack-dolibarr.pl again with option to publish files on
+- Run makepack-dolibarr.pl again with option to publish files on 
  sourceforge. This will also add official tag.
 - Edit symbolic links in directory "/home/dolibarr/wwwroot/files/stable/xxx"
  on server to point to new files (used by some web sites).

 - Post a news on dolibarr.org/dolibarr.fr + social networks
+- Send mail on mailings-list
--- a/build/obs/README
+++ b/build/obs/README
@@ -54,5 +54,5 @@ OBS:QualityCategory   Stable|Testing|Development|Private
 For example: https://bugzilla.novell.com/show_bug.cgi?id=848083 to be a maintener of category
 https://build.opensuse.org/project/show/Application:ERP
 - Once done, go into project, category, subproject and enter a subproject for your application.
-For example: Dolibarr
+Fo example: Dolibarr
 - Then go onto project into your home and ask a publish to the category/you project your created. 
--- a/build/pad/DoliWamp.pml
+++ b/build/pad/DoliWamp.pml
@@ -58,8 +58,8 @@ DoliWamp is the auto-installer for Windows users with no technical knowledge to
 			<Char_Desc_45>DoliWamp, Dolibarr ERP/CRM per Windows</Char_Desc_45>
 			<Char_Desc_80>Gestionale open source e gratuito per piccole e medie imprese, fondazioni</Char_Desc_80>
 			<Char_Desc_250>Dolibarr è un a gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività.</Char_Desc_250>
-			<Char_Desc_450>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibarr è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_450>
-			<Char_Desc_2000>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibarr è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. Dolibarr è completamente web-based, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_2000>
+			<Char_Desc_450>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_450>
+			<Char_Desc_2000>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. Dolibar è completamente web-based, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_2000>
 		</Italian>
 	</Program_Descriptions>
 	<Web_Info>
--- a/build/pad/Dolibarr.pml
+++ b/build/pad/Dolibarr.pml
@@ -53,8 +53,8 @@ Note that Dolibarr is also available with an auto-installer for Windows or Ubunt
 			<Char_Desc_45>Gestionale open source e gratuito</Char_Desc_45>
 			<Char_Desc_80>Gestionale open source e gratuito per piccole e medie imprese, fondazioni</Char_Desc_80>
 			<Char_Desc_250>Dolibarr è un a gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività.</Char_Desc_250>
-			<Char_Desc_450>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibarr è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_450>
-			<Char_Desc_2000>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibarr è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. Dolibarr è completamente web-based, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_2000>
+			<Char_Desc_450>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_450>
+			<Char_Desc_2000>Dolibarr è un programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. Dolibar è completamente web-based, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare.</Char_Desc_2000>
 		</Italian>
 		<French>
 			<Keywords>dolibarr, erp, crm, invoices, commercial proposals, orders, accounting, stock, products, agenda, bank, business, company, foundation, management, sme, doliwamp</Keywords>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Eric - CAP-REL	97aaff7395	13.0 fix migration missing tms auto update (#33443 ) * tms field in llx_product is not updated to default timestamp * but that's not the only one ...	2025-03-13 23:01:52 +01:00
Mathieu Moulin	a602309e04	Fix user::load_previous_next_ref() with MULTICOMPANY_TRANSVERSE_MODE bad sql query (cartesian product replaced by INNER JOIN) (#31946 )	2024-11-16 18:19:59 +01:00
Mathieu Moulin	f51935a258	Fix slow user card when many users in same group, disable loading of all other users (#31947 )	2024-11-16 18:10:08 +01:00
Laurent Destailleur	7cf1a97673	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2024-10-29 15:44:55 +01:00
Laurent Destailleur	cf57e7e88b	Merge	2024-10-29 15:44:25 +01:00
Laurent Destailleur	a186e16568	Backport fix for mysql 8 export	2024-10-29 15:32:54 +01:00