From 7100503c4f3458b9066ff25f6e4a482976e0d365 Mon Sep 17 00:00:00 2001 From: pitzm Date: Tue, 18 Feb 2025 11:00:29 +0100 Subject: [PATCH 1/3] =?UTF-8?q?PEPPOL=203017=20wird=20zun=C3=A4chst=20per?= =?UTF-8?q?=20default=20deaktiviert.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Interfaces/ZUGFeRDInterface.vb | 2 +- Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb | 9 +++++---- Jobs/ZUGFeRD/WorkerArgs.vb | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Interfaces/ZUGFeRDInterface.vb b/Interfaces/ZUGFeRDInterface.vb index e7917500..43fae6c0 100644 --- a/Interfaces/ZUGFeRDInterface.vb +++ b/Interfaces/ZUGFeRDInterface.vb @@ -61,7 +61,7 @@ Public Class ZUGFeRDInterface Public Property AllowXRechnung_Filename As Boolean = True Public Property AllowZugferd_1_0_Schema As Boolean = True Public Property AllowZugferd_2_x_Schema As Boolean = True - Public Property AllowPeppol_3017_Schema As Boolean = True + Public Property AllowPeppol_3017_Schema As Boolean = False End Class Public Class ZugferdResult diff --git a/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb b/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb index 368ee941..b1f8724b 100644 --- a/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb +++ b/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb @@ -43,7 +43,7 @@ Public Class ImportZUGFeRDFiles Private SQL_xRechnung_ItemTemplate As String = "" Private ReadOnly _gdpictureLicenseKey As String - Private _xRechnungCreator As XRechnungViewDocument + Private ReadOnly _xRechnungCreator As XRechnungViewDocument Private _zugferd As ZUGFeRDInterface Private _EmailOutAccountId As Integer @@ -92,16 +92,17 @@ Public Class ImportZUGFeRDFiles _zugferd = New ZUGFeRDInterface(_logConfig, _gdpictureLicenseKey, New ZUGFeRDInterface.ZugferdOptions() With { .AllowFacturX_Filename = oArgs.AllowFacturX, - .AllowXRechnung_Filename = oArgs.AllowXRechnung + .AllowXRechnung_Filename = oArgs.AllowXRechnung, + .AllowPeppol_3017_Schema = oArgs.AllowPeppolBISBill3x }) _logger.Debug("Starting Job {0}", [GetType].Name) If oArgs.AllowXRechnung Then - Dim oSQL = "Select SQL_COMMAND from TBDD_SQL_COMMANDS WHERE TITLE = 'VWDD_ZUGFERD_VIEW_RECEIPT_TEMPLATE_ITEMS'" + ' TODO - Config-Schalter hat NIX mit XRechnung-Dateien u. Sichtbelegen zu tun, sondern nur mit Dateinamen zu tun. + Dim oSQL = "SELECT SQL_COMMAND FROM TBDD_SQL_COMMANDS WHERE TITLE = 'VWDD_ZUGFERD_VIEW_RECEIPT_TEMPLATE_ITEMS'" SQL_xRechnung_ItemTemplate = _mssql.GetScalarValue(oSQL) End If - Try 'For Each oPath As String In oArgs.WatchDirectory Dim oPath As String = oArgs.WatchDirectory diff --git a/Jobs/ZUGFeRD/WorkerArgs.vb b/Jobs/ZUGFeRD/WorkerArgs.vb index 1c7e9e24..b1bb878b 100644 --- a/Jobs/ZUGFeRD/WorkerArgs.vb +++ b/Jobs/ZUGFeRD/WorkerArgs.vb @@ -31,6 +31,6 @@ Public Class WorkerArgs Public AllowXRechnung As Boolean = True Public AllowZugferd10 As Boolean = True Public AllowZugferd2x As Boolean = True - Public AllowPeppolBISBill3x As Boolean = True + Public AllowPeppolBISBill3x As Boolean = False End Class \ No newline at end of file From 6bcb4dd609bc4a5e89e16e9d5575c709c46466a8 Mon Sep 17 00:00:00 2001 From: pitzm Date: Tue, 18 Feb 2025 11:13:09 +0100 Subject: [PATCH 2/3] Modules.Interfaces: Version 2.2.3.0 --- Interfaces/My Project/AssemblyInfo.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Interfaces/My Project/AssemblyInfo.vb b/Interfaces/My Project/AssemblyInfo.vb index a1222a46..dfb81214 100644 --- a/Interfaces/My Project/AssemblyInfo.vb +++ b/Interfaces/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 13ff63d6e040d868f74f81e1e0e4a00c20a0c552 Mon Sep 17 00:00:00 2001 From: pitzm Date: Tue, 18 Feb 2025 11:14:03 +0100 Subject: [PATCH 3/3] Modules.Jobs: Version 2.8.1.0 --- Jobs/My Project/AssemblyInfo.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jobs/My Project/AssemblyInfo.vb b/Jobs/My Project/AssemblyInfo.vb index 4b06ea4e..50024539 100644 --- a/Jobs/My Project/AssemblyInfo.vb +++ b/Jobs/My Project/AssemblyInfo.vb @@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices - + @@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices ' Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern ' übernehmen, indem Sie "*" eingeben: - - + +