Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-06 04:44:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix for inclusive tax rates

Browse Source
This commit is contained in:
Hillel Coren 2017-03-24 13:29:38 +03:00
parent 462d6e95d5
commit a6e546bcdc
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/InvoiceController.php
View File

@ -286,12 +286,14 @@ class InvoiceController extends BaseController
} }
// Check for any taxes which have been deleted // Check for any taxes which have been deleted
$taxRateOptions = $account->present()->taxRateOptions;
if ($invoice->exists) { if ($invoice->exists) {
foreach ($invoice->getTaxes() as $key => $rate) { foreach ($invoice->getTaxes() as $key => $rate) {
if (isset($options[$key])) { $key = '0 ' . $key;
if (isset($taxRateOptions[$key])) {
continue; continue;
} }
$options['0 ' . $key] = $rate['name'] . ' ' . $rate['rate'] . '%'; $taxRateOptions[$key] = $rate['name'] . ' ' . $rate['rate'] . '%';
} }
} }
@ -299,7 +301,7 @@ class InvoiceController extends BaseController
'data' => Input::old('data'), 'data' => Input::old('data'),
'account' => Auth::user()->account->load('country'), 'account' => Auth::user()->account->load('country'),
'products' => Product::scope()->with('default_tax_rate')->orderBy('product_key')->get(), 'products' => Product::scope()->with('default_tax_rate')->orderBy('product_key')->get(),
'taxRateOptions' => $account->present()->taxRateOptions, 'taxRateOptions' => $taxRateOptions,
'defaultTax' => $account->default_tax_rate, 'defaultTax' => $account->default_tax_rate,
'currencies' => Cache::get('currencies'), 'currencies' => Cache::get('currencies'),
'sizes' => Cache::get('sizes'), 'sizes' => Cache::get('sizes'),