diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index b7b4ed0c36eb0..98400a41664a7 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -2878,7 +2878,7 @@ } // Presend form -$modelmail = 'expensereport'; +$modelmail = 'expensereport_send'; $defaulttopic = 'SendExpenseReportRef'; $diroutput = $conf->expensereport->dir_output; $trackid = 'exp'.$object->id; diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php index 1d15754842e29..bde096c6404bf 100644 --- a/htdocs/public/ticket/list.php +++ b/htdocs/public/ticket/list.php @@ -69,10 +69,10 @@ unset($_SESSION['track_id_customer']); unset($_SESSION['email_customer']); } -if (isset($_SESSION['track_id_customer'])) { +if (empty($track_id) && isset($_SESSION['track_id_customer'])) { $track_id = $_SESSION['track_id_customer']; } -if (isset($_SESSION['email_customer'])) { +if (empty($email) && isset($_SESSION['email_customer'])) { $email = strtolower($_SESSION['email_customer']); } @@ -209,6 +209,7 @@ // Store current page url $url_page_current = dol_buildpath('/public/ticket/list.php', 1); + $contextpage = $url_page_current; // Do we click on purge search criteria ? if (GETPOST("button_removefilter_x")) { @@ -267,7 +268,7 @@ if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) { foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) { if ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate') { - $enabled = abs(dol_eval($extrafields->attributes[$object->table_element]['list'][$key], 1, 1, '2')); + $enabled = abs((int) dol_eval($extrafields->attributes[$object->table_element]['list'][$key], 1, 1, '2')); $enabled = (($enabled == 0 || $enabled == 3) ? 0 : $enabled); $arrayfields["ef.".$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'checked' => ($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1, 'position' => $extrafields->attributes[$object->table_element]['pos'][$key], 'enabled' => $enabled && $extrafields->attributes[$object->table_element]['perms'][$key]); }