projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reorganized code a bit for clarity.
[timetracker.git]
/
invoice_view.php
diff --git
a/invoice_view.php
b/invoice_view.php
index
f05b766
..
a40d9b6
100644
(file)
--- a/
invoice_view.php
+++ b/
invoice_view.php
@@
-54,9
+54,9
@@
foreach($invoice_items as $item)
if ($tax_percent) {
$tax_expenses = in_array('et', explode(',', $user->plugins));
foreach($invoice_items as $item) {
if ($tax_percent) {
$tax_expenses = in_array('et', explode(',', $user->plugins));
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);