diff --git a/database/migrations/2017_10_11_000000_create_bill_totals_table.php b/database/migrations/2017_10_11_000000_create_bill_totals_table.php
index 2bd8a5c7c..89c84f9c0 100644
--- a/database/migrations/2017_10_11_000000_create_bill_totals_table.php
+++ b/database/migrations/2017_10_11_000000_create_bill_totals_table.php
@@ -2,6 +2,7 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use App\Models\Model;
 use App\Models\Company\Company;
 use App\Models\Expense\Bill;
 use App\Models\Expense\BillItem;
@@ -39,7 +40,7 @@ class CreateBillTotalsTable extends Migration
             $bills = Bill::where('company_id', $company->id)->get();
 
             foreach ($bills as $bill) {
-                $bill_items = BillItem::where('bill_id', $bill->id)->get();
+                $bill_items = BillItem::where('company_id', $company->id)->where('bill_id', $bill->id)->get();
 
                 $taxes = [];
                 $tax_total = 0;
@@ -47,14 +48,17 @@ class CreateBillTotalsTable extends Migration
 
                 foreach ($bill_items as $bill_item) {
                     unset($tax_object);
+
                     $bill_item->total = $bill_item->price * $bill_item->quantity;
 
-                    $bill_item->update();
-
                     if (!empty($bill_item->tax_id)) {
-                        $tax_object = Tax::find($bill_item->tax_id);
+                        $tax_object = Tax::where('company_id', $company->id)->where('id', $bill_item->tax_id)->first();
+
+                        $bill_item->tax = (($bill_item->price * $bill_item->quantity) / 100) * $tax_object->rate;
                     }
 
+                    $bill_item->update();
+
                     if (isset($tax_object)) {
                         if (array_key_exists($bill_item->tax_id, $taxes)) {
                             $taxes[$bill_item->tax_id]['amount'] += $bill_item->tax;
diff --git a/database/migrations/2017_10_11_000000_create_invoice_totals_table.php b/database/migrations/2017_10_11_000000_create_invoice_totals_table.php
index 29b55c07a..6a3e1f77b 100644
--- a/database/migrations/2017_10_11_000000_create_invoice_totals_table.php
+++ b/database/migrations/2017_10_11_000000_create_invoice_totals_table.php
@@ -2,6 +2,7 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use App\Models\Model;
 use App\Models\Company\Company;
 use App\Models\Income\Invoice;
 use App\Models\Income\InvoiceItem;
@@ -39,7 +40,7 @@ class CreateInvoiceTotalsTable extends Migration
             $invoices = Invoice::where('company_id', $company->id)->get();
 
             foreach ($invoices as $invoice) {
-                $invoice_items = InvoiceItem::where('invoice_id', $invoice->id)->get();
+                $invoice_items = InvoiceItem::where('company_id', $company->id)->where('invoice_id', $invoice->id)->get();
 
                 $taxes = [];
                 $tax_total = 0;
@@ -47,14 +48,17 @@ class CreateInvoiceTotalsTable extends Migration
 
                 foreach ($invoice_items as $invoice_item) {
                     unset($tax_object);
+
                     $invoice_item->total = $invoice_item->price * $invoice_item->quantity;
 
-                    $invoice_item->update();
-
                     if (!empty($invoice_item->tax_id)) {
-                        $tax_object = Tax::find($invoice_item->tax_id);
+                        $tax_object = Tax::where('company_id', $company->id)->where('id', $invoice_item->tax_id)->first();
+
+                        $invoice_item->tax = (($invoice_item->price * $invoice_item->quantity) / 100) * $tax_object->rate;
                     }
 
+                    $invoice_item->update();
+
                     if (isset($tax_object)) {
                         if (array_key_exists($invoice_item->tax_id, $taxes)) {
                             $taxes[$invoice_item->tax_id]['amount'] += $invoice_item->tax;