X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=tofile.php;h=1b367e253936e1f9fa249f50142dadcaf93e9077;hb=3f7ed883e1c7d75aacc49900b403f8e84a68dc3f;hp=c7f81e5024c7bb36f8b08175eff29aee96284e0c;hpb=4adddb2df36c69f06192807b82d48d7d282605d3;p=timetracker.git diff --git a/tofile.php b/tofile.php index c7f81e50..1b367e25 100644 --- a/tofile.php +++ b/tofile.php @@ -32,7 +32,7 @@ import('form.ActionForm'); import('ttReportHelper'); // Access check. -if (!ttAccessCheck(right_view_reports)) { +if (!ttAccessAllowed('view_own_reports')) { header('Location: access_denied.php'); exit(); } @@ -53,7 +53,7 @@ $bean = new ActionForm('reportBean', new Form('reportForm'), $request); $type = $request->getParameter('type'); // Also, there are 2 variations of report: totals only, or normal. Totals only means that the report -// is grouped by (either date, user, client, project, task or cf_1) and user only needs to see subtotals by group. +// is grouped by (either date, user, client, project, task, or cf_1) and user only needs to see subtotals by group. $totals_only = $bean->getAttribute('chtotalsonly'); // Obtain items. @@ -132,6 +132,7 @@ if ('xml' == $type) { print $item['expense']; print "]]>\n"; } + if ($bean->getAttribute('chpaid')) print "\t\n"; if ($bean->getAttribute('chinvoice')) print "\t\n"; print "\n"; @@ -198,6 +199,7 @@ if ('csv' == $type) { if ($bean->getAttribute('chduration')) print ',"'.$i18n->getKey('label.duration').'"'; if ($bean->getAttribute('chnote')) print ',"'.$i18n->getKey('label.note').'"'; if ($bean->getAttribute('chcost')) print ',"'.$i18n->getKey('label.cost').'"'; + if ($bean->getAttribute('chpaid')) print ',"'.$i18n->getKey('label.paid').'"'; if ($bean->getAttribute('chinvoice')) print ',"'.$i18n->getKey('label.invoice').'"'; print "\n"; @@ -224,6 +226,7 @@ if ('csv' == $type) { else print ',"'.$item['expense'].'"'; } + if ($bean->getAttribute('chpaid')) print ',"'.$item['paid'].'"'; if ($bean->getAttribute('chinvoice')) print ',"'.str_replace('"','""',$item['invoice']).'"'; print "\n"; }