update validation-lib, XRechnung v2.1.1, reading ZUGFeRD v2.x invoices

LandrixSoftware · Apr 8, 2022 · 3dbb654 · 3dbb654
1 parent 66a2cda
commit 3dbb654
Show file tree

Hide file tree

Showing 10 changed files with 762 additions and 82 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,13 +26,13 @@
 #*.obj
 #
 
-Dokumentation
+Documentation
 Samples/Win32
 Samples/Win64
 SaxonHE-Unmanaged
 Distribution/validator
 Distribution/validator-configuration-122
-Distribution/validator-configuration-201
+Distribution/validator-configuration-211
 Distribution/visualization
 Distribution/java
 Schema

diff --git a/Distribution/README.md b/Distribution/README.md
@@ -4,7 +4,11 @@ Das Skript installtools.ps1 mit PowerShell ausf
 
 ## Historie
 
-- 02.02.2020 Neues Release XRechnung Visualization 2020-12-31 compatible with XRechnung 2.0.1
+- 05.04.2022 Update xrechnung-2.1.1-xrechnung-visualization-2021-11-15 validator-configuration-xrechnung_2.1.1_2021-11-15
+
+- 01.10.2021 Update validationtool-1.4.2 validator-configuration-xrechnung_2.1.1_2021-07-31 xrechnung-2.1.1-xrechnung-visualization-2021-07-31
+
+- 02.02.2021 Neues Release XRechnung Visualization 2020-12-31 compatible with XRechnung 2.0.1
 
 - 18.12.2020 Neues Release validator-configuration-xrechnung release-2020-12-31
 

diff --git a/Distribution/installtools.ps1 b/Distribution/installtools.ps1
@@ -9,8 +9,8 @@ If (Test-Path validator-configuration-122){
 If (Test-Path validator-configuration-200){
   Remove-Item validator-configuration-200 -Recurse
 }
-If (Test-Path validator-configuration-201){
-  Remove-Item validator-configuration-201 -Recurse
+If (Test-Path validator-configuration-211){
+  Remove-Item validator-configuration-211 -Recurse
 }
 
 If (Test-Path visualization){
@@ -21,15 +21,15 @@ If (Test-Path java){
   Remove-Item java -Recurse
 }
 
-Invoke-WebRequest -Uri https://github.com/itplr-kosit/validator/releases/download/v1.4.1/validationtool-1.4.1.zip -OutFile validator.zip
+Invoke-WebRequest -Uri https://github.com/itplr-kosit/validator/releases/download/v1.4.2/validator-1.4.2-distribution.zip -OutFile validator.zip
 Invoke-WebRequest -Uri https://github.com/itplr-kosit/validator-configuration-xrechnung/releases/download/release-2019-12-30/validator-configuration-xrechnung_1.2.2_2019-12-30.zip -OutFile validator-configuration-122.zip
-Invoke-WebRequest -Uri https://github.com/itplr-kosit/validator-configuration-xrechnung/releases/download/release-2020-12-31/validator-configuration-xrechnung_2.0.1_2020-12-31.zip -OutFile validator-configuration-201.zip
-Invoke-WebRequest -Uri https://github.com/itplr-kosit/xrechnung-visualization/releases/download/v2020-12-31/xrechnung-2.0.1-xrechnung-visualization-2020-12-31.zip -OutFile visualization.zip
+Invoke-WebRequest -Uri https://github.com/itplr-kosit/validator-configuration-xrechnung/releases/download/release-2021-11-15/validator-configuration-xrechnung_2.1.1_2021-11-15.zip -OutFile validator-configuration-211.zip
+Invoke-WebRequest -Uri https://github.com/itplr-kosit/xrechnung-visualization/releases/download/v2021-11-15/xrechnung-2.1.1-xrechnung-visualization-2021-11-15.zip -OutFile visualization.zip
 Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jre_x64_windows_hotspot_8u265b01.zip -OutFile jre.zip
 
 Expand-Archive validator.zip
 Expand-Archive validator-configuration-122.zip
-Expand-Archive validator-configuration-201.zip
+Expand-Archive validator-configuration-211.zip
 Expand-Archive visualization.zip
 Expand-Archive jre.zip
 Move-Item .\jre\jdk8u265-b01-jre .\java
@@ -41,8 +41,8 @@ If (Test-Path validator.zip){
 If (Test-Path validator-configuration-122.zip){
   Remove-Item validator-configuration-122.zip
 }
-If (Test-Path validator-configuration-201.zip){
-  Remove-Item validator-configuration-201.zip
+If (Test-Path validator-configuration-211.zip){
+  Remove-Item validator-configuration-211.zip
 }
 If (Test-Path visualization.zip){
   Remove-Item visualization.zip

diff --git a/README.md b/README.md
@@ -20,7 +20,10 @@ https://github.com/itplr-kosit/validator-configuration-xrechnung/issues/41
 
 ## Version
 
-Aktuelle XRechnung-Versionen 1.2.2 und 2.0.1
+Aktuelle XRechnung-Versionen
+
+- 1.2.2 (Gültigkeitszeitraum 01.07.2020 - 31.12.2020)
+- 2.1.1 (Gültigkeitszeitraum 01.02.2022 - 31.07.2022)
 
 ## Weitere Informationen zu XRechnung
 
@@ -36,7 +39,7 @@ https://cranesoftwrights.github.io/resources/Crane-UBL-2.2-Skeleton/Crane-UBL-In
 
 english version below
 
-Die Bibliothek "XRechnung-for-Delphi" unterliegt eine Doppellizenz. Sie können Sie kostenlos und
+Die Bibliothek "XRechnung-for-Delphi" unterliegt eine Doppellizenz. Sie können sie kostenlos und
  ohne Einschränkungen unter der [GPL v3.0](https://www.gnu.org/licenses/gpl-3.0.en.html) verwenden, oder Sie erwerben
 eine Lizenz zur kommerziellen Nutzung unter der [Landrix Software Commercial License](commercial.license.md)
 
@@ -71,4 +74,3 @@ Please send an e-mail to [email protected] to request an invoice which will contai
 
 Support and enhancement requests submitted by users that pay for 
 support will be prioritised. New developments may incur additional costs depending on time required for implementation.
-ß
diff --git a/Samples/XRechnungProject.dproj b/Samples/XRechnungProject.dproj
@@ -1,12 +1,12 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{289847D5-0AA3-4C16-9133-97921118E4C5}</ProjectGuid>
-        <ProjectVersion>19.2</ProjectVersion>
+        <ProjectVersion>19.4</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <MainSource>XRechnungProject.dpr</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <Platform Condition="'$(Platform)'==''">Win64</Platform>
+        <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Application</AppType>
     </PropertyGroup>
@@ -79,9 +79,9 @@
         <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
         <BT_BuildType>Debug</BT_BuildType>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
+        <AppDPIAwarenessMode>none</AppDPIAwarenessMode>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win64)'!=''">
         <DCC_UsePackage>DBXSqliteDriver;IndyIPCommon;RESTComponents;bindcompdbx;DBXInterBaseDriver;vcl;IndyIPServer;vclactnband;RemObjects_Synapse_D27;vclFireDAC;IndySystem;bindcompvclsmp;tethering;dsnapcon;FireDACADSDriver;FireDACMSAccDriver;fmxFireDAC;PKIECtrl27;vclimg;TeeDB;FireDAC;vcltouch;vcldb;bindcompfmx;FireDACSqliteDriver;FireDACPgDriver;RemObjects_Server_Synapse_D27;inetdb;RVPkg27;TMSVCLUIPackPkgExDX27;FMXTee;soaprtl;DbxCommonDriver;FmxTeeUI;fmx;FireDACIBDriver;fmxdae;xmlrtl;soapmidas;vcledge;fmxobj;vclwinx;Tee;rtl;htmlcomp_DX27;DbxClientDriver;CustomIPTransport;vcldsnap;dbexpress;IndyCore;hclcore_DX27;vclx;bindcomp;appanalytics;dsnap;FireDACCommon;IndyIPClient;bindcompvcl;RESTBackendComponents;TeeUI;VCLRESTComponents;soapserver;dbxcds;VclSmp;TMSVCLUIPackPkgDX27;adortl;vclie;bindengine;DBXMySQLDriver;CloudService;dsnapxml;FireDACMySQLDriver;dbrtl;IndyProtocols;inetdbxpress;BaseRT27;RemObjects_Indy_D27;FireDACCommonODBC;FireDACCommonDriver;RemObjects_Server_Indy_D27;RemObjects_WebBroker_D27;inet;fmxase;$(DCC_UsePackage)</DCC_UsePackage>
@@ -101,13 +101,12 @@
     <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
         <DCC_RemoteDebug>false</DCC_RemoteDebug>
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
-        <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
-        <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
+        <AppDPIAwarenessMode>none</AppDPIAwarenessMode>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
     </PropertyGroup>
@@ -133,17 +132,17 @@
             <Form>Form1</Form>
             <FormType>dfm</FormType>
         </DCCReference>
-        <BuildConfiguration Include="Release">
-            <Key>Cfg_2</Key>
-            <CfgParent>Base</CfgParent>
-        </BuildConfiguration>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_1</Key>
             <CfgParent>Base</CfgParent>
         </BuildConfiguration>
+        <BuildConfiguration Include="Release">
+            <Key>Cfg_2</Key>
+            <CfgParent>Base</CfgParent>
+        </BuildConfiguration>
     </ItemGroup>
     <ProjectExtensions>
         <Borland.Personality>Delphi.Personality.12</Borland.Personality>
@@ -154,8 +153,8 @@
                     <Source Name="MainSource">XRechnungProject.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k280.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp280.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Deployment Version="3">
@@ -177,6 +176,16 @@
                         <Operation>0</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidClasses">
+                    <Platform Name="Android">
+                        <RemoteDir>classes</RemoteDir>
+                        <Operation>64</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>classes</RemoteDir>
+                        <Operation>64</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="AndroidClassesDexFile">
                     <Platform Name="Android">
                         <RemoteDir>classes</RemoteDir>
@@ -478,6 +487,11 @@
                         <Operation>1</Operation>
                         <Extensions>.framework</Extensions>
                     </Platform>
+                    <Platform Name="OSXARM64">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                        <Extensions>.framework</Extensions>
+                    </Platform>
                     <Platform Name="Win32">
                         <Operation>0</Operation>
                     </Platform>
@@ -505,6 +519,11 @@
                         <Operation>1</Operation>
                         <Extensions>.dylib</Extensions>
                     </Platform>
+                    <Platform Name="OSXARM64">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
                     <Platform Name="Win32">
                         <Operation>0</Operation>
                         <Extensions>.dll;.bpl</Extensions>
@@ -533,6 +552,11 @@
                         <Operation>1</Operation>
                         <Extensions>.dylib</Extensions>
                     </Platform>
+                    <Platform Name="OSXARM64">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
                     <Platform Name="Win32">
                         <Operation>0</Operation>
                         <Extensions>.bpl</Extensions>
@@ -562,6 +586,10 @@
                         <RemoteDir>Contents\Resources\StartUp\</RemoteDir>
                         <Operation>0</Operation>
                     </Platform>
+                    <Platform Name="OSXARM64">
+                        <RemoteDir>Contents\Resources\StartUp\</RemoteDir>
+                        <Operation>0</Operation>
+                    </Platform>
                     <Platform Name="Win32">
                         <Operation>0</Operation>
                     </Platform>
@@ -827,6 +855,10 @@
                         <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="OSXARM64">
+                        <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectOSXEntitlements">
                     <Platform Name="OSX32">
@@ -837,6 +869,10 @@
                         <RemoteDir>..\</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="OSXARM64">
+                        <RemoteDir>..\</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectOSXInfoPList">
                     <Platform Name="OSX32">
@@ -847,6 +883,10 @@
                         <RemoteDir>Contents</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="OSXARM64">
+                        <RemoteDir>Contents</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectOSXResource">
                     <Platform Name="OSX32">
@@ -857,6 +897,10 @@
                         <RemoteDir>Contents\Resources</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="OSXARM64">
+                        <RemoteDir>Contents\Resources</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Required="true" Name="ProjectOutput">
                     <Platform Name="Android">
@@ -887,6 +931,10 @@
                         <RemoteDir>Contents\MacOS</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="OSXARM64">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
                     <Platform Name="Win32">
                         <Operation>0</Operation>
                     </Platform>
@@ -925,16 +973,17 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
-                <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
+                <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
+                <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
-                <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/>
-                <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/>
-                <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
-                <ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
+                <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
             </Deployment>
             <Platforms>
                 <Platform value="Win32">True</Platform>

diff --git a/Samples/XRechnungProject.res b/Samples/XRechnungProject.res
diff --git a/Samples/XRechnungUnit1.dfm b/Samples/XRechnungUnit1.dfm
@@ -1,7 +1,7 @@
 object Form1: TForm1
   Left = 0
   Top = 0
-  Caption = 'XRechnung for Delphi v1.3.2'
+  Caption = 'XRechnung for Delphi v1.3.3'
   ClientHeight = 1185
   ClientWidth = 1910
   Color = clBtnFace
@@ -10,13 +10,11 @@ object Form1: TForm1
   Font.Height = -11
   Font.Name = 'Tahoma'
   Font.Style = []
-  OldCreateOrder = False
   Position = poScreenCenter
   OnCreate = FormCreate
   DesignSize = (
     1910
     1185)
-  PixelsPerInch = 96
   TextHeight = 13
   object Label1: TLabel
     Left = 152
@@ -30,7 +28,7 @@ object Form1: TForm1
     Top = 506
     Width = 83
     Height = 13
-    Caption = 'XRechnung 2.0.1'
+    Caption = 'XRechnung 2.1.1'
   end
   object Label3: TLabel
     Left = 8
@@ -201,7 +199,7 @@ object Form1: TForm1
     Top = 1142
     Width = 129
     Height = 25
-    Caption = 'Laden'
+    Caption = 'Datei laden'
     TabOrder = 16
     OnClick = Button2Click
   end