minor fixes and add SellerTaxRepresentative to Descriptor20Reader/Writer

Author: PeterSawatzki-MGGM

intf.ZUGFeRDInvoiceDescriptor1Writer.pas

@@ -72,6 +72,20 @@   TZUGFeRDInvoiceDescriptor1Writer = class(TZUGFeRDInvoiceDescriptorWriter)
     procedure _writeElementWithAttribute(_writer: TZUGFeRDProfileAwareXmlTextWriter; tagName, attributeName,attributeValue, nodeValue: String);
     function _translateInvoiceType(type_ : TZUGFeRDInvoiceType) : String;
     function _encodeInvoiceType(type_ : TZUGFeRDInvoiceType) : Integer;
+  private const
+    ALL_PROFILES = [TZUGFeRDProfile.Minimum,
+                    TZUGFeRDProfile.BasicWL,
+                    TZUGFeRDProfile.Basic,
+                    TZUGFeRDProfile.Comfort,
+                    TZUGFeRDProfile.Extended,
+                    TZUGFeRDProfile.XRechnung1,
+                    TZUGFeRDProfile.XRechnung,
+                    TZUGFeRDProfile.EReporting];
+    PROFILE_COMFORT_EXTENDED_XRECHNUNG =
+                   [TZUGFeRDProfile.Comfort,
+                    TZUGFeRDProfile.Extended,
+                    TZUGFeRDProfile.XRechnung1,
+                    TZUGFeRDProfile.XRechnung];
   public
     function Validate(_descriptor: TZUGFeRDInvoiceDescriptor; _throwExceptions: Boolean = True): Boolean; override;
     /// <summary>
@@ -866,7 +880,7 @@ procedure TZUGFeRDInvoiceDescriptor1Writer._writeOptionalParty(
   end;
 
   _Writer.WriteOptionalElementString('ram:Name', Party.Name);
-  _Writer.WriteOptionalElementString('ram:Description', Party.Description, [TZUGFeRDProfile.Comfort,TZUGFeRDProfile.Extended,TZUGFeRDProfile.XRechnung1, TZUGFeRDProfile.XRechnung]);
+  _Writer.WriteOptionalElementString('ram:Description', Party.Description, PROFILE_COMFORT_EXTENDED_XRECHNUNG);
   _writeOptionalContact(_writer, 'ram:DefinedTradeContact', Contact);
   _writer.WriteStartElement('ram:PostalTradeAddress');
   _writer.WriteOptionalElementString('ram:PostcodeCode', Party.Postcode);

intf.ZUGFeRDInvoiceDescriptor20Reader.pas

@@ -206,6 +206,16 @@ function TZUGFeRDInvoiceDescriptor20Reader.Load(xmldocument : IXMLDocument): TZU
     );
   end;
 
+  // SellerTaxRepresentativeTradeParty STEUERBEVOLLMÄCHTIGTER DES VERKÄUFERS, BG-11
+  Result.SellerTaxRepresentative := _nodeAsParty(doc.DocumentElement, '//ram:ApplicableHeaderTradeAgreement/ram:SellerTaxRepresentativeTradeParty');
+  nodes := doc.selectNodes('//ram:ApplicableHeaderTradeAgreement/ram:SellerTaxRepresentativeTradeParty/ram:SpecifiedTaxRegistration');
+  for i := 0 to nodes.length-1 do
+  begin
+    var id : String := TZUGFeRDXmlUtils.NodeAsString(nodes[i], './/ram:ID');
+    var schemeID : String := TZUGFeRDXmlUtils.NodeAsString(nodes[i], './/ram:ID/@schemeID');
+    Result.AddSellerTaxRepresentativeTaxRegistration(id, TZUGFeRDTaxRegistrationSchemeIDExtensions.FromString(schemeID));
+  end;
+
   //Get all referenced and embedded documents (BG-24)
   nodes := doc.SelectNodes('.//ram:ApplicableHeaderTradeAgreement/ram:AdditionalReferencedDocument');
   for i := 0 to nodes.length-1 do

intf.ZUGFeRDInvoiceDescriptor20Writer.pas

@@ -75,6 +75,20 @@   TZUGFeRDInvoiceDescriptor20Writer = class(TZUGFeRDInvoiceDescriptorWriter)
     procedure _writeElementWithAttribute(_writer: TZUGFeRDProfileAwareXmlTextWriter; tagName, attributeName,attributeValue, nodeValue: String);
     function _translateInvoiceType(type_ : TZUGFeRDInvoiceType) : String;
     function _encodeInvoiceType(type_ : TZUGFeRDInvoiceType) : Integer;
+  private const
+    ALL_PROFILES = [TZUGFeRDProfile.Minimum,
+                    TZUGFeRDProfile.BasicWL,
+                    TZUGFeRDProfile.Basic,
+                    TZUGFeRDProfile.Comfort,
+                    TZUGFeRDProfile.Extended,
+                    TZUGFeRDProfile.XRechnung1,
+                    TZUGFeRDProfile.XRechnung,
+                    TZUGFeRDProfile.EReporting];
+    PROFILE_COMFORT_EXTENDED_XRECHNUNG =
+                   [TZUGFeRDProfile.Comfort,
+                    TZUGFeRDProfile.Extended,
+                    TZUGFeRDProfile.XRechnung1,
+                    TZUGFeRDProfile.XRechnung];
   public
     function Validate(_descriptor: TZUGFeRDInvoiceDescriptor; _throwExceptions: Boolean = True): Boolean; override;
     /// <summary>
@@ -469,6 +483,11 @@ procedure TZUGFeRDInvoiceDescriptor20Writer.Save(
   _writeOptionalParty(Writer, 'ram:SellerTradeParty', Descriptor.Seller, Descriptor.SellerContact, Descriptor.SellerTaxRegistration);
   _writeOptionalParty(Writer, 'ram:BuyerTradeParty', Descriptor.Buyer, Descriptor.BuyerContact, Descriptor.BuyerTaxRegistration);
 
+  //#region SellerTaxRepresentativeTradeParty
+  // BT-63: the tax registration of the SellerTaxRepresentativeTradeParty
+  _writeOptionalParty(Writer, 'ram:SellerTaxRepresentativeTradeParty', Descriptor.SellerTaxRepresentative, Nil, Descriptor.SellerTaxRepresentativeTaxRegistration);
+  //#endregion
+
   //#region SellerOrderReferencedDocument (BT-14: Comfort, Extended)
   if (Descriptor.SellerOrderReferencedDocument <> nil) then
   if (Descriptor.SellerOrderReferencedDocument.ID <> '') then
@@ -1058,7 +1077,9 @@ procedure TZUGFeRDInvoiceDescriptor20Writer._writeNotes(
 
 procedure TZUGFeRDInvoiceDescriptor20Writer._writeOptionalParty(
   _writer: TZUGFeRDProfileAwareXmlTextWriter;
-  PartyTag : String; Party : TZUGFeRDParty; Contact : TZUGFeRDContact = nil;
+  PartyTag : String;
+  Party : TZUGFeRDParty;
+  Contact : TZUGFeRDContact = nil;
   TaxRegistrations : TObjectList<TZUGFeRDTaxRegistration> = nil);
 begin
   if Party = nil then
@@ -1091,7 +1112,7 @@ procedure TZUGFeRDInvoiceDescriptor20Writer._writeOptionalParty(
   end;
 
   _Writer.WriteOptionalElementString('ram:Name', Party.Name);
-  _Writer.WriteOptionalElementString('ram:Description', Party.Description, [TZUGFeRDProfile.Comfort,TZUGFeRDProfile.Extended,TZUGFeRDProfile.XRechnung1, TZUGFeRDProfile.XRechnung]);
+  _Writer.WriteOptionalElementString('ram:Description', Party.Description, PROFILE_COMFORT_EXTENDED_XRECHNUNG);
   _writeOptionalContact(_writer, 'ram:DefinedTradeContact', Contact);
   _writer.WriteStartElement('ram:PostalTradeAddress');
   _writer.WriteOptionalElementString('ram:PostcodeCode', Party.Postcode);

intf.ZUGFeRDInvoiceDescriptor23CIIReader.pas

@@ -323,6 +323,7 @@ function TZUGFeRDInvoiceDescriptor23CIIReader.Load(xmldocument : IXMLDocument):
     );
   end;
 
+  // SellerTaxRepresentativeTradeParty STEUERBEVOLLMÄCHTIGTER DES VERKÄUFERS, BG-11
   Result.SellerTaxRepresentative := _nodeAsParty(doc.DocumentElement, '//ram:ApplicableHeaderTradeAgreement/ram:SellerTaxRepresentativeTradeParty');
   nodes := doc.selectNodes('//ram:ApplicableHeaderTradeAgreement/ram:SellerTaxRepresentativeTradeParty/ram:SpecifiedTaxRegistration');
   for i := 0 to nodes.length-1 do

intf.ZUGFeRDInvoiceDescriptor23CIIWriter.pas

@@ -720,12 +720,12 @@ procedure TZUGFeRDInvoiceDescriptor23CIIWriter.Save(
   _writeOptionalParty(Writer, TZUGFeRDPartyTypes.SellerTradeParty, Descriptor.Seller, Descriptor.SellerContact, Descriptor.SellerElectronicAddress, Descriptor.SellerTaxRegistration);
   //#endregion
 
-  //region BuyerTradeParty
+  //#region BuyerTradeParty
   // BT-48: Descriptor.BuyerTaxRegistration
   _writeOptionalParty(Writer, TZUGFeRDPartyTypes.BuyerTradeParty, Descriptor.Buyer, Descriptor.BuyerContact, Descriptor.BuyerElectronicAddress, Descriptor.BuyerTaxRegistration);
   //#endregion
 
-  //region SellerTaxRepresentativeTradeParty
+  //#region SellerTaxRepresentativeTradeParty
   // BT-63: the tax registration of the SellerTaxRepresentativeTradeParty
   _writeOptionalParty(Writer, TZUGFeRDPartyTypes.SellerTaxRepresentativeTradeParty, Descriptor.SellerTaxRepresentative, Nil, Nil, Descriptor.SellerTaxRepresentativeTaxRegistration);
   //#endregion