Merge branch 'develop' into patch-255

.travis.yml

@@ -200,6 +200,7 @@ before_script:
       mysql -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
     fi
     if [ "$DB" = 'postgresql' ]; then
+      #pgsql travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
       #pgloader mysql://root:pass@127.0.0.1/dolibarr_9 postgresql://dolibarrowner:dolibarrownerpass@127.0.0.1/dolibarr_dev
       echo pgloader mysql://root@127.0.0.1/travis postgresql:///travis
       pgloader mysql://root@127.0.0.1/travis postgresql:///travis
@@ -209,7 +210,6 @@ before_script:
       #echo 'select * from information_schema.table_constraints;' | psql travis
       #echo 'ALTER TABLE "llx_accounting_account" DROP CONSTRAINT "idx_16390_primary"' | psql travis
     fi
-    # TODO: SQLite
     echo
 
   - |
@@ -222,6 +222,7 @@ before_script:
     echo '$'dolibarr_main_db_host=\'127.0.0.1\'';' >> $CONF_FILE
     echo '$'dolibarr_main_db_name=\'travis\'';' >> $CONF_FILE
     echo '$'dolibarr_main_db_user=\'travis\'';' >> $CONF_FILE
+    echo '$'dolibarr_main_instance_unique_id=\'travis1234567890\'';' >> $CONF_FILE
     if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then
       echo '$'dolibarr_main_db_type=\'mysqli\'';' >> $CONF_FILE
       echo '$'dolibarr_main_db_port=\'3306\'';' >> $CONF_FILE
@@ -230,7 +231,6 @@ before_script:
       echo '$'dolibarr_main_db_type=\'pgsql\'';' >> $CONF_FILE
       echo '$'dolibarr_main_db_port=\'5432\'';' >> $CONF_FILE
     fi
-    # TODO: SQLite
     echo '$'dolibarr_main_authentication=\'dolibarr\'';' >> $CONF_FILE
     cat $CONF_FILE
     echo
@@ -299,10 +299,70 @@ script:
   set +e
   echo
 
-# TODO: Check Javascript (jshint?)
-
-# TODO: Check CSS (csslint?)
+- |
+  export INSTALL_FORCED_FILE=htdocs/install/install.forced.php
+  echo "Setting up Dolibarr $INSTALL_FORCED_FILE to test installation"
+  # Ensure we catch errors
+  set +e
+  echo '<?php ' > $INSTALL_FORCED_FILE
+  echo '$'force_install_noedit=2';' >> $INSTALL_FORCED_FILE
+  if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then
+    echo '$'force_install_type=\'mysqli\'';' >> $INSTALL_FORCED_FILE
+  fi
+  if [ "$DB" = 'postgresql' ]; then
+    echo '$'force_install_type=\'pgsql\'';' >> $INSTALL_FORCED_FILE
+  fi
+  echo '$'force_install_dbserver=\'127.0.0.1\'';' >> $INSTALL_FORCED_FILE
+  echo '$'force_install_database=\'travis\'';' >> $INSTALL_FORCED_FILE
+  echo '$'force_install_databaselogin=\'travis\'';' >> $INSTALL_FORCED_FILE
+  echo '$'force_install_databasepass=\'\'';' >> $INSTALL_FORCED_FILE
+  echo '$'force_install_port=\'5432\'';' >> $INSTALL_FORCED_FILE
+  echo '$'force_install_prefix=\'llx_\'';' >> $INSTALL_FORCED_FILE
+  echo '$'force_install_createdatabase=false';' >> $INSTALL_FORCED_FILE
+  echo '$'force_install_createuser=false';' >> $INSTALL_FORCED_FILE
+  echo '$'force_install_mainforcehttps=false';' >> $INSTALL_FORCED_FILE
+  echo '$'force_install_main_data_root=\'$TRAVIS_BUILD_DIR/htdocs\'';' >> $INSTALL_FORCED_FILE
+  #cat $INSTALL_FORCED_FILE
+
+#- |
+#  echo "Installing Dolibarr"
+#  cd htdocs/install
+#  php step1.php $TRAVIS_BUILD_DIR/htdocs > $TRAVIS_BUILD_DIR/install.log
+#  php step2.php set >> $TRAVIS_BUILD_DIR/install.log
+#  if [ "$?" -ne "0" ]; then
+#    echo "SORRY, AN ERROR OCCURED DURING INSTALLATION PROCESS"
+#    cat $TRAVIS_BUILD_DIR/install.log
+#    exit 1
+#  fi
+#  cd ../..
+#  rm $INSTALL_FORCED_FILE
+#  #cat $TRAVIS_BUILD_DIR/install.log
+# set +e
+#  echo
 
+- |
+  echo "Setting up database to test migrations"
+  if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ] || [ "$DB" = 'postgresql' ]; then
+    echo "MySQL"
+    mysql -e 'DROP DATABASE IF EXISTS travis;'
+    mysql -e 'CREATE DATABASE IF NOT EXISTS travis;'
+    mysql -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;'
+    mysql -e 'FLUSH PRIVILEGES;'    
+    mysql -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
+  fi
+  if [ "$DB" = 'postgresql' ]; then
+    #pgsql travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql
+    #pgloader mysql://root:pass@127.0.0.1/base postgresql://dolibarrowner@127.0.0.1/dolibarr
+    echo pgloader mysql://root@127.0.0.1/travis postgresql:///travis
+    pgloader mysql://root@127.0.0.1/travis postgresql:///travis
+    echo 'ALTER SEQUENCE llx_accountingaccount_rowid_seq RENAME TO llx_accounting_account_rowid_seq' | psql travis
+    echo 'ALTER SEQUENCE llx_accounting_account_rowid_seq RESTART WITH 1000001;' | psql travis
+    #echo 'select * from INFORMATION_SCHEMA.COLUMNS where table_name = 'llx_accountingaccount' | psql travis
+    #echo 'select * from information_schema.table_constraints;' | psql travis
+    #echo 'ALTER TABLE "llx_accounting_account" DROP CONSTRAINT "idx_16390_primary"' | psql travis
+  fi
+  echo
+  
 - |
   echo "Upgrading Dolibarr"
   # Ensure we catch errors. Set this to +e if you want to go to the end to see log files.

.tx/config

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

COPYING

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

COPYRIGHT

@@ -5,7 +5,7 @@ License
 Dolibarr is released under the terms of the GNU General Public License as 
 published by the Free Software Foundation; either version 3 of the License,
 or (at your option) any later version (GPL-3+).
-More information: http://www.gnu.org/licenses/gpl-3.0.txt
+More information: https://www.gnu.org/licenses/gpl-3.0.txt
 
 Dolibarr uses some external libraries released under different licenses. This is compatibility summary:
 
@@ -17,7 +17,7 @@ CKEditor               4.12.1        LGPL-2.1+                   Yes
 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
 GeoIP                  1.4           LGPL-2.1+                   Yes             Sample code to make geoip convert (not into deb package)
-Mobiledetect           2.8.83        MIT License                 Yes             Detect mobile devices browsers
+Mobiledetect           2.8.33        MIT License                 Yes             Detect mobile devices browsers
 NuSoap                 0.9.5         LGPL 2.1+                   Yes             Library to develop SOAP Web services (not into rpm and deb package)
 PEAR Mail_MIME         1.8.9         BSD                         Yes             NuSoap dependency
 ParseDown              1.6           MIT License                 Yes             Markdown parser
@@ -33,10 +33,11 @@ Restler                3.0.0RC6      LGPL-3+                     Yes
 Sabre                  3.2.2         BSD                         Yes             DAV support
 Swift Mailer           5.4.2-DEV     MIT license                 Yes             Comprehensive mailing tools for PHP
 Stripe                 6.41          MIT licence                 Yes             Library for Stripe module
-TCPDF                  6.2.25        LGPL-3+                     Yes             PDF generation
+TCPDF                  6.3.2         LGPL-3+                     Yes             PDF generation
 TCPDI                  1.0.0         LGPL-3+ / Apache 2.0        Yes             FPDI replacement
 
 JS libraries:
+Ace                    1.4.6         BSD                         Yes             JS library to get code syntaxique coloration in a textarea.    
 jQuery                 3.4.1         MIT License                 Yes             JS library
 jQuery UI              1.12.1        GPL and MIT License         Yes             JS library plugin UI
 jQuery select2         4.0.5         GPL and Apache License      Yes             JS library plugin for sexier multiselect
@@ -54,7 +55,6 @@ jQuery Timepicker      1.1.0         GPL and MIT License         Yes
 jsGanttImproved        1.7.5.4       BSD License                 Yes             JS library (to build Gantt reports)
 JsTimezoneDetect       1.0.6         MIT License                 Yes             JS library to detect user timezone
 SwaggerUI			   2.0.24		 GPL-2+                      Yes             JS library to offer the REST API explorer
-Ace                    1.2.8         BSD                         Yes             JS library to get code syntaxique coloration in a textarea.    
 
 Image libraries:
 Octicons               8.1           MIT                         Yes
@@ -64,7 +64,7 @@ Fontawesome            5.7.2         Font Awesome Free licence   Yes
 
 
 For licenses compatibility informations:
-http://www.gnu.org/licenses/licenses.en.html
+https://www.gnu.org/licenses/licenses.en.html
 
 
 Copyright / Authors

ChangeLog

@@ -22,6 +22,7 @@ Following changes may create regressions for some external modules, but were nec
 * Removed deprecated method actioncomm->add(), use create() instead
 * If you have developed your own emailing target selector and used parent::add_to_target(...), you must now use parent::addToTargets(...)
 * Removed function dol_micro_time. Use native PHP microtime instead.
+* The trigger BON_PRELEVEMENT_CREATE has been renamed into DIRECT_DEBIT_ORDER_CREATE.
 
 
 ***** ChangeLog for 10.0.2 compared to 10.0.1 *****

build/debian/copyright

@@ -338,7 +338,7 @@ License: GPL-2+
  details.
  .
  You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
  .
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file

build/docker/README.md

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

build/doxygen/dolibarr-doxygen.doxyfile

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

build/exe/doliwamp/README.md

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

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

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

composer.json

@@ -26,15 +26,13 @@
 	"require" : {
 		"php" : ">=5.3.0",
 		"ext-curl" : "*",
-		"ccampbell/chromephp" : "4.1.0",
-		"ckeditor/ckeditor" : "4.6.2",
+		"ckeditor/ckeditor" : "4.12.1",
 		"mike42/escpos-php" : "1.2.1",
-		"mobiledetect/mobiledetectlib" : "2.8.17",
+		"mobiledetect/mobiledetectlib" : "2.8.33",
 		"phpoffice/phpexcel" : "1.8.1",
 		"restler/framework" : "3.0.0-RC6",
 		"tecnickcom/tcpdf" : "^6.2",
-		"atgp/factur-x" : "^1.0",
-		"luracast/restler": "^3.0"
+		"luracast/restler" : "^3.0"
 	},
 	"require-dev" : {
 		"jakub-onderka/php-parallel-lint" : "^0",
@@ -59,4 +57,4 @@
 		"ext-xml" : "Excel support",
 		"firephp/firephp-core" : "Logging to Firebug console support"
 	}
-}
+}