New: Add patch from Guillaume Baron
This commit is contained in:
parent
c5e25f8d2c
commit
74f663decd
@ -62,27 +62,27 @@ function pt ($db, $sql, $date)
|
|||||||
$num = $db->num_rows($result);
|
$num = $db->num_rows($result);
|
||||||
$i = 0;
|
$i = 0;
|
||||||
$total = 0;
|
$total = 0;
|
||||||
print "<table class=\"noborder\" width=\"100%\">";
|
print '<table class="noborder" width="100%">';
|
||||||
print "<tr class=\"liste_titre\">";
|
print '<tr class="liste_titre">';
|
||||||
print "<td nowrap width=\"60%\">$date</td>";
|
print '<td nowrap="nowrap" width="60%">'.$date.'</td>';
|
||||||
print "<td align=\"right\">".$langs->trans("Amount")."</td>";
|
print '<td align="right">'.$langs->trans("Amount").'</td>';
|
||||||
print "<td> </td>\n";
|
print '<td> </td>'."\n";
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
$var=True;
|
$var=True;
|
||||||
while ($i < $num)
|
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 nowrap>$obj->dm</td>\n";
|
print '<td nowrap="nowrap">'.$obj->dm."</td>\n";
|
||||||
$total = $total + $obj->mm;
|
$total = $total + $obj->mm;
|
||||||
|
|
||||||
print "<td nowrap align=\"right\">".price($obj->mm)."</td><td > </td>\n";
|
print '<td nowrap="nowrap" align="right">'.price($obj->mm)."</td><td > </td>\n";
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
print "<tr class=\"liste_total\"><td align=\"right\">".$langs->trans("Total")." :</td><td nowrap align=\"right\"><b>".price($total)."</b></td><td> </td></tr>";
|
print '<tr class="liste_total"><td align="right">'.$langs->trans("Total")." :</td><td nowrap=\"nowrap\" align=\"right\"><b>".price($total)."</b></td><td> </td></tr>";
|
||||||
|
|
||||||
print "</table>";
|
print "</table>";
|
||||||
$db->free($result);
|
$db->free($result);
|
||||||
@ -158,7 +158,7 @@ for ($m = 1 ; $m < 13 ; $m++ )
|
|||||||
|
|
||||||
$var=!$var;
|
$var=!$var;
|
||||||
print "<tr $bc[$var]>";
|
print "<tr $bc[$var]>";
|
||||||
print '<td nowrap>'.dol_print_date(dol_mktime(0,0,0,$m,1,$y),"%b %Y").'</td>';
|
print '<td nowrap><a href="quadri_detail.php?leftmenu=tax_vat&month='.$m.'&year='.$y.'">'.dol_print_date(dol_mktime(0,0,0,$m,1,$y),"%b %Y").'</a></td>';
|
||||||
|
|
||||||
$x_coll = 0;
|
$x_coll = 0;
|
||||||
foreach($coll_listsell as $vatrate=>$val)
|
foreach($coll_listsell as $vatrate=>$val)
|
||||||
@ -187,10 +187,10 @@ for ($m = 1 ; $m < 13 ; $m++ )
|
|||||||
$i++;
|
$i++;
|
||||||
if ($i > 2) {
|
if ($i > 2) {
|
||||||
print '<tr class="liste_total">';
|
print '<tr class="liste_total">';
|
||||||
print '<td align="right">'.$langs->trans("SubTotal").':</td>';
|
print '<td align="right"><a href="quadri_detail.php?leftmenu=tax_vat&q='.($m/3).'&year='.$y.'">'.$langs->trans("SubTotal").'</a>:</td>';
|
||||||
print '<td nowrap align="right">'.price($subtotalcoll).'</td>';
|
print '<td nowrap="nowrap" align="right">'.price($subtotalcoll).'</td>';
|
||||||
print '<td nowrap align="right">'.price($subtotalpaye).'</td>';
|
print '<td nowrap="nowrap" align="right">'.price($subtotalpaye).'</td>';
|
||||||
print '<td nowrap align="right">'.price($subtotal).'</td>';
|
print '<td nowrap="nowrap" align="right">'.price($subtotal).'</td>';
|
||||||
print '<td> </td></tr>';
|
print '<td> </td></tr>';
|
||||||
$i = 0;
|
$i = 0;
|
||||||
$subtotalcoll=0; $subtotalpaye=0; $subtotal=0;
|
$subtotalcoll=0; $subtotalpaye=0; $subtotal=0;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user