Merge pull request #4 from Dolibarr/develop

Merge from upstream develop branch

.gitignore

@@ -12,6 +12,7 @@ dolibarr_install.log
 upgrade.log
 doxygen_warnings.log
 /.project
+/.vscode
 .DS_Store
 .idea
 *.iml

.mailmap

@@ -6,8 +6,8 @@ Laurent Destailleur <eldy@destailleur.fr> eldy <eldy@destailleur.fr>
 Laurent Destailleur <eldy@destailleur.fr> Laurent Destailleur <ldestailleur@teclib.com>
 Laurent Destailleur <eldy@destailleur.fr> eldy10 <eldy10@master8.(none)>
 Laurent Destailleur <eldy@destailleur.fr> Laurent Destailleur <ephpcsdy@destailleur.fr>
-Regis Houssin <regis.houssin@capnetworks.com> Regis Houssin <regis@dolibarr.fr>
-Regis Houssin <regis.houssin@capnetworks.com> Régis Houssin <regishoussin@device5.home>
+Regis Houssin <regis.houssin@inodbox.com> Regis Houssin <regis@dolibarr.fr>
+Regis Houssin <regis.houssin@inodbox.com> Régis Houssin <regishoussin@device5.home>
 Juanjo Menent <jmenent@2byte.es> simnandez <jmenent@2byte.es>
 Juanjo Menent <jmenent@2byte.es> Juanjo Menent <simnandez@gmail.com>
 Juanjo Menent <jmenent@2byte.es> Simnandez <jmenent@2byte.es>

.travis.yml

@@ -2,7 +2,7 @@
 # from Dolibarr GitHub repository.
 # For syntax, see http://about.travis-ci.org/docs/user/languages/php/
 
-# We use dist: precise to have php 5.3 available
+# We use dist: trusty to have php 5.4+ available
 dist: trusty
 sudo: required
 
@@ -37,7 +37,6 @@ php:
 - '7.0'
 - '7.1'
 - '7.2'
-#- hhvm		only with dist: trusty
 - nightly
 
 env:
@@ -59,10 +58,17 @@ env:
 matrix:
   fast_finish: true
   allow_failures:
-  - php: hhvm
   - 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'
+    env: DB=mariadb
+  - php: '7.1'
+    env: DB=mariadb
   - php: '5.5'
     env: DB=postgresql
   - php: '5.6'
@@ -71,8 +77,6 @@ matrix:
     env: DB=postgresql
   - php: '7.1'
     env: DB=postgresql
-  - php: hhvm
-    env: DB=postgresql
   - php: nightly
     env: DB=postgresql
 
@@ -216,7 +220,7 @@ before_script:
   - |
     export CONF_FILE=htdocs/conf/conf.php
     echo "Setting up Dolibarr $CONF_FILE"
-    echo '<?php ' > $CONF_FILE
+    echo '<?php' > $CONF_FILE
     echo '$'dolibarr_main_url_root=\'http://127.0.0.1\'';' >> $CONF_FILE
     echo '$'dolibarr_main_document_root=\'$TRAVIS_BUILD_DIR/htdocs\'';' >> $CONF_FILE
     echo '$'dolibarr_main_data_root=\'$TRAVIS_BUILD_DIR/documents\'';' >> $CONF_FILE
@@ -284,7 +288,8 @@ script:
   echo "Checking PHP syntax errors"
   # Ensure we catch errors
   set -e
-  parallel-lint --exclude htdocs/includes --blame .
+  #parallel-lint --exclude htdocs/includes --blame .
+  parallel-lint --exclude htdocs/includes/sabre --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
 
@@ -337,6 +342,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
   cd -
   set +e
   echo

.tx/config

@@ -38,6 +38,12 @@ source_file = htdocs/langs/en_US/bills.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.blockedlog]
+file_filter = htdocs/langs/<lang>/blockedlog.lang
+source_file = htdocs/langs/en_US/blockedlog.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.bookmarks]
 file_filter = htdocs/langs/<lang>/bookmarks.lang
 source_file = htdocs/langs/en_US/bookmarks.lang
@@ -308,6 +314,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
@@ -391,3 +403,4 @@ file_filter = htdocs/langs/<lang>/workflow.lang
 source_file = htdocs/langs/en_US/workflow.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
+

COPYRIGHT

@@ -53,6 +53,10 @@ 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
+Octicons               8.1           MIT                         Yes
+
+
 For licenses compatibility informations:
 http://www.gnu.org/licenses/licenses.en.html