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

Added compatibilty to XRechnung 2.2

Browse Source
This commit is contained in:
Lars Kusch 2023-04-05 14:57:26 +02:00
parent cdda4a6594
commit 66b0d287b8
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Jobs/Invoice/CreateXInvoice.php
View File

@ -74,7 +74,7 @@ class CreateXInvoice implements ShouldQueue
->setDocumentSupplyChainEvent(date_create($invoice->date)) ->setDocumentSupplyChainEvent(date_create($invoice->date))
->setDocumentSeller($company->getSetting('name')) ->setDocumentSeller($company->getSetting('name'))
->setDocumentSellerAddress($company->getSetting("address1"), "", "", $company->getSetting("postal_code"), $company->getSetting("city"), $company->country()->iso_3166_2) ->setDocumentSellerAddress($company->getSetting("address1"), "", "", $company->getSetting("postal_code"), $company->getSetting("city"), $company->country()->iso_3166_2)
->setDocumentSellerContact($invoice->user->first_name." ".$invoice->user->last_name) ->setDocumentSellerContact($invoice->user->first_name." ".$invoice->user->last_name, "", $invoice->user->phone, "", $invoice->user->email)
->setDocumentBuyer($client->name, $client->number) ->setDocumentBuyer($client->name, $client->number)
->setDocumentBuyerAddress($client->address1, "", "", $client->postal_code, $client->city, $client->country->iso_3166_2) ->setDocumentBuyerAddress($client->address1, "", "", $client->postal_code, $client->city, $client->country->iso_3166_2)
->setDocumentBuyerReference($client->leitweg_id) ->setDocumentBuyerReference($client->leitweg_id)
@ -86,6 +86,10 @@ class CreateXInvoice implements ShouldQueue
if (!empty($invoice->po_number)) { if (!empty($invoice->po_number)) {
$xrechnung->setDocumentBuyerOrderReferencedDocument($invoice->po_number); $xrechnung->setDocumentBuyerOrderReferencedDocument($invoice->po_number);
} }
if (empty($client->leitweg_id)){
$xrechnung->setDocumentBuyerReference(ctrans("texts.xinvoice_no_buyers_reference"));
}
$xrechnung->addDocumentPaymentMean(10, "");
if (str_contains($company->getSetting('vat_number'), "/")) { if (str_contains($company->getSetting('vat_number'), "/")) {
$xrechnung->addDocumentSellerTaxRegistration("FC", $company->getSetting('vat_number')); $xrechnung->addDocumentSellerTaxRegistration("FC", $company->getSetting('vat_number'));
@ -107,7 +111,7 @@ class CreateXInvoice implements ShouldQueue
} else { } else {
$xrechnung->setDocumentPositionQuantity($item->quantity, "H87"); $xrechnung->setDocumentPositionQuantity($item->quantity, "H87");
} }
$linenetamount = $item->line_total + $item->surcharge_1 + $item->surcharge_2 + $item->surcharge_3; $linenetamount = $item->line_total;
if ($item->discount > 0){ if ($item->discount > 0){
if ($invoice->is_amount_discount){ if ($invoice->is_amount_discount){
$linenetamount -= $item->discount; $linenetamount -= $item->discount;

2
lang/en/texts.php
View File

@ -5021,7 +5021,7 @@ $LANG = array(
'payment_type_Klarna' => 'Klarna', 'payment_type_Klarna' => 'Klarna',
'payment_type_Interac E Transfer' => 'Interac E Transfer', 'payment_type_Interac E Transfer' => 'Interac E Transfer',
'xinvoice_payable' => 'Payable within :payeddue days net until :paydate', 'xinvoice_payable' => 'Payable within :payeddue days net until :paydate',
'xinvoice_no_buyers_reference' => "No buyer's reference given",
); );