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

Last fixes

Browse Source
This commit is contained in:
Lars Kusch 2024-05-20 21:25:30 +02:00
parent 7abf67cce5
commit 3709039b08
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ class MergeEDocument implements ShouldQueue
public $deleteWhenMissingModels = true; public $deleteWhenMissingModels = true;
public function __construct(private object $document, private string $pdf_file) public function __construct(private mixed $document, private string $pdf_file)
{ {
} }

15
app/Jobs/Entity/CreateRawPdf.php
View File

@ -96,6 +96,9 @@ class CreateRawPdf
} }
/**
* @throws FilePermissionsFailure
*/
public function handle() public function handle()
{ {
/** Testing this override to improve PDF generation performance */ /** Testing this override to improve PDF generation performance */
@ -105,15 +108,15 @@ class CreateRawPdf
"{$this->entity_string}s" => [$this->entity], "{$this->entity_string}s" => [$this->entity],
]); ]);
$pdf = $ps->boot()->getPdf(); try {
$pdf = $ps->boot()->getPdf();
nlog("pdf timer = ". $ps->execution_time); } catch (\Exception) {
if ($this->entity_string == "invoice" && $this->entity->company->getSetting("enable_e_invoice")){ throw new FilePermissionsFailure('Unable to generate the raw PDF');
}
if ($this->entity_string == "invoice" && $this->entity->getSetting("merge_e_invoice_to_pdf")){
$pdf = (new MergeEDocument($this->entity, $pdf))->handle(); $pdf = (new MergeEDocument($this->entity, $pdf))->handle();
} }
return $pdf; return $pdf;
throw new FilePermissionsFailure('Unable to generate the raw PDF');
} }
public function failed($e) public function failed($e)

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

@ -72,9 +72,10 @@ class ZugferdEDokument extends AbstractService
// Probably wrong file code https://github.com/horstoeko/zugferd/blob/master/src/codelists/ZugferdInvoiceType.php // Probably wrong file code https://github.com/horstoeko/zugferd/blob/master/src/codelists/ZugferdInvoiceType.php
if (empty($this->document->number)) { if (empty($this->document->number)) {
$this->xdocument->setDocumentInformation("DRAFT", "84", date_create($this->document->date ?? now()->format('Y-m-d')), $client->getCurrencyCode()); $this->xdocument->setDocumentInformation("DRAFT", "84", date_create($this->document->date ?? now()->format('Y-m-d')), $client->getCurrencyCode());
$this->xdocument->setIsTestDocument();
} else { } else {
$this->xdocument->setDocumentInformation($this->document->number, "84", date_create($this->document->date ?? now()->format('Y-m-d')), $client->getCurrencyCode()); $this->xdocument->setDocumentInformation($this->document->number, "84", date_create($this->document->date ?? now()->format('Y-m-d')), $client->getCurrencyCode());
}; }
break; break;
case Invoice::class: case Invoice::class:
if (empty($this->document->number)) { if (empty($this->document->number)) {
@ -87,6 +88,7 @@ class ZugferdEDokument extends AbstractService
case Credit::class: case Credit::class:
if (empty($this->document->number)) { if (empty($this->document->number)) {
$this->xdocument->setDocumentInformation("DRAFT", "389", date_create($this->document->date ?? now()->format('Y-m-d')), $client->getCurrencyCode()); $this->xdocument->setDocumentInformation("DRAFT", "389", date_create($this->document->date ?? now()->format('Y-m-d')), $client->getCurrencyCode());
$this->xdocument->setIsTestDocument();
} else { } else {
$this->xdocument->setDocumentInformation($this->document->number, "389", date_create($this->document->date ?? now()->format('Y-m-d')), $client->getCurrencyCode()); $this->xdocument->setDocumentInformation($this->document->number, "389", date_create($this->document->date ?? now()->format('Y-m-d')), $client->getCurrencyCode());
} }
@ -124,7 +126,6 @@ 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 InvoiceItem $item **/ /** @var InvoiceItem $item **/
@ -157,7 +158,6 @@ class ZugferdEDokument extends AbstractService
$line_discount -= $item->line_total * ($item->discount / 100); $line_discount -= $item->line_total * ($item->discount / 100);
} }
$this->xdocument->addDocumentPositionGrossPriceAllowanceCharge( abs($line_discount), false); $this->xdocument->addDocumentPositionGrossPriceAllowanceCharge( abs($line_discount), false);
$total_position_discount += abs($line_discount);
} }
$this->xdocument->setDocumentPositionLineSummation($item->line_total); $this->xdocument->setDocumentPositionLineSummation($item->line_total);
@ -214,15 +214,18 @@ class ZugferdEDokument extends AbstractService
} else { } else {
$document_discount = $this->document->amount * $this->document->discount / 100; $document_discount = $this->document->amount * $this->document->discount / 100;
} }
$this->xdocument->addDocumentAllowanceCharge($document_discount, false, ZugferdDutyTaxFeeCategories::STANDARD_RATE, "VAT", "19");
$this->xdocument->setDocumentSummation($this->document->amount, $this->document->balance, $invoicing_data->getSubTotal(), $invoicing_data->getTotalSurcharges(), $document_discount, $invoicing_data->getSubTotal()-$document_discount, $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(), $document_discount, $invoicing_data->getSubTotal()-$document_discount, $invoicing_data->getItemTotalTaxes(), 0.0, $this->document->amount - $this->document->balance);
foreach ($this->tax_map as $item) { foreach ($this->tax_map as $item) {
if ($document_discount > 0){ if ($document_discount > 0){
if ($item["net_amount"] >= $document_discount) { if ($item["net_amount"] >= $document_discount) {
$item["net_amount"] -= $document_discount; $item["net_amount"] -= $document_discount;
$this->xdocument->addDocumentAllowanceCharge($document_discount, false, $item["tax_type"], "VAT", $item["tax_rate"] * 100);
} else { } else {
$document_discount -= $item["net_amount"]; $document_discount -= $item["net_amount"];
$this->xdocument->addDocumentAllowanceCharge($item["net_amount"], false, $item["tax_type"], "VAT", $item["tax_rate"] * 100);
$item["net_amount"] = 0; $item["net_amount"] = 0;
} }
} }
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){