Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 01:58:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: view only the error message

Browse Source
This commit is contained in:
Regis Houssin
2009-11-11 15:46:56 +00:00
parent 43ab15e1f5
commit c97663b21f
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/cashdesk/include/environnement.php
View File

@@ -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"]; $conf_fkentrepot = $conf->global->CASHDESK_ID_WAREHOUSE > 0?$conf->global->CASHDESK_ID_WAREHOUSE:$_SESSION["CASHDESK_ID_WAREHOUSE"];
// Check if setup ok // Check if setup ok
if (empty($conf_fksoc)) dol_print_error('',"Setup of CashDesk module not complete. Third party not defined.",1); if (empty($conf_fksoc))
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); 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 // Parametres d'affichage
$conf_taille_listes = 200; // Nombre max de lignes a afficher dans les listes $conf_taille_listes = 200; // Nombre max de lignes a afficher dans les listes

10
htdocs/lib/functions.lib.php
View File

@@ -1773,11 +1773,10 @@ function dolibarr_print_error($db='',$error='')
* On doit appeler cette fonction quand une erreur technique bloquante est rencontree. * 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 * 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". * renvoyer leur erreur par l'intermediaire de leur propriete "error".
* \param db Database handler * \param db Database handler
* \param error Chaine erreur ou tableau de chaines erreur complementaires a afficher * \param error Chaine erreur ou tableau de chaines erreur complementaires a afficher
* \param limitToMessage Just view the error message
*/ */
function dol_print_error($db='',$error='',$limitToMessage='') function dol_print_error($db='',$error='')
{ {
global $conf,$langs,$argv; global $conf,$langs,$argv;
$out = ''; $out = '';
@@ -1870,8 +1869,7 @@ function dol_print_error($db='',$error='',$limitToMessage='')
} }
global $dolibarr_main_prod; global $dolibarr_main_prod;
if ($limitToMessage) print $error; if (empty($dolibarr_main_prod)) print $out;
else 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.'; 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); dol_syslog("Error ".$syslog, LOG_ERR);
} }