diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index db1d0a13db6..93c7a17de2f 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -146,7 +146,7 @@ function payment_supplier_prepare_head(Paiement $object)
*/
function getValidOnlinePaymentMethods($paymentmethod = '')
{
- global $conf, $langs, $hookmanager, $action;
+ global $langs, $hookmanager, $action;
$validpaymentmethod = array();
@@ -434,6 +434,8 @@ function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0,
{
global $conf;
+ $reg = array();
+
// Juridical status
$line1 = "";
if ($fromcompany->forme_juridique_code) {
@@ -485,9 +487,8 @@ function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0,
print ''."\n";
+ print ''."\n";
}
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 42556f8704c..0be113d8205 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -881,7 +881,7 @@ if ($id && empty($user->rights->holiday->readall) && !in_array($id, $childids))
print '
';
}
- $holidaystatic->fk_type = $typeleaves[$obj->fk_type]['rowid'];
+ $holidaystatic->fk_type = empty($typeleaves[$obj->fk_type]['rowid']) ? 0 : $typeleaves[$obj->fk_type]['rowid'];
// Output Kanban
if ($massactionbutton || $massaction) {
diff --git a/htdocs/public/users/view.php b/htdocs/public/users/view.php
index 0eaeb1b6c8f..30b76404472 100644
--- a/htdocs/public/users/view.php
+++ b/htdocs/public/users/view.php
@@ -451,8 +451,6 @@ print '
'."\n";
print '
';
-//htmlPrintOnlinePaymentFooter($mysoc, $langs);
-
print '';
print '
';
print '
';
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 42afd27304b..8e2114f9bae 100755
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -1248,10 +1248,12 @@ if ($action == 'create' || $action == 'presend') {
}
print '';
// Group
- print '| '.$langs->trans("TicketCategory").' | ';
+ $s = '';
if (!empty($object->category_code)) {
- print $langs->getLabelFromKey($db, 'TicketCategoryShort'.$object->category_code, 'c_ticket_category', 'code', 'label', $object->category_code);
+ $s = $langs->getLabelFromKey($db, 'TicketCategoryShort'.$object->category_code, 'c_ticket_category', 'code', 'label', $object->category_code);
}
+ print ' |
| '.$langs->trans("TicketCategory").' | ';
+ print dol_escape_htmltag($s);
print ' |
';
// Severity
print '| '.$langs->trans("TicketSeverity").' | ';
|