lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix error message

Browse Source
This commit is contained in:
Laurent Destailleur 2020-11-27 16:13:27 +01:00
parent 4a5cdd0092
commit 5ed2bbb204
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/expedition/card.php
View File

@ -435,16 +435,11 @@ if (empty($reshook))
$result = $object->valid($user); $result = $object->valid($user);
if ($result < 0) if ($result < 0) {
{ setEventMessages($object->error, $object->errors, 'errors');
$langs->load("errors"); } else {
setEventMessages($langs->trans($object->error), $object->errors, 'errors');
}
else
{
// Define output language // Define output language
if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
{
$outputlangs = $langs; $outputlangs = $langs;
$newlang = ''; $newlang = '';
if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09'); if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');

1
htdocs/product/stock/class/mouvementstock.class.php
View File

@ -204,6 +204,7 @@ class MouvementStock extends CommonObject
{ {
if (empty($batch)) if (empty($batch))
{ {
$langs->load("errors");
$this->errors[] = $langs->transnoentitiesnoconv("ErrorTryToMakeMoveOnProductRequiringBatchData", $product->ref); $this->errors[] = $langs->transnoentitiesnoconv("ErrorTryToMakeMoveOnProductRequiringBatchData", $product->ref);
dol_syslog("Try to make a movement of a product with status_batch on without any batch data"); dol_syslog("Try to make a movement of a product with status_batch on without any batch data");