diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index c95ca219350..2af152dda0b 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -222,15 +222,15 @@ print_liste_field_titre("PredefinedGroups", $_SERVER["PHP_SELF"], 'f.thirdparty_
print_liste_field_titre('');
if ($modecompta == 'BOOKKEEPING')
{
- print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], 'amount', '', $param, 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], 'amount', '', $param, 'class="right"', $sortfield, $sortorder);
}
else
{
if ($modecompta == 'CREANCES-DETTES')
{
- print_liste_field_titre("AmountHT", $_SERVER["PHP_SELF"], 'amount_ht', '', $param, 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre("AmountHT", $_SERVER["PHP_SELF"], 'amount_ht', '', $param, 'class="right"', $sortfield, $sortorder);
}
- print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], 'amount_ttc', '', $param, 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], 'amount_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
}
print "\n";
@@ -284,7 +284,7 @@ if ($modecompta == 'BOOKKEEPING')
print '';
print '| | ';
print ''.$objp->pcg_type.($objp->pcg_subtype != 'XXXXXX'?' - '.$objp->pcg_subtype:'').($objp->name?' ('.$objp->name.')':'')." | \n";
- print ''.price($objp->amount)." | \n";
+ print ''.price($objp->amount)." | \n";
print "
\n";
$total_ht += (isset($objp->amount)?$objp->amount:0);
@@ -317,7 +317,7 @@ if ($modecompta == 'BOOKKEEPING')
print '';
print ' | ';
print ' ' . length_accountg($cpt['account_number']) . ' - ' . $cpt['account_label'] . ' | ';
- print '' . price($resultN) . ' | ';
+ print '' . price($resultN) . ' | ';
print "
\n";
}
}
@@ -389,8 +389,8 @@ else
print "".$langs->trans("Bills").' '.$objp->name." | \n";
if ($modecompta == 'CREANCES-DETTES')
- print "".price($objp->amount_ht)." | \n";
- print "".price($objp->amount_ttc)." | \n";
+ print ''.price($objp->amount_ht)." | \n";
+ print ''.price($objp->amount_ttc)." | \n";
$total_ht += (isset($objp->amount_ht)?$objp->amount_ht:0);
$total_ttc += $objp->amount_ttc;
@@ -434,8 +434,8 @@ else
print "".$langs->trans("Bills")." ".$langs->trans("Other")." (".$langs->trans("PaymentsNotLinkedToInvoice").")\n";
if ($modecompta == 'CREANCES-DETTES')
- print " | ".price($objp->amount_ht)." | \n";
- print "".price($objp->amount_ttc)." | \n";
+ print ''.price($objp->amount_ht)." | \n";
+ print ''.price($objp->amount_ttc)." | \n";
$total_ht += (isset($objp->amount_ht)?$objp->amount_ht:0);
$total_ttc += $objp->amount_ttc;
@@ -459,8 +459,8 @@ else
print '';
if ($modecompta == 'CREANCES-DETTES')
- print '| '.price($total_ht).' | ';
- print ''.price($total_ttc).' | ';
+ print ''.price($total_ht).' | ';
+ print ''.price($total_ttc).' | ';
print '
';
@@ -519,8 +519,8 @@ else
print "".$langs->trans("Bills")." socid."\">".$objp->name." | \n";
if ($modecompta == 'CREANCES-DETTES')
- print "".price(-$objp->amount_ht)." | \n";
- print "".price(-$objp->amount_ttc)." | \n";
+ print ''.price(-$objp->amount_ht)." | \n";
+ print ''.price(-$objp->amount_ttc)." | \n";
$total_ht -= (isset($objp->amount_ht)?$objp->amount_ht:0);
$total_ttc -= $objp->amount_ttc;
@@ -544,8 +544,8 @@ else
}
print '';
if ($modecompta == 'CREANCES-DETTES')
- print '| '.price(-$subtotal_ht).' | ';
- print ''.price(-$subtotal_ttc).' | ';
+ print ''.price(-$subtotal_ht).' | ';
+ print ''.price(-$subtotal_ttc).' | ';
print '
';
@@ -605,8 +605,8 @@ else
print '| | ';
print ''.$obj->label.' | ';
- if ($modecompta == 'CREANCES-DETTES') print ''.price(-$obj->amount).' | ';
- print ''.price(-$obj->amount).' | ';
+ if ($modecompta == 'CREANCES-DETTES') print ''.price(-$obj->amount).' | ';
+ print ''.price(-$obj->amount).' | ';
print '
';
$i++;
}
@@ -621,8 +621,8 @@ else
}
print '';
if ($modecompta == 'CREANCES-DETTES')
- print '| '.price(-$subtotal_ht).' | ';
- print ''.price(-$subtotal_ttc).' | ';
+ print ''.price(-$subtotal_ht).' | ';
+ print ''.price(-$subtotal_ttc).' | ';
print '
';
@@ -682,8 +682,8 @@ else
print '| | ';
print ''.$obj->label.' | ';
if ($modecompta == 'CREANCES-DETTES')
- print ''.price(-$obj->amount).' | ';
- print ''.price(-$obj->amount).' | ';
+ print ''.price(-$obj->amount).' | ';
+ print ''.price(-$obj->amount).' | ';
print '
';
$i++;
}
@@ -698,8 +698,8 @@ else
}
print '';
if ($modecompta == 'CREANCES-DETTES')
- print '| '.price(-$subtotal_ht).' | ';
- print ''.price(-$subtotal_ttc).' | ';
+ print ''.price(-$subtotal_ht).' | ';
+ print ''.price(-$subtotal_ttc).' | ';
print '
';
if ($mysoc->tva_assuj == 'franchise') // Non assujetti
@@ -709,10 +709,10 @@ else
print ' | ';
print '';
- print '| '.$langs->trans("Profit").' | ';
+ print '
| '.$langs->trans("Profit").' | ';
if ($modecompta == 'CREANCES-DETTES')
- print ''.price($total_ht).' | ';
- print ''.price($total_ttc).' | ';
+ print ''.price($total_ht).' | ';
+ print ''.price($total_ttc).' | ';
print '
';
print '';
@@ -775,8 +775,8 @@ else
print "| ".$langs->trans("Salary")." fk_user."\">".$obj->firstname." ".$obj->lastname." | \n";
- if ($modecompta == 'CREANCES-DETTES') print ''.price(-$obj->amount).' | ';
- print ''.price(-$obj->amount).' | ';
+ if ($modecompta == 'CREANCES-DETTES') print ''.price(-$obj->amount).' | ';
+ print ''.price(-$obj->amount).' | ';
print '
';
$i++;
}
@@ -794,8 +794,8 @@ else
}
print '';
if ($modecompta == 'CREANCES-DETTES')
- print '| '.price(-$subtotal_ht).' | ';
- print ''.price(-$subtotal_ttc).' | ';
+ print ''.price(-$subtotal_ht).' | ';
+ print ''.price(-$subtotal_ttc).' | ';
print '
';
}
@@ -862,8 +862,8 @@ else
print "".$langs->trans("ExpenseReport")." userid."\">".$obj->firstname." ".$obj->lastname." | \n";
- if ($modecompta == 'CREANCES-DETTES') print ''.price(-$obj->amount_ht).' | ';
- print ''.price(-$obj->amount_ttc).' | ';
+ if ($modecompta == 'CREANCES-DETTES') print ''.price(-$obj->amount_ht).' | ';
+ print ''.price(-$obj->amount_ttc).' | ';
print '';
}
}
@@ -879,8 +879,8 @@ else
dol_print_error($db);
}
print '';
- if ($modecompta == 'CREANCES-DETTES') print '| '.price(-$subtotal_ht).' | ';
- print ''.price(-$subtotal_ttc).' | ';
+ if ($modecompta == 'CREANCES-DETTES') print ''.price(-$subtotal_ht).' | ';
+ print ''.price(-$subtotal_ttc).' | ';
print '
';
}
@@ -943,8 +943,8 @@ else
print "".$langs->trans("Donation")." name."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->name. " ".$obj->firstname." ".$obj->lastname." | \n";
- if ($modecompta == 'CREANCES-DETTES') print ''.price($obj->amount).' | ';
- print ''.price($obj->amount).' | ';
+ if ($modecompta == 'CREANCES-DETTES') print ''.price($obj->amount).' | ';
+ print ''.price($obj->amount).' | ';
print '';
$i++;
}
@@ -962,8 +962,8 @@ else
}
print '';
if ($modecompta == 'CREANCES-DETTES')
- print '| '.price($subtotal_ht).' | ';
- print ''.price($subtotal_ttc).' | ';
+ print ''.price($subtotal_ht).' | ';
+ print ''.price($subtotal_ttc).' | ';
print '
';
}
@@ -1024,7 +1024,7 @@ else
}
print '| | ';
print "".$langs->trans("VATToPay")." | \n";
- print " | \n";
+ print '' | \n";
print "".price($amount)." | \n";
print "
\n";
@@ -1072,9 +1072,9 @@ else
dol_print_error($db);
}
print '| | ';
- print "".$langs->trans("VATToCollect")." | \n";
- print " | \n";
- print "".price($amount)." | \n";
+ print ''.$langs->trans("VATToCollect")." | \n";
+ print ' | '."\n";
+ print ''.price($amount)." | \n";
print "
\n";
}
else
@@ -1119,8 +1119,8 @@ else
print '| | ';
print "".$langs->trans("VATPaid")." | \n";
if ($modecompta == 'CREANCES-DETTES')
- print "".price($amount)." | \n";
- print "".price($amount)." | \n";
+ print ''.price($amount)." | \n";
+ print ''.price($amount)." | \n";
print "
\n";
// VAT really received
@@ -1165,8 +1165,8 @@ else
print '| | ';
print "".$langs->trans("VATCollected")." | \n";
if ($modecompta == 'CREANCES-DETTES')
- print "".price($amount)." | \n";
- print "".price($amount)." | \n";
+ print ''.price($amount)." | \n";
+ print ''.price($amount)." | \n";
print "
\n";
}
}
@@ -1175,8 +1175,8 @@ else
{
print '';
if ($modecompta == 'CREANCES-DETTES')
- print '| | ';
- print ''.price(price2num($subtotal_ttc, 'MT')).' | ';
+ print ' | ';
+ print ''.price(price2num($subtotal_ttc, 'MT')).' | ';
print '
';
}
}
@@ -1199,10 +1199,10 @@ if ($mysoc->tva_assuj != 'franchise') // Assujetti
print ' | ';
print '';
- print '| '.$langs->trans("Profit").' | ';
+ print '
| '.$langs->trans("Profit").' | ';
if ($modecompta == 'CREANCES-DETTES')
- print ''.price(price2num($total_ht, 'MT')).' | ';
- print ''.price(price2num($total_ttc, 'MT')).' | ';
+ print ''.price(price2num($total_ht, 'MT')).' | ';
+ print ''.price(price2num($total_ttc, 'MT')).' | ';
print '
';
}