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

This commit is contained in:
Laurent Destailleur 2022-11-15 19:36:37 +01:00
commit f4b1d31013

View File

@ -266,9 +266,13 @@ if (empty($reshook) && $action == 'add') {
// Fill array 'array_options' with data from add form // Fill array 'array_options' with data from add form
$extrafields->fetch_name_optionals_label($adh->table_element); $extrafields->fetch_name_optionals_label($adh->table_element);
$ret = $extrafields->setOptionalsFromPost(null, $adh); $ret = $extrafields->setOptionalsFromPost(null, $adh);
if ($ret < 0) $error++; if ($ret < 0) {
$error++;
}
if (!$error) {
$result = $adh->create($user); $result = $adh->create($user);
if ($result > 0) { if ($result > 0) {
require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
$object = $adh; $object = $adh;
@ -417,6 +421,7 @@ if (empty($reshook) && $action == 'add') {
$errmsg .= join('<br>', $adh->errors); $errmsg .= join('<br>', $adh->errors);
} }
} }
}
if (!$error) { if (!$error) {
$db->commit(); $db->commit();