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

fix: scrutinizer

Browse Source
This commit is contained in:
Florian HENRY 2021-10-21 17:09:48 +02:00
parent e9fe668725
commit 4795190a75
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6488,7 +6488,7 @@ abstract class CommonObject
$out = ''; $out = '';
$type = ''; $type = '';
$isDependList=0; $isDependList = 0;
$param = array(); $param = array();
$param['options'] = array(); $param['options'] = array();
$reg = array(); $reg = array();
@ -6796,7 +6796,7 @@ abstract class CommonObject
if (!empty($InfoFieldList[3]) && $parentField) { if (!empty($InfoFieldList[3]) && $parentField) {
$parent = $parentName.':'.$obj->{$parentField}; $parent = $parentName.':'.$obj->{$parentField};
$isDependList=1; $isDependList = 1;
} }
$out .= '<option value="'.$obj->rowid.'"'; $out .= '<option value="'.$obj->rowid.'"';
@ -6951,7 +6951,7 @@ abstract class CommonObject
if (!empty($InfoFieldList[3]) && $parentField) { if (!empty($InfoFieldList[3]) && $parentField) {
$parent = $parentName.':'.$obj->{$parentField}; $parent = $parentName.':'.$obj->{$parentField};
$isDependList=1; $isDependList = 1;
} }
$data[$obj->rowid] = $labeltoshow; $data[$obj->rowid] = $labeltoshow;

10
htdocs/core/class/extrafields.class.php
View File

@ -250,6 +250,8 @@ class ExtraFields
return -1; return -1;
} }
$result = 0;
if ($type == 'separate') { if ($type == 'separate') {
$unique = 0; $unique = 0;
$required = 0; $required = 0;
@ -1978,10 +1980,10 @@ class ExtraFields
{ {
global $conf, $langs; global $conf, $langs;
if ($display_type=='card') { $tagtype='tr';
$tagtype='tr'; $tagtype_dyn='td';
$tagtype_dyn='td';
} elseif ($display_type=='line') { if ($display_type=='line') {
$tagtype='div'; $tagtype='div';
$tagtype_dyn='span'; $tagtype_dyn='span';
$colspan=0; $colspan=0;