X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=WEB-INF%2Flib%2FttReportHelper.class.php;h=2e2113dfe2f27f2dfca8768eb796fb906b5c6e6a;hb=0056678b5dda50f9664753a8134c558c7583dce9;hp=41ddd0fe32ce6c7175a0f2e2a90b6b8fcf5dc506;hpb=343bde69ae7c9d8efc8a814ce891a3f04b8f502c;p=timetracker.git
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 41ddd0fe..2e2113df 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -98,6 +98,8 @@ class ttReportHelper {
if ($report['billable']=='2') $dropdown_parts .= ' and l.billable = 0';
if ($report['invoice']=='1') $dropdown_parts .= ' and l.invoice_id is not NULL';
if ($report['invoice']=='2') $dropdown_parts .= ' and l.invoice_id is NULL';
+ if ($report['paid_status']=='1') $dropdown_parts .= ' and l.paid = 1';
+ if ($report['paid_status']=='2') $dropdown_parts .= ' and l.paid = 0';
// Prepare user list part.
$userlist = -1;
@@ -1448,6 +1450,8 @@ class ttReportHelper {
$body .= '
'.$i18n->getKey('label.note').' | ';
if ($report['show_cost'])
$body .= ''.$i18n->getKey('label.cost').' | ';
+ if ($report['show_paid'])
+ $body .= ''.$i18n->getKey('label.paid').' | ';
if ($report['show_invoice'])
$body .= ''.$i18n->getKey('label.invoice').' | ';
$body .= '';
@@ -1489,6 +1493,7 @@ class ttReportHelper {
$body .= ($user->canManageTeam() || $user->isClient()) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses'];
$body .= '';
}
+ if ($report['show_paid']) $body .= ' | ';
if ($report['show_invoice']) $body .= ' | ';
$body .= '';
$body .= ' |
';
@@ -1521,6 +1526,11 @@ class ttReportHelper {
$body .= ''.htmlspecialchars($record['note']).' | ';
if ($report['show_cost'])
$body .= ''.$record['cost'].' | ';
+ if ($report['show_paid']) {
+ $body .= '';
+ $body .= $record['paid'] == 1 ? $i18n->getKey('label.yes') : $i18n->getKey('label.no');
+ $body .= ' | ';
+ }
if ($report['show_invoice'])
$body .= ''.htmlspecialchars($record['invoice']).' | ';
$body .= '';
@@ -1550,6 +1560,7 @@ class ttReportHelper {
$body .= ($user->canManageTeam() || $user->isClient()) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses'];
$body .= '';
}
+ if ($report['show_paid']) $body .= ' | ';
if ($report['show_invoice']) $body .= ' | ';
$body .= '';
}
@@ -1572,6 +1583,7 @@ class ttReportHelper {
$body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses'];
$body .= '';
}
+ if ($report['show_paid']) $body .= ' | ';
if ($report['show_invoice']) $body .= ' | ';
$body .= '';