Fix: Le terme total de la tva payé doit s'appeler Total et non Total HT.
This commit is contained in:
parent
fa395ba1b2
commit
ac55764f7e
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
/* 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
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -20,63 +20,71 @@
|
|||||||
* $Source$
|
* $Source$
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
\file htdocs/compta/tva/reglement.php
|
||||||
|
\brief Liste des règlements de TVA effectués
|
||||||
|
\version $Revision$
|
||||||
|
*/
|
||||||
|
|
||||||
require("./pre.inc.php");
|
require("./pre.inc.php");
|
||||||
require("../../tva.class.php");
|
require("../../tva.class.php");
|
||||||
|
|
||||||
/*
|
$langs->load("compta");
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
llxHeader();
|
llxHeader();
|
||||||
|
|
||||||
$tva = new Tva($db);
|
$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 .= " FROM ".MAIN_DB_PREFIX."tva as f ";
|
||||||
$sql .= " ORDER BY dm DESC";
|
$sql .= " ORDER BY dm DESC";
|
||||||
|
|
||||||
$result = $db->query($sql);
|
$result = $db->query($sql);
|
||||||
if ($result)
|
if ($result)
|
||||||
{
|
{
|
||||||
$num = $db->num_rows();
|
$num = $db->num_rows($result);
|
||||||
$i = 0;
|
$i = 0;
|
||||||
$total = 0 ;
|
$total = 0 ;
|
||||||
print '<br>';
|
print '<br>';
|
||||||
print '<table class="noborder" width="100%">';
|
print '<table class="noborder" width="100%">';
|
||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print "<td width=\"60%\">".$langs->trans("Date")."</td>";
|
print '<td nowrap width="120">'.$langs->trans("Date").'</td>';
|
||||||
print "<td align=\"right\">".$langs->trans("Amount")."</td>";
|
print "<td>".$langs->trans("Label")."</td>";
|
||||||
print "<td> </td>\n";
|
print "<td align=\"right\">".$langs->trans("Amount")."</td>";
|
||||||
print "</tr>\n";
|
print "<td> </td>\n";
|
||||||
$var=1;
|
print "</tr>\n";
|
||||||
while ($i < $num)
|
$var=1;
|
||||||
|
while ($i < $num)
|
||||||
{
|
{
|
||||||
$obj = $db->fetch_object($result);
|
$obj = $db->fetch_object($result);
|
||||||
$var=!$var;
|
$var=!$var;
|
||||||
print "<tr $bc[$var]>";
|
print "<tr $bc[$var]>";
|
||||||
print "<td>".dolibarr_print_date($obj->dm)."</td>\n";
|
print "<td>".dolibarr_print_date($obj->dm)."</td>\n";
|
||||||
$total = $total + $obj->amount;
|
print "<td>".$obj->label."</td>\n";
|
||||||
|
$total = $total + $obj->amount;
|
||||||
|
|
||||||
print "<td align=\"right\">".price($obj->amount)."</td><td> </td>";
|
print "<td align=\"right\">".price($obj->amount)."</td><td> </td>";
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
print "<tr class=\"total\"><td align=\"right\">".$langs->trans("TotalHT").":</td>";
|
print '<tr class="liste_total"><td align="right" colspan="2">'.$langs->trans("Total").'</td>';
|
||||||
print "<td align=\"right\"><b>".price($total)."</b></td><td>".$conf->monnaie."</td></tr>";
|
print "<td align=\"right\"><b>".price($total)."</b></td></tr>";
|
||||||
|
|
||||||
print "</table>";
|
print "</table>";
|
||||||
$db->free();
|
$db->free($result);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
print $db->error();
|
dolibarr_print_error($db);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
llxFooter("<em>Dernière modification $Date$ révision $Revision$</em>");
|
llxFooter('$Date$ - $Revision$');
|
||||||
?>
|
?>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user