X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=expenses.php;h=aa0d977695fb3b562e73e35ce98303f4b76268e2;hb=722638fd8cc9400c5228106537effa1dcd0f7fa5;hp=fee8120511d24e4284fb98de6739c26f627b7df9;hpb=45c855269d952873285f7a835e82fc2b3eff3971;p=timetracker.git diff --git a/expenses.php b/expenses.php index fee81205..aa0d9776 100644 --- a/expenses.php +++ b/expenses.php @@ -188,15 +188,15 @@ if ($request->isPost()) { // Insert record. if ($err->no()) { - if (ttExpenseHelper::insert(array('date'=>$cl_date,'user_id'=>$user->getActiveUser(), - 'client_id'=>$cl_client,'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'status'=>1))) { + if (ttExpenseHelper::insert(array('date'=>$cl_date,'client_id'=>$cl_client, + 'project_id'=>$cl_project,'name'=>$cl_item_name,'cost'=>$cl_cost,'status'=>1))) { header('Location: expenses.php'); exit(); } else $err->add($i18n->get('error.db')); } } elseif ($request->getParameter('onBehalfUser')) { - if($user->canManageTeam()) { + if($user->can('track_expenses')) { unset($_SESSION['behalf_id']); unset($_SESSION['behalf_name']); @@ -210,8 +210,8 @@ if ($request->isPost()) { } } -$smarty->assign('day_total', ttExpenseHelper::getTotalForDay($user->getActiveUser(), $cl_date)); -$smarty->assign('expense_items', ttExpenseHelper::getItems($user->getActiveUser(), $cl_date)); +$smarty->assign('day_total', ttExpenseHelper::getTotalForDay($user->getUser(), $cl_date)); +$smarty->assign('expense_items', ttExpenseHelper::getItems($user->getUser(), $cl_date)); $smarty->assign('predefined_expenses', $predefined_expenses); $smarty->assign('client_list', $client_list); $smarty->assign('project_list', $project_list);