X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=expenses.php;h=2c25bde66e0c91b254fc7be13f5bcf0c9f945524;hb=HEAD;hp=9a34542213a813bfb3b0d2fe2e110d9a51d4a239;hpb=a106b7a2db73b3e1fdab428b218212f6f38d7623;p=timetracker.git

diff --git a/expenses.php b/expenses.php
index 9a345422..2c25bde6 100644
--- a/expenses.php
+++ b/expenses.php
@@ -31,6 +31,7 @@ import('form.Form');
 import('ttUserHelper');
 import('ttGroupHelper');
 import('DateAndTime');
+import('ttTimeHelper');
 import('ttExpenseHelper');
 
 // Access checks.
@@ -189,7 +190,7 @@ $form->addInput(array('type'=>'submit','name'=>'btn_submit','onclick'=>'browser_
 if ($request->isPost()) {
   if ($request->getParameter('btn_submit')) {
     // Validate user input.
-    if ($user->isPluginEnabled('cl') && $user->isPluginEnabled('cm') && !$cl_client)
+    if ($user->isPluginEnabled('cl') && $user->isOptionEnabled('client_required') && !$cl_client)
       $err->add($i18n->get('error.client'));
     if ($show_project && !$cl_project)
       $err->add($i18n->get('error.project'));
@@ -202,6 +203,7 @@ if ($request->isPost()) {
       if ($selected_date->after($browser_today))
         $err->add($i18n->get('error.future_date'));
     }
+    if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
     // Finished validating input data.
 
     // Prohibit creating entries in locked range.