From aa3b6533f11a90518285ef549250e4a56d8550d7 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Wed, 27 Nov 2019 02:45:43 +0100
Subject: [PATCH] Look & Feel v11

---
 htdocs/salaries/list.php | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 51fd8462180..e9014e423c6 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -150,9 +150,7 @@ if ($result)
 	$newcardbutton='';
 	if (! empty($user->rights->salaries->write))
 	{
-		$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/salaries/card.php?action=create"><span class="valignmiddle text-plus-circle">'.$langs->trans('NewSalaryPayment').'</span>';
-		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
-		$newcardbutton.= '</a>';
+		$newcardbutton .= dolGetButtonTitle($langs->trans('NewSalaryPayment'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/salaries/card.php?action=create');
 	}
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -234,14 +232,24 @@ if ($result)
 
         // Ref
 		print "<td>".$salstatic->getNomUrl(1)."</td>\n";
+		if (! $i) $totalarray['nbfield']++;
+
 		// Employee
 		print "<td>".$userstatic->getNomUrl(1)."</td>\n";
+		if (! $i) $totalarray['nbfield']++;
+
 		// Label payment
         print "<td>".dol_trunc($obj->label, 40)."</td>\n";
+		if (! $i) $totalarray['nbfield']++;
+
 		// Date payment
         print '<td align="center">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
+		if (! $i) $totalarray['nbfield']++;
+
         // Type
         print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';
+		if (! $i) $totalarray['nbfield']++;
+
 		// Account
     	if (! empty($conf->banque->enabled))
 	    {
@@ -267,22 +275,26 @@ if ($result)
 	        }
 	        else print '&nbsp;';
 	        print '</td>';
+			if (! $i) $totalarray['nbfield']++;
 	    }
-        // Amount
-        print '<td class="right">'.price($obj->amount).'</td>';
-        print '<td></td>';
-        print "</tr>\n";
 
-        $total = $total + $obj->amount;
+        // Amount
+        print '<td class="nowrap right">'.price($obj->amount).'</td>';
+		if (! $i) $totalarray['nbfield']++;
+		if (! $i) $totalarray['pos'][$totalarray['nbfield']]='totalttcfield';
+		$totalarray['val']['totalttcfield'] += $obj->amount;
+
+        print '<td></td>';
+
+		if (! $i) $totalarray['nbfield']++;
+
+        print "</tr>\n";
 
         $i++;
     }
 
-    $colspan=5;
-    if (! empty($conf->banque->enabled)) $colspan++;
-    print '<tr class="liste_total"><td colspan="'.$colspan.'" class="liste_total">'.$langs->trans("Total").'</td>';
-    print '<td class="liste_total right">'.price($total)."</td>";
-	print "<td></td></tr>";
+	// Show total line
+	include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
     print "</table>";
     print '</div>';