waqas
/
Akaunting
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3257 from CihanSenturk/fix-document-import-item-tax-issue 

Fixed document import item tax issue
This commit is contained in:
Cihan Şentürk 2025-01-17 21:06:55 +03:00 committed by GitHub
parent 0ed1ba4258 a626e90825
commit 85f32a228b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 47 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Exports/Purchases/Bills/Sheets/BillItemTaxes.php
View File

@ -23,6 +23,7 @@ class BillItemTaxes extends Export implements WithParentSheet
$model->bill_number = $document->document_number;
$model->item_name = $model->item->name;
$model->tax_name = $model->tax->name;
$model->tax_rate = $model->tax->rate;
return parent::map($model);
@ -33,6 +34,7 @@ class BillItemTaxes extends Export implements WithParentSheet
return [
'bill_number',
'item_name',
'tax_name',
'tax_rate',
'amount',
];

2
app/Exports/Purchases/RecurringBills/Sheets/RecurringBillItemTaxes.php
View File

@ -23,6 +23,7 @@ class RecurringBillItemTaxes extends Export implements WithParentSheet
$model->bill_number = $document->document_number;
$model->item_name = $model->item->name;
$model->tax_name = $model->tax->name;
$model->tax_rate = $model->tax->rate;
return parent::map($model);
@ -33,6 +34,7 @@ class RecurringBillItemTaxes extends Export implements WithParentSheet
return [
'bill_number',
'item_name',
'tax_name',
'tax_rate',
'amount',
];

2
app/Exports/Sales/Invoices/Sheets/InvoiceItemTaxes.php
View File

@ -23,6 +23,7 @@ class InvoiceItemTaxes extends Export implements WithParentSheet
$model->invoice_number = $document->document_number;
$model->item_name = $model->item->name;
$model->tax_name = $model->tax->name;
$model->tax_rate = $model->tax->rate;
return parent::map($model);
@ -33,6 +34,7 @@ class InvoiceItemTaxes extends Export implements WithParentSheet
return [
'invoice_number',
'item_name',
'tax_name',
'tax_rate',
'amount',
];

2
app/Exports/Sales/RecurringInvoices/Sheets/RecurringInvoiceItemTaxes.php
View File

@ -23,6 +23,7 @@ class RecurringInvoiceItemTaxes extends Export implements WithParentSheet
$model->invoice_number = $document->document_number;
$model->item_name = $model->item->name;
$model->tax_name = $model->tax->name;
$model->tax_rate = $model->tax->rate;
return parent::map($model);
@ -33,6 +34,7 @@ class RecurringInvoiceItemTaxes extends Export implements WithParentSheet
return [
'invoice_number',
'item_name',
'tax_name',
'tax_rate',
'amount',
];

10
app/Imports/Purchases/Bills/Sheets/BillItemTaxes.php
View File

@ -44,6 +44,10 @@ class BillItemTaxes extends Import
$document = Document::with('items')->bill()->number($row['bill_number'])->first();
if (! $document) {
return [];
}
$row['document_id'] = (int) $document->id;
if (empty($row['document_item_id']) && !empty($row['item_name'])) {
@ -51,7 +55,11 @@ class BillItemTaxes extends Import
$item_id = Item::name($row['item_name'])->whereIn('id', $document_items_ids)->pluck('id')->first();
$row['document_item_id'] = DocumentItem::bill()->where('item_id', $item_id)->pluck('id')->first();
$row['document_item_id'] = DocumentItem::bill()
->where('document_id', $row['document_id'])
->where('item_id', $item_id)
->pluck('id')
->first();
}
$row['tax_id'] = $this->getTaxId($row);

14
app/Imports/Purchases/RecurringBills/Sheets/RecurringBillItemTaxes.php
View File

@ -42,15 +42,19 @@ class RecurringBillItemTaxes extends Import
$row = parent::map($row);
$row['document_id'] = (int) Document::where('type', '=', Document::BILL_RECURRING_TYPE)
->number($row['bill_number'])
->pluck('id')
->first();
$document = Document::with('items')->billRecurring()->number($row['bill_number'])->first();
if (! $document) {
return [];
}
$row['document_id'] = (int) $document->id;
if (empty($row['document_item_id']) && !empty($row['item_name'])) {
$item_id = Item::name($row['item_name'])->pluck('id')->first();
$row['document_item_id'] = DocumentItem::where('type', '=', Document::BILL_RECURRING_TYPE)
$row['document_item_id'] = DocumentItem::billRecurring()
->where('document_id', $row['document_id'])
->where('item_id', $item_id)
->pluck('id')
->first();

10
app/Imports/Sales/Invoices/Sheets/InvoiceItemTaxes.php
View File

@ -44,6 +44,10 @@ class InvoiceItemTaxes extends Import
$document = Document::with('items')->invoice()->number($row['invoice_number'])->first();
if (! $document) {
return [];
}
$row['document_id'] = (int) $document->id;
if (empty($row['document_item_id']) && !empty($row['item_name'])) {
@ -51,7 +55,11 @@ class InvoiceItemTaxes extends Import
$item_id = Item::name($row['item_name'])->whereIn('id', $document_items_ids)->pluck('id')->first();
$row['document_item_id'] = DocumentItem::invoice()->where('item_id', $item_id)->pluck('id')->first();
$row['document_item_id'] = DocumentItem::invoice()
->where('document_id', $row['document_id'])
->where('item_id', $item_id)
->pluck('id')
->first();
}
$row['tax_id'] = $this->getTaxId($row);

18
app/Imports/Sales/RecurringInvoices/Sheets/RecurringInvoiceItemTaxes.php
View File

@ -42,15 +42,21 @@ class RecurringInvoiceItemTaxes extends Import
$row = parent::map($row);
$row['document_id'] = (int) Document::where('type', '=', Document::INVOICE_RECURRING_TYPE)
->number($row['invoice_number'])
->pluck('id')
->first();
$document = Document::with('items')->invoiceRecurring()->number($row['invoice_number'])->first();
if (! $document) {
return [];
}
$row['document_id'] = (int) $document->id;
if (empty($row['document_item_id']) && !empty($row['item_name'])) {
$item_id = Item::name($row['item_name'])->pluck('id')->first();
$document_items_ids = $document->items->pluck('item_id')->toArray();
$row['document_item_id'] = DocumentItem::where('type', '=', Document::INVOICE_RECURRING_TYPE)
$item_id = Item::name($row['item_name'])->whereIn('id', $document_items_ids)->pluck('id')->first();
$row['document_item_id'] = DocumentItem::invoiceRecurring()
->where('document_id', $row['document_id'])
->where('item_id', $item_id)
->pluck('id')
->first();