From 96b25afaf637670c22738c6638345ae131a33394 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 15 Dec 2025 16:13:35 +0100 Subject: [PATCH 1/9] ustva, etc. --- SDL/USTV/frmMDM_USTVAntrag.vb | 17 +- SDL/USTV/frmUSTVoffeneAntraege.vb | 4 +- SDL/USTV/ustCntlUSTV_AntragPosition.vb | 2 +- SDL/USTV/ustCntlUSTV_ErstattungPosition .vb | 3 +- SDL/kassenbuch/frmBelegNeu.vb | 14 +- SDL/mdm/frmMDMDatenverarbetiung.vb | 210 ++++++++++++++---- .../Classes/USTV/cUSTVAntrag.vb | 41 ++++ .../frmDatumsabfrage.Designer.vb | 28 +-- 8 files changed, 256 insertions(+), 63 deletions(-) diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index e81c7843..2b643877 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -748,6 +748,7 @@ Public Class frmMDM_USTVAntrag Dim USTV_POS As New VERAG_PROG_ALLGEMEIN.cUStVPositionen USTV_POS.UStVAn_ID = USTV_ANTRAG.[UStVAn_ID] USTV_POS.UStVPo_ID = USTV_ANTRAG.getMaxPosNr + USTV_POS.UStVPo_interneNr = USTV_ANTRAG.getMaxPosinterneNr USTV_POS.UStVPo_ReDat = ANTRAG.plose_RechnungsDatum USTV_POS.UStVPo_ReNr = ANTRAG.plose_RechnungsNr.ToString @@ -908,6 +909,7 @@ Public Class frmMDM_USTVAntrag Dim USTV_POS As New VERAG_PROG_ALLGEMEIN.cUStVPositionen USTV_POS.UStVAn_ID = USTV_ANTRAG.[UStVAn_ID] USTV_POS.UStVPo_ID = USTV_ANTRAG.getMaxPosNr + USTV_POS.UStVPo_interneNr = USTV_ANTRAG.getMaxPosinterneNr USTV_POS.UStVPo_ReDat = r.Item("Rechnungsdatum") USTV_POS.UStVPo_ReNr = r.Item("Rechnungsnummer") @@ -1024,6 +1026,7 @@ Public Class frmMDM_USTVAntrag Dim USTV_POS As New VERAG_PROG_ALLGEMEIN.cUStVPositionen USTV_POS.UStVAn_ID = USTV_ANTRAG.[UStVAn_ID] USTV_POS.UStVPo_ID = USTV_ANTRAG.getMaxPosNr + USTV_POS.UStVPo_interneNr = USTV_ANTRAG.getMaxPosinterneNr USTV_POS.UStVPo_ReDat = r.Item("rmc_reDatum") USTV_POS.UStVPo_ReNr = r.Item("rmc_reNr").ToString USTV_POS.UStVPo_SchnittstellenNr = bytSchnittstellenNr @@ -1135,6 +1138,7 @@ Public Class frmMDM_USTVAntrag Dim USTV_POS As New VERAG_PROG_ALLGEMEIN.cUStVPositionen USTV_POS.UStVAn_ID = USTV_ANTRAG.[UStVAn_ID] USTV_POS.UStVPo_ID = USTV_ANTRAG.getMaxPosNr + USTV_POS.UStVPo_interneNr = USTV_ANTRAG.getMaxPosinterneNr USTV_POS.UStVPo_ReDat = r.Item("invoice_date") USTV_POS.UStVPo_ReNr = r.Item("invoice_number") & " - " & kdNr & IIf(Antrag_LandKz = "BE", "/Belgium", "") USTV_POS.UStVPo_SchnittstellenNr = bytSchnittstellenNr @@ -1213,6 +1217,7 @@ Public Class frmMDM_USTVAntrag Dim USTV_POS As New VERAG_PROG_ALLGEMEIN.cUStVPositionen USTV_POS.UStVAn_ID = USTV_ANTRAG.[UStVAn_ID] USTV_POS.UStVPo_ID = USTV_ANTRAG.getMaxPosNr + USTV_POS.UStVPo_interneNr = USTV_ANTRAG.getMaxPosinterneNr USTV_POS.UStVPo_ReDat = r.Item("Rechnungsdatum") USTV_POS.UStVPo_ReNr = r.Item("Rechnungsnummer").ToString USTV_POS.UStVPo_SchnittstellenNr = bytSchnittstellenNr @@ -1296,6 +1301,7 @@ Public Class frmMDM_USTVAntrag Dim USTV_POS As New VERAG_PROG_ALLGEMEIN.cUStVPositionen USTV_POS.UStVAn_ID = USTV_ANTRAG.[UStVAn_ID] USTV_POS.UStVPo_ID = USTV_ANTRAG.getMaxPosNr + USTV_POS.UStVPo_interneNr = USTV_ANTRAG.getMaxPosinterneNr USTV_POS.UStVPo_ReDat = r.Item("Rechnungsdatum") USTV_POS.UStVPo_ReNr = r.Item("Rechnungsnummer").ToString USTV_POS.UStVPo_SchnittstellenNr = bytSchnittstellenNr @@ -1452,6 +1458,7 @@ Public Class frmMDM_USTVAntrag USTV_POS.UStVAn_ID = USTV_ANTRAG.[UStVAn_ID] USTV_POS.UStVPo_ID = USTV_ANTRAG.getMaxPosNr + USTV_POS.UStVPo_interneNr = USTV_ANTRAG.getMaxPosinterneNr USTV_POS.UStVPo_ReDat = reDat.ToShortDateString USTV_POS.UStVPo_ReNr = r.Cells("invoice_id").Value.ToString USTV_POS.UStVPo_SchnittstellenNr = bytSchnittstellenNr @@ -2035,6 +2042,7 @@ Public Class frmMDM_USTVAntrag UstCntlUSTV_AntragPosition1.reset() UstCntlUSTV_AntragPosition1.UStV_POS = New cUStVPositionen(UStVAn_ID) UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ID = USTV_ANTRAG.getMaxPosNr + UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_interneNr = USTV_ANTRAG.getMaxPosinterneNr UstCntlUSTV_AntragPosition1.Enabled = True @@ -2050,9 +2058,9 @@ Public Class frmMDM_USTVAntrag If UstCntlUSTV_AntragPosition1.cboSchnittstellennr._value = -1 OrElse UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_daId_loeschbar Then 'nur Dokumente löschen, die nicht über Schnittstellen geladen wurden! - If UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_daId < 0 Then + If UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_daId < 0 OrElse UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_daId Is Nothing Then - Dim DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "MDM", "MDM", "MDM_DATEN", "USTVA_" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID & "_" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ID, "SONSTIGE", USTV_ANTRAG.UStVAn_KuNr) + Dim DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "MDM", "MDM", "MDM_DATEN", "USTVA_" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID & "_" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_interneNr, "SONSTIGE", USTV_ANTRAG.UStVAn_KuNr) If DS IsNot Nothing Then DS.DELETE_COMPLETE() @@ -2218,6 +2226,8 @@ Public Class frmMDM_USTVAntrag Case 7 'RMC - neue Schnittstelle - OK sqlText = "Update [tblRMCImport] Set rmc_archiv=0, [rmc_archiviertDatum] = NULL, UStVAn_ID = NULL FROM [tblRMCImport] inner join adressen on adressen.WölflKundenNr = tblRMCImport.rmc_kdNr Where cast(rmc_reDatum as date) = '" & RechnungsDatum.ToShortDateString & "' And rmc_reNr = '" & RechnungsNr & "' AND adressen.AdressenNr=" & USTV_ANTRAG.UStVAn_KuNr If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") + sqlText = "Update [tblRMCImport] Set rmc_archiv=0, [rmc_archiviertDatum] = NULL, UStVAn_ID = NULL FROM [tblRMCImport] inner join adressen on adressen.weitereWölflKundenNr = tblRMCImport.rmc_kdNr Where cast(rmc_reDatum as date) = '" & RechnungsDatum.ToShortDateString & "' And rmc_reNr = '" & RechnungsNr & "' AND adressen.AdressenNr=" & USTV_ANTRAG.UStVAn_KuNr + If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") Case 8, 12 'IDS neue Schnittstelle - OK sqlText = "update tblIDSTransactionsNew set UStVAn_ID = NULL From tblIDSTransactionsNew @@ -2925,6 +2935,7 @@ Public Class frmMDM_USTVAntrag UstCntlUSTV_AntragErstattungen1.reset() UstCntlUSTV_AntragErstattungen1.UStV_ERS = New VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen() UstCntlUSTV_AntragErstattungen1.UStV_ERS.UStVEr_ID = USTV_ANTRAG.getMaxPosNrErst() + UstCntlUSTV_AntragErstattungen1.UStV_ERS.UStVEr_interneNr = USTV_ANTRAG.getMaxinternePosNrErst() UstCntlUSTV_AntragErstattungen1.Enabled = True End Sub @@ -2938,7 +2949,7 @@ Public Class frmMDM_USTVAntrag If UstCntlUSTV_AntragErstattungen1.UStV_ERS.UStVEr_daId < 0 Then - Dim DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "MDM", "MDM", "MDM_DATEN", "USTVERS_" & UstCntlUSTV_AntragErstattungen1.UStV_ERS.UStVAn_ID & "_" & UstCntlUSTV_AntragErstattungen1.UStV_ERS.UStVEr_ID, "SONSTIGE", USTV_ANTRAG.UStVAn_KuNr) + Dim DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "MDM", "MDM", "MDM_DATEN", "USTVERS_" & UstCntlUSTV_AntragErstattungen1.UStV_ERS.UStVAn_ID & "_" & UstCntlUSTV_AntragErstattungen1.UStV_ERS.UStVEr_interneNr, "SONSTIGE", USTV_ANTRAG.UStVAn_KuNr) If DS IsNot Nothing Then DS.DELETE_COMPLETE() diff --git a/SDL/USTV/frmUSTVoffeneAntraege.vb b/SDL/USTV/frmUSTVoffeneAntraege.vb index b6820350..e68fcb49 100644 --- a/SDL/USTV/frmUSTVoffeneAntraege.vb +++ b/SDL/USTV/frmUSTVoffeneAntraege.vb @@ -224,11 +224,11 @@ Public Class frmUSTVoffeneAntraege Dim sqlstring = "Select " & top & " [rmc_kdNr], [rmc_kdName], [rmc_landKZ], [rmc_reDatum], [rmc_reNr], [rmc_waehrung], [rmc_betragMWST],rmc_daid as daId FROM [tblRMCImport] INNER JOIN Adressen on WölflKundenNr=[rmc_kdNr] - where rmc_reDatum >= '" & dat_Sum_Von.Value & "' And rmc_reDatum < '" & dat_Sum_Bis.Value & "' And rmc_archiv <> 1 AND [rmc_betragMWST] <> 0 " & sqlwhere + where rmc_reDatum >= '" & dat_Sum_Von.Value & "' And rmc_reDatum <= '" & dat_Sum_Bis.Value & "' And rmc_archiv <> 1 AND [rmc_betragMWST] <> 0 " & sqlwhere sqlstring &= " UNION ALL Select " & top & " [rmc_kdNr], [rmc_kdName], [rmc_landKZ], [rmc_reDatum], [rmc_reNr], [rmc_waehrung], [rmc_betragMWST],rmc_daid as daId FROM [tblRMCImport] INNER JOIN Adressen on weitereWölflKundenNr=[rmc_kdNr] - where rmc_reDatum >= '" & dat_Sum_Von.Value & "' And rmc_reDatum < '" & dat_Sum_Bis.Value & "' And rmc_archiv <> 1 AND [rmc_betragMWST] <> 0 " & sqlwhere + where rmc_reDatum >= '" & dat_Sum_Von.Value & "' And rmc_reDatum <= '" & dat_Sum_Bis.Value & "' And rmc_archiv <> 1 AND [rmc_betragMWST] <> 0 " & sqlwhere .SET_SQL(sqlstring, "FMZOLL") .LOAD() diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.vb index 6a7512a9..5470dfce 100644 --- a/SDL/USTV/ustCntlUSTV_AntragPosition.vb +++ b/SDL/USTV/ustCntlUSTV_AntragPosition.vb @@ -110,7 +110,7 @@ Public Class ustCntlUSTV_AntragPosition scanSonstiges.Enabled = UStV_POS.UStVPo_daId_loeschbar 'Not UStV_POS.UStVPo_SchnittstellenNr > 0 btnAPIUbload.Enabled = True 'hochladbar aber nicht einfügen lassen! UStV_POS.UStVPo_daId_loeschbar Else - scanSonstiges.INIT(kdnr, "MDM", "MDM_DATEN", "USTVA_" & UStV_POS.UStVAn_ID & "_" & UStV_POS.UStVPo_ID) + scanSonstiges.INIT(kdnr, "MDM", "MDM_DATEN", "USTVA_" & UStV_POS.UStVAn_ID & "_" & UStV_POS.UStVPo_interneNr) 'scanSonstiges.INIT_daId(da_id) scanSonstiges.Enabled = True btnAPIUbload.Enabled = False diff --git a/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb b/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb index 4be117bb..a5c02c9c 100644 --- a/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb +++ b/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb @@ -67,7 +67,7 @@ Public Class ustCntlUSTV_ErstattungPosition If UStV_ERS.UStVEr_daId IsNot Nothing AndAlso UStV_ERS.UStVEr_daId > 0 Then scanSonstigesErst.INIT_daId(UStV_ERS.UStVEr_daId) Else - scanSonstigesErst.INIT(kdNr, "MDM", "MDM_DATEN", "USTVERS_" & UStV_ERS.UStVAn_ID & "_" & UStV_ERS.UStVEr_ID) + scanSonstigesErst.INIT(kdNr, "MDM", "MDM_DATEN", "USTVERS_" & UStV_ERS.UStVAn_ID & "_" & UStV_ERS.UStVEr_interneNr) End If @@ -80,6 +80,7 @@ Public Class ustCntlUSTV_ErstattungPosition If UStV_ERS Is Nothing Then UStV_ERS = New VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen() UStV_ERS.UStVEr_ID = UstV_AN.getMaxPosNrErst + UStV_ERS.UStVEr_interneNr = UstV_AN.getMaxinternePosNrErst End If UStV_ERS.UStVEr_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME diff --git a/SDL/kassenbuch/frmBelegNeu.vb b/SDL/kassenbuch/frmBelegNeu.vb index 88139e42..30de9657 100644 --- a/SDL/kassenbuch/frmBelegNeu.vb +++ b/SDL/kassenbuch/frmBelegNeu.vb @@ -1391,8 +1391,14 @@ Public Class frmBelegNeu MsgBox(response) If returnCode = 0 Then 'Zahlung wurde erfolgreich durchgeführt setRKSV() + ElseIf returnCode = 1000 Then 'Workaround, wenn nicht in Registry geschrieben wurden konnte. + If vbYes = MsgBox("In der Registry wurde der Returncode 1000 abgegeben! " & vbNewLine & "Wurde die Zahlung dennoch vom Zahlungsterminal erfolgreich durchgeführt, dann mit Ja bestätigen", MsgBoxStyle.YesNoCancel) Then + setRKSV() + Else + Me.Cursor = Cursors.Default + End If Else - Me.Cursor = Cursors.Default + Me.Cursor = Cursors.Default End If End Sub @@ -1408,15 +1414,16 @@ Public Class frmBelegNeu Exit Sub End If - dt = SQL.loadDgvBySql("SELECT * FROM tblRKSV_POS WHERE [pos_aktiv] = 1 AND [pos_kasse]='" & cboKassen.SelectedItem.Value & "'", "FMZOLL") + dt = SQL.loadDgvBySql("SELECT * FROM tblRKSV_POS WHERE [pos_aktiv] = 1 And [pos_kasse]='" & cboKassen.SelectedItem.Value & "'", "FMZOLL") - Select Case dt.Rows.Count + Select Case dt.Rows.Count Case 0 MsgBox("Für diese Kasse ist kein aktives POS-Terminal hinterlegt!") Case 1 If Not printRoutine() Then Exit Sub End If + SetRegEntries() Case Else @@ -1488,6 +1495,7 @@ Public Class frmBelegNeu Else ZVTKey.SetValue("Kassedruck", 0, RegistryValueKind.DWord) End If + ZVTKey.SetValue("Ergebnis", 1000, RegistryValueKind.DWord) ' Zur Sicherheit, falls EasyZVT gar nicht installiert ist oder nicht gestartet werden kann ZVTKey.SetValue("ErgebnisText", "EasyZVT konnte nicht gestartet werden", RegistryValueKind.String) diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index 5e0ffad2..0b198203 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -1,11 +1,20 @@ Imports System.Data.OleDb Imports System.IO +Imports System.Runtime.InteropServices Imports itextsharp.text.pdf Imports MDM_Worker Imports VERAG_PROG_ALLGEMEIN Public Class frmMDMDatenverarbetiung + Private Declare Function SendMessage Lib "user32" Alias "SendMessageA" ( + ByVal hwnd As IntPtr, + ByVal wMsg As Integer, + ByVal wParam As Boolean, + ByVal lParam As Integer) As Integer + + Const WM_SETREDRAW As Integer = 11 + Public LIEFERANT = "" Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL ' Dim ProduktCode_NOT_IN = "SELECT plp_ProductCode FROM [tblPLOSE_Produktbeschreibung] WHERE [plp_einarbeiten]=0 " @@ -3729,7 +3738,6 @@ Public Class frmMDMDatenverarbetiung Panel2.Enabled = cbx.Checked End Sub - Function pruefData_PLOSE() As Boolean pruefData_PLOSE = True @@ -3750,85 +3758,207 @@ Public Class frmMDMDatenverarbetiung checkFixeTaxeImOffert("PLOSE", VERAGKdNr_DT) + '------------------------------------------ALT-------------------------------------------------- + '------------------------------------------ALT-------------------------------------------------- + '------------------------------------------ALT-------------------------------------------------- + + 'For Each r As DataGridViewRow In MyDatagridview1.Rows + ' 'KUNDEN-NR / PLOSE KD-NR + ' results = VERAGKdNr_DT.Select("PLOSEKundenNr = '" & r.Cells("plose_POLSEKundennummer").Value & "'") + ' If results.Length > 0 Then + ' 'Gefunden! + ' r.Cells("VERAGKdNr").Value = results(0)("PLOSEKundenNr") + ' r.Cells("VERAGKdNr").Style.BackColor = Color.MintCream + ' VERAGKdNr = results(0)("AdressenNr") + ' found = True + ' Else + ' r.Cells("VERAGKdNr").Style.BackColor = Color.PapayaWhip + ' pruefData_PLOSE = False + ' End If + + + + ' 'VERAG/PLOSE LEISTUNG + ' results = VERAGLeistungsNr_DT.Select("plp_ProductCode = '" & r.Cells("plose_ProduktCode").Value & "' AND plp_LeistungsNr is not null") + ' If results.Length > 0 Then + ' 'Gefunden! + ' VERAGLeistungsNr = results(0)("plp_LeistungsNr") + ' r.Cells("VERAGLeistungsNr").Value = results(0)("plp_LeistungsNr") + ' r.Cells("VERAGLeistungsNr").Style.BackColor = Color.MintCream + ' found = True + ' Else + ' r.Cells("VERAGLeistungsNr").Style.BackColor = Color.PapayaWhip + ' pruefData_PLOSE = False + ' End If + + + ' 'VERAG OFFERT 80 + ' 'Default -> Nicht gefunden + ' 'Dim OffertenNr_DT = SQL.loadDgvBySql("SELECT KundenNr,OffertenNr FROM [Offerten] where OffertenNr = 80 AND KundenNr = '" & VERAGKdNr & "'", "FMZOLL") + ' results = OffertenNr_DT.Select("KundenNr = '" & VERAGKdNr & "'") + ' If results.Length > 0 Then + ' 'Gefunden! + ' r.Cells("KundeOffertenNr").Value = results(0)("OffertenNr") + ' r.Cells("KundeOffertenNr").Style.BackColor = Color.MintCream + ' Else + ' pruefData_PLOSE = False + ' r.Cells("KundeOffertenNr").Style.BackColor = Color.PapayaWhip + ' End If + + + + ' 'VERAG LEISTUNGS-NR + ' 'Default -> Nicht gefunden + ' 'Dim KundeLeistungsNr_DT = SQL.loadDgvBySql("SELECT [LeistungsNr],KundenNr FROM [Offertenpositionen] where OffertenNr = 80 AND KundenNr = '" & VERAGKdNr & "' AND LeistungsNr = '" & VERAGLeistungsNr & "'", "FMZOLL") + ' results = KundeLeistungsNr_DT.Select("KundenNr = '" & VERAGKdNr & "' AND LeistungsNr = '" & VERAGLeistungsNr & "'") + ' If results.Length > 0 Then + ' 'Gefunden! + ' r.Cells("KundeLeistungsNr").Value = VERAGLeistungsNr + ' r.Cells("KundeLeistungsNr").Style.BackColor = Color.MintCream + ' Else + ' r.Cells("KundeLeistungsNr").Style.BackColor = Color.PapayaWhip + ' pruefData_PLOSE = False + ' End If + + ' If cnt Mod 5 = 0 Then + ' lblProzPruef.Text = CInt(cnt / cntTotal * 100) & " %" + ' lblProzPruef.Refresh() + ' 'Me.Refresh() + ' End If + + ' cnt += 1 + + 'Next + + ''lblProzPruef.Text = CInt(cnt / MyDatagridview1.Rows.Count() * 100) & " %" '100 + ''lblProzPruef.Refresh() + 'Me.Refresh() + + + + + '------------------------------------------NEU-------------------------------------------------- + '------------------------------------------NEU-------------------------------------------------- + '------------------------------------------NEU-------------------------------------------------- + + + + + 'MyDatagridview1.SuspendLayout() + + Dim dictPloseKunden = VERAGKdNr_DT.AsEnumerable(). + GroupBy(Function(x) x("PLOSEKundenNr").ToString()). + ToDictionary(Function(g) g.Key, Function(g) g.First()) + + Dim dictProdukt = VERAGLeistungsNr_DT.AsEnumerable(). + GroupBy(Function(x) x("plp_ProductCode").ToString()). + ToDictionary(Function(g) g.Key, + Function(g) g.First()) + + + Dim dictOfferte = + OffertenNr_DT.AsEnumerable(). + GroupBy(Function(x) x("KundenNr").ToString()). + ToDictionary(Function(g) g.Key, + Function(g) g.First()("OffertenNr")) + + Dim dictLeistung = + KundeLeistungsNr_DT.AsEnumerable(). + GroupBy(Function(x) x("KundenNr").ToString()). + ToDictionary(Function(g) g.Key, + Function(g) g.Select(Function(r) r("LeistungsNr").ToString()). + ToHashSet()) + + + SendMessage(MyDatagridview1.Handle, WM_SETREDRAW, False, 0) + SuspendPainting(MyDatagridview1) + For Each r As DataGridViewRow In MyDatagridview1.Rows - 'KUNDEN-NR / PLOSE KD-NR - results = VERAGKdNr_DT.Select("PLOSEKundenNr = '" & r.Cells("plose_POLSEKundennummer").Value & "'") - If results.Length > 0 Then - 'Gefunden! - r.Cells("VERAGKdNr").Value = results(0)("PLOSEKundenNr") + + Dim ploseKunde = r.Cells("plose_POLSEKundennummer").Value?.ToString() + Dim produktCode = r.Cells("plose_ProduktCode").Value?.ToString() + + 'KD lookup + Dim rowKd As DataRow = Nothing + If dictPloseKunden.TryGetValue(ploseKunde, rowKd) Then + r.Cells("VERAGKdNr").Value = rowKd("PLOSEKundenNr") + VERAGKdNr = CInt(rowKd("AdressenNr")) r.Cells("VERAGKdNr").Style.BackColor = Color.MintCream - VERAGKdNr = results(0)("AdressenNr") - found = True Else + pruefData_PLOSE = False r.Cells("VERAGKdNr").Style.BackColor = Color.PapayaWhip - pruefData_PLOSE = False End If - - - 'VERAG/PLOSE LEISTUNG - results = VERAGLeistungsNr_DT.Select("plp_ProductCode = '" & r.Cells("plose_ProduktCode").Value & "' AND plp_LeistungsNr is not null") - If results.Length > 0 Then - 'Gefunden! - VERAGLeistungsNr = results(0)("plp_LeistungsNr") - r.Cells("VERAGLeistungsNr").Value = results(0)("plp_LeistungsNr") + 'Produkt lookup + Dim rowProdukt As DataRow = Nothing + If dictProdukt.TryGetValue(produktCode, rowProdukt) Then + VERAGLeistungsNr = CInt(rowProdukt("plp_LeistungsNr")) + r.Cells("VERAGLeistungsNr").Value = VERAGLeistungsNr r.Cells("VERAGLeistungsNr").Style.BackColor = Color.MintCream - found = True Else - r.Cells("VERAGLeistungsNr").Style.BackColor = Color.PapayaWhip pruefData_PLOSE = False + r.Cells("VERAGLeistungsNr").Style.BackColor = Color.PapayaWhip End If - - 'VERAG OFFERT 80 - 'Default -> Nicht gefunden - 'Dim OffertenNr_DT = SQL.loadDgvBySql("SELECT KundenNr,OffertenNr FROM [Offerten] where OffertenNr = 80 AND KundenNr = '" & VERAGKdNr & "'", "FMZOLL") - results = OffertenNr_DT.Select("KundenNr = '" & VERAGKdNr & "'") - If results.Length > 0 Then - 'Gefunden! - r.Cells("KundeOffertenNr").Value = results(0)("OffertenNr") + 'Offerte 80 lookup + Dim offered80 As Object = Nothing + If dictOfferte.TryGetValue(VERAGKdNr.ToString(), offered80) Then + r.Cells("KundeOffertenNr").Value = offered80 r.Cells("KundeOffertenNr").Style.BackColor = Color.MintCream Else pruefData_PLOSE = False r.Cells("KundeOffertenNr").Style.BackColor = Color.PapayaWhip End If + 'Leistung lookup + Dim setLeist As HashSet(Of String) = Nothing + If dictLeistung.TryGetValue(VERAGKdNr.ToString(), setLeist) AndAlso + setLeist.Contains(VERAGLeistungsNr.ToString()) Then - - 'VERAG LEISTUNGS-NR - 'Default -> Nicht gefunden - 'Dim KundeLeistungsNr_DT = SQL.loadDgvBySql("SELECT [LeistungsNr],KundenNr FROM [Offertenpositionen] where OffertenNr = 80 AND KundenNr = '" & VERAGKdNr & "' AND LeistungsNr = '" & VERAGLeistungsNr & "'", "FMZOLL") - results = KundeLeistungsNr_DT.Select("KundenNr = '" & VERAGKdNr & "' AND LeistungsNr = '" & VERAGLeistungsNr & "'") - If results.Length > 0 Then - 'Gefunden! r.Cells("KundeLeistungsNr").Value = VERAGLeistungsNr r.Cells("KundeLeistungsNr").Style.BackColor = Color.MintCream Else - r.Cells("KundeLeistungsNr").Style.BackColor = Color.PapayaWhip pruefData_PLOSE = False + r.Cells("KundeLeistungsNr").Style.BackColor = Color.PapayaWhip End If - If cnt Mod 5 = 0 Then + 'UI update alle 100 Zeilen statt 5 + If cnt Mod 100 = 0 Then lblProzPruef.Text = CInt(cnt / cntTotal * 100) & " %" lblProzPruef.Refresh() - 'Me.Refresh() End If cnt += 1 Next + ResumePainting(MyDatagridview1) + SendMessage(MyDatagridview1.Handle, WM_SETREDRAW, True, 0) + MyDatagridview1.Refresh() - 'lblProzPruef.Text = CInt(cnt / MyDatagridview1.Rows.Count() * 100) & " %" '100 - 'lblProzPruef.Refresh() + lblProzPruef.Text = CInt(cnt / MyDatagridview1.Rows.Count() * 100) & " %" '100 + lblProzPruef.Refresh() Me.Refresh() + + MyDatagridview1.SuspendLayout() + + Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) pruefData_PLOSE = False End Try End Function + Public Sub SuspendPainting(ByVal parent As Control) + SendMessage(parent.Handle, WM_SETREDRAW, False, 0) + End Sub + + Public Sub ResumePainting(ByVal parent As Control) + SendMessage(parent.Handle, WM_SETREDRAW, True, 0) + parent.Refresh() + End Sub + Function pruefData_ASFINAG() As Boolean pruefData_ASFINAG = True Try @@ -4911,4 +5041,6 @@ RabattBerechnen: initDgv_IDS() End Sub + + End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb index 42cdd7e8..e3f6a734 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb @@ -278,6 +278,18 @@ Public Class cUSTVAntrag Return -1 End Function + Public Function getMaxPosinterneNr() As Integer + Try + Dim maxPosNr = -1 + + Return SQL.getValueTxtBySql("SELECT isnull(max([UStVPo_interneNr]),0)+1 FROM [tblUStVPositionen] where UStVAn_ID='" & UStVAn_ID & "'", "FMZOLL",,, "1") + + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + Return -1 + End Function + Public Function getMaxPosNrErst() As Integer Try Dim maxPosNr = -1 @@ -290,6 +302,18 @@ Public Class cUSTVAntrag Return -1 End Function + Public Function getMaxinternePosNrErst() As Integer + Try + Dim maxPosNr = -1 + + Return SQL.getValueTxtBySql("SELECT isnull(max([UStVEr_interneNr]),0)+1 FROM [tblUStVErstattung] where UStVAn_ID='" & UStVAn_ID & "'", "FMZOLL",,, "1") + + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + Return -1 + End Function + Public Function DELETE() As Boolean @@ -323,6 +347,8 @@ Public Class cUStVPositionen Property UStVPo_LeistenderId As Integer ' Property UStVPo_VZ As Boolean = False Property UStVPo_VZ_RKID As Object = Nothing ' + Property UStVPo_interneNr As Integer + Dim SQL As New SQL @@ -439,6 +465,7 @@ Public Class cUStVPositionen list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVPo_LeistenderId", UStVPo_LeistenderId)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVPo_VZ", UStVPo_VZ)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVPo_VZ_RKID", UStVPo_VZ_RKID)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVPo_interneNr", UStVPo_interneNr)) Return list End Function @@ -496,6 +523,7 @@ Public Class cUStVErstattungPositionen Property UStVEr_Sachbearbeiter As Object = Nothing Property UStVEr_Zeitstempel As Object = Nothing Property UStVEr_daId As Object = Nothing + Property UStVEr_interneNr As Integer Public hasEntry = False @@ -521,6 +549,7 @@ Public Class cUStVErstattungPositionen list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVEr_Sachbearbeiter", UStVEr_Sachbearbeiter)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVEr_Zeitstempel", UStVEr_Zeitstempel)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVEr_daId", UStVEr_daId)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVEr_interneNr", UStVEr_interneNr)) Return list End Function @@ -646,6 +675,18 @@ Public Class cUStVErstattungPositionen Return -1 End Function + Public Function getMaxInternePosNr() As Integer + Try + Dim maxPosNr = -1 + + Return SQL.getValueTxtBySql("SELECT isnull(max([UStVEr_interneNr]),0)+1 FROM [tblUStVErstattung] where UStVAn_ID='" & UStVAn_ID & "'", "FMZOLL",,, "1") + + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + Return -1 + End Function + End Class diff --git a/VERAG_PROG_ALLGEMEIN/frmDatumsabfrage.Designer.vb b/VERAG_PROG_ALLGEMEIN/frmDatumsabfrage.Designer.vb index ec9fd797..674b0ba1 100644 --- a/VERAG_PROG_ALLGEMEIN/frmDatumsabfrage.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/frmDatumsabfrage.Designer.vb @@ -27,13 +27,13 @@ Partial Class frmDatumsabfrage Me.components = New System.ComponentModel.Container() Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) Me.pnlKunde = New System.Windows.Forms.Panel() + Me.cbxKunden = New System.Windows.Forms.CheckBox() Me.cboKundenkreis = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.dtp_date = New System.Windows.Forms.DateTimePicker() Me.btnClose = New System.Windows.Forms.Button() Me.btn = New System.Windows.Forms.Button() Me.lbl = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() - Me.cbxKunden = New System.Windows.Forms.CheckBox() Me.MyPanel1.SuspendLayout() Me.pnlKunde.SuspendLayout() Me.SuspendLayout() @@ -51,7 +51,7 @@ Partial Class frmDatumsabfrage Me.MyPanel1.Dock = System.Windows.Forms.DockStyle.Fill Me.MyPanel1.Location = New System.Drawing.Point(0, 0) Me.MyPanel1.Name = "MyPanel1" - Me.MyPanel1.Size = New System.Drawing.Size(264, 84) + Me.MyPanel1.Size = New System.Drawing.Size(286, 84) Me.MyPanel1.TabIndex = 3 ' 'pnlKunde @@ -64,6 +64,15 @@ Partial Class frmDatumsabfrage Me.pnlKunde.TabIndex = 26 Me.pnlKunde.Visible = False ' + 'cbxKunden + ' + Me.cbxKunden.AutoSize = True + Me.cbxKunden.Location = New System.Drawing.Point(12, 9) + Me.cbxKunden.Name = "cbxKunden" + Me.cbxKunden.Size = New System.Drawing.Size(15, 14) + Me.cbxKunden.TabIndex = 5 + Me.cbxKunden.UseVisualStyleBackColor = True + ' 'cboKundenkreis ' Me.cboKundenkreis._allowedValuesFreiText = Nothing @@ -99,7 +108,7 @@ Partial Class frmDatumsabfrage Me.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnClose.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!, System.Drawing.FontStyle.Bold) Me.btnClose.ForeColor = System.Drawing.Color.White - Me.btnClose.Location = New System.Drawing.Point(231, 0) + Me.btnClose.Location = New System.Drawing.Point(253, 0) Me.btnClose.Name = "btnClose" Me.btnClose.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.btnClose.Size = New System.Drawing.Size(31, 20) @@ -111,7 +120,7 @@ Partial Class frmDatumsabfrage ' Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btn.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) - Me.btn.Location = New System.Drawing.Point(197, 48) + Me.btn.Location = New System.Drawing.Point(219, 52) Me.btn.Margin = New System.Windows.Forms.Padding(0) Me.btn.Name = "btn" Me.btn.Size = New System.Drawing.Size(57, 22) @@ -136,20 +145,11 @@ Partial Class frmDatumsabfrage Me.Label1.Size = New System.Drawing.Size(132, 18) Me.Label1.TabIndex = 6 ' - 'cbxKunden - ' - Me.cbxKunden.AutoSize = True - Me.cbxKunden.Location = New System.Drawing.Point(12, 9) - Me.cbxKunden.Name = "cbxKunden" - Me.cbxKunden.Size = New System.Drawing.Size(15, 14) - Me.cbxKunden.TabIndex = 5 - Me.cbxKunden.UseVisualStyleBackColor = True - ' 'frmDatumsabfrage ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(264, 84) + Me.ClientSize = New System.Drawing.Size(286, 84) Me.Controls.Add(Me.MyPanel1) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.Name = "frmDatumsabfrage" From f168d0323ec8b5aa142127d9f19f39e5393c7493 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 16 Dec 2025 09:46:13 +0100 Subject: [PATCH 2/9] Vorkosten, Spedbuch --- SDL/My Project/AssemblyInfo.vb | 4 ++-- .../Nacherfassung/frmNacherfassungVorkosten.vb | 10 ++++++++-- VERAG_PROG_ALLGEMEIN/Classes/cSpeditionsbuch.vb | 12 ++++++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 9dc046b9..6847d078 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: ' - - + + diff --git a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungVorkosten.vb b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungVorkosten.vb index f15e8a78..4bf1c42f 100644 --- a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungVorkosten.vb +++ b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungVorkosten.vb @@ -21,12 +21,18 @@ 'Next VORKOSTEN.Clear() + Dim LeistungsBez As String = "" For i = 0 To dgvVorkosten.RowCount - 1 Dim r As DataGridViewRow = dgvVorkosten.Rows(i) If Not IsNumeric(r.Cells("LeistungsNr").Value) Then MsgBox("Leistungsnummer muss eine Zahl sein!") : Me.DialogResult = Windows.Forms.DialogResult.None : Exit Sub If Not IsNumeric(r.Cells("Preis").Value) Then MsgBox("Preis muss eine Zahl sein!") : Me.DialogResult = Windows.Forms.DialogResult.None : Exit Sub - If r.Cells("LeistungsBez").Value.ToString.Length > 30 Then MsgBox("Leistungbezeichnung zu lang (max 30 Zeichen)!") : Me.DialogResult = Windows.Forms.DialogResult.None : Exit Sub - VORKOSTEN.Add(New VERAG_PROG_ALLGEMEIN.cVorkosten(FilialenNr, AbfertigungsNr, UnterNr, CInt(r.Cells("LeistungsNr").Value), CStr(r.Cells("Leistungsbez").Value), CDbl(r.Cells("Preis").Value))) + If r.Cells("LeistungsBez").Value.ToString.Length > 256 Then MsgBox("Leistungbezeichnung zu lang (max 256 Zeichen)!") : Me.DialogResult = Windows.Forms.DialogResult.None : Exit Sub + If CStr(r.Cells("Leistungsbez").Value).ToString.Length > 30 Then + LeistungsBez = CStr(r.Cells("Leistungsbez").Value).ToString.Substring(0, 30) + Else + LeistungsBez = CStr(r.Cells("Leistungsbez").Value) + End If + VORKOSTEN.Add(New VERAG_PROG_ALLGEMEIN.cVorkosten(FilialenNr, AbfertigungsNr, UnterNr, CInt(r.Cells("LeistungsNr").Value), LeistungsBez, CDbl(r.Cells("Preis").Value), CStr(r.Cells("Leistungsbez").Value))) Next Me.Close() diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cSpeditionsbuch.vb b/VERAG_PROG_ALLGEMEIN/Classes/cSpeditionsbuch.vb index 9f4479dd..8c57f91a 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cSpeditionsbuch.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cSpeditionsbuch.vb @@ -770,6 +770,7 @@ Public Class cVorkosten Property LeistungsNr As Integer Property LeistungsBez As Object = Nothing Property Preis As Double = 0 + Property Bezeichnung As Object = Nothing ' Property Abfertigungsbezeichnung As String = "-" Dim SQL As New SQL @@ -786,6 +787,16 @@ Public Class cVorkosten Me.Preis = Preis End Sub + Sub New(FilialenNr, AbfertigungsNr, UnterNr, LeistungsNr, LeistungsBez, Preis, Bezeichnung) + Me.FilialenNr = FilialenNr + Me.AbfertigungsNr = AbfertigungsNr + Me.UnterNr = UnterNr + Me.LeistungsNr = LeistungsNr + Me.LeistungsBez = LeistungsBez + Me.Preis = Preis + Me.Bezeichnung = Bezeichnung + End Sub + Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FilialenNr", FilialenNr)) @@ -794,6 +805,7 @@ Public Class cVorkosten list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("LeistungsNr", LeistungsNr)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("LeistungsBez", LeistungsBez)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Preis", Preis)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Bezeichnung", Bezeichnung)) Return list End Function From d92eb90b6414349a09402b618d9dc182e580cb7b Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 16 Dec 2025 09:54:59 +0100 Subject: [PATCH 3/9] Vorkosten, etc. --- .../Nacherfassung/frmNacherfassungVorkosten.vb | 2 +- .../DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.vb | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungVorkosten.vb b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungVorkosten.vb index 4bf1c42f..774ae6e2 100644 --- a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungVorkosten.vb +++ b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungVorkosten.vb @@ -129,7 +129,7 @@ If txtLeistungsbezeichnung.Text = "" Then Label24.Visible = True : txtLeistungsbezeichnung.Focus() : Exit Sub If txtPreis._value = "" Then Label1.Visible = True : txtPreis.Focus() : Exit Sub - If txtLeistungsbezeichnung.Text.Length > 30 Then MsgBox("Leistungbezeichnung zu lang (max 30 Zeichen)!") : Label24.Visible = True : txtLeistungsbezeichnung.Focus() : Exit Sub + If txtLeistungsbezeichnung.Text.Length > 265 Then MsgBox("Leistungbezeichnung zu lang (max 265 Zeichen)!") : Label24.Visible = True : txtLeistungsbezeichnung.Focus() : Exit Sub If VK_EDIT >= 0 Then dgvVorkosten.Rows.RemoveAt(VK_EDIT) diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.vb index 49814671..60089d8c 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.vb @@ -770,14 +770,16 @@ Public Class usrCntlATLAS_EZA End Sub Private Sub DateiimportToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DateiimportToolStripMenuItem.Click - Dim f As New cATLAS_EZA_IMPORT(AVISO, SENDUNG, EZA) - f.ShowDialog(Me.FindForm) - EZA = f.EZA + '----- Kann ansonten keine Version freigeben!!! - Me.FindForm.SuspendLayout() - POSITIONEN.setValues(EZA, True) - btnPositionen.PerformClick() - Me.FindForm.ResumeLayout() + 'Dim f As New cATLAS_EZA_IMPORT(AVISO, SENDUNG, EZA) + 'f.ShowDialog(Me.FindForm) + 'EZA = f.EZA + + 'Me.FindForm.SuspendLayout() + 'POSITIONEN.setValues(EZA, True) + 'btnPositionen.PerformClick() + 'Me.FindForm.ResumeLayout() End Sub From e3055daed5bcc962af894519b9b43373acd44cbe Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 16 Dec 2025 10:09:22 +0100 Subject: [PATCH 4/9] offert --- SDL/kunden/usrCntlOfferte.vb | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/SDL/kunden/usrCntlOfferte.vb b/SDL/kunden/usrCntlOfferte.vb index f27a47c3..460ebb17 100644 --- a/SDL/kunden/usrCntlOfferte.vb +++ b/SDL/kunden/usrCntlOfferte.vb @@ -133,7 +133,7 @@ Public Class usrCntlOfferte .Columns("BGebMinBetrag").Width = 60 .Columns("BGebMinBetrag").HeaderText = "BGebMinBetr." .Columns("BGebMinBetrag").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight - .Columns("Eingegeben am").Visible = False + .Columns("Eingegeben am").Visible = VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_DATIEREN", "SDL") ' .Columns("Sachbearbeiter").Visible = False ' .Columns("Geändert am").Visible = False .Columns("PreisänderungProzent").Width = 70 @@ -361,7 +361,7 @@ Public Class usrCntlOfferte If loaded = True Then dgvOfferteDetails.Rows(e.RowIndex).Cells("Sachbearbeiter").Value = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME - dgvOfferteDetails.Rows(e.RowIndex).Cells("Geändert am").Value = Now + If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_DATIEREN", "SDL") Then dgvOfferteDetails.Rows(e.RowIndex).Cells("Geändert am").Value = Now DGVHasChaged = True 'saveCurrentOffert() If isNew Then @@ -613,8 +613,26 @@ Public Class usrCntlOfferte c.ReadOnly = True End If + + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_DATIEREN", "SDL") Then + + If (c.Name = "Eingegeben am") Then + If edit Then + c.ReadOnly = False + handleEditMode(edit) + Else + c.ReadOnly = True + handleEditMode(edit) + End If + Else + c.ReadOnly = True + + End If + + End If End If + Next dgvOfferteDetails.AllowUserToDeleteRows = edit End If From eb7d05101e3a86e255f7a5cc89547a403aad8653 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 16 Dec 2025 11:20:03 +0100 Subject: [PATCH 5/9] ustva, etc. --- SDL/Fakturierung/cFakturierung.vb | 4 +- SDL/USTV/frmMDM_USTVAntrag.Designer.vb | 128 +++++++++--------- SDL/USTV/frmMDM_USTVAntrag.vb | 1 + .../MyTextBox.vb | 24 ++-- 4 files changed, 79 insertions(+), 78 deletions(-) diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index b25a4544..b43a5d95 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -2662,8 +2662,8 @@ Public Class cFakturierung rpt.lblZWSumme.Visible = True If RECHNUNG.Firma_ID = 19 Then 'Bei MDM ausblenden! - rpt.lblSteuersatz.Text = "" - rpt.lblSteuerbetrag.Visible = False + 'rpt.lblSteuersatz.Text = "" + 'rpt.lblSteuerbetrag.Visible = False Else rpt.lblSteuerbetrag.Text = CDbl(getReverseChargeSummeRKID(firma, RECHNUNG)).ToString("N2", CultureInfo.CurrentCulture) rpt.lblSteuersatz.Visible = True diff --git a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb index 1e3788a7..2617090d 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb @@ -24,9 +24,11 @@ Partial Class frmMDM_USTVAntrag Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMDM_USTVAntrag)) - Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.pnlBottom = New System.Windows.Forms.Panel() + Me.Label18 = New System.Windows.Forms.Label() + Me.txtSumme = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.pbMail = New System.Windows.Forms.PictureBox() Me.pb_Beleg = New System.Windows.Forms.PictureBox() Me.Button5 = New System.Windows.Forms.Button() @@ -114,7 +116,6 @@ Partial Class frmMDM_USTVAntrag Me.dgvUSTVPositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.pnlAntragsPosDetails = New System.Windows.Forms.Panel() Me.Panel2 = New System.Windows.Forms.Panel() - Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition() Me.Panel4 = New System.Windows.Forms.Panel() Me.cbxKIUploaddelete = New System.Windows.Forms.CheckBox() Me.scanUSTVA = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() @@ -125,7 +126,6 @@ Partial Class frmMDM_USTVAntrag Me.Panel3 = New System.Windows.Forms.Panel() Me.dgvErstattungspositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.pnlErstattungsdetails = New System.Windows.Forms.Panel() - Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition() Me.Panel1 = New System.Windows.Forms.Panel() Me.Button2 = New System.Windows.Forms.Button() Me.Button3 = New System.Windows.Forms.Button() @@ -142,8 +142,8 @@ Partial Class frmMDM_USTVAntrag Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() Me.FakturiertToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.txtSumme = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label18 = New System.Windows.Forms.Label() + Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition() + Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition() Me.pnlBottom.SuspendLayout() CType(Me.pbMail, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.pb_Beleg, System.ComponentModel.ISupportInitialize).BeginInit() @@ -196,6 +196,41 @@ Partial Class frmMDM_USTVAntrag Me.pnlBottom.Size = New System.Drawing.Size(1444, 100) Me.pnlBottom.TabIndex = 3 ' + 'Label18 + ' + Me.Label18.AutoSize = True + Me.Label18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label18.Location = New System.Drawing.Point(1090, 58) + Me.Label18.Name = "Label18" + Me.Label18.Size = New System.Drawing.Size(45, 13) + Me.Label18.TabIndex = 54 + Me.Label18.Text = "Summe:" + ' + 'txtSumme + ' + Me.txtSumme._DateTimeOnly = False + Me.txtSumme._numbersOnly = False + Me.txtSumme._numbersOnlyKommastellen = "" + Me.txtSumme._numbersOnlyTrennzeichen = False + Me.txtSumme._Prozent = False + Me.txtSumme._ShortDateNew = False + Me.txtSumme._ShortDateOnly = False + Me.txtSumme._TimeOnly = False + Me.txtSumme._TimeOnly_Seconds = False + Me.txtSumme._value = "" + Me.txtSumme._Waehrung = True + Me.txtSumme._WaehrungZeichen = True + Me.txtSumme.ForeColor = System.Drawing.Color.Black + Me.txtSumme.Location = New System.Drawing.Point(1145, 51) + Me.txtSumme.MaxLineLength = -1 + Me.txtSumme.MaxLines_Warning = "" + Me.txtSumme.MaxLines_Warning_Label = Nothing + Me.txtSumme.Name = "txtSumme" + Me.txtSumme.ReadOnly = True + Me.txtSumme.Size = New System.Drawing.Size(88, 20) + Me.txtSumme.TabIndex = 53 + Me.txtSumme.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'pbMail ' Me.pbMail.Image = CType(resources.GetObject("pbMail.Image"), System.Drawing.Image) @@ -643,7 +678,7 @@ Partial Class frmMDM_USTVAntrag ' Me.txtRZ._DateTimeOnly = False Me.txtRZ._numbersOnly = True - Me.txtRZ._numbersOnlyKommastellen = "" + Me.txtRZ._numbersOnlyKommastellen = "2" Me.txtRZ._numbersOnlyTrennzeichen = True Me.txtRZ._Prozent = False Me.txtRZ._ShortDateNew = False @@ -859,7 +894,7 @@ Partial Class frmMDM_USTVAntrag ' Me.txtVZ._DateTimeOnly = False Me.txtVZ._numbersOnly = True - Me.txtVZ._numbersOnlyKommastellen = "" + Me.txtVZ._numbersOnlyKommastellen = "2" Me.txtVZ._numbersOnlyTrennzeichen = True Me.txtVZ._Prozent = False Me.txtVZ._ShortDateNew = False @@ -1024,7 +1059,7 @@ Partial Class frmMDM_USTVAntrag ' Me.txt3470._DateTimeOnly = False Me.txt3470._numbersOnly = True - Me.txt3470._numbersOnlyKommastellen = "" + Me.txt3470._numbersOnlyKommastellen = "2" Me.txt3470._numbersOnlyTrennzeichen = True Me.txt3470._Prozent = False Me.txt3470._ShortDateNew = False @@ -1497,8 +1532,8 @@ Partial Class frmMDM_USTVAntrag Me.dgvUSTVPositionen.AKTUALISIERUNGS_INTERVALL = 500 Me.dgvUSTVPositionen.AllowUserToAddRows = False Me.dgvUSTVPositionen.AllowUserToDeleteRows = False - DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUSTVPositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUSTVPositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.dgvUSTVPositionen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -1534,14 +1569,6 @@ Partial Class frmMDM_USTVAntrag Me.Panel2.Size = New System.Drawing.Size(1428, 263) Me.Panel2.TabIndex = 1 ' - 'UstCntlUSTV_AntragPosition1 - ' - Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0) - Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1" - Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1272, 261) - Me.UstCntlUSTV_AntragPosition1.TabIndex = 0 - ' 'Panel4 ' Me.Panel4.BackColor = System.Drawing.Color.WhiteSmoke @@ -1637,7 +1664,7 @@ Partial Class frmMDM_USTVAntrag Me.TabPage2.Location = New System.Drawing.Point(4, 22) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(1434, 415) + Me.TabPage2.Size = New System.Drawing.Size(1434, 433) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Erstattungspositionen" Me.TabPage2.UseVisualStyleBackColor = True @@ -1651,7 +1678,7 @@ Partial Class frmMDM_USTVAntrag Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel3.Location = New System.Drawing.Point(3, 3) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(1428, 409) + Me.Panel3.Size = New System.Drawing.Size(1428, 427) Me.Panel3.TabIndex = 3 ' 'dgvErstattungspositionen @@ -1659,8 +1686,8 @@ Partial Class frmMDM_USTVAntrag Me.dgvErstattungspositionen.AKTUALISIERUNGS_INTERVALL = 500 Me.dgvErstattungspositionen.AllowUserToAddRows = False Me.dgvErstattungspositionen.AllowUserToDeleteRows = False - DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvErstattungspositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvErstattungspositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 Me.dgvErstattungspositionen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -1672,7 +1699,7 @@ Partial Class frmMDM_USTVAntrag Me.dgvErstattungspositionen.RowHeadersVisible = False Me.dgvErstattungspositionen.RowHeadersWidth = 62 Me.dgvErstattungspositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvErstattungspositionen.Size = New System.Drawing.Size(1428, 143) + Me.dgvErstattungspositionen.Size = New System.Drawing.Size(1428, 161) Me.dgvErstattungspositionen.TabIndex = 1 ' 'pnlErstattungsdetails @@ -1682,19 +1709,11 @@ Partial Class frmMDM_USTVAntrag Me.pnlErstattungsdetails.Controls.Add(Me.UstCntlUSTV_AntragErstattungen1) Me.pnlErstattungsdetails.Controls.Add(Me.Panel1) Me.pnlErstattungsdetails.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlErstattungsdetails.Location = New System.Drawing.Point(0, 146) + Me.pnlErstattungsdetails.Location = New System.Drawing.Point(0, 164) Me.pnlErstattungsdetails.Name = "pnlErstattungsdetails" Me.pnlErstattungsdetails.Size = New System.Drawing.Size(1426, 261) Me.pnlErstattungsdetails.TabIndex = 0 ' - 'UstCntlUSTV_AntragErstattungen1 - ' - Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0) - Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1" - Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1270, 259) - Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2 - ' 'Panel1 ' Me.Panel1.BackColor = System.Drawing.Color.WhiteSmoke @@ -1813,40 +1832,21 @@ Partial Class frmMDM_USTVAntrag Me.FakturiertToolStripMenuItem.Text = "Fakturiert zurücksetzen" Me.FakturiertToolStripMenuItem.Visible = False ' - 'txtSumme + 'UstCntlUSTV_AntragPosition1 ' - Me.txtSumme._DateTimeOnly = False - Me.txtSumme._numbersOnly = False - Me.txtSumme._numbersOnlyKommastellen = "" - Me.txtSumme._numbersOnlyTrennzeichen = False - Me.txtSumme._Prozent = False - Me.txtSumme._ShortDateNew = False - Me.txtSumme._ShortDateOnly = False - Me.txtSumme._TimeOnly = False - Me.txtSumme._TimeOnly_Seconds = False - Me.txtSumme._value = "" - Me.txtSumme._Waehrung = True - Me.txtSumme._WaehrungZeichen = True - Me.txtSumme.ForeColor = System.Drawing.Color.Black - Me.txtSumme.Location = New System.Drawing.Point(1145, 51) - Me.txtSumme.MaxLineLength = -1 - Me.txtSumme.MaxLines_Warning = "" - Me.txtSumme.MaxLines_Warning_Label = Nothing - Me.txtSumme.Name = "txtSumme" - Me.txtSumme.ReadOnly = True - Me.txtSumme.Size = New System.Drawing.Size(88, 20) - Me.txtSumme.TabIndex = 53 - Me.txtSumme.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0) + Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1" + Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1272, 261) + Me.UstCntlUSTV_AntragPosition1.TabIndex = 0 ' - 'Label18 + 'UstCntlUSTV_AntragErstattungen1 ' - Me.Label18.AutoSize = True - Me.Label18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label18.Location = New System.Drawing.Point(1090, 58) - Me.Label18.Name = "Label18" - Me.Label18.Size = New System.Drawing.Size(45, 13) - Me.Label18.TabIndex = 54 - Me.Label18.Text = "Summe:" + Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0) + Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1" + Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1270, 259) + Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2 ' 'frmMDM_USTVAntrag ' diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 2b643877..b90b8284 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -2818,6 +2818,7 @@ Public Class frmMDM_USTVAntrag Dim USTV_POS As New VERAG_PROG_ALLGEMEIN.cUStVPositionen USTV_POS.UStVAn_ID = USTV_POS_temp.UStVAn_ID USTV_POS.UStVPo_ID = USTV_ANTRAG.getMaxPosNr + USTV_POS.UStVPo_interneNr = USTV_ANTRAG.getMaxPosinterneNr USTV_POS.UStVPo_ReDat = USTV_POS_temp.UStVPo_ReDat USTV_POS.UStVPo_ReNr = USTV_POS_temp.UStVPo_ReNr USTV_POS.UStVPo_SchnittstellenNr = -1 diff --git a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/MyTextBox.vb b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/MyTextBox.vb index 47b99a75..0f569611 100644 --- a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/MyTextBox.vb +++ b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/MyTextBox.vb @@ -296,14 +296,14 @@ Public Class MyTextBox pruefungHandled = True Try If Not _numbersOnlyTrennzeichen And IsNumeric(sender.text) Then - Me._value = CLng(sender.text) + Me._value = CDbl(sender.text) ElseIf IsNumeric(_numbersOnlyKommastellen) And IsNumeric(sender.text) Then - sender.text = CLng(sender.text).ToString("N" & _numbersOnlyKommastellen) ' , CultureInfo.InvariantCulture) - Me._value = CLng(sender.text) + sender.text = CDbl(sender.text).ToString("N" & _numbersOnlyKommastellen) ' , CultureInfo.InvariantCulture) + Me._value = CDbl(sender.text) ' Else ' sender.text = CDbl(sender.text) ElseIf IsNumeric(sender.text) Then - Me._value = CLng(sender.text) + Me._value = CDbl(sender.text) Else Me._value = "" End If @@ -591,13 +591,13 @@ Public Class MyTextBox ElseIf _numbersOnly Then If Not _numbersOnlyTrennzeichen And IsNumeric(v) Then - Propvalue = CLng(v) + Propvalue = CDbl(v) Me.Text = v ElseIf IsNumeric(Me._numbersOnlyKommastellen) And IsNumeric(v) Then - Propvalue = CLng(v) - Me.Text = CLng(v).ToString("N" & Me._numbersOnlyKommastellen) ' , CultureInfo.InvariantCulture) + Propvalue = CDbl(v) + Me.Text = CDbl(v).ToString("N" & Me._numbersOnlyKommastellen) ' , CultureInfo.InvariantCulture) ElseIf IsNumeric(v) Then - Propvalue = CLng(v) + Propvalue = CDbl(v) Me.Text = v Else Propvalue = "" @@ -635,11 +635,11 @@ Public Class MyTextBox Try 'String.Format("{0:N2}", CDbl(sender.text)) If Not _numbersOnlyTrennzeichen And IsNumeric(sender.text) Then - sender.text = CLng(sender.text) + sender.text = CDbl(sender.text) ElseIf IsNumeric(_numbersOnlyKommastellen) And IsNumeric(sender.text) Then - sender.text = CLng(sender.text).ToString("N" & _numbersOnlyKommastellen) ' , CultureInfo.InvariantCulture) + sender.text = CDbl(sender.text).ToString("N" & _numbersOnlyKommastellen) ' , CultureInfo.InvariantCulture) Else - sender.text = CLng(sender.text) + sender.text = CDbl(sender.text) End If e.Cancel = False Catch ex As Exception @@ -652,7 +652,7 @@ Public Class MyTextBox If _Waehrung Then Try 'String.Format("{0:N2}", CDbl(sender.text)) - CLng(sender.text).ToString(If(_WaehrungZeichen, "C2", "N2")) + CDbl(sender.text).ToString(If(_WaehrungZeichen, "C2", "N2")) e.Cancel = False Catch ex As Exception errDescription = "Die Eingabe muss eine Zahl sein! (z.B. 123,45)" From e9ce8f66c88bd6d3217ea4c5280c4e3a22f0e68b Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 17 Dec 2025 11:21:05 +0100 Subject: [PATCH 6/9] Offert, Sicherheiten, etc. --- SDL/My Project/AssemblyInfo.vb | 4 +- SDL/kunden/usrCntlOfferte.vb | 8 +- .../usrCntlAuswertungenCBAM_DE.Designer.vb | 1 + SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb | 278 +++++++++++++----- SDL/zoll/usrCntlZOLLAuswertungen.vb | 198 ++++++++++++- VERAG_PROG_ALLGEMEIN/cSicherheiten.vb | 55 +++- 6 files changed, 455 insertions(+), 89 deletions(-) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 6847d078..55a9f384 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: ' - - + + diff --git a/SDL/kunden/usrCntlOfferte.vb b/SDL/kunden/usrCntlOfferte.vb index 460ebb17..9f075350 100644 --- a/SDL/kunden/usrCntlOfferte.vb +++ b/SDL/kunden/usrCntlOfferte.vb @@ -361,7 +361,7 @@ Public Class usrCntlOfferte If loaded = True Then dgvOfferteDetails.Rows(e.RowIndex).Cells("Sachbearbeiter").Value = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME - If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_DATIEREN", "SDL") Then dgvOfferteDetails.Rows(e.RowIndex).Cells("Geändert am").Value = Now + dgvOfferteDetails.Rows(e.RowIndex).Cells("Geändert am").Value = Now DGVHasChaged = True 'saveCurrentOffert() If isNew Then @@ -620,13 +620,7 @@ Public Class usrCntlOfferte If edit Then c.ReadOnly = False handleEditMode(edit) - Else - c.ReadOnly = True - handleEditMode(edit) End If - Else - c.ReadOnly = True - End If End If diff --git a/SDL/zoll/usrCntlAuswertungenCBAM_DE.Designer.vb b/SDL/zoll/usrCntlAuswertungenCBAM_DE.Designer.vb index 0805c458..b71784a3 100644 --- a/SDL/zoll/usrCntlAuswertungenCBAM_DE.Designer.vb +++ b/SDL/zoll/usrCntlAuswertungenCBAM_DE.Designer.vb @@ -239,6 +239,7 @@ Partial Class usrCntlAuswertungenCBAM_DE ' Me.Controls.Add(Me.Label8) Me.Controls.Add(Me.GroupBox2) + Me.Name = "usrCntlAuswertungenCBAM_DE" Me.GroupBox2.ResumeLayout(False) Me.GroupBox2.PerformLayout() CType(Me.txtJahr, System.ComponentModel.ISupportInitialize).EndInit() diff --git a/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb b/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb index fb5fd71c..35ff3ed6 100644 --- a/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb +++ b/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb @@ -231,15 +231,8 @@ Partial Class usrCntlZOLLAuswertungen Me.PictureBox3 = New System.Windows.Forms.PictureBox() Me.PictureBox1 = New System.Windows.Forms.PictureBox() Me.TabPage2 = New System.Windows.Forms.TabPage() - Me.UsrCntlAuswertungenUIDPruefung1 = New SDL.usrCntlAuswertungenUIDPruefung() - Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1 = New SDL.usrCntlAuswertungenKunden_Auftragsrueckgang() Me.TabPage3 = New System.Windows.Forms.TabPage() - Me.UsrCntlAuswertungenEV_Veranlagungen1 = New SDL.usrCntlAuswertungenEV_Veranlagungen() - Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1 = New SDL.usrCntlAuswertungenFiskal_IntrastatMeldung() - Me.UsrCntlAuswertungenFiskalvertretung_42001 = New SDL.usrCntlAuswertungenFiskalvertretung_4200() Me.TabPage4 = New System.Windows.Forms.TabPage() - Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1 = New SDL.usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER() - Me.UsrCntlAuswertungenAufschub_Abgabenliste1 = New SDL.usrCntlAuswertungenAufschub_Abgabenliste() Me.TabPage5 = New System.Windows.Forms.TabPage() Me.Label60 = New System.Windows.Forms.Label() Me.GroupBox9 = New System.Windows.Forms.GroupBox() @@ -261,6 +254,23 @@ Partial Class usrCntlZOLLAuswertungen Me.Button14 = New System.Windows.Forms.Button() Me.PictureBox8 = New System.Windows.Forms.PictureBox() Me.pnl = New System.Windows.Forms.Panel() + Me.TabPage6 = New System.Windows.Forms.TabPage() + Me.excelCbam = New System.Windows.Forms.Button() + Me.Label96 = New System.Windows.Forms.Label() + Me.von_CBAM = New System.Windows.Forms.DateTimePicker() + Me.Label97 = New System.Windows.Forms.Label() + Me.Label99 = New System.Windows.Forms.Label() + Me.bis_CBAM = New System.Windows.Forms.DateTimePicker() + Me.cbxcbamQuelle = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Label100 = New System.Windows.Forms.Label() + Me.cbxCBAM_Detaildaten = New System.Windows.Forms.CheckBox() + Me.UsrCntlAuswertungenUIDPruefung1 = New SDL.usrCntlAuswertungenUIDPruefung() + Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1 = New SDL.usrCntlAuswertungenKunden_Auftragsrueckgang() + Me.UsrCntlAuswertungenEV_Veranlagungen1 = New SDL.usrCntlAuswertungenEV_Veranlagungen() + Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1 = New SDL.usrCntlAuswertungenFiskal_IntrastatMeldung() + Me.UsrCntlAuswertungenFiskalvertretung_42001 = New SDL.usrCntlAuswertungenFiskalvertretung_4200() + Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1 = New SDL.usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER() + Me.UsrCntlAuswertungenAufschub_Abgabenliste1 = New SDL.usrCntlAuswertungenAufschub_Abgabenliste() Me.GroupBox1.SuspendLayout() Me.grpDurmaz.SuspendLayout() CType(Me.picDurmaz, System.ComponentModel.ISupportInitialize).BeginInit() @@ -304,6 +314,7 @@ Partial Class usrCntlZOLLAuswertungen Me.GroupBox9.SuspendLayout() CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnl.SuspendLayout() + Me.TabPage6.SuspendLayout() Me.SuspendLayout() ' 'Label3 @@ -1298,11 +1309,12 @@ Partial Class usrCntlZOLLAuswertungen Me.tbcntr.Controls.Add(Me.TabPage3) Me.tbcntr.Controls.Add(Me.TabPage4) Me.tbcntr.Controls.Add(Me.TabPage5) + Me.tbcntr.Controls.Add(Me.TabPage6) Me.tbcntr.Dock = System.Windows.Forms.DockStyle.Top Me.tbcntr.Location = New System.Drawing.Point(0, 57) Me.tbcntr.Name = "tbcntr" Me.tbcntr.SelectedIndex = 0 - Me.tbcntr.Size = New System.Drawing.Size(1211, 1829) + Me.tbcntr.Size = New System.Drawing.Size(1126, 1829) Me.tbcntr.TabIndex = 22 ' 'TabPage1 @@ -1345,7 +1357,7 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage1.Location = New System.Drawing.Point(4, 22) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(1203, 1803) + Me.TabPage1.Size = New System.Drawing.Size(1135, 1803) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Bürgschaften" Me.TabPage1.UseVisualStyleBackColor = True @@ -2542,27 +2554,11 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage2.Location = New System.Drawing.Point(4, 22) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(1203, 1803) + Me.TabPage2.Size = New System.Drawing.Size(1135, 1803) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Kunden" Me.TabPage2.UseVisualStyleBackColor = True ' - 'UsrCntlAuswertungenUIDPruefung1 - ' - Me.UsrCntlAuswertungenUIDPruefung1.BackColor = System.Drawing.Color.White - Me.UsrCntlAuswertungenUIDPruefung1.Location = New System.Drawing.Point(6, 259) - Me.UsrCntlAuswertungenUIDPruefung1.Name = "UsrCntlAuswertungenUIDPruefung1" - Me.UsrCntlAuswertungenUIDPruefung1.Size = New System.Drawing.Size(708, 176) - Me.UsrCntlAuswertungenUIDPruefung1.TabIndex = 1 - ' - 'UsrCntlAuswertungenKunden_Auftragsrueckgang1 - ' - Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.BackColor = System.Drawing.Color.White - Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Location = New System.Drawing.Point(6, 18) - Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Name = "UsrCntlAuswertungenKunden_Auftragsrueckgang1" - Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Size = New System.Drawing.Size(708, 235) - Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.TabIndex = 0 - ' 'TabPage3 ' Me.TabPage3.Controls.Add(Me.UsrCntlAuswertungenEV_Veranlagungen1) @@ -2571,62 +2567,22 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage3.Location = New System.Drawing.Point(4, 22) Me.TabPage3.Name = "TabPage3" Me.TabPage3.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage3.Size = New System.Drawing.Size(1220, 1803) + Me.TabPage3.Size = New System.Drawing.Size(1135, 1803) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "Fiskalvertretung / EV-Veranlagung" Me.TabPage3.UseVisualStyleBackColor = True ' - 'UsrCntlAuswertungenEV_Veranlagungen1 - ' - Me.UsrCntlAuswertungenEV_Veranlagungen1.BackColor = System.Drawing.Color.White - Me.UsrCntlAuswertungenEV_Veranlagungen1.Location = New System.Drawing.Point(3, 568) - Me.UsrCntlAuswertungenEV_Veranlagungen1.Name = "UsrCntlAuswertungenEV_Veranlagungen1" - Me.UsrCntlAuswertungenEV_Veranlagungen1.Size = New System.Drawing.Size(708, 105) - Me.UsrCntlAuswertungenEV_Veranlagungen1.TabIndex = 2 - ' - 'UsrCntlAuswertungenFiskal_IntrastatMeldung1 - ' - Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.BackColor = System.Drawing.Color.White - Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Location = New System.Drawing.Point(3, 327) - Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Name = "UsrCntlAuswertungenFiskal_IntrastatMeldung1" - Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Size = New System.Drawing.Size(708, 235) - Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.TabIndex = 1 - ' - 'UsrCntlAuswertungenFiskalvertretung_42001 - ' - Me.UsrCntlAuswertungenFiskalvertretung_42001.BackColor = System.Drawing.Color.White - Me.UsrCntlAuswertungenFiskalvertretung_42001.Location = New System.Drawing.Point(3, 22) - Me.UsrCntlAuswertungenFiskalvertretung_42001.Name = "UsrCntlAuswertungenFiskalvertretung_42001" - Me.UsrCntlAuswertungenFiskalvertretung_42001.Size = New System.Drawing.Size(708, 234) - Me.UsrCntlAuswertungenFiskalvertretung_42001.TabIndex = 0 - ' 'TabPage4 ' Me.TabPage4.Controls.Add(Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1) Me.TabPage4.Controls.Add(Me.UsrCntlAuswertungenAufschub_Abgabenliste1) Me.TabPage4.Location = New System.Drawing.Point(4, 22) Me.TabPage4.Name = "TabPage4" - Me.TabPage4.Size = New System.Drawing.Size(1220, 1803) + Me.TabPage4.Size = New System.Drawing.Size(1135, 1803) Me.TabPage4.TabIndex = 3 Me.TabPage4.Text = "Aufschubdaten" Me.TabPage4.UseVisualStyleBackColor = True ' - 'UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1 - ' - Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.BackColor = System.Drawing.Color.White - Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Location = New System.Drawing.Point(3, 149) - Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Name = "UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1" - Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Size = New System.Drawing.Size(708, 120) - Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.TabIndex = 1 - ' - 'UsrCntlAuswertungenAufschub_Abgabenliste1 - ' - Me.UsrCntlAuswertungenAufschub_Abgabenliste1.BackColor = System.Drawing.Color.White - Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Location = New System.Drawing.Point(3, 22) - Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Name = "UsrCntlAuswertungenAufschub_Abgabenliste1" - Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Size = New System.Drawing.Size(708, 180) - Me.UsrCntlAuswertungenAufschub_Abgabenliste1.TabIndex = 0 - ' 'TabPage5 ' Me.TabPage5.Controls.Add(Me.Label60) @@ -2635,7 +2591,7 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage5.Location = New System.Drawing.Point(4, 22) Me.TabPage5.Name = "TabPage5" Me.TabPage5.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage5.Size = New System.Drawing.Size(1220, 1803) + Me.TabPage5.Size = New System.Drawing.Size(1135, 1803) Me.TabPage5.TabIndex = 4 Me.TabPage5.Text = "UNISPED" Me.TabPage5.UseVisualStyleBackColor = True @@ -2843,9 +2799,177 @@ Partial Class usrCntlZOLLAuswertungen Me.pnl.Dock = System.Windows.Forms.DockStyle.Top Me.pnl.Location = New System.Drawing.Point(0, 0) Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(1211, 57) + Me.pnl.Size = New System.Drawing.Size(1126, 57) Me.pnl.TabIndex = 23 ' + 'TabPage6 + ' + Me.TabPage6.Controls.Add(Me.cbxCBAM_Detaildaten) + Me.TabPage6.Controls.Add(Me.Label100) + Me.TabPage6.Controls.Add(Me.cbxcbamQuelle) + Me.TabPage6.Controls.Add(Me.Label99) + Me.TabPage6.Controls.Add(Me.bis_CBAM) + Me.TabPage6.Controls.Add(Me.Label97) + Me.TabPage6.Controls.Add(Me.excelCbam) + Me.TabPage6.Controls.Add(Me.Label96) + Me.TabPage6.Controls.Add(Me.von_CBAM) + Me.TabPage6.Location = New System.Drawing.Point(4, 22) + Me.TabPage6.Name = "TabPage6" + Me.TabPage6.Size = New System.Drawing.Size(1118, 1803) + Me.TabPage6.TabIndex = 5 + Me.TabPage6.Text = "CBAM" + Me.TabPage6.UseVisualStyleBackColor = True + ' + 'excelCbam + ' + Me.excelCbam.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.excelCbam.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.excelCbam.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.excelCbam.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.excelCbam.Location = New System.Drawing.Point(13, 103) + Me.excelCbam.Name = "excelCbam" + Me.excelCbam.Padding = New System.Windows.Forms.Padding(0, 0, 25, 0) + Me.excelCbam.Size = New System.Drawing.Size(121, 38) + Me.excelCbam.TabIndex = 22 + Me.excelCbam.Text = "Excel" + Me.excelCbam.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.excelCbam.UseVisualStyleBackColor = True + ' + 'Label96 + ' + Me.Label96.AutoSize = True + Me.Label96.Location = New System.Drawing.Point(114, 37) + Me.Label96.Name = "Label96" + Me.Label96.Size = New System.Drawing.Size(38, 13) + Me.Label96.TabIndex = 21 + Me.Label96.Text = "Datum" + ' + 'von_CBAM + ' + Me.von_CBAM.Format = System.Windows.Forms.DateTimePickerFormat.[Short] + Me.von_CBAM.Location = New System.Drawing.Point(117, 53) + Me.von_CBAM.Name = "von_CBAM" + Me.von_CBAM.Size = New System.Drawing.Size(93, 20) + Me.von_CBAM.TabIndex = 20 + ' + 'Label97 + ' + Me.Label97.AutoSize = True + Me.Label97.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label97.ForeColor = System.Drawing.SystemColors.ControlDarkDark + Me.Label97.Location = New System.Drawing.Point(10, 9) + Me.Label97.Name = "Label97" + Me.Label97.Size = New System.Drawing.Size(140, 17) + Me.Label97.TabIndex = 24 + Me.Label97.Text = "CBAM Kundenliste" + ' + 'Label99 + ' + Me.Label99.AutoSize = True + Me.Label99.Location = New System.Drawing.Point(224, 56) + Me.Label99.Name = "Label99" + Me.Label99.Size = New System.Drawing.Size(23, 13) + Me.Label99.TabIndex = 26 + Me.Label99.Text = "bis:" + ' + 'bis_CBAM + ' + Me.bis_CBAM.Format = System.Windows.Forms.DateTimePickerFormat.[Short] + Me.bis_CBAM.Location = New System.Drawing.Point(253, 53) + Me.bis_CBAM.Name = "bis_CBAM" + Me.bis_CBAM.Size = New System.Drawing.Size(93, 20) + Me.bis_CBAM.TabIndex = 25 + ' + 'cbxcbamQuelle + ' + Me.cbxcbamQuelle._allowedValuesFreiText = Nothing + Me.cbxcbamQuelle._allowFreiText = False + Me.cbxcbamQuelle._value = "" + Me.cbxcbamQuelle.DropDownHeight = 100 + Me.cbxcbamQuelle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cbxcbamQuelle.DropDownWidth = 100 + Me.cbxcbamQuelle.FormattingEnabled = True + Me.cbxcbamQuelle.IntegralHeight = False + Me.cbxcbamQuelle.Location = New System.Drawing.Point(13, 53) + Me.cbxcbamQuelle.Name = "cbxcbamQuelle" + Me.cbxcbamQuelle.Size = New System.Drawing.Size(85, 21) + Me.cbxcbamQuelle.TabIndex = 27 + ' + 'Label100 + ' + Me.Label100.AutoSize = True + Me.Label100.Location = New System.Drawing.Point(10, 37) + Me.Label100.Name = "Label100" + Me.Label100.Size = New System.Drawing.Size(37, 13) + Me.Label100.TabIndex = 28 + Me.Label100.Text = "Quelle" + ' + 'cbxCBAM_Detaildaten + ' + Me.cbxCBAM_Detaildaten.AutoSize = True + Me.cbxCBAM_Detaildaten.Location = New System.Drawing.Point(13, 80) + Me.cbxCBAM_Detaildaten.Name = "cbxCBAM_Detaildaten" + Me.cbxCBAM_Detaildaten.Size = New System.Drawing.Size(126, 17) + Me.cbxCBAM_Detaildaten.TabIndex = 29 + Me.cbxCBAM_Detaildaten.Text = "mit Sendunggsdetails" + Me.cbxCBAM_Detaildaten.UseVisualStyleBackColor = True + ' + 'UsrCntlAuswertungenUIDPruefung1 + ' + Me.UsrCntlAuswertungenUIDPruefung1.BackColor = System.Drawing.Color.White + Me.UsrCntlAuswertungenUIDPruefung1.Location = New System.Drawing.Point(6, 259) + Me.UsrCntlAuswertungenUIDPruefung1.Name = "UsrCntlAuswertungenUIDPruefung1" + Me.UsrCntlAuswertungenUIDPruefung1.Size = New System.Drawing.Size(708, 176) + Me.UsrCntlAuswertungenUIDPruefung1.TabIndex = 1 + ' + 'UsrCntlAuswertungenKunden_Auftragsrueckgang1 + ' + Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.BackColor = System.Drawing.Color.White + Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Location = New System.Drawing.Point(6, 18) + Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Name = "UsrCntlAuswertungenKunden_Auftragsrueckgang1" + Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Size = New System.Drawing.Size(708, 235) + Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.TabIndex = 0 + ' + 'UsrCntlAuswertungenEV_Veranlagungen1 + ' + Me.UsrCntlAuswertungenEV_Veranlagungen1.BackColor = System.Drawing.Color.White + Me.UsrCntlAuswertungenEV_Veranlagungen1.Location = New System.Drawing.Point(3, 568) + Me.UsrCntlAuswertungenEV_Veranlagungen1.Name = "UsrCntlAuswertungenEV_Veranlagungen1" + Me.UsrCntlAuswertungenEV_Veranlagungen1.Size = New System.Drawing.Size(708, 105) + Me.UsrCntlAuswertungenEV_Veranlagungen1.TabIndex = 2 + ' + 'UsrCntlAuswertungenFiskal_IntrastatMeldung1 + ' + Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.BackColor = System.Drawing.Color.White + Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Location = New System.Drawing.Point(3, 327) + Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Name = "UsrCntlAuswertungenFiskal_IntrastatMeldung1" + Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Size = New System.Drawing.Size(708, 235) + Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.TabIndex = 1 + ' + 'UsrCntlAuswertungenFiskalvertretung_42001 + ' + Me.UsrCntlAuswertungenFiskalvertretung_42001.BackColor = System.Drawing.Color.White + Me.UsrCntlAuswertungenFiskalvertretung_42001.Location = New System.Drawing.Point(3, 22) + Me.UsrCntlAuswertungenFiskalvertretung_42001.Name = "UsrCntlAuswertungenFiskalvertretung_42001" + Me.UsrCntlAuswertungenFiskalvertretung_42001.Size = New System.Drawing.Size(708, 234) + Me.UsrCntlAuswertungenFiskalvertretung_42001.TabIndex = 0 + ' + 'UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1 + ' + Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.BackColor = System.Drawing.Color.White + Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Location = New System.Drawing.Point(3, 149) + Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Name = "UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1" + Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Size = New System.Drawing.Size(708, 120) + Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.TabIndex = 1 + ' + 'UsrCntlAuswertungenAufschub_Abgabenliste1 + ' + Me.UsrCntlAuswertungenAufschub_Abgabenliste1.BackColor = System.Drawing.Color.White + Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Location = New System.Drawing.Point(3, 22) + Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Name = "UsrCntlAuswertungenAufschub_Abgabenliste1" + Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Size = New System.Drawing.Size(708, 180) + Me.UsrCntlAuswertungenAufschub_Abgabenliste1.TabIndex = 0 + ' 'usrCntlZOLLAuswertungen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -2855,7 +2979,7 @@ Partial Class usrCntlZOLLAuswertungen Me.Controls.Add(Me.tbcntr) Me.Controls.Add(Me.pnl) Me.Name = "usrCntlZOLLAuswertungen" - Me.Size = New System.Drawing.Size(1211, 1174) + Me.Size = New System.Drawing.Size(1126, 1174) Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() Me.grpDurmaz.ResumeLayout(False) @@ -2916,6 +3040,8 @@ Partial Class usrCntlZOLLAuswertungen CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).EndInit() Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() + Me.TabPage6.ResumeLayout(False) + Me.TabPage6.PerformLayout() Me.ResumeLayout(False) End Sub @@ -3158,4 +3284,14 @@ Partial Class usrCntlZOLLAuswertungen Friend WithEvents Button24 As Button Friend WithEvents Label36 As Label Friend WithEvents MyComboBox1 As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents TabPage6 As TabPage + Friend WithEvents Label100 As Label + Friend WithEvents cbxcbamQuelle As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents Label99 As Label + Friend WithEvents bis_CBAM As DateTimePicker + Friend WithEvents Label97 As Label + Friend WithEvents excelCbam As Button + Friend WithEvents Label96 As Label + Friend WithEvents von_CBAM As DateTimePicker + Friend WithEvents cbxCBAM_Detaildaten As CheckBox End Class diff --git a/SDL/zoll/usrCntlZOLLAuswertungen.vb b/SDL/zoll/usrCntlZOLLAuswertungen.vb index dc5b2196..3c0fed25 100644 --- a/SDL/zoll/usrCntlZOLLAuswertungen.vb +++ b/SDL/zoll/usrCntlZOLLAuswertungen.vb @@ -1,4 +1,5 @@ Imports System.IO +Imports GrapeCity.DataVisualization.Chart Public Class usrCntlZOLLAuswertungen @@ -133,8 +134,16 @@ Public Class usrCntlZOLLAuswertungen cboDYDatumArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Eröffnungsdatum", "OPEN")) cboDYDatumArt.SelectedIndex = 0 + cbxcbamQuelle.Items.Clear() + cbxcbamQuelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DAKOSY", "DAKOSY")) + cbxcbamQuelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DHF", "DHF")) + cbxcbamQuelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DHF-UNISPED", "DHF-UNI")) + cbxcbamQuelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("TELOTEC", "TELOTEC")) + cbxcbamQuelle.SelectedIndex = 0 - + Dim yearStart As Date = CDate("01.01." & Now.Year) + von_CBAM.Value = yearStart + bis_CBAM.Value = Now cboEZOLLBrg.Items.Clear() cboEZOLLBrg.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", "")) @@ -1031,6 +1040,193 @@ Public Class usrCntlZOLLAuswertungen End Sub + Private Sub Button2_Click_1(sender As Object, e As EventArgs) Handles excelCbam.Click + + If cbxcbamQuelle.SelectedIndex = 0 Then + cbxcbamQuelle.Focus() + End If + + Dim SQLString As String = "" + Dim Quelle As String = "FMZOLL" + + Select Case cbxcbamQuelle._value + Case "DAKOSY" : SQLString = getDAkosySQL(von_CBAM.Value, bis_CBAM.Value, cbxCBAM_Detaildaten.Checked) : Quelle = "FMZOLL" + Case "DHF" : SQLString = getDHFSQL(von_CBAM.Value, bis_CBAM.Value, cbxCBAM_Detaildaten.Checked) : Quelle = "EZOLL" + Case "DHF-UNI" : SQLString = getDHFSQL(von_CBAM.Value, bis_CBAM.Value, cbxCBAM_Detaildaten.Checked) : Quelle = "EZOLL_UNISPED" + Case "TELOTEC" : SQLString = getTELOTECSQL(von_CBAM.Value, bis_CBAM.Value, cbxCBAM_Detaildaten.Checked) : Quelle = "FMZOLL" + + End Select + + + Dim dt As DataTable = SQL.loadDgvBySql(SQLString, Quelle, 700) + If dt IsNot Nothing Then + cProgramFunctions.genExcelFromDT_NEW(dt) + End If + + End Sub + + Private Function getDAkosySQL(von As Date, bis As Date, mitDetaildatensaetze As Boolean) + + Return "SELECT + Empfaenger.ezaAd_TeilnehmerEORI AS EmpfängerEORI, + Adressen.AdressenNr as KundenNr, + Adressen.[Name 1] as Kunde," & IIf(mitDetaildatensaetze, " COUNT(DISTINCT eza_ANR) As Anzahl_Anmeldungen,COUNT(*) As Anzahl_Positionen,SUM(ezaWP_Eigenmasse) As Summe_Eigenmasse,SUM(ezaWP_Artikelpreis) As Summe_Rechnungspreis, MAX(eza_Anmeldedatum) As Letzte_Anmeldung,MIN(eza_Anmeldedatum) As Erste_Anmeldung, ", "") & "kkd_Email as Email, + Adressen.[E-Mail] as EMailKunde1, + Adressen.[E-Mail2] as EMailKunde2, + isnull(Offerten.OffertenNr, '-') as Offert, + Kunden.FilialenNr as FilialenNr + + + From [VERAG].[dbo].[tblDakosy_EZA] +INNER Join tblDakosy_EZA_Warenposition ON ezaWP_EzaId = eza_Id +Left Join tblDakosy_EZA_Adressen AS Empfaenger ON Empfaenger.ezaAd_EZAId = eza_Id And Empfaenger.ezaAd_AdressTyp = 'CN' + Left Join Kunden on Kunden.EORITIN = Empfaenger.ezaAd_TeilnehmerEORI +Left Join Adressen on Adressen.AdressenNr = Kunden.KundenNr +Left Join Offerten on Offerten.KundenNr = Kunden.KundenNr And OffertenNr = 65 +Left Join tblKundenKontakt on Kunden.KundenNr = kkd_KundenNr And kkd_kkaBez = 'Allgemein' + + WHERE + ISNULL(eza_anmeldedatum, eza_Trans_DatumZeit) + BETWEEN '" & von & "' AND '" & bis & "' + And eza_status BETWEEN 41 And 60 + And ( + /* Eisen & Stahl */ + ezaWP_WarennummerEZT Like '72%' + Or ezaWP_WarennummerEZT Like '7301%' -- Schienen, Profile etc. + Or ezaWP_WarennummerEZT Like '7302%' + Or ezaWP_WarennummerEZT Like '7303%' + Or ezaWP_WarennummerEZT Like '7304%' + Or ezaWP_WarennummerEZT Like '7305%' + Or ezaWP_WarennummerEZT Like '7306%' + + /* Zement */ + Or ezaWP_WarennummerEZT Like '2523%' + + /* Aluminium */ + Or ezaWP_WarennummerEZT Like '76%' + + /* Düngemittel */ + Or ezaWP_WarennummerEZT Like '3102%' + Or ezaWP_WarennummerEZT Like '3103%' + Or ezaWP_WarennummerEZT Like '3104%' + Or ezaWP_WarennummerEZT Like '3105%' + + /* Elektrizität */ + Or ezaWP_WarennummerEZT Like '2716%' + + /* Wasserstoff */ + Or ezaWP_WarennummerEZT Like '280410%' + ) + + GROUP BY + Empfaenger.ezaAd_TeilnehmerEORI,Adressen.AdressenNr, Adressen.[Name 1],Adressen.[E-Mail],Adressen.[E-Mail2], kkd_Email, Offerten.OffertenNr, Kunden.FilialenNr" + + + End Function + + Private Function getDHFSQL(von As Date, bis As Date, mitDetaildatensaetze As Boolean) + + Return " select + (SELECT TIN FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID ))EORI_Empfänger, + Adressen.AdressenNr as KundenNr, + Adressen.[Name 1] as Kunde, " & IIf(mitDetaildatensaetze, "COUNT(DISTINCT CRN) As Anzahl_Anmeldungen, COUNT(*) As Anzahl_Positionen,MAX(DecDT) As Letzte_Anmeldung,MIN(DecDT) As Erste_Anmeldung,SUM(Net) As Summe_Eigenmasse,SUM(ItVal) As Summe_Rechnungspreis, ", "") & + "kkd_Email as Email, +Adressen.[E-Mail] as EMailKunde1, + Adressen.[E-Mail2] as EMailKunde2, + isnull(Offerten.OffertenNr, '-') as Offert, + Kunden.FilialenNr as FilialenNr + + + --, (SELECT TIN FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID ))EORI_Empfänger + --, (SELECT Na FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID ))Empfänger + from zsAnmRefs + inner join zsAnmGdsitem on zsAnmRefs.LizenzNr=zsAnmGdsitem.LizenzNr and zsAnmRefs.AnmID=zsAnmGdsitem.AnmID and zsAnmRefs.VorgangID=zsAnmGdsitem.VorgangID and zsAnmRefs.OperatorID=zsAnmGdsitem.OperatorID + inner join zsAnmHea on zsAnmHea.LizenzNr=zsAnmGdsitem.LizenzNr and zsAnmHea.AnmID=zsAnmGdsitem.AnmID and zsAnmHea.VorgangID=zsAnmGdsitem.VorgangID and zsAnmHea.OperatorID=zsAnmGdsitem.OperatorID + inner join zsAnmDeclarant on zsAnmHea.LizenzNr=zsAnmDeclarant.LizenzNr and zsAnmHea.AnmID=zsAnmDeclarant.AnmID and zsAnmHea.VorgangID=zsAnmDeclarant.VorgangID and zsAnmHea.OperatorID=zsAnmDeclarant.OperatorID + inner join zsAnmTransp on zsAnmHea.LizenzNr=zsAnmTransp.LizenzNr and zsAnmHea.AnmID=zsAnmTransp.AnmID and zsAnmHea.VorgangID=zsAnmTransp.VorgangID and zsAnmHea.OperatorID=zsAnmTransp.OperatorID + Left Join [FMZOLL\SQLFMZOLL].[VERAG].[dbo].[Kunden] on Kunden.EORITIN = (SELECT TIN FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID )) + Left Join [FMZOLL\SQLFMZOLL].[VERAG].[dbo].Adressen on Adressen.AdressenNr = Kunden.KundenNr + Left Join [FMZOLL\SQLFMZOLL].[VERAG].[dbo].Offerten on Offerten.KundenNr = Kunden.KundenNr And OffertenNr = 65 + Left Join [FMZOLL\SQLFMZOLL].[VERAG].[dbo].tblKundenKontakt on Kunden.KundenNr = kkd_KundenNr And kkd_kkaBez = 'Allgemein' + where DecDT between '" & von & "' AND '" & bis & "' + + and + ( + left(ComCd,4) IN (2523,2716,2808,2814,3102,3105,7201,7203,7318,7326,7601,7616) + OR left(ComCd,4) between 7301 and 7311 + OR left(ComCd,4) between 7205 and 7229 + OR left(ComCd,4) between 7603 and 7614 + OR ComCd like '25070080%' + OR ComCd like '283421%' + OR ComCd like '260112%' + OR ComCd like '720211%' + OR ComCd like '720219%' + OR ComCd like '720241%' + OR ComCd like '720249%' + OR ComCd like '720260%' + OR ComCd like '280410%' + ) + and ComCd not like '310560%' + and crn is not null + + + group by TIN, Adressen.AdressenNr ,Adressen.[Name 1],Adressen.[E-Mail],Adressen.[E-Mail2], kkd_Email, Offerten.OffertenNr, Kunden.FilialenNr, zsAnmHea.LizenzNr, zsAnmHea.OperatorID, zsAnmHea.VorgangID, zsAnmHea.AnmID" + + + End Function + + Private Function getTELOTECSQL(von As Date, bis As Date, mitDetaildatensaetze As Boolean) + + Return " SELECT + ConeeTra_TIN as EmpfängerEORI, + Adressen.AdressenNr as KundenNr, + Adressen.[Name 1] as Kunde," & IIf(mitDetaildatensaetze, " COUNT(DISTINCT telanm_CRN) As Anzahl_Anmeldungen,COUNT(*) As Anzahl_Positionen,MAX(dec_CreateDate) As Letzte_Anmeldung,MIN(dec_CreateDate) As Erste_Anmeldung,SUM(dec_TotNet) As Summe_Eigenmasse,SUM(ValData_InvVal) As Summe_Rechnungspreis, ", "") & + "kkd_Email as Email, +Adressen.[E-Mail] as EMailKunde1, + Adressen.[E-Mail2] as EMailKunde2, + isnull(Offerten.OffertenNr, '-') as Offert, + Kunden.FilialenNr as FilialenNr + + + FROM [VERAG].[dbo].[tblTelotec_Anmeldung] + inner join tblTelotec_Positionsdaten on telpos_telanmId=telanm_id +Left Join Kunden on Kunden.EORITIN = ConeeTra_TIN +Left Join Adressen on Adressen.AdressenNr = Kunden.KundenNr +Left Join Offerten on Offerten.KundenNr = Kunden.KundenNr And OffertenNr = 65 +Left Join tblKundenKontakt on Kunden.KundenNr = kkd_KundenNr And kkd_kkaBez = 'Allgemein' + + where 1=1 + +and + ( + left(Item_ComCd,4) IN (2523,2716,2808,2814,3102,3105,7201,7203,7318,7326,7601,7616) + OR left(Item_ComCd,4) between 7301 and 7311 + OR left(Item_ComCd,4) between 7205 and 7229 + OR left(Item_ComCd,4) between 7603 and 7614 + OR Item_ComCd like '25070080%' + OR Item_ComCd like '283421%' + OR Item_ComCd like '260112%' + OR Item_ComCd like '720211%' + OR Item_ComCd like '720219%' + OR Item_ComCd like '720241%' + OR Item_ComCd like '720249%' + OR Item_ComCd like '720260%' + OR Item_ComCd like '280410%' + ) + and Item_ComCd not like '310560%' + + and telnam_aktuellsteNachricht=1 + + and telanm_ART ='EUA' + and dec_CreateDate between '" & von & "' AND '" & bis & "' + + group by ConeeTra_TIN, Adressen.AdressenNr,Adressen.[Name 1],Adressen.[E-Mail],Adressen.[E-Mail2], kkd_Email, Offerten.OffertenNr, Kunden.FilialenNr" + + + End Function + + + 'Private Sub Button5_Click(sender As Object, e As EventArgs, Optional exportPDF As String = "", Optional exportEXCEL As String = "") Handles Button5.Click ' Dim sqlStr = "" diff --git a/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb b/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb index dd4ce49f..19438430 100644 --- a/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb +++ b/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb @@ -40,6 +40,13 @@ Public Class cSicherheiten LOAD() End Sub + Sub New(gs_gsID, gs_posNr, gs_posSubNr) + Me.gs_gsId = gs_gsID + Me.gs_posNr = gs_posNr + Me.gs_posSubNr = gs_posSubNr + LOADSubNr() + End Sub + Sub New(gs_gsNr) Me.gs_gsNr = gs_gsNr LOADGSNR() @@ -49,7 +56,7 @@ Public Class cSicherheiten End Sub - Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) + Function getParameterList(Optional WithoutPosSubNr As Boolean = False) As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_gsId", gs_gsId,, True)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_ATBNr", gs_ATBNr)) @@ -76,7 +83,7 @@ Public Class cSicherheiten list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_zuletztgeandert", gs_zuletztgeandert)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_systemuser", gs_systemuser)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_MRNNr", gs_MRNNr)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_posSubNr", gs_posSubNr)) + If Not WithoutPosSubNr Then list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_posSubNr", gs_posSubNr)) Return list End Function @@ -110,19 +117,21 @@ Public Class cSicherheiten - Public Function UPDATEWithNewPosNr() As Integer + Public Function UPDATEWithNewPosNr(Optional ingorePosSubNr As Boolean = False) As Integer - Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList(ingorePosSubNr) - Dim sqlstr = " BEGIN " & getUpdateCmd() & " END " + Dim sqlstr = " BEGIN " & getUpdateCmd(ingorePosSubNr) & " END " - gs_gsId = SQL.doSQLVarListID(gs_gsId, sqlstr, "AVISO", , List) + gs_gsId = SQL.doSQLVarListID(gs_gsId, sqlstr, "AVISO", , list) Return gs_gsId End Function + + Public Sub LOAD() Try hasEntry = False @@ -152,6 +161,36 @@ Public Class cSicherheiten End Try End Sub + Public Sub LOADSubNr() + Try + hasEntry = False + Using conn As SqlConnection = SQL.GetNewOpenConnectionAVISO() + Using cmd As New SqlCommand("SELECT * FROM [tblGesamtsicherheit] WHERE gs_gsId=@gs_gsId AND gs_posNr=@gs_posNr AND gs_posSubNr=@gs_posSubNr ", conn) + cmd.Parameters.AddWithValue("@gs_gsID", gs_gsId) + cmd.Parameters.AddWithValue("@gs_posNr", gs_posNr) + cmd.Parameters.AddWithValue("@gs_posSubNr", gs_posSubNr) + Dim dr = cmd.ExecuteReader() + If dr.Read Then + For Each li In getParameterList() + Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable) + + If dr.Item(li.Text) Is DBNull.Value Then + propInfo.SetValue(Me, Nothing) + Else + propInfo.SetValue(Me, dr.Item(li.Text)) + End If + + Next + hasEntry = True + End If + dr.Close() + End Using + End Using + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + End Sub + Public Sub LOADGSNR() Try @@ -184,9 +223,9 @@ Public Class cSicherheiten - Public Function getUpdateCmd() As String + Public Function getUpdateCmd(Optional ingorePosSubNr As Boolean = False) As String Try - Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList(ingorePosSubNr) Dim str As String = "" For Each i In list From da8cf8854af7b922693781f616db46436c28a5a1 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 17 Dec 2025 17:16:16 +0100 Subject: [PATCH 7/9] cFakt, Kundenblatt, etc. --- SDL/Fakturierung/cFakturierung.vb | 3 +- SDL/kunden/frmKundenblatt.vb | 2 + .../usrcntlKundeBearbeitenFull.Designer.vb | 602 ++++++++++-------- SDL/kunden/usrcntlKundeBearbeitenFull.vb | 7 +- SDL/mdm/usrCntlMDMAuswertungen.Designer.vb | 166 ++++- SDL/mdm/usrCntlMDMAuswertungen.resx | 8 + SDL/mdm/usrCntlMDMAuswertungen.vb | 40 ++ .../Classes/cKundenErweitert.vb | 4 + 8 files changed, 535 insertions(+), 297 deletions(-) diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index b43a5d95..bf5f7e7a 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -2353,8 +2353,9 @@ Public Class cFakturierung Case Else rpt.lblLeistungUeberschrift.Text = "RENR" + rpt.lblLeistungUeberschrift.Text = "RE Datum" rpt.lblAnzahlUeberschrift.Text = "VZ Tage" - rpt.lblSteuerpflichtigUeberschrift.Text = "Zahlungsbetrag" + rpt.lblSteuerpflichtigUeberschrift.Text = "RE Betrag" rpt.lblSteuerfreiUeberschrift.Text = "Verzugszinsen" 'rpt.lbl_onlyZR_ZinsenUeberschrift.Text = "Zinsen p.a." End Select diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb index 2915485d..1dd0e546 100644 --- a/SDL/kunden/frmKundenblatt.vb +++ b/SDL/kunden/frmKundenblatt.vb @@ -219,6 +219,8 @@ Public Class frmKundenblatt Dim path = DS.GET_TOP1_PATH 'cDATENSERVER.getTOP1Path("GRAFIK", "FIRMENLOGOS", kdNr) If path <> "" Then picLogo.ImageLocation = path + Else + picLogo.ImageLocation = Nothing End If Catch ex As Exception diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb index 12bb686c..7cbe19de 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb @@ -23,34 +23,34 @@ Partial Class usrcntlKundeBearbeitenFull Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle32 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle33 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle34 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle35 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle36 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle37 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle38 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle39 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle40 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle41 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle42 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle43 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle44 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle45 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle46 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle47 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle48 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle49 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle50 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle51 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle52 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle53 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle54 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle55 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle56 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.tbcntrDetails = New System.Windows.Forms.TabControl() Me.tbAbfertigung = New System.Windows.Forms.TabPage() Me.cbxVerzolltBeiExport = New System.Windows.Forms.CheckBox() @@ -285,6 +285,11 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvIDS_Standard = New System.Windows.Forms.DataGridView() Me.Kunden = New System.Windows.Forms.TabPage() Me.dgvIDS_Rabatte = New System.Windows.Forms.DataGridView() + Me.TabPage2 = New System.Windows.Forms.TabPage() + Me.txtATEZ_GreenpulseID = New System.Windows.Forms.TextBox() + Me.Label118 = New System.Windows.Forms.Label() + Me.txtATEZ_LogicustID = New System.Windows.Forms.TextBox() + Me.Label119 = New System.Windows.Forms.Label() Me.cbxCSInsolvent = New System.Windows.Forms.CheckBox() Me.cbxCS_Added = New System.Windows.Forms.CheckBox() Me.Label113 = New System.Windows.Forms.Label() @@ -428,11 +433,10 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboAuswahl = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.TabPage2 = New System.Windows.Forms.TabPage() - Me.txtATEZ_GreenpulseID = New System.Windows.Forms.TextBox() - Me.Label118 = New System.Windows.Forms.Label() - Me.txtATEZ_LogicustID = New System.Windows.Forms.TextBox() - Me.Label119 = New System.Windows.Forms.Label() + Me.Label120 = New System.Windows.Forms.Label() + Me.txtSEG_vom = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtSEG_Summe = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label121 = New System.Windows.Forms.Label() Me.tbcntrDetails.SuspendLayout() Me.tbAbfertigung.SuspendLayout() Me.tbcntrAbf.SuspendLayout() @@ -465,6 +469,7 @@ Partial Class usrcntlKundeBearbeitenFull CType(Me.dgvIDS_Standard, System.ComponentModel.ISupportInitialize).BeginInit() Me.Kunden.SuspendLayout() CType(Me.dgvIDS_Rabatte, System.ComponentModel.ISupportInitialize).BeginInit() + Me.TabPage2.SuspendLayout() CType(Me.dgvSonst_IDSKunden, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbSchnittstellen.SuspendLayout() CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -479,7 +484,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.TabPage11.SuspendLayout() Me.pnlNeukunde.SuspendLayout() Me.cnsBankverbindungen.SuspendLayout() - Me.TabPage2.SuspendLayout() Me.SuspendLayout() ' 'tbcntrDetails @@ -2282,6 +2286,10 @@ Partial Class usrcntlKundeBearbeitenFull ' 'tbVersicherung ' + Me.tbVersicherung.Controls.Add(Me.Label121) + Me.tbVersicherung.Controls.Add(Me.Label120) + Me.tbVersicherung.Controls.Add(Me.txtSEG_vom) + Me.tbVersicherung.Controls.Add(Me.txtSEG_Summe) Me.tbVersicherung.Controls.Add(Me.cbxBlanko) Me.tbVersicherung.Controls.Add(Me.Label105) Me.tbVersicherung.Controls.Add(Me.Label106) @@ -2396,7 +2404,7 @@ Partial Class usrcntlKundeBearbeitenFull 'Label81 ' Me.Label81.AutoSize = True - Me.Label81.Location = New System.Drawing.Point(419, 168) + Me.Label81.Location = New System.Drawing.Point(419, 181) Me.Label81.Name = "Label81" Me.Label81.Size = New System.Drawing.Size(98, 13) Me.Label81.TabIndex = 45 @@ -2405,7 +2413,7 @@ Partial Class usrcntlKundeBearbeitenFull 'Label82 ' Me.Label82.AutoSize = True - Me.Label82.Location = New System.Drawing.Point(311, 168) + Me.Label82.Location = New System.Drawing.Point(311, 181) Me.Label82.Name = "Label82" Me.Label82.Size = New System.Drawing.Size(24, 13) Me.Label82.TabIndex = 43 @@ -2414,7 +2422,7 @@ Partial Class usrcntlKundeBearbeitenFull 'cbxInkassoUebergeben ' Me.cbxInkassoUebergeben.AutoSize = True - Me.cbxInkassoUebergeben.Location = New System.Drawing.Point(159, 167) + Me.cbxInkassoUebergeben.Location = New System.Drawing.Point(159, 180) Me.cbxInkassoUebergeben.Name = "cbxInkassoUebergeben" Me.cbxInkassoUebergeben.Size = New System.Drawing.Size(156, 17) Me.cbxInkassoUebergeben.TabIndex = 42 @@ -2434,7 +2442,7 @@ Partial Class usrcntlKundeBearbeitenFull 'Label35 ' Me.Label35.AutoSize = True - Me.Label35.Location = New System.Drawing.Point(419, 142) + Me.Label35.Location = New System.Drawing.Point(419, 155) Me.Label35.Name = "Label35" Me.Label35.Size = New System.Drawing.Size(22, 13) Me.Label35.TabIndex = 22 @@ -2443,7 +2451,7 @@ Partial Class usrcntlKundeBearbeitenFull 'Label27 ' Me.Label27.AutoSize = True - Me.Label27.Location = New System.Drawing.Point(419, 116) + Me.Label27.Location = New System.Drawing.Point(419, 129) Me.Label27.Name = "Label27" Me.Label27.Size = New System.Drawing.Size(98, 13) Me.Label27.TabIndex = 17 @@ -2452,7 +2460,7 @@ Partial Class usrcntlKundeBearbeitenFull 'Label24 ' Me.Label24.AutoSize = True - Me.Label24.Location = New System.Drawing.Point(419, 89) + Me.Label24.Location = New System.Drawing.Point(419, 102) Me.Label24.Name = "Label24" Me.Label24.Size = New System.Drawing.Size(55, 13) Me.Label24.TabIndex = 12 @@ -2462,7 +2470,7 @@ Partial Class usrcntlKundeBearbeitenFull 'cbxNichtVersicherbar ' Me.cbxNichtVersicherbar.AutoSize = True - Me.cbxNichtVersicherbar.Location = New System.Drawing.Point(159, 39) + Me.cbxNichtVersicherbar.Location = New System.Drawing.Point(159, 30) Me.cbxNichtVersicherbar.Name = "cbxNichtVersicherbar" Me.cbxNichtVersicherbar.Size = New System.Drawing.Size(142, 17) Me.cbxNichtVersicherbar.TabIndex = 2 @@ -2472,7 +2480,7 @@ Partial Class usrcntlKundeBearbeitenFull 'Label17 ' Me.Label17.AutoSize = True - Me.Label17.Location = New System.Drawing.Point(419, 65) + Me.Label17.Location = New System.Drawing.Point(419, 54) Me.Label17.Name = "Label17" Me.Label17.Size = New System.Drawing.Size(86, 13) Me.Label17.TabIndex = 7 @@ -2481,7 +2489,7 @@ Partial Class usrcntlKundeBearbeitenFull 'Label8 ' Me.Label8.AutoSize = True - Me.Label8.Location = New System.Drawing.Point(311, 142) + Me.Label8.Location = New System.Drawing.Point(311, 155) Me.Label8.Name = "Label8" Me.Label8.Size = New System.Drawing.Size(24, 13) Me.Label8.TabIndex = 20 @@ -2490,7 +2498,7 @@ Partial Class usrcntlKundeBearbeitenFull 'cbxAnerkVersFall ' Me.cbxAnerkVersFall.AutoSize = True - Me.cbxAnerkVersFall.Location = New System.Drawing.Point(159, 141) + Me.cbxAnerkVersFall.Location = New System.Drawing.Point(159, 154) Me.cbxAnerkVersFall.Name = "cbxAnerkVersFall" Me.cbxAnerkVersFall.Size = New System.Drawing.Size(130, 17) Me.cbxAnerkVersFall.TabIndex = 19 @@ -2500,7 +2508,7 @@ Partial Class usrcntlKundeBearbeitenFull 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(311, 116) + Me.Label2.Location = New System.Drawing.Point(311, 129) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(24, 13) Me.Label2.TabIndex = 15 @@ -2509,7 +2517,7 @@ Partial Class usrcntlKundeBearbeitenFull 'cbxVersicherungUebergeben ' Me.cbxVersicherungUebergeben.AutoSize = True - Me.cbxVersicherungUebergeben.Location = New System.Drawing.Point(159, 115) + Me.cbxVersicherungUebergeben.Location = New System.Drawing.Point(159, 128) Me.cbxVersicherungUebergeben.Name = "cbxVersicherungUebergeben" Me.cbxVersicherungUebergeben.Size = New System.Drawing.Size(142, 17) Me.cbxVersicherungUebergeben.TabIndex = 14 @@ -2519,7 +2527,7 @@ Partial Class usrcntlKundeBearbeitenFull 'Label6 ' Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(305, 89) + Me.Label6.Location = New System.Drawing.Point(305, 102) Me.Label6.Name = "Label6" Me.Label6.Size = New System.Drawing.Size(30, 13) Me.Label6.TabIndex = 10 @@ -2528,7 +2536,7 @@ Partial Class usrcntlKundeBearbeitenFull 'cbxDeckungsstopp ' Me.cbxDeckungsstopp.AutoSize = True - Me.cbxDeckungsstopp.Location = New System.Drawing.Point(159, 88) + Me.cbxDeckungsstopp.Location = New System.Drawing.Point(159, 101) Me.cbxDeckungsstopp.Name = "cbxDeckungsstopp" Me.cbxDeckungsstopp.Size = New System.Drawing.Size(101, 17) Me.cbxDeckungsstopp.TabIndex = 9 @@ -2573,7 +2581,7 @@ Partial Class usrcntlKundeBearbeitenFull 'Label55 ' Me.Label55.AutoSize = True - Me.Label55.Location = New System.Drawing.Point(305, 65) + Me.Label55.Location = New System.Drawing.Point(305, 54) Me.Label55.Name = "Label55" Me.Label55.Size = New System.Drawing.Size(30, 13) Me.Label55.TabIndex = 5 @@ -2622,7 +2630,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.Label54.AutoSize = True Me.Label54.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label54.Location = New System.Drawing.Point(7, 65) + Me.Label54.Location = New System.Drawing.Point(6, 58) Me.Label54.Name = "Label54" Me.Label54.Size = New System.Drawing.Size(110, 13) Me.Label54.TabIndex = 3 @@ -2762,7 +2770,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtInkasso_GemeldeterBetrag._Waehrung = True Me.txtInkasso_GemeldeterBetrag._WaehrungZeichen = True Me.txtInkasso_GemeldeterBetrag.ForeColor = System.Drawing.Color.Red - Me.txtInkasso_GemeldeterBetrag.Location = New System.Drawing.Point(523, 165) + Me.txtInkasso_GemeldeterBetrag.Location = New System.Drawing.Point(523, 178) Me.txtInkasso_GemeldeterBetrag.MaxLength = 10 Me.txtInkasso_GemeldeterBetrag.MaxLineLength = -1 Me.txtInkasso_GemeldeterBetrag.MaxLines_Warning = "" @@ -2788,7 +2796,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtInkassoUebergebenAm._WaehrungZeichen = True Me.txtInkassoUebergebenAm.Enabled = False Me.txtInkassoUebergebenAm.ForeColor = System.Drawing.Color.Red - Me.txtInkassoUebergebenAm.Location = New System.Drawing.Point(341, 165) + Me.txtInkassoUebergebenAm.Location = New System.Drawing.Point(341, 178) Me.txtInkassoUebergebenAm.MaxLength = 10 Me.txtInkassoUebergebenAm.MaxLineLength = -1 Me.txtInkassoUebergebenAm.MaxLines_Warning = "" @@ -2836,7 +2844,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtAnerkVersFallAb._Waehrung = False Me.txtAnerkVersFallAb._WaehrungZeichen = True Me.txtAnerkVersFallAb.ForeColor = System.Drawing.Color.Red - Me.txtAnerkVersFallAb.Location = New System.Drawing.Point(449, 139) + Me.txtAnerkVersFallAb.Location = New System.Drawing.Point(449, 152) Me.txtAnerkVersFallAb.MaxLength = 10 Me.txtAnerkVersFallAb.MaxLineLength = -1 Me.txtAnerkVersFallAb.MaxLines_Warning = "" @@ -2861,7 +2869,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtVersicherung_GemeldeterBetrag._Waehrung = True Me.txtVersicherung_GemeldeterBetrag._WaehrungZeichen = True Me.txtVersicherung_GemeldeterBetrag.ForeColor = System.Drawing.Color.Red - Me.txtVersicherung_GemeldeterBetrag.Location = New System.Drawing.Point(523, 113) + Me.txtVersicherung_GemeldeterBetrag.Location = New System.Drawing.Point(523, 126) Me.txtVersicherung_GemeldeterBetrag.MaxLength = 10 Me.txtVersicherung_GemeldeterBetrag.MaxLineLength = -1 Me.txtVersicherung_GemeldeterBetrag.MaxLines_Warning = "" @@ -2886,7 +2894,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtVersUebergebenOPSaldo._Waehrung = True Me.txtVersUebergebenOPSaldo._WaehrungZeichen = True Me.txtVersUebergebenOPSaldo.ForeColor = System.Drawing.Color.Red - Me.txtVersUebergebenOPSaldo.Location = New System.Drawing.Point(480, 86) + Me.txtVersUebergebenOPSaldo.Location = New System.Drawing.Point(480, 99) Me.txtVersUebergebenOPSaldo.MaxLength = 10 Me.txtVersUebergebenOPSaldo.MaxLineLength = -1 Me.txtVersUebergebenOPSaldo.MaxLines_Warning = "" @@ -2912,7 +2920,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtVersicherungDeckungsquote._Waehrung = False Me.txtVersicherungDeckungsquote._WaehrungZeichen = True Me.txtVersicherungDeckungsquote.ForeColor = System.Drawing.Color.Red - Me.txtVersicherungDeckungsquote.Location = New System.Drawing.Point(523, 62) + Me.txtVersicherungDeckungsquote.Location = New System.Drawing.Point(523, 51) Me.txtVersicherungDeckungsquote.MaxLength = 10 Me.txtVersicherungDeckungsquote.MaxLineLength = -1 Me.txtVersicherungDeckungsquote.MaxLines_Warning = "" @@ -2938,7 +2946,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtAnerkVersFallAm._WaehrungZeichen = True Me.txtAnerkVersFallAm.Enabled = False Me.txtAnerkVersFallAm.ForeColor = System.Drawing.Color.Red - Me.txtAnerkVersFallAm.Location = New System.Drawing.Point(341, 139) + Me.txtAnerkVersFallAm.Location = New System.Drawing.Point(341, 152) Me.txtAnerkVersFallAm.MaxLength = 10 Me.txtAnerkVersFallAm.MaxLineLength = -1 Me.txtAnerkVersFallAm.MaxLines_Warning = "" @@ -2964,7 +2972,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtVersicherungUebergebenAm._WaehrungZeichen = True Me.txtVersicherungUebergebenAm.Enabled = False Me.txtVersicherungUebergebenAm.ForeColor = System.Drawing.Color.Red - Me.txtVersicherungUebergebenAm.Location = New System.Drawing.Point(341, 113) + Me.txtVersicherungUebergebenAm.Location = New System.Drawing.Point(341, 126) Me.txtVersicherungUebergebenAm.MaxLength = 10 Me.txtVersicherungUebergebenAm.MaxLineLength = -1 Me.txtVersicherungUebergebenAm.MaxLines_Warning = "" @@ -2990,7 +2998,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtDeckungsstoppDatum._WaehrungZeichen = True Me.txtDeckungsstoppDatum.Enabled = False Me.txtDeckungsstoppDatum.ForeColor = System.Drawing.Color.Red - Me.txtDeckungsstoppDatum.Location = New System.Drawing.Point(341, 86) + Me.txtDeckungsstoppDatum.Location = New System.Drawing.Point(341, 99) Me.txtDeckungsstoppDatum.MaxLength = 10 Me.txtDeckungsstoppDatum.MaxLineLength = -1 Me.txtDeckungsstoppDatum.MaxLines_Warning = "" @@ -3089,7 +3097,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtVers_VersicherungssummeVon._Waehrung = False Me.txtVers_VersicherungssummeVon._WaehrungZeichen = True Me.txtVers_VersicherungssummeVon.ForeColor = System.Drawing.Color.Red - Me.txtVers_VersicherungssummeVon.Location = New System.Drawing.Point(341, 62) + Me.txtVers_VersicherungssummeVon.Location = New System.Drawing.Point(341, 51) Me.txtVers_VersicherungssummeVon.MaxLength = 10 Me.txtVers_VersicherungssummeVon.MaxLineLength = -1 Me.txtVers_VersicherungssummeVon.MaxLines_Warning = "" @@ -3187,7 +3195,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtVers_Versicherungssumme._Waehrung = True Me.txtVers_Versicherungssumme._WaehrungZeichen = True Me.txtVers_Versicherungssumme.ForeColor = System.Drawing.Color.Red - Me.txtVers_Versicherungssumme.Location = New System.Drawing.Point(159, 62) + Me.txtVers_Versicherungssumme.Location = New System.Drawing.Point(159, 51) Me.txtVers_Versicherungssumme.MaxLineLength = -1 Me.txtVers_Versicherungssumme.MaxLines_Warning = "" Me.txtVers_Versicherungssumme.MaxLines_Warning_Label = Nothing @@ -3271,8 +3279,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvUmsatzbericht.AllowUserToDeleteRows = False Me.dgvUmsatzbericht.AllowUserToOrderColumns = True Me.dgvUmsatzbericht.AllowUserToResizeRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle29.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle29 Me.dgvUmsatzbericht.BackgroundColor = System.Drawing.Color.White Me.dgvUmsatzbericht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvUmsatzbericht.Location = New System.Drawing.Point(6, 25) @@ -3371,8 +3379,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvOffenePosten.AllowUserToDeleteRows = False Me.dgvOffenePosten.AllowUserToOrderColumns = True Me.dgvOffenePosten.AllowUserToResizeRows = False - DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle30.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle30 Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvOffenePosten.Location = New System.Drawing.Point(6, 38) @@ -3547,40 +3555,40 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvKreditkarten.AllowUserToDeleteRows = False Me.dgvKreditkarten.AllowUserToOrderColumns = True Me.dgvKreditkarten.AllowUserToResizeRows = False - DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle31.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle31 Me.dgvKreditkarten.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle32.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle32.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle32 Me.dgvKreditkarten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle5 + DataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle33.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle33.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle33 Me.dgvKreditkarten.Location = New System.Drawing.Point(9, 20) Me.dgvKreditkarten.MultiSelect = False Me.dgvKreditkarten.Name = "dgvKreditkarten" - DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle6 + DataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle34.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle34 Me.dgvKreditkarten.RowHeadersVisible = False - DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle7 + DataGridViewCellStyle35.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle35 Me.dgvKreditkarten.RowTemplate.DefaultCellStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.dgvKreditkarten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvKreditkarten.Size = New System.Drawing.Size(642, 312) @@ -3660,26 +3668,26 @@ Partial Class usrcntlKundeBearbeitenFull ' 'dgvMWST ' - DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvMWST.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8 + DataGridViewCellStyle36.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvMWST.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle36 Me.dgvMWST.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvMWST.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle9 + DataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle37.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle37.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle37.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle37.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle37.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvMWST.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle37 Me.dgvMWST.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvMWST.DefaultCellStyle = DataGridViewCellStyle10 + DataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle38.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle38.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle38.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle38.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle38.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvMWST.DefaultCellStyle = DataGridViewCellStyle38 Me.dgvMWST.Location = New System.Drawing.Point(9, 359) Me.dgvMWST.Name = "dgvMWST" Me.dgvMWST.Size = New System.Drawing.Size(171, 125) @@ -3764,26 +3772,26 @@ Partial Class usrcntlKundeBearbeitenFull ' 'dgvUstv_LaenderUndSteuernummern ' - DataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11 + DataGridViewCellStyle39.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle39 Me.dgvUstv_LaenderUndSteuernummern.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle12 + DataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle40.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle40.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle40.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle40.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle40.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle40 Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvUstv_LaenderUndSteuernummern.DefaultCellStyle = DataGridViewCellStyle13 + DataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle41.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle41.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle41.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle41.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle41.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvUstv_LaenderUndSteuernummern.DefaultCellStyle = DataGridViewCellStyle41 Me.dgvUstv_LaenderUndSteuernummern.Location = New System.Drawing.Point(9, 94) Me.dgvUstv_LaenderUndSteuernummern.Name = "dgvUstv_LaenderUndSteuernummern" Me.dgvUstv_LaenderUndSteuernummern.Size = New System.Drawing.Size(657, 259) @@ -4035,26 +4043,26 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvIDS_Standard.AllowUserToAddRows = False Me.dgvIDS_Standard.AllowUserToDeleteRows = False Me.dgvIDS_Standard.AllowUserToResizeRows = False - DataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvIDS_Standard.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14 + DataGridViewCellStyle42.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvIDS_Standard.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle42 Me.dgvIDS_Standard.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvIDS_Standard.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle15 + DataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle43.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle43.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle43.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle43.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle43.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvIDS_Standard.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle43 Me.dgvIDS_Standard.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvIDS_Standard.DefaultCellStyle = DataGridViewCellStyle16 + DataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle44.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle44.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle44.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle44.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle44.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle44.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvIDS_Standard.DefaultCellStyle = DataGridViewCellStyle44 Me.dgvIDS_Standard.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvIDS_Standard.Location = New System.Drawing.Point(3, 3) Me.dgvIDS_Standard.Name = "dgvIDS_Standard" @@ -4077,32 +4085,80 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvIDS_Rabatte.AllowUserToAddRows = False Me.dgvIDS_Rabatte.AllowUserToDeleteRows = False Me.dgvIDS_Rabatte.AllowUserToResizeRows = False - DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvIDS_Rabatte.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17 + DataGridViewCellStyle45.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvIDS_Rabatte.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle45 Me.dgvIDS_Rabatte.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvIDS_Rabatte.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle18 + DataGridViewCellStyle46.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle46.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle46.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle46.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle46.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle46.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle46.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvIDS_Rabatte.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle46 Me.dgvIDS_Rabatte.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvIDS_Rabatte.DefaultCellStyle = DataGridViewCellStyle19 + DataGridViewCellStyle47.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle47.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle47.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle47.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle47.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle47.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle47.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvIDS_Rabatte.DefaultCellStyle = DataGridViewCellStyle47 Me.dgvIDS_Rabatte.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvIDS_Rabatte.Location = New System.Drawing.Point(3, 3) Me.dgvIDS_Rabatte.Name = "dgvIDS_Rabatte" Me.dgvIDS_Rabatte.Size = New System.Drawing.Size(645, 169) Me.dgvIDS_Rabatte.TabIndex = 34 ' + 'TabPage2 + ' + Me.TabPage2.Controls.Add(Me.txtATEZ_GreenpulseID) + Me.TabPage2.Controls.Add(Me.Label118) + Me.TabPage2.Controls.Add(Me.txtATEZ_LogicustID) + Me.TabPage2.Controls.Add(Me.Label119) + Me.TabPage2.Location = New System.Drawing.Point(4, 22) + Me.TabPage2.Name = "TabPage2" + Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) + Me.TabPage2.Size = New System.Drawing.Size(651, 175) + Me.TabPage2.TabIndex = 2 + Me.TabPage2.Text = "ATEZ KundenNr" + Me.TabPage2.UseVisualStyleBackColor = True + ' + 'txtATEZ_GreenpulseID + ' + Me.txtATEZ_GreenpulseID.Location = New System.Drawing.Point(97, 43) + Me.txtATEZ_GreenpulseID.Name = "txtATEZ_GreenpulseID" + Me.txtATEZ_GreenpulseID.Size = New System.Drawing.Size(314, 20) + Me.txtATEZ_GreenpulseID.TabIndex = 17 + ' + 'Label118 + ' + Me.Label118.AutoSize = True + Me.Label118.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label118.Location = New System.Drawing.Point(14, 46) + Me.Label118.Name = "Label118" + Me.Label118.Size = New System.Drawing.Size(78, 13) + Me.Label118.TabIndex = 16 + Me.Label118.Text = "Greenpulse-ID:" + ' + 'txtATEZ_LogicustID + ' + Me.txtATEZ_LogicustID.Location = New System.Drawing.Point(97, 14) + Me.txtATEZ_LogicustID.Name = "txtATEZ_LogicustID" + Me.txtATEZ_LogicustID.Size = New System.Drawing.Size(314, 20) + Me.txtATEZ_LogicustID.TabIndex = 15 + ' + 'Label119 + ' + Me.Label119.AutoSize = True + Me.Label119.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label119.Location = New System.Drawing.Point(14, 17) + Me.Label119.Name = "Label119" + Me.Label119.Size = New System.Drawing.Size(64, 13) + Me.Label119.TabIndex = 14 + Me.Label119.Text = "Logicust-ID:" + ' 'cbxCSInsolvent ' Me.cbxCSInsolvent.AutoSize = True @@ -4268,26 +4324,26 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvSonst_IDSKunden.AllowUserToAddRows = False Me.dgvSonst_IDSKunden.AllowUserToDeleteRows = False Me.dgvSonst_IDSKunden.AllowUserToResizeRows = False - DataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle20 + DataGridViewCellStyle48.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle48 Me.dgvSonst_IDSKunden.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSonst_IDSKunden.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle21 + DataGridViewCellStyle49.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle49.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle49.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle49.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle49.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle49.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle49.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSonst_IDSKunden.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle49 Me.dgvSonst_IDSKunden.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvSonst_IDSKunden.DefaultCellStyle = DataGridViewCellStyle22 + DataGridViewCellStyle50.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle50.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle50.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle50.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle50.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle50.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle50.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvSonst_IDSKunden.DefaultCellStyle = DataGridViewCellStyle50 Me.dgvSonst_IDSKunden.Location = New System.Drawing.Point(9, 214) Me.dgvSonst_IDSKunden.MultiSelect = False Me.dgvSonst_IDSKunden.Name = "dgvSonst_IDSKunden" @@ -4598,26 +4654,26 @@ Partial Class usrcntlKundeBearbeitenFull 'DataGridView1 ' Me.DataGridView1.AllowUserToResizeRows = False - DataGridViewCellStyle23.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle23 + DataGridViewCellStyle51.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle51 Me.DataGridView1.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.DataGridView1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle24 + DataGridViewCellStyle52.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle52.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle52.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle52.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle52.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle52.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle52.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.DataGridView1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle52 Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.DataGridView1.DefaultCellStyle = DataGridViewCellStyle25 + DataGridViewCellStyle53.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle53.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle53.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle53.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle53.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle53.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle53.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.DataGridView1.DefaultCellStyle = DataGridViewCellStyle53 Me.DataGridView1.Enabled = False Me.DataGridView1.Location = New System.Drawing.Point(6, 111) Me.DataGridView1.MultiSelect = False @@ -4684,26 +4740,26 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.dgvBankverbindungen.AllowUserToDeleteRows = False Me.dgvBankverbindungen.AllowUserToResizeRows = False - DataGridViewCellStyle26.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvBankverbindungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle26 + DataGridViewCellStyle54.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvBankverbindungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle54 Me.dgvBankverbindungen.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvBankverbindungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle27 + DataGridViewCellStyle55.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle55.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle55.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle55.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle55.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle55.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle55.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvBankverbindungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle55 Me.dgvBankverbindungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle28.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvBankverbindungen.DefaultCellStyle = DataGridViewCellStyle28 + DataGridViewCellStyle56.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle56.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle56.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle56.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle56.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle56.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle56.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvBankverbindungen.DefaultCellStyle = DataGridViewCellStyle56 Me.dgvBankverbindungen.Location = New System.Drawing.Point(3, 40) Me.dgvBankverbindungen.MultiSelect = False Me.dgvBankverbindungen.Name = "dgvBankverbindungen" @@ -5859,53 +5915,73 @@ Partial Class usrcntlKundeBearbeitenFull Me.DataGridViewTextBoxColumn2.HeaderText = "E-Mail" Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" ' - 'TabPage2 + 'Label120 ' - Me.TabPage2.Controls.Add(Me.txtATEZ_GreenpulseID) - Me.TabPage2.Controls.Add(Me.Label118) - Me.TabPage2.Controls.Add(Me.txtATEZ_LogicustID) - Me.TabPage2.Controls.Add(Me.Label119) - Me.TabPage2.Location = New System.Drawing.Point(4, 22) - Me.TabPage2.Name = "TabPage2" - Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(651, 175) - Me.TabPage2.TabIndex = 2 - Me.TabPage2.Text = "ATEZ KundenNr" - Me.TabPage2.UseVisualStyleBackColor = True + Me.Label120.AutoSize = True + Me.Label120.Location = New System.Drawing.Point(305, 78) + Me.Label120.Name = "Label120" + Me.Label120.Size = New System.Drawing.Size(30, 13) + Me.Label120.TabIndex = 57 + Me.Label120.Text = "vom:" ' - 'txtATEZ_GreenpulseID + 'txtSEG_vom ' - Me.txtATEZ_GreenpulseID.Location = New System.Drawing.Point(97, 43) - Me.txtATEZ_GreenpulseID.Name = "txtATEZ_GreenpulseID" - Me.txtATEZ_GreenpulseID.Size = New System.Drawing.Size(314, 20) - Me.txtATEZ_GreenpulseID.TabIndex = 17 + Me.txtSEG_vom._DateTimeOnly = False + Me.txtSEG_vom._numbersOnly = False + Me.txtSEG_vom._numbersOnlyKommastellen = "" + Me.txtSEG_vom._numbersOnlyTrennzeichen = True + Me.txtSEG_vom._Prozent = False + Me.txtSEG_vom._ShortDateNew = True + Me.txtSEG_vom._ShortDateOnly = False + Me.txtSEG_vom._TimeOnly = False + Me.txtSEG_vom._TimeOnly_Seconds = False + Me.txtSEG_vom._value = "" + Me.txtSEG_vom._Waehrung = False + Me.txtSEG_vom._WaehrungZeichen = True + Me.txtSEG_vom.ForeColor = System.Drawing.Color.Red + Me.txtSEG_vom.Location = New System.Drawing.Point(341, 75) + Me.txtSEG_vom.MaxLength = 10 + Me.txtSEG_vom.MaxLineLength = -1 + Me.txtSEG_vom.MaxLines_Warning = "" + Me.txtSEG_vom.MaxLines_Warning_Label = Nothing + Me.txtSEG_vom.Name = "txtSEG_vom" + Me.txtSEG_vom.Size = New System.Drawing.Size(60, 20) + Me.txtSEG_vom.TabIndex = 58 + Me.txtSEG_vom.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' - 'Label118 + 'txtSEG_Summe ' - Me.Label118.AutoSize = True - Me.Label118.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label118.Location = New System.Drawing.Point(14, 46) - Me.Label118.Name = "Label118" - Me.Label118.Size = New System.Drawing.Size(78, 13) - Me.Label118.TabIndex = 16 - Me.Label118.Text = "Greenpulse-ID:" + Me.txtSEG_Summe._DateTimeOnly = False + Me.txtSEG_Summe._numbersOnly = False + Me.txtSEG_Summe._numbersOnlyKommastellen = "" + Me.txtSEG_Summe._numbersOnlyTrennzeichen = True + Me.txtSEG_Summe._Prozent = False + Me.txtSEG_Summe._ShortDateNew = False + Me.txtSEG_Summe._ShortDateOnly = False + Me.txtSEG_Summe._TimeOnly = False + Me.txtSEG_Summe._TimeOnly_Seconds = False + Me.txtSEG_Summe._value = "" + Me.txtSEG_Summe._Waehrung = True + Me.txtSEG_Summe._WaehrungZeichen = True + Me.txtSEG_Summe.ForeColor = System.Drawing.Color.Red + Me.txtSEG_Summe.Location = New System.Drawing.Point(159, 75) + Me.txtSEG_Summe.MaxLineLength = -1 + Me.txtSEG_Summe.MaxLines_Warning = "" + Me.txtSEG_Summe.MaxLines_Warning_Label = Nothing + Me.txtSEG_Summe.Name = "txtSEG_Summe" + Me.txtSEG_Summe.Size = New System.Drawing.Size(100, 20) + Me.txtSEG_Summe.TabIndex = 56 + Me.txtSEG_Summe.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' - 'txtATEZ_LogicustID + 'Label121 ' - Me.txtATEZ_LogicustID.Location = New System.Drawing.Point(97, 14) - Me.txtATEZ_LogicustID.Name = "txtATEZ_LogicustID" - Me.txtATEZ_LogicustID.Size = New System.Drawing.Size(314, 20) - Me.txtATEZ_LogicustID.TabIndex = 15 - ' - 'Label119 - ' - Me.Label119.AutoSize = True - Me.Label119.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label119.Location = New System.Drawing.Point(14, 17) - Me.Label119.Name = "Label119" - Me.Label119.Size = New System.Drawing.Size(64, 13) - Me.Label119.TabIndex = 14 - Me.Label119.Text = "Logicust-ID:" + Me.Label121.AutoSize = True + Me.Label121.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label121.Location = New System.Drawing.Point(7, 78) + Me.Label121.Name = "Label121" + Me.Label121.Size = New System.Drawing.Size(32, 13) + Me.Label121.TabIndex = 59 + Me.Label121.Text = "SEG:" ' 'usrcntlKundeBearbeitenFull ' @@ -5990,6 +6066,8 @@ Partial Class usrcntlKundeBearbeitenFull CType(Me.dgvIDS_Standard, System.ComponentModel.ISupportInitialize).EndInit() Me.Kunden.ResumeLayout(False) CType(Me.dgvIDS_Rabatte, System.ComponentModel.ISupportInitialize).EndInit() + Me.TabPage2.ResumeLayout(False) + Me.TabPage2.PerformLayout() CType(Me.dgvSonst_IDSKunden, System.ComponentModel.ISupportInitialize).EndInit() Me.tbSchnittstellen.ResumeLayout(False) Me.tbSchnittstellen.PerformLayout() @@ -6011,8 +6089,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.pnlNeukunde.ResumeLayout(False) Me.pnlNeukunde.PerformLayout() Me.cnsBankverbindungen.ResumeLayout(False) - Me.TabPage2.ResumeLayout(False) - Me.TabPage2.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -6399,4 +6475,8 @@ Partial Class usrcntlKundeBearbeitenFull Friend WithEvents Label118 As Label Friend WithEvents txtATEZ_LogicustID As TextBox Friend WithEvents Label119 As Label + Friend WithEvents Label121 As Label + Friend WithEvents Label120 As Label + Friend WithEvents txtSEG_vom As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtSEG_Summe As VERAG_PROG_ALLGEMEIN.MyTextBox End Class diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index 58067b44..efe42ffe 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -275,6 +275,8 @@ Public Class usrcntlKundeBearbeitenFull txtVers_HermesRefNr.Text = loadValue(KUNDE.Referenznummer, "") txtVers_Versicherungssumme._value = loadValue(KUNDE.Versicherungssumme, "") txtVers_VersicherungssummeVon._value = loadValue(KUNDE.Entscheidung_vom, "") + txtSEG_Summe._value = loadValue(KUNDE_ERW.kde_SEG_Summe, "") + txtSEG_vom._value = loadValue(KUNDE_ERW.kde_SEG_Datum, "") txtVers_Antragssumme._value = loadValue(KUNDE.Antragssumme, "") txtVers_AntragssummeVon._value = loadValue(KUNDE.Antrag_vom, "") txtVers_Kreditlimit._value = loadValue(KUNDE.Kreditlimit, "") @@ -703,8 +705,11 @@ Public Class usrcntlKundeBearbeitenFull 'End If KUNDE.Versicherungssumme = isLeerNothingDbl(txtVers_Versicherungssumme._value) - KUNDE.Entscheidung_vom = isLeerNothing(txtVers_VersicherungssummeVon._value) + + KUNDE_ERW.kde_SEG_Summe = isLeerNothingDbl(txtSEG_Summe._value) + KUNDE_ERW.kde_SEG_Datum = isLeerNothing(txtSEG_vom._value) + KUNDE.Antragssumme = isLeerNothingDbl(txtVers_Antragssumme._value) KUNDE.Antrag_vom = isLeerNothing(txtVers_AntragssummeVon._value) KUNDE.Kreditlimit = isLeerNothingDbl(txtVers_Kreditlimit._value) diff --git a/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb b/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb index 6e53695e..1709c22a 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb +++ b/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb @@ -111,6 +111,13 @@ Partial Class usrCntlMDMAuswertungen Me.Label32 = New System.Windows.Forms.Label() Me.tbcntr = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() + Me.Label44 = New System.Windows.Forms.Label() + Me.GroupBox19 = New System.Windows.Forms.GroupBox() + Me.cbx_nuraktiveKunden = New System.Windows.Forms.CheckBox() + Me.Label61 = New System.Windows.Forms.Label() + Me.PictureBox6 = New System.Windows.Forms.PictureBox() + Me.Label63 = New System.Windows.Forms.Label() + Me.Button19 = New System.Windows.Forms.Button() Me.Label33 = New System.Windows.Forms.Label() Me.GroupBox9 = New System.Windows.Forms.GroupBox() Me.Button9 = New System.Windows.Forms.Button() @@ -120,7 +127,6 @@ Partial Class usrCntlMDMAuswertungen Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label36 = New System.Windows.Forms.Label() Me.TabPage3 = New System.Windows.Forms.TabPage() - Me.UsrCntlWoelfl_IM_CSVRg1 = New SDL.usrCntlWoelfl_IM_CSVRg() Me.tbIDS = New System.Windows.Forms.TabPage() Me.Label62 = New System.Windows.Forms.Label() Me.GroupBox13 = New System.Windows.Forms.GroupBox() @@ -157,7 +163,6 @@ Partial Class usrCntlMDMAuswertungen Me.Label41 = New System.Windows.Forms.Label() Me.Button12 = New System.Windows.Forms.Button() Me.TabPage4 = New System.Windows.Forms.TabPage() - Me.UsrCntlMSE_KonvertCSV1 = New SDL.usrCntlMSE_KonvertCSV() Me.TabPage5 = New System.Windows.Forms.TabPage() Me.Label56 = New System.Windows.Forms.Label() Me.GroupBox17 = New System.Windows.Forms.GroupBox() @@ -182,6 +187,8 @@ Partial Class usrCntlMDMAuswertungen Me.btnContractdaten = New System.Windows.Forms.Button() Me.Button15 = New System.Windows.Forms.Button() Me.pnl = New System.Windows.Forms.Panel() + Me.UsrCntlWoelfl_IM_CSVRg1 = New SDL.usrCntlWoelfl_IM_CSVRg() + Me.UsrCntlMSE_KonvertCSV1 = New SDL.usrCntlMSE_KonvertCSV() Me.GroupBox1.SuspendLayout() Me.GroupBox2.SuspendLayout() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() @@ -197,6 +204,8 @@ Partial Class usrCntlMDMAuswertungen Me.GroupBox8.SuspendLayout() Me.tbcntr.SuspendLayout() Me.TabPage1.SuspendLayout() + Me.GroupBox19.SuspendLayout() + CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox9.SuspendLayout() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabPage3.SuspendLayout() @@ -422,7 +431,7 @@ Partial Class usrCntlMDMAuswertungen Me.Label8.AutoSize = True Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label8.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label8.Location = New System.Drawing.Point(7, 153) + Me.Label8.Location = New System.Drawing.Point(9, 119) Me.Label8.Name = "Label8" Me.Label8.Size = New System.Drawing.Size(186, 17) Me.Label8.TabIndex = 11 @@ -442,9 +451,9 @@ Partial Class usrCntlMDMAuswertungen Me.GroupBox3.Controls.Add(Me.datUeberfaelligeBestVon) Me.GroupBox3.Controls.Add(Me.Label11) Me.GroupBox3.Controls.Add(Me.Button2) - Me.GroupBox3.Location = New System.Drawing.Point(6, 164) + Me.GroupBox3.Location = New System.Drawing.Point(8, 130) Me.GroupBox3.Name = "GroupBox3" - Me.GroupBox3.Size = New System.Drawing.Size(697, 149) + Me.GroupBox3.Size = New System.Drawing.Size(697, 137) Me.GroupBox3.TabIndex = 10 Me.GroupBox3.TabStop = False ' @@ -592,7 +601,7 @@ Partial Class usrCntlMDMAuswertungen Me.Label13.AutoSize = True Me.Label13.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label13.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label13.Location = New System.Drawing.Point(7, 332) + Me.Label13.Location = New System.Drawing.Point(9, 379) Me.Label13.Name = "Label13" Me.Label13.Size = New System.Drawing.Size(78, 17) Me.Label13.TabIndex = 13 @@ -608,7 +617,7 @@ Partial Class usrCntlMDMAuswertungen Me.GroupBox4.Controls.Add(Me.Label15) Me.GroupBox4.Controls.Add(Me.Label17) Me.GroupBox4.Controls.Add(Me.Button3) - Me.GroupBox4.Location = New System.Drawing.Point(6, 343) + Me.GroupBox4.Location = New System.Drawing.Point(8, 390) Me.GroupBox4.Name = "GroupBox4" Me.GroupBox4.Size = New System.Drawing.Size(697, 110) Me.GroupBox4.TabIndex = 12 @@ -722,7 +731,7 @@ Partial Class usrCntlMDMAuswertungen Me.Label16.AutoSize = True Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label16.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label16.Location = New System.Drawing.Point(7, 471) + Me.Label16.Location = New System.Drawing.Point(9, 518) Me.Label16.Name = "Label16" Me.Label16.Size = New System.Drawing.Size(287, 17) Me.Label16.TabIndex = 15 @@ -739,7 +748,7 @@ Partial Class usrCntlMDMAuswertungen Me.GroupBox5.Controls.Add(Me.datBenachrichtigungVon) Me.GroupBox5.Controls.Add(Me.Label21) Me.GroupBox5.Controls.Add(Me.Button4) - Me.GroupBox5.Location = New System.Drawing.Point(6, 482) + Me.GroupBox5.Location = New System.Drawing.Point(8, 529) Me.GroupBox5.Name = "GroupBox5" Me.GroupBox5.Size = New System.Drawing.Size(697, 98) Me.GroupBox5.TabIndex = 14 @@ -795,7 +804,7 @@ Partial Class usrCntlMDMAuswertungen 'Label19 ' Me.Label19.AutoSize = True - Me.Label19.Location = New System.Drawing.Point(322, 81) + Me.Label19.Location = New System.Drawing.Point(322, 72) Me.Label19.Name = "Label19" Me.Label19.Size = New System.Drawing.Size(23, 13) Me.Label19.TabIndex = 10 @@ -805,7 +814,7 @@ Partial Class usrCntlMDMAuswertungen 'datBenachrichtigungBis ' Me.datBenachrichtigungBis.Format = System.Windows.Forms.DateTimePickerFormat.[Short] - Me.datBenachrichtigungBis.Location = New System.Drawing.Point(351, 78) + Me.datBenachrichtigungBis.Location = New System.Drawing.Point(351, 69) Me.datBenachrichtigungBis.Name = "datBenachrichtigungBis" Me.datBenachrichtigungBis.Size = New System.Drawing.Size(93, 20) Me.datBenachrichtigungBis.TabIndex = 9 @@ -814,7 +823,7 @@ Partial Class usrCntlMDMAuswertungen 'Label20 ' Me.Label20.AutoSize = True - Me.Label20.Location = New System.Drawing.Point(145, 81) + Me.Label20.Location = New System.Drawing.Point(145, 72) Me.Label20.Name = "Label20" Me.Label20.Size = New System.Drawing.Size(72, 13) Me.Label20.TabIndex = 8 @@ -824,7 +833,7 @@ Partial Class usrCntlMDMAuswertungen 'datBenachrichtigungVon ' Me.datBenachrichtigungVon.Format = System.Windows.Forms.DateTimePickerFormat.[Short] - Me.datBenachrichtigungVon.Location = New System.Drawing.Point(223, 78) + Me.datBenachrichtigungVon.Location = New System.Drawing.Point(223, 69) Me.datBenachrichtigungVon.Name = "datBenachrichtigungVon" Me.datBenachrichtigungVon.Size = New System.Drawing.Size(93, 20) Me.datBenachrichtigungVon.TabIndex = 7 @@ -856,7 +865,7 @@ Partial Class usrCntlMDMAuswertungen Me.Label23.AutoSize = True Me.Label23.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label23.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label23.Location = New System.Drawing.Point(7, 597) + Me.Label23.Location = New System.Drawing.Point(9, 630) Me.Label23.Name = "Label23" Me.Label23.Size = New System.Drawing.Size(88, 17) Me.Label23.TabIndex = 17 @@ -872,9 +881,9 @@ Partial Class usrCntlMDMAuswertungen Me.GroupBox6.Controls.Add(Me.PictureBox4) Me.GroupBox6.Controls.Add(Me.Label28) Me.GroupBox6.Controls.Add(Me.Button5) - Me.GroupBox6.Location = New System.Drawing.Point(6, 608) + Me.GroupBox6.Location = New System.Drawing.Point(8, 641) Me.GroupBox6.Name = "GroupBox6" - Me.GroupBox6.Size = New System.Drawing.Size(697, 86) + Me.GroupBox6.Size = New System.Drawing.Size(697, 73) Me.GroupBox6.TabIndex = 16 Me.GroupBox6.TabStop = False ' @@ -1196,6 +1205,8 @@ Partial Class usrCntlMDMAuswertungen ' 'TabPage1 ' + Me.TabPage1.Controls.Add(Me.Label44) + Me.TabPage1.Controls.Add(Me.GroupBox19) Me.TabPage1.Controls.Add(Me.Label33) Me.TabPage1.Controls.Add(Me.GroupBox9) Me.TabPage1.Controls.Add(Me.Label3) @@ -1216,12 +1227,89 @@ Partial Class usrCntlMDMAuswertungen Me.TabPage1.Text = "VERAG Auswertungen" Me.TabPage1.UseVisualStyleBackColor = True ' + 'Label44 + ' + Me.Label44.AutoSize = True + Me.Label44.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label44.ForeColor = System.Drawing.SystemColors.ControlDarkDark + Me.Label44.Location = New System.Drawing.Point(11, 270) + Me.Label44.Name = "Label44" + Me.Label44.Size = New System.Drawing.Size(93, 17) + Me.Label44.TabIndex = 21 + Me.Label44.Text = "Kundenliste" + ' + 'GroupBox19 + ' + Me.GroupBox19.Controls.Add(Me.cbx_nuraktiveKunden) + Me.GroupBox19.Controls.Add(Me.Label61) + Me.GroupBox19.Controls.Add(Me.PictureBox6) + Me.GroupBox19.Controls.Add(Me.Label63) + Me.GroupBox19.Controls.Add(Me.Button19) + Me.GroupBox19.Location = New System.Drawing.Point(9, 284) + Me.GroupBox19.Name = "GroupBox19" + Me.GroupBox19.Size = New System.Drawing.Size(697, 80) + Me.GroupBox19.TabIndex = 20 + Me.GroupBox19.TabStop = False + ' + 'cbx_nuraktiveKunden + ' + Me.cbx_nuraktiveKunden.AutoSize = True + Me.cbx_nuraktiveKunden.Checked = True + Me.cbx_nuraktiveKunden.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbx_nuraktiveKunden.Location = New System.Drawing.Point(148, 37) + Me.cbx_nuraktiveKunden.Name = "cbx_nuraktiveKunden" + Me.cbx_nuraktiveKunden.Size = New System.Drawing.Size(15, 14) + Me.cbx_nuraktiveKunden.TabIndex = 24 + Me.cbx_nuraktiveKunden.UseVisualStyleBackColor = True + ' + 'Label61 + ' + Me.Label61.AutoSize = True + Me.Label61.Location = New System.Drawing.Point(169, 38) + Me.Label61.Name = "Label61" + Me.Label61.Size = New System.Drawing.Size(94, 13) + Me.Label61.TabIndex = 21 + Me.Label61.Text = "nur aktive Kunden" + ' + 'PictureBox6 + ' + Me.PictureBox6.Image = CType(resources.GetObject("PictureBox6.Image"), System.Drawing.Image) + Me.PictureBox6.Location = New System.Drawing.Point(640, 8) + Me.PictureBox6.Name = "PictureBox6" + Me.PictureBox6.Size = New System.Drawing.Size(51, 24) + Me.PictureBox6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom + Me.PictureBox6.TabIndex = 11 + Me.PictureBox6.TabStop = False + ' + 'Label63 + ' + Me.Label63.AutoSize = True + Me.Label63.Location = New System.Drawing.Point(145, 19) + Me.Label63.Name = "Label63" + Me.Label63.Size = New System.Drawing.Size(255, 13) + Me.Label63.TabIndex = 5 + Me.Label63.Text = "Kundenliste mit Kundennummern bei den Lieferanten" + ' + 'Button19 + ' + Me.Button19.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button19.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button19.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.Button19.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button19.Location = New System.Drawing.Point(6, 19) + Me.Button19.Name = "Button19" + Me.Button19.Size = New System.Drawing.Size(121, 49) + Me.Button19.TabIndex = 4 + Me.Button19.Text = "Kundenliste" + Me.Button19.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button19.UseVisualStyleBackColor = True + ' 'Label33 ' Me.Label33.AutoSize = True Me.Label33.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label33.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label33.Location = New System.Drawing.Point(7, 712) + Me.Label33.Location = New System.Drawing.Point(9, 717) Me.Label33.Name = "Label33" Me.Label33.Size = New System.Drawing.Size(145, 17) Me.Label33.TabIndex = 19 @@ -1235,7 +1323,7 @@ Partial Class usrCntlMDMAuswertungen Me.GroupBox9.Controls.Add(Me.PictureBox5) Me.GroupBox9.Controls.Add(Me.MyComboBox2) Me.GroupBox9.Controls.Add(Me.Label36) - Me.GroupBox9.Location = New System.Drawing.Point(6, 723) + Me.GroupBox9.Location = New System.Drawing.Point(8, 728) Me.GroupBox9.Name = "GroupBox9" Me.GroupBox9.Size = New System.Drawing.Size(697, 107) Me.GroupBox9.TabIndex = 18 @@ -1327,14 +1415,6 @@ Partial Class usrCntlMDMAuswertungen Me.TabPage3.Text = "WÖLFL" Me.TabPage3.UseVisualStyleBackColor = True ' - 'UsrCntlWoelfl_IM_CSVRg1 - ' - Me.UsrCntlWoelfl_IM_CSVRg1.BackColor = System.Drawing.Color.White - Me.UsrCntlWoelfl_IM_CSVRg1.Location = New System.Drawing.Point(6, 167) - Me.UsrCntlWoelfl_IM_CSVRg1.Name = "UsrCntlWoelfl_IM_CSVRg1" - Me.UsrCntlWoelfl_IM_CSVRg1.Size = New System.Drawing.Size(728, 97) - Me.UsrCntlWoelfl_IM_CSVRg1.TabIndex = 10 - ' 'tbIDS ' Me.tbIDS.Controls.Add(Me.Label62) @@ -1713,14 +1793,6 @@ Partial Class usrCntlMDMAuswertungen Me.TabPage4.Text = "MSE" Me.TabPage4.UseVisualStyleBackColor = True ' - 'UsrCntlMSE_KonvertCSV1 - ' - Me.UsrCntlMSE_KonvertCSV1.BackColor = System.Drawing.Color.White - Me.UsrCntlMSE_KonvertCSV1.Location = New System.Drawing.Point(7, 7) - Me.UsrCntlMSE_KonvertCSV1.Name = "UsrCntlMSE_KonvertCSV1" - Me.UsrCntlMSE_KonvertCSV1.Size = New System.Drawing.Size(728, 97) - Me.UsrCntlMSE_KonvertCSV1.TabIndex = 0 - ' 'TabPage5 ' Me.TabPage5.Controls.Add(Me.Label56) @@ -1980,6 +2052,22 @@ Partial Class usrCntlMDMAuswertungen Me.pnl.Size = New System.Drawing.Size(1057, 54) Me.pnl.TabIndex = 26 ' + 'UsrCntlWoelfl_IM_CSVRg1 + ' + Me.UsrCntlWoelfl_IM_CSVRg1.BackColor = System.Drawing.Color.White + Me.UsrCntlWoelfl_IM_CSVRg1.Location = New System.Drawing.Point(6, 167) + Me.UsrCntlWoelfl_IM_CSVRg1.Name = "UsrCntlWoelfl_IM_CSVRg1" + Me.UsrCntlWoelfl_IM_CSVRg1.Size = New System.Drawing.Size(728, 97) + Me.UsrCntlWoelfl_IM_CSVRg1.TabIndex = 10 + ' + 'UsrCntlMSE_KonvertCSV1 + ' + Me.UsrCntlMSE_KonvertCSV1.BackColor = System.Drawing.Color.White + Me.UsrCntlMSE_KonvertCSV1.Location = New System.Drawing.Point(7, 7) + Me.UsrCntlMSE_KonvertCSV1.Name = "UsrCntlMSE_KonvertCSV1" + Me.UsrCntlMSE_KonvertCSV1.Size = New System.Drawing.Size(728, 97) + Me.UsrCntlMSE_KonvertCSV1.TabIndex = 0 + ' 'usrCntlMDMAuswertungen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -2013,6 +2101,9 @@ Partial Class usrCntlMDMAuswertungen Me.tbcntr.ResumeLayout(False) Me.TabPage1.ResumeLayout(False) Me.TabPage1.PerformLayout() + Me.GroupBox19.ResumeLayout(False) + Me.GroupBox19.PerformLayout() + CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).EndInit() Me.GroupBox9.ResumeLayout(False) Me.GroupBox9.PerformLayout() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit() @@ -2208,4 +2299,11 @@ Partial Class usrCntlMDMAuswertungen Friend WithEvents GroupBox13 As GroupBox Friend WithEvents Button18 As Button Friend WithEvents Button14 As Button + Friend WithEvents Label44 As Label + Friend WithEvents GroupBox19 As GroupBox + Friend WithEvents cbx_nuraktiveKunden As CheckBox + Friend WithEvents Label61 As Label + Friend WithEvents PictureBox6 As PictureBox + Friend WithEvents Label63 As Label + Friend WithEvents Button19 As Button End Class diff --git a/SDL/mdm/usrCntlMDMAuswertungen.resx b/SDL/mdm/usrCntlMDMAuswertungen.resx index 05de4ba7..1ffacd1e 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.resx +++ b/SDL/mdm/usrCntlMDMAuswertungen.resx @@ -132,6 +132,14 @@ 0MEJgDAMQNHflXQmxxDcQt1CvAr1rq7hHIriKa1QQxQs/EtbHm0AMufcZhGQ8xoIjECVkJfQHXhcTlml hL4BLXoXfPDl2DrHIMEeKJR1AWiRfOEKLMrWGGg+Q38cKBsC0CL5wvba0FTHQPMZzkCjbApAi/4B7lqo BXidk8YAAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAH1JREFUOE/V + 0MEJgDAMQNHflXQmxxDcQt1CvAr1rq7hHIriKa1QQxQs/EtbHm0AMufcZhGQ8xoIjECVkJfQHXhcTlml + hL4BLXoXfPDl2DrHIMEeKJR1AWiRfOEKLMrWGGg+Q38cKBsC0CL5wvba0FTHQPMZzkCjbApAi/4B7lqo + BXidk8YAAAAAAElFTkSuQmCC diff --git a/SDL/mdm/usrCntlMDMAuswertungen.vb b/SDL/mdm/usrCntlMDMAuswertungen.vb index a696607e..b4c9fa45 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.vb +++ b/SDL/mdm/usrCntlMDMAuswertungen.vb @@ -1536,6 +1536,46 @@ Public Class usrCntlMDMAuswertungen + End Sub + + Private Sub Button19_Click_1(sender As Object, e As EventArgs) Handles Button19.Click + + Me.Cursor = Cursors.WaitCursor + + Dim SQLstr = " SELECT AD.Auswahl,AD.AdressenNr AS KundenNr,AD.[Name 1] AS Kundenname,AD.Ort,AD.LandKz,ISNULL(kde_betreuer,'-') AS Betreuer,kde_keineMWSt AS keineMWST,AD.AdressenNr AS ASFINAG_KundenNr,AD.PLOSEKundenNr AS Plose_KundenNr,tblMSECustomers.customer_id AS MSE_KundenNr,ids.CustomerCode AS IDS_KundenNr, AD.UTAKundenNr AS UTA_KundenNr, + ISNULL(CAST(WölflKundenNr AS nvarchar(50)), '') + + CASE + WHEN WölflKundenNr IS NOT NULL + AND weitereWölflKundenNr IS NOT NULL + THEN ', ' ELSE '' + END + + ISNULL(CAST(weitereWölflKundenNr AS nvarchar(50)), '') AS RMC_KundenNr + + FROM Adressen AD + INNER JOIN Kunden KD ON KD.KundenNr = AD.AdressenNr + INNER JOIN tblKundenErweitert ON KD.KundenNr = kde_KundenNr + LEFT JOIN tblMSECustomers ON partner_customer_number = KD.KundenNr + LEFT JOIN tbl_IDS_Kunden AS ids + ON ids.KdNrVERAG = KD.KundenNr + AND ISNULL(ids.KdNrAlt,0) <> 1 + AND ids.Zeitstempel = + ( + SELECT MAX(i2.Zeitstempel) + FROM tbl_IDS_Kunden AS i2 + WHERE + i2.KdNrVERAG = ids.KdNrVERAG + AND ISNULL(i2.KdNrAlt,0) <> 1 + ) + WHERE + KD.FilialenNr = 8001 " & IIf(cbx_nuraktiveKunden.Checked, "and AD.Auswahl = 'A' ", "") + + Dim dt = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL") + + cProgramFunctions.genExcelFromDT_NEW(dt) + + Me.Cursor = Cursors.Default + + End Sub End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb index f7b78580..1e5438e4 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb @@ -105,6 +105,8 @@ Public Class cKundenErweitert Property kde_betreuer As Object = Nothing Property kde_ATEZ_LogicustID As Object = Nothing Property kde_ATEZ_GreenpulseID As Object = Nothing + Property kde_SEG_Summe As Object = Nothing + Property kde_SEG_Datum As Object = Nothing Dim SQL As New SQL @@ -216,6 +218,8 @@ Public Class cKundenErweitert list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_betreuer", kde_betreuer)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_ATEZ_LogicustID", kde_ATEZ_LogicustID)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_ATEZ_GreenpulseID", kde_ATEZ_GreenpulseID)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_SEG_Summe", kde_SEG_Summe)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_SEG_Datum", kde_SEG_Datum)) Return list End Function From 4bf0bee25e7f16023f11acfacc3b1687378d0dec Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 18 Dec 2025 10:28:49 +0100 Subject: [PATCH 8/9] KundeBearbeiten, etc. --- SDL/My Project/AssemblyInfo.vb | 4 +- .../usrcntlKundeBearbeitenFull.Designer.vb | 530 +++++++++--------- SDL/mdm/usrCntlMDMAuswertungen.Designer.vb | 40 +- SDL/mdm/usrCntlMDMAuswertungen.vb | 13 +- 4 files changed, 290 insertions(+), 297 deletions(-) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 55a9f384..961b2d69 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: ' - - + + diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb index 7cbe19de..4f624358 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb @@ -23,34 +23,34 @@ Partial Class usrcntlKundeBearbeitenFull Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle32 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle33 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle34 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle35 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle36 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle37 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle38 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle39 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle40 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle41 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle42 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle43 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle44 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle45 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle46 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle47 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle48 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle49 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle50 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle51 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle52 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle53 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle54 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle55 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle56 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.tbcntrDetails = New System.Windows.Forms.TabControl() Me.tbAbfertigung = New System.Windows.Forms.TabPage() Me.cbxVerzolltBeiExport = New System.Windows.Forms.CheckBox() @@ -176,6 +176,10 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtAbf_Vorlageprovision = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtAbf_Zahlungsziel = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.tbVersicherung = New System.Windows.Forms.TabPage() + Me.Label121 = New System.Windows.Forms.Label() + Me.Label120 = New System.Windows.Forms.Label() + Me.txtSEG_vom = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtSEG_Summe = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.cbxBlanko = New System.Windows.Forms.CheckBox() Me.Label105 = New System.Windows.Forms.Label() Me.Label106 = New System.Windows.Forms.Label() @@ -433,10 +437,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboAuswahl = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.Label120 = New System.Windows.Forms.Label() - Me.txtSEG_vom = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtSEG_Summe = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label121 = New System.Windows.Forms.Label() Me.tbcntrDetails.SuspendLayout() Me.tbAbfertigung.SuspendLayout() Me.tbcntrAbf.SuspendLayout() @@ -2354,6 +2354,74 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbVersicherung.Text = "Versicherung" Me.tbVersicherung.UseVisualStyleBackColor = True ' + 'Label121 + ' + Me.Label121.AutoSize = True + Me.Label121.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label121.Location = New System.Drawing.Point(7, 78) + Me.Label121.Name = "Label121" + Me.Label121.Size = New System.Drawing.Size(32, 13) + Me.Label121.TabIndex = 59 + Me.Label121.Text = "SEG:" + ' + 'Label120 + ' + Me.Label120.AutoSize = True + Me.Label120.Location = New System.Drawing.Point(305, 78) + Me.Label120.Name = "Label120" + Me.Label120.Size = New System.Drawing.Size(30, 13) + Me.Label120.TabIndex = 57 + Me.Label120.Text = "vom:" + ' + 'txtSEG_vom + ' + Me.txtSEG_vom._DateTimeOnly = False + Me.txtSEG_vom._numbersOnly = False + Me.txtSEG_vom._numbersOnlyKommastellen = "" + Me.txtSEG_vom._numbersOnlyTrennzeichen = True + Me.txtSEG_vom._Prozent = False + Me.txtSEG_vom._ShortDateNew = True + Me.txtSEG_vom._ShortDateOnly = False + Me.txtSEG_vom._TimeOnly = False + Me.txtSEG_vom._TimeOnly_Seconds = False + Me.txtSEG_vom._value = "" + Me.txtSEG_vom._Waehrung = False + Me.txtSEG_vom._WaehrungZeichen = True + Me.txtSEG_vom.ForeColor = System.Drawing.Color.Red + Me.txtSEG_vom.Location = New System.Drawing.Point(341, 75) + Me.txtSEG_vom.MaxLength = 10 + Me.txtSEG_vom.MaxLineLength = -1 + Me.txtSEG_vom.MaxLines_Warning = "" + Me.txtSEG_vom.MaxLines_Warning_Label = Nothing + Me.txtSEG_vom.Name = "txtSEG_vom" + Me.txtSEG_vom.Size = New System.Drawing.Size(60, 20) + Me.txtSEG_vom.TabIndex = 58 + Me.txtSEG_vom.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'txtSEG_Summe + ' + Me.txtSEG_Summe._DateTimeOnly = False + Me.txtSEG_Summe._numbersOnly = False + Me.txtSEG_Summe._numbersOnlyKommastellen = "" + Me.txtSEG_Summe._numbersOnlyTrennzeichen = True + Me.txtSEG_Summe._Prozent = False + Me.txtSEG_Summe._ShortDateNew = False + Me.txtSEG_Summe._ShortDateOnly = False + Me.txtSEG_Summe._TimeOnly = False + Me.txtSEG_Summe._TimeOnly_Seconds = False + Me.txtSEG_Summe._value = "" + Me.txtSEG_Summe._Waehrung = True + Me.txtSEG_Summe._WaehrungZeichen = True + Me.txtSEG_Summe.ForeColor = System.Drawing.Color.Red + Me.txtSEG_Summe.Location = New System.Drawing.Point(159, 75) + Me.txtSEG_Summe.MaxLineLength = -1 + Me.txtSEG_Summe.MaxLines_Warning = "" + Me.txtSEG_Summe.MaxLines_Warning_Label = Nothing + Me.txtSEG_Summe.Name = "txtSEG_Summe" + Me.txtSEG_Summe.Size = New System.Drawing.Size(100, 20) + Me.txtSEG_Summe.TabIndex = 56 + Me.txtSEG_Summe.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'cbxBlanko ' Me.cbxBlanko.AutoSize = True @@ -3279,8 +3347,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvUmsatzbericht.AllowUserToDeleteRows = False Me.dgvUmsatzbericht.AllowUserToOrderColumns = True Me.dgvUmsatzbericht.AllowUserToResizeRows = False - DataGridViewCellStyle29.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle29 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.dgvUmsatzbericht.BackgroundColor = System.Drawing.Color.White Me.dgvUmsatzbericht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvUmsatzbericht.Location = New System.Drawing.Point(6, 25) @@ -3379,8 +3447,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvOffenePosten.AllowUserToDeleteRows = False Me.dgvOffenePosten.AllowUserToOrderColumns = True Me.dgvOffenePosten.AllowUserToResizeRows = False - DataGridViewCellStyle30.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle30 + DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvOffenePosten.Location = New System.Drawing.Point(6, 38) @@ -3555,40 +3623,40 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvKreditkarten.AllowUserToDeleteRows = False Me.dgvKreditkarten.AllowUserToOrderColumns = True Me.dgvKreditkarten.AllowUserToResizeRows = False - DataGridViewCellStyle31.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle31 + DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3 Me.dgvKreditkarten.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle32.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle32.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle32 + DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4 Me.dgvKreditkarten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle33.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle33.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle33 + DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle5 Me.dgvKreditkarten.Location = New System.Drawing.Point(9, 20) Me.dgvKreditkarten.MultiSelect = False Me.dgvKreditkarten.Name = "dgvKreditkarten" - DataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle34.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle34 + DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle6 Me.dgvKreditkarten.RowHeadersVisible = False - DataGridViewCellStyle35.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle35 + DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle7 Me.dgvKreditkarten.RowTemplate.DefaultCellStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.dgvKreditkarten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvKreditkarten.Size = New System.Drawing.Size(642, 312) @@ -3668,26 +3736,26 @@ Partial Class usrcntlKundeBearbeitenFull ' 'dgvMWST ' - DataGridViewCellStyle36.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvMWST.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle36 + DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvMWST.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8 Me.dgvMWST.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle37.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle37.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle37.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle37.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle37.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvMWST.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle37 + DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvMWST.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle9 Me.dgvMWST.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle38.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle38.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle38.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle38.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle38.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvMWST.DefaultCellStyle = DataGridViewCellStyle38 + DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvMWST.DefaultCellStyle = DataGridViewCellStyle10 Me.dgvMWST.Location = New System.Drawing.Point(9, 359) Me.dgvMWST.Name = "dgvMWST" Me.dgvMWST.Size = New System.Drawing.Size(171, 125) @@ -3772,26 +3840,26 @@ Partial Class usrcntlKundeBearbeitenFull ' 'dgvUstv_LaenderUndSteuernummern ' - DataGridViewCellStyle39.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle39 + DataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11 Me.dgvUstv_LaenderUndSteuernummern.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle40.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle40.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle40.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle40.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle40.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle40 + DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle12 Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle41.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle41.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle41.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle41.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle41.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvUstv_LaenderUndSteuernummern.DefaultCellStyle = DataGridViewCellStyle41 + DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvUstv_LaenderUndSteuernummern.DefaultCellStyle = DataGridViewCellStyle13 Me.dgvUstv_LaenderUndSteuernummern.Location = New System.Drawing.Point(9, 94) Me.dgvUstv_LaenderUndSteuernummern.Name = "dgvUstv_LaenderUndSteuernummern" Me.dgvUstv_LaenderUndSteuernummern.Size = New System.Drawing.Size(657, 259) @@ -3989,7 +4057,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.lblIDS_Rabatte.AutoSize = True Me.lblIDS_Rabatte.Enabled = False Me.lblIDS_Rabatte.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblIDS_Rabatte.Location = New System.Drawing.Point(10, 273) + Me.lblIDS_Rabatte.Location = New System.Drawing.Point(10, 283) Me.lblIDS_Rabatte.Name = "lblIDS_Rabatte" Me.lblIDS_Rabatte.Size = New System.Drawing.Size(100, 13) Me.lblIDS_Rabatte.TabIndex = 147 @@ -4000,7 +4068,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.PictureBox7.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None Me.PictureBox7.Image = Global.SDL.My.Resources.Resources.Excel_logo - Me.PictureBox7.Location = New System.Drawing.Point(645, 273) + Me.PictureBox7.Location = New System.Drawing.Point(645, 284) Me.PictureBox7.Name = "PictureBox7" Me.PictureBox7.Size = New System.Drawing.Size(20, 20) Me.PictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom @@ -4021,10 +4089,10 @@ Partial Class usrcntlKundeBearbeitenFull Me.TabControl1.Controls.Add(Me.Standard) Me.TabControl1.Controls.Add(Me.Kunden) Me.TabControl1.Controls.Add(Me.TabPage2) - Me.TabControl1.Location = New System.Drawing.Point(6, 288) + Me.TabControl1.Location = New System.Drawing.Point(6, 299) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(659, 201) + Me.TabControl1.Size = New System.Drawing.Size(659, 190) Me.TabControl1.TabIndex = 40 ' 'Standard @@ -4033,7 +4101,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.Standard.Location = New System.Drawing.Point(4, 22) Me.Standard.Name = "Standard" Me.Standard.Padding = New System.Windows.Forms.Padding(3) - Me.Standard.Size = New System.Drawing.Size(651, 175) + Me.Standard.Size = New System.Drawing.Size(651, 164) Me.Standard.TabIndex = 0 Me.Standard.Text = "Standardpreise" Me.Standard.UseVisualStyleBackColor = True @@ -4043,30 +4111,30 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvIDS_Standard.AllowUserToAddRows = False Me.dgvIDS_Standard.AllowUserToDeleteRows = False Me.dgvIDS_Standard.AllowUserToResizeRows = False - DataGridViewCellStyle42.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvIDS_Standard.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle42 + DataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvIDS_Standard.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14 Me.dgvIDS_Standard.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle43.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle43.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle43.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle43.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle43.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvIDS_Standard.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle43 + DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvIDS_Standard.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle15 Me.dgvIDS_Standard.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle44.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle44.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle44.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle44.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle44.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle44.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvIDS_Standard.DefaultCellStyle = DataGridViewCellStyle44 + DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvIDS_Standard.DefaultCellStyle = DataGridViewCellStyle16 Me.dgvIDS_Standard.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvIDS_Standard.Location = New System.Drawing.Point(3, 3) Me.dgvIDS_Standard.Name = "dgvIDS_Standard" - Me.dgvIDS_Standard.Size = New System.Drawing.Size(645, 169) + Me.dgvIDS_Standard.Size = New System.Drawing.Size(645, 158) Me.dgvIDS_Standard.TabIndex = 35 ' 'Kunden @@ -4085,26 +4153,26 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvIDS_Rabatte.AllowUserToAddRows = False Me.dgvIDS_Rabatte.AllowUserToDeleteRows = False Me.dgvIDS_Rabatte.AllowUserToResizeRows = False - DataGridViewCellStyle45.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvIDS_Rabatte.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle45 + DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvIDS_Rabatte.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17 Me.dgvIDS_Rabatte.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle46.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle46.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle46.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle46.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle46.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle46.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle46.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvIDS_Rabatte.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle46 + DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvIDS_Rabatte.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle18 Me.dgvIDS_Rabatte.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle47.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle47.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle47.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle47.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle47.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle47.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle47.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvIDS_Rabatte.DefaultCellStyle = DataGridViewCellStyle47 + DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvIDS_Rabatte.DefaultCellStyle = DataGridViewCellStyle19 Me.dgvIDS_Rabatte.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvIDS_Rabatte.Location = New System.Drawing.Point(3, 3) Me.dgvIDS_Rabatte.Name = "dgvIDS_Rabatte" @@ -4324,30 +4392,30 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvSonst_IDSKunden.AllowUserToAddRows = False Me.dgvSonst_IDSKunden.AllowUserToDeleteRows = False Me.dgvSonst_IDSKunden.AllowUserToResizeRows = False - DataGridViewCellStyle48.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle48 + DataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle20 Me.dgvSonst_IDSKunden.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle49.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle49.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle49.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle49.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle49.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle49.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle49.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSonst_IDSKunden.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle49 + DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSonst_IDSKunden.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle21 Me.dgvSonst_IDSKunden.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle50.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle50.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle50.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle50.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle50.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle50.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle50.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvSonst_IDSKunden.DefaultCellStyle = DataGridViewCellStyle50 + DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvSonst_IDSKunden.DefaultCellStyle = DataGridViewCellStyle22 Me.dgvSonst_IDSKunden.Location = New System.Drawing.Point(9, 214) Me.dgvSonst_IDSKunden.MultiSelect = False Me.dgvSonst_IDSKunden.Name = "dgvSonst_IDSKunden" - Me.dgvSonst_IDSKunden.Size = New System.Drawing.Size(657, 53) + Me.dgvSonst_IDSKunden.Size = New System.Drawing.Size(657, 68) Me.dgvSonst_IDSKunden.TabIndex = 18 ' 'cbxSonst_CsvAsfinag @@ -4654,26 +4722,26 @@ Partial Class usrcntlKundeBearbeitenFull 'DataGridView1 ' Me.DataGridView1.AllowUserToResizeRows = False - DataGridViewCellStyle51.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle51 + DataGridViewCellStyle23.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle23 Me.DataGridView1.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle52.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle52.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle52.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle52.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle52.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle52.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle52.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.DataGridView1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle52 + DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.DataGridView1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle24 Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle53.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle53.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle53.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle53.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle53.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle53.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle53.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.DataGridView1.DefaultCellStyle = DataGridViewCellStyle53 + DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.DataGridView1.DefaultCellStyle = DataGridViewCellStyle25 Me.DataGridView1.Enabled = False Me.DataGridView1.Location = New System.Drawing.Point(6, 111) Me.DataGridView1.MultiSelect = False @@ -4740,26 +4808,26 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.dgvBankverbindungen.AllowUserToDeleteRows = False Me.dgvBankverbindungen.AllowUserToResizeRows = False - DataGridViewCellStyle54.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvBankverbindungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle54 + DataGridViewCellStyle26.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvBankverbindungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle26 Me.dgvBankverbindungen.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle55.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle55.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle55.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle55.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle55.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle55.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle55.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvBankverbindungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle55 + DataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvBankverbindungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle27 Me.dgvBankverbindungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle56.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle56.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle56.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle56.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle56.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle56.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle56.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvBankverbindungen.DefaultCellStyle = DataGridViewCellStyle56 + DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle28.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvBankverbindungen.DefaultCellStyle = DataGridViewCellStyle28 Me.dgvBankverbindungen.Location = New System.Drawing.Point(3, 40) Me.dgvBankverbindungen.MultiSelect = False Me.dgvBankverbindungen.Name = "dgvBankverbindungen" @@ -5915,74 +5983,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.DataGridViewTextBoxColumn2.HeaderText = "E-Mail" Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" ' - 'Label120 - ' - Me.Label120.AutoSize = True - Me.Label120.Location = New System.Drawing.Point(305, 78) - Me.Label120.Name = "Label120" - Me.Label120.Size = New System.Drawing.Size(30, 13) - Me.Label120.TabIndex = 57 - Me.Label120.Text = "vom:" - ' - 'txtSEG_vom - ' - Me.txtSEG_vom._DateTimeOnly = False - Me.txtSEG_vom._numbersOnly = False - Me.txtSEG_vom._numbersOnlyKommastellen = "" - Me.txtSEG_vom._numbersOnlyTrennzeichen = True - Me.txtSEG_vom._Prozent = False - Me.txtSEG_vom._ShortDateNew = True - Me.txtSEG_vom._ShortDateOnly = False - Me.txtSEG_vom._TimeOnly = False - Me.txtSEG_vom._TimeOnly_Seconds = False - Me.txtSEG_vom._value = "" - Me.txtSEG_vom._Waehrung = False - Me.txtSEG_vom._WaehrungZeichen = True - Me.txtSEG_vom.ForeColor = System.Drawing.Color.Red - Me.txtSEG_vom.Location = New System.Drawing.Point(341, 75) - Me.txtSEG_vom.MaxLength = 10 - Me.txtSEG_vom.MaxLineLength = -1 - Me.txtSEG_vom.MaxLines_Warning = "" - Me.txtSEG_vom.MaxLines_Warning_Label = Nothing - Me.txtSEG_vom.Name = "txtSEG_vom" - Me.txtSEG_vom.Size = New System.Drawing.Size(60, 20) - Me.txtSEG_vom.TabIndex = 58 - Me.txtSEG_vom.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' - 'txtSEG_Summe - ' - Me.txtSEG_Summe._DateTimeOnly = False - Me.txtSEG_Summe._numbersOnly = False - Me.txtSEG_Summe._numbersOnlyKommastellen = "" - Me.txtSEG_Summe._numbersOnlyTrennzeichen = True - Me.txtSEG_Summe._Prozent = False - Me.txtSEG_Summe._ShortDateNew = False - Me.txtSEG_Summe._ShortDateOnly = False - Me.txtSEG_Summe._TimeOnly = False - Me.txtSEG_Summe._TimeOnly_Seconds = False - Me.txtSEG_Summe._value = "" - Me.txtSEG_Summe._Waehrung = True - Me.txtSEG_Summe._WaehrungZeichen = True - Me.txtSEG_Summe.ForeColor = System.Drawing.Color.Red - Me.txtSEG_Summe.Location = New System.Drawing.Point(159, 75) - Me.txtSEG_Summe.MaxLineLength = -1 - Me.txtSEG_Summe.MaxLines_Warning = "" - Me.txtSEG_Summe.MaxLines_Warning_Label = Nothing - Me.txtSEG_Summe.Name = "txtSEG_Summe" - Me.txtSEG_Summe.Size = New System.Drawing.Size(100, 20) - Me.txtSEG_Summe.TabIndex = 56 - Me.txtSEG_Summe.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' - 'Label121 - ' - Me.Label121.AutoSize = True - Me.Label121.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label121.Location = New System.Drawing.Point(7, 78) - Me.Label121.Name = "Label121" - Me.Label121.Size = New System.Drawing.Size(32, 13) - Me.Label121.TabIndex = 59 - Me.Label121.Text = "SEG:" - ' 'usrcntlKundeBearbeitenFull ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb b/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb index 1709c22a..ca1bed4d 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb +++ b/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb @@ -127,6 +127,7 @@ Partial Class usrCntlMDMAuswertungen Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label36 = New System.Windows.Forms.Label() Me.TabPage3 = New System.Windows.Forms.TabPage() + Me.UsrCntlWoelfl_IM_CSVRg1 = New SDL.usrCntlWoelfl_IM_CSVRg() Me.tbIDS = New System.Windows.Forms.TabPage() Me.Label62 = New System.Windows.Forms.Label() Me.GroupBox13 = New System.Windows.Forms.GroupBox() @@ -163,6 +164,7 @@ Partial Class usrCntlMDMAuswertungen Me.Label41 = New System.Windows.Forms.Label() Me.Button12 = New System.Windows.Forms.Button() Me.TabPage4 = New System.Windows.Forms.TabPage() + Me.UsrCntlMSE_KonvertCSV1 = New SDL.usrCntlMSE_KonvertCSV() Me.TabPage5 = New System.Windows.Forms.TabPage() Me.Label56 = New System.Windows.Forms.Label() Me.GroupBox17 = New System.Windows.Forms.GroupBox() @@ -187,8 +189,6 @@ Partial Class usrCntlMDMAuswertungen Me.btnContractdaten = New System.Windows.Forms.Button() Me.Button15 = New System.Windows.Forms.Button() Me.pnl = New System.Windows.Forms.Panel() - Me.UsrCntlWoelfl_IM_CSVRg1 = New SDL.usrCntlWoelfl_IM_CSVRg() - Me.UsrCntlMSE_KonvertCSV1 = New SDL.usrCntlMSE_KonvertCSV() Me.GroupBox1.SuspendLayout() Me.GroupBox2.SuspendLayout() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() @@ -1267,9 +1267,9 @@ Partial Class usrCntlMDMAuswertungen Me.Label61.AutoSize = True Me.Label61.Location = New System.Drawing.Point(169, 38) Me.Label61.Name = "Label61" - Me.Label61.Size = New System.Drawing.Size(94, 13) + Me.Label61.Size = New System.Drawing.Size(169, 13) Me.Label61.TabIndex = 21 - Me.Label61.Text = "nur aktive Kunden" + Me.Label61.Text = "nur aktive/nicht gesperrte Kunden" ' 'PictureBox6 ' @@ -1415,6 +1415,14 @@ Partial Class usrCntlMDMAuswertungen Me.TabPage3.Text = "WÖLFL" Me.TabPage3.UseVisualStyleBackColor = True ' + 'UsrCntlWoelfl_IM_CSVRg1 + ' + Me.UsrCntlWoelfl_IM_CSVRg1.BackColor = System.Drawing.Color.White + Me.UsrCntlWoelfl_IM_CSVRg1.Location = New System.Drawing.Point(6, 167) + Me.UsrCntlWoelfl_IM_CSVRg1.Name = "UsrCntlWoelfl_IM_CSVRg1" + Me.UsrCntlWoelfl_IM_CSVRg1.Size = New System.Drawing.Size(728, 97) + Me.UsrCntlWoelfl_IM_CSVRg1.TabIndex = 10 + ' 'tbIDS ' Me.tbIDS.Controls.Add(Me.Label62) @@ -1793,6 +1801,14 @@ Partial Class usrCntlMDMAuswertungen Me.TabPage4.Text = "MSE" Me.TabPage4.UseVisualStyleBackColor = True ' + 'UsrCntlMSE_KonvertCSV1 + ' + Me.UsrCntlMSE_KonvertCSV1.BackColor = System.Drawing.Color.White + Me.UsrCntlMSE_KonvertCSV1.Location = New System.Drawing.Point(7, 7) + Me.UsrCntlMSE_KonvertCSV1.Name = "UsrCntlMSE_KonvertCSV1" + Me.UsrCntlMSE_KonvertCSV1.Size = New System.Drawing.Size(728, 97) + Me.UsrCntlMSE_KonvertCSV1.TabIndex = 0 + ' 'TabPage5 ' Me.TabPage5.Controls.Add(Me.Label56) @@ -2052,22 +2068,6 @@ Partial Class usrCntlMDMAuswertungen Me.pnl.Size = New System.Drawing.Size(1057, 54) Me.pnl.TabIndex = 26 ' - 'UsrCntlWoelfl_IM_CSVRg1 - ' - Me.UsrCntlWoelfl_IM_CSVRg1.BackColor = System.Drawing.Color.White - Me.UsrCntlWoelfl_IM_CSVRg1.Location = New System.Drawing.Point(6, 167) - Me.UsrCntlWoelfl_IM_CSVRg1.Name = "UsrCntlWoelfl_IM_CSVRg1" - Me.UsrCntlWoelfl_IM_CSVRg1.Size = New System.Drawing.Size(728, 97) - Me.UsrCntlWoelfl_IM_CSVRg1.TabIndex = 10 - ' - 'UsrCntlMSE_KonvertCSV1 - ' - Me.UsrCntlMSE_KonvertCSV1.BackColor = System.Drawing.Color.White - Me.UsrCntlMSE_KonvertCSV1.Location = New System.Drawing.Point(7, 7) - Me.UsrCntlMSE_KonvertCSV1.Name = "UsrCntlMSE_KonvertCSV1" - Me.UsrCntlMSE_KonvertCSV1.Size = New System.Drawing.Size(728, 97) - Me.UsrCntlMSE_KonvertCSV1.TabIndex = 0 - ' 'usrCntlMDMAuswertungen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/SDL/mdm/usrCntlMDMAuswertungen.vb b/SDL/mdm/usrCntlMDMAuswertungen.vb index b4c9fa45..5a407b43 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.vb +++ b/SDL/mdm/usrCntlMDMAuswertungen.vb @@ -1542,7 +1542,7 @@ Public Class usrCntlMDMAuswertungen Me.Cursor = Cursors.WaitCursor - Dim SQLstr = " SELECT AD.Auswahl,AD.AdressenNr AS KundenNr,AD.[Name 1] AS Kundenname,AD.Ort,AD.LandKz,ISNULL(kde_betreuer,'-') AS Betreuer,kde_keineMWSt AS keineMWST,AD.AdressenNr AS ASFINAG_KundenNr,AD.PLOSEKundenNr AS Plose_KundenNr,tblMSECustomers.customer_id AS MSE_KundenNr,ids.CustomerCode AS IDS_KundenNr, AD.UTAKundenNr AS UTA_KundenNr, + Dim SQLstr = " SELECT AD.Auswahl,KD.Abfertigungsverbot as gesperrter_Kunde,AD.AdressenNr AS KundenNr,AD.[Name 1] AS Kundenname,AD.Ort,AD.LandKz,ISNULL(kde_betreuer,'-') AS Betreuer,kde_keineMWSt AS keineMWST,AD.AdressenNr AS ASFINAG_KundenNr,AD.PLOSEKundenNr AS Plose_KundenNr,tblMSECustomers.customer_id AS MSE_KundenNr,ids.CustomerCode AS IDS_KundenNr, AD.UTAKundenNr AS UTA_KundenNr, ISNULL(CAST(WölflKundenNr AS nvarchar(50)), '') + CASE WHEN WölflKundenNr IS NOT NULL @@ -1558,16 +1558,9 @@ Public Class usrCntlMDMAuswertungen LEFT JOIN tbl_IDS_Kunden AS ids ON ids.KdNrVERAG = KD.KundenNr AND ISNULL(ids.KdNrAlt,0) <> 1 - AND ids.Zeitstempel = - ( - SELECT MAX(i2.Zeitstempel) - FROM tbl_IDS_Kunden AS i2 - WHERE - i2.KdNrVERAG = ids.KdNrVERAG - AND ISNULL(i2.KdNrAlt,0) <> 1 - ) + -- NICHT NOTWENDIG AND ids.Zeitstempel =(SELECT MAX(i2.Zeitstempel) FROM tbl_IDS_Kunden AS i2 WHEREi2.KdNrVERAG = ids.KdNrVERAG AND ISNULL(i2.KdNrAlt,0) <> 1) WHERE - KD.FilialenNr = 8001 " & IIf(cbx_nuraktiveKunden.Checked, "and AD.Auswahl = 'A' ", "") + KD.FilialenNr = 8001 " & IIf(cbx_nuraktiveKunden.Checked, "and AD.Auswahl = 'A' and isnull(KD.Abfertigungsverbot,0) <> 1 ", "") Dim dt = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL") From 3aead839405d2015d54b9856e445805d33a7f001 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 18 Dec 2025 15:45:26 +0100 Subject: [PATCH 9/9] kundeblatt, etc. --- SDL/Fakturierung/cFakturierung.vb | 23 +++++++- SDL/Fakturierung/usrCntlFaktAbrechnung.vb | 5 +- SDL/My Project/AssemblyInfo.vb | 4 +- SDL/kunden/frmKundenblatt.Designer.vb | 69 +++++++++++------------ SDL/kunden/frmKundenblatt.vb | 19 +++++++ SDL/kunden/usrCntlOfferte.vb | 4 +- SDL/mdm/frmMDMDatenverarbetiung.vb | 2 +- 7 files changed, 81 insertions(+), 45 deletions(-) diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index bf5f7e7a..b45ccb2f 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -2106,20 +2106,37 @@ Public Class cFakturierung Select Case RECHNUNG.BelegartenKz Case "AR" rpt.lblUeberschriftRG_GS.Text = "FACTURA" - rpt.lblSummeUeberschrift.Text = "Total" + rpt.lblSummeUeberschrift.Text = "Total:" rpt.lblRgNrUeberschrift.Text = "Nr. factura:" rpt.lblRgDatumUeberschrift.Text = "Data factura:" Case "AG" rpt.lblUeberschriftRG_GS.Text = "NOTA DE CREDIT" - rpt.lblSummeUeberschrift.Text = "Total" + rpt.lblSummeUeberschrift.Text = "Total:" rpt.lblRgNrUeberschrift.Text = "Nr. nota credit:" rpt.lblRgDatumUeberschrift.Text = "Data nota credit:" End Select + Case "TR" 'Todo: bekomme noch die Übersetzungen dazu: 2025-12-18 + Select Case RECHNUNG.BelegartenKz + Case "AR" + rpt.lblUeberschriftRG_GS.Text = "INVOICE" + rpt.lblSummeUeberschrift.Text = "Invoice Amount:" + rpt.lblRgNrUeberschrift.Text = "Invoice No.:" + rpt.lblRgDatumUeberschrift.Text = "Invoice Date:" + Case "AG" + rpt.lblUeberschriftRG_GS.Text = "CREDIT NOTE" + rpt.lblSummeUeberschrift.Text = "Credit Amount:" + rpt.lblRgNrUeberschrift.Text = "Credit Note No.:" + rpt.lblRgDatumUeberschrift.Text = "Credit Note Date:" + End Select + Case Else Select Case RECHNUNG.BelegartenKz Case "AR" rpt.lblUeberschriftRG_GS.Text = "RECHNUNG" + rpt.lblSummeUeberschrift.Text = "Rechnungsbetrag" + rpt.lblRgNrUeberschrift.Text = "Rechnungs-Nr.:" + rpt.lblRgDatumUeberschrift.Text = "Rechnungs-Datum:" Case "AG" rpt.lblUeberschriftRG_GS.Text = "GUTSCHRIFT" rpt.lblSummeUeberschrift.Text = "Gutschriftsbetrag:" @@ -2353,7 +2370,7 @@ Public Class cFakturierung Case Else rpt.lblLeistungUeberschrift.Text = "RENR" - rpt.lblLeistungUeberschrift.Text = "RE Datum" + rpt.lbl_onlyZR_ReDatUeberschrift.Text = "RE Datum" rpt.lblAnzahlUeberschrift.Text = "VZ Tage" rpt.lblSteuerpflichtigUeberschrift.Text = "RE Betrag" rpt.lblSteuerfreiUeberschrift.Text = "Verzugszinsen" diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index 54bbfdc9..82d72cbc 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -558,7 +558,10 @@ Public Class usrCntlFaktAbrechnung cboRechnungSprache.Items.Clear() cboRechnungSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Deutsch", "DE")) cboRechnungSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Englisch", "EN")) - If FirmaTmp = "VERAG360" Then cboRechnungSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Rumänisch", "RO")) + If FirmaTmp = "VERAG360" Then + cboRechnungSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Rumänisch", "RO")) + cboRechnungSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Türkisch", "TR")) + End If cboRechnungSprache.changeItem(0) cboRgArt.Items.Clear() diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 961b2d69..0797284c 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: ' - - + + diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index b374cad8..4d75e482 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -66,7 +66,6 @@ Partial Class frmKundenblatt Me.GroupBox5 = New System.Windows.Forms.GroupBox() Me.lblStat_Lkws = New System.Windows.Forms.Label() Me.dgvLeistungen = New System.Windows.Forms.DataGridView() - Me.PictureBox5 = New System.Windows.Forms.PictureBox() Me.lblAnsprechp = New System.Windows.Forms.TextBox() Me.txtEmailRE2 = New System.Windows.Forms.TextBox() Me.txtEmailRE = New System.Windows.Forms.TextBox() @@ -221,6 +220,7 @@ Partial Class frmKundenblatt Me.tbRechnungen = New System.Windows.Forms.TabPage() Me.dgvRg = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) + Me.btnRgMail = New System.Windows.Forms.Button() Me.btnRgPdf = New System.Windows.Forms.Button() Me.btnMonat = New System.Windows.Forms.Button() Me.Button10 = New System.Windows.Forms.Button() @@ -253,13 +253,13 @@ Partial Class frmKundenblatt Me.tbiKartenverwaltung = New System.Windows.Forms.ToolStripMenuItem() Me.tbiLKW = New System.Windows.Forms.ToolStripMenuItem() Me.tbiVERAGCard = New System.Windows.Forms.ToolStripMenuItem() + Me.Button8 = New System.Windows.Forms.Button() Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull() Me.usrcntlKarten = New SDL.usrCntlKartenDaten() Me.UsrCntlLKW1 = New SDL.usrCntlLKW() Me.UsrCntlKundenlogin1 = New SDL.usrCntlKundenlogin() Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() Me.UsrCntlUSTV = New SDL.usrCntlUSTV() - Me.btnRgMail = New System.Windows.Forms.Button() Me.pnlInfo.SuspendLayout() Me.tbFirmendaten.SuspendLayout() Me.Panel4.SuspendLayout() @@ -267,7 +267,6 @@ Partial Class frmKundenblatt Me.tbAllgemein.SuspendLayout() Me.GroupBox5.SuspendLayout() CType(Me.dgvLeistungen, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.picLogo, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabControl1.SuspendLayout() @@ -386,6 +385,7 @@ Partial Class frmKundenblatt 'tbAllgemein ' Me.tbAllgemein.BackColor = System.Drawing.Color.White + Me.tbAllgemein.Controls.Add(Me.Button8) Me.tbAllgemein.Controls.Add(Me.txtKundeninfo) Me.tbAllgemein.Controls.Add(Me.txtRisiko) Me.tbAllgemein.Controls.Add(Me.Label20) @@ -539,7 +539,6 @@ Partial Class frmKundenblatt Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.GroupBox5.Controls.Add(Me.lblStat_Lkws) Me.GroupBox5.Controls.Add(Me.dgvLeistungen) - Me.GroupBox5.Controls.Add(Me.PictureBox5) Me.GroupBox5.Location = New System.Drawing.Point(738, 501) Me.GroupBox5.Name = "GroupBox5" Me.GroupBox5.Size = New System.Drawing.Size(543, 489) @@ -596,17 +595,6 @@ Partial Class frmKundenblatt Me.dgvLeistungen.Size = New System.Drawing.Size(531, 429) Me.dgvLeistungen.TabIndex = 197 ' - 'PictureBox5 - ' - Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.PictureBox5.Image = Global.SDL.My.Resources.Resources.statistik - Me.PictureBox5.Location = New System.Drawing.Point(449, 9) - Me.PictureBox5.Name = "PictureBox5" - Me.PictureBox5.Size = New System.Drawing.Size(38, 39) - Me.PictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom - Me.PictureBox5.TabIndex = 144 - Me.PictureBox5.TabStop = False - ' 'lblAnsprechp ' Me.lblAnsprechp.BackColor = System.Drawing.Color.White @@ -1059,7 +1047,7 @@ Partial Class frmKundenblatt 'Label17 ' Me.Label17.AutoSize = True - Me.Label17.Location = New System.Drawing.Point(660, 21) + Me.Label17.Location = New System.Drawing.Point(660, 101) Me.Label17.Name = "Label17" Me.Label17.Size = New System.Drawing.Size(66, 13) Me.Label17.TabIndex = 1 @@ -1086,7 +1074,7 @@ Partial Class frmKundenblatt DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] Me.dgvOfferte.DefaultCellStyle = DataGridViewCellStyle17 - Me.dgvOfferte.Location = New System.Drawing.Point(684, 37) + Me.dgvOfferte.Location = New System.Drawing.Point(684, 118) Me.dgvOfferte.Name = "dgvOfferte" Me.dgvOfferte.ReadOnly = True DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft @@ -1097,7 +1085,7 @@ Partial Class frmKundenblatt DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.dgvOfferte.RowHeadersDefaultCellStyle = DataGridViewCellStyle18 - Me.dgvOfferte.Size = New System.Drawing.Size(42, 320) + Me.dgvOfferte.Size = New System.Drawing.Size(42, 239) Me.dgvOfferte.TabIndex = 12 Me.dgvOfferte.Visible = False ' @@ -2817,6 +2805,20 @@ Partial Class frmKundenblatt Me.MyPanel1.Size = New System.Drawing.Size(1681, 60) Me.MyPanel1.TabIndex = 2 ' + 'btnRgMail + ' + Me.btnRgMail.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnRgMail.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnRgMail.Image = Global.SDL.My.Resources.Resources.email_big1 + Me.btnRgMail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnRgMail.Location = New System.Drawing.Point(1536, 0) + Me.btnRgMail.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3) + Me.btnRgMail.Name = "btnRgMail" + Me.btnRgMail.Size = New System.Drawing.Size(58, 57) + Me.btnRgMail.TabIndex = 213 + Me.btnRgMail.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnRgMail.UseVisualStyleBackColor = True + ' 'btnRgPdf ' Me.btnRgPdf.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -3027,7 +3029,7 @@ Partial Class frmKundenblatt ' Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM" - Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8 + Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4 Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4) Me.cntxtCntxtMDM.Text = "cntxtMDM" ' @@ -3189,6 +3191,18 @@ Partial Class frmKundenblatt Me.tbiVERAGCard.Size = New System.Drawing.Size(186, 22) Me.tbiVERAGCard.Text = "VERAG Card" ' + 'Button8 + ' + Me.Button8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button8.Image = Global.SDL.My.Resources.Resources.statistik2 + Me.Button8.Location = New System.Drawing.Point(660, 6) + Me.Button8.Name = "Button8" + Me.Button8.Size = New System.Drawing.Size(66, 58) + Me.Button8.TabIndex = 203 + Me.Button8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button8.UseVisualStyleBackColor = True + ' 'UsrcntlKundeBearbeitenFull1 ' Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White @@ -3247,20 +3261,6 @@ Partial Class frmKundenblatt Me.UsrCntlUSTV.Size = New System.Drawing.Size(1667, 964) Me.UsrCntlUSTV.TabIndex = 0 ' - 'btnRgMail - ' - Me.btnRgMail.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnRgMail.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnRgMail.Image = Global.SDL.My.Resources.Resources.email_big1 - Me.btnRgMail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnRgMail.Location = New System.Drawing.Point(1536, 0) - Me.btnRgMail.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3) - Me.btnRgMail.Name = "btnRgMail" - Me.btnRgMail.Size = New System.Drawing.Size(58, 57) - Me.btnRgMail.TabIndex = 213 - Me.btnRgMail.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnRgMail.UseVisualStyleBackColor = True - ' 'frmKundenblatt ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -3290,7 +3290,6 @@ Partial Class frmKundenblatt Me.GroupBox5.ResumeLayout(False) Me.GroupBox5.PerformLayout() CType(Me.dgvLeistungen, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.picLogo, System.ComponentModel.ISupportInitialize).EndInit() Me.TabControl1.ResumeLayout(False) @@ -3373,7 +3372,6 @@ Partial Class frmKundenblatt Friend WithEvents tbLKW As System.Windows.Forms.TabPage Friend WithEvents pnlLKWRight As System.Windows.Forms.Panel Friend WithEvents GroupBox5 As System.Windows.Forms.GroupBox - Friend WithEvents PictureBox5 As System.Windows.Forms.PictureBox Friend WithEvents lblStat_Lkws As System.Windows.Forms.Label Friend WithEvents Button4 As System.Windows.Forms.Button Friend WithEvents PictureBox4 As System.Windows.Forms.PictureBox @@ -3570,4 +3568,5 @@ Partial Class frmKundenblatt Friend WithEvents Label21 As Label Friend WithEvents txtKundeninfo As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents btnRgMail As Button + Friend WithEvents Button8 As Button End Class diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb index 1dd0e546..b5d1169d 100644 --- a/SDL/kunden/frmKundenblatt.vb +++ b/SDL/kunden/frmKundenblatt.vb @@ -219,6 +219,7 @@ Public Class frmKundenblatt Dim path = DS.GET_TOP1_PATH 'cDATENSERVER.getTOP1Path("GRAFIK", "FIRMENLOGOS", kdNr) If path <> "" Then picLogo.ImageLocation = path + picLogo.SizeMode = PictureBoxSizeMode.Zoom Else picLogo.ImageLocation = Nothing End If @@ -1694,6 +1695,8 @@ Public Class frmKundenblatt 'Dim path = cDATENSERVER.uploadDataToDATENSERVERFileDialog("GRAFIK", "FIRMENLOGOS", kdNr, , , , "PIC") If path <> "" Then picLogo.ImageLocation = path + Else + picLogo.ImageLocation = Nothing End If @@ -2884,5 +2887,21 @@ Public Class frmKundenblatt Private Sub btnRgMail_Click(sender As Object, e As EventArgs) Handles btnRgMail.Click End Sub + + Private Sub Button8_Click(sender As Object, e As EventArgs) Handles Button8.Click + + Dim rptKundeUebersicht As New SDL.rptKundeUebersicht(kdNr, 19) + Dim rpt As New frmPrintLayout + rpt.Text = "" + + rpt.Viewer.LoadDocument(rptKundeUebersicht) + + rpt.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous + rpt.Show() + End Sub + + Private Sub PictureBox5_Click(sender As Object, e As EventArgs) + + End Sub End Class diff --git a/SDL/kunden/usrCntlOfferte.vb b/SDL/kunden/usrCntlOfferte.vb index 9f075350..9ced1568 100644 --- a/SDL/kunden/usrCntlOfferte.vb +++ b/SDL/kunden/usrCntlOfferte.vb @@ -1055,9 +1055,7 @@ Public Class usrCntlOfferte Private Sub btnOffertPreisliste_Click(sender As Object, e As EventArgs) Handles btnOffertPreisliste.Click - 'dgvOfferteDetails - - + MsgBox("Noch nicht implementiert!") End Sub End Class diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index 0b198203..388c67ee 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -815,7 +815,7 @@ Public Class frmMDMDatenverarbetiung AND (tblUTAImportNew.Lieferland = tblUTALeistungen.Lieferland) AND (tblUTAImportNew.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart)) ON tblUTAFakturierwarenarten.Fakturierwarenart = tblUTALeistungen.Fakturierwarenart) as temp - where isnull(temp.charged,0) = 0 and cast([Rechnungsdatum] as Date) = '" & DateTimePicker2.Text & "' and temp.AdressenNr not in (756150, 711104) + where (temp.charged = 0 OR temp.charged IS NULL) and [Rechnungsdatum] >= '" & DateTimePicker2.Text & "' AND [Rechnungsdatum] < '" & CDate(DateTimePicker2.Text).AddDays(1).ToShortDateString & "' and temp.AdressenNr not in (756150, 711104) GROUP BY Kundennummer, KundenNr, [Name 1], LandKz, Ort", "FMZOLL") .LOAD() 'MsgBox(.GET_SQL())