Merge branch 'master' into develop

delcroip · Apr 2, 2023 · fa1854f · fa1854f
2 parents fee109c + 3bba8d6
commit fa1854f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/htdocs/timesheet/class/TimesheetTask.class.php b/htdocs/timesheet/class/TimesheetTask.class.php
@@ -1359,7 +1359,7 @@ public function saveTaskTime($Submitter, $duration, $daynote, $dayKey, $addmode
                 $this->timespent_note = $daynote;
                 $this->timespent_duration = $duration;
             }
- 
+
             if ($item['duration']!=$this->timespent_duration ||$item_note_old!=$item_note) {
                 if ($this->timespent_duration>0 || !empty($item_note)) {
                     dol_syslog(__METHOD__."  taskTimeUpdate", LOG_DEBUG);
@@ -1368,19 +1368,23 @@ public function saveTaskTime($Submitter, $duration, $daynote, $dayKey, $addmode
                     } else {
                         $resArray['updateError']++;
                     }
+
                 } else {
+                    $resArray['updateError']++;
+                }
+            } else {
                     dol_syslog(__METHOD__."  taskTimeDelete", LOG_DEBUG);
                     if ($this->delTimeSpent($Submitter, 0) >= 0) {
                         $resArray['timeSpendDeleted']++;
                         $this->tasklist[$dayKey]['id'] = 0;
                     } else {
                         $resArray['updateError']++;
                     }
-                }
             }
         } elseif ($duration>0 || !empty($daynote)) {
             $this->timespent_note = $daynote;
             $this->timespent_duration = $duration;
+
             if (property_exists($this, 'timespent_datehour') && $duration>0 ) {
                 $this->timespent_withhour = '1';
                 if ($is_today) {