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

Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	htdocs/expedition/card.php
This commit is contained in:
Laurent Destailleur 2020-11-27 16:21:32 +01:00
commit 73790a0958
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/expedition/card.php
View File

@ -418,10 +418,8 @@ 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");
setEventMessages($langs->trans($object->error), $object->errors, 'errors');
} else { } else {
// Define output language // Define output language
if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))