Merge branch 'master' of https://github.com/stephanstapel/ZUGFeRD-csharp

stephanstapel · Jan 10, 2025 · 92844da · 92844da
2 parents cf2858b + d4376bd
commit 92844da
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/ZUGFeRD/InvoiceDescriptor22UBLWriter.cs b/ZUGFeRD/InvoiceDescriptor22UBLWriter.cs
@@ -595,7 +595,6 @@ private void _WriteTradeLineItem(TradeLineItem tradeLineItem)
                 Writer.WriteEndElement(); //!SellersItemIdentification
             }
 
-            _writeApplicableProductCharacteristics(Writer, tradeLineItem.ApplicableProductCharacteristics);
             _writeIncludedReferencedProducts(Writer, tradeLineItem.IncludedReferencedProducts);
             _WriteCommodityClassification(Writer, tradeLineItem.GetDesignatedProductClassifications());
 
@@ -610,6 +609,8 @@ private void _WriteTradeLineItem(TradeLineItem tradeLineItem)
 
             Writer.WriteEndElement();// !ClassifiedTaxCategory
 
+            _writeApplicableProductCharacteristics(Writer, tradeLineItem.ApplicableProductCharacteristics);
+
             Writer.WriteEndElement(); //!Item
 
             Writer.WriteStartElement("cac", "Price");  // BG-29

diff --git a/ZUGFeRD/InvoiceDescriptor23CIIWriter.cs b/ZUGFeRD/InvoiceDescriptor23CIIWriter.cs
@@ -264,7 +264,7 @@ public override void Save(InvoiceDescriptor descriptor, Stream stream, ZUGFeRDFo
 
                     #region BuyerOrderReferencedDocument (Comfort, Extended, XRechnung)
                     //Detailangaben zur zugehörigen Bestellung
-                    if (tradeLineItem.BuyerOrderReferencedDocument != null)
+                    if (tradeLineItem.BuyerOrderReferencedDocument != null && (!string.IsNullOrWhiteSpace(tradeLineItem.BuyerOrderReferencedDocument.LineID) || descriptor.Profile == Profile.Extended))
                     {
                         Writer.WriteStartElement("ram", "BuyerOrderReferencedDocument", Profile.Comfort | Profile.Extended | Profile.XRechnung1 | Profile.XRechnung);
 
@@ -430,7 +430,7 @@ public override void Save(InvoiceDescriptor descriptor, Stream stream, ZUGFeRDFo
 
                 if (tradeLineItem.DeliveryNoteReferencedDocument != null)
                 {
-                    Writer.WriteStartElement("ram", "DeliveryNoteReferencedDocument", ALL_PROFILES ^ (Profile.XRechnung1 | Profile.XRechnung)); // this violates CII-SR-175 for XRechnung 3
+                    Writer.WriteStartElement("ram", "DeliveryNoteReferencedDocument", Profile.Extended); // this violates CII-SR-175 for XRechnung 3
                     Writer.WriteOptionalElementString("ram", "IssuerAssignedID", tradeLineItem.DeliveryNoteReferencedDocument.ID);
 
                     if (tradeLineItem.DeliveryNoteReferencedDocument.IssueDateTime.HasValue)
@@ -657,7 +657,7 @@ public override void Save(InvoiceDescriptor descriptor, Stream stream, ZUGFeRDFo
                 Writer.WriteElementString("ram", "IssuerAssignedID", this.Descriptor.OrderNo);
                 if (this.Descriptor.OrderDate.HasValue)
                 {
-                    Writer.WriteStartElement("ram", "FormattedIssueDateTime", ALL_PROFILES ^ (Profile.XRechnung1 | Profile.XRechnung));
+                    Writer.WriteStartElement("ram", "FormattedIssueDateTime", Profile.Extended);
                     Writer.WriteStartElement("qdt", "DateTimeString");
                     Writer.WriteAttributeString("format", "102");
                     Writer.WriteValue(_formatDate(this.Descriptor.OrderDate.Value));
@@ -756,7 +756,7 @@ public override void Save(InvoiceDescriptor descriptor, Stream stream, ZUGFeRDFo
             #region DeliveryNoteReferencedDocument
             if (this.Descriptor.DeliveryNoteReferencedDocument != null)
             {
-                Writer.WriteStartElement("ram", "DeliveryNoteReferencedDocument");
+                Writer.WriteStartElement("ram", "DeliveryNoteReferencedDocument", Profile.Extended);
                 Writer.WriteElementString("ram", "IssuerAssignedID", this.Descriptor.DeliveryNoteReferencedDocument.ID);
 
                 if (this.Descriptor.DeliveryNoteReferencedDocument.IssueDateTime.HasValue)