X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=invoice_view.php;h=2bb987637beeec51f3336399df1bb65d31e0baba;hb=8fce71f594124d3d6e91d8a3ef25209a7ca180fa;hp=79efdd9b7cbe52cd33e6a7c7df20d642b159412d;hpb=d26c95718cac0a2994ab4e9633b59f420a0816b4;p=timetracker.git diff --git a/invoice_view.php b/invoice_view.php index 79efdd9b..2bb98763 100644 --- a/invoice_view.php +++ b/invoice_view.php @@ -52,7 +52,7 @@ $tax = 0; 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; @@ -74,7 +74,7 @@ if ('.' != $user->decimal_mark) { $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);