X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=time_delete.php;h=a7b802b6033fb94eaca988fd0564bdf58d1de05b;hb=e3cdaaf8e6b4e5433ec620396e562de1a5dcec10;hp=5d721ab1f4fd882a7eb599095c2297172959cf07;hpb=11bfec0ff88b649a934556e8b4812d65715c7509;p=timetracker.git

diff --git a/time_delete.php b/time_delete.php
index 5d721ab1..a7b802b6 100644
--- a/time_delete.php
+++ b/time_delete.php
@@ -38,9 +38,9 @@ if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
   exit();
 }
 $cl_id = (int)$request->getParameter('id');
-$time_rec = ttTimeHelper::getRecord($cl_id, $user->getActiveUser());
-if (!$time_rec || $time_rec['invoice_id']) {
-  // Prohibit deleting not ours or invoiced records.
+$time_rec = ttTimeHelper::getRecord($cl_id);
+if (!$time_rec || $time_rec['approved'] || $time_rec['timesheet_id'] || $time_rec['invoice_id']) {
+  // Prohibit deleting not ours, approved, assigned to timesheet, or invoiced records.
   header('Location: access_denied.php');
   exit();
 }
@@ -62,11 +62,8 @@ if ($request->isPost()) {
       $err->add($i18n->get('error.range_locked'));
 
     if ($err->no()) {
-
       // Delete the record.
-      $result = ttTimeHelper::delete($cl_id, $user->getActiveUser());
-
-      if ($result) {
+      if (ttTimeHelper::delete($cl_id)) {
         header('Location: time.php');
         exit();
       } else {