Merge branch 'develop' into fix/copyrighttool

.travis.yml

@@ -177,7 +177,7 @@ install:
   fi
 
   # Remove non expected files
-  rm -fr /home/travis/dev/build/Dolibarr/dolibarr/htdocs/includes/phpunit/php-code-coverage/src/Report/Html/Renderer/Template/js
+  rm -fr /home/travis/build/Dolibarr/dolibarr/htdocs/includes/phpunit/php-code-coverage/src/Report/Html/Renderer/Template/js
   echo
 
 - |

ChangeLog

@@ -2,6 +2,25 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
+
+***** ChangeLog for 22.0.0 compared to 21.0 *****
+
+For users:
+----------
+
+
+For developers:
+----------
+
+
+WARNING:
+--------
+
+The following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
+* The directory /build has been moved into /dev/build.
+
+
+
 ***** ChangeLog for 21.0.0 compared to 20.0 *****
 
 For users:

dev/build/phpstan/README

@@ -23,4 +23,4 @@ mv /tmp/custom htdocs
 
 Build HTML report from Cron:
 Example of line to add into a cron to generate a HTML report:
-0 1 5 * * cd /home/dolibarr/preview.dolibarr.org/dolibarr; chmod -R u+w /home/dolibarr/preview.dolibarr.org/dolibarr; git pull; /home/dolibarr/phpstan/vendor/bin/phpstan -v analyze --memory-limit 4G --error-format=github | awk ' BEGIN{ print "Date "strftime("%Y-%m-%d")"<br>" } { print $0"<br>" } END{ print NR } ' > /home/dolibarr/doxygen.dolibarr.org/phpstan/index.html
+0 1 5 * * cd /home/dolibarr/preview.dolibarr.org/dolibarr; chmod -R u+w /home/dolibarr/preview.dolibarr.org/dolibarr; git reset --hard HEAD; git pull; /home/dolibarr/preview.dolibarr.org/dolibarr/dev/build/phpstan/vendor/bin/phpstan -v analyze --memory-limit 4G --error-format=github | awk ' BEGIN{ print "Date "strftime("%Y-%m-%d")"<br>" } { print $0"<br>" } END{ print NR } ' > /home/dolibarr/cti.dolibarr.org/phpstanindex.html

dev/build/phpstan/bootstrap.php

@@ -42,4 +42,4 @@ if (!defined("NOHTTPSREDIRECT")) {
 
 global $conf, $db, $hookmanager, $langs, $mysoc, $user;
 
-include_once __DIR__ . '/../../htdocs/main.inc.php';
+include_once __DIR__ . '/../../../htdocs/main.inc.php';

dev/build/phpstan/bootstrap_action.php

@@ -27,9 +27,9 @@ if (!defined("NOHTTPSREDIRECT")) {
 }
 
 // Defined some constants and load Dolibarr env to reduce PHPStan bootstrap that fails to load a lot of things.
-$dolibarr_main_document_root = __DIR__ . '/../../htdocs';
-define('DOL_DOCUMENT_ROOT', __DIR__ . '/../../htdocs');
-define('DOL_DATA_ROOT', __DIR__ . '/../../documents');
+$dolibarr_main_document_root = __DIR__ . '/../../../htdocs';
+define('DOL_DOCUMENT_ROOT', __DIR__ . '/../../../htdocs');
+define('DOL_DATA_ROOT', __DIR__ . '/../../../documents');
 define('DOL_URL_ROOT', '/');
 define('DOL_MAIN_URL_ROOT', '/');
 define('MAIN_DB_PREFIX', 'llx_');

doc/install/README

@@ -12,7 +12,7 @@ Download
     https://www.dolibarr.org
 
 * Most external modules are only available on DoliStore:
-    https://www.dolistore.com 
+    https://www.dolistore.com
 
 
 --------------------------------
@@ -21,5 +21,5 @@ Install
 
 * For a Quick guide, take a look at README.md file into root directory.
 
-* More complete documentations are also available on line on the Dolibarr Wiki:
+* More complete documentation is also available on line on the Dolibarr Wiki:
     https://wiki.dolibarr.org

htdocs/commande/class/orderline.class.php

@@ -105,7 +105,7 @@ class OrderLine extends CommonOrderLine
 
 	/**
 	 * Buy price without taxes
-	 * @var float
+	 * @var float|string	Can be '' when we do not provide any buying price.
 	 */
 	public $pa_ht;
 

htdocs/filefunc.inc.php

@@ -36,7 +36,7 @@ if (!defined('DOL_APPLICATION_TITLE')) {
 	define('DOL_APPLICATION_TITLE', 'Dolibarr');
 }
 if (!defined('DOL_VERSION')) {
-	define('DOL_VERSION', '21.0.0'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+	define('DOL_VERSION', '22.0.0-alpha'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 }
 
 if (!defined('EURO')) {

htdocs/imports/import.php

@@ -238,7 +238,7 @@ if ($step == 3 && $datatoimport) {
 		dol_mkdir($conf->import->dir_temp);
 		$nowyearmonth = dol_print_date(dol_now(), '%Y%m%d%H%M%S');
 
-		$fullpath = $conf->import->dir_temp."/".$nowyearmonth.'-'.$_FILES['userfile']['name'];
+		$fullpath = $conf->import->dir_temp."/".$nowyearmonth.'-'.dol_string_nohtmltag(dol_sanitizeFileName($_FILES['userfile']['name']));
 		if (dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $fullpath, 1) > 0) {
 			dol_syslog("File ".$fullpath." was added for import");
 		} else {