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

FIX : travis + stickler

Browse Source
This commit is contained in:
Gauthier PC portable 024 2023-03-08 11:59:32 +01:00
parent 9769fe54a2
commit 5064ee178a
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4638,7 +4638,7 @@ abstract class CommonObject
$sql.= " AND c.".$element['parentkey']." = p.rowid"; $sql.= " AND c.".$element['parentkey']." = p.rowid";
} }
if (!empty($element['parent']) && !empty($element['parenttypefield']) && !empty($element['parenttypevalue'])) { if (!empty($element['parent']) && !empty($element['parenttypefield']) && !empty($element['parenttypevalue'])) {
$sql.= " AND c.".$element['parenttypefield']." = '".$element['parenttypevalue']."'"; $sql.= " AND c.".$element['parenttypefield']." = '".$this->db->escape($element['parenttypevalue'])."'";
} }
if (!empty($entity)) { if (!empty($entity)) {
if (!empty($element['parent']) && !empty($element['parentkey'])) { if (!empty($element['parent']) && !empty($element['parentkey'])) {

2
htdocs/projet/class/task.class.php
View File

@ -1558,7 +1558,6 @@ class Task extends CommonObjectLine
dol_syslog(get_class($this)."::fetchTimeSpent", LOG_DEBUG); dol_syslog(get_class($this)."::fetchTimeSpent", LOG_DEBUG);
if ($timespent->id > 0) { if ($timespent->id > 0) {
$this->timespent_id = $timespent->id; $this->timespent_id = $timespent->id;
$this->id = $timespent->fk_element; $this->id = $timespent->fk_element;
$this->timespent_date = $this->db->jdate($timespent->element_date); $this->timespent_date = $this->db->jdate($timespent->element_date);
@ -1571,7 +1570,6 @@ class Task extends CommonObjectLine
$this->timespent_note = $timespent->note; $this->timespent_note = $timespent->note;
return 1; return 1;
} }
return 0; return 0;