diff --git a/app/Imports/Purchases/Sheets/BillHistories.php b/app/Imports/Purchases/Sheets/BillHistories.php index b0b5f1954..75eb5aa08 100644 --- a/app/Imports/Purchases/Sheets/BillHistories.php +++ b/app/Imports/Purchases/Sheets/BillHistories.php @@ -20,6 +20,8 @@ class BillHistories extends Import return []; } + $row['bill_number'] = (string) $row['bill_number']; + $row = parent::map($row); $row['document_id'] = (int) Document::bill()->number($row['bill_number'])->pluck('id')->first(); diff --git a/app/Imports/Purchases/Sheets/BillItemTaxes.php b/app/Imports/Purchases/Sheets/BillItemTaxes.php index ade037f2c..62c1bbb8c 100644 --- a/app/Imports/Purchases/Sheets/BillItemTaxes.php +++ b/app/Imports/Purchases/Sheets/BillItemTaxes.php @@ -22,6 +22,8 @@ class BillItemTaxes extends Import return []; } + $row['bill_number'] = (string) $row['bill_number']; + $row = parent::map($row); $row['document_id'] = (int) Document::bill()->number($row['bill_number'])->pluck('id')->first(); diff --git a/app/Imports/Purchases/Sheets/BillItems.php b/app/Imports/Purchases/Sheets/BillItems.php index 885b3d3ce..8f0f83617 100644 --- a/app/Imports/Purchases/Sheets/BillItems.php +++ b/app/Imports/Purchases/Sheets/BillItems.php @@ -20,6 +20,8 @@ class BillItems extends Import return []; } + $row['bill_number'] = (string) $row['bill_number']; + $row = parent::map($row); $row['document_id'] = (int) Document::bill()->number($row['bill_number'])->pluck('id')->first(); diff --git a/app/Imports/Purchases/Sheets/BillTotals.php b/app/Imports/Purchases/Sheets/BillTotals.php index 54a256f8e..a3dc6ccea 100644 --- a/app/Imports/Purchases/Sheets/BillTotals.php +++ b/app/Imports/Purchases/Sheets/BillTotals.php @@ -20,6 +20,8 @@ class BillTotals extends Import return []; } + $row['bill_number'] = (string) $row['bill_number']; + $row = parent::map($row); $row['document_id'] = (int) Document::bill()->number($row['bill_number'])->pluck('id')->first(); diff --git a/app/Imports/Purchases/Sheets/BillTransactions.php b/app/Imports/Purchases/Sheets/BillTransactions.php index 528d5bb16..604d64df5 100644 --- a/app/Imports/Purchases/Sheets/BillTransactions.php +++ b/app/Imports/Purchases/Sheets/BillTransactions.php @@ -19,6 +19,8 @@ class BillTransactions extends Import return []; } + $row['bill_number'] = (string) $row['bill_number']; + $row = parent::map($row); $row['type'] = 'expense'; diff --git a/app/Imports/Purchases/Sheets/Bills.php b/app/Imports/Purchases/Sheets/Bills.php index f3ea5a549..5dce7b836 100644 --- a/app/Imports/Purchases/Sheets/Bills.php +++ b/app/Imports/Purchases/Sheets/Bills.php @@ -20,6 +20,8 @@ class Bills extends Import return []; } + $row['bill_number'] = (string) $row['bill_number']; + $row = parent::map($row); $country = array_search($row['contact_country'], trans('countries')); diff --git a/app/Imports/Sales/Sheets/InvoiceHistories.php b/app/Imports/Sales/Sheets/InvoiceHistories.php index f69e3e617..2d05e15db 100644 --- a/app/Imports/Sales/Sheets/InvoiceHistories.php +++ b/app/Imports/Sales/Sheets/InvoiceHistories.php @@ -20,6 +20,8 @@ class InvoiceHistories extends Import return []; } + $row['invoice_number'] = (string) $row['invoice_number']; + $row = parent::map($row); $row['document_id'] = (int) Document::invoice()->number($row['invoice_number'])->pluck('id')->first(); diff --git a/app/Imports/Sales/Sheets/InvoiceItemTaxes.php b/app/Imports/Sales/Sheets/InvoiceItemTaxes.php index 4203d1b94..470f333c7 100644 --- a/app/Imports/Sales/Sheets/InvoiceItemTaxes.php +++ b/app/Imports/Sales/Sheets/InvoiceItemTaxes.php @@ -22,6 +22,8 @@ class InvoiceItemTaxes extends Import return []; } + $row['invoice_number'] = (string) $row['invoice_number']; + $row = parent::map($row); $row['document_id'] = (int) Document::invoice()->number($row['invoice_number'])->pluck('id')->first(); diff --git a/app/Imports/Sales/Sheets/InvoiceItems.php b/app/Imports/Sales/Sheets/InvoiceItems.php index 36f068cd1..ad3836aad 100644 --- a/app/Imports/Sales/Sheets/InvoiceItems.php +++ b/app/Imports/Sales/Sheets/InvoiceItems.php @@ -20,6 +20,8 @@ class InvoiceItems extends Import return []; } + $row['invoice_number'] = (string) $row['invoice_number']; + $row = parent::map($row); $row['document_id'] = (int) Document::invoice()->number($row['invoice_number'])->pluck('id')->first(); diff --git a/app/Imports/Sales/Sheets/InvoiceTotals.php b/app/Imports/Sales/Sheets/InvoiceTotals.php index 0ecc65c4f..1cb7dc34d 100644 --- a/app/Imports/Sales/Sheets/InvoiceTotals.php +++ b/app/Imports/Sales/Sheets/InvoiceTotals.php @@ -20,6 +20,8 @@ class InvoiceTotals extends Import return []; } + $row['invoice_number'] = (string) $row['invoice_number']; + $row = parent::map($row); $row['document_id'] = (int) Document::invoice()->number($row['invoice_number'])->pluck('id')->first(); diff --git a/app/Imports/Sales/Sheets/InvoiceTransactions.php b/app/Imports/Sales/Sheets/InvoiceTransactions.php index 2fb2cf21c..1b9a1796a 100644 --- a/app/Imports/Sales/Sheets/InvoiceTransactions.php +++ b/app/Imports/Sales/Sheets/InvoiceTransactions.php @@ -19,6 +19,8 @@ class InvoiceTransactions extends Import return []; } + $row['invoice_number'] = (string) $row['invoice_number']; + $row = parent::map($row); $row['type'] = 'income'; diff --git a/app/Imports/Sales/Sheets/Invoices.php b/app/Imports/Sales/Sheets/Invoices.php index e0d52e699..fa3bc22b9 100644 --- a/app/Imports/Sales/Sheets/Invoices.php +++ b/app/Imports/Sales/Sheets/Invoices.php @@ -20,6 +20,8 @@ class Invoices extends Import return []; } + $row['invoice_number'] = (string) $row['invoice_number']; + $row = parent::map($row); $country = array_search($row['contact_country'], trans('countries')); diff --git a/app/Traits/Import.php b/app/Traits/Import.php index 95742496b..ffdb40d5a 100644 --- a/app/Traits/Import.php +++ b/app/Traits/Import.php @@ -327,6 +327,7 @@ trait Import $data = [ 'company_id' => company_id(), + 'type' => $row['item_type'], 'name' => $row['item_name'], 'sale_price' => !empty($row['sale_price']) ? $row['sale_price'] : (!empty($row['price']) ? $row['price'] : 0), 'purchase_price' => !empty($row['purchase_price']) ? $row['purchase_price'] : (!empty($row['price']) ? $row['price'] : 0), diff --git a/public/files/import/bills.xlsx b/public/files/import/bills.xlsx index 86cfaef8c..89ecdd52c 100644 Binary files a/public/files/import/bills.xlsx and b/public/files/import/bills.xlsx differ diff --git a/public/files/import/invoices.xlsx b/public/files/import/invoices.xlsx index ab014c110..af5e7317b 100644 Binary files a/public/files/import/invoices.xlsx and b/public/files/import/invoices.xlsx differ