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

Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024

Browse Source
This commit is contained in:
Andreas Luxbauer
2026-10-16 10:30:46 +02:00
parent 5aae16e9cb c88e0d60d6
commit de6939c518
6 changed files with 127 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

161
SDL/Formulare/KDFormulare/frmFormulare.vb
View File

@@ -11,6 +11,7 @@ Imports GrapeCity.DataVisualization.TypeScript
Imports itextsharp.text.pdf Imports itextsharp.text.pdf
Imports Microsoft.Office.Interop Imports Microsoft.Office.Interop
Imports VERAG_PROG_ALLGEMEIN Imports VERAG_PROG_ALLGEMEIN
Imports VERAG_PROG_ALLGEMEIN.TESTJSON
Public Class frmFormulare Public Class frmFormulare
@@ -1706,13 +1707,13 @@ Public Class FormularManagerNEU
Dim Top = -10 Dim Top = -10
Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues) Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues)
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAnsprechpartner.Text, 140, Top + 30, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAnsprechpartner.Text, 140, Top + 30, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFirma.Text, 40, Top + 50, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFirma.Text, 40, Top + 50, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse1.Text, 40, Top + 56, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse1.Text, 40, Top + 56, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse2.Text, 40, Top + 62, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse2.Text, 40, Top + 62, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtTel.Text, 40, Top + 70, 55, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtTel.Text, 40, Top + 70, 55, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEmail.Text, 120, Top + 70, 90, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEmail.Text, 120, Top + 70, 90, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtDauer.Text, 40, Top + 78, 90, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtDauer.Text, 40, Top + 78, 90, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
@@ -1740,27 +1741,27 @@ Public Class FormularManagerNEU
Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues) Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues)
' listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAnsprechpartner.Text, 140, Top + 30, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) ' listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAnsprechpartner.Text, 140, Top + 30, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFirma.Text, 17.6, Top + 58.2, 150, 6, "", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFirma.Text, 17.6, Top + 58.2, 150, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse1.Text, 17.6, Top + 61.6, 150, 6, "", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse1.Text, 17.6, Top + 61.6, 150, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse2.Text, 17.6, Top + 64.8, 150, 6, "", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse2.Text, 17.6, Top + 64.8, 150, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtVertragsbeginn.Text, 44, Top + 45, 90, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtVertragsbeginn.Text, 44, Top + 45, 90, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
Select Case usrCntl.cboPaketOption._value Select Case usrCntl.cboPaketOption._value
Case "CBAM_Basic" : listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("X", 22.5, Top + 42.3, 90, 10, "bold", 14, , iTextSharp.text.Element.ALIGN_LEFT, 2)) Case "CBAM_Basic" : listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("X", 22.5, Top + 42.3, 90, 10, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT, 2))
Case "CBAM_Standard" : listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("X", 22.5, Top + 114, 90, 10, "bold", 14, , iTextSharp.text.Element.ALIGN_LEFT, 2)) Case "CBAM_Standard" : listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("X", 22.5, Top + 114, 90, 10, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT, 2))
Case "CBAM_Premium" : listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("X", 22.5, Top + 177.5, 90, 10, "bold", 14, , iTextSharp.text.Element.ALIGN_LEFT, 2)) Case "CBAM_Premium" : listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("X", 22.5, Top + 177.5, 90, 10, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT, 2))
End Select End Select
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_Onboarding_Paket_1._value, True), 168, Top + 54, 25, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_RIGHT, 2)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_Onboarding_Paket_1._value, True), 168, Top + 54, 25, 6, "bold", 10, , itextsharp.text.Element.ALIGN_RIGHT, 2))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_MonatPausch_Paket_1._value, True), 168, Top + 62, 25, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_RIGHT, 2)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_MonatPausch_Paket_1._value, True), 168, Top + 62, 25, 6, "bold", 10, , itextsharp.text.Element.ALIGN_RIGHT, 2))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_jeWeitere_Paket_1._value, True), 168, Top + 95, 25, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_RIGHT, 2)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_jeWeitere_Paket_1._value, True), 168, Top + 95, 25, 6, "bold", 10, , itextsharp.text.Element.ALIGN_RIGHT, 2))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_Onboarding_Paket_2._value, True), 168, Top + 125.5, 25, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_RIGHT, 2)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_Onboarding_Paket_2._value, True), 168, Top + 125.5, 25, 6, "bold", 10, , itextsharp.text.Element.ALIGN_RIGHT, 2))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_MonatPausch_Paket_2._value, True), 168, Top + 133, 25, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_RIGHT, 2)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_MonatPausch_Paket_2._value, True), 168, Top + 133, 25, 6, "bold", 10, , itextsharp.text.Element.ALIGN_RIGHT, 2))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_jeWeitere_Paket_2._value, True), 168, Top + 159, 25, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_RIGHT, 2)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_jeWeitere_Paket_2._value, True), 168, Top + 159, 25, 6, "bold", 10, , itextsharp.text.Element.ALIGN_RIGHT, 2))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_Onboarding_Paket_3._value, True), 168, Top + 189, 25, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_RIGHT, 2)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_Onboarding_Paket_3._value, True), 168, Top + 189, 25, 6, "bold", 10, , itextsharp.text.Element.ALIGN_RIGHT, 2))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_MonatPausch_Paket_3._value, True), 168, Top + 197, 25, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_RIGHT, 2)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_MonatPausch_Paket_3._value, True), 168, Top + 197, 25, 6, "bold", 10, , itextsharp.text.Element.ALIGN_RIGHT, 2))
'listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_jeWeitere_Paket_3._value,True), 175, Top + 96, 18, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_RIGHT, 2)) 'listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_jeWeitere_Paket_3._value,True), 175, Top + 96, 18, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_RIGHT, 2))
@@ -1783,16 +1784,16 @@ Public Class FormularManagerNEU
Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues) Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues)
' listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAnsprechpartner.Text, 140, Top + 30, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) ' listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAnsprechpartner.Text, 140, Top + 30, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFirma.Text, 17.6, Top + 58.2, 150, 6, "", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFirma.Text, 17.6, Top + 58.2, 150, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse1.Text, 17.6, Top + 61.6, 150, 6, "", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse1.Text, 17.6, Top + 61.6, 150, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse2.Text, 17.6, Top + 64.8, 150, 6, "", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse2.Text, 17.6, Top + 64.8, 150, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtVertragsbeginn.Text, 44, Top + 45, 90, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtVertragsbeginn.Text, 44, Top + 45, 90, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatProz(usrCntl.txtCBAM_ZertAufschlag_Paket_1._value, 1), 186.5, Top + 54, 12, 6, "bold", 8, , iTextSharp.text.Element.ALIGN_LEFT, 2)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatProz(usrCntl.txtCBAM_ZertAufschlag_Paket_1._value, 1), 186.5, Top + 54, 12, 6, "bold", 8, , itextsharp.text.Element.ALIGN_LEFT, 2))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_jeZertBest_Paket_1._value, True), 168, Top + 59, 25, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_RIGHT, 2)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_jeZertBest_Paket_1._value, True), 168, Top + 59, 25, 6, "bold", 10, , itextsharp.text.Element.ALIGN_RIGHT, 2))
@@ -1854,21 +1855,21 @@ Public Class FormularManagerNEU
' listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAnsprechpartner.Text, 140, Top + 30, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) ' listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAnsprechpartner.Text, 140, Top + 30, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFirma.Text, 17.6, Top + 60.2, 150, 6, "", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFirma.Text, 17.6, Top + 60.2, 150, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse1.Text, 17.6, Top + 63.6, 150, 6, "", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse1.Text, 17.6, Top + 63.6, 150, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse2.Text, 17.6, Top + 66.8, 150, 6, "", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse2.Text, 17.6, Top + 66.8, 150, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
Select Case usrCntl.cboSprache._value Select Case usrCntl.cboSprache._value
Case "TR" Case "TR"
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtVertragsbeginn.Text, 59, Top + 47.4, 90, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtVertragsbeginn.Text, 59, Top + 47.4, 90, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
Case Else Case Else
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtVertragsbeginn.Text, 45, Top + 47.4, 90, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtVertragsbeginn.Text, 45, Top + 47.4, 90, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
End Select End Select
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_Onboarding_Paket_1._value, True), 168, Top + 49.5, 25, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_RIGHT, 2)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_Onboarding_Paket_1._value, True), 168, Top + 49.5, 25, 6, "bold", 10, , itextsharp.text.Element.ALIGN_RIGHT, 2))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_MonatPausch_Paket_1._value, True), 168, Top + 58.5, 25, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_RIGHT, 2)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_MonatPausch_Paket_1._value, True), 168, Top + 58.5, 25, 6, "bold", 10, , itextsharp.text.Element.ALIGN_RIGHT, 2))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_jeWeitere_Paket_1._value, True), 168, Top + 99, 25, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_RIGHT, 2)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_jeWeitere_Paket_1._value, True), 168, Top + 99, 25, 6, "bold", 10, , itextsharp.text.Element.ALIGN_RIGHT, 2))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatProz(usrCntl.txtCBAM_ZertAufschlag_Paket_1._value, 1), 186.5, Top + 110, 12, 6, "bold", 8, , iTextSharp.text.Element.ALIGN_LEFT, 2)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatProz(usrCntl.txtCBAM_ZertAufschlag_Paket_1._value, 1), 186.5, Top + 110, 12, 6, "bold", 8, , itextsharp.text.Element.ALIGN_LEFT, 2))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_jeZertBest_Paket_1._value, True), 168, Top + 114.5, 25, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_RIGHT, 2)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(formatAmountEUR(usrCntl.txtCBAM_jeZertBest_Paket_1._value, True), 168, Top + 114.5, 25, 6, "bold", 10, , itextsharp.text.Element.ALIGN_RIGHT, 2))
'Dim ohneOnboarding As String = IIf(usrCntl.cbxOnboardingVerrechnen.Checked, "", "ohne_Onboarding_") 'Dim ohneOnboarding As String = IIf(usrCntl.cbxOnboardingVerrechnen.Checked, "", "ohne_Onboarding_")
@@ -1891,15 +1892,15 @@ Public Class FormularManagerNEU
Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues) Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues)
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAnsprechpartner.Text, 128, 36, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAnsprechpartner.Text, 128, 36, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFirma.Text, 40, 50, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFirma.Text, 40, 50, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse1.Text, 40, 56, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse1.Text, 40, 56, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse2.Text, 40, 62, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse2.Text, 40, 62, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtUid.Text, 40, 68, 55, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtUid.Text, 40, 68, 55, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEori.Text, 119, 68, 70, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEori.Text, 119, 68, 70, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtTel.Text, 40, 74, 55, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtTel.Text, 40, 74, 55, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFax.Text, 119, 74, 70, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFax.Text, 119, 74, 70, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEmail.Text, 40, 81, 90, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEmail.Text, 40, 81, 90, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
Dim top = 0 Dim top = 0
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
@@ -1931,17 +1932,17 @@ Public Class FormularManagerNEU
Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues) Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues)
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAnsprechpartner.Text, 128, 36, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAnsprechpartner.Text, 128, 36, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFirma.Text, 40, 50, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFirma.Text, 40, 50, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse1.Text, 40, 56, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse1.Text, 40, 56, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse2.Text, 40, 62, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse2.Text, 40, 62, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtUid.Text, 40, 68, 55, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtUid.Text, 40, 68, 55, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEori.Text, 119, 68, 70, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEori.Text, 119, 68, 70, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtTel.Text, 40, 74, 55, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtTel.Text, 40, 74, 55, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFax.Text, 119, 74, 70, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFax.Text, 119, 74, 70, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEmail.Text, 40, 80, 90, 6, "bold", 8, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEmail.Text, 40, 80, 90, 6, "bold", 8, , itextsharp.text.Element.ALIGN_LEFT))
'listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtVmDat.Text, 25, 260, 90, 6, "bold", 8, , iTextSharp.text.Element.ALIGN_LEFT)) 'listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtVmDat.Text, 25, 260, 90, 6, "bold", 8, , iTextSharp.text.Element.ALIGN_LEFT))
@@ -1950,7 +1951,7 @@ Public Class FormularManagerNEU
If usrCntl.txtOrt.Text <> "" Then If usrCntl.txtOrt.Text <> "" Then
If (IsDate(usrCntl.datDatum.Text)) AndAlso usrCntl.cbxDatum.Checked Then If (IsDate(usrCntl.datDatum.Text)) AndAlso usrCntl.cbxDatum.Checked Then
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtOrt.Text & ", " & usrCntl.datDatum.Text, 20, 269, 90, 6, "bold", 8, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtOrt.Text & ", " & usrCntl.datDatum.Text, 20, 269, 90, 6, "bold", 8, , itextsharp.text.Element.ALIGN_LEFT))
End If End If
Else Else
@@ -1960,7 +1961,7 @@ Public Class FormularManagerNEU
dat = CDate(usrCntl.datDatum.Value) dat = CDate(usrCntl.datDatum.Value)
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.datDatum.Text, 50, 269, 90, 6, "bold", 8, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.datDatum.Text, 50, 269, 90, 6, "bold", 8, , itextsharp.text.Element.ALIGN_LEFT))
End If End If
End If End If
@@ -2599,22 +2600,22 @@ Public Class FormularManagerNEU
Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues) Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues)
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAnsprechpartner.Text, 128, 34, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAnsprechpartner.Text, 128, 34, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFirma.Text, 40, 49, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFirma.Text, 40, 49, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse1.Text, 40, 55, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse1.Text, 40, 55, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse2.Text, 40, 61, 150, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse2.Text, 40, 61, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtRechtsform.Text, 40, 67, 55, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtRechtsform.Text, 40, 67, 55, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtInhaber.Text, 129, 67, 55, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtInhaber.Text, 129, 67, 55, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtUid.Text, 40, 75, 55, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtUid.Text, 40, 75, 55, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEori.Text, 129, 75, 70, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEori.Text, 129, 75, 70, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtTel.Text, 40, 82, 55, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtTel.Text, 40, 82, 55, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFax.Text, 129, 82, 70, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFax.Text, 129, 82, 70, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEmail.Text, 40, 88, 65, 6, "bold", 8, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEmail.Text, 40, 88, 65, 6, "bold", 8, , itextsharp.text.Element.ALIGN_LEFT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFaStNr.Text, 132, 88, 55, 6, "bold", 10, , iTextSharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFaStNr.Text, 132, 88, 55, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
If usrCntl.cbxEinmaligeVollmacht.Checked Then If usrCntl.cbxEinmaligeVollmacht.Checked Then
listTowrite = addEinmaligeVM(listTowrite, 0, 220, usrCntl.cboSprache._value, usrCntl.txtEinmalig_RgNr.Text, usrCntl.txtEinmalig_RgDat.Text) listTowrite = addEinmaligeVM(listTowrite, 0, 220, usrCntl.cboSprache._value, usrCntl.txtEinmalig_RgNr.Text, usrCntl.txtEinmalig_RgDat.Text)
@@ -4857,12 +4858,28 @@ Public Class FormularManagerNEU
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtMwstProzent.Text, 140, top + 53, 30, 6, "normal", 10, , itextsharp.text.Element.ALIGN_RIGHT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtMwstProzent.Text, 140, top + 53, 30, 6, "normal", 10, , itextsharp.text.Element.ALIGN_RIGHT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(chWrg(usrCntl.txtMWST.Text, w), 170, top + 53, 30, 6, "normal", 10, , itextsharp.text.Element.ALIGN_RIGHT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(chWrg(usrCntl.txtMWST.Text, w), 170, top + 53, 30, 6, "normal", 10, , itextsharp.text.Element.ALIGN_RIGHT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(chWrg(usrCntl.lblWaehrung.Text, w), 140, top + 61, 30, 6, "bold", 10, , itextsharp.text.Element.ALIGN_RIGHT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(chWrg(usrCntl.lblWaehrung.Text, w), 140, top + 61, 30, 6, "bold", 10, , itextsharp.text.Element.ALIGN_RIGHT))
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(chWrg(usrCntl.txtGesamtsumme.Text, w), 170, top + 61, 30, 6, "bold", 10, , itextsharp.text.Element.ALIGN_RIGHT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(chWrg(usrCntl.txtGesamtsumme.Text, w), 170, top + 61, 30, 6, "bold", 10, , itextsharp.text.Element.ALIGN_RIGHT))
'If usrCntl.cboFirma._value <> "" AndAlso IsNumeric(usrCntl.cboFirma._value) Then
' Dim FIRMA As New cFirmen(CInt(usrCntl.cboFirma._value))
' listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(chWrg(FIRMA.Firma_Bankverbindung1, w), 140, top + 61, 30, 6, "bold", 10, , itextsharp.text.Element.ALIGN_RIGHT))
' listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(chWrg(FIRMA.Firma_IBAN1, w), 170, top + 61, 30, 6, "bold", 10, , itextsharp.text.Element.ALIGN_RIGHT))
' listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(chWrg(FIRMA.Firma_BIC1, w), 170, top + 61, 30, 6, "bold", 10, , itextsharp.text.Element.ALIGN_RIGHT))
'End If
Select Case usrCntl.cboSprache._value Select Case usrCntl.cboSprache._value
Case "EN" Case "EN"
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("IMPORTANT NOTICE:", 12, 250, 70, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT, 2)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("IMPORTANT NOTICE:", 12, 250, 70, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT, 2))

28
SDL/USTV/usrCntlUSTV.vb
View File

@@ -766,7 +766,17 @@ Public Class usrCntlUSTV
'INFO -> Schnittstelle beinhaltet ald DA-ID die RK-ID (Feld wird missbraucht!!!) 'INFO -> Schnittstelle beinhaltet ald DA-ID die RK-ID (Feld wird missbraucht!!!)
Dim sqlStr = "select tblUStVAntrag.UStVAn_ID,[Länderverzeichnis für die Außenhandelsstatistik].LandKz,cast(UStVPo_reDat as Date) as Rechnungsdatum, UStVPo_interneNr, UStVPo_ID, UStVPo_SchnittstellenNr, UStVPo_daId, UStVPo_daId_loeschbar, UStVPo_Zeitstempel as letzte_Äendunger, UStVPo_Sachbearbeiter Dim sqlStr = "select tblUStVAntrag.UStVAn_ID,[Länderverzeichnis für die Außenhandelsstatistik].LandKz,cast(UStVPo_reDat as Date) as Rechnungsdatum, UStVPo_interneNr, UStVPo_ID, UStVPo_SchnittstellenNr,
CASE
WHEN UStVPo_SchnittstellenNr = 2 or UStVPo_SchnittstellenNr = 8 or UStVPo_SchnittstellenNr = 12 THEN 'IDS'
WHEN UStVPo_SchnittstellenNr = 3 THEN 'Telepass'
WHEN UStVPo_SchnittstellenNr = 4 or UStVPo_SchnittstellenNr = 9 THEN 'MSE'
WHEN UStVPo_SchnittstellenNr = 5 or UStVPo_SchnittstellenNr = 10 THEN 'UTA'
WHEN UStVPo_SchnittstellenNr = 6 or UStVPo_SchnittstellenNr = 11 THEN 'PLOSE'
WHEN UStVPo_SchnittstellenNr = 7 THEN 'RMC'
ELSE 'MANUELL'
END AS Schnittstelle_Lieferant
, UStVPo_daId, UStVPo_daId_loeschbar, UStVPo_Zeitstempel as letzte_Äendunger, UStVPo_Sachbearbeiter
from tblUStVAntrag from tblUStVAntrag
inner join tblUStVPositionen on tblUStVAntrag.UStVAn_ID = tblUStVPositionen.UStVAn_ID inner join tblUStVPositionen on tblUStVAntrag.UStVAn_ID = tblUStVPositionen.UStVAn_ID
inner join [Länderverzeichnis für die Außenhandelsstatistik] on Landnr = tblUStVAntrag.UStVAn_LandNr inner join [Länderverzeichnis für die Außenhandelsstatistik] on Landnr = tblUStVAntrag.UStVAn_LandNr
@@ -789,16 +799,26 @@ Public Class usrCntlUSTV
Private Function checkAntragspositionen(RechnungsjahrVon As Integer, RechnungsjahrBis As Integer) As Boolean Private Function checkAntragspositionen(RechnungsjahrVon As Integer, RechnungsjahrBis As Integer) As Boolean
Dim sqlWhere As String = ""
If vbYes = MsgBox("Möchten Sie bei der Prüfung Positionen von MSE ausnehmen?", vbYesNo) Then
sqlWhere = " and tblUStVPositionen.UStVPo_SchnittstellenNr not in (9,4) "
End If
Dim sqlStr = "SELECT [UStVAn_ID] as AntragsID,cast([UStVPo_ReDat] as date) as Rechnungsdatum,[UStVPo_ReNr] as RechnungsNr Dim sqlStr = "SELECT [UStVAn_ID] as AntragsID,cast([UStVPo_ReDat] as date) as Rechnungsdatum,[UStVPo_ReNr] as RechnungsNr
FROM [VERAG].[dbo].[tblUStVPositionen] where Year([UStVPo_ReDat]) >= " & RechnungsjahrVon & " and Year([UStVPo_ReDat]) <= " & RechnungsjahrBis & " FROM [VERAG].[dbo].[tblUStVPositionen] where Year([UStVPo_ReDat]) >= " & RechnungsjahrVon & " and Year([UStVPo_ReDat]) <= " & RechnungsjahrBis & sqlWhere &
group by [UStVAn_ID] ,[UStVPo_ReNr], [UStVPo_ReDat] "group by [UStVAn_ID] ,[UStVPo_ReNr], [UStVPo_ReDat]
HAVING COUNT(*) > 1 HAVING COUNT(*) > 1
order by [UStVAn_ID] desc" order by [UStVAn_ID] desc"
' If Not (r.Cells("UStVPo_SchnittstellenNr").Value = 4 OrElse r.Cells("UStVPo_SchnittstellenNr").Value = 9) AndAlso Not r.Cells("UStVPo_ReNr").Value.ToString.ToLower.StartsWith("bis") Then 'MSE und "SAMMELBERIFF" ausnehmen
Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL") Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL")
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, True,,, True) VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,, "mehrfach vorkommende RE-Nr im Antrag",, True,,, True)
Return True Return True
Else Else
MsgBox("Keine Daten!") MsgBox("Keine Daten!")

2
VERAG_PROG_ALLGEMEIN/Classes/cTrdInvoice.vb
View File

@@ -781,7 +781,7 @@ Class TrdInvoice_FUNCTIONS
Sum(RechnungsausgangPositionen.SteuerpflichtigerBetrag)+Sum(RechnungsausgangPositionen.SteuerfreierBetrag)+((Sum(RechnungsausgangPositionen.SteuerpflichtigerBetrag)*min(Rechnungsausgang.[Steuersatz %])*100)/100) AS RK_Rechnungsbetrag, Sum(RechnungsausgangPositionen.SteuerpflichtigerBetrag)+Sum(RechnungsausgangPositionen.SteuerfreierBetrag)+((Sum(RechnungsausgangPositionen.SteuerpflichtigerBetrag)*min(Rechnungsausgang.[Steuersatz %])*100)/100) AS RK_Rechnungsbetrag,
Count(1) AS RK_Satzzähler, '' as VZ, 0 as BV, 'RE' as Source Count(1) AS RK_Satzzähler, '' as VZ, 0 as BV, 'RE' as Source
FROM Rechnungsausgang INNER JOIN RechnungsausgangPositionen ON Rechnungsausgang.RK_ID = RechnungsausgangPositionen.RK_ID FROM Rechnungsausgang INNER JOIN RechnungsausgangPositionen ON Rechnungsausgang.RK_ID = RechnungsausgangPositionen.RK_ID
WHERE (((Rechnungsausgang.RechnungsDatum) Is Not Null) AND ((Rechnungsausgang.RechnungsNr) Is Not Null) AND ((Rechnungsausgang.Trdin)=0)) " & If(Firma > 0, " and Firma_ID=" & Firma, "") & If(Buchungsjahr > 0, " and Buchungsjahr=" & Buchungsjahr, "") & " WHERE (((Rechnungsausgang.RechnungsDatum) Is Not Null) AND (isnull(Rechnungsausgang.RechnungsNr,0) > 0) AND ((Rechnungsausgang.Trdin)=0)) " & If(Firma > 0, " and Firma_ID=" & Firma, "") & If(Buchungsjahr > 0, " and Buchungsjahr=" & Buchungsjahr, "") & "
GROUP BY Rechnungsausgang.RechnungsDatum, Rechnungsausgang.RechnungsNr" GROUP BY Rechnungsausgang.RechnungsDatum, Rechnungsausgang.RechnungsNr"
If WithOrderClause Then If WithOrderClause Then

12
VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb
View File

@@ -121,13 +121,15 @@ Public Class cTimasAPI
rest.AddQueryParam("format", datetimeformat) rest.AddQueryParam("format", datetimeformat)
If timeStamp_deadline <> "" AndAlso IsDate(timeStamp_deadline) Then If timeStamp_deadline <> "" AndAlso IsDate(timeStamp_deadline) Then
rest.AddQueryParam("stamp", CDate(timeStamp_deadline).ToString("yyyy-MM-dd")) rest.AddQueryParam("stamp", CDate(timeStamp_deadline).ToString("dd.MM.yyyy"))
rest.IdleTimeoutMs = 300000 rest.IdleTimeoutMs = 60000
Else Else
rest.IdleTimeoutMs = 30000 'defualt rest.IdleTimeoutMs = 30000 'defualt
End If End If
Dim sw = Stopwatch.StartNew()
Dim responseJson As String = rest.FullRequestNoBody("GET", "/rest/web-api/employees/" & maid & "/balance") Dim responseJson As String = rest.FullRequestNoBody("GET", "/rest/web-api/employees/" & maid & "/balance")
If (rest.LastMethodSuccess <> True) Then If (rest.LastMethodSuccess <> True) Then
Debug.WriteLine(rest.LastErrorText) Debug.WriteLine(rest.LastErrorText)
@@ -135,6 +137,10 @@ Public Class cTimasAPI
Return timesaldo Return timesaldo
End If End If
sw.Stop()
Debug.WriteLine($"Request dauerte {sw.ElapsedMilliseconds} ms")
Debug.WriteLine(rest.LastErrorText)
If (rest.ResponseStatusCode <> 200) Then If (rest.ResponseStatusCode <> 200) Then
Debug.WriteLine(rest.ResponseHeader) Debug.WriteLine(rest.ResponseHeader)
@@ -1059,7 +1065,7 @@ Public Class cTimasAPI
dt.Columns.Add("Geschlecht", GetType(String)) dt.Columns.Add("Geschlecht", GetType(String))
dt.Columns.Add("Ausweis-Nr", GetType(Integer)) dt.Columns.Add("Ausweis-Nr", GetType(Integer))
dt.Columns.Add("Info", GetType(String)) dt.Columns.Add("Info", GetType(String))
dt.Columns.Add("Mandant", GetType(String)) 'dt.Columns.Add("Mandant", GetType(String))
End If End If
dt.Clear() dt.Clear()

2
VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb
View File

@@ -180,7 +180,7 @@ Public Class cSyska_Interface
getPersonenKto_MDM &= FormatStringSYS(row("Ort"), 50) & vbTab getPersonenKto_MDM &= FormatStringSYS(row("Ort"), 50) & vbTab
getPersonenKto_MDM &= cProgramFunctions.getISO2Land(FormatStringSYS(LandKz, 5)) & vbTab getPersonenKto_MDM &= cProgramFunctions.getISO2Land(FormatStringSYS(LandKz, 5)) & vbTab
getPersonenKto_MDM &= CDate(row("EingegebenAm")).ToShortDateString & vbTab 'Eröffnungsdatum getPersonenKto_MDM &= CDate(row("EingegebenAm")).ToShortDateString & vbTab 'Eröffnungsdatum
'getPersonenKto_MDM &= Gegenkontonummer & vbTab getPersonenKto_MDM &= "2000" & vbTab
getPersonenKto_MDM &= vbTab 'Bankname getPersonenKto_MDM &= vbTab 'Bankname
getPersonenKto_MDM &= If(Lastschrift, row("BLZ"), "") & vbTab getPersonenKto_MDM &= If(Lastschrift, row("BLZ"), "") & vbTab
getPersonenKto_MDM &= If(Lastschrift, row("KTO"), "") & vbTab getPersonenKto_MDM &= If(Lastschrift, row("KTO"), "") & vbTab

2
VERAG_PROG_ALLGEMEIN/frmDatumsabfrage.Designer.vb generated
View File

@@ -234,7 +234,7 @@ Partial Class frmDatumsabfrage
Friend WithEvents btnClose As Button Friend WithEvents btnClose As Button
Friend WithEvents btn As Button Friend WithEvents btn As Button
Friend WithEvents lbl As Label Friend WithEvents lbl As Label
Friend WithEvents Label1 As Label Public WithEvents Label1 As Label
Public WithEvents dtp_date As DateTimePicker Public WithEvents dtp_date As DateTimePicker
Friend WithEvents pnlKunde As Panel Friend WithEvents pnlKunde As Panel
Public WithEvents cboKundenkreis As VERAG_PROG_ALLGEMEIN.MyComboBox Public WithEvents cboKundenkreis As VERAG_PROG_ALLGEMEIN.MyComboBox