Merge pull request #385 from Syntaxrabbit/master

Avoid Exception in InvoiceDescriptor22UBLWriter, satisfy validators for XRechnung with charges or allowances
stephanstapel · Oct 9, 2024 · 24fd9da · 24fd9da
2 parents eaac0fe + 54a9fb5
commit 24fd9da
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ZUGFeRD/InvoiceDescriptor22UBLWriter.cs b/ZUGFeRD/InvoiceDescriptor22UBLWriter.cs
@@ -602,7 +602,7 @@ private void _writeOptionalParty(ProfileAwareXmlTextWriter writer, PartyTypes pa
                     writer.WriteEndElement();
                 }
 
-                if (this.Descriptor.PaymentMeans.SEPAMandateReference != null)
+                if (this.Descriptor.PaymentMeans?.SEPAMandateReference != null)
                 {
                     writer.WriteStartElement("cac:PartyIdentification");
                     writer.WriteStartElement("cbc:ID");

diff --git a/ZUGFeRD/InvoiceDescriptor23CIIWriter.cs b/ZUGFeRD/InvoiceDescriptor23CIIWriter.cs
@@ -431,11 +431,11 @@ public override void Save(InvoiceDescriptor descriptor, Stream stream, ZUGFeRDFo
 
                 #region SpecifiedTradeAllowanceCharge (Basic, Comfort, Extended)
                 //Abschläge auf Ebene der Rechnungsposition (Basic, Comfort, Extended)
-                if (new Profile[] { Profile.Basic, Profile.Comfort, Profile.Extended }.Contains(descriptor.Profile))
+                if (new Profile[] { Profile.Basic, Profile.Comfort, Profile.Extended, Profile.XRechnung }.Contains(descriptor.Profile))
                 {
                     if (tradeLineItem.GetSpecifiedTradeAllowanceCharges().Count > 0)
                     {
-                        Writer.WriteStartElement("ram:SpecifiedTradeAllowanceCharge", Profile.Basic | Profile.Comfort | Profile.Extended);
+                        Writer.WriteStartElement("ram:SpecifiedTradeAllowanceCharge", Profile.Basic | Profile.Comfort | Profile.Extended | Profile.XRechnung);
 
                         foreach (TradeAllowanceCharge specifiedTradeAllowanceCharge in tradeLineItem.GetSpecifiedTradeAllowanceCharges()) // BT-147
                         {