X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttExpenseHelper.class.php;h=e7da92cbb69ca34f8f0102dc2a27619ffd6193a2;hb=75a1eedb8977b8f2db459128bab9aaf367e3b58b;hp=40a3e88f0459526704a68bec59004ab3a87debd4;hpb=cb611bf2abbb4072459632155b11301ae6fe840b;p=timetracker.git diff --git a/WEB-INF/lib/ttExpenseHelper.class.php b/WEB-INF/lib/ttExpenseHelper.class.php index 40a3e88f..e7da92cb 100644 --- a/WEB-INF/lib/ttExpenseHelper.class.php +++ b/WEB-INF/lib/ttExpenseHelper.class.php @@ -140,7 +140,8 @@ class ttExpenseHelper { if ($user->isPluginEnabled('cl')) $left_joins .= " left join tt_clients c on (ei.client_id = c.id)"; - $sql = "select ei.id, ei.date, ei.client_id, ei.project_id, ei.name, ei.cost, ei.invoice_id, ei.paid $client_field, p.name as project_name". + $sql = "select ei.id, ei.date, ei.client_id, ei.project_id, ei.name, ei.cost, ei.invoice_id, ei.approved,". + " ei.paid $client_field, p.name as project_name". " from tt_expense_items ei $left_joins". " where ei.id = $id and ei.group_id = $group_id and ei.org_id = $org_id and ei.user_id = $user_id and ei.status = 1"; $res = $mdb2->query($sql); @@ -177,7 +178,7 @@ class ttExpenseHelper { $left_joins .= " left join tt_clients c on (ei.client_id = c.id)"; $sql = "select ei.id as id $client_field, p.name as project, ei.name as item, ei.cost as cost,". - " ei.invoice_id from tt_expense_items ei $left_joins". + " ei.invoice_id, ei.approved from tt_expense_items ei $left_joins". " where ei.date = ".$mdb2->quote($date)." and ei.user_id = $user_id". " and ei.group_id = $group_id and ei.org_id = $org_id and ei.status = 1 order by ei.id";