reading support for paymentterms in XREchnung format

#SKONTO#TAGE=2#PROZENT=2.00#BASISBETRAG=252.94#
#SKONTO#TAGE=4#PROZENT=4.01#
#VERZUG#TAGE=14#PROZENT=1.0#
add TaxPointDate, add DueDateTypeCode
fix DesignatedProductClassification

Author: PeterSawatzki-MGGM

intf.ZUGFeRDDesignatedProductClassification.pas

@@ -29,9 +29,9 @@ interface
   TZUGFeRDDesignatedProductClassification = class
   private
     FClassName: String;
-    FListID: String;
+    FListID: TZUGFeRDDesignatedProductClassificationClassCodes;
     FListVersionID: String;
-    FClassCode: TZUGFeRDDesignatedProductClassificationClassCodes;
+    FClassCode: string;
   public
     /// <summary>
     /// A code for the classification of an item according to type or kind or nature.
@@ -40,12 +40,12 @@   TZUGFeRDDesignatedProductClassification = class
     /// purposes, for instance like public procurement, in accordance with the Common Vocabulary for Public Procurement
     /// [CPV]), e-Commerce(UNSPSC) etc.
     /// </summary>
-    property ClassCode : TZUGFeRDDesignatedProductClassificationClassCodes read FClassCode write FClassCode;
+    property ClassCode : string read FClassCode write FClassCode;
 
     /// <summary>
     /// Product classification name
     /// </summary>
-    property ListID : String read FListID write FListID;
+    property ListID : TZUGFeRDDesignatedProductClassificationClassCodes read FListID write FListID;
 
     /// <summary>
     /// Version of product classification

intf.ZUGFeRDDesignatedProductClassificationClassCodes.pas

@@ -37,6 +37,8 @@ interface
 	/// </summary>
   TZUGFeRDDesignatedProductClassificationClassCodes = (
 
+    Unknown,
+
 		/// <summary>
 		/// Product version number
 		/// Number assigned by manufacturer or seller to identify the release of a product.
@@ -49,7 +51,17 @@ interface
 		/// </summary>
     HS,
 
-    Unknown
+		/// <summary>
+		/// ISBN (International Standard Book Number)
+    ///  A unique number identifying a book.
+		/// </summary>
+    IB,
+
+    /// <summary>
+    /// Mutually defined
+    /// Item type identification mutually agreed between interchanging parties.
+    /// </summary>
+    ZZZ
   );
 
   TZUGFeRDDesignatedProductClassificationClassCodesExtensions = class
@@ -68,6 +80,8 @@ class function TZUGFeRDDesignatedProductClassificationClassCodesExtensions.EnumT
   case c of
     TZUGFeRDDesignatedProductClassificationClassCodes.AA: Result := 'AA';
     TZUGFeRDDesignatedProductClassificationClassCodes.HS: Result := 'HS';
+    TZUGFeRDDesignatedProductClassificationClassCodes.IB: Result := 'IB';
+    TZUGFeRDDesignatedProductClassificationClassCodes.ZZZ: Result := 'ZZZ';
     else Result := '';
   end;
 end;
@@ -80,6 +94,12 @@ class function TZUGFeRDDesignatedProductClassificationClassCodesExtensions.FromS
   else
   if SameText(s,'HS') then
     Result := TZUGFeRDDesignatedProductClassificationClassCodes.HS
+  else
+  if SameText(s,'IB') then
+    Result := TZUGFeRDDesignatedProductClassificationClassCodes.IB
+  else
+  if SameText(s,'ZZZ') then
+    Result := TZUGFeRDDesignatedProductClassificationClassCodes.ZZZ
   else
     Result := TZUGFeRDDesignatedProductClassificationClassCodes.Unknown;
 end;

intf.ZUGFeRDGlobalIDSchemeIdentifiers.pas

@@ -6,6 +6,9 @@ interface
   System.SysUtils
   ;
 
+// see http://iso6523.info/icd_list.pdf
+//
+
 type
   TZUGFeRDGlobalIDSchemeIdentifiers = (
     /// <summary>
@@ -43,7 +46,11 @@ interface
     /// <summary>
     /// Numero d'entreprise / ondernemingsnummer / Unternehmensnummer
     /// </summary>
-    CompanyNumber = 208
+    CompanyNumber = 208,
+    /// <summary>
+    /// Leitweg-ID
+    /// </summary>
+    LeitwegID = 204
   );
 
   TZUGFeRDGlobalIDSchemeIdentifiersExtensions = class
@@ -72,6 +79,8 @@ class function TZUGFeRDGlobalIDSchemeIdentifiersExtensions.FromString(s: string)
     Result := TZUGFeRDGlobalIDSchemeIdentifiers.ODETTE else
   if SameText(s,'0208') then
     Result := TZUGFeRDGlobalIDSchemeIdentifiers.CompanyNumber else
+  if SameText(s,'0204') then
+    Result := TZUGFeRDGlobalIDSchemeIdentifiers.LeitwegID else
 
   Result := TZUGFeRDGlobalIDSchemeIdentifiers.Unknown;
 end;
@@ -87,6 +96,7 @@ class function TZUGFeRDGlobalIDSchemeIdentifiersExtensions.EnumToString(c: TZUGF
     TZUGFeRDGlobalIDSchemeIdentifiers.EAN: Result := '0160';
     TZUGFeRDGlobalIDSchemeIdentifiers.ODETTE: Result := '0177';
     TZUGFeRDGlobalIDSchemeIdentifiers.CompanyNumber: Result := '0208';
+    TZUGFeRDGlobalIDSchemeIdentifiers.LeitwegID: Result := '0204';
   else
     Result := '0000';
   end;

intf.ZUGFeRDInvoiceDescriptor.pas

@@ -41,6 +41,7 @@ interface
   intf.ZUGFeRDTaxTypes,
   intf.ZUGFeRDTaxCategoryCodes,
   intf.ZUGFeRDTaxExemptionReasonCodes,
+  intf.ZUGFeRDDateTypeCodes,
   intf.ZUGFeRDContact,
   intf.ZUGFeRDNote,
   intf.ZUGFeRDCurrencyCodes,
@@ -745,7 +746,7 @@   TZUGFeRDInvoiceDescriptor = class
     /// <param name="allowanceChargeBasisAmount"></param>
     /// <param name="exemptionReasonCode"></param>
     /// <param name="exemptionReason"></param>
-    procedure AddApplicableTradeTax(const calculatedAmount, basisAmount: Currency; const percent: Double; const typeCode: TZUGFeRDTaxTypes; const categoryCode: TZUGFeRDTaxCategoryCodes = TZUGFeRDTaxCategoryCodes.Unknown; const allowanceChargeBasisAmount: Currency = 0; const exemptionReasonCode: IZUGFeRDNullableParam<TZUGFeRDTaxExemptionReasonCodes> = Nil; const exemptionReason: string = ''; const lineTotalBasisAmount: Currency = 0);
+    procedure AddApplicableTradeTax(const calculatedAmount, basisAmount: Currency; const percent: Double; const typeCode: TZUGFeRDTaxTypes; const categoryCode: TZUGFeRDTaxCategoryCodes = TZUGFeRDTaxCategoryCodes.Unknown; const allowanceChargeBasisAmount: Currency = 0; const exemptionReasonCode: IZUGFeRDNullableParam<TZUGFeRDTaxExemptionReasonCodes> = Nil; const exemptionReason: string = ''; const lineTotalBasisAmount: Currency = 0;   const taxPointDate: IZUGFeRDNullableParam<TDateTime> = nil;  const dueDateTypeCode: IZUGFeRDNullableParam<TZUGFeRDDateTypeCodes> = Nil);
 
     /// <summary>
     /// Saves the descriptor object into a stream.
@@ -1526,7 +1527,9 @@ procedure TZUGFeRDInvoiceDescriptor.AddApplicableTradeTax(const calculatedAmount
   const allowanceChargeBasisAmount: Currency = 0;
   const exemptionReasonCode: IZUGFeRDNullableParam<TZUGFeRDTaxExemptionReasonCodes> = Nil;
   const exemptionReason: string = '';
-  const lineTotalBasisAmount: Currency = 0);
+  const lineTotalBasisAmount: Currency = 0;
+  const taxPointDate: IZUGFeRDNullableParam<TDateTime> = nil;
+  const dueDateTypeCode: IZUGFeRDNullableParam<TZUGFeRDDateTypeCodes> = Nil);
 var
   tax: TZUGFeRDTax;
 begin
@@ -1539,6 +1542,7 @@ procedure TZUGFeRDInvoiceDescriptor.AddApplicableTradeTax(const calculatedAmount
   tax.LineTotalBasisAmount := lineTotalBasisAmount;
   tax.ExemptionReasonCode := exemptionReasonCode;
   tax.ExemptionReason := exemptionReason;
+  tax.DueDateTypeCode := dueDateTypeCode;
 
   if (categoryCode <> TZUGFeRDTaxCategoryCodes.Unknown) then
     tax.CategoryCode := categoryCode;

intf.ZUGFeRDInvoiceDescriptor20Reader.pas

@@ -47,6 +47,7 @@ interface
   ,intf.ZUGFeRDBankAccount
   ,intf.ZUGFeRDTaxTypes,intf.ZUGFeRDTaxCategoryCodes
   ,intf.ZUGFeRDTaxExemptionReasonCodes
+  ,intf.ZUGFeRDDateTypeCodes
   ,intf.ZUGFeRDPaymentTerms
   ,intf.ZUGFeRDSellerOrderReferencedDocument
   ,intf.ZUGFeRDInvoiceReferencedDocument
@@ -327,7 +328,9 @@ function TZUGFeRDInvoiceDescriptor20Reader.Load(xmldocument : IXMLDocument): TZU
                                  TZUGFeRDXmlUtils.NodeAsDecimal(nodes[i], './/ram:AllowanceChargeBasisAmount', 0),
                                  TZUGFeRDTaxExemptionReasonCodesExtensions.FromString(TZUGFeRDXmlUtils.NodeAsString(nodes[i], './/ram:ExemptionReasonCode')),
                                  TZUGFeRDXmlUtils.NodeAsString(nodes[i], './/ram:ExemptionReason'),
-                                 TZUGFeRDXmlUtils.NodeAsDecimal(nodes[i], './/ram:LineTotalBasisAmount'));
+                                 TZUGFeRDXmlUtils.NodeAsDecimal(nodes[i], './/ram:LineTotalBasisAmount'),
+                                 TZUGFeRDXmlUtils.NodeAsDateTime(nodes[i], './/ram:TaxPointDate/udt:DateString'),
+                                 TZUGFeRDDateTypeCodesExtensions.FromString(TZUGFeRDXmlUtils.NodeAsString(nodes[i], './/ram:DueDateTypeCode')));
   end;
 
   nodes := doc.SelectNodes('//ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradeAllowanceCharge');

intf.ZUGFeRDInvoiceDescriptor20Writer.pas

@@ -42,6 +42,7 @@ interface
   ,intf.ZUGFeRDTax
   ,intf.ZUGFeRDTaxTypes
   ,intf.ZUGFeRDTaxCategoryCodes
+  ,intf.ZUGFeRDDateTypeCodes
   ,intf.ZUGFeRDTradeLineItem
   ,intf.ZUGFeRDAdditionalReferencedDocument
   ,intf.ZUGFeRDAdditionalReferencedDocumentTypeCodes
@@ -1011,6 +1012,17 @@ procedure TZUGFeRDInvoiceDescriptor20Writer._writeOptionalTaxes(
     begin
       _writer.WriteElementString('ram:ExemptionReasonCode', TZUGFeRDTaxExemptionReasonCodesExtensions.EnumToString(tax.ExemptionReasonCode));
     end;
+    if tax.TaxPointDate.HasValue then
+    begin
+      _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
+    end;
+    if tax.DueDateTypeCode.HasValue then
+      _writer.WriteElementString('ram:DueDateTypeCode', TZUGFeRDDateTypeCodesExtensions.EnumToString(tax.DueDateTypeCode));
     _writer.WriteElementString('ram:RateApplicablePercent', _formatDecimal(tax.Percent));
     _writer.WriteEndElement(); // !ApplicableTradeTax
   end;