This commit is contained in:
Laurent Destailleur 2026-02-08 00:19:03 +01:00
parent 192e181d8a
commit 9369f4aea3
3 changed files with 8 additions and 4 deletions

View file

@ -653,6 +653,8 @@ if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
} else {
dol_print_error($db);
}
$db->free($resql);
} else {
$sqlforcount1 = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql1);
$sqlforcount2 = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql2);
@ -666,13 +668,15 @@ if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
} else {
dol_print_error($db);
}
$db->free($resql1);
$db->free($resql2);
}
if (($page * $limit) > (int) $nbtotalofrecords) { // if total resultset is smaller then paging size (filtering), goto and load page 0
$page = 0;
$offset = 0;
}
$db->free($resql);
}
// Complete request and execute it with limit

View file

@ -574,7 +574,7 @@ if ($id > 0 || $ref) {
print '<td>';
$tmpuser = new User($db);
$tmpuser->fetch($obj->fk_user_demande);
print $tmpuser->getNomUrl($db);
print $tmpuser->getNomUrl(1);
print '</td>';
print '<td class="right"><span class="amount">'.price($obj->amount)."</span></td>\n";

View file

@ -1834,8 +1834,8 @@ class Ticket extends CommonObject
$now = dol_now();
// Clean parameters
if (isset($this->fk_track_id)) {
$this->fk_track_id = trim($this->fk_track_id);
if (isset($this->track_id)) {
$this->track_id = trim($this->track_id);
}
if (isset($this->message)) {