Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

More fixes for item discounts

Browse Source
This commit is contained in:
Lars Kusch 2024-05-15 16:58:21 +02:00
parent 45c3e42bff
commit 8e7c117bd9
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/Services/EDocument/Standards/ZugferdEDokument.php
View File

@ -11,10 +11,10 @@
namespace App\Services\EDocument\Standards; namespace App\Services\EDocument\Standards;
use App\DataMapper\InvoiceItem;
use App\Models\Credit; use App\Models\Credit;
use App\Models\Invoice; use App\Models\Invoice;
use App\Models\Product; use App\Models\Product;
use App\Models\PurchaseOrder;
use App\Models\Quote; use App\Models\Quote;
use App\Services\AbstractService; use App\Services\AbstractService;
use horstoeko\zugferd\codelists\ZugferdDutyTaxFeeCategories; use horstoeko\zugferd\codelists\ZugferdDutyTaxFeeCategories;
@ -120,10 +120,10 @@ class ZugferdEDokument extends AbstractService
} }
$invoicing_data = $this->document->calc(); $invoicing_data = $this->document->calc();
$total_position_discount = 0.0;
//Create line items and calculate taxes //Create line items and calculate taxes
foreach ($this->document->line_items as $index => $item) { foreach ($this->document->line_items as $index => $item) {
/** @var \App\DataMapper\InvoiceItem $item **/ /** @var InvoiceItem $item **/
$this->xdocument->addNewPosition($index) $this->xdocument->addNewPosition($index)
->setDocumentPositionGrossPrice($item->gross_line_total+$item->discount) ->setDocumentPositionGrossPrice($item->gross_line_total+$item->discount)
->setDocumentPositionNetPrice($item->line_total); ->setDocumentPositionNetPrice($item->line_total);
@ -145,15 +145,19 @@ class ZugferdEDokument extends AbstractService
} else { } else {
$this->xdocument->setDocumentPositionQuantity($item->quantity, "H87"); $this->xdocument->setDocumentPositionQuantity($item->quantity, "H87");
} }
$linenetamount = $item->line_total; $line_discount = 0.0;
/* if ($item->discount > 0) { if ($item->discount > 0) {
if ($this->document->is_amount_discount) { if ($this->document->is_amount_discount) {
$linenetamount -= $item->discount; $line_discount -= $item->discount;
} else { } else {
$linenetamount -= $linenetamount * ($item->discount / 100); $line_discount -= $item->line_total * ($item->discount / 100);
} }
}*/ $this->xdocument->addDocumentPositionAllowanceCharge( abs($line_discount), false);
$this->xdocument->setDocumentPositionLineSummation($linenetamount, $item->discount); $total_position_discount += abs($line_discount);
}
$this->xdocument->setDocumentPositionLineSummation($item->line_total, $item->discount);
// According to european law, each line item can only have one tax rate // According to european law, each line item can only have one tax rate
if (!(empty($item->tax_name1) && empty($item->tax_name2) && empty($item->tax_name3))) { if (!(empty($item->tax_name1) && empty($item->tax_name2) && empty($item->tax_name3))) {
$taxtype = $this->getTaxType($item->tax_id); $taxtype = $this->getTaxType($item->tax_id);
@ -163,47 +167,47 @@ class ZugferdEDokument extends AbstractService
} else { } else {
$this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate1); $this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate1);
} }
$this->addtoTaxMap($taxtype, $linenetamount, $item->tax_rate1); $this->addtoTaxMap($taxtype, $item->line_total, $item->tax_rate1);
} elseif (!empty($item->tax_name2)) { } elseif (!empty($item->tax_name2)) {
if ($taxtype == ZugferdDutyTaxFeeCategories::VAT_EXEMPT_FOR_EEA_INTRACOMMUNITY_SUPPLY_OF_GOODS_AND_SERVICES){ if ($taxtype == ZugferdDutyTaxFeeCategories::VAT_EXEMPT_FOR_EEA_INTRACOMMUNITY_SUPPLY_OF_GOODS_AND_SERVICES){
$this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate2, exemptionReason: ctrans('texts.intracommunity_suply')); $this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate2, exemptionReason: ctrans('texts.intracommunity_suply'));
} else { } else {
$this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate2); $this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate2);
} }
$this->addtoTaxMap($taxtype, $linenetamount, $item->tax_rate2); $this->addtoTaxMap($taxtype, $item->line_total, $item->tax_rate2);
} elseif (!empty($item->tax_name3)) { } elseif (!empty($item->tax_name3)) {
if ($taxtype == ZugferdDutyTaxFeeCategories::VAT_EXEMPT_FOR_EEA_INTRACOMMUNITY_SUPPLY_OF_GOODS_AND_SERVICES){ if ($taxtype == ZugferdDutyTaxFeeCategories::VAT_EXEMPT_FOR_EEA_INTRACOMMUNITY_SUPPLY_OF_GOODS_AND_SERVICES){
$this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate3, exemptionReason: ctrans('texts.intracommunity_suply')); $this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate3, exemptionReason: ctrans('texts.intracommunity_suply'));
} else { } else {
$this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate3); $this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate3);
} }
$this->addtoTaxMap($taxtype, $linenetamount, $item->tax_rate3); $this->addtoTaxMap($taxtype, $item->line_total, $item->tax_rate3);
} else { } else {
// nlog("Can't add correct tax position"); nlog("Can't add correct tax position");
} }
} else { } else {
if (!empty($this->document->tax_name1)) { if (!empty($this->document->tax_name1)) {
$taxtype = $this->getTaxType($this->document->tax_name1); $taxtype = $this->getTaxType($this->document->tax_name1);
$this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $this->document->tax_rate1); $this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $this->document->tax_rate1);
$this->addtoTaxMap($taxtype, $linenetamount, $this->document->tax_rate1); $this->addtoTaxMap($taxtype, $item->line_total, $this->document->tax_rate1);
} elseif (!empty($this->document->tax_name2)) { } elseif (!empty($this->document->tax_name2)) {
$taxtype = $this->getTaxType($this->document->tax_name2); $taxtype = $this->getTaxType($this->document->tax_name2);
$this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $this->document->tax_rate2); $this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $this->document->tax_rate2);
$this->addtoTaxMap($taxtype, $linenetamount, $this->document->tax_rate2); $this->addtoTaxMap($taxtype, $item->line_total, $this->document->tax_rate2);
} elseif (!empty($this->document->tax_name3)) { } elseif (!empty($this->document->tax_name3)) {
$taxtype = $this->getTaxType($this->document->tax_name3); $taxtype = $this->getTaxType($this->document->tax_name3);
$this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $this->document->tax_rate3); $this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $this->document->tax_rate3);
$this->addtoTaxMap($taxtype, $linenetamount, $this->document->tax_rate3); $this->addtoTaxMap($taxtype, $item->line_total, $this->document->tax_rate3);
} else { } else {
$taxtype = ZugferdDutyTaxFeeCategories::ZERO_RATED_GOODS; $taxtype = ZugferdDutyTaxFeeCategories::ZERO_RATED_GOODS;
$this->xdocument->addDocumentPositionTax($taxtype, 'VAT', 0); $this->xdocument->addDocumentPositionTax($taxtype, 'VAT', 0);
$this->addtoTaxMap($taxtype, $linenetamount, 0); $this->addtoTaxMap($taxtype, $item->line_total, 0);
// nlog("Can't add correct tax position"); // nlog("Can't add correct tax position");
} }
} }
} }
$this->xdocument->setDocumentSummation($this->document->amount, $this->document->balance, $invoicing_data->getSubTotal(), $invoicing_data->getTotalSurcharges(), $invoicing_data->getTotalDiscount(), $invoicing_data->getSubTotal(), $invoicing_data->getItemTotalTaxes(), 0.0, $this->document->amount - $this->document->balance); $this->xdocument->setDocumentSummation($this->document->amount, $this->document->balance, $invoicing_data->getSubTotal(), $invoicing_data->getTotalSurcharges(), $invoicing_data->getTotalDiscount()+$total_position_discount, $invoicing_data->getSubTotal(), $invoicing_data->getItemTotalTaxes(), 0.0, $this->document->amount - $this->document->balance);
foreach ($this->tax_map as $item) { foreach ($this->tax_map as $item) {
if ($item["tax_type"] == ZugferdDutyTaxFeeCategories::VAT_EXEMPT_FOR_EEA_INTRACOMMUNITY_SUPPLY_OF_GOODS_AND_SERVICES){ if ($item["tax_type"] == ZugferdDutyTaxFeeCategories::VAT_EXEMPT_FOR_EEA_INTRACOMMUNITY_SUPPLY_OF_GOODS_AND_SERVICES){