X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=timesheet_add.php;h=7c7633c6c8d945ef5156eb3159b0e555aa4c8d74;hb=5629a1c360655d5a09dc965004946bf65e3725b9;hp=294886be754ece683846bd8441d0c54bdddf51f0;hpb=bfbd5b318b37a66ece219e719734a60249781b6d;p=timetracker.git

diff --git a/timesheet_add.php b/timesheet_add.php
index 294886be..7c7633c6 100644
--- a/timesheet_add.php
+++ b/timesheet_add.php
@@ -78,7 +78,7 @@ if ($request->isPost()) {
   if (!ttValidDate($cl_start)) $err->add($i18n->get('error.field'), $i18n->get('label.start_date'));
   if (!ttValidDate($cl_finish)) $err->add($i18n->get('error.field'), $i18n->get('label.end_date'));
   if (!ttValidString($cl_comment, true)) $err->add($i18n->get('error.field'), $i18n->get('label.comment'));
-  if ($err->no() && ttTimesheetHelper::getTimesheetByName($cl_name, $user_id)) $err->add($i18n->get('error.object_exists'));
+  if ($err->no() && ttTimesheetHelper::getTimesheetByName($cl_name)) $err->add($i18n->get('error.object_exists'));
   $fields = array('user_id' => $user_id,
     'name' => $cl_name,
     'client_id' => $cl_client,
@@ -87,6 +87,7 @@ if ($request->isPost()) {
     'end_date' => $cl_finish,
     'comment' => $cl_comment);
   if ($err->no() && !ttTimesheetHelper::timesheetItemsExist($fields)) $err->add($i18n->get('error.no_records'));
+  if ($err->no() && ttTimesheetHelper::overlaps($fields)) $err->add($i18n->get('error.overlap'));
   // Finished validating user input.
 
   if ($err->no()) {