From ac55764f7e40168a2e4e4a70990ef689303b3815 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 8 May 2005 19:25:55 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20Le=20terme=20total=20de=20la=20tva=20pay?=
 =?UTF-8?q?=E9=20doit=20s'appeler=20Total=20et=20non=20Total=20HT.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/compta/tva/reglement.php | 80 ++++++++++++++++++---------------
 1 file changed, 44 insertions(+), 36 deletions(-)

diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php
index fd41d0d710a..c36d499c0d2 100644
--- a/htdocs/compta/tva/reglement.php
+++ b/htdocs/compta/tva/reglement.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004      Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2005 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,63 +20,71 @@
  * $Source$
  *
  */
+
+/**
+	    \file       htdocs/compta/tva/reglement.php
+		\brief      Liste des règlements de TVA effectués
+		\version    $Revision$
+*/
+
 require("./pre.inc.php");
 require("../../tva.class.php");
 
-/*
- *
- */
+$langs->load("compta");
+
 
 llxHeader();
 
 $tva = new Tva($db);
 
-print_titre("Réglements TVA");
+print_titre($langs->trans("VATPayments"));
 
-$sql = "SELECT amount, ".$db->pdate("f.datev")." as dm";
+$sql = "SELECT rowid, amount, label, ".$db->pdate("f.datev")." as dm";
 $sql .= " FROM ".MAIN_DB_PREFIX."tva as f ";
-$sql .= " ORDER  BY dm DESC";
+$sql .= " ORDER BY dm DESC";
 
 $result = $db->query($sql);
 if ($result)
 {
-  $num = $db->num_rows();
-  $i = 0; 
-  $total = 0 ;
-  print '<br>';
-  print '<table class="noborder" width="100%">';
-  print '<tr class="liste_titre">';
-  print "<td width=\"60%\">".$langs->trans("Date")."</td>";
-  print "<td align=\"right\">".$langs->trans("Amount")."</td>";
-  print "<td>&nbsp;</td>\n";
-  print "</tr>\n";
-  $var=1;
-  while ($i < $num)
+    $num = $db->num_rows($result);
+    $i = 0; 
+    $total = 0 ;
+    print '<br>';
+    print '<table class="noborder" width="100%">';
+    print '<tr class="liste_titre">';
+    print '<td nowrap width="120">'.$langs->trans("Date").'</td>';
+    print "<td>".$langs->trans("Label")."</td>";
+    print "<td align=\"right\">".$langs->trans("Amount")."</td>";
+    print "<td>&nbsp;</td>\n";
+    print "</tr>\n";
+    $var=1;
+    while ($i < $num)
     {
-      $obj = $db->fetch_object($result);
-      $var=!$var;
-      print "<tr $bc[$var]>";
-      print "<td>".dolibarr_print_date($obj->dm)."</td>\n";
-      $total = $total + $obj->amount;
-      
-      print "<td align=\"right\">".price($obj->amount)."</td><td>&nbsp;</td>";
-      print "</tr>\n";
-      
-      $i++;
+        $obj = $db->fetch_object($result);
+        $var=!$var;
+        print "<tr $bc[$var]>";
+        print "<td>".dolibarr_print_date($obj->dm)."</td>\n";
+        print "<td>".$obj->label."</td>\n";
+        $total = $total + $obj->amount;
+        
+        print "<td align=\"right\">".price($obj->amount)."</td><td>&nbsp;</td>";
+        print "</tr>\n";
+        
+        $i++;
     }
-  print "<tr class=\"total\"><td align=\"right\">".$langs->trans("TotalHT").":</td>";
-  print "<td align=\"right\"><b>".price($total)."</b></td><td>".$conf->monnaie."</td></tr>";
-  
-  print "</table>";
-  $db->free();
+    print '<tr class="liste_total"><td align="right" colspan="2">'.$langs->trans("Total").'</td>';
+    print "<td align=\"right\"><b>".price($total)."</b></td></tr>";
+    
+    print "</table>";
+    $db->free($result);
 }
 else
 {
-  print $db->error();
+    dolibarr_print_error($db);
 }
   
 
 $db->close();
 
-llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
+llxFooter('$Date$ - $Revision$');
 ?>