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

Fix: Select cheque for cheque receipt works when there is more than on bank accounts.

Browse Source
This commit is contained in:
Laurent Destailleur
2011-05-05 21:22:40 +00:00
parent 559a798407
commit d8b2d03e1b
4 changed files with 80 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3442,29 +3442,38 @@ function dol_htmloutput_mesg($mesgstring='',$mesgarray='', $style='ok', $keepemb
{
global $conf, $langs;
$ret = '';
$out = '';
$ret='';
$out='';
$divstart=$divend='';
if (is_array($mesgarray) && sizeof($mesgarray))
{
if (empty($conf->global->MAIN_USE_JQUERY_JNOTIFY) && ! preg_match('/<div class=".*">/i',$out))
{
$divstart='<div class="'.$style.'">';
$divend='</div>';
}
if ((is_array($mesgarray) && sizeof($mesgarray)) || $mesgstring)
{
$langs->load("errors");
if (empty($conf->global->MAIN_USE_JQUERY_JNOTIFY)) $out.= '<div class="'.$style.'">';
foreach($mesgarray as $message)
{
$ret++;
$out.= $langs->trans($message);
if ($ret < sizeof($mesgarray)) $out.= "<br>\n";
}
if (empty($conf->global->MAIN_USE_JQUERY_JNOTIFY)) $out.= '</div>';
}
if ($mesgstring)
{
$langs->load("errors");
$ret++;
if (empty($conf->global->MAIN_USE_JQUERY_JNOTIFY)) $out.= '<div class="'.$style.'">';
$out.= $langs->trans($mesgstring);
if (empty($conf->global->MAIN_USE_JQUERY_JNOTIFY)) $out.= '</div>';
}
$out.=$divstart;
if (is_array($mesgarray) && sizeof($mesgarray))
{
foreach($mesgarray as $message)
{
$ret++;
$out.= $langs->trans($message);
if ($ret < sizeof($mesgarray)) $out.= "<br>\n";
}
}
if ($mesgstring)
{
$langs->load("errors");
$ret++;
$out.= $langs->trans($mesgstring);
}
$out.=$divend;
}
if ($out)
{
if (! empty($conf->global->MAIN_USE_JQUERY_JNOTIFY) && ! $keepembedded)