X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=WEB-INF%2Flib%2FttExpenseHelper.class.php;h=b11e71fd035a4d805b818cfea27ef209ce20cb54;hb=b1082e6ec27ca11586bd786b65f509d1a20220f6;hp=7c0d83ff341b4313ba2c96148af4d6d520005904;hpb=1e49bbdab2c6d229a22ed10495b526ac703b0be8;p=timetracker.git diff --git a/WEB-INF/lib/ttExpenseHelper.class.php b/WEB-INF/lib/ttExpenseHelper.class.php index 7c0d83ff..b11e71fd 100644 --- a/WEB-INF/lib/ttExpenseHelper.class.php +++ b/WEB-INF/lib/ttExpenseHelper.class.php @@ -34,8 +34,8 @@ class ttExpenseHelper { global $user; $mdb2 = getConnection(); - $user_id = $user->getActiveUser(); - $group_id = $user->getActiveGroup(); + $user_id = $user->getUser(); + $group_id = $user->getGroup(); $org_id = $user->org_id; $date = $fields['date']; @@ -46,7 +46,7 @@ class ttExpenseHelper { $invoice_id = $fields['invoice_id']; $status = $fields['status']; $paid = (int) $fields['paid']; - $created = ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$mdb2->quote($user->id); + $created = ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$user->id; $sql = "insert into tt_expense_items". " (date, user_id, group_id, org_id, client_id, project_id, name, cost, invoice_id, paid, created, created_ip, created_by, status)". @@ -75,7 +75,7 @@ class ttExpenseHelper { if ($user->can('manage_invoices') && $user->isPluginEnabled('ps')) { $paid_part = $fields['paid'] ? ', paid = 1' : ', paid = 0'; } - $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id); + $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id; $sql = "UPDATE tt_expense_items set date = ".$mdb2->quote($date).", user_id = $user_id, client_id = ".$mdb2->quote($client_id). ", project_id = ".$mdb2->quote($project_id).", name = ".$mdb2->quote($name).