Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

dev/build/phpstan/phpstan-baseline.neon

@@ -8178,12 +8178,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/core/modules/rapport/pdf_paiement.class.php
 
-		-
-			message: '#^Property Reception\:\:\$trueWeight \(float\|int\) in isset\(\) is not nullable\.$#'
-			identifier: isset.property
-			count: 1
-			path: ../../../htdocs/core/modules/reception/doc/pdf_squille.modules.php
-
 		-
 			message: '#^Ternary operator condition is always false\.$#'
 			identifier: ternary.alwaysFalse
@@ -8838,12 +8832,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/eventorganization/conferenceorboothattendee_list.php
 
-		-
-			message: '#^Variable \$projectref might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../../htdocs/eventorganization/conferenceorboothattendee_list.php
-
 		-
 			message: '#^Property ExpeditionLigne\:\:\$detail_children \(array\<int, array\<int, float\|int\>\>\) on left side of \?\? is not nullable\.$#'
 			identifier: nullCoalesce.property
@@ -14226,12 +14214,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/reception/class/reception.class.php
 
-		-
-			message: '#^Property Reception\:\:\$size_units \(int\|string\) in isset\(\) is not nullable\.$#'
-			identifier: isset.property
-			count: 2
-			path: ../../../htdocs/reception/class/reception.class.php
-
 		-
 			message: '#^Property Reception\:\:\$socid \(int\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -14244,30 +14226,6 @@ parameters:
 			count: 2
 			path: ../../../htdocs/reception/class/reception.class.php
 
-		-
-			message: '#^Property Reception\:\:\$trueDepth \(float\|int\) in isset\(\) is not nullable\.$#'
-			identifier: isset.property
-			count: 1
-			path: ../../../htdocs/reception/class/reception.class.php
-
-		-
-			message: '#^Property Reception\:\:\$trueHeight \(float\|int\) in isset\(\) is not nullable\.$#'
-			identifier: isset.property
-			count: 1
-			path: ../../../htdocs/reception/class/reception.class.php
-
-		-
-			message: '#^Property Reception\:\:\$trueWeight \(float\|int\) in isset\(\) is not nullable\.$#'
-			identifier: isset.property
-			count: 1
-			path: ../../../htdocs/reception/class/reception.class.php
-
-		-
-			message: '#^Property Reception\:\:\$trueWidth \(float\|int\) in isset\(\) is not nullable\.$#'
-			identifier: isset.property
-			count: 1
-			path: ../../../htdocs/reception/class/reception.class.php
-
 		-
 			message: '#^Ternary operator condition is always true\.$#'
 			identifier: ternary.alwaysTrue
@@ -15390,12 +15348,6 @@ parameters:
 			count: 1
 			path: ../../../htdocs/takepos/index.php
 
-		-
-			message: '#^Loose comparison using \=\= between 0 and 1 will always evaluate to false\.$#'
-			identifier: equal.alwaysFalse
-			count: 1
-			path: ../../../htdocs/takepos/index.php
-
 		-
 			message: '#^Property CommonInvoiceLine\:\:\$product_type \(int\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -16059,13 +16011,7 @@ parameters:
 		-
 			message: '#^Call to function is_object\(\) with object will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
-			count: 2
-			path: ../../../htdocs/user/perms.php
-
-		-
-			message: '#^Variable \$menumanager might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
+			count: 1
 			path: ../../../htdocs/user/perms.php
 
 		-

htdocs/core/modules/modHoliday.class.php

@@ -290,6 +290,28 @@ class modHoliday extends DolibarrModules
 		// $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
 		// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
 		// $r++;
+
+		// Imports
+		//--------
+		$r = 0;
+
+		// Import list of leave request
+
+		$r++;
+		$this->import_code[$r] = $this->rights_class.'_'.$r;
+		$this->import_label[$r] = "ListeCP"; // Translation key
+		$this->import_icon[$r] = 'holiday';
+		$this->import_tables_array[$r] = array('d' => MAIN_DB_PREFIX.'holiday');
+		$this->import_fields_array[$r] = array(
+			'd.ref' => 'Ref*', 'd.fk_user' => 'UserID*', 'd.fk_type' => 'TypeOfLeaveId*','d.fk_validator' => 'ApprovedBy*',
+			'd.date_debut' => 'DateStart*', 'd.date_fin' => 'DateEnd*', 'd.halfday' => 'HalfDay', 'd.description' => 'Description*',
+			'd.date_create' => 'DateCreation*'
+		);
+
+		$keyforselect = 'holiday';
+		$keyforelement = 'holiday';
+		$keyforaliasextra = 'extra';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinimport.inc.php';
 	}
 
 	/**