diff --git a/app/Http/Controllers/Api/Expenses/Bills.php b/app/Http/Controllers/Api/Expenses/Bills.php
index c9e2955a4..748ccb723 100644
--- a/app/Http/Controllers/Api/Expenses/Bills.php
+++ b/app/Http/Controllers/Api/Expenses/Bills.php
@@ -62,19 +62,21 @@ class Bills extends ApiController
                 $item_sku = '';
 
                 if (!empty($item['item_id'])) {
-                    $data = Item::where('id', $item['item_id'])->first();
+                    $item_object = Item::find($item['item_id']);
 
-                    $item_sku = $data['sku'];
+                    $item_sku = $item_object->sku;
                 }
 
-                $tax_id = 0;
-                $tax_rate = 0;
+                $tax = $tax_id = 0;
 
-                if (!empty($item['tax'])) {
-                    $tax = Tax::where('id', $item['tax'])->first();
+                if (!empty($item['tax_id'])) {
+                    $tax_object = Tax::find($item['tax_id']);
 
-                    $tax_rate = $tax->rate;
-                    $tax_id = $item['tax'];
+                    $tax_id = $item['tax_id'];
+
+                    $tax = (($item['price'] * $item['quantity']) / 100) * $tax_object->rate;
+                } elseif (!empty($item['tax'])) {
+                    $tax = $item['tax'];
                 }
 
                 $bill_item['item_id'] = $item['item_id'];
@@ -82,7 +84,7 @@ class Bills extends ApiController
                 $bill_item['sku'] = $item_sku;
                 $bill_item['quantity'] = $item['quantity'];
                 $bill_item['price'] = $item['price'];
-                $bill_item['tax'] = (($item['price'] * $item['quantity']) / 100) * $tax_rate;
+                $bill_item['tax'] = $tax;
                 $bill_item['tax_id'] = $tax_id;
                 $bill_item['total'] = ($item['price'] + $bill_item['tax']) * $item['quantity'];
 
@@ -127,19 +129,21 @@ class Bills extends ApiController
                 $item_sku = '';
 
                 if (!empty($item['item_id'])) {
-                    $data = Item::where('id', $item['item_id'])->first();
+                    $item_object = Item::find($item['item_id']);
 
-                    $item_sku = $data['sku'];
+                    $item_sku = $item_object->sku;
                 }
 
-                $tax_id = 0;
-                $tax_rate = 0;
+                $tax = $tax_id = 0;
 
-                if (!empty($item['tax'])) {
-                    $tax = Tax::where('id', $item['tax'])->first();
+                if (!empty($item['tax_id'])) {
+                    $tax_object = Tax::find($item['tax_id']);
 
-                    $tax_rate = $tax->rate;
-                    $tax_id = $item['tax'];
+                    $tax_id = $item['tax_id'];
+
+                    $tax = (($item['price'] * $item['quantity']) / 100) * $tax_object->rate;
+                } elseif (!empty($item['tax'])) {
+                    $tax = $item['tax'];
                 }
 
                 $bill_item['item_id'] = $item['item_id'];
@@ -147,7 +151,7 @@ class Bills extends ApiController
                 $bill_item['sku'] = $item_sku;
                 $bill_item['quantity'] = $item['quantity'];
                 $bill_item['price'] = $item['price'];
-                $bill_item['tax'] = (($item['price'] * $item['quantity']) / 100 * $tax_rate);
+                $bill_item['tax'] = $tax;
                 $bill_item['tax_id'] = $tax_id;
                 $bill_item['total'] = ($item['price'] + $bill_item['tax']) * $item['quantity'];
 
diff --git a/app/Http/Controllers/Api/Incomes/Invoices.php b/app/Http/Controllers/Api/Incomes/Invoices.php
index 2bc774444..69d2aebe4 100644
--- a/app/Http/Controllers/Api/Incomes/Invoices.php
+++ b/app/Http/Controllers/Api/Incomes/Invoices.php
@@ -62,19 +62,21 @@ class Invoices extends ApiController
                 $item_sku = '';
 
                 if (!empty($item['item_id'])) {
-                    $data = Item::where('id', $item['item_id'])->first();
+                    $item_object = Item::find($item['item_id']);
 
-                    $item_sku = $data['sku'];
+                    $item_sku = $item_object->sku;
                 }
 
-                $tax_id = 0;
-                $tax_rate = 0;
+                $tax = $tax_id = 0;
 
-                if (!empty($item['tax'])) {
-                    $tax = Tax::where('id', $item['tax'])->first();
+                if (!empty($item['tax_id'])) {
+                    $tax_object = Tax::find($item['tax_id']);
 
-                    $tax_rate = $tax->rate;
-                    $tax_id = $item['tax'];
+                    $tax_id = $item['tax_id'];
+
+                    $tax = (($item['price'] * $item['quantity']) / 100) * $tax_object->rate;
+                } elseif (!empty($item['tax'])) {
+                    $tax = $item['tax'];
                 }
 
                 $invoice_item['item_id'] = $item['item_id'];
@@ -82,7 +84,7 @@ class Invoices extends ApiController
                 $invoice_item['sku'] = $item_sku;
                 $invoice_item['quantity'] = $item['quantity'];
                 $invoice_item['price'] = $item['price'];
-                $invoice_item['tax'] = (($item['price'] * $item['quantity']) / 100) * $tax_rate;
+                $invoice_item['tax'] = $tax;
                 $invoice_item['tax_id'] = $tax_id;
                 $invoice_item['total'] = ($item['price'] + $invoice_item['tax']) * $item['quantity'];
 
@@ -127,19 +129,21 @@ class Invoices extends ApiController
                 $item_sku = '';
 
                 if (!empty($item['item_id'])) {
-                    $data = Item::where('id', $item['item_id'])->first();
+                    $item_object = Item::find($item['item_id']);
 
-                    $item_sku = $data['sku'];
+                    $item_sku = $item_object->sku;
                 }
 
-                $tax_id = 0;
-                $tax_rate = 0;
+                $tax = $tax_id = 0;
 
-                if (!empty($item['tax'])) {
-                    $tax = Tax::where('id', $item['tax'])->first();
+                if (!empty($item['tax_id'])) {
+                    $tax_object = Tax::find($item['tax_id']);
 
-                    $tax_rate = $tax->rate;
-                    $tax_id = $item['tax'];
+                    $tax_id = $item['tax_id'];
+
+                    $tax = (($item['price'] * $item['quantity']) / 100) * $tax_object->rate;
+                } elseif (!empty($item['tax'])) {
+                    $tax = $item['tax'];
                 }
 
                 $invoice_item['item_id'] = $item['item_id'];
@@ -147,7 +151,7 @@ class Invoices extends ApiController
                 $invoice_item['sku'] = $item_sku;
                 $invoice_item['quantity'] = $item['quantity'];
                 $invoice_item['price'] = $item['price'];
-                $invoice_item['tax'] = (($item['price'] * $item['quantity']) / 100 * $tax_rate);
+                $invoice_item['tax'] = $tax;
                 $invoice_item['tax_id'] = $tax_id;
                 $invoice_item['total'] = ($item['price'] + $invoice_item['tax']) * $item['quantity'];
 
diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Expenses/Bills.php
index b7ffff7a5..e92381bcf 100644
--- a/app/Http/Controllers/Expenses/Bills.php
+++ b/app/Http/Controllers/Expenses/Bills.php
@@ -301,19 +301,19 @@ class Bills extends Controller
                 $item_sku = '';
 
                 if (!empty($item['item_id'])) {
-                    $data = Item::where('id', $item['item_id'])->first();
+                    $item_object = Item::find($item['item_id']);
 
-                    $item_sku = $data['sku'];
+                    $item_sku = $item_object->sku;
                 }
 
-                $tax_id = 0;
-                $tax_rate = 0;
+                $tax = $tax_id = 0;
 
-                if (!empty($item['tax'])) {
-                    $tax = Tax::where('id', $item['tax'])->first();
+                if (!empty($item['tax_id'])) {
+                    $tax_object = Tax::find($item['tax_id']);
 
-                    $tax_rate = $tax->rate;
-                    $tax_id = $item['tax'];
+                    $tax_id = $item['tax_id'];
+
+                    $tax = (($item['price'] * $item['quantity']) / 100) * $tax_object->rate;
                 }
 
                 $bill_item['item_id'] = $item['item_id'];
@@ -321,7 +321,7 @@ class Bills extends Controller
                 $bill_item['sku'] = $item_sku;
                 $bill_item['quantity'] = $item['quantity'];
                 $bill_item['price'] = $item['price'];
-                $bill_item['tax'] = (($item['price'] * $item['quantity']) / 100) * $tax_rate;
+                $bill_item['tax'] = $tax;
                 $bill_item['tax_id'] = $tax_id;
                 $bill_item['total'] = ($item['price'] + $bill_item['tax']) * $item['quantity'];
 
@@ -416,19 +416,19 @@ class Bills extends Controller
                 $item_sku = '';
 
                 if (!empty($item['item_id'])) {
-                    $data = Item::where('id', $item['item_id'])->first();
+                    $item_object = Item::find($item['item_id']);
 
-                    $item_sku = $data['sku'];
+                    $item_sku = $item_object->sku;
                 }
 
-                $tax_id = 0;
-                $tax_rate = 0;
+                $tax = $tax_id = 0;
 
-                if (!empty($item['tax'])) {
-                    $tax = Tax::where('id', $item['tax'])->first();
+                if (!empty($item['tax_id'])) {
+                    $tax_object = Tax::find($item['tax_id']);
 
-                    $tax_rate = $tax->rate;
-                    $tax_id = $item['tax'];
+                    $tax_id = $item['tax_id'];
+
+                    $tax = (($item['price'] * $item['quantity']) / 100) * $tax_object->rate;
                 }
 
                 $bill_item['item_id'] = $item['item_id'];
@@ -436,7 +436,7 @@ class Bills extends Controller
                 $bill_item['sku'] = $item_sku;
                 $bill_item['quantity'] = $item['quantity'];
                 $bill_item['price'] = $item['price'];
-                $bill_item['tax'] = (($item['price'] * $item['quantity']) / 100) * $tax_rate;
+                $bill_item['tax'] = $tax;
                 $bill_item['tax_id'] = $tax_id;
                 $bill_item['total'] = ($item['price'] + $bill_item['tax']) * $item['quantity'];
 
diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php
index 7698d63b4..c90d3d9d4 100644
--- a/app/Http/Controllers/Incomes/Invoices.php
+++ b/app/Http/Controllers/Incomes/Invoices.php
@@ -311,19 +311,19 @@ class Invoices extends Controller
                 $item_sku = '';
 
                 if (!empty($item['item_id'])) {
-                    $data = Item::where('id', $item['item_id'])->first();
+                    $item_object = Item::find($item['item_id']);
 
-                    $item_sku = $data['sku'];
+                    $item_sku = $item_object->sku;
                 }
 
-                $tax_id = 0;
-                $tax_rate = 0;
+                $tax = $tax_id = 0;
 
-                if (!empty($item['tax'])) {
-                    $tax = Tax::where('id', $item['tax'])->first();
+                if (!empty($item['tax_id'])) {
+                    $tax_object = Tax::find($item['tax_id']);
 
-                    $tax_rate = $tax->rate;
-                    $tax_id = $item['tax'];
+                    $tax_id = $item['tax_id'];
+
+                    $tax = (($item['price'] * $item['quantity']) / 100) * $tax_object->rate;
                 }
 
                 $invoice_item['item_id'] = $item['item_id'];
@@ -331,7 +331,7 @@ class Invoices extends Controller
                 $invoice_item['sku'] = $item_sku;
                 $invoice_item['quantity'] = $item['quantity'];
                 $invoice_item['price'] = $item['price'];
-                $invoice_item['tax'] = (($item['price'] * $item['quantity']) / 100) * $tax_rate;
+                $invoice_item['tax'] = $tax;
                 $invoice_item['tax_id'] = $tax_id;
                 $invoice_item['total'] = ($item['price'] + $invoice_item['tax']) * $item['quantity'];
 
@@ -426,19 +426,19 @@ class Invoices extends Controller
                 $item_sku = '';
 
                 if (!empty($item['item_id'])) {
-                    $data = Item::where('id', $item['item_id'])->first();
+                    $item_object = Item::find($item['item_id']);
 
-                    $item_sku = $data['sku'];
+                    $item_sku = $item_object->sku;
                 }
 
-                $tax_id = 0;
-                $tax_rate = 0;
+                $tax = $tax_id = 0;
 
-                if (!empty($item['tax'])) {
-                    $tax = Tax::where('id', $item['tax'])->first();
+                if (!empty($item['tax_id'])) {
+                    $tax_object = Tax::find($item['tax_id']);
 
-                    $tax_rate = $tax->rate;
-                    $tax_id = $item['tax'];
+                    $tax_id = $item['tax_id'];
+
+                    $tax = (($item['price'] * $item['quantity']) / 100) * $tax_object->rate;
                 }
 
                 $invoice_item['item_id'] = $item['item_id'];
@@ -446,7 +446,7 @@ class Invoices extends Controller
                 $invoice_item['sku'] = $item_sku;
                 $invoice_item['quantity'] = $item['quantity'];
                 $invoice_item['price'] = $item['price'];
-                $invoice_item['tax'] = (($item['price'] * $item['quantity']) / 100 * $tax_rate);
+                $invoice_item['tax'] = $tax;
                 $invoice_item['tax_id'] = $tax_id;
                 $invoice_item['total'] = ($item['price'] + $invoice_item['tax']) * $item['quantity'];
 
diff --git a/app/Http/Controllers/Items/Items.php b/app/Http/Controllers/Items/Items.php
index 3d8eef2b3..a8d4f920e 100644
--- a/app/Http/Controllers/Items/Items.php
+++ b/app/Http/Controllers/Items/Items.php
@@ -164,7 +164,7 @@ class Items extends Controller
 
         if ($items) {
             foreach ($items as $item) {
-                $tax = Tax::where('id', $item->tax_id)->first();
+                $tax = Tax::find($item->tax_id);
 
                 $item_tax_price = 0;
 
@@ -213,8 +213,8 @@ class Items extends Controller
                 $item_tax_total= 0;
                 $item_sub_total = ($item['price'] * $item['quantity']);
 
-                if (!empty($item['tax'])) {
-                    $tax = Tax::where('id', $item['tax'])->first();
+                if (!empty($item['tax_id'])) {
+                    $tax = Tax::find($item['tax_id']);
 
                     $item_tax_total = (($item['price'] * $item['quantity']) / 100) * $tax->rate;
                 }
diff --git a/resources/views/expenses/bills/create.blade.php b/resources/views/expenses/bills/create.blade.php
index d51ede35d..053abc807 100644
--- a/resources/views/expenses/bills/create.blade.php
+++ b/resources/views/expenses/bills/create.blade.php
@@ -51,7 +51,7 @@
                                 <input class="form-control text-right" required="required" name="item[{{ $item_row }}][price]" type="text" id="item-price-{{ $item_row }}">
                             </td>
                             <td>
-                                {!! Form::select('item[' . $item_row . '][tax]', $taxes, setting('general.default_tax'), ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!}
+                                {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, setting('general.default_tax'), ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!}
                             </td>
                             <td class="text-right" style="vertical-align: middle;">
                                 <span id="item-total-{{ $item_row }}">0</span>
@@ -123,7 +123,7 @@
             html += '      <input class="form-control text-right" required="required" name="item[' + item_row + '][price]" type="text" id="item-price-' + item_row + '">';
             html += '  </td>';
             html += '  <td>';
-            html += '      <select class="form-control select2" name="item[' + item_row + '][tax]" id="item-tax-' + item_row + '">';
+            html += '      <select class="form-control select2" name="item[' + item_row + '][tax_id]" id="item-tax-' + item_row + '">';
             html += '         <option selected="selected" value="">{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}</option>';
             @foreach($taxes as $tax_key => $tax_value)
             html += '         <option value="{{ $tax_key }}">{{ $tax_value }}</option>';
diff --git a/resources/views/expenses/bills/edit.blade.php b/resources/views/expenses/bills/edit.blade.php
index c055e5da5..0b1440d3c 100644
--- a/resources/views/expenses/bills/edit.blade.php
+++ b/resources/views/expenses/bills/edit.blade.php
@@ -52,7 +52,7 @@
                                     <input value="{{ $item->price }}" class="form-control text-right" required="required" name="item[{{ $item_row }}][price]" type="text" id="item-price-{{ $item_row }}">
                                 </td>
                                 <td>
-                                    {!! Form::select('item[' . $item_row . '][tax]', $taxes, $item->tax, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!}
+                                    {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, $item->tax, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!}
                                 </td>
                                 <td class="text-right" style="vertical-align: middle;">
                                     <span id="item-total-{{ $item_row }}">@money($item->total, $bill->currency_code, true)</span>
@@ -76,7 +76,7 @@
                                     <input class="form-control text-right" required="required" name="item[{{ $item_row }}][price]" type="text" id="item-price-{{ $item_row }}">
                                 </td>
                                 <td>
-                                    {!! Form::select('item[' . $item_row . '][tax]', $taxes, null, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])])  !!}
+                                    {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, null, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])])  !!}
                                 </td>
                                 <td class="text-right" style="vertical-align: middle;">
                                     <span id="item-total-{{ $item_row }}">0</span>
@@ -151,7 +151,7 @@
             html += '      <input class="form-control text-right" required="required" name="item[' + item_row + '][price]" type="text" id="item-price-' + item_row + '">';
             html += '  </td>';
             html += '  <td>';
-            html += '      <select class="form-control select2" name="item[' + item_row + '][tax]" id="item-tax-' + item_row + '">';
+            html += '      <select class="form-control select2" name="item[' + item_row + '][tax_id]" id="item-tax-' + item_row + '">';
             html += '         <option selected="selected" value="">{{ trans('general.form.select.filed', ['field' => trans_choice('general.taxes', 1)]) }}</option>';
             @foreach($taxes as $tax_key => $tax_value)
             html += '         <option value="{{ $tax_key }}">{{ $tax_value }}</option>';
diff --git a/resources/views/incomes/invoices/create.blade.php b/resources/views/incomes/invoices/create.blade.php
index 1b78c28fe..43102bc0b 100644
--- a/resources/views/incomes/invoices/create.blade.php
+++ b/resources/views/incomes/invoices/create.blade.php
@@ -51,7 +51,7 @@
                                 <input class="form-control text-right" required="required" name="item[{{ $item_row }}][price]" type="text" id="item-price-{{ $item_row }}">
                             </td>
                             <td>
-                                {!! Form::select('item[' . $item_row . '][tax]', $taxes, setting('general.default_tax'), ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!}
+                                {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, setting('general.default_tax'), ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!}
                             </td>
                             <td class="text-right" style="vertical-align: middle;">
                                 <span id="item-total-{{ $item_row }}">0</span>
@@ -124,7 +124,7 @@
             html += '      <input class="form-control text-right" required="required" name="item[' + item_row + '][price]" type="text" id="item-price-' + item_row + '">';
             html += '  </td>';
             html += '  <td>';
-            html += '      <select class="form-control select2" name="item[' + item_row + '][tax]" id="item-tax-' + item_row + '">';
+            html += '      <select class="form-control select2" name="item[' + item_row + '][tax_id]" id="item-tax-' + item_row + '">';
             html += '         <option selected="selected" value="">{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}</option>';
             @foreach($taxes as $tax_key => $tax_value)
             html += '         <option value="{{ $tax_key }}">{{ $tax_value }}</option>';
diff --git a/resources/views/incomes/invoices/edit.blade.php b/resources/views/incomes/invoices/edit.blade.php
index 1eaf4ab46..ea48ff559 100644
--- a/resources/views/incomes/invoices/edit.blade.php
+++ b/resources/views/incomes/invoices/edit.blade.php
@@ -51,7 +51,7 @@
                                     <input value="{{ $item->price }}" class="form-control text-right" required="required" name="item[{{ $item_row }}][price]" type="text" id="item-price-{{ $item_row }}">
                                 </td>
                                 <td>
-                                    {!! Form::select('item[' . $item_row . '][tax]', $taxes, $item->tax_id, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.enter', ['field' => trans_choice('general.taxes', 1)])]) !!}
+                                    {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, $item->tax_id, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.enter', ['field' => trans_choice('general.taxes', 1)])]) !!}
                                 </td>
                                 <td class="text-right" style="vertical-align: middle;">
                                     <span id="item-total-{{ $item_row }}">@money($item->total, $invoice->currency_code, true)</span>
@@ -75,7 +75,7 @@
                                     <input class="form-control text-right" required="required" name="item[{{ $item_row }}][price]" type="text" id="item-price-{{ $item_row }}">
                                 </td>
                                 <td>
-                                    {!! Form::select('item[' . $item_row . '][tax]', $taxes, null, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!}
+                                    {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, null, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!}
                                 </td>
                                 <td class="text-right" style="vertical-align: middle;">
                                     <span id="item-total-{{ $item_row }}">0</span>
@@ -150,7 +150,7 @@
             html += '      <input class="form-control text-right" required="required" name="item[' + item_row + '][price]" type="text" id="item-price-' + item_row + '">';
             html += '  </td>';
             html += '  <td>';
-            html += '      <select class="form-control select2" name="item[' + item_row + '][tax]" id="item-tax-' + item_row + '">';
+            html += '      <select class="form-control select2" name="item[' + item_row + '][tax_id]" id="item-tax-' + item_row + '">';
             html += '         <option selected="selected" value="">{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}</option>';
             @foreach($taxes as $tax_key => $tax_value)
             html += '         <option value="{{ $tax_key }}">{{ $tax_value }}</option>';