projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed show holidays config option.
[timetracker.git]
/
expense_edit.php
diff --git
a/expense_edit.php
b/expense_edit.php
index
8eb7d4f
..
3cebac1
100644
(file)
--- a/
expense_edit.php
+++ b/
expense_edit.php
@@
-30,6
+30,7
@@
require_once('initialize.php');
import('form.Form');
import('ttGroupHelper');
import('DateAndTime');
import('form.Form');
import('ttGroupHelper');
import('DateAndTime');
+import('ttTimeHelper');
import('ttExpenseHelper');
// Access checks.
import('ttExpenseHelper');
// Access checks.
@@
-44,8
+45,8
@@
if (!$user->isPluginEnabled('ex')) {
$cl_id = (int)$request->getParameter('id');
// Get the expense item we are editing.
$expense_item = ttExpenseHelper::getItem($cl_id);
$cl_id = (int)$request->getParameter('id');
// Get the expense item we are editing.
$expense_item = ttExpenseHelper::getItem($cl_id);
-if (!$expense_item || $expense_item['invoice_id']) {
- // Prohibit editing not ours or invoiced items.
+if (!$expense_item || $expense_item['
approved'] || $expense_item['
invoice_id']) {
+ // Prohibit editing not ours
, approved,
or invoiced items.
header('Location: access_denied.php');
exit();
}
header('Location: access_denied.php');
exit();
}
@@
-159,7
+160,7
@@
$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get(
if ($request->isPost()) {
// Validate user input.
if ($request->isPost()) {
// Validate user input.
- if ($user->isPluginEnabled('cl') && $user->is
PluginEnabled('cm
') && !$cl_client)
+ if ($user->isPluginEnabled('cl') && $user->is
OptionEnabled('client_required
') && !$cl_client)
$err->add($i18n->get('error.client'));
if ($show_project && !$cl_project)
$err->add($i18n->get('error.project'));
$err->add($i18n->get('error.client'));
if ($show_project && !$cl_project)
$err->add($i18n->get('error.project'));
@@
-176,6
+177,8
@@
if ($request->isPost()) {
if ($new_date->after($browser_today))
$err->add($i18n->get('error.future_date'));
}
if ($new_date->after($browser_today))
$err->add($i18n->get('error.future_date'));
}
+ if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
+ // Finished validating user input.
// Save record.
if ($request->getParameter('btn_save')) {
// Save record.
if ($request->getParameter('btn_save')) {