edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

Browse Source
This commit is contained in:
d.breimaier
2023-12-04 09:32:21 +01:00
parent 2313ccf586 e3c682ccff
commit 2f160c793d
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
SDL/Fakturierung/cFakturierung.vb
View File

@@ -553,6 +553,18 @@ Public Class cFakturierung
'End Select 'End Select
If SPEDBUCH IsNot Nothing Then 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 Select Case SPEDBUCH.Abfertigungsart
Case 1, 2, 3, 4, 23, 28, 39, 47 Case 1, 2, 3, 4, 23, 28, 39, 47
If checkAnlage_Orig(RECHNUNG) Then If checkAnlage_Orig(RECHNUNG) Then
@@ -562,6 +574,7 @@ Public Class cFakturierung
End Select End Select
End If End If
End Select End Select
End If End If

1
SDL/SDL.vbproj
View File

@@ -3076,6 +3076,7 @@
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="frmEssensbestellungenAdministration.resx"> <EmbeddedResource Include="frmEssensbestellungenAdministration.resx">
<DependentUpon>frmEssensbestellungenAdministration.vb</DependentUpon> <DependentUpon>frmEssensbestellungenAdministration.vb</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="kassenbuch\frmPOSTerminal.resx"> <EmbeddedResource Include="kassenbuch\frmPOSTerminal.resx">
<DependentUpon>frmPOSTerminal.vb</DependentUpon> <DependentUpon>frmPOSTerminal.vb</DependentUpon>

4
VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
View File

@@ -73,9 +73,9 @@
<AssemblyOriginatorKeyFile>ProgAllg.pfx</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>ProgAllg.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <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> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\dll\ChillKat64\ChilkatDotNet47.dll</HintPath> <HintPath>..\..\..\dll\ChillKat64\neu 2023\chilkatdotnet47-9.5.0-x64\ChilkatDotNet47.dll</HintPath>
</Reference> </Reference>
<Reference Include="ClosedXML, Version=0.76.0.0, Culture=neutral, PublicKeyToken=fd1eb21b62ae805b, processorArchitecture=MSIL"> <Reference Include="ClosedXML, Version=0.76.0.0, Culture=neutral, PublicKeyToken=fd1eb21b62ae805b, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>

8
VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb
View File

@@ -537,16 +537,12 @@ Public Class cProgramFunctions
Public Function MakeScreenshot() Public Function MakeScreenshot()
Dim form As New Form Dim form As New Form
form = Form.ActiveForm form = form.ActiveForm
Dim bounds As Rectangle Dim bounds As Rectangle
Dim screenshot As System.Drawing.Bitmap Dim screenshot As System.Drawing.Bitmap
Dim graph As Graphics Dim graph As Graphics
If form Is Nothing Then Return "" If form Is Nothing Then Return ""
bounds = form.Bounds bounds = form.Bounds 'Screen.PrimaryScreen.Bounds
'Screen.PrimaryScreen.Bounds
screenshot = New System.Drawing.Bitmap(bounds.Width, bounds.Height, System.Drawing.Imaging.PixelFormat.Format32bppArgb) screenshot = New System.Drawing.Bitmap(bounds.Width, bounds.Height, System.Drawing.Imaging.PixelFormat.Format32bppArgb)
graph = Graphics.FromImage(screenshot) graph = Graphics.FromImage(screenshot)