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

Merge pull request #20482 from OPEN-DSI/14.0_fix_delete_task_time_trigger

Browse Source 
FIX - Move delete task time trigger position
This commit is contained in:
Laurent Destailleur 2022-03-29 13:14:47 +02:00 committed by GitHub
commit 9eec25c62d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1604,16 +1604,6 @@ class Task extends CommonObject
$this->db->begin(); $this->db->begin();
$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_time";
$sql .= " WHERE rowid = ".$this->timespent_id;
dol_syslog(get_class($this)."::delTimeSpent", LOG_DEBUG);
$resql = $this->db->query($sql);
if (!$resql) {
$error++; $this->errors[] = "Error ".$this->db->lasterror();
}
if (!$error) {
if (!$notrigger) { if (!$notrigger) {
// Call trigger // Call trigger
$result = $this->call_trigger('TASK_TIMESPENT_DELETE', $user); $result = $this->call_trigger('TASK_TIMESPENT_DELETE', $user);
@ -1622,6 +1612,16 @@ class Task extends CommonObject
} }
// End call triggers // End call triggers
} }
if (!$error) {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_time";
$sql .= " WHERE rowid = ".$this->timespent_id;
dol_syslog(get_class($this)."::delTimeSpent", LOG_DEBUG);
$resql = $this->db->query($sql);
if (!$resql) {
$error++; $this->errors[] = "Error ".$this->db->lasterror();
}
} }
if (!$error) { if (!$error) {