projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improved a comment explaining class reuse.
[timetracker.git]
/
expenses.php
diff --git
a/expenses.php
b/expenses.php
index
7291414
..
7d7295d
100644
(file)
--- a/
expenses.php
+++ b/
expenses.php
@@
-92,7
+92,7
@@
if ($user->can('track_expenses')) {
// Dropdown for clients in MODE_TIME. Use all active clients.
if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
// Dropdown for clients in MODE_TIME. Use all active clients.
if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
- $active_clients = ttTeamHelper::getActiveClients($user->
team
_id, true);
+ $active_clients = ttTeamHelper::getActiveClients($user->
group
_id, true);
$form->addInput(array('type'=>'combobox',
'onchange'=>'fillProjectDropdown(this.value);',
'name'=>'client',
$form->addInput(array('type'=>'combobox',
'onchange'=>'fillProjectDropdown(this.value);',
'name'=>'client',
@@
-118,7
+118,7
@@
if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t
// Dropdown for clients if the clients plugin is enabled.
if ($user->isPluginEnabled('cl')) {
// Dropdown for clients if the clients plugin is enabled.
if ($user->isPluginEnabled('cl')) {
- $active_clients = ttTeamHelper::getActiveClients($user->
team
_id, true);
+ $active_clients = ttTeamHelper::getActiveClients($user->
group
_id, true);
// We need an array of assigned project ids to do some trimming.
foreach($project_list as $project)
$projects_assigned_to_user[] = $project['id'];
// We need an array of assigned project ids to do some trimming.
foreach($project_list as $project)
$projects_assigned_to_user[] = $project['id'];
@@
-144,7
+144,7
@@
if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t
}
}
// If predefined expenses are configured, add controls to select an expense and quantity.
}
}
// If predefined expenses are configured, add controls to select an expense and quantity.
-$predefined_expenses = ttTeamHelper::getPredefinedExpenses($user->
team
_id);
+$predefined_expenses = ttTeamHelper::getPredefinedExpenses($user->
group
_id);
if ($predefined_expenses) {
$form->addInput(array('type'=>'combobox',
'onchange'=>'recalculateCost();',
if ($predefined_expenses) {
$form->addInput(array('type'=>'combobox',
'onchange'=>'recalculateCost();',
@@
-196,7
+196,7
@@
if ($request->isPost()) {
$err->add($i18n->get('error.db'));
}
} elseif ($request->getParameter('onBehalfUser')) {
$err->add($i18n->get('error.db'));
}
} elseif ($request->getParameter('onBehalfUser')) {
- if($user->can
ManageTeam(
)) {
+ if($user->can
('track_expenses'
)) {
unset($_SESSION['behalf_id']);
unset($_SESSION['behalf_name']);
unset($_SESSION['behalf_id']);
unset($_SESSION['behalf_name']);