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

Fixes

Browse Source
This commit is contained in:
Lars Kusch 2024-05-17 07:59:25 +02:00
parent f1e4d3e8f1
commit 439c02cb8b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Jobs/EDocument/MergeEDocument.php
View File

@ -31,7 +31,6 @@ class MergeEDocument implements ShouldQueue
*/ */
public function handle(): string public function handle(): string
{ {
global $mergeToPdf;
$settings_entity = ($this->document instanceof PurchaseOrder) ? $this->document->vendor : $this->document->client; $settings_entity = ($this->document instanceof PurchaseOrder) ? $this->document->vendor : $this->document->client;
$e_document_type = strlen($settings_entity->getSetting('e_invoice_type')) > 2 ? $settings_entity->getSetting('e_invoice_type') : "XInvoice_3_0"; $e_document_type = strlen($settings_entity->getSetting('e_invoice_type')) > 2 ? $settings_entity->getSetting('e_invoice_type') : "XInvoice_3_0";

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

@ -166,21 +166,21 @@ class ZugferdEDokument extends AbstractService
$taxtype = $this->getTaxType($item->tax_id); $taxtype = $this->getTaxType($item->tax_id);
if (!empty($item->tax_name1)) { if (!empty($item->tax_name1)) {
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_rate1, exemptionReason: ctrans('texts.intracommunity_suply')); $this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate1, exemptionReason: ctrans('texts.intracommunity_tax_info'));
} else { } else {
$this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate1); $this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate1);
} }
$this->addtoTaxMap($taxtype, $item->line_total, $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_tax_info'));
} else { } else {
$this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate2); $this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate2);
} }
$this->addtoTaxMap($taxtype, $item->line_total, $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_tax_info'));
} else { } else {
$this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate3); $this->xdocument->addDocumentPositionTax($taxtype, 'VAT', $item->tax_rate3);
} }
@ -226,7 +226,7 @@ class ZugferdEDokument extends AbstractService
} }
} }
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){
$this->xdocument->addDocumentTax($item["tax_type"], "VAT", $item["net_amount"], $item["tax_rate"] * $item["net_amount"], $item["tax_rate"] * 100, ctrans('texts.intracommunity_suply')); $this->xdocument->addDocumentTax($item["tax_type"], "VAT", $item["net_amount"], $item["tax_rate"] * $item["net_amount"], $item["tax_rate"] * 100, ctrans('texts.intracommunity_tax_info'));
} else { } else {
$this->xdocument->addDocumentTax($item["tax_type"], "VAT", $item["net_amount"], $item["tax_rate"] * $item["net_amount"], $item["tax_rate"] * 100); $this->xdocument->addDocumentTax($item["tax_type"], "VAT", $item["net_amount"], $item["tax_rate"] * $item["net_amount"], $item["tax_rate"] * 100);
} }