From 4acce0664cde5dcf531074fad338387ad7f3a851 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 7 Dec 2007 22:24:34 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20on=20d=E9duit=20les=20paiements=20d=E9j?=
 =?UTF-8?q?=E0=20effectu=E9s=20des=20factures?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/compta/bank/treso.php | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index af4010b27cd..d49cfc026a4 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -169,6 +169,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 		$i = 0;
 		while ($i < $num)
 		{
+			$paiement = '';
 			$var=!$var;
 			$obj = $db->fetch_object($result);
 			
@@ -181,6 +182,17 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 				$facturefournstatic->id=$obj->facid;
 				$facturefournstatic->type=$obj->type;
 				$facture = $facturefournstatic->getNomUrl(1,'');
+				
+				// On recherche les paiements deja effectue pour les deduires
+				$sqlp = "SELECT sum(amount) as paiement";
+				$sqlp.= " FROM ".MAIN_DB_PREFIX.'paiementfourn_facturefourn';
+				$sqlp.= " WHERE fk_facturefourn = ".$obj->facid;
+				$resql = $db->query($sqlp);
+				if ($resql)
+				{
+					$objp = $db->fetch_object($resql);
+					if ($objp) $paiement = $objp->paiement;
+				}
 			}
 			else
 			{
@@ -188,22 +200,39 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 				$facturestatic->id=$obj->facid;
 				$facturestatic->type=$obj->type;
 				$facture = $facturestatic->getNomUrl(1,'');
+				
+				// On recherche les paiements deja effectue pour les deduires
+				$sqlp = "SELECT sum(amount) as paiement";
+				$sqlp.= " FROM ".MAIN_DB_PREFIX.'paiement_facture';
+				$sqlp.= " WHERE fk_facture = ".$obj->facid;
+				$resql = $db->query($sqlp);
+				if ($resql)
+				{
+					$objp = $db->fetch_object($resql);
+					if ($objp) $paiement = $objp->paiement;
+				}
 			}
 
-			$solde += $obj->total_ttc;
+			$total_ttc = $obj->total_ttc;
+			if ($paiement) $total_ttc = $obj->total_ttc - $paiement;
+			$solde += $total_ttc;
 
 			print "<tr $bc[$var]>";
 			print "<td>".$facture."</td>";
 			print "<td>".$societestatic->getNomUrl(0,'',16)."</td>";
 			print "<td>".dolibarr_print_date($obj->dlr,"day")."</td>";
-			if ($obj->total_ttc < 0) { print "<td align=\"right\">".price($obj->total_ttc)."</td><td>&nbsp;</td>"; };
-			if ($obj->total_ttc >= 0) { print "<td>&nbsp;</td><td align=\"right\">".price($obj->total_ttc)."</td>"; };			
+			if ($obj->total_ttc < 0) { print "<td align=\"right\">".price($total_ttc)."</td><td>&nbsp;</td>"; };
+			if ($obj->total_ttc >= 0) { print "<td>&nbsp;</td><td align=\"right\">".price($total_ttc)."</td>"; };			
 			print "<td align=\"right\">".price($solde)."</td>";
 			print "</tr>";
 			$i++;
 		}
 		$db->free($result);
 	}
+	else
+	{
+		dolibarr_print_error($db);
+	}
 
 	print "</table>";