Skip to content

update ZUGFeRD-csharp v18.0.0-beta2 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ipax77 merged 1 commit into from
Nov 16, 2025
Merged

update ZUGFeRD-csharp v18.0.0-beta2 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,14 @@ BeInX does not collect or transmit any personal data. See our full [privacy poli

# Change Log

<details open="open"><summary>v0.5.2</summary>
<details open="open"><summary>v0.5.3</summary>

>- Update ZUGFeRD-csharp v18.0.0-beta2
>- Using basic ZUGFeRD-csharp format (ZUGFeRDVersion.Version23, Profile.Basic, ZUGFeRDFormats.CII)

</details>

<details><summary>v0.5.2</summary>

>- Improved mobile responsiveness.
>- Refined collapsed navigation menu behavior.
Expand Down
25 changes: 12 additions & 13 deletions src/beinx.db/Services/ZugferdMapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ public static string MapToZugferd(BlazorInvoiceDto invoice)
bool isSmallBusiness = taxRate == 0; // keine Umsatzsteuer nach § 19 UStG
decimal taxAmount = isSmallBusiness ? 0 : Math.Round(payableAmount - taxExclusiveAmount, 2);


InvoiceDescriptor desc = InvoiceDescriptor.CreateInvoice(
invoice.Id,
invoice.IssueDate,
Expand All @@ -36,7 +35,7 @@ public static string MapToZugferd(BlazorInvoiceDto invoice)
id: string.Empty
);
desc.AddBuyerTaxRegistration(invoice.BuyerParty.TaxId, TaxRegistrationSchemeID.VA);
desc.SetBuyerElectronicAddress(invoice.BuyerParty.Email, ElectronicAddressSchemeIdentifiers.EM);
desc.SetBuyerElectronicAddress(invoice.BuyerParty.Email, ElectronicAddressSchemeIdentifiers.GermanyVatNumber);
desc.SetBuyerContact(
name: invoice.BuyerParty.Name,
emailAddress: invoice.BuyerParty.Email,
Expand All @@ -57,7 +56,7 @@ public static string MapToZugferd(BlazorInvoiceDto invoice)
emailAddress: invoice.SellerParty.Email,
phoneno: invoice.SellerParty.Telefone
);
desc.SetSellerElectronicAddress(invoice.SellerParty.Email, ElectronicAddressSchemeIdentifiers.EM);
desc.SetSellerElectronicAddress(invoice.SellerParty.Email, ElectronicAddressSchemeIdentifiers.GermanyVatNumber);

desc.AddApplicableTradeTax(
basisAmount: taxExclusiveAmount,
Expand All @@ -72,7 +71,6 @@ public static string MapToZugferd(BlazorInvoiceDto invoice)
description: invoice.PaymentTermsNote,
dueDate: invoice.DueDate
);

desc.AddCreditorFinancialAccount(
iban: invoice.PaymentMeans.Iban,
bic: invoice.PaymentMeans.Bic,
Expand All @@ -98,9 +96,10 @@ public static string MapToZugferd(BlazorInvoiceDto invoice)
);

using var memoryStream = new MemoryStream();
desc.Save(memoryStream, ZUGFeRDVersion.Version23, Profile.Comfort);
desc.Save(memoryStream, ZUGFeRDVersion.Version23, Profile.Basic, ZUGFeRDFormats.CII);
memoryStream.Position = 0;
return Encoding.UTF8.GetString(memoryStream.ToArray());
var xml = Encoding.UTF8.GetString(memoryStream.ToArray());
return xml;
}

private static void AddLine(InvoiceLineAnnotationDto line, BlazorInvoiceDto invoice, InvoiceDescriptor desc)
Expand Down Expand Up @@ -147,6 +146,8 @@ public static BlazorInvoiceDto MapFromZugferd(string xmlText)
using var stream = new MemoryStream(Encoding.UTF8.GetBytes(xmlText));
var desc = InvoiceDescriptor.Load(stream);

var terms = desc.GetTradePaymentTerms();

var dto = new BlazorInvoiceDto
{
Id = desc.InvoiceNo,
Expand Down Expand Up @@ -193,12 +194,12 @@ public static BlazorInvoiceDto MapFromZugferd(string xmlText)
GlobalTaxCategory = desc.TradeLineItems.FirstOrDefault()?.TaxCategoryCode.ToString() ?? string.Empty,
PaymentMeans = new PaymentAnnotationDto
{
Iban = desc.CreditorBankAccounts.FirstOrDefault()?.IBAN ?? string.Empty,
Bic = desc.CreditorBankAccounts.FirstOrDefault()?.BIC ?? string.Empty,
Name = desc.CreditorBankAccounts.FirstOrDefault()?.BankName ?? string.Empty,
Iban = desc.GetCreditorFinancialAccounts().FirstOrDefault()?.IBAN ?? string.Empty,
Bic = desc.GetCreditorFinancialAccounts().FirstOrDefault()?.BIC ?? string.Empty,
Name = desc.GetCreditorFinancialAccounts().FirstOrDefault()?.BankName ?? string.Empty,
PaymentMeansTypeCode = desc.PaymentMeans.TypeCode == null ? "30" : GetEnumAttributeValue(desc.PaymentMeans.TypeCode.Value)
},
PaymentTermsNote = desc.PaymentTerms.FirstOrDefault()?.Description ?? string.Empty,
PaymentTermsNote = desc.GetTradePaymentTerms().FirstOrDefault()?.Description ?? string.Empty,
DueDate = desc.PaymentTerms.FirstOrDefault()?.DueDate,
InvoiceLines = desc.TradeLineItems.Select((line, index) => new InvoiceLineAnnotationDto
{
Expand All @@ -207,9 +208,7 @@ public static BlazorInvoiceDto MapFromZugferd(string xmlText)
Description = line.Description,
Quantity = (double)line.BilledQuantity,
QuantityCode = line.UnitCode.ToString() ?? string.Empty,
# pragma warning disable CS0618
UnitPrice = line.NetUnitPrice == null ? 0 : (double)line.NetUnitPrice,
#pragma warning restore CS0618
UnitPrice = (double)line.NetUnitPrice,
StartDate = line.BillingPeriodStart,
EndDate = line.BillingPeriodEnd
}).ToList()
Expand Down
2 changes: 1 addition & 1 deletion src/beinx.shared/beinx.shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="pax.XRechnung.NET" Version="0.3.1" />
<PackageReference Include="ZUGFeRD-csharp" Version="17.4.0" />
<PackageReference Include="ZUGFeRD-csharp" Version="18.0.0-beta2" />
</ItemGroup>

</Project>
2 changes: 2 additions & 0 deletions src/beinx.web/InvoiceImportComponent.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
@using Microsoft.AspNetCore.Components.Forms
@using Microsoft.Extensions.Localization
@using System.Text.Json
@using Microsoft.Extensions.Logging
@using beinx.loc
@using beinx.shared
@using beinx.shared.Interfaces
Expand All @@ -13,6 +14,7 @@
@inject IToastService ToastService
@inject IStringLocalizer<InvoiceLoc> Loc
@inject IPdfJsInterop PdfJsInterop
@inject ILogger<InvoiceImportComponent> Logger

<div class="container-fluid mt-3">
<div class="alert alert-dark d-flex align-items-start" style="max-width: 800px;">
Expand Down
3 changes: 2 additions & 1 deletion src/beinx.web/InvoiceImportComponent.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using beinx.shared;
using Microsoft.AspNetCore.Components.Forms;
using Microsoft.Extensions.Logging;
using pax.XRechnung.NET;
using pax.XRechnung.NET.XmlModels;
using System.Text;
Expand Down Expand Up @@ -146,7 +147,7 @@ private void ValidateXml(string? xml)
importResult = new InvoiceImportResult { Message = Loc["Failed getting xml data"] };
return;
}

Logger.LogInformation(xml);
var doc = XDocument.Parse(xml);
var root = doc.Root;

Expand Down
2 changes: 1 addition & 1 deletion src/beinx.web/NavMenuCanvas.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
else
{
<div class="me-2 mt-2">
v0.5.2
v0.5.3
</div>
}
@if (IsHomePage)
Expand Down
10 changes: 0 additions & 10 deletions tests/beinx.Tests/Test1.cs
View file
Open in desktop

This file was deleted.

36 changes: 23 additions & 13 deletions tests/beinx.Tests/Zugferd.Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ public static BlazorInvoiceDto GetInvoiceAnnDto()
IssueDate = DateTime.UtcNow,
InvoiceTypeCode = "380",
DocumentCurrencyCode = "EUR",
Note = "Dies ist eine Testrechnung.",
SellerParty = new SellerAnnotationDto()
Note = "Test Note",
SellerParty = new()
{
Name = "Seller Name",
StreetName = "Test Street",
Expand All @@ -30,9 +30,9 @@ public static BlazorInvoiceDto GetInvoiceAnnDto()
Email = "seller@example.com",
RegistrationName = "Seller Name",
TaxId = "DE12345678",
CompanyId = "000/0000/000"
CompanyId = "000/000/0000 0",
},
BuyerParty = new BuyerAnnotationDto()
BuyerParty = new()
{
Name = "Buyer Name",
StreetName = "Test Street",
Expand All @@ -42,21 +42,23 @@ public static BlazorInvoiceDto GetInvoiceAnnDto()
Telefone = "1234/54321",
Email = "buyer@example.com",
RegistrationName = "Buyer Name",
BuyerReference = "DE87654321"
BuyerReference = "04011000-12345-34",
},
PaymentMeans = new PaymentAnnotationDto()
PaymentMeans = new()
{
Iban = "DE12 1234 1234 1234 1234 12",
Bic = "BICABCDE",
Name = "Bank Name",
PaymentMeansTypeCode = "30",
},
PaymentTermsNote = "Zahlbar innerhalb 14 Tagen nach Erhalt der Rechnung.",
PaymentTermsNote = "Zahlbar innerhalb von 14 Tagen nach Erhalt der Rechnung.",
PayableAmount = 119.0,
InvoiceLines = [
new InvoiceLineAnnotationDto()
new()
{
Id = "1",
StartDate = new(DateTime.Today.Year, DateTime.Today.Month, DateTime.Today.Day, 0, 0, 0),
EndDate = new(DateTime.Today.Year, DateTime.Today.Month, DateTime.Today.Day, 0, 0, 0),
Quantity = 1.0,
QuantityCode = "HUR",
UnitPrice = 100.0,
Expand All @@ -75,7 +77,7 @@ public void CanMapDto()
Assert.Contains("Test Job", xmlText, "Invoice line description not found in XML.");
Assert.Contains("Buyer Name", xmlText, "Buyer name not found in XML.");
Assert.Contains("Seller Name", xmlText, "Seller name not found in XML.");
Assert.Contains("Zahlbar innerhalb 14 Tagen", xmlText, "Payment terms not included.");
Assert.Contains("Zahlbar innerhalb von 14 Tagen", xmlText, "Payment terms not included.");
}

[TestMethod]
Expand All @@ -88,7 +90,7 @@ public void CanMapNoTaxDto()
Assert.Contains("Test Job", xmlText, "Invoice line description not found in XML.");
Assert.Contains("Buyer Name", xmlText, "Buyer name not found in XML.");
Assert.Contains("Seller Name", xmlText, "Seller name not found in XML.");
Assert.Contains("Zahlbar innerhalb 14 Tagen", xmlText, "Payment terms not included.");
Assert.Contains("Zahlbar innerhalb von 14 Tagen", xmlText, "Payment terms not included.");

}

Expand Down Expand Up @@ -146,7 +148,15 @@ public void CanDeepReverseMapDto()
var invoice = GetInvoiceAnnDto();
var xmlText = ZugferdMapper.MapToZugferd(invoice);
var reverseDto = ZugferdMapper.MapFromZugferd(xmlText);
reverseDto.PaymentMeans.Name = invoice.PaymentMeans.Name; // Manually set for now

// manually fix missing properties for ZUGFeRDVersion.Version23, Profile.Basic
reverseDto.SellerParty.Telefone = invoice.SellerParty.Telefone;
reverseDto.BuyerParty.Telefone = invoice.BuyerParty.Telefone;
reverseDto.SellerParty.RegistrationName = invoice.SellerParty.RegistrationName;
reverseDto.BuyerParty.RegistrationName = invoice.BuyerParty.RegistrationName;
reverseDto.PaymentMeans.Name = invoice.PaymentMeans.Name;
reverseDto.PaymentMeans.Bic = invoice.PaymentMeans.Bic;

DtoAssert.AreEqual(invoice, reverseDto);
}
}
Expand Down Expand Up @@ -189,7 +199,7 @@ private static void AssertBuyer(BuyerAnnotationDto e, BuyerAnnotationDto a)
Assert.AreEqual(e.Telefone, a.Telefone);
Assert.AreEqual(e.TaxId, a.TaxId);
Assert.AreEqual(e.BuyerReference, a.BuyerReference);
//Assert.AreEqual(e.RegistrationName, a.RegistrationName);
Assert.AreEqual(e.RegistrationName, a.RegistrationName);
}

private static void AssertSeller(SellerAnnotationDto e, SellerAnnotationDto a)
Expand All @@ -203,7 +213,7 @@ private static void AssertSeller(SellerAnnotationDto e, SellerAnnotationDto a)
Assert.AreEqual(e.Telefone, a.Telefone);
Assert.AreEqual(e.TaxId, a.TaxId);
Assert.AreEqual(e.CompanyId, a.CompanyId);
//Assert.AreEqual(e.RegistrationName, a.RegistrationName);
Assert.AreEqual(e.RegistrationName, a.RegistrationName);
}

private static void AssertPayment(PaymentAnnotationDto e, PaymentAnnotationDto a)
Expand Down