From: Nik Okuntseff Date: Sun, 21 Jan 2018 18:02:59 +0000 (+0000) Subject: Fixed reports to properly handle paid status dropdown. X-Git-Tag: timetracker_1.19-1~1352 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=0a9cab0efe3edcabcf7b9c8994715bbd24450bf1;p=timetracker.git Fixed reports to properly handle paid status dropdown. --- diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php index fe81a575..ba8c9c92 100644 --- a/WEB-INF/lib/ttReportHelper.class.php +++ b/WEB-INF/lib/ttReportHelper.class.php @@ -53,6 +53,8 @@ class ttReportHelper { if ($bean->getAttribute('include_records')=='2') $dropdown_parts .= ' and l.billable = 0'; if ($bean->getAttribute('invoice')=='1') $dropdown_parts .= ' and l.invoice_id is not NULL'; if ($bean->getAttribute('invoice')=='2') $dropdown_parts .= ' and l.invoice_id is NULL'; + if ($bean->getAttribute('paid_status')=='1') $dropdown_parts .= ' and l.paid = 1'; + if ($bean->getAttribute('paid_status')=='2') $dropdown_parts .= ' and l.paid = 0'; // Prepare user list part. $userlist = -1; diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 9f017e66..8e45dcec 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.15.2.3767 | Copyright © Anuko | +  Anuko Time Tracker 1.15.2.3768 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve}