More progress on refactoring expenses for subgroups.

[timetracker.git] / expenses.php

diff --git a/expenses.php b/expenses.php
index 1ff638fbebc6b9d7e9a6d5eee3684c9fdff6c086..882e520b105639cd8d53bf14889a2fa23cf09fa1 100644 (file)
--- a/expenses.php
+++ b/expenses.php
@@ -29,7 +29,6 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttUserHelper');
-import('ttTeamHelper');
 import('ttGroupHelper');
 import('DateAndTime');
 import('ttExpenseHelper');
@@ -145,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.
-$predefined_expenses = ttTeamHelper::getPredefinedExpenses($user->group_id);
+$predefined_expenses = ttGroupHelper::getPredefinedExpenses();
 if ($predefined_expenses) {
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'recalculateCost();',
@@ -211,8 +210,8 @@ if ($request->isPost()) {
   }
 }
 
-$smarty->assign('day_total', ttExpenseHelper::getTotalForDay($user->getUser(), $cl_date));
-$smarty->assign('expense_items', ttExpenseHelper::getItems($user->getUser(), $cl_date));
+$smarty->assign('day_total', ttExpenseHelper::getTotalForDay($cl_date));
+$smarty->assign('expense_items', ttExpenseHelper::getItems($cl_date));
 $smarty->assign('predefined_expenses', $predefined_expenses);
 $smarty->assign('client_list', $client_list);
 $smarty->assign('project_list', $project_list);