diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 5c77bbba21d..1b5a232b812 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -231,13 +231,11 @@ $result = $db->query($sql);
if ($result) {
$num = $db->num_rows($result);
$i = 0;
- $var=true;
while ($i < $num)
{
$objp = $db->fetch_object($result);
-
- print "| | ";
+ print '
| | ';
print "".$langs->trans("Bills").' '.$objp->name." | \n";
if ($modecompta == 'CREANCES-DETTES')
@@ -282,7 +280,7 @@ if ($modecompta != 'CREANCES-DETTES')
$objp = $db->fetch_object($result);
- print "
| | ";
+ print '
| | ';
print "".$langs->trans("Bills")." ".$langs->trans("Other")." (".$langs->trans("PaymentsNotLinkedToInvoice").")\n";
if ($modecompta == 'CREANCES-DETTES')
@@ -303,9 +301,8 @@ if ($modecompta != 'CREANCES-DETTES')
}
if ($total_ttc == 0)
-{
-
- print " |
| | ";
+{
+ print '
| | ';
print ''.$langs->trans("None").' | ';
print '
';
}
@@ -361,15 +358,13 @@ $result = $db->query($sql);
if ($result) {
$num = $db->num_rows($result);
$i = 0;
- $var=true;
if ($num > 0)
{
while ($i < $num)
{
$objp = $db->fetch_object($result);
-
- print "| | ";
+ print '
| | ';
print "".$langs->trans("Bills")." socid."\">".$objp->name." | \n";
if ($modecompta == 'CREANCES-DETTES')
@@ -386,9 +381,8 @@ if ($result) {
}
}
else
- {
-
- print "
| | ";
+ {
+ print '
| | ';
print ''.$langs->trans("None").' | ';
print '
';
}
@@ -447,7 +441,6 @@ $subtotal_ht = 0;
$subtotal_ttc = 0;
if ($result) {
$num = $db->num_rows($result);
- $var=true;
$i = 0;
if ($num) {
while ($i < $num) {
@@ -458,8 +451,7 @@ if ($result) {
$subtotal_ht += $obj->amount;
$subtotal_ttc += $obj->amount;
- $var = !$var;
- print "| | ";
+ print '
| | ';
print ''.$obj->label.' | ';
if ($modecompta == 'CREANCES-DETTES') print ''.price(-$obj->amount).' | ';
print ''.price(-$obj->amount).' | ';
@@ -468,8 +460,7 @@ if ($result) {
}
}
else {
- $var = !$var;
- print "
| | ";
+ print '
| | ';
print ''.$langs->trans("None").' | ';
print '
';
}
@@ -526,7 +517,6 @@ $subtotal_ht = 0;
$subtotal_ttc = 0;
if ($result) {
$num = $db->num_rows($result);
- $var=true;
$i = 0;
if ($num) {
while ($i < $num) {
@@ -537,8 +527,7 @@ if ($result) {
$subtotal_ht += $obj->amount;
$subtotal_ttc += $obj->amount;
- $var = !$var;
- print "| | ";
+ print '
| | ';
print ''.$obj->label.' | ';
if ($modecompta == 'CREANCES-DETTES')
print ''.price(-$obj->amount).' | ';
@@ -548,8 +537,7 @@ if ($result) {
}
}
else {
- $var = !$var;
- print "
| | ";
+ print '
| | ';
print ''.$langs->trans("None").' | ';
print '
';
}
@@ -615,7 +603,6 @@ if (! empty($conf->salaries->enabled))
if ($result)
{
$num = $db->num_rows($result);
- $var=true;
$i = 0;
if ($num)
{
@@ -628,8 +615,7 @@ if (! empty($conf->salaries->enabled))
$subtotal_ht += $obj->amount;
$subtotal_ttc += $obj->amount;
- $var = !$var;
- print "| | ";
+ print '
| | ';
print "".$langs->trans("Salary")." fk_user."\">".$obj->firstname." ".$obj->lastname." | \n";
@@ -641,8 +627,7 @@ if (! empty($conf->salaries->enabled))
}
else
{
- $var = !$var;
- print "
| | ";
+ print '
| | ';
print ''.$langs->trans("None").' | ';
print '
';
}
@@ -704,7 +689,6 @@ if (! empty($conf->expensereport->enabled))
if ($result)
{
$num = $db->num_rows($result);
- $var=true;
if ($num)
{
while ($obj = $db->fetch_object($result))
@@ -714,8 +698,7 @@ if (! empty($conf->expensereport->enabled))
$subtotal_ht += $obj->amount_ht;
$subtotal_ttc += $obj->amount_ttc;
- $var = !$var;
- print "| | ";
+ print '
| | ';
print "".$langs->trans("ExpenseReport")." userid."\">".$obj->firstname." ".$obj->lastname." | \n";
@@ -726,8 +709,7 @@ if (! empty($conf->expensereport->enabled))
}
else
{
- $var = !$var;
- print "
| | ";
+ print '
| | ';
print ''.$langs->trans("None").' | ';
print '
';
}
@@ -782,7 +764,6 @@ if (! empty($conf->don->enabled))
if ($result)
{
$num = $db->num_rows($result);
- $var=true;
$i = 0;
if ($num)
{
@@ -795,8 +776,7 @@ if (! empty($conf->don->enabled))
$subtotal_ht += $obj->amount;
$subtotal_ttc += $obj->amount;
- $var = !$var;
- print "| | ";
+ print '
| | ';
print "".$langs->trans("Donation")." name."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->name. " ".$obj->firstname." ".$obj->lastname." | \n";
@@ -808,8 +788,7 @@ if (! empty($conf->don->enabled))
}
else
{
- $var = !$var;
- print "
| | ";
+ print '
| | ';
print ''.$langs->trans("None").' | ';
print '
';
}
@@ -859,7 +838,6 @@ if ($modecompta == 'CREANCES-DETTES')
if ($result)
{
$num = $db->num_rows($result);
- $var=false;
$i = 0;
if ($num)
{
@@ -878,7 +856,7 @@ if ($modecompta == 'CREANCES-DETTES')
} else {
dol_print_error($db);
}
- print "| | ";
+ print '
| | ';
print "".$langs->trans("VATToPay")." | \n";
print " | \n";
print "".price($amount)." | \n";
@@ -908,7 +886,6 @@ if ($modecompta == 'CREANCES-DETTES')
if ($result)
{
$num = $db->num_rows($result);
- $var=true;
$i = 0;
if ($num)
{
@@ -928,7 +905,7 @@ if ($modecompta == 'CREANCES-DETTES')
} else {
dol_print_error($db);
}
- print "
| | ";
+ print '
| | ';
print "".$langs->trans("VATToCollect")." | \n";
print " | \n";
print "".price($amount)." | \n";
@@ -955,7 +932,6 @@ else
$result=$db->query($sql);
if ($result) {
$num = $db->num_rows($result);
- $var=false;
$i = 0;
if ($num) {
while ($i < $num) {
@@ -974,7 +950,7 @@ else
} else {
dol_print_error($db);
}
- print "
| | ";
+ print '
| | ';
print "".$langs->trans("VATPaid")." | \n";
if ($modecompta == 'CREANCES-DETTES')
print "".price($amount)." | \n";
@@ -1000,7 +976,6 @@ else
$result=$db->query($sql);
if ($result) {
$num = $db->num_rows($result);
- $var=true;
$i = 0;
if ($num) {
while ($i < $num) {
@@ -1021,7 +996,7 @@ else
{
dol_print_error($db);
}
- print "
| | ";
+ print '
| | ';
print "".$langs->trans("VATCollected")." | \n";
if ($modecompta == 'CREANCES-DETTES')
print "".price($amount)." | \n";