X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttInvoiceHelper.class.php;h=d58bc11611120773f166de01ec0d981395b13bfa;hb=a575a9147976a06263d8a7eae006d6ba3372446e;hp=9fa7e58c38017f67338c10a30a9443718eb0e943;hpb=b7df85b084e9aaecef29ff6712015194f96e0c22;p=timetracker.git diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php index 9fa7e58c..d58bc116 100644 --- a/WEB-INF/lib/ttInvoiceHelper.class.php +++ b/WEB-INF/lib/ttInvoiceHelper.class.php @@ -69,7 +69,9 @@ class ttInvoiceHelper { global $user; $mdb2 = getConnection(); - $sql = "select * from tt_invoices where id = $invoice_id and team_id = $user->team_id and status = 1"; + if ($user->isClient()) $client_part = " and client_id = $user->client_id"; + + $sql = "select * from tt_invoices where id = $invoice_id and team_id = $user->team_id $client_part and status = 1"; $res = $mdb2->query($sql); if (!is_a($res, 'PEAR_Error')) { if ($val = $res->fetchRow()) @@ -427,16 +429,16 @@ class ttInvoiceHelper { $body .= ''; // Output title. - $body .= '

'.$i18n->getKey('title.invoice').' '.htmlspecialchars($invoice['name']).'

'; + $body .= '

'.$i18n->get('title.invoice').' '.htmlspecialchars($invoice['name']).'

'; // Output comment. if($comment) $body .= '

'.htmlspecialchars($comment).'

'; // Output invoice info. $body .= ''; - $body .= ''; - $body .= ''; - $body .= ''; + $body .= ''; + $body .= ''; + $body .= ''; $body .= '

'.$i18n->getKey('label.date').': '.$invoice['date'].'

'.$i18n->getKey('label.client').': '.htmlspecialchars($client['name']).'

'.$i18n->getKey('label.client_address').': '.htmlspecialchars($client['address']).'

'.$i18n->get('label.date').': '.$invoice['date'].'

'.$i18n->get('label.client').': '.htmlspecialchars($client['name']).'

'.$i18n->get('label.client_address').': '.htmlspecialchars($client['address']).'

'; $body .= '

'; @@ -444,15 +446,15 @@ class ttInvoiceHelper { // Output invoice items. $body .= ''; $body .= ''; - $body .= ''; - $body .= ''; + $body .= ''; + $body .= ''; if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) - $body .= ''; + $body .= ''; if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) - $body .= ''; - $body .= ''; - $body .= ''; - $body .= ''; + $body .= ''; + $body .= ''; + $body .= ''; + $body .= ''; $body .= ''; foreach ($invoice_items as $item) { $body .= ''; @@ -475,15 +477,15 @@ class ttInvoiceHelper { $colspan += 2; $body .= ''; if ($tax) { - $body .= ''; - $body .= ''; + $body .= ''; + $body .= ''; } - $body .= ''; + $body .= ''; $body .= '

'.$i18n->getKey('label.date').'

'.$i18n->getKey('form.invoice.person').'

'.$i18n->get('label.date').'

'.$i18n->get('form.invoice.person').'

'.$i18n->getKey('label.project').'

'.$i18n->get('label.project').'

'.$i18n->getKey('label.task').'

'.$i18n->getKey('label.note').'

'.$i18n->getKey('label.duration').'

'.$i18n->getKey('label.cost').'

'.$i18n->get('label.task').'

'.$i18n->get('label.note').'

'.$i18n->get('label.duration').'

'.$i18n->get('label.cost').'

'.$i18n->getKey('label.subtotal').':

'.$subtotal.'

'.$i18n->getKey('label.tax').':

'.$tax.'

'.$i18n->get('label.subtotal').':

'.$subtotal.'

'.$i18n->get('label.tax').':

'.$tax.'

'.$i18n->getKey('label.total').':

'.$total.'

'.$i18n->get('label.total').':

'.$total.'

'; // Output footer. if (!defined('REPORT_FOOTER') || !(REPORT_FOOTER == false)) - $body .= '

'.$i18n->getKey('form.mail.footer').'

'; + $body .= '

'.$i18n->get('form.mail.footer').'

'; // Finish creating email body. $body .= '';