From 0820d8fb337a83a9eeb0391b9043e7d9e0c05acc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 9 Nov 2005 21:27:37 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20Si=20facture=20pay=E9,=20on=20affiche=20?=
 =?UTF-8?q?pas=20le=20reste=20=E0=20pay=E9=20(uniformit=E9=20avec=20factur?=
 =?UTF-8?q?e=20clients)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/fourn/facture/fiche.php    | 36 ++++++++++++++-----------------
 htdocs/fourn/facture/paiement.php |  2 +-
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index d7b2a85748a..d188962b139 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -502,18 +502,17 @@ else
 			print '</td><td valign="top">';
 
 
-			/*
-			 * Liste des paiements
-			 */
-
 			print '<table class="border" width="100%">';
 
 			print '<tr>';
 			print '<td>'.$langs->trans('DateEcheance').'</td><td>';
 			print dolibarr_print_date($fac->date_echeance,'%A %d %B %Y').'</td></tr>';
 
-			print '<tr><td colspan="2">'.$langs->trans('Payments').'</td></tr>';
-
+			/*
+			 * Liste des paiements
+			 */
+			print '<tr><td colspan="2">';
+			print $langs->trans('Payments').' :<br>';
 			$sql  = 'SELECT '.$db->pdate('datep').' as dp, pf.amount,';
 			$sql .= ' c.libelle as paiement_type, p.num_paiement, p.rowid';
 			$sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn as p';
@@ -526,11 +525,8 @@ else
 			if ($result)
 			{
 				$num = $db->num_rows($result);
-				$i = 0; $total = 0;
-
-				print '<tr><td colspan="2">';
+				$i = 0; $totalpaye = 0;
 				print '<table class="noborder" width="100%">';
-
 				print '<tr class="liste_titre">';
 				print '<td>'.$langs->trans('Date').'</td>';
 				print '<td>'.$langs->trans('Type').'</td>';
@@ -560,22 +556,22 @@ else
 					}
 
 					print '</tr>';
-					$total = $total + $objp->amount;
+					$totalpaye += $objp->amount;
 					$i++;
 				}
-				print '<tr class="liste_total"><td colspan="2" align="right">'.$langs->trans('Total').' :</td><td align="right"><b>'.price($total).'</b></td><td'.$tdsup.'>'.$langs->trans('Currency'.$conf->monnaie)."</td></tr>\n";
 
-
-				if ($fac->statut > 0)
+				if ($fac->paye == 0)
 				{
-					$resteapayer = abs($fac->total_ttc - $total);
-					print '<tr class="liste_total"><td colspan="2" align="right">'.$langs->trans('RemainderToPay').' :</td>';
-					print '<td align="right"><b>'.price($resteapayer).'</b></td><td'.$tdsup.'>'.$langs->trans('Currency'.$conf->monnaie).'</td>';
-					print '</tr>';
-				}
+					print '<tr><td colspan="2" align="right">'.$langs->trans('AlreadyPayed').' :</td><td align="right"><b>'.price($totalpaye).'</b></td><td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>';
+					print '<tr><td colspan="2" align="right">'.$langs->trans("Billed").' :</td><td align="right" style="border: 1px solid;">'.price($fac->total_ttc).'</td><td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>';
 
+					$resteapayer = $fac->total_ttc - $totalpaye;
+
+					print '<tr><td colspan="2" align="right">'.$langs->trans('RemainderToPay').' :</td>';
+					print '<td align="right" style="border: 1px solid;" bgcolor="#f0f0f0"><b>'.price($resteapayer).'</b></td><td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>';
+				}
 				print '</table>';
-				$db->free();
+				$db->free($result);
 			}
 			else
 			{
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 10a274560ae..0053d315101 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -271,7 +271,7 @@ if ($action == 'create' || $action == 'add_paiement')
 					print '<tr class="liste_titre">';
 					print '<td>'.$langs->trans('Bill').'</td><td align="center">'.$langs->trans('Date').'</td>';
 					print '<td align="right">'.$langs->trans('AmountTTC').'</td>';
-					print '<td align="right">'.$langs->trans('Paied').'</td>';
+					print '<td align="right">'.$langs->trans('AlreadyPayed').'</td>';
 					print '<td align="right">'.$langs->trans('RemainderToPay').'</td>';
 					print '<td align="center">'.$langs->trans('Amount').'</td>';
 					print '</tr>';