Merge pull request #299 from shahchandra/master

ApplicableProductCharacteristic in the UBL format

Author: stephanstapel

ZUGFeRD-Test/InvoiceProvider.cs

@@ -88,7 +88,7 @@ internal InvoiceDescriptor CreateInvoice()
       desc.ActualDeliveryDate = new DateTime(2018, 03, 05);
       desc.SetPaymentMeans(PaymentMeansTypeCodes.SEPACreditTransfer, "Zahlung per SEPA Überweisung.");
       desc.AddCreditorFinancialAccount(iban: "DE02120300000000202051", bic: "BYLADEM1001", name: "Kunden AG");
-      desc.AddDebitorFinancialAccount(iban: "DB02120300000000202051", bic: "DBBYLADEM1001", bankName: "KundenDB AG");
+      //desc.AddDebitorFinancialAccount(iban: "DB02120300000000202051", bic: "DBBYLADEM1001", bankName: "KundenDB AG");
             desc.AddApplicableTradeTax(basisAmount: 275.0m,
                                  percent: 7m,
                                  typeCode: TaxTypes.VAT,

ZUGFeRD-Test/ZUGFeRD22Tests.cs

@@ -258,7 +258,6 @@ public void TestMinimumInvoice()
         public void TestUBLInvoiceCreation()
         {
             InvoiceDescriptor desc = this.InvoiceProvider.CreateInvoice();
-
             MemoryStream ms = new MemoryStream();
 
             desc.Save(ms, ZUGFeRDVersion.Version22,Profile.XRechnung,ZUGFeRDFormats.UBL);
@@ -273,6 +272,39 @@ public void TestUBLInvoiceCreation()
             Assert.IsNull(loadedInvoice.BuyerContact);
         }
 
+        [TestMethod]
+        public void TestUBLTradelineitemProductCharacterstics()
+        {
+            InvoiceDescriptor desc = this.InvoiceProvider.CreateInvoice();
+
+            desc.TradeLineItems[0].ApplicableProductCharacteristics = new ApplicableProductCharacteristic[]
+                    {
+                        new ApplicableProductCharacteristic()
+                        {
+                            Description = "Test Description",
+                            Value = "1.5 kg"
+                        },
+                        new ApplicableProductCharacteristic()
+                        {
+                            Description = "UBL Characterstics 2",
+                            Value = "3 kg"
+                        },
+                    }.ToList();
+
+            MemoryStream ms = new MemoryStream();
+
+            desc.Save(ms, ZUGFeRDVersion.Version22, Profile.XRechnung, ZUGFeRDFormats.UBL);
+            ms.Seek(0, SeekOrigin.Begin);
+
+            InvoiceDescriptor loadedInvoice = InvoiceDescriptor.Load(ms);
+
+            Assert.IsNotNull(loadedInvoice.TradeLineItems);
+            Assert.AreEqual(loadedInvoice.TradeLineItems[0].ApplicableProductCharacteristics.Count, 2);
+            Assert.AreEqual(loadedInvoice.TradeLineItems[0].ApplicableProductCharacteristics[0].Description, "Test Description");
+            Assert.AreEqual(loadedInvoice.TradeLineItems[0].ApplicableProductCharacteristics[1].Value, "3 kg");
+        }
+
+
         [TestMethod]
         public void TestInvoiceWithAttachmentXRechnung()
         {

ZUGFeRD/InvoiceDescriptor22UBLWriter.cs

@@ -21,10 +21,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using System.Globalization;
-using System.Linq;
 using System.Xml;
-using System.Diagnostics;
 
 namespace s2industries.ZUGFeRD
 {
@@ -274,6 +271,9 @@ public override void Save(InvoiceDescriptor descriptor, Stream stream, ZUGFeRDFo
                 Writer.WriteElementString("cbc:ID", tradeLineItem.BuyerAssignedID);
                 Writer.WriteEndElement(); //!BuyersItemIdentification
 
+
+                _writeApplicableProductCharacteristics(Writer, tradeLineItem.ApplicableProductCharacteristics);
+
                 Writer.WriteEndElement(); //!Item
 
 
@@ -541,6 +541,20 @@ private void _writeOptionalParty(ProfileAwareXmlTextWriter writer, PartyTypes pa
             }
         } // !_writeOptionalParty()
 
+        private void _writeApplicableProductCharacteristics(ProfileAwareXmlTextWriter writer, List<ApplicableProductCharacteristic> productCharacteristics)
+        {
+
+            if (productCharacteristics.Count > 0)
+            {
+                foreach (var characteristic in productCharacteristics)
+                {
+                    writer.WriteStartElement("cac:AdditionalItemProperty");
+                    writer.WriteElementString("cbc:Name", characteristic.Description);
+                    writer.WriteElementString("cbc:Value", characteristic.Value);
+                    writer.WriteEndElement();
+                }
+            }
+        } // !_writeApplicableProductCharacteristics()
 
         private void _writeNotes(ProfileAwareXmlTextWriter writer, List<Note> notes)
         {

ZUGFeRD/InvoiceDescriptor22UblReader.cs

@@ -442,17 +442,18 @@ private static TradeLineItem _parseTradeLineItem(XmlNode tradeLineItem, XmlNames
                 BillingPeriodEnd = _nodeAsDateTime(tradeLineItem, ".//cac:InvoicePeriod/cbc:EndDate", nsmgr),
             };
 
-            // TODO: Find value //if (tradeLineItem.SelectNodes(".//cac:Item/ram:ApplicableProductCharacteristic", nsmgr) != null)
-            //{
-            //  foreach (XmlNode applicableProductCharacteristic in tradeLineItem.SelectNodes(".//cac:Item/ram:ApplicableProductCharacteristic", nsmgr))
-            //  {
-            //    item.ApplicableProductCharacteristics.Add(new ApplicableProductCharacteristic()
-            //    {
-            //      Description = _nodeAsString(applicableProductCharacteristic, ".//ram:Description", nsmgr),
-            //      Value = _nodeAsString(applicableProductCharacteristic, ".//ram:Value", nsmgr),
-            //    });
-            //  }
-            //}
+            // Read ApplicableProductCharacteristic 
+            if (tradeLineItem.SelectNodes(".//cac:Item/cac:AdditionalItemProperty", nsmgr) != null)
+            {
+                foreach (XmlNode applicableProductCharacteristic in tradeLineItem.SelectNodes(".//cac:Item/cac:AdditionalItemProperty", nsmgr))
+                {
+                    item.ApplicableProductCharacteristics.Add(new ApplicableProductCharacteristic()
+                    {
+                        Description = _nodeAsString(applicableProductCharacteristic, ".//cbc:Name", nsmgr),
+                        Value = _nodeAsString(applicableProductCharacteristic, ".//cbc:Value", nsmgr),
+                    });
+                }
+            }
 
             // TODO: Find value //if (tradeLineItem.SelectSingleNode(".//ram:SpecifiedLineTradeAgreement/ram:BuyerOrderReferencedDocument", nsmgr) != null)
             //{