From 851dbeec0d054b7a4b4d8ba3f7141f64532a7bfc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 8 May 2005 20:14:04 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20Les=20collones=20TVA=20=E0=20payer=20et?=
 =?UTF-8?q?=20=E0=20r=E9cup=E9rer=20sont=20invers=E9es.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/compta/tva/index.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index 7e02b159d21..a7fe5c5eb43 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -140,10 +140,9 @@ for ($y = $year_current ; $y >= $year_start ; $y=$y-1 ) {
   print "<table class=\"noborder\" width=\"100%\">";
   print "<tr class=\"liste_titre\">";
   print "<td width=\"30%\">".$langs->trans("Year")." $y</td>";
-  print "<td align=\"right\">".$langs->trans("VATToCollect")."</td>";
   print "<td align=\"right\">".$langs->trans("VATToPay")."</td>";
-  print "<td>&nbsp;</td>\n";
-  print "<td>&nbsp;</td>\n";
+  print "<td align=\"right\">".$langs->trans("VATToCollect")."</td>";
+  print "<td align=\"right\">".$langs->trans("VATToCollect")."</td>";
   print "</tr>\n";
   $var=True;
   $total = 0;  $subtotal = 0;
@@ -164,17 +163,16 @@ for ($y = $year_current ; $y >= $year_start ; $y=$y-1 ) {
     $subtotal = $subtotal + $diff;
     
     print "<td nowrap align=\"right\">".price($diff)."</td>\n";
-    print "<td>&nbsp;</td>\n";
     print "</tr>\n";
     
     $i++;
     if ($i > 2) {
-      print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("SubTotal").':</td><td nowrap align="right">'.price($subtotal).'</td><td nowrap align="right"><small>'.price($subtotal * 0.8).'</small></td>';
+      print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("SubTotal").':</td><td nowrap align="right">'.price($subtotal).'</td></tr>';
       $i = 0;
       $subtotal = 0;
     }
   }
-  print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("Total").':</td><td nowrap align="right"><b>'.price($total).'</b></td>';
+  print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("TotalToPay").':</td><td nowrap align="right"><b>'.price($total).'</b></td>';
   print "<td>&nbsp;</td>\n";
   print "</table>";