diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index eea830dfbc5..485b9a9b47a 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -338,7 +338,7 @@ else
/*
* Factures clients
*/
- print '
| '.$langs->trans("CustomersInvoices").' |
';
+ print '| '.$langs->trans("CustomersInvoices").' |
';
if ($modecompta == 'CREANCES-DETTES')
{
@@ -500,7 +500,7 @@ else
$sql .= " GROUP BY name, socid";
$sql.= $db->order($sortfield, $sortorder);
- print '| '.$langs->trans("SuppliersInvoices").' |
';
+ print '| '.$langs->trans("SuppliersInvoices").' |
';
$subtotal_ht = 0;
$subtotal_ttc = 0;
@@ -554,7 +554,7 @@ else
* Charges sociales non deductibles
*/
- print '| '.$langs->trans("SocialContributionsNondeductibles").' |
';
+ print '| '.$langs->trans("SocialContributionsNondeductibles").' |
';
if ($modecompta == 'CREANCES-DETTES')
{
@@ -630,7 +630,7 @@ else
* Charges sociales deductibles
*/
- print '| '.$langs->trans("SocialContributionsDeductibles").' |
';
+ print '| '.$langs->trans("SocialContributionsDeductibles").' |
';
if ($modecompta == 'CREANCES-DETTES')
{
@@ -727,7 +727,7 @@ else
if (! empty($conf->salaries->enabled))
{
- print '| '.$langs->trans("Salaries").' |
';
+ print '| '.$langs->trans("Salaries").' |
';
if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES')
{
@@ -840,7 +840,7 @@ else
$sql.= $db->order($newsortfield, $sortorder);
}
- print '| '.$langs->trans("ExpenseReport").' |
';
+ print '| '.$langs->trans("ExpenseReport").' |
';
dol_syslog("get expense report outcome");
$result=$db->query($sql);
@@ -890,7 +890,7 @@ else
if (! empty($conf->don->enabled))
{
- print '| '.$langs->trans("Donations").' |
';
+ print '| '.$langs->trans("Donations").' |
';
if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES')
{
@@ -972,7 +972,7 @@ else
* VAT
*/
- print '| '.$langs->trans("VAT").' |
';
+ print '| '.$langs->trans("VAT").' |
';
$subtotal_ht = 0;
$subtotal_ttc = 0;
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index bd1d8effcc7..20333675542 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -893,10 +893,19 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
}
print '';
print '| '.$langs->trans("Month").' | ';
+// Loop on each year to ouput
for ($annee = $year_start ; $annee <= $year_end ; $annee++)
{
- print ''.$langs->trans("Outcome").' | ';
- print ''.$langs->trans("Income").' | ';
+ print '';
+ $htmlhelp='';
+ // if ($modecompta == 'RECETTES-DEPENSES') $htmlhelp=$langs->trans("PurchasesPlusVATEarnedAndDue");
+ print $form->textwithpicto($langs->trans("Outcome"), $htmlhelp);
+ print ' | ';
+ print '';
+ $htmlhelp='';
+ // if ($modecompta == 'RECETTES-DEPENSES') $htmlhelp=$langs->trans("SalesPlusVATToRetreive");
+ print $form->textwithpicto($langs->trans("Income"), $htmlhelp);
+ print ' | ';
}
print '
';
@@ -967,7 +976,7 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
{
$in=(isset($totentrees[$annee])?price2num($totentrees[$annee], 'MT'):0);
$out=(isset($totsorties[$annee])?price2num($totsorties[$annee],'MT'):0);
- print price($in-$out).'';
+ print price(price2num($in-$out, 'MT')).'';
// print ' | ';
}
}