Backport and cleanup for TaxPointDate

Author: stephanstapel

ZUGFeRD/DateTypeCodes.cs

@@ -27,12 +27,6 @@ namespace s2industries.ZUGFeRD
 {
     public enum DateTypeCodes
     {
-        /// <summary>
-        /// Unknown means, we have a problem ...
-        /// </summary>
-        [EnumStringValue("")]
-        Unknown = 0,
-
         /// <summary>
         /// Date of invoice
         /// </summary>

ZUGFeRD/InvoiceDescriptor.cs

@@ -1258,19 +1258,15 @@ public void SetTotals(decimal? lineTotalAmount = null, decimal? chargeTotalAmoun
         /// <param name="exemptionReasonCode">Tax exemption reason code</param>
         /// <param name="exemptionReason">Tax exemption reason text</param>
         /// <param name="lineTotalBasisAmount">Line total base amount for tax calculation</param>
-        /// <param name="taxPointDate">Value added tax point date</param>
-        /// <param name="dueDateTypeCode">Value added tax point date code</param>
-        public void AddApplicableTradeTax(decimal basisAmount,
+        public Tax AddApplicableTradeTax(decimal basisAmount,
             decimal percent,
             decimal taxAmount,
             TaxTypes typeCode,
             TaxCategoryCodes? categoryCode = null,
             decimal? allowanceChargeBasisAmount = null,
             TaxExemptionReasonCodes? exemptionReasonCode = null,
             string exemptionReason = null,
-            decimal? lineTotalBasisAmount = null,
-            DateTime? taxPointDate = null,
-            DateTypeCodes? dueDateTypeCode = null)
+            decimal? lineTotalBasisAmount = null)
         {
             Tax tax = new Tax()
             {
@@ -1281,9 +1277,7 @@ public void AddApplicableTradeTax(decimal basisAmount,
                 AllowanceChargeBasisAmount = allowanceChargeBasisAmount,
                 LineTotalBasisAmount = lineTotalBasisAmount,
                 ExemptionReasonCode = exemptionReasonCode,
-                ExemptionReason = exemptionReason,
-                TaxPointDate = taxPointDate,
-                DueDateTypeCode = dueDateTypeCode
+                ExemptionReason = exemptionReason
             };
 
             if ((categoryCode != null) && (categoryCode.Value != TaxCategoryCodes.Unknown))
@@ -1292,6 +1286,7 @@ public void AddApplicableTradeTax(decimal basisAmount,
             }
 
             this.Taxes.Add(tax);
+            return tax;
         } // !AddApplicableTradeTax()
 
 

ZUGFeRD/InvoiceDescriptor20Reader.cs

@@ -241,7 +241,9 @@ public override InvoiceDescriptor Load(Stream stream)
                                              XmlUtils.NodeAsDecimal(node, ".//ram:AllowanceChargeBasisAmount", nsmgr),
                                              EnumExtensions.StringToNullableEnum<TaxExemptionReasonCodes>(XmlUtils.NodeAsString(node, ".//ram:ExemptionReasonCode", nsmgr)),
                                              XmlUtils.NodeAsString(node, ".//ram:ExemptionReason", nsmgr),
-                                             lineTotalBasisAmount: XmlUtils.NodeAsDecimal(node, ".//ram:LineTotalBasisAmount", nsmgr));
+                                             lineTotalBasisAmount: XmlUtils.NodeAsDecimal(node, ".//ram:LineTotalBasisAmount", nsmgr))
+                    .SetTaxPointDate(XmlUtils.NodeAsDateTime(node, ".//ram:TaxPointDate/udt:DateString", nsmgr),
+                                     EnumExtensions.StringToNullableEnum<DateTypeCodes>(XmlUtils.NodeAsString(node, ".//ram:DueDateTypeCode", nsmgr)));
             }
 
             foreach (XmlNode node in doc.SelectNodes("//ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeAllowanceCharge", nsmgr))

ZUGFeRD/InvoiceDescriptor20Writer.cs

@@ -1028,6 +1028,20 @@ private void _writeOptionalTaxes(ProfileAwareXmlTextWriter writer)
                     writer.WriteElementString("ram", "ExemptionReasonCode", tax.ExemptionReasonCode?.EnumToString());
                 }
 
+                if (tax.TaxPointDate.HasValue)
+                {
+                    Writer.WriteStartElement("ram", "TaxPointDate");
+                    Writer.WriteStartElement("udt", "DateString");
+                    Writer.WriteAttributeString("format", "102");
+                    Writer.WriteValue(_formatDate(tax.TaxPointDate.Value));
+                    Writer.WriteEndElement(); // !udt:DateString
+                    Writer.WriteEndElement(); // !TaxPointDate
+                }
+                if (tax.TaxPointDate.HasValue)
+                {
+                    Writer.WriteElementString("ram", "DueDateTypeCode", tax.DueDateTypeCode?.EnumToString());
+                }
+
                 writer.WriteElementString("ram", "RateApplicablePercent", _formatDecimal(tax.Percent));
                 writer.WriteEndElement(); // !ApplicableTradeTax
             }

ZUGFeRD/InvoiceDescriptor23CIIReader.cs

@@ -312,9 +312,9 @@ public override InvoiceDescriptor Load(Stream stream)
                                              XmlUtils.NodeAsDecimal(node, ".//ram:AllowanceChargeBasisAmount", nsmgr),
                                              EnumExtensions.StringToNullableEnum<TaxExemptionReasonCodes>(XmlUtils.NodeAsString(node, ".//ram:ExemptionReasonCode", nsmgr)),
                                              XmlUtils.NodeAsString(node, ".//ram:ExemptionReason", nsmgr),
-                                             XmlUtils.NodeAsDecimal(node, ".//ram:LineTotalBasisAmount", nsmgr),
-                                             XmlUtils.NodeAsDateTime(node, ".//ram:TaxPointDate/udt:DateString", nsmgr),
-                                             EnumExtensions.StringToNullableEnum<DateTypeCodes>(XmlUtils.NodeAsString(node, ".//ram:DueDateTypeCode", nsmgr)));
+                                             XmlUtils.NodeAsDecimal(node, ".//ram:LineTotalBasisAmount", nsmgr))
+                    .SetTaxPointDate(XmlUtils.NodeAsDateTime(node, ".//ram:TaxPointDate/udt:DateString", nsmgr),
+                                     EnumExtensions.StringToNullableEnum<DateTypeCodes>(XmlUtils.NodeAsString(node, ".//ram:DueDateTypeCode", nsmgr)));
             }
 
             foreach (XmlNode node in doc.SelectNodes("//ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeAllowanceCharge", nsmgr))

ZUGFeRD/InvoiceDescriptor23CIIWriter.cs

@@ -1493,7 +1493,7 @@ private void _writeOptionalTaxes(ProfileAwareXmlTextWriter writer)
                 }
 
                 writer.WriteElementString("ram", "RateApplicablePercent", _formatDecimal(tax.Percent));
-                writer.WriteEndElement(); // !RateApplicablePercent
+                writer.WriteEndElement(); // !ApplicableTradeTax
             });
         } // !_writeOptionalTaxes()
 

ZUGFeRD/Tax.cs

@@ -17,6 +17,10 @@
  * under the License.
  */
 using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Text.RegularExpressions;
+using System.Xml.Linq;
 
 namespace s2industries.ZUGFeRD
 {
@@ -87,5 +91,25 @@ public class Tax
         /// </summary>
         public DateTypeCodes? DueDateTypeCode { get; set; }
 
+
+        /// <summary>
+        /// The tax point is usually the date goods were supplied or services completed (the 'basic tax point'). There are
+        /// some variations.Please refer to Article 226 (7) of the Council Directive 2006/112/EC[2] for more information.
+        /// This element is required if the Value added tax point date is different from the Invoice issue date.
+        /// Both Buyer and Seller should use the Tax Point Date when provided by the Seller.The use of BT-7 and BT-8 is
+        /// mutually exclusive.
+        ///
+        /// BT-7
+        /// 
+        /// Use: The date when the VAT becomes accountable for the Seller and for the Buyer in so far as that date can be
+        /// determined and differs from the date of issue of the invoice, according to the VAT directive.
+        /// </summary>
+        /// <param name="taxPointDate">Value added tax point date</param>
+        /// <param name="dueDateTypeCode">Value added tax point date code</param>
+        public void SetTaxPointDate(DateTime? taxPointDate = null, DateTypeCodes? dueDateTypeCode = null)
+        {
+            TaxPointDate = taxPointDate;
+            DueDateTypeCode = dueDateTypeCode;
+        } // !SetTaxPointDate()
     }
 }