Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
This commit is contained in:
commit
acafc69baa
@ -820,8 +820,7 @@ if (empty($reshook)) {
|
||||
} else {
|
||||
$db->rollback();
|
||||
|
||||
dol_print_error($db, $object->error);
|
||||
exit;
|
||||
setEventMessages($object->error, $object->errors, 'errors');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -204,6 +204,7 @@ if (!empty($conf->projet->enabled)) {
|
||||
}
|
||||
} else {
|
||||
if (!empty($object->fk_project)) {
|
||||
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
|
||||
$proj = new Project($db);
|
||||
$proj->fetch($object->fk_project);
|
||||
$morehtmlref .= $proj->getNomUrl(1);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user