Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: Bad error message

Browse Source
This commit is contained in:
Laurent Destailleur
2014-11-02 11:39:30 +01:00
parent a1a10edc30
commit b74bdb8f7d
3 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/commande/card.php
View File

@@ -1295,18 +1295,10 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
setEventMessage($mesg, 'errors'); setEventMessage($mesg, 'errors');
} }
} }
/* }
else
{
$langs->load("other");
$mesg='<div class="error">'.$langs->trans('ErrorMailRecipientIsEmpty').' !</div>';
$action='presend';
dol_syslog('Recipient email is empty');
}*/
} else { } else {
$langs->load("errors"); $langs->load("other");
setEventMessage($langs->trans('ErrorCantReadFile', $file), 'errors'); setEventMessage($langs->trans('ErrorMailRecipientIsEmpty') . '!', 'errors');
dol_syslog('Failed to read file: ' . $file); dol_syslog($langs->trans('ErrorMailRecipientIsEmpty'));
} }
} else { } else {
$langs->load("other"); $langs->load("other");

18
htdocs/compta/facture.php
View File

@@ -1615,8 +1615,9 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
$sendtoid = $_POST['receiver']; $sendtoid = $_POST['receiver'];
} }
} }
if (dol_strlen($sendto)) { if (dol_strlen($sendto))
{
$langs->load("commercial"); $langs->load("commercial");
$from = $_POST['fromname'] . ' <' . $_POST['frommail'] . '>'; $from = $_POST['fromname'] . ' <' . $_POST['frommail'] . '>';
@@ -1715,17 +1716,10 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
setEventMessage($mesg, 'errors'); setEventMessage($mesg, 'errors');
} }
} }
/* }
else
{
$langs->load("other");
$mesgs[]='<div class="error">'.$langs->trans('ErrorMailRecipientIsEmpty').'</div>';
dol_syslog('Recipient email is empty');
}*/
} else { } else {
$langs->load("errors"); $langs->load("other");
setEventMessage($langs->trans('ErrorCantReadFile', $file), 'errors'); setEventMessage($langs->trans('ErrorMailRecipientIsEmpty') . '!', 'errors');
dol_syslog('Failed to read file: ' . $file); dol_syslog($langs->trans('ErrorMailRecipientIsEmpty'));
} }
} else { } else {
$langs->load("other"); $langs->load("other");

6
htdocs/core/lib/functions.lib.php
View File

@@ -2862,7 +2862,11 @@ function price($amount, $form=0, $outlangs='', $trunc=1, $rounding=-1, $forcerou
$listofcurrenciesbefore=array('USD'); $listofcurrenciesbefore=array('USD');
if (in_array($currency_code,$listofcurrenciesbefore)) $cursymbolbefore.=$outlangs->getCurrencySymbol($currency_code); if (in_array($currency_code,$listofcurrenciesbefore)) $cursymbolbefore.=$outlangs->getCurrencySymbol($currency_code);
else $cursymbolafter.=$outlangs->getCurrencySymbol($currency_code); else
{
$tmpcur=$outlangs->getCurrencySymbol($currency_code);
$cursymbolafter.=($tmpcur == $currency_code ? ' '.$tmpcur : $tmpcur);
}
} }
$output=$cursymbolbefore.$output.$end.$cursymbolafter; $output=$cursymbolbefore.$output.$end.$cursymbolafter;