Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 13:12:50 +01:00
Code Issues Releases Activity

More fixes

Browse Source
This commit is contained in:
Lars Kusch 2023-05-03 16:32:53 +02:00
parent 937036ddb3
commit cbf441adec
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/Services/Invoice/EInvoice/ZugferdEInvoice.php
View File

@ -85,7 +85,6 @@ class ZugferdEInvoice extends AbstractService
} }
$invoicing_data = $this->invoice->calc(); $invoicing_data = $this->invoice->calc();
$globaltax = null;
//Create line items and calculate taxes //Create line items and calculate taxes
foreach ($this->invoice->line_items as $index => $item) { foreach ($this->invoice->line_items as $index => $item) {
@ -139,15 +138,15 @@ class ZugferdEInvoice extends AbstractService
if (!empty($this->invoice->tax_name1)) { if (!empty($this->invoice->tax_name1)) {
$taxtype = $this->getTaxType($this->invoice->tax_name1); $taxtype = $this->getTaxType($this->invoice->tax_name1);
$xrechnung->addDocumentPositionTax($taxtype, 'VAT', $this->invoice->tax_rate1); $xrechnung->addDocumentPositionTax($taxtype, 'VAT', $this->invoice->tax_rate1);
$this->addtoTaxMap($taxtype, $linenetamount, $item->tax_rate1); $this->addtoTaxMap($taxtype, $linenetamount, $this->invoice->tax_rate1);
} elseif (!empty($this->invoice->tax_name2)) { } elseif (!empty($this->invoice->tax_name2)) {
$taxtype = $this->getTaxType($this->invoice->tax_name2); $taxtype = $this->getTaxType($this->invoice->tax_name2);
$xrechnung->addDocumentPositionTax($taxtype, 'VAT', $this->invoice->tax_rate2); $xrechnung->addDocumentPositionTax($taxtype, 'VAT', $this->invoice->tax_rate2);
$this->addtoTaxMap($taxtype, $linenetamount, $item->tax_rate1); $this->addtoTaxMap($taxtype, $linenetamount, $this->invoice->tax_rate2);
} elseif (!empty($this->invoice->tax_name3)) { } elseif (!empty($this->invoice->tax_name3)) {
$taxtype = $this->getTaxType($this->invoice->tax_name3); $taxtype = $this->getTaxType($this->invoice->tax_name3);
$xrechnung->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate3); $xrechnung->addDocumentPositionTax($taxtype, 'VAT', $this->invoice->tax_rate3);
$this->addtoTaxMap($taxtype, $linenetamount, $item->tax_rate1); $this->addtoTaxMap($taxtype, $linenetamount, $this->invoice->tax_rate3);
} else { } else {
nlog("Can't add correct tax position"); nlog("Can't add correct tax position");
} }
@ -156,14 +155,14 @@ class ZugferdEInvoice extends AbstractService
if ($this->invoice->isPartial()) { if ($this->invoice->isPartial()) {
$xrechnung->setDocumentSummation($this->invoice->amount, $this->invoice->amount-$this->invoice->balance, $invoicing_data->getSubTotal(), $invoicing_data->getTotalSurcharges(), $invoicing_data->getTotalDiscount(), $invoicing_data->getSubTotal(), $invoicing_data->getItemTotalTaxes(), null, $this->invoice->partial); $xrechnung->setDocumentSummation($this->invoice->amount, $this->invoice->balance, $invoicing_data->getSubTotal(), $invoicing_data->getTotalSurcharges(), $invoicing_data->getTotalDiscount(), $invoicing_data->getSubTotal(), $invoicing_data->getItemTotalTaxes(), null, $this->invoice->partial);
} else { } else {
$xrechnung->setDocumentSummation($this->invoice->amount, $this->invoice->amount-$this->invoice->balance, $invoicing_data->getSubTotal(), $invoicing_data->getTotalSurcharges(), $invoicing_data->getTotalDiscount(), $invoicing_data->getSubTotal(), $invoicing_data->getItemTotalTaxes(), null, 0.0); $xrechnung->setDocumentSummation($this->invoice->amount, $this->invoice->balance, $invoicing_data->getSubTotal(), $invoicing_data->getTotalSurcharges(), $invoicing_data->getTotalDiscount(), $invoicing_data->getSubTotal(), $invoicing_data->getItemTotalTaxes(), null, 0.0);
} }
foreach ($this->tax_map as $item){ foreach ($this->tax_map as $item){
$xrechnung->addDocumentTax($item["tax_type"], "VAT", $item["net_amount"], $item["tax_rate"]*$item["net_amount"], $item["tax_rate"]); $xrechnung->addDocumentTax($item["tax_type"], "VAT", $item["net_amount"], $item["tax_rate"]*$item["net_amount"], $item["tax_rate"]*100);
} }
$disk = config('filesystems.default'); $disk = config('filesystems.default');
@ -240,7 +239,7 @@ class ZugferdEInvoice extends AbstractService
$this->tax_map[$hash] = [ $this->tax_map[$hash] = [
"tax_type" => $taxtype, "tax_type" => $taxtype,
"net_amount" => $netamount, "net_amount" => $netamount,
"tax_rate" => $taxrate "tax_rate" => $taxrate / 100
]; ];
} }
} }