From f47422f551e933aad59063ad67e620951c4bd668 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 9 Dec 2012 18:40:01 +0100
Subject: [PATCH] Fix: Errors into turnover reports

---
 htdocs/compta/resultat/index.php | 13 ++++++++-----
 htdocs/compta/stats/index.php    |  3 ++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index a3855b9c7ea..f63f1da9b8b 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -65,9 +65,10 @@ if ($modecompta == 'CREANCES-DETTES')
 	$nom.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
 	$period="$year_start - $year_end";
 	$periodlink=($year_start?"<a href='".$_SERVER["PHP_SELF"]."?year_start=".($year_start-1)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year_start=".($year_start+1)."&modecompta=".$modecompta."'>".img_next()."</a>":"");
-	$description=$langs->trans("RulesResultDue")."<br>";
-	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.= $langs->trans("DepositsAreNotIncluded");
-	else  $description.= $langs->trans("DepositsAreIncluded");
+	$description=$langs->trans("RulesAmountWithTaxIncluded");
+	$description.='<br>'.$langs->trans("RulesResultDue");
+	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.="<br>".$langs->trans("DepositsAreNotIncluded");
+	else  $description.="<br>".$langs->trans("DepositsAreIncluded");
 	$builddate=time();
 	//$exportlink=$langs->trans("NotYetAvailable");
 }
@@ -76,7 +77,8 @@ else {
 	$nom.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=CREANCES-DETTES">','</a>').')';
 	$period="$year_start - $year_end";
 	$periodlink=($year_start?"<a href='".$_SERVER["PHP_SELF"]."?year_start=".($year_start-1)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year_start=".($year_start+1)."&modecompta=".$modecompta."'>".img_next()."</a>":"");
-	$description=$langs->trans("RulesResultInOut");
+	$description=$langs->trans("RulesAmountWithTaxIncluded");
+	$description.='<br>'.$langs->trans("RulesResultInOut");
 	$builddate=time();
 	//$exportlink=$langs->trans("NotYetAvailable");
 }
@@ -513,7 +515,8 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
 		print "</td>";
 
 		print '<td align="right">&nbsp;';
-		if (isset($encaiss_ttc[$case]) && $encaiss_ttc[$case] != 0)
+		//if (isset($encaiss_ttc[$case]) && $encaiss_ttc[$case] != 0)
+		if (isset($encaiss_ttc[$case]))
 		{
 			print '<a href="clientfourn.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta?'&modecompta='.$modecompta:'').'">'.price(price2num($encaiss_ttc[$case],'MT')).'</a>';
 			if (! isset($totentrees[$annee])) $totentrees[$annee]=0;
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index 12b878fc4be..f20218f525a 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -252,7 +252,8 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
 			}
 			if (! $cum[$caseprev] && $cum[$case])
 			{
-				print '<td align="right">+Inf%</td>';
+				//print '<td align="right">+Inf%</td>';
+				print '<td align="right">-</td>';
 			}
 			if (isset($cum[$caseprev]) && ! $cum[$caseprev] && ! $cum[$case])
 			{