Prepare 10.0.7

Conflicts:
	htdocs/product/class/product.class.php

.editorconfig

@@ -1,14 +1,21 @@
-# EditorConfig is awesome: http://EditorConfig.org
+# EditorConfig is awesome: https://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

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

.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 your commit messages during release process by the project manager.
+Please don't edit the ChangeLog file. File will be generated from all commit messages during release process by the project manager.
 
 ### <a name="commits"></a>Commits
 Use clear commit messages with the following structure:
@@ -56,13 +56,15 @@ 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: for a bug fix
+- Fix/FIX: for a bug fix
-- Close: for closing a referenced feature request
+- New/NEW: for an unreferenced new feature (Opening a feature request and using close is prefered)
-- New: for an unreferenced new feature (Opening a feature request and using close is prefered)
+- Close/CLOSE: for closing a referenced feature request
 
 #### Issuenum
 If your commit fixes a referenced bug or feature request.
@@ -85,14 +87,14 @@ This section can span multiple lines.
 
 Try to keep lines under 120 characters.
 
-#### Samples
+#### Examples
 <pre>
 FIX|Fix #456 Short description (where #456 is number of bug fix, if it exists. In upper case to appear into ChangeLog)
 or
-CLOSE|Close #456 Short description (where #456 is number of feature request, if it exists. In upper case to appear into ChangeLog)
-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
 Short description (when the commit is not introducing feature nor closing a bug)
 
 Long description (Can span accross multiple lines).
@@ -104,13 +106,23 @@ 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 must pass the Continuous Integration checks.
+Your Pull Request (PR) must pass the Continuous Integration checks.
 Also, some code changes need a prior approbation:
 
 * if you want to include a new external library (into htdocs/includes directory), please ask before to the project manager (@eldy) to see if such a library can be accepted.
 
 * if you 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 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 give you information of things you have to do to have the PR taken into consideration (for example a change is requested, a conflict is expected to be solved, some questions were asked). If you have a yellow, red flag of purple flag, don't expect to have your PR validated. You must first provide the answer the flag ask you. The majority of PR are waiting a developer action.
+
+Around 95% of submitted PR are reviewed and tagged. Even if this is one of the most important ratio of answered PR in Open Source world, don't expect the core team to reach the 100%. With the increasing popularity of Dolibarr, this ratio will probably decrease in future.
+
+
 ### Resources
 [Developer documentation](http://wiki.dolibarr.org/index.php/Developer_documentation)
 
@@ -120,9 +132,12 @@ 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/).
 
-Join an existing translation team or create your own and translate into the interface.
+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. 
 
-Your translations will be available in the next major release.
 
 ### Resources
 [Translator documentation](http://wiki.dolibarr.org/index.php/Translator_documentation)
@@ -131,5 +146,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.
+*Note*: to help prevent spam, you need to create an account before being able to edit. Everybody is welcome to contribute to its content.
 

.mailmap

@@ -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.dolibarr@gmail.com> aspangaro <aspangaro.dolibarr@gmail.com>
+Alexandre Spangaro <aspangaro@open-dsi.fr> aspangaro <aspangaro@open-dsi.fr>
-Alexandre Spangaro <aspangaro.dolibarr@gmail.com> Spangaro Alexandre <aspangaro.dolibarr@gmail.com>
+Alexandre Spangaro <aspangaro@open-dsi.fr> Spangaro Alexandre <aspangaro@open-dsi.fr>
-Alexandre Spangaro <aspangaro.dolibarr@gmail.com> Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
+Alexandre Spangaro <aspangaro@open-dsi.fr> Alexandre SPANGARO <aspangaro@open-dsi.fr>
 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>

.stickler.yml

@@ -0,0 +1,10 @@
+---
+linters:
+  phpcs:
+      standard: 'dev/setup/codesniffer/ruleset.xml'
+      extensions: 'php'
+      tab_width: 4
+      fixer: true
+
+fixers:
+    enable: true

.travis.yml

@@ -3,6 +3,7 @@
 # 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
 sudo: required
 
@@ -31,7 +32,6 @@ addons:
     - pgloader
 
 php:
-- '5.4'
 - '5.5'
 - '5.6'
 - '7.0'
@@ -62,8 +62,6 @@ matrix:
   - php: nightly
   # We exclude some combinations not usefull to save Travis CPU
   exclude:
-  - php: '5.5'
-    env: DB=mariadb
   - php: '5.6'
     env: DB=mariadb
   - php: '7.0'
@@ -72,8 +70,6 @@ matrix:
     env: DB=mariadb
   - php: '7.2'
     env: DB=mariadb
-  - php: '5.5'
-    env: DB=postgresql
   - php: '5.6'
     env: DB=postgresql
   - php: '7.0'
@@ -299,7 +295,7 @@ script:
   # Ensure we catch errors
   set -e
   #parallel-lint --exclude htdocs/includes --blame .
-  parallel-lint --exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared --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/myclabs --exclude htdocs/includes/webmozart --exclude htdocs/includes/phpspec --exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian --exclude htdocs/includes/squizlabs/php_codesniffer/tests --exclude htdocs/includes/jakub-onderka/php-parallel-lint/tests --exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/phpunit/php-token-stream/tests --exclude htdocs/includes/composer/autoload_static.php --blame .
   set +e
   echo
 
@@ -309,7 +305,7 @@ script:
   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 .
-  phpcs -s -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .
+  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
   set +e
   echo
 
@@ -352,6 +348,9 @@ script:
   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
   # 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 $?

.tx/config

@@ -236,6 +236,12 @@ 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
@@ -314,6 +320,12 @@ 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
@@ -397,3 +409,4 @@ file_filter = htdocs/langs/<lang>/workflow.lang
 source_file = htdocs/langs/en_US/workflow.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
+

COPYRIGHT

@@ -13,28 +13,31 @@ Component              Version       License                     GPL Compatible
 -------------------------------------------------------------------------------------
 PHP libraries:
 AdoDb-Date             0.36          Modified BSD License        Yes             Date convertion (not into rpm package)
-ChromePHP              4.1.0         Apache Software License 2.0 Yes             Return server log to chrome browser console
+CKEditor               4.11.4        LGPL-2.1+                   Yes             Editor WYSIWYG
-CKEditor               4.6.2         LGPL-2.1+                   Yes             Editor WYSIWYG
 EvalMath               1.0           BSD                         Yes             Safe math expressions evaluation
-Escpos-php                           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.17        MIT License                 Yes             Detect mobile devices browsers
+Mobiledetect           2.8.83        MIT License                 Yes             Detect mobile devices browsers
 NuSoap                 0.9.5         LGPL 2.1+                   Yes             Library to develop SOAP Web services (not into rpm and deb package)
 PEAR Mail_MIME         1.8.9         BSD                         Yes             NuSoap dependency
-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)
-TCPDF                  6.2.12        LGPL-3+                     Yes             PDF generation
+Sabre                  3.2.2         BSD                         Yes             DAV support
-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
+Stripe                 6.41          MIT licence                 Yes             Library for Stripe module
+TCPDF                  6.2.25        LGPL-3+                     Yes             PDF generation
+TCPDI                  1.0.0         LGPL-3+ / Apache 2.0        Yes             FPDI replacement
 
 JS libraries:
-jQuery                 3.1.1         MIT License                 Yes             JS library
+jQuery                 3.3.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 blockUI         2.70.0        GPL and MIT License         Yes             JS library plugin blockUI (to use ajax popups)
@@ -53,9 +56,12 @@ JsTimezoneDetect       1.0.6         MIT License                 Yes
 SwaggerUI			   2.0.24		 GPL-2+                      Yes             JS library to offer the REST API explorer
 Ace                    1.2.8         BSD                         Yes             JS library to get code syntaxique coloration in a textarea.    
 
-Image libraries
+Image libraries:
 Octicons               8.1           MIT                         Yes
 
+Font libraries:
+Fontawesome            5.7.2         Font Awesome Free licence   Yes
+
 
 For licenses compatibility informations:
 http://www.gnu.org/licenses/licenses.en.html

README.md

@@ -1,6 +1,6 @@
 # DOLIBARR ERP & CRM
 
-![Downloads per day](https://img.shields.io/sourceforge/dm/dolibarr.svg)
+![Downloads per day](https://img.shields.io/sourceforge/dw/dolibarr.svg)
 [![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
 
 |6|7|8|9|develop|
@@ -47,7 +47,7 @@ You can use a Web server and a supported database (MariaDB, MySQL or PostgreSQL)
 
   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 you'r web server does not have directory to point to already defined. 
+- 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)
 
@@ -67,6 +67,11 @@ You can use a Web server and a supported database (MariaDB, MySQL or PostgreSQL)
    
 - 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
 
@@ -133,7 +138,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - 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)
-- 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))
+- 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.
 - APIs.
 - An easy to understand, maintain and develop code (PHP with no heavy framework; trigger and hook architecture)

build/doxygen/doxygen_header.html

@@ -42,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 align="right"><!-- banner start -->
+		<td class="right"><!-- banner start -->
 		<table cellpadding="0" cellspacing="0" class="moduletablemybanner">
 			<tr>
 				<td>

build/exe/doliwamp/Languages/MyEnglish.isl

@@ -11,7 +11,7 @@ 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 softwares like Apache, Mysql and PHP) on your computer.
+YouWillInstallDoliWamp=You will install or upgrade DoliWamp (so Dolibarr + all required third party software like Apache, Mysql and PHP) on your computer.
 ThisAssistantInstallOrUpgrade=WARNING: Using an ERP CRM installed on a local computer can be dangerous: if your computer break down, you can lose all your data. Do this if you are ready to manage backup yourself seriously. If not, use an installation in Saas instead (see https://saas.dolibarr.org).
 IfYouHaveTechnicalKnowledge=Moreover, if you have technical knowledges and want to manage your Apache, Mysql and PHP yourself, you should not use this assistant and make a manual installation of Dolibarr on your existing server with Apache, Mysql and PHP.
 ButIfYouLook=But if you look for an automatic setup on your local computer, you''re on the good way...

build/exe/doliwamp/README.md

@@ -1,7 +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 and all prerequisites like the web server, and the database in one autoinstall process.
+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.
 
 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/doliwamp.iss

@@ -31,7 +31,7 @@ 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 softwares.
+AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql software.
 AppCopyright=Copyright (C) 2008-2019 Laurent Destailleur (NLTechno), Fabian Rodriguez (Le Goût du Libre)
 DefaultDirName=c:\dolibarr
 DefaultGroupName=Dolibarr

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 webmaster@localhost
+ServerAdmin doliwamp@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 softwares
+# Declare alias for Dolibarr, PHPMyAdmin and other software
 Include "WAMPROOT/alias/*.conf"

build/exe/doliwamp/index.php.install

@@ -527,10 +527,10 @@ a:hover {
 </head>
 
 <body>
-<table width="100%"><tr><td align="left">
+<table width="100%"><tr><td class="left">
 	<img src="index.php?img=pngLogo">
 </td>
-<td align="right">
+<td class="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>
@@ -587,4 +587,4 @@ a:hover {
 EOPAGE;
 
 echo $pageContents;
-?>
+?>

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

@@ -5,6 +5,7 @@
 // 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

@@ -653,6 +653,8 @@ 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
@@ -665,6 +667,7 @@ 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

build/exe/doliwamp/rundoliadmin.bat.install

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

build/exe/doliwamp/rundolihelp.bat.install

@@ -5,3 +5,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/"

build/exe/doliwamp/rundoliwamp.bat.install

@@ -4,6 +4,8 @@ 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/"
 
 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/"

build/generate_filelist_xml.php

@@ -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__);
@@ -45,8 +45,7 @@ require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
 $includecustom=0;
 $includeconstants=array();
 
-if (empty($argv[1]))
+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";
     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;
@@ -54,14 +53,11 @@ if (empty($argv[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;
         }
@@ -70,50 +66,39 @@ while ($i < $argc)
     $i++;
 }
 
-if (empty($release))
+if (empty($release)) {
-{
+    print "Error: Missing release paramater\n";
-	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";
-	print "Usage: ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
+    exit -1;
-	exit -1;
 }
 
 $savrelease = $release;
 
 // If release is auto, we take current version
 $tmpver=explode('-', $release, 2);
-if ($tmpver[0] == 'auto' || $tmpver[0] == 'autostable')
+if ($tmpver[0] == 'auto' || $tmpver[0] == 'autostable') {
-{
+    $release=DOL_VERSION;
-	$release=DOL_VERSION;
+    if ($tmpver[1] && $tmpver[0] == 'auto') $release.='-'.$tmpver[1];
-	if ($tmpver[1] && $tmpver[0] == 'auto') $release.='-'.$tmpver[1];
 }
 
-if (empty($includecustom))
+if (empty($includecustom)) {
-{
+    $tmpverbis=explode('-', $release, 2);
-	$tmpverbis=explode('-', $release, 2);
+    if (empty($tmpverbis[1]) || $tmpver[0] == 'autostable') {
-	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";
-		if (DOL_VERSION != $tmpverbis[0] && $savrelease != 'auto')
+            print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
-	    {
+            exit -1;
-	    	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";
+    } else {
-	        exit -1;
+        $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";
-	else
+            print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
-	{
+            exit -1;
-		$tmpverter=explode('-', DOL_VERSION, 2);
+        }
-		if ($tmpverter[0] != $tmpverbis[0])
+    }
-		{
+} else {
-			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";
+    if (! preg_match('/'.preg_quote(DOL_VERSION, '/').'-/', $release)) {
-			print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
-			exit -1;
-		}
-	}
-}
-else
-{
-    if (! preg_match('/'.preg_quote(DOL_VERSION,'/').'-/',$release))
-    {
         print 'Error: When parameter "includecustom" is set, version declared into filefunc.inc.php ('.DOL_VERSION.') must be used with a suffix into "release" parameter (ex: '.DOL_VERSION.'-mydistrib).'."\n";
         print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
         exit -1;
@@ -121,12 +106,11 @@ else
 }
 
 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 ($includeconstants as $countrycode => $tmp) {
-{
+    foreach($tmp as $constname => $constvalue) {
-    foreach($tmp as $constname => $constvalue)
-    {
         print $constname.'='.$constvalue." ";
     }
 }
@@ -135,20 +119,18 @@ 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");
@@ -163,16 +145,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|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
+$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|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'];
+    $file = $filetmp['fullname'];
-	//$newdir = str_replace(dirname(__FILE__).'/../htdocs', '', dirname($file));
+    //$newdir = str_replace(dirname(__FILE__).'/../htdocs', '', dirname($file));
-	$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
+    $newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
-	if ($newdir!=$dir) {
+    if ($newdir!=$dir) {
         if ($needtoclose)
             fputs($fp, '  </dir>'."\n");
         fputs($fp, '  <dir name="'.$newdir.'" >'."\n");
@@ -191,7 +173,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");
 
 
@@ -211,10 +193,10 @@ $files = dol_dir_list(dirname(__FILE__).'/../scripts/', 'files', 1, $regextoincl
 $dir='';
 $needtoclose=0;
 foreach ($files as $filetmp) {
-	$file = $filetmp['fullname'];
+    $file = $filetmp['fullname'];
-	//$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
+    //$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
-	$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
+    $newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
-	$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
+    $newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
     if ($newdir!=$dir) {
         if ($needtoclose)
             fputs($fp, '  </dir>'."\n");
@@ -233,7 +215,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/makepack-dolibarr.pl

@@ -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','([\d\.a-z\-]+)'\)/ ) { $PROJVERSION = $1; break; }
+	if ( $_ =~ /define\('DOL_VERSION',\s*'([\d\.a-z\-]+)'\)/ ) { $PROJVERSION = $1; break; }
 }
 close IN;
 ($MAJOR,$MINOR,$BUILD)=split(/\./,$PROJVERSION,3);
@@ -357,17 +357,16 @@ 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\' | 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 `git rev-list --boundary '.$MAJOR.'.'.$MINOR.'..origin/develop | grep ^- | cut -c2- | head -n 1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\|CLOSE\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/CLOSE/NEW/g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
 		}
 		else			# For a maintenance release
 		{
-			#print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-1).'.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\' | 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).'.. --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\' | 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\|CLOSE\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/CLOSE/NEW/g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
-			
 		}
 		print "\n";
 		if (! $ret)
@@ -382,11 +381,15 @@ 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)
 		{
@@ -458,15 +461,18 @@ if ($nboftargetok) {
 		print "Clean $BUILDROOT\n";
 		$ret=`rm -f  $BUILDROOT/$PROJECT/.buildpath`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/.editorconfig`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/.codeclimate`;
 		$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`;
@@ -1002,7 +1008,7 @@ if ($nboftargetok) {
 			$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/myobject.php`;
+			$ret=`chmod -R 755 $BUILDROOT/$PROJECT.tmp/htdocs/modulebuilder/template/scripts/mymodule.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 {} \\; ";

build/perl/virtualmin/dolibarr.pl

@@ -1,7 +1,7 @@
 #----------------------------------------------------------------------------
 # \file         dolibarr.pl
 # \brief        Dolibarr script install for Virtualmin Pro
-# \author       (c)2009-2018 Regis Houssin  <regis.houssin@inodbox.com>
+# \author       (c)2009-2019 Regis Houssin  <regis.houssin@inodbox.com>
 #----------------------------------------------------------------------------
 
 
@@ -30,7 +30,7 @@ return "Regis Houssin";
 # script_dolibarr_versions()
 sub script_dolibarr_versions
 {
-return ( "9.0.0", "8.0.3", "7.0.4", "6.0.8", "5.0.7" );
+return ( "10.0.0", "9.0.3", "8.0.5", "7.0.5", "6.0.8" );
 }
 
 sub script_dolibarr_release
@@ -390,6 +390,7 @@ 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" :

build/phpstan/bootstrap.php

@@ -0,0 +1,14 @@
+<?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 finctions 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_fedora.spec

@@ -165,6 +165,7 @@ done >>%{name}.lang
 %_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
@@ -179,6 +180,7 @@ done >>%{name}.lang
 %_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
@@ -200,6 +202,7 @@ 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,6 +211,7 @@ 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/societe
 %_datadir/dolibarr/htdocs/stripe

build/rpm/dolibarr_generic.spec

@@ -245,6 +245,7 @@ done >>%{name}.lang
 %_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
@@ -259,6 +260,7 @@ done >>%{name}.lang
 %_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
@@ -280,6 +282,7 @@ 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
@@ -288,6 +291,7 @@ 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/societe
 %_datadir/dolibarr/htdocs/stripe

build/rpm/dolibarr_mandriva.spec

@@ -162,6 +162,7 @@ done >>%{name}.lang
 %_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
@@ -176,6 +177,7 @@ done >>%{name}.lang
 %_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
@@ -197,6 +199,7 @@ 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
@@ -205,6 +208,7 @@ 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/societe
 %_datadir/dolibarr/htdocs/stripe

build/rpm/dolibarr_opensuse.spec

@@ -173,6 +173,7 @@ done >>%{name}.lang
 %_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
@@ -187,6 +188,7 @@ done >>%{name}.lang
 %_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
@@ -208,6 +210,7 @@ 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
@@ -216,6 +219,7 @@ 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/societe
 %_datadir/dolibarr/htdocs/stripe

composer.json

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

composer.lock

@@ -4,9 +4,59 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "c586663818e933f26657871d86d01dc6",
+    "content-hash": "949d55d933c4e0725a2086a189595483",
-    "content-hash": "09e891bb978d35a48902a5f57760aee9",
     "packages": [
+        {
+            "name": "atgp/factur-x",
+            "version": "v1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/atgp/factur-x.git",
+                "reference": "22e22c3b5dfbb0f25afbd7c3fe69a0305199414c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/atgp/factur-x/zipball/22e22c3b5dfbb0f25afbd7c3fe69a0305199414c",
+                "reference": "22e22c3b5dfbb0f25afbd7c3fe69a0305199414c",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-fileinfo": "*",
+                "ext-libxml": "*",
+                "ext-simplexml": "*",
+                "ext-zlib": "*",
+                "php": ">=5.6",
+                "setasign/fpdi-fpdf": "^2.0",
+                "smalot/pdfparser": "^0.13.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Atgp\\FacturX\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Lucas Gouy-Pailler",
+                    "email": "lucas.gouypailler@atgp.net"
+                }
+            ],
+            "description": "PHP library to manage your Factur-X / ZUGFeRD 2.0 PDF invoices files",
+            "keywords": [
+                "ZUGFeRD",
+                "factur-x",
+                "invoice",
+                "pdf",
+                "php",
+                "xml"
+            ],
+            "time": "2019-01-16T10:09:35+00:00"
+        },
         {
             "name": "ccampbell/chromephp",
             "version": "4.1.0",
@@ -48,20 +98,20 @@
                 "log",
                 "logging"
             ],
-            "time": "2013-06-26 03:44:33"
+            "time": "2013-06-26T03:44:33+00:00"
         },
         {
             "name": "ckeditor/ckeditor",
-            "version": "4.5.11",
+            "version": "4.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ckeditor/ckeditor-releases.git",
-                "reference": "48155a1e1c7e84736b5a166ad3f33acea2a51255"
+                "reference": "268078ab43195b6004d64bc8764c41f2f829640e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ckeditor/ckeditor-releases/zipball/48155a1e1c7e84736b5a166ad3f33acea2a51255",
+                "url": "https://api.github.com/repos/ckeditor/ckeditor-releases/zipball/268078ab43195b6004d64bc8764c41f2f829640e",
-                "reference": "48155a1e1c7e84736b5a166ad3f33acea2a51255",
+                "reference": "268078ab43195b6004d64bc8764c41f2f829640e",
                 "shasum": ""
             },
             "type": "library",
@@ -89,7 +139,7 @@
                 "text",
                 "wysiwyg"
             ],
-            "time": "2016-09-07 13:32:39"
+            "time": "2017-01-12T17:36:48+00:00"
         },
         {
             "name": "mike42/escpos-php",
@@ -153,7 +203,7 @@
                 "print",
                 "receipt"
             ],
-            "time": "2016-04-25 01:14:07"
+            "time": "2016-04-25T01:14:07+00:00"
         },
         {
             "name": "mobiledetect/mobiledetectlib",
@@ -207,7 +257,7 @@
                 "mobile detector",
                 "php mobile detect"
             ],
-            "time": "2015-09-17 14:45:21"
+            "time": "2015-09-17T14:45:21+00:00"
         },
         {
             "name": "phpoffice/phpexcel",
@@ -264,7 +314,8 @@
                 "xls",
                 "xlsx"
             ],
-            "time": "2015-05-01 07:00:55"
+            "abandoned": "phpoffice/phpspreadsheet",
+            "time": "2015-05-01T07:00:55+00:00"
         },
         {
             "name": "restler/framework",
@@ -273,12 +324,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Luracast/Restler-Framework.git",
-                "reference": "3388d76e73a81f871ce5baa906271071b12cd17f"
+                "reference": "6bc0968f8c8aa47c9a62d548b9d7e34f1ed4fc09"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Luracast/Restler-Framework/zipball/3388d76e73a81f871ce5baa906271071b12cd17f",
+                "url": "https://api.github.com/repos/Luracast/Restler-Framework/zipball/6bc0968f8c8aa47c9a62d548b9d7e34f1ed4fc09",
-                "reference": "3388d76e73a81f871ce5baa906271071b12cd17f",
+                "reference": "6bc0968f8c8aa47c9a62d548b9d7e34f1ed4fc09",
                 "shasum": ""
             },
             "require": {
@@ -325,20 +376,209 @@
                 "rest",
                 "server"
             ],
-            "time": "2016-06-21 12:42:18"
+            "time": "2018-01-06T01:39:27+00:00"
         },
         {
-            "name": "tecnickcom/tcpdf",
+            "name": "setasign/fpdf",
-            "version": "6.2.12",
+            "version": "1.8.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/tecnickcom/TCPDF.git",
+                "url": "https://github.com/Setasign/FPDF.git",
-                "reference": "2f732eaa91b5665274689b1d40b285a7bacdc37f"
+                "reference": "2c68c9e6c034ac3187d25968790139a73184cdb1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/2f732eaa91b5665274689b1d40b285a7bacdc37f",
+                "url": "https://api.github.com/repos/Setasign/FPDF/zipball/2c68c9e6c034ac3187d25968790139a73184cdb1",
-                "reference": "2f732eaa91b5665274689b1d40b285a7bacdc37f",
+                "reference": "2c68c9e6c034ac3187d25968790139a73184cdb1",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "fpdf.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "no usage restriction"
+            ],
+            "authors": [
+                {
+                    "name": "Olivier Plathey",
+                    "email": "oliver@fpdf.org",
+                    "homepage": "http://fpdf.org/"
+                }
+            ],
+            "description": "FPDF is a PHP class which allows to generate PDF files with pure PHP. F from FPDF stands for Free: you may use it for any kind of usage and modify it to suit your needs.",
+            "homepage": "http://www.fpdf.org",
+            "keywords": [
+                "fpdf",
+                "pdf"
+            ],
+            "time": "2016-01-01T17:47:15+00:00"
+        },
+        {
+            "name": "setasign/fpdi",
+            "version": "v2.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Setasign/FPDI.git",
+                "reference": "3c266002f8044f61b17329f7cd702d44d73f0f7f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Setasign/FPDI/zipball/3c266002f8044f61b17329f7cd702d44d73f0f7f",
+                "reference": "3c266002f8044f61b17329f7cd702d44d73f0f7f",
+                "shasum": ""
+            },
+            "require": {
+                "ext-zlib": "*",
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~5.7",
+                "setasign/fpdf": "~1.8",
+                "setasign/tfpdf": "1.25",
+                "tecnickcom/tcpdf": "~6.2"
+            },
+            "suggest": {
+                "setasign/fpdf": "FPDI will extend this class but as it is also possible to use TCPDF or tFPDF as an alternative. There's no fixed dependency configured.",
+                "setasign/fpdi-fpdf": "Use this package to automatically evaluate dependencies to FPDF.",
+                "setasign/fpdi-tcpdf": "Use this package to automatically evaluate dependencies to TCPDF.",
+                "setasign/fpdi-tfpdf": "Use this package to automatically evaluate dependencies to tFPDF."
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "setasign\\Fpdi\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jan Slabon",
+                    "email": "jan.slabon@setasign.com",
+                    "homepage": "https://www.setasign.com"
+                },
+                {
+                    "name": "Maximilian Kresse",
+                    "email": "maximilian.kresse@setasign.com",
+                    "homepage": "https://www.setasign.com"
+                }
+            ],
+            "description": "FPDI is a collection of PHP classes facilitating developers to read pages from existing PDF documents and use them as templates in FPDF. Because it is also possible to use FPDI with TCPDF, there are no fixed dependencies defined. Please see suggestions for packages which evaluates the dependencies automatically.",
+            "homepage": "https://www.setasign.com/fpdi",
+            "keywords": [
+                "fpdf",
+                "fpdi",
+                "pdf"
+            ],
+            "time": "2019-01-30T14:11:19+00:00"
+        },
+        {
+            "name": "setasign/fpdi-fpdf",
+            "version": "v2.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Setasign/FPDI-FPDF.git",
+                "reference": "e4363ac09e1b766b38ebea1c3cbe82b3480a11e9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Setasign/FPDI-FPDF/zipball/e4363ac09e1b766b38ebea1c3cbe82b3480a11e9",
+                "reference": "e4363ac09e1b766b38ebea1c3cbe82b3480a11e9",
+                "shasum": ""
+            },
+            "require": {
+                "setasign/fpdf": "^1.8",
+                "setasign/fpdi": "^2.2"
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jan Slabon",
+                    "email": "jan.slabon@setasign.com",
+                    "homepage": "https://www.setasign.com"
+                }
+            ],
+            "description": "Kind of metadata package for dependencies of the latest versions of FPDI and FPDF.",
+            "homepage": "https://www.setasign.com/fpdi",
+            "keywords": [
+                "fpdf",
+                "fpdi",
+                "pdf"
+            ],
+            "time": "2019-01-30T14:38:19+00:00"
+        },
+        {
+            "name": "smalot/pdfparser",
+            "version": "v0.13.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/smalot/pdfparser.git",
+                "reference": "c3a050fb9b47ec3a0ce1b6f1b6f48ec822ba04d6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/smalot/pdfparser/zipball/c3a050fb9b47ec3a0ce1b6f1b6f48ec822ba04d6",
+                "reference": "c3a050fb9b47ec3a0ce1b6f1b6f48ec822ba04d6",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "ext-zlib": "*",
+                "php": ">=5.3.0",
+                "tecnickcom/tcpdf": "~6.0"
+            },
+            "require-dev": {
+                "atoum/atoum": "^2.8 | ^3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Smalot\\PdfParser\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastien MALOT",
+                    "email": "sebastien@malot.fr"
+                }
+            ],
+            "description": "Pdf parser library. Can read and extract information from pdf file.",
+            "homepage": "http://www.pdfparser.org",
+            "keywords": [
+                "extract",
+                "parse",
+                "parser",
+                "pdf",
+                "text"
+            ],
+            "time": "2019-01-11T08:49:57+00:00"
+        },
+        {
+            "name": "tecnickcom/tcpdf",
+            "version": "6.2.26",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/tecnickcom/TCPDF.git",
+                "reference": "367241059ca166e3a76490f4448c284e0a161f15"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/367241059ca166e3a76490f4448c284e0a161f15",
+                "reference": "367241059ca166e3a76490f4448c284e0a161f15",
                 "shasum": ""
             },
             "require": {
@@ -347,7 +587,6 @@
             "type": "library",
             "autoload": {
                 "classmap": [
-                    "fonts",
                     "config",
                     "include",
                     "tcpdf.php",
@@ -368,13 +607,13 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "LGPLv3"
+                "LGPL-3.0"
             ],
             "authors": [
                 {
                     "name": "Nicola Asuni",
                     "email": "info@tecnick.com",
-                    "homepage": "http://nicolaasuni.tecnick.com"
+                    "role": "lead"
                 }
             ],
             "description": "TCPDF is a PHP class for generating PDF documents and barcodes.",
@@ -388,7 +627,7 @@
                 "pdf417",
                 "qrcode"
             ],
-            "time": "2015-09-12 10:08:34"
+            "time": "2018-10-16T17:24:05+00:00"
         }
     ],
     "packages-dev": [
@@ -444,7 +683,7 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2015-06-14 21:17:01"
+            "time": "2015-06-14T21:17:01+00:00"
         },
         {
             "name": "jakub-onderka/php-console-color",
@@ -487,7 +726,7 @@
                     "homepage": "http://www.acci.cz"
                 }
             ],
-            "time": "2014-04-08 15:00:19"
+            "time": "2014-04-08T15:00:19+00:00"
         },
         {
             "name": "jakub-onderka/php-console-highlighter",
@@ -531,7 +770,7 @@
                     "homepage": "http://www.acci.cz/"
                 }
             ],
-            "time": "2015-04-20 18:58:01"
+            "time": "2015-04-20T18:58:01+00:00"
         },
         {
             "name": "jakub-onderka/php-parallel-lint",
@@ -578,7 +817,7 @@
             ],
             "description": "This tool check syntax of PHP files about 20x faster than serial check.",
             "homepage": "https://github.com/JakubOnderka/PHP-Parallel-Lint",
-            "time": "2015-12-15 10:42:16"
+            "time": "2015-12-15T10:42:16+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
@@ -632,7 +871,7 @@
                 "reflection",
                 "static analysis"
             ],
-            "time": "2015-12-27 11:43:31"
+            "time": "2015-12-27T11:43:31+00:00"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
@@ -677,7 +916,7 @@
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2016-09-30 07:12:33"
+            "time": "2016-09-30T07:12:33+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
@@ -724,7 +963,7 @@
                     "email": "me@mikevanriel.com"
                 }
             ],
-            "time": "2016-06-10 07:14:17"
+            "time": "2016-06-10T07:14:17+00:00"
         },
         {
             "name": "phpspec/prophecy",
@@ -786,7 +1025,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2016-06-07 08:13:47"
+            "time": "2016-06-07T08:13:47+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -848,7 +1087,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-10-06 15:47:00"
+            "time": "2015-10-06T15:47:00+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -895,7 +1134,7 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2015-06-21 13:08:43"
+            "time": "2015-06-21T13:08:43+00:00"
         },
         {
             "name": "phpunit/php-text-template",
@@ -936,7 +1175,7 @@
             "keywords": [
                 "template"
             ],
-            "time": "2015-06-21 13:50:34"
+            "time": "2015-06-21T13:50:34+00:00"
         },
         {
             "name": "phpunit/php-timer",
@@ -980,7 +1219,7 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2016-05-12 18:03:57"
+            "time": "2016-05-12T18:03:57+00:00"
         },
         {
             "name": "phpunit/php-token-stream",
@@ -1029,7 +1268,7 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2015-09-15 10:49:45"
+            "time": "2015-09-15T10:49:45+00:00"
         },
         {
             "name": "phpunit/phpunit",
@@ -1101,7 +1340,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2016-07-21 06:48:14"
+            "time": "2016-07-21T06:48:14+00:00"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -1157,7 +1396,7 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2015-10-02 06:51:40"
+            "time": "2015-10-02T06:51:40+00:00"
         },
         {
             "name": "phpunit/phpunit-selenium",
@@ -1221,7 +1460,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2016-03-01 10:33:56"
+            "time": "2016-03-01T10:33:56+00:00"
         },
         {
             "name": "sebastian/comparator",
@@ -1285,7 +1524,7 @@
                 "compare",
                 "equality"
             ],
-            "time": "2015-07-26 15:48:44"
+            "time": "2015-07-26T15:48:44+00:00"
         },
         {
             "name": "sebastian/diff",
@@ -1337,7 +1576,7 @@
             "keywords": [
                 "diff"
             ],
-            "time": "2015-12-08 07:14:41"
+            "time": "2015-12-08T07:14:41+00:00"
         },
         {
             "name": "sebastian/environment",
@@ -1387,7 +1626,7 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2016-08-18 05:49:44"
+            "time": "2016-08-18T05:49:44+00:00"
         },
         {
             "name": "sebastian/exporter",
@@ -1454,7 +1693,7 @@
                 "export",
                 "exporter"
             ],
-            "time": "2016-06-17 09:04:28"
+            "time": "2016-06-17T09:04:28+00:00"
         },
         {
             "name": "sebastian/global-state",
@@ -1505,7 +1744,7 @@
             "keywords": [
                 "global state"
             ],
-            "time": "2015-10-12 03:26:01"
+            "time": "2015-10-12T03:26:01+00:00"
         },
         {
             "name": "sebastian/recursion-context",
@@ -1558,7 +1797,7 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2015-11-11 19:50:13"
+            "time": "2015-11-11T19:50:13+00:00"
         },
         {
             "name": "sebastian/version",
@@ -1593,7 +1832,7 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2015-06-21 13:59:46"
+            "time": "2015-06-21T13:59:46+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
@@ -1671,7 +1910,7 @@
                 "phpcs",
                 "standards"
             ],
-            "time": "2016-09-01 23:53:02"
+            "time": "2016-09-01T23:53:02+00:00"
         },
         {
             "name": "symfony/yaml",
@@ -1720,7 +1959,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2016-10-24 18:41:13"
+            "time": "2016-10-24T18:41:13+00:00"
         },
         {
             "name": "webmozart/assert",
@@ -1770,7 +2009,7 @@
                 "check",
                 "validate"
             ],
-            "time": "2016-08-09 15:02:57"
+            "time": "2016-08-09T15:02:57+00:00"
         }
     ],
     "aliases": [],

dev/dolibarr_changes.txt

@@ -8,6 +8,15 @@ 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
@@ -18,6 +27,15 @@ With
 
 
 
+ESCPOS:
+-------
+Replace
+	private $connector;
+With
+	protected $connector;
+
+
+
 NUSOAP:
 -------
 * In file nusoap.php, to avoid a warning,
@@ -41,30 +59,6 @@ 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);
-
-* Replace the continue into switch with a break:
-
-case 're': {
-	// justify block
-	if (!TCPDF_STATIC::empty_string($this->lispacer)) {
-		$this->lispacer = '';
-		continue;
-	}
-
-into 
-case 're': {
-	// justify block
-	if (!TCPDF_STATIC::empty_string($this->lispacer)) {
-		$this->lispacer = '';
-		break;
-	}
-
 * Optionnaly, removed all fonts except 
     dejavusans* (used by greek, arab, persan, romanian, turkish), 
     freemono* (russian), 
@@ -72,7 +66,7 @@ case 're': {
     helvetica* (all other languages),
     zapfdingbats.php (for special chars like form checkboxes)
 
-* Optionnaly, made freemono the default monotype font because we removed courier
+* Optionnaly, made freemono the default monotype font if we removed courier
 In htdocs/includes/tcpdf/tcpdf.php
 -       protected $default_monospaced_font = 'courier';
 +       protected $default_monospaced_font = 'freemono';
@@ -133,6 +127,13 @@ 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:
 --------
@@ -149,7 +150,7 @@ to get
         if ($className == 'Luracast\Restler\mixed') return;
 		...
 
-Change also file Luracast/Restler/explorer/index.html
+Change also content of file htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
 
 +With swagger 2:
 

dev/examples/code/create_invoice.php

@@ -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.
+$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; }
+if (! $result > 0) { dol_print_error('', $user->error); exit; }
 $user->getrights();
 
 
@@ -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

@@ -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.
+$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; }
+if (! $result > 0) { dol_print_error('', $user->error); exit; }
 $user->getrights();
 
 
@@ -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

@@ -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.
+$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; }
+if (! $result > 0) { dol_print_error('', $user->error); exit; }
 $user->getrights();
 
 
@@ -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

@@ -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.
+$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; }
+if (! $result > 0) { dol_print_error('', $user->error); exit; }
 $user->getrights();
 
 
@@ -77,17 +77,17 @@ if ($idobject > 0)
 	else
 	{
 		$error++;
-		dol_print_error($db,$obj->error);
+		dol_print_error($db, $obj->error);
 	}
 }
-else if ($obj->error == 'ErrorLoginAlreadyExists')
+elseif ($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

@@ -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.
+$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; }
+if (! $result > 0) { dol_print_error('', $user->error); exit; }
 $user->getrights();
 
 

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 occurence was moved on tuesday. So this record were added.
+# first occurrence was moved on tuesday. So this record were added.
 BEGIN:VEVENT
 DTSTART;TZID=Europe/Paris:20150519T100000
 DTEND;TZID=Europe/Paris:20150519T110000

dev/examples/mail/README

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

dev/initdata/generate-invoice.php

@@ -43,59 +43,59 @@ require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
 
 define(GEN_NUMBER_FACTURE, 1);
 $year = 2016;
-$dates = array (mktime(12,0,0,1,3,$year),
+$dates = array (mktime(12, 0, 0, 1, 3, $year),
-    mktime(12,0,0,1,9,$year),
+    mktime(12, 0, 0, 1, 9, $year),
-    mktime(12,0,0,2,13,$year),
+    mktime(12, 0, 0, 2, 13, $year),
-    mktime(12,0,0,2,23,$year),
+    mktime(12, 0, 0, 2, 23, $year),
-    mktime(12,0,0,3,30,$year),
+    mktime(12, 0, 0, 3, 30, $year),
-    mktime(12,0,0,4,3,$year),
+    mktime(12, 0, 0, 4, 3, $year),
-    mktime(12,0,0,4,3,$year),
+    mktime(12, 0, 0, 4, 3, $year),
-    mktime(12,0,0,5,9,$year),
+    mktime(12, 0, 0, 5, 9, $year),
-    mktime(12,0,0,5,1,$year),
+    mktime(12, 0, 0, 5, 1, $year),
-    mktime(12,0,0,5,13,$year),
+    mktime(12, 0, 0, 5, 13, $year),
-    mktime(12,0,0,5,19,$year),
+    mktime(12, 0, 0, 5, 19, $year),
-    mktime(12,0,0,5,23,$year),
+    mktime(12, 0, 0, 5, 23, $year),
-    mktime(12,0,0,6,3,$year),
+    mktime(12, 0, 0, 6, 3, $year),
-    mktime(12,0,0,6,19,$year),
+    mktime(12, 0, 0, 6, 19, $year),
-    mktime(12,0,0,6,24,$year),
+    mktime(12, 0, 0, 6, 24, $year),
-    mktime(12,0,0,7,3,$year),
+    mktime(12, 0, 0, 7, 3, $year),
-    mktime(12,0,0,7,9,$year),
+    mktime(12, 0, 0, 7, 9, $year),
-    mktime(12,0,0,7,23,$year),
+    mktime(12, 0, 0, 7, 23, $year),
-    mktime(12,0,0,7,30,$year),
+    mktime(12, 0, 0, 7, 30, $year),
-    mktime(12,0,0,8,9,$year),
+    mktime(12, 0, 0, 8, 9, $year),
-    mktime(12,0,0,9,23,$year),
+    mktime(12, 0, 0, 9, 23, $year),
-    mktime(12,0,0,10,3,$year),
+    mktime(12, 0, 0, 10, 3, $year),
-    mktime(12,0,0,11,12,$year),
+    mktime(12, 0, 0, 11, 12, $year),
-    mktime(12,0,0,11,13,$year),
+    mktime(12, 0, 0, 11, 13, $year),
-    mktime(12,0,0,1,3,($year - 1)),
+    mktime(12, 0, 0, 1, 3, ($year - 1)),
-    mktime(12,0,0,1,9,($year - 1)),
+    mktime(12, 0, 0, 1, 9, ($year - 1)),
-    mktime(12,0,0,2,13,($year - 1)),
+    mktime(12, 0, 0, 2, 13, ($year - 1)),
-    mktime(12,0,0,2,23,($year - 1)),
+    mktime(12, 0, 0, 2, 23, ($year - 1)),
-    mktime(12,0,0,3,30,($year - 1)),
+    mktime(12, 0, 0, 3, 30, ($year - 1)),
-    mktime(12,0,0,4,3,($year - 1)),
+    mktime(12, 0, 0, 4, 3, ($year - 1)),
-    mktime(12,0,0,4,3,($year - 1)),
+    mktime(12, 0, 0, 4, 3, ($year - 1)),
-    mktime(12,0,0,5,9,($year - 1)),
+    mktime(12, 0, 0, 5, 9, ($year - 1)),
-    mktime(12,0,0,5,1,($year - 1)),
+    mktime(12, 0, 0, 5, 1, ($year - 1)),
-    mktime(12,0,0,5,13,($year - 1)),
+    mktime(12, 0, 0, 5, 13, ($year - 1)),
-    mktime(12,0,0,5,19,($year - 1)),
+    mktime(12, 0, 0, 5, 19, ($year - 1)),
-    mktime(12,0,0,5,23,($year - 1)),
+    mktime(12, 0, 0, 5, 23, ($year - 1)),
-    mktime(12,0,0,6,3,($year - 1)),
+    mktime(12, 0, 0, 6, 3, ($year - 1)),
-    mktime(12,0,0,6,19,($year - 1)),
+    mktime(12, 0, 0, 6, 19, ($year - 1)),
-    mktime(12,0,0,6,24,($year - 1)),
+    mktime(12, 0, 0, 6, 24, ($year - 1)),
-    mktime(12,0,0,7,3,($year - 1)),
+    mktime(12, 0, 0, 7, 3, ($year - 1)),
-    mktime(12,0,0,7,9,($year - 1)),
+    mktime(12, 0, 0, 7, 9, ($year - 1)),
-    mktime(12,0,0,7,23,($year - 1)),
+    mktime(12, 0, 0, 7, 23, ($year - 1)),
-    mktime(12,0,0,7,30,($year - 1)),
+    mktime(12, 0, 0, 7, 30, ($year - 1)),
-    mktime(12,0,0,8,9,($year - 1)),
+    mktime(12, 0, 0, 8, 9, ($year - 1)),
-    mktime(12,0,0,9,23,($year - 1)),
+    mktime(12, 0, 0, 9, 23, ($year - 1)),
-    mktime(12,0,0,10,3,($year - 1)),
+    mktime(12, 0, 0, 10, 3, ($year - 1)),
-    mktime(12,0,0,11,12,$year),
+    mktime(12, 0, 0, 11, 12, $year),
-    mktime(12,0,0,11,13,$year),
+    mktime(12, 0, 0, 11, 13, $year),
-    mktime(12,0,0,12,12,$year),
+    mktime(12, 0, 0, 12, 12, $year),
-    mktime(12,0,0,12,13,$year),
+    mktime(12, 0, 0, 12, 13, $year),
 );
 
-$ret=$user->fetch('','admin');
+$ret=$user->fetch('', 'admin');
 if (! $ret > 0)
 {
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
@@ -150,7 +150,7 @@ while ($i < GEN_NUMBER_FACTURE && $result >= 0)
 	$object->mode_reglement_id = 3;
 
     $fuser = new User($db);
-    $fuser->fetch(mt_rand(1,2));
+    $fuser->fetch(mt_rand(1, 2));
     $fuser->getRights();
     
 	$result=$object->create($fuser);
@@ -163,10 +163,10 @@ while ($i < GEN_NUMBER_FACTURE && $result >= 0)
 			$prodid = mt_rand(1, $num_prods);
 			$product=new Product($db);
 			$result=$product->fetch($prodids[$prodid]);
-			$result=$object->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0, '', '', 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type);
+			$result=$object->addline($product->description, $product->price, mt_rand(1, 5), 0, 0, 0, $prodids[$prodid], 0, '', '', 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type);
 		    if ($result < 0)
             {
-                dol_print_error($db,$propal->error);
+                dol_print_error($db, $propal->error);
             }
             $xnbp++;
 		}
@@ -178,11 +178,11 @@ while ($i < GEN_NUMBER_FACTURE && $result >= 0)
 		}
 		else
 		{
-			dol_print_error($db,$object->error);
+			dol_print_error($db, $object->error);
 		}
 	}
 	else
 	{
-		dol_print_error($db,$object->error);
+		dol_print_error($db, $object->error);
 	}
 }

dev/initdata/generate-order.php

@@ -20,8 +20,8 @@
  */
 
 /**
- * 	    \file       dev/initdata/generate-order.php
+ *      \file       dev/initdata/generate-order.php
- * 		\brief      Script example to inject random orders (for load tests)
+ *      \brief      Script example to inject random orders (for load tests)
  */
 
 // Test si mode batch
@@ -49,59 +49,59 @@ require_once DOL_DOCUMENT_ROOT."/commande/class/commande.class.php";
 
 define(GEN_NUMBER_COMMANDE, 10);
 $year = 2016;
-$dates = array (mktime(12,0,0,1,3,$year),
+$dates = array (mktime(12, 0, 0, 1, 3, $year),
-    mktime(12,0,0,1,9,$year),
+    mktime(12, 0, 0, 1, 9, $year),
-    mktime(12,0,0,2,13,$year),
+    mktime(12, 0, 0, 2, 13, $year),
-    mktime(12,0,0,2,23,$year),
+    mktime(12, 0, 0, 2, 23, $year),
-    mktime(12,0,0,3,30,$year),
+    mktime(12, 0, 0, 3, 30, $year),
-    mktime(12,0,0,4,3,$year),
+    mktime(12, 0, 0, 4, 3, $year),
-    mktime(12,0,0,4,3,$year),
+    mktime(12, 0, 0, 4, 3, $year),
-    mktime(12,0,0,5,9,$year),
+    mktime(12, 0, 0, 5, 9, $year),
-    mktime(12,0,0,5,1,$year),
+    mktime(12, 0, 0, 5, 1, $year),
-    mktime(12,0,0,5,13,$year),
+    mktime(12, 0, 0, 5, 13, $year),
-    mktime(12,0,0,5,19,$year),
+    mktime(12, 0, 0, 5, 19, $year),
-    mktime(12,0,0,5,23,$year),
+    mktime(12, 0, 0, 5, 23, $year),
-    mktime(12,0,0,6,3,$year),
+    mktime(12, 0, 0, 6, 3, $year),
-    mktime(12,0,0,6,19,$year),
+    mktime(12, 0, 0, 6, 19, $year),
-    mktime(12,0,0,6,24,$year),
+    mktime(12, 0, 0, 6, 24, $year),
-    mktime(12,0,0,7,3,$year),
+    mktime(12, 0, 0, 7, 3, $year),
-    mktime(12,0,0,7,9,$year),
+    mktime(12, 0, 0, 7, 9, $year),
-    mktime(12,0,0,7,23,$year),
+    mktime(12, 0, 0, 7, 23, $year),
-    mktime(12,0,0,7,30,$year),
+    mktime(12, 0, 0, 7, 30, $year),
-    mktime(12,0,0,8,9,$year),
+    mktime(12, 0, 0, 8, 9, $year),
-    mktime(12,0,0,9,23,$year),
+    mktime(12, 0, 0, 9, 23, $year),
-    mktime(12,0,0,10,3,$year),
+    mktime(12, 0, 0, 10, 3, $year),
-    mktime(12,0,0,11,12,$year),
+    mktime(12, 0, 0, 11, 12, $year),
-    mktime(12,0,0,11,13,$year),
+    mktime(12, 0, 0, 11, 13, $year),
-    mktime(12,0,0,1,3,($year - 1)),
+    mktime(12, 0, 0, 1, 3, ($year - 1)),
-    mktime(12,0,0,1,9,($year - 1)),
+    mktime(12, 0, 0, 1, 9, ($year - 1)),
-    mktime(12,0,0,2,13,($year - 1)),
+    mktime(12, 0, 0, 2, 13, ($year - 1)),
-    mktime(12,0,0,2,23,($year - 1)),
+    mktime(12, 0, 0, 2, 23, ($year - 1)),
-    mktime(12,0,0,3,30,($year - 1)),
+    mktime(12, 0, 0, 3, 30, ($year - 1)),
-    mktime(12,0,0,4,3,($year - 1)),
+    mktime(12, 0, 0, 4, 3, ($year - 1)),
-    mktime(12,0,0,4,3,($year - 1)),
+    mktime(12, 0, 0, 4, 3, ($year - 1)),
-    mktime(12,0,0,5,9,($year - 1)),
+    mktime(12, 0, 0, 5, 9, ($year - 1)),
-    mktime(12,0,0,5,1,($year - 1)),
+    mktime(12, 0, 0, 5, 1, ($year - 1)),
-    mktime(12,0,0,5,13,($year - 1)),
+    mktime(12, 0, 0, 5, 13, ($year - 1)),
-    mktime(12,0,0,5,19,($year - 1)),
+    mktime(12, 0, 0, 5, 19, ($year - 1)),
-    mktime(12,0,0,5,23,($year - 1)),
+    mktime(12, 0, 0, 5, 23, ($year - 1)),
-    mktime(12,0,0,6,3,($year - 1)),
+    mktime(12, 0, 0, 6, 3, ($year - 1)),
-    mktime(12,0,0,6,19,($year - 1)),
+    mktime(12, 0, 0, 6, 19, ($year - 1)),
-    mktime(12,0,0,6,24,($year - 1)),
+    mktime(12, 0, 0, 6, 24, ($year - 1)),
-    mktime(12,0,0,7,3,($year - 1)),
+    mktime(12, 0, 0, 7, 3, ($year - 1)),
-    mktime(12,0,0,7,9,($year - 1)),
+    mktime(12, 0, 0, 7, 9, ($year - 1)),
-    mktime(12,0,0,7,23,($year - 1)),
+    mktime(12, 0, 0, 7, 23, ($year - 1)),
-    mktime(12,0,0,7,30,($year - 1)),
+    mktime(12, 0, 0, 7, 30, ($year - 1)),
-    mktime(12,0,0,8,9,($year - 1)),
+    mktime(12, 0, 0, 8, 9, ($year - 1)),
-    mktime(12,0,0,9,23,($year - 1)),
+    mktime(12, 0, 0, 9, 23, ($year - 1)),
-    mktime(12,0,0,10,3,($year - 1)),
+    mktime(12, 0, 0, 10, 3, ($year - 1)),
-    mktime(12,0,0,11,12,$year),
+    mktime(12, 0, 0, 11, 12, $year),
-    mktime(12,0,0,11,13,$year),
+    mktime(12, 0, 0, 11, 13, $year),
-    mktime(12,0,0,12,12,$year),
+    mktime(12, 0, 0, 12, 12, $year),
-    mktime(12,0,0,12,13,$year),
+    mktime(12, 0, 0, 12, 13, $year),
 );
 
-$ret=$user->fetch('','admin');
+$ret=$user->fetch('', 'admin');
 if ($ret <= 0)
 {
     print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
@@ -113,13 +113,13 @@ $societesid = array();
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe where client in (1, 3)";
 $resql=$db->query($sql);
 if ($resql) {
-	$num_thirdparties = $db->num_rows($resql);
+    $num_thirdparties = $db->num_rows($resql);
-	$i = 0;
+    $i = 0;
-	while ($i < $num_thirdparties) {
+    while ($i < $num_thirdparties) {
-		$i++;
+        $i++;
-	    $row = $db->fetch_row($resql);
+        $row = $db->fetch_row($resql);
-		$societesid[$i] = $row[0];
+        $societesid[$i] = $row[0];
-	}
+    }
 }
 else { print "err"; }
 
@@ -127,35 +127,32 @@ $commandesid = array();
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande";
 $resql=$db->query($sql);
 if ($resql) {
-	$num = $db->num_rows($resql);
+    $num = $db->num_rows($resql);
-	$i = 0;
+    $i = 0;
-	while ($i < $num) {
+    while ($i < $num) {
-		$i++;
+        $i++;
-	    $row = $db->fetch_row($resql);
+        $row = $db->fetch_row($resql);
-		$commandesid[$i] = $row[0];
+        $commandesid[$i] = $row[0];
-	}
+    }
 }
 else { print "err"; }
 
 $prodids = array();
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product WHERE tosell=1";
 $resql = $db->query($sql);
-if ($resql)
+if ($resql) {
-{
+    $num_prods = $db->num_rows($resql);
-  $num_prods = $db->num_rows($resql);
+    $i = 0;
-  $i = 0;
+    while ($i < $num_prods) {
-  while ($i < $num_prods)
+        $i++;
-    {
-      $i++;
 
-      $row = $db->fetch_row($resql);
+        $row = $db->fetch_row($resql);
-      $prodids[$i] = $row[0];
+        $prodids[$i] = $row[0];
     }
 }
 
 
 
-
 print "Build ".GEN_NUMBER_COMMANDE." orders\n";
 for ($s = 0 ; $s < GEN_NUMBER_COMMANDE ; $s++)
 {
@@ -173,18 +170,18 @@ for ($s = 0 ; $s < GEN_NUMBER_COMMANDE ; $s++)
     $object->cond_reglement_id = mt_rand(0, 2);
     $object->more_reglement_id = mt_rand(0, 7);
     $object->availability_id = mt_rand(0, 1);
-    
+
     $listofuserid=array(12,13,16);
-    
+
     $fuser = new User($db);
-    $fuser->fetch($listofuserid[mt_rand(0,2)]);
+    $fuser->fetch($listofuserid[mt_rand(0, 2)]);
     $fuser->getRights();
-    
+
     $db->begin();
 
     $result=$object->create($fuser);
-	if ($result >= 0)
+    if ($result >= 0)
-	{
+    {
         $nbp = mt_rand(2, 5);
         $xnbp = 0;
         while ($xnbp < $nbp)
@@ -192,32 +189,31 @@ for ($s = 0 ; $s < GEN_NUMBER_COMMANDE ; $s++)
             $prodid = mt_rand(1, $num_prods);
             $product=new Product($db);
             $result=$product->fetch($prodids[$prodid]);
-            $result=$object->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0, 0, 0,  $product->price_base_type, $product->price_ttc, '', '', $product->type);
+            $result=$object->addline($product->description, $product->price, mt_rand(1, 5), 0, 0, 0, $prodids[$prodid], 0, 0, 0, $product->price_base_type, $product->price_ttc, '', '', $product->type);
             if ($result <= 0)
             {
-                dol_print_error($db,$object->error);
+                dol_print_error($db, $object->error);
             }
             $xnbp++;
         }
 
-	    $result=$object->valid($fuser);
+        $result=$object->valid($fuser);
-		if ($result > 0)
+        if ($result > 0)
-		{
+        {
             $db->commit();
             print " OK with ref ".$object->ref."\n";
-		}
+        }
-		else
+        else
-		{
+        {
             print " KO\n";
-		    $db->rollback();
+            $db->rollback();
-		    dol_print_error($db,$object->error);
+            dol_print_error($db, $object->error);
-		}
+        }
-	}
+    }
-	else
+    else
-	{
+    {
         print " KO\n";
-	    $db->rollback();
+        $db->rollback();
-	    dol_print_error($db,$object->error);
+        dol_print_error($db, $object->error);
-	}
+    }
 }
-

dev/initdata/generate-product.php

@@ -49,7 +49,7 @@ include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 define(GEN_NUMBER_PRODUIT, 100000);
 
 
-$ret=$user->fetch('','admin');
+$ret=$user->fetch('', 'admin');
 if (! $ret > 0)
 {
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
@@ -85,16 +85,14 @@ for ($s = 0 ; $s < GEN_NUMBER_PRODUIT ; $s++)
 {
     print "Product ".$s;
     $produit = new Product($db);
-    $produit->type = mt_rand(0,1);
+    $produit->type = mt_rand(0, 1);
     $produit->status = 1;
     $produit->ref = ($produit->type?'S':'P').time().$s;
     $produit->label = 'Label '.time().$s;
     $produit->description = 'Description '.time().$s;
-    $produit->price = mt_rand(1,1000);
+    $produit->price = mt_rand(1, 1000);
     $produit->tva_tx = "19.6";
     $ret=$produit->create($user);
     if ($ret < 0) print "Error $ret - ".$produit->error."\n";
 	else print " OK with ref ".$produit->ref."\n";
 }
-
-

dev/initdata/generate-proposal.php

@@ -45,59 +45,59 @@ require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
 
 define(GEN_NUMBER_PROPAL, 10);
 $year = 2016;
-$dates = array (mktime(12,0,0,1,3,$year),
+$dates = array (mktime(12, 0, 0, 1, 3, $year),
-    mktime(12,0,0,1,9,$year),
+    mktime(12, 0, 0, 1, 9, $year),
-    mktime(12,0,0,2,13,$year),
+    mktime(12, 0, 0, 2, 13, $year),
-    mktime(12,0,0,2,23,$year),
+    mktime(12, 0, 0, 2, 23, $year),
-    mktime(12,0,0,3,30,$year),
+    mktime(12, 0, 0, 3, 30, $year),
-    mktime(12,0,0,4,3,$year),
+    mktime(12, 0, 0, 4, 3, $year),
-    mktime(12,0,0,4,3,$year),
+    mktime(12, 0, 0, 4, 3, $year),
-    mktime(12,0,0,5,9,$year),
+    mktime(12, 0, 0, 5, 9, $year),
-    mktime(12,0,0,5,1,$year),
+    mktime(12, 0, 0, 5, 1, $year),
-    mktime(12,0,0,5,13,$year),
+    mktime(12, 0, 0, 5, 13, $year),
-    mktime(12,0,0,5,19,$year),
+    mktime(12, 0, 0, 5, 19, $year),
-    mktime(12,0,0,5,23,$year),
+    mktime(12, 0, 0, 5, 23, $year),
-    mktime(12,0,0,6,3,$year),
+    mktime(12, 0, 0, 6, 3, $year),
-    mktime(12,0,0,6,19,$year),
+    mktime(12, 0, 0, 6, 19, $year),
-    mktime(12,0,0,6,24,$year),
+    mktime(12, 0, 0, 6, 24, $year),
-    mktime(12,0,0,7,3,$year),
+    mktime(12, 0, 0, 7, 3, $year),
-    mktime(12,0,0,7,9,$year),
+    mktime(12, 0, 0, 7, 9, $year),
-    mktime(12,0,0,7,23,$year),
+    mktime(12, 0, 0, 7, 23, $year),
-    mktime(12,0,0,7,30,$year),
+    mktime(12, 0, 0, 7, 30, $year),
-    mktime(12,0,0,8,9,$year),
+    mktime(12, 0, 0, 8, 9, $year),
-    mktime(12,0,0,9,23,$year),
+    mktime(12, 0, 0, 9, 23, $year),
-    mktime(12,0,0,10,3,$year),
+    mktime(12, 0, 0, 10, 3, $year),
-    mktime(12,0,0,11,12,$year),
+    mktime(12, 0, 0, 11, 12, $year),
-    mktime(12,0,0,11,13,$year),
+    mktime(12, 0, 0, 11, 13, $year),
-    mktime(12,0,0,1,3,($year - 1)),
+    mktime(12, 0, 0, 1, 3, ($year - 1)),
-    mktime(12,0,0,1,9,($year - 1)),
+    mktime(12, 0, 0, 1, 9, ($year - 1)),
-    mktime(12,0,0,2,13,($year - 1)),
+    mktime(12, 0, 0, 2, 13, ($year - 1)),
-    mktime(12,0,0,2,23,($year - 1)),
+    mktime(12, 0, 0, 2, 23, ($year - 1)),
-    mktime(12,0,0,3,30,($year - 1)),
+    mktime(12, 0, 0, 3, 30, ($year - 1)),
-    mktime(12,0,0,4,3,($year - 1)),
+    mktime(12, 0, 0, 4, 3, ($year - 1)),
-    mktime(12,0,0,4,3,($year - 1)),
+    mktime(12, 0, 0, 4, 3, ($year - 1)),
-    mktime(12,0,0,5,9,($year - 1)),
+    mktime(12, 0, 0, 5, 9, ($year - 1)),
-    mktime(12,0,0,5,1,($year - 1)),
+    mktime(12, 0, 0, 5, 1, ($year - 1)),
-    mktime(12,0,0,5,13,($year - 1)),
+    mktime(12, 0, 0, 5, 13, ($year - 1)),
-    mktime(12,0,0,5,19,($year - 1)),
+    mktime(12, 0, 0, 5, 19, ($year - 1)),
-    mktime(12,0,0,5,23,($year - 1)),
+    mktime(12, 0, 0, 5, 23, ($year - 1)),
-    mktime(12,0,0,6,3,($year - 1)),
+    mktime(12, 0, 0, 6, 3, ($year - 1)),
-    mktime(12,0,0,6,19,($year - 1)),
+    mktime(12, 0, 0, 6, 19, ($year - 1)),
-    mktime(12,0,0,6,24,($year - 1)),
+    mktime(12, 0, 0, 6, 24, ($year - 1)),
-    mktime(12,0,0,7,3,($year - 1)),
+    mktime(12, 0, 0, 7, 3, ($year - 1)),
-    mktime(12,0,0,7,9,($year - 1)),
+    mktime(12, 0, 0, 7, 9, ($year - 1)),
-    mktime(12,0,0,7,23,($year - 1)),
+    mktime(12, 0, 0, 7, 23, ($year - 1)),
-    mktime(12,0,0,7,30,($year - 1)),
+    mktime(12, 0, 0, 7, 30, ($year - 1)),
-    mktime(12,0,0,8,9,($year - 1)),
+    mktime(12, 0, 0, 8, 9, ($year - 1)),
-    mktime(12,0,0,9,23,($year - 1)),
+    mktime(12, 0, 0, 9, 23, ($year - 1)),
-    mktime(12,0,0,10,3,($year - 1)),
+    mktime(12, 0, 0, 10, 3, ($year - 1)),
-    mktime(12,0,0,11,12,$year),
+    mktime(12, 0, 0, 11, 12, $year),
-    mktime(12,0,0,11,13,$year),
+    mktime(12, 0, 0, 11, 13, $year),
-    mktime(12,0,0,12,12,$year),
+    mktime(12, 0, 0, 12, 12, $year),
-    mktime(12,0,0,12,13,$year),
+    mktime(12, 0, 0, 12, 13, $year),
 );
 
-$ret=$user->fetch('','admin');
+$ret=$user->fetch('', 'admin');
 if (! $ret > 0)
 {
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
@@ -174,7 +174,7 @@ while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 	$object = new Propal($db);
 
     $fuser = new User($db);
-    $fuser->fetch(mt_rand(1,2));
+    $fuser->fetch(mt_rand(1, 2));
     $fuser->getRights();
     
 	$object->contactid = $contids[$socids[$socid]][0];
@@ -193,10 +193,10 @@ while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 			$prodid = mt_rand(1, $num_prods);
 			$product=new Product($db);
 			$result=$product->fetch($prodids[$prodid]);
-			$result=$object->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0);
+			$result=$object->addline($product->description, $product->price, mt_rand(1, 5), 0, 0, 0, $prodids[$prodid], 0);
 			if ($result < 0)
 			{
-				dol_print_error($db,$object->error);
+				dol_print_error($db, $object->error);
 			}
 			$xnbp++;
 		}
@@ -211,11 +211,11 @@ while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 		{
 		    print " KO\n";
 		    $db->rollback();
-		    dol_print_error($db,$object->error);
+		    dol_print_error($db, $object->error);
 		}
 	}
 	else
 	{
-		dol_print_error($db,$object->error);
+		dol_print_error($db, $object->error);
 	}
 }

dev/initdata/generate-thirdparty.php

@@ -52,7 +52,7 @@ $listoflastname = array("Joe","Marc","Steve","Laurent","Nico","Isabelle","Doroth
 define(GEN_NUMBER_SOCIETE, 10);
 
 
-$ret=$user->fetch('','admin');
+$ret=$user->fetch('', 'admin');
 if (! $ret > 0)
 {
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
@@ -91,22 +91,22 @@ for ($s = 0 ; $s < GEN_NUMBER_SOCIETE ; $s++)
     $soc = new Societe($db);
     $soc->name = "Company num ".time()."$s";
     $soc->town = $listoftown[mt_rand(0, count($listoftown)-1)];
-    $soc->client = mt_rand(1,2);		// Une societe sur 2 est prospect, l'autre client
+    $soc->client = mt_rand(1, 2);		// Une societe sur 2 est prospect, l'autre client
-    $soc->fournisseur = mt_rand(0,1);	// Une societe sur 2 est fournisseur
+    $soc->fournisseur = mt_rand(0, 1);	// Une societe sur 2 est fournisseur
     $soc->code_client='CU'.time()."$s";
     $soc->code_fournisseur='SU'.time()."$s";
     $soc->tva_assuj=1;
     $soc->country_id=1;
     $soc->country_code='FR';
 	// Un client sur 3 a une remise de 5%
-    $user_remise=mt_rand(1,3); if ($user_remise==3) $soc->remise_percent=5;
+    $user_remise=mt_rand(1, 3); if ($user_remise==3) $soc->remise_percent=5;
 	print "> client=".$soc->client.", fournisseur=".$soc->fournisseur.", remise=".$soc->remise_percent."\n";
     $soc->note_private = 'Company created by the script generate-societe.php';
     $socid = $soc->create();
 
     if ($socid >= 0)
     {
-        $rand = mt_rand(1,4);
+        $rand = mt_rand(1, 4);
         print "> Generates $rand contact(s)\n";
         for ($c = 0 ; $c < $rand ; $c++)
         {
@@ -127,5 +127,3 @@ for ($s = 0 ; $s < GEN_NUMBER_SOCIETE ; $s++)
     	print "Error: ".$soc->error."\n";
     }
 }
-
-

dev/initdata/import-products.php

@@ -35,7 +35,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Recupere root dolibarr
-$path=preg_replace('/import-products.php/i','',$_SERVER["PHP_SELF"]);
+$path=preg_replace('/import-products.php/i', '', $_SERVER["PHP_SELF"]);
 require $path."../../htdocs/master.inc.php";
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@@ -57,7 +57,7 @@ $error=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".implode(',',$argv));
+dol_syslog($script_file." launched with arg ".implode(',', $argv));
 
 $mode = $argv[1];
 $filepath = $argv[2];
@@ -66,7 +66,7 @@ $defaultlang = empty($argv[3])?'en_US':$argv[3];
 $startlinenb = empty($argv[4])?1:$argv[4];
 $endlinenb = empty($argv[5])?0:$argv[5];
 
-if (empty($mode) || ! in_array($mode,array('test','confirm','confirmforced')) || empty($filepath)) {
+if (empty($mode) || ! in_array($mode, array('test','confirm','confirmforced')) || empty($filepath)) {
     print "Usage:  $script_file (test|confirm|confirmforced) filepath.csv [defaultlang] [startlinenb] [endlinenb]\n";
     print "Usage:  $script_file test myfilepath.csv fr_FR 2 1002\n";
     print "\n";
@@ -78,7 +78,7 @@ if (! file_exists($filepath)) {
     exit(-1);
 }
 
-$ret=$user->fetch('','admin');
+$ret=$user->fetch('', 'admin');
 if (! $ret > 0)
 {
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
@@ -93,7 +93,7 @@ if (! $confirmed)
     $input = trim(fgets(STDIN));
 }
 
-// Open input and ouput files
+// Open input and output files
 $fhandle = fopen($filepath, 'r');
 if (! $fhandle)
 {

dev/initdata/import-thirdparties.php

@@ -35,7 +35,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Recupere root dolibarr
-$path=preg_replace('/import-thirdparties.php/i','',$_SERVER["PHP_SELF"]);
+$path=preg_replace('/import-thirdparties.php/i', '', $_SERVER["PHP_SELF"]);
 require $path."../../htdocs/master.inc.php";
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@@ -57,7 +57,7 @@ $error=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".implode(',',$argv));
+dol_syslog($script_file." launched with arg ".implode(',', $argv));
 
 $mode = $argv[1];
 $filepath = $argv[2];
@@ -66,7 +66,7 @@ $filepatherr = $filepath.'.err';
 $startlinenb = empty($argv[3])?1:$argv[3];
 $endlinenb = empty($argv[4])?0:$argv[4];
 
-if (empty($mode) || ! in_array($mode,array('test','confirm','confirmforced')) || empty($filepath)) {
+if (empty($mode) || ! in_array($mode, array('test','confirm','confirmforced')) || empty($filepath)) {
     print "Usage:  $script_file (test|confirm|confirmforced) filepath.csv [startlinenb] [endlinenb]\n";
     print "Usage:  $script_file test myfilepath.csv 2 1002\n";
     print "\n";
@@ -78,7 +78,7 @@ if (! file_exists($filepath)) {
     exit(-1);
 }
 
-$ret=$user->fetch('','admin');
+$ret=$user->fetch('', 'admin');
 if (! $ret > 0)
 {
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
@@ -93,7 +93,7 @@ if (! $confirmed)
     $input = trim(fgets(STDIN));
 }
 
-// Open input and ouput files
+// Open input and output files
 $fhandle = fopen($filepath, 'r');
 if (! $fhandle)
 {
@@ -199,13 +199,13 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 	{
     	$salesrep=new User($db);
 
-    	$tmp=explode(' ',$fields[3],2);
+    	$tmp=explode(' ', $fields[3], 2);
     	$salesrep->firstname = trim($tmp[0]);
     	$salesrep->lastname = trim($tmp[1]);
     	if ($salesrep->lastname) $salesrep->login = strtolower(substr($salesrep->firstname, 0, 1)) . strtolower(substr($salesrep->lastname, 0));
     	else $salesrep->login=strtolower($salesrep->firstname);
-    	$salesrep->login=preg_replace('/ /','',$salesrep->login);
+    	$salesrep->login=preg_replace('/ /', '', $salesrep->login);
-    	$salesrep->fetch(0,$salesrep->login);
+    	$salesrep->fetch(0, $salesrep->login);
 
     	$result = $object->add_commercial($user, $salesrep->id);
     	if ($result < 0)

dev/initdata/import-users.php

@@ -35,7 +35,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Recupere root dolibarr
-$path=preg_replace('/import-users.php/i','',$_SERVER["PHP_SELF"]);
+$path=preg_replace('/import-users.php/i', '', $_SERVER["PHP_SELF"]);
 require $path."../../htdocs/master.inc.php";
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@@ -57,7 +57,7 @@ $error=0;
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".implode(',',$argv));
+dol_syslog($script_file." launched with arg ".implode(',', $argv));
 
 $mode = $argv[1];
 $filepath = $argv[2];
@@ -66,7 +66,7 @@ $filepatherr = $filepath.'.err';
 $startlinenb = empty($argv[3])?1:$argv[3];
 $endlinenb = empty($argv[4])?0:$argv[4];
 
-if (empty($mode) || ! in_array($mode,array('test','confirm','confirmforced')) || empty($filepath)) {
+if (empty($mode) || ! in_array($mode, array('test','confirm','confirmforced')) || empty($filepath)) {
     print "Usage:  $script_file (test|confirm|confirmforced) filepath.csv [startlinenb] [endlinenb]\n";
     print "Usage:  $script_file test myfilepath.csv 2 1002\n";
     print "\n";
@@ -78,7 +78,7 @@ if (! file_exists($filepath)) {
     exit(-1);
 }
 
-$ret=$user->fetch('','admin');
+$ret=$user->fetch('', 'admin');
 if (! $ret > 0)
 {
 	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
@@ -93,7 +93,7 @@ if (! $confirmed)
     $input = trim(fgets(STDIN));
 }
 
-// Open input and ouput files
+// Open input and output files
 $fhandle = fopen($filepath, 'r');
 if (! $fhandle)
 {
@@ -127,12 +127,12 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     $object = new User($db);
     $object->statut = 1;
 
-    $tmp=explode(' ',$fields[3],2);
+    $tmp=explode(' ', $fields[3], 2);
     $object->firstname = trim($tmp[0]);
     $object->lastname = trim($tmp[1]);
     if ($object->lastname) $object->login = strtolower(substr($object->firstname, 0, 1)) . strtolower(substr($object->lastname, 0));
     else $object->login=strtolower($object->firstname);
-    $object->login=preg_replace('/ /','',$object->login);
+    $object->login=preg_replace('/ /', '', $object->login);
     $object->password = 'init';
 
     print "Process line nb ".$i.", login ".$object->login;

dev/initdata/purge-data.php

@@ -35,7 +35,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Recupere root dolibarr
-$path=preg_replace('/purge-data.php/i','',$_SERVER["PHP_SELF"]);
+$path=preg_replace('/purge-data.php/i', '', $_SERVER["PHP_SELF"]);
 require $path."../../htdocs/master.inc.php";
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
@@ -53,133 +53,177 @@ $error=0;
 // List of sql to execute
 $sqls=array(
     'user'=>array(
-        'DELETE FROM '.MAIN_DB_PREFIX."user_rights WHERE fk_user IN (SELECT rowid FROM ".MAIN_DB_PREFIX."user WHERE admin = 0 and login != 'admin')",
+        "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user IN (SELECT rowid FROM ".MAIN_DB_PREFIX."user WHERE admin = 0 and login != 'admin') AND fk_user IN (select rowid FROM ".MAIN_DB_PREFIX."user where datec < '__DATE__')",
-        'DELETE FROM '.MAIN_DB_PREFIX."user WHERE admin = 0 and login != 'admin'",
+        "DELETE FROM ".MAIN_DB_PREFIX."user WHERE admin = 0 and login != 'admin' AND datec < '__DATE__'",
+    ),
+    'event'=>array(
+        //"DELETE FROM ".MAIN_DB_PREFIX."actioncomm WHERE lineid IN (SELECT rowid FROM ".MAIN_DB_PREFIX."bank WHERE datec < '__DATE__')",
+        "DELETE FROM ".MAIN_DB_PREFIX."actioncomm WHERE datec < '__DATE__'",
+    ),
+    'payment'=>array(
+        "DELETE FROM ".MAIN_DB_PREFIX."paiement_facture where fk_facture IN (select rowid FROM ".MAIN_DB_PREFIX."facture where datec < '__DATE__')",
+        "DELETE FROM ".MAIN_DB_PREFIX."paiement where rowid NOT IN (SELECT fk_paiement FROM ".MAIN_DB_PREFIX."paiement_facture)",
     ),
     'bank'=>array(
-        'DELETE FROM '.MAIN_DB_PREFIX.'bank_account',
+        "DELETE FROM ".MAIN_DB_PREFIX."bank_class WHERE lineid IN (SELECT rowid FROM ".MAIN_DB_PREFIX."bank WHERE datec < '__DATE__')",
-        'DELETE FROM '.MAIN_DB_PREFIX.'bank_class',
+        "DELETE FROM ".MAIN_DB_PREFIX."bank_url WHERE fk_bank IN (SELECT rowid FROM ".MAIN_DB_PREFIX."bank WHERE datec < '__DATE__')",
-        'DELETE FROM '.MAIN_DB_PREFIX.'bank_url',
+        "DELETE FROM ".MAIN_DB_PREFIX."bank WHERE datec < '__DATE__'",
-        'DELETE FROM '.MAIN_DB_PREFIX.'bank',
     ),
-    'contract'=>array(
+    'bankaccount'=>array(
-        'DELETE FROM '.MAIN_DB_PREFIX.'contratdet',
+        "DELETE FROM ".MAIN_DB_PREFIX."bank_account WHERE datec < '__DATE__'",
-        'DELETE FROM '.MAIN_DB_PREFIX.'contrat',
     ),
     'invoice'=>array(
-        'DELETE FROM '.MAIN_DB_PREFIX.'paiement_facture',
+        '@payment',
-        'DELETE FROM '.MAIN_DB_PREFIX.'facture_rec',
+        "DELETE FROM ".MAIN_DB_PREFIX."societe_remise_except where fk_facture_source IN (select rowid FROM ".MAIN_DB_PREFIX."facture where datec < '__DATE__')",
-        'DELETE FROM '.MAIN_DB_PREFIX.'facturedet',
+        "DELETE FROM ".MAIN_DB_PREFIX."societe_remise_except where fk_facture IN (select rowid FROM ".MAIN_DB_PREFIX."facture where datec < '__DATE__')",
-        'DELETE FROM '.MAIN_DB_PREFIX.'facture WHERE fk_facture_source IS NOT NULL',
+        "DELETE FROM ".MAIN_DB_PREFIX."societe_remise_except where fk_facture_line IN (select rowid FROM ".MAIN_DB_PREFIX."facturedet as fd WHERE fd.fk_facture IN (select rowid from ".MAIN_DB_PREFIX."facture where datec < '__DATE__'))",
-        'DELETE FROM '.MAIN_DB_PREFIX.'facture',
+        "DELETE FROM ".MAIN_DB_PREFIX."facture_rec where datec < '__DATE__'",
+        "DELETE FROM ".MAIN_DB_PREFIX."facturedet WHERE fk_facture IN (select rowid FROM ".MAIN_DB_PREFIX."facture where datec < '__DATE__')",
+        "UPDATE ".MAIN_DB_PREFIX."facture SET fk_facture_source = NULL WHERE fk_facture_source IN (select f2.rowid FROM (select * from ".MAIN_DB_PREFIX."facture) as f2 where f2.datec < '__DATE__')",
+        "DELETE FROM ".MAIN_DB_PREFIX."facture where datec < '__DATE__'",
+    ),
+    'accounting'=>array(
+        "DELETE FROM ".MAIN_DB_PREFIX."accounting_bookkeeping where doc_date < '__DATE__'",
     ),
     'proposal'=>array(
-        'DELETE FROM '.MAIN_DB_PREFIX.'propaldet',
+        "DELETE FROM ".MAIN_DB_PREFIX."propaldet WHERE fk_propal IN (select rowid FROM ".MAIN_DB_PREFIX."propal where datec < '__DATE__')",
-        'DELETE FROM '.MAIN_DB_PREFIX.'propal',
+        "DELETE FROM ".MAIN_DB_PREFIX."propal WHERE datec < '__DATE__'",
     ),
-    'supplier_proposal'=>array(
+    "supplier_proposal"=>array(
-        'DELETE FROM '.MAIN_DB_PREFIX.'supplier_proposaldet',
+        "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposaldet WHERE fk_supplier_proposal IN (select rowid FROM ".MAIN_DB_PREFIX."propal where datec < '__DATE__')",
-        'DELETE FROM '.MAIN_DB_PREFIX.'supplier_proposal',
+        "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposal where datec < '__DATE__'",
-    ),
-	'supplier_order'=>array(
-        'DELETE FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet',
-        'DELETE FROM '.MAIN_DB_PREFIX.'commande_fournisseur',
-    ),
-	'supplier_invoice'=>array(
-        'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det',
-        'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn',
-    ),
-    'delivery'=>array(
-        'DELETE FROM '.MAIN_DB_PREFIX.'livraisondet',
-        'DELETE FROM '.MAIN_DB_PREFIX.'livraison',
-    ),
-    'shipment'=>array(
-        '@delivery',
-        'DELETE FROM '.MAIN_DB_PREFIX.'expeditiondet_batch',
-        'DELETE FROM '.MAIN_DB_PREFIX.'expeditiondet_extrafields',
-        'DELETE FROM '.MAIN_DB_PREFIX.'expeditiondet',
-        'DELETE FROM '.MAIN_DB_PREFIX.'expedition_extrafields',
-        'DELETE FROM '.MAIN_DB_PREFIX.'expedition',
     ),
     'order'=>array(
         '@shipment',
-        'DELETE FROM '.MAIN_DB_PREFIX.'commandedet',
+        "DELETE FROM ".MAIN_DB_PREFIX."commandedet WHERE fk_commande IN (select rowid FROM ".MAIN_DB_PREFIX."commande where date_creation < '__DATE__')",
-        'DELETE FROM '.MAIN_DB_PREFIX.'commande',
+        "DELETE FROM ".MAIN_DB_PREFIX."commande where date_creation < '__DATE__'",
+    ),
+    'supplier_order'=>array(
+        "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseurdet WHERE fk_commande IN (select rowid FROM ".MAIN_DB_PREFIX."commande_fournisseur where date_creation < '__DATE__')",
+        "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur where date_creation < '__DATE__'",
+    ),
+	'supplier_invoice'=>array(
+        "DELETE FROM ".MAIN_DB_PREFIX."facture_fourn_det WHERE fk_facture_fourn IN (select rowid FROM ".MAIN_DB_PREFIX."facture_fourn where datec < '__DATE__')",
+        "DELETE FROM ".MAIN_DB_PREFIX."facture_fourn where datec < '__DATE__'",
+    ),
+    'shipment'=>array(
+        '@delivery',
+        "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet_batch WHERE fk_expeditiondet IN (select rowid FROM ".MAIN_DB_PREFIX."expeditiondet WHERE fk_expedition IN (select rowid FROM ".MAIN_DB_PREFIX."expedition where date_creation < '__DATE__'))",
+        "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet_extrafields WHERE fk_object IN (select rowid FROM ".MAIN_DB_PREFIX."expeditiondet WHERE fk_expedition IN (select rowid FROM ".MAIN_DB_PREFIX."expedition where date_creation < '__DATE__'))",
+        "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet WHERE fk_expedition IN (select rowid FROM ".MAIN_DB_PREFIX."expedition where date_creation < '__DATE__')",
+        "DELETE FROM ".MAIN_DB_PREFIX."expedition_extrafields WHERE fk_object IN (select rowid FROM ".MAIN_DB_PREFIX."expedition where date_creation < '__DATE__')",
+        "DELETE FROM ".MAIN_DB_PREFIX."expedition where date_creation < '__DATE__'",
+    ),
+    'delivery'=>array(
+        "DELETE FROM ".MAIN_DB_PREFIX."livraisondet WHERE fk_livraison IN (select rowid FROM ".MAIN_DB_PREFIX."livraison where date_creation < '__DATE__')",
+        "DELETE FROM ".MAIN_DB_PREFIX."livraison where date_creation < '__DATE__'",
+    ),
+    'contract'=>array(
+        "DELETE FROM ".MAIN_DB_PREFIX."contratdet_extrafields WHERE fk_object IN (select rowid FROM ".MAIN_DB_PREFIX."contratdet WHERE fk_contrat IN (select rowid FROM ".MAIN_DB_PREFIX."contrat where datec < '__DATE__'))",
+        "DELETE FROM ".MAIN_DB_PREFIX."contratdet WHERE fk_contrat IN (select rowid FROM ".MAIN_DB_PREFIX."contrat where datec < '__DATE__')",
+        "DELETE FROM ".MAIN_DB_PREFIX."contrat_extrafields WHERE fk_object IN (select rowid FROM ".MAIN_DB_PREFIX."contrat where datec < '__DATE__')",
+        "DELETE FROM ".MAIN_DB_PREFIX."contrat WHERE datec < '__DATE__'",
     ),
     'intervention'=>array(
-        'DELETE FROM '.MAIN_DB_PREFIX.'fichinterdet',
+        "DELETE FROM ".MAIN_DB_PREFIX."fichinterdet WHERE fk_fichinter IN (select rowid FROM ".MAIN_DB_PREFIX."fichinter where datec < '__DATE__')",
-        'DELETE FROM '.MAIN_DB_PREFIX.'fichinter',
+        "DELETE FROM ".MAIN_DB_PREFIX."fichinter where datec < '__DATE__'",
+    ),
+    'stock'=>array(
+        "DELETE FROM ".MAIN_DB_PREFIX."stock_mouvement WHERE datem < '__DATE__'",
     ),
     'product'=>array(
-        'DELETE FROM '.MAIN_DB_PREFIX.'categorie_product',
+        "DELETE FROM ".MAIN_DB_PREFIX."categorie_product WHERE fk_product IN (select rowid FROM ".MAIN_DB_PREFIX."product where datec < '__DATE__')",
-        'DELETE FROM '.MAIN_DB_PREFIX.'product_lang',
+        "DELETE FROM ".MAIN_DB_PREFIX."product_lang WHERE fk_product IN (select rowid FROM ".MAIN_DB_PREFIX."product where datec < '__DATE__')",
-        'DELETE FROM '.MAIN_DB_PREFIX.'product_price',
+        "DELETE FROM ".MAIN_DB_PREFIX."product_price_by_qty WHERE fk_product_price IN (select rowid FROM ".MAIN_DB_PREFIX."product_price where fk_product IN (select rowid FROM ".MAIN_DB_PREFIX."product where datec < '__DATE__'))",
-        'DELETE FROM '.MAIN_DB_PREFIX.'product_fournisseur_price',
+        "DELETE FROM ".MAIN_DB_PREFIX."product_price WHERE fk_product IN (select rowid FROM ".MAIN_DB_PREFIX."product where datec < '__DATE__')",
-        'DELETE FROM '.MAIN_DB_PREFIX.'product_batch',
+        "DELETE FROM ".MAIN_DB_PREFIX."product_fournisseur_price WHERE fk_product IN (select rowid FROM ".MAIN_DB_PREFIX."product where datec < '__DATE__')",
-    	'DELETE FROM '.MAIN_DB_PREFIX.'product_stock',
+        "DELETE FROM ".MAIN_DB_PREFIX."product_batch WHERE fk_product_stock IN (select rowid FROM ".MAIN_DB_PREFIX."product_stock where fk_product IN (select rowid FROM ".MAIN_DB_PREFIX."product where datec < '__DATE__'))",
-        'DELETE FROM '.MAIN_DB_PREFIX.'product_lot',
+    	"DELETE FROM ".MAIN_DB_PREFIX."product_stock WHERE fk_product IN (select rowid FROM ".MAIN_DB_PREFIX."product where datec < '__DATE__')",
-    	'DELETE FROM '.MAIN_DB_PREFIX.'product',
+        "DELETE FROM ".MAIN_DB_PREFIX."product_lot WHERE fk_product IN (select rowid FROM ".MAIN_DB_PREFIX."product where datec < '__DATE__')",
+    	"DELETE FROM ".MAIN_DB_PREFIX."product where datec < '__DATE__'",
     ),
     'project'=>array(
-        'DELETE FROM '.MAIN_DB_PREFIX.'projet_task_time',
+        // TODO set fk_project to null on object that refer to project
-        'DELETE FROM '.MAIN_DB_PREFIX.'projet_task',
+        "DELETE FROM ".MAIN_DB_PREFIX."projet_task_time WHERE fk_task IN (select rowid FROM ".MAIN_DB_PREFIX."projet_task WHERE fk_projet IN (select rowid FROM ".MAIN_DB_PREFIX."projet where datec < '__DATE__'))",
-        'DELETE FROM '.MAIN_DB_PREFIX.'projet',
+        "DELETE FROM ".MAIN_DB_PREFIX."projet_task WHERE fk_projet IN (select rowid FROM ".MAIN_DB_PREFIX."projet where datec < '__DATE__')",
+        "DELETE FROM ".MAIN_DB_PREFIX."projet where datec < '__DATE__'",
     ),
     'contact'=>array(
-        'DELETE FROM '.MAIN_DB_PREFIX.'categorie_contact',
+        "DELETE FROM ".MAIN_DB_PREFIX."categorie_contact WHERE fk_socpeople IN (select rowid FROM ".MAIN_DB_PREFIX."socpeople where datec < '__DATE__')",
-        'DELETE FROM '.MAIN_DB_PREFIX.'socpeople',
+        "DELETE FROM ".MAIN_DB_PREFIX."socpeople where datec < '__DATE__'",
     ),
     'thirdparty'=>array(
         '@contact',
-        'DELETE FROM '.MAIN_DB_PREFIX.'cabinetmed_cons',
+        "DELETE FROM ".MAIN_DB_PREFIX."cabinetmed_cons WHERE fk_soc IN (select rowid FROM ".MAIN_DB_PREFIX."societe where datec < '__DATE__')",
-        'UPDATE '.MAIN_DB_PREFIX.'adherent SET fk_soc = NULL',
+        "UPDATE ".MAIN_DB_PREFIX."adherent SET fk_soc = NULL WHERE fk_soc IN (select rowid FROM ".MAIN_DB_PREFIX."societe where datec < '__DATE__')",
-        'DELETE FROM '.MAIN_DB_PREFIX.'categorie_fournisseur',
+        "DELETE FROM ".MAIN_DB_PREFIX."categorie_fournisseur WHERE fk_soc IN (select rowid FROM ".MAIN_DB_PREFIX."societe where datec < '__DATE__')",
-        'DELETE FROM '.MAIN_DB_PREFIX.'categorie_societe',
+        "DELETE FROM ".MAIN_DB_PREFIX."categorie_societe WHERE fk_soc IN (select rowid FROM ".MAIN_DB_PREFIX."societe where datec < '__DATE__')",
-        'DELETE FROM '.MAIN_DB_PREFIX.'societe_remise_except',
+        "DELETE FROM ".MAIN_DB_PREFIX."societe_remise_except WHERE fk_soc IN (select rowid FROM ".MAIN_DB_PREFIX."societe where datec < '__DATE__')",
-        'DELETE FROM '.MAIN_DB_PREFIX.'societe_rib',
+        "DELETE FROM ".MAIN_DB_PREFIX."societe_rib WHERE fk_soc IN (select rowid FROM ".MAIN_DB_PREFIX."societe where datec < '__DATE__')",
-    	'DELETE FROM '.MAIN_DB_PREFIX.'societe',
+    	"DELETE FROM ".MAIN_DB_PREFIX."societe where datec < '__DATE__'",
     )
 );
 
 
-
-
 /*
  * Main
  */
 
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
-dol_syslog($script_file." launched with arg ".implode(',',$argv));
+dol_syslog($script_file." launched with arg ".implode(',', $argv));
 
 $mode = $argv[1];
 $option = $argv[2];
+$date = $argv[3];
 
-if (empty($mode) || ! in_array($mode,array('test','confirm'))) {
+if (empty($mode) || ! in_array($mode, array('test','confirm'))) {
-    print "Usage:  $script_file (test|confirm) (all|option) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
+    print "Usage:  $script_file (test|confirm) (all|option) (all|YYYY-MM-DD) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
     print "\n";
-    print "option can be ".implode(',',array_keys($sqls))."\n";
+    print "option can be ".implode(',', array_keys($sqls))."\n";
+    exit(-1);
+}
+if (empty($option))
+{
+    print "Usage:  $script_file (test|confirm) (all|option) (all|YYYY-MM-DD) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
+    print "\n";
+    print "option must be defined with a value in list ".implode(',', array_keys($sqls))."\n";
+    exit(-1);
+}
+if ($option != 'all')
+{
+    $listofoptions=explode(',', $option);
+    foreach($listofoptions as $cursoroption)
+    {
+        if (! in_array($cursoroption, array_keys($sqls))) {
+            print "Usage:  $script_file (test|confirm) (all|option) (all|YYYY-MM-DD) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
+            print "\n";
+            print "option '".$cursoroption."' must be in list ".implode(',', array_keys($sqls))."\n";
+            exit(-1);
+        }
+    }
+}
+
+if (empty($date) || (! preg_match('/\d\d\d\d\-\d\d\-\d\d$/', $date) && $date != 'all')) {
+    print "Usage:  $script_file (test|confirm) (all|option) (all|YYYY-MM-DD) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
+    print "\n";
+    print "date can be 'all' or 'YYYY-MM-DD' to delete record before YYYY-MM-DD\n";
     exit(-1);
 }
 
-if (empty($option) || ! in_array($option, array_merge(array('all'),array_keys($sqls))) ) {
+if ($date == 'all') $date = '2199-01-01';
-    print "Usage:  $script_file (test|confirm) (all|option) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
-    print "\n";
-    print "option can be ".implode(',',array_keys($sqls))."\n";
-    exit(-1);
-}
 
 // Replace database handler
-if (! empty($argv[3]))
+if (! empty($argv[4]))
 {
 	$db->close();
 	unset($db);
-	$db=getDoliDBInstance($argv[3], $argv[4], $argv[5], $argv[6], $argv[7], $argv[8]);
+	$db=getDoliDBInstance($argv[4], $argv[5], $argv[6], $argv[7], $argv[8], $argv[9]);
 	$user=new User($db);
 }
 
 //var_dump($user->db->database_name);
-$ret=$user->fetch('','admin');
+$ret=$user->fetch('', 'admin');
 if (! $ret > 0)
 {
 	print 'An admin user with login "admin" must exists to use this script.'."\n";
@@ -189,6 +233,7 @@ if (! $ret > 0)
 
 
 print "Purge all data for this database:\n";
+print "Before = ".$date."\n";
 print "Server = ".$db->database_host."\n";
 print "Database name = ".$db->database_name."\n";
 print "Database port = ".$db->database_port."\n";
@@ -206,23 +251,27 @@ if (! $confirmed)
  * Process sql requests of a family
  *
  * @param   string  $family     Name of family key of array $sqls
+ * @param   string  $date       Date value
  * @return  int                 -1 if KO, 1 if OK
  */
-function processfamily($family)
+function processfamily($family, $date)
 {
     global $db, $sqls;
 
     $error=0;
     foreach($sqls[$family] as $sql)
     {
-        if (preg_match('/^@/',$sql))
+        if (preg_match('/^@/', $sql))
         {
-            $newfamily=preg_replace('/@/','',$sql);
+            $newfamily=preg_replace('/@/', '', $sql);
-            processfamily($newfamily);
+            processfamily($newfamily, $date);
             continue;
         }
 
+        $sql = preg_replace('/__DATE__/', $date, $sql);
+
         print "Run sql: ".$sql."\n";
+
         $resql=$db->query($sql);
         if (! $resql)
         {
@@ -247,25 +296,29 @@ function processfamily($family)
 
 $db->begin();
 
-$oldfamily='';
+$listofoptions=explode(',', $option);
-foreach($sqls as $family => $familysql)
+foreach($listofoptions as $cursoroption)
 {
-    if ($option && $option != 'all' && $option != $family) continue;
+    $oldfamily='';
-
+    foreach($sqls as $family => $familysql)
-    if ($family != $oldfamily) print "Process action for family ".$family."\n";
-    $oldfamily = $family;
-
-    $result=processfamily($family);
-    if ($result < 0)
     {
-        $error++;
+        if ($cursoroption && $cursoroption != 'all' && $cursoroption != $family) continue;
-        break;
+
+        if ($family != $oldfamily) print "Process action for family ".$family."\n";
+        $oldfamily = $family;
+
+        $result=processfamily($family, $date);
+        if ($result < 0)
+        {
+            $error++;
+            break;
+        }
     }
 }
 
 if ($error || $mode != 'confirm')
 {
-    print "Rollback any changes.\n";
+    print "\nRollback any changes.\n";
     $db->rollback();
 }
 else
@@ -275,4 +328,3 @@ else
 }
 
 $db->close();
-