shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refs #688 add this changes InvoiceItem Tax

Browse Source
This commit is contained in:
cuneytsenturk 2019-03-07 12:01:32 +03:00
parent 183e3c86e0
commit 31e076b59d
2 changed files with 19 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Jobs/Expense/CreateBillItem.php
View File

@ -106,16 +106,16 @@ class CreateBillItem
$item_amount = $item_discount_amount + $item_tax_total; $item_amount = $item_discount_amount + $item_tax_total;
$item_base_rate = $item_amount / (1 + collect($inclusives)->sum('rate')/100); $item_base_rate = $item_amount / (1 + collect($inclusives)->sum('rate')/100);
foreach ($inclusives as $inclusive) { foreach ($inclusives as $inclusive) {
$item_tax_total += $tax_amount = $item_base_rate * ($inclusive->rate / 100); $item_tax_total += $tax_amount = $item_base_rate * ($inclusive->rate / 100);
$item_taxes[] = [ $item_taxes[] = [
'company_id' => $this->bill->company_id, 'company_id' => $this->bill->company_id,
'bill_id' => $this->bill->id, 'bill_id' => $this->bill->id,
'tax_id' => $inclusive->id, 'tax_id' => $inclusive->id,
'name' => $inclusive->name, 'name' => $inclusive->name,
'amount' => $tax_amount, 'amount' => $tax_amount,
]; ];
} }

54
app/Jobs/Income/CreateInvoiceItem.php
View File

@ -130,51 +130,23 @@ class CreateInvoiceItem
} }
if ($inclusives) { if ($inclusives) {
if ($this->discount) { $item_amount = $item_discount_amount + $item_tax_total;
$item_tax_total = 0;
if ($taxes) { $item_base_rate = $item_amount / (1 + collect($inclusives)->sum('rate')/100);
foreach ($taxes as $tax) {
$item_tax_amount = ($item_amount / 100) * $tax->rate;
$item_tax_total += $item_tax_amount; foreach ($inclusives as $inclusive) {
} $item_tax_total += $tax_amount = $item_base_rate * ($inclusive->rate / 100);
}
foreach ($inclusives as $inclusive) { $item_taxes[] = [
$item_sub_and_tax_total = $item_amount + $item_tax_total; 'company_id' => $this->invoice->company_id,
'invoice_id' => $this->invoice->id,
$item_tax_total = $item_sub_and_tax_total - ($item_sub_and_tax_total / (1 + ($inclusive->rate / 100))); 'tax_id' => $inclusive->id,
'name' => $inclusive->name,
$item_sub_total = $item_sub_and_tax_total - $item_tax_total; 'amount' => $tax_amount,
];
$item_taxes[] = [
'company_id' => $this->invoice->company_id,
'invoice_id' => $this->invoice->id,
'tax_id' => $inclusive->id,
'name' => $inclusive->name,
'amount' => $tax_amount,
];
$item_discount_amount = $item_sub_total - ($item_sub_total * ($this->discount / 100));
}
} else {
foreach ($inclusives as $inclusive) {
$item_sub_and_tax_total = $item_discount_amount + $item_tax_total;
$item_tax_total = $tax_amount = $item_sub_and_tax_total - ($item_sub_and_tax_total / (1 + ($inclusive->rate / 100)));
$item_taxes[] = [
'company_id' => $this->invoice->company_id,
'invoice_id' => $this->invoice->id,
'tax_id' => $inclusive->id,
'name' => $inclusive->name,
'amount' => $tax_amount,
];
$item_amount = $item_sub_and_tax_total - $item_tax_total;
}
} }
$item_amount = ($item_amount - $item_tax_total) / (1 - $this->discount / 100);
} }
if ($compounds) { if ($compounds) {