lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur 2023-03-18 10:24:52 +01:00
commit 4ef435e286
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/class/html.form.class.php
View File

@ -7479,7 +7479,13 @@ class Form
} }
// Add where from hooks // 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 $reshook = $hookmanager->executeHooks('selectForFormsListWhere', $parameters); // Note that $action and $object may have been modified by hook
if (!empty($hookmanager->resPrint)) { if (!empty($hookmanager->resPrint)) {
$sql .= $hookmanager->resPrint; $sql .= $hookmanager->resPrint;

14
htdocs/ticket/class/ticket.class.php
View File

@ -1300,7 +1300,7 @@ class Ticket extends CommonObject
public function LibStatut($status, $mode = 0, $notooltip = 0, $progress = 0) public function LibStatut($status, $mode = 0, $notooltip = 0, $progress = 0)
{ {
// phpcs:enable // phpcs:enable
global $langs; global $langs, $hookmanager;
$labelStatus = $this->statuts[$status]; $labelStatus = $this->statuts[$status];
$labelStatusShort = $this->statuts_short[$status]; $labelStatusShort = $this->statuts_short[$status];
@ -1328,6 +1328,18 @@ class Ticket extends CommonObject
$mode = 0; $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(); $params = array();
if ($notooltip) { if ($notooltip) {
$params = array('tooltip' => 'no'); $params = array('tooltip' => 'no');