Merge branch 'develop' into phan/2025.2.6

htdocs/core/modules/project/modules_project.php

@@ -68,10 +68,10 @@ public static function liste_modeles($db, $maxfilenamelength = 0)
 	/**
 	 *	Function to build pdf project onto disk
 	 *
-	 *	@param	Project		$object					Object source to build document
-	 *	@param	Translate	$outputlangs			Lang output object
-	 * 	@param	string		$srctemplatepath	    Full path of source filename for generator using a template file
-	 *	@return	int<-1,1>      						1 if OK, <=0 if KO
+	 *	@param	Project			$object					Object source to build document
+	 *	@param	Translate		$outputlangs			Lang output object
+	 * 	@param	string			$srctemplatepath	    Full path of source filename for generator using a template file
+	 *	@return	int<-1,1>      							1 if OK, <=0 if KO
 	 */
 	abstract public function write_file($object, $outputlangs, $srctemplatepath = '');
 	// phpcs:enable

htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php

@@ -606,6 +606,8 @@ public function write_file($object, $outputlangs, $srctemplatepath = '')
 					}
 				}
 
+				/** @var Task $object */
+
 				// Replace tags of lines for tasks
 				try {
 					// Security check

htdocs/core/modules/project/task/modules_task.php

@@ -60,7 +60,7 @@ public static function liste_modeles($db, $maxfilenamelength = 0)
 	/**
 	 *	Function to build a document on disk using the generic odt module.
 	 *
-	 *	@param	Project		$object					Object source to build document
+	 *	@param	Task		$object					Object source to build document
 	 *	@param	Translate	$outputlangs			Lang output object
 	 * 	@param	string		$srctemplatepath		Full path of source filename for generator using a template file
 	 *	@return	int<-1,1>							1 if OK, <=0 if KO

htdocs/install/mysql/migration/repair.sql

@@ -602,6 +602,10 @@ DELETE FROM llx_rights_def WHERE module = 'hrm' AND perms = 'employee';
 -- UPDATE llx_bank as b SET b.amount_main_currency = -b.amount_main_currency WHERE b.amount IS NOT NULL AND b.amount_main_currency IS NOT NULL AND SIGN(b.amount_main_currency) <> SIGN(b.amount);
 
 
+-- Sequence to fix the table llx_paiement_facture and llx_paiement for payment record on a bank account that does not exists anymore.
+-- delete from llx_paiement_facture where fk_paiement in (select rowid from llx_paiement WHERE fk_bank is not null AND fk_bank not in (select rowid from llx_bank));
+-- delete from llx_paiement WHERE fk_bank is not null AND fk_bank not in (select rowid from llx_bank);
+
 
 -- Delete duplicate entries into llx_c_transport_mode
 -- VMYSQL4.1 DELETE T1 FROM llx_c_transport_mode as T1, llx_c_transport_mode as T2 where T1.entity = T2.entity AND T1.code = T2.code and T1.rowid > T2.rowid;

htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php

@@ -445,6 +445,7 @@ public function write_file($object, $outputlangs, $srctemplatepath = '', $hidede
 				if ($foundtagforlines) {
 					$linenumber = 0;
 					foreach ($object->lines as $line) {
+						/** @var CommonObjectLine $line */
 						$linenumber++;
 						$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 						complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");

htdocs/product/stock/list.php

@@ -679,7 +679,7 @@
 
 // Hook fields
 $parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
-$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
 if (!empty($arrayfields['t.statut']['checked'])) {
@@ -898,11 +898,6 @@
 	$i++;
 }
 
-if ($totalnboflines - $offset <= $limit) {
-	// Show total line
-	include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
-}
-
 // If no record found
 if ($num == 0) {
 	$colspan = 1;
@@ -916,6 +911,9 @@
 
 $db->free($resql);
 
+// Unconditionally show the total line (modification: totals are now displayed on every page)
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
 $parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;

htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php

@@ -437,6 +437,7 @@ public function write_file($object, $outputlangs, $srctemplatepath = '', $hidede
 				if ($foundtagforlines) {
 					$linenumber = 0;
 					foreach ($object->lines as $line) {
+						/** @var CommonObjectLine $line */
 						$linenumber++;
 						$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 						complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");