X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=WEB-INF%2Flib%2FttReportHelper.class.php;h=af8549de3a63f054ced2d7505d51b507c6238e20;hb=aad7651dc744e59b94b14c7e2d5626bbcc713569;hp=bd882559c098d1ea301c992f65f5dee680be529d;hpb=101cdfe54c97350fc65b140f3f27c5bdd466844e;p=timetracker.git

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index bd882559..af8549de 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -368,7 +368,7 @@ class ttReportHelper {
       // Add paid status.
       if ($canViewReports && $bean->getAttribute('chpaid'))
         array_push($fields, 'ei.paid as paid');
-      // Add IP address. NULL for now for expenses.
+      // Add IP address.
       if ($canViewReports && $bean->getAttribute('chip')) {
         array_push($fields, 'ei.created as created');
         array_push($fields, 'ei.created_ip as created_ip');
@@ -553,6 +553,16 @@ class ttReportHelper {
         array_push($fields, "cast(l.billable * coalesce(upb.rate, 0) * time_to_sec(l.duration)/3600 as decimal(10,2)) as cost"); // Use project rate for user.
       array_push($fields, "null as expense"); 
     }
+    // Add paid status.
+    if ($canViewReports && $report['show_paid'])
+      array_push($fields, 'l.paid as paid');
+    // Add IP address.
+    if ($canViewReports && $report['show_ip']) {
+      array_push($fields, 'l.created as created');
+      array_push($fields, 'l.created_ip as created_ip');
+      array_push($fields, 'l.modified as modified');
+      array_push($fields, 'l.modified_ip as modified_ip');
+    }
     // Add invoice name if it is selected.
     if (($canViewReports || $isClient) && $report['show_invoice'])
       array_push($fields, 'i.name as invoice');
@@ -619,6 +629,16 @@ class ttReportHelper {
         array_push($fields, 'ei.name as note');
       array_push($fields, 'ei.cost as cost');
       array_push($fields, 'ei.cost as expense');
+      // Add paid status.
+      if ($canViewReports && $report['show_paid'])
+        array_push($fields, 'ei.paid as paid');
+      // Add IP address.
+      if ($canViewReports && $report['show_ip']) {
+        array_push($fields, 'ei.created as created');
+        array_push($fields, 'ei.created_ip as created_ip');
+        array_push($fields, 'ei.modified as modified');
+        array_push($fields, 'ei.modified_ip as modified_ip');
+      }
       // Add invoice name if it is selected.
       if (($canViewReports || $isClient) && $report['show_invoice'])
         array_push($fields, 'i.name as invoice');