projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes for fav reports export and import.
[timetracker.git]
/
invoice_view.php
diff --git
a/invoice_view.php
b/invoice_view.php
index
79efdd9
..
e94c04b
100644
(file)
--- a/
invoice_view.php
+++ b/
invoice_view.php
@@
-32,7
+32,7
@@
import('ttInvoiceHelper');
import('ttClientHelper');
// Access check.
import('ttClientHelper');
// Access check.
-if (!ttAccessCheck(right_view_invoices)) {
+if (!ttAccessCheck(right_view_invoices)
|| !$user->isPluginEnabled('iv')
) {
header('Location: access_denied.php');
exit();
}
header('Location: access_denied.php');
exit();
}
@@
-52,7
+52,7
@@
$tax = 0;
foreach($invoice_items as $item)
$subtotal += $item['cost'];
if ($tax_percent) {
foreach($invoice_items as $item)
$subtotal += $item['cost'];
if ($tax_percent) {
- $tax_expenses =
in_array('et', explode(',', $user->plugins)
);
+ $tax_expenses =
$user->isPluginEnabled('et'
);
foreach($invoice_items as $item) {
if ($item['type'] == 2 && !$tax_expenses)
continue;
foreach($invoice_items as $item) {
if ($item['type'] == 2 && !$tax_expenses)
continue;
@@
-74,7
+74,7
@@
if ('.' != $user->decimal_mark) {
$colspan = 4;
if (MODE_PROJECTS == $user->tracking_mode)
$colspan++;
$colspan = 4;
if (MODE_PROJECTS == $user->tracking_mode)
$colspan++;
-else
if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+elseif (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
$colspan += 2;
$smarty->assign('invoice_id', $invoice_id);
$colspan += 2;
$smarty->assign('invoice_id', $invoice_id);