From a9dd9d6dfcf6ede725531a678c46dbdd7dd442d4 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sun, 3 Nov 2013 15:07:26 +0100
Subject: [PATCH] Modify the presentation of the card

---
 htdocs/compta/sociales/charges.php | 38 ++++++++++++++----------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php
index 2ec6539db9e..adc5fb8ae74 100644
--- a/htdocs/compta/sociales/charges.php
+++ b/htdocs/compta/sociales/charges.php
@@ -297,20 +297,7 @@ if ($id > 0)
 		}
 
 		// Type
-		print "<tr><td>".$langs->trans("Type")."</td><td>".$object->type_libelle."</td><td>".$langs->trans("Payments")."</td></tr>";
-
-		// Period end date
-		print "<tr><td>".$langs->trans("PeriodEndDate")."</td>";
-		print "<td>";
-		if ($action == 'edit')
-		{
-			print $form->select_date($object->periode, 'period', 0, 0, 0, 'charge', 1);
-		}
-		else
-		{
-			print dol_print_date($object->periode,"day");
-		}
-		print "</td>";
+		print "<tr><td>".$langs->trans("Type")."</td><td>".$object->type_libelle."</td>";
 
 		$rowspan=5;
 		print '<td rowspan="'.$rowspan.'" valign="top">';
@@ -337,8 +324,8 @@ if ($id > 0)
 			$i = 0; $total = 0;
 			echo '<table class="nobordernopadding" width="100%">';
 			print '<tr class="liste_titre">';
-			print '<td>'.$langs->trans("Date").'</td><td>'.$langs->trans("Type").'</td>';
-			print '<td align="right">'.$langs->trans("Amount").'</td><td>&nbsp;</td></tr>';
+			print '<td>'.$langs->trans("Payments").'</td><td>'.$langs->trans("Type").'</td>';
+      print '<td align="right">'.$langs->trans("Amount").'</td><td>&nbsp;</td></tr>';
 
 			$var=True;
 			while ($i < $num)
@@ -349,12 +336,12 @@ if ($id > 0)
 				print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").'</a> ';
 				print dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
 				print "<td>".$objp->paiement_type.' '.$objp->num_paiement."</td>\n";
-				print '<td align="right">'.price($objp->amount)."</td><td>&nbsp;".$langs->trans("Currency".$conf->currency)."</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++;
 			}
-
+      
 			if ($object->paye == 0)
 			{
 				print "<tr><td colspan=\"2\" align=\"right\">".$langs->trans("AlreadyPaid")." :</td><td align=\"right\"><b>".price($totalpaye)."</b></td><td>&nbsp;".$langs->trans("Currency".$conf->currency)."</td></tr>\n";
@@ -376,6 +363,19 @@ if ($id > 0)
 
 		print "</tr>";
 
+    // Period end date
+		print "<tr><td>".$langs->trans("PeriodEndDate")."</td>";
+		print "<td>";
+		if ($action == 'edit')
+		{
+			print $form->select_date($object->periode, 'period', 0, 0, 0, 'charge', 1);
+		}
+		else
+		{
+			print dol_print_date($object->periode,"day");
+		}
+		print "</td></tr>";
+    
 		// Due date
 		if ($action == 'edit')
 		{
@@ -393,8 +393,6 @@ if ($id > 0)
 		// Status
 		print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
 
-		print '<tr><td colspan="2">&nbsp;</td></tr>';
-
 		print '</table>';
 
 		if ($action == 'edit')