fix customreports.lib.php (#31771)

* fix customreports.lib.php * Update commondict.class.php * Update ctyperesource.class.php * fix * CommonDict is not a business class * Update ctyperesource.class.php * Update ctyperesource.class.php --------- Co-authored-by: Laurent Destailleur <[email protected]>
Dolibarr · Nov 12, 2024 · 836bb71 · 836bb71
1 parent 3b0ccdd
commit 836bb71
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 18 deletions.
diff --git a/build/phpstan/phpstan-baseline.neon b/build/phpstan/phpstan-baseline.neon
@@ -17930,21 +17930,6 @@ parameters:
 			count: 1
 			path: ../../htdocs/opensurvey/results.php
 
-		-
-			message: "#^Parameter \\#4 \\$month of function dol_mktime expects int, array\\|string given\\.$#"
-			count: 1
-			path: ../../htdocs/opensurvey/wizard/create_survey.php
-
-		-
-			message: "#^Parameter \\#5 \\$day of function dol_mktime expects int, array\\|string given\\.$#"
-			count: 1
-			path: ../../htdocs/opensurvey/wizard/create_survey.php
-
-		-
-			message: "#^Parameter \\#6 \\$year of function dol_mktime expects int, array\\|string given\\.$#"
-			count: 1
-			path: ../../htdocs/opensurvey/wizard/create_survey.php
-
 		-
 			message: "#^Variable \\$allow_comments might not be defined\\.$#"
 			count: 1

diff --git a/htdocs/core/lib/customreports.lib.php b/htdocs/core/lib/customreports.lib.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2024 Laurent Destailleur  <[email protected]>
+/* Copyright (C) 2024       Laurent Destailleur     <[email protected]>
  * Copyright (C) 2024		Frédéric France			<[email protected]>
  * Copyright (C) 2024		MDW						<[email protected]>
 *
@@ -591,7 +591,7 @@ function fillArrayOfFilterFields($object, $tablealias, $labelofobject, &$arrayof
 				'position' => 1000 + (int) $extrafields->attributes[$object->table_element]['pos'][$key] + ($count * 100000),
 				'table' => $object->table_element,
 				'tablefromt' => $tablepath,
-				'type' => $val['type']  // TODO: Check this, seems a copy/paste error
+				'type' => $extrafields->attributes[$object->table_element]['type'][$key],
 			);
 		}
 	}

diff --git a/htdocs/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php
@@ -93,7 +93,7 @@
 	$testdate = false;
 	$champdatefin = (int) dol_mktime(23, 59, 59, GETPOSTINT('champdatefinmonth'), GETPOSTINT('champdatefinday'), GETPOSTINT('champdatefinyear'));
 
-	if ($champdatefin > 0) {	// A date was provided, $error still 0 here
+	if ($champdatefin > 0) {	// A date was provided
 		// Expire date is not before today
 		if ($champdatefin >= dol_now()) {
 			$testdate = true;