X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=invoice_view.php;h=2bb987637beeec51f3336399df1bb65d31e0baba;hb=fcb4a368c1de2e4c086e64064c00f404efaef617;hp=f05b766e804d657675481a495e3e7eeac60ed988;hpb=5ef582473f6b329be18ad83c61e053fdcd9c6ed5;p=timetracker.git diff --git a/invoice_view.php b/invoice_view.php index f05b766e..2bb98763 100644 --- a/invoice_view.php +++ b/invoice_view.php @@ -52,11 +52,11 @@ $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; - $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; @@ -67,14 +67,14 @@ $smarty->assign('total', $user->currency.' '.str_replace('.', $user->decimal_mar 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++; -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);