Fix infinit logs

Fix can set desiredstock to (int) 0 from API Rest

.dockerignore

@@ -0,0 +1,16 @@
+build
+build.xml
+ChangeLog
+composer.json
+CONTRIBUTING.md
+COPYING
+COPYRIGHT
+dev
+doc
+Dockerfile
+INSTALL
+README-FR.md
+README.md
+robots.txt
+scripts
+test

.editorconfig

@@ -1,21 +1,14 @@
-# EditorConfig is awesome: https://editorconfig.org
+# EditorConfig is awesome: http://EditorConfig.org
 
 # top-most EditorConfig file
 root = true
-
 # Unix-style newlines with a newline ending every file
 [*]
 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
-trim_trailing_whitespace = true
-insert_final_newline = true
 [*.js]
 indent_style = tab
 [*.css]

.github/CODEOWNERS

@@ -1 +0,0 @@
-htdocs/takepos @andreubisquerra

.github/CODE_OF_CONDUCT.md

@@ -1,84 +0,0 @@
-# Code of Conduct
-
-## 1. Purpose
-
-A primary goal of Dolibarr is to be inclusive to the largest number of contributors, with the most varied and diverse backgrounds possible. As such, we are committed to providing a friendly, safe and welcoming environment for all, regardless of gender, sexual orientation, ability, ethnicity, socioeconomic status, and religion (or lack thereof).
-
-This code of conduct outlines our expectations for all those who participate in our community, as well as the consequences for unacceptable behavior.
-
-We invite all those who participate in Dolibarr to help us create safe and positive experiences for everyone.
-
-## 2. Open Source Citizenship
-
-A supplemental goal of this Code of Conduct is to increase open source citizenship by encouraging participants to recognize and strengthen the relationships between our actions and their effects on our community.
-
-Communities mirror the societies in which they exist and positive action is essential to counteract the many forms of inequality and abuses of power that exist in society.
-
-If you see someone who is making an extra effort to ensure our community is welcoming, friendly, and encourages all participants to contribute to the fullest extent, we want to know.
-
-## 3. Expected Behavior
-
-The following behaviors are expected and requested of all community members:
-
-*   Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.
-*   Exercise consideration and respect in your speech and actions.
-*   Attempt collaboration before conflict.
-*   Refrain from demeaning, discriminatory, or harassing behavior and speech.
-*   Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.
-*   Remember that community event venues may be shared with members of the public; please be respectful to all patrons of these locations.
-
-## 4. Unacceptable Behavior
-
-The following behaviors are considered harassment and are unacceptable within our community:
-
-*   Violence, threats of violence or violent language directed against another person.
-*   Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.
-*   Posting or displaying sexually explicit or violent material.
-*   Posting or threatening to post other people’s personally identifying information ("doxing").
-*   Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
-*   Inappropriate photography or recording.
-*   Inappropriate physical contact. You should have someone’s consent before touching them.
-*   Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances.
-*   Deliberate intimidation, stalking or following (online or in person).
-*   Advocating for, or encouraging, any of the above behavior.
-*   Sustained disruption of community events, including talks and presentations.
-
-## 5. Consequences of Unacceptable Behavior
-
-Unacceptable behavior from any community member, including sponsors and those with decision-making authority, will not be tolerated.
-
-Anyone asked to stop unacceptable behavior is expected to comply immediately.
-
-If a community member engages in unacceptable behavior, the community organizers may take any action they deem appropriate, up to and including a temporary ban or permanent expulsion from the community without warning (and without refund in the case of a paid event).
-
-## 6. Reporting Guidelines
-
-If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible. contact@dolibarr.org.
-
-
-
-Additionally, community organizers are available to help community members engage with local law enforcement or to otherwise help those experiencing unacceptable behavior feel safe. In the context of in-person events, organizers will also provide escorts as desired by the person experiencing distress.
-
-## 7. Addressing Grievances
-
-If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify Dolibarr with a concise description of your grievance. Your grievance will be handled in accordance with our existing governing policies.
-
-
-
-## 8. Scope
-
-We expect all community participants (contributors, paid or otherwise; sponsors; and other guests) to abide by this Code of Conduct in all community venues–online and in-person–as well as in all one-on-one communications pertaining to community business.
-
-This code of conduct and its related procedures also applies to unacceptable behavior occurring outside the scope of community activities when such behavior has the potential to adversely affect the safety and well-being of community members.
-
-## 9. Contact info
-
-contact@dolibarr.org
-
-## 10. License and attribution
-
-This Code of Conduct is distributed under a [Creative Commons Attribution-ShareAlike license](http://creativecommons.org/licenses/by-sa/3.0/).
-
-Portions of text derived from the [Django Code of Conduct](https://www.djangoproject.com/conduct/) and the [Geek Feminism Anti-Harassment Policy](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy).
-
-Retrieved on November 22, 2016 from [http://citizencodeofconduct.org/](http://citizencodeofconduct.org/)

.github/CONTRIBUTING.md

@@ -38,7 +38,7 @@ We officially support versions N, N − 1 and N − 2 for N the latest version a
 Choose your base branch accordingly.
 
 ### General rules
-Please don't edit the ChangeLog file. File will be generated from all commit messages during release process by the project manager.
+Please don't edit the ChangeLog file. File will be generated from your commit messages during release process by the project manager.
 
 ### <a name="commits"></a>Commits
 Use clear commit messages with the following structure:
@@ -56,15 +56,13 @@ You can add it to your git configuration using:
 git config --local commit.template .gitmessage
 ```
 
-where 
-
 #### Keyword
 In uppercase if you want to have the log comment appears into the generated ChangeLog file.
 
 The keyword can be ommitted if your commit does not fit in any of the following categories:
-- Fix/FIX: for a bug fix
-- New/NEW: for an unreferenced new feature (Opening a feature request and using close is prefered)
-- Close/CLOSE: for closing a referenced feature request
+- Fix: for a bug fix
+- Close: for closing a referenced feature request
+- New: for an unreferenced new feature (Opening a feature request and using close is prefered)
 
 #### Issuenum
 If your commit fixes a referenced bug or feature request.
@@ -87,14 +85,14 @@ This section can span multiple lines.
 
 Try to keep lines under 120 characters.
 
-#### Examples
+#### Samples
 <pre>
 FIX|Fix #456 Short description (where #456 is number of bug fix, if it exists. In upper case to appear into ChangeLog)
 or
-NEW|New Short description (In upper case to appear into ChangeLog, use this if you add a feature not tracked, otherwise use CLOSE #456)
-or
 CLOSE|Close #456 Short description (where #456 is number of feature request, if it exists. In upper case to appear into ChangeLog)
 or
+NEW|New Short description (In upper case to appear into ChangeLog, use this if you add a feature not tracked, otherwise use CLOSE #456)
+or
 Short description (when the commit is not introducing feature nor closing a bug)
 
 Long description (Can span accross multiple lines).
@@ -106,25 +104,13 @@ When submitting a pull request, use same rule as [Commits](#commits) for the mes
 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.
+Your Pull Request must pass the Continuous Integration checks.
 Also, some code changes need a prior approbation:
 
 * if you want to include a new external library (into htdocs/includes directory), please ask before to the project manager (@eldy) to see if such a library can be accepted.
 
 * if you 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.
-
-If the label of PR start with "WIP" (Work In Progress), it will not be analyzed (until you change the label of PR).
-
-If your PR has errors reported by the Continuous Integration Platform, it means your PR is not valid and nothing will be done with it. It will be kept open to allow developers to fix this, or it may be closed several month later. Don't expect anything on your PR if you have such errors, you MUST first fix the Continuous Integration error to have it taken into consideration. 
-
-If the PR is valid, and is kept open for a long time, a tag will also be added on the PR to describe the status of your PR and why the PR is kept open. By putting your mouse on the tag, you will get a full explanation of the tag/status that explain why your PR has not been integrated yet.
-In most cases, it gives you information of things you have to do to have the PR taken into consideration (for example a change is requested, a conflict is expected to be solved, some questions were asked). If you have a yellow, red flag of purple flag, don't expect to have your PR validated. You must first provide the answer the flag ask you. The majority of PR are waiting an action of the developer/author.
-
-Statistics on Dolibarr project shows that around 95% of submitted PR are reviewed and tagged. This is one of the most important ratio of answered PR in Open Source world. Don't expect the core team to reach the 100%. With the increasing popularity of Dolibarr, this ratio will probably decrease in future.
-
-
 ### Resources
 [Developer documentation](http://wiki.dolibarr.org/index.php/Developer_documentation)
 
@@ -134,12 +120,9 @@ The source language (en_US) is maintained in the repository. See the [Code](#cod
 
 All other translations are managed online at [Transifex](https://www.transifex.com/dolibarr-association/dolibarr/).
 
-Translations done on transifex are available in the next major release.
-
-Note: Sometimes, the source text (english) is modified. In such a case, the translation is reset. Transifex assume that if the original source
-has changed, the translation is surely no more correct so must be done again. But old translation is not lost and you can use the tab "History"
-to retreive all old translation of a source text, and restore the translation in one click with no need to retranslate it if there is no need to. 
+Join an existing translation team or create your own and translate into the interface.
 
+Your translations will be available in the next major release.
 
 ### Resources
 [Translator documentation](http://wiki.dolibarr.org/index.php/Translator_documentation)
@@ -148,5 +131,5 @@ Documentation
 -------------
 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.
+*Note*: to help prevent spam, you need to create an account before being able to edit.
 

.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*]

.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,33 +8,20 @@ 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/
-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/

.mailmap

@@ -6,8 +6,8 @@ Laurent Destailleur <eldy@destailleur.fr> eldy <eldy@destailleur.fr>
 Laurent Destailleur <eldy@destailleur.fr> Laurent Destailleur <ldestailleur@teclib.com>
 Laurent Destailleur <eldy@destailleur.fr> eldy10 <eldy10@master8.(none)>
 Laurent Destailleur <eldy@destailleur.fr> Laurent Destailleur <ephpcsdy@destailleur.fr>
-Regis Houssin <regis.houssin@inodbox.com> Regis Houssin <regis@dolibarr.fr>
-Regis Houssin <regis.houssin@inodbox.com> Régis Houssin <regishoussin@device5.home>
+Regis Houssin <regis.houssin@capnetworks.com> Regis Houssin <regis@dolibarr.fr>
+Regis Houssin <regis.houssin@capnetworks.com> Régis Houssin <regishoussin@device5.home>
 Juanjo Menent <jmenent@2byte.es> simnandez <jmenent@2byte.es>
 Juanjo Menent <jmenent@2byte.es> Juanjo Menent <simnandez@gmail.com>
 Juanjo Menent <jmenent@2byte.es> Simnandez <jmenent@2byte.es>
@@ -21,9 +21,9 @@ Florian Henry <florian.henry@open-concept.pro> FHenry <florian.henry.mail@gmail.
 Florian Henry <florian.henry@open-concept.pro> Florian HENRY <florian.henry@open-conept.pro>
 Florian Henry <florian.henry@open-concept.pro> FHenry <florian.henry@open-concept.pro>
 Florian Henry <florian.henry@open-concept.pro> HENRY Florian <florian.henry@open-concept.pro>
-Alexandre Spangaro <aspangaro@open-dsi.fr> aspangaro <aspangaro@open-dsi.fr>
-Alexandre Spangaro <aspangaro@open-dsi.fr> Spangaro Alexandre <aspangaro@open-dsi.fr>
-Alexandre Spangaro <aspangaro@open-dsi.fr> Alexandre SPANGARO <aspangaro@open-dsi.fr>
+Alexandre Spangaro <aspangaro.dolibarr@gmail.com> aspangaro <aspangaro.dolibarr@gmail.com>
+Alexandre Spangaro <aspangaro.dolibarr@gmail.com> Spangaro Alexandre <aspangaro.dolibarr@gmail.com>
+Alexandre Spangaro <aspangaro.dolibarr@gmail.com> Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr> Raphaël Doursenaud <rdoursenaud@free.fr>
 Philippe Grand <philippe.grand@atoo-net.com> Grand Philippe <contact@atoo-net.com>
 Philippe Grand <philippe.grand@atoo-net.com> Philippe GRAND <philippe.grand@atoo-net.com>

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

.stickler.yml

@@ -1,14 +0,0 @@
----
-linters:
-  phpcs:
-      standard: 'dev/setup/codesniffer/ruleset.xml'
-      extensions: 'php'
-      tab_width: 4
-      fixer: true
-
-fixers:
-    enable: true
-
-files:
-    ignore:
-        - 'htdocs/includes/*'

.travis.yml

@@ -2,9 +2,8 @@
 # from Dolibarr GitHub repository.
 # For syntax, see http://about.travis-ci.org/docs/user/languages/php/
 
-# We use dist: trusty to have php 5.4+ available
-os: linux
-dist: trusty
+# We use dist: precise to have php 5.3 available 
+dist: precise
 sudo: required
 
 language: php
@@ -19,7 +18,9 @@ addons:
   apt:
     sources:
     # To use the last version of pgloader, we add repo of postgresql
-    - pgdg-trusty
+    - 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.
@@ -30,20 +31,20 @@ addons:
     - pgloader
 
 php:
+- '5.3'
+- '5.4'
 - '5.5'
 - '5.6'
 - '7.0'
 - '7.1'
-- '7.2'
-- '7.3'
-- '7.4'
+#- hhvm		only with dist: trusty
 - 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=mysql
   - DB=mariadb
@@ -55,31 +56,30 @@ env:
   # See https://github.com/DracoBlue/travis-ci-nginx-php-fpm-test
   #- WS=nginx
 
-jobs:
+matrix:
   fast_finish: true
   allow_failures:
+  - php: hhvm
   - php: nightly
   # We exclude some combinations not usefull to save Travis CPU
   exclude:
+  - php: '5.4'
+    env: DB=mariadb
+  - php: '5.5'
+    env: DB=mariadb
   - php: '5.6'
     env: DB=mariadb
   - php: '7.0'
     env: DB=mariadb
-  - php: '7.1'
-    env: DB=mariadb
-  - php: '7.2'
-    env: DB=mariadb
-  - php: '7.3'
-    env: DB=mariadb
+  - php: '5.4'
+    env: DB=postgresql
+  - php: '5.5'
+    env: DB=postgresql
   - php: '5.6'
     env: DB=postgresql
   - php: '7.0'
     env: DB=postgresql
-  - php: '7.1'
-    env: DB=postgresql
-  - php: '7.2'
-    env: DB=postgresql
-  - php: '7.3'
+  - php: hhvm
     env: DB=postgresql
   - php: nightly
     env: DB=postgresql
@@ -87,7 +87,7 @@ jobs:
 notifications:
   email:
     on_success: never # [always|never|change] default: change
-    on_failure: never # [always|never|change] default: always
+    on_failure: change # [always|never|change] default: always
   irc:
     channels:
     - "chat.freenode.net#dolibarr"
@@ -109,180 +109,173 @@ before_install:
     pgloader --version
     echo
   fi
-
+ 
 install:
 - |
   echo "Updating Composer"
   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
   echo
 
 - |
-  echo "Installing Composer dependencies (PHP Unit, Parallel Lint & PHP CodeSniffer"
-  if [ "$TRAVIS_PHP_VERSION" = '5.4' ] || [ "$TRAVIS_PHP_VERSION" = '5.5' ]; then
-    composer -n require phpunit/phpunit ^4 \
-                        jakub-onderka/php-parallel-lint ^0 \
-                        jakub-onderka/php-console-highlighter ^0 \
-                        squizlabs/php_codesniffer ^3
+  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.3' ] || [ "$TRAVIS_PHP_VERSION" = '5.4' ] || [ "$TRAVIS_PHP_VERSION" = '5.5' ]; then
+    composer -n require phpunit/phpunit ^4
   fi
-  if [ "$TRAVIS_PHP_VERSION" = '5.6' ] || [ "$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' ]; then
-    composer -n require phpunit/phpunit ^5 \
-                        jakub-onderka/php-parallel-lint ^0 \
-                        jakub-onderka/php-console-highlighter ^0 \
-                        squizlabs/php_codesniffer ^3
+  if [ "$TRAVIS_PHP_VERSION" = '5.6' ] || [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
+    composer -n require phpunit/phpunit ^5
   fi
-  if [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
-      composer -n require --ignore-platform-reqs 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 ^2
   echo
 
 - |
   echo "Adding path of binaries tools installed by composer to the PATH"
   export PATH="$TRAVIS_BUILD_DIR/htdocs/includes/bin:$PATH"
   echo
-
-
+  
 
 before_script:
-  - |
-    echo Start travis
-    echo Current dir is `pwd`
-    echo Home dir is `echo ~`
-    echo TRAVIS_BUILD_DIR is $TRAVIS_BUILD_DIR
+- |
+  echo Start travis
+  echo Current dir is `pwd`
+  echo Home dir is `echo ~`
+  echo TRAVIS_BUILD_DIR is $TRAVIS_BUILD_DIR
 
-  - |
-    echo "Re-enabling Xdebug for PHP CodeSniffer and PHP Unit"
-    phpenv config-add /tmp/xdebug.ini
-    echo
+- |
+  echo "Re-enabling Xdebug for PHP CodeSniffer and PHP Unit"
+  phpenv config-add /tmp/xdebug.ini
+  echo
 
-  - |
-    echo "Setting up PHP"
-    echo
-    echo "Set timezone"
-    echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
-    phpenv rehash
+- |
+  echo "Setting up PHP"
+  echo
+  echo "Set timezone"
+  echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
+  if [ "$TRAVIS_PHP_VERSION" = '5.3' ] || [ "$TRAVIS_PHP_VERSION" = '5.4' ]; then
+    #echo
+    #echo "Enabling APC for PHP <= 5.4"
+    #   Documentation says it should be available for PHP <= 5.6 but it's not for 5.5 and 5.6!
+    #echo 'extension = apc.so' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
     echo
+    echo "Enabling Memcached for PHP <= 5.4"
+    #   Documentation says it should be available for all PHP versions but it's not for 5.5 and 5.6, 7.0, 7.1 and nightly!
+    echo 'extension = memcached.so' >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
+  fi
+  phpenv rehash
+  echo
 
-  - |
-    echo "Versions information"
+- |
+  if [ "$DEBUG" = true ]; then
+    echo "Debugging informations"
     # Check PHP
-    echo "PHP version"
-    php -i | head -
+    php -i
     # Check PHP CodeSniffer installation
-    echo "PHPCS version"
     which phpcs
-    phpcs --version | head -
-    phpcs -i | head -
+    phpcs --version
+    phpcs -i
     # Check PHPUnit installation
-    echo "PHPUnit version"
     which phpunit
-    phpunit --version | head -
-    # Check Apache version
-    echo "Apache version"
-    apache2 -v | head -
-    # Check MariaDb
-    echo "MariaDb version"
-    mysql --version | head -
-    mysql -e "SELECT VERSION();"  | head -
+    phpunit --version
+    # Check MySQL
+    mysql --version
+    mysql -e "SELECT VERSION();"
     echo
+  fi
+  
+- |
+  echo "Setting up database"
+  if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ] || [ "$DB" = 'postgresql' ]; then
+    echo "MySQL"
+    mysql -e 'DROP DATABASE IF EXISTS travis;'
+    mysql -e 'CREATE DATABASE IF NOT EXISTS travis;'
+    mysql -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;'
+    mysql -e 'FLUSH PRIVILEGES;'    
+    mysql -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
+  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
+    pgloader mysql://root@127.0.0.1/travis postgresql:///travis
+  fi
+  # TODO: SQLite
+  echo
 
-  - |
-    echo "Setting up database"
-    if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ] || [ "$DB" = 'postgresql' ]; then
-      echo "MySQL"
-      mysql -e 'DROP DATABASE IF EXISTS travis;'
-      mysql -e 'CREATE DATABASE IF NOT EXISTS travis;'
-      mysql -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;'
-      mysql -e 'FLUSH PRIVILEGES;'
-      mysql -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
-    fi
-    if [ "$DB" = 'postgresql' ]; then
-      #pgsql travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
-      #pgloader mysql://root:pass@127.0.0.1/dolibarr_9 postgresql://dolibarrowner:dolibarrownerpass@127.0.0.1/dolibarr_dev
-      echo pgloader mysql://root@127.0.0.1/travis postgresql:///travis
-      pgloader mysql://root@127.0.0.1/travis postgresql:///travis
-      echo 'ALTER SEQUENCE llx_accountingaccount_rowid_seq RENAME TO llx_accounting_account_rowid_seq' | psql travis
-      echo 'ALTER SEQUENCE llx_accounting_account_rowid_seq RESTART WITH 1000001;' | psql travis
-      #echo 'select * from INFORMATION_SCHEMA.COLUMNS where table_name = 'llx_accountingaccount' | psql travis
-      #echo 'select * from information_schema.table_constraints;' | psql travis
-      #echo 'ALTER TABLE "llx_accounting_account" DROP CONSTRAINT "idx_16390_primary"' | psql travis
-    fi
-    echo
+- |
+  export CONF_FILE=htdocs/conf/conf.php
+  echo "Setting up Dolibarr $CONF_FILE"
+  echo '<?php ' > $CONF_FILE
+  echo '$'dolibarr_main_url_root=\'http://127.0.0.1\'';' >> $CONF_FILE
+  echo '$'dolibarr_main_document_root=\'$TRAVIS_BUILD_DIR/htdocs\'';' >> $CONF_FILE
+  echo '$'dolibarr_main_data_root=\'$TRAVIS_BUILD_DIR/documents\'';' >> $CONF_FILE
+  echo '$'dolibarr_main_db_host=\'127.0.0.1\'';' >> $CONF_FILE
+  echo '$'dolibarr_main_db_name=\'travis\'';' >> $CONF_FILE
+  echo '$'dolibarr_main_db_user=\'travis\'';' >> $CONF_FILE
+  if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then
+    echo '$'dolibarr_main_db_type=\'mysqli\'';' >> $CONF_FILE
+  fi
+  if [ "$DB" = 'postgresql' ]; then
+    echo '$'dolibarr_main_db_type=\'pgsql\'';' >> $CONF_FILE
+  fi
+  # TODO: SQLite
+  echo '$'dolibarr_main_authentication=\'dolibarr\'';' >> $CONF_FILE
+  cat $CONF_FILE
+  echo
 
-  - |
-    export CONF_FILE=htdocs/conf/conf.php
-    echo "Setting up Dolibarr $CONF_FILE"
-    echo '<?php' > $CONF_FILE
-    echo '$'dolibarr_main_url_root=\'http://127.0.0.1\'';' >> $CONF_FILE
-    echo '$'dolibarr_main_document_root=\'$TRAVIS_BUILD_DIR/htdocs\'';' >> $CONF_FILE
-    echo '$'dolibarr_main_data_root=\'$TRAVIS_BUILD_DIR/documents\'';' >> $CONF_FILE
-    echo '$'dolibarr_main_db_host=\'127.0.0.1\'';' >> $CONF_FILE
-    echo '$'dolibarr_main_db_name=\'travis\'';' >> $CONF_FILE
-    echo '$'dolibarr_main_db_user=\'travis\'';' >> $CONF_FILE
-    echo '$'dolibarr_main_instance_unique_id=\'travis1234567890\'';' >> $CONF_FILE
-    if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then
-      echo '$'dolibarr_main_db_type=\'mysqli\'';' >> $CONF_FILE
-      echo '$'dolibarr_main_db_port=\'3306\'';' >> $CONF_FILE
-    fi
-    if [ "$DB" = 'postgresql' ]; then
-      echo '$'dolibarr_main_db_type=\'pgsql\'';' >> $CONF_FILE
-      echo '$'dolibarr_main_db_port=\'5432\'';' >> $CONF_FILE
-    fi
-    echo '$'dolibarr_main_authentication=\'dolibarr\'';' >> $CONF_FILE
-    cat $CONF_FILE
-    echo
+- |
+  echo "Create documents directory and set permissions"
+  # and admin/temp subdirectory needed for unit tests
+  mkdir -p documents/admin/temp
+  echo "first line" > documents/dolibarr.log
+  echo
 
-  - |
-    echo "Create documents directory and set permissions"
-    # and admin/temp subdirectory needed for unit tests
-    mkdir -p $TRAVIS_BUILD_DIR/documents/admin/temp
-    sudo chmod -R a+rwx $TRAVIS_BUILD_DIR/documents
-    echo "***** First line of dolibarr.log" > $TRAVIS_BUILD_DIR/documents/dolibarr.log
-    echo
-
-
-  - echo "Setting up Apache + FPM"
+- |
+  echo "Setting up Apache + FPM"
   # enable php-fpm
-  - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf
-  - |
-    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
-      # Copy the included pool
-      sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf
-    fi
-  - sudo a2enmod rewrite actions fastcgi alias
-  - echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-  - sudo sed -i -e "s,www-data,travis,g" /etc/apache2/envvars
-  - sudo chown -R travis:travis /var/lib/apache2/fastcgi
-  - ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
-  # configure apache virtual hosts 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
-  - sudo service apache2 restart
-
-
+  cp ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.conf.default ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.conf
+  if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
+    # Copy the included pool
+    cp ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.d/www.conf
+  fi
+  if [ "$DEBUG" = true ]; then
+    cat ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php-fpm.conf
+  fi
+  sudo a2enmod rewrite actions fastcgi alias
+  echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
+  if [ "$DEBUG" = true ]; then
+    cat ~/.phpenv/versions/$PHP_VERSION_NAME/etc/php.ini
+  fi
+  ~/.phpenv/versions/$PHP_VERSION_NAME/sbin/php-fpm
+  # configure apache virtual hosts
+  sudo cp -f build/travis-ci/apache.conf /etc/apache2/sites-available/default
+  sudo sed -e "s?%TRAVIS_BUILD_DIR%?$TRAVIS_BUILD_DIR?g" --in-place /etc/apache2/sites-available/default
+  if [ "$DEBUG" = true ]; then
+    sudo cat /etc/apache2/sites-available/default
+  fi
+  sudo service apache2 restart
+  echo
 
 script:
 - |
-  echo "Checking webserver availability by a wget -O - http://127.0.0.1"
-  # Ensure we stop on error with set -e
-  set +e
-  # The wget should return a page with line '<meta name="generator" content="Dolibarr installer">
-  wget -O - http://127.0.0.1 > test.html
-  head test.html
-  sudo cat /var/log/apache2/travis_error_log
+  echo "Checking webserver availability"
+  # Ensure we catch errors
+  set -e
+  wget http://127.0.0.1
+  if [ "$DEBUG" = true ]; then
+    cat index.html
+  fi
   set +e
   echo
 
@@ -290,88 +283,26 @@ script:
   echo "Checking PHP syntax errors"
   # Ensure we catch errors
   set -e
-  #parallel-lint --exclude htdocs/includes --blame .
-  parallel-lint --exclude dev/namespacemig --exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian --exclude htdocs/includes/squizlabs/php_codesniffer/tests --exclude htdocs/includes/jakub-onderka/php-parallel-lint/tests --exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/phpunit/php-token-stream/tests --exclude htdocs/includes/composer/autoload_static.php --blame .
+  parallel-lint --exclude htdocs/includes --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
-  #phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 .
-  if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .; fi
+  phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 .
   set +e
   echo
 
-- |
-  export INSTALL_FORCED_FILE=htdocs/install/install.forced.php
-  echo "Setting up Dolibarr $INSTALL_FORCED_FILE to test installation"
-  # Ensure we catch errors
-  set +e
-  echo '<?php ' > $INSTALL_FORCED_FILE
-  echo '$'force_install_noedit=2';' >> $INSTALL_FORCED_FILE
-  if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then
-    echo '$'force_install_type=\'mysqli\'';' >> $INSTALL_FORCED_FILE
-  fi
-  if [ "$DB" = 'postgresql' ]; then
-    echo '$'force_install_type=\'pgsql\'';' >> $INSTALL_FORCED_FILE
-  fi
-  echo '$'force_install_dbserver=\'127.0.0.1\'';' >> $INSTALL_FORCED_FILE
-  echo '$'force_install_database=\'travis\'';' >> $INSTALL_FORCED_FILE
-  echo '$'force_install_databaselogin=\'travis\'';' >> $INSTALL_FORCED_FILE
-  echo '$'force_install_databasepass=\'\'';' >> $INSTALL_FORCED_FILE
-  echo '$'force_install_port=\'5432\'';' >> $INSTALL_FORCED_FILE
-  echo '$'force_install_prefix=\'llx_\'';' >> $INSTALL_FORCED_FILE
-  echo '$'force_install_createdatabase=false';' >> $INSTALL_FORCED_FILE
-  echo '$'force_install_createuser=false';' >> $INSTALL_FORCED_FILE
-  echo '$'force_install_mainforcehttps=false';' >> $INSTALL_FORCED_FILE
-  echo '$'force_install_main_data_root=\'$TRAVIS_BUILD_DIR/htdocs\'';' >> $INSTALL_FORCED_FILE
-  #cat $INSTALL_FORCED_FILE
+# TODO: Check Javascript (jshint?)
 
-#- |
-#  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
+# TODO: Check CSS (csslint?)
 
 - |
   echo "Upgrading Dolibarr"
-  # Ensure we catch errors. Set this to +e if you want to go to the end to see log files.
+  # Ensure we catch errors
   set +e
   cd htdocs/install
   php upgrade.php 3.5.0 3.6.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade350360.log
@@ -387,53 +318,40 @@ script:
   php upgrade2.php 3.8.0 3.9.0 > $TRAVIS_BUILD_DIR/upgrade380390-2.log
   php step5.php 3.8.0 3.9.0 > $TRAVIS_BUILD_DIR/upgrade380390-3.log
   php upgrade.php 3.9.0 4.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade390400.log
-  php upgrade2.php 3.9.0 4.0.0 > $TRAVIS_BUILD_DIR/upgrade390400-2.log
+  php upgrade2.php 3.9.0 4.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL > $TRAVIS_BUILD_DIR/upgrade390400-2.log
   php step5.php 3.9.0 4.0.0 > $TRAVIS_BUILD_DIR/upgrade390400-3.log
   php upgrade.php 4.0.0 5.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade400500.log
-  php upgrade2.php 4.0.0 5.0.0 > $TRAVIS_BUILD_DIR/upgrade400500-2.log
+  php upgrade2.php 4.0.0 5.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL > $TRAVIS_BUILD_DIR/upgrade400500-2.log
   php step5.php 4.0.0 5.0.0 > $TRAVIS_BUILD_DIR/upgrade400500-3.log
   php upgrade.php 5.0.0 6.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade500600.log
-  php upgrade2.php 5.0.0 6.0.0 > $TRAVIS_BUILD_DIR/upgrade500600-2.log
+  php upgrade2.php 5.0.0 6.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL > $TRAVIS_BUILD_DIR/upgrade500600-2.log
   php step5.php 5.0.0 6.0.0 > $TRAVIS_BUILD_DIR/upgrade500600-3.log
   php upgrade.php 6.0.0 7.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade600700.log
-  php upgrade2.php 6.0.0 7.0.0 > $TRAVIS_BUILD_DIR/upgrade600700-2.log
+  php upgrade2.php 6.0.0 7.0.0 MAIN_MODULE_API,MAIN_MODULE_SUPPLIERPROPOSAL > $TRAVIS_BUILD_DIR/upgrade600700-2.log
   php step5.php 6.0.0 7.0.0 > $TRAVIS_BUILD_DIR/upgrade600700-3.log
-  php upgrade.php 7.0.0 8.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade700800.log
-  php upgrade2.php 7.0.0 8.0.0 > $TRAVIS_BUILD_DIR/upgrade700800-2.log
-  php step5.php 7.0.0 8.0.0 > $TRAVIS_BUILD_DIR/upgrade700800-3.log
-  php upgrade.php 8.0.0 9.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade800900.log
-  php upgrade2.php 8.0.0 9.0.0 > $TRAVIS_BUILD_DIR/upgrade800900-2.log
-  php step5.php 8.0.0 9.0.0 > $TRAVIS_BUILD_DIR/upgrade800900-3.log
-  php upgrade.php 9.0.0 10.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade9001000.log
-  php upgrade2.php 9.0.0 10.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-2.log
-  php step5.php 9.0.0 10.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-3.log
-  php upgrade.php 10.0.0 11.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade9001000.log
-  php upgrade2.php 10.0.0 11.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-2.log
-  php step5.php 10.0.0 11.0.0 > $TRAVIS_BUILD_DIR/upgrade9001000-3.log
-  # 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 $?
   cd -
   set +e
   echo
+  #cat $TRAVIS_BUILD_DIR/upgrade400500-2.log
   #cat /tmp/dolibarr_install.log
-  cat $TRAVIS_BUILD_DIR/enablemodule.log
-
+  
 - |
   echo "Unit testing"
-  # Ensure we catch errors. Set this to +e if you want to go to the end to see dolibarr.log file.
+  # Ensure we catch errors. Set this to +e if you want to go to the end to see log file.
   set -e
   phpunit -d memory_limit=-1 -c test/phpunit/phpunittest.xml test/phpunit/AllTests.php
-  phpunitresult=$?
-  echo "Phpunit return code = $phpunitresult"
   set +e
 
+- |
+  #echo "Output dolibarr.log"
+  #echo cat documents/dolibarr.log
+
 after_script:
 - |
-  echo "After script - Output lines of dolibarr.log"
-  ls $TRAVIS_BUILD_DIR/documents
-  #cat $TRAVIS_BUILD_DIR/documents/dolibarr.log
-  sudo tail -n 50 $TRAVIS_BUILD_DIR/documents/dolibarr.log
+  # Dolibarr log file
+  #echo "After script"
+  #cat documents/dolibarr.log
+
 
 after_success:
 - |
@@ -441,24 +359,20 @@ after_success:
 
 after_failure:
 - |
-  echo Failure detected, so we show samples of log to help diagnose
-  # This part of code is executed only if previous command that fails are enclosed with set +e
+  echo Failure
+  # This part of code seems to be never executed, error or not ???
+  echo "Debugging informations"
   # Upgrade log files
-  for ficlog in `ls $TRAVIS_BUILD_DIR/*.log`
-  do
-    echo "Debugging informations for file $ficlog"
-    #cat $ficlog
-  done
+  cat *.log
+  echo "Debugging informations"
   # Apache log file
-  echo "Debugging informations for file apache error.log"
-  sudo cat /var/log/apache2/travis_error_log
+  sudo cat /var/log/apache2/error.log
+  # Dolibarr log file
+  cat documents/dolibarr.log
   if [ "$DEBUG" = true ]; then
-    # Dolibarr log file
-    echo "Debugging informations for file dolibarr.log (latest 50 lines)"
-    tail -n 50 $TRAVIS_BUILD_DIR/documents/dolibarr.log
     # MariaDB log file
-    echo "Debugging informations for file mysql error.log"
-    sudo tail -n 50 /var/log/mysql/error.log
+    sudo cat /var/log/mysql/error.log
     # TODO: PostgreSQL log file
     echo
   fi
+

.tx/config

@@ -20,12 +20,6 @@ source_file = htdocs/langs/en_US/agenda.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.assets]
-file_filter = htdocs/langs/<lang>/assets.lang
-source_file = htdocs/langs/en_US/assets.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.banks]
 file_filter = htdocs/langs/<lang>/banks.lang
 source_file = htdocs/langs/en_US/banks.lang
@@ -38,12 +32,6 @@ source_file = htdocs/langs/en_US/bills.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.blockedlog]
-file_filter = htdocs/langs/<lang>/blockedlog.lang
-source_file = htdocs/langs/en_US/blockedlog.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.bookmarks]
 file_filter = htdocs/langs/<lang>/bookmarks.lang
 source_file = htdocs/langs/en_US/bookmarks.lang
@@ -164,6 +152,12 @@ source_file = htdocs/langs/en_US/hrm.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.incoterm]
+file_filter = htdocs/langs/<lang>/incoterm.lang
+source_file = htdocs/langs/en_US/incoterm.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.install]
 file_filter = htdocs/langs/<lang>/install.lang
 source_file = htdocs/langs/en_US/install.lang
@@ -236,12 +230,6 @@ source_file = htdocs/langs/en_US/modulebuilder.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.mrp]
-file_filter = htdocs/langs/<lang>/mrp.lang
-source_file = htdocs/langs/en_US/mrp.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.multicurrency]
 file_filter = htdocs/langs/<lang>/multicurrency.lang
 source_file = htdocs/langs/en_US/multicurrency.lang
@@ -320,12 +308,6 @@ source_file = htdocs/langs/en_US/receiptprinter.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.receptions]
-file_filter = htdocs/langs/<lang>/receptions.lang
-source_file = htdocs/langs/en_US/receptions.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.resource]
 file_filter = htdocs/langs/<lang>/resource.lang
 source_file = htdocs/langs/en_US/resource.lang
@@ -374,12 +356,6 @@ source_file = htdocs/langs/en_US/supplier_proposal.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.ticket]
-file_filter = htdocs/langs/<lang>/ticket.lang
-source_file = htdocs/langs/en_US/ticket.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.trips]
 file_filter = htdocs/langs/<lang>/trips.lang
 source_file = htdocs/langs/en_US/trips.lang
@@ -409,10 +385,3 @@ file_filter = htdocs/langs/<lang>/workflow.lang
 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

@@ -2,10 +2,10 @@
 License
 -------
 
-Dolibarr is released under the terms of the GNU General Public License as
+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,36 +13,33 @@ 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
+ChromePHP              4.1.0         Apache Software License 2.0 Yes             Return server log to chrome browser console
+CKEditor               4.6.2         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
 GeoIP                  1.4           LGPL-2.1+                   Yes             Sample code to make geoip convert (not into deb package)
-Mobiledetect           2.8.33        MIT License                 Yes             Detect mobile devices browsers
+Mobiledetect           2.8.17        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
+odtPHP                 1.0.1         GPL-2+                      Yes             Library to build/edit ODT files
 ParseDown              1.6           MIT License                 Yes             Markdown parser
-PHPDebugBar            1.15.0        MIT License	             Yes             Used only by the module "debugbar" for developers
 PHPExcel               1.8.1         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
-PHPSpreadSheet         ?             LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
 php-iban               1.4.7         LGPL-3+                     Yes             Parse and validate IBAN (and IIBAN) bank account information in PHP
 PHPoAuthLib            0.8.2         MIT License                 Yes             Library to provide oauth1 and oauth2 to different service
 PHPPrintIPP            1.3           GPL-2+                      Yes             Library to send print IPP requests
-PSR/Logs			   1.0										                 Library for logs (used by DebugBar)
-PSR/simple-cache	   ?										                 Library for cache (used by PHPSpreadSheet)
 Restler                3.0.0RC6      LGPL-3+                     Yes             Library to develop REST Web services (+ swagger-ui js lib into dir explorer)
-Sabre                  3.2.2         BSD                         Yes             DAV support
-Swift Mailer           5.4.2-DEV     MIT license                 Yes             Comprehensive mailing tools for PHP
-Stripe                 6.41          MIT licence                 Yes             Library for Stripe module
-TCPDF                  6.3.2         LGPL-3+                     Yes             PDF generation
+TCPDF                  6.2.12        LGPL-3+                     Yes             PDF generation
 TCPDI                  1.0.0         LGPL-3+ / Apache 2.0        Yes             FPDI replacement
+Swift Mailer           5.4.2-DEV     MIT license                 Yes             Comprehensive mailing tools for PHP
+Stripe                 4.7.0         MIT licence                 Yes             Library for Stripe module
 
 JS libraries:
-Ace                    1.4.6         BSD                         Yes             JS library to get code syntaxique coloration in a textarea.
-jQuery                 3.4.1         MIT License                 Yes             JS library
-jQuery UI              1.12.1        GPL and MIT License         Yes             JS library plugin UI
-jQuery select2         4.0.5         GPL and Apache License      Yes             JS library plugin for sexier multiselect
+jQuery                 1.11.3        MIT License                 Yes             JS library
+jQuery UI              1.11.4        GPL and MIT License         Yes             JS library plugin UI
+jQuery select2         3.5.2         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 FileUpload      5.0.3         GPL and MIT License         Yes             JS library to upload files
 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)
@@ -52,19 +49,13 @@ jQuery jqueryFileTree  1.0.1         GPL and MIT License         Yes
 jQuery jquerytreeview  1.4.1         MIT License                 Yes             JS library for filetree
 jQuery TableDnD        0.6           GPL and MIT License         Yes             JS library plugin TableDnD (to reorder table rows)
 jQuery Timepicker      1.1.0         GPL and MIT License         Yes             JS library Timepicker addon for Datepicker
-jsGanttImproved        1.7.5.4       BSD License                 Yes             JS library (to build Gantt reports)
+jQuery Tiptip          1.3           GPL and MIT License         Yes             JS library for tooltips
+jsGanttImproved        1.7.5.2       BSD License                 Yes             JS library (to build Gantt reports)
 JsTimezoneDetect       1.0.6         MIT License                 Yes             JS library to detect user timezone
 SwaggerUI			   2.0.24		 GPL-2+                      Yes             JS library to offer the REST API explorer
 
-Image libraries:
-Octicons               8.1           MIT                         Yes
-
-Font libraries:
-Fontawesome            5.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

Dockerfile

@@ -0,0 +1,19 @@
+FROM php:5.6-apache
+
+RUN apt-get update && apt-get install -y libpng12-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-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
+        && docker-php-ext-install ldap \
+        && docker-php-ext-install mysqli \
+        && apt-get purge -y libpng12-dev libjpeg-dev libldap2-dev
+
+COPY htdocs/ /var/www/html/
+
+RUN chown -hR www-data:www-data /var/www/html
+
+VOLUME /var/www/html/conf
+VOLUME /var/www/html/documents
+
+EXPOSE 80

README-FR.md

@@ -1,76 +1,74 @@
 # 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).
+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_640x480.png)
+
 
-![ScreenShot](https://www.dolibarr.org/images/dolibarr_screenshot1_1920x1080.jpg)
 
 ## LICENCE
 
 Dolibarr est distribué sous les termes de la licence GNU General Public License v3+ ou supérieure.
 
+
+
 ## INSTALLER DOLIBARR
 
-### Configuration simple
+Si vous n'avez pas de connaissances techniques, et que vous recherchez
+un programme d'installation qui install Dolibarr ERP/CRM en quelques clics,
+vous devez vous réorienter vers DoliWamp (la version tout-en-un
+de Dolibarr pour Windows), DoliDeb (la version tout-en-un pour Debian ou
+Ubuntu) ou DoliRpm (la version tout-en-un de Dolibarr pour Fedora, Redhat,
+OpenSuse, Mandriva ou Mageia).
 
-Si vous avez peu de compétences techniques et que vous souhaitez installer Dolibarr ERP/CRM en quelques clics, vous pouvez utiliser l'une des versions pré-packagées avec les prérequis:
+Vous pouvez les télécharger depuis la rubrique *download* du portail officiel: 
+https://www.dolibarr.org/
 
-- DoliWamp pour Windows
-- DoliDeb pour Debian ou Ubuntu
-- DoliRpm pour Redhat, Fedora, OpenSuse, Mandriva ou Mageia
+Si vous avez déjà installé un serveur Web avec PHP et une base de donnée (MariaDb/MySql/PostgreSql),
+vous pouvez installer Dolibarr avec cette version de la manière suivante:
 
-Les packages peuvent être téléchargés à partir de [site web officiel](https://www.dolibarr.org/).
-
-### Configuration avancée
-
-Vous pouvez aussi utiliser un serveur Web et une base de données prise en charge (MariaDB, MySQL ou PostgreSQL) pour installer la version standard.
-
-- 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, ...)
-
-- 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 à:
-
-  `http://localhost/dolibarr/htdocs/install/`
+- Copier le répertoire "dolibarr" et son contenu dans la racine de votre serveur
+  web, ou bien copier le répertoire sur le serveur et configurer ce serveur pour
+  utiliser "dolibarr/htdocs" comme racine d'un nouveau virtual host (ce second 
+  choix requiert des compétences et habilitations en administration du serveur
+  web).
+  
+- Créer un fichier vide "htdocs/conf/conf.php" et attribuer les permissions
+  en lecture et écriture pour le user du serveur web (les permissions en 
+  écriture seront supprimées une fois l'installation terminée).
 
+- Depuis votre navigateur, appeler la page "install/" de dolibarr. L'url dépend 
+  du choix fait à la première etape:
+   http://localhost/dolibarr/htdocs/install/
   ou
+   http://yourdolibarrvirtualhost/install/
+   
+- Suivez les instructions fournies par l'installeur...
 
-  `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
+Pour mettre a jour Dolibarr depuis une vieille version vers celle ci:
+- Ecraser les vieux fichiers dans le vieux repertoire 'dolibarr' par les fichiers
   fournis dans ce nouveau package.
+  
+- Au prochain accès, Dolibarr proposera la page de "mise a jour" des données (si necessaire).
+  Si un fichier install.lock existe pour vérouiller le processus de mise à jour, il sera demandé de le supprimer manuellement (vous devriez trouver le fichier install.lock dans le répertoire utilisé pour stocker les documents générés ou transféré sur le serveur. Dans la plupart des cas, c'est le répertoire appelé "documents") 
 
-- Au prochain accès, Dolibarr proposera la page de "mise à jour" des données (si nécessaire).
-  Si un fichier install.lock existe pour verrouiller le processus de mise à jour, il sera demandé de le supprimer manuellement (vous devriez trouver le fichier install.lock dans le répertoire utilisé pour stocker les documents générés ou transférés sur le serveur. Dans la plupart des cas, c'est le répertoire appelé "documents")
-
-*Note: Le processus de migration peut être lancé manuellement et plusieurs fois, sans risque, en appelant la page /install/*
+*Note: Le processus de migration peut etre 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
@@ -79,7 +77,7 @@ Voir fichier ChangeLog.
 - Gestion des factures clients/fournisseurs et paiements
 - Gestion des virements bancaires SEPA
 - Gestion des comptes bancaires
-- Calendrier/Agenda partagé (avec export ical, vcal)
+- Calendrier/Agenda partagé (avec export ical, vcal) 
 - Suivi des opportunités et/ou projets (suivi de rentabilité incluant les factures, notes de frais, temps consommé valorisé, ...)
 - Gestion de contrats de services
 - Gestion de stock
@@ -92,22 +90,21 @@ Voir fichier ChangeLog.
 - Point de vente/Caisse enregistreuse
 - …
 
-### Autres modules
+### Autres modules:
 
 - Gestion de marque-pages
 - Gestion des promesses de dons
+- Gestion de la TVA NPR (non perçue récupérable - pour les utilisateurs français des DOM-TOM)
 - Rapports
 - Imports/Exports des données
-- Support des codes barres
-- Calcul des marges
 - Connectivité LDAP
 - Intégratn de ClickToDial
 - Intégration RSS
 - Intégation Skype
-- Intégration de système de paiements (Paypal, Stripe, Paybox...)
+- Intégration de système de paiements (Paypal, Strip, Paybox...)
 - …
 
-### Divers
+### Divers:
 
 - Multi-langue.
 - Multi-utilisateurs avec différents niveaux de permissions par module.
@@ -115,43 +112,36 @@ Voir fichier ChangeLog.
 - Peux être multi-société par ajout du module externe multi-société.
 - Plusieurs thèmes visuels.
 - Application simple à utiliser.
-- Requiert PHP et MariaDb, Mysql ou Postgresql (Voir versions exactes sur https://wiki.dolibarr.org/index.php/Prérequis).
+- Requiert PHP et MariaDb, Mysql ou Postgresql (Voir versions exactes sur https://wiki.dolibarr.org/index.php/Prérequis). 
 - Compatible avec toutes les offres Cloud du marché respectant les prérequis de base de données et PHP.
+- Code simple et facilement personnalisable (pas de framework lourd; mécanisme de hook et triggers).
 - APIs.
 - Génération PDF et ODT des éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
-- Code simple et facilement personnalisable (pas de framework lourd; mécanisme de hook et triggers).
-- Support natif de nombreuses fonctions spécifiques aux pays comme:
-  - La tax espagnole TE et ISPF
-  - Gestion de la TVA NPR (non perçue récupérable - pour les utilisateurs français des DOM-TOM)
-  - La loi française Finance 2016 et logiciels de caisse
-  - La double taxe canadienne
-  - Le timbre fiscal tunisien
-  - Numérotation de facture de l'argentines (avec type A,B,C...)
-  - Compatible avec vos processus RGPD
-  - ...
 - …
 
 ### Extension
 
 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:
-
+Voici un liste de fonctionnalites 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).
+- 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).
+Les documentations utilisateur, développeur et traducteur sont disponible sous forme de ressources de la communautés via la 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>
+## CONTRIBUTING
+
+Voir le fichier [CONTRIBUTING](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)
+
 
 ## CREDITS
 
@@ -159,16 +149,19 @@ Dolibarr est le résultat du travail de nombreux contributeurs depuis des année
 
 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)
-- [Twitter](https://www.twitter.com/dolibarr_france)
+- Facebook: <https://www.facebook.com/dolibarr.fr>
+- 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,17 @@
 # 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)
+![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/6.0.svg) ![Downloads per day](https://img.shields.io/sourceforge/dm/dolibarr.svg)
 
-Dolibarr ERP & CRM is a modern software package to manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda…).
+Dolibarr ERP & CRM is a modern software package to manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda, ...).
 
-It's an Open Source Software (written in PHP language) designed for small, medium or large companies, foundations and freelances.
+It's an Open Source software (wrote 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,80 +21,85 @@ 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
 
+### Download
+
+Releases can be downloaded from [official website](https://www.dolibarr.org/).
+
+### Install from composer
+If you do not already have Composer installed, you may do so by following the instructions at getcomposer.org. On Linux and Mac OS X, you'll run the following commands:
+
+curl -sS https://getcomposer.org/installer | php
+mv composer.phar /usr/local/bin/composer
+
+On Windows, you'll download and run https://getcomposer.org/Composer-Setup.exe
+
+composer create-project dolibarr/dolibarr erp
+
 ### 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:
+If you have low technical skills and you're looking to install Dolibarr ERP/CRM in few clicks, you can use one of the packaged versions:
 
 - DoliWamp for Windows
 - DoliDeb for Debian or Ubuntu
 - DoliRpm for Redhat, Fedora, OpenSuse, Mandriva or Mageia
 
-Releases can be downloaded from [official website](https://www.dolibarr.org/).
-
 ### Advanced setup
 
-You can use a Web server and a supported database (MariaDB, MySQL or PostgreSQL) to install the standard version.
-
-- 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, ...)
-
-- Set up your web server to use "*dolibarr/htdocs*" as root if your web server does not have an already defined directory to point to.
-
-- Create an empty `htdocs/conf/conf.php` file and set *write* permissions for your web server user (*write* permission will be removed once install is finished)
+You can use a Web server and a supported database (MariaDb, MySql or Postgresql) to install the standard version.
 
+- Uncompress the downloaded archive
+- Copy directory "dolibarr" and all its files inside your web server root, or copy directory anywhere and set up your web server to use "dolibarr/htdocs" as root for a new web server virtual host (second choice need to be server administrator)
+- Create an empty file "htdocs/conf/conf.php" and set permissions for your web server user (write permissions will be removed once install is finished)
 - From your browser, go to the dolibarr "install/" page
 
-  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/`
-
-  or
-
-  `http://localhost/dolibarr/install/`
-
-  or
-
-  `http://yourdolibarrvirtualhost/install/`
+    The URL will depends on choices made in the first step:
 
+        http://localhost/dolibarr/htdocs/install/
+        
+    or
+    
+        http://localhost/dolibarr/install/
+        
+    or
+    
+    	http://yourdolibarrvirtualhost/install/
+   
 - Follow the installer instructions
 
-### Saas/Cloud setup
-
-If you don't have time to install it yourself, you can try some commercial 'ready to use' Cloud offers (See https://saas.dolibarr.org). However, this third solution is not free.
 
 ## UPGRADING
 
-- At first make a backup of your Dolibarr files & than see https://wiki.dolibarr.org/index.php/Installation_-_Upgrade#Upgrade_Dolibarr
 - 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*").
+- At first next access, Dolibarr will redirect your to the "install/" page to make the upgrade process.
+  If a file install.lock exists to lock any run of 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 safely be done multiple times by calling the page /install/index.php*
 
-*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
+- Customers, Prospects and/or Suppliers directory
 - Products and/or Services catalog
 - Commercial proposals management
 - Customer and Supplier Orders management
 - Invoices and payment management
 - Standing orders management (European SEPA)
 - Bank accounts management
-- Accounting management
 - Shared calendar/agenda (with ical and vcal export for third party tools integration)
 - Opportunities and/or project management
 - Projects management
 - Contracts management
-- Warehouse/Stock management
+- Stock management
 - Shipping management
 - Interventions management
 - Employee's leave requests management
@@ -104,7 +109,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Foundations members management
 - Mass emailing
 - Surveys
-- Point of Sale (POS)
+- Point of Sale
 - …
 
 ### Other application/modules
@@ -113,6 +118,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Donations management
 - Reporting
 - Data export/import
+- Thirdparties and/or products categories
 - Barcodes support
 - Margin calculations
 - LDAP connectivity
@@ -124,38 +130,32 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 
 ### Other general features
 
-- Localization in most major languages
-- Multi-Users and groups with finely grained rights
-- Multi-currency
-- Multi-company by adding of an external module
-- Very user friendly and easy to use
-- customizable Dashboard
+- Localization in most major languages.
+- Multi-Users and groups with finely grained rights.
+- Multi-currency.
+- Multi-company by adding of an external module.
+- Very user friendly and easy to use.
 - Highly customizable: enable only the modules you need, add user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one)
-
-- APIs
+- Works with PHP 5.3+ 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.
+- 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
-  - French NPR VAT rate (VAT called "Non Perçue Récupérable" for DOM-TOM)
-  - Canadian double taxes (federal/province) and other countries using cumulative VAT
-  - Tunisian tax stamp
-  - Argentina invoice numbering using A,B,C...
-  - Compatible with [European directives](http://europa.eu/legislation_summaries/taxation/l31057_en.htm) (2006/112/CE ... 2010/45/UE)
-  - Compatible with European GDPR rules
-  - ...
+- Support for country specific features:
+    - Spanish Tax RE and ISPF
+    - French NPR VAT rate (VAT called "Non Perçue Récupérable" for DOM-TOM)
+    - Canadian double taxes (federal/province) and other countries using cumulative VAT
+    - Tunisian tax stamp
+    - Argentina invoice numbering using A,B,C... 
+    - Compatible with [European directives](http://europa.eu/legislation_summaries/taxation/l31057_en.htm) (2006/112/CE ... 2010/45/UE)
 - 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
+
+## FUTURE
 
 These are features that Dolibarr does **not** yet fully support:
 
@@ -164,14 +164,16 @@ 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)].
-<a href="https://github.com/Dolibarr/dolibarr/graphs/contributors"><img src="https://opencollective.com/dolibarr/contributors.svg?width=890&button=false" /></a>
+See file [CONTRIBUTING](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)
+
 
 ## CREDITS
 
@@ -179,16 +181,14 @@ Dolibarr is the work of many contributors over the years and uses some fine libr
 
 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:
 
 
@@ -15,20 +16,18 @@ Note: Prerequisites to build tgz, debian, rpm package
 > apt-get install tar dpkg dpatch p7zip-full rpm zip
 
 Note: Prerequisites to build autoexe DoliWamp package:
-> apt-get install wine q4wine
-> Launch "wine cmd" to check a drive Z: pointing to / exists.
 > Install InnoSetup
    For example by running isetup-5.3.9.exe (http://www.jrsoftware.org)
 > Install WampServer into "C:\Program Files\Wamp"
-   For example by running wampserver2.5-Apache-2.4.9-Mysql-5.6.17-php5.5.12-32b.exe (http://www.wampserver.com)
-> Install WampServer addon to have versions: Mysql5.0.45
+   For example by running wampserver2.2e-php5.4.3-httpd-2.4.2-mysql5.5.24-x64.exe (http://www.wampserver.com)
+> Install WampServer addon to have versions: Apache2.2.11, Mysql5.0.45, Php5.3.0
+   For example by running WampServer2-APACHE2211.exe (http://www.wampserver.com)
    For example by running WampServer2-MYSQL5045.exe (http://www.wampserver.com)
+   For example by running WampServer2-PHP530.exe (http://www.wampserver.com)
 > To build from Windows (running from makepack-dolibarr.pl script is however
   recommanded), open file build/exe/doliwamp.iss and click on button "Compile".
   The .exe file will be build into directory build.
-> Add path to ISCC into PATH windows var:
-  Launch wine cmd, then regedit and add entry int HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment\PATH
-  
+
 - To build a theme package, launch the script
 > perl makepack-dolibarrtheme.pl
 
@@ -36,7 +35,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: 
@@ -47,6 +46,9 @@ generated packages will not contains this "build" directory.
 
 We can find in "build", following sub-directories:
 
+* aps:
+To build APS package.
+
 * debian:
 To build Debian package.
 

build/aps/APP-META-1.1.xml

@@ -0,0 +1,123 @@
+<!-- Application namespaces and APS version (step 9) -->
+<application xmlns="http://apstandard.com/ns/1" version="1.1">
+	<!-- Application common properties (step 9) -->
+	<name>Dolibarr ERP-CRM</name>
+	<version>__VERSION__</version>
+	<release>__RELEASE__</release>
+	<homepage>http://www.dolibarr.org/</homepage>
+	<vendor>
+		<name>Dolibarr</name>
+		<homepage>http://www.dolibarr.org/</homepage>
+		<icon path="images/appicon_64.png" />
+	</vendor>
+	<packager>
+		<name>Laurent Destailleur</name>
+		<homepage>http://www.nltechno.com</homepage>
+		<uri>uuid:e743ee30-9fe8-11e0-a32e-0025115d642c</uri>
+	</packager>
+	<presentation>
+		<summary>Dolibarr ERP-CRM, the easy to use software to manage small or medium companies, freelancers or foundations</summary>
+		<description>
+Dolibarr is a free modular software (you see only
+features you need) to manage small and medium companies, freelancers
+or foundations.
+This OpenSource software is designed to provide all features you need to
+manage information on many aspects of your business
+into an intuitive and user-friendly graphical interface
+It's an OpenSource software you can install on a web server or as a
+standalone software. Dolibarr is designed to provide simplicity to end-user.
+        </description>
+		<icon path="images/appicon_64.png" />
+		<screenshot path="images/dolibarr_screenshot1_640x480.png">
+			<description>Screenshot 1</description>
+		</screenshot>
+		<changelog>
+			<version version="3.1.0" release="0">
+				<entry>See http://www.dolibarr.org/files/ChangeLog</entry>
+			</version>
+		</changelog>
+		<categories>
+			<category>Back office/Billing</category>
+			<category>Back office/Accounting and Financial</category>
+			<category>Back office/Customer Relationship Management</category>
+			<category>Back office/Enterprise Resource Planning</category>
+		</categories>
+		<languages>
+			<language>en</language>
+			<language>fr</language>
+			<language>es</language>
+			<language>de</language>
+			<language>pt</language>
+		</languages>
+	</presentation>
+	<upgrade match="/application/version = '3.0'" />
+	<!-- Application service (step 4) -->
+	<service id="dolibarr">
+		<!-- Service presentation properties (step 7) -->
+		<license must-accept="false">
+			<text>
+				<name>GPL-3.0+</name>
+				<file>COPYING</file>
+			</text>
+		</license>
+		<presentation>
+			<name>Dolibarr instance</name>
+            <summary>Dolibarr services</summary>
+			<entry-points>
+				<entry class="frontpage" dst="/">
+					<label>Application entry point</label>
+				</entry>
+			</entry-points>
+		</presentation>
+		<!-- Service settings (step 7) -->
+		<settings>
+		      <!-- 
+			<group>
+				<name>Administrator's preferences</name>
+				<setting id="admin_name" type="string" default-value="admin"
+					min-length="1" max-length="32" regex="^[a-zA-Z][0-9a-zA-Z_\-]*">
+					<name>Administrator's login</name>
+					<error-message>
+Please make sure the text you entered starts with a	letter and continues with either numbers, letters, underscores or hyphens.
+                    </error-message>
+				</setting>
+				<setting id="admin_password" type="password" min-length="1">
+					<name>Password</name>
+				</setting>
+			</group>
+			-->
+		</settings>
+		<!-- Service used technologies (step 6) -->
+		<requirements xmlns:php="http://apstandard.com/ns/1/php"
+			xmlns:db="http://apstandard.com/ns/1/db">
+			<php:version min="4.2.0" />
+			<php:extension>mysql</php:extension>
+			<php:extension>mbstring</php:extension>
+			<php:safe-mode>false</php:safe-mode>
+			<db:db>
+				<db:id>main</db:id>
+				<db:default-name>dolibarr</db:default-name>
+				<db:can-use-tables-prefix>false</db:can-use-tables-prefix>
+				<db:server-type>mysql</db:server-type>
+				<db:server-min-version>4.3.1</db:server-min-version>
+			</db:db>
+		</requirements>
+		<!-- Content delivery settings (step 8) -->
+		<provision>
+			<url-mapping>
+				<default-prefix>dolibarr</default-prefix>
+				<installed-size>35000000</installed-size>
+				<mapping url="/" path="htdocs" xmlns:php="http://apstandard.com/ns/1/php">
+					<php:handler>
+						<php:extension>php</php:extension>
+					</php:handler>
+				</mapping>
+			</url-mapping>
+			<!-- Service configuration script declaration (step 10) -->
+            <configuration-script name="configure.php">
+                <configuration-script-language>php</configuration-script-language>
+                <status-control/>
+			</configuration-script>
+		</provision>
+	</service>
+</application>

build/aps/APP-META-1.2.xml

@@ -0,0 +1,121 @@
+<!-- Application namespaces and APS version (step 9) -->
+<application xmlns="http://apstandard.com/ns/1" version="1.2">
+	<!-- Application common properties (step 9) -->
+	<id>dolibarr</id>
+	<name>Dolibarr</name>
+	<version>__VERSION__</version>
+	<release>__RELEASE__</release>
+	<homepage>http://www.dolibarr.org/</homepage>
+	<vendor>
+		<name>Dolibarr</name>
+		<homepage>http://www.dolibarr.org/</homepage>
+		<icon path="images/appicon_64.png" />
+	</vendor>
+	<packager>
+        <name>Laurent Destailleur</name>
+        <homepage>http://www.nltechno.com</homepage>
+		<uri>uuid:e743ee30-9fe8-11e0-a32e-0025115d642c</uri>
+	</packager>
+	<presentation>
+		<summary>Dolibarr ERP - CRM, the easy to use software to manage small or medium companies, freelancers or foundations</summary>
+		<description>
+Dolibarr is a free modular software (you see only
+features you need) to manage small and medium companies, freelancers
+or foundations.
+This OpenSource software is designed to provide all features you need to
+manage information on many aspects of your business
+into an intuitive and user-friendly graphical interface
+It's an OpenSource software you can install on a web server or as a
+standalone software. Dolibarr is designed to provide simplicity to end-user.
+</description>
+		<icon path="images/appicon_64.png" />
+		<screenshot path="images/dolibarr_screenshot1_640x480.png">
+			<description>Screenshot 1</description>
+		</screenshot>
+		<changelog>
+			<version version="3.1.0" release="0">
+				<entry>See http://www.dolibarr.org/files/ChangeLog</entry>
+			</version>
+		</changelog>
+		<categories>
+			<category>Back office/Billing</category>
+			<category>Back office/Accounting and Financial</category>
+			<category>Back office/Customer Relationship Management</category>
+			<category>Back office/Enterprise Resource Planning</category>
+		</categories>
+		<languages>
+			<language>en</language>
+			<language>fr</language>
+			<language>es</language>
+			<language>de</language>
+			<language>pt</language>
+		</languages>
+	</presentation>
+	<upgrade match="/application/version = '3.0'" />
+	<!-- Application service (step 4) -->
+	<service id="dolibarr">
+		<!-- Service presentation properties (step 7) -->
+		<license must-accept="false">
+			<text xml:lang="">
+				<name>GPL-3.0+</name>
+				<file>COPYING</file>
+			</text>
+		</license>
+		<presentation>
+			<name>Dolibarr instance</name>
+			<entry-points>
+				<entry class="frontpage" dst="/">
+					<label>Application entry point</label>
+				</entry>
+			</entry-points>
+		</presentation>
+		<!-- Service settings (step 7) -->
+		<settings>
+			<group>
+				<name>Administrator's preferences</name>
+				<setting id="admin_name" type="string" default-value="admin"
+					min-length="1" max-length="32" regex="^[a-zA-Z][0-9a-zA-Z_\-]*">
+					<name>Administrator's login</name>
+					<error-message>
+Please make sure the text you entered starts with a letter and continues with either numbers, letters, underscores or hyphens.
+                    </error-message>
+				</setting>
+				<setting id="admin_password" type="password" min-length="1">
+					<name>Password</name>
+				</setting>
+			</group>
+		</settings>
+		<!-- Service used technologies (step 6) -->
+		<requirements xmlns:php="http://apstandard.com/ns/1/php"
+			xmlns:db="http://apstandard.com/ns/1/db">
+			<php:version min="4.2.0" />
+			<php:extension>mysql</php:extension>
+			<php:extension>mbstring</php:extension>
+			<php:safe-mode>false</php:safe-mode>
+			<db:db>
+				<db:id>main</db:id>
+				<db:default-name>dolibarr</db:default-name>
+				<db:can-use-tables-prefix>false</db:can-use-tables-prefix>
+				<db:server-type>mysql</db:server-type>
+				<db:server-min-version>4.3.1</db:server-min-version>
+			</db:db>
+		</requirements>
+		<!-- Content delivery settings (step 8) -->
+		<provision>
+			<url-mapping>
+				<default-prefix>dolibarr</default-prefix>
+				<installed-size>35000000</installed-size>
+				<mapping url="/" path="htdocs" xmlns:php="http://apstandard.com/ns/1/php">
+					<php:handler>
+						<php:extension>php</php:extension>
+					</php:handler>
+				</mapping>
+			</url-mapping>
+			<!-- Service configuration script declaration (step 10) -->
+			<configuration-script name="configure.php">
+				<script-language>php</script-language>
+				<status-control/>
+			</configuration-script>
+		</provision>
+	</service>
+</application>

build/aps/Limitations of APS Support in the Panel.html

@@ -0,0 +1,89 @@
+<html><head>
+<title> Limitations of APS Support in the Panel </title>
+<meta name="Keywords" content="">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" type="text/css" href="Limitations%20of%20APS%20Support%20in%20the%20Panel_fichiers/stylesheet.css">
+<link href="Limitations%20of%20APS%20Support%20in%20the%20Panel_fichiers/prettify.css" type="text/css" rel="stylesheet">
+<script type="text/javascript" src="Limitations%20of%20APS%20Support%20in%20the%20Panel_fichiers/prettify.js"></script>
+<script src="Limitations%20of%20APS%20Support%20in%20the%20Panel_fichiers/highlight.js"></script></head>
+
+<body onload="prettyPrint()" link="#0000A0" text="#000000" vlink="#FF0000" alink="#008000" bgcolor="#FFFFFF">
+<h1 class="heading1">Limitations of APS Support in the Panel</h1>
+<h2 class="heading2">About This Document</h2>
+<p class="bodytext">This document is addressed to independent software 
+vendors who plan to distribute web applications among the Panel users. 
+The aim of the document is to help vendors find out whether they can 
+package their applications to APS to make them available through the 
+Panel.</p>
+<p class="bodytext">The document does not contain information about 
+Application Packaging Standard itself or give application packaging 
+instructions. It focuses on how the Panel implements APS and what APS 
+packages are not supported by this implementation.</p>
+<p class="bodytext"></p>
+<h2 class="heading2">APS Support in the Panel</h2>
+<p class="bodytext"><em class="emphasis"><em class="emphasis">Application Packaging Standard</em></em> (<em class="emphasis">APS</em>)
+ is a set of rules that defines a web application packaging format. This
+ standard is designed to ease the integration of applications in a 
+service provider's infrastructure. It covers provisioning, management, 
+and integration of cloud-based services and applications.</p>
+<p class="bodytext">The Panel uses APS to offer third-party applications to hosting customers. These applications are presented in <em class="emphasis">APS catalog</em>, where the customers can buy or download them.</p>
+<p class="bodytext">Currently, the Panel does not support all aspects of
+ APS. Therefore, customers may have problems trying to install certain 
+applications. To find out whether your application is compatible with 
+the Panel, see section <strong class="specialbold"><strong class="specialbold">Plesk Panel Restrictions.</strong></strong></p>
+<p class="bodytext">You can find more information about APS at http://www.apsstandard.org/.</p>
+<p class="bodytext">APS specification and supporting documents are available at http://www.apsstandard.org/isv/documentation/.</p>
+<p class="bodytext"></p>
+<h2 class="heading2">Restrictions on Packages Processing</h2>
+<p class="bodytext">The current Panel version has restrictions on APS 
+applications processing. If an application requires performing 
+restricted actions, the Panel will not install it. Particularly, these 
+actions are the following:</p>
+<ul class="listbullet"><li class="listbullet">Sending e-mails or processing incoming mail.<p class="listcontinue">See <strong class="specialbold">Mail aspect</strong> of APS in <strong class="specialbold">APS Format Specification v1.2</strong>, section <strong class="specialbold">8.8. Mail </strong>at http://www.apsstandard.org/r/doc/package-format-specification-1.2/index.html#s.aspects.mail</p>
+</li><li class="listbullet">Changing the DNS resource records of an environment where the application works.<p class="listcontinue">See <strong class="specialbold">DNS aspect</strong> in <strong class="specialbold">APS Format Specification v1.2</strong>, section <strong class="specialbold">8.10. DNS Zone </strong>at http://www.apsstandard.org/r/doc/package-format-specification-1.2/index.html#s.aspects.dns</p>
+</li><li class="listbullet">Installing third-party dynamic libraries (*.dll, *.so).<p class="listcontinue">See<strong class="specialbold"> DLL aspect</strong> in <strong class="specialbold">APS Format Specification v1.2</strong>, section <strong class="specialbold">8.11. DLL Content Processing Method </strong>at http://www.apsstandard.org/r/doc/package-format-specification-1.2/index.html#s.aspects.dll</p>
+</li><li class="listbullet">Updating older version of application with 
+complex changes in application settings or deployment logic. According 
+to APS, such updates are called <em class="emphasis">upgrades. </em>For more information on the application updates, see the <strong class="specialbold">APS Format Specification v1.2</strong>, section <strong class="specialbold">5.1.15 Updates </strong>at http://www.apsstandard.org/r/doc/package-format-specification-1.2/index.html#s.metadata.common.update</li></ul><p class="bodytext">If
+ you need you application to perform these actions, consider other ways 
+of integration with the Panel: API RPC, modules or Panel Notifications.</p>
+<p class="bodytext">Also, the Panel does not support the following actions defined in the application package: </p>
+<ul class="listbullet"><li class="listbullet">Checking application settings for consistency via <strong class="specialbold">verification script. </strong>For more information on verification scripts, see the <strong class="specialbold">APS Format Specification v1.2</strong>, section <strong class="specialbold">5.3.3 Verification Script </strong>at http://www.apsstandard.org/r/doc/package-format-specification-1.2/index.html#s.metadata.provision.verification-script</li><li class="listbullet">Processing application resource usage reports defined by <strong class="specialbold">resource counters</strong> and passed by <strong class="specialbold">resource script</strong> . For more information on resource counters and resource scripts, see the <strong class="specialbold">APS Format Specification v1.2</strong>, section <strong class="specialbold">5.2.6. Resources</strong> at http://www.apsstandard.org/r/doc/package-format-specification-1.2/index.html#s.metadata.service.resources and <strong class="specialbold">5.3.3 Resources Script </strong>at http://www.apsstandard.org/r/doc/package-format-specification-1.2/index.html#s.metadata.provision.resource-script</li>
+
+<h1 class="heading1">Copyright Notice</h1>
+<p class="copyright">Parallels Holdings, Ltd.</p>
+<p class="copyright">c/o Parallels International GmbH</p>
+<p class="copyright">Vordergasse 59</p>
+<p class="copyright">CH-Schaffhausen</p>
+<p class="copyright">Switzerland</p>
+<p class="copyright">Phone:&nbsp;+41-526320-411</p>
+<p class="copyright">Fax: +41-52672-2010</p>
+<p class="copyright">&nbsp;</p>
+<p class="copyright">Copyright © 1999-2011 Parallels Holdings, Ltd. and its affiliates.&nbsp;All rights reserved.&nbsp;</p>
+<p class="copyright">&nbsp;</p>
+<p class="copyright">This product is protected by United States and 
+international copyright laws. The product's underlying technology, 
+patents, and trademarks are listed at 
+http://www.parallels.com/trademarks.&nbsp;</p>
+<p class="copyright">&nbsp;</p>
+<p class="copyright">Microsoft, Windows, Windows Server, Windows NT, Windows Vista, and MS-DOS are registered trademarks of Microsoft Corporation.</p>
+<p class="copyright">Linux is a registered trademark of Linus Torvalds.</p>
+<p class="copyright">Mac is a registered trademark of Apple, Inc.</p>
+<p class="copyright">All other marks and names mentioned herein may be trademarks of their respective owners.</p>
+
+
+
+<p class="bodytext">
+<a target="_blank" title="Send feedback through a web form" href="http://www.parallels.com/en/support/usersdoc/?problemSubject=Feedback+on+Help+Page+" onclick="var u = parent.BODY.location.href;
+u = u.replace(/.+\/([^/]+).htm$/,'$1');
+u+= '+of+the+'+parent.document.title.replace(/ /g,'+');
+
+this.href+=u;
+
+window.location.reload(false);">Please send us your feedback on this help page.</a></p>
+
+
+
+
+</ul></body></html>
+<!-- Edited by post-publisher -->

build/aps/Limitations of APS Support in the Panel_fichiers/highlight.js

@@ -0,0 +1,64 @@
+function last(href)
+{
+  var ret = href.split("/");
+  return ret[ret.length-1];
+}
+
+function StopProcess()
+{
+LeftFrame = parent.TOC.document.location.href;
+LeftFrame = last(LeftFrame);
+if (LeftFrame == "dhtml_search.htm") return 1
+else return 0;
+}
+
+
+
+function highlightTOC(str) {
+    
+	
+		
+		 
+	
+    if (StopProcess()) return;
+    try {
+		
+    str = str || parent.BODY.document.location.href;
+    uri = last(str);
+    list = parent.TOC.document.getElementsByTagName("a");
+    for(i=0; i<list.length; i++)
+    {
+      if (last(list[i].href) == uri)
+	{
+        list[i].style.backgroundColor = "#6697cc";
+        list[i].style.padding = "2px";
+        list[i].style.color = "#ffffff";
+		
+	} else {
+		list[i].style.backgroundColor = "#ffffff";
+        list[i].style.color = "#003380";
+	  }
+    }
+    } catch (e) {}
+}
+
+function FindCorrectTOCPage()
+{
+if (StopProcess()) return;
+//Updated on 30.04.2008
+list = parent.BODY.document.getElementsByTagName("a") || document.getElementsByTagName("a");
+    for(i=0; i<list.length; i++)
+    {
+      if (list[i].target == "TOC")
+	{
+
+		if (last(list[i].href) != last(parent.TOC.document.location.href))
+			{
+				parent.TOC.document.location.href = list[i].href;
+				return;
+			}
+	}
+    }
+
+
+}

build/aps/Limitations of APS Support in the Panel_fichiers/prettify.css

@@ -0,0 +1,60 @@
+/* Pretty printing styles. Used with prettify.js. */
+
+.str { color: #FF0000; }
+.vr { color: #0000FF; }
+.kwd { color: #000080; font-weight: bold}
+.com { color: #EA8110; }
+.typ { color: #606; }
+.lit { color: #066; }
+.pun { color: #660; }
+.pln { color: #000; }
+.tag { color: #008; }
+.atn { color: #606; }
+.atv { color: #080; }
+.dec { color: #606; }
+pre.preformatted { 
+
+	    display: block;
+        font-family: "Courier New", verdana, arial, helvetica, sans-serif;
+        font-style: normal;
+        font-variant: normal;
+        font-weight: normal;
+        font-size: 10pt;
+        color: #000000;
+        background-color: #f4f4f4;
+        word-spacing: normal;
+        letter-spacing: normal;
+        vertical-align: baseline;
+        text-decoration: none;
+        text-transform: none;
+        line-height: normal;
+        margin-top: 0pt;
+        margin-bottom: 0pt;
+        margin-left: 0pt;
+        margin-right: 6pt;
+        padding-top: 1pt;
+        padding-bottom: 1pt;
+        padding-left: 5pt;
+        padding-right: 5pt;
+        float: none;
+        clear: none;
+        text-align: left;
+        text-indent: 0cm;
+        width: auto;
+        height: auto;
+
+}
+
+@media print {
+  .vr { color: #f0f; }
+  .str { color: #060; }
+  .kwd { color: #006; font-weight: bold; }
+  .com { color: #600; font-style: italic; }
+  .typ { color: #404; font-weight: bold; }
+  .lit { color: #044; }
+  .pun { color: #440; }
+  .pln { color: #000; }
+  .tag { color: #006; font-weight: bold; }
+  .atn { color: #404; }
+  .atv { color: #060; }
+}

build/aps/README

@@ -0,0 +1,20 @@
+README (English)
+##################################################
+This directory is dedicated to APS package building
+##################################################
+
+Docs for APS format 1.1:
+http://www.apsstandard.org/r/doc/aps-format-1.1-packaging-guide/index.htm
+
+Docs for APS format 1.2 (need APP-LIST.xml):
+http://www.apsstandard.org/r/doc/aps-format-1.2-packaging-guide/index.htm
+
+
+To check an APS package on Debian:
+* Install libgdiplus with 
+apt-get install libgdiplus
+* Install apslint.exe (http://www.apsstandard.org/r/doc/aps-format-1.2-packaging-guide/57414.htm)
+tar -xvf xxxx.tgz 
+* Go into directory of apslint and run command
+mono ./apslint.exe '/media/DATA/Mes Developpements/dolibarr/build/dolibarr-3.1.0-dev.app.zip' 
+

build/aps/configure.php

@@ -0,0 +1,151 @@
+#!/usr/bin/env php
+<?php
+/*-----------------------------------------------------
+ *
+ *----------------------------------------------------- */
+
+// This is list of predefined variables when script is ran
+// We have to set them manually to run script outside context.
+/*putenv('SETTINGS_admin_name=admin');
+putenv('SETTINGS_admin_password=admin-ad');
+putenv('BASE_URL_SCHEME=http');
+putenv('BASE_URL_HOST=localhost');
+putenv('BASE_URL_PORT=0');
+putenv('BASE_URL_PATH=/');
+//putenv('WEB___DIR=/var/wwww/dolibarr/htdocs');      // WEB___DIR is dir to htdocs
+putenv('WEB___DIR=../htdocs');      // WEB___DIR is dir to htdocs
+putenv('DB_main_NAME=dolibarr');
+putenv('DB_main_HOST=localhost');
+putenv('DB_main_PORT=3306');
+putenv('DB_main_LOGIN=root');
+putenv('DB_main_PASSWORD=root');
+*/
+
+// Check parameters
+if(count($_SERVER['argv']) < 2)
+{
+    print "Usage: configure.php (install | upgrade <version> | configure | remove)\n";
+    exit(1);
+}
+$command = $_SERVER['argv'][1]; //$command stores the argument with which the script was invoked.
+
+
+if($command == "install")
+{
+    $db_id = 'main';
+
+    $rootdir = getenv("WEB___DIR");
+    if ($rootdir != '/') $rootdir = preg_replace('/\/$/','',$rootdir);  // Remove last /
+    $datadir = $rootdir.'/dolibarr_documents';
+
+    //List of database-related variables that are passed to the configuration
+    //script. See the 6.3.1.1.1. Environment variables section of the
+    //Specification for details.
+    $db_address = getenv("DB_${db_id}_HOST");
+    $db_port = getenv("DB_${db_id}_PORT");
+    $dblogin = getenv("DB_${db_id}_LOGIN");
+    $dbpassword = getenv("DB_${db_id}_PASSWORD");
+    $dbname = getenv("DB_${db_id}_NAME");
+
+
+    //PHP functions for connecting to the mysql server and
+    //executing SQL queries.
+    //mysql_connect($dbaddress, $dblogin, $dbpassword);
+    //mysql_select_db($dbname);
+    /*
+     $sql_queries = file($query_file);
+     foreach ($sql_queries as $query) mysql_query($query);
+     */
+
+
+    //Other code to be executed on invoking configure with
+    //the install argument.
+
+    // Create empty config file
+    $file=$rootdir.'/conf/conf.php';
+    print "Create conf file ".$file."\n";
+    $fp = fopen($file, 'wb');
+    if ($fp)
+    {
+        fclose($fp);
+        chmod($file,0775);
+    }
+    else
+    {
+        print "configure.php install: Unable to write file $file.\n";
+        exit(1);
+    }
+
+    // Create empty directory that will be used by software to store uploaded documents
+    print "Create directory ".$datadir."\n";
+    @mkdir($datadir);
+    chmod($datadir,0775);
+
+    // Create install.forced.php into htdocs/install directory with value.
+    // This will set parameters of install for web installer wizard.
+    $file_source=$rootdir.'/../build/aps/install.forced.php.install';
+    $file=$rootdir.'/install/install.forced.php';
+    print "Create file ".$file.' from '.$file_source."\n";
+
+    $modify_hash=array(
+    'WEB___DIR'=>$rootdir,
+    'DB_'.$db_id.'_HOST'=>$db_address,
+    'DB_'.$db_id.'_PORT'=>$db_port,
+    'DB_'.$db_id.'_LOGIN'=>$dblogin,
+    'DB_'.$db_id.'_PASSWORD'=>$dbpassword,
+    'DB_'.$db_id.'_NAME'=>$dbname
+    );
+
+    $file_content = fread(fopen($file_source, 'r'), filesize($file_source));
+    foreach($modify_hash as $param => $val){
+        $file_content = str_replace($param, php_quote($val), $file_content);
+    }
+    $fp = fopen($file, 'wb');
+    if ($fp)
+    {
+        fputs($fp, $file_content);
+        fputs($fp, "\n");
+        fclose($fp);
+        chmod($file,0775);
+    }
+    else
+    {
+        print "configure.php install: Unable to write file $file.\n";
+        exit(2);
+    }
+
+    exit(0);
+}
+
+if($command == "remove")
+{
+    //Code to be executed on invoking configure with the remove argument
+    exit(0);
+}
+
+if($command == "upgrade")
+{
+    //Code to be executed on invoking configure with the upgrade argument
+    exit(0);
+}
+
+if($command == "configure")
+{
+    //Code to be executed on invoking configure with the configure argument
+    exit(0);
+}
+
+print "configure.php: Error: unknown command $command.\n";
+exit(1);
+
+
+
+// Content of file-util.php we need
+
+function php_quote($val)
+{
+    $res_val = str_replace("\\", "\\\\", $val);
+    $res_val = str_replace("'", "\\'", $res_val);
+    return $res_val;
+}
+

build/aps/install.forced.php.install

@@ -0,0 +1,23 @@
+<?php
+// File to force Dolibarr wizard installer choices.
+//
+// This file must be present into htdocs/install directory
+// during install process to be used.
+//
+//
+$force_install_noedit=1;
+$force_install_message='KeepDefaultValuesDeb';
+$force_install_main_data_root='WEB___DIR/dolibarr_documents';
+$force_install_type='mysqli';
+$force_install_dbserver='DB_main_HOST';
+$force_install_port='DB_main_PORT';
+$force_install_database='DB_main_NAME';
+$force_install_createdatabase='0';
+$force_install_databaselogin='DB_main_LOGIN';
+$force_install_databasepass='DB_main_PASSWORD';
+$force_install_createuser='0';
+$force_install_databaserootlogin='';
+$force_install_databaserootpass='';
+$force_install_dolibarrlogin='admin';
+$force_install_nophpinfo='1';
+$force_install_lockinstall='444';

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

@@ -8,7 +8,7 @@ Copyright: 2002-2009, Rodolphe Quiedeville   <rodolphe@quiedeville.org>
            2003-2006, Jean-Louis Bergamo     <jlb@j1b.org>
            2003-2013, Laurent Destailleur    <eldy@users.sourceforge.net>
            2003, Xavier Dutoit               <doli@sydesy.com>
-           2004-2013, Regis Houssin          <regis.houssin@inodbox.com>
+           2004-2013, Regis Houssin          <regis.houssin@capnetworks.com>
            2004, Sebastien Di Cintio         <sdicintio@ressource-toi.org>
            2004, Benoit Mortier              <benoit.mortier@opensides.be>
            2004, Christophe Combelles        <ccomb@free.fr>
@@ -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/patches/use-etc-dolibarr-conf.patch

@@ -34,4 +34,17 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +$conffiletoshow = "/etc/dolibarr/conf.php";
  
  
+ // Load conf file if it is already defined
+--- a/htdocs/support/inc.php
++++ b/htdocs/support/inc.php
+@@ -69,8 +69,8 @@ $conffiletoshowshort = "conf.php";
+ $conffile = "../conf/conf.php";
+ $conffiletoshow = "htdocs/conf/conf.php";
+ // For debian/redhat like systems
+-//$conffile = "/etc/dolibarr/conf.php";
+-//$conffiletoshow = "/etc/dolibarr/conf.php";
++$conffile = "/etc/dolibarr/conf.php";
++$conffiletoshow = "/etc/dolibarr/conf.php";
+ 
+ 
  // Load conf file if it is already defined

build/debian/rules

@@ -10,23 +10,12 @@ export DH_OPTIONS=-v
 %:
 	dh $@
 
-# Replace standard debian package actions with a new one
-########################################################
-
 override_dh_auto_clean:
 # Do nothing. Added to disable launchpad to use bugged dh_auto_clean search for ant
 
 override_dh_auto_build:
 # Do nothing. Added to disable launchpad to use bugged dh_auto_build search for ant
-
-#override_dh_compress:
-#	dh_compress --no-act -X.png
-
-# We disable this for png file because it modify content of original file so make
-# the dolibarr signature not valid.
-override_dh_strip_nondeterminism:
-	dh_strip_nondeterminism -X.png
-
+	
 override_dh_install:
 	dh_install
 	# Delete files

build/debian/source/include-binaries

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

build/docker/.dockerignore

@@ -1,3 +0,0 @@
-Dockerfile
-README.md
-docker-compose.yml

build/docker/Dockerfile

@@ -1,38 +0,0 @@
-FROM php:7.2-apache
-
-ENV HOST_USER_ID 33
-ENV PHP_INI_DATE_TIMEZONE 'UTC'
-
-RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libldap2-dev zlib1g-dev libicu-dev g++\
-	&& 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-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
-        && docker-php-ext-install ldap \
-        && docker-php-ext-install mysqli \
-        && docker-php-ext-install calendar \
-        && 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 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_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
-
-ENTRYPOINT ["docker-run.sh"]

build/docker/README.md

@@ -1,28 +0,0 @@
-# How to use it ?
-
-The docker-compose.yml file is used to build and run Dolibarr in the current workspace.
-
-Before build/run, define the variable HOST_USER_ID as following:
-
-        export HOST_USER_ID=$(id -u)
-
-Go in repository build/docker :
-
-        cd build/docker
-
-And then, you can run :
-
-        docker-compose up
-
-This will run 3 container Docker : Dolibarr, MariaDB and PhpMyAdmin.
-
-The URL to go to the Dolibarr is :
-
-        http://0.0.0.0
-
-The URL to go to PhpMyAdmin is (login/password is root/root) :
-
-        http://0.0.0.0:8080
-
-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,25 +0,0 @@
-mariadb:
-    build: mariadb
-    environment:
-        MYSQL_ROOT_PASSWORD: root
-        MYSQL_DATABASE: dolibarr
-
-phpmyadmin:
-    image: phpmyadmin/phpmyadmin
-    environment:
-        PMA_HOST: mariadb
-    links:
-        - mariadb
-    ports:
-        - "8080:80"
-
-web:
-    build: .
-    environment:
-        HOST_USER_ID: $HOST_USER_ID
-    volumes:
-        - ../../htdocs:/var/www/html
-    links:
-        - mariadb
-    ports:
-        - "80:80"

build/docker/docker-run.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-usermod -u $HOST_USER_ID www-data
-groupmod -g $HOST_USER_ID www-data
-
-chgrp -hR www-data /var/www/html
-chmod g+rwx /var/www/html/conf
-
-if [ ! -f /usr/local/etc/php/php.ini ]; then
-  cat <<EOF > /usr/local/etc/php/php.ini
-date.timezone = $PHP_INI_DATE_TIMEZONE
-display_errors = On
-EOF
-fi
-
-exec apache2-foreground

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-filter.pl

@@ -8,7 +8,7 @@
 # Usage: dolibarr-doxygen-filter.pl pathtofilefromdolibarrroot
 
 $file=$ARGV[0];
-if (! $file)
+if (! $file) 
 {
 	print "Usage: dolibarr-doxygen-filter.pl pathtofilefromdolibarrroot\n";
 	exit;
@@ -75,7 +75,7 @@ while (<FILE>)
 						{
 							$insidedquote=0;
 						}
-					}
+					}				
 				}
 			}
 			$ignore="";

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
 
@@ -442,7 +442,7 @@ SORT_BY_SCOPE_NAME = NO
 # disable (NO) the todo list. This list is created by putting \todo
 # commands in the documentation.
 
-GENERATE_TODOLIST = NO
+GENERATE_TODOLIST = YES
 
 # The GENERATE_TESTLIST tag can be used to enable (YES) or
 # disable (NO) the test list. This list is created by putting \test
@@ -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
@@ -639,7 +639,7 @@ EXCLUDE_SYMBOLS =
 # directories that contain example code fragments that are included (see
 # the \include command).
 
-EXAMPLE_PATH = ../../htdocs/modulebuilder/template 
+EXAMPLE_PATH = ../../dev/skeletons
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
@@ -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

@@ -3,50 +3,49 @@ File added into doxygen generated documentation
 -->
 
 
+<!-- Google analytics -->
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-9049390-16', 'auto');
+  ga('send', 'pageview');
+
+</script>
+<!-- End google analytics -->
+
 
 <hr class="footer" />
-<address class="footer"><small>Generated on $datetime for <a href="https://www.dolibarr.org">$projectname</a> by Doxygen $doxygenversion </small></address>
+<address class="footer"><small>Generated on $datetime
+for <a href="https://www.dolibarr.org">$projectname</a> by Doxygen $doxygenversion </small></address>
 
 
+<!--  Google AdSense -->
+<div class="center">
+<script type="text/javascript"><!--
+google_ad_client = "pub-1071905880519467";
+/* PUBBANDEAUDOLIBARR */
+google_ad_slot = "1421205532";
+google_ad_width = 468;
+google_ad_height = 60;
+//-->
+</script>
+<script type="text/javascript" src="https://pagead2.googlesyndication.com/pagead/show_ads.js"></script>
+</div>
+<!-- End google adsense -->
 <br>
 
-
-
-<!-- Global site tag (gtag.js) - Google Analytics -->
-<script async src="https://www.googletagmanager.com/gtag/js?id=UA-9049390-16"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-
-  gtag('config', 'UA-9049390-16');
-</script>
-
-
-<!-- Facebook Pixel Code -->
-<script>
-!function(f,b,e,v,n,t,s){if(f.fbq)return;n=f.fbq=function(){n.callMethod?
-n.callMethod.apply(n,arguments):n.queue.push(arguments)};if(!f._fbq)f._fbq=n;
-n.push=n;n.loaded=!0;n.version='2.0';n.queue=[];t=b.createElement(e);t.async=!0;
-t.src=v;s=b.getElementsByTagName(e)[0];s.parentNode.insertBefore(t,s)}(window,
-document,'script','//connect.facebook.net/en_US/fbevents.js');
-
-fbq('init', '1998533953704960');
-fbq('track', "PageView");</script>
-<noscript><img height="1" width="1" style="display:none"
-src="https://www.facebook.com/tr?id=1998533953704960&ev=PageView&noscript=1"
-/></noscript>
-<!-- End Facebook Pixel Code -->
-
+</div>
 
 <!-- Twitter ad collector -->
-<script src="//static.ads-twitter.com/oct.js" type="text/javascript"></script>
+<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

@@ -30,6 +30,7 @@ src="https://www.facebook.com/tr?id=1998533953704960&ev=PageView&noscript=1"
 </head>
 
 <body>
+<div id="top">
 
 <div class="topmaincol">
 <div class="divpath">
@@ -41,7 +42,7 @@ src="https://www.facebook.com/tr?id=1998533953704960&ev=PageView&noscript=1"
 <table width="100%">
 	<tr>
 		<td><div id="projectname">$projectname</div> - <span id="projectnumber">$projectnumber</span></td>
-		<td class="right"><!-- banner start -->
+		<td align="right"><!-- banner start -->
 		<table cellpadding="0" cellspacing="0" class="moduletablemybanner">
 			<tr>
 				<td>

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/MyEnglish.isl

@@ -11,10 +11,10 @@ LaunchProgram=Launch %1
 AssocFileExtension=&Associate %1 with the %2 file extension
 AssocingFileExtension=Associating %1 with the %2 file extension...
 
-YouWillInstallDoliWamp=You will install or upgrade DoliWamp (so Dolibarr + all required third party software like Apache, Mysql and PHP) on your computer.
-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...
+YouWillInstallDoliWamp=You will install or upgrade DoliWamp (Apache+Mysql+PHP+Dolibarr) on your computer.
+ThisAssistantInstallOrUpgrade=This assistant installs or upgrades Dolibarr ERP-CRM and all required third party softwares (Apache, Mysql and PHP) optimized for a Dolibarr usage.
+IfYouHaveTechnicalKnowledge=If you have technical knowledge and plan to share your Apache, Mysql and PHP with other projects than Dolibarr, you should not use this assistant and make a manual installation of Dolibarr on your existing Apache, Mysql and PHP installation.
+ButIfYouLook=But if you look for an automatic setup, you''re on the good way...
 DoYouWantToStart=Do you want to start installation/upgrade process ?
 
 TechnicalParameters=Technical parameters
@@ -32,7 +32,7 @@ PortAlreadyInUse=Port %1 seems to be already in use. You should cancel to go bac
 
 FirefoxDetected=Firefox has been detected on your computer. Would you like to use it as the default browser for Dolibarr ?
 ChromeDetected=Chrome has been detected on your computer. Would you like to use it as the default browser for Dolibarr ?
-ChooseDefaultBrowser=Please choose your default browser (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...). If you are not sure, just click Open :
+ChooseDefaultBrowser=Please choose your default browser. If you are not sure, just click Open :
 
 LaunchNow=Launch Dolibarr now
 
@@ -43,5 +43,3 @@ DoliWampWillStartApacheMysql=DoliWamp installer will now start or restart Apache
 OldVersionFoundAndMoveInNew=An old database version has been found and moved to be used by new Dolibarr version
 OldVersionFoundButFailedToMoveInNew=An old database version has been found but could not be moved to be used with new Dolibarr version
 
-DLLMissing=Your Windows installation is missing The "Micrsoft Visual C++ Redistributable for Visual Studio 2012" component. Please install the 32-bit version (vcredist_x86.exe) first (you can find it at https://www.microsoft.com/en-us/download/) and restart DoliWamp installation/upgrade after.
-ContinueAnyway=Continue anyway (install process may fails without this prerequisite)

build/exe/doliwamp/Languages/MyFrench.isl

@@ -11,10 +11,10 @@ LaunchProgram=Ex
 AssocFileExtension=&Associer %1 avec l'extension de fichier %2
 AssocingFileExtension=Associe %1 avec l'extension de fichier %2...
 
-YouWillInstallDoliWamp=Vous allez installer ou mettre <20> jour DoliWamp sur votre ordinateur (donc Dolibarr + tous ses composants pr<70>requis comme Apache, Mysql et PHP).
-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...
+YouWillInstallDoliWamp=Vous allez installer ou mettre <20> jour DoliWamp (Apache+Mysql+PHP+Dolibarr) sur votre ordinateur.
+ThisAssistantInstallOrUpgrade=Cet assistant installe ou met <20> jour Dolibarr ERP-CRM et tous ses composants pr<70>requis (Apache, Mysql et PHP) optimis<EFBFBD>s pour une utilisation de Dolibarr.
+IfYouHaveTechnicalKnowledge=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 socle Apache, Mysql et PHP existant.
+ButIfYouLook=Mais si vous recherchez une installation cl<63> en main automatis<69>e, vous <20>tes sur la bonne voie...
 DoYouWantToStart=Voulez-vous d<>marrer le processus d'installation/mise <20> jour ?
 
 TechnicalParameters=Param<61>tres techniques
@@ -33,7 +33,7 @@ PortAlreadyInUse=Le port %1 semble d
 
 FirefoxDetected=Firefox a <20>t<EFBFBD> d<>tect<63> sur votre ordinateur. Voulez-vous en faire votre navigateur par d<>faut pour Dolibarr ?
 ChromeDetected=Chrome a <20>t<EFBFBD> d<>tect<63> sur votre ordinateur. Voulez-vous en faire votre navigateur par d<>faut pour Dolibarr ?
-ChooseDefaultBrowser=Merci de choisir votre navigateur par d<>faut (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...). Si vous n'<27>tes pas s<>r, cliquez simplement sur Ouvrir :
+ChooseDefaultBrowser=Merci de choisir votre navigateur par d<>faut. Si vous n'<27>tes pas s<>r, cliquez simplement sur Ouvrir :
 
 LaunchNow=Lancer Dolibarr maintenant
 
@@ -44,5 +44,3 @@ DoliWampWillStartApacheMysql=L'installeur DoliWamp va maintenant d
 OldVersionFoundAndMoveInNew=Une ancienne version de base a <20>t<EFBFBD> trouv<75>e et d<>plac<61>e pour fonctionner avec la nouvelle version de Dolibarr.
 OldVersionFoundButFailedToMoveInNew=Une ancienne version de base a <20>t<EFBFBD> trouv<75>e mais ne peut <20>tre d<>plac<61>e pour <20>tre utilis<69>e avec la nouvelle version de Dolibarr.
 
-DLLMissing=L'installation de votre Windows est incompl<70>te. Il manque le composant "Micrsoft Visual C++ Redistributable for Visual Studio 2012". Installer la version 32-bit (vcredist_x86.exe) d'abord (vous pourrez le trouver <20> https://www.microsoft.com/fr-fr/download/) puis relancer l'installation de DoliWamp apr<70>s.
-ContinueAnyway=Continuer malgr<67> tout (le process d'installaton <20>chouera)

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 distributedt (for Windows).

build/exe/doliwamp/README.md

@@ -1,10 +1,7 @@
 # DOLIWAMP, THE DOLIBARR INSTALLER FOR WINDOWS
 
 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).
+It's a dedicated Dolibarr version for Windows newbies with no technical knowledge. This package will install or upgrade Dolibarr but also and all prerequisites like the web server, and the database in one autoinstall process.
 
 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

@@ -28,11 +28,11 @@ OutputBaseFilename=__FILENAMEEXEDOLIWAMP__
 SourceDir=..\..\..
 AppId=doliwamp
 AppPublisher=NLTechno
-AppPublisherURL=https://www.nltechno.com
-AppSupportURL=https://www.dolibarr.org
-AppUpdatesURL=https://www.dolibarr.org
-AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql software.
-AppCopyright=Copyright (C) 2008-2019 Laurent Destailleur (NLTechno), Fabian Rodriguez (Le Goût du Libre)
+AppPublisherURL=http://www.nltechno.com
+AppSupportURL=http://www.dolibarr.org
+AppUpdatesURL=http://www.dolibarr.org
+AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql softwares.
+AppCopyright=Copyright (C) 2008-2016 Laurent Destailleur, NLTechno
 DefaultDirName=c:\dolibarr
 DefaultGroupName=Dolibarr
 ;LicenseFile=COPYING
@@ -100,9 +100,9 @@ Source: "build\exe\doliwamp\builddemosslfiles.bat.install"; DestDir: "{app}\"; F
 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.6, php 5.2.5 (5.2.11, 5.3.0 and 5.3.1 fails if php_exif, php_pgsql, php_zip is on), mysql 5.0.45
 ; Value OK: apache 2.2.11, php 5.3.0 (if no php_exif, php_pgsql, php_zip), mysql 5.0.45
-; Value OK: apache 2.4.19, php 5.5.12, mysql 5.0.45 instead of 5.6.17 (wampserver2.5-Apache-2.4.9-Mysql-5.6.17-php5.5.12-32b.exe)
+; Value ???: apache 2.4.19, php 5.5.12, mysql 5.0.45 instead of 5.6.17 (wampserver2.5-Apache-2.4.9-Mysql-5.6.17-php5.5.12-32b.exe)
 Source: "C:\Program Files\Wamp\apps\phpmyadmin4.1.14\*.*"; DestDir: "{app}\apps\phpmyadmin4.1.14"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log,darkblue_orange"
 Source: "C:\Program Files\Wamp\bin\apache\apache2.4.9\*.*"; DestDir: "{app}\bin\apache\apache2.4.9"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
 Source: "C:\Program Files\Wamp\bin\php\php5.5.12\*.*"; DestDir: "{app}\bin\php\php5.5.12"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
@@ -110,7 +110,7 @@ Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\m
 ; Mysql data files (does not overwrite if exists)
 Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db"
 ; 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"
@@ -202,30 +202,10 @@ var value: String;
 function InitializeSetup(): Boolean;
 begin
   Result := MsgBox(CustomMessage('YouWillInstallDoliWamp')+#13#13+CustomMessage('ThisAssistantInstallOrUpgrade')+#13#13+CustomMessage('IfYouHaveTechnicalKnowledge')+#13#13+CustomMessage('ButIfYouLook')+#13#13+CustomMessage('DoYouWantToStart'), mbConfirmation, MB_YESNO) = IDYES;
-
-  if Result then
-  begin
-  
-	//----------------------------------------------
-	// Test if msvcr110 DLL has been installed
-	//----------------------------------------------
-	
-	if not FileExists ('c:/windows/system32/msvcr110.dll') and not FileExists ('c:/windows/sysWOW64/msvcr110.dll') and not FileExists ('c:/winnt/system32/msvcr110.dll') and not FileExists ('c:/winnt/sysWOW64/msvcr110.dll') then
-	begin
-	    // TODO - offer to install the component by opening the URL in the default browser, abort installation if user doesn't accept 
-	    Result := MsgBox(CustomMessage('DLLMissing')+#13#13+CustomMessage('ContinueAnyway'), mbConfirmation, MB_YESNO) = IDYES;
-	    
-	end;
-	// Pb seems similar with msvcp110.dll
-	//vcredist_x64.exe
-	  
-  end;
-
 end;
 
 procedure InitializeWizard();
 begin
-
   //version des applis, a modifier pour chaque version de WampServer 2
   apacheVersion := '2.4.9';
   phpVersion := '5.5.12' ;
@@ -237,7 +217,6 @@ begin
   mysqlPort := '3306';
   newPassword := 'changeme';
 
-
   firstinstall := true;
 
 
@@ -365,6 +344,19 @@ begin
     exedirold := pathWithSlashes+'/bin/mysql/mysql5.0.45';
     exedirnew := pathWithSlashes+'/bin/mysql/mysql5.0.45';
 
+
+    //----------------------------------------------
+    // Test if msvcr110 DLL has been installed
+    //----------------------------------------------
+	
+    if not FileExists ('c:/windows/system32/msvcr110.dll') and not FileExists ('c:/windows/sysWOW64/msvcr110.dll') and not FileExists ('c:/winnt/system32/msvcr110.dll') and not FileExists ('c:/winnt/sysWOW64/msvcr110.dll') then
+    begin
+      // TODO Copy file or ask to install package ?
+      //CustomMessage('YouWillInstallDoliWamp')+#13#13
+      MsgBox('The Visual C++ Redistributable package should be installed, it seems it is not. Please install the 32-bit version from http://www.microsoft.com/en-us/download/details.aspx?id=30679, then restart the DoliWAMP installation/upgrade.',mbInformation,MB_OK);
+    end;
+	// Pb seems similar with msvcp110.dll
+	//vcredist_x64.exe
 	
 	
     // If we have a new database version, we should only copy old my.ini file into new directory

build/exe/doliwamp/httpd.conf.install

@@ -150,7 +150,7 @@ Require local
 # e-mailed.  This address appears on some server-generated pages, such
 # as error documents.  e.g. admin@your-domain.com
 #
-ServerAdmin doliwamp@localhost
+ServerAdmin webmaster@localhost
 
 #
 # ServerName gives the name and port that the server uses to identify itself.
@@ -772,5 +772,5 @@ SSLCertificateKeyFile "WAMPROOT/myserver.key"
 #</Location>
 
 
-# Declare alias for Dolibarr, PHPMyAdmin and other software
+# Declare alias for Dolibarr, PHPMyAdmin and other softwares
 Include "WAMPROOT/alias/*.conf"

build/exe/doliwamp/index.php.install

@@ -527,15 +527,15 @@ a:hover {
 </head>
 
 <body>
-<table width="100%"><tr><td class="left">
+<table width="100%"><tr><td align="left">
 	<img src="index.php?img=pngLogo">
 </td>
-<td class="right">
+<td align="right">
 	<ul class="utility">
 		<li><a href="?lang={$langues[$langue]['autreLangueLien1']}">{$langues[$langue]['autreLangue1']}</a>
 		- <a href="?lang={$langues[$langue]['autreLangueLien2']}">{$langues[$langue]['autreLangue2']}</a></li>
 		<br><br>
-		<li>Provided by <a href="https://www.nltechno.com" targer="_blank">NLTechno</a></li>
+		<li>Provided by <a href="http://www.nltechno.com" targer="_blank">NLTechno</a></li>
 	</ul>
 </td></tr></table>
 <hr>
@@ -580,11 +580,11 @@ a:hover {
 
 
 	<ul id="foot">
-		<li><a href="https://www.nltechno.com/pages/dolibarrwinbin.php">DoliWamp project</a> was built from modified sources of <a href="http://www.wampserver.com">WampServer project</a> from Anaska</li>
+		<li><a href="http://www.nltechno.com/pages/dolibarrwinbin.php">DoliWamp project</a> was built from modified sources of <a href="http://www.wampserver.com">WampServer project</a> from Anaska</li>
 	</ul>
 </body>
 </html>
 EOPAGE;
 
 echo $pageContents;
-?>
+?>

build/exe/doliwamp/install.forced.php.install

@@ -5,7 +5,6 @@
 // during install process to be used.
 //
 //
-$force_install_type='doliwamp';
 $force_install_noedit=2;		// 1=To block vars specific to distrib, 2 to block all technical parameters
 $force_install_message='KeepDefaultValuesWamp';
 $force_install_main_data_root='WAMPROOT/dolibarr_documents';

build/exe/doliwamp/php.ini.install

@@ -458,6 +458,16 @@ variables_order = "GPCS"
 ; with user data.  This makes most sense when coupled with track_vars - in which
 ; case you can access all of the GPC variables through the $HTTP_*_VARS[],
 ; variables.
+;
+; You should do your best to write your scripts so that they do not require
+; register_globals to be on;  Using form variables as globals can easily lead
+; to possible security problems, if the code is not very well thought of.
+register_globals = Off
+
+; Whether or not to register the old-style input arrays, HTTP_GET_VARS
+; and friends.  If you're not using them, it's recommended to turn them off,
+; for performance reasons.
+register_long_arrays = Off
 
 ; This directive tells PHP whether to declare the argv&argc variables (that
 ; would contain the GET information).  If you don't use these variables, you
@@ -467,7 +477,8 @@ register_argc_argv = Off
 ; When enabled, the SERVER and ENV variables are created when they're first
 ; used (Just In Time) instead of when the script starts. If these variables
 ; are not used within a script, having this directive on will result in a
-; performance gain.
+; performance gain. The PHP directives register_globals, register_long_arrays,
+; and register_argc_argv must be disabled for this directive to have any affect.
 auto_globals_jit = On
 
 ; Maximum size of POST data that PHP will accept.
@@ -642,8 +653,6 @@ default_socket_timeout = 60
 ; extension folders as well as the separate PECL DLL download (PHP 5).
 ; Be sure to appropriately set the extension_dir directive.
 
-; If an extension does not load, run  "deplister.exe php_xxx.dll" to get list of dependency dll missing.
-
 extension=php_bz2.dll
 extension=php_curl.dll
 ;extension=php_dba.dll
@@ -656,7 +665,6 @@ extension=php_gd2.dll
 ;extension=php_ifx.dll
 ;extension=php_imap.dll
 ;extension=php_interbase.dll
-extension=php_intl.dll
 extension=php_ldap.dll
 extension=php_mbstring.dll
 ;extension=php_mcrypt.dll
@@ -1090,6 +1098,14 @@ session.gc_maxlifetime = 1800
 ;       setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
 ;          cd /path/to/sessions; find -cmin +24 | xargs rm
 
+; PHP 4.2 and less have an undocumented feature/bug that allows you to
+; to initialize a session variable in the global scope, albeit register_globals
+; is disabled.  PHP 4.3 and later will warn you, if this feature is used.
+; You can disable the feature and the warning separately. At this time,
+; the warning is only displayed, if bug_compat_42 is enabled.
+
+session.bug_compat_42 = 0
+session.bug_compat_warn = 1
 
 ; Check HTTP Referer to invalidate externally stored URLs containing ids.
 ; HTTP_REFERER has to contain this substring for the session to be

build/exe/doliwamp/rundoliadmin.bat.install

@@ -3,5 +3,4 @@ REM Launch Dolibarr Admin center
 REM ----------------------------
 
 REM Go to admin center page
-start "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/
-REM FOR EDGE start microsoft-edge:"http://localhost:WAMPAPACHEPORT/"
+start "DoliWamp admin" "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/

build/exe/doliwamp/rundolihelp.bat.install

@@ -4,5 +4,4 @@ REM ---------------------------
 
 REM Go to help center page
 echo Please wait...
-start "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/support/
-REM FOR EDGE start microsoft-edge:"http://localhost:WAMPAPACHEPORT/dolibarr/support/"
+start "Dolibarr Help center" "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/support/

build/exe/doliwamp/rundoliwamp.bat.install

@@ -3,9 +3,7 @@ REM Launch Dolibarr
 REM ---------------
 
 REM If no lock file, we call install process
-IF NOT EXIST dolibarr_documents\install.lock start "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/install/
-REM FOR EDGE IF NOT EXIST dolibarr_documents\install.lock start microsoft-edge:"http://localhost:WAMPAPACHEPORT/dolibarr/install/"
+IF NOT EXIST dolibarr_documents\install.lock start "Dolibarr" "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/install/
 
 REM If lock file exists, we call home page
-IF EXIST dolibarr_documents\install.lock start "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/
-REM FOR EDGE IF EXIST dolibarr_documents\install.lock start microsoft-edge:"http://localhost:WAMPAPACHEPORT/dolibarr/"
+IF EXIST dolibarr_documents\install.lock start "Dolibarr" "WAMPBROWSER" http://localhost:WAMPAPACHEPORT/dolibarr/

build/flatpack/org.flatpak.Dolibarr.json

@@ -1 +0,0 @@
-"Help wanted..."

build/generate_filelist_xml.php

@@ -13,7 +13,7 @@
  * 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/>.
  */
 
 /**
@@ -22,7 +22,7 @@
  * 		\brief      This script create a xml checksum file
  */
 
-if (! defined('NOREQUIREDB')) define('NOREQUIREDB', '1');	// Do not create database handler $db
+if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1');	// Do not create database handler $db
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
@@ -34,8 +34,8 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
     exit;
 }
 
-require_once $path."../htdocs/master.inc.php";
-require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
+require_once($path."../htdocs/master.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 
 /*
@@ -45,19 +45,23 @@ require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
 $includecustom=0;
 $includeconstants=array();
 
-if (empty($argv[1])) {
-    print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
+if (empty($argv[1]))
+{
+    print "Usage:   ".$script_file." release=auto|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
     print "Example: ".$script_file." release=6.0.0 includecustom=1 includeconstant=FR:INVOICE_CAN_ALWAYS_BE_REMOVED:0 includeconstant=all:MAILING_NO_USING_PHPMAIL:1\n";
     exit -1;
 }
 parse_str($argv[1]);
 
 $i=0;
-while ($i < $argc) {
+while ($i < $argc)
+{
     if (! empty($argv[$i])) parse_str($argv[$i]);
-    if (preg_match('/includeconstant=/', $argv[$i])) {
+    if (preg_match('/includeconstant=/',$argv[$i]))
+    {
         $tmp=explode(':', $includeconstant, 3);
-        if (count($tmp) != 3) {
+        if (count($tmp) != 3)
+        {
             print "Error: Bad parameter includeconstant ".$includeconstant."\n";
             exit -1;
         }
@@ -66,41 +70,30 @@ while ($i < $argc) {
     $i++;
 }
 
-if (empty($release)) {
-    print "Error: Missing release paramater\n";
-    print "Usage: ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
-    exit -1;
-}
-
-$savrelease = $release;
-
 // If release is auto, we take current version
 $tmpver=explode('-', $release, 2);
-if ($tmpver[0] == 'auto' || $tmpver[0] == 'autostable') {
-    $release=DOL_VERSION;
-    if ($tmpver[1] && $tmpver[0] == 'auto') $release.='-'.$tmpver[1];
+if ($tmpver[0] == 'auto')
+{
+	$release=DOL_VERSION;
+	if ($tmpver[1]) $release.='-'.$tmpver[1];
 }
 
-if (empty($includecustom)) {
-    $tmpverbis=explode('-', $release, 2);
-    if (empty($tmpverbis[1]) || $tmpver[0] == 'autostable') {
-        if (DOL_VERSION != $tmpverbis[0] && $savrelease != 'auto') {
-            print 'Error: When parameter "includecustom" is not set and there is no suffix in release parameter, version declared into filefunc.in.php ('.DOL_VERSION.') must be exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
-            print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
-            exit -1;
-        }
-    } else {
-        $tmpverter=explode('-', DOL_VERSION, 2);
-        if ($tmpverter[0] != $tmpverbis[0]) {
-            print 'Error: When parameter "includecustom" is not set, version declared into filefunc.in.php ('.DOL_VERSION.') must have value without prefix ('.$tmpverter[0].') that is exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
-            print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
-            exit -1;
-        }
+if (empty($includecustom))
+{
+	$tmpver=explode('-', $release, 2);
+	if (DOL_VERSION != $tmpver[0])
+    {
+    	print 'Error: When parameter "includecustom" is not set and there is no suffix in release parameter, version declared into filefunc.in.php ('.DOL_VERSION.') must be exact same value than "release" parameter ('.$tmpver[0].')'."\n";
+        print "Usage: ".$script_file." release=x.y.z[-...] [includecustom=1]\n";
+        exit -1;
     }
-} else {
-    if (! preg_match('/'.preg_quote(DOL_VERSION, '/').'-/', $release)) {
-        print 'Error: When parameter "includecustom" is set, version declared into filefunc.inc.php ('.DOL_VERSION.') must be used with a suffix into "release" parameter (ex: '.DOL_VERSION.'-mydistrib).'."\n";
-        print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
+}
+else
+{
+    if (! preg_match('/'.preg_quote(DOL_VERSION,'/').'-/',$release))
+    {
+        print 'Error: When parameter "includecustom" is set, version declared into filefunc.inc.php ('.DOL_VERSION.') must be used with a suffix into "release" parmater (ex: '.DOL_VERSION.'-mydistrib).'."\n";
+        print "Usage: ".$script_file." release=x.y.z[-...] [includecustom=1]\n";
         exit -1;
     }
 }
@@ -109,8 +102,10 @@ print "Release                        : ".$release."\n";
 print "Working on files into          : ".DOL_DOCUMENT_ROOT."\n";
 print "Include custom in signature    : ".$includecustom."\n";
 print "Include constants in signature : ";
-foreach ($includeconstants as $countrycode => $tmp) {
-    foreach($tmp as $constname => $constvalue) {
+foreach ($includeconstants as $countrycode => $tmp)
+{
+    foreach($tmp as $constname => $constvalue)
+    {
         print $constname.'='.$constvalue." ";
     }
 }
@@ -119,18 +114,20 @@ print "\n";
 //$outputfile=dirname(__FILE__).'/../htdocs/install/filelist-'.$release.'.xml';
 $outputdir=dirname(dirname(__FILE__)).'/htdocs/install';
 print 'Delete current files '.$outputdir.'/filelist*.xml'."\n";
-dol_delete_file($outputdir.'/filelist*.xml', 0, 1, 1);
+dol_delete_file($outputdir.'/filelist*.xml',0,1,1);
 
 $checksumconcat=array();
 
 $outputfile=$outputdir.'/filelist-'.$release.'.xml';
-$fp = fopen($outputfile, 'w');
+$fp = fopen($outputfile,'w');
 fputs($fp, '<?xml version="1.0" encoding="UTF-8" ?>'."\n");
 fputs($fp, '<checksum_list version="'.$release.'" date="'.dol_print_date(dol_now(), 'dayhourrfc').'" generator="'.$script_file.'">'."\n");
 
-foreach ($includeconstants as $countrycode => $tmp) {
+foreach ($includeconstants as $countrycode => $tmp)
+{
     fputs($fp, '<dolibarr_constants country="'.$countrycode.'">'."\n");
-    foreach($tmp as $constname => $constvalue) {
+    foreach($tmp as $constname => $constvalue)
+    {
         $valueforchecksum=(empty($constvalue)?'0':$constvalue);
         $checksumconcat[]=$valueforchecksum;
         fputs($fp, '    <constant name="'.$constname.'">'.$valueforchecksum.'</constant>'."\n");
@@ -145,16 +142,16 @@ $iterator1 = new RecursiveIteratorIterator($dir_iterator1);
 // Need to ignore document custom etc. Note: this also ignore natively symbolic links.
 $files = new RegexIterator($iterator1, '#^(?:[A-Z]:)?(?:/(?!(?:'.($includecustom?'':'custom\/|').'documents\/|conf\/|install\/))[^/]+)+/[^/]+\.(?:php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$#i');
 */
-$regextoinclude='\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$';
-$regextoexclude='('.($includecustom?'':'custom|').'documents|conf|install|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$';  // Exclude dirs
+$regextoinclude='\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
+$regextoexclude='('.($includecustom?'':'custom|').'documents|conf|install|public\/test|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$';  // Exclude dirs
 $files = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
 $dir='';
 $needtoclose=0;
 foreach ($files as $filetmp) {
-    $file = $filetmp['fullname'];
-    //$newdir = str_replace(dirname(__FILE__).'/../htdocs', '', dirname($file));
-    $newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
-    if ($newdir!=$dir) {
+	$file = $filetmp['fullname'];
+	//$newdir = str_replace(dirname(__FILE__).'/../htdocs', '', dirname($file));
+	$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
+	if ($newdir!=$dir) {
         if ($needtoclose)
             fputs($fp, '  </dir>'."\n");
         fputs($fp, '  <dir name="'.$newdir.'" >'."\n");
@@ -164,7 +161,7 @@ foreach ($files as $filetmp) {
     if (filetype($file)=="file") {
         $md5=md5_file($file);
         $checksumconcat[]=$md5;
-        fputs($fp, '    <md5file name="'.basename($file).'" size="'.filesize($file).'">'.$md5.'</md5file>'."\n");
+        fputs($fp, '    <md5file name="'.basename($file).'">'.$md5.'</md5file>'."\n");
     }
 }
 fputs($fp, '  </dir>'."\n");
@@ -173,7 +170,7 @@ fputs($fp, '</dolibarr_htdocs_dir>'."\n");
 asort($checksumconcat); // Sort list of checksum
 //var_dump($checksumconcat);
 fputs($fp, '<dolibarr_htdocs_dir_checksum>'."\n");
-fputs($fp, md5(join(',', $checksumconcat))."\n");
+fputs($fp, md5(join(',',$checksumconcat))."\n");
 fputs($fp, '</dolibarr_htdocs_dir_checksum>'."\n");
 
 
@@ -193,10 +190,10 @@ $files = dol_dir_list(dirname(__FILE__).'/../scripts/', 'files', 1, $regextoincl
 $dir='';
 $needtoclose=0;
 foreach ($files as $filetmp) {
-    $file = $filetmp['fullname'];
-    //$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
-    $newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
-    $newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
+	$file = $filetmp['fullname'];
+	//$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
+	$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
+	$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
     if ($newdir!=$dir) {
         if ($needtoclose)
             fputs($fp, '  </dir>'."\n");
@@ -207,7 +204,7 @@ foreach ($files as $filetmp) {
     if (filetype($file)=="file") {
         $md5=md5_file($file);
         $checksumconcat[]=$md5;
-        fputs($fp, '    <md5file name="'.basename($file).'" size="'.filesize($file).'">'.$md5.'</md5file>'."\n");
+        fputs($fp, '    <md5file name="'.basename($file).'">'.$md5.'</md5file>'."\n");
     }
 }
 fputs($fp, '  </dir>'."\n");
@@ -215,7 +212,7 @@ fputs($fp, '</dolibarr_script_dir>'."\n");
 
 asort($checksumconcat); // Sort list of checksum
 fputs($fp, '<dolibarr_script_dir_checksum>'."\n");
-fputs($fp, md5(join(',', $checksumconcat))."\n");
+fputs($fp, md5(join(',',$checksumconcat))."\n");
 fputs($fp, '</dolibarr_script_dir_checksum>'."\n");
 
 fputs($fp, '</checksum_list>'."\n");

build/gource/README.md

@@ -1,10 +0,0 @@
-# Command to run gource on Dolibarr git project.
-
-cd ~/git/dolibarr
-gource -a 0.5 -c 4 -i 0 --max-files 0 --dir-name-depth 2 --max-file-lag 0.1 --max-user-speed 150 --user-friction 1 --user-scale 3 --file-filter svgs --file-filter _source --file-filter tests --file-show-filter htdocs --date-format "%d %b %Y" -logo doc/images/appicon_64.png --highlight-users --highlight-colour FFFF88 -s 0.5 -1280x720 -r 25 -title 'Dolibarr ERP CRM Genesis' --stop-at-end --filename-time 2 --user-image-dir build/gource/avatars --hide filenames
-
-
-# To build a mp4 video
-# Change -crf 1 to -crf 50 for max compression (best is 5)
-cd ~/git/dolibarr
-gource -a 0.5 -c 4 -i 0 --max-files 0 --dir-name-depth 2 --max-file-lag 0.1 --max-user-speed 150 --user-friction 1 --user-scale 3 --file-filter svgs --file-filter _source --file-filter tests --file-show-filter htdocs --date-format "%d %b %Y" -logo doc/images/appicon_64.png --highlight-users --highlight-colour FFFF88 -s 0.4 -1280x720 -r 25 -title 'Dolibarr ERP CRM Genesis' --stop-at-end --filename-time 2 --user-image-dir build/gource/avatars --hide filenames -o - | ffmpeg -y -r 25 -f image2pipe -vcodec ppm -i - -vcodec libx264 -preset slow -pix_fmt yuv420p -crf 5 -threads 0 -bf 0 dolibarr_genesis.mp4 

build/gource/avatars/.gitignore

@@ -1 +0,0 @@
-/*.png

build/gource/avatars/README.md

@@ -1 +0,0 @@
-Directory that will be filled with avatars images of developers for gource

build/gource/getavatars.pl

@@ -1,49 +0,0 @@
-#!/usr/bin/perl
-#fetch Gravatars
-
-use strict;
-use warnings;
-
-use LWP::Simple;
-use Digest::MD5 qw(md5_hex);
-
-my $size       = 90;
-my $output_dir = './avatars';
-
-die("no .git/ directory found in current path\n") unless -d './avatars';
-
-mkdir($output_dir) unless -d $output_dir;
-
-open(GITLOG, q/git log --pretty=format:"%ae|%an" |/) or die("failed to read git-log: $!\n");
-
-my %processed_authors;
-
-while(<GITLOG>) {
-    chomp;
-    my($email, $author) = split(/\|/, $_);
-
-    next if $processed_authors{$author}++;
-
-    my $author_image_file = $output_dir . '/' . $author . '.png';
-
-    #skip images we have
-    next if -e $author_image_file;
-
-    #try and fetch image
-
-    my $grav_url = "http://www.gravatar.com/avatar/".md5_hex(lc $email)."?d=404&size=".$size; 
-
-    warn "fetching image for '$author' $email ($grav_url)...\n";
-
-    my $rc = getstore($grav_url, $author_image_file);
-
-    sleep(1);
-
-    if($rc != 200) {
-        unlink($author_image_file);
-        next;
-    }
-}
-
-close GITLOG;
-

build/makepack-dolibarr.pl

@@ -22,7 +22,7 @@ $PUBLISHSTABLE="eldy,dolibarr\@frs.sourceforge.net:/home/frs/project/dolibarr";
 $PUBLISHBETARC="dolibarr\@vmprod1.dolibarr.org:/home/dolibarr/dolibarr.org/httpdocs/files";
 
 
-#@LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","EXEDOLIWAMP","SNAPSHOT");   # Possible packages
+#@LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT");   # Possible packages
 @LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","EXEDOLIWAMP","SNAPSHOT");   # Possible packages
 %REQUIREMENTPUBLISH=(
 "SF"=>"git ssh rsync",
@@ -36,8 +36,8 @@ $PUBLISHBETARC="dolibarr\@vmprod1.dolibarr.org:/home/dolibarr/dolibarr.org/httpd
 "RPM_FEDORA"=>"rpmbuild",
 "RPM_MANDRIVA"=>"rpmbuild",
 "RPM_OPENSUSE"=>"rpmbuild",
-"DEB"=>"dpkg dpatch",
-"FLATPACK"=>"flatpack",
+"DEB"=>"dpkg",
+"APS"=>"zip",
 "EXEDOLIWAMP"=>"ISCC.exe",
 "SNAPSHOT"=>"tar"
 );
@@ -129,7 +129,7 @@ $BUILDROOT="$TEMP/buildroot";
 $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',\s*'([\d\.a-z\-]+)'\)/ ) { $PROJVERSION = $1; break; }
+	if ( $_ =~ /define\('DOL_VERSION','([\d\.a-z\-]+)'\)/ ) { $PROJVERSION = $1; break; }
 }
 close IN;
 ($MAJOR,$MINOR,$BUILD)=split(/\./,$PROJVERSION,3);
@@ -142,6 +142,7 @@ $FILENAMETGZ         = "$PROJECT-$MAJOR.$MINOR.$BUILD";
 $FILENAMEZIP         = "$PROJECT-$MAJOR.$MINOR.$BUILD";
 $FILENAMEXZ          = "$PROJECT-$MAJOR.$MINOR.$BUILD";
 $FILENAMEDEB         = "see later";
+$FILENAMEAPS         = "$PROJECT-$MAJOR.$MINOR.$BUILD.app";
 $FILENAMEEXEDOLIWAMP = "DoliWamp-$MAJOR.$MINOR.$BUILD";
 # For RPM
 $ARCH='noarch';
@@ -357,16 +358,17 @@ if ($nboftargetok) {
 		}
 		else
 		{
-			print "ChangeLog for $MAJOR.$MINOR\.$BUILD was found into '$SOURCE/ChangeLog'. But you can regenerate it with command:\n";
+			print "ChangeLog for $MAJOR.$MINOR\.$BUILD was found into '$SOURCE/ChangeLog. But you can regenerate it with command:'\n";
 		}
 		if (! $BUILD || $BUILD eq '0-rc')	# For a major version
 		{
-			print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log `git rev-list --boundary '.$MAJOR.'.'.$MINOR.'..origin/develop | grep ^- | cut -c2- | head -n 1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\|CLOSE\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/CLOSE/NEW/g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
+			print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log `git rev-list --boundary '.$MAJOR.'.'.$MINOR.'..origin/develop | grep ^- | cut -c2- | head -n 1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
 		}
 		else			# For a maintenance release
 		{
-			#print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-1).'.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/CLOSE/NEW/g\'| sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
-			print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-1).'.. | grep -v "Merge branch" | grep -v "Merge pull" | grep "^ " | sed -e "s/^[0-9a-z]* *//" | grep -e \'^FIX\|NEW\|CLOSE\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/CLOSE/NEW/g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
+			#print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-1).'.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
+			print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-1).'.. | grep -v "Merge branch" | grep -v "Merge pull" | grep "^ " | sed -e "s/^[0-9a-z]* *//" | grep -e \'^FIX\|NEW\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
+			
 		}
 		print "\n";
 		if (! $ret)
@@ -381,25 +383,12 @@ if ($nboftargetok) {
 			}
 		}
 	}
-
+		
 	# Build xml check file
 	#-----------------------
 	if ($CHOOSEDTARGET{'-CHKSUM'})
 	{
-		print "Go to directory $SOURCE\n";
-		$olddir=getcwd();
-		chdir("$SOURCE");
-		
-		$ret=`git ls-files . --exclude-standard --others`;
-		if ($ret)
-		{
-				print "Some files exists in source directory and are not indexed neither excluded in .gitignore.\n";
-				print $ret;
-				print "Canceled.\n";
-				exit;
-		}
-		
-	   	print 'Create xml check file with md5 checksum with command php '.$SOURCE.'/build/generate_filelist_xml.php release='.$MAJOR.'.'.$MINOR.'.'.$BUILD."\n";
+	   	print 'Create xml check file with md5 checksum with command php '.$SOURCE.'/build/generate_filecheck_xml.php release='.$MAJOR.'.'.$MINOR.'.'.$BUILD."\n";
 	  	$ret=`php $SOURCE/build/generate_filelist_xml.php release=$MAJOR.$MINOR.$BUILD`;
 	  	print $ret."\n";
 	  	# Copy to final dir
@@ -461,18 +450,15 @@ if ($nboftargetok) {
 		print "Clean $BUILDROOT\n";
 		$ret=`rm -f  $BUILDROOT/$PROJECT/.buildpath`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/.codeclimate`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/.editorconfig`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/.externalToolBuilders`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/.git*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/.pydevproject`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/.scrutinizer.yml`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/.stickler.yml`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/.travis.yml`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/.tx`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/build.xml`;
-		$ret=`rm -f  $BUILDROOT/$PROJECT/phpstan.neon`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/pom.xml`;
 		
 		$ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
@@ -537,21 +523,12 @@ if ($nboftargetok) {
 		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`;
 
 		# Security to avoid to package data files 
-        print "Remove documents dir\n";
 		$ret=`rm -fr $BUILDROOT/$PROJECT/document`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/document`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/documents`;
-        
-        print "Remove subdir of custom dir\n";
-   	    print "find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \\;\n";
-   	    $ret=`find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \\; >/dev/null 2>&1`;	# For custom we want to remove all subdirs but not files
-   	    print "find $BUILDROOT/$PROJECT/htdocs/custom/* -type l -exec rm -fr {} \\;\n";
-   	    $ret=`find $BUILDROOT/$PROJECT/htdocs/custom/* -type l -exec rm -fr {} \\; >/dev/null 2>&1`;	# For custom we want to remove all subdirs, even symbolic links, but not files
 
 		# Removed known external modules to avoid any error when packaging from env where external modules are tested 
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/abricot*`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/accountingexport*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/allscreens*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/ancotec*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/cabinetmed*`;
@@ -566,14 +543,12 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/multicompany*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/ndf*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/nltechno*`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/nomenclature*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/of/`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/oscim*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/pos*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/timesheet*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/webmail*`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/workstation*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/accountingexport*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/oblyon*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/allscreen*`;
 		# Removed other test files
@@ -585,7 +560,7 @@ if ($nboftargetok) {
    	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/geoip/sample*.*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/ckeditor/adapters`;		# Keep this removal in case we embed libraries
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/ckeditor/samples`;		# Keep this removal in case we embed libraries
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;					# _source must be kept into tarball for official debian, not for the rest
+        #$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;		# _source must be kept into tarball
    	    
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/select2/release.sh`;
@@ -604,8 +579,6 @@ if ($nboftargetok) {
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Examples`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/unitTests`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/license.md`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/sabre/sabre/*/tests`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/stripe/tests`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/stripe/LICENSE`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-*`;
@@ -619,6 +592,13 @@ if ($nboftargetok) {
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/LICENSE.TXT`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/theme/common/octicons/LICENSE`;
+        
+        
+        print "Remove subdir of custom dir\n";
+   	    print "find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \\;\n";
+   	    $ret=`find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \\; >/dev/null 2>&1`;	# For custom we want to remove all subdirs but not files
+   	    print "find $BUILDROOT/$PROJECT/htdocs/custom/* -type l -exec rm -fr {} \\;\n";
+   	    $ret=`find $BUILDROOT/$PROJECT/htdocs/custom/* -type l -exec rm -fr {} \\; >/dev/null 2>&1`;	# For custom we want to remove all subdirs, even symbolic links, but not files
 	}
 
 	# Build package for each target
@@ -712,7 +692,7 @@ if ($nboftargetok) {
 			print "Go to directory $BUILDROOT\n";
 			$olddir=getcwd();
 			chdir("$BUILDROOT");
-			$cmd= "xz -9 -r $BUILDROOT/$FILENAMEXZ.xz \*";
+			$cmd= "xz -9 -r $BUILDROOT/$FILENAMEAPS.xz \*";
 			print $cmd."\n";
 			$ret= `$cmd`;
 			chdir("$olddir");
@@ -789,8 +769,8 @@ if ($nboftargetok) {
 			$cmd="cp -pr '$BUILDROOT/$PROJECT' '$BUILDROOT/$FILENAMETGZ2'";
 			$ret=`$cmd`;
 
-			# Removed files we don't need (already removed before)
-			#$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/htdocs/includes/ckeditor/_source`;
+			# Removed files we don't need
+			$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/htdocs/includes/ckeditor/_source`;
 
 			print "Set permissions on files/dir\n";
 			$ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`;
@@ -939,8 +919,8 @@ if ($nboftargetok) {
 			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/mike42/escpos-php/LICENSE.md`;
 			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/mobiledetect/mobiledetectlib/LICENSE.txt`;
 			
-			# Removed files we don't need (already removed)
-			#$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source`;
+			# Removed files we don't need
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/ckeditor/_source`;
 			
 			# Rename upstream changelog to match debian rules
 			$ret=`mv $BUILDROOT/$PROJECT.tmp/ChangeLog $BUILDROOT/$PROJECT.tmp/changelog`;
@@ -1002,13 +982,13 @@ if ($nboftargetok) {
 			$ret=`chmod 755 $BUILDROOT/$PROJECT.tmp/debian/rules`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/translation/autotranslator.class.php`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/class/actions_mymodule.class.php`;
-			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/class/api_mymodule.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/class/api_myobject.class.php`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/class/myobject.class.php`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/core/modules/modMyModule.class.php`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/mymoduleindex.php`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/myobject_card.php`;
 			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/myobject_list.php`;
-			$ret=`chmod -R 755 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/scripts/mymodule.php`;
+			$ret=`chmod -R 755 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/scripts/myobject.php`;
 			$cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
 			$ret=`$cmd`;
 			$cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.sh' -type f -exec chmod 755 {} \\; ";
@@ -1053,6 +1033,92 @@ if ($nboftargetok) {
 			next;
 		}
 		
+		if ($target eq 'APS') 
+		{
+			$NEWDESTI=$DESTI;
+			if ($NEWDESTI =~ /stable/)
+			{
+				mkdir($DESTI.'/package_aps');
+				if (-d $DESTI.'/package_aps') { $NEWDESTI=$DESTI.'/package_aps'; }
+			} 
+			
+			$newbuild = $BUILD;
+			$newbuild =~ s/(dev|alpha)/0/gi;                # dev
+			$newbuild =~ s/beta/1/gi;                       # beta
+			$newbuild =~ s/rc./2/gi;                        # rc
+			if ($newbuild !~ /-/) { $newbuild.='-3'; }      # finale
+			# now newbuild is 0-0 or 0-3 for example
+			$REL1 = $newbuild; $REL1 =~ s/-.*$//gi;
+			if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; }
+			print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
+			
+			print "Remove target $FILENAMEAPS.zip...\n";
+			unlink "$NEWDESTI/$FILENAMEAPS.zip";
+
+			#rmdir "$BUILDROOT/$PROJECT.tmp";
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
+			print "Create directory $BUILDROOT/$PROJECT.tmp\n";
+			$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp"`;
+			print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp\n";
+			$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp\"";
+			$ret=`$cmd`;
+
+			print "Remove other files\n";
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/rpm`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`;
+
+            $APSVERSION="1.2";
+            print "Create APS files $BUILDROOT/$PROJECT.tmp/$PROJECT/APP-META.xml\n";
+            open (SPECFROM,"<$BUILDROOT/$PROJECT/build/aps/APP-META-$APSVERSION.xml") || die "Error";
+            open (SPECTO,">$BUILDROOT/$PROJECT.tmp/$PROJECT/APP-META.xml") || die "Error";
+            while (<SPECFROM>) {
+                $newbuild = $BUILD;
+                $newbuild =~ s/(dev|alpha)/0/gi;                # dev
+                $newbuild =~ s/beta/1/gi;                       # beta
+                $newbuild =~ s/rc./2/gi;                        # rc
+                if ($newbuild !~ /-/) { $newbuild.='-3'; }      # finale
+                # now newbuild is 0-0 or 0-3 for example
+                $_ =~ s/__VERSION__/$MAJOR.$MINOR.$REL1/;
+                $_ =~ s/__RELEASE__/$RPMSUBVERSION/;
+                print SPECTO $_;
+            }
+            close SPECFROM;
+            close SPECTO;
+            print "Version set to $MAJOR.$MINOR.$newbuild\n";
+            $cmd="cp -pr \"$BUILDROOT/$PROJECT/build/aps/configure.php\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/scripts/configure.php\"";
+            $ret=`$cmd`;
+            $cmd="cp -pr \"$BUILDROOT/$PROJECT/doc/images\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/images\"";
+            $ret=`$cmd`;
+ 
+            print "Remove other files\n";
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc`;
+            
+            print "Build APP-LIST.xml files\n";
+            
+            print "Compress $BUILDROOT/$PROJECT.tmp/$PROJECT into $FILENAMEAPS.zip...\n";
+ 
+            print "Go to directory $BUILDROOT/$PROJECT.tmp\/$PROJECT\n";
+            $olddir=getcwd();
+            chdir("$BUILDROOT\/$PROJECT.tmp\/$PROJECT");
+            $cmd= "zip -9 -r $BUILDROOT/$FILENAMEAPS.zip \*";
+            print $cmd."\n";
+            $ret= `$cmd`;
+            chdir("$olddir");
+                        
+    		# Move to final dir
+            print "Move $BUILDROOT/$FILENAMEAPS.zip to $NEWDESTI/$FILENAMEAPS.zip\n";
+            $ret=`mv "$BUILDROOT/$FILENAMEAPS.zip" "$NEWDESTI/$FILENAMEAPS.zip"`;
+            next;
+    	}
+
 		if ($target eq 'EXEDOLIWAMP')
 		{
 			$NEWDESTI=$DESTI;
@@ -1074,7 +1140,7 @@ if ($nboftargetok) {
     		$ret=`cat "$SOURCE/build/exe/doliwamp/doliwamp.iss" | sed -e 's/__FILENAMEEXEDOLIWAMP__/$FILENAMEEXEDOLIWAMP/g' > "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`;
 
     		print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"\n";
-    		$cmd= "wine ISCC.exe \"Z:$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"";
+    		$cmd= "ISCC.exe \"Z:$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"";
 			print "$cmd\n";
 			$ret= `$cmd`;
 			#print "$ret\n";

build/makepack-howto.txt

@@ -43,9 +43,9 @@ To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dol
 - Run makepack-dolibarr.pl to generate all packages.
 
 - Check content of built packages.
+- Move build files into www.dolibarr.org web site
+  (/home/dolibarr/wwwroot/files/stable).
 
-- Run makepack-dolibarr.pl again with option to publish files on 
-  dolibarr foundation server (Dir /home/dolibarr/wwwroot/files/stable on www.dolibarr.org).
 - Run makepack-dolibarr.pl again with option to publish files on 
   sourceforge. This will also add official tag.
 - Edit symbolic links in directory "/home/dolibarr/wwwroot/files/stable/xxx"

build/perl/virtualmin/dolibarr.pl

@@ -1,7 +1,7 @@
 #----------------------------------------------------------------------------
 # \file         dolibarr.pl
 # \brief        Dolibarr script install for Virtualmin Pro
-# \author       (c)2009-2019 Regis Houssin  <regis.houssin@inodbox.com>
+# \author       (c)2009-2017 Regis Houssin  <regis.houssin@capnetworks.com>
 #----------------------------------------------------------------------------
 
 
@@ -30,7 +30,7 @@ return "Regis Houssin";
 # script_dolibarr_versions()
 sub script_dolibarr_versions
 {
-return ( "10.0.0", "9.0.3", "8.0.5", "7.0.5", "6.0.8" );
+return ( "5.0.4", "4.0.6", "3.9.4" );
 }
 
 sub script_dolibarr_release
@@ -263,16 +263,15 @@ if ($upgrade) {
 	local @params = ( [ "action", "upgrade" ],
 			  [ "versionfrom", $upgrade->{'version'} ],
 			  [ "versionto", $ver ],
-			  [ "installlock", "444" ],
 			 );
 	local $p = $ver >= 3.8 ? "step5" : "etape5";
 	local $err = &call_dolibarr_wizard_page(\@params, $p, $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
 	
-	# Remove the installation directory. (deprecated)
-	# local $dinstall = "$opts->{'dir'}/install";
-	# $dinstall  =~ s/\/$//;
-	# $out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall));
+	# Remove the installation directory.
+	local $dinstall = "$opts->{'dir'}/install";
+	$dinstall  =~ s/\/$//;
+	$out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall));
 	
 	}
 else {
@@ -307,18 +306,15 @@ else {
 			  [ "login", "admin" ],
 			  [ "pass", $dompass ],
 			  [ "pass_verif", $dompass ],
-			  [ "installlock", "444" ],
 	 		 );
 	local $p = $ver >= 3.8 ? "step5" : "etape5";
 	local $err = &call_dolibarr_wizard_page(\@params, $p, $d, $opts);
 	return (-1, "Dolibarr wizard failed : $err") if ($err);
 	
-	# Remove the installation directory (deprecated)
-	# local $dinstall = "$opts->{'dir'}/install";
-	# $dinstall  =~ s/\/$//;
-	# $out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall));
-	
-	# Protect config file
+	# Remove the installation directory and protect config file.
+	local $dinstall = "$opts->{'dir'}/install";
+	$dinstall  =~ s/\/$//;
+	$out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall));
 	&set_permissions_as_domain_user($d, 0644, $cfile);
 	&set_permissions_as_domain_user($d, 0755, $cfiledir);
 	}
@@ -390,19 +386,14 @@ sub script_dolibarr_check_latest
 {
 local ($ver) = @_;
 local @vers = &osdn_package_versions("dolibarr",
-				$ver >= 10.0 ? "dolibarr\\-(10\\.0\\.[0-9\\.]+)\\.tgz" :
-				$ver >= 9.0 ? "dolibarr\\-(9\\.0\\.[0-9\\.]+)\\.tgz" :
-				$ver >= 8.0 ? "dolibarr\\-(8\\.0\\.[0-9\\.]+)\\.tgz" :
-				$ver >= 7.0 ? "dolibarr\\-(7\\.0\\.[0-9\\.]+)\\.tgz" :
-				$ver >= 6.0 ? "dolibarr\\-(6\\.0\\.[0-9\\.]+)\\.tgz" :
-				$ver >= 5.0 ? "dolibarr\\-(5\\.0\\.[0-9\\.]+)\\.tgz" :
-				$ver >= 4.0 ? "dolibarr\\-(4\\.0\\.[0-9\\.]+)\\.tgz" :
-				$ver >= 3.9 ? "dolibarr\\-(3\\.9\\.[0-9\\.]+)\\.tgz" :
-				$ver >= 3.8 ? "dolibarr\\-(3\\.8\\.[0-9\\.]+)\\.tgz" :
-				$ver >= 3.7 ? "dolibarr\\-(3\\.7\\.[0-9\\.]+)\\.tgz" :
-				$ver >= 3.6 ? "dolibarr\\-(3\\.6\\.[0-9\\.]+)\\.tgz" :
-				$ver >= 3.5 ? "dolibarr\\-(3\\.5\\.[0-9\\.]+)\\.tgz" :
-				$ver >= 2.9 ? "dolibarr\\-(2\\.9\\.[0-9\\.]+)\\.tgz" :
+                $ver >= 5.0 ? "dolibarr\\-(5\\.0\\.[0-9\\.]+)\\.tgz" :
+                $ver >= 4.0 ? "dolibarr\\-(4\\.0\\.[0-9\\.]+)\\.tgz" :
+                $ver >= 3.9 ? "dolibarr\\-(3\\.9\\.[0-9\\.]+)\\.tgz" :
+		$ver >= 3.8 ? "dolibarr\\-(3\\.8\\.[0-9\\.]+)\\.tgz" :
+                $ver >= 3.7 ? "dolibarr\\-(3\\.7\\.[0-9\\.]+)\\.tgz" :
+                $ver >= 3.6 ? "dolibarr\\-(3\\.6\\.[0-9\\.]+)\\.tgz" :
+                $ver >= 3.5 ? "dolibarr\\-(3\\.5\\.[0-9\\.]+)\\.tgz" :
+                $ver >= 2.9 ? "dolibarr\\-(2\\.9\\.[0-9\\.]+)\\.tgz" :
                               "dolibarr\\-(2\\.8\\.[0-9\\.]+)\\.tgz");
 return "Failed to find versions" if (!@vers);
 return $ver eq $vers[0] ? undef : $vers[0];

build/phpstan/bootstrap.php

@@ -1,14 +0,0 @@
-<?php
-// Example to use PHPStan
-// cd git/dolibarr
-// /usr/bin/php7.2 ../phpstan.phar -l1 analyze htdocs/societe/website.php --memory-limit 2G
-
-// Defined some constants and load Dolibarr env to reduce PHPStan bootstrap that fails to load a lot of things.
-define('DOL_DOCUMENT_ROOT', __DIR__ . '/../../htdocs');
-define('DOL_DATA_ROOT', __DIR__ . '/../../documents');
-define('DOL_URL_ROOT', '/');
-
-// Load the main.inc.php file to have functions llx_Header and llx_Footer defined
-if (! defined("NOLOGIN")) define("NOLOGIN", '1');
-global $conf, $langs, $user, $db;
-include_once __DIR__ . '/../../htdocs/main.inc.php';

build/rpm/dolibarr-forrpm.patch

@@ -15,7 +15,21 @@ diff -up htdocs/filefunc.inc.php.patch htdocs/filefunc.inc.php
 diff -up htdocs/install/inc.php.patch htdocs/install/inc.php
 --- htdocs/install/inc.php.patch	2011-09-03 02:33:26.450952000 +0200
 +++ htdocs/install/inc.php	2011-09-03 02:33:36.286952001 +0200
-@@ -74,8 +74,8 @@
+@@ -71,8 +71,8 @@
+ $conffile = "../conf/conf.php";
+ $conffiletoshow = "htdocs/conf/conf.php";
+ // For debian/redhat like systems
+-//$conffile = "/etc/dolibarr/conf.php";
+-//$conffiletoshow = "/etc/dolibarr/conf.php";
++$conffile = "/etc/dolibarr/conf.php";
++$conffiletoshow = "/etc/dolibarr/conf.php";
+ 
+ 
+ // Load conf file if it is already defined
+diff -up htdocs/support/inc.php.patch htdocs/support/inc.php
+--- htdocs/support/inc.php.patch	2011-09-03 02:34:39.606952000 +0200
++++ htdocs/support/inc.php	2011-09-03 02:33:59.814952000 +0200
+@@ -69,8 +69,8 @@
  $conffile = "../conf/conf.php";
  $conffiletoshow = "htdocs/conf/conf.php";
  // For debian/redhat like systems

build/rpm/dolibarr_fedora.spec

@@ -25,7 +25,7 @@ BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
 
 Group: Applications/Productivity
-Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mysqli, php-adodb, php-nusoap, dejavu-sans-fonts
+Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mysql, php-adodb, php-nusoap, dejavu-sans-fonts
 Requires: mysql-server, mysql
 #BuildRequires: desktop-file-utils
 
@@ -160,12 +160,10 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/adherents
 %_datadir/dolibarr/htdocs/admin
 %_datadir/dolibarr/htdocs/api
-%_datadir/dolibarr/htdocs/asset
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/blockedlog
 %_datadir/dolibarr/htdocs/bookmarks
-%_datadir/dolibarr/htdocs/bom
 %_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
 %_datadir/dolibarr/htdocs/collab
@@ -178,12 +176,8 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/core
 %_datadir/dolibarr/htdocs/cron
 %_datadir/dolibarr/htdocs/custom
-%_datadir/dolibarr/htdocs/datapolicy
-%_datadir/dolibarr/htdocs/dav
-%_datadir/dolibarr/htdocs/debugbar
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
-%_datadir/dolibarr/htdocs/emailcollector
 %_datadir/dolibarr/htdocs/expedition
 %_datadir/dolibarr/htdocs/expensereport
 %_datadir/dolibarr/htdocs/exports
@@ -202,7 +196,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
 %_datadir/dolibarr/htdocs/modulebuilder
-%_datadir/dolibarr/htdocs/mrp
 %_datadir/dolibarr/htdocs/multicurrency
 %_datadir/dolibarr/htdocs/opensurvey
 %_datadir/dolibarr/htdocs/paybox
@@ -211,21 +204,16 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/product
 %_datadir/dolibarr/htdocs/projet
 %_datadir/dolibarr/htdocs/public
-%_datadir/dolibarr/htdocs/reception
 %_datadir/dolibarr/htdocs/resource
-%_datadir/dolibarr/htdocs/salaries
 %_datadir/dolibarr/htdocs/societe
 %_datadir/dolibarr/htdocs/stripe
 %_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
-%_datadir/dolibarr/htdocs/takepos
-%_datadir/dolibarr/htdocs/ticket
 %_datadir/dolibarr/htdocs/user
 %_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices
-%_datadir/dolibarr/htdocs/website
-%_datadir/dolibarr/htdocs/zapier
+%_datadir/dolibarr/htdocs/websites
 %_datadir/dolibarr/htdocs/*.ico
 %_datadir/dolibarr/htdocs/*.patch
 %_datadir/dolibarr/htdocs/*.php

build/rpm/dolibarr_generic.spec

@@ -46,7 +46,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
 
 %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
 Group: Applications/Productivity
-Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mysqli, php-adodb, php-nusoap, dejavu-sans-fonts, php-mbstring, php-xml
+Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mysql, php-adodb, php-nusoap, dejavu-sans-fonts
 Requires: mysql-server, mysql
 BuildRequires: desktop-file-utils
 %else
@@ -54,7 +54,7 @@ BuildRequires: desktop-file-utils
 Group: Applications/Productivity
 Requires: apache-base, apache-mod_php, php-cgi, php-cli, php-bz2, php-gd, php-ldap, php-imap, php-mysqli, php-openssl, fonts-ttf-dejavu 
 Requires: mysql, mysql-client 
-%else%_datadir/dolibarr/htdocs/datapolicy
+%else
 %if 0%{?suse_version}
 # Voir http://en.opensuse.org/openSUSE:Packaging_Conventions_RPM_Macros
 Group: Productivity/Office/Management
@@ -63,9 +63,9 @@ Requires: mysql-community-server, mysql-community-server-client
 BuildRequires: update-desktop-files fdupes
 %else
 Group: Applications/Productivity
-Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mbstring, php-xml
+Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap 
 Requires: mysql-server, mysql 
-Requires: php-mysqli >= 4.1.0 
+Requires: php-mysql >= 4.1.0 
 %endif
 %endif
 %endif
@@ -124,7 +124,7 @@ cui hai bisogno ed essere facile da usare.
 
 %if 0%{?sles_version}
 %{__rm} -rf $RPM_BUILD_ROOT
-%{__mkdir} $RPM_BUILD_ROOT%_datadir/dolibarr/htdocs/datapolicy
+%{__mkdir} $RPM_BUILD_ROOT
 %{__mkdir} $RPM_BUILD_ROOT%{_sysconfdir}
 %{__mkdir} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 %else
@@ -240,12 +240,10 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/adherents
 %_datadir/dolibarr/htdocs/admin
 %_datadir/dolibarr/htdocs/api
-%_datadir/dolibarr/htdocs/asset
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/blockedlog
 %_datadir/dolibarr/htdocs/bookmarks
-%_datadir/dolibarr/htdocs/bom
 %_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
 %_datadir/dolibarr/htdocs/collab
@@ -258,12 +256,8 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/core
 %_datadir/dolibarr/htdocs/cron
 %_datadir/dolibarr/htdocs/custom
-%_datadir/dolibarr/htdocs/datapolicy
-%_datadir/dolibarr/htdocs/dav
-%_datadir/dolibarr/htdocs/debugbar
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
-%_datadir/dolibarr/htdocs/emailcollector
 %_datadir/dolibarr/htdocs/expedition
 %_datadir/dolibarr/htdocs/expensereport
 %_datadir/dolibarr/htdocs/exports
@@ -282,7 +276,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
 %_datadir/dolibarr/htdocs/modulebuilder
-%_datadir/dolibarr/htdocs/mrp
 %_datadir/dolibarr/htdocs/multicurrency
 %_datadir/dolibarr/htdocs/opensurvey
 %_datadir/dolibarr/htdocs/paybox
@@ -291,21 +284,16 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/product
 %_datadir/dolibarr/htdocs/projet
 %_datadir/dolibarr/htdocs/public
-%_datadir/dolibarr/htdocs/reception
 %_datadir/dolibarr/htdocs/resource
-%_datadir/dolibarr/htdocs/salaries
 %_datadir/dolibarr/htdocs/societe
 %_datadir/dolibarr/htdocs/stripe
 %_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
-%_datadir/dolibarr/htdocs/takepos
-%_datadir/dolibarr/htdocs/ticket
 %_datadir/dolibarr/htdocs/user
 %_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices
-%_datadir/dolibarr/htdocs/website
-%_datadir/dolibarr/htdocs/zapier
+%_datadir/dolibarr/htdocs/websites
 %_datadir/dolibarr/htdocs/*.ico
 %_datadir/dolibarr/htdocs/*.patch
 %_datadir/dolibarr/htdocs/*.php
@@ -453,8 +441,8 @@ if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon ]; then
 %else
   echo Add SE Linux permissions for dolibarr
   # semanage add records into /etc/selinux/targeted/contexts/files/file_contexts.local
-  semanage fcontext -a -t httpd_sys_rw_content_t "/etc/dolibarr(/.*)?"
-  semanage fcontext -a -t httpd_sys_rw_content_t "/var/lib/dolibarr(/.*)?"
+  semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)"
+  semanage fcontext -a -t httpd_sys_script_rw_t "/var/lib/dolibarr(/.*?)"
   restorecon -R -v /etc/dolibarr
   restorecon -R -v /var/lib/dolibarr
 %endif

build/rpm/dolibarr_mandriva.spec

@@ -157,12 +157,10 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/adherents
 %_datadir/dolibarr/htdocs/admin
 %_datadir/dolibarr/htdocs/api
-%_datadir/dolibarr/htdocs/asset
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/blockedlog
 %_datadir/dolibarr/htdocs/bookmarks
-%_datadir/dolibarr/htdocs/bom
 %_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
 %_datadir/dolibarr/htdocs/collab
@@ -175,12 +173,8 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/core
 %_datadir/dolibarr/htdocs/cron
 %_datadir/dolibarr/htdocs/custom
-%_datadir/dolibarr/htdocs/datapolicy
-%_datadir/dolibarr/htdocs/dav
-%_datadir/dolibarr/htdocs/debugbar
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
-%_datadir/dolibarr/htdocs/emailcollector
 %_datadir/dolibarr/htdocs/expedition
 %_datadir/dolibarr/htdocs/expensereport
 %_datadir/dolibarr/htdocs/exports
@@ -199,7 +193,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
 %_datadir/dolibarr/htdocs/modulebuilder
-%_datadir/dolibarr/htdocs/mrp
 %_datadir/dolibarr/htdocs/multicurrency
 %_datadir/dolibarr/htdocs/opensurvey
 %_datadir/dolibarr/htdocs/paybox
@@ -208,21 +201,16 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/product
 %_datadir/dolibarr/htdocs/projet
 %_datadir/dolibarr/htdocs/public
-%_datadir/dolibarr/htdocs/reception
 %_datadir/dolibarr/htdocs/resource
-%_datadir/dolibarr/htdocs/salaries
 %_datadir/dolibarr/htdocs/societe
 %_datadir/dolibarr/htdocs/stripe
 %_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
-%_datadir/dolibarr/htdocs/takepos
-%_datadir/dolibarr/htdocs/ticket
 %_datadir/dolibarr/htdocs/user
 %_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices
-%_datadir/dolibarr/htdocs/website
-%_datadir/dolibarr/htdocs/zapier
+%_datadir/dolibarr/htdocs/websites
 %_datadir/dolibarr/htdocs/*.ico
 %_datadir/dolibarr/htdocs/*.patch
 %_datadir/dolibarr/htdocs/*.php

build/rpm/dolibarr_opensuse.spec

@@ -168,12 +168,10 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/adherents
 %_datadir/dolibarr/htdocs/admin
 %_datadir/dolibarr/htdocs/api
-%_datadir/dolibarr/htdocs/asset
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/blockedlog
 %_datadir/dolibarr/htdocs/bookmarks
-%_datadir/dolibarr/htdocs/bom
 %_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
 %_datadir/dolibarr/htdocs/collab
@@ -186,12 +184,8 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/core
 %_datadir/dolibarr/htdocs/cron
 %_datadir/dolibarr/htdocs/custom
-%_datadir/dolibarr/htdocs/datapolicy
-%_datadir/dolibarr/htdocs/dav
-%_datadir/dolibarr/htdocs/debugbar
 %_datadir/dolibarr/htdocs/don
 %_datadir/dolibarr/htdocs/ecm
-%_datadir/dolibarr/htdocs/emailcollector
 %_datadir/dolibarr/htdocs/expedition
 %_datadir/dolibarr/htdocs/expensereport
 %_datadir/dolibarr/htdocs/exports
@@ -210,7 +204,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/mailmanspip
 %_datadir/dolibarr/htdocs/margin
 %_datadir/dolibarr/htdocs/modulebuilder
-%_datadir/dolibarr/htdocs/mrp
 %_datadir/dolibarr/htdocs/multicurrency
 %_datadir/dolibarr/htdocs/opensurvey
 %_datadir/dolibarr/htdocs/paybox
@@ -219,21 +212,16 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/product
 %_datadir/dolibarr/htdocs/projet
 %_datadir/dolibarr/htdocs/public
-%_datadir/dolibarr/htdocs/reception
 %_datadir/dolibarr/htdocs/resource
-%_datadir/dolibarr/htdocs/salaries
 %_datadir/dolibarr/htdocs/societe
 %_datadir/dolibarr/htdocs/stripe
 %_datadir/dolibarr/htdocs/supplier_proposal
 %_datadir/dolibarr/htdocs/support
 %_datadir/dolibarr/htdocs/theme
-%_datadir/dolibarr/htdocs/takepos
-%_datadir/dolibarr/htdocs/ticket
 %_datadir/dolibarr/htdocs/user
 %_datadir/dolibarr/htdocs/variants
 %_datadir/dolibarr/htdocs/webservices
-%_datadir/dolibarr/htdocs/website
-%_datadir/dolibarr/htdocs/zapier
+%_datadir/dolibarr/htdocs/websites
 %_datadir/dolibarr/htdocs/*.ico
 %_datadir/dolibarr/htdocs/*.patch
 %_datadir/dolibarr/htdocs/*.php

build/rpm/httpd-dolibarr.conf

@@ -15,20 +15,24 @@ Alias /dolibarr /usr/share/dolibarr/htdocs
 
 # Directory for web pages
 <DirectoryMatch /usr/share/dolibarr>
-  <IfVersion >= 2.3>
-    Require all granted
-  </IfVersion>
-  <IfVersion < 2.3>
-    Order deny,allow
-    Allow from all
-  </IfVersion>
-
+  Order deny,allow
+  Allow from all
   DirectoryIndex index.php
   Options +FollowSymLinks +Indexes
 
   ErrorDocument 401 /public/error-401.php
   ErrorDocument 404 /public/error-404.php
 
+  <IfModule mod_php4.c>
+    php_flag magic_quotes_gpc Off
+    php_flag register_globals Off
+  </IfModule>
+
+  <IfModule mod_php5.c>
+    php_flag magic_quotes_gpc Off
+    php_flag register_globals Off
+  </IfModule>
+
 
     # OPTIMIZE: To use gzip compressed files (for Dolibarr already compressed files).
     # Note that constant MAIN_OPTIMIZE_SPEED must have a value with bit 0 set. 
@@ -56,51 +60,27 @@ Alias /dolibarr /usr/share/dolibarr/htdocs
 
 # Directory for public pages
 <DirectoryMatch /usr/share/dolibarr/public>
-  <IfVersion >= 2.3>
-    Require all granted
-  </IfVersion>
-  <IfVersion < 2.3>
+    AllowOverride All
     Order deny,allow
     Allow from all
-  </IfVersion>
-
-    AllowOverride All
 </DirectoryMatch>
 
 # Config files
 <DirectoryMatch /etc/dolibarr>
-  <IfVersion >= 2.3>
-    Require all granted
-  </IfVersion>
-  <IfVersion < 2.3>
+	AllowOverride All
     Order deny,allow
     Allow from all
-  </IfVersion>
-
-	AllowOverride All
 </DirectoryMatch>
 
 # Directory for data files
 <DirectoryMatch /usr/share/dolibarr/documents>
-  <IfVersion >= 2.3>
-    Require all granted
-  </IfVersion>
-  <IfVersion < 2.3>
+    AllowOverride All
     Order deny,allow
     Allow from all
-  </IfVersion>
-
-    AllowOverride All
 </DirectoryMatch>
 <DirectoryMatch /var/lib/dolibarr/documents>
-  <IfVersion >= 2.3>
-    Require all granted
-  </IfVersion>
-  <IfVersion < 2.3>
-    Order allow,deny
-    Allow from all
-  </IfVersion>
-
     AllowOverride All
+    Order deny,allow
+    Allow from all
 </DirectoryMatch>
 

build/travis-ci/apache.conf

@@ -1,11 +1,11 @@
 <VirtualHost *:80>
   DocumentRoot %TRAVIS_BUILD_DIR%/htdocs
-  ErrorLog /var/log/apache2/travis_error_log
 
-  <Directory "%TRAVIS_BUILD_DIR%/htdocs/">
+  <Directory "%TRAVIS_BUILD_DIR%/htdocs">
     Options FollowSymLinks MultiViews ExecCGI
     AllowOverride All
-    Require all granted
+    Order deny,allow
+    Allow from all
   </Directory>
 
   # Wire up Apache to use Travis CI's php-fpm.
@@ -14,9 +14,5 @@
     Action php5-fcgi /php5-fcgi
     Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi
     FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization
-    
-    <Directory /usr/lib/cgi-bin>
-        Require all granted
-    </Directory>
   </IfModule>
 </VirtualHost>

composer.json

@@ -1,59 +1,60 @@
 {
-	"name" : "dolibarr/dolibarr",
-	"type" : "project",
-	"description" : "Dolibarr ERP & CRM is a modern and easy to use web software to manage your business",
-	"keywords" : [
-		"erp",
-		"crm",
-		"invoice",
-		"sme",
-		"proposal",
-		"order",
-		"stock",
-		"agenda"
-	],
-	"homepage" : "https://www.dolibarr.org",
-	"license" : "GPL-3.0-or-later",
-	"support" : {
-		"issues" : "https://github.com/Dolibarr/dolibarr/issues",
-		"forum" : "https://www.dolibarr.org/forum",
-		"wiki" : "https://wiki.dolibarr.org",
-		"source" : "https://github.com/Dolibarr/dolibarr"
-	},
-	"config" : {
-		"vendor-dir" : "htdocs/includes"
-	},
-	"require" : {
-		"php" : ">=5.5.0",
-		"ext-curl" : "*",
-		"ckeditor/ckeditor" : "4.12.1",
-		"mike42/escpos-php" : "2.2",
-		"mobiledetect/mobiledetectlib" : "2.8.33",
-		"phpoffice/phpexcel" : "1.8.1",
-		"restler/framework" : "3.0.0-RC6",
-		"tecnickcom/tcpdf" : "^6.2",
-		"luracast/restler" : "^3.0"
-	},
-	"require-dev" : {
-		"jakub-onderka/php-parallel-lint" : "^0",
-		"jakub-onderka/php-console-highlighter" : "^0",
-		"phpunit/phpunit" : "^4",
-		"squizlabs/php_codesniffer" : "^2",
-		"phpunit/phpunit-selenium" : "^2"
-	},
-	"suggest" : {
-		"ext-mysqlnd" : "To use with MySQL or MariaDB",
-		"ext-mysqli" : "To use with MySQL or MariaDB",
-		"ext-pgsql" : "To use with PostgreSQL",
-		"ext-mssql" : "To use with MSSQL (experimental)",
-		"ext-pdo_sqlite" : "To use with SQLite (experimental)",
-		"ext-gd" : "Image manipulation (Required but maybe built-in PHP)",
-		"ext-imagick" : "Generation of thumbs from PDF",
-		"ext-mcrypt" : "(Required but maybe built-in PHP)",
-		"ext-openssl" : "Secure connections (Emails, SOAP\u2026)",
-		"ext-mbstring" : "Handle non UTF-8 characters",
-		"ext-soap" : "Native SOAP",
-		"ext-zip" : "ODT, Excel and file compression support",
-		"ext-xml" : "Excel support"
-	}
-}
+    "name": "dolibarr/dolibarr",
+    "type": "project",
+    "description": "Dolibarr ERP & CRM is a modern and easy to use web software to manage your business",
+    "keywords": [
+	    "erp",
+   		"crm",
+    	"invoice",
+    	"sme",
+    	"proposal",
+    	"order",
+    	"stock",
+    	"agenda"
+    ],
+    "homepage": "https://www.dolibarr.org",
+    "license": "GPL-3.0+",
+    "support": {
+        "issues": "https://github.com/Dolibarr/dolibarr/issues",
+        "forum": "https://www.dolibarr.org/forum",
+        "wiki": "https://wiki.dolibarr.org",
+        "source": "https://github.com/Dolibarr/dolibarr"
+    },
+    "config": {
+        "vendor-dir": "htdocs/includes"
+    },
+    "require": {
+        "php": ">=5.3.0",
+        "ext-curl": "*",
+        "ccampbell/chromephp": "4.1.0",
+        "ckeditor/ckeditor": "4.5.9",
+        "mike42/escpos-php": "1.2.1",
+        "mobiledetect/mobiledetectlib": "2.8.17",
+        "phpoffice/phpexcel": "1.8.1",
+        "restler/framework": "3.0.0-RC6",
+        "tecnickcom/tcpdf": "6.2.12"
+    },
+    "require-dev": {
+        "jakub-onderka/php-parallel-lint": "^0",
+        "jakub-onderka/php-console-highlighter": "^0",
+        "phpunit/phpunit": "^4",
+        "squizlabs/php_codesniffer": "^2",
+        "phpunit/phpunit-selenium": "^2"
+    },
+    "suggest": {
+        "ext-mysqlnd": "To use with MySQL or MariaDB",
+        "ext-mysqli": "To use with MySQL or MariaDB",
+        "ext-pgsql": "To use with PostgreSQL",
+        "ext-mssql": "To use with MSSQL (experimental)",
+        "ext-pdo_sqlite": "To use with SQLite (experimental)",
+        "ext-gd": "Image manipulation (Required but maybe built-in PHP)",
+        "ext-imagick": "Image manipulation (TCPDF)",
+        "ext-mcrypt": "(Required but maybe built-in PHP)",
+        "ext-openssl": "Secure connections (Emails, SOAP…)",
+        "ext-mbstring": "Handle non UTF-8 databases",
+        "ext-soap": "Native SOAP",
+        "ext-zip": "ODT and Excel support",
+        "ext-xml": "Excel support",
+        "firephp/firephp-core": "Logging to Firebug console support"
+    }
+}

dev/dolibarr_changes.txt

@@ -1,5 +1,5 @@
 
-This file describes changes made on external libraries after being included
+This file describe changes made on external library after beeing included
 in Dolibarr root.
 
 
@@ -8,15 +8,6 @@ ALL:
 Check "@CHANGE"
 
 
-PrestaShopWebservice:
----------------------
-Replace
-	$params = array('filter', 'display', 'sort', 'limit', 'id_shop', 'id_group_shop');
-With
-	$params = array('filter', 'display', 'sort', 'limit', 'id_shop', 'id_group_shop', 'date');
-
-
-
 CKEDITOR (4.6.2):
 -----------------
 * In ckeditor/ckeditor/contents.css
@@ -27,15 +18,6 @@ With
 
 
 
-ESCPOS:
--------
-Replace
-	private $connector;
-With
-	protected $connector;
-
-
-
 NUSOAP:
 -------
 * In file nusoap.php, to avoid a warning,
@@ -52,75 +34,6 @@ Replace call to serialize_val with no bugged value
 
 TCPDF:
 ------
-* Replace in tcpdf.php:
-
-            if (isset($this->imagekeys)) {
-                foreach($this->imagekeys as $file) {
-                    unlink($file);
-                }
-            }
-with
-
-            if (isset($this->imagekeys)) {
-                foreach($this->imagekeys as $file) {
-				// DOL CHANGE If we keep this, source image files are physically destroyed
-				// unlink($file);
-                }
-            }
-
-* Replace in tcpdf.php
-
-		$preserve = array(
-			'file_id',
-			'internal_encoding',
-			'state',
-			'bufferlen',
-			'buffer',
-			'cached_files',
-
-with
-
-		$preserve = array(
-			'file_id',
-			'internal_encoding',
-			'state',
-			'bufferlen',
-			'buffer',
-			'cached_files',
-			// @CHANGE DOL
-			'imagekeys',
-
-* Replace in tcpdf.php
-
-			if (!@TCPDF_STATIC::file_exists($file)) {
-				return false;	
-			}
-
-with
-
-			if (!@TCPDF_STATIC::file_exists($file)) {
-				// DOL CHANGE If we keep this, the image is not visible on pages after the first one.
-				//var_dump($file.' '.(!@TCPDF_STATIC::file_exists($file)));
-				//return false;	
-			}
-			
-
-
-* In tecnickcom/tcpdf/include/tcpdf_static, in function fopenLocal, replace
-
-		if (strpos($filename, '://') === false) {
-
-with
-
-        if (strpos($filename, '//') === 0)
-        {
-            // Share folder on a (windows) server
-            // e.g.: "//[MyServerName]/[MySharedFolder]/"
-            //
-            // nothing to change
-        }
-        elseif (strpos($filename, '://') === false)
-
 * To avoid to have QRcode changed because generated with a random mask, replace
 define('QR_FIND_FROM_RANDOM', 2);
 with
@@ -128,6 +41,13 @@ define('QR_FIND_FROM_RANDOM', false);
 
 * Removed useless directories ("examples", "tools")
 
+* Fix
+ 	// initialize subsetchars
+	$subsetchars = array();
+into
+	// initialize subsetchars
+	$subsetchars = array_fill(0, 256, true);
+
 * Optionnaly, removed all fonts except 
     dejavusans* (used by greek, arab, persan, romanian, turkish), 
     freemono* (russian), 
@@ -135,30 +55,23 @@ define('QR_FIND_FROM_RANDOM', false);
     helvetica* (all other languages),
     zapfdingbats.php (for special chars like form checkboxes)
 
-* Optionnaly, made freemono the default monotype font if we removed courier
-In htdocs/includes/tecnickcom/tcpdf/tcpdf.php
+* Optionnaly, made freemono the default monotype font because we removed courier
+In htdocs/includes/tcpdf/tcpdf.php
 -       protected $default_monospaced_font = 'courier';
 +       protected $default_monospaced_font = 'freemono';
 
 
 
-
 TCPDI:
 ------
 Add fpdf_tpl.php 1.2
 Add tcpdi.php
-
 Add tcpdi_parser.php and replace:
 require_once(dirname(__FILE__).'/include/tcpdf_filters.php');
 with:
 require_once(dirname(__FILE__).'/../tecnickcom/tcpdf/include/tcpdf_filters.php');
 
 
-* Fix by replacing
-	} elseif (($key == '/Index') AND ($v[0] == PDF_TYPE_ARRAY AND count($v[1] >= 2))) {
-with
-	} elseif (($key == '/Index') AND ($v[0] == PDF_TYPE_ARRAY AND count($v[1]) >= 2)) {
-
 
 
 JSGANTT:
@@ -169,21 +82,7 @@ with
 // LDR To open in same window
 //var OpenWindow=window.open(pRef, "newwin", "height="+vHeight+",width="+vWidth);
 window.location.href=pRef
-
-* Replace
-vTmpDiv=this.newNode(vTmpCell, 'div', null, null, vTaskList[i].getResource());
-with                       
-var vTmpNode=this.newNode(vTmpCell, 'div', null, '');
-vTmpNode=this.newNode(vTmpNode, 'a', null, '', vLangs[vLang]['moreinfo']);
-vTmpNode.setAttribute('href',vTaskList[i].getLink());
-                        
-* Replace '% Comp.' to have a smaller text column header
-'comp':'% Comp.'
-with
-'comp':'%'
-
-
-
+* Replace hard coded string with i18n["String"];
 
 
 JCROP:
@@ -196,54 +95,26 @@ JQUERYFILETREE:
 * Remove directory htdocs/includes/jquery/plugins/jqueryFileTree/connectors
 
 
-PHPEXCEL:
----------
-* Replace in htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE.php
-    continue;
-with:
-    continue 2;
-
 
 RESTLER:
 --------
-Change content of file htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
 
-+With swagger 2:
-
-* Add line into Util.php to complete function
-
-    public static function getShortName($className)
+* Add 2 lines into file AutoLoader.php to complete function     
+	private function alias($className, $currentClass)
     {
-    	// @CHANGE LDR
-    	if (! is_string($className)) return;
-    	//var_dump($className);
+		...
+to get 
 
+	private function alias($className, $currentClass)
+    {
+        if ($className == 'Luracast\Restler\string') return;
+        if ($className == 'Luracast\Restler\mixed') return;
+		...
     	
     	
 PARSEDOWN
 ---------
 
-* Add support of css by adding in Parsedown.php:
-
-	// @CHANGE LDR
-	'class' => $Link['element']['attributes']['class'] 
-
-	...
-	
-	// @CHANGE LDR
-    if (preg_match('/{([^}]+)}/', $remainder, $matches2))
-    {
-        $Element['attributes']['class'] = $matches2[1];
-       	$remainder = preg_replace('/{'.preg_quote($matches2[1],'/').'}/', '', $remainder);
-    }
-
-
-	// @CHANGE LDR
-	//$markup .= $this->{$Element['handler']}($Element['text']);
-	$markup .= preg_replace('/>{[^}]+}/', '>', $this->{$Element['handler']}($Element['text']));
-
-
-
 * Fix to avoid fatal error when mb_strlen not available:
 
 	// @CHANGE LDR Fix when mb_strlen is not available
@@ -251,6 +122,7 @@ PARSEDOWN
 	if (function_exists('mb_strlen')) $len = mb_strlen($line, 'utf-8');
 	else $len = strlen($line);
 	$shortage = 4 - $len % 4;
+                	
 
 
 JEDITABLE.JS
@@ -259,3 +131,4 @@ JEDITABLE.JS
 * <button type="submit" />  =>  <button class="button" type="submit" />
 * <button type="cancel" />  =>  <button class="button" type="cancel" />
 
+

dev/examples/code/create_invoice.php

@@ -13,7 +13,7 @@
  * 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/>.
  */
 
 /**
@@ -40,7 +40,7 @@ $error=0;
 
 // -------------------- START OF YOUR CODE HERE --------------------
 // Include Dolibarr environment
-require_once $path."../../htdocs/master.inc.php";
+require_once($path."../../htdocs/master.inc.php");
 // After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
 
 //$langs->setDefaultLang('en_US'); 	// To change default language of $langs
@@ -48,8 +48,8 @@ $langs->load("main");				// To load language file for default language
 @set_time_limit(0);
 
 // Load user and its permissions
-$result=$user->fetch('', 'admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) { dol_print_error('', $user->error); exit; }
+$result=$user->fetch('','admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
+if (! $result > 0) { dol_print_error('',$user->error); exit; }
 $user->getrights();
 
 
@@ -58,7 +58,7 @@ print "***** ".$script_file." (".$version.") *****\n";
 // Start of transaction
 $db->begin();
 
-require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php";
+require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
 
 // Create invoice object
 $obj = new Facture($db);
@@ -89,13 +89,13 @@ if ($idobject > 0)
 	else
 	{
 		$error++;
-		dol_print_error($db, $obj->error);
+		dol_print_error($db,$obj->error);
 	}
 }
 else
 {
 	$error++;
-	dol_print_error($db, $obj->error);
+	dol_print_error($db,$obj->error);
 }
 
 

dev/examples/code/create_order.php

@@ -13,7 +13,7 @@
  * 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/>.
  */
 
 /**
@@ -40,7 +40,7 @@ $error=0;
 
 // -------------------- START OF YOUR CODE HERE --------------------
 // Include Dolibarr environment
-require_once $path."../../htdocs/master.inc.php";
+require_once($path."../../htdocs/master.inc.php");
 // After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
 
 //$langs->setDefaultLang('en_US'); 	// To change default language of $langs
@@ -48,8 +48,8 @@ $langs->load("main");				// To load language file for default language
 @set_time_limit(0);
 
 // Load user and its permissions
-$result=$user->fetch('', 'admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) { dol_print_error('', $user->error); exit; }
+$result=$user->fetch('','admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
+if (! $result > 0) { dol_print_error('',$user->error); exit; }
 $user->getrights();
 
 
@@ -59,7 +59,7 @@ print "***** ".$script_file." (".$version.") *****\n";
 // Start of transaction
 $db->begin();
 
-require_once DOL_DOCUMENT_ROOT."/commande/class/commande.class.php";
+require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
 
 // Create order object
 $com = new Commande($db);
@@ -87,13 +87,13 @@ if ($idobject > 0)
 	else
 	{
 		$error++;
-		dol_print_error($db, $com->error);
+		dol_print_error($db,$com->error);
 	}
 }
 else
 {
 	$error++;
-	dol_print_error($db, $com->error);
+	dol_print_error($db,$com->error);
 }
 
 

dev/examples/code/create_product.php

@@ -13,7 +13,7 @@
  * 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/>.
  */
 
 /**
@@ -40,7 +40,7 @@ $error=0;
 
 // -------------------- START OF YOUR CODE HERE --------------------
 // Include Dolibarr environment
-require_once $path."../../htdocs/master.inc.php";
+require_once($path."../../htdocs/master.inc.php");
 // After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
 
 //$langs->setDefaultLang('en_US'); 	// To change default language of $langs
@@ -48,8 +48,8 @@ $langs->load("main");				// To load language file for default language
 @set_time_limit(0);
 
 // Load user and its permissions
-$result=$user->fetch('', 'admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) { dol_print_error('', $user->error); exit; }
+$result=$user->fetch('','admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
+if (! $result > 0) { dol_print_error('',$user->error); exit; }
 $user->getrights();
 
 
@@ -59,7 +59,7 @@ print "***** ".$script_file." (".$version.") *****\n";
 // Start of transaction
 $db->begin();
 
-require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
+require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 
 // Create instance of object
 $myproduct=new Product($db);
@@ -86,7 +86,7 @@ if ($idobject > 0)
 else
 {
 	$error++;
-	dol_print_error($db, $myproduct->error);
+	dol_print_error($db,$myproduct->error);
 }
 
 // -------------------- END OF YOUR CODE --------------------

dev/examples/code/create_user.php

@@ -13,7 +13,7 @@
  * 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/>.
  */
 
 /**
@@ -40,7 +40,7 @@ $error=0;
 
 // -------------------- START OF YOUR CODE HERE --------------------
 // Include Dolibarr environment
-require_once $path."../../htdocs/master.inc.php";
+require_once($path."../../htdocs/master.inc.php");
 // After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
 
 //$langs->setDefaultLang('en_US'); 	// To change default language of $langs
@@ -48,8 +48,8 @@ $langs->load("main");				// To load language file for default language
 @set_time_limit(0);
 
 // Load user and its permissions
-$result=$user->fetch('', 'admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) { dol_print_error('', $user->error); exit; }
+$result=$user->fetch('','admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
+if (! $result > 0) { dol_print_error('',$user->error); exit; }
 $user->getrights();
 
 
@@ -58,16 +58,16 @@ print "***** ".$script_file." (".$version.") *****\n";
 // Start of transaction
 $db->begin();
 
-require_once DOL_DOCUMENT_ROOT."/user/class/user.class.php";
+require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
 
-// Create user object
+// Create invoice object
 $obj = new User($db);
 //$obj->initAsSpecimen();
 
 $obj->login = 'ABCDEF';
 $obj->nom   = 'ABCDEF';
 
-// Create user
+// Create invoice
 $idobject=$obj->create($user);
 if ($idobject > 0)
 {
@@ -77,17 +77,17 @@ if ($idobject > 0)
 	else
 	{
 		$error++;
-		dol_print_error($db, $obj->error);
+		dol_print_error($db,$obj->error);
 	}
 }
-elseif ($obj->error == 'ErrorLoginAlreadyExists')
+else if ($obj->error == 'ErrorLoginAlreadyExists')
 {
      print "User with login ".$obj->login." already exists\n";
 }
 else
 {
 	$error++;
-	dol_print_error($db, $obj->error);
+	dol_print_error($db,$obj->error);
 }
 
 

dev/examples/code/get_contracts.php

@@ -13,7 +13,7 @@
  * 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/>.
  */
 
 /**
@@ -40,7 +40,7 @@ $error=0;
 
 // -------------------- START OF YOUR CODE HERE --------------------
 // Include Dolibarr environment
-require_once $path."../../htdocs/master.inc.php";
+require_once($path."../../htdocs/master.inc.php");
 // After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
 
 //$langs->setDefaultLang('en_US'); 	// To change default language of $langs
@@ -48,8 +48,8 @@ $langs->load("main");				// To load language file for default language
 @set_time_limit(0);
 
 // Load user and its permissions
-$result=$user->fetch('', 'admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) { dol_print_error('', $user->error); exit; }
+$result=$user->fetch('','admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
+if (! $result > 0) { dol_print_error('',$user->error); exit; }
 $user->getrights();
 
 
@@ -65,9 +65,9 @@ print 'Argument id_thirdparty='.$argv[1]."\n";
 // Start of transaction
 $db->begin();
 
-require_once DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php";
+require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
 
-// Create contract object
+// Create invoice object
 $obj = new Contrat($db);
 $obj->socid=$argv[1];
 

dev/examples/ical/event_recu.txt

@@ -1,7 +1,7 @@
 Example fo recurring event, 1 week, no end, exported by Google
 
 # The recurring event were recorded every monday the 20150518. This is the Recurrence-id, but then
-# first occurrence was moved on tuesday. So this record were added.
+# first occurence was moved on tuesday. So this record were added.
 BEGIN:VEVENT
 DTSTART;TZID=Europe/Paris:20150519T100000
 DTEND;TZID=Europe/Paris:20150519T110000

dev/examples/ldap/ldapsearch_sample1.txt

@@ -7,7 +7,3 @@
 # ldapsearch -h hostname -x -b "ou=people,dc=teclib,dc=infra"
 # ldapsearch -h hostname -x -z 0 -b "o=somecompany.com" -D "cn=manager,o=somecompany.com" -w password "(objectclass=*)"
 # ldapsearch -h hostname -x -b "o=somecompany.com" -D "cn=manager,o=somecompany.com" -w password "(objectclass=*)"
-#
-# Example to test a ldap search: 
-# ldapsearch -h hostname -x -z 5 -b 'OU=Collaborateurs,OU=Utilisateurs,OU=MyCompany,DC=bocal,DC=lan' -D 'CN=UserAdmin,OU=Informatique,OU=Utilisateurs,OU=MyCompany,DC=bocal,DC=lan' -w password
-

dev/examples/mail/README

@@ -1,5 +1,5 @@
 README (English)
 --------------------------------
 
-This directory contains example of well formatted mail messages.
+This directory contains example of well formated mail messages.
 This is to help to build the CMailFile.class.php code.

dev/examples/mail/dolibarr_mail_simpleHTML.txt

@@ -4,4 +4,4 @@ X-Mailer: Dolibarr version 2.7.0-beta (using php mail)
 MIME-Version: 1.0
 Content-Type: text/html; charset=UTF-8
 Content-Transfer-Encoding: 8bit
-<html><head><title></title></head><body>Test&eacute;<br>fdsfsdf<br>fsdf<strong>sfd</strong>s<br>fssdfsd<br></body></html>
+<html><head><title></title></head><body>Test&eacute;<br />fdsfsdf<br />fsdf<strong>sfd</strong>s<br />fssdfsd<br /></body></html>

dev/examples/zapier/.gitignore

@@ -1,7 +0,0 @@
-build
-docs
-node_modules
-*.log
-.environment
-.env
-.zapierapprc

dev/examples/zapier/.travis.yml

@@ -1,7 +0,0 @@
-language: node_js
-node_js:
-  - 8.10.0
-before_script: 'npm install -g zapier-platform-cli'
-script: 'zapier test'
-notifications:
-  email: false

dev/examples/zapier/action.json

@@ -1,56 +0,0 @@
-{
-    "table_rowid": "id",
-    "id": 6764,
-    "ref": null,
-    "type_id": "5",
-    "type_code": "AC_RDV",
-    "type": null,
-    "type_color": null,
-    "code": null,
-    "label": "azerty",
-    "datec": null,
-    "datem": null,
-    "authorid": null,
-    "usermodid": null,
-    "datep": 1555365600,
-    "datef": 1555538399,
-    "durationp": 172799,
-    "fulldayevent": 1,
-    "punctual": 1,
-    "percentage": "-1",
-    "location": "",
-    "transparency": 1,
-    "priority": 0,
-    "userassigned": {
-        "1": {
-            "id": "1",
-            "transparency": 1
-        }
-    },
-    "userownerid": "1",
-    "userdoneid": null,
-    "usertodo": null,
-    "userdone": null,
-    "socid": null,
-    "contactid": null,
-    "elementtype": "",
-    "icalname": null,
-    "icalcolor": null,
-    "actions": [],
-    "email_msgid": null,
-    "email_from": null,
-    "email_sender": null,
-    "email_to": null,
-    "email_tocc": null,
-    "email_tobcc": null,
-    "email_subject": null,
-    "errors_to": null,
-    "import_key": null,
-    "linkedObjectsIds": null,
-    "fk_project": 0,
-    "modelpdf": null,
-    "note_public": null,
-    "note_private": null,
-    "note": "wxcvbn",
-    "duree": 0
-}

dev/examples/zapier/authentication.js

@@ -1,77 +0,0 @@
-/*jshint esversion: 6 */
-const testAuth = (z , bundle) => {
-    const url = bundle.authData.url+'/api/index.php/login';
-    // Normally you want to make a request to an endpoint that is either specifically designed to test auth, or one that
-    // every user will have access to, such as an account or profile endpoint like /me.
-    // In this example, we'll hit httpbin, which validates the Authorization Header against the arguments passed in the URL path
-    const promise = z.request({
-        url: url,
-    });
-
-    // This method can return any truthy value to indicate the credentials are valid.
-    // Raise an error to show
-    return promise.then((response) => {
-        if (response.status === 401) {
-            throw new Error('The Session Key you supplied is invalid');
-        }
-        return response;
-    });
-};
-
-const getSessionKey = (z, bundle) => {
-    const url = bundle.authData.url + '/api/index.php/login';
-
-    const promise = z.request({
-        method: 'POST',
-        url: url,
-        body: {
-            login: bundle.authData.login,
-            password: bundle.authData.password,
-        }
-    });
-
-    return promise.then((response) => {
-        if (response.status === 401) {
-            throw new Error('The login/password you supplied is invalid');
-        }
-        const json = JSON.parse(response.content);
-        return {
-            sessionKey: json.success.token || 'secret'
-        };
-    });
-};
-
-module.exports = {
-    type: 'session',
-    // Define any auth fields your app requires here. The user will be prompted to enter this info when
-    // they connect their account.
-    fields: [
-        {
-            key: 'url',
-            label: 'Url of service',
-            required: true,
-            type: 'string'
-        },
-        {
-            key: 'login',
-            label: 'Login',
-            required: true,
-            type: 'string'
-        },
-        {
-            key: 'password',
-            label: 'Password',
-            required: true,
-            type: 'password'
-        }
-    ],
-    // The test method allows Zapier to verify that the credentials a user provides are valid. We'll execute this
-    // method whenever a user connects their account for the first time.
-    test: testAuth,
-    // The method that will exchange the fields provided by the user for session credentials.
-    sessionConfig: {
-        perform: getSessionKey
-    },
-    // assuming "login" is a key returned from the test
-    connectionLabel: '{{login}}'
-};

dev/examples/zapier/creates/thirdparty.js

@@ -1,90 +0,0 @@
-/*jshint esversion: 6 */
-// create a particular thirdparty by name
-const createThirdparty = async (z, bundle) => {
-    const apiurl = bundle.authData.url  + '/api/index.php/thirdparties';
-
-    const response = await z.request({
-        method: 'POST',
-        url: apiurl,
-        body: JSON.stringify({
-            name: bundle.inputData.name,
-            name_alias: bundle.inputData.name_alias,
-            ref_ext: bundle.inputData.ref_ext,
-            ref_int: bundle.inputData.ref_int,
-            address: bundle.inputData.address,
-            zip: bundle.inputData.zip,
-            town: bundle.inputData.town,
-            country_code: bundle.inputData.country_code,
-            country_id: bundle.inputData.country_id,
-            country: bundle.inputData.country,
-            phone: bundle.inputData.phone,
-            email: bundle.inputData.email,
-            client: bundle.inputData.client,
-            fournisseur: bundle.inputData.fournisseur,
-            code_client: bundle.inputData.code_client,
-            code_fournisseur: bundle.inputData.code_fournisseur,
-            sens: 'fromzapier'
-        })
-    });
-    const result = z.JSON.parse(response.content);
-    // api returns an integer when ok, a json when ko
-    return result.response || {id: response};
-};
-
-module.exports = {
-    key: 'thirdparty',
-    noun: 'Thirdparty',
-
-    display: {
-        label: 'Create Thirdparty',
-        description: 'Creates a thirdparty.'
-    },
-
-    operation: {
-        inputFields: [
-            {key: 'name', required: true},
-            {key: 'name_alias', required: false},
-            {key: 'address', required: false},
-            {key: 'zip', required: false},
-            {key: 'town', required: false},
-            {key: 'email', required: false},
-            {key: 'client', type: 'integer', required: false},
-            {key: 'fournisseur', type: 'integer', required: false},
-            {key: 'code_client', required: false},
-            {key: 'code_fournisseur', required: false}
-        ],
-        perform: createThirdparty,
-
-        sample: {
-            id: 1,
-            name: 'DUPOND',
-            name_alias: 'DUPOND Ltd',
-            address: 'Rue des Canaries',
-            zip: '34090',
-            town: 'MONTPELLIER',
-            phone: '0123456789',
-            fax: '2345678901',
-            email: 'robot@domain.com',
-            client: 1,
-            fournisseur: 0,
-            code_client: 'CU1903-1234',
-            code_fournisseur: 'SU1903-2345'
-        },
-
-        outputFields: [
-            {key: 'id', label: 'ID'},
-            {key: 'name', label: 'Name'},
-            {key: 'name_alias', label: 'Name alias'},
-            {key: 'address', label: 'Address'},
-            {key: 'zip', label: 'Zip'},
-            {key: 'town', label: 'Town'},
-            {key: 'phone', label: 'Phone'},
-            {key: 'fax', label: 'Fax'},
-            {key: 'email', label: 'Email'},
-            {key: 'client', label: 'Customer/Prospect 0/1/2/3'},
-            {key: 'fournisseur', label: 'Supplier 0/1'},
-            {key: 'code_client', label: 'Customer code'},
-            {key: 'code_fournisseur', label: 'Supplier code'}
-        ]
-    }
-};

dev/examples/zapier/index.js

@@ -1,73 +0,0 @@
-/*jshint esversion: 6 */
-const triggerThirdparty = require('./triggers/thirdparty');
-const triggerOrder = require('./triggers/order');
-const triggerAction = require('./triggers/action');
-
-const searchThirdparty = require('./searches/thirdparty');
-
-const createThirdparty = require('./creates/thirdparty');
-
-const authentication = require('./authentication');
-
-// To include the session key header on all outbound requests, simply define a function here.
-// It runs runs before each request is sent out, allowing you to make tweaks to the request in a centralized spot
-const includeSessionKeyHeader = (request, z, bundle) => {
-    if (bundle.authData.sessionKey) {
-        request.headers = request.headers || {};
-        request.headers['DOLAPIKEY'] = bundle.authData.sessionKey;
-    }
-    return request;
-};
-
-// If we get a response and it is a 401, we can raise a special error telling Zapier to retry this after another exchange.
-const sessionRefreshIf401 = (response, z, bundle) => {
-    if (bundle.authData.sessionKey) {
-        if (response.status === 401) {
-            throw new z.errors.RefreshAuthError('Session apikey needs refreshing.');
-        }
-    }
-    return response;
-};
-
-// We can roll up all our behaviors in an App.
-const App = {
-    // This is just shorthand to reference the installed dependencies you have. Zapier will
-    // need to know these before we can upload
-    version: require('./package.json').version,
-    platformVersion: require('zapier-platform-core').version,
-
-    authentication: authentication,
-
-    // beforeRequest & afterResponse are optional hooks into the provided HTTP client
-    beforeRequest: [
-        includeSessionKeyHeader
-    ],
-
-    afterResponse: [
-        sessionRefreshIf401
-    ],
-
-    // If you want to define optional resources to simplify creation of triggers, searches, creates - do that here!
-    resources: {
-    },
-
-    // If you want your trigger to show up, you better include it here!
-    triggers: {
-        [triggerThirdparty.key]: triggerThirdparty,
-        [triggerOrder.key]: triggerOrder,
-        [triggerAction.key]: triggerAction
-    },
-
-    // If you want your searches to show up, you better include it here!
-    searches: {
-        [searchThirdparty.key]: searchThirdparty,
-    },
-
-    // If you want your creates to show up, you better include it here!
-    creates: {
-        [createThirdparty.key]: createThirdparty,
-    }
-};
-
-// Finally, export the app.
-module.exports = App;

dev/examples/zapier/package-lock.json

@@ -1,405 +0,0 @@
-{
-  "name": "Dolibarr",
-  "version": "1.0.2",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "@types/node": {
-      "version": "8.10.20",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.20.tgz",
-      "integrity": "sha512-M7x8+5D1k/CuA6jhiwuSCmE8sbUWJF0wYsjcig9WrXvwUI5ArEoUBdOXpV4JcEMrLp02/QbDjw+kI+vQeKyQgg==",
-      "optional": true
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
-    },
-    "bluebird": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
-      "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw="
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "browser-stdout": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
-      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
-      "dev": true
-    },
-    "combined-stream": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
-      "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
-    "commander": {
-      "version": "2.15.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
-      "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
-      "dev": true
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "content-disposition": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
-      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
-    },
-    "debug": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-      "dev": true,
-      "requires": {
-        "ms": "2.0.0"
-      }
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
-    },
-    "diff": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
-      "dev": true
-    },
-    "dotenv": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-5.0.1.tgz",
-      "integrity": "sha512-4As8uPrjfwb7VXC+WnLCbXK7y+Ueb2B3zgNCePYfhxS1PYeaO1YTeplffTEcbfLhvFNGLAz90VvJs9yomG7bow=="
-    },
-    "encoding": {
-      "version": "0.1.12",
-      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
-      "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
-      "requires": {
-        "iconv-lite": "~0.4.13"
-      }
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
-    },
-    "form-data": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
-      "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "1.0.6",
-        "mime-types": "^2.1.12"
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "glob": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-      "dev": true,
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "growl": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
-      "dev": true
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true
-    },
-    "he": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
-      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
-      "dev": true
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
-    },
-    "is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
-    },
-    "json-tryparse": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/json-tryparse/-/json-tryparse-1.0.5.tgz",
-      "integrity": "sha1-Khy6CLTjEjNo+p+2o01GQwBFeyc="
-    },
-    "jsonschema": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.1.1.tgz",
-      "integrity": "sha1-PO3o4+QR03eHLu+8n98mODy8Ptk="
-    },
-    "lodash": {
-      "version": "4.17.11",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
-    },
-    "mime-db": {
-      "version": "1.38.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz",
-      "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="
-    },
-    "mime-types": {
-      "version": "2.1.22",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz",
-      "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==",
-      "requires": {
-        "mime-db": "~1.38.0"
-      }
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-      "dev": true
-    },
-    "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "dev": true,
-      "requires": {
-        "minimist": "0.0.8"
-      }
-    },
-    "mocha": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz",
-      "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==",
-      "dev": true,
-      "requires": {
-        "browser-stdout": "1.3.1",
-        "commander": "2.15.1",
-        "debug": "3.1.0",
-        "diff": "3.5.0",
-        "escape-string-regexp": "1.0.5",
-        "glob": "7.1.2",
-        "growl": "1.10.5",
-        "he": "1.1.1",
-        "minimatch": "3.0.4",
-        "mkdirp": "0.5.1",
-        "supports-color": "5.4.0"
-      }
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node-fetch": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.1.tgz",
-      "integrity": "sha512-j8XsFGCLw79vWXkZtMSmmLaOk9z5SQ9bV/tkbZVCqvgwzrjAGq66igobLofHtF63NvMTp2WjytpsNTGKa+XRIQ==",
-      "requires": {
-        "encoding": "^0.1.11",
-        "is-stream": "^1.0.1"
-      }
-    },
-    "oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "semver": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-      "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
-    },
-    "should": {
-      "version": "13.2.3",
-      "resolved": "https://registry.npmjs.org/should/-/should-13.2.3.tgz",
-      "integrity": "sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ==",
-      "dev": true,
-      "requires": {
-        "should-equal": "^2.0.0",
-        "should-format": "^3.0.3",
-        "should-type": "^1.4.0",
-        "should-type-adaptors": "^1.0.1",
-        "should-util": "^1.0.0"
-      }
-    },
-    "should-equal": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/should-equal/-/should-equal-2.0.0.tgz",
-      "integrity": "sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==",
-      "dev": true,
-      "requires": {
-        "should-type": "^1.4.0"
-      }
-    },
-    "should-format": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz",
-      "integrity": "sha1-m/yPdPo5IFxT04w01xcwPidxJPE=",
-      "dev": true,
-      "requires": {
-        "should-type": "^1.3.0",
-        "should-type-adaptors": "^1.0.1"
-      }
-    },
-    "should-type": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/should-type/-/should-type-1.4.0.tgz",
-      "integrity": "sha1-B1bYzoRt/QmEOmlHcZ36DUz/XPM=",
-      "dev": true
-    },
-    "should-type-adaptors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz",
-      "integrity": "sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==",
-      "dev": true,
-      "requires": {
-        "should-type": "^1.3.0",
-        "should-util": "^1.0.0"
-      }
-    },
-    "should-util": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/should-util/-/should-util-1.0.0.tgz",
-      "integrity": "sha1-yYzaN0qmsZDfi6h8mInCtNtiAGM=",
-      "dev": true
-    },
-    "supports-color": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-      "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-      "dev": true,
-      "requires": {
-        "has-flag": "^3.0.0"
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    },
-    "zapier-platform-core": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/zapier-platform-core/-/zapier-platform-core-8.0.1.tgz",
-      "integrity": "sha512-vuAe7JkFQ88AeQ//NwwNEh8ZjiZr30GRWtwYo7Wo/nx1cqZwq+CRc9zJU2WRrhJfJOtOOTUF6w+pArBTtMOC5A==",
-      "requires": {
-        "@types/node": "8.10.20",
-        "bluebird": "3.5.0",
-        "content-disposition": "0.5.2",
-        "dotenv": "5.0.1",
-        "form-data": "2.3.2",
-        "lodash": "4.17.11",
-        "node-fetch": "1.7.1",
-        "oauth-sign": "0.9.0",
-        "semver": "5.6.0",
-        "zapier-platform-schema": "8.0.1"
-      }
-    },
-    "zapier-platform-schema": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/zapier-platform-schema/-/zapier-platform-schema-8.0.1.tgz",
-      "integrity": "sha512-97KJ0xVLtpU4BiXVaMTPQpiA0T6CQIEzWfzAWwJAWbu5336+6DMFUzDWN4bANBeD3CIsRHHPcZkP8n/17U05ag==",
-      "requires": {
-        "jsonschema": "1.1.1",
-        "lodash": "4.17.10"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.10",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
-          "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
-        }
-      }
-    }
-  }
-}