projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add indicator for uncompleted time entry in users.php (#20)
[timetracker.git]
/
invoice_view.php
diff --git
a/invoice_view.php
b/invoice_view.php
index
f05b766
..
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,11
+52,11
@@
$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) {
foreach($invoice_items as $item) {
-
if ($item['type'] == 2 && !$tax_expenses)
-
continue;
- $tax += round($item['cost'] * $tax_percent / 100, 2);
+ if ($item['type'] == 2 && !$tax_expenses)
+ continue;
+ $tax += round($item['cost'] * $tax_percent / 100, 2);
}
}
$total = $subtotal + $tax;
}
}
$total = $subtotal + $tax;
@@
-67,14
+67,14
@@
$smarty->assign('total', $user->currency.' '.str_replace('.', $user->decimal_mar
if ('.' != $user->decimal_mark) {
foreach ($invoice_items as &$item)
if ('.' != $user->decimal_mark) {
foreach ($invoice_items as &$item)
-
$item['cost'] = str_replace('.', $user->decimal_mark, $item['cost']);
+ $item['cost'] = str_replace('.', $user->decimal_mark, $item['cost']);
}
// Calculate colspan for invoice summary.
$colspan = 4;
if (MODE_PROJECTS == $user->tracking_mode)
$colspan++;
}
// Calculate colspan for invoice summary.
$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);