From c97663b21f08b2d61225c7cd6816e68cb8623f9d Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Wed, 11 Nov 2009 15:46:56 +0000
Subject: [PATCH] Fix: view only the error message

---
 htdocs/cashdesk/include/environnement.php | 15 ++++++++++++---
 htdocs/lib/functions.lib.php              | 10 ++++------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/htdocs/cashdesk/include/environnement.php b/htdocs/cashdesk/include/environnement.php
index 3497967a738..0825681b969 100644
--- a/htdocs/cashdesk/include/environnement.php
+++ b/htdocs/cashdesk/include/environnement.php
@@ -48,9 +48,18 @@ $conf_fkaccount_cb = $conf->global->CASHDESK_ID_BANKACCOUNT_CB > 0?$conf->global
 $conf_fkentrepot = $conf->global->CASHDESK_ID_WAREHOUSE > 0?$conf->global->CASHDESK_ID_WAREHOUSE:$_SESSION["CASHDESK_ID_WAREHOUSE"];
 
 // Check if setup ok
-if (empty($conf_fksoc))      dol_print_error('',"Setup of CashDesk module not complete. Third party not defined.",1);
-if ($conf->banque->enabled && (empty($conf_fkaccount_cash) || empty($conf_fkaccount_cheque) || empty($conf_fkaccount_cb)))  dol_print_error('',"Setup of CashDesk module not complete. Bank account not defined.",1);
-if ($conf->stock->enabled && empty($conf_fkentrepot)) dol_print_error('',"Setup of CashDesk module not complete. Warehouse not defined.",1);
+if (empty($conf_fksoc))
+{
+	print '<div class="error">Setup of CashDesk module not complete. Third party not defined</div>';
+}
+if ($conf->banque->enabled && (empty($conf_fkaccount_cash) || empty($conf_fkaccount_cheque) || empty($conf_fkaccount_cb)))
+{
+	print '<div class="error">Setup of CashDesk module not complete. Bank account not defined</div>';
+}
+if ($conf->stock->enabled && empty($conf_fkentrepot))
+{
+	print '<div class="error">Setup of CashDesk module not complete. Warehouse not defined</div>';
+}
 
 // Parametres d'affichage
 $conf_taille_listes = 200;	// Nombre max de lignes a afficher dans les listes
diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php
index 3798cd08375..438c2882541 100644
--- a/htdocs/lib/functions.lib.php
+++ b/htdocs/lib/functions.lib.php
@@ -1773,11 +1773,10 @@ function dolibarr_print_error($db='',$error='')
  *				On doit appeler cette fonction quand une erreur technique bloquante est rencontree.
  *				Toutefois, il faut essayer de ne l'appeler qu'au sein de pages php, les classes devant
  *				renvoyer leur erreur par l'intermediaire de leur propriete "error".
- *	\param      db               Database handler
- *	\param      error	         Chaine erreur ou tableau de chaines erreur complementaires a afficher
- *  \param      limitToMessage   Just view the error message
+ *	\param      db      Database handler
+ *	\param      error	Chaine erreur ou tableau de chaines erreur complementaires a afficher
  */
-function dol_print_error($db='',$error='',$limitToMessage='')
+function dol_print_error($db='',$error='')
 {
 	global $conf,$langs,$argv;
 	$out = '';
@@ -1870,8 +1869,7 @@ function dol_print_error($db='',$error='',$limitToMessage='')
 	}
 
 	global $dolibarr_main_prod;
-	if ($limitToMessage) print $error;
-	else if (empty($dolibarr_main_prod)) print $out;
+	if (empty($dolibarr_main_prod)) print $out;
 	else print 'Sorry, an error occured but the parameter $dolibarr_main_prod is defined in conf file so no message is reported to your browser. Please read the log file for error message.';
 	dol_syslog("Error ".$syslog, LOG_ERR);
 }