Prepare 12.0.5

Fix #16241 Date filter resets on Miscellaneous Payments

.editorconfig

@@ -9,8 +9,6 @@ charset = utf-8
 end_of_line = lf
 insert_final_newline = true
 
-# PHP PSR-2 Coding Standards
-# http://www.php-fig.org/psr/psr-2/
 [*.php]
 indent_style = tab
 indent_size = 4

.github/CONTRIBUTING.md

@@ -4,7 +4,7 @@ How to contribute to Dolibarr
 Bug reports and feature requests
 --------------------------------
 
-<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](http://www.dolibarr.org/forum).
+<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).
 
 Issues are managed on [GitHub](https://github.com/Dolibarr/dolibarr/issues).
 
@@ -101,32 +101,35 @@ Long description (Can span accross multiple lines).
 </pre>
 
 ### Pull Requests
-When submitting a pull request, use same rule as [Commits](#commits) for the message.
+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...
 
-If your pull request only contains one commit, GitHub will be smart enough to fill it for you.
-Otherwise, please be a bit verbose about what you're providing.
+* A PR must be atomic. It means it must contains the lower possible changes for 1 need (1 bug fix or 1 new feature) without breaking usability of code. If a PR can be split into several PRs, it often means your PR is not atomic.
+
+* Your Pull Request (PR) must pass the Continuous Integration checks and code quality checks.
+
+* 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.
 
-Your Pull Request (PR) must pass the Continuous Integration checks.
 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 project manager (@eldy) 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 a new table, you must first create a page on http://wiki.dolibarr.org/index.php/Category:Table_SQL (copy an existing page changing its name to see it into this index page). Than ask the project manager (@eldy) if the new data model you plan to add can be accepted as you suggest.
+* 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.
+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 "WIP" (Work In Progress), it will not be analyzed (until you change the label of PR).
+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 flag ask you. The majority of PR are waiting an action of the developer/author.
+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 around 95% of submitted PR are reviewed and tagged. This is one of the most important ratio of answered PR in Open Source world. Don't expect the core team to reach the 100%. With the increasing popularity of Dolibarr, this ratio will probably decrease in future.
+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
-[Developer documentation](http://wiki.dolibarr.org/index.php/Developer_documentation)
+[Developer documentation](https://wiki.dolibarr.org/index.php/Developer_documentation)
 
 Translations
 ------------
@@ -142,11 +145,11 @@ to retreive all old translation of a source text, and restore the translation in
 
 
 ### Resources
-[Translator documentation](http://wiki.dolibarr.org/index.php/Translator_documentation)
+[Translator documentation](https://wiki.dolibarr.org/index.php/Translator_documentation)
 
 Documentation
 -------------
-The project's documentation is maintained on the [Wiki](http://wiki.dolibarr.org/index.php).
+The project's documentation is maintained on the [Wiki](https://wiki.dolibarr.org/index.php).
 
 *Note*: to help prevent spam, you need to create an account before being able to edit. Everybody is welcome to contribute to its content.
 

.github/workflows/greetings-pr.yml.disabled

@@ -0,0 +1,13 @@
+# See syntax file on https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
+name: Greetings PR
+
+on: [pull_request]
+
+jobs:
+  greeting:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/first-interaction@v1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        pr-message: 'Welcome to the Dolibarr army. You are on the road to become an Admiral (see https://wiki.dolibarr.org/index.php/Dolibarr_Project)'

.github/workflows/stale-issues-safe.yml

@@ -0,0 +1,24 @@
+# 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 21 * * *"
+  issue_comment:
+    types: [created]
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: Dolibarr/stale@staleunstale
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-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-label: 'Issue Stale (automatic label)'
+        exempt-labels: 'Priority High / Blocking,Priority Top Strategic,Priority Medium,Hacktoberfest,good first issue,Bug Security (CVE),Analysis of PR in progres'
+        days-before-stale: 365
+        days-before-close: 15
+        operations-per-run: 100
+        dry-run: false
+        

.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'
+        

.gitignore

@@ -16,6 +16,7 @@ default.properties
 .DS_Store
 .idea
 *.iml
+*.orig
 Thumbs.db
 /dolibarr_genesis.mp4
 # Log files
@@ -40,3 +41,4 @@ htdocs/includes/sebastian/
 htdocs/includes/squizlabs/
 htdocs/includes/symfony/
 htdocs/includes/webmozart/
+htdocs/.well-known/apple-developer-merchantid-domain-association

.scrutinizer.yml

@@ -194,22 +194,6 @@ tools:
                 - 'test/*'
                 - 'htdocs/includes/*'
             paths: {  }
-
-    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: {  }
             
     # Coding-Style / Bug Detection
     js_hint:

.travis.yml

@@ -2,24 +2,26 @@
 # from Dolibarr GitHub repository.
 # For syntax, see http://about.travis-ci.org/docs/user/languages/php/
 
-# We use dist: trusty to have php 5.4+ available
+# We use dist: xenial to have php 5.6+ available
 os: linux
-dist: trusty
-sudo: required
+dist: xenial
+#dist: bionic
 
 language: php
 
 # Start on every boot
 services:
 - memcached
+- mysql
+- postgresql
 
 addons:
-  mariadb: '10.0'
-  postgresql: '9.3'
+  # 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
-    - pgdg-trusty
+    # 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.
@@ -29,60 +31,25 @@ addons:
     # We need pgloader for import mysql database into pgsql
     - pgloader
 
-php:
-- '5.5'
-- '5.6'
-- '7.0'
-- '7.1'
-- '7.2'
-- '7.3'
-- '7.4'
-- nightly
-
 env:
   global:
   # Set to true for very verbose output
   - DEBUG=false
-  jobs:
-  # MariaDB overrides MySQL installation so it's not possible to test both yet
-  #- DB=mysql
-  - DB=mariadb
-  - DB=postgresql
-  # TODO
-  #- DB=sqlite
-  # See https://docs.travis-ci.com/user/languages/php/#Apache-%2B-PHP
-  #- WS=apache
-  # See https://github.com/DracoBlue/travis-ci-nginx-php-fpm-test
-  #- WS=nginx
 
 jobs:
   fast_finish: true
   allow_failures:
   - php: nightly
-  # We exclude some combinations not usefull to save Travis CPU
-  exclude:
-  - php: '5.6'
-    env: DB=mariadb
-  - php: '7.0'
-    env: DB=mariadb
-  - php: '7.1'
-    env: DB=mariadb
-  - php: '7.2'
-    env: DB=mariadb
-  - php: '7.3'
-    env: DB=mariadb
-  - php: '5.6'
-    env: DB=postgresql
-  - php: '7.0'
-    env: DB=postgresql
-  - php: '7.1'
-    env: DB=postgresql
-  - php: '7.2'
-    env: DB=postgresql
-  - php: '7.3'
-    env: DB=postgresql
-  - php: nightly
-    env: DB=postgresql
+  include:
+    - if: type = push
+      php: '5.6'
+      env: DB=postgresql
+    - if: type = pull_request OR type = push
+      php: '7.4'
+      env: DB=mysql
+    - if: type = push AND branch = develop
+      php: nightly 
+      env: DB=mysql
 
 notifications:
   email:
@@ -115,11 +82,11 @@ install:
   echo "Updating Composer"
   rm $TRAVIS_BUILD_DIR/composer.json
   rm $TRAVIS_BUILD_DIR/composer.lock
+  composer -V
   composer self-update
-  # To have composer making parallel downloads
-  composer global require hirak/prestissimo
   composer -n init
   composer -n config vendor-dir htdocs/includes
+  composer -n config -g vendor-dir htdocs/includes
   echo
 
 - |
@@ -148,6 +115,9 @@ install:
 - |
   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/vendor
+  ls $TRAVIS_BUILD_DIR/htdocs/includes/bin
   echo
 
 
@@ -174,47 +144,51 @@ before_script:
 
   - |
     echo "Versions information"
+    echo
     # Check PHP
     echo "PHP version"
     php -i | head -
-    # Check PHP CodeSniffer installation
+    # Check Parallel-lint version
+    echo "Parallel-lint version"
+    which parallel-lint
+    parallel-lint -V
+    # Check PHP CodeSniffer version
     echo "PHPCS version"
     which phpcs
     phpcs --version | head -
     phpcs -i | head -
-    # Check PHPUnit installation
+    # Check PHPUnit version
     echo "PHPUnit version"
     which phpunit
     phpunit --version | head -
     # Check Apache version
     echo "Apache version"
     apache2 -v | head -
-    # Check MariaDb
-    echo "MariaDb version"
+    # Check Database
+    echo "Database version"
     mysql --version | head -
     mysql -e "SELECT VERSION();"  | head -
+    psql --version
     echo
 
   - |
     echo "Setting up database"
     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
+      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
-      #pgsql travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
-      #pgloader mysql://root:pass@127.0.0.1/dolibarr_9 postgresql://dolibarrowner:dolibarrownerpass@127.0.0.1/dolibarr_dev
-      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
+      #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
 
@@ -263,10 +237,7 @@ before_script:
   - 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 for precise
-  #- sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/default
-  #- sudo cat /etc/apache2/sites-available/default
-  # configure apache virtual hosts for trusty
+  # 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
@@ -291,17 +262,18 @@ script:
   # Ensure we catch errors
   set -e
   #parallel-lint --exclude htdocs/includes --blame .
-  parallel-lint --exclude dev/namespacemig --exclude htdocs/includes/myclabs --exclude htdocs/includes/webmozart --exclude htdocs/includes/phpspec --exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian --exclude htdocs/includes/squizlabs/php_codesniffer/tests --exclude htdocs/includes/jakub-onderka/php-parallel-lint/tests --exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/phpunit/php-token-stream/tests --exclude htdocs/includes/composer/autoload_static.php --blame .
+  parallel-lint --exclude dev/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/webmozart --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes --exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian --exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/phpunit/ --exclude htdocs/includes/composer/autoload_static.php --blame .
   set +e
   echo
 
 - |
-  echo "Checking coding style (excluding Pull Requests builds)"
+  echo "Checking coding style (excluding Pull Requests builds to not overload travis, excluding also some jobs to avoid duplicate tests)"
   # Ensure we catch errors
   set -e
   # Exclusions are defined in the ruleset.xml file
-  #phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 .
-  if [ "$TRAVIS_PULL_REQUEST" = "false" ]; 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
+  if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_PHP_VERSION" = "7.4" ] && [ "$DB" = "mysql" ]; 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
 
@@ -407,9 +379,13 @@ script:
   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/upgrade9001000.log
-  php upgrade2.php 10.0.0 11.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-2.log
-  php step5.php 10.0.0 11.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
+
   # Enable modules not enabled into original dump
   php upgrade2.php 0.0.0 0.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL,MAIN_MODULE_WEBSITE,MAIN_MODULE_TICKETSUP,MAIN_MODULE_ACCOUNTING > $TRAVIS_BUILD_DIR/enablemodule.log
   echo $?
@@ -430,7 +406,7 @@ script:
 
 after_script:
 - |
-  echo "After script - Output lines of dolibarr.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
@@ -456,7 +432,7 @@ after_failure:
     # Dolibarr log file
     echo "Debugging informations for file dolibarr.log (latest 50 lines)"
     tail -n 50 $TRAVIS_BUILD_DIR/documents/dolibarr.log
-    # MariaDB log file
+    # Database log file
     echo "Debugging informations for file mysql error.log"
     sudo tail -n 50 /var/log/mysql/error.log
     # TODO: PostgreSQL log file

COPYRIGHT

@@ -16,8 +16,8 @@ AdoDb-Date             0.36          Modified BSD License        Yes
 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
-GeoIP                  1.4           LGPL-2.1+                   Yes             Sample code to make geoip convert (not into deb package)
-Mobiledetect           2.8.33        MIT License                 Yes             Detect mobile devices browsers
+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.6           MIT License                 Yes             Markdown parser
@@ -32,18 +32,18 @@ PSR/simple-cache	   ?										                 Library for cache (used by PHPSp
 Restler                3.0.0RC6      LGPL-3+                     Yes             Library to develop REST Web services (+ swagger-ui js lib into dir explorer)
 Sabre                  3.2.2         BSD                         Yes             DAV support
 Swift Mailer           5.4.2-DEV     MIT license                 Yes             Comprehensive mailing tools for PHP
-Stripe                 6.41          MIT licence                 Yes             Library for Stripe module
+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
 
 JS libraries:
-Ace                    1.4.6         BSD                         Yes             JS library to get code syntaxique coloration in a textarea.
+Ace                    1.4.8         BSD                         Yes             JS library to get code syntaxique coloration in a textarea.
+ChartJS				   2.9.3         MIT License                 Yes             JS library for graph
 jQuery                 3.4.1         MIT License                 Yes             JS library
 jQuery UI              1.12.1        GPL and MIT License         Yes             JS library plugin UI
-jQuery select2         4.0.5         GPL and Apache License      Yes             JS library plugin for sexier multiselect
+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 Flot            0.8.3         MIT License                 Yes             JS library to build graph
 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 Software License 2.0 Yes             JS library plugin jNotify (to use ajax popups)
@@ -60,7 +60,7 @@ Image libraries:
 Octicons               8.1           MIT                         Yes
 
 Font libraries:
-Fontawesome            5.7.2         Font Awesome Free licence   Yes
+Fontawesome            5.13          Font Awesome Free licence   Yes
 
 
 For licenses compatibility informations:

ChangeLog

@@ -2,6 +2,538 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
+
+***** ChangeLog for 12.0.5 compared to 12.0.4 *****
+FIX: before crediting a withdrawal receipt, check whether it has been credited already
+FIX: mandatory extrafields of type sellist
+FIX: when a mandatory extrafield of type sellist contains '0' it should be considered empty and trigger an error message upon insertion
+FIX: when a new intervention is created from an object, a new $extrafields object is instantiated but not initialized
+FIX: "openall" filter on ticket list does not include read tickets
+FIX: ticket - extrafields of type 'date' are not saved
+FIX: ticket - the "openall" filter on the ticket list does not include tickets with status READ
+FIX: #14290 #15900
+FIX: #15388 #15891
+FIX: #15465 External user sees last 5 shipments to other customers in the dashboard
+FIX: #15629
+FIX: #15751 Miscellaneous payment type change to 0 after updating subledger account
+FIX: #15946
+FIX: #15966 #15967
+FIX: Accountancy - Fix some problems on CEGID export
+FIX: Accountancy - label_operation is used instead of label_compte
+FIX: Accountancy - Retire entire opening balance feature
+FIX: add autofix of count of email target when data is corrupted
+FIX: add categories params  on llxHeader filter
+FIX: Add critical price patch from 12 to 11.
+FIX: Bad cleaning of VAT rate when numbers are into code
+FIX: Bad dates filtering in the ticket list causes sql error
+FIX: balance starting and ending fiscal month #14197
+FIX: bom line unit display #13831
+FIX: cash fence for takepos with multientity
+FIX: Check of customer/vendor code fails in some cases
+FIX: create ticket : thirdparty/contact notification #15629
+FIX: Creation of thirdparty when setup is empty
+FIX: Dates of sales start in TakePOS
+FIX: dupliacete customer or supplier code must be error dipslayed with new code proposed
+FIX: Export FEC - Force Carriage Return Line Feed
+FIX: Facture Situation Out : status condition
+FIX: Filter on date of next generation on template invoices
+FIX: Fix detect dispatched product and set to received completely when the supplier order have services (support STOCK_SUPPORTS_SERVICES)
+FIX: Invoice Situation Out : status condition
+FIX: issue 15659 : Missing test if supplier conf is enabled
+FIX: link to create event when task is in a project with a thirdparty
+FIX: Localtax must be converted with price2num
+FIX: manage price min for PRODUIT_CUSTOMER_PRICES
+FIX: missing GETPOST parameters on card_presend.tpl.php
+FIX: missing socid into link to create event from project agenda tab
+FIX: Must delete extrafields before main table on product deletion.
+FIX: (path) htdocs removed
+FIX: php alert sms.php
+FIX: right to show VAT rate in product list
+FIX: select default mail template
+FIX: Timeout during import
+FIX: update order by api
+FIX: useless tracking number displayed on pdf if empty issue #14501
+FIX: Visible date of payment
+FIX: warning when adding a line if $remise_percent is an empty string
+FIX: When creating a new POS sell, the creation date must be modified.
+FIX: wrong name for search status param issue #15516
+
+***** ChangeLog for 12.0.4 compared to 12.0.3 *****
+FIX: make formConfirm an addreplace-type hook
+FIX: regex to remove 'action' parameter: taking feedback from PR#15213 into account
+FIX: remove 'action' parameter from redirect URL when reordering lines on a document
+FIX: error when displaying lines on order after adding a line if both MAIN_MULTILANGS and MAIN_DISABLE_PDF_AUTOUPDATE are activated
+FIX: on survey creation, entity is always set to 1 ⇒ set it to $conf->entity
+FIX: set entity to $conf->entity (instead of 1 by default) when creating a survey; otherwise the survey cannot be listed from the entity it was created on unless it is the main entity
+FIX: the stringent XSS protection provided by 'alphanohtml' causes problems with some clients who used basic tags (bold, italic, underline) in product labels. Using 'restricthtml' instead could be a good compromise.
+FIX: third party of object is not always fetched when initiating the e-mail presend action (e.g. from an order)
+FIX: when the cronjob 'params' field is empty, the cron method is called with one empty string param instead of no params at all
+FIX: XSS protection too stringent -> replace 'alphanohtml' with 'restricthtml'
+FIX: #13067 including opening balance in calculation of displayed balance
+FIX: #14326
+FIX: #14649
+FIX: #14901
+FIX: #14927 Change ContratLigne property type to product_type
+FIX: #14979
+FIX: #15074
+FIX: #15111 Fix special characters output in PDF
+FIX: #15161 MO translation conflict
+FIX: #15163
+FIX: #15199
+FIX: #15208
+FIX: #15303
+FIX: #15365 export of extrafields for user and resources
+FIX: #15374 : "New" doesn't clear total amounts
+FIX: #15501
+FIX: #15572
+FIX: #15590
+FIX: #15618
+FIX: supplier proposals as linked objects of events are not correctly fetched
+FIX: when users create an event from a supplier proposal, the "linked objects" section says "Deleted"
+FIX: Accountancy - Some ajustments on length of the account (general & auxiliary)
+FIX: admin conf selected
+FIX: also check if there is a method $object->fetch_thirdparty() before calling it
+FIX: autofocus on first setup
+FIX: Bad rigths to send contract
+FIX: Better error message with IMAP when connection fails
+FIX: Can create user but not update user with activedirectory
+FIX: Can receipt of a product that required lot after disabling stock and
+FIX: Can't create shipment for virtual product. Add
+FIX: cant empty action comm desc
+FIX: CA report by product/service : subcategory filter
+FIX: Clean orphan records in llx_ecm_files into repair script.
+FIX: default accountancy values and posted values
+FIX: Deletion of expensereport + other generated object not complete.
+FIX: disabled users must not be available in sales representative list on societe edit mode
+FIX: Dol print error : conf usage thirdparty propagate extrafields to
+FIX: Don't display inactive users in birthday box and company card
+FIX: empty value is needed on filter list
+FIX: enable HTML in product labels depending on conf MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML
+FIX: error 500 on cash closure
+FIX: excess comma
+FIX: Export FEC - Remove line at zero
+FIX: extrafield required error after submit
+FIX: filter on project list
+FIX: force payment mode to withdraw
+FIX: formating of prices with foreign languages
+FIX: handling $heightforinfotot when he's superior to a page height
+FIX: if no PDF default model in admin for expense report, do not create a PDF
+FIX: invoice payment terms edition: error management
+FIX: list of fields in list of recurring invoices was empty
+FIX: load default linked options for linked sellist extra fields
+FIX: Loan - Return on list when you cancel create form or delete a loan
+FIX: Missing lang trans
+FIX: no empty value in required extrafield
+FIX: Param joinfiles not sanitized
+FIX: Payment by BankTransfer
+FIX: pdf_getlinetotalwithtax must show total incl tax
+FIX: Problem on supplier payment card
+FIX: product auto volume calculation
+FIX: product customer prices: missing triggers in CRUD class
+FIX: Request on purchase orders in timeout even on very small databases
+FIX: set paid on total discount of a product in cash desk
+FIX: several warning with the barcode use in ODT templates
+FIX: SHIP MODE install v12 bug insert
+FIX: stripe for connect mode
+FIX: subcat filter
+FIX: supplier invoice: automatically calculate payment term when modifying payment condition
+FIX: SUPPLIER PROPOSAL v12 bug add
+FIX: table making extrafield input too small on advance target mailing
+FIX: table making extrafield too small advtagertmailing
+FIX: Unable to edit extrafields in expense report
+FIX: update margins rates on object line edit
+FIX: uses price2numjs
+FIX: various payments: bad data handling for subledger account + useless db commit/rollback
+FIX: virtual products: displayed value is by unit
+FIX: virtual products: supplier discount was not applied in component list
+FIX: warning for purchase order delivery late.
+FIX: Warning on late purchase order delivery
+FIX: WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING must not consider services while STOCK_SUPPORTS_SERVICES is empty
+FIX: wrong tab
+FIX: Yogosha report 4425 (backport)
+FIX: Yogosha report 4434 (backport)
+
+***** ChangeLog for 12.0.3 compared to 12.0.2 *****
+FIX: 10.0 - when the mime file name is different from the filesystem name, the attachment name should be the mime filename
+FIX: 11.0 - expenses lines overlapping the total amounts frame
+FIX: 12.0 - round value of virtual stock on product stock reassort list
+FIX: #14469
+FIX: #14474 Error when deleting
+FIX: #14530
+FIX: #14703
+FIX: - Accountancy balance Error SQL on entity
+FIX: Bad number of subscription (forgotten when member was resiliated)
+FIX: bad route url to delete subproduct with API
+FIX: Category for suplements not saved
+FIX: Compatibility with modules without document generation
+FIX: Cron load lang
+FIX: CSS
+FIX: Error management. Do no try to approve PO if validation fails.
+FIX: expenses lines overlapping the frame for total amounts.
+FIX: Filter in "billed" of orders was not saved
+FIX: infinite fetch object linked loop
+FIX: Intervention lose html tags when updating
+FIX: JS CRASH - bad usage of moreparam
+FIX: lang fr retained warranty
+FIX: Look and feel v12: First tab must be name of object
+FIX: missing entity check
+FIX: missing param for hook
+FIX: Missing transaction on PO actions
+FIX: MySql Strict mode
+FIX: param entity in html form file
+FIX: Problems on FEC format
+FIX: round stock value on product list
+FIX: - Send mail from contact : select mail model
+FIX: set sales representatives on create company card
+FIX: Setup of stock increase/decrease
+FIX: sign of amount with credit note and multicurrencies
+FIX: Static property called as non static
+FIX: task leftmenu
+FIX: title button attribute id empty
+FIX: unit price divided by quantity when accepting supplier price proposal
+FIX: Update extrafields on line only if it is supported
+FIX: Update line of BOM
+FIX: using decimal on stock correction
+FIX: Visualization rights correction on last modified contacts box
+FIX: Wrong redirection
+FIX: Yogosha report 4425 (backport)
+
+***** ChangeLog for 12.0.2 compared to 12.0.1 *****
+FIX: computation of the bottom margin of <body> returns NaN because body is not loaded yet
+FIX: DebugBar hides content at page bottom
+FIX: allow more harmless html tags
+FIX: Bad back to link
+FIX: Bad param
+FIX: Can go on page even when module is disabled
+FIX: Change position of line in BOM
+FIX: Checkbox "drop table" was not checked when using php method to generate backup dump
+FIX: ClickToDial tab of users has disappeared
+FIX: CSS
+FIX: date in supplier price log tooltip.
+FIX: Debug module direct debit order. Solve conflict with credit transfer
+FIX: Debug setup of receipt printer module
+FIX: dolGetElementUrl and agenda page for external modules
+FIX: DO not erase variable $key and $label during output of extrafields
+FIX: duration fields size with firefox
+FIX: Edit extrafield of type long text loose carriage returns
+FIX: Fails to retraive accounting code of social contribution sometimes
+FIX: Filter too large for extrafields with type text or html
+FIX: If using a rounding step, localtax1+2 not included in total
+FIX: input field of extrafields must keep data if form submit fails.
+FIX: Label of opportunities in graph with special chars badly encoded
+FIX: locataxes lost on lines when cloning a vendor invoice
+FIX: Look and feel v12
+FIX: Missing PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE conf support in supplier order
+FIX: Navigation in object fails to find the next ref in some cases
+FIX: null required
+FIX: order by amount ht uses wrong column
+FIX: Order by amount in product propal stats must be done on d.total_ht and not p.total
+FIX: page for confirmation of payments is empty
+FIX: Param of fetch_name_optionals_label must be object->table_element
+FIX: Picto of HRM module
+FIX: product label and desc were never updated when modifying translation
+FIX: redirect on contact card from main search
+FIX: Reposition and nav
+FIX: search warehouse list
+FIX: Setup of clicktodial hang on smartphone
+FIX: Setup of currency limit and accuracy
+FIX: shipping creation: checks not done on weight and sizes
+FIX: Should not be able to edit qty on shipment when no stock available
+FIX: Size of image on the help popup of modules
+FIX: Sql error on stat by referring entries of a product
+FIX: Warning if no bank account defined
+FIX: We need to see unit line on PDF even though it's an option
+FIX: wrong element var for fetch_name_optionals_label function with expeditions
+FIX: wrong link to third invoice templates
+FIX: Disable svg as supported image by default (can contains javascript). Set MAIN_ALLOW_SVG_FILES_AS_IMAGES to 1 to have svg accepted
+FIX: #14076
+FIX: #14146
+FIX: #14209
+FIX: #14222
+FIX: #14236
+FIX: #14241 Mysql 8 compatibility
+FIX: #14253
+FIX: #14256
+FIX: #14259
+FIX: #14279
+FIX: #14291
+FIX: #14292
+FIX: #14336
+
+***** ChangeLog for 12.0.1 compared to 12.0.0 *****
+FIX: reposition was broken if url end with #anchor
+FIX: $_POST must be GETPOST
+FIX: 10.0 - fatal with postgreSQL
+FIX: #14109
+FIX: #14112
+FIX: #14142
+FIX: all extrafields cleared after update of one of them
+FIX: Avoid warning when creating a module with already existing files
+FIX: change selected fields on company card
+FIX: Correct ModuleBuilder left menu
+FIX: create a deposit with amount using comma didn't work
+FIX: CSS
+FIX: Entry from stripe intent were reported into SEPA payments
+FIX: Filter on status, closing opening status
+FIX: html lost on html extrafield
+FIX: Label of popup on thirdparty
+FIX: missing possibility to change entity when propal cloning
+FIX: missing setup of extrafields for MO
+FIX: Missing the tooltip when creating bank account
+FIX: Missing token
+FIX: non numeric value on comm/card.php
+FIX: SQL Problem in customer invoice list
+FIX: SQL Problem in social contribution list
+FIX: SQL Problem in supplier invoice list
+FIX: SQL syntax error when editing extrafields
+FIX: Sql type
+FIX: takepos 12 hook
+FIX: Update form erased extrafields that were hidden
+FIX: Update of extrafields date
+FIX: Update of extrafiels on draft object
+FIX: upload documents into manual ECM was reported a permission error
+FIX: Use of office365 TLS with SMTPs method.
+FIX: wrong origin
+FIX: Permission error during import
+
+***** ChangeLog for 12.0.0 compared to 11.0.0 *****
+For users:
+
+NEW: Module MO (Manufacturing Order) is available as stable module.
+NEW: Receipt printer module moved from 'development' to 'experimental'
+NEW: Add option MAIN_VIEW_LINE_NUMBER_IN_LIST for some lists.
+NEW: add numbering module for TakePOS module
+NEW: 2 new options when creating an invoice from time spent on a project : by period or by task
+NEW: Accountancy add column thirdparty on binding page
+NEW: Accountancy - Add Export for Fiducial Winfic eWinfic WinSis Compta
+NEW: Accountancy - Add Export LD compta version 10
+NEW: Accountancy - Add mode intra & export for product or service bought
+NEW: Accountancy - Add possibility to manage a short alternative label for account - Use to simplify accountancy
+NEW: Accountancy - General ledger - Add an option to search not reconciled lines
+NEW: Add accountancy code of thirdparty in contact and supplier export
+NEW: support webp image format
+NEW: Add checkbox "overwrite if exists" into ECM/DMS module
+NEW: add a link to notes in members list
+NEW: add a parameter to group same products in TakePOS
+NEW: add a parameter to sort product by label in TakePOS
+NEW: Add a profil to import contact categories
+NEW: Add company extrafields into order export
+NEW: add const CASHDESK_FORCE_DECREASE_STOCK to force batch decrementation
+NEW: add const TAKEPOS_NUMPAD_USE_PAYMENT_ICON to use icons on payment buttons
+NEW: add csv separator setup in module admin
+NEW: add dedicated substitutions keys for extrafields of type date and datetime
+NEW: add default warehouse for dispatch
+NEW: Add due date in feature "Export accounting documents"
+NEW: Add duration information for fichinter
+NEW: Start support of Dark theme into ELDY theme
+NEW: Add field author public alias for blog post on website module
+NEW: Add "finished" field on product list
+NEW: Add French association chart of accounts 2018
+NEW: Add French farm chart of accounts 2014
+NEW: Add French foundation chart of accounts 2018
+NEW: add global reduction in cash desk
+NEW: Add graph type 'piesemicircle'
+NEW: Add hook getInputIdProf. Better solution for #13228
+NEW: Add hook on margin list page
+NEW: add icon on payment buttons in cash desk
+NEW: Add include various payments and loans in accounting report with simplfified accountancy
+NEW: Add invoice stat graph and categ search
+NEW: Addition of delivery times in substitution variables
+NEW: add member to validate on dashboard
+NEW: Add method to add social network sharing buttons on blog posts
+NEW: add multicurrency columns to document lists
+NEW: add numbering module for cash desk
+NEW: add Opening Balance column to balance.php
+NEW: add opportunity status in project stats
+NEW: Add option PDF_USE_ALSO_LANGUAGE_CODE to generate PDF in 2 languages
+NEW: Add option to hide all inactive users into combo list of users.
+NEW: add PDF certificate if present on document folder
+NEW: add product if only one found
+NEW: Add product on key "Enter" in search bar
+NEW: add professional ID 1 in sepamandate document
+NEW: Add Project Ref Column on list of social/fiscal contributions
+NEW: add Project Ref in events export
+NEW: add public and private notes in propal list
+NEW: Add social networks of the company
+NEW: Add sorting for contacts of ... pages
+NEW: Add subtitution variables for url of document in backoffice
+NEW: Add tel and fax in warehouse card
+NEW: add total of value in product stat
+NEW: add total weighted amount in project list
+NEW: add units in product list
+NEW: add VAT ID in sepamandate document
+NEW: add VAT rates in free zone for product/service in TakePOS
+NEW: add weighted amount on project/opportunity
+NEW: add width and height measures in product list
+NEW: add WYSiWYG on member type's description
+NEW: [Allow constants values to be overridden by environment variables]
+NEW: Allow custom module class origine type in Mouvementstock
+NEW: allow display extrafields on pdf
+NEW: Allow extrafields on pdf : extend to line desc
+NEW: allow time consumed to be linked to another task
+NEW: Another way to navigate between pages for some lists
+NEW: Add author column in the client/supplier invoice lists and into order list
+NEW: bank account tags for invoice ODT template
+NEW: Bar Restaurant tab and Auto order
+NEW: better filter on shipment list as other list
+NEW: Better php module view admin
+NEW: Bookkeeping - Add link to document & pdf
+NEW: Bookmarks are now in top menu bar
+NEW: Can check all events in one click in setup of audited events
+NEW: Can create an deposit from order using a percentage of qty.
+NEW: Can edit option PDF_USE_ALSO_LANGUAGE_CODE from PDF setup page
+NEW: Can enter and edit stripe credit card using the Stripe card ID
+NEW: Can filter on donation status in list
+NEW: Can replace a string into all pages in website module
+NEW: Can select several fields to personalize list before submit.
+NEW: Can select which element to export in export accounting documents.
+NEW: can update contact in import model
+NEW: Cash Fence in TakePOS
+NEW: Categories and subcategories sorted by label in TakePOS
+NEW: Categories for actioncomm
+NEW: Category filter for bank and warehouse list
+NEW: Chart of accounts to Ecuador
+NEW: class tool for converting units
+NEW: Close #13011 Add button create thirdparty when creating intervention
+NEW: Colorful theme for TakePOS
+NEW: columns units in product list
+NEW: compatibility of translabel with more dictionaries
+NEW: Confirm file delete on invoice card
+NEW: "contact_civility" for ODT templates
+NEW: CUPS printing compatibility for TakePOS
+NEW: Customer command list - Add date start & date end
+NEW: display weight in shipment list
+NEW: Documentation about PHP support in Dolibarr
+NEW: Donation - Update FR CERFA to 11580*04
+NEW: Easier way to setup the different types of tax. Better visibility.
+NEW: Expedition list - Add date start & date end
+NEW: Experiment supplier packaging with option PRODUCT_USE_SUPPLIER_PACKAGING: Using price according to the minimum quantity
+NEW: Export module, add extrafields for Contract and Contract line
+NEW: Extend retained warranty to be  available for all invoices
+NEW: French new regions
+NEW: hook and data id
+NEW: hook on ics generation to add more events in eventarray
+NEW: hook on product load stats
+NEW: If $dolibarr_main_force_https is set, the flag 'secure' on session
+NEW: ignore dir for apple pay with stripe
+NEW: Invoice list - Add date start & date end
+NEW: invoice list: enable multicurrency columns
+NEW: labels on reduction buttons in cash desk
+NEW: Minimum sell prices taking into account in TakePOS
+NEW: monthly view to enter time
+NEW: Multiple sales in TakePOS
+NEW: multiselect categorie client stats facturation
+NEW: no confirm discard ticket if paid
+NEW: not show linked table on add message action
+NEW: only auto print paid ticket in cash desk
+NEW: only show units columns in product list (not in service list)
+NEW: order list: enable multicurrency columns
+NEW: Overwrite tpl with module_part['tpl'] is deprecated. USe hooks
+NEW: possibility to defined rounding rules by currency
+NEW: possibility to show society info when print page
+NEW: Povide a RSS Feed for blogposts
+NEW: PRODUCT_SHOW_ORIGIN_IN_COMBO
+NEW: Project task list, add column selector and extrafields
+NEW: Propal list - Add date start & date end
+NEW: propal list: enable multicurrency columns
+NEW: RECEIPT_PRINTER_NB_CHARACT_BY_LINE and FIX: product label
+NEW: Restore version of application on main screen (for screenshots)
+NEW: Salaries list - Add date start & date end
+NEW: search on key code "enter" if defined in TakePOS
+NEW: set payment method on paid ticket in TakePOS
+NEW: Show active widget state of a RSS feed
+NEW: Show count of each category elements in category card
+NEW: Show creator, last update user of category/tag in the information tab
+NEW: Show list of users in the user category card
+NEW: show messages on ticket card
+NEW: show "New category" button in top of sub categories list
+NEW: show project label in project index
+NEW: Show units of products in stocks and hide total units if content is of diffents units
+NEW: sorting elements on project overview
+NEW: special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other documents lines the id of original lines and origin class line rather than origin object id and origin object type
+NEW: stats invoice graph with 3 bars (3 years instead of 2)
+NEW: supplier invoice list: enable multicurrency columns
+NEW: supplier order list: enable multicurrency columns
+NEW: supplier proposal list: enable multicurrency columns
+NEW: Support of tag {line_pos} for line numbers for tables in ODT templates
+NEW: Support some HTML contents into ODT documents
+NEW: Parameters for Bar Restaurant are grouped in same tab
+NEW: Takepos : Sort products by reference
+NEW: Takepos supplements are supported.
+NEW: The info_admin() can show text after click on other text
+NEW: The module selection uses a KanBan view by default.
+NEW: tooltip for Unit_type and scale in "Dictionary setup - Measuring Units"
+NEW: tooltip notes with first public note and then private note
+NEW: Tree view for sub-categories
+NEW: Truncate columns names when too long and show full title as popup
+NEW: upload odt models for invoices, order, proposal, thirdparties and shipments.
+NEW: Use native --convert-to feature to convert to pdf
+NEW: Add user on order list
+NEW: Various payment list - Add search date start & date end & subledger account
+NEW: visu FROM day TO day in permonth view
+NEW: Website logs are now into a separated log file.
+NEW: X-Axis on graph are shown verticaly when there is a lot of values.
+NEW: Can force ref of a variant product
+
+For developers or integrators:
+
+NEW: Add a method $form->widgetForTranslation to allow any field of a form to be entered into different languages.
+NEW: Add API to get types of expense reports
+NEW: API filter bankaccounts by category
+NEW: API filter contacts by category
+NEW: API filter members by category
+NEW: API filter projects by category
+NEW: API filter thirdparty by category
+NEW: API filter user by category
+NEW: API filter warehouses by categorie
+NEW: api for  get user's documents
+NEW: api invoice get by ref
+NEW: API to update purchase price.
+NEW: Move engine to build charts from jflot to chart.js
+NEW: Upgrade ace to 1.4.8 - Upgrade select2 to 4.0.13
+NEW: Upgrade Stripe library to 6.43.1
+NEW: Bookkeeping by account - Add selectfields & hook
+NEW: Can force position of legend of graph on right (instead of top)
+NEW: Can change destination of "Back to list" using a "backtolist" parameter
+NEW: add more category types from hook
+NEW: enable put for agendaevents api
+NEW: filter by product on supplier order API
+NEW: get documents for categories with RESP API
+NEW: get proposal by ref with API
+NEW: Hidden option MAIN_TEMP_DIR
+
+WARNING:
+
+Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
+* PHP 5.5 is no more supported. Minimum PHP is now 5.6+.
+* Default mode for GETPOST function is now 'alphanohtml' instead of 'none'. So check when you make POST or GET requests with
+  HTML content that you make a GETPOST('myparam', 'restricthtml') or GETPOST('myparam', 'none') if you really need posted content without sanitizing
+  the HTML code of content (in such a case, sanitize data later)
+* Removed hidden constant MAIN_EXTRAFIELDS_IN_ONE_TD that was useless. 
+* Reference of object including a "/" are no more allowed. It is never used by default but to support setup that introduced it, the "/" will be replaced 
+  by a "_" automatically when a reference (with a custom numbering mask that use it) is generated.  
+* Library jflot (replace with chartjs) was removed.
+* Library geoip (replaced with geoip2) was removed.  
+* Hidden constant COMMANDE_VALID_AFTER_CLOSE_PROPAL was renamed into ORDER_VALID_AFTER_CLOSE_PROPAL.
+* Object field ref_int is deprecated and set to 'not used', method to fetch object by only ref_int is not supported anymore.
+* UserGroup class has been refactored with new architecture. Triggers of class UserGroup are now USERGROUP_CREATE, USERGROUP_MODIFY, USERGROUP_DELETE
+* A new way to navigate between pages in list is available. To use it (not mandatory), you must:
+  - replace line $page = GETPOST('page', 'int') with $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); 
+  - remove input field in form '<input type="hidden" name="page" value="'.$page.'">';'
+  - add parameter $pagenavastextinput to value 1 when calling print_barre_liste()
+
+WARNING FOR DOLIWAMP USERS ONLY:
+
+Only people that installed Dolibarr using the all-in-one autoinstaller for Windows called "DoliWAMP" are concerned by the following warnings:
+ 
+* DoliWAMP autoinstaller for Windows is not more available on 32bits systems. Use standard package if you need to use such architecture.
+* It is not possible to migrate from an installation done with the old DoliWAMP autoinstaller for Windows by using this new one. You must make a backup 
+  of your database, make a fresh installation using the new installer and reload.
+* Don't forget that DoliWAMP is a good solution to make a quick test of Dolibarr on your local computer but was never recommanded as a production
+  solution on a local desktop since a desktop computer has not a backup and security policy as good as on a server (when there is one). 
+  DoliWAMP remains a solution for fast test or demo purposes.
+
+
 ***** ChangeLog for 11.0.5 compared to 11.0.4 *****
 FIX: $arraydefaultmessage is an object, as well as in /htdocs/core/class/html.formmail.class.php
 FIX: 10.0 - pagination in prelevement/bons.php
@@ -292,6 +824,7 @@ FIX: #13094
 FIX: #13096
 FIX: #13100
 
+
 ***** ChangeLog for 11.0.0 compared to 10.0.0 *****
 For Users:
 

README-FR.md

@@ -151,6 +151,7 @@ La documentation utilisateur, développeur et traducteur est disponible sous for
 ## CONTRIBUER
 
 Ce projet existe grâce à ses nombreux contributeurs [[Contribuer](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)].
+
 <a href="https://github.com/Dolibarr/dolibarr/graphs/contributors"><img src="https://opencollective.com/dolibarr/contributors.svg?width=890&button=false" /></a>
 
 ## CREDITS

README.md

@@ -5,7 +5,7 @@
 
 Dolibarr ERP & CRM is a modern software package to manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda…).
 
-It's an Open Source Software (written in PHP language) designed for small, medium or large companies, foundations and freelances.
+It's an Open Source Software (written in PHP language) designed for small, medium or large companies, foundations and freelancers.
 
 You can freely use, study, modify or distribute it according to its Free Software licence.
 
@@ -27,8 +27,8 @@ Other licenses apply for some included dependencies. See [COPYRIGHT](https://git
 
 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
-- DoliDeb for Debian or Ubuntu
+- [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 Redhat, Fedora, OpenSuse, Mandriva or Mageia
 
 Releases can be downloaded from [official website](https://www.dolibarr.org/).
@@ -37,6 +37,8 @@ Releases can be downloaded from [official website](https://www.dolibarr.org/).
 
 You can use a Web server and a supported database (MariaDB, MySQL or PostgreSQL) to install the standard version.
 
+- Check that your installed PHP version is supported [see PHP support](https://wiki.dolibarr.org/index.php/Versions).
+
 - 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 known git):
 
   `git clone https://github.com/dolibarr/dolibarr -b x.y`     (where x.y is main version like 3.6, 9.0, ...)
@@ -65,9 +67,11 @@ You can use a Web server and a supported database (MariaDB, MySQL or PostgreSQL)
 
 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
 
 - 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 your 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 into the directory used to store generated and uploaded documents, in most cases, it is the directory called "*documents*").
@@ -82,28 +86,28 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 
 ### Main application/modules (all optional)
 
-- Customers, Prospects (Leads) and/or Suppliers directory
+- Customers, Prospects (Leads) and/or Suppliers directory + Contacts
+- Members management 
 - Products and/or Services catalog
 - Commercial proposals management
-- Customer and Supplier Orders management
+- Customer & Supplier Orders management
 - Invoices and payment management
-- Standing orders management (European SEPA)
+- Shipping management
+- Warehouse/Stock management
+- Manufacturing Orders
 - Bank accounts management
+- Direct debit orders management (European SEPA)
 - Accounting management
 - Shared calendar/agenda (with ical and vcal export for third party tools integration)
-- Opportunities and/or project management
-- Projects management
+- Opportunities or Leads management
+- Projects & Tasks management
 - Contracts management
-- Warehouse/Stock management
-- Shipping management
 - Interventions management
 - Employee's leave requests management
 - Expense reports
 - Timesheets
 - Electronic Document Management (EDM)
 - Foundations members management
-- Mass emailing
-- Surveys
 - Point of Sale (POS)
 - …
 
@@ -112,11 +116,13 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Bookmarks management
 - Donations management
 - Reporting
+- Surveys
 - Data export/import
 - Barcodes support
 - Margin calculations
 - LDAP connectivity
 - ClickToDial integration
+- Mass emailing
 - RSS integration
 - Skype integration
 - Payment platforms integration (PayPal, Stripe, Paybox...)
@@ -170,7 +176,8 @@ Administrator, user, developer and translator's documentations are available alo
 
 ## CONTRIBUTING
 
-This project exists thanks to all the people who contribute. [[Contribute](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)].
+This project exists thanks to all the people who contribute. [[Contribute](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)]
+
 <a href="https://github.com/Dolibarr/dolibarr/graphs/contributors"><img src="https://opencollective.com/dolibarr/contributors.svg?width=890&button=false" /></a>
 
 ## CREDITS

build/README

@@ -45,9 +45,12 @@ Dolibarr working. It is here only to build Dolibarr packages, and those
 generated packages will not contains this "build" directory.
 
 
-We can find in "build", following sub-directories:
+You can find in "build", following sub-directories:
 
-* debian:
+* composer
+To test an upgrade of a lib.
+
+* debian
 To build Debian package.
 
 * dmg:

build/debian/control

@@ -14,7 +14,7 @@ Architecture: all
 Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5 | libapache2-mod-php | libapache2-mod-phpfilter | php-cgi | php-fpm | php,
     php5-cli | php-cli,
 # Required PHP extensions
-    php5-mysql | php5-mysqli | php-mysql | php-mysqli, php5-curl | php-curl, php5-gd | php-gd, php5-ldap | php-gd,
+    php5-mysql | php5-mysqli | php-mysql | php-mysqli, php5-curl | php-curl, php5-gd | php-gd, php5-ldap | php-gd, php5-zip | php-zip,
 # Required PHP libraries
     php-pear, php-mail-mime,
 #    php-tcpdf,

build/docker/Dockerfile

@@ -3,10 +3,11 @@ FROM php:7.2-apache
 ENV HOST_USER_ID 33
 ENV PHP_INI_DATE_TIMEZONE 'UTC'
 
-RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libldap2-dev zlib1g-dev libicu-dev g++\
+RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libldap2-dev libzip-dev zlib1g-dev libicu-dev g++\
 	&& rm -rf /var/lib/apt/lists/* \
 	&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
 	&& docker-php-ext-install gd \
+	&& docker-php-ext-install zip \
 	&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
         && docker-php-ext-install ldap \
         && docker-php-ext-install mysqli \

build/doxygen/doxygen_footer.html

@@ -5,7 +5,7 @@ File added into doxygen generated documentation
 
 
 <hr class="footer" />
-<address class="footer"><small>Generated on $datetime for <a href="https://www.dolibarr.org">$projectname</a> by Doxygen $doxygenversion </small></address>
+<address class="footer"><small>Generated on $datetime for <a href="https://www.dolibarr.org" title="ERP and CRM open source software">$projectname</a> by Doxygen $doxygenversion </small></address>
 
 
 <br>
@@ -22,31 +22,5 @@ File added into doxygen generated documentation
   gtag('config', 'UA-9049390-16');
 </script>
 
-
-<!-- Facebook Pixel Code -->
-<script>
-!function(f,b,e,v,n,t,s){if(f.fbq)return;n=f.fbq=function(){n.callMethod?
-n.callMethod.apply(n,arguments):n.queue.push(arguments)};if(!f._fbq)f._fbq=n;
-n.push=n;n.loaded=!0;n.version='2.0';n.queue=[];t=b.createElement(e);t.async=!0;
-t.src=v;s=b.getElementsByTagName(e)[0];s.parentNode.insertBefore(t,s)}(window,
-document,'script','//connect.facebook.net/en_US/fbevents.js');
-
-fbq('init', '1998533953704960');
-fbq('track', "PageView");</script>
-<noscript><img height="1" width="1" style="display:none"
-src="https://www.facebook.com/tr?id=1998533953704960&ev=PageView&noscript=1"
-/></noscript>
-<!-- End Facebook Pixel Code -->
-
-
-<!-- Twitter ad collector -->
-<script src="//static.ads-twitter.com/oct.js" type="text/javascript"></script>
-<script type="text/javascript">twttr.conversion.trackPid('ntm4n', { tw_sale_amount: 0, tw_order_quantity: 0 });</script>
-<noscript>
-<img height="1" width="1" style="display:none;" alt="" src="https://analytics.twitter.com/i/adsct?txn_id=ntm4n&p_id=Twitter&tw_sale_amount=0&tw_order_quantity=0" />
-<img height="1" width="1" style="display:none;" alt="" src="//t.co/i/adsct?txn_id=ntm4n&p_id=Twitter&tw_sale_amount=0&tw_order_quantity=0" />
-</noscript>
-
-
 </body>
 </html>

build/doxygen/doxygen_header.html

@@ -12,21 +12,6 @@
 <link href="tabs.css" rel="stylesheet" type="text/css" />
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
 <!-- End from dolibarr.org -->
-
-<!-- Facebook Pixel Code -->
-<script>
-!function(f,b,e,v,n,t,s){if(f.fbq)return;n=f.fbq=function(){n.callMethod?
-n.callMethod.apply(n,arguments):n.queue.push(arguments)};if(!f._fbq)f._fbq=n;
-n.push=n;n.loaded=!0;n.version='2.0';n.queue=[];t=b.createElement(e);t.async=!0;
-t.src=v;s=b.getElementsByTagName(e)[0];s.parentNode.insertBefore(t,s)}(window,
-document,'script','//connect.facebook.net/en_US/fbevents.js');
-
-fbq('init', '1998533953704960');
-fbq('track', "PageView");</script>
-<noscript><img height="1" width="1" style="display:none"
-src="https://www.facebook.com/tr?id=1998533953704960&ev=PageView&noscript=1"
-/></noscript>
-<!-- End Facebook Pixel Code -->
 </head>
 
 <body>
@@ -48,15 +33,6 @@ src="https://www.facebook.com/tr?id=1998533953704960&ev=PageView&noscript=1"
 				<div class="bannergroupmybanner">
 
 				<div class="banneritemmybanner">
-<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
-<!-- BAN_728x90_DOXYGEN -->
-<ins class="adsbygoogle"
-     style="display:inline-block;width:728px;height:90px"
-     data-ad-client="ca-pub-1465985984238664"
-     data-ad-slot="4297390217"></ins>
-<script>
-(adsbygoogle = window.adsbygoogle || []).push({});
-</script>
 				<div class="clr"></div>
 				</div>
 

build/exe/doliwamp/Languages/MyCatalan.isl

@@ -1,45 +1,47 @@
 
 [CustomMessages]
 
-NameAndVersion=%1 versi<EFBFBD> %2
+NameAndVersion=%1 versió %2
 AdditionalIcons=Icones addicionals:
 CreateDesktopIcon=Crea una icona a l'&Escriptori
 CreateQuickLaunchIcon=Crea una icona a la &Barra de tasques
 ProgramOnTheWeb=%1 a Internet
-UninstallProgram=Desinstal<EFBFBD>la %1
+UninstallProgram=Desinstal·la %1
 LaunchProgram=Obre %1
-AssocFileExtension=&Associa %1 amb l'extensi<EFBFBD> de fitxer %2
-AssocingFileExtension=Associant %1 amb l'extensi<EFBFBD> de fitxer %2...
+AssocFileExtension=&Associa %1 amb l'extensió de fitxer %2
+AssocingFileExtension=Associant %1 amb l'extensió de fitxer %2...
 
-YouWillInstallDoliWamp=Va a instal<EFBFBD>lar o actualitzar (Apache + Mysql + PHP + Dolibarr) al seu ordinador.
-ThisAssistantInstallOrUpgrade=Aquest assistent instal<EFBFBD>la o actualitza Dolibarr ERP-CRM i tots els seus requisits (Apache, Mysql i PHP) optimitzats per a l'<27>s de Dolibarr.
-IfYouHaveTechnicalKnowledge=Si teniu coneixements t<EFBFBD>cnics i necessita usar la seva Apache, Mysql i PHP amb altres aplicacions a part de Dolibarr, no utilitzeu aquest assistent, hauria laci<EFBFBD> manual d'Dolibarr sobre un Apache, Mysql i PHP existent.
-ButIfYouLook=Per<EFBFBD> si busca una instal<EFBFBD>laci<EFBFBD> autom<EFBFBD>tica, es troba en el bon cam<EFBFBD>...
-DoYouWantToStart=Vol iniciar el proc<EFBFBD>s d'instal<EFBFBD>laci<EFBFBD>/actualitzaci<63>?
+YouWillInstallDoliWamp=Instal·laràs DoliWamp (Dolibarr i altres programaris com Apache, Mysql i PHP) al teu ordinador.
+ThisAssistantInstallOrUpgrade=ALERTA: Utilitzar un ERP CRM instal·lat en un ordinador en local pot ser perillós: si l'ordinador s'espatlla, pots perdre totes les teves dades. Fes-ho si estàs preparat per autogestionar-te còpies de seguretat. Si no, pots utilitzar una instal·lació Saas (pots veure https://saas.dolibarr.org).
+IfYouHaveTechnicalKnowledge=Si tens coneixements tècnics i vols autogestionar el teu Apache, Mysql i PHP, no utilitzis aquest assistent i fes una instal·lació manual de Dolibarr sobre un servidor existent d'Apache, Mysql i PHP.
+ButIfYouLook=Però si busques una instal·lació automàtica en el teu propi ordinador, et trobes en el bon camí...
+DoYouWantToStart=Vols iniciar el procés d'instal·lació?
 
-TechnicalParameters=Par<EFBFBD>metres t<EFBFBD>cnics
-IfFirstInstall=Si es tracta de la primera instal laci<EFBFBD>, haur<EFBFBD> d'especificar alguns par<EFBFBD>metres t<EFBFBD>cnics. Si no els ent<EFBFBD>n, no sabeu o va a procedir a una actualitzaci<EFBFBD>, deixi els camps amb els valors proposats per defecte.
+TechnicalParameters=Paràmetres tècnics
+IfFirstInstall=Si es tracta de la primera instal·lació, hauràs d'especificar alguns paràmetres tècnics. Si no els entens, no n'estàs segur, o estàs fent una actualització, pots deixar els valors per defecte.
 
-; WARNING !!! STRINGS HERE MUST BE LOWER THAN 70 CHARACTERS
-SMTPServer=Servidor SMTP (El seu o el del seu ISP, <20>nicament primera instal.laci<EFBFBD>) :
-ApachePort=Puerto Apache (<EFBFBD>nicament primera instal.laci<EFBFBD>, normalment <EFBFBD>s el 80) :
-MySqlPort=Puerto Mysql (<EFBFBD>nicament primera instal.laci<EFBFBD>, normalment <EFBFBD>s el 3306) :
-MySqlPassword=Contrasenya del servidor i la base de dades MySQL de root (<EFBFBD>nicament primera instal.laci<EFBFBD>):
+; WARNING !!! STRINGS HERE MUST BE LOWER THAN 60 CHARACTERS
+SMTPServer=Servidor SMTP (propi o ISP, només primera instal·lació) :
+ApachePort=Port Apache (només primera instal·lació, normalment el 80) :
+MySqlPort=Port MySql (només primera instal·lació, normalment el 3306) :
+MySqlPassword=Contrasenya del servidor i base de dades MySql de root (només primera instal·lació):
 
-FailedToDeleteLock=FailedToDeleteLock=Error en l'eliminaci<EFBFBD> del fitxer %1/www/dolibarr/install.lock. Pot ignorar l'av<EFBFBD>s per<EFBFBD> <20>s possible que hagi de eliminar-lo manualment m<EFBFBD>s tard. En aquest cas, ser<EFBFBD> informat. Feu clic a OK per continuar...
+FailedToDeleteLock=FailedToDeleteLock=Error en l'eliminació del fitxer %1/www/dolibarr/install.lock. Pots ignorar l'avís però és possible que hagis d'eliminar-lo manualment més tard. En aquest cas, serà informat. Fes clic a OK per continuar...
 
-PortAlreadyInUse=Sembla que el port %1 ja est<EFBFBD> sent utilitzat. Es recomana cancel<EFBFBD>lar, tornar enrere i especificar un altre valor per al port% 2. Cancel<EFBFBD>lar i escollir un altre valor?
+PortAlreadyInUse=Sembla que el port %1 ja està sent utilitzat. Es recomana cancel·lar, tornar enrere i especificar un altre valor per al port% 2. Vols cancel·lar i escollir un altre valor?
 
-FirefoxDetected=S'ha detectat Firefox al seu ordinador. Voleu activar per defecte com a navegador per Dolibarr?
-ChromeDetected=S'ha detectat Chrome al seu ordinador. Voleu activar per defecte com a navegador per Dolibarr?
-ChooseDefaultBrowser=Esculli el seu navegador per defecte. Si no est<EFBFBD> segur, simplement feu clic a Obrir:
+FirefoxDetected=S'ha detectat Firefox al teu ordinador. El vols utilitzar com a navegador per defecte per Dolibarr?
+ChromeDetected=S'ha detectat Chrome al teu ordinador. El vols utilitzar com a navegador per defecte per Dolibarr?
+ChooseDefaultBrowser=Escull el teu navegador per defecte (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...).. Si no estàs segur, simplement fes clic a Obre:
 
-LaunchNow=Llan<EFBFBD>ar ara Dolibarr
+LaunchNow=Obre ara el Dolibarr
 
-ProgramHasBeenRemoved=Els arxius del programa Dolibarr han estat eliminats. No obstant aix<EFBFBD> tots els seus arxius de dades es troben encara al directori %1. Haur<EFBFBD> eliminar aquest directori manualment per a una desinstal completa.
+ProgramHasBeenRemoved=Els arxius del programa Dolibarr han estat eliminats. No obstant això tots els seus arxius de dades es troben encara al directori %1. Hauràs d'eliminar aquest directori manualment per a una desinstal·lació completa.
 
-DoliWampWillStartApacheMysql=L'instal<EFBFBD>lador DoliWamp intentar<EFBFBD> iniciar o reiniciar Apache i MySQL, aix<EFBFBD> pot durar des de diversos segons a un minut despr<EFBFBD>s de la confirmaci<EFBFBD>. Iniciar la instal<EFBFBD>laci<EFBFBD> o actualitzaci<EFBFBD> dels servidors web i bases de dades requerides per Dolibarr?
+DoliWampWillStartApacheMysql=L'instal·lador DoliWamp intentarà iniciar o reiniciar Apache i MySQL, això pot durar des de diversos segons a un minut després de la confirmació. Vols iniciar la instal·lació o actualització dels servidors web i de base de dades requerides per Dolibarr?
 
-OldVersionFoundAndMoveInNew=S'ha trobat una versi<EFBFBD> antiga de base de dades i ha estat moguda per a ser utilitzada per la nova versi<EFBFBD> de Dolibarr
-OldVersionFoundButFailedToMoveInNew=S'ha trobat una versi<EFBFBD> antiga de base de dades, per<EFBFBD> no es pot moure per a ser utilitzada per la nova versi<EFBFBD> de Dolibarr
+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 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)

build/exe/doliwamp/Languages/MyEnglish.isl

@@ -11,11 +11,11 @@ LaunchProgram=Launch %1
 AssocFileExtension=&Associate %1 with the %2 file extension
 AssocingFileExtension=Associating %1 with the %2 file extension...
 
-YouWillInstallDoliWamp=You will install or upgrade DoliWamp (so Dolibarr + all required third party software like Apache, Mysql and PHP) on your computer.
+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/upgrade process ?
+DoYouWantToStart=Do you want to start installation process ?
 
 TechnicalParameters=Technical parameters
 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.
@@ -32,6 +32,7 @@ PortAlreadyInUse=Port %1 seems to be already in use. You should cancel to go bac
 
 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

build/exe/doliwamp/Languages/MyFrench.isl

@@ -11,11 +11,11 @@ LaunchProgram=Ex
 AssocFileExtension=&Associer %1 avec l'extension de fichier %2
 AssocingFileExtension=Associe %1 avec l'extension de fichier %2...
 
-YouWillInstallDoliWamp=Vous allez installer ou mettre <20> jour DoliWamp sur votre ordinateur (donc Dolibarr + tous ses composants pr<70>requis comme Apache, Mysql et PHP).
+YouWillInstallDoliWamp=Vous allez installer DoliWamp sur votre ordinateur (donc Dolibarr + tous ses composants pr<70>requis comme Apache, Mysql et PHP).
 ThisAssistantInstallOrUpgrade=AVERTISSEMENT: L'utilisation d'un ERP CRM install<6C> sur un ordinateur local peut <20>tre dangereuse: si votre ordinateur tombe en panne, vous pouvez perdre toutes vos donn<6E>es. Faites-le si vous <20>tes pr<70>t <20> g<>rer les sauvegardes vous-m<>me s<>rieusement. Sinon, utilisez plut<75>t une installation en Saas (voir https://saas.dolibarr.org).
 IfYouHaveTechnicalKnowledge=De plus, si vous avez des comp<6D>tences techniques et envisagez de partager votre Apache, Mysql et PHP avec d''autres applications que Dolibarr, vous ne devriez pas utiliser cet assistant mais faire plut<75>t une installation manuelle de Dolibarr sur un serveur existant <20>quip<69> de Apache, Mysql et PHP.
 ButIfYouLook=Mais si vous recherchez une installation cl<63> en main automatis<69>e sur une poste local, vous <20>tes sur la bonne voie...
-DoYouWantToStart=Voulez-vous d<>marrer le processus d'installation/mise <20> jour ?
+DoYouWantToStart=Voulez-vous d<>marrer le processus d'installation ?
 
 TechnicalParameters=Param<61>tres techniques
 IfFirstInstall=S'il s'agit de la premi<6D>re installation, merci de sp<73>cifier ces quelques param<61>tres techniques. Si vous ne les comprennez pas, <20>tes non s<>r, ou proc<6F>dez <20> une mise <20> jour, laissez les champs avec les valeurs propos<6F>es par d<>faut.

build/exe/doliwamp/Languages/MyGerman.isl

@@ -2,7 +2,7 @@
 [CustomMessages]
 
 NameAndVersion=%1 Version %2
-AdditionalIcons=Zus<EFBFBD>tzliche Symbole:
+AdditionalIcons=Zusätzliche Symbole:
 CreateDesktopIcon=&Desktop-Symbol erstellen
 CreateQuickLaunchIcon=Symbol in der Schnellstartleiste erstellen
 ProgramOnTheWeb=%1 im Internet
@@ -10,3 +10,38 @@ UninstallProgram=%1 entfernen
 LaunchProgram=%1 starten
 AssocFileExtension=&Registriere %1 mit der %2-Dateierweiterung
 AssocingFileExtension=%1 wird mit der %2-Dateierweiterung registriert...
+
+
+YouWillInstallDoliWamp=Sie installieren DoliWamp (also Dolibarr + alle erforderliche Software von Drittanbietern wie Apache, MySQL und PHP) auf Ihrem Computer.
+ThisAssistantInstallOrUpgrade=WARNUNG: Die Verwendung eines auf einem lokalen Computer installierten ERP-CRM kann gefährlich sein: Wenn Ihr Computer ausfällt, können Sie alle Ihre Daten verlieren. Tun Sie dies, wenn Sie bereit sind, das Backup selbst ernsthaft zu verwalten. Wenn nicht, verwenden Sie stattdessen eine Installation in Saas (siehe https://saas.dolibarr.org).
+IfYouHaveTechnicalKnowledge=Wenn Sie über technische Kenntnisse verfügen und Apache, MySQL und PHP selbst verwalten möchten, sollten Sie diesen Assistenten nicht verwenden und eine manuelle Installation von Dolibarr auf Ihrem vorhandenen Server mit Apache, MySQL und PHP durchführen.
+ButIfYouLook=Aber wenn Sie auf Ihrem lokalen Computer nach einer automatischen Einrichtung suchen, sind Sie auf dem besten Weg ...
+DoYouWantToStart=Möchten Sie den Installationsprozess starten?
+
+TechnicalParameters=technische Parameter
+IfFirstInstall=Geben Sie bei der Erstinstallation einige technische Parameter an. Wenn Sie nicht verstehen, sich nicht sicher sind oder ein Upgrade durchführen, belassen Sie einfach die Standardwerte.
+
+; 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, Standard ist 80) :
+MySqlPort=MySQL Port (first install only, Standard ist 3306) :
+MySqlPassword=MySQL Server und Datenbank Passwort für root (first install only):
+
+FailedToDeleteLock=Fehler beim Löschen der Datei %1/www/dolibarr/install.lock. Sie können die Warnung ignorieren, müssen sie jedoch möglicherweise später manuell entfernen, wenn Sie dazu aufgefordert werden. Klicken Sie auf OK, um fortzufahren ...
+
+PortAlreadyInUse=Port %1 scheint bereits verwendet zu werden. Sie sollten zurückgehen und einen anderen Wert für %2 Port wählen.  Auswahl abbrechen und einen anderen Wert wählen ? 
+
+FirefoxDetected=Firefox wurde auf Ihrem Computer erkannt. Möchten Sie ihn als Standardbrowser für Dolibarr verwenden?
+ChromeDetected=Chrome wurde auf Ihrem Computer erkannt. Möchten Sie ihn als Standardbrowser für Dolibarr verwenden?
+ChooseDefaultBrowser=Bitte wählen Sie Ihren Standardbrowser (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...). Wenn Sie sich nicht sicher sind, klicken Sie einfach auf Öffnen:
+
+LaunchNow=Starten Sie jetzt Dolibarr
+
+ProgramHasBeenRemoved=Die Dolibarr-Programmdateien wurden entfernt. Alle Ihre Daten befinden sich jedoch noch im Verzeichnis %1. Für eine vollständige Deinstallation, müssen Sie dieses Verzeichnis manuell entfernen.
+DoliWampWillStartApacheMysql=Die DoliWamp-Installation wird nun starten oder Apache und MySQL neu starten. Dies kann nach dieser Bestätigung einige Sekunden bis eine Minute dauern. Wollen Sie mit der Installation oder Aktualisierung des von Dolibarr benötigten Web- und Datenbankservers starten ?
+
+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 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).

build/exe/doliwamp/Languages/MySpanish.isl

@@ -1,45 +1,47 @@
 
 [CustomMessages]
 
-NameAndVersion=%1 versi<EFBFBD>n %2
+NameAndVersion=%1 versión %2
 AdditionalIcons=Iconos adicionales:
 CreateDesktopIcon=Crear un icono en el &escritorio
-CreateQuickLaunchIcon=Crear un icono de Inicio R<EFBFBD>pido
+CreateQuickLaunchIcon=Crear un icono de Inicio Rápido
 ProgramOnTheWeb=%1 en la Web
 UninstallProgram=Desinstalar %1
 LaunchProgram=Ejecutar %1
-AssocFileExtension=&Asociar %1 con la extensi<EFBFBD>n de archivo %2
-AssocingFileExtension=Asociando %1 con la extensi<EFBFBD>n de archivo %2...
+AssocFileExtension=&Asociar %1 con la extensión de archivo %2
+AssocingFileExtension=Asociando %1 con la extensión de archivo %2...
 
-YouWillInstallDoliWamp=Va a instalar o actualizar (Apache+Mysql+PHP+Dolibarr) en su ordenador.
-ThisAssistantInstallOrUpgrade=Este asistente instala o actualiza Dolibarr ERP-CRM y todos sus requisitos (Apache, Mysql y PHP) optimizados para el uso de  Dolibarr.
-IfYouHaveTechnicalKnowledge=Si tiene conocimientos t<EFBFBD>cnicos y necesita usar su Apache, Mysql y PHP con otras aplicaciones aparte de Dolibarr, no deber<EFBFBD>a usar este asistente, deber<EFBFBD>a realizar una instalaci<EFBFBD>n manual de Dolibarr sobre un Apache, Mysql y PHP existente.
-ButIfYouLook=Pero si busca una instalaci<EFBFBD>n autom<EFBFBD>tica, se encuentra en el buen camino...
-DoYouWantToStart=<EFBFBD>Quiere iniciar el proceso de instalaci<EFBFBD>n/actualizaci<63>n?
+YouWillInstallDoliWamp=Va a instalar DoliWamp (Dolibarr y otro software como Apache, Mysql y PHP) en su ordenador.
+ThisAssistantInstallOrUpgrade=ALERTA: Utilizar un ERP CRM instalado en un ordenador en local puede ser peligroso: si el ordenador se estropea, puede perder todos sus datos. Hágalo si está preparado para autogestionar sus copias de seguridad. Si no, puede utilizar una instalacion Saas (puede ver https://saas.dolibarr.org).
+IfYouHaveTechnicalKnowledge=Si tiene conocimientos técnicos y necesita usar su Apache, Mysql y PHP con otras aplicaciones aparte de Dolibarr, no debería usar este asistente, debería realizar una instalación manual de Dolibarr sobre un Apache, Mysql y PHP existente.
+ButIfYouLook=Pero si busca una instalación automática en tu propio ordenador, se encuentra en el buen camino...
+DoYouWantToStart=¿Quiere iniciar el proceso de instalación?
 
-TechnicalParameters=Par<EFBFBD>metros t<EFBFBD>cnicos
-IfFirstInstall=Si se trata de la primera instalaci<EFBFBD>n, deber<EFBFBD> especificar algunos par<EFBFBD>metros t<EFBFBD>cnicos. Si no los entiende, no est<EFBFBD> seguro o va a proceder a una actualizaci<EFBFBD>n, deje los campos con los valores propuestos por defecto.
+TechnicalParameters=Parámetros técnicos
+IfFirstInstall=Si se trata de la primera instalación, deberá especificar algunos parámetros técnicos. Si no los entiende, no está seguro o va a proceder a una actualización, deje los campos con los valores propuestos por defecto.
 
-; WARNING !!! STRINGS HERE MUST BE LOWER THAN 70 CHARACTERS
-SMTPServer=Servidor SMTP (El suyo o el de su ISP, <20>nicamente primera instalaci<EFBFBD>n) :
-ApachePort=Puerto Apache (<EFBFBD>nicamente primera instalaci<EFBFBD>n, normalmente es el 80) :
-MySqlPort=Puerto Mysql (<EFBFBD>nicamente primera instalaci<EFBFBD>n, normalmente es el 3306) :
-MySqlPassword=Contrase<EFBFBD>a del servidor y la base de datos MySQL de root (<EFBFBD>nicamente primera instalaci<EFBFBD>n):
+; WARNING !!! STRINGS HERE MUST BE LOWER THAN 60 CHARACTERS
+SMTPServer=Servidor SMTP (propio o su ISP, sólo primera instalación) :
+ApachePort=Puerto Apache (sólo primera instalación, normalmente el 80) :
+MySqlPort=Puerto Mysql (sólo primera instalación, normalmente el 3306) :
+MySqlPassword=Contraseña del servidor y la base de datos MySQL de root (sólo primera instalación):
 
-FailedToDeleteLock=Error en la eliminaci<EFBFBD>n del archivo %1/www/dolibarr/install.lock. Puede ignorar el aviso pero es posible que deba eliminarlo manualmente m<EFBFBD>s tarde. En este caso, ser<EFBFBD> informado. Haga clic en OK para continuar...
+FailedToDeleteLock=Error en la eliminación del archivo %1/www/dolibarr/install.lock. Puede ignorar el aviso pero es posible que deba eliminarlo manualmente más tarde. En este caso, será informado. Haga clic en OK para continuar...
 
-PortAlreadyInUse=Parece que el puerto %1 ya esta siendo usado. Se recomienda cancelar, volver atras y especificar otro valor para el puerto %2. <EFBFBD>Cancelar y escojer otro valor?
+PortAlreadyInUse=Parece que el puerto %1 ya esta siendo usado. Se recomienda cancelar, volver atras y especificar otro valor para el puerto %2. ¿Cancelar y escojer otro valor?
 
 FirefoxDetected=Se ha detectado Firefox en su ordenador. Desea activarlo por defecto como navegador para Dolibarr ?
 ChromeDetected=Se ha detectado Chrome en su ordenador. Desea activarlo por defecto como navegador para Dolibarr ?
-ChooseDefaultBrowser=Escoja su navegador por defecto. Si no est<EFBFBD> seguro, simplementa haga clic en Abrir :
+ChooseDefaultBrowser=Escoja su navegador por defecto (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...). Si no está seguro, simplementa haga clic en Abrir :
 
 LaunchNow=Lanzar ahora Dolibarr
 
-ProgramHasBeenRemoved=Los archivos del programa Dolibarr han sido eliminados. Sin embargo todos sus archivos de datos se encuentran todav<EFBFBD>a en el directorio %1. Deber<EFBFBD> eliminar este directorio manualmente para una desinstalaci<EFBFBD>n completa.
+ProgramHasBeenRemoved=Los archivos del programa Dolibarr han sido eliminados. Sin embargo todos sus archivos de datos se encuentran todavía en el directorio %1. Deberá eliminar este directorio manualmente para una desinstalación completa.
 
-DoliWampWillStartApacheMysql=El instalador DoliWamp intentar<EFBFBD> iniciar o reiniciar Apache y MySQL, esto puede durar desde varios segundos a un minuto despu<EFBFBD>s de la confirmaci<EFBFBD>n. <EFBFBD>Iniciar la instalaci<EFBFBD>n o actualizaci<EFBFBD>n de los servidores Web y bases de datos requeridas por Dolibarr?
+DoliWampWillStartApacheMysql=El instalador DoliWamp intentará iniciar o reiniciar Apache y MySQL, esto puede durar desde varios segundos a un minuto después de la confirmación. ¿Iniciar la instalación o actualización de los servidores Web y bases de datos requeridas por Dolibarr?
 
-OldVersionFoundAndMoveInNew=Se ha encontrado una versi<EFBFBD>n antigua de base de datos y ha sido movida para ser utilizada por la nueva versi<EFBFBD>n de Dolibarr
-OldVersionFoundButFailedToMoveInNew=Se ha encontrado una versi<EFBFBD>n antigua de base de datos, pero no se pudo mover para ser utilizada por la nueva versi<EFBFBD>n de Dolibarr
- 	  	 
+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 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)

build/exe/doliwamp/doliwamp.iss

@@ -32,7 +32,7 @@ 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-2019 Laurent Destailleur (NLTechno), 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
@@ -41,7 +41,7 @@ Compression=lzma
 SolidCompression=yes
 WizardImageFile=build\exe\doliwamp\doliwamp.bmp
 WizardSmallImageFile=build\exe\doliwamp\doliwampsmall.bmp
-SetupIconFile=doc\images\dolibarr.ico
+SetupIconFile=doc\images\dolibarr_favicon.ico
 ;To say the installer must be ran as admin
 PrivilegesRequired=admin
 DisableProgramGroupPage=yes
@@ -81,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.9\logs"
+Name: "{app}\bin\apache\apache2.4.41\logs"
 
 [Files]
 ; Stop/start
@@ -98,35 +98,48 @@ Source: "build\exe\doliwamp\mysqltestinstall.bat.install"; DestDir: "{app}\"; Fl
 Source: "build\exe\doliwamp\startdoliwamp_manual_donotuse.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\builddemosslfiles.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversion;
+
 ; PhpMyAdmin, Apache, Php, Mysql
 ; Put here path of Wampserver applications
 ; 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.19, 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)
-Source: "C:\Program Files\Wamp\apps\phpmyadmin4.1.14\*.*"; DestDir: "{app}\apps\phpmyadmin4.1.14"; 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:\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:\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"
+; 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)
-Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db"
+; 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
+;Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mariadb\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db"
+
 ; Dolibarr
 Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,documents\*,includes\ckeditor\_source\*,includes\savant\*,includes\phpmailer\*,jquery\plugins\template\*,nltechno*\*,sabre\sabre\*\tests,PHPExcel\Shared\PDF\*,PHPExcel\Shared\PCLZip\*,tcpdf\fonts\dejavu-fonts-ttf-2.33\*,tcpdf\fonts\freefont-20100919\*,tcpdf\fonts\utils\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\conf.php.sav,*\install.forced.php"
 Source: "dev\*.*"; DestDir: "{app}\www\dolibarr\dev"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,dbmodel\*,fpdf\*,initdata\*,initdemo\*,iso-normes\*,licence\*,phpcheckstyle\*,phpunit\*,samples\*,test\*,uml\*,vagrant\*,xdebug\*"
 Source: "doc\*.*"; DestDir: "{app}\www\dolibarr\doc"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,wiki\*,plaquette\*,dev\*,images\dolibarr_screenshot2.png,images\dolibarr_screenshot3.png,images\dolibarr_screenshot4.png,images\dolibarr_screenshot5.png,images\dolibarr_screenshot6.png,images\dolibarr_screenshot7.png,images\dolibarr_screenshot8.png,images\dolibarr_screenshot9.png,images\dolibarr_screenshot10.png,images\dolibarr_screenshot11.png,images\dolibarr_screenshot12.png"
 Source: "scripts\*.*"; DestDir: "{app}\www\dolibarr\scripts"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,product\materiel.net.php,product\import-product.php"
 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\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.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\php.ini.install"; DestDir: "{app}\bin\php\php5.5.12"; 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;
 Source: "build\exe\doliwamp\ca_demo_dolibarr.crt"; DestDir: "{app}"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\ca_demo_dolibarr.key"; DestDir: "{app}"; Flags: ignoreversion;
+
 ; Licence
 Source: "COPYRIGHT"; DestDir: "{app}"; Flags: ignoreversion;
 
@@ -227,9 +240,12 @@ procedure InitializeWizard();
 begin
 
   //version des applis, a modifier pour chaque version de WampServer 2
-  apacheVersion := '2.4.9';
-  phpVersion := '5.5.12' ;
-  mysqlVersion := '5.0.45';
+  //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';
@@ -361,18 +377,19 @@ begin
     winPath := ExpandConstant('{win}');
     pathWithSlashes := path;
     StringChange (pathWithSlashes, '\','/');
-    datadir := pathWithSlashes+'/bin/mysql/data';
-    exedirold := pathWithSlashes+'/bin/mysql/mysql5.0.45';
-    exedirnew := pathWithSlashes+'/bin/mysql/mysql5.0.45';
 
 	
-	
+	// Migration of database
+//	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.
     // Install of service and stop/start scripts are already rebuild by installer.
 //      FileCopy(exedirold+'/my.ini',exedirnew+'/my.ini', true);
 
-//    We should not need this, also databases may not be called dolibarr
+	// We should not need this, also databases may not be called dolibarr
 //      res := RenameFile(ibdata1dirold+'/dolibarr',ibdata1dirnew+'/dolibarr');
 //      if res then
 //      begin
@@ -392,39 +409,21 @@ begin
     //----------------------------------------------
 	// TODO Update this list when changing PHP/Apache versions
 	
-    phpDllCopy := 'fdftk.dll';
+    phpDllCopy := 'libssh2.dll';
     filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'fribidi.dll';
+    phpDllCopy := 'icuuc64.dll';
     filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'gds32.dll';
+    phpDllCopy := 'icuin64.dll';
     filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'libeay32.dll';
+    phpDllCopy := 'icuio64.dll';
     filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'libmhash.dll';
+    phpDllCopy := 'icudt64.dll';
     filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'libmysql.dll';
+    phpDllCopy := 'libsasl.dll';
     filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'libpq.dll';
+    phpDllCopy := 'php7apache2_4.dll';
     filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'msql.dll';
-    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'libmcrypt.dll';
-    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'libmysqli.dll';
-    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'ntwdblib.dll';
-    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-
-    phpDllCopy := 'php5activescript.dll';
-    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'php5nsapi.dll';
-    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'php5ts.dll';
-    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-
-    phpDllCopy := 'ssleay32.dll';
-    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'yaz.dll';
+    phpDllCopy := 'php7ts.dll';
     filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
 
 
@@ -516,6 +515,17 @@ begin
 		then
 		begin
 		    
+	    //----------------------------------------------
+	    // check that we don't try an upgrade (mysql upgrade no supported)
+	    //----------------------------------------------
+
+	    if FileExists (pathWithSlashes+'/bin/mysql/mysql5.0.45/bin/mysqld-nt.exe') then
+	    begin
+	      MsgBox('An existing installation using an old version of Mysql exists. Sorry, upgrade with this installer is not possible.', mbInformation, MB_OK);
+	      Abort();
+	    end;
+
+
 	    //----------------------------------------------
 	    // Rename file c:/windows/php.ini (we don't want it)
 	    //----------------------------------------------
@@ -578,15 +588,26 @@ begin
 		    end;
 		  end;
 	      
+	      if browser = 'iexplore.exe' then
+	      begin
+		    if FileExists (winPath+'/SystemApps/Microsoft.MicrosoftEdge_8wekyb3d8bbwe/MicrosoftEdge.exe')  then
+		    begin
+		      if MsgBox(CustomMessage('MicrosoftEdgeDetected'),mbConfirmation,MB_YESNO) = IDYES then
+		      begin
+		        browser := winPath+'/SystemApps/Microsoft.MicrosoftEdge_8wekyb3d8bbwe/MicrosoftEdge.exe';
+		      end;
+		    end;
+		  end;
+
 	      if browser = 'iexplore.exe' then
 	      begin
             if FileExists (pfPath+'/Internet Explorer/iexplore.exe')  then
             begin
-               GetOpenFileName(CustomMessage('ChooseDefaultBrowser'), browser, pfPath+'/Internet Explorer','exe files (*.exe)|*.exe|All files (*.*)|*.*' ,'exe');
+               GetOpenFileName(CustomMessage('ChooseDefaultBrowser'), browser, pfPath+'/Internet Explorer', 'exe files (*.exe)|*.exe|All files (*.*)|*.*' ,'exe');
 	        end
 	        else
 	        begin
-               GetOpenFileName(CustomMessage('ChooseDefaultBrowser'), browser, winPath,'exe files (*.exe)|*.exe|All files (*.*)|*.*' ,'exe');
+               GetOpenFileName(CustomMessage('ChooseDefaultBrowser'), browser, winPath, 'exe files (*.exe)|*.exe|All files (*.*)|*.*' ,'exe');
 	        end;
 	      end;
 	
@@ -727,8 +748,8 @@ begin
 		    // Create file my.ini (if not exists)
 		    //----------------------------------------------
 		
-		    destFile := pathWithSlashes+'/bin/mysql/mysql'+mysqlVersion+'/my.ini';
-		    srcFile := pathWithSlashes+'/bin/mysql/mysql'+mysqlVersion+'/my.ini.install';
+		    destFile := pathWithSlashes+'/bin/mariadb/mariadb'+mysqlVersion+'/my.ini';
+		    srcFile := pathWithSlashes+'/bin/mariadb/mariadb'+mysqlVersion+'/my.ini.install';
 		
 		    if not FileExists (destFile) then
 		    begin
@@ -814,6 +835,8 @@ begin
 		      StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
 		      StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True);
 		      StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True);
+		      StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
+		      StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
 		
 		      SaveStringToFile(destFile,srcContents, False);
 		    end;
@@ -956,9 +979,11 @@ begin
 		
 		
 		
-	   		// Uninstall and Install services
+	   		// Uninstall services
 		  	batFile := path+'\uninstall_services.bat';
         Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
+  			
+  			// Install services
   			batFile := path+'\install_services.bat';
   			Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult);
 			
@@ -1057,7 +1082,7 @@ Filename: "{app}\rundoliwamp.bat"; Description: {cm:LaunchNow}; Flags: shellexec
 
 [UninstallDelete]
 Type: files; Name: "{app}\*.*"
-Type: files; Name: "{app}\bin\mysql\mysql5.0.45\*.*"
+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"

build/exe/doliwamp/httpd.conf.install

@@ -1,55 +1,74 @@
 #
 # This is the main Apache HTTP server configuration file.  It contains the
 # configuration directives that give the server its instructions.
-# See <URL:http://httpd.apache.org/docs/2.2/> for detailed information.
-# In particular, see 
-# <URL:http://httpd.apache.org/docs/2.2/mod/directives.html>
+# See <URL:http://httpd.apache.org/docs/2.4/> for detailed information.
+# In particular, see
+# <URL:http://httpd.apache.org/docs/2.4/mod/directives.html>
 # for a discussion of each configuration directive.
 #
 # Do NOT simply read the instructions in here without understanding
 # what they do.  They're here only as hints or reminders.  If you are unsure
-# consult the online docs. You have been warned.  
+# consult the online docs. You have been warned.
 #
 # Configuration and logfile names: If the filenames you specify for many
 # of the server's control files begin with "/" (or "drive:/" for Win32), the
 # server will use that explicit path.  If the filenames do *not* begin
-# with "/", the value of ServerRoot is prepended -- so "logs/foo.log"
-# with ServerRoot set to "C:/Program Files/Apache Software Foundation/Apache2.2" will be interpreted by the
-# server as "C:/Program Files/Apache Software Foundation/Apache2.2/logs/foo.log".
+# with "/", the value of ServerRoot is prepended -- so "logs/access_log"
+# with ServerRoot set to "/usr/local/apache2" will be interpreted by the
+# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log"
+# will be interpreted as '/logs/access_log'.
 #
 # NOTE: Where filenames are specified, you must use forward slashes
 # instead of backslashes (e.g., "c:/apache" instead of "c:\apache").
-# If a drive letter is omitted, the drive on which Apache.exe is located
+# If a drive letter is omitted, the drive on which httpd.exe is located
 # will be used by default.  It is recommended that you always supply
-# an explicit drive letter in absolute paths, however, to avoid
-# confusion.
-#
-
-# ThreadsPerChild: constant number of worker threads in the server process
-# MaxRequestsPerChild: maximum  number of requests a server process serves
-ThreadsPerChild 250
-MaxRequestsPerChild  0
+# an explicit drive letter in absolute paths to avoid confusion.
+ServerSignature On
+ServerTokens Full
 
 #
 # ServerRoot: The top of the directory tree under which the server's
 # configuration, error, and log files are kept.
 #
 # Do not add a slash at the end of the directory path.  If you point
-# ServerRoot at a non-local disk, be sure to point the LockFile directive
-# at a local disk.  If you wish to share the same ServerRoot for multiple
-# httpd daemons, you will need to change at least LockFile and PidFile.
+# ServerRoot at a non-local disk, be sure to specify a local disk on the
+# Mutex directive, if file-based mutexes are used.  If you wish to share the
+# same ServerRoot for multiple httpd daemons, you will need to change at
+# least PidFile.
 #
+# Apache variable names used by Apache conf files:
+# The names and contents of variables:
+# APACHE24, VERSION_APACHE, INSTALL_DIR, APACHE_DIR, SRVROOT
+# should never be changed.
+Define APACHE24 Apache2.4
+Define VERSION_APACHE WAMPAPACHEVERSION
+Define INSTALL_DIR WAMPROOT
+Define APACHE_DIR ${INSTALL_DIR}/bin/apache/apache${VERSION_APACHE}
+Define SRVROOT ${INSTALL_DIR}/bin/apache/apache${VERSION_APACHE}
+
 ServerRoot "WAMPROOT/bin/apache/apacheWAMPAPACHEVERSION"
 
+#
+# Mutex: Allows you to set the mutex mechanism and mutex file directory
+# for individual mutexes, or change the global defaults
+#
+# Uncomment and change the directory if mutexes are file-based and the default
+# mutex file directory is not on a local disk or is not appropriate for some
+# other reason.
+#
+# Mutex default:logs
+
 #
 # Listen: Allows you to bind Apache to specific IP addresses and/or
 # ports, instead of the default. See also the <VirtualHost>
 # directive.
 #
-# Change this to Listen on specific IP addresses as shown below to 
-# prevent Apache from glomming onto all bound IP addresses (0.0.0.0)
+# Change this to Listen on specific IP addresses as shown below to
+# prevent Apache from glomming onto all bound IP addresses.
 #
 #Listen 12.34.56.78:80
+#Listen 0.0.0.0:80
+#Listen [::0]:80
 Listen WAMPAPACHEPORT
 
 #
@@ -64,40 +83,72 @@ Listen WAMPAPACHEPORT
 # Example:
 # LoadModule foo_module modules/mod_foo.so
 #
+LoadModule access_compat_module modules/mod_access_compat.so
 LoadModule actions_module modules/mod_actions.so
 LoadModule alias_module modules/mod_alias.so
 LoadModule allowmethods_module modules/mod_allowmethods.so
 LoadModule asis_module modules/mod_asis.so
 LoadModule auth_basic_module modules/mod_auth_basic.so
-#LoadModule auth_digest_module modules/mod_auth_digest.so
+LoadModule auth_digest_module modules/mod_auth_digest.so
+#LoadModule auth_form_module modules/mod_auth_form.so
 #LoadModule authn_anon_module modules/mod_authn_anon.so
+LoadModule authn_core_module modules/mod_authn_core.so
+#LoadModule authn_dbd_module modules/mod_authn_dbd.so
 #LoadModule authn_dbm_module modules/mod_authn_dbm.so
 LoadModule authn_file_module modules/mod_authn_file.so
+#LoadModule authn_socache_module modules/mod_authn_socache.so
+#LoadModule authnz_fcgi_module modules/mod_authnz_fcgi.so
+#LoadModule authnz_ldap_module modules/mod_authnz_ldap.so
 LoadModule authz_core_module modules/mod_authz_core.so
+#LoadModule authz_dbd_module modules/mod_authz_dbd.so
 #LoadModule authz_dbm_module modules/mod_authz_dbm.so
-#LoadModule authz_default_module modules/mod_authz_default.so
 LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
 LoadModule authz_host_module modules/mod_authz_host.so
+#LoadModule authz_owner_module modules/mod_authz_owner.so
 LoadModule authz_user_module modules/mod_authz_user.so
 LoadModule autoindex_module modules/mod_autoindex.so
-LoadModule buffer_module modules/mod_buffer.so
+#LoadModule brotli_module modules/mod_brotli.so
+#LoadModule buffer_module modules/mod_buffer.so
 LoadModule cache_module modules/mod_cache.so
 LoadModule cache_disk_module modules/mod_cache_disk.so
+#LoadModule cache_socache_module modules/mod_cache_socache.so
 #LoadModule cern_meta_module modules/mod_cern_meta.so
 LoadModule cgi_module modules/mod_cgi.so
+#LoadModule charset_lite_module modules/mod_charset_lite.so
+#LoadModule data_module modules/mod_data.so
 #LoadModule dav_module modules/mod_dav.so
 #LoadModule dav_fs_module modules/mod_dav_fs.so
+#LoadModule dav_lock_module modules/mod_dav_lock.so
+#LoadModule dbd_module modules/mod_dbd.so
 #LoadModule deflate_module modules/mod_deflate.so
 LoadModule dir_module modules/mod_dir.so
+#LoadModule dumpio_module modules/mod_dumpio.so
 LoadModule env_module modules/mod_env.so
-LoadModule expires_module modules/mod_expires.so
-#LoadModule file_cache_module modules/mod_file_cache.so
+#LoadModule expires_module modules/mod_expires.so
+#LoadModule ext_filter_module modules/mod_ext_filter.so
+LoadModule file_cache_module modules/mod_file_cache.so
+#LoadModule filter_module modules/mod_filter.so
+#LoadModule http2_module modules/mod_http2.so
 #LoadModule headers_module modules/mod_headers.so
-LoadModule imagemap_module modules/mod_imagemap.so
+#LoadModule heartbeat_module modules/mod_heartbeat.so
+#LoadModule heartmonitor_module modules/mod_heartmonitor.so
+#LoadModule ident_module modules/mod_ident.so
+#LoadModule imagemap_module modules/mod_imagemap.so
 LoadModule include_module modules/mod_include.so
 #LoadModule info_module modules/mod_info.so
 LoadModule isapi_module modules/mod_isapi.so
+#LoadModule lbmethod_bybusyness_module modules/mod_lbmethod_bybusyness.so
+#LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so
+#LoadModule lbmethod_bytraffic_module modules/mod_lbmethod_bytraffic.so
+#LoadModule lbmethod_heartbeat_module modules/mod_lbmethod_heartbeat.so
+#LoadModule ldap_module modules/mod_ldap.so
+#LoadModule logio_module modules/mod_logio.so
 LoadModule log_config_module modules/mod_log_config.so
+#LoadModule log_debug_module modules/mod_log_debug.so
+#LoadModule log_forensic_module modules/mod_log_forensic.so
+#LoadModule lua_module modules/mod_lua.so
+#LoadModule macro_module modules/mod_macro.so
+#LoadModule md_module modules/mod_md.so
 LoadModule mime_module modules/mod_mime.so
 #LoadModule mime_magic_module modules/mod_mime_magic.so
 LoadModule negotiation_module modules/mod_negotiation.so
@@ -105,33 +156,63 @@ LoadModule negotiation_module modules/mod_negotiation.so
 #LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
 #LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
 #LoadModule proxy_connect_module modules/mod_proxy_connect.so
-#LoadModule proxy_http_module modules/mod_proxy_http.so
+#LoadModule proxy_express_module modules/mod_proxy_express.so
+#LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so
 #LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
+#LoadModule proxy_hcheck_module modules/mod_proxy_hcheck.so
+#LoadModule proxy_html_module modules/mod_proxy_html.so
+#LoadModule proxy_http_module modules/mod_proxy_http.so
+#LoadModule proxy_http2_module modules/mod_proxy_http2.so
+#LoadModule proxy_scgi_module modules/mod_proxy_scgi.so
+#LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so
+#LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so
+#LoadModule ratelimit_module modules/mod_ratelimit.so
+#LoadModule reflector_module modules/mod_reflector.so
+#LoadModule remoteip_module modules/mod_remoteip.so
+#LoadModule request_module modules/mod_request.so
+#LoadModule reqtimeout_module modules/mod_reqtimeout.so
 LoadModule rewrite_module modules/mod_rewrite.so
+#LoadModule sed_module modules/mod_sed.so
+#LoadModule session_module modules/mod_session.so
+#LoadModule session_cookie_module modules/mod_session_cookie.so
+#LoadModule session_crypto_module modules/mod_session_crypto.so
+#LoadModule session_dbd_module modules/mod_session_dbd.so
 LoadModule setenvif_module modules/mod_setenvif.so
+#LoadModule slotmem_plain_module modules/mod_slotmem_plain.so
+#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so
+#LoadModule socache_dbm_module modules/mod_socache_dbm.so
+#LoadModule socache_memcache_module modules/mod_socache_memcache.so
+#LoadModule socache_redis_module modules/mod_socache_redis.so
+#LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
 #LoadModule speling_module modules/mod_speling.so
 #LoadModule ssl_module modules/mod_ssl.so
-LoadModule status_module modules/mod_status.so
+#LoadModule status_module modules/mod_status.so
+#LoadModule substitute_module modules/mod_substitute.so
 #LoadModule unique_id_module modules/mod_unique_id.so
 LoadModule userdir_module modules/mod_userdir.so
 #LoadModule usertrack_module modules/mod_usertrack.so
+#LoadModule version_module modules/mod_version.so
 LoadModule vhost_alias_module modules/mod_vhost_alias.so
-LoadModule php5_module "WAMPROOT/bin/php/phpWAMPPHPVERSION/php5apache2_4.dll"
+#LoadModule watchdog_module modules/mod_watchdog.so
+#LoadModule xml2enc_module modules/mod_xml2enc.so
 
+PHPIniDir "${APACHE_DIR}/bin"
+#LoadModule WAMPAPACHELOADMODULE "${INSTALL_DIR}/bin/php/phpWAMPPHPVERSIONWEB/WAMPPHPAPACHEDLL"
+LoadModule php7_module "WAMPROOT/bin/php/phpWAMPPHPVERSION/php7apache2_4.dll"
+
+<IfModule unixd_module>
 #
-# ExtendedStatus controls whether Apache will generate "full" status
-# information (ExtendedStatus On) or just basic information (ExtendedStatus
-# Off) when the "server-status" handler is called. The default is Off.
+# If you wish httpd to run as a different user or group, you must run
+# httpd as root initially and it will switch.
 #
-ExtendedStatus On
-
-<Location /server-status>
-SetHandler server-status
-Require local
-#Require ip 1.2.3.4
-#Require host 1.2.3.4
-</Location>
+# User/Group: The name (or #number) of the user/group to run httpd as.
+# It is usually good practice to create a dedicated user and group for
+# running httpd, as with most system services.
+#
+User daemon
+Group daemon
 
+</IfModule>
 
 # 'Main' server configuration
 #
@@ -162,59 +243,12 @@ ServerAdmin doliwamp@localhost
 ServerName localhost
 
 #
-# ServerTokens
-# This directive configures what you return as the Server HTTP response
-# Header. The default is 'Full' which sends information about the OS-Type
-# and compiled in modules.
-# Set to one of:  Full | OS | Minor | Minimal | Major | Prod
-# where Full conveys the most information, and Prod the least.
-#
-#ServerTokens Prod
-
-#
-# DocumentRoot: The directory out of which you will serve your
-# documents. By default, all requests are taken from this directory, but
-# symbolic links and aliases may be used to point to other locations.
-#
-DocumentRoot "WAMPROOT/www/"
-
-
-#
-# Timeout: The number of seconds before receives and sends time out.
-#
-Timeout 300
-
-#
-# KeepAlive: Whether or not to allow persistent connections (more than
-# one request per connection). Set to "Off" to deactivate.
-#
-KeepAlive On
-
-#
-# MaxKeepAliveRequests: The maximum number of requests to allow
-# during a persistent connection. Set to 0 to allow an unlimited amount.
-# We recommend you leave this number high, for maximum performance.
-#
-MaxKeepAliveRequests 500
-
-#
-# KeepAliveTimeout: Number of seconds to wait for the next request from the
-# same client on the same connection.
-#
-KeepAliveTimeout 30
-
-
-#
-# Each directory to which Apache has access can be configured with respect
-# to which services and features are allowed and/or disabled in that
-# directory (and its subdirectories). 
-#
-# First, we configure the "default" to be a very restrictive set of 
-# features.  
+# Deny access to the entirety of your server's filesystem. You must
+# explicitly permit access to web content directories in other
+# <Directory> blocks below.
 #
 <Directory />
-    Options FollowSymLinks
-    AllowOverride None
+    AllowOverride none
     Require all denied
 </Directory>
 
@@ -224,12 +258,15 @@ KeepAliveTimeout 30
 # you might expect, make sure that you have specifically enabled it
 # below.
 #
+HostnameLookups Off
 
 #
-# This should be changed to whatever you set DocumentRoot to.
+# DocumentRoot: The directory out of which you will serve your
+# documents. By default, all requests are taken from this directory, but
+# symbolic links and aliases may be used to point to other locations.
 #
-<Directory "WAMPROOT/www/">
-
+DocumentRoot "${INSTALL_DIR}/www"
+<Directory "${INSTALL_DIR}/www/">
     #
     # Possible values for the Options directive are "None", "All",
     # or any combination of:
@@ -239,30 +276,23 @@ KeepAliveTimeout 30
     # doesn't give it to you.
     #
     # The Options directive is both complicated and important.  Please see
-    # http://httpd.apache.org/docs/2.2/mod/core.html#options
+    # http://httpd.apache.org/docs/2.4/mod/core.html#options
     # for more information.
     #
-    Options Indexes FollowSymLinks
+    Options +Indexes +FollowSymLinks +Multiviews
 
     #
     # AllowOverride controls what directives may be placed in .htaccess files.
     # It can be "All", "None", or any combination of the keywords:
-    #   Options FileInfo AuthConfig Limit
+    #   AllowOverride FileInfo AuthConfig Limit
     #
     AllowOverride all
 
     #
     # Controls who can get stuff from this server.
     #
-#   onlineoffline tag - don't remove
-	
-	Require all granted
-    
-    <RequireAny>
-		Require ip 127.0.0.1
-		Require host localhost
-	</RequireAny>
-
+#   Don't modify this line - Instead modify Require of VirtualHost in httpd-vhost.conf
+    Require local
 </Directory>
 
 #
@@ -274,12 +304,12 @@ KeepAliveTimeout 30
 </IfModule>
 
 #
-# The following lines prevent .htaccess and .htpasswd files from being 
-# viewed by Web clients. 
+# The following lines prevent .htaccess and .htpasswd files from being
+# viewed by Web clients.
 #
-<FilesMatch "^\.ht">
+<Files ".ht*">
     Require all denied
-</FilesMatch>
+</Files>
 
 #
 # ErrorLog: The location of the error log file.
@@ -288,7 +318,8 @@ KeepAliveTimeout 30
 # logged here.  If you *do* define an error logfile for a <VirtualHost>
 # container, that host's errors will be logged there and not here.
 #
-ErrorLog "WAMPROOT/logs/apache_error.log"
+
+ErrorLog "${INSTALL_DIR}/logs/apache_error.log"
 
 #
 # LogLevel: Control the number of messages logged to the error_log.
@@ -317,22 +348,22 @@ LogLevel warn
     # define per-<VirtualHost> access logfiles, transactions will be
     # logged therein and *not* in this file.
     #
-    CustomLog "WAMPROOT/logs/access.log" common
+    CustomLog "${INSTALL_DIR}/logs/access.log" common
 
     #
     # If you prefer a logfile with access, agent, and referer information
     # (Combined Logfile Format) you can use the following directive.
     #
-    #CustomLog logs/access.log combined
+    #CustomLog "logs/access.log" combined
 </IfModule>
 
 <IfModule alias_module>
     #
-    # Redirect: Allows you to tell clients about documents that used to 
-    # exist in your server's namespace, but do not anymore. The client 
+    # Redirect: Allows you to tell clients about documents that used to
+    # exist in your server's namespace, but do not anymore. The client
     # will make a new request for the document at its new location.
     # Example:
-    # Redirect permanent /foo http://localhost/bar
+    # Redirect permanent /foo http://www.example.com/bar
 
     #
     # Alias: Maps web paths into filesystem paths and is used to
@@ -346,75 +377,43 @@ LogLevel warn
     # the filesystem path.
 
     #
-    # ScriptAlias: This controls which directories contain server scripts. 
+    # ScriptAlias: This controls which directories contain server scripts.
     # ScriptAliases are essentially the same as Aliases, except that
     # documents in the target directory are treated as applications and
     # run by the server when requested rather than as documents sent to the
     # client.  The same rules about trailing "/" apply to ScriptAlias
     # directives as to Alias.
     #
-    ScriptAlias /cgi-bin/ "cgi-bin/"
+    ScriptAlias /cgi-bin/ "${SRVROOT}/cgi-bin/"
 
 </IfModule>
 
+<IfModule cgid_module>
+    #
+    # ScriptSock: On threaded servers, designate the path to the UNIX
+    # socket used to communicate with the CGI daemon of mod_cgid.
+    #
+    #Scriptsock cgisock
+</IfModule>
+
 #
-# "C:/Program Files/Apache Software Foundation/Apache2.2/cgi-bin" should be changed to whatever your ScriptAliased
+# "${SRVROOT}/cgi-bin" should be changed to whatever your ScriptAliased
 # CGI directory exists, if you have that configured.
 #
-<Directory "cgi-bin">
+<Directory "${SRVROOT}/cgi-bin">
     AllowOverride None
     Options None
     Require all granted
 </Directory>
 
-# 
-# Apache parses all CGI scripts for the shebang line by default.
-# This comment line, the first line of the script, consists of the symbols
-# pound (#) and exclamation (!) followed by the path of the program that 
-# can execute this specific script.  For a perl script, with perl.exe in
-# the C:\Program Files\Perl directory, the shebang line should be:
-
-   #!c:/program files/perl/perl
-
-# Note you _must_not_ indent the actual shebang line, and it must be the
-# first line of the file.  Of course, CGI processing must be enabled by 
-# the appropriate ScriptAlias or Options ExecCGI directives for the files 
-# or directory in question.
-#
-# However, Apache on Windows allows either the Unix behavior above, or can
-# use the Registry to match files by extention.  The command to execute 
-# a file of this type is retrieved from the registry by the same method as 
-# the Windows Explorer would use to handle double-clicking on a file.
-# These script actions can be configured from the Windows Explorer View menu, 
-# 'Folder Options', and reviewing the 'File Types' tab.  Clicking the Edit
-# button allows you to modify the Actions, of which Apache 1.3 attempts to
-# perform the 'Open' Action, and failing that it will try the shebang line.
-# This behavior is subject to change in Apache release 2.0.
-#
-# Each mechanism has it's own specific security weaknesses, from the means
-# to run a program you didn't intend the website owner to invoke, and the
-# best method is a matter of great debate.
-#
-# To enable the this Windows specific behavior (and therefore -disable- the
-# equivilant Unix behavior), uncomment the following directive:
-#
-#ScriptInterpreterSource registry
-#
-# The directive above can be placed in individual <Directory> blocks or the
-# .htaccess file, with either the 'registry' (Windows behavior) or 'script' 
-# (Unix behavior) option, and will override this server default option.
-#
-
-#
-# DefaultType: the default MIME type the server will use for a document
-# if it cannot otherwise determine one, such as from filename extensions.
-# If your server contains mostly text or HTML documents, "text/plain" is
-# a good value.  If most of your content is binary, such as applications
-# or images, you may want to use "application/octet-stream" instead to
-# keep browsers from trying to display binary files as though they are
-# text.
-#
-#DefaultType text/plain
+<IfModule headers_module>
+    #
+    # Avoid passing HTTP_PROXY environment to CGI's on this or any proxied
+    # backend servers which have lingering "httpoxy" defects.
+    # 'Proxy' request header is undefined by the IETF, not listed by IANA
+    #
+    RequestHeader unset Proxy early
+</IfModule>
 
 <IfModule mime_module>
     #
@@ -432,8 +431,8 @@ LogLevel warn
     # AddEncoding allows you to have certain browsers uncompress
     # information on the fly. Note: Not all browsers support this.
     #
-    #AddEncoding x-compress .Z
-    #AddEncoding x-gzip .gz .tgz
+    AddEncoding x-compress .Z
+    AddEncoding x-gzip .gz .tgz
     #
     # If the AddEncoding directives above are commented-out, then you
     # probably should define those extensions to indicate media types:
@@ -481,25 +480,40 @@ LogLevel warn
 #ErrorDocument 500 "The server made a boo boo."
 #ErrorDocument 404 /missing.html
 #ErrorDocument 404 "/cgi-bin/missing_handler.pl"
-#ErrorDocument 402 http://localhost/subscription_info.html
+#ErrorDocument 402 http://www.example.com/subscription_info.html
 #
 
 #
-# EnableMMAP and EnableSendfile: On systems that support it, 
-# memory-mapping or the sendfile syscall is used to deliver
+# MaxRanges: Maximum number of Ranges in a request before
+# returning the entire resource, or one of the special
+# values 'default', 'none' or 'unlimited'.
+# Default setting is to accept 200 Ranges.
+#MaxRanges unlimited
+
+#
+# EnableMMAP and EnableSendfile: On systems that support it,
+# memory-mapping or the sendfile syscall may be used to deliver
 # files.  This usually improves server performance, but must
-# be turned off when serving from networked-mounted 
+# be turned off when serving from networked-mounted
 # filesystems or if support for these functions is otherwise
 # broken on your system.
+# Defaults: EnableMMAP On, EnableSendfile Off
 #
-#EnableMMAP off
-#EnableSendfile off
+EnableMMAP off
+EnableSendfile off
+
+# AcceptFilter: On Windows, none uses accept() rather than AcceptEx() and
+# will not recycle sockets between connections. This is useful for network
+# adapters with broken driver support, as well as some virtual network
+# providers such as vpn drivers, or spam, virus or spyware filters.
+AcceptFilter http none
+AcceptFilter https none
 
 # Supplemental configuration
 #
-# The configuration files in the conf/extra/ directory can be 
-# included to add extra features or to modify the default configuration of 
-# the server, or you may simply copy their contents here and change as 
+# The configuration files in the conf/extra/ directory can be
+# included to add extra features or to modify the default configuration of
+# the server, or you may simply copy their contents here and change as
 # necessary.
 
 # Server-pool management (MPM specific)
@@ -532,17 +546,19 @@ Include conf/extra/httpd-autoindex.conf
 # Various default settings
 #Include conf/extra/httpd-default.conf
 
-
+# Configure mod_proxy_html to understand HTML4/XHTML1
+<IfModule proxy_html_module>
+Include conf/extra/proxy-html.conf
+</IfModule>
 
 # Secure (SSL/TLS) connections
+#Include conf/extra/httpd-ssl.conf
 #
 # Note: The following must must be present to support
 #       starting without SSL on platforms with no /dev/random equivalent
 #       but a statically compiled-in mod_ssl.
 #
-
 <IfModule ssl_module>
-
 SSLRandomSeed startup builtin
 SSLRandomSeed connect builtin
 
@@ -733,44 +749,8 @@ SSLCertificateKeyFile "WAMPROOT/myserver.key"
 #         nokeepalive ssl-unclean-shutdown \
 #         downgrade-1.0 force-response-1.0
 
-</VirtualHost>  
+</VirtualHost> 
 
 </IfModule>
 
-
-
-# OPTIMIZE: To use gzip compression (for already compressed files).
-# Note that constant MAIN_OPTIMIZE_SPEED must have a value with bit 0 set. 
-#AddType text/javascript .jgz
-#AddEncoding gzip .jgz
-
-# OPTIMIZE: To use gzip compression (on the fly).
-# Note that you must also enable the module mod_deflate.
-# You can also set this with constant MAIN_OPTIMIZE_SPEED and bit 2 set. 
-#TODO
-
-# 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
-#ExpiresByType image/gif A2592000
-#ExpiresByType image/png A2592000
-#ExpiresByType image/jpeg A2592000
-#ExpiresByType text/css A2592000
-#ExpiresByType text/javascript A2592000
-#ExpiresByType application/x-javascript A2592000
-#ExpiresByType application/javascript A2592000
-    
-
-# To protect Dolibarr with HTTP Auth
-#<Location /dolibarr>
-#       Options +Indexes
-#       AuthUserFile /var/www/.htpasswd
-#       AuthName "Zone authent basic Dolibarr"
-#       AuthType Basic
-#       require user test
-#</Location>
-
-
-# Declare alias for Dolibarr, PHPMyAdmin and other software
-Include "WAMPROOT/alias/*.conf"
+Include "${INSTALL_DIR}/alias/*.conf"

build/exe/doliwamp/install_services.bat.install

@@ -11,14 +11,19 @@ REM NET STOP doliwampmysqld
 cd "WAMPROOT"
 
 REM Apache x.x
-.\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -k install -n doliwampapache
+.\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -k install -n doliwampapache >> doliwamp.log 2>>&1
 REM reg add HKLM\SYSTEM\CurrentControlSet\Services\doliwampapache /V Start /t REG_DWORD /d 3 /f
 
 REM Mysql 5.0-
-REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --install-manual doliwampmysqld
-.\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --install doliwampmysqld
+REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --install-manual doliwampmysqld
+REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --install doliwampmysqld
 REM Mysql 5.1+
 REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --install doliwampmysqld
+REM Mariadb
+REM The mysql_install_db allows to not provide files into mysql dir but does not return to prompt so install hangs
+REM .\bin\mariadb\mariadbWAMPMYSQLVERSION\bin\mysql_install_db.exe --datadir=WAMPROOT/bin/mariadb/data --port=WAMPMYSQLPORT --password=WAMPMYSQLXXX >> doliwamp.log 2>>&1
+.\bin\mariadb\mariadbWAMPMYSQLVERSION\bin\mysql_install_db.exe --datadir=WAMPROOT/bin/mariadb/data --port=WAMPMYSQLPORT >> doliwamp.log 2>>&1
+.\bin\mariadb\mariadbWAMPMYSQLVERSION\bin\mysqld.exe --install doliwampmysqld >> doliwamp.log 2>>&1
 
 echo ---- End script >> doliwamp.log 2>>&1
 

build/exe/doliwamp/my.ini.install

@@ -69,13 +69,13 @@ port=WAMPMYSQLPORT
 
 
 #Path to installation directory. All paths are usually resolved relative to this.
-basedir=WAMPROOT/bin/mysql/mysqlWAMPMYSQLVERSION
+basedir=WAMPROOT/bin/mariadb/mariadbWAMPMYSQLVERSION
 
 #log file
 log-error=WAMPROOT/logs/mysql.log
 
 #Path to the database root
-datadir=WAMPROOT/bin/mysql/data
+datadir=WAMPROOT/bin/mariadb/data
 
 # The default storage engine that will be used when create new tables when
 default-storage-engine=INNODB
@@ -196,13 +196,13 @@ port=WAMPMYSQLPORT
 
 
 #Path to installation directory. All paths are usually resolved relative to this.
-basedir=WAMPROOT/bin/mysql/mysqlWAMPMYSQLVERSION
+basedir=WAMPROOT/bin/mariadb/mariadbWAMPMYSQLVERSION
 
 #log file
 log-error=WAMPROOT/logs/mysql.log
 
 #Path to the database root
-datadir=WAMPROOT/bin/mysql/data
+datadir=WAMPROOT/bin/mariadb/data
 
 # The default storage engine that will be used when create new tables when
 default-storage-engine=INNODB

build/exe/doliwamp/mysqlinitpassword.bat.install

@@ -17,7 +17,7 @@ ping 1.1.1.1 -n 1 -w 5000 > nul
 echo ---- Execute mysqlinitpassword.bat to init mysql password >> doliwamp.log 2>>&1
 echo For a first installation, if an error is shown here, rerun the script manually. >> doliwamp.log 2>>&1
 echo For an update, you will get an "Access denied" error, ignore this error. >> doliwamp.log 2>>&1
-.\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqladmin -v -w6 -P WAMPMYSQLPORT -u root password WAMPMYSQLNEWPASSWORD >> doliwamp.log 2>>&1
+.\bin\mariadb\mariadbWAMPMYSQLVERSION\bin\mysqladmin -v -w6 -P WAMPMYSQLPORT -u root password WAMPMYSQLNEWPASSWORD >> doliwamp.log 2>>&1
 
 echo ---- End script >> doliwamp.log 2>>&1
 

build/exe/doliwamp/mysqltestinstall.bat.install

@@ -6,7 +6,7 @@ REM To change password, run following SQL command:
 REM GRANT ALL ON *.* TO login@localhost IDENTIFIED BY "newpassword"
 
 echo -----------------------------------------------------------
-echo This programm wil test a login on Mysql installed
+echo This programm will test a login on Mysql installed
 echo by DoliWamp.
 echo Version: WAMPMYSQLVERSION
 echo Port: WAMPMYSQLPORT
@@ -19,6 +19,6 @@ SET SAVES=
 SET /P SAVES=Enter password to test: 
 
 echo Try to connect to mysql with this password
-.\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysql -P WAMPMYSQLPORT -u root -p%SAVES%
+.\bin\mariadb\mariadbWAMPMYSQLVERSION\bin\mysql -P WAMPMYSQLPORT -u root -p%SAVES%
 
 pause

build/exe/doliwamp/php.ini.install

@@ -304,7 +304,7 @@ expose_php = On
 max_execution_time = 30       ; Maximum execution time of each script, in seconds
 max_input_time = 60	          ; Maximum amount of time each script may spend parsing request data
 ;max_input_nesting_level = 64 ; Maximum input variable nesting level
-memory_limit = 64M            ; Maximum amount of memory a script may consume (128MB)
+memory_limit = 256M            ; Maximum amount of memory a script may consume (128MB)
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -644,53 +644,36 @@ default_socket_timeout = 60
 
 ; If an extension does not load, run  "deplister.exe php_xxx.dll" to get list of dependency dll missing.
 
-extension=php_bz2.dll
-extension=php_curl.dll
-;extension=php_dba.dll
-;extension=php_dbase.dll
-;extension=php_exif.dll
-;extension=php_fdf.dll
-extension=php_gd2.dll
-;extension=php_gettext.dll
-;extension=php_gmp.dll
-;extension=php_ifx.dll
-;extension=php_imap.dll
-;extension=php_interbase.dll
-extension=php_intl.dll
-extension=php_ldap.dll
-extension=php_mbstring.dll
-;extension=php_mcrypt.dll
-;extension=php_mhash.dll
-;extension=php_mime_magic.dll
-;extension=php_ming.dll
-;extension=php_msql.dll
-;extension=php_mssql.dll
-extension=php_mysql.dll
-extension=php_mysqli.dll
-;extension=php_oci8.dll
-extension=php_openssl.dll
-;extension=php_pdo.dll              ; for php 5.2.11
-;extension=php_pdo_firebird.dll
-;extension=php_pdo_mssql.dll
-extension=php_pdo_mysql.dll
-;extension=php_pdo_oci.dll
-;extension=php_pdo_oci8.dll
-;extension=php_pdo_odbc.dll
-;extension=php_pdo_pgsql.dll
-extension=php_pdo_sqlite.dll
-;extension=php_pgsql.dll
-;extension=php_pspell.dll
-;extension=php_shmop.dll
-;extension=php_snmp.dll
-extension=php_soap.dll
-extension=php_sockets.dll
-;extension=php_sqlite.dll
-;extension=php_sybase_ct.dll
-;extension=php_tidy.dll
-;extension=php_xmlrpc.dll
-;extension=php_xsl.dll
-;extension=php_zip.dll
-;extension=php_xdebug-2.0.5-5.2.dll
+extension=bz2
+extension=curl
+;extension=dba
+;extension=com_dotnet
+;extension=enchant
+;extension=fileinfo
+;extension=ftp
+extension=gd2
+;extension=gettext
+;extension=gmp
+extension=intl
+extension=imap
+;extension=interbase
+extension=ldap
+extension=mbstring
+extension=exif      ; Must be after mbstring as it depends on it
+extension=mysqli
+;extension=odbc
+extension=openssl
+;extension=pdo_firebird
+extension=pdo_mysql
+;extension=pdo_oci
+;extension=pdo_odbc
+;extension=pdo_pgsql
+;extension=pdo_sqlite
+;extension=pgsql
+;extension=phpdbg_webhelper
+;extension=shmop
+extension=soap
+extension=sockets
 
 
 ;;;;;;;;;;;;;;;;;;;

build/exe/doliwamp/startdoliwamp_manual_donotuse.bat.install

@@ -12,7 +12,8 @@ start WAMPROOT\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -f conf\httpd.co
 echo 
 
 echo Running Mysql as user process (this process does not return so we use "start")
-start WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --defaults-file=WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\my.ini --console
+REM start WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --defaults-file=WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\my.ini --console
 REM start WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --defaults-file=WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\my.ini --console
+start WAMPROOT\bin\mariadb\mariadbWAMPMYSQLVERSION\bin\mysqld.exe --defaults-file=WAMPROOT\bin\mariadb\mariadbWAMPMYSQLVERSION\my.ini --console
 
 pause

build/exe/doliwamp/uninstall_services.bat.install

@@ -11,9 +11,11 @@ NET STOP doliwampapache
 
 NET STOP doliwampmysqld 
 REM Mysql 5.0-
-.\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --remove doliwampmysqld
+REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --remove doliwampmysqld
 REM Mysql 5.1+
 REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --remove doliwampmysqld
+REM Maraiadb
+.\bin\mariadb\mariadbWAMPMYSQLVERSION\bin\mysqld.exe --remove doliwampmysqld
 
 REM wampmanager.exe -quit -id={doliwampserver}
 echo ---- End script >> doliwamp.log 2>>&1

build/makepack-dolibarr.pl

@@ -1067,7 +1067,7 @@ if ($nboftargetok) {
      		print "Remove target $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe...\n";
     		unlink "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe";
  
- 			print "Check that in your Wine setup, you create 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;

build/obs/README

@@ -1,20 +1,24 @@
 README (English)
 ##################################################
 OBS Package tools
+OBE - openSUSE Build Service 
 ##################################################
 
-This directory contains files to explain how to publish
-a package onto OBS
+This directory contains an instruction to explain 
+how to publish a package onto OBS.
 
 
-# Create a project onto OBS
-#----------------------------------
-https://build.opensuse.org
+# Create a project onto OBS 
+--------------------------- 
+https://build.opensuse.org 
 
-Packaging rules: http://en.opensuse.org/Portal:Packaging
+
+# Packaging rules: 
+------------------
+https://en.opensuse.org/Portal:Packaging
 
 Add attributes:
-OBS:Screenshots         URL of screenshot http://www.dolibarr.org/images/dolibarr_screenshot1.png
+OBS:Screenshots         URL of screenshot https://www.dolibarr.org/images/dolibarr_screenshot1.png
 OBS:QualityCategory     Development|Testing|Stable|Private
 OBS:Maintained          1
 
@@ -28,22 +32,24 @@ To submit a snapshot for building, we should have a service file with content
   </service>
 </services>
 
-How to have such a service file created automatically ?
 
-Go into project you want to update. It mught be:
+# How to have such a service file created automatically ?
+---------------------------------------------------------
+Go into project you want to update. It might be:
 - openSUSE Build Service > Projects > Application:ERP:Dolibarr > dolibarr
 - or your private project
 
 Once logged, click on "Add file" in section "Source Files", then select mode "Upload From: Remote URL"
 Keep empty for "Filename", choose "Remote URL" and enter into last field, URL that should looks like this:
-http://www.dolibarr.org/files/stable/package_rpm_generic/dolibarr-x.y.v-0.4.src.rpm
+https://www.dolibarr.org/files/stable/package_rpm_generic/dolibarr-x.y.v-0.4.src.rpm
 
 Then add into Advanded - Attributes
-OBS:Screenshots http://www.dolibarr.org/images/dolibarr_screenshot1.png
-OBS:QualityCategory Stable|Testing|Development|Private
+OBS:Screenshots       https://www.dolibarr.org/images/dolibarr_screenshot1.png
+OBS:QualityCategory   Stable|Testing|Development|Private
 
 
 # Move project into official directory
+--------------------------------------
 - Enter a bug to ask to be a maintener of a category or to add a new one.
 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

build/rpm/dolibarr_fedora.spec

@@ -90,7 +90,7 @@ cui hai bisogno ed essere facile da usare.
 %{__install} -m 644 build/rpm/install.forced.php.fedora $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/install.forced.php
 
 %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-%{__install} -m 644 doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+%{__install} -m 644 doc/images/appicon_64.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
 %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications
 #desktop-file-install --delete-original --dir=$RPM_BUILD_ROOT%{_datadir}/applications build/rpm/%{name}.desktop
 %{__install} -m 644 build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

build/rpm/dolibarr_generic.spec

@@ -150,7 +150,7 @@ cui hai bisogno ed essere facile da usare.
 %endif
 
 %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-%{__install} -m 644 doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+%{__install} -m 644 doc/images/appicon_64.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
 %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications
 %{__install} -m 644 build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version} || 0%{?mdkversion} || 0%{?suse_version}

build/rpm/dolibarr_mandriva.spec

@@ -89,7 +89,7 @@ cui hai bisogno ed essere facile da usare.
 %{__install} -m 644 build/rpm/install.forced.php.mandriva $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/install.forced.php
 
 %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-%{__install} -m 644 doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+%{__install} -m 644 doc/images/appicon_64.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
 %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications
 #desktop-file-install --delete-original --dir=$RPM_BUILD_ROOT%{_datadir}/applications build/rpm/%{name}.desktop
 %{__install} -m 644 build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

build/rpm/dolibarr_opensuse.spec

@@ -90,7 +90,7 @@ cui hai bisogno ed essere facile da usare.
 %{__install} -m 644 build/rpm/install.forced.php.opensuse $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/install.forced.php
 
 %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-%{__install} -m 644 doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+%{__install} -m 644 doc/images/appicon_64.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
 %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications
 #desktop-file-install --delete-original --dir=$RPM_BUILD_ROOT%{_datadir}/applications build/rpm/%{name}.desktop
 %{__install} -m 644 build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

composer.json

@@ -28,11 +28,12 @@
 		"ext-curl" : "*",
 		"ckeditor/ckeditor" : "4.12.1",
 		"mike42/escpos-php" : "2.2",
-		"mobiledetect/mobiledetectlib" : "2.8.33",
+		"mobiledetect/mobiledetectlib" : "2.8.34",
 		"phpoffice/phpexcel" : "1.8.1",
 		"restler/framework" : "3.0.0-RC6",
-		"tecnickcom/tcpdf" : "^6.2",
-		"luracast/restler" : "^3.0"
+		"tecnickcom/tcpdf" : "6.3.2",
+		"nnnick/chartjs" : "^2.9",
+		"stripe/stripe-php" : "6.43.1"
 	},
 	"require-dev" : {
 		"jakub-onderka/php-parallel-lint" : "^0",
@@ -56,4 +57,4 @@
 		"ext-zip" : "ODT, Excel and file compression support",
 		"ext-xml" : "Excel support"
 	}
-}
+}

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "16c94fd4f22ac17820d85ee57b0616e1",
+    "content-hash": "17e906996157e8a94564f686a6096dc5",
     "packages": [
         {
             "name": "ckeditor/ckeditor",
@@ -49,24 +49,31 @@
         },
         {
             "name": "mike42/escpos-php",
-            "version": "v1.2.1",
+            "version": "v2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mike42/escpos-php.git",
-                "reference": "cfea4c4fc95516ac953e1e5b623f854632afa2ee"
+                "reference": "e5496cf819b048b11877117bd14a9cea4fb17c03"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mike42/escpos-php/zipball/cfea4c4fc95516ac953e1e5b623f854632afa2ee",
-                "reference": "cfea4c4fc95516ac953e1e5b623f854632afa2ee",
+                "url": "https://api.github.com/repos/mike42/escpos-php/zipball/e5496cf819b048b11877117bd14a9cea4fb17c03",
+                "reference": "e5496cf819b048b11877117bd14a9cea4fb17c03",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "ext-mbstring": "*",
+                "php": ">=5.4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "4.5.*",
-                "squizlabs/php_codesniffer": "2.*"
+                "guzzlehttp/guzzle": "^5.3",
+                "phpunit/phpunit": "^4.8",
+                "squizlabs/php_codesniffer": "^3.2"
+            },
+            "suggest": {
+                "ext-gd": "Used for image printing if present.",
+                "ext-imagick": "Will be used for image printing if present. Required for PDF printing or use of custom fonts.",
+                "guzzlehttp/guzzle": "Allows the use of the ApiConnector to send print jobs over HTTP."
             },
             "type": "library",
             "autoload": {
@@ -79,28 +86,12 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Roni Saha",
-                    "email": "roni.cse@gmail.com"
-                },
                 {
                     "name": "Michael Billington",
                     "email": "michael.billington@gmail.com"
-                },
-                {
-                    "name": "Gergely Radics",
-                    "email": "gerifield@ustream.tv"
-                },
-                {
-                    "name": "Warren Doyle",
-                    "email": "w.doyle@fuelled.co"
-                },
-                {
-                    "name": "vharo",
-                    "email": "vharo@geepok.com"
                 }
             ],
-            "description": "Thermal receipt printer library, for use with ESC/POS compatible printers",
+            "description": "PHP receipt printer library for use with ESC/POS-compatible thermal and impact printers",
             "homepage": "https://github.com/mike42/escpos-php",
             "keywords": [
                 "ESC-POS",
@@ -109,20 +100,20 @@
                 "print",
                 "receipt"
             ],
-            "time": "2016-04-25T01:14:07+00:00"
+            "time": "2019-10-05T05:59:00+00:00"
         },
         {
             "name": "mobiledetect/mobiledetectlib",
-            "version": "2.8.33",
+            "version": "2.8.34",
             "source": {
                 "type": "git",
                 "url": "https://github.com/serbanghita/Mobile-Detect.git",
-                "reference": "cd385290f9a0d609d2eddd165a1e44ec1bf12102"
+                "reference": "6f8113f57a508494ca36acbcfa2dc2d923c7ed5b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/cd385290f9a0d609d2eddd165a1e44ec1bf12102",
-                "reference": "cd385290f9a0d609d2eddd165a1e44ec1bf12102",
+                "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/6f8113f57a508494ca36acbcfa2dc2d923c7ed5b",
+                "reference": "6f8113f57a508494ca36acbcfa2dc2d923c7ed5b",
                 "shasum": ""
             },
             "require": {
@@ -161,7 +152,48 @@
                 "mobile detector",
                 "php mobile detect"
             ],
-            "time": "2018-09-01T15:05:15+00:00"
+            "time": "2019-09-18T18:44:20+00:00"
+        },
+        {
+            "name": "nnnick/chartjs",
+            "version": "v2.9.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/chartjs/Chart.js.git",
+                "reference": "06f73dc3590084b2c464bf08189c7aee2b6b92d2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/chartjs/Chart.js/zipball/06f73dc3590084b2c464bf08189c7aee2b6b92d2",
+                "reference": "06f73dc3590084b2c464bf08189c7aee2b6b92d2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "release/2.0": "v2.0-dev"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "NICK DOWNIE",
+                    "email": "hello@nickdownie.com"
+                }
+            ],
+            "description": "Simple HTML5 charts using the canvas element.",
+            "homepage": "https://www.chartjs.org/",
+            "keywords": [
+                "JS",
+                "chart"
+            ],
+            "time": "2019-11-14T18:37:30+00:00"
         },
         {
             "name": "phpoffice/phpexcel",
@@ -282,6 +314,62 @@
             ],
             "time": "2019-05-12T15:15:11+00:00"
         },
+        {
+            "name": "stripe/stripe-php",
+            "version": "v6.43.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/stripe/stripe-php.git",
+                "reference": "42fcdaf99c44bb26937223f8eae1f263491d5ab8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/stripe/stripe-php/zipball/42fcdaf99c44bb26937223f8eae1f263491d5ab8",
+                "reference": "42fcdaf99c44bb26937223f8eae1f263491d5ab8",
+                "shasum": ""
+            },
+            "require": {
+                "ext-curl": "*",
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "php-coveralls/php-coveralls": "1.*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~2.0",
+                "symfony/process": "~2.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Stripe\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Stripe and contributors",
+                    "homepage": "https://github.com/stripe/stripe-php/contributors"
+                }
+            ],
+            "description": "Stripe PHP Library",
+            "homepage": "https://stripe.com/",
+            "keywords": [
+                "api",
+                "payment processing",
+                "stripe"
+            ],
+            "time": "2019-08-29T16:56:12+00:00"
+        },
         {
             "name": "tecnickcom/tcpdf",
             "version": "6.3.2",
@@ -1815,7 +1903,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=5.3.0",
+        "php": ">=5.5.0",
         "ext-curl": "*"
     },
     "platform-dev": []

dev/dolibarr_changes.txt

@@ -8,6 +8,7 @@ ALL:
 Check "@CHANGE"
 
 
+
 PrestaShopWebservice:
 ---------------------
 Replace
@@ -27,6 +28,19 @@ With
 
 
 
+DEBUGBAR:
+---------
+
+Move
+    this.options = {
+                bodyMarginBottom: true,
+                bodyMarginBottomHeight: parseInt($('body').css('margin-bottom')),
+    };
+few line lower in the  
+	initialize: function() {
+
+
+
 ESCPOS:
 -------
 Replace
@@ -274,9 +288,39 @@ PARSEDOWN
 	$shortage = 4 - $len % 4;
 
 
+
+OAUTH
+-----
+Add into Class Google of file OAuth2/Service/Google:
+
+    // LDR CHANGE Add approval_prompt to force the prompt if value is set to 'force' so it force return of a "refresh token" in addition to "standard token"
+    public $approvalPrompt='auto';
+    public function setApprouvalPrompt($prompt)
+    {
+        if (!in_array($prompt, array('auto', 'force'), true)) {
+            // @todo Maybe could we rename this exception
+            throw new InvalidAccessTypeException('Invalid approuvalPrompt, expected either auto or force.');
+        }
+        $this->approvalPrompt = $prompt;
+    }
+    
+
+
 JEDITABLE.JS
 ------------
 
 * <button type="submit" />  =>  <button class="button" type="submit" />
 * <button type="cancel" />  =>  <button class="button" type="cancel" />
 
+
+
+SELECT2
+-------
+
+Edit CSS to restore line removed between 4.0.5 and 4.0.6. It generates this bug: https://github.com/select2/select2/issues/5832
+
+.select2-hidden-accessible {
+  margin: -10000px !important;                /* line to restore */
+}
+
+

dev/examples/code/create_invoice.php

@@ -66,8 +66,9 @@ $obj = new Facture($db);
 
 $obj->ref            = 'ABCDE';
 $obj->socid          = 4;	// Put id of third party (rowid in llx_societe table)
-$obj->date           = mktime();
-$obj->note           = 'A comment';
+$obj->date           = dol_now();
+$obj->note_public    = 'A public comment';
+$obj->note_private   = 'A private comment';
 $obj->cond_reglement_id = 1;
 
 $line1=new FactureLigne($db);

dev/examples/code/create_order.php

@@ -66,8 +66,9 @@ $com = new Commande($db);
 
 $com->ref            = 'ABCDE';
 $com->socid          = 4;	// Put id of third party (rowid in llx_societe table)
-$com->date_commande  = mktime();
-$com->note           = 'A comment';
+$com->date           = dol_now();
+$com->note_public    = 'A public comment';
+$com->note_private   = 'A private comment';
 $com->source         = 1;
 $com->remise_percent = 0;
 

dev/examples/ldap/ldapadd_sample1.txt

@@ -11,4 +11,4 @@ objectclass: dcObject
 objectClass: organization
 objectClass: top
 dc: my-domain
-o: Mon organisation
+o: my organisation

dev/examples/ldap/ldapmodify_sample1.txt

@@ -12,4 +12,4 @@ objectclass: dcObject
 objectClass: organization
 objectClass: top
 dc: my-domain
-o: Mon organisation
+o: my organisation

dev/initdata/dbf/import-dbf.php

@@ -0,0 +1,231 @@
+#!/usr/bin/env php
+<?php
+/* Copyright (C) 2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2016 Juanjo Menent        <jmenent@2byte.es>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * WARNING, THIS WILL LOAD MASS DATA ON YOUR INSTANCE
+ */
+
+/**
+ *  \file       dev/initdata/import-dbf.php
+ * 	\brief      Script example to create a table from a large DBF file (openoffice)
+ *              To purge data, you can have a look at purge-data.php
+ */
+// Test si mode batch
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+
+$path = dirname(__FILE__) . '/';
+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;
+}
+
+// Recupere root dolibarr
+$path = dirname($_SERVER["PHP_SELF"]);
+require $path . "./../htdocs/master.inc.php";
+require $path . "/includes/dbase.class.php";
+
+// Global variables
+$version = DOL_VERSION;
+$confirmed = 1;
+$error = 0;
+
+
+/*
+ * Main
+ */
+
+@set_time_limit(0);
+print "***** " . $script_file . " (" . $version . ") pid=" . dol_getmypid() . " *****\n";
+dol_syslog($script_file . " launched with arg " . implode(',', $argv));
+
+
+$filepath = $argv[1];
+$filepatherr = $filepath . '.err';
+$startchar = empty($argv[2]) ? 0 : (int) $argv[2];
+$deleteTable = empty($argv[3]) ? 1 : 0;
+$startlinenb = empty($argv[3]) ? 1 : (int) $argv[3];
+$endlinenb = empty($argv[4]) ? 0 : (int) $argv[4];
+
+if (empty($filepath)) {
+    print "Usage: php $script_file myfilepath.dbf [removeChatColumnName] [startlinenb] [endlinenb]\n";
+    print "Example: php $script_file myfilepath.dbf 0 2 1002\n";
+    print "\n";
+    exit(-1);
+}
+if (!file_exists($filepath)) {
+    print "Error: File " . $filepath . " not found.\n";
+    print "\n";
+    exit(-1);
+}
+
+$ret = $user->fetch('', 'admin');
+if (!$ret > 0) {
+    print 'A user with login "admin" and all permissions must be created to use this script.' . "\n";
+    exit;
+}
+$user->getrights();
+
+// Ask confirmation
+if (!$confirmed) {
+    print "Hit Enter to continue or CTRL+C to stop...\n";
+    $input = trim(fgets(STDIN));
+}
+
+// Open input and output files
+$fhandle = dbase_open($filepath, 0);
+if (!$fhandle) {
+    print 'Error: Failed to open file ' . $filepath . "\n";
+    exit(1);
+}
+$fhandleerr = fopen($filepatherr, 'w');
+if (!$fhandleerr) {
+    print 'Error: Failed to open file ' . $filepatherr . "\n";
+    exit(1);
+}
+
+$langs->setDefaultLang($defaultlang);
+
+$record_numbers = dbase_numrecords($fhandle);
+$table_name = substr(basename($filepath), 0, strpos(basename($filepath), '.'));
+print 'Info: ' . $record_numbers . " lines in file \n";
+$header = dbase_get_header_info($fhandle);
+if ($deleteTable) {
+    $db->query("DROP TABLE IF EXISTS `$table_name`");
+}
+$sqlCreate = "CREATE TABLE IF NOT EXISTS `$table_name` ( `id` INT(11) NOT NULL AUTO_INCREMENT ";
+$fieldArray = array("`id`");
+foreach ($header as $value) {
+    $fieldName = substr(str_replace('_', '', $value['name']), $startchar);
+    $fieldArray[] = "`$fieldName`";
+    $sqlCreate .= ", `" . $fieldName . "` VARCHAR({$value['length']}) NULL DEFAULT NULL ";
+}
+$sqlCreate .= ", PRIMARY KEY (`id`)) ENGINE = InnoDB";
+$resql = $db->query($sqlCreate);
+if ($resql !== false) {
+    print "Table $table_name created\n";
+} else {
+    var_dump($db->errno());
+    print "Impossible : " . $sqlCreate . "\n";
+    die();
+}
+
+$i = 0;
+$nboflines++;
+
+$fields = implode(',', $fieldArray);
+//var_dump($fieldArray);die();
+$maxLength = 0;
+for ($i = 1; $i <= $record_numbers; $i++) {
+    if ($startlinenb && $i < $startlinenb)
+        continue;
+    if ($endlinenb && $i > $endlinenb)
+        continue;
+    $row = dbase_get_record_with_names($fhandle, $i);
+    if ($row === false || (isset($row["deleted"]) && $row["deleted"] == '1'))
+        continue;
+    $sqlInsert = "INSERT INTO `$table_name`($fields) VALUES (null,";
+    array_shift($row); // remove delete column
+    foreach ($row as $value) {
+        $sqlInsert .= "'" . $db->escape(utf8_encode($value)) . "', ";
+    }
+    replaceable_echo(implode("\t", $row));
+    $sqlInsert = rtrim($sqlInsert, ', ');
+    $sqlInsert .= ")";
+    $resql = $db->query($sqlInsert);
+    if ($resql === false) {
+        print "Impossible : " . $sqlInsert . "\n";
+        var_dump($row, $db->errno());
+        die();
+    }
+	//    $fields = (object) $row;
+	//    var_dump($fields);
+    continue;
+}
+die();
+
+
+
+
+
+// commit or rollback
+print "Nb of lines qualified: " . $nboflines . "\n";
+print "Nb of errors: " . $error . "\n";
+if ($mode != 'confirmforced' && ($error || $mode != 'confirm')) {
+    print "Rollback any changes.\n";
+    $db->rollback();
+} else {
+    print "Commit all changes.\n";
+    $db->commit();
+}
+
+$db->close();
+fclose($fhandle);
+fclose($fhandleerr);
+
+exit($error);
+
+
+/**
+ * replaceable_echo
+ *
+ * @param string 	$message			Message
+ * @param int 		$force_clear_lines	Force clear messages
+ * @return void
+ */
+function replaceable_echo($message, $force_clear_lines = null)
+{
+    static $last_lines = 0;
+
+    if (!is_null($force_clear_lines)) {
+        $last_lines = $force_clear_lines;
+    }
+
+    $toss = array();
+    $status = 0;
+    $term_width = exec('tput cols', $toss, $status);
+    if ($status) {
+        $term_width = 64; // Arbitrary fall-back term width.
+    }
+
+    $line_count = 0;
+    foreach (explode("\n", $message) as $line) {
+        $line_count += count(str_split($line, $term_width));
+    }
+
+    // Erasure MAGIC: Clear as many lines as the last output had.
+    for ($i = 0; $i < $last_lines; $i++) {
+        // Return to the beginning of the line
+        echo "\r";
+        // Erase to the end of the line
+        echo "\033[K";
+        // Move cursor Up a line
+        echo "\033[1A";
+        // Return to the beginning of the line
+        echo "\r";
+        // Erase to the end of the line
+        echo "\033[K";
+        // Return to the beginning of the line
+        echo "\r";
+        // Can be consolodated into
+        // echo "\r\033[K\033[1A\r\033[K\r";
+    }
+
+    $last_lines = $line_count;
+
+    echo $message . "\n";
+}

dev/initdata/dbf/importdb-products.php

@@ -0,0 +1,241 @@
+#!/usr/bin/env php
+<?php
+/* Copyright (C) 2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2016 Juanjo Menent        <jmenent@2byte.es>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * WARNING, THIS WILL LOAD MASS DATA ON YOUR INSTANCE
+ */
+
+/**
+ *      \file       dev/initdata/import-product.php
+ * 		\brief      Script example to insert products from a csv file.
+ *                  To purge data, you can have a look at purge-data.php
+ */
+// Test si mode batch
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path = dirname(__FILE__) . '/';
+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;
+}
+
+// Recupere root dolibarr
+$path = preg_replace('/importdb-products.php/i', '', $_SERVER["PHP_SELF"]);
+require $path . "../../htdocs/master.inc.php";
+require $path . "includes/dbase.class.php";
+include_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+include_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+
+//$delimiter = ',';
+//$enclosure = '"';
+//$linelength = 10000;
+//$escape = '/';
+// Global variables
+$version = DOL_VERSION;
+$confirmed = 1;
+$error = 0;
+
+$tvas = [
+    '1' => "20.00",
+    '2' => "5.50",
+    '3' => "0.00",
+    '4' => "20.60",
+    '5' => "19.60",
+];
+$tvasD = [
+    '1' => "20",
+    '2' => "5.5",
+    '3' => "0",
+    '4' => "20",
+    '5' => "20",
+];
+
+/*
+ * Main
+ */
+
+@set_time_limit(0);
+print "***** " . $script_file . " (" . $version . ") pid=" . dol_getmypid() . " *****\n";
+dol_syslog($script_file . " launched with arg " . implode(',', $argv));
+
+$table = $argv[1];
+
+if (empty($argv[1])) {
+    print "Error: Which table ?\n";
+    print "\n";
+    exit(-1);
+}
+
+$ret = $user->fetch('', 'admin');
+if (!$ret > 0) {
+    print 'A user with login "admin" and all permissions must be created to use this script.' . "\n";
+    exit;
+}
+
+$sql = "SELECT * FROM `$table` WHERE 1";
+$resql = $db->query($sql);
+if ($resql)
+while ($fields = $db->fetch_array($resql)) {
+	$errorrecord = 0;
+	if ($fields === false)
+		continue;
+	$nboflines++;
+
+	$produit = new Product($db);
+	$produit->type = 0;
+	$produit->status = 1;
+	$produit->ref = trim($fields['REF']);
+	if ($produit->ref == '')
+		continue;
+	print "Process line nb " . $j . ", ref " . $produit->ref;
+	$produit->label = trim($fields['LIBELLE']);
+	if ($produit->label == '')
+		$produit->label = $produit->ref;
+	if (empty($produit->label))
+		continue;
+	//$produit->description = trim($fields[4] . "\n" . ($fields[5] ? $fields[5] . ' x ' . $fields[6] . ' x ' . $fields[7] : ''));
+	//        $produit->volume = price2num($fields[8]);
+	//        $produit->volume_unit = 0;
+	$produit->weight = price2num($fields['MASSE']);
+	$produit->weight_units = 0;          // -3 = g
+	//$produit->customcode = $fields[10];
+	$produit->barcode = str_pad($fields['CODE'], 12, "0", STR_PAD_LEFT);
+	$produit->barcode_type = '2';
+	$produit->import_key = $fields['CODE'];
+
+	$produit->status = 1;
+	$produit->status_buy = 1;
+
+	$produit->finished = 1;
+
+	//        $produit->multiprices[0] = price2num($fields['TARIF0']);
+	//        $produit->multiprices[1] = price2num($fields['TARIF1']);
+	//        $produit->multiprices[2] = price2num($fields['TARIF2']);
+	//        $produit->multiprices[3] = price2num($fields['TARIF3']);
+	//        $produit->multiprices[4] = price2num($fields['TARIF4']);
+	//        $produit->multiprices[5] = price2num($fields['TARIF5']);
+	//        $produit->multiprices[6] = price2num($fields['TARIF6']);
+	//        $produit->multiprices[7] = price2num($fields['TARIF7']);
+	//        $produit->multiprices[8] = price2num($fields['TARIF8']);
+	//        $produit->multiprices[9] = price2num($fields['TARIF9']);
+	//        $produit->price_min = null;
+	//        $produit->price_min_ttc = null;
+	//        $produit->price = price2num($fields[11]);
+	//        $produit->price_ttc = price2num($fields[12]);
+	//        $produit->price_base_type = 'TTC';
+	//        $produit->tva_tx = price2num($fields[13]);
+	$produit->tva_tx = (int) ($tvas[$fields['CODTVA']]);
+	$produit->tva_npr = 0;
+	//        $produit->cost_price = price2num($fields[16]);
+	//compta
+
+	$produit->accountancy_code_buy = trim($fields['COMACH']);
+	$produit->accountancy_code_sell = trim($fields['COMVEN']);
+	//        $produit->accountancy_code_sell_intra=trim($fields['COMVEN']);
+	//        $produit->accountancy_code_sell_export=trim($fields['COMVEN']);
+	// Extrafields
+	//        $produit->array_options['options_ecotaxdeee'] = price2num($fields[17]);
+
+	$produit->seuil_stock_alerte = $fields['STALERTE'];
+	$ret = $produit->create($user, 0);
+	if ($ret < 0) {
+		print " - Error in create result code = " . $ret . " - " . $produit->errorsToString();
+		$errorrecord++;
+	} else {
+		print " - Creation OK with ref " . $produit->ref . " - id = " . $ret;
+	}
+
+	dol_syslog("Add prices");
+
+	// If we use price level, insert price for each level
+	if (!$errorrecord && 1) {
+		//$ret1 = $produit->updatePrice($produit->price_ttc, $produit->price_base_type, $user, $produit->tva_tx, $produit->price_min, 1, $produit->tva_npr, 0, 0, array());
+		$ret1 = false;
+		for ($i = 0; $i < 10; $i++) {
+			if ($fields['TARIF' . ($i)] == 0)
+				continue;
+			$ret1 = $ret1 || $produit->updatePrice(price2num($fields['TARIF' . ($i)]), 'HT', $user, $produit->tva_tx, $produit->price_min, $i + 1, $produit->tva_npr, 0, 0, array()) < 0;
+		}
+		if ($ret1) {
+			print " - Error in updatePrice result " . $produit->errorsToString();
+			$errorrecord++;
+		} else {
+			print " - updatePrice OK";
+		}
+	}
+
+
+	//        dol_syslog("Add multilangs");
+	// Add alternative languages
+	//        if (!$errorrecord && 1) {
+	//            $produit->multilangs['fr_FR'] = array('label' => $produit->label, 'description' => $produit->description, 'note' => $produit->note_private);
+	//            $produit->multilangs['en_US'] = array('label' => $fields[3], 'description' => $produit->description, 'note' => $produit->note_private);
+	//
+	//            $ret = $produit->setMultiLangs($user);
+	//            if ($ret < 0) {
+	//                print " - Error in setMultiLangs result code = " . $ret . " - " . $produit->errorsToString();
+	//                $errorrecord++;
+	//            } else {
+	//                print " - setMultiLangs OK";
+	//            }
+	//        }
+
+
+	dol_syslog("Add stocks");
+	// stocks
+	if (!$errorrecord && $fields['STOCK'] != 0) {
+		$rets = $produit->correct_stock($user, 1, $fields['STOCK'], 0, 'Stock importé');
+		if ($rets < 0) {
+			print " - Error in correct_stock result " . $produit->errorsToString();
+			$errorrecord++;
+		} else {
+			print " - correct_stock OK";
+		}
+	}
+
+	//update date créa
+	if (!$errorrecord) {
+		$date = substr($fields['DATCREA'], 0, 4) . '-' . substr($fields['DATCREA'], 4, 2) . '-' . substr($fields['DATCREA'], 6, 2);
+		$retd = $db->query("UPDATE `llx_product` SET `datec` = '$date 00:00:00' WHERE `llx_product`.`rowid` = $produit->id");
+		if ($retd < 1) {
+			print " - Error in update date créa result " . $produit->errorsToString();
+			$errorrecord++;
+		} else {
+			print " - update date créa OK";
+		}
+	}
+	print "\n";
+
+	if ($errorrecord) {
+		print( 'Error on record nb ' . $i . " - " . $produit->errorsToString() . "\n");
+		var_dump($db);
+		die();
+		$error++;    // $errorrecord will be reset
+	}
+	$j++;
+} else
+    die("error : $sql");
+
+
+
+
+// commit or rollback
+print "Nb of lines qualified: " . $nboflines . "\n";
+print "Nb of errors: " . $error . "\n";
+$db->close();
+
+exit($error);

dev/initdata/dbf/importdb-thirdparties.php

@@ -0,0 +1,355 @@
+#!/usr/bin/env php
+<?php
+/* Copyright (C) 2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2016 Juanjo Menent        <jmenent@2byte.es>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * WARNING, THIS WILL LOAD MASS DATA ON YOUR INSTANCE
+ */
+
+/**
+ *      \file       dev/initdata/import-product.php
+ * 		\brief      Script example to insert products from a csv file.
+ *                  To purge data, you can have a look at purge-data.php
+ */
+// Test si mode batch
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path = dirname(__FILE__) . '/';
+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;
+}
+
+// Recupere root dolibarr
+$path = preg_replace('/importdb-thirdparties.php/i', '', $_SERVER["PHP_SELF"]);
+require $path . "../../htdocs/master.inc.php";
+require $path . "includes/dbase.class.php";
+include_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+include_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+
+//$delimiter = ',';
+//$enclosure = '"';
+//$linelength = 10000;
+//$escape = '/';
+// Global variables
+$version = DOL_VERSION;
+$confirmed = 1;
+$error = 0;
+
+$civilPrivate = array("MLLE",
+    "MM",
+    "MM/MADAME",
+    "MME",
+    "MME.",
+    "MME²",
+    "MMONSIEUR",
+    "MMR",
+    "MOBNSIEUR",
+    "MOMSIEUR",
+    "MON SIEUR",
+    "MONDIAL",
+    "MONIEUR",
+    "MONJSIEUR",
+    "MONNSIEUR",
+    "MONRIEUR",
+    "MONS",
+    "MONSIEÕR",
+    "MONSIER",
+    "MONSIERU",
+    "MONSIEU",
+    "monsieue",
+    "MONSIEUR",
+    "Monsieur     \"",
+    "MONSIEUR    \"",
+    "MONSIEUR   E",
+    "MONSIEUR  DENIS",
+    "MONSIEUR ET MME",
+    "MONSIEUR!",
+    "MONSIEUR.",
+    "MONSIEUR.MADAME",
+    "MONSIEUR3",
+    "MONSIEURN",
+    "MONSIEURT",
+    "MONSIEUR£",
+    "MONSIEYR",
+    "Monsigur",
+    "MONSIIEUR",
+    "MONSIUER",
+    "MONSIZEUR",
+    "MOPNSIEUR",
+    "MOSIEUR",
+    "MR",
+    "Mr  Mme",
+    "Mr - MME",
+    "MR BLANC",
+    "MR ET MME",
+    "mr mm",
+    "MR OU MME",
+    "Mr.",
+    "MR/MME",
+    "MRME",
+    "MRR",
+    "Mrs",
+    "Mademoiselle",
+    "MADAOME",
+    "madamme",
+    "MADAME",
+    "M0NSIEUR",
+    "M.et Madame",
+    "M. ET MR",
+    "M.",
+    "M%",
+    "M MME",
+    "M ET MME",
+    "M",
+    "M CROCE",
+    "M DIEVART",
+);
+
+/*
+ * Main
+ */
+
+@set_time_limit(0);
+print "***** " . $script_file . " (" . $version . ") pid=" . dol_getmypid() . " *****\n";
+dol_syslog($script_file . " launched with arg " . implode(',', $argv));
+
+$table = $argv[1];
+
+if (empty($argv[1])) {
+    print "Error: Quelle table ?\n";
+    print "\n";
+    exit(-1);
+}
+
+$ret = $user->fetch('', 'admin');
+if (!$ret > 0) {
+    print 'A user with login "admin" and all permissions must be created to use this script.' . "\n";
+    exit;
+}
+
+$sql = "SELECT * FROM `$table` WHERE 1 "; //ORDER BY REMISE DESC,`LCIVIL` DESC";
+$resql = $db->query($sql);
+//$db->begin();
+if ($resql)
+while ($fields = $db->fetch_array($resql)) {
+	$i++;
+	$errorrecord = 0;
+
+	if ($startlinenb && $i < $startlinenb)
+		continue;
+	if ($endlinenb && $i > $endlinenb)
+		continue;
+
+	$nboflines++;
+
+	$object = new Societe($db);
+	$object->import_key = $fields['CODE'];
+	$object->state = 1;
+	$object->client = 3;
+	$object->fournisseur = 0;
+
+	$object->name = $fields['FCIVIL'] . ' ' . $fields['FNOM'];
+	//$object->name_alias = $fields[0] != $fields[13] ? trim($fields[0]) : '';
+
+	$date = $fields['DATCREA'] ? $fields['DATCREA'] : ($fields['DATMOD'] ? $fields['DATMOD'] : '20200101');
+	$object->code_client = 'CU' . substr($date, 2, 2) . substr($date, 4, 2) . '-' . str_pad(substr($fields['CODE'], 0, 5), 5, "0", STR_PAD_LEFT);
+
+
+	$object->address = trim($fields['FADR1']);
+	if ($fields['FADR2'])
+		$object->address .= "\n" . trim($fields['FADR2']);
+	if ($fields['FADR3'])
+		$object->address .= "\n" . trim($fields['FADR3']);
+
+	$object->zip = trim($fields['FPOSTE']);
+	$object->town = trim($fields['FVILLE']);
+	if ($fields['FPAYS'])
+		$object->country_id = dol_getIdFromCode($db, trim(ucwords(strtolower($fields['FPAYS']))), 'c_country', 'label', 'rowid');
+	else
+		$object->country_id = 1;
+	$object->phone = trim($fields['FTEL']) ? trim($fields['FTEL']) : trim($fields['FCONTACT']);
+	$object->phone = substr($object->phone, 0, 20);
+	$object->fax = trim($fields['FFAX']) ? trim($fields['FFAX']) : trim($fields['FCONTACT']);
+	$object->fax = substr($object->fax, 0, 20);
+	$object->email = trim($fields['FMAIL']);
+	//        $object->idprof2 = trim($fields[29]);
+	$object->tva_intra = str_replace(['.', ' '], '', $fields['TVAINTRA']);
+	$object->tva_intra = substr($object->tva_intra, 0, 20);
+	$object->default_lang = 'fr_FR';
+
+	$object->cond_reglement_id = dol_getIdFromCode($db, 'PT_ORDER', 'c_payment_term', 'code', 'rowid', 1);
+	$object->multicurrency_code = 'EUR';
+
+	if ($fields['REMISE'] != '0.00') {
+		$object->remise_percent = abs($fields['REMISE']);
+	}
+
+	//        $object->code_client = $fields[9];
+	//        $object->code_fournisseur = $fields[10];
+
+
+	if ($fields['FCIVIL']) {
+		$labeltype = in_array($fields['FCIVIL'], $civilPrivate) ? 'TE_PRIVATE' : 'TE_SMALL';
+		$object->typent_id = dol_getIdFromCode($db, $labeltype, 'c_typent', 'code');
+	}
+
+	// Set price level
+	$object->price_level = $fields['TARIF'] + 1;
+	//        if ($labeltype == 'Revendeur')
+	//            $object->price_level = 2;
+
+	print "Process line nb " . $i . ", code " . $fields['CODE'] . ", name " . $object->name;
+
+
+	// Extrafields
+	$object->array_options['options_banque'] = $fields['BANQUE'];
+	$object->array_options['options_banque2'] = $fields['BANQUE2'];
+	$object->array_options['options_banquevalid'] = $fields['VALID'];
+
+	if (!$errorrecord) {
+		$ret = $object->create($user);
+		if ($ret < 0) {
+			print " - Error in create result code = " . $ret . " - " . $object->errorsToString();
+			$errorrecord++;
+			var_dump($object->code_client, $db);
+			die();
+		} else {
+			print " - Creation OK with name " . $object->name . " - id = " . $ret;
+		}
+	}
+
+	if (!$errorrecord) {
+		dol_syslog("Set price level");
+		$object->set_price_level($object->price_level, $user);
+	}
+	if (!$errorrecord && @$object->remise_percent) {
+		dol_syslog("Set remise client");
+		$object->set_remise_client($object->remise_percent, 'Importé', $user);
+	}
+
+	dol_syslog("Add contact");
+	// Insert an invoice contact if there is an invoice email != standard email
+	if (!$errorrecord && ($fields['LCIVIL'] || $fields['LNOM'])) {
+		$madame = array("MADAME",
+			"MADEMOISELLE",
+			"MELLE",
+			"MLLE",
+			"MM",
+			"Mme",
+			"MNE",
+		);
+		$monsieur = array("M",
+			"M ET MME",
+			"M MME",
+			"M.",
+			"M. MME",
+			"M. OU Mme",
+			"M.ou Madame",
+			"MONSEUR",
+			"MONSIER",
+			"MONSIEU",
+			"MONSIEUR",
+			"monsieur:mme",
+			"MONSIEUR¨",
+			"MONSIEZUR",
+			"MONSIUER",
+			"MONSKIEUR",
+			"MR",
+		);
+		$ret1 = $ret2 = 0;
+
+		$contact = new Contact($db);
+		if (in_array($fields['LCIVIL'], $madame)) {
+			// une dame
+			$contact->civility_id = 'MME';
+			$contact->lastname = $fields['LNOM'];
+		} elseif (in_array($fields['LCIVIL'], $monsieur)) {
+			// un monsieur
+			$contact->civility_id = 'MR';
+			$contact->lastname = $fields['LNOM'];
+		} elseif (in_array($fields['LCIVIL'], ['DOCTEUR'])) {
+			// un monsieur
+			$contact->civility_id = 'DR';
+			$contact->lastname = $fields['LNOM'];
+		} else {
+			// un a rattraper
+			$contact->lastname = $fields['LCIVIL'] . " " . $fields['LNOM'];
+		}
+		$contact->address = trim($fields['LADR1']);
+		if ($fields['LADR2'])
+			$contact->address .= "\n" . trim($fields['LADR2']);
+		if ($fields['LADR3'])
+			$contact->address .= "\n" . trim($fields['LADR3']);
+
+		$contact->zip = trim($fields['LPOSTE']);
+		$contact->town = trim($fields['LVILLE']);
+		if ($fields['FPAYS'])
+			$contact->country_id = dol_getIdFromCode($db, trim(ucwords(strtolower($fields['LPAYS']))), 'c_country', 'label', 'rowid');
+		else
+			$contact->country_id = 1;
+		$contact->email = $fields['LMAIL'];
+		$contact->phone = trim($fields['LTEL']) ? trim($fields['LTEL']) : trim($fields['LCONTACT']);
+		$contact->fax = trim($fields['LFAX']) ? trim($fields['LFAX']) : trim($fields['LCONTACT']);
+		$contact->socid = $object->id;
+
+		$ret1 = $contact->create($user);
+		if ($ret1 > 0) {
+			//$ret2=$contact->add_contact($object->id, 'BILLING');
+		}
+		if ($ret1 < 0 || $ret2 < 0) {
+			print " - Error in create contact result code = " . $ret1 . " " . $ret2 . " - " . $contact->errorsToString();
+			$errorrecord++;
+		} else {
+			print " - create contact OK";
+		}
+	}
+
+
+	//update date créa
+	if (!$errorrecord) {
+		$datec = substr($date, 0, 4) . '-' . substr($date, 4, 2) . '-' . substr($date, 6, 2);
+		$retd = $db->query("UPDATE `llx_societe` SET `datec` = '$datec 00:00:00' WHERE `rowid` = $object->id");
+		if ($retd < 1) {
+			print " - Error in update date créa result " . $object->errorsToString();
+			$errorrecord++;
+		} else {
+			print " - update date créa OK";
+		}
+	}
+	print "\n";
+
+	if ($errorrecord) {
+		print( 'Error on record nb ' . $i . " - " . $object->errorsToString() . "\n");
+		var_dump($db, $object, $contact);
+		//            $db->rollback();
+		die();
+		$error++;    // $errorrecord will be reset
+	}
+	$j++;
+} else
+    die("error : $sql");
+
+$db->commit();
+
+
+
+// commit or rollback
+print "Nb of lines qualified: " . $nboflines . "\n";
+print "Nb of errors: " . $error . "\n";
+$db->close();
+
+exit($error);

dev/initdata/dbf/includes/dbase.class.php

@@ -0,0 +1,402 @@
+<?php
+/**
+ * \file        dev/initdata/dbf/includes/dbase.class.php
+ * \ingroup     dev
+ * \brief       Class to manage DBF databases
+ */
+
+// source : https://github.com/donfbecker/php-dbase
+
+define('DBASE_RDONLY', 0);
+define('DBASE_WRONLY', 1);
+define('DBASE_RDWR', 2);
+define('DBASE_TYPE_DBASE', 0);
+define('DBASE_TYPE_FOXPRO', 1);
+
+/**
+ * Class for DBase
+ */
+class DBase
+{
+    private $fd;
+    private $headerLength = 0;
+    private $fields = array();
+    private $fieldCount = 0;
+    private $recordLength = 0;
+    private $recordCount = 0;
+
+    //resource dbase_open ( string $filename , int $mode )
+    public static function open($filename, $mode)
+	{
+        if (!file_exists($filename))
+            return false;
+        $modes = array('r', 'w', 'r+');
+        $mode = $modes[$mode];
+        $fd = fopen($filename, $mode);
+        if (!$fd)
+            return false;
+        return new DBase($fd);
+    }
+
+    //resource dbase_create ( string $filename , array $fields [, int $type = DBASE_TYPE_DBASE ] )
+    public static function create($filename, $fields, $type = DBASE_TYPE_DBASE)
+	{
+        if (file_exists($filename))
+            return false;
+        $fd = fopen($filename, 'c+');
+        if (!$fd)
+            return false;
+        // Byte 0 (1 byte): Valid dBASE for DOS file; bits 0-2 indicate version number, bit 3
+        // indicates the presence of a dBASE for DOS memo file, bits 4-6 indicate the
+        // presence of a SQL table, bit 7 indicates the presence of any memo file
+        // (either dBASE m PLUS or dBASE for DOS)
+        self::putChar8($fd, 5);
+        // Byte 1-3 (3 bytes): Date of last update; formatted as YYMMDD
+        self::putChar8($fd, date('Y') - 1900);
+        self::putChar8($fd, date('m'));
+        self::putChar8($fd, date('d'));
+        // Byte 4-7 (32-bit number): Number of records in the database file.  Currently 0
+        self::putInt32($fd, 0);
+        // Byte 8-9 (16-bit number): Number of bytes in the header.
+        self::putInt16($fd, 32 + (32 * count($fields)) + 1);
+        // Byte 10-11 (16-bit number): Number of bytes in record.
+        // Make sure the include the byte for deleted flag
+        $len = 1;
+        foreach ($fields as &$field)
+            $len += self::length($field);
+        self::putInt16($fd, $len);
+        // Byte 12-13 (2 bytes): Reserved, 0 filled.
+        self::putInt16($fd, 0);
+        // Byte 14 (1 byte): Flag indicating incomplete transaction
+        // The ISMARKEDO function checks this flag. BEGIN TRANSACTION sets it to 1, END TRANSACTION and ROLLBACK reset it to 0.
+        self::putChar8($fd, 0);
+        // Byte 15 (1 byte): Encryption flag. If this flag is set to 1, the message Database encrypted appears. Changing this flag to 0 removes the message, but does not decrypt the file.
+        self::putChar8($fd, 0);
+        // Byte 16-27 (12 bytes): Reserved for dBASE for DOS in a multi-user environment
+        self::putInt32($fd, 0);
+        self::putInt32($fd, 0);
+        self::putInt32($fd, 0);
+        // Byte 28 (1 byte): Production .mdx file flag; 0x01 if there is a production .mdx file, 0x00 if not
+        self::putChar8($fd, 0);
+        // Byte 29 (1 byte): Language driver ID
+        // (no clue what this is)
+        self::putChar8($fd, 0);
+        // Byte 30-31 (2 bytes): Reserved, 0 filled.
+        self::putInt16($fd, 0);
+        // Byte 32 - n (32 bytes each): Field descriptor array
+        foreach ($fields as &$field) {
+            self::putString($fd, $field[0], 11);       // Byte 0 - 10 (11 bytes): Field name in ASCII (zero-filled)
+            self::putString($fd, $field[1], 1);       // Byte 11 (1 byte): Field type in ASCII (C, D, F, L, M, or N)
+            self::putInt32($fd, 0);                    // Byte 12 - 15 (4 bytes): Reserved
+            self::putChar8($fd, self::length($field)); // Byte 16 (1 byte): Field length in binary. The maximum length of a field is 254 (0xFE).
+            self::putChar8($fd, $field[3]);            // Byte 17 (1 byte): Field decimal count in binary
+            self::putInt16($fd, 0);                    // Byte 18 - 19 (2 bytes): Work area ID
+            self::putChar8($fd, 0);                    // Byte 20 (1 byte): Example (??)
+            self::putInt32($fd, 0);                    // Byte 21 - 30 (10 bytes): Reserved
+            self::putInt32($fd, 0);
+            self::putInt16($fd, 0);
+            self::putChar8($fd, 0);                    // Byte 31 (1 byte): Production MDX field flag; 1 if field has an index tag in the production MDX file, 0 if not
+        }
+        // Byte n + 1 (1 byte): 0x0D as the field descriptor array terminator
+        self::putChar8($fd, 0x0D);
+        return new DBase($fd);
+    }
+
+    // Create DBase instance
+    private function __construct($fd)
+	{
+        $this->fd = $fd;
+        // Byte 4-7 (32-bit number): Number of records in the database file.  Currently 0
+        fseek($this->fd, 4, SEEK_SET);
+        $this->recordCount = self::getInt32($fd);
+        // Byte 8-9 (16-bit number): Number of bytes in the header.
+        fseek($this->fd, 8, SEEK_SET);
+        $this->headerLength = self::getInt16($fd);
+        // Number of fields is (headerLength - 33) / 32)
+        $this->fieldCount = ($this->headerLength - 33) / 32;
+        // Byte 10-11 (16-bit number): Number of bytes in record.
+        fseek($this->fd, 10, SEEK_SET);
+        $this->recordLength = self::getInt16($fd);
+        // Byte 32 - n (32 bytes each): Field descriptor array
+        fseek($fd, 32, SEEK_SET);
+        for ($i = 0; $i < $this->fieldCount; $i++) {
+            $data = fread($this->fd, 32);
+            $field = array_map('trim', unpack('a11name/a1type/c4/c1length/c1precision/s1workid/c1example/c10/c1production', $data));
+            $this->fields[] = $field;
+        }
+    }
+
+    //bool dbase_close ( resource $dbase_identifier )
+    public function close()
+	{
+        fclose($this->fd);
+    }
+
+    //array dbase_get_header_info ( resource $dbase_identifier )
+    public function get_header_info()
+	{
+        return $this->fields;
+    }
+
+    //int dbase_numfields ( resource $dbase_identifier )
+    public function numfields()
+	{
+        return $this->fieldCount;
+    }
+
+    //int dbase_numrecords ( resource $dbase_identifier )
+    public function numrecords()
+	{
+        return $this->recordCount;
+    }
+
+    //bool dbase_add_record ( resource $dbase_identifier , array $record )
+    public function add_record($record)
+	{
+        if (count($record) != $this->fieldCount)
+            return false;
+        // Seek to end of file, minus the end of file marker
+        fseek($this->fd, 0, SEEK_END);
+        // Put the deleted flag
+        self::putChar8($this->fd, 0x20);
+        // Put the record
+        if (!$this->putRecord($record))
+            return false;
+        // Update the record count
+        fseek($this->fd, 4);
+        self::putInt32($this->fd, ++$this->recordCount);
+        return true;
+    }
+
+    //bool dbase_replace_record ( resource $dbase_identifier , array $record , int $record_number )
+    public function replace_record($record, $record_number)
+	{
+        if (count($record) != $this->fieldCount)
+            return false;
+        if ($record_number < 1 || $record_number > $this->recordCount)
+            return false;
+        // Skip to the record location, plus the 1 byte for the deleted flag
+        fseek($this->fd, $this->headerLength + ($this->recordLength * ($record_number - 1)) + 1);
+        return $this->putRecord($record);
+    }
+
+    //bool dbase_delete_record ( resource $dbase_identifier , int $record_number )
+    public function delete_record($record_number)
+	{
+        if ($record_number < 1 || $record_number > $this->recordCount)
+            return false;
+        fseek($this->fd, $this->headerLength + ($this->recordLength * ($record_number - 1)));
+        self::putChar8($this->fd, 0x2A);
+        return true;
+    }
+
+    //array dbase_get_record ( resource $dbase_identifier , int $record_number )
+    public function get_record($record_number)
+	{
+        if ($record_number < 1 || $record_number > $this->recordCount)
+            return false;
+        fseek($this->fd, $this->headerLength + ($this->recordLength * ($record_number - 1)));
+        $record = array(
+            'deleted' => self::getChar8($this->fd) == 0x2A ? 1 : 0
+        );
+        foreach ($this->fields as $i => &$field) {
+            $value = trim(fread($this->fd, $field['length']));
+            if ($field['type'] == 'L') {
+                $value = strtolower($value);
+                if ($value == 't' || $value == 'y')
+                    $value = true;
+                elseif ($value == 'f' || $value == 'n')
+                    $value = false;
+                else
+                    $value = null;
+            }
+            $record[$i] = $value;
+        }
+        return $record;
+    }
+
+    //array dbase_get_record_with_names ( resource $dbase_identifier , int $record_number )
+    public function get_record_with_names($record_number)
+	{
+        if ($record_number < 1 || $record_number > $this->recordCount)
+            return false;
+        $record = $this->get_record($record_number);
+        foreach ($this->fields as $i => &$field) {
+            $record[$field['name']] = $record[$i];
+            unset($record[$i]);
+        }
+        return $record;
+    }
+
+    //bool dbase_pack ( resource $dbase_identifier )
+    public function pack()
+	{
+        $in_offset = $out_offset = $this->headerLength;
+        $new_count = 0;
+        $rec_count = $this->recordCount;
+        while ($rec_count > 0) {
+            fseek($this->fd, $in_offset, SEEK_SET);
+            $record = fread($this->fd, $this->recordLength);
+            $deleted = substr($record, 0, 1);
+            if ($deleted != '*') {
+                fseek($this->fd, $out_offset, SEEK_SET);
+                fwrite($this->fd, $record);
+                $out_offset += $this->recordLength;
+                $new_count++;
+            }
+            $in_offset += $this->recordLength;
+            $rec_count--;
+        }
+        ftruncate($this->fd, $out_offset);
+        // Update the record count
+        fseek($this->fd, 4);
+        self::putInt32($this->fd, $new_count);
+    }
+
+    /*
+     * A few utilitiy functions
+     */
+
+    private static function length($field)
+	{
+        switch ($field[1]) {
+            case 'D': // Date: Numbers and a character to separate month, day, and year (stored internally as 8 digits in YYYYMMDD format)
+                return 8;
+            case 'T': // DateTime (YYYYMMDDhhmmss.uuu) (FoxPro)
+                return 18;
+            case 'M': // Memo (ignored): All ASCII characters (stored internally as 10 digits representing a .dbt block number, right justified, padded with whitespaces)
+            case 'N': // Number: -.0123456789 (right justified, padded with whitespaces)
+            case 'F': // Float: -.0123456789 (right justified, padded with whitespaces)
+            case 'C': // String: All ASCII characters (padded with whitespaces up to the field's length)
+                return $field[2];
+            case 'L': // Boolean: YyNnTtFf? (? when not initialized)
+                return 1;
+        }
+        return 0;
+    }
+
+    /*
+     * Functions for reading and writing bytes
+     */
+
+    private static function getChar8($fd)
+	{
+        return ord(fread($fd, 1));
+    }
+
+    private static function putChar8($fd, $value)
+	{
+        return fwrite($fd, chr($value));
+    }
+
+    private static function getInt16($fd, $n = 1)
+	{
+        $data = fread($fd, 2 * $n);
+        $i = unpack("S$n", $data);
+        if ($n == 1)
+            return (int) $i[1];
+        else
+            return array_merge($i);
+    }
+
+    private static function putInt16($fd, $value)
+	{
+        return fwrite($fd, pack('S', $value));
+    }
+
+    private static function getInt32($fd, $n = 1)
+	{
+        $data = fread($fd, 4 * $n);
+        $i = unpack("L$n", $data);
+        if ($n == 1)
+            return (int) $i[1];
+        else
+            return array_merge($i);
+    }
+
+    private static function putInt32($fd, $value)
+	{
+        return fwrite($fd, pack('L', $value));
+    }
+
+    private static function putString($fd, $value, $length = 254)
+	{
+        $ret = fwrite($fd, pack('A' . $length, $value));
+    }
+
+    private function putRecord($record)
+	{
+        foreach ($this->fields as $i => &$field) {
+            $value = $record[$i];
+            // Number types are right aligned with spaces
+            if ($field['type'] == 'N' || $field['type'] == 'F' && strlen($value) < $field['length']) {
+                $value = str_repeat(' ', $field['length'] - strlen($value)) . $value;
+            }
+            self::putString($this->fd, $value, $field['length']);
+        }
+        return true;
+    }
+}
+
+if (!function_exists('dbase_open')) {
+
+    function dbase_open($filename, $mode)
+	{
+        return DBase::open($filename, $mode);
+    }
+
+    function dbase_create($filename, $fields, $type = DBASE_TYPE_DBASE)
+	{
+        return DBase::create($filename, $fields, $type);
+    }
+
+    function dbase_close($dbase_identifier)
+	{
+        return $dbase_identifier->close();
+    }
+
+    function dbase_get_header_info($dbase_identifier)
+	{
+        return $dbase_identifier->get_header_info();
+    }
+
+    function dbase_numfields($dbase_identifier)
+	{
+        $dbase_identifier->numfields();
+    }
+
+    function dbase_numrecords($dbase_identifier)
+	{
+        return $dbase_identifier->numrecords();
+    }
+
+    function dbase_add_record($dbase_identifier, $record)
+	{
+        return $dbase_identifier->add_record($record);
+    }
+
+    function dbase_delete_record($dbase_identifier, $record_number)
+	{
+        return $dbase_identifier->delete_record($record_number);
+    }
+
+    function dbase_replace_record($dbase_identifier, $record, $record_number)
+	{
+        return $dbase_identifier->replace_record($record, $record_number);
+    }
+
+    function dbase_get_record($dbase_identifier, $record_number)
+	{
+        return $dbase_identifier->get_record($record_number);
+    }
+
+    function dbase_get_record_with_names($dbase_identifier, $record_number)
+	{
+        return $dbase_identifier->get_record_with_names($record_number);
+    }
+
+    function dbase_pack($dbase_identifier)
+	{
+        return $dbase_identifier->pack();
+    }
+}

dev/initdata/generate-invoice.php

@@ -23,10 +23,14 @@
  *		\brief      Script example to inject random customer invoices (for load tests)
  */
 
+$sapi_type = php_sapi_name();
+$script_file = basename(__FILE__);
+$path=dirname(__FILE__).'/';
+
 // Test si mode batch
 $sapi_type = php_sapi_name();
 if (substr($sapi_type, 0, 3) == 'cgi') {
-	echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
+	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
 	exit;
 }