dependencies update 07 2025

Author: Sven Harazim

.gitignore

@@ -43,7 +43,7 @@ Delphi6/Samples/Indy9
 Delphi6/Samples/*.ddp
 SaxonHE-Unmanaged
 Distribution/validator*
-Distribution/validool.org
+Distribution/valitool
 Distribution/visualization23x
 Distribution/visualization30x
 Distribution/java
@@ -57,6 +57,7 @@ xrechnung-3.0.0-testsuite-2023-07-31
 Webservice via Peppol
 
 # Delphi compiler-generated binaries (safe to delete)
+*.cbk
 *.exe
 *.dll
 *.bpl

Delphi6/intfInvoice.pas

@@ -250,9 +250,9 @@   TInvoiceAttachmentTypeHelper = class(TObject)
   //Der Code 130 "Rechnungsdatenblatt" wird benutzt, um eine vom Verkäufer angegebene Kennung für ein Objekt zu referenzieren. (BT-18)
   //https://www.xrepository.de/details/urn:xoev-de:kosit:codeliste:untdid.1001_4#version
   TInvoiceAttachmentTypeCode = (iatc_None,
-                      iatc_50,
-                      iatc_130,
-                      iatc_916);//Default
+                      iatc_50,  //BT-17
+                      iatc_130, //BT-18
+                      iatc_916);//BT-122 Default
 
   //Entweder externe Referenz oder eingebettetes Objekt
   //Ob man die Daten als Base64 integriert oder separat mitliefert,
@@ -611,9 +611,9 @@   TInvoiceAddress = class(TObject)
 
   TInvoiceAccountingParty = class(TObject)
   public
-    Name : String;
-    RegistrationName : String;
-    CompanyID : String; //BT-30
+    Name : String; //BT-28 Handelsname des Verkäufers wenn abweichend
+    RegistrationName : String; //BT-27 Vollständiger Name der Verkäufers/Käufers (Firma)
+    CompanyID : String; //BT-30 Handelsregisternummer
 
     Address : TInvoiceAddress;
 
@@ -638,7 +638,7 @@   TInvoiceDeliveryInformation = class(TObject)
     Name : String;
     LocationIdentifier : String; //optional Ein Bezeichner fuer den Ort, an den die Waren geliefert oder an dem die Dienstleistungen erbracht werden.
     Address : TInvoiceAddress;
-    ActualDeliveryDate : TDate; //Lieferdatum
+    ActualDeliveryDate : TDate; //BT-72 Lieferdatum
   public
     constructor Create;
     destructor Destroy; override;
@@ -740,8 +740,9 @@   TInvoice = class(TObject)
     SellerOrderReference : String; //BT-14 Auftragsnummer der Verkaeufers
     PurchaseOrderReference : String; //BT-13 Bestellnummer oder Vertragsnummer des Kaeufers
     ProjectReference : String; //BT-11
+    ReceiptDocumentReference : String; //BT-15
     ContractDocumentReference : String; //BT-12
-    DeliveryReceiptNumber : String; //BT-15 Lieferscheinnummer (Lieferscheindatum fehlt und wuerde nur in ZUGFeRD unterstuetzt)
+    DeliveryReceiptNumber : String; //BT-16 Lieferscheinnummer (Lieferscheindatum fehlt und wuerde nur in ZUGFeRD unterstuetzt)
     BuyerAccountingReference : String; //BT-19 Buchungsreferenz des Kaeufers für die Rechnung UBL ein Wert, CII Liste
 
     AccountingSupplierParty : TInvoiceAccountingParty;

Delphi6/intfXRechnungValidationHelperJava.pas

@@ -669,7 +669,7 @@ function TXRechnungValidationHelperJava.ValitoolValidate(
     exit;
   if ValitoolLicense = '' then
     exit;
-  if not FileExists(ValitoolPath+'valitool.cli.exe') then
+  if not FileExists(ValitoolPath+'valitool.exe') then
     exit;
   if not DirectoryExists(TempPath) then
     exit;
@@ -689,7 +689,7 @@ function TXRechnungValidationHelperJava.ValitoolValidate(
              ' --mode validate'+
              ' --pdfReport';
 
-    Result := ExecAndWait(QuoteIfContainsSpace(ValitoolPath+'valitool.cli.exe'),cmdline);
+    Result := ExecAndWait(QuoteIfContainsSpace(ValitoolPath+'valitool.exe'),cmdline);
 
     _CmdOutput := CmdOutput.Text;
 
@@ -727,7 +727,7 @@ function TXRechnungValidationHelperJava.ValitoolValidateDirectory(
     exit;
   if not DirectoryExists(_Directory) then
     exit;
-  if not FileExists(ValitoolPath+'valitool.cli.exe') then
+  if not FileExists(ValitoolPath+'valitool.exe') then
     exit;
 
   cmdLine :=
@@ -738,7 +738,7 @@ function TXRechnungValidationHelperJava.ValitoolValidateDirectory(
            ' --pdfReport'+
            ' --noXMLReport';
 
-  Result := ExecAndWait(QuoteIfContainsSpace(ValitoolPath+'valitool.cli.exe'),cmdline);
+  Result := ExecAndWait(QuoteIfContainsSpace(ValitoolPath+'valitool.exe'),cmdline);
 end;
 
 function TXRechnungValidationHelperJava.Visualize(const _InvoiceXMLData: String;

Delphi6/intfXRechnung_3_0.pas

@@ -235,8 +235,20 @@ class function TXRechnungInvoiceAdapter301.LoadDocumentUBL(_Invoice: TInvoice;
     end;
     if TXRechnungXMLHelper.SelectNode(xml,'//cac:DespatchDocumentReference/cbc:ID',node) then
       _Invoice.DeliveryReceiptNumber := node.Text;
+    if TXRechnungXMLHelper.SelectNode(xml,'//cac:ReceiptDocumentReference/cbc:ID',node) then
+      _Invoice.ReceiptDocumentReference := node.Text;
+
+    if TXRechnungXMLHelper.SelectNodes(xml,'//cac:OriginatorDocumentReference',nodes) then
+    for i := 0  to nodes.length-1 do
+    with _Invoice.Attachments.AddAttachment(iat_application_None) do
+    begin
+      ID := TXRechnungXMLHelper.SelectNodeText(nodes.item[i],'.//cbc:ID');
+      TypeCode := iatc_50;
+    end;
+
     if TXRechnungXMLHelper.SelectNode(xml,'//cac:ContractDocumentReference/cbc:ID',node) then
       _Invoice.ContractDocumentReference := node.Text;
+
     if TXRechnungXMLHelper.SelectNodes(xml,'//cac:AdditionalDocumentReference',nodes) then
     for i := 0  to nodes.length-1 do
     with _Invoice.Attachments.AddAttachment(iat_application_None) do
@@ -728,6 +740,10 @@ class function TXRechnungInvoiceAdapter301.LoadDocumentUNCEFACT(_Invoice: TInvoi
       if TXRechnungXMLHelper.SelectNode(nodeApplicableHeaderTradeAgreement,'.//ram:DespatchAdviceReferencedDocument',node2) then
       if TXRechnungXMLHelper.SelectNode(node2,'.//ram:IssuerAssignedID',node3) then
         _Invoice.DeliveryReceiptNumber := Node3.text;
+
+      if TXRechnungXMLHelper.SelectNode(nodeApplicableHeaderTradeAgreement,'.//ram:ReceivingAdviceReferencedDocument',node2) then
+      if TXRechnungXMLHelper.SelectNode(node2,'.//ram:IssuerAssignedID',node3) then
+        _Invoice.ReceiptDocumentReference := Node3.text;
     end;
     if TXRechnungXMLHelper.SelectNode(nodeSupplyChainTradeTransaction,'.//ram:ApplicableHeaderTradeSettlement',nodeApplicableHeaderTradeAgreement) then
     begin
@@ -837,7 +853,8 @@ class function TXRechnungInvoiceAdapter301.LoadDocumentUNCEFACT(_Invoice: TInvoi
           end;
           //Restliche Skontoeintraege finden
           for i := 0 to nodes.length-1 do
-          if (TXRechnungXMLHelper.FindNode(nodes[i],'.//ram:ApplicableTradePaymentDiscountTerms/ram:CalculationPercent')) then
+          if (TXRechnungXMLHelper.FindNode(nodes[i],'.//ram:ApplicableTradePaymentDiscountTerms/ram:CalculationPercent') or
+              TXRechnungXMLHelper.FindNode(nodes[i],'.//ram:ApplicableTradePaymentDiscountTerms/ram:ActualDiscountAmount')) then
           begin
             if _Invoice.PaymentTermsType in [iptt_None,iptt_Net] then
               _Invoice.PaymentTermsType := iptt_CashDiscount1
@@ -853,7 +870,13 @@ class function TXRechnungInvoiceAdapter301.LoadDocumentUNCEFACT(_Invoice: TInvoi
               _Invoice.PaymentTermCashDiscount1Percent := 0;
               _Invoice.PaymentTermCashDiscount1Base := 0;
               if TXRechnungXMLHelper.SelectNode(nodes[i],'.//ram:ApplicableTradePaymentDiscountTerms/ram:BasisPeriodMeasure',node3) then
-                _Invoice.PaymentTermCashDiscount1Days := StrToIntDef(node3.text,0)
+              begin
+                _Invoice.PaymentTermCashDiscount1Days := StrToIntDef(node3.text,0);
+                //Sonderfall beim Einlesen von ZUGFeRD, wird intern von TInvoice nicht unterstuetzt
+                //Das Basisdatum + Skontotage wird auf das Rechnungsdatum + Skontotage umgerechnet
+                if TXRechnungXMLHelper.SelectNode(nodes[i],'.//ram:ApplicableTradePaymentDiscountTerms/ram:BasisDateTime/udt:DateTimeString',node3) then
+                  _Invoice.PaymentTermCashDiscount1Days := DaysBetween(Trunc(_Invoice.InvoiceIssueDate),Trunc(TXRechnungHelper.DateFromStrUNCEFACTFormat(node3.text))+_Invoice.PaymentTermCashDiscount1Days);
+              end
               else
               if TXRechnungXMLHelper.FindNode(nodes[i],'.//ram:DueDateDateTime') then
               begin
@@ -875,7 +898,13 @@ class function TXRechnungInvoiceAdapter301.LoadDocumentUNCEFACT(_Invoice: TInvoi
               _Invoice.PaymentTermCashDiscount2Percent := 0;
               _Invoice.PaymentTermCashDiscount2Base := 0;
               if TXRechnungXMLHelper.SelectNode(nodes[i],'.//ram:ApplicableTradePaymentDiscountTerms/ram:BasisPeriodMeasure',node3) then
-                _Invoice.PaymentTermCashDiscount2Days := StrToIntDef(node3.text,0)
+              begin
+                _Invoice.PaymentTermCashDiscount2Days := StrToIntDef(node3.text,0);
+                //Sonderfall beim Einlesen von ZUGFeRD, wird intern von TInvoice nicht unterstuetzt
+                //Das Basisdatum + Skontotage wird auf das Rechnungsdatum + Skontotage umgerechnet
+                if TXRechnungXMLHelper.SelectNode(nodes[i],'.//ram:ApplicableTradePaymentDiscountTerms/ram:BasisDateTime/udt:DateTimeString',node3) then
+                  _Invoice.PaymentTermCashDiscount2Days := DaysBetween(Trunc(_Invoice.InvoiceIssueDate),Trunc(TXRechnungHelper.DateFromStrUNCEFACTFormat(node3.text))+_Invoice.PaymentTermCashDiscount2Days);
+              end
               else
               if TXRechnungXMLHelper.FindNode(nodes[i],'.//ram:DueDateDateTime') then
               begin
@@ -1156,18 +1185,29 @@ class procedure TXRechnungInvoiceAdapter301.SaveDocumentUBL(_Invoice: TInvoice;
   end;
   if _Invoice.DeliveryReceiptNumber <> '' then
     xRoot.AddChild('cac:DespatchDocumentReference').AddChild('cbc:ID').Text := _Invoice.DeliveryReceiptNumber;
+  if _Invoice.ReceiptDocumentReference <> '' then
+    xRoot.AddChild('cac:ReceiptDocumentReference').AddChild('cbc:ID').Text := _Invoice.ReceiptDocumentReference;
+
+  for i := 0 to _Invoice.Attachments.Count -1 do
+  if (_Invoice.Attachments[i].TypeCode = iatc_50) then //BT-17
+  if (_Invoice.Attachments[i].ID <> '') then
+    xRoot.AddChild('cac:OriginatorDocumentReference').AddChild('cbc:ID').Text := _Invoice.Attachments[i].ID;
+
   if _Invoice.ContractDocumentReference <> '' then
     xRoot.AddChild('cac:ContractDocumentReference').AddChild('cbc:ID').Text := _Invoice.ContractDocumentReference;
 
   for i := 0 to _Invoice.Attachments.Count -1 do
+  if (_Invoice.Attachments[i].TypeCode <> iatc_50) then //BT-17 extra
   begin
     with xRoot.AddChild('cac:AdditionalDocumentReference') do
     begin
       AddChild('cbc:ID').Text := _Invoice.Attachments[i].ID;
-      if _Invoice.Attachments[i].TypeCode = iatc_130 then
+      if (_Invoice.Attachments[i].TypeCode in [iatc_130{,iatc_916}]) then //916 gibt derzeit Fehler bei UBL, ggf. spaeter wieder aktivieren
         AddChild('cbc:DocumentTypeCode').Text := TXRechnungHelper.InvoiceAttachmentTypeCodeToStr(_Invoice.Attachments[i].TypeCode);
       if _Invoice.Attachments[i].DocumentDescription <> '' then
         AddChild('cbc:DocumentDescription').Text := _Invoice.Attachments[i].DocumentDescription;
+      if (_Invoice.Attachments[i].ContainsBinaryObject) or
+         (_Invoice.Attachments[i].ExternalReference <> '') then
       with AddChild('cac:Attachment') do
       begin
         if _Invoice.Attachments[i].ContainsBinaryObject then
@@ -1206,6 +1246,7 @@ class procedure TXRechnungInvoiceAdapter301.SaveDocumentUBL(_Invoice: TInvoice;
       Attributes['schemeID'] := 'SEPA';
       Text := _Invoice.AccountingSupplierParty.BankAssignedCreditorIdentifier;
     end;
+    if _Invoice.AccountingSupplierParty.Name <> '' then
     with AddChild('cac:PartyName') do
     begin
       AddChild('cbc:Name').Text := _Invoice.AccountingSupplierParty.Name;
@@ -1266,6 +1307,7 @@ class procedure TXRechnungInvoiceAdapter301.SaveDocumentUBL(_Invoice: TInvoice;
       Attributes['schemeID'] := '0088';
       Text := _Invoice.AccountingCustomerParty.IdentifierSellerBuyer;
     end;
+    if _Invoice.AccountingCustomerParty.Name <> '' then
     with AddChild('cac:PartyName') do
     begin
       AddChild('cbc:Name').Text := _Invoice.AccountingCustomerParty.Name;
@@ -1969,6 +2011,12 @@ class procedure TXRechnungInvoiceAdapter301.SaveDocumentUNCEFACT(
       begin
         Text := _Invoice.DeliveryReceiptNumber;
       end;
+      if (_Invoice.ReceiptDocumentReference <> '') then
+      with AddChild('ram:ReceivingAdviceReferencedDocument')
+           .AddChild('ram:IssuerAssignedID') do
+      begin
+        Text := _Invoice.ReceiptDocumentReference;
+      end;
     end;
     with AddChild('ram:ApplicableHeaderTradeSettlement') do
     begin

Distribution/README.md

@@ -33,6 +33,9 @@ Set-ExecutionPolicy Unrestricted
  - Schließe PowerShell und versuche es erneut.
 
 ## Historie
+- 16.07.2025 Update\
+  https://github.com/itplr-kosit/validator-configuration-xrechnung/releases/download/release-2025-07-10/validator-configuration-xrechnung_3.0.2_2025-07-10.zip\
+  https://github.com/itplr-kosit/xrechnung-visualization/releases/download/v2025-07-10/xrechnung-3.0.2-xrechnung-visualization-2025-07-10.zip
 
 - 03.04.2025 Update\
   https://github.com/itplr-kosit/validator-configuration-xrechnung/releases/download/release-2025-03-21/validator-configuration-xrechnung_3.0.2_2025-03-21.zip\

Distribution/installtools.ps1

@@ -35,12 +35,12 @@ If (Test-Path mustangproject){
 
 Invoke-WebRequest -Uri "https://github.com/itplr-kosit/validator/releases/download/v1.5.0/validator-1.5.0-distribution.zip" -OutFile validator.zip
 Invoke-WebRequest -Uri "https://github.com/itplr-kosit/validator-configuration-xrechnung/releases/download/release-2023-05-12/validator-configuration-xrechnung_2.3.1_2023-05-12.zip" -OutFile validator-configuration23x.zip
-Invoke-WebRequest -Uri "https://github.com/itplr-kosit/validator-configuration-xrechnung/releases/download/release-2025-03-21/validator-configuration-xrechnung_3.0.2_2025-03-21.zip" -OutFile validator-configuration30x.zip
+Invoke-WebRequest -Uri "https://github.com/itplr-kosit/validator-configuration-xrechnung/releases/download/release-2025-07-10/validator-configuration-xrechnung_3.0.2_2025-07-10.zip" -OutFile validator-configuration30x.zip
 Invoke-WebRequest -Uri "https://github.com/LandrixSoftware/validator-configuration-zugferd/releases/download/validation-configuration-zugferd-2.3.2-2025-04-03/validation-configuration-zugferd-2.3.2-2025-04-03.zip" -OutFile validator-configuration-zugferd232.zip
 Invoke-WebRequest -Uri "https://github.com/itplr-kosit/xrechnung-visualization/releases/download/v2023-05-12/xrechnung-2.3.1-xrechnung-visualization-2023-05-12.zip" -OutFile visualization23x.zip
-Invoke-WebRequest -Uri "https://github.com/itplr-kosit/xrechnung-visualization/releases/download/v2025-03-21/xrechnung-3.0.2-xrechnung-visualization-2025-03-21.zip" -OutFile visualization30x.zip
+Invoke-WebRequest -Uri "https://github.com/itplr-kosit/xrechnung-visualization/releases/download/v2025-07-10/xrechnung-3.0.2-xrechnung-visualization-2025-07-10.zip" -OutFile visualization30x.zip
 Invoke-WebRequest -Uri "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.6%2B10/OpenJDK17U-jre_x64_windows_hotspot_17.0.6_10.zip" -OutFile jre.zip
-#Invoke-WebRequest -Uri https://github.com/itplr-kosit/xrechnung-schematron/releases/download/release-2.3.0/xrechnung-3.0.2-schematron-2.3.0.zip -OutFile schematron.zip
+#Invoke-WebRequest -Uri https://github.com/itplr-kosit/xrechnung-schematron/releases/download/release-2.4.0/xrechnung-3.0.2-schematron-2.4.0.zip -OutFile schematron.zip
 Invoke-WebRequest -Uri "https://www.apache.org/dyn/closer.cgi?filename=/xmlgraphics/fop/binaries/fop-2.8-bin.zip&action=download" -OutFile fop.zip
 
 $LatestVersionContent = (Invoke-WebRequest 'https://api.github.com/repos/ZUGFeRD/mustangproject/releases/latest').Content | ConvertFrom-Json

Samples/XRechnungUnit1.dfm

@@ -221,7 +221,7 @@ object Form1: TForm1
   end
   object Button1: TButton
     Left = 8
-    Top = 711
+    Top = 708
     Width = 162
     Height = 25
     Anchors = [akLeft, akBottom]

Samples/XRechnungUnit1.pas

@@ -27,6 +27,7 @@ interface
   ,Vcl.OleCtrls, SHDocVw, Vcl.ExtCtrls, Vcl.ComCtrls
   ,Xml.xmldom,Xml.XMLDoc,Xml.XMLIntf,Xml.XMLSchema
   {$IFDEF USE_EDGE_BROWSER}
+  //https://www.nuget.org/packages/Microsoft.Web.WebView2
   ,Winapi.WebView2, Vcl.Edge
   {$ENDIF}
   ,XRechnungUnit2TestCases
@@ -148,7 +149,8 @@ procedure TForm1.FormCreate(Sender: TObject);
   MessageDlg('Fuer vollen Browsersupport bitte Edge nutzen: USE_EDGE_BROWSER', mtWarning, [mbOK], 0);
   {$ELSE}
   if not FileExists(ExtractFilePath(Application.ExeName)+'WebView2Loader.dll') then
-    MessageDlg('WebView2Loader.dll nicht gefunden, Edge-Browser nicht nutzbar!', mtError, [mbOK], 0);
+    MessageDlg('WebView2Loader.dll nicht gefunden, Edge-Browser nicht nutzbar!'+#10+
+               'https://www.nuget.org/packages/Microsoft.Web.WebView2', mtError, [mbOK], 0);
   EdgeBrowser1 := TEdgeBrowser.Create(Self);
   EdgeBrowser1.Name := 'EdgeBrowser1';
   EdgeBrowser1.SetParentComponent(TabSheet1);
@@ -320,7 +322,7 @@ procedure TForm1.Button1Click(Sender: TObject);
 
   {$IFDEF USE_Valitool}
   GetXRechnungValidationHelperJava
-      .SetValitoolPath(DistributionBasePath+'validool.org\CLI\')
+      .SetValitoolPath(DistributionBasePath+'Valitool\VALITOOL\')
       .SetValitoolLicense(Valitool_LICENSE)
       .ValitoolValidateDirectory(ValidXMLExamplesPath);
   {$ENDIF}
@@ -431,7 +433,7 @@ procedure TForm1.Button3Click(Sender: TObject);
     {$IFDEF USE_Valitool}
     xml := TFile.ReadAllText(od.FileName,TEncoding.UTF8);
     GetXRechnungValidationHelperJava
-        .SetValitoolPath(DistributionBasePath+'validool.org\CLI\')
+        .SetValitoolPath(DistributionBasePath+'Valitool\VALITOOL\')
         .SetValitoolLicense(Valitool_LICENSE)
         .ValitoolValidate(xml,cmdoutput,xmlresult,pdfresult);
 
@@ -763,7 +765,7 @@ procedure TForm1.Generate(inv: TInvoice);
     if cbValidateWithJava.Checked then
     begin
       GetXRechnungValidationHelperJava
-          .SetValitoolPath(DistributionBasePath+'validool.org\CLI\')
+          .SetValitoolPath(DistributionBasePath+'Valitool\VALITOOL\')
           .SetValitoolLicense(Valitool_LICENSE)
           .ValitoolValidate(xml,cmdoutput,xmlresult,pdfresult);
 

Samples/XRechnungUnit2TestCases.pas

@@ -1980,6 +1980,7 @@ class procedure TInvoiceTestCases.ThirdPartyPaymentBGDEX09(inv: TInvoice;
   //BG-DEX-09 THIRD PARTY PAYMENT
   //Alle Werte muessen ausgefuellt werden.
   //Summe aller PrepaidPayments muss inv.PayableAmount hinzugefuegt werden
+  //!!! gibt aktuell Validierungsprobleme
   with inv.PrepaidPayments.AddPrepaidPayment do
   begin
     ID := 'MobilesBezahlen'; //BT-DEX-001

ValidXMLExamples/Austauschteilesteuer-cii-30x.xml

@@ -175,9 +175,6 @@ Zeile 3</ram:Description>
       <ram:BuyerReference>04011000-12345-34</ram:BuyerReference>
       <ram:SellerTradeParty>
         <ram:Name>Verkaeufername</ram:Name>
-        <ram:SpecifiedLegalOrganization>
-          <ram:TradingBusinessName>Verkaeufername</ram:TradingBusinessName>
-        </ram:SpecifiedLegalOrganization>
         <ram:DefinedTradeContact>
           <ram:PersonName>Meier</ram:PersonName>
           <ram:TelephoneUniversalCommunication>
@@ -207,7 +204,6 @@ Zeile 3</ram:Description>
         <ram:Name>Kaeufername</ram:Name>
         <ram:SpecifiedLegalOrganization>
           <ram:ID>HRB 456</ram:ID>
-          <ram:TradingBusinessName>Kaeufername</ram:TradingBusinessName>
         </ram:SpecifiedLegalOrganization>
         <ram:DefinedTradeContact>
           <ram:PersonName>Mueller</ram:PersonName>