diff --git a/htdocs/compta/localtax/list.php b/htdocs/compta/localtax/list.php
index 7efee5995ff..8d02d8390dd 100644
--- a/htdocs/compta/localtax/list.php
+++ b/htdocs/compta/localtax/list.php
@@ -93,7 +93,7 @@ if ($result)
$i++;
}
print '| '.$langs->trans("Total").' | ';
- print ''.price($total).' |
';
+ print ''.price($total).' | ';
print "";
$db->free($result);
diff --git a/htdocs/compta/localtax/quadri_detail.php b/htdocs/compta/localtax/quadri_detail.php
index 07fd53ffbad..4bbe5c723e1 100644
--- a/htdocs/compta/localtax/quadri_detail.php
+++ b/htdocs/compta/localtax/quadri_detail.php
@@ -320,10 +320,10 @@ else
print '';
print '| '.$elementcust.' | ';
print ''.$productcust.' | ';
- if ($modetax != 2) print ''.$amountcust.' | ';
- if ($modetax != 1) print ''.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").') | ';
- print ''.$langs->trans("BI").' | ';
- print ''.$vatcust.' | ';
+ if ($modetax != 2) print ''.$amountcust.' | ';
+ if ($modetax != 1) print ''.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").') | ';
+ print ''.$langs->trans("BI").' | ';
+ print ''.$vatcust.' | ';
print '
';
@@ -357,7 +357,7 @@ else
print '';
// Ref
- print '| '.$fields['link'].' | ';
+ print ''.$fields['link'].' | ';
// Description
print '';
@@ -389,7 +389,7 @@ else
// Total HT
if ($modetax != 2)
{
- print ' | ';
+ print ' | ';
print price($fields['totalht']);
if (price2num($fields['ftotal_ttc']))
{
@@ -403,7 +403,7 @@ else
if ($modetax != 1)
{
if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
- print ' | ';
+ print ' | ';
if ($fields['payment_amount'] && $fields['ftotal_ttc'])
{
$payment_static->id=$fields['payment_id'];
@@ -421,14 +421,14 @@ else
}
// Total collected
- print ' | ';
+ print ' | ';
$temp_ht=$fields['totalht'];
if ($type == 1) $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
print price(price2num($temp_ht, 'MT'));
print ' | ';
// Localtax
- print '';
+ print ' | ';
$temp_vat= $local==1?$fields['localtax1']:$fields['localtax2'];
print price(price2num($temp_vat, 'MT'));
//print price($fields['vat']);
@@ -445,14 +445,14 @@ else
// Total customers for this vat rate
print ' |
';
print ' | ';
- print ''.$langs->trans("Total").': | ';
+ print ''.$langs->trans("Total").': | ';
if ($modetax != 1)
{
- print ' | ';
- print ' | ';
+ print ' | ';
+ print ' | ';
}
- print ''.price(price2num($subtot_coll_total_ht, 'MT')).' | ';
- print ''.price(price2num($subtot_coll_vat, 'MT')).' | ';
+ print ''.price(price2num($subtot_coll_total_ht, 'MT')).' | ';
+ print ''.price(price2num($subtot_coll_vat, 'MT')).' | ';
print '
';
}
@@ -460,14 +460,14 @@ else
{
print '';
print '| | ';
- print ''.$langs->trans("Total").': | ';
+ print ''.$langs->trans("Total").': | ';
if ($modetax == 0)
{
- print ' | ';
- print ' | ';
+ print ' | ';
+ print ' | ';
}
- print ''.price(price2num(0, 'MT')).' | ';
- print ''.price(price2num(0, 'MT')).' | ';
+ print ''.price(price2num(0, 'MT')).' | ';
+ print ''.price(price2num(0, 'MT')).' | ';
print '
';
}
@@ -485,11 +485,11 @@ else
print ''.$productsup.' | ';
if ($modetax != 1)
{
- print ''.$amountsup.' | ';
- print ''.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").') | ';
+ print ''.$amountsup.' | ';
+ print ''.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").') | ';
}
- print ''.$langs->trans("BI").' | ';
- print ''.$vatsup.' | ';
+ print ''.$langs->trans("BI").' | ';
+ print ''.$vatsup.' | ';
print ''."\n";
foreach(array_keys($x_paye) as $rate)
@@ -519,7 +519,7 @@ else
print '';
// Ref
- print '| '.$fields['link'].' | ';
+ print ''.$fields['link'].' | ';
// Description
print '';
@@ -545,7 +545,7 @@ else
// Total HT
if ($modetax != 2)
{
- print ' | ';
+ print ' | ';
print price($fields['totalht']);
if (price2num($fields['ftotal_ttc']))
{
@@ -560,7 +560,7 @@ else
$ratiopaymentinvoice=1;
if ($modetax != 1)
{
- print ' | ';
+ print ' | ';
if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
if ($fields['payment_amount'] && $fields['ftotal_ttc'])
{
@@ -582,13 +582,13 @@ else
}
// VAT paid
- print ' | ';
+ print ' | ';
$temp_ht=$fields['totalht']*$ratiopaymentinvoice;
print price(price2num($temp_ht, 'MT'), 1);
print ' | ';
// Localtax
- print '';
+ print ' | ';
$temp_vat=($local==1?$fields['localtax1']:$fields['localtax2'])*$ratiopaymentinvoice;
print price(price2num($temp_vat, 'MT'), 1);
//print price($fields['vat']);
@@ -605,27 +605,27 @@ else
// Total suppliers for this vat rate
print ' |
';
print '| | ';
- print ''.$langs->trans("Total").': | ';
+ print ''.$langs->trans("Total").': | ';
if ($modetax != 1)
{
- print ' | ';
- print ' | ';
+ print ' | ';
+ print ' | ';
}
- print ''.price(price2num($subtot_paye_total_ht, 'MT')).' | ';
- print ''.price(price2num($subtot_paye_vat, 'MT')).' | ';
+ print ''.price(price2num($subtot_paye_total_ht, 'MT')).' | ';
+ print ''.price(price2num($subtot_paye_vat, 'MT')).' | ';
print '
';
}
if (count($x_paye) == 0) { // Show a total line if nothing shown
print '';
print '| | ';
- print ''.$langs->trans("Total").': | ';
+ print ''.$langs->trans("Total").': | ';
if ($modetax != 1) {
- print ' | ';
- print ' | ';
+ print ' | ';
+ print ' | ';
}
- print ''.price(price2num(0, 'MT')).' | ';
- print ''.price(price2num(0, 'MT')).' | ';
+ print ''.price(price2num(0, 'MT')).' | ';
+ print ''.price(price2num(0, 'MT')).' | ';
print '
';
}
@@ -638,7 +638,7 @@ else
$diff = $x_coll_sum - $x_paye_sum;
print '';
print '| '.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').' | ';
- print ''.price(price2num($diff, 'MT'))." | \n";
+ print ''.price(price2num($diff, 'MT'))." | \n";
print "
\n";
$i++;