X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttInvoiceHelper.class.php;h=b5a3c59ec831ee87cb83253281fd45fd37c61440;hb=ac5189157ef60820dd125400baee9f408a9ba2ea;hp=d506830968290e9bb53ad0f32f5f579c32741672;hpb=c9ab2e84d7c459e4d5e8e946be78c2e49533796e;p=timetracker.git diff --git a/WEB-INF/lib/ttInvoiceHelper.class.php b/WEB-INF/lib/ttInvoiceHelper.class.php index d5068309..b5a3c59e 100644 --- a/WEB-INF/lib/ttInvoiceHelper.class.php +++ b/WEB-INF/lib/ttInvoiceHelper.class.php @@ -129,7 +129,7 @@ class ttInvoiceHelper { } // If we have expenses, we need to do a union with a separate query for expense items from tt_expense_items table. - if (ttPluginEnabled('ex')) { // if ex(penses) plugin is enabled + if ($user->isPluginEnabled('ex')) { $sql_for_expense_items = "select ei.date as date, 2 as type, u.name as user_name, p.name as project_name, null as task_name, ei.name as note, null as duration, ei.cost as cost from tt_expense_items ei @@ -336,7 +336,7 @@ class ttInvoiceHelper { foreach($invoice_items as $item) $subtotal += $item['cost']; if ($tax_percent) { - $tax_expenses = ttPluginEnabled('et'); + $tax_expenses = $user->isPluginEnabled('et'); foreach($invoice_items as $item) { if ($item['type'] == 2 && !$tax_expenses) continue;