From f84a8361bc27004b78fb394462a1f62e37f5c74b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 13 Mar 2023 10:05:00 +0100
Subject: [PATCH] Look and feel v18

---
 htdocs/core/lib/payments.lib.php | 10 ++++++----
 htdocs/holiday/list.php          |  2 +-
 htdocs/public/users/view.php     |  2 --
 htdocs/ticket/card.php           |  6 ++++--
 4 files changed, 11 insertions(+), 9 deletions(-)

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 '<!-- htmlPrintOnlinePaymentFooter -->'."\n";
 
+	print '<footer class="center paddingleft paddingright centpercent">'."\n";
 	print '<br>';
-
-	print '<div class="center paddingleft paddingright centpercent">'."\n";
 	if ($addformmessage) {
 		print '<!-- object = '.(empty($object) ? 'undefined' : $object->element).' -->';
 		print '<br>';
@@ -519,5 +520,6 @@ function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0,
 		print ' - ';
 	}
 	print $line2;
-	print '</span></div>'."\n";
+	print '</span>';
+	print '</footer>'."\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 '<div class="box-flex-container kanban">';
 			}
 
-			$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 '</div>'."\n";
 print '<br>';
 
 
-//htmlPrintOnlinePaymentFooter($mysoc, $langs);
-
 print '<div class="backgreypublicpayment">';
 print '<div class="center">';
 print '<a href="'.$urlforqrcode.'">';
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 '</td></tr>';
 			// Group
-			print '<tr><td>'.$langs->trans("TicketCategory").'</td><td>';
+			$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 '<tr><td>'.$langs->trans("TicketCategory").'</td><td class="tdoverflowmax200" title="'.dol_escape_htmltag($s).'">';
+			print dol_escape_htmltag($s);
 			print '</td></tr>';
 			// Severity
 			print '<tr><td>'.$langs->trans("TicketSeverity").'</td><td>';