From 24d2357799b84b2e03b6facce792d21a8a21ad87 Mon Sep 17 00:00:00 2001 From: Troels Liebe Bentsen Date: Fri, 4 Jul 2014 21:46:13 +0200 Subject: [PATCH] Make sure we default to the correct tax rate --- app/views/invoices/edit.blade.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php index ed71207acfff..8cf32a462b3b 100755 --- a/app/views/invoices/edit.blade.php +++ b/app/views/invoices/edit.blade.php @@ -1485,7 +1485,7 @@ model.addTaxRate(); @foreach ($taxRates as $taxRate) model.addTaxRate({{ $taxRate }}); - @endforeach + @endforeach @if ($invoice) var invoice = {{ $invoice }}; ko.mapping.fromJS(invoice, model.invoice().mapping, model.invoice); @@ -1501,6 +1501,11 @@ model.invoice().addItem(); //model.addTaxRate(); @endif + // Add the first tax rate for new invoices + if(model.invoice_taxes() && model.tax_rates().length > 0) { + var tax = model.tax_rates()[0]; + model.invoice().tax(tax); + } @endif model.invoice().tax(model.getTaxRate(model.invoice().tax_name(), model.invoice().tax_rate()));