FIX - use price() to display qty on a product's stats tab to avoid showing too many decimals when rounding errors are possible (#31165)

* FIX: when qty is not an integer, apply price() to avoid displaying precision errors if php.ini's precision settings are too high

* Apply eldy's suggestion to use price's parameters rather than a test

.editorconfig

@@ -9,6 +9,8 @@ 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](https://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](http://www.dolibarr.org/forum).
 
 Issues are managed on [GitHub](https://github.com/Dolibarr/dolibarr/issues).
 
@@ -101,35 +101,30 @@ Long description (Can span accross multiple lines).
 </pre>
 
 ### Pull Requests
-Pull Request (PR) process is the process to submit a change (enhancement, bug fix, ...) into the code of the project. There is some rules to know and 
+When submitting a pull request, use same rule as [Commits](#commits) for the message.
-a process to follow to optimize the chance to have PRs merged efficiently...
 
-* 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.
+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.
-* 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 core project manager (mention @dolibarr-yoda in your issue) to see if such a library can be accepted.
+* if you want to include a new external library (into htdocs/includes directory), please ask before to the project manager (@eldy) to see if such a library can be accepted.
 
-* if you add a new table, you must first create a page on https://wiki.dolibarr.org/index.php/Category:Table_SQL (copy an existing page changing its name to see it into this index page). Then ask the project manager (@dolibarr-yoda) if the new data model you plan to add is compatible with curent and future works in progress and can be accepted as you suggest.
+* 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.
 
-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).
+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.
-
-If the label of PR start with "Draft" or "WIP" (Work In Progress), it will not be analyzed for merging until you change the label of PR (but it can be analyzed for discussion).
 
 If your PR has errors reported by the Continuous Integration Platform, it means your PR is not valid and nothing will be done with it. It will be kept open to allow developers to fix this, or it may be closed several month later. Don't expect anything on your PR if you have such errors, you MUST first fix the Continuous Integration error to have it taken into consideration. 
 
 If the PR is valid, and is kept open for a long time, a tag will also be added on the PR to describe the status of your PR and why the PR is kept open. By putting your mouse on the tag, you will get a full explanation of the tag/status that explain why your PR has not been integrated yet.
-In most cases, it gives you information of things you have to do to have the PR taken into consideration (for example a change is requested, a conflict is expected to be solved, some questions were asked). If you have a yellow, red flag of purple flag, don't expect to have your PR validated. You must first provide the answer the tag ask you. The majority of open PR are waiting an action of the author of the PR.
+In most cases, it give 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 a developer action.
 
-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.
+Around 95% of submitted PR are reviewed and tagged. Even if 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.
 
 
 ### Resources
-[Developer documentation](https://wiki.dolibarr.org/index.php/Developer_documentation)
+[Developer documentation](http://wiki.dolibarr.org/index.php/Developer_documentation)
 
 Translations
 ------------
@@ -145,11 +140,11 @@ to retreive all old translation of a source text, and restore the translation in
 
 
 ### Resources
-[Translator documentation](https://wiki.dolibarr.org/index.php/Translator_documentation)
+[Translator documentation](http://wiki.dolibarr.org/index.php/Translator_documentation)
 
 Documentation
 -------------
-The project's documentation is maintained on the [Wiki](https://wiki.dolibarr.org/index.php).
+The project's documentation is maintained on the [Wiki](http://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/FUNDING.yml

@@ -1,5 +0,0 @@
-# These are supported funding model platforms
-
-open_collective: dolibarr
-custom: https://wiki.dolibarr.org/index.php/Subscribe
-# github: [eldy]

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,41 @@
+# Instructions
+*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
+*Please:*
+- *only keep the "Bug" or "Feature Request" section*
+- *replace the bracket enclosed texts with meaningful informations*
+- *remove any unused sub-section*
+
+
+# Bug
+[*Short description*]
+
+## Environment
+- **Version**: [*Affected Dolibarr version(s)*]
+- **OS**: [*Server OS type and version*]
+- **Web server**: [*Webserver type and version*]
+- **PHP**: [*PHP version*]
+- **Database**: [*Database type and version*]
+- **URL(s)**: [*Affected URL(s)*]
+
+## Expected and actual behavior
+[*Verbose description*]
+
+## Steps to reproduce the behavior
+[*Verbose description*]
+
+## [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)
+[*Files*]
+
+
+
+# Feature Request
+[*Short description*]
+
+## Use case
+[*Verbose description*]
+
+## Suggested implementation
+[*Verbose description*]
+
+## Suggested steps
+[*List of tasks to achieve goal*]

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,35 +0,0 @@
----
-name: Bug report
-about: Create a report to help us fix something that is broken
-title: ''
-labels: Bug
-assignees: ''
-
----
-
-# Instructions
-*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
-*Please:*
-- *replace the bracket enclosed texts with meaningful information*
-- *remove any unused sub-section*
-
-
-# Bug
-[*Short description*]
-
-## Environment
-- **Version**: [*Affected Dolibarr version(s)*]
-- **OS**: [*Server OS type and version*]
-- **Web server**: [*Webserver type and version*]
-- **PHP**: [*PHP version*]
-- **Database**: [*Database type and version*]
-- **URL(s)**: [*Affected URL(s)*]
-
-## Expected and actual behavior
-[*Verbose description*]
-
-## Steps to reproduce the behavior
-[*Verbose description*]
-
-## [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)
-[*Files*]

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,27 +0,0 @@
----
-name: Feature request
-about: Suggest a new idea for this project
-title: ''
-labels: Feature request
-assignees: ''
-
----
-
-# Instructions
-*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
-*Please:*
-- *replace the bracket enclosed texts with meaningful information*
-- *remove any unused sub-section*
-
-
-# Feature Request
-[*Short description*]
-
-## Use case
-[*Verbose description*]
-
-## Suggested implementation
-[*Verbose description*]
-
-## Suggested steps
-[*List of tasks to achieve goal*]

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

@@ -1,13 +0,0 @@
-# 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

@@ -1,24 +0,0 @@
-# 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

@@ -1,25 +0,0 @@
-# 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

@@ -1,7 +1,5 @@
 htdocs/conf/conf.php
 htdocs/conf/conf.php.old
-htdocs/conf/conf.php.sav
-htdocs/conf/conf.php.back
 documents/
 custom2/
 test/report/
@@ -10,34 +8,21 @@ default.properties
 .settings/
 .buildpath
 .gitmodules
+dolibarr_install.log
+upgrade.log
+doxygen_warnings.log
 /.project
-/.pydevproject
 /.vscode
 .DS_Store
 .idea
 *.iml
 Thumbs.db
-/dolibarr_genesis.mp4
-# Log files
-dolibarr_install.log
-upgrade.log
-doxygen_warnings.log
 # Vagrant generated files
 .vagrant
 # Composer installed repositories
 /htdocs/includes/**/.git
 # Composer autoloader and unwanted files
-composer.phar
 htdocs/includes/autoload.php
 htdocs/includes/bin/
 htdocs/includes/composer/
-htdocs/includes/doctrine/
+/.pydevproject
-htdocs/includes/jakub-onderka/
-htdocs/includes/phpdocumentor/
-htdocs/includes/phpspec/
-htdocs/includes/phpunit/
-htdocs/includes/sebastian/
-htdocs/includes/squizlabs/
-htdocs/includes/symfony/
-htdocs/includes/webmozart/
-htdocs/.well-known/apple-developer-merchantid-domain-association

.scrutinizer.yml

@@ -1,13 +1,4 @@
 # .scrutinizer.yml
-#build:
-#    - php-scrutinizer-run
-build:
-    nodes:
-        analysis:
-            tests:
-                override:
-                    - php-scrutinizer-run
-          
 imports:
     - javascript
     - php
@@ -38,7 +29,6 @@ tools:
                 - doc/*
                 - test/*
                 - htdocs/includes/*
-                - htdocs/core/class/lessc.class.php
             paths:
                 - htdocs/
                 - scripts/
@@ -195,6 +185,22 @@ tools:
                 - '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:
         enabled: false

.stickler.yml

@@ -8,7 +8,3 @@ linters:
 
 fixers:
     enable: true
-
-files:
-    ignore:
-        - 'htdocs/includes/*'

.travis.yml

@@ -2,9 +2,9 @@
 # from Dolibarr GitHub repository.
 # For syntax, see http://about.travis-ci.org/docs/user/languages/php/
 
-# We use dist: xenial to have php 5.6+ available
+# We use dist: trusty to have php 5.4+ available
 os: linux
-dist: xenial
+dist: trusty
 sudo: required
 
 language: php
@@ -12,16 +12,16 @@ language: php
 # Start on every boot
 services:
 - memcached
-- mysql
-- postgresql
 
 addons:
-  # Force postgresql to 9.4 (the oldest availablable on xenial)
+  mariadb: '10.0'
-  postgresql: '9.4'
+  postgresql: '9.3'
   apt:
     sources:
-    # To use the last version of pgloader, we add repo of postgresql with a name available in http://apt.postgresql.org/pub/repos/apt/
+    # To use the last version of pgloader, we add repo of postgresql
-    - pgdg-xenial
+    - postgresql
+    - sourceline: 'deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main'
+    - key_url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc'
     packages:
     # We need a webserver to test the webservices
     # Let's install Apache with.
@@ -32,50 +32,52 @@ addons:
     - 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:
+  matrix:
   # MariaDB overrides MySQL installation so it's not possible to test both yet
-  #- DB=mariadb
+  #- DB=mysql
-  - 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:
+matrix:
   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=mysql
+    env: DB=mariadb
   - php: '7.1'
-    env: DB=mysql
+    env: DB=mariadb
   - php: '7.2'
-    env: DB=mysql
+    env: DB=mariadb
-  - php: '7.3'
+  - php: '5.6'
-    env: DB=mysql
+    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
 
@@ -111,35 +113,35 @@ install:
   rm $TRAVIS_BUILD_DIR/composer.json
   rm $TRAVIS_BUILD_DIR/composer.lock
   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
 
 - |
-  echo "Installing Composer dependencies (PHP Unit, Parallel Lint & PHP CodeSniffer"
+  echo "Installing Parallel Lint"
+  composer -n require jakub-onderka/php-parallel-lint ^0
+  composer -n require jakub-onderka/php-console-highlighter ^0
+  echo
+
+- |
+  echo "Installing PHP Unit"
   if [ "$TRAVIS_PHP_VERSION" = '5.4' ] || [ "$TRAVIS_PHP_VERSION" = '5.5' ]; then
-    composer -n require phpunit/phpunit ^4 \
+    composer -n require phpunit/phpunit ^4
-                        jakub-onderka/php-parallel-lint ^0 \
-                        jakub-onderka/php-console-highlighter ^0 \
-                        squizlabs/php_codesniffer ^3
   fi
-  if [ "$TRAVIS_PHP_VERSION" = '5.6' ] || [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] \
+  if [ "$TRAVIS_PHP_VERSION" = '5.6' ] || [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ]; then
-     [ "$TRAVIS_PHP_VERSION" = '7.2' ] || [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = '7.4' ]; then
+    composer -n require phpunit/phpunit ^5
-    composer -n require phpunit/phpunit ^5 \
-                        jakub-onderka/php-parallel-lint ^0 \
-                        jakub-onderka/php-console-highlighter ^0 \
-                        squizlabs/php_codesniffer ^3
   fi
-  if [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
+  if [ "$TRAVIS_PHP_VERSION" = '7.2' ] || [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
-      composer -n require --ignore-platform-reqs phpunit/phpunit ^5 \
+    composer -n require phpunit/phpunit ^5
-                                                 jakub-onderka/php-parallel-lint ^0 \
-                                                 jakub-onderka/php-console-highlighter ^0 \
-                                                 squizlabs/php_codesniffer ^3
   fi
   echo
 
+- |
+  echo "Installing PHP CodeSniffer"
+  composer -n require squizlabs/php_codesniffer ^3
+  echo
+
 - |
   echo "Adding path of binaries tools installed by composer to the PATH"
   export PATH="$TRAVIS_BUILD_DIR/htdocs/includes/bin:$PATH"
@@ -164,6 +166,12 @@ before_script:
     echo
     echo "Set timezone"
     echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
+    if [ "$TRAVIS_PHP_VERSION" = '5.4' ]; then
+      # Documentation says it should be available for all PHP versions but it's not for 5.5 and 5.6, 7.0, 7.1, 7.2 and nightly!
+      echo
+      echo "Enabling Memcached for PHP <= 5.4"
+      echo 'extension = memcached.so' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
+    fi
     phpenv rehash
     echo
 
@@ -184,32 +192,33 @@ before_script:
     # Check Apache version
     echo "Apache version"
     apache2 -v | head -
-    # Check Database
+    # Check MariaDb
-    echo "Database version"
+    echo "MariaDb 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 -u root -e 'DROP DATABASE IF EXISTS travis;'
+      mysql -e 'DROP DATABASE IF EXISTS travis;'
-      mysql -u root -e 'CREATE DATABASE IF NOT EXISTS travis;'
+      mysql -e 'CREATE DATABASE IF NOT EXISTS travis;'
-      mysql -u root -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;'
+      mysql -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;'
-      mysql -u root -e 'FLUSH PRIVILEGES;'
+      mysql -e 'FLUSH PRIVILEGES;'
-      mysql -u root -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
+      mysql -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
     fi
     if [ "$DB" = 'postgresql' ]; then
-      #psql -c 'create database travis;' -U postgres
+      #pgloader mysql://root:pass@127.0.0.1/dolibarr_9 postgresql://dolibarrowner:dolibarrownerpass@127.0.0.1/dolibarr_dev
-      #psql travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
+      echo pgloader mysql://root@127.0.0.1/travis postgresql:///travis
-      #pgloader mysql://root:pass@127.0.0.1/dolibarr_src postgresql://dolibarrowner:dolibarrownerpass@127.0.0.1/dolibarr_dest
+      pgloader mysql://root@127.0.0.1/travis postgresql:///travis
-      echo 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 travis
-      pgloader mysql://root@127.0.0.1/travis postgresql://postgres@/travis
+      echo 'ALTER SEQUENCE llx_accounting_account_rowid_seq RESTART WITH 1000001;' | psql travis
-      echo 'ALTER SEQUENCE llx_accountingaccount_rowid_seq RENAME TO llx_accounting_account_rowid_seq' | psql -U postgres travis
+      #echo 'select * from INFORMATION_SCHEMA.COLUMNS where table_name = 'llx_accountingaccount' | psql travis
-      echo 'ALTER SEQUENCE llx_accounting_account_rowid_seq RESTART WITH 1000001;' | psql -U postgres travis
+      #echo 'select * from information_schema.table_constraints;' | psql travis
+      #echo 'ALTER TABLE "llx_accounting_account" DROP CONSTRAINT "idx_16390_primary"' | psql travis
     fi
+    # TODO: SQLite
     echo
 
   - |
@@ -222,7 +231,6 @@ before_script:
     echo '$'dolibarr_main_db_host=\'127.0.0.1\'';' >> $CONF_FILE
     echo '$'dolibarr_main_db_name=\'travis\'';' >> $CONF_FILE
     echo '$'dolibarr_main_db_user=\'travis\'';' >> $CONF_FILE
-    echo '$'dolibarr_main_instance_unique_id=\'travis1234567890\'';' >> $CONF_FILE
     if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then
       echo '$'dolibarr_main_db_type=\'mysqli\'';' >> $CONF_FILE
       echo '$'dolibarr_main_db_port=\'3306\'';' >> $CONF_FILE
@@ -231,6 +239,7 @@ before_script:
       echo '$'dolibarr_main_db_type=\'pgsql\'';' >> $CONF_FILE
       echo '$'dolibarr_main_db_port=\'5432\'';' >> $CONF_FILE
     fi
+    # TODO: SQLite
     echo '$'dolibarr_main_authentication=\'dolibarr\'';' >> $CONF_FILE
     cat $CONF_FILE
     echo
@@ -245,10 +254,12 @@ before_script:
 
 
   - echo "Setting up Apache + FPM"
+  - sudo apt-get update
+  - sudo apt-get install apache2 libapache2-mod-fastcgi
   # enable php-fpm
   - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf
   - |
-    if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = '7.2' ] || [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = '7.4' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
+    if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = '7.2' ] || [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
       # Copy the included pool
       sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf
     fi
@@ -257,7 +268,10 @@ 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
+  # 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
   - 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
@@ -282,12 +296,12 @@ 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 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 .
+  parallel-lint --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 .
   set +e
   echo
 
 - |
-  echo "Checking coding style (excluding Pull Requests builds)"
+  echo "Checking coding style"
   # Ensure we catch errors
   set -e
   # Exclusions are defined in the ruleset.xml file
@@ -296,69 +310,9 @@ script:
   set +e
   echo
 
-- |
+# TODO: Check Javascript (jshint?)
-  export INSTALL_FORCED_FILE=htdocs/install/install.forced.php
-  echo "Setting up Dolibarr $INSTALL_FORCED_FILE to test installation"
-  # Ensure we catch errors
-  set +e
-  echo '<?php ' > $INSTALL_FORCED_FILE
-  echo '$'force_install_noedit=2';' >> $INSTALL_FORCED_FILE
-  if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then
-    echo '$'force_install_type=\'mysqli\'';' >> $INSTALL_FORCED_FILE
-  fi
-  if [ "$DB" = 'postgresql' ]; then
-    echo '$'force_install_type=\'pgsql\'';' >> $INSTALL_FORCED_FILE
-  fi
-  echo '$'force_install_dbserver=\'127.0.0.1\'';' >> $INSTALL_FORCED_FILE
-  echo '$'force_install_database=\'travis\'';' >> $INSTALL_FORCED_FILE
-  echo '$'force_install_databaselogin=\'travis\'';' >> $INSTALL_FORCED_FILE
-  echo '$'force_install_databasepass=\'\'';' >> $INSTALL_FORCED_FILE
-  echo '$'force_install_port=\'5432\'';' >> $INSTALL_FORCED_FILE
-  echo '$'force_install_prefix=\'llx_\'';' >> $INSTALL_FORCED_FILE
-  echo '$'force_install_createdatabase=false';' >> $INSTALL_FORCED_FILE
-  echo '$'force_install_createuser=false';' >> $INSTALL_FORCED_FILE
-  echo '$'force_install_mainforcehttps=false';' >> $INSTALL_FORCED_FILE
-  echo '$'force_install_main_data_root=\'$TRAVIS_BUILD_DIR/htdocs\'';' >> $INSTALL_FORCED_FILE
-  #cat $INSTALL_FORCED_FILE
 
-#- |
+# TODO: Check CSS (csslint?)
-#  echo "Installing Dolibarr"
-#  cd htdocs/install
-#  php step1.php $TRAVIS_BUILD_DIR/htdocs > $TRAVIS_BUILD_DIR/install.log
-#  php step2.php set >> $TRAVIS_BUILD_DIR/install.log
-#  if [ "$?" -ne "0" ]; then
-#    echo "SORRY, AN ERROR OCCURED DURING INSTALLATION PROCESS"
-#    cat $TRAVIS_BUILD_DIR/install.log
-#    exit 1
-#  fi
-#  cd ../..
-#  rm $INSTALL_FORCED_FILE
-#  #cat $TRAVIS_BUILD_DIR/install.log
-# set +e
-#  echo
-
-- |
-  echo "Setting up database to test migrations"
-  if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ] || [ "$DB" = 'postgresql' ]; then
-    echo "MySQL"
-    mysql -e 'DROP DATABASE IF EXISTS travis;'
-    mysql -e 'CREATE DATABASE IF NOT EXISTS travis;'
-    mysql -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;'
-    mysql -e 'FLUSH PRIVILEGES;'
-    mysql -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
-  fi
-  if [ "$DB" = 'postgresql' ]; then
-    #pgsql travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
-    #pgloader mysql://root:pass@127.0.0.1/base postgresql://dolibarrowner@127.0.0.1/dolibarr
-    echo pgloader mysql://root@127.0.0.1/travis postgresql:///travis
-    pgloader mysql://root@127.0.0.1/travis postgresql:///travis
-    echo 'ALTER SEQUENCE llx_accountingaccount_rowid_seq RENAME TO llx_accounting_account_rowid_seq' | psql travis
-    echo 'ALTER SEQUENCE llx_accounting_account_rowid_seq RESTART WITH 1000001;' | psql travis
-    #echo 'select * from INFORMATION_SCHEMA.COLUMNS where table_name = 'llx_accountingaccount' | psql travis
-    #echo 'select * from information_schema.table_constraints;' | psql travis
-    #echo 'ALTER TABLE "llx_accounting_account" DROP CONSTRAINT "idx_16390_primary"' | psql travis
-  fi
-  echo
 
 - |
   echo "Upgrading Dolibarr"
@@ -398,12 +352,6 @@ 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/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 $?
@@ -450,7 +398,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
-    # Database log file
+    # MariaDB log file
     echo "Debugging informations for file mysql error.log"
     sudo tail -n 50 /var/log/mysql/error.log
     # TODO: PostgreSQL log file

.tx/config

@@ -410,9 +410,3 @@ source_file = htdocs/langs/en_US/workflow.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.zapier]
-file_filter = htdocs/langs/<lang>/zapier.lang
-source_file = htdocs/langs/en_US/zapier.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-

COPYING

@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
     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/>.
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
+<http://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<https://www.gnu.org/philosophy/why-not-lgpl.html>.
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

COPYRIGHT

@@ -5,7 +5,7 @@ License
 Dolibarr is released under the terms of the GNU General Public License as 
 published by the Free Software Foundation; either version 3 of the License,
 or (at your option) any later version (GPL-3+).
-More information: https://www.gnu.org/licenses/gpl-3.0.txt
+More information: http://www.gnu.org/licenses/gpl-3.0.txt
 
 Dolibarr uses some external libraries released under different licenses. This is compatibility summary:
 
@@ -13,11 +13,11 @@ Component              Version       License                     GPL Compatible
 -------------------------------------------------------------------------------------
 PHP libraries:
 AdoDb-Date             0.36          Modified BSD License        Yes             Date convertion (not into rpm package)
-CKEditor               4.12.1        LGPL-2.1+                   Yes             Editor WYSIWYG
+CKEditor               4.11.4        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
+Escpos-php             ?             MIT License                 Yes             Thermal receipt printer library, for use with ESC/POS compatible printers
-GeoIP2                 0.2.0         LGPL-2.1+                   Yes             Lib to make geoip convert
+GeoIP                  1.4           LGPL-2.1+                   Yes             Sample code to make geoip convert (not into deb package)
-Mobiledetect           2.8.34        MIT License                 Yes             Detect mobile devices browsers
+Mobiledetect           2.8.83        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,17 @@ 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.43.1        MIT licence                 Yes             Library for Stripe module
+Stripe                 6.41          MIT licence                 Yes             Library for Stripe module
-TCPDF                  6.3.2         LGPL-3+                     Yes             PDF generation
+TCPDF                  6.2.25        LGPL-3+                     Yes             PDF generation
 TCPDI                  1.0.0         LGPL-3+ / Apache 2.0        Yes             FPDI replacement
 
 JS libraries:
-Ace                    1.4.8         BSD                         Yes             JS library to get code syntaxique coloration in a textarea.
+jQuery                 3.3.1         MIT License                 Yes             JS library
-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.13         GPL and Apache License      Yes             JS library plugin for sexier multiselect. Warning: 4.0.6+ create troubles without patching css
+jQuery select2         4.0.5         GPL and Apache License      Yes             JS library plugin for sexier multiselect
 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)
@@ -55,16 +54,17 @@ jQuery Timepicker      1.1.0         GPL and MIT License         Yes
 jsGanttImproved        1.7.5.4       BSD License                 Yes             JS library (to build Gantt reports)
 JsTimezoneDetect       1.0.6         MIT License                 Yes             JS library to detect user timezone
 SwaggerUI			   2.0.24		 GPL-2+                      Yes             JS library to offer the REST API explorer
+Ace                    1.2.8         BSD                         Yes             JS library to get code syntaxique coloration in a textarea.    
 
 Image libraries:
 Octicons               8.1           MIT                         Yes
 
 Font libraries:
-Fontawesome            5.13          Font Awesome Free licence   Yes
+Fontawesome            5.7.2         Font Awesome Free licence   Yes
 
 
 For licenses compatibility informations:
-https://www.gnu.org/licenses/licenses.en.html
+http://www.gnu.org/licenses/licenses.en.html
 
 
 Copyright / Authors

ChangeLog

@@ -2,783 +2,6 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
-
-***** 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
-FIX: 10.0 - undefined $langs if template file copy fails during activation of modContrat
-FIX: 11.0 - fatal with postgres on contact/agenda.php
-FIX: 11.0 - multicurrency amount not fetched when fetching payments from llx_paiement or llx_paiementfourn
-FIX: 11.0 - when using pdftk as per hidden conf USE_PDFTK_FOR_PDF_CONCAT, check that the file exists before displaying a success message
-FIX: #13841
-FIX: #13877 - Can validate invoice if there is a credit note with VAT 0% on an invoice with other lines with a VAT non 0%
-FIX: #13968
-FIX: #14001
-FIX: #14002
-FIX: 9.0 - delete unused mandatory argument from migrate_clean_association: argument count mismatch causes a fatal error since php7
-FIX: 9.0 - fatal during migration from 3.1 using PHP 7
-FIX: Accountancy - Binding index - Add a filter on sql request for module Subtotal & Jalon
-FIX: avoid error "Call to undefined function measuringUnitString()"
-FIX: BlindBoolean SQL injection reported by Christian Weiler
-FIX: Can create a credit note on situation invoice if previous is also
-FIX: can install module even if (x) was appended during download.
-FIX: copy value date of VariousPayment onto the new AccountLine
-FIX: count of open day when date and start are not open should be 0
-FIX: Default bank account was not loaded for document generation.
-FIX: Do not show stats panel if the user does not have permissions
-FIX: Fix link of the button to create a credit note and fix the awareness of a error that happen when wo create a credit note
-FIX: force rounding 2 on export ld compta
-FIX: free text on cash desk
-FIX: links into emails of notifications
-FIX: missing file manifest.json.php
-FIX: missing GetNomURL Hook in warehouse class
-FIX: missing hook init + table class + $page not set
-FIX: missing rollbacks on trigger bad return
-FIX: missing translation value for key "NoMorePredefinedProductToDispatch"
-FIX: percent must be displayed on one line
-FIX: php error if multicompany disabled
-FIX: Privilege escalation reported by wizlynx WLX-2020-011
-FIX: replace filter parameter "none" by "restricthtml"
-FIX: Rounding Total TVA in "crabe" model pdf
-FIX: Show ref_customer, amount on contract link object
-FIX: Site ec.europa.eu has moved to https://
-FIX: Tickets mail models doesn't work
-FIX: vulnerability reported by wizlynx WLX-2020-012
-FIX: We must only rename current bank receipt
-FIX: when creating a VariousPayment, the value date is not copied onto the AccountLine that gets created at the same time, so the bank transaction's value date will be the payment date instead of the payment's value date
-FIX: wrong url param
-FIX: XSS using the renaming of .noexe files - reported by Nolan.
-
-***** ChangeLog for 11.0.4 compared to 11.0.3 *****
-FIX: #13749
-FIX: #7594 Expense report multi pagebreak
-FIX: Access to undeclared static property: Contact::$table_element
-FIX: actions on supplier proposal not saved (bad trigger name)
-FIX: Add function "completeTabsHead" to "addreplace" type hook.
-FIX: All forms must use newToken()
-FIX: Another "Access to undeclared static property: Contact::$table_element" && "Societe::$table_element"
-FIX: author search supplier proposal list
-FIX: A variable was erased by a temporary variable
-FIX: Avoid infinite loop when a fetch is inside a compute field.
-FIX: Backto link
-FIX: Bad position of total in column
-FIX: bad value in currency into discount created from down payment
-FIX: buyprice extrafield langfile and tooltip
-FIX: Buyprice was updated only if min price for this qty had same qty
-FIX: Can switch from double to price type for extrafields
-FIX: Can use decimal value in virtual products
-FIX: child categories only with good entity rights
-FIX: cloning of emailing when no content selected
-FIX: closing tags
-FIX: Combo list of available users to filter on the list of leaves.
-FIX: Compatibility with multicompany, bad numerotation of task.
-FIX: consistency of price w/wo vat wrong when price entered with tax
-FIX: default value of selectMasssAction broken
-FIX: draftordered replenish virtual stock
-FIX: Error update SQL into stock reception
-FIX: expensereport status in generated pdf
-FIX: extra date field incorrect check
-FIX: Extrafields of type price must be '' and not '0' if not defined
-FIX: Foreign currency lost when splitting a discount
-FIX: get remain to pay with rounding decimals
-FIX: gzip and bzip2 must use option -f
-FIX: IHM, unexpected quote
-FIX: keep viewstatut for doli 3.5
-FIX: Link missing into email of some notification
-FIX: Look and feel v11
-FIX: md stylesheet to be included by external modules like eldy
-FIX: missing array option
-FIX: missing default accountancy product buy code
-FIX: missing fk_bank during export of suppliers invoices
-FIX: missing member entity
-FIX: missing selectedlines on supplier order but checkbox are displayed
-FIX: Missing token and take into account max date when it can.
-FIX: model export list must be sorted by label
-FIX: multicurrency manage on hidden conf SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL
-FIX: Must escape shell
-FIX: Must exclude logs and some dirs for compressed backup
-FIX: ordered stock already in $stock
-FIX: picture migration script from doli 9.0
-FIX: print pictures on shipment docs
-FIX: product get purchase prices
-FIX: product purchase prices
-FIX: Protection when database has a corrupted product id
-FIX: remove unused var, $usercancreate can be change by Multicompany
-FIX: replenish stock to buy
-FIX: Sanitizing menu parameter
-FIX: Send email from bulk action of list of thirdparties
-FIX: setup of suggested payment mode on proposals and orders
-FIX: Several pb in export of documents
-FIX: Situation invoice take into account the credit notes.
-FIX: some others modules (like subtotal) use other product_type than 0 or 1 AND must not be considered in this report
-FIX: sort by default role makes no sense
-FIX: sort on company on member list
-FIX: TakePOS buying price
-FIX: text version of html emailing (removed the body style)
-FIX: The "test smtp connectivity" failed on page to setup mass emailing
-FIX: Error logs an Orderline::delete error, but this is an Orderline::insert error
-FIX: Translation of tooltips of extrafields
-FIX: Use getNomURL instead of hard coded link. Fix limit.
-FIX: Use of image into free text for PDF if DOL_DATA_DIR is outside of
-FIX: viewstatut to search status
-FIX: we must export company mail address on contact vcard only if contact email address is empty
-FIX: when we filter a list on a view status, we want this filter to be on bookmark that we create
-FIX: Wrong Sql on getListOfTowns api method
-FIX: wrong user right's name to top menu "commercial"
-FIX: XSS Vulnerability reported by Mehmet Kelepçe / Gais Cyber Security
-
-***** ChangeLog for 11.0.3 compared to 11.0.2 *****
-FIX: unit price for selected supplier products not set. NaN was used.
-FIX: use bad var to check if total is positive for each VAT rate when validating an invoice
-FIX: status missing from last customer invoices box when using MAIN_STATUS_USES_CSS
-FIX: translations for "orders" not loaded in the homepage box
-FIX: #13194
-FIX: #13274 cannot add or update 0 value for an int or double extrafield
-FIX: #13285 SQL error during migration with pgsql
-FIX: #13294
-FIX: #13313
-FIX: Clone Fourn Command, add line's extrafields
-FIX: cols parameter not propagated to tpl
-FIX: CSRF error when creating an intervention
-FIX: date order was -1D and desc with label repetition
-FIX: empty of series in graph of product distribution
-FIX: fk_type subscription list via api REST
-FIX: link when using anchor on "/" in website module
-FIX: menu export document was not visible when using "simple accounting"
-FIX: missing class declaration
-FIX: missing global $conf
-FIX: Missing token in some forms (avoid unset POST errors)
-FIX: params of setEventMessage($langs->trans('ErrorProductClone')...
-FIX: Remove unexisting link
-FIX: mass action on stock movements
-FIX: substitute lines dates values on doc generator (ODT, ...)
-FIX: Ticket - Load Cache Messages Ticket, wrong message's status
-FIX: Ticket Public  - Private messages are displayed
-FIX: wrong include - replace extrafields_create.tpl.php to extrafields_add.tpl.php
-
-***** ChangeLog for 11.0.2 compared to 11.0.1 *****
-FIX: #10309
-FIX: #13110
-FIX: #13118
-FIX: #13124
-FIX: #13131
-FIX: #13135
-FIX: #13146 
-FIX: #13198
-FIX: #13175
-FIX: #13182
-FIX: #13183
-FIX: #13184
-FIX: #13263
-FIX: #13267
-FIX: an external user can not approve
-FIX: API Get list of documents for supplier_invoice
-FIX: API to push an expense report
-FIX: API upload/download doc for expensereport
-FIX: Avoid to download the export if we just press enter to refresh form
-FIX: Bad link to template invoices
-FIX: Bad sort link in accounting report
-FIX: Bad translation for productlot EatBy and SellBy
-FIX: better method to check user rights AND usergroup rights !
-FIX: CA by product list filter
-FIX: CSS
-FIX: Disable js if no javascript
-FIX: duplicate class name into some log lines
-FIX: etrafield with visibilty=5 were not in read only.
-FIX: excess paid from situation invoices not counted when calculating remain to pay.
-FIX: Force FEC export to txt format.
-FIX: Free input for email no more visible.
-FIX: Keep assigned users in session when loading projects and tasks
-FIX: List of viewed projects too large in task widget.
-FIX: Menu truncated. Add tooltip to have all content.
-FIX: Missing field "billed" in export.
-FIX: missing "statut" for getNomUrl() function
-FIX: modFournisseur is required by modSupplierProposal
-FIX: Multicompany compatibility
-FIX: must be == and not =
-FIX: option for topbar search and bookmarks
-FIX: option MAIN_OPTIMIZEFORTEXTBROWSER
-FIX: some responsive troubles
-FIX: round MT in accountancy books
-FIX: search with '0'
-FIX: sort link
-FIX: SQL Overload in default contact trigger.
-FIX: SQl syntax error.
-FIX: Submit of documents for supplier invoices.
-FIX: timezone must be tzserver and not tzuser as on contract card
-FIX: token in barcode tools page missing
-FIX: Bad name of trigger PROPAL_SUPPLIER_TRIGGER, should be PROPOSAL_SUPPLIER_TRIGGER
-FIX: Type of contact for event does not exists and not supported
-FIX: Type of contact not saved when creating a contact
-FIX: typo on ckeck method
-FIX: undefined function measuringUnitString in product list
-FIX: Usage of project not available in export.
-FIX: wrong test
-FIX: z-index for moretabsList with constant MAIN_MAXTABS_IN_CARD
-FIX: Use GETPOST instead of POST
-FIX: HTML Injection
-FIX: Visualization rights correction on last modified contacts box.
-FIX: Vulnerability in module from modulebuilder.
-FIX: Vulnerability reported by code16
-
-***** ChangeLog for 11.0.1 compared to 11.0.0 *****
-FIX: advanced target emailing sql and ergonomy.
-FIX: After import of a website template, home page was not set.
-FIX: Avoid deletion of bank record if in accounting
-FIX: compatibility with multicompany (avoid duplicate data)
-FIX: Confusion between 'bank reconciled' and 'accounted'. Show both data.
-FIX: Count of Stripe payment mode must take test/live into account
-FIX: Creation of Stripe card from backoffice must return a clean message
-FIX: CVE-2019–17223
-FIX: CVE-2019–17223 
-FIX: CVE-2020-7994
-FIX: CVE Need permission to be able to develop modules
-FIX: #13053
-FIX: Disable ticket status change if ticket closed
-FIX: doc of dictionnary API
-FIX: expedition ceate line new parameter is not required.
-FIX: export ledger
-FIX: FEC export have specific name
-FIX: Filenames must not contains non ascii char or we will get non ascii
-FIX: Filter on list of events were lost after "Back to list"
-FIX: hasDelay for retained warranty
-FIX: If we can change vendor status, we must be able to chane vendor code
-FIX: links in products/services index
-FIX: Log of authentication ok or ko + CVE-2020-7996
-FIX: Look and feel v11
-FIX: Mail smtps truncated if content has a line with single .
-FIX: missing hook parameter
-FIX: Missing include
-FIX: need weight short label in shipping doc
-FIX: Picture of contact not visible in tooltip
-FIX: Problem with column label in subscription list
-FIX: ref_client not visible in tooltip.
-FIX: search filter on extrafields were not restored after "Back to list"
-FIX: situation invoice: allow excess paid to be converted to discount
-FIX: situation invoice: bad amount for previous payments because of local variable overwriting a more global one
-FIX: situation invoice: can't convert excess received to discount & bad previous payment amount
-FIX: SQL request and phpunit
-FIX: Update export_files.php
-FIX: Use ref into label of ticket message
-FIX: use "usergroup" instead of "user"
-FIX: Warning on admin/export_files
-FIX: #10203
-FIX: default filtering for 'select' extrafields should use "=", not "LIKE"
-FIX: #11975 When a product is split between multiple pages in a document, prices/quantity/etc appear on the last relevant page
-FIX: #12760 #12763 #12755 #12765 #12751
-FIX: #12874
-FIX: #12892
-FIX: #12908 User login with credentials from self-subscription form fails
-FIX: #12932
-FIX: #12966
-FIX: #12973
-FIX: #12974
-FIX: #12975
-FIX: #12978
-FIX: #12986
-FIX: #12991
-FIX: #12992
-FIX: #12995
-FIX: #13018 Extrafields Supplier invoice
-FIX: #13019
-FIX: #13022
-FIX: #13028
-FIX: #13038 ExpenseReport PDF - custom category description is not correct
-FIX: #13046 More complete
-FIX: #13048
-FIX: #13050
-FIX: #13077 Replace left join with inner join (left join was useless)
-FIX: #13085
-FIX: #13094
-FIX: #13096
-FIX: #13100
-
-
-***** ChangeLog for 11.0.0 compared to 10.0.0 *****
-For Users:
-
-NEW: Module BOM is now stable.
-NEW: Module MO (Manufacturing Order) is available with experimental status.
-NEW: Can set the Address/Contact by default on third parties.
-NEW: Add a dictionary to edit list of Social networks.
-NEW: A nicer dashboard for open elements on Home page.
-NEW: Add task widget and add task progress bar
-NEW: Support of deployment of metapackages
-NEW: Menu "Export accounting document" to generate a zip with all documents requested by a bookkeeper is now stable.
-NEW: Add button "Save and Stay" in website editor of pages.
-NEW: Accountancy - Can add specific widget in this accountancy area.
-NEW: Accountancy - Add export model LDCompta V9 & higher
-NEW: Accountancy - Add permission on export, delete operations in ledger
-NEW: Can defined alternative profiles (email and signatures) for users.
-NEW: add ability to edit price without tax before adding a line of a predefined product.
-NEW: Add a tab to setup "Opening hours" of company (information only).
-NEW: Add attendee to ical export + cleanup.
-NEW: Add bank data of users into the expense report exports.
-NEW: add clone customers prices in clone product or service.
-NEW: Add column of module source and POS terminal in the invoice list.
-NEW: Add column last modification date into the table of targets for emailing.
-NEW: Add column VAT rate in product list
-NEW: add constant DISPATCH_FORCE_QTY_INPUT
-NEW: Add constant MAIN_DISABLE_GLOBAL_WORKBOARD to disable workboard in home page
-NEW: add country code in import product model
-NEW: Add 'Direct Cash Payment' button in TakePOS
-NEW: Add odt support to supplier orders
-NEW: Add feature to search a string into website containers
-NEW: Add GET and POST /supplierinvoices/payments REST API endpoints.
-NEW: Show progress bar for declared progression of tasks.
-NEW: Add last change date in page "Other setup". Can sort page on name/date.
-NEW: Add link to export targets of an emailings into a CSV file.
-NEW: Add link to the public interface on the ticket card.
-NEW: Add location into event tooltip. Use full day for fullday events
-NEW: add MAIN_LANGUAGES_ALLOWED constant to limit languages displayed.
-NEW: add MAIN_SHOW_COMPANY_NAME_IN_BANNER_ADDRESS constant.
-NEW: add mass actions in shipment list.
-NEW: add minimum stock filter in load warehoues for product form.
-NEW: add name_alias in fields used for quick search.
-NEW: add new rule fetchidfromcodeandlabel for categories import.
-NEW: add office phone for salespresentatives
-NEW: add office phone & job on user tooltips
-NEW: Add option MAIN_PDF_FORCE_FONT_SIZE
-NEW: Add option MEMBER_CAN_CONVERT_CUSTOMERS_TO_MEMBERS
-NEW: Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_PROPOSAL
-NEW: Add pagination on list of object of a category
-NEW: add parent category id or label in import category module
-NEW: add parent id or ref column in warehouse import
-NEW: Add search into template
-NEW: Add shipment widget
-NEW: Add statistics on product into contracts
-NEW: Add status of warehouse in the tooltip of a warehouse.
-NEW: add supplier's product list
-NEW: add units fields in buying price tab of product card
-NEW: Add units in select products lines
-NEW: Add upload document on account statement
-NEW: Add widgets for BOMs and MOs.
-NEW: Amount invoiced column in proposal list
-NEW: Ask the new label and new dates in confirm popup when cloning tax
-NEW: auto set closing date and user on invoice
-NEW: Avoid wrap between picto and text on getNomUrl
-NEW: Balance Stripe connect account for supplier
-NEW: Bank Add an option for colorize background color of debit or credit movement
-NEW: Beautify the select box of warehouses
-NEW: Add birthday widget for members
-NEW: Widgets uses fiscal year.
-NEW: Can change supplier when cloning a Purchase Order.
-NEW: can choose lines to keep while creating order from origin
-NEW: Can crop/resize image attached on a bank record
-NEW: Can edit date or RUM mandate.
-NEW: Can edit link to the translation page in website module
-NEW: Can edit the price of predefined product during adding in documents
-NEW: Can enter price tax incl on vendor proposal and purchase orders
-NEW: Can filter on description on bank account transaction lists.
-NEW: Can filter on label on invoice in accounting vendor binding pages
-NEW: Can load multilang translation in same step than fetch_lines
-NEW: Can restrict access using DAV module to some host IPs only
-NEW: Can restrict API usage to some IP only
-NEW: Can select website templates from available default templates with a preview.
-NEW: Can set a squarred icon on your company setup
-NEW: can specify hour start end for selectDate and step for minutes
-NEW: Categories/Tags are also available on warehouses
-NEW: Check if a resource is in use in an event
-NEW: Compute column value from others columns in import module
-NEW: Copy linked categories on product clone process.
-NEW: Default mode for Stripe is STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION
-NEW: Digitaria model for numbering accountancy thirdparty
-NEW: Display membership in takepos if member linked to the thirdparty
-NEW: Display supplier in objectline if defined
-NEW: Add default duration of subscriptions on members type
-NEW: Email template for Takepos (to send invoice)
-NEW: Expense request and holiday validator fields
-NEW: Export ledger table in Charlemagne format
-NEW: Extend option ORDER_ADD_ORDERS_WITH_PARENT_PROD_IF_INCDEC for all virtual product stats (renamed into PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC)
-NEW: Value "None" to unbind an invoice line and its accounting account is more visible
-NEW: FCKeditor setup for tickets
-NEW: The default theme of TakePOS work better on smartphones.
-NEW: GeoIP v2 support is natively provided -> So IPv6 is supported
-NEW: List by closing date on order list and proposal list
-NEW: Look and feel v11: Some setup pages are by default direclty in edit mode.
-NEW: Management of retained warranty on situation invoices
-NEW: Mass email action on invoice list use billing contact if exists
-NEW: more living colors for charts and option for "color bind" people
-NEW: Supports multiple payments in a TakePOS sale
-NEW: multiselect with checkbox in categories/tags search for product list
-NEW: Option to allow to create members from third-party
-NEW: Platform compliance with Stripe Connect
-NEW: print / send email form in TakePOS
-NEW: Public holidays are now in a dictionary table (no more hard coded per country)
-NEW: Better performance by reducing the $companystatic calls on some pages.
-NEW: Replace the "info" tab on contract with the more complete "agenda" tab.
-NEW: Save user of last modification in donation record.
-NEW: Show html combo list instead input text for extrafields typed as list.
-NEW: Show POS application and the terminal used on invoice card.
-NEW: Add categories/tags for stocks.
-NEW: Support Net Measure in product's card.php
-NEW: Extrafields separator can be collapsed or not
-NEW: Extrafields support on Leave requests.
-NEW: Extrafields support on Salaries.
-NEW: Extrafields support in Product supplier prices.
-NEW: Add extrafields for warehouses
-NEW: Add extrafields in export of expense report (and holiday)
-NEW: The integrity checker now show also the expected size of files.
-NEW: The order method in purchase order is now mandatory when recording an order.
-NEW: update / delete stripe account for supplier
-NEW: Use the gender of member for picto in member lists.
-NEW: Use the squarre logo as favicon of pages
-NEW: VAT list - Add date start & date end in filters
-NEW: widget box for supplier orders awaiting reception
-NEW: Update translations
-NEW: #4301
-
-For Developers or integrators:
-
-NEW: Compatible with PHP 7.4 
-NEW: Code for extrafields uses the new array $extrafields->attributes
-NEW: Can set a filter on object linked in modulebuilder.
-NEW: Can defined a position of numbering submodules for thirdparties
-NEW: Add option multiselect for developers on the selector of language.
-NEW: Add a manifest.json.php file for web app.
-NEW: Support of deployement of metapackages
-NEW: Removed deprecated code that create linked object from ->origin
-NEW: experimental zapier for dolibarr
-NEW: Accountancy - Add hook bookkeepinglist on general ledger
-NEW: Can update product type with the update method.
-NEW: add API shipment mode dictionnary
-NEW: Add API to get Country by code and iso
-NEW: Add API to get objects by ref, ref_ext, ...
-NEW: Add anonymous telemetry
-NEW: Add a category to a contact in API
-NEW: Add fk projet on stock movement
-NEW: Add hidden option to set fields for the quick search on products.
-NEW: add hook on commongeneratedocument
-NEW: Add hook on fileupload.class.php to enable modules to override…
-NEW: Add hooks on index pages
-NEW: adding 'formObjectOptions' hooks loading at card.php of adherents module
-NEW: Add method getStructuredData for website
-NEW: Add payments GET and POST REST API endpoints for supplierinvoices.
-NEW: Add POST /bankaccounts/transfer REST API endpoint.
-NEW: add "printBucktrackInfo" hook, an external module can add info
-NEW: Add trigger DIRECT_DEBIT_ORDER_CREATE on widthdraw is missing
-NEW: API to post documents for "product" and Delete document
-NEW: add new function "setEntity()" and better compatibility with Multicompany
-NEW: Can add a button "Create" after combo of object with modulebuilder.
-NEW: contacts type dictionnary in api_setup.class.php
-NEW: Look and feel v11: Introduce CSS "trforbreak"
-NEW: list of measuring units API
-NEW: get social networks  dictionary by API
-NEW: Get thirdparty's salesrepresentatives by API
-NEW: get user connected informations in REST API
-NEW: mode for list thirdparty API (add easy filter for supplier only)
-NEW: purchase_prices API
-NEW: Provides more complete demo data
-NEW: Module builder can generate CSS of JS file.
-NEW: Use a dedicated css for the pencil to edit a field.
-NEW: multilangs in fetch_lines
-NEW: Add more complete info for triggers actioncom
-NEW: add multicurrency rate at currency list API
-NEW: Add 2 hidden options to set the default sorting (sort and order) on document page.
-NEW: Add hidden option to update supplier buying price during receptions.
-NEW: Add hidden option PROPOSAL_SHOW_INVOICED_AMOUNT (not reliable if one invoice is done on several order or several proposal)
-NEW: Add hidden option SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT for add possibility to update supplier buying price in the reception on a supplier order
-NEW: Add hidden option THIRDPARTY_PROPAGATE_EXTRAFIELDS_TO_ORDER to copy extrafields from third party to order.
-NEW: Add hidden options to send by email even for object with draft status.
-NEW: Update jquery library to 3.4.1
-NEW: Upgrade ACE editor to v1.4.6
-
-WARNING:
-
-Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
-* Properties ->libelle_incoterms were renamed into ->label_incoterms
-* Removed the method liste_array() of project class. It was not used by core code.
-* The function show_theme() hase been renamed into showSkins()
-* Rename 'module_part' parameter into 'modulepart' into document APIs, for consistency.
-* The deprecated method get_OutstandingBill has been removed. You can use getOutstandingBills() instead.
-* The hook "moreFamily" must return payment into var "totalpayment" and no more "paiement" (english replace french).
-* Removed deprecated method actioncomm->add(), use create() instead
-* If you have developed your own emailing target selector and used parent::add_to_target(...), you must now use parent::addToTargets(...)
-* Removed function dol_micro_time. Use native PHP microtime instead.
-* The trigger BON_PRELEVEMENT_CREATE has been renamed into DIRECT_DEBIT_ORDER_CREATE.
-* The constant INVOICE_SHOW_POS_IN_EXPORT has been renamed into INVOICE_SHOW_POS.
-* If your logo is no more visible on the menu bar, you must upload a new logo into 'Home-Setup-Company/Organization' to have it visible again. 
-* All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed into 'labelStatus'. 
-* All properties 'labelstatusshort' and 'labelstatut_short' were renamed into 'labelStatusShort'. 
-* All properties 'type_libelle' were renamed into 'type_label'.
-* Renamed property of thirdparty "statut_commercial" into "status_prospect_label"
-* The jquery plugin/dependency multiselect has been removed. It was not used by Dolibarr core.
-
-
 ***** ChangeLog for 10.0.7 compared to 10.0.6 *****
 FIX: 10.0 - missing translations for "orders" homepage "orders" box
 FIX: 10.0 - status missing from last customer invoices box when using MAIN_STATUS_USES_CSS
@@ -1092,14 +315,12 @@ FIX: Wrong variable. Must be PROJECT_HIDE_UNSELECTABLES
 
 ***** ChangeLog for 10.0.1 compared to 10.0.0 *****
 FIX: #10930
-FIX: #10984 
+FIX: #10984 FIX: reposition on "Build backup" button
-FIX: reposition on "Build backup" button
 FIX: #11400
 FIX: #11412
-FIX: #11460 
+FIX: #11460 FIX: #11492 FIX: #11576 FIX: #11590
 FIX: #11463
 FIX: #11466
-FIX: #11492 
 FIX: #11498
 FIX: #11505
 FIX: #11506
@@ -1108,118 +329,7 @@ FIX: #11509
 FIX: #11537
 FIX: #11543
 FIX: #11553
-FIX: #11576 
 FIX: #11584
-FIX: #11590
-FIX: accounting mode must be taken from global conf, because there's no way to choose a mode with interface
-FIX: Add message from public interface
-FIX: add missing hook calls
-FIX: Add warning when setup is strange
-FIX: ajax call for line positioning when CSRFCHECK_WITH_TOKEN is on
-FIX: API return 404 sometimes even if API exists
-FIX: Attachment was lost when we validate an expense report
-FIX: avoid conflict with "$classname" in card.php
-FIX: Bad sql request
-FIX: better compatibility with multicompany transverse mode
-FIX: Better PHP compatibility
-FIX: Block to link with tickets
-FIX: Can't submit a ticket from public interface
-FIX: categories import: prevent mismatch between category type and object type
-FIX: Closing ticket from public interface
-FIX: Column 'paid' missing in expense report
-FIX: compatibility mysql 8. rank is reserved
-FIX: Computed field were not calculated into lists.
-FIX: Content of email for subscription
-FIX: correct error in files with multiple spaces
-FIX: CVE-2019-11199
-FIX: delete of links between objects
-FIX: div not balanced
-FIX: do not return formatted prices in json string
-FIX: duplicate on the check (TODO field $onetrtd not used ?)
-FIX: element name in update_price
-FIX: empty product_use_units in product configuration
-FIX: expedition card: infinite loop for printObjectLine hook if return > 0
-FIX: extrafield loading bug due to assumption that an object is a third party while it may be a contact if MAIN_USE_COMPANY_NAME_OF_CONTACT is set.
-FIX: Fatal error on dol_htmloutput_mesg with corrupted array
-FIX: Fatal situation if payment removed on expense report. Action
-FIX: FEC Format - Missing date_creation in general ledger when you add a new transaction
-FIX: FEC Format - Save translation of the journal label in database & nowrap on amount
-FIX: floating point precision errors in the triggers of the workflow module
-FIX: for #11232
-FIX: format of field with type timestamp
-FIX: fournrprice log for insert
-FIX: help text
-FIX: import filter error
-FIX: __INFOS__ tag not exists
-FIX: issue #9300: install error with PostgreSQL when using custom table prefix
-FIX: Language key
-FIX: Limit of uploaded files (max_post_size was not used)
-FIX: list of balance of leaves
-FIX: minor spelling issues
-FIX: missing "dropdown-icon" replacement
-FIX: Missing field "Conciliated" into bank transaction export
-FIX: missing filter by current contact
-FIX: missing token
-FIX: Missing where on entity
-FIX: move sql request in INNER JOIN
-FIX: name was able to be in field but went back to new line
-FIX: Nowrap on amount
-FIX: Online payment
-FIX: on shipment delete confirm dialog, a new checkbox allows the user to choose if they want their stock re-incremented after the deletion.
-FIX: option EXPORT_LABEL_FOR_SELECT to restore compatibility in export
-FIX: Option THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION
-FIX: outdated phpdoc
-FIX: Permission for BOM menu
-FIX: permission to delete a draft purchase order
-FIX: phpcs
-FIX: Position was lost when we edit the line of template invoice
-FIX: product_use_units was set to 0 each time a conf in block other was set
-FIX: propal createFrom hook: undefined parameter attached
-FIX: Responsive of public interface of ticket
-FIX: search by phone pro
-FIX: Setup of TakePos was not possible after a clean install
-FIX: Show list of events on tickets
-FIX: socpeople assigned list in action com list
-FIX: SQL problem on donation & nowrap on amount
-FIX: stock increase on shipment deletion if STOCK_CALCULATE_ON_SHIPMENT_NEW: is set
-FIX: stripe webhook ID constant set
-FIX: summary of time spent in preview tab of projects
-FIX: the feature to bill time spent was not enabled.
-FIX: The new feature to attach document on lines was not correclty
-FIX: The proposed new supplier code does not work
-FIX: this function can not be private
-FIX: tk9877 - PDF rouget requires product.lib.php (otherwise measuring_units_string() is not defined)
-FIX: Update the file index table when we validate/rename a ref.
-FIX: use rounding to compare the amounts
-FIX: We must save code instead of value in database for template invoice modelpdf
-FIX: we need to be able to add freeline with qty between 0 & 1 in supplierorder line
-FIX: We should remove property comments only for project and task api.
-FIX: When saving an action it didn't save the label based on the type of event if the label is empty and the type is customized
-FIX: when STOCK_CALCULATE_ON_SHIPMENT_NEW: is set, deleting a "closed" shipment now increases stock as expected
-FIX: wrong path sociales/index.php doesnt exist anymore
-
-
-***** ChangeLog for 10.0.1 compared to 10.0.0 *****
-FIX: #10930
-FIX: #10984 
-FIX: reposition on "Build backup" button
-FIX: #11400
-FIX: #11412
-FIX: #11460 
-FIX: #11463
-FIX: #11466
-FIX: #11492 
-FIX: #11498
-FIX: #11505
-FIX: #11506
-FIX: #11507
-FIX: #11509
-FIX: #11537
-FIX: #11543
-FIX: #11553
-FIX: #11576 
-FIX: #11584
-FIX: #11590
 FIX: accounting mode must be taken from global conf, because there's no way to choose a mode with interface
 FIX: Add message from public interface
 FIX: add missing hook calls
@@ -1260,6 +370,7 @@ FIX: fournrprice log for insert
 FIX: help text
 FIX: import filter error
 FIX: __INFOS__ tag not exists
+FIX: issue #9300: install error with PostgreSQL using custom table prefix
 FIX: issue #9300: install error with PostgreSQL when using custom table prefix
 FIX: Language key
 FIX: Limit of uploaded files (max_post_size was not used)
@@ -1362,7 +473,7 @@ NEW: Can generate invoices from the timespent entered on a project
 NEW: Can update product supplier price ref
 NEW: Can upload files from the edit page of expense report
 NEW: Color for hover and for checked line is on by default
-NEW: Column of p...arent company is available in list of third parties
+NEW: Column of parent company is available in list of third parties
 NEW: conditionnal add member button by statut
 NEW: constant KEEP_DISCOUNT_LINES_FROM_ORIGIN
 NEW: Contact related items tab
@@ -1704,7 +815,7 @@ NEW: add option PROPOSAL_AUTO_ADD_AUTHOR_AS_CONTACT
 NEW: Add option to display thirdparty adress in combolist
 NEW: Add option to swap sender/recipient address on PDF
 NEW: Add option to display thirdparty adress in combolist
-NEW: Add project on payment of salaries
+NEW: Add project on pament of salaries
 NEW: Add SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME and
 NEW: Add somes hooks in bank planned entries
 NEW: Add supplier ref in item reception page

README-FR.md

@@ -1,17 +1,18 @@
 # DOLIBARR ERP & CRM
 
-![Downloads per day](https://img.shields.io/sourceforge/dw/dolibarr.svg)
-![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/develop.svg)
-
 Dolibarr ERP & CRM est un logiciel moderne pour gérer votre activité (société, association, auto-entrepreneurs, artisans). 
 Il est simple d'utilisation et modulaire, vous permettant de n'activez que les fonctions dont vous avez besoin (contacts, fournisseurs, factures, commandes, stocks, agenda, ...).
  
-![ScreenShot](https://www.dolibarr.org/images/dolibarr_screenshot1_1920x1080.jpg)
+![ScreenShot](https://www.dolibarr.org/images/dolibarr_screenshot1_640x480.png)
+
+
 
 ## LICENCE
 
 Dolibarr est distribué sous les termes de la licence GNU General Public License v3+ ou supérieure.
 
+
+
 ## INSTALLER DOLIBARR
 
 ### Configuration simple
@@ -22,7 +23,7 @@ Si vous avez peu de compétences techniques et que vous souhaitez installer Doli
 - DoliDeb pour Debian ou Ubuntu
 - DoliRpm pour Redhat, Fedora, OpenSuse, Mandriva ou Mageia
 
-Les packages peuvent être téléchargés à partir de [site web officiel](https://www.dolibarr.org/).
+Les packages peuvent être téléchargés à partir de [site web officiel] (https://www.dolibarr.org/).
 
 ### Configuration avancée
 
@@ -30,32 +31,32 @@ Vous pouvez aussi utiliser un serveur Web et une base de données prise en charg
 
 - Décompressez l'archive .zip téléchargée pour copier le répertoire "dolibarr/htdocs" et tous ses fichiers à la racine du serveur Web ou récupérez-les directement à partir de GitHub (recommandé si vous connaissez git):
 
-  `git clone https://github.com/dolibarr/dolibarr -b x.y`   (où x.y est la version principale comme 3.6, 9.0, ...)
+  git clone https://github.com/dolibarr/dolibarr -b x.y   (où x.y est la version principale comme 3.6, 9.0, ...)
 
 - Configurez votre serveur Web pour qu'il utilise "*dolibarr/htdocs*" en tant que racine si votre serveur Web ne possède pas déjà de répertoire défini vers lequel pointer.
-
+ 
 - Créez un fichier `htdocs/conf/conf.php` vide et définissez les autorisations d'*écrire* pour l'utilisateur de votre serveur Web (l'autorisation *écrire* sera supprimée une fois l'installation terminée)
 
 - Depuis votre navigateur, allez à la page "install/" de dolibarr
 
-  L’URL dépendra de la façon dont votre configuration Web a été configurée pour pointer vers votre installation de dolibarr. Cela peut ressembler à:
+    L’URL dépendra de la façon dont votre configuration Web a été configurée pour pointer vers votre installation de dolibarr. Cela peut ressembler à:
-
-  `http://localhost/dolibarr/htdocs/install/`
-
-  ou
-
-  `http://localhost/dolibarr/install/`
-
-  ou
-
-  `http://yourdolibarrvirtualhost/install/`
 
+        http://localhost/dolibarr/htdocs/install/
+        
+    ou
+    
+        http://localhost/dolibarr/install/
+        
+    ou
+    
+    http://yourdolibarrvirtualhost/install/
+   
 - Suivez les instructions de l'installateur
 
+
 ## METTRE A JOUR DOLIBARR
 
 Pour mettre à jour Dolibarr depuis une vieille version vers celle ci:
-
 - Ecrasez les vieux fichiers dans le vieux répertoire 'dolibarr' par les fichiers
   fournis dans ce nouveau package.
   
@@ -64,13 +65,16 @@ Pour mettre à jour Dolibarr depuis une vieille version vers celle ci:
   
 *Note: Le processus de migration peut être lancé manuellement et plusieurs fois, sans risque, en appelant la page /install/*
   
+
 ## CE QUI EST NOUVEAU
 
 Voir fichier ChangeLog.
 
+
+
 ## CE QUE DOLIBARR PEUT FAIRE
 
-### Modules principaux (tous optionnels)
+### Modules principaux (tous optionnels):
 
 - Annuaires des prospects et/ou client et/ou fournisseurs
 - Gestion de catalogue de produits et services
@@ -92,7 +96,7 @@ Voir fichier ChangeLog.
 - Point de vente/Caisse enregistreuse
 - …
 
-### Autres modules
+### Autres modules:
 
 - Gestion de marque-pages
 - Gestion des promesses de dons
@@ -107,7 +111,7 @@ Voir fichier ChangeLog.
 - Intégration de système de paiements (Paypal, Stripe, Paybox...)
 - …
 
-### Divers
+### Divers:
 
 - Multi-langue.
 - Multi-utilisateurs avec différents niveaux de permissions par module.
@@ -135,41 +139,46 @@ Voir fichier ChangeLog.
 
 Dolibarr peut aussi être étendu à volonté avec l'ajout de module/applications externes développées par des développeus tiers, disponible sur [DoliStore](https://www.dolistore.com).
 
+
 ## CE QUE DOLIBARR NE PEUT PAS (ENCORE) FAIRE
 
 Voici un liste de fonctionnalités pas encore gérées par Dolibarr:
-
 - Dolibarr ne contient pas de module de Gestion de la paie.
 - Les tâches du module de gestion de projets n'ont pas de dépendances entre elle.
 - Dolibarr n'embarque pas de Webmail intégré nativement.
 - Dolibarr ne fait pas le café (pas encore). 
 
+
 ## DOCUMENTATION
 
 La documentation utilisateur, développeur et traducteur est disponible sous forme de ressources de la communauté via le site [Wiki](https://wiki.dolibarr.org).
 
+
 ## 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
 
 Dolibarr est le résultat du travail de nombreux contributeurs depuis des années et utilise des librairies d'autres contributeurs.
 
 Voir le fichier [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT)
 
+
 ## ACTUALITES ET RESEAUX SOCIAUX
 
 Suivez le projet Dolibarr project sur les réseaux francophones
 
-- [Facebook](https://www.facebook.com/dolibarr.fr)
+- Facebook: <https://www.facebook.com/dolibarr.fr>
-- [Twitter](https://www.twitter.com/dolibarr_france)
+- Google+: <https://plus.google.com/+DolibarrFrance>
+- Twitter: <https://www.twitter.com/dolibarr_france>
 
 ou sur les réseaux anglophones
 
 - [Facebook](https://www.facebook.com/dolibarr)
+- [Google+](https://plus.google.com/+DolibarrOrg)
 - [Twitter](https://www.twitter.com/dolibarr)
 - [LinkedIn](https://www.linkedin.com/company/association-dolibarr)
 - [YouTube](https://www.youtube.com/user/DolibarrERPCRM)

README.md

@@ -1,17 +1,22 @@
 # DOLIBARR ERP & CRM
 
 ![Downloads per day](https://img.shields.io/sourceforge/dw/dolibarr.svg)
-![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/develop.svg)
+[![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
+
+|6|7|8|9|develop|
+|----------|----------|----------|----------|----------|
+|![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/6.0.svg)|![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/7.0.svg)|![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/8.0.svg)|![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/9.0.svg)|![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/develop.svg)|
 
 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 freelancers.
+It's an Open Source Software (written in PHP language) designed for small, medium or large companies, foundations and freelances.
 
 You can freely use, study, modify or distribute it according to its Free Software licence.
 
 You can use it as a standalone application or as a web application to be able to access it from the Internet or a LAN.
 
-![ScreenShot](https://www.dolibarr.org/images/dolibarr_screenshot1_1920x1080.jpg)
+![ScreenShot](https://www.dolibarr.org/images/dolibarr_screenshot1_640x400.png)
+
 
 ## LICENSE
 
@@ -21,14 +26,15 @@ See the [COPYING](https://github.com/Dolibarr/dolibarr/blob/develop/COPYING) fil
 
 Other licenses apply for some included dependencies. See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) for a full list.
 
+
 ## INSTALLING
 
 ### Simple setup
 
 If you have low technical skills and you're looking to install Dolibarr ERP/CRM in just a few clicks, you can use one of the packaged versions:
 
-- [DoliWamp for Windows](https://wiki.dolibarr.org/index.php/Dolibarr_for_Windows_(DoliWamp)
+- DoliWamp for Windows
-- [DoliDeb for Debian](https://wiki.dolibarr.org/index.php/Dolibarr_for_Ubuntu_or_Debian
+- DoliDeb for Debian or Ubuntu
 - DoliRpm for Redhat, Fedora, OpenSuse, Mandriva or Mageia
 
 Releases can be downloaded from [official website](https://www.dolibarr.org/).
@@ -37,11 +43,9 @@ 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, ...)
+  git clone https://github.com/dolibarr/dolibarr -b x.y     (where x.y is main version like 3.6, 9.0, ...)
 
 - Set up your web server to use "*dolibarr/htdocs*" as root if your web server does not have an already defined directory to point to. 
  
@@ -51,15 +55,15 @@ You can use a Web server and a supported database (MariaDB, MySQL or PostgreSQL)
 
     The URL will depends on how you web setup was setup to point to your dolibarr installation. It may looks like:
 
-  `http://localhost/dolibarr/htdocs/install/`
+        http://localhost/dolibarr/htdocs/install/
         
     or
     
-  `http://localhost/dolibarr/install/`
+        http://localhost/dolibarr/install/
         
     or
     
-  `http://yourdolibarrvirtualhost/install/`
+    	http://yourdolibarrvirtualhost/install/
    
 - Follow the installer instructions
 
@@ -68,47 +72,47 @@ 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*").
 
 *Note: migration process can be safely done multiple times by calling the `/install/index.php` page*
 
+
 ## WHAT'S NEW
 
 See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) file.
 
+
 ## FEATURES
 
 ### Main application/modules (all optional)
 
-- Customers, Prospects (Leads) and/or Suppliers directory + Contacts
+- Customers, Prospects and/or Suppliers directory
-- Members management 
 - Products and/or Services catalog
 - Commercial proposals management
-- Customer & Supplier Orders management
+- Customer and Supplier Orders management
 - Invoices and payment management
-- Shipping management
+- Standing orders management (European SEPA)
-- 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 or Leads management
+- Opportunities and/or project management
-- Projects & Tasks management
+- Projects management
 - Contracts management
+- Stock management
+- Shipping management
 - Interventions management
 - Employee's leave requests management
 - Expense reports
 - Timesheets
 - Electronic Document Management (EDM)
 - Foundations members management
-- Point of Sale (POS)
+- Mass emailing
+- Surveys
+- Point of Sale
 - …
 
 ### Other application/modules
@@ -116,13 +120,11 @@ 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...)
@@ -130,15 +132,15 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 
 ### Other general features
 
-- Localization in most major languages
+- Localization in most major languages.
-- Multi-Users and groups with finely grained rights
+- Multi-Users and groups with finely grained rights.
-- Multi-currency
+- Multi-currency.
-- Multi-company by adding of an external module
+- Multi-company by adding of an external module.
-- Very user friendly and easy to use
+- Very user friendly and easy to use.
-- customizable Dashboard
 - Highly customizable: enable only the modules you need, add user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one)
-
+- Works with PHP 5.5+ and MariaDB 5.0.3+, MySQL 5.0.3+ or PostgreSQL 8.1.4+ (See requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite))
-- APIs
+- Compatible with all Cloud solutions that match MySQL, PHP or PostgreSQL prerequisites.
+- APIs.
 - An easy to understand, maintain and develop code (PHP with no heavy framework; trigger and hook architecture)
 - Support a lot of country specific features:
     - Spanish Tax RE and ISPF
@@ -152,15 +154,11 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - PDF or ODT generation for invoice, proposals, orders...
 - …
 
-### System Environment / Requirements
-
-- Works with PHP 5.5+ and MariaDB 5.0.3+, MySQL 5.0.3+ or PostgreSQL 8.1.4+ (See requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite))
-- Compatible with all Cloud solutions that match MySQL, PHP or PostgreSQL prerequisites.
-
 ### Extending
 
 Dolibarr can be extended with a lot of other external application or modules from third party developers available at the [DoliStore](https://www.dolistore.com).
 
+
 ## WHAT DOLIBARR CAN'T DO YET
 
 These are features that Dolibarr does **not** yet fully support:
@@ -170,32 +168,37 @@ These are features that Dolibarr does **not** yet fully support:
 - No native embedded Webmail
 - Dolibarr can't do coffee (yet)
 
+
 ## DOCUMENTATION
 
 Administrator, user, developer and translator's documentations are available along with other community resources on the [Wiki](https://wiki.dolibarr.org).
 
+
 ## 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
 
 Dolibarr is the work of many contributors over the years and uses some fine libraries.
 
 See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) file.
 
+
 ## NEWS AND SOCIAL NETWORKS
 
 Follow Dolibarr project on:
 
 - [Facebook](https://www.facebook.com/dolibarr)
+- [Google+](https://plus.google.com/+DolibarrOrg)
 - [Twitter](https://www.twitter.com/dolibarr)
 - [LinkedIn](https://www.linkedin.com/company/association-dolibarr)
 - [YouTube](https://www.youtube.com/user/DolibarrERPCRM)
 - [GitHub](https://github.com/Dolibarr/dolibarr)
 
+
 ### Sponsors
 
 Support this project by becoming a sponsor. Your logo will show up here. 🙏 [[Become a sponsor/backer](https://opencollective.com/dolibarr#backer)]

SECURITY.md

@@ -1,13 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-| Version  | Supported          |
-| -------- | ------------------ |
-| <= 8.0.* | :x: |
-| >= 9.0.* | :white_check_mark: |
-
-## Reporting a Vulnerability
-
-To report a vulnerability, please send an email to security@dolibarr.org
-In most cases, after fixing the security, we make an answer by email to say the issue has been fixed.

build/.gitignore

@@ -5,5 +5,6 @@
 /dolibarr-*.tgz
 /dolibarr-*.rpm
 /dolibarr-*.zip
+/dolibarr-*.tgz
 /*.exe
 /html

build/README

@@ -3,7 +3,8 @@ README (English)
 Building packages
 ##################################################
 
-All sub-directories of "build" directory contains files (setup or binary tools) required to build automatically Dolibarr packages.
+All sub-directories of "build" directory contains files required to build
+automatically Dolibarr packages.
 There are several tools:
 
 
@@ -36,7 +37,7 @@ Note: Prerequisites to build autoexe DoliWamp package:
 > perl makepack-dolibarrmodule.pl
 
 - To build developper documentation, launch the script
-> perl dolibarr-doxygen-build.pl
+> perl dolybarr-doxygen-build.pl
 
 
 Note: 
@@ -45,12 +46,9 @@ Dolibarr working. It is here only to build Dolibarr packages, and those
 generated packages will not contains this "build" directory.
 
 
-You can find in "build", following sub-directories:
+We can find in "build", following sub-directories:
 
-* composer
+* debian:
-To test an upgrade of a lib.
-
-* debian
 To build Debian package.
 
 * dmg:

build/debian/conf.php.install

@@ -231,8 +231,3 @@ $dolibarr_main_prod='0';
 # Default value: 0 (use database value if exist)
 # Examples:
 # $dolibarr_mailing_limit_sendbycli='0';
-
-# dolibarr_distrib
-# A key to identify the distribution used for first installation
-$dolibarr_distrib = 'deb';
-

build/debian/copyright

@@ -52,7 +52,7 @@ License: GPL-3+
  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/>.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the full text of the GNU General Public
  License version 3 can be found in the file
@@ -98,7 +98,7 @@ License: GPL-2+
  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/>.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the complete text of the GNU General Public License
  can be found in /usr/share/common-licenses/GPL-2 file.
@@ -192,7 +192,7 @@ License: GPL-2+
  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/>.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
@@ -212,7 +212,7 @@ License: LGPL-2.1+
  Lesser General Public License for more details.
  .
  You should have received a copy of the GNU Lesser General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the full text of the GNU Lesser General Public
  License version 2.1 can be found in the file
@@ -236,7 +236,7 @@ License: GPL-2+ or MIT
  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/>.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
@@ -291,7 +291,7 @@ License: GPL-2+
  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/>.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
@@ -311,7 +311,7 @@ License: LGPL-2.1+
  Lesser General Public License for more details.
  .
  You should have received a copy of the GNU Lesser General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the full text of the GNU Lesser General Public
  License version 2.1 can be found in the file
@@ -338,7 +338,7 @@ License: GPL-2+
  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/>.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
@@ -358,7 +358,7 @@ License: LGPL-2.1+
  Lesser General Public License for more details.
  .
  You should have received a copy of the GNU Lesser General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the full text of the GNU Lesser General Public
  License version 2.1 can be found in the file
@@ -378,7 +378,7 @@ License: LGPL-3.0+
  See the GNU Lesser General Public License for more details.
  .
  You should have received a copy of the GNU Lesser General Public License
- along with TCPDF. If not, see <https://www.gnu.org/licenses/>.
+ along with TCPDF. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the complete text of the GNU Lesser General
  Public License version 3 can be found in "/usr/share/common-licenses/LGPL-3".

build/debian/source/include-binaries

@@ -1,2 +1 @@
 htdocs/install/doctemplates/websites/website_template-corporate.zip
-htdocs/install/doctemplates/websites/website_template-stellar.zip

build/docker/Dockerfile

@@ -1,38 +1,31 @@
-FROM php:7.2-apache
+FROM php:7.0-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 libzip-dev zlib1g-dev libicu-dev g++\
+RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libldap2-dev \
 	&& 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 \
-        && docker-php-ext-install calendar \
+        && apt-get purge -y libjpeg-dev libldap2-dev
-        && docker-php-ext-configure intl \
-        && docker-php-ext-install intl \
-        && apt-get autoremove --purge -y libjpeg-dev libldap2-dev zlib1g-dev libicu-dev g++
-
-RUN mkdir /var/documents
-RUN chown www-data /var/documents
 
 COPY docker-run.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/docker-run.sh
 
-RUN pecl install xdebug && docker-php-ext-enable xdebug
+RUN pecl install xdebug-2.5.5 && docker-php-ext-enable xdebug
 RUN echo 'zend_extension="/usr/local/lib/php/extensions/no-debug-non-zts-20151012/xdebug.so"' >> /usr/local/etc/php/php.ini
 RUN echo 'xdebug.remote_autostart=0' >> /usr/local/etc/php/php.ini
 RUN echo 'xdebug.remote_enable=1' >> /usr/local/etc/php/php.ini
 RUN echo 'xdebug.default_enable=0' >> /usr/local/etc/php/php.ini
-RUN echo 'xdebug.remote_host=docker.host' >> /usr/local/etc/php/php.ini
+RUN echo 'xdebug.remote_host=docker.for.mac.host.internal' >> /usr/local/etc/php/php.ini
 RUN echo 'xdebug.remote_port=9000' >> /usr/local/etc/php/php.ini
 RUN echo 'xdebug.remote_connect_back=0' >> /usr/local/etc/php/php.ini
 RUN echo 'xdebug.profiler_enable=0' >> /usr/local/etc/php/php.ini
 RUN echo 'xdebug.remote_log="/tmp/xdebug.log"' >> /usr/local/etc/php/php.ini
-RUN echo '172.17.0.1 docker.host' >> /etc/hosts
+
 
 EXPOSE 80
 

build/docker/README.md

@@ -23,6 +23,3 @@ The URL to go to the Dolibarr is :
 The URL to go to PhpMyAdmin is (login/password is root/root) :
 
         http://0.0.0.0:8080
-
-Setup the database connection during the installation process, please use mariad
-b (name of the database container) as database host.

build/docker/docker-compose.yml

@@ -1,5 +1,5 @@
 mariadb:
-    build: mariadb
+    image: mariadb:latest
     environment:
         MYSQL_ROOT_PASSWORD: root
         MYSQL_DATABASE: dolibarr

build/docker/docker-run.sh

@@ -3,8 +3,7 @@
 usermod -u $HOST_USER_ID www-data
 groupmod -g $HOST_USER_ID www-data
 
-chgrp -hR www-data /var/www/html
+chown -hR www-data:www-data /var/www
-chmod g+rwx /var/www/html/conf
 
 if [ ! -f /usr/local/etc/php/php.ini ]; then
   cat <<EOF > /usr/local/etc/php/php.ini

build/docker/mariadb/Dockerfile

@@ -1,3 +0,0 @@
-FROM mariadb:latest
-# Enable comented out UTF8 charset/collation options
-RUN sed '/utf8/ s/^#//' /etc/mysql/mariadb.cnf >/tmp/t && mv /tmp/t /etc/mysql/mariadb.cnf

build/doxygen/dolibarr-doxygen-build.pl

@@ -36,7 +36,7 @@ $SOURCE="../..";
 $result = open( IN, "< " . $SOURCE . "/htdocs/filefunc.inc.php" );
 if ( !$result ) { die "Error: Can't open descriptor file " . $SOURCE . "/htdocs/filefunc.inc.php\n"; }
 while (<IN>) {
-	if ( $_ =~ /define\('DOL_VERSION', '([\d\.a-z\-]+)'\)/ ) { $PROJVERSION = $1; break; }
+	if ( $_ =~ /define\('DOL_VERSION','([\d\.a-z\-]+)'\)/ ) { $PROJVERSION = $1; break; }
 }
 close IN;
 ($MAJOR,$MINOR,$BUILD)=split(/\./,$PROJVERSION,3);

build/doxygen/dolibarr-doxygen.doxyfile

@@ -18,7 +18,7 @@
 # that follow. The default is UTF-8 which is also the encoding used for all
 # text before the first occurrence of this tag. Doxygen uses libiconv (or the
 # iconv built into libc) for the transcoding. See
-# https://www.gnu.org/software/libiconv for the list of possible encodings.
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
 
 DOXYFILE_ENCODING = UTF-8
 
@@ -587,7 +587,7 @@ INPUT = ../../htdocs ../../scripts
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
 # also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See https://www.gnu.org/software/libiconv for
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
 # the list of possible encodings.
 
 INPUT_ENCODING = UTF-8
@@ -737,7 +737,7 @@ REFERENCES_LINK_SOURCE = YES
 # If the USE_HTAGS tag is set to YES then the references to source code
 # will point to the HTML generated by the htags(1) tool instead of doxygen
 # built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see https://www.gnu.org/software/global/global.html). You
+# tagging system (see http://www.gnu.org/software/global/global.html). You
 # will need version 4.8.6 or higher.
 
 USE_HTAGS = NO

build/doxygen/doxygen_footer.html

@@ -5,11 +5,12 @@ File added into doxygen generated documentation
 
 
 <hr class="footer" />
-<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>
+<address class="footer"><small>Generated on $datetime for <a href="https://www.dolibarr.org">$projectname</a> by Doxygen $doxygenversion </small></address>
 
 
 <br>
 
+</div>
 
 
 <!-- Global site tag (gtag.js) - Google Analytics -->
@@ -22,5 +23,14 @@ File added into doxygen generated documentation
   gtag('config', 'UA-9049390-16');
 </script>
 
+
+<!-- Twitter ad collector -->
+<script src="//platform.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,9 +12,25 @@
 <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>
+<div id="top">
 
 <div class="topmaincol">
 <div class="divpath">
@@ -33,6 +49,15 @@
 				<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/exakat/README.md

@@ -1,29 +0,0 @@
-
-== Install exakat ==
-mkdir exakat 
-cd exakat 
-curl -o exakat.phar http://dist.exakat.io/index.php?file=latest 
-curl -o apache-tinkerpop-gremlin-server-3.3.5-bin.zip http://dist.exakat.io/apache-tinkerpop-gremlin-server-3.3.5-bin.zip
-unzip apache-tinkerpop-gremlin-server-3.3.5-bin.zip
-mv apache-tinkerpop-gremlin-server-3.3.5 tinkergraph 
-rm -rf apache-tinkerpop-gremlin-server-3.3.5-bin.zip
-cd tinkergraph ./bin/gremlin-server.sh -i org.apache.tinkerpop neo4j-gremlin 3.3.5
-cd ..
- 
-php exakat.phar version
-php exakat.phar doctor
-
-== Init project ==
-php 
-
-
-Edit config.ini file to exclude some dirs:
-ignore_dirs[] = "/htdocs/includes";
-ignore_dirs[] = "/scripts";
-ignore_dirs[] = "/build";
-ignore_dirs[] = "/dev";
-ignore_dirs[] = "/documents";
-
-
-== Analyze project ==
-php

build/exe/doliwamp/Languages/MyCatalan.isl

@@ -1,47 +1,45 @@
 
 [CustomMessages]
 
-NameAndVersion=%1 versió %2
+NameAndVersion=%1 versi<EFBFBD> %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·la %1
+UninstallProgram=Desinstal<EFBFBD>la %1
 LaunchProgram=Obre %1
-AssocFileExtension=&Associa %1 amb l'extensió de fitxer %2
+AssocFileExtension=&Associa %1 amb l'extensi<EFBFBD> de fitxer %2
-AssocingFileExtension=Associant %1 amb l'extensió de fitxer %2...
+AssocingFileExtension=Associant %1 amb l'extensi<EFBFBD> de fitxer %2...
 
-YouWillInstallDoliWamp=Instal·laràs DoliWamp (Dolibarr i altres programaris com Apache, Mysql i PHP) al teu ordinador.
+YouWillInstallDoliWamp=Va a instal<EFBFBD>lar o actualitzar (Apache + Mysql + PHP + Dolibarr) al seu 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).
+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 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.
+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ò si busques una instal·lació automàtica en el teu propi ordinador, et trobes en el bon camí...
+ButIfYouLook=Per<EFBFBD> si busca una instal<EFBFBD>laci<EFBFBD> autom<EFBFBD>tica, es troba en el bon cam<EFBFBD>...
-DoYouWantToStart=Vols iniciar el procés d'instal·lació?
+DoYouWantToStart=Vol iniciar el proc<EFBFBD>s d'instal<EFBFBD>laci<EFBFBD>/actualitzaci<EFBFBD>?
 
-TechnicalParameters=Paràmetres tècnics
+TechnicalParameters=Par<EFBFBD>metres t<EFBFBD>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.
+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.
 
-; WARNING !!! STRINGS HERE MUST BE LOWER THAN 60 CHARACTERS
+; WARNING !!! STRINGS HERE MUST BE LOWER THAN 70 CHARACTERS
-SMTPServer=Servidor SMTP (propi o ISP, només primera instal·lació) :
+SMTPServer=Servidor SMTP (El seu o el del seu ISP, <20>nicament primera instal.laci<EFBFBD>) :
-ApachePort=Port Apache (només primera instal·lació, normalment el 80) :
+ApachePort=Puerto Apache (<EFBFBD>nicament primera instal.laci<EFBFBD>, normalment <EFBFBD>s el 80) :
-MySqlPort=Port MySql (només primera instal·lació, normalment el 3306) :
+MySqlPort=Puerto Mysql (<EFBFBD>nicament primera instal.laci<EFBFBD>, normalment <EFBFBD>s el 3306) :
-MySqlPassword=Contrasenya del servidor i base de dades MySql de root (només primera instal·lació):
+MySqlPassword=Contrasenya del servidor i la base de dades MySQL de root (<EFBFBD>nicament primera instal.laci<EFBFBD>):
 
-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...
+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...
 
-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?
+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?
 
-FirefoxDetected=S'ha detectat Firefox al teu ordinador. El vols utilitzar com a navegador per defecte per Dolibarr?
+FirefoxDetected=S'ha detectat Firefox al seu ordinador. Voleu activar per defecte com a navegador per Dolibarr?
-ChromeDetected=S'ha detectat Chrome al teu ordinador. El vols utilitzar com a navegador per defecte per Dolibarr?
+ChromeDetected=S'ha detectat Chrome al seu ordinador. Voleu activar per defecte com a navegador 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:
+ChooseDefaultBrowser=Esculli el seu navegador per defecte. Si no est<EFBFBD> segur, simplement feu clic a Obrir:
 
-LaunchNow=Obre ara el Dolibarr
+LaunchNow=Llan<EFBFBD>ar ara Dolibarr
 
-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.
+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.
 
-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?
+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?
 
-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
+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ó antiga de base de dades, però no es pot moure per a ser utilitzada per la nova versió 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
 
-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 DoliWamp (so Dolibarr + all required third party software like Apache, Mysql and PHP) on your computer.
+YouWillInstallDoliWamp=You will install or upgrade DoliWamp (so Dolibarr + all required third party software like Apache, Mysql and PHP) on your computer.
 ThisAssistantInstallOrUpgrade=WARNING: Using an ERP CRM installed on a local computer can be dangerous: if your computer break down, you can lose all your data. Do this if you are ready to manage backup yourself seriously. If not, use an installation in Saas instead (see https://saas.dolibarr.org).
 IfYouHaveTechnicalKnowledge=Moreover, if you have technical knowledges and want to manage your Apache, Mysql and PHP yourself, you should not use this assistant and make a manual installation of Dolibarr on your existing server with Apache, Mysql and PHP.
 ButIfYouLook=But if you look for an automatic setup on your local computer, you''re on the good way...
-DoYouWantToStart=Do you want to start installation process ?
+DoYouWantToStart=Do you want to start installation/upgrade 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,7 +32,6 @@ 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 DoliWamp sur votre ordinateur (donc Dolibarr + tous ses composants pr<70>requis comme Apache, Mysql et PHP).
+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).
 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 ?
+DoYouWantToStart=Voulez-vous d<>marrer le processus d'installation/mise <20> jour ?
 
 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ätzliche Symbole:
+AdditionalIcons=Zus<EFBFBD>tzliche Symbole:
 CreateDesktopIcon=&Desktop-Symbol erstellen
 CreateQuickLaunchIcon=Symbol in der Schnellstartleiste erstellen
 ProgramOnTheWeb=%1 im Internet
@@ -10,38 +10,3 @@ 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,47 +1,45 @@
 
 [CustomMessages]
 
-NameAndVersion=%1 versión %2
+NameAndVersion=%1 versi<EFBFBD>n %2
 AdditionalIcons=Iconos adicionales:
 CreateDesktopIcon=Crear un icono en el &escritorio
-CreateQuickLaunchIcon=Crear un icono de Inicio Rápido
+CreateQuickLaunchIcon=Crear un icono de Inicio R<EFBFBD>pido
 ProgramOnTheWeb=%1 en la Web
 UninstallProgram=Desinstalar %1
 LaunchProgram=Ejecutar %1
-AssocFileExtension=&Asociar %1 con la extensión de archivo %2
+AssocFileExtension=&Asociar %1 con la extensi<EFBFBD>n de archivo %2
-AssocingFileExtension=Asociando %1 con la extensión de archivo %2...
+AssocingFileExtension=Asociando %1 con la extensi<EFBFBD>n de archivo %2...
 
-YouWillInstallDoliWamp=Va a instalar DoliWamp (Dolibarr y otro software como Apache, Mysql y PHP) en su ordenador.
+YouWillInstallDoliWamp=Va a instalar o actualizar (Apache+Mysql+PHP+Dolibarr) 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).
+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é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.
+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ón automática en tu propio ordenador, se encuentra en el buen camino...
+ButIfYouLook=Pero si busca una instalaci<EFBFBD>n autom<EFBFBD>tica, se encuentra en el buen camino...
-DoYouWantToStart=¿Quiere iniciar el proceso de instalación?
+DoYouWantToStart=<EFBFBD>Quiere iniciar el proceso de instalaci<EFBFBD>n/actualizaci<63>n?
 
-TechnicalParameters=Parámetros técnicos
+TechnicalParameters=Par<EFBFBD>metros t<EFBFBD>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.
+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.
 
-; WARNING !!! STRINGS HERE MUST BE LOWER THAN 60 CHARACTERS
+; WARNING !!! STRINGS HERE MUST BE LOWER THAN 70 CHARACTERS
-SMTPServer=Servidor SMTP (propio o su ISP, sólo primera instalación) :
+SMTPServer=Servidor SMTP (El suyo o el de su ISP, <20>nicamente primera instalaci<EFBFBD>n) :
-ApachePort=Puerto Apache (sólo primera instalación, normalmente el 80) :
+ApachePort=Puerto Apache (<EFBFBD>nicamente primera instalaci<EFBFBD>n, normalmente es el 80) :
-MySqlPort=Puerto Mysql (sólo primera instalación, normalmente el 3306) :
+MySqlPort=Puerto Mysql (<EFBFBD>nicamente primera instalaci<EFBFBD>n, normalmente es el 3306) :
-MySqlPassword=Contraseña del servidor y la base de datos MySQL de root (sólo primera instalación):
+MySqlPassword=Contrase<EFBFBD>a del servidor y la base de datos MySQL de root (<EFBFBD>nicamente primera instalaci<EFBFBD>n):
 
-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...
+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...
 
-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?
+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?
 
 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 (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...). Si no está seguro, simplementa haga clic en Abrir :
+ChooseDefaultBrowser=Escoja su navegador por defecto. Si no est<EFBFBD> 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ía en el directorio %1. Deberá eliminar este directorio manualmente para una desinstalación completa.
+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.
 
-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?
+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?
 
-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
+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ón antigua de base de datos, pero no se pudo mover para ser utilizada por la nueva versió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
  	  	 
-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/README

@@ -0,0 +1,8 @@
+README (English)
+##################################################
+DOLIWAMP Package tools
+##################################################
+
+This directory contains files used by makepack-dolibarr.pl
+script to build the all-in-on .EXE package DoliWamp, ready
+to be distributed (for Windows).

build/exe/doliwamp/README.md

@@ -3,8 +3,5 @@
 DoliWamp is a special all in one package installer for Windows (Dolibarr+Mysql+Apache+PHP). 
 It's a dedicated Dolibarr version for Windows newbies with no technical knowledge. This package will install or upgrade Dolibarr but also all prerequisites like the web server, and the database in one auto-install process.
 
-This directory contains files used by *makepack-dolibarr.pl* script to build the all-in-on .EXE package DoliWamp, ready
-to be distributed (for Windows).
-
 If you have technical knowledge in web administration and plan to share your server instance (Apache, Mysql or PHP) with other projects than Dolibarr or want to use Dolibarr other components (PostgreSQL), you should not use this assistant and make a manual installation of Dolibarr on your existing server by downloading the standard package (.tgz or .zip file).
 

build/exe/doliwamp/config.inc.php.install

@@ -402,7 +402,7 @@ $cfg['RecodingEngine'] = 'auto';
 
 // Specify some parameters for iconv used in charset conversion. See iconv
 // documentation for details:
-// https://www.gnu.org/software/libiconv/documentation/libiconv/iconv_open.3.html
+// http://www.gnu.org/software/libiconv/documentation/libiconv/iconv_open.3.html
 $cfg['IconvExtraParams'] = '//TRANSLIT';
 
 // Available charsets for MySQL conversion. currently contains all which could

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-2020 Laurent Destailleur (NLTechno), Fabian Rodriguez (Le Goût du Libre)
+AppCopyright=Copyright (C) 2008-2019 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_favicon.ico
+SetupIconFile=doc\images\dolibarr.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.41\logs"
+Name: "{app}\bin\apache\apache2.4.9\logs"
 
 [Files]
 ; Stop/start
@@ -98,48 +98,35 @@ 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.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.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)
-; Value To test: apache 2.4.41, php 7.3.12, mariadb10.4.10 (wampserver3.2.0_x64.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\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:\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"
-Source: "C:\wamp64\bin\php\php7.3.12\*.*"; DestDir: "{app}\bin\php\php7.3.12"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
-;Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
-Source: "C:\wamp64\bin\mariadb\mariadb10.4.10\*.*"; DestDir: "{app}\bin\mariadb\mariadb10.4.10"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
-
 ; Mysql data files (does not overwrite if exists)
-; We must copy them because the tool mysql_install_db.exe to generate them at first install does not return to prompt so make install hang
+Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db"
-;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: "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*\*,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\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\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;
 
@@ -240,12 +227,9 @@ procedure InitializeWizard();
 begin
 
   //version des applis, a modifier pour chaque version de WampServer 2
-  //apacheVersion := '2.4.9';
+  apacheVersion := '2.4.9';
-  //phpVersion := '5.5.12' ;
+  phpVersion := '5.5.12' ;
-  apacheVersion := '2.4.41';
+  mysqlVersion := '5.0.45';
-  phpVersion := '7.3.12' ;
-  //mysqlVersion := '5.0.45';
-  mysqlVersion := '10.4.10';
   phpmyadminVersion := '4.1.14';
 
   smtpServer := 'localhost';
@@ -377,19 +361,18 @@ 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
@@ -409,21 +392,39 @@ begin
     //----------------------------------------------
 	// TODO Update this list when changing PHP/Apache versions
 	
-    phpDllCopy := 'libssh2.dll';
+    phpDllCopy := 'fdftk.dll';
     filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'icuuc64.dll';
+    phpDllCopy := 'fribidi.dll';
     filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'icuin64.dll';
+    phpDllCopy := 'gds32.dll';
     filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'icuio64.dll';
+    phpDllCopy := 'libeay32.dll';
     filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'icudt64.dll';
+    phpDllCopy := 'libmhash.dll';
     filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'libsasl.dll';
+    phpDllCopy := 'libmysql.dll';
     filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'php7apache2_4.dll';
+    phpDllCopy := 'libpq.dll';
     filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'php7ts.dll';
+    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';
     filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
 
 
@@ -515,17 +516,6 @@ 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)
 	    //----------------------------------------------
@@ -588,26 +578,15 @@ 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;
 	
@@ -748,8 +727,8 @@ begin
 		    // Create file my.ini (if not exists)
 		    //----------------------------------------------
 		
-		    destFile := pathWithSlashes+'/bin/mariadb/mariadb'+mysqlVersion+'/my.ini';
+		    destFile := pathWithSlashes+'/bin/mysql/mysql'+mysqlVersion+'/my.ini';
-		    srcFile := pathWithSlashes+'/bin/mariadb/mariadb'+mysqlVersion+'/my.ini.install';
+		    srcFile := pathWithSlashes+'/bin/mysql/mysql'+mysqlVersion+'/my.ini.install';
 		
 		    if not FileExists (destFile) then
 		    begin
@@ -835,8 +814,6 @@ 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;
@@ -979,11 +956,9 @@ begin
 		
 		
 		
-	   		// Uninstall services
+	   		// Uninstall and Install 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);
 			
@@ -1082,7 +1057,7 @@ Filename: "{app}\rundoliwamp.bat"; Description: {cm:LaunchNow}; Flags: shellexec
 
 [UninstallDelete]
 Type: files; Name: "{app}\*.*"
-Type: files; Name: "{app}\bin\mariadb\mariadb10.4.10\*.*"
+Type: files; Name: "{app}\bin\mysql\mysql5.0.45\*.*"
 Type: filesandordirs; Name: "{app}\alias"
 Type: filesandordirs; Name: "{app}\apps"
 Type: filesandordirs; Name: "{app}\bin\apache"

build/exe/doliwamp/httpd.conf.install

@@ -1,9 +1,9 @@
 #
 # 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.4/> for detailed information.
+# See <URL:http://httpd.apache.org/docs/2.2/> for detailed information.
 # In particular, see 
-# <URL:http://httpd.apache.org/docs/2.4/mod/directives.html>
+# <URL:http://httpd.apache.org/docs/2.2/mod/directives.html>
 # for a discussion of each configuration directive.
 #
 # Do NOT simply read the instructions in here without understanding
@@ -13,62 +13,43 @@
 # 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/access_log"
+# with "/", the value of ServerRoot is prepended -- so "logs/foo.log"
-# with ServerRoot set to "/usr/local/apache2" will be interpreted by the
+# with ServerRoot set to "C:/Program Files/Apache Software Foundation/Apache2.2" will be interpreted by the
-# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log"
+# server as "C:/Program Files/Apache Software Foundation/Apache2.2/logs/foo.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 httpd.exe is located
+# If a drive letter is omitted, the drive on which Apache.exe is located
 # will be used by default.  It is recommended that you always supply
-# an explicit drive letter in absolute paths to avoid confusion.
+# an explicit drive letter in absolute paths, however, to avoid
-ServerSignature On
+# confusion.
-ServerTokens Full
+#
+
+# ThreadsPerChild: constant number of worker threads in the server process
+# MaxRequestsPerChild: maximum  number of requests a server process serves
+ThreadsPerChild 250
+MaxRequestsPerChild  0
 
 #
 # 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 specify a local disk on the
+# ServerRoot at a non-local disk, be sure to point the LockFile directive
-# Mutex directive, if file-based mutexes are used.  If you wish to share the
+# at a local disk.  If you wish to share the same ServerRoot for multiple
-# same ServerRoot for multiple httpd daemons, you will need to change at
+# httpd daemons, you will need to change at least LockFile and PidFile.
-# 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.
+# prevent Apache from glomming onto all bound IP addresses (0.0.0.0)
 #
 #Listen 12.34.56.78:80
-#Listen 0.0.0.0:80
-#Listen [::0]:80
 Listen WAMPAPACHEPORT
 
 #
@@ -83,72 +64,40 @@ 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 brotli_module modules/mod_brotli.so
+LoadModule buffer_module modules/mod_buffer.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 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 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 heartbeat_module modules/mod_heartbeat.so
+LoadModule imagemap_module modules/mod_imagemap.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
@@ -156,63 +105,33 @@ 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_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_ftp_module modules/mod_proxy_ftp.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 watchdog_module modules/mod_watchdog.so
+LoadModule php5_module "WAMPROOT/bin/php/phpWAMPPHPVERSION/php5apache2_4.dll"
-#LoadModule xml2enc_module modules/mod_xml2enc.so
 
-PHPIniDir "${APACHE_DIR}/bin"
+#
-#LoadModule WAMPAPACHELOADMODULE "${INSTALL_DIR}/bin/php/phpWAMPPHPVERSIONWEB/WAMPPHPAPACHEDLL"
+# ExtendedStatus controls whether Apache will generate "full" status
-LoadModule php7_module "WAMPROOT/bin/php/phpWAMPPHPVERSION/php7apache2_4.dll"
+# information (ExtendedStatus On) or just basic information (ExtendedStatus
+# Off) when the "server-status" handler is called. The default is Off.
+#
+ExtendedStatus On
 
-<IfModule unixd_module>
+<Location /server-status>
-#
+SetHandler server-status
-# If you wish httpd to run as a different user or group, you must run
+Require local
-# httpd as root initially and it will switch.
+#Require ip 1.2.3.4
-#
+#Require host 1.2.3.4
-# User/Group: The name (or #number) of the user/group to run httpd as.
+</Location>
-# 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
 #
@@ -243,12 +162,59 @@ ServerAdmin doliwamp@localhost
 ServerName localhost
 
 #
-# Deny access to the entirety of your server's filesystem. You must
+# ServerTokens
-# explicitly permit access to web content directories in other
+# This directive configures what you return as the Server HTTP response
-# <Directory> blocks below.
+# 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.  
 #
 <Directory />
-    AllowOverride none
+    Options FollowSymLinks
+    AllowOverride None
     Require all denied
 </Directory>
 
@@ -258,15 +224,12 @@ ServerName localhost
 # you might expect, make sure that you have specifically enabled it
 # below.
 #
-HostnameLookups Off
 
 #
-# DocumentRoot: The directory out of which you will serve your
+# This should be changed to whatever you set DocumentRoot to.
-# documents. By default, all requests are taken from this directory, but
-# symbolic links and aliases may be used to point to other locations.
 #
-DocumentRoot "${INSTALL_DIR}/www"
+<Directory "WAMPROOT/www/">
-<Directory "${INSTALL_DIR}/www/">
+
     #
     # Possible values for the Options directive are "None", "All",
     # or any combination of:
@@ -276,23 +239,30 @@ DocumentRoot "${INSTALL_DIR}/www"
     # doesn't give it to you.
     #
     # The Options directive is both complicated and important.  Please see
-    # http://httpd.apache.org/docs/2.4/mod/core.html#options
+    # http://httpd.apache.org/docs/2.2/mod/core.html#options
     # for more information.
     #
-    Options +Indexes +FollowSymLinks +Multiviews
+    Options Indexes FollowSymLinks
 
     #
     # AllowOverride controls what directives may be placed in .htaccess files.
     # It can be "All", "None", or any combination of the keywords:
-    #   AllowOverride FileInfo AuthConfig Limit
+    #   Options FileInfo AuthConfig Limit
     #
     AllowOverride all
 
     #
     # Controls who can get stuff from this server.
     #
-#   Don't modify this line - Instead modify Require of VirtualHost in httpd-vhost.conf
+#   onlineoffline tag - don't remove
-    Require local
+	
+	Require all granted
+    
+    <RequireAny>
+		Require ip 127.0.0.1
+		Require host localhost
+	</RequireAny>
+
 </Directory>
 
 #
@@ -307,9 +277,9 @@ DocumentRoot "${INSTALL_DIR}/www"
 # The following lines prevent .htaccess and .htpasswd files from being 
 # viewed by Web clients. 
 #
-<Files ".ht*">
+<FilesMatch "^\.ht">
     Require all denied
-</Files>
+</FilesMatch>
 
 #
 # ErrorLog: The location of the error log file.
@@ -318,8 +288,7 @@ DocumentRoot "${INSTALL_DIR}/www"
 # 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.
@@ -348,13 +317,13 @@ LogLevel warn
     # define per-<VirtualHost> access logfiles, transactions will be
     # logged therein and *not* in this file.
     #
-    CustomLog "${INSTALL_DIR}/logs/access.log" common
+    CustomLog "WAMPROOT/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>
@@ -363,7 +332,7 @@ LogLevel warn
     # 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://www.example.com/bar
+    # Redirect permanent /foo http://localhost/bar
 
     #
     # Alias: Maps web paths into filesystem paths and is used to
@@ -384,36 +353,68 @@ LogLevel warn
     # client.  The same rules about trailing "/" apply to ScriptAlias
     # directives as to Alias.
     #
-    ScriptAlias /cgi-bin/ "${SRVROOT}/cgi-bin/"
+    ScriptAlias /cgi-bin/ "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>
-
 #
-# "${SRVROOT}/cgi-bin" should be changed to whatever your ScriptAliased
+# "C:/Program Files/Apache Software Foundation/Apache2.2/cgi-bin" should be changed to whatever your ScriptAliased
 # CGI directory exists, if you have that configured.
 #
-<Directory "${SRVROOT}/cgi-bin">
+<Directory "cgi-bin">
     AllowOverride None
     Options None
     Require all granted
 </Directory>
 
-<IfModule headers_module>
+# 
-    #
+# Apache parses all CGI scripts for the shebang line by default.
-    # Avoid passing HTTP_PROXY environment to CGI's on this or any proxied
+# This comment line, the first line of the script, consists of the symbols
-    # backend servers which have lingering "httpoxy" defects.
+# pound (#) and exclamation (!) followed by the path of the program that 
-    # 'Proxy' request header is undefined by the IETF, not listed by IANA
+# can execute this specific script.  For a perl script, with perl.exe in
-    #
+# the C:\Program Files\Perl directory, the shebang line should be:
-    RequestHeader unset Proxy early
+
-</IfModule>
+   #!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 mime_module>
     #
@@ -431,8 +432,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-compress .Z
-    AddEncoding x-gzip .gz .tgz
+    #AddEncoding x-gzip .gz .tgz
     #
     # If the AddEncoding directives above are commented-out, then you
     # probably should define those extensions to indicate media types:
@@ -480,34 +481,19 @@ LogLevel warn
 #ErrorDocument 500 "The server made a boo boo."
 #ErrorDocument 404 /missing.html
 #ErrorDocument 404 "/cgi-bin/missing_handler.pl"
-#ErrorDocument 402 http://www.example.com/subscription_info.html
+#ErrorDocument 402 http://localhost/subscription_info.html
 #
 
-#
-# 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
+# memory-mapping or the sendfile syscall is used to deliver
 # files.  This usually improves server performance, but must
 # 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
+#EnableMMAP off
-EnableSendfile 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
 #
@@ -546,19 +532,17 @@ 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
 
@@ -753,4 +737,40 @@ SSLCertificateKeyFile "WAMPROOT/myserver.key"
 
 </IfModule>
 
-Include "${INSTALL_DIR}/alias/*.conf"
+
+
+# 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"

build/exe/doliwamp/install_services.bat.install

@@ -11,19 +11,14 @@ REM NET STOP doliwampmysqld
 cd "WAMPROOT"
 
 REM Apache x.x
-.\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -k install -n doliwampapache >> doliwamp.log 2>>&1
+.\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -k install -n doliwampapache
 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.exe --install-manual doliwampmysqld
+REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --install-manual doliwampmysqld
-REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --install doliwampmysqld
+.\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.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/mariadb/mariadbWAMPMYSQLVERSION
+basedir=WAMPROOT/bin/mysql/mysqlWAMPMYSQLVERSION
 
 #log file
 log-error=WAMPROOT/logs/mysql.log
 
 #Path to the database root
-datadir=WAMPROOT/bin/mariadb/data
+datadir=WAMPROOT/bin/mysql/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/mariadb/mariadbWAMPMYSQLVERSION
+basedir=WAMPROOT/bin/mysql/mysqlWAMPMYSQLVERSION
 
 #log file
 log-error=WAMPROOT/logs/mysql.log
 
 #Path to the database root
-datadir=WAMPROOT/bin/mariadb/data
+datadir=WAMPROOT/bin/mysql/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\mariadb\mariadbWAMPMYSQLVERSION\bin\mysqladmin -v -w6 -P WAMPMYSQLPORT -u root password WAMPMYSQLNEWPASSWORD >> doliwamp.log 2>>&1
+.\bin\mysql\mysqlWAMPMYSQLVERSION\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 will test a login on Mysql installed
+echo This programm wil 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\mariadb\mariadbWAMPMYSQLVERSION\bin\mysql -P WAMPMYSQLPORT -u root -p%SAVES%
+.\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysql -P WAMPMYSQLPORT -u root -p%SAVES%
 
 pause