From 9783c0da18ba85fbda713ba57d98448425591f05 Mon Sep 17 00:00:00 2001
From: Andreas Luxbauer <al@verag.ag>
Date: Fri, 1 Dec 2023 15:35:41 +0100
Subject: [PATCH] Fakt

---
 SDL/Fakturierung/cFakturierung.vb                | 13 +++++++++++++
 SDL/My Project/AssemblyInfo.vb                   |  4 ++--
 SDL/SDL.vbproj                                   |  1 +
 VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj |  4 ++--
 VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb        |  1 +
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb
index f26d4acf..2a4aad83 100644
--- a/SDL/Fakturierung/cFakturierung.vb
+++ b/SDL/Fakturierung/cFakturierung.vb
@@ -553,6 +553,18 @@ Public Class cFakturierung
         'End Select
 
         If SPEDBUCH IsNot Nothing Then
+
+            'CBAM!
+            Select Case SPEDBUCH.Abfertigungsart
+                Case 1, 2, 3, 4, 23, 28, 26, 38, 39, 47
+                    'If checkAnlage_Orig(RECHNUNG) Then
+                    Select Case RECHNUNG.RechnungSprache
+                        Case "EN" : strText = strText & "IMPORTANT INFORMATION: From 01.10.2023, a reporting obligation (CBAM) was introduced for the import of certain goods from third countries into EU. The importer is responsible for this notification." & vbCrLf & "Information at www.zoll.de or www.customs-consulting.at keyword CBAM" & vbCrLf & vbCrLf
+                        Case Else : strText = strText & "WICHTIGE INFORMATION: Ab 01.10.2023 wurde eine Meldepflicht (CBAM) beim Import bestimmter Waren aus Drittländern in die EU eingeführt. Der Importeur ist für diese Meldung eigenverantwortlich." & vbCrLf & "Informationen unter www.zoll.de oder www.customs-consulting.at Stichwort CBAM" & vbCrLf & vbCrLf
+                    End Select
+                    'End If
+            End Select
+
             Select Case SPEDBUCH.Abfertigungsart
                 Case 1, 2, 3, 4, 23, 28, 39, 47
                     If checkAnlage_Orig(RECHNUNG) Then
@@ -562,6 +574,7 @@ Public Class cFakturierung
                         End Select
                     End If
             End Select
+
         End If
 
 
diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb
index 21b454f8..979f09a7 100644
--- a/SDL/My Project/AssemblyInfo.vb	
+++ b/SDL/My Project/AssemblyInfo.vb	
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.2.6.6")>
-<Assembly: AssemblyFileVersion("1.2.6.6")>
+<Assembly: AssemblyVersion("1.2.6.7")>
+<Assembly: AssemblyFileVersion("1.2.6.7")>
diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj
index 53ccccaf..90f09af2 100644
--- a/SDL/SDL.vbproj
+++ b/SDL/SDL.vbproj
@@ -3070,6 +3070,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="frmEssensbestellungenAdministration.resx">
       <DependentUpon>frmEssensbestellungenAdministration.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="kassenbuch\frmPOSTerminal.resx">
       <DependentUpon>frmPOSTerminal.vb</DependentUpon>
diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
index ffa1077a..170a9723 100644
--- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
+++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
@@ -73,9 +73,9 @@
     <AssemblyOriginatorKeyFile>ProgAllg.pfx</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ChilkatDotNet47, Version=9.5.0.96, Culture=neutral, PublicKeyToken=eb5fc1fc52ef09bd, processorArchitecture=AMD64">
+    <Reference Include="ChilkatDotNet47, Version=9.5.0.88, Culture=neutral, PublicKeyToken=eb5fc1fc52ef09bd, processorArchitecture=AMD64">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\dll\ChillKat64\ChilkatDotNet47.dll</HintPath>
+      <HintPath>..\..\..\dll\ChillKat64\neu 2023\chilkatdotnet47-9.5.0-x64\ChilkatDotNet47.dll</HintPath>
     </Reference>
     <Reference Include="ClosedXML, Version=0.76.0.0, Culture=neutral, PublicKeyToken=fd1eb21b62ae805b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb
index 87c794af..1d1dba48 100644
--- a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb
+++ b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb
@@ -541,6 +541,7 @@ Public Class cProgramFunctions
         Dim bounds As Rectangle
         Dim screenshot As System.Drawing.Bitmap
         Dim graph As Graphics
+        If form Is Nothing Then Return ""
         bounds = form.Bounds 'Screen.PrimaryScreen.Bounds
 
         screenshot = New System.Drawing.Bitmap(bounds.Width, bounds.Height, System.Drawing.Imaging.PixelFormat.Format32bppArgb)