Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix_element_type_part_05

Browse Source
This commit is contained in:
Laurent Destailleur
2024-03-12 14:22:25 +01:00
committed by GitHub
parent 12ae786b0d 367f47428f
commit 53c3406d11
119 changed files with 538 additions and 647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3280,8 +3280,8 @@ abstract class CommonObject
if ($this->db->num_rows($resql) > 0) {
while ($row = $this->db->fetch_row($resql)) {
$rows[] = $row[0];
if (!empty($includealltree)) {
$rows = array_merge($rows, $this->getChildrenOfLine($row[0]), $includealltree);
if ($includealltree) {
$rows = array_merge($rows, $this->getChildrenOfLine($row[0], $includealltree));
}
}
}
@@ -7928,7 +7928,11 @@ abstract class CommonObject
if (!empty($value)) {
$checked = ' checked ';
}
$value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';
if (getDolGlobalInt('MAIN_OPTIMIZEFORTEXTBROWSER') < 2) {
$value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';
} else {
$value = yn($value ? 1 : 0);
}
} elseif ($type == 'mail' || $type == 'email') {
$value = dol_print_email($value, 0, 0, 0, 64, 1, 1);
} elseif ($type == 'url') {