Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix/2025-02-07-phpstan

Browse Source
This commit is contained in:
Laurent Destailleur
2025-02-07 14:28:35 +01:00
committed by GitHub
parent 473592055f 21530703d8
commit 8d04badf2d
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/modules/project/modules_project.php
View File

@@ -68,10 +68,10 @@ abstract class ModelePDFProjects extends CommonDocGenerator
/**
* Function to build pdf project onto disk
*
* @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
* @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

2
htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
View File

@@ -606,7 +606,7 @@ class doc_generic_task_odt extends ModelePDFTask
}
}
/** var Task $object */
/** @var Task $object */
// Replace tags of lines for tasks
try {

2
htdocs/core/modules/project/task/modules_task.php
View File

@@ -60,7 +60,7 @@ abstract class ModelePDFTask extends CommonDocGenerator
/**
* 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

10
htdocs/product/stock/list.php
View File

@@ -679,7 +679,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
// 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 @@ while ($i < $imaxinloop) {
$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 @@ if ($num == 0) {
$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;