From ae6ce0127b3bc98f10bb247d6375eeb75b9b83fe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 Jan 2022 22:07:58 +0100
Subject: [PATCH] css

---
 htdocs/compta/sociales/payments.php | 33 +++++++++++++++++------------
 htdocs/contact/list.php             |  2 +-
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index b2ee4ffce5e..ba138fd5a5e 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -66,7 +66,7 @@ if (!$sortorder) {
 	$sortorder = "DESC";
 }
 
-// Security check
+// Security check140px
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -136,7 +136,7 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 
 $sql = "SELECT c.id, c.libelle as label,";
-$sql .= " cs.rowid, cs.libelle, cs.fk_type as type, cs.periode, cs.date_ech, cs.amount as total,";
+$sql .= " cs.rowid, cs.libelle as label_sc, cs.fk_type as type, cs.periode, cs.date_ech, cs.amount as total,";
 $sql .= " pc.rowid as pid, pc.datep, pc.amount as totalpaye, pc.num_paiement as num_payment, pc.fk_bank,";
 $sql .= " pct.code as payment_code,";
 $sql .= " u.rowid uid, u.lastname, u.firstname, u.email, u.login, u.admin,";
@@ -231,8 +231,8 @@ print '<tr class="liste_titre">';
 print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pc.rowid", "", $param, '', $sortfield, $sortorder);
 print_liste_field_titre("SocialContribution", $_SERVER["PHP_SELF"], "c.libelle", "", $param, '', $sortfield, $sortorder);
 print_liste_field_titre("TypeContrib", $_SERVER["PHP_SELF"], "cs.fk_type", "", $param, '', $sortfield, $sortorder);
-print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "cs.periode", "", $param, 'width="140px"', $sortfield, $sortorder);
-print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pc.datep", "", $param, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "cs.periode", "", $param, '', $sortfield, $sortorder, 'center ');
+print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pc.datep", "", $param, '', $sortfield, $sortorder, 'center ');
 print_liste_field_titre("Employee", $_SERVER["PHP_SELF"], "u.rowid", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre("PaymentMode", $_SERVER["PHP_SELF"], "pct.code", "", $param, '', $sortfield, $sortorder);
 print_liste_field_titre("Numero", $_SERVER["PHP_SELF"], "pc.num_paiement", "", $param, '', $sortfield, $sortorder, '', 'ChequeOrTransferNumber');
@@ -257,26 +257,31 @@ $totalpaye = 0;
 
 while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($resql);
-	print '<tr class="oddeven">';
-	// Ref payment
+
 	$payment_sc_static->id = $obj->pid;
 	$payment_sc_static->ref = $obj->pid;
-	print '<td>'.$payment_sc_static->getNomUrl(1)."</td>\n";
-	// Label
-	print '<td>';
+
 	$socialcontrib->id = $obj->rowid;
-	$socialcontrib->ref = empty($obj->libelle) ? $obj->label : $obj->libelle;
-	$socialcontrib->label = empty($obj->libelle) ? $obj->label : $obj->libelle;
-	print $socialcontrib->getNomUrl(1, '20');
+	// $obj->label_sc is label of social contribution (may be empty)
+	// $obj->label is label of type of social contribution
+	$socialcontrib->ref = empty($obj->label_sc) ? $obj->label : $obj->label_sc;
+	$socialcontrib->label = empty($obj->label_sc) ? $obj->label : $obj->label_sc;
+
+	print '<tr class="oddeven">';
+	// Ref payment
+	print '<td class="nowraponall">'.$payment_sc_static->getNomUrl(1)."</td>\n";
+	// Label
+	print '<td class="tdoverflowmax250">';
+	print $socialcontrib->getNomUrl(1, '');
 	print '</td>';
 	// Type
-	print '<td title="'.dol_escape_htmltag($obj->label).'" class="tdmaxoverflow300">'.$obj->label.'</td>';
+	print '<td title="'.dol_escape_htmltag($obj->label).'" class="tdoverflowmax300">'.$obj->label.'</td>';
 	// Date
 	$date = $obj->periode;
 	if (empty($date)) {
 		$date = $obj->date_ech;
 	}
-	print '<td>'.dol_print_date($date, 'day').'</td>';
+	print '<td class="center">'.dol_print_date($date, 'day').'</td>';
 	// Date payment
 	print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day').'</td>';
 
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index ec886ce1d4e..66561730829 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -1169,7 +1169,7 @@ while ($i < min($num, $limit)) {
 	}
 	// EMail
 	if (!empty($arrayfields['p.email']['checked'])) {
-		print '<td class="nowraponall tdmaxoverflow300">'.dol_print_email($obj->email, $obj->rowid, $obj->socid, 'AC_EMAIL', 18, 0, 1).'</td>';
+		print '<td class="nowraponall tdoverflowmax300">'.dol_print_email($obj->email, $obj->rowid, $obj->socid, 'AC_EMAIL', 18, 0, 1).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}