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

FIX check on required field when updating 1 extrafields.

Browse Source
This commit is contained in:
Laurent Destailleur 2020-10-23 17:31:17 +02:00
parent cddbbc76c9
commit f00fa93903
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
htdocs/core/class/commonobject.class.php
View File

@ -5213,7 +5213,8 @@ abstract class CommonObject
$attributeRequired = $extrafields->attributes[$this->table_element]['required'][$attributeKey];
$attrfieldcomputed = $extrafields->attributes[$this->table_element]['computed'][$attributeKey];
if ($attributeRequired)
// Similar code than into insertExtraFields
if ($attributeRequired)
{
$mandatorypb = false;
if ($attributeType == 'link' && $this->array_options[$key] == '-1') $mandatorypb = true;
@ -5241,7 +5242,7 @@ abstract class CommonObject
}
}
switch ($attributeType)
switch ($attributeType)
{
case 'int':
if (!is_numeric($value) && $value != '')
@ -5584,10 +5585,37 @@ abstract class CommonObject
$attributeLabel = $extrafields->attributes[$this->table_element]['label'][$key];
$attributeParam = $extrafields->attributes[$this->table_element]['param'][$key];
$attributeRequired = $extrafields->attributes[$this->table_element]['required'][$key];
$attrfieldcomputed = $extrafields->attributes[$this->table_element]['computed'][$key];
// Similar code than into insertExtraFields
if ($attributeRequired)
{
$mandatorypb = false;
if ($attributeType == 'link' && $this->array_options["options_".$key] == '-1') $mandatorypb = true;
if ($this->array_options["options_".$key] === '') $mandatorypb = true;
if ($mandatorypb)
{
dol_syslog("Mandatory extra field options_".$key." is empty");
$this->errors[] = $langs->trans('ErrorFieldRequired', $attributeLabel);
return -1;
}
}
//dol_syslog("attributeLabel=".$attributeLabel, LOG_DEBUG);
//dol_syslog("attributeType=".$attributeType, LOG_DEBUG);
if (!empty($attrfieldcomputed))
{
if (!empty($conf->global->MAIN_STORE_COMPUTED_EXTRAFIELDS))
{
$value = dol_eval($attrfieldcomputed, 1, 0);
dol_syslog($langs->trans("Extrafieldcomputed")." sur ".$attributeLabel."(".$value.")", LOG_DEBUG);
$this->array_options["options_".$key] = $value;
} else {
$this->array_options["options_".$key] = null;
}
}
switch ($attributeType)
{
case 'int':