Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
This commit is contained in:
commit
4ef435e286
@ -7479,7 +7479,13 @@ class Form
|
||||
}
|
||||
|
||||
// Add where from hooks
|
||||
$parameters = array();
|
||||
$parameters = array(
|
||||
'object' => $objecttmp,
|
||||
'htmlname' => $htmlname,
|
||||
'filter' => $filter,
|
||||
'searchkey' => $searchkey
|
||||
);
|
||||
|
||||
$reshook = $hookmanager->executeHooks('selectForFormsListWhere', $parameters); // Note that $action and $object may have been modified by hook
|
||||
if (!empty($hookmanager->resPrint)) {
|
||||
$sql .= $hookmanager->resPrint;
|
||||
|
||||
@ -1300,7 +1300,7 @@ class Ticket extends CommonObject
|
||||
public function LibStatut($status, $mode = 0, $notooltip = 0, $progress = 0)
|
||||
{
|
||||
// phpcs:enable
|
||||
global $langs;
|
||||
global $langs, $hookmanager;
|
||||
|
||||
$labelStatus = $this->statuts[$status];
|
||||
$labelStatusShort = $this->statuts_short[$status];
|
||||
@ -1328,6 +1328,18 @@ class Ticket extends CommonObject
|
||||
$mode = 0;
|
||||
}
|
||||
|
||||
$parameters = array(
|
||||
'status' => $status,
|
||||
'mode' => $mode,
|
||||
);
|
||||
|
||||
// Note that $action and $object may have been modified by hook
|
||||
$reshook = $hookmanager->executeHooks('LibStatut', $parameters, $this);
|
||||
|
||||
if ($reshook > 0) {
|
||||
return $hookmanager->resPrint;
|
||||
}
|
||||
|
||||
$params = array();
|
||||
if ($notooltip) {
|
||||
$params = array('tooltip' => 'no');
|
||||
|
||||
Loading…
Reference in New Issue
Block a user