vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Laurent Destailleur 2024-08-01 12:53:14 +02:00
commit 03676d0b36
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
htdocs/core/class/commonobject.class.php
View file

@ -145,7 +145,8 @@ abstract class CommonObject
/**
* @var array<string,array<string,string>> Array to store alternative languages values of object
* Note: call fetchValuesForExtraLanguages() before using this
*
* Note: call fetchValuesForExtraLanguages() before using this
*/
public $array_languages = null; // Value is array() when load already tried
@ -3356,9 +3357,9 @@ abstract class CommonObject
/**
* Get children of line
*
* @param int $id Id of parent line
* @param int $includealltree 0 = 1st level child, >0 = All level child
* @return int[] Array with list of children lines id
* @param int $id Id of parent line
* @param int<0,1> $includealltree 0 = 1st level child, 1 = All level child
* @return int[] Array with list of children lines id
*/
public function getChildrenOfLine($id, $includealltree = 0)
{
@ -8092,6 +8093,7 @@ abstract class CommonObject
$type = empty($val['type']) ? '' : $val['type'];
$size = empty($val['css']) ? '' : $val['css'];
$reg = array();
$value = ''; // Default return value
// Convert var to be able to share same code than showOutputField of extrafields
if (preg_match('/varchar\((\d+)\)/', $type, $reg)) {
@ -8593,7 +8595,7 @@ abstract class CommonObject
$this->clearFieldError($fieldKey);
if (!isset($fields[$fieldKey])) {
if (!isset($fields[$fieldKey]) || $fields[$fieldKey] === null) {
$this->setFieldError($fieldKey, $langs->trans('FieldNotFoundInObject'));
return false;
}
@ -8915,7 +8917,7 @@ abstract class CommonObject
$value = $getposttemp;
}
} elseif (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('int'))) {
$value =( !empty($this->array_options["options_".$key]) || $this->array_options["options_".$key] === '0' ) ? $this->array_options["options_".$key] : '';
$value = (!empty($this->array_options["options_".$key]) || $this->array_options["options_".$key] === '0') ? $this->array_options["options_".$key] : '';
} else {
$value = (!empty($this->array_options["options_".$key]) ? $this->array_options["options_".$key] : ''); // No GET, no POST, no default value, so we take value of object.
}