From 3e28f22bad4b2ec5007c8eecae7bd012c532d4a0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Dec 2016 00:05:33 +0100
Subject: [PATCH] Fix style

---
 htdocs/compta/facture.php       |  2 +-
 htdocs/compta/sociales/card.php | 44 +++++++++++++++++++--------------
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index cd44122b981..fd1f4d73a4c 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -3723,7 +3723,7 @@ else if ($id > 0 || ! empty($ref))
         else
             print $langs->trans('ExcessReceived');
         print ' :</td>';
-        print '<td align="right"'.($resteapayeraffiche?' class="amountremaintopay"':$cssforamountpaymentcomplete).'>' . price($resteapayeraffiche) . '</td>';
+        print '<td align="right"'.($resteapayeraffiche?' class="amountremaintopay"':(' class="'.$cssforamountpaymentcomplete.'"').'>' . price($resteapayeraffiche) . '</td>';
         print '<td class="nowrap">&nbsp;</td></tr>';
     } 
     else // Credit note
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index e917e1e1c71..77393b78f4e 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -556,34 +556,42 @@ if ($id > 0)
 		    print '<td>'.$langs->trans("Date").'</td>';
 		    print '<td>'.$langs->trans("Type").'</td>';
 		    print '<td align="right">'.$langs->trans("Amount").'</td>';
-		    print '<td>&nbsp;</td>';
 		    print '</tr>';
 		
-		    $var=True;
-		    while ($i < $num)
+		    $var=true;
+            if ($num > 0)
+            {
+    		    while ($i < $num)
+    		    {
+    		        $objp = $db->fetch_object($resql);
+    		        $var=!$var;
+    		        print "<tr ".$bc[$var]."><td>";
+    		        print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.'</a></td>';
+    		        print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
+    		        $labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->paiement_type;
+    		        print "<td>".$labeltype.' '.$objp->num_paiement."</td>\n";
+    		        print '<td align="right">'.price($objp->amount)."</td>\n";
+    		        print "</tr>";
+    		        $totalpaye += $objp->amount;
+    		        $i++;
+    		    }
+            }
+            else
 		    {
-		        $objp = $db->fetch_object($resql);
 		        $var=!$var;
-		        print "<tr ".$bc[$var]."><td>";
-		        print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.'</a></td>';
-		        print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
-		        $labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->paiement_type;
-		        print "<td>".$labeltype.' '.$objp->num_paiement."</td>\n";
-		        print '<td align="right">'.price($objp->amount)."</td><td>&nbsp;".$langs->trans("Currency".$conf->currency)."</td>\n";
-		        print "</tr>";
-		        $totalpaye += $objp->amount;
-		        $i++;
+		        print '<tr '.$bc[$var].'><td colspan="'.$nbcols.'" class="opacitymedium">'.$langs->trans("None").'</td><td></td><td></td><td></td></tr>';
 		    }
-		
+                
 		    if ($object->paye == 0)
 		    {
-		        print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("AlreadyPaid")." :</td><td align=\"right\">".price($totalpaye)."</td><td>&nbsp;".$langs->trans("Currency".$conf->currency)."</td></tr>\n";
-		        print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("AmountExpected")." :</td><td align=\"right\">".price($object->amount)."</td><td>&nbsp;".$langs->trans("Currency".$conf->currency)."</td></tr>\n";
+		        print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("AlreadyPaid")." :</td><td align=\"right\">".price($totalpaye)."</td></tr>\n";
+		        print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("AmountExpected")." :</td><td align=\"right\">".price($object->amount)."</td></tr>\n";
 		
 		        $resteapayer = $object->amount - $totalpaye;
-		
+		        $cssforamountpaymentcomplete = 'amountpaymentcomplete';
+		        
 		        print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("RemainderToPay")." :</td>";
-		        print "<td align=\"right\">".price($resteapayer)."</td><td>&nbsp;".$langs->trans("Currency".$conf->currency)."</td></tr>\n";
+		        print '<td align="right"'.($resteapayer?' class="amountremaintopay"':(' class="'.$cssforamountpaymentcomplete.'"')).'>'.price($resteapayer)."</td></tr>\n";
 		    }
 		    print "</table>";
 		    $db->free($resql);
-- 
GitLab