From 348c46c74eceb0d4944048fcead56a7000107906 Mon Sep 17 00:00:00 2001 From: pitzm Date: Wed, 31 Jan 2024 13:11:40 +0100 Subject: [PATCH 1/9] Zugferd Service: Version 2.6.0.5 --- Services.ZUGFeRDService/My Project/AssemblyInfo.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Services.ZUGFeRDService/My Project/AssemblyInfo.vb b/Services.ZUGFeRDService/My Project/AssemblyInfo.vb index 0468af9d..31145cc0 100644 --- a/Services.ZUGFeRDService/My Project/AssemblyInfo.vb +++ b/Services.ZUGFeRDService/My Project/AssemblyInfo.vb @@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + From 44b3d512e12e00eb38480fcaace38cd5661c39bd Mon Sep 17 00:00:00 2001 From: pitzm Date: Wed, 31 Jan 2024 13:14:20 +0100 Subject: [PATCH 2/9] Zugferd: Version 2.7.0.0 Release dlls --- .../DDZUGFeRDService.vbproj | 24 +++++++++++-------- .../My Project/AssemblyInfo.vb | 6 ++--- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Services.ZUGFeRDService/DDZUGFeRDService.vbproj b/Services.ZUGFeRDService/DDZUGFeRDService.vbproj index e8f7013b..a4a018da 100644 --- a/Services.ZUGFeRDService/DDZUGFeRDService.vbproj +++ b/Services.ZUGFeRDService/DDZUGFeRDService.vbproj @@ -48,25 +48,29 @@ On - + False - ..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll + P:\Install .Net\0 DD - Bibliotheken\Modules\Base\DigitalData.Modules.Base.dll - + False - ..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll + P:\Install .Net\0 DD - Bibliotheken\Modules\Config\DigitalData.Modules.Config.dll - + False - ..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll + P:\Install .Net\0 DD - Bibliotheken\Modules\Database\DigitalData.Modules.Database.dll - + False - ..\..\DDModules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll + P:\Install .Net\0 DD - Bibliotheken\Modules\Interfaces\DigitalData.Modules.Interfaces.dll - + False - ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + P:\Install .Net\0 DD - Bibliotheken\Modules\Jobs\DigitalData.Modules.Jobs.dll + + + False + P:\Install .Net\0 DD - Bibliotheken\Modules\Logging\DigitalData.Modules.Logging.dll diff --git a/Services.ZUGFeRDService/My Project/AssemblyInfo.vb b/Services.ZUGFeRDService/My Project/AssemblyInfo.vb index 31145cc0..c6e33563 100644 --- a/Services.ZUGFeRDService/My Project/AssemblyInfo.vb +++ b/Services.ZUGFeRDService/My Project/AssemblyInfo.vb @@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + From 13446e05e8d6c7ec7478745053d7605757ed34bb Mon Sep 17 00:00:00 2001 From: pitzm Date: Wed, 28 Feb 2024 10:48:14 +0100 Subject: [PATCH 3/9] app.config im Zugferd-TEST-Modul angepasst --- GUIs.Test.ZUGFeRDTest/App.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GUIs.Test.ZUGFeRDTest/App.config b/GUIs.Test.ZUGFeRDTest/App.config index f5e56d48..d7f7e734 100644 --- a/GUIs.Test.ZUGFeRDTest/App.config +++ b/GUIs.Test.ZUGFeRDTest/App.config @@ -33,7 +33,7 @@ - Server=SDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM_TEST;User Id=sa;Password=dd + Server=SDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd From 0841f82ba9cbee956352ee664aa3f2c3dd9c5898 Mon Sep 17 00:00:00 2001 From: pitzm Date: Wed, 17 Apr 2024 16:00:43 +0200 Subject: [PATCH 4/9] TEST-Gui --- GUIs.Test.ZUGFeRDTest/Form1.vb | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/GUIs.Test.ZUGFeRDTest/Form1.vb b/GUIs.Test.ZUGFeRDTest/Form1.vb index 681efe1e..fe13417e 100644 --- a/GUIs.Test.ZUGFeRDTest/Form1.vb +++ b/GUIs.Test.ZUGFeRDTest/Form1.vb @@ -64,14 +64,29 @@ Public Class Form1 End Function Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click - Dim oResult = FolderBrowserDialog1.ShowDialog() + Dim oInputPath As String = "E:\TestFiles\ZUGFERDService\Input" + + Dim DI As DirectoryInfo = New DirectoryInfo(oInputPath) + + Dim oResult As DialogResult = DialogResult.OK + If DI.Exists = False Then + ' Nur öffnen, wenn Pfad ungültig ist + oResult = FolderBrowserDialog1.ShowDialog() + oInputPath = FolderBrowserDialog1.SelectedPath + End If If oResult = DialogResult.OK Then Dim args As New WorkerArgs() With { .MaxAttachmentSizeInMegaBytes = 10, .IgnoreRejectionStatus = False, .NamePortal = "TEST FROM FORM", - .WatchDirectory = FolderBrowserDialog1.SelectedPath + .WatchDirectory = oInputPath, + .SuccessDirectory = "E:\TestFiles\ZUGFERDService\Result\Success", + .ErrorDirectory = "E:\TestFiles\ZUGFERDService\Result\Error", + .OriginalEmailDirectory = "E:\TestFiles\ZUGFERDService\Result\Original_eml", + .RejectedEmailDirectory = "E:\TestFiles\ZUGFERDService\Result\Rejected_eml", + .AttachmentsSubDirectory = "Attachments", + .RejectionTemplateId = 1 } args = LoadPropertyMapFor(args) From f3c4df03e1ac485319ab512bf5e3c58b7a109233 Mon Sep 17 00:00:00 2001 From: pitzm Date: Wed, 17 Apr 2024 16:09:52 +0200 Subject: [PATCH 5/9] ZUGFERD Service: Version 2.8.0.0 --- Services.ZUGFeRDService/My Project/AssemblyInfo.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Services.ZUGFeRDService/My Project/AssemblyInfo.vb b/Services.ZUGFeRDService/My Project/AssemblyInfo.vb index c6e33563..762f8874 100644 --- a/Services.ZUGFeRDService/My Project/AssemblyInfo.vb +++ b/Services.ZUGFeRDService/My Project/AssemblyInfo.vb @@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + From 5596552e3acff0d4fcf319e6eb99ff4e14b15931 Mon Sep 17 00:00:00 2001 From: pitzm Date: Thu, 18 Apr 2024 10:18:28 +0200 Subject: [PATCH 6/9] Neuer Config Schalter RejectionTemplateId --- Services.ZUGFeRDService/Config.vb | 7 ++++++- Services.ZUGFeRDService/ThreadRunner.vb | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Services.ZUGFeRDService/Config.vb b/Services.ZUGFeRDService/Config.vb index bd0a7b4b..ae3f1000 100644 --- a/Services.ZUGFeRDService/Config.vb +++ b/Services.ZUGFeRDService/Config.vb @@ -41,9 +41,14 @@ ''' Minimum file age. If one file is newer than this, the whole group will be skipped ''' to ensure that all files of a group have been created. ''' - ''' Public Property MinFileAgeInMinutes As Integer = 5 + ''' + ''' GUID des EMail Templates das bei Ablehnungsmails verwendet wird. + ''' Siehe Tabelle DD_ECM.dbo.TBDD_EMAIL_TEMPLATE + ''' + Public Property RejectionTemplateId As Integer = 0 + Public Property AllowFacturX As Boolean = False Public Property AllowXRechnung As Boolean = False Public Property AllowZugferd10 As Boolean = True diff --git a/Services.ZUGFeRDService/ThreadRunner.vb b/Services.ZUGFeRDService/ThreadRunner.vb index 9662eef3..daaa9810 100644 --- a/Services.ZUGFeRDService/ThreadRunner.vb +++ b/Services.ZUGFeRDService/ThreadRunner.vb @@ -51,7 +51,8 @@ Public Class ThreadRunner .AllowFacturX = _config.Config.Custom.AllowFacturX, .AllowXRechnung = _config.Config.Custom.AllowXRechnung, .AllowZugferd10 = _config.Config.Custom.AllowZugferd10, - .AllowZugferd2x = _config.Config.Custom.AllowZugferd2x + .AllowZugferd2x = _config.Config.Custom.AllowZugferd2x, + .RejectionTemplateId = _config.Config.Custom.RejectionTemplateId } oArgs = LoadFolderConfig(oArgs) From 197300799d43f28df02d918b0ee00c44e435910c Mon Sep 17 00:00:00 2001 From: pitzm Date: Thu, 18 Apr 2024 10:19:31 +0200 Subject: [PATCH 7/9] ZUGFeRD Service: Version 2.8.1.0 --- Services.ZUGFeRDService/My Project/AssemblyInfo.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Services.ZUGFeRDService/My Project/AssemblyInfo.vb b/Services.ZUGFeRDService/My Project/AssemblyInfo.vb index 762f8874..d61e233f 100644 --- a/Services.ZUGFeRDService/My Project/AssemblyInfo.vb +++ b/Services.ZUGFeRDService/My Project/AssemblyInfo.vb @@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + From 7d4bd9430218d6b57928693cce71e9db4d53bcc2 Mon Sep 17 00:00:00 2001 From: pitzm Date: Mon, 22 Apr 2024 16:38:22 +0200 Subject: [PATCH 8/9] Test Config Switch added --- Services.ZUGFeRDService/ThreadRunner.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/Services.ZUGFeRDService/ThreadRunner.vb b/Services.ZUGFeRDService/ThreadRunner.vb index daaa9810..531a5448 100644 --- a/Services.ZUGFeRDService/ThreadRunner.vb +++ b/Services.ZUGFeRDService/ThreadRunner.vb @@ -63,6 +63,7 @@ Public Class ThreadRunner _logger.Debug("IgnoreRejectionStatus: [{0}]", oArgs.IgnoreRejectionStatus) _logger.Debug("MaxAttachmentSizeInMegaBytes: [{0}]", oArgs.MaxAttachmentSizeInMegaBytes) _logger.Debug("MinFileAgeInMinutes: [{0}]", oArgs.MinFileAgeInMinutes) + _logger.Debug("RejectionTemplateId: [{0}]", oArgs.RejectionTemplateId) _jobArguments = oArgs From 8dc76c0499f197e80bfebfea118e7e3f6772a877 Mon Sep 17 00:00:00 2001 From: pitzm Date: Tue, 23 Apr 2024 12:05:03 +0200 Subject: [PATCH 9/9] ZUGFeRD Service: Version 2.8.2.0 --- Services.ZUGFeRDService/My Project/AssemblyInfo.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Services.ZUGFeRDService/My Project/AssemblyInfo.vb b/Services.ZUGFeRDService/My Project/AssemblyInfo.vb index d61e233f..eecef51c 100644 --- a/Services.ZUGFeRDService/My Project/AssemblyInfo.vb +++ b/Services.ZUGFeRDService/My Project/AssemblyInfo.vb @@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + +