From 319837c39a4cde55e64149d48592d54cbaf93df7 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 22 Aug 2025 13:10:40 +0200 Subject: [PATCH 01/12] OFfertenBeabeiten, Formulare, Fakt. --- SDL/Fakturierung/cFakturierung.vb | 5 ++-- SDL/Formulare/KDFormulare/frmFormulare.vb | 12 ++++++++ SDL/My Project/AssemblyInfo.vb | 4 +-- SDL/USTV/frmMDM_USTVAntrag.vb | 5 +++- SDL/kunden/frmOffertenBearbeiten.Designer.vb | 30 +++++++++++++++++++ SDL/kunden/frmOffertenBearbeiten.vb | 4 ++- .../Classes/cMDMFunctionsAllgemein.vb | 3 +- VERAG_PROG_ALLGEMEIN/Classes/cOfferte.vb | 19 ++++++++---- 8 files changed, 70 insertions(+), 12 deletions(-) diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index 7ca96d37..4061a994 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -718,13 +718,14 @@ Public Class cFakturierung 'End Function - Public Shared Function doRechnungsDruck_SRorER(RK_ID As Integer, Optional RechnungsDatum As Object = Nothing, Optional vorschau As Boolean = False, Optional Rechnugnsdruck As Integer = -1, Optional ByRef Path As String = "", Optional ByRef PrinterName As String = "", Optional printStbVdb As Boolean = False, Optional AnlageEinzelRg As Boolean = False, Optional sammelrechnungKopie As Boolean = False) As Boolean + + Public Shared Function doRechnungsDruck_SRorER(RK_ID As Integer, Optional RechnungsDatum As Object = Nothing, Optional vorschau As Boolean = False, Optional Rechnugnsdruck As Integer = -1, Optional ByRef Path As String = "", Optional ByRef PrinterName As String = "", Optional printStbVdb As Boolean = False, Optional AnlageEinzelRg As Boolean = False, Optional sammelrechnungKopie As Boolean = False, Optional onlyAsfinagAttach As Boolean = False) As Boolean If RK_ID <= 0 Then Return False Dim RG_TMP As New VERAG_PROG_ALLGEMEIN.cRechnungsausgang(RK_ID) If RG_TMP.Sammelrechnung = 0 Then Return doRechnungsDruck(New VERAG_PROG_ALLGEMEIN.cRechnungsausgang(RK_ID), RechnungsDatum, vorschau, Rechnugnsdruck, Path, PrinterName, , printStbVdb) ElseIf RG_TMP.Sammelrechnung = 6 Then - Return cFakturierung.doSAMMELRechnungsDruck_Abschnitt(RG_TMP.RechnungsNr, -1, -1, RG_TMP.DruckDatumZeit, "", AnlageEinzelRg, True, Rechnugnsdruck, Path, False,,,,,,,, True, True, sammelrechnungKopie,,, , True) + Return cFakturierung.doSAMMELRechnungsDruck_Abschnitt(RG_TMP.RechnungsNr, -1, -1, RG_TMP.DruckDatumZeit, "", AnlageEinzelRg, True, Rechnugnsdruck, Path, False,,,,,,,, True, True, sammelrechnungKopie,,, onlyAsfinagAttach, True) Else Return cFakturierung.doSAMMELRechnungsDruck_Abschnitt(RG_TMP.RechnungsNr, -1, -1, RG_TMP.DruckDatumZeit, "", AnlageEinzelRg, , Rechnugnsdruck, Path, True) End If diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index d292f429..9029adce 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -5575,6 +5575,11 @@ Public Class FormularManagerNEU mail_To = AD.E_Mail End If + If AD IsNot Nothing AndAlso AD.E_Mail2 <> "" Then + If mail_To <> "" Then mail_To &= ";" + mail_To &= AD.E_Mail2 + End If + Dim FISKAL As New cFiskal_Daten(usrCntl.KdNR) If FISKAL IsNot Nothing Then mail_To_Stb = If(FISKAL.fisk_schreibenSB_Mail, "") @@ -5875,6 +5880,13 @@ Public Class FormularManagerNEU If EMAILTMP = "" Then Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(usrCntl.KdNR) If AD IsNot Nothing Then Mail_To = If(AD.E_Mail, "") + If AD IsNot Nothing AndAlso AD.E_Mail2 IsNot Nothing Then + If Mail_To <> "" Then + Mail_To &= ";" & AD.E_Mail2 + Else + Mail_To = AD.E_Mail2 + End If + End If End If End If diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 48d7cb39..e3ac54a5 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/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 21015f00..36595acd 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -927,6 +927,9 @@ Public Class frmMDM_USTVAntrag USTV_POS.UStVPo_daId = 0 Dim rkID = sql.getValueTxtBySql("SELECT TOP(1) isnull(RK_ID,0) FROM Rechnungsausgang where cast(Rechnungsausgang.RechnungsDatum as Date) ='" & USTV_POS.UStVPo_ReDat & "' and Rechnungsausgang.RechnungsNr='" & USTV_POS.UStVPo_ReNr & "' AND FilialenNr = " & r.Item("FilialenNr") & " AND RK_ID is not null", "FMZOLL") + + + If rkID <> "" AndAlso IsNumeric(rkID) Then USTV_POS.UStVPo_daId = rkID If USTV_POS.UStVPo_daId > 0 Then USTV_POS.UStVPo_daId_loeschbar = False @@ -3558,7 +3561,7 @@ Public Class frmMDM_USTVAntrag If IsNumeric(item.Name) Then Dim RG_PATH = "" - cFakturierung.doRechnungsDruck_SRorER(item.Name,, False, 4, RG_PATH,,, True) + cFakturierung.doRechnungsDruck_SRorER(item.Name,, False, 4, RG_PATH,,, True,, True) Process.Start(RG_PATH) End If diff --git a/SDL/kunden/frmOffertenBearbeiten.Designer.vb b/SDL/kunden/frmOffertenBearbeiten.Designer.vb index 6206da96..cdc4b578 100644 --- a/SDL/kunden/frmOffertenBearbeiten.Designer.vb +++ b/SDL/kunden/frmOffertenBearbeiten.Designer.vb @@ -28,6 +28,8 @@ Partial Class frmOffertenBearbeiten Me.lblBitteWahlenSieDieOffertenFurDenKundenAus = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() Me.cboSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Label2 = New System.Windows.Forms.Label() Me.SuspendLayout() ' 'FlowLayoutPanel @@ -90,12 +92,38 @@ Partial Class frmOffertenBearbeiten Me.cboSprache.Size = New System.Drawing.Size(51, 21) Me.cboSprache.TabIndex = 13 ' + 'cboFiliale + ' + Me.cboFiliale._allowedValuesFreiText = Nothing + Me.cboFiliale._allowFreiText = False + Me.cboFiliale._value = "" + Me.cboFiliale.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend + Me.cboFiliale.DropDownWidth = 50 + Me.cboFiliale.FormattingEnabled = True + Me.cboFiliale.Location = New System.Drawing.Point(274, 24) + Me.cboFiliale.Name = "cboFiliale" + Me.cboFiliale.Size = New System.Drawing.Size(51, 21) + Me.cboFiliale.TabIndex = 15 + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label2.Location = New System.Drawing.Point(211, 27) + Me.Label2.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(44, 13) + Me.Label2.TabIndex = 14 + Me.Label2.Text = "Filiale:" + ' 'frmOffertenBearbeiten ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White Me.ClientSize = New System.Drawing.Size(337, 559) + Me.Controls.Add(Me.cboFiliale) + Me.Controls.Add(Me.Label2) Me.Controls.Add(Me.cboSprache) Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.lblBitteWahlenSieDieOffertenFurDenKundenAus) @@ -115,4 +143,6 @@ Partial Class frmOffertenBearbeiten Friend WithEvents lblBitteWahlenSieDieOffertenFurDenKundenAus As System.Windows.Forms.Label Friend WithEvents Label1 As Label Friend WithEvents cboSprache As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents cboFiliale As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents Label2 As Label End Class diff --git a/SDL/kunden/frmOffertenBearbeiten.vb b/SDL/kunden/frmOffertenBearbeiten.vb index f446c5dd..cd2d1b52 100644 --- a/SDL/kunden/frmOffertenBearbeiten.vb +++ b/SDL/kunden/frmOffertenBearbeiten.vb @@ -32,6 +32,8 @@ Public Class frmOffertenBearbeiten cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("RO", "RO")) cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("TR", "TR")) + cboFiliale.fillWithSQL("SELECT Filialen.FilialenNr FROM Filialen ORDER BY Filialen.FilialenNr", False, "FMZOLL") + Dim where = "" Select Case FIRMA_TMP @@ -84,7 +86,7 @@ Public Class frmOffertenBearbeiten If c.GetType Is GetType(VERAG_PROG_ALLGEMEIN.MyCheckBoxValue) Then ' MsgBox(c._value) If c.enabled And c.checked Then - Dim o As New VERAG_PROG_ALLGEMEIN.cOfferte(kdnr, c._value, False) + Dim o As New VERAG_PROG_ALLGEMEIN.cOfferte(kdnr, c._value, cboFiliale._value, False) o.Art = "Neuanlage" o.SAVE() 'speichern o.LOAD_POSITIONEN() 'positionen Laden diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb index 3df41c11..4c66e29a 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb @@ -876,7 +876,8 @@ Public Class cMDMFunctionsAllgemein If dsID > 0 Then 'Me.Cursor = Cursors.WaitCursor Dim path As String - cFakturierung.doRechnungsDruck_SRorER(dsID,, False, 4, path) + Dim onlyAsfinat As Boolean = True + cFakturierung.doRechnungsDruck_SRorER(dsID,, False, 4, path,,,,, onlyAsfinat) If nummierung > 0 Then diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cOfferte.vb b/VERAG_PROG_ALLGEMEIN/Classes/cOfferte.vb index f85df762..c05d95e6 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cOfferte.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cOfferte.vb @@ -42,7 +42,7 @@ Public Class cOfferteList propInfo.SetValue(l, dr.Item(i.Text)) End If Next - If loadPos Then l.LOAD_POSITIONEN() + If loadPos Then l.LOAD_POSITIONEN(-1) LIST.Add(l) End While @@ -92,6 +92,13 @@ Public Class cOfferte LOAD(KundenNr, OffertenNr, loadPos) End Sub + Sub New(KundenNr, OffertenNr, FilialeNr, loadPos) + Me.KundenNr = KundenNr + Me.OffertenNr = OffertenNr + Me.FilialenNr = FilialeNr + LOAD(KundenNr, OffertenNr, loadPos) + 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("KundenNr", KundenNr)) @@ -111,13 +118,14 @@ Public Class cOfferte Return list End Function - Public Sub LOAD(KundenNr, OffertenNr, loadPos) + Public Sub LOAD(KundenNr As Integer, OffertenNr As Integer, loadPos As Boolean, Optional FilialenNr As Integer = -1) Try POSITIONEN.Clear() Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() - Using cmd As New SqlCommand("SELECT * FROM Offerten WHERE KundenNr=@KundenNr AND OffertenNr=@OffertenNr ", conn) + Using cmd As New SqlCommand("SELECT * FROM Offerten WHERE KundenNr=@KundenNr AND OffertenNr=@OffertenNr " & IIf(FilialenNr > 0, " AND FilialenNr=@FilialenNr", ""), conn) cmd.Parameters.AddWithValue("@KundenNr", KundenNr) cmd.Parameters.AddWithValue("@OffertenNr", OffertenNr) + If FilialenNr > 0 Then cmd.Parameters.AddWithValue("@FilialenNr", FilialenNr) Dim dr = cmd.ExecuteReader() If dr.Read Then 'Dim l As New cOfferte @@ -140,13 +148,14 @@ Public Class cOfferte End Sub - Public Sub LOAD_POSITIONEN() + Public Sub LOAD_POSITIONEN(Optional FilialenNr As Integer = -1) Try POSITIONEN.Clear() Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() - Using cmd As New SqlCommand("SELECT * FROM Offertenpositionen WHERE KundenNr=@KundenNr and OffertenNr=@OffertenNr ", conn) + Using cmd As New SqlCommand("SELECT * FROM Offertenpositionen WHERE KundenNr=@KundenNr and OffertenNr=@OffertenNr " & IIf(FilialenNr > 0, " AND FilialenNr=@FilialenNr", ""), conn) cmd.Parameters.AddWithValue("@KundenNr", Me.KundenNr) cmd.Parameters.AddWithValue("@OffertenNr", Me.OffertenNr) + If FilialenNr > 0 Then cmd.Parameters.AddWithValue("@FilialenNr", FilialenNr) Dim dr = cmd.ExecuteReader() While dr.Read Dim l As New cOffertPosition From 868a2abec3823edd7788b7626c83341df0aaeb04 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 22 Aug 2025 14:38:48 +0200 Subject: [PATCH 02/12] Mailversand --- SDL/Fakturierung/cAutomailversand.vb | 8 ++++---- SDL/Fakturierung/cFakturierung.vb | 19 ++++++++++++++----- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/SDL/Fakturierung/cAutomailversand.vb b/SDL/Fakturierung/cAutomailversand.vb index 69d510c6..2d5cfa8b 100644 --- a/SDL/Fakturierung/cAutomailversand.vb +++ b/SDL/Fakturierung/cAutomailversand.vb @@ -116,9 +116,9 @@ Public Class cAutomailversand Dim HTMLMail As String = "" Dim listPDFs As New List(Of String) - + Dim showError As Boolean = False setEmailText(row, FirmaID, RechnungsNr, Mailsubject, HTMLMail) - If doRechnung(row.Item("RechnungsKundenNr"), FirmaID, SammelrechungArt, Rechnungsdatum, RechnungsNr, DruckDatumZeit, MDMKopiedrucken, listPDFs) Then + If doRechnung(row.Item("RechnungsKundenNr"), FirmaID, SammelrechungArt, Rechnungsdatum, RechnungsNr, DruckDatumZeit, MDMKopiedrucken, listPDFs,,,, showError) Then loadAndSetAnhaenge(SR_DT, ATTACHMENTS, listPDFs) If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then Mailsubject &= " TEST" @@ -196,10 +196,10 @@ Public Class cAutomailversand End Sub - Private Function doRechnung(kdNr As Integer, FirmaID As Integer, Sammelrechnungsart As Integer, Rechnungsdatum As Date, lastAktuelle_RgNr As Integer, DruckDatumZeit As Date, Kopie As Boolean, listPDFs As List(Of String), Optional EinzelAnlagen As Boolean = False, Optional Sammelbericht As Boolean = True, Optional saveInThereFore As Boolean = False) + Private Function doRechnung(kdNr As Integer, FirmaID As Integer, Sammelrechnungsart As Integer, Rechnungsdatum As Date, lastAktuelle_RgNr As Integer, DruckDatumZeit As Date, Kopie As Boolean, listPDFs As List(Of String), Optional EinzelAnlagen As Boolean = False, Optional Sammelbericht As Boolean = True, Optional saveInThereFore As Boolean = False, Optional showError As Boolean = True) Dim RechnungsNrisSet As Boolean = False - RechnungsNrisSet = cFakturierung.doSAMMELRechnungsDruck(19, 6, Rechnungsdatum, Rechnungsdatum, "", EinzelAnlagen, Sammelbericht, kdNr, 4, listPDFs, "", lastAktuelle_RgNr, DruckDatumZeit, , , ,, ,,, True, Kopie,, saveInThereFore) + RechnungsNrisSet = cFakturierung.doSAMMELRechnungsDruck(19, 6, Rechnungsdatum, Rechnungsdatum, "", EinzelAnlagen, Sammelbericht, kdNr, 4, listPDFs, "", lastAktuelle_RgNr, DruckDatumZeit, , , ,, ,,, True, Kopie,, saveInThereFore, showError) Return RechnungsNrisSet End Function diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index 4061a994..7e2cb717 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -3172,7 +3172,7 @@ Public Class cFakturierung End Function - Public Shared Function doSAMMELRechnungsDruck(Firma_ID As Integer, SammelrechungArt As Integer, DatumBis As Date, Rechnungsdatum As Date, PrinterName As String, Optional AnlageEinzelRg As Boolean = True, Optional Sammelrechnungsbericht As Boolean = True, Optional whereKdNr As String = "", Optional RechnungsdruckArt As Integer = -1, Optional ByRef listPDFs As List(Of String) = Nothing, Optional SB As String = "", ByRef Optional lastAktuelle_RgNr As Integer = -1, ByRef Optional DruckdatumUhrzeit As DateTime = Nothing, Optional AvisoIds As List(Of Integer) = Nothing, Optional AnlageExcelEvolog As Boolean = False, Optional ByRef SonstAnlagen As List(Of String) = Nothing, Optional vorschau As Boolean = False, Optional AnlageExcelTransferry360 As Boolean = False, Optional FakturierungsGruppe As String = "", Optional Abfertigungsart As String = "", Optional MDMRENrvoarhanden As Boolean = False, Optional MDMREkopie As Boolean = False, Optional setAutoMailversand As Boolean = False, Optional saveInThereFore As Boolean = True) As Boolean 'RECHNUNG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, Optional vorschau As Boolean = False, Optional Rechnugnsdruck As Integer = -1, Optional ByRef Path As String = "") As Boolean + Public Shared Function doSAMMELRechnungsDruck(Firma_ID As Integer, SammelrechungArt As Integer, DatumBis As Date, Rechnungsdatum As Date, PrinterName As String, Optional AnlageEinzelRg As Boolean = True, Optional Sammelrechnungsbericht As Boolean = True, Optional whereKdNr As String = "", Optional RechnungsdruckArt As Integer = -1, Optional ByRef listPDFs As List(Of String) = Nothing, Optional SB As String = "", ByRef Optional lastAktuelle_RgNr As Integer = -1, ByRef Optional DruckdatumUhrzeit As DateTime = Nothing, Optional AvisoIds As List(Of Integer) = Nothing, Optional AnlageExcelEvolog As Boolean = False, Optional ByRef SonstAnlagen As List(Of String) = Nothing, Optional vorschau As Boolean = False, Optional AnlageExcelTransferry360 As Boolean = False, Optional FakturierungsGruppe As String = "", Optional Abfertigungsart As String = "", Optional MDMRENrvoarhanden As Boolean = False, Optional MDMREkopie As Boolean = False, Optional setAutoMailversand As Boolean = False, Optional saveInThereFore As Boolean = True, Optional showError As Boolean = True) As Boolean 'RECHNUNG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, Optional vorschau As Boolean = False, Optional Rechnugnsdruck As Integer = -1, Optional ByRef Path As String = "") As Boolean 'If RECHNUNG Is Nothing Then MsgBox("Fehler beim Laden der Rechnungsdaten!") : Return False Try @@ -3196,9 +3196,18 @@ Public Class cFakturierung If SammelrechungArt = 7 And (AvisoIds IsNot Nothing AndAlso AvisoIds.Count = 0) Then Return False 'Prüfung, ob Daten vorhanden; Abbruch ZB wenn keine AvisoId Dim dt = GET_SR_SQLDT(Firma_ID, SammelrechungArt, DatumBis, whereKdNr, SB, AvisoIds, FakturierungsGruppe, Abfertigungsart) 'SQL.loadDgvBySql(sqlStr, "FMZOLL") - If dt Is Nothing Then MsgBox("ERR01: Keine Daten") : Return True - If dt.Rows.Count = 0 Then MsgBox("ERR02: Keine Daten") : Return True - If Not CHECK_SR_SQLDT(dt) Then MsgBox("ERR03: Es wurden Rechnungen mit einem 0-Betrag gefunden. Bitte prüfen Sie die Eingaben und starten Sie die Sammelabrechnung erneut.") : Return True + If dt Is Nothing Then + If showError Then MsgBox("ERR01: Keine Daten") + Return True + End If + If dt.Rows.Count = 0 Then + If showError Then MsgBox("ERR02: Keine Daten") + Return True + End If + If Not CHECK_SR_SQLDT(dt) Then + If showError Then MsgBox("ERR03: Es wurden Rechnungen mit einem 0-Betrag gefunden. Bitte prüfen Sie die Eingaben und starten Sie die Sammelabrechnung erneut.") + Return True + End If Dim Buchungsjahr = cRKSV.getGJ(Rechnungsdatum, Firma_ID) 'IIf(Rechnungsdatum.Month = 1, Rechnungsdatum.Year - 1, Rechnungsdatum.Year) @@ -3295,7 +3304,7 @@ Public Class cFakturierung If RechnungsdruckArt <> 7 Then If Not RG.checkRechnungsNrIsSet() AndAlso Not vorschau Then - MsgBox("Rechnungsnummer wurde nicht in Datenbank eingetragen" & vbNewLine & "Vorgang wird abgebrochen") + If showError Then MsgBox("Rechnungsnummer wurde nicht in Datenbank eingetragen" & vbNewLine & "Vorgang wird abgebrochen") Return False Else found = True From 5937ba8067e0d86c4426a01560958d4f5552151d Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 26 Aug 2025 10:38:21 +0200 Subject: [PATCH 03/12] IDS-Dieselpreise, etc. --- SDL/My Project/AssemblyInfo.vb | 4 +- SDL/kunden/usrCntlIDSPreise.Designer.vb | 317 +++---------- SDL/kunden/usrCntlIDSPreise.vb | 573 +++++++++--------------- SDL/kunden/usrCntlKundenuebersicht.vb | 2 +- SDL/mdm/usrCntlMDMAuswertungen.vb | 21 +- VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb | 212 +++++++-- 6 files changed, 492 insertions(+), 637 deletions(-) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index e3ac54a5..da9771d0 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/usrCntlIDSPreise.Designer.vb b/SDL/kunden/usrCntlIDSPreise.Designer.vb index 7c3bbf31..6c0873fe 100644 --- a/SDL/kunden/usrCntlIDSPreise.Designer.vb +++ b/SDL/kunden/usrCntlIDSPreise.Designer.vb @@ -27,27 +27,16 @@ Partial Class usrCntlIDSPreise Me.lblOffert = New System.Windows.Forms.TextBox() Me.Label11 = New System.Windows.Forms.Label() Me.dgvOfferteDetails = New System.Windows.Forms.DataGridView() - Me.btnDeleteLeistung = New System.Windows.Forms.Button() - Me.btnAddLeistung = New System.Windows.Forms.Button() Me.cntxtAddSdl = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.btnOfferteSpeichern = New System.Windows.Forms.Button() - Me.btnHinzufuegen = New System.Windows.Forms.Button() - Me.Label1 = New System.Windows.Forms.Label() - Me.lblLeistunAddErr = New System.Windows.Forms.Label() - Me.Label2 = New System.Windows.Forms.Label() - Me.lblLeistunAddErr2 = New System.Windows.Forms.Label() - Me.pnlEdit = New System.Windows.Forms.Panel() - Me.Label3 = New System.Windows.Forms.Label() - Me.cboLeistungenAdd = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.btnDeleteOfferte = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.sbLeistungAdd = New VERAG_PROG_ALLGEMEIN.MySearchBox() - Me.btnCreateOffert = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.btnEditIDS = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.dgvIDS = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.cbxTypes = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.btnCloseEditMode = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.lblEditMode = New System.Windows.Forms.Label() CType(Me.dgvOfferteDetails, System.ComponentModel.ISupportInitialize).BeginInit() Me.cntxtAddSdl.SuspendLayout() - Me.pnlEdit.SuspendLayout() CType(Me.dgvIDS, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -95,32 +84,6 @@ Partial Class usrCntlIDSPreise Me.dgvOfferteDetails.Size = New System.Drawing.Size(796, 475) Me.dgvOfferteDetails.TabIndex = 5 ' - 'btnDeleteLeistung - ' - Me.btnDeleteLeistung.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.btnDeleteLeistung.BackgroundImage = Global.SDL.My.Resources.Resources.del - Me.btnDeleteLeistung.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.btnDeleteLeistung.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnDeleteLeistung.Location = New System.Drawing.Point(348, 228) - Me.btnDeleteLeistung.Name = "btnDeleteLeistung" - Me.btnDeleteLeistung.Size = New System.Drawing.Size(28, 23) - Me.btnDeleteLeistung.TabIndex = 8 - Me.btnDeleteLeistung.UseVisualStyleBackColor = True - Me.btnDeleteLeistung.Visible = False - ' - 'btnAddLeistung - ' - Me.btnAddLeistung.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.btnAddLeistung.BackgroundImage = Global.SDL.My.Resources.Resources.plus - Me.btnAddLeistung.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.btnAddLeistung.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnAddLeistung.Location = New System.Drawing.Point(375, 228) - Me.btnAddLeistung.Name = "btnAddLeistung" - Me.btnAddLeistung.Size = New System.Drawing.Size(28, 23) - Me.btnAddLeistung.TabIndex = 9 - Me.btnAddLeistung.UseVisualStyleBackColor = True - Me.btnAddLeistung.Visible = False - ' 'cntxtAddSdl ' Me.cntxtAddSdl.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DToolStripMenuItem}) @@ -140,196 +103,29 @@ Partial Class usrCntlIDSPreise Me.btnOfferteSpeichern.ForeColor = System.Drawing.Color.Black Me.btnOfferteSpeichern.Image = Global.SDL.My.Resources.Resources.save Me.btnOfferteSpeichern.ImageAlign = System.Drawing.ContentAlignment.TopLeft - Me.btnOfferteSpeichern.Location = New System.Drawing.Point(664, 0) + Me.btnOfferteSpeichern.Location = New System.Drawing.Point(899, 514) Me.btnOfferteSpeichern.Name = "btnOfferteSpeichern" Me.btnOfferteSpeichern.Size = New System.Drawing.Size(132, 36) Me.btnOfferteSpeichern.TabIndex = 15 Me.btnOfferteSpeichern.Tag = "" Me.btnOfferteSpeichern.Text = "Speichern" Me.btnOfferteSpeichern.UseVisualStyleBackColor = True + Me.btnOfferteSpeichern.Visible = False ' - 'btnHinzufuegen + 'btnEditIDS ' - Me.btnHinzufuegen.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnHinzufuegen.ForeColor = System.Drawing.Color.Black - Me.btnHinzufuegen.Image = Global.SDL.My.Resources.Resources.plus - Me.btnHinzufuegen.ImageAlign = System.Drawing.ContentAlignment.TopLeft - Me.btnHinzufuegen.Location = New System.Drawing.Point(235, 1) - Me.btnHinzufuegen.Name = "btnHinzufuegen" - Me.btnHinzufuegen.Size = New System.Drawing.Size(106, 36) - Me.btnHinzufuegen.TabIndex = 14 - Me.btnHinzufuegen.Tag = "" - Me.btnHinzufuegen.Text = "Hinzufügen" - Me.btnHinzufuegen.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnHinzufuegen.UseVisualStyleBackColor = True - ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(3, 3) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(105, 13) - Me.Label1.TabIndex = 10 - Me.Label1.Text = "Leistung hinzufügen:" - ' - 'lblLeistunAddErr - ' - Me.lblLeistunAddErr.AutoSize = True - Me.lblLeistunAddErr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblLeistunAddErr.ForeColor = System.Drawing.Color.Red - Me.lblLeistunAddErr.Location = New System.Drawing.Point(179, 3) - Me.lblLeistunAddErr.Name = "lblLeistunAddErr" - Me.lblLeistunAddErr.Size = New System.Drawing.Size(50, 13) - Me.lblLeistunAddErr.TabIndex = 11 - Me.lblLeistunAddErr.Text = "Auswahl!" - Me.lblLeistunAddErr.Visible = False - ' - 'Label2 - ' - Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.Label2.AutoSize = True - Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label2.ForeColor = System.Drawing.Color.Red - Me.Label2.Location = New System.Drawing.Point(420, 283) - Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(50, 13) - Me.Label2.TabIndex = 7 - Me.Label2.Text = "Auswahl!" - Me.Label2.Visible = False - ' - 'lblLeistunAddErr2 - ' - Me.lblLeistunAddErr2.AutoSize = True - Me.lblLeistunAddErr2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblLeistunAddErr2.ForeColor = System.Drawing.Color.Red - Me.lblLeistunAddErr2.Location = New System.Drawing.Point(2, 38) - Me.lblLeistunAddErr2.Name = "lblLeistunAddErr2" - Me.lblLeistunAddErr2.Size = New System.Drawing.Size(174, 13) - Me.lblLeistunAddErr2.TabIndex = 16 - Me.lblLeistunAddErr2.Text = "Diese Bezeichnung existiert bereits!" - Me.lblLeistunAddErr2.Visible = False - ' - 'pnlEdit - ' - Me.pnlEdit.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.pnlEdit.Controls.Add(Me.Label3) - Me.pnlEdit.Controls.Add(Me.Label1) - Me.pnlEdit.Controls.Add(Me.btnHinzufuegen) - Me.pnlEdit.Controls.Add(Me.lblLeistunAddErr2) - Me.pnlEdit.Controls.Add(Me.lblLeistunAddErr) - Me.pnlEdit.Controls.Add(Me.btnOfferteSpeichern) - Me.pnlEdit.Controls.Add(Me.cboLeistungenAdd) - Me.pnlEdit.Controls.Add(Me.MyTextBox1) - Me.pnlEdit.Location = New System.Drawing.Point(244, 513) - Me.pnlEdit.Name = "pnlEdit" - Me.pnlEdit.Size = New System.Drawing.Size(797, 60) - Me.pnlEdit.TabIndex = 20 - ' - 'Label3 - ' - Me.Label3.AutoSize = True - Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label3.ForeColor = System.Drawing.Color.Red - Me.Label3.Location = New System.Drawing.Point(55, 40) - Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(110, 13) - Me.Label3.TabIndex = 17 - Me.Label3.Text = "Zuerst Offert anlegen!" - Me.Label3.Visible = False - ' - 'cboLeistungenAdd - ' - Me.cboLeistungenAdd._allowedValuesFreiText = Nothing - Me.cboLeistungenAdd._allowFreiText = False - Me.cboLeistungenAdd._value = "" - Me.cboLeistungenAdd.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend - Me.cboLeistungenAdd.DropDownWidth = 350 - Me.cboLeistungenAdd.FormattingEnabled = True - Me.cboLeistungenAdd.Location = New System.Drawing.Point(6, 16) - Me.cboLeistungenAdd.Name = "cboLeistungenAdd" - Me.cboLeistungenAdd.Size = New System.Drawing.Size(47, 21) - Me.cboLeistungenAdd.TabIndex = 12 - ' - 'MyTextBox1 - ' - Me.MyTextBox1._DateTimeOnly = False - Me.MyTextBox1._numbersOnly = False - Me.MyTextBox1._numbersOnlyKommastellen = "" - Me.MyTextBox1._numbersOnlyTrennzeichen = True - Me.MyTextBox1._Prozent = False - Me.MyTextBox1._ShortDateNew = False - Me.MyTextBox1._ShortDateOnly = False - Me.MyTextBox1._TimeOnly = False - Me.MyTextBox1._TimeOnly_Seconds = False - Me.MyTextBox1._value = Nothing - Me.MyTextBox1._Waehrung = False - Me.MyTextBox1._WaehrungZeichen = True - Me.MyTextBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) - Me.MyTextBox1.ForeColor = System.Drawing.Color.Black - Me.MyTextBox1.Location = New System.Drawing.Point(52, 16) - Me.MyTextBox1.MaxLineLength = -1 - Me.MyTextBox1.MaxLines_Warning = "" - Me.MyTextBox1.MaxLines_Warning_Label = Nothing - Me.MyTextBox1.Name = "MyTextBox1" - Me.MyTextBox1.Size = New System.Drawing.Size(177, 21) - Me.MyTextBox1.TabIndex = 13 - ' - 'btnDeleteOfferte - ' - Me.btnDeleteOfferte.allowBorder = False - Me.btnDeleteOfferte.BackgroundImage = Global.SDL.My.Resources.Resources.del_small - Me.btnDeleteOfferte.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.btnDeleteOfferte.FlatAppearance.BorderSize = 0 - Me.btnDeleteOfferte.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnDeleteOfferte.ForeColor = System.Drawing.Color.Black - Me.btnDeleteOfferte.Location = New System.Drawing.Point(182, 9) - Me.btnDeleteOfferte.Name = "btnDeleteOfferte" - Me.btnDeleteOfferte.Size = New System.Drawing.Size(20, 20) - Me.btnDeleteOfferte.TabIndex = 21 - Me.btnDeleteOfferte.UseVisualStyleBackColor = True - Me.btnDeleteOfferte.Visible = False - ' - 'sbLeistungAdd - ' - Me.sbLeistungAdd._allowFreitext = False - Me.sbLeistungAdd._AllowSetValue = False - Me.sbLeistungAdd._allowSpaceAsSplitter = False - Me.sbLeistungAdd._autoSizeGross = False - Me.sbLeistungAdd._hideIfListEmpty = True - Me.sbLeistungAdd._value = Nothing - Me.sbLeistungAdd.conn_art = "FMZOLL" - Me.sbLeistungAdd.dgvpos = "LEFT" - Me.sbLeistungAdd.DISPLAY_PARAM = Nothing - Me.sbLeistungAdd.INVISIBLE_COLUMNS = Nothing - Me.sbLeistungAdd.key_visible = False - Me.sbLeistungAdd.KEYPARAM = Nothing - Me.sbLeistungAdd.Location = New System.Drawing.Point(348, 255) - Me.sbLeistungAdd.Name = "sbLeistungAdd" - Me.sbLeistungAdd.searchActive = True - Me.sbLeistungAdd.Size = New System.Drawing.Size(223, 20) - Me.sbLeistungAdd.SQL_ORDER_BY = Nothing - Me.sbLeistungAdd.SQL_SELECT = Nothing - Me.sbLeistungAdd.SQL_WHERE = Nothing - Me.sbLeistungAdd.SQL_WhereParamList = Nothing - Me.sbLeistungAdd.TabIndex = 6 - Me.sbLeistungAdd.usrcntl = Nothing - Me.sbLeistungAdd.Visible = False - ' - 'btnCreateOffert - ' - Me.btnCreateOffert.allowBorder = False - Me.btnCreateOffert.BackgroundImage = Global.SDL.My.Resources.Resources.stift - Me.btnCreateOffert.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.btnCreateOffert.FlatAppearance.BorderSize = 0 - Me.btnCreateOffert.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnCreateOffert.ForeColor = System.Drawing.Color.Black - Me.btnCreateOffert.Location = New System.Drawing.Point(208, 10) - Me.btnCreateOffert.Name = "btnCreateOffert" - Me.btnCreateOffert.Size = New System.Drawing.Size(20, 20) - Me.btnCreateOffert.TabIndex = 1 - Me.btnCreateOffert.UseVisualStyleBackColor = True + Me.btnEditIDS.allowBorder = False + Me.btnEditIDS.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnEditIDS.BackgroundImage = Global.SDL.My.Resources.Resources.stift + Me.btnEditIDS.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnEditIDS.FlatAppearance.BorderSize = 0 + Me.btnEditIDS.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnEditIDS.ForeColor = System.Drawing.Color.Black + Me.btnEditIDS.Location = New System.Drawing.Point(965, 6) + Me.btnEditIDS.Name = "btnEditIDS" + Me.btnEditIDS.Size = New System.Drawing.Size(20, 20) + Me.btnEditIDS.TabIndex = 1 + Me.btnEditIDS.UseVisualStyleBackColor = True ' 'dgvIDS ' @@ -347,33 +143,69 @@ Partial Class usrCntlIDSPreise Me.dgvIDS.Name = "dgvIDS" Me.dgvIDS.ReadOnly = True Me.dgvIDS.RowHeadersVisible = False - Me.dgvIDS.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvIDS.Size = New System.Drawing.Size(228, 444) Me.dgvIDS.TabIndex = 30 ' + 'cbxTypes + ' + Me.cbxTypes._allowedValuesFreiText = Nothing + Me.cbxTypes._allowFreiText = False + Me.cbxTypes._value = "" + Me.cbxTypes.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend + Me.cbxTypes.DropDownWidth = 350 + Me.cbxTypes.FormattingEnabled = True + Me.cbxTypes.Location = New System.Drawing.Point(0, 36) + Me.cbxTypes.Name = "cbxTypes" + Me.cbxTypes.Size = New System.Drawing.Size(149, 21) + Me.cbxTypes.TabIndex = 18 + ' + 'btnCloseEditMode + ' + Me.btnCloseEditMode.allowBorder = False + Me.btnCloseEditMode.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnCloseEditMode.BackgroundImage = Global.SDL.My.Resources.Resources.del + Me.btnCloseEditMode.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnCloseEditMode.FlatAppearance.BorderSize = 0 + Me.btnCloseEditMode.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnCloseEditMode.ForeColor = System.Drawing.Color.Black + Me.btnCloseEditMode.Location = New System.Drawing.Point(1000, 8) + Me.btnCloseEditMode.Name = "btnCloseEditMode" + Me.btnCloseEditMode.Size = New System.Drawing.Size(20, 20) + Me.btnCloseEditMode.TabIndex = 31 + Me.btnCloseEditMode.UseVisualStyleBackColor = True + Me.btnCloseEditMode.Visible = False + ' + 'lblEditMode + ' + Me.lblEditMode.AutoSize = True + Me.lblEditMode.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblEditMode.ForeColor = System.Drawing.Color.Red + Me.lblEditMode.Location = New System.Drawing.Point(551, 13) + Me.lblEditMode.Name = "lblEditMode" + Me.lblEditMode.Size = New System.Drawing.Size(64, 13) + Me.lblEditMode.TabIndex = 32 + Me.lblEditMode.Text = "Edit Mode" + Me.lblEditMode.Visible = False + ' 'usrCntlIDSPreise ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White + Me.Controls.Add(Me.lblEditMode) + Me.Controls.Add(Me.btnCloseEditMode) + Me.Controls.Add(Me.cbxTypes) Me.Controls.Add(Me.dgvIDS) - Me.Controls.Add(Me.btnDeleteOfferte) - Me.Controls.Add(Me.Label2) - Me.Controls.Add(Me.sbLeistungAdd) - Me.Controls.Add(Me.btnDeleteLeistung) - Me.Controls.Add(Me.btnAddLeistung) - Me.Controls.Add(Me.btnCreateOffert) + Me.Controls.Add(Me.btnOfferteSpeichern) + Me.Controls.Add(Me.btnEditIDS) Me.Controls.Add(Me.Label11) Me.Controls.Add(Me.lblOffert) Me.Controls.Add(Me.dgvOfferteDetails) - Me.Controls.Add(Me.pnlEdit) Me.Margin = New System.Windows.Forms.Padding(2) Me.Name = "usrCntlIDSPreise" Me.Size = New System.Drawing.Size(1041, 576) CType(Me.dgvOfferteDetails, System.ComponentModel.ISupportInitialize).EndInit() Me.cntxtAddSdl.ResumeLayout(False) - Me.pnlEdit.ResumeLayout(False) - Me.pnlEdit.PerformLayout() CType(Me.dgvIDS, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -382,23 +214,12 @@ Partial Class usrCntlIDSPreise Friend WithEvents lblOffert As System.Windows.Forms.TextBox Friend WithEvents Label11 As System.Windows.Forms.Label Friend WithEvents dgvOfferteDetails As System.Windows.Forms.DataGridView - Friend WithEvents btnCreateOffert As VERAG_PROG_ALLGEMEIN.FlatButton - Friend WithEvents btnDeleteLeistung As Button - Friend WithEvents btnAddLeistung As Button + Friend WithEvents btnEditIDS As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents cntxtAddSdl As ContextMenuStrip Friend WithEvents DToolStripMenuItem As ToolStripMenuItem Friend WithEvents btnOfferteSpeichern As Button - Friend WithEvents btnHinzufuegen As Button - Friend WithEvents Label1 As Label - Friend WithEvents sbLeistungAdd As VERAG_PROG_ALLGEMEIN.MySearchBox - Friend WithEvents lblLeistunAddErr As Label - Friend WithEvents cboLeistungenAdd As VERAG_PROG_ALLGEMEIN.MyComboBox - Friend WithEvents MyTextBox1 As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents Label2 As Label - Friend WithEvents lblLeistunAddErr2 As Label - Friend WithEvents pnlEdit As Panel - ' Friend WithEvents CheckVatService1 As eu.europa.ec.checkVatService - Friend WithEvents Label3 As Label - Friend WithEvents btnDeleteOfferte As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents dgvIDS As VERAG_PROG_ALLGEMEIN.MyDatagridview + Friend WithEvents cbxTypes As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents btnCloseEditMode As VERAG_PROG_ALLGEMEIN.FlatButton + Friend WithEvents lblEditMode As Label End Class diff --git a/SDL/kunden/usrCntlIDSPreise.vb b/SDL/kunden/usrCntlIDSPreise.vb index 0e86ee83..0dbdb615 100644 --- a/SDL/kunden/usrCntlIDSPreise.vb +++ b/SDL/kunden/usrCntlIDSPreise.vb @@ -1,5 +1,6 @@  +Imports DocumentFormat.OpenXml.Office.Word Imports VERAG_PROG_ALLGEMEIN Imports VERAG_PROG_ALLGEMEIN.TESTJSON @@ -7,21 +8,18 @@ Public Class usrCntlIDSPreise Dim FUNC As New cProgramFunctions Dim SQL As New SQL - Public Event OfferteChanged() + Public Event IDSChanged() - Dim OFFERTEBind As cEasyBinding + Dim IDSDIESEL_Bind As cEasyBinding Dim table Public BIND_DB = "FMZOLL" Dim tmpDataTable As New DataTable - Dim currentOffert As VERAG_PROG_ALLGEMEIN.cOfferte - Dim currentOffertArchiv As VERAG_PROG_ALLGEMEIN.cOfferteArchiv + Dim currentIDS As VERAG_PROG_ALLGEMEIN.cIDSDieselpreisRW Dim edit As Boolean Dim DGVHasChaged = False Dim isStandard Dim loaded = False - Dim isNew = False - Dim addLeistung = False Dim ofID As Integer Dim isVerag360 As Boolean = False @@ -33,51 +31,78 @@ Public Class usrCntlIDSPreise Public Sub init(Optional _isVerag360 As Boolean = False) - initDGVOfferte() edit = False handleEditMode(edit) isVerag360 = _isVerag360 End Sub - Sub initDGVOfferte() - dgvOfferteDetails.Columns.Clear() - With dgvIDS - .DataSource = SQL.loadDgvBySql("SELECT OutletCountry, Lieferland_ISO2 FROM [VERAG].[dbo].[tbl_IDS_Länder] ORDER BY OutletCountry", "FMZOLL") - .Columns("Lieferland_ISO2").HeaderText = "Land" - .Columns("OutletCountry").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - .Columns("OutletCountry").HeaderText = "Bezeichnung" - End With - - End Sub - - - Sub initDGVOfferteDetails(OffertenNr) + Sub initDGVDieselpreiseDetails(Optional OutletCountryCode As Integer = -1) loaded = False Try With dgvOfferteDetails - '.Columns.Clear() + Dim SQL_ = "" + + Select Case cbxTypes._value + Case "L" + SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter, tbl_IDS_Rechenwerte.SSMA_TimeStamp, tbl_IDS_Rechenwerte.KategorieNr + FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN tbl_IDS_Rechenwerte ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode + WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode, "") & " ) + ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" + + + Case "LS" + SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter, tbl_IDS_Rechenwerte.SSMA_TimeStamp, tbl_IDS_Rechenwerte.KategorieNr + FROM tbl_IDS_Produkte + INNER JOIN (tbl_IDS_Länder + INNER JOIN (tbl_IDS_Stationen + INNER JOIN tbl_IDS_Rechenwerte ON (tbl_IDS_Stationen.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) AND (tbl_IDS_Stationen.OutletCode = tbl_IDS_Rechenwerte.OutletCode)) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) + ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode + WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode, "") & " ) + ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" + + Case "KRW" + SQL_ = "SELECT tbl_IDS_Kategorien_Rechenwerte.ID as ID, tbl_IDS_Kategorien_Rechenwerte.KategorieNr, tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Kategorien_Rechenwerte.Rechenwert, tbl_IDS_Kategorien_Rechenwerte.Zeitstempel, tbl_IDS_Kategorien_Rechenwerte.Sachbearbeiter, tbl_IDS_Kategorien_Rechenwerte.SSMA_TimeStamp + FROM tbl_IDS_Produkte INNER JOIN tbl_IDS_Kategorien_Rechenwerte ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode + ORDER BY tbl_IDS_Kategorien_Rechenwerte.KategorieNr, tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode;" + + Case "LK" + SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, Adressen.Ordnungsbegriff AS CustomerName, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter, tbl_IDS_Rechenwerte.SSMA_TimeStamp, tbl_IDS_Rechenwerte.KategorieNr + FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN (Adressen INNER JOIN tbl_IDS_Rechenwerte ON Adressen.AdressenNr = tbl_IDS_Rechenwerte.CustomerCode) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode + WHERE (((tbl_IDS_Rechenwerte.CustomerCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.OutletCode) Is Null) " & IIf(OutletCountryCode > 0, " WHERE tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode, "") & " ) + ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, Adressen.Ordnungsbegriff, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" + + Case "LSK" + SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, Adressen.Ordnungsbegriff AS CustomerName, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter, tbl_IDS_Rechenwerte.SSMA_TimeStamp, tbl_IDS_Rechenwerte.KategorieNr + FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN (Adressen INNER JOIN (tbl_IDS_Stationen INNER JOIN tbl_IDS_Rechenwerte ON (tbl_IDS_Stationen.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) AND (tbl_IDS_Stationen.OutletCode = tbl_IDS_Rechenwerte.OutletCode)) ON Adressen.AdressenNr = tbl_IDS_Rechenwerte.CustomerCode) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode + WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Not Null) " & IIf(OutletCountryCode > 0, " WHERE tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode, "") & " ) + ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, Adressen.Ordnungsbegriff, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;" + + Case "KOR" + SQL_ = "SELECT tbl_IDS_Kunden_ohne_Rabatt.CustomerCode, tbl_IDS_Kunden_ohne_Rabatt.Zeitstempel, tbl_IDS_Kunden_ohne_Rabatt.Sachbearbeiter + FROM tbl_IDS_Kunden_ohne_Rabatt + ORDER BY tbl_IDS_Kunden_ohne_Rabatt.CustomerCode;" + + End Select + + If SQL_ = "" Then Exit Sub Try - OFFERTEBind = New cEasyBinding(BIND_DB) - OFFERTEBind.initBinding(" SELECT [LeistungsNr],[LeistungsBez],[BerechnungsartNr],[Preis],[Anzahl],[BGebLeistungsNr],[BGebProzent],[BGebMinBetrag],BerechnungsartPosInkludiert,[Eingegeben am],[Geändert am],[Sachbearbeiter],[PreisänderungProzent],[PreisAlt],[Preisänderung],KundenNr,OffertenNr - From [Offertenpositionen] " & - " Where OffertenNr='" & OffertenNr & "' ORDER BY LeistungsNr, Preis DESC", "Offertenpositionen") - For Each c As DataColumn In OFFERTEBind.bindingdataTable.Columns + IDSDIESEL_Bind = New cEasyBinding(BIND_DB) + IDSDIESEL_Bind.initBinding(SQL_, "tbl_IDS_Rechenwerte") + For Each c As DataColumn In IDSDIESEL_Bind.bindingdataTable.Columns If c.ColumnName = "SSMA_TimeStamp" Then - OFFERTEBind.bindingdataTable.Columns.Remove(c) + IDSDIESEL_Bind.bindingdataTable.Columns.Remove(c) Exit For End If Next - ' KASSENBind.initBinding("SELECT * FROM " & table & "", table) - .DataSource = OFFERTEBind.bindingdataTable - ' DataGridView.AutoSize = True - ' OFFERTEBind.bindingdataTable.PrimaryKey = {OFFERTEBind.bindingdataTable.Columns("KundenNr"), OFFERTEBind.bindingdataTable.Columns("LeistungsNr"), OFFERTEBind.bindingdataTable.Columns("LeistungsNr"), OFFERTEBind.bindingdataTable.Columns("LeistungsBez")} + .DataSource = IDSDIESEL_Bind.bindingdataTable + Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) @@ -88,55 +113,54 @@ Public Class usrCntlIDSPreise ' " FROM [Offertenpositionen] " & ' " WHERE KundenNr='" & kdNr & "' and OffertenNr='" & OffertenNr & "' ORDER BY LeistungsNr ", "FMZOLL") - FUNC.dgvCellToCbo(dgvOfferteDetails, 2, "Berechnungsart", "BerechnungsartNr", " SELECT [BerechnungsartNr], CAST(BerechnungsartNr as varchar(3)) + ' - ' + [BerechnungsartBez] as [BerechnungsartBez] FROM [Berechnungsart] ORDER BY BerechnungsartNr ", "FMZOLL", 150) - FUNC.dgvCellToCbo(dgvOfferteDetails, 5, "BGebLeist.", "BGebLeistungsNr", " SELECT [LeistungsNr], CAST(LeistungsNr as varchar(3)) + ' - ' + [LeistungsBez] as LeistungsBez FROM [Leistungen] ORDER BY [LeistungsNr] ", "FMZOLL", 250) + 'FUNC.dgvCellToCbo(dgvOfferteDetails, 2, "Kz", "Kz", " SELECT [BerechnungsartNr], CAST(BerechnungsartNr as varchar(3)) + ' - ' + [BerechnungsartBez] as [BerechnungsartBez] FROM [Berechnungsart] ORDER BY BerechnungsartNr ", "FMZOLL", 150) + 'FUNC.dgvCellToCbo(dgvOfferteDetails, 5, "BGebLeist.", "BGebLeistungsNr", " SELECT [LeistungsNr], CAST(LeistungsNr as varchar(3)) + ' - ' + [LeistungsBez] as LeistungsBez FROM [Leistungen] ORDER BY [LeistungsNr] ", "FMZOLL", 250) - checkPerimissionsDGVDetails() + 'checkPerimissionsDGVDetails() + If .Columns.Contains("ID") Then .Columns("ID").Visible = False + '.Columns("KundenNr").Visible = False + '.Columns("LeistungsNr").Width = 30 + '.Columns("LeistungsNr").HeaderText = "Nr" + '.Columns("LeistungsBez").MinimumWidth = 200 + '.Columns("LeistungsBez").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + '.Columns("LeistungsBez").HeaderText = "Leistung" + '.Columns("BerechnungsartNr").MinimumWidth = 150 + '.Columns("Preis").Width = 60 + '.Columns("Preis").DefaultCellStyle.Format = "N2" + '.Columns("Preis").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight + '.Columns("Anzahl").Width = 50 + '.Columns("Anzahl").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter - .Columns("OffertenNr").Visible = False - .Columns("KundenNr").Visible = False - .Columns("LeistungsNr").Width = 30 - .Columns("LeistungsNr").HeaderText = "Nr" - .Columns("LeistungsBez").MinimumWidth = 200 - .Columns("LeistungsBez").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - .Columns("LeistungsBez").HeaderText = "Leistung" - .Columns("BerechnungsartNr").MinimumWidth = 150 - .Columns("Preis").Width = 60 - .Columns("Preis").DefaultCellStyle.Format = "N2" - .Columns("Preis").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight - .Columns("Anzahl").Width = 50 - .Columns("Anzahl").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter + '.Columns("BerechnungsartPosInkludiert").HeaderText = "Pos.inkl." + '.Columns("BerechnungsartPosInkludiert").Width = 45 - .Columns("BerechnungsartPosInkludiert").HeaderText = "Pos.inkl." - .Columns("BerechnungsartPosInkludiert").Width = 45 + '.Columns("BGebLeistungsNr").Width = 60 + '.Columns("BGebProzent").Width = 55 + '.Columns("BGebProzent").HeaderText = "BGeb %" + '.Columns("BGebProzent").DefaultCellStyle.Format = "P" + '.Columns("BGebProzent").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight + '.Columns("BGebMinBetrag").Width = 60 + '.Columns("BGebMinBetrag").HeaderText = "BGebMinBetr." + '.Columns("BGebMinBetrag").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight + '.Columns("Eingegeben am").Visible = False + '' .Columns("Sachbearbeiter").Visible = False + '' .Columns("Geändert am").Visible = False + '.Columns("PreisänderungProzent").Width = 70 + '.Columns("PreisänderungProzent").HeaderText = "Preisänd. %" + '.Columns("PreisänderungProzent").DefaultCellStyle.Format = "p" + '.Columns("PreisänderungProzent").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight + '.Columns("PreisAlt").Width = 60 + '.Columns("PreisAlt").DefaultCellStyle.Format = "N2" + '.Columns("PreisAlt").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight + '.Columns("Preisänderung").Width = 60 + '.Columns("Preisänderung").HeaderText = "PreisNeu" + '.Columns("Preisänderung").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight + '' .Columns("OffertenBez").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + '' .Columns("OffertenBez").HeaderText = "Bezeichnung" - .Columns("BGebLeistungsNr").Width = 60 - .Columns("BGebProzent").Width = 55 - .Columns("BGebProzent").HeaderText = "BGeb %" - .Columns("BGebProzent").DefaultCellStyle.Format = "P" - .Columns("BGebProzent").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight - .Columns("BGebMinBetrag").Width = 60 - .Columns("BGebMinBetrag").HeaderText = "BGebMinBetr." - .Columns("BGebMinBetrag").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight - .Columns("Eingegeben am").Visible = False - ' .Columns("Sachbearbeiter").Visible = False - ' .Columns("Geändert am").Visible = False - .Columns("PreisänderungProzent").Width = 70 - .Columns("PreisänderungProzent").HeaderText = "Preisänd. %" - .Columns("PreisänderungProzent").DefaultCellStyle.Format = "p" - .Columns("PreisänderungProzent").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight - .Columns("PreisAlt").Width = 60 - .Columns("PreisAlt").DefaultCellStyle.Format = "N2" - .Columns("PreisAlt").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight - .Columns("Preisänderung").Width = 60 - .Columns("Preisänderung").HeaderText = "PreisNeu" - .Columns("Preisänderung").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight - ' .Columns("OffertenBez").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - ' .Columns("OffertenBez").HeaderText = "Bezeichnung" - - .Columns("PreisänderungProzent").Visible = False - .Columns("PreisAlt").Visible = False - .Columns("Preisänderung").Visible = False + '.Columns("PreisänderungProzent").Visible = False + '.Columns("PreisAlt").Visible = False + '.Columns("Preisänderung").Visible = False loaded = True End With @@ -150,31 +174,49 @@ Public Class usrCntlIDSPreise - Private Sub dgvOfferteDetails_SelectionChanged(sender As Object, e As EventArgs) Handles dgvIDS.SelectionChanged - Try + Private Sub dgvIDS_SelectionChanged(sender As Object, e As EventArgs) Handles dgvIDS.SelectionChanged - checkPermissions() + If dgvIDS.SelectedCells.Count > 0 Then - If dgvIDS.SelectedRows.Count > 0 Then - initDGVOfferteDetails(dgvIDS.SelectedRows(0).Cells("OffertenNr").Value) + If dgvIDS.SelectedCells(0).RowIndex > -1 Then + initDGVDieselpreiseDetails(dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value) End If - Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) - End Try + + End If + End Sub - Private Sub usrCntlOfferte_Load(sender As Object, e As EventArgs) Handles Me.Load + Private Sub usrCntlOfferte_Load(sender As Object, e As EventArgs) Handles MyBase.Load init(isVerag360) - ' sbLeistungAdd.initSearchBox(Me.FindForm, " [Code] ,[LeistungsNr],[LeistungsBez] FROM [Leistungen]", {"LeistungsNr", "LeistungsBez"}, " ", "LeistungsNr", "LeistungsNr", , "FMZOLL", , 400, 200) - cboLeistungenAdd.fillWithSQL("SELECT [LeistungsNr],Replace([LeistungsBez],'P.P./', '') FROM [Leistungen] ORDER BY LeistungsNr", , "FMZOLL", True) + cbxTypes.Items.Clear() + cbxTypes.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Länder", "L")) + cbxTypes.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Länder/Stationen", "LS")) + cbxTypes.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Kategorien/Rechenwerte", "KRW")) + cbxTypes.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Länder/Kunden", "LK")) + cbxTypes.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Länder/Stationen/Kunden", "LSK")) + cbxTypes.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Kunden ohne Rabatt", "KOR")) checkPermissions() + Dim SQL_ As String = "" + SQL_ = "SELECT OutletCountry, OutletCountryCode FROM [VERAG].[dbo].[tbl_IDS_Länder] ORDER BY OutletCountry" + With dgvIDS + .DataSource = SQL.loadDgvBySql(SQL_, "FMZOLL") + .Columns("OutletCountry").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("OutletCountry").HeaderText = "Bezeichnung" + .Columns("OutletCountryCode").Visible = False + End With + + dgvOfferteDetails.Columns.Clear() + dgvIDS.ClearSelection() + + initDGVDieselpreiseDetails() + 'AddHandler OFFERTEBind.bindingdataTable.ColumnChanged, Sub(ev As EventArgs, change As DataColumnChangeEventArgs) ' ' If change.Column.ColumnName="" @@ -186,38 +228,7 @@ Public Class usrCntlIDSPreise End Sub - Private Sub btnAddLeistung_Click(sender As Object, e As EventArgs) Handles btnAddLeistung.Click - Try - - Dim SQLsrt = " SELECT (select case when COUNT(*)>0 then 1 else 0 end FROM Offertenpositionen where [Offertenpositionen].[OffertenNr]=[Offertenstamm].[OffertenNr]) as vorhanden," & - " [Offertenstamm].[OffertenNr],[OffertenBez] FROM Offertenstamm " - - For Each r As DataRow In SQL.loadDgvBySql(SQLsrt, "FMZOLL").Rows - If Not CBool(r("vorhanden")) Then - Dim i As New ToolStripMenuItem - i.Text = r("OffertenNr") & " - " & r("OffertenBez") - i.Name = "tsmiOffertNr_" & r("OffertenNr") - i.Tag = r("OffertenNr") - cntxtAddSdl.Items.Add(i) - ' If s.Sperre <> 0 Then i.Enabled = False : i.Text = i.Text & " (gesperrt)" - AddHandler i.Click, AddressOf AddOffert_Click - End If - Next - - - - btnAddLeistung.ContextMenuStrip = cntxtAddSdl - ' cntxtAddSdl - Dim ptLowerLeft As New Point(sender.width, sender.Height) - ptLowerLeft = sender.PointToScreen(ptLowerLeft) - ptLowerLeft.X -= sender.width - cntxtAddSdl.Show(ptLowerLeft) - - Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) - End Try - End Sub Private Sub AddOffert_Click(sender As Object, e As EventArgs) Handles DToolStripMenuItem.Click If sender.name.contains("tsmiOffertNr_") Then @@ -230,124 +241,41 @@ Public Class usrCntlIDSPreise End Sub - Private Sub btnHinzufuegen_Click_1(sender As Object, e As EventArgs) Handles btnHinzufuegen.Click - - Try - - - If edit = False Then - MsgBox("Bitte vorher in den Editiermodus wechseln") - Exit Sub - End If - lblLeistunAddErr.Visible = False - lblLeistunAddErr2.Visible = False - Label3.Visible = False - - If dgvIDS.SelectedRows.Count <> 1 Then - Label3.Visible = True - End If - 'Fehlerprüfung: - '------- - If cboLeistungenAdd._value = "" Then lblLeistunAddErr.Visible = True : Exit Sub - '------- - - Dim l As New VERAG_PROG_ALLGEMEIN.cLeistungen(cboLeistungenAdd._value) - Dim o As New VERAG_PROG_ALLGEMEIN.cOffertPosition - o.LeistungsNr = l.LeistungsNr - o.LeistungsBez = MyTextBox1.Text - o.OffertenNr = dgvIDS.SelectedRows(0).Cells("OffertenNr").Value - 'o.Preis=l.preis - o.BerechnungsartNr = l.BerechnungsartNr - 'o.Anzahl = l.m - 'o.BGebLeistungsNr = l.BGebUStV - 'o.BGebProzent = l.XXXXXXXXXX - 'o.BGebMinBetrag = l.XXXXXXXXXX - o.Eingegeben_am = Now - 'o.Geändert_am = l.XXXXXXXXXX - o.Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME - 'o.Preisänderung = l.Preissperre - 'o.PreisänderungProzent = l.XXXXXXXXXX - 'o.PreisAlt = l.XXXXXXXXXX - If o.INSERT() Then - cboLeistungenAdd.changeItem("") - initDGVOfferteDetails(o.OffertenNr) - addLeistung = True - End If - - Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) - End Try - End Sub - - Private Sub cboLeistungenAdd_KeyDown(sender As Object, e As KeyEventArgs) Handles cboLeistungenAdd.KeyDown, MyTextBox1.KeyDown - If e.KeyCode = Keys.Return Then - btnHinzufuegen.PerformClick() - End If - End Sub - - Private Sub cboLeistungenAdd_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboLeistungenAdd.SelectedIndexChanged - If cboLeistungenAdd._value <> "" Then - MyTextBox1.Text = cboLeistungenAdd.Text.ToString.Replace(cboLeistungenAdd._value & " - ", "").Trim() - Else - MyTextBox1.Text = "" - End If - - End Sub - Private Sub dgvOfferteDetails_CellValueChanged(sender As Object, e As DataGridViewCellEventArgs) Handles dgvOfferteDetails.CellValueChanged Try + Select Case cbxTypes._value + Case "L", "LS", "LSK", "KRW", "LSK" + If loaded = True Then + If currentIDS IsNot Nothing Then + currentIDS.Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + currentIDS.Zeitstempel = Now - 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 - DGVHasChaged = True - 'saveCurrentOffert() - If isNew Then - currentOffert.Art = "Neuanlage" - Else - currentOffert.Art = "Geändert" - End If - currentOffert.SAVE() + Select Case dgvOfferteDetails.CurrentCell.ColumnIndex + Case 5 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvOfferteDetails.CurrentCell.Value) Then currentIDS.Rechenwert = CDbl(dgvOfferteDetails.CurrentCell.Value) + Case 6 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso dgvOfferteDetails.CurrentCell.Value <> "" AndAlso (dgvOfferteDetails.CurrentCell.Value = "R" Or dgvOfferteDetails.CurrentCell.Value = "P") Then currentIDS.Kz = dgvOfferteDetails.CurrentCell.Value.ToString - End If - Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) - End Try + End Select - End Sub + DGVHasChaged = True + If currentIDS.SAVE() Then - Private Sub btnDeleteOfferte_Click(sender As Object, e As EventArgs) Handles btnDeleteOfferte.Click - Try + If dgvIDS.SelectedCells.Count > 0 Then - If dgvIDS.SelectedRows.Count = 1 Then - If vbYes = MsgBox("Möchten Sie das Offert '" & dgvIDS.SelectedRows(0).Cells("OffertenBez").Value & "' wirklich löschen", vbYesNoCancel) Then - saveCurrentOffert() - currentOffert.Art = "Offert gelöscht" - currentOffert.SAVE() - OfferteArchivieren() - If SQL.doSQL("DELETE FROM Offerten where [OffertenNr]='" & dgvIDS.SelectedRows(0).Cells("OffertenNr").Value & "' ", "FMZOLL") Then - initDGVOfferte() - RaiseEvent OfferteChanged() - End If - End If - End If + If dgvIDS.SelectedCells(0).RowIndex > -1 Then + initDGVDieselpreiseDetails(dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value) + End If - Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) - End Try - End Sub + Else + initDGVDieselpreiseDetails() - Private Sub btnOfferteSpeichern_Click(sender As Object, e As EventArgs) Handles btnOfferteSpeichern.Click - Try + End If - checkPerimissionsDGVDetails() - edit = False - handleEditMode(edit) - saveToArchive() + End If - OFFERTEBind.updateBinding() - RaiseEvent OfferteChanged() - DGVHasChaged = False + End If + End If + + End Select Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) @@ -355,69 +283,15 @@ Public Class usrCntlIDSPreise End Sub - Private Sub btnOffertbearbeiten_Click(sender As Object, e As EventArgs) + + Private Sub btnOffertbearbeiten_Click(sender As Object, e As EventArgs) Handles btnEditIDS.Click edit = True handleEditMode(edit) checkPerimissionsDGVDetails() - saveCurrentOffert() End Sub - Private Sub OfferteArchivieren(Optional Art As String = "") - - Try - - currentOffertArchiv = New VERAG_PROG_ALLGEMEIN.cOfferteArchiv() - currentOffertArchiv.KundenNr = currentOffert.KundenNr - currentOffertArchiv.FilialenNr = currentOffert.FilialenNr - currentOffertArchiv.OffertenNr = currentOffert.OffertenNr - currentOffertArchiv.Standardofferte = currentOffert.Standardofferte - currentOffertArchiv.Besonderheiten = currentOffert.Besonderheiten - currentOffertArchiv.Eingegeben_am = currentOffert.Eingegeben_am - currentOffertArchiv.Geändert_am = currentOffert.Geändert_am - currentOffertArchiv.Sachbearbeiter = currentOffert.Sachbearbeiter - currentOffertArchiv.SSMA_TimeStamp = currentOffert.SSMA_TimeStamp - currentOffertArchiv.Gesperrt = currentOffert.Gesperrt - currentOffertArchiv.Gesperrt_Datum = currentOffert.Gesperrt_Datum - currentOffertArchiv.Gesperrt_Grund = currentOffert.Gesperrt_Grund - currentOffertArchiv.Art = currentOffert.Art - ofID = currentOffertArchiv.SAVERETURNID() - - If ofID > 0 Then - For Each row As DataRow In tmpDataTable.Rows - If tmpDataTable.Rows.Count = 0 Then Exit Sub - Dim oP As New VERAG_PROG_ALLGEMEIN.cOffertPositionArchiv - oP.OfID = ofID - oP.KundenNr = currentOffertArchiv.KundenNr - oP.LeistungsNr = row("LeistungsNr") - oP.LeistungsBez = row("LeistungsBez") - oP.OffertenNr = currentOffertArchiv.OffertenNr - oP.BerechnungsartNr = row("BerechnungsartNr") - oP.Preis = row("Preis") - oP.Anzahl = row("Anzahl") - oP.BGebLeistungsNr = row("BGebLeistungsNr") - oP.BGebProzent = row("BGebProzent") - oP.BGebMinBetrag = row("BGebMinBetrag") - oP.Eingegeben_am = row("Eingegeben am") - oP.Geändert_am = row("Geändert am") - oP.Sachbearbeiter = row("Sachbearbeiter") - oP.Preisänderung = row("Preisänderung") - oP.PreisänderungProzent = row("PreisänderungProzent") - oP.PreisAlt = row("PreisAlt") - oP.BerechnungsartPosInkludiert = row("BerechnungsartPosInkludiert") - oP.INSERT() - Next - - End If - - Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) - End Try - End Sub - - - Private Sub cbxArchivierteOfferten_SelectedIndexChanged(sender As Object, e As EventArgs) checkPerimissionsDGVDetails() @@ -428,7 +302,7 @@ Public Class usrCntlIDSPreise If dgvIDS.SelectedRows.Count = 0 Then Exit Sub - initDGVOfferteDetails(dgvIDS.SelectedRows(0).Cells("OffertenNr").Value) + initDGVDieselpreiseDetails(dgvIDS.SelectedRows(0).Cells("OffertenNr").Value) End Sub @@ -439,7 +313,7 @@ Public Class usrCntlIDSPreise Try With dgvOfferteDetails - If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_BEARBEITEN", "SDL") Then + If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("DIESELPREISE_BEARBEITEN", "SDL") Then For Each c As DataGridViewColumn In .Columns c.ReadOnly = True handleEditMode(False) @@ -450,7 +324,7 @@ Public Class usrCntlIDSPreise For Each c As DataGridViewColumn In .Columns If isVerag360 Then - If (c.Name = "Preis" Or c.Name = "LeistungsBez" Or c.Name = "Anzahl" Or c.Name = "BerechnungsartNr" Or c.Name = "BerechnungsartPosInkludiert" Or c.Name = "BGebLeistungsNr" Or c.Name = "BGebProzent" Or c.Name = "BGebMinBetrag" Or c.Name = "Land" Or c.Name = "VZ" Or c.Name = "RMC" Or c.Name = "Fremd") Then + If (c.Name = "Rechenwert" Or c.Name = "Kz") Then If edit Then c.ReadOnly = False handleEditMode(edit) @@ -462,23 +336,11 @@ Public Class usrCntlIDSPreise c.ReadOnly = True End If - Else - If (c.Name = "Preis" Or c.Name = "LeistungsBez" Or c.Name = "Anzahl" Or c.Name = "BerechnungsartNr" Or c.Name = "BerechnungsartPosInkludiert") 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 Next - dgvOfferteDetails.AllowUserToDeleteRows = edit + dgvOfferteDetails.AllowUserToDeleteRows = False End If End With @@ -494,7 +356,7 @@ Public Class usrCntlIDSPreise dgvIDS.Enabled = False - 'currentOffert = New VERAG_PROG_ALLGEMEIN.cOfferte(kdNr, dgvIDS.SelectedRows(0).Cells("OffertenNr").Value, False) + 'currentOffert = New VERAG_PROG_ALLGEMEIN.cOfferte(dgvIDS.SelectedRows(0).Cells("OffertenNr").Value, False) Dim orgDataTable As DataTable = dgvOfferteDetails.DataSource tmpDataTable = orgDataTable.Copy @@ -507,9 +369,9 @@ Public Class usrCntlIDSPreise - If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_BEARBEITEN", "SDL") Then - pnlEdit.Visible = False - btnCreateOffert.Visible = False + If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("DIESELPREISE_BEARBEITEN", "SDL") Then + + btnEditIDS.Visible = False dgvIDS.ReadOnly = True Else @@ -517,11 +379,6 @@ Public Class usrCntlIDSPreise dgvOfferteDetails.AllowUserToDeleteRows = True dgvOfferteDetails.RowHeadersVisible = True - - - If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_LOESCHEN", "SDL") Then - btnDeleteOfferte.Visible = True - End If End If @@ -539,73 +396,34 @@ Public Class usrCntlIDSPreise dgvIDS.Enabled = False dgvOfferteDetails.ReadOnly = False btnOfferteSpeichern.Enabled = True + btnCloseEditMode.Visible = True + cbxTypes.Enabled = False + Else dgvIDS.Enabled = True dgvOfferteDetails.ReadOnly = True btnOfferteSpeichern.Enabled = False + btnCloseEditMode.Visible = False + cbxTypes.Enabled = True End If + + lblEditMode.Visible = isInEditMode End Sub - Private Sub saveToArchive() - Try - - - - If isNew = False AndAlso isStandard = False Or isNew AndAlso isStandard = False Then 'Neuanlage oder Anlage über "Standardoffert laden" speichern, - If DGVHasChaged = False Then Exit Sub - End If - - If isStandard Then - If isNew Then - OfferteArchivieren() - isNew = False - - End If - isStandard = False - Else - - If DGVHasChaged Then - If isNew = False Then - OfferteArchivieren() - Exit Sub - - Else - If isNew Then - OfferteArchivieren() - isNew = False - End If - - End If - End If - End If - - Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) - End Try - - - End Sub - Private Sub dgvOfferteDetails_UserDeletingRow(sender As Object, e As DataGridViewRowCancelEventArgs) Handles dgvOfferteDetails.UserDeletingRow DGVHasChaged = True End Sub - Private Sub Button1_Click(sender As Object, e As EventArgs) - cProgramFunctions.genExcelFromDGV_NEW(dgvOfferteDetails, True) - End Sub - Private Sub dgvOfferteDetails_KeyUp(sender As Object, e As KeyEventArgs) Handles dgvOfferteDetails.KeyUp If e.KeyCode = Keys.Tab Then - dgvOfferteDetails.CurrentCell = GetNextCell(dgvOfferteDetails.CurrentCell) e.Handled = True End If - End Sub Private Function GetNextCell(currentCell As DataGridViewCell) As DataGridViewCell @@ -626,4 +444,55 @@ Public Class usrCntlIDSPreise End Function + Private Sub cbxTypes_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cbxTypes.SelectedIndexChanged + + If dgvIDS.SelectedRows.Count > 0 Then + initDGVDieselpreiseDetails(dgvIDS.SelectedRows(0).Cells("OutletCountryCode").Value) + Else + initDGVDieselpreiseDetails() + End If + + End Sub + + + Private Sub dgvIDS_MouseDown(sender As Object, e As MouseEventArgs) Handles dgvIDS.MouseDown + + Dim hit As DataGridView.HitTestInfo = dgvIDS.HitTest(e.X, e.Y) + + ' Prüfen ob NICHT auf eine Zelle geklickt wurde + If hit.Type = DataGridViewHitTestType.None OrElse hit.Type = DataGridViewHitTestType.ColumnHeader OrElse hit.Type = DataGridViewHitTestType.RowHeader Then + + dgvIDS.ClearSelection() + initDGVDieselpreiseDetails() + Exit Sub + + End If + + + + + End Sub + + Private Sub btnCloseEditMode_Click(sender As Object, e As EventArgs) Handles btnCloseEditMode.Click + edit = False + handleEditMode(edit) + checkPerimissionsDGVDetails() + End Sub + + Private Sub dgvOfferteDetails_SelectionChanged(sender As Object, e As EventArgs) Handles dgvOfferteDetails.SelectionChanged + + If dgvOfferteDetails.Columns.Contains("ID") Then + + If dgvOfferteDetails.SelectedCells.Count > 0 Then + + If dgvOfferteDetails.SelectedCells(0).RowIndex > -1 Then + currentIDS = New cIDSDieselpreisRW(dgvOfferteDetails.Rows(dgvOfferteDetails.SelectedCells(0).RowIndex).Cells("ID").Value) + End If + + End If + + + End If + + End Sub End Class diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index d5ae279d..815ad988 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -3120,7 +3120,7 @@ Public Class usrCntlKundenuebersicht setCreditSafeEntry(company, pdfObject, kdNr, forecedReqest, beforeRequestCount, afterRequestCount, limit, country) End If - If beforeRequestCount > (limit - 100) Then 'Benachrichtigung + If beforeRequestCount > (limit - 100) AndAlso beforeRequestCount < (limit - 96) Then 'Benachrichtigung VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag; d.breimaier@verag.ag", "Creditsafe-Limit", "ACHTUNG, das Creditsafe-Limit für " & country & " ist fast erreicht!" & vbNewLine & vbNewLine & "Limit: " & limit & " , aktuelle Stand: " & afterRequestCount & vbNewLine & vbNewLine & "*Automatic generated e-mail*",,,,,) End If diff --git a/SDL/mdm/usrCntlMDMAuswertungen.vb b/SDL/mdm/usrCntlMDMAuswertungen.vb index 6b572b6a..879d9259 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.vb +++ b/SDL/mdm/usrCntlMDMAuswertungen.vb @@ -1494,9 +1494,7 @@ Public Class usrCntlMDMAuswertungen Dim dt As New DataTable dt = (New SQL).loadDgvBySql(sql, "FMZOLL") - frmShowData.Show() - frmShowData.DataGridView1.DataSource = dt - frmShowData.Label2.Text = "Anzahl: " & frmShowData.DataGridView1.RowCount + cProgramFunctions.genExcelFromDT_NEW(dt,,,,,, True) @@ -1509,7 +1507,22 @@ Public Class usrCntlMDMAuswertungen uscCntl.init(True) - uscCntl.Show() + 'uscCntl.Show() + + + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + Dim frm As New Form + + frm.Size = New Size(1600, 1000) + uscCntl.Size = New Size(frm.Size.Width - 50, frm.Size.Height - 50) + uscCntl.Dock = DockStyle.Fill + uscCntl.Anchor = AnchorStyles.Left + uscCntl.Anchor = AnchorStyles.Top + frm.Controls.Add(uscCntl) + frm.StartPosition = FormStartPosition.CenterScreen + frm.Show() + + End Sub End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb b/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb index 5ebc8a73..1d32d337 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb @@ -301,11 +301,11 @@ Public Class cIDS Dim str As String = "" For Each i In list If Not i.isPrimaryParam Then - str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + str &= "" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," End If Next str = str.Substring(0, str.Length - 1) 'wg. ',' - Return (" UPDATE [tblIDSTransactionsNew] SET " & str & " WHERE YearMonthDay=@YearMonthDay AND Paymentsummarynumber=@Paymentsummarynumber AND CustomerCode=@CustomerCode AND OutletCountryCode=@OutletCountryCode AND OutletCode=@OutletCode AND ProductTypeCode=@ProductTypeCode " & IIf(PARAM <> "" AndAlso VALUE <> "", " AND " & PARAM & "=" & VALUE, "") & " AND isnull(charged,0) = 0 ") + Return (" UPDATE tblIDSTransactionsNew] SET " & str & " WHERE YearMonthDay=@YearMonthDay AND Paymentsummarynumber=@Paymentsummarynumber AND CustomerCode=@CustomerCode AND OutletCountryCode=@OutletCountryCode AND OutletCode=@OutletCode AND ProductTypeCode=@ProductTypeCode " & IIf(PARAM <> "" AndAlso VALUE <> "", " AND " & PARAM & "=" & VALUE, "") & " AND isnull(charged,0) = 0 ") Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) @@ -321,7 +321,7 @@ Public Class cIDS Dim values As String = "" For Each i In list If Not i.isPrimaryParam Then - str &= "[" & i.Text & "]," + str &= "" & i.Text & "]," values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," End If Next @@ -457,10 +457,10 @@ Public Class cIDS 'Else .TransactionVolume = isleernothing((currentRow(8))) - .AmminclVAT = isleernothing((currentRow(9))) - .TotalNetAmount = isleernothing((currentRow(10))) - .VATAmount = isleernothing((currentRow(11))) - .avpriceexclVAT = IIf(avprive <> "" AndAlso IsNumeric(avprive), avprive, 0) + .AmminclVAT = isleernothing((currentRow(9))) + .TotalNetAmount = isleernothing((currentRow(10))) + .VATAmount = isleernothing((currentRow(11))) + .avpriceexclVAT = IIf(avprive <> "" AndAlso IsNumeric(avprive), avprive, 0) ' End If @@ -544,31 +544,31 @@ Public Class cIDS Using cmd As New SqlCommand("SELECT tblIDSTransactionsNew.KdNrVERAG as Kundennummer, - ISNULL(tblIDSTransactionsNew.[OBONumber],ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber])) AS Rechnungsnummer, - tblIDSTransactionsNew.[YearMonthDay] AS Rechnungsdatum, - SUM(tblIDSTransactionsNew.[VATAmount]) AS Steuerbetrag + ISNULL(tblIDSTransactionsNew.OBONumber],ISNULL(tblIDSTransactionsNew.VRNumber], tblIDSTransactionsNew.Paymentsummarynumber])) AS Rechnungsnummer, + tblIDSTransactionsNew.YearMonthDay] AS Rechnungsdatum, + SUM(tblIDSTransactionsNew.VATAmount]) AS Steuerbetrag FROM tblIDSTransactionsNew INNER JOIN tbl_IDS_Länder - ON tblIDSTransactionsNew.[OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode + ON tblIDSTransactionsNew.OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode WHERE - tblIDSTransactionsNew.[YearMonthDay] BETWEEN @von AND @bis + tblIDSTransactionsNew.YearMonthDay] BETWEEN @von AND @bis AND tblIDSTransactionsNew.KdNrVERAG = @AdressenNr - AND tbl_IDS_Länder.[Lieferland_ISO2] = @LandKZ - AND tblIDSTransactionsNew.[VATAmount] <> 0 + AND tbl_IDS_Länder.Lieferland_ISO2] = @LandKZ + AND tblIDSTransactionsNew.VATAmount] <> 0 " & IIf(Archiv, " ", " AND isnull(UStVAn_ID,0) = 0 ") & " GROUP BY tblIDSTransactionsNew.KdNrVERAG, - tblIDSTransactionsNew.[YearMonthDay], - ISNULL(tblIDSTransactionsNew.[OBONumber], - ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber])) + tblIDSTransactionsNew.YearMonthDay], + ISNULL(tblIDSTransactionsNew.OBONumber], + ISNULL(tblIDSTransactionsNew.VRNumber], tblIDSTransactionsNew.Paymentsummarynumber])) ORDER BY tblIDSTransactionsNew.KdNrVERAG, - tblIDSTransactionsNew.[YearMonthDay], - ISNULL(tblIDSTransactionsNew.[OBONumber], - ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber]));", conn) + tblIDSTransactionsNew.YearMonthDay], + ISNULL(tblIDSTransactionsNew.OBONumber], + ISNULL(tblIDSTransactionsNew.VRNumber], tblIDSTransactionsNew.Paymentsummarynumber]));", conn) cmd.Parameters.AddWithValue("@LandKZ", LandKZ) cmd.Parameters.AddWithValue("@von", von) @@ -607,11 +607,11 @@ Public Class cIDS Return SQL.doSQLVarList("update tblIDSTransactionsNew set UStVAn_ID = @UStVAn_ID FROM tblIDSTransactionsNew INNER JOIN tbl_IDS_Länder - ON tblIDSTransactionsNew.[OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode + ON tblIDSTransactionsNew.OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode WHERE - tblIDSTransactionsNew.[YearMonthDay] = @reDat AND ISNULL(tblIDSTransactionsNew.[OBONumber], ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber])) = @reNr + tblIDSTransactionsNew.YearMonthDay] = @reDat AND ISNULL(tblIDSTransactionsNew.OBONumber], ISNULL(tblIDSTransactionsNew.VRNumber], tblIDSTransactionsNew.Paymentsummarynumber])) = @reNr AND tblIDSTransactionsNew.KdNrVERAG = @ids_kdNr - AND tbl_IDS_Länder.[Lieferland_ISO2] = @country", "FMZOLL",, list) + AND tbl_IDS_Länder.Lieferland_ISO2] = @country", "FMZOLL",, list) Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try @@ -624,7 +624,7 @@ Public Class cIDS Shared apiSettingsloaded As Boolean = False Shared SQL As New VERAG_PROG_ALLGEMEIN.SQL Shared Function GET_PARAM_ByName(tcParam_name, TESTSYSTEM) As String - Return SQL.getValueTxtBySql("SELECT TOP 1 [Param_value] FROM [tblPartnersystem_Paramter] WHERE Param_system='IDS' AND [Param_name]='" & tcParam_name & "' AND Param_testsystem = " & IIf(TESTSYSTEM, 1, 0), , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(False)) + Return SQL.getValueTxtBySql("SELECT TOP 1 Param_value] FROM tblPartnersystem_Paramter] WHERE Param_system='IDS' AND Param_name]='" & tcParam_name & "' AND Param_testsystem = " & IIf(TESTSYSTEM, 1, 0), , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(False)) End Function Shared Function getFTPConenction(ByRef API_String As String, ByRef API As DataTable, ByRef program As String) As Boolean @@ -770,11 +770,11 @@ Public Class cIDSInvoice Dim str As String = "" For Each i In list If Not i.isPrimaryParam Then - str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + str &= "" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," End If Next str = str.Substring(0, str.Length - 1) 'wg. ',' - Return (" UPDATE [tblIDSInvoicesNew] SET " & str & " WHERE YearMonthDay=@YearMonthDay AND CustomerCode=@CustomerCode AND Invoicenumber=@Invoicenumber") + Return (" UPDATE tblIDSInvoicesNew] SET " & str & " WHERE YearMonthDay=@YearMonthDay AND CustomerCode=@CustomerCode AND Invoicenumber=@Invoicenumber") Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) @@ -788,7 +788,7 @@ Public Class cIDSInvoice Dim values As String = "" For Each i In list If Not i.isPrimaryParam Then - str &= "[" & i.Text & "]," + str &= "" & i.Text & "]," values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," End If Next @@ -1005,11 +1005,11 @@ Public Class cIDSInvoiceSplittedByCountry Dim str As String = "" For Each i In list If Not i.isPrimaryParam Then - str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + str &= "" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," End If Next str = str.Substring(0, str.Length - 1) 'wg. ',' - Return (" UPDATE [tblIDSInvoicesNewSplittedByCountry] SET " & str & " WHERE YearMonthDay=@YearMonthDay AND CustomerCode=@CustomerCode AND Invoicenumber=@Invoicenumber AND Country=@Country") + Return (" UPDATE tblIDSInvoicesNewSplittedByCountry] SET " & str & " WHERE YearMonthDay=@YearMonthDay AND CustomerCode=@CustomerCode AND Invoicenumber=@Invoicenumber AND Country=@Country") Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) @@ -1023,7 +1023,7 @@ Public Class cIDSInvoiceSplittedByCountry Dim values As String = "" For Each i In list If Not i.isPrimaryParam Then - str &= "[" & i.Text & "]," + str &= "" & i.Text & "]," values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," End If Next @@ -1039,6 +1039,158 @@ Public Class cIDSInvoiceSplittedByCountry End Class +Public Class cIDSDieselpreisRW + + Property ID As Integer + Property OutletCountryCode As Object = Nothing + Property OutletCode As Object = Nothing + Property CustomerCode As Object = Nothing + Property ProductTypeCode As Object = Nothing + Property Rechenwert As Object = Nothing + Property Kz As Object = Nothing + Property Zeitstempel As Object = Nothing + Property Sachbearbeiter As Object = Nothing + Property KategorieNr As Object = Nothing + + + Public hasEntry = False + + Dim SQL As New SQL + + Sub New() + + End Sub + + Sub New(ID) + Me.ID = ID + LOADID() + 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("ID", ID,, True)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("OutletCountryCode", OutletCountryCode)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("OutletCode", OutletCode)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("CustomerCode", CustomerCode)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ProductTypeCode", ProductTypeCode)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Rechenwert", Rechenwert)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Kz", Kz)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Zeitstempel", Zeitstempel)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Sachbearbeiter", Sachbearbeiter)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KategorieNr", KategorieNr)) + + + + Return list + End Function + Public Function SAVE() As Boolean + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + + Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tbl_IDS_Rechenwerte WHERE ID=@ID) " & + " BEGIN " & getUpdateCmd() & " END " & + " Else " & + " BEGIN " & getInsertCmd() & " END " & + " commit tran " + + Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list) + End Function + Public Sub LOADID() + Try + hasEntry = False + Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() + Using cmd As New SqlCommand("SELECT * FROM tbl_IDS_Rechenwerte WHERE ID=@ID ", conn) + cmd.Parameters.AddWithValue("@ID", ID) + 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 + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + End Sub + + + Public Sub LOAD() + Try + hasEntry = False + Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() + Using cmd As New SqlCommand("SELECT * FROM tbl_IDS_Rechenwerte WHERE ID=@ID", conn) + cmd.Parameters.AddWithValue("@ID", ID) + + + 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 + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + End Sub + Public Function getUpdateCmd() As String + Try + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + Dim str As String = "" + For Each i In list + If Not i.isPrimaryParam Then + str &= "" & i.Text & " = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + End If + Next + str = str.Substring(0, str.Length - 1) 'wg. ',' + Return (" UPDATE tbl_IDS_Rechenwerte SET " & str & " WHERE ID=@ID") + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + Return "" + End Function + Public Function getInsertCmd() As String + Try + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + Dim str As String = "" + Dim values As String = "" + For Each i In list + If Not i.isPrimaryParam Then + str &= "" & i.Text & "," + values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + End If + Next + str = str.Substring(0, str.Length - 1) 'wg. ',' + values = values.Substring(0, values.Length - 1) 'wg. ',' + Return (" INSERT INTO tbl_IDS_Rechenwerte (" & str & ") VALUES(" & values & ") ") + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + Return "" + End Function + +End Class + + From 4262a8aeca1d12670ce783ab8bca4ab0c8f8f700 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 26 Aug 2025 11:09:28 +0200 Subject: [PATCH 04/12] IDS-Preise --- SDL/kunden/usrCntlIDSPreise.Designer.vb | 28 ++++++++++++------------- SDL/kunden/usrCntlIDSPreise.vb | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/SDL/kunden/usrCntlIDSPreise.Designer.vb b/SDL/kunden/usrCntlIDSPreise.Designer.vb index 6c0873fe..a12e1856 100644 --- a/SDL/kunden/usrCntlIDSPreise.Designer.vb +++ b/SDL/kunden/usrCntlIDSPreise.Designer.vb @@ -24,7 +24,7 @@ Partial Class usrCntlIDSPreise Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Me.lblOffert = New System.Windows.Forms.TextBox() + Me.lblIDS = New System.Windows.Forms.TextBox() Me.Label11 = New System.Windows.Forms.Label() Me.dgvOfferteDetails = New System.Windows.Forms.DataGridView() Me.cntxtAddSdl = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -40,18 +40,18 @@ Partial Class usrCntlIDSPreise CType(Me.dgvIDS, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'lblOffert + 'lblIDS ' - Me.lblOffert.BackColor = System.Drawing.Color.White - Me.lblOffert.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.lblOffert.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblOffert.Location = New System.Drawing.Point(5, 10) - Me.lblOffert.Multiline = True - Me.lblOffert.Name = "lblOffert" - Me.lblOffert.ReadOnly = True - Me.lblOffert.Size = New System.Drawing.Size(171, 22) - Me.lblOffert.TabIndex = 0 - Me.lblOffert.Text = "IDS" + Me.lblIDS.BackColor = System.Drawing.Color.White + Me.lblIDS.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.lblIDS.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblIDS.Location = New System.Drawing.Point(5, 10) + Me.lblIDS.Multiline = True + Me.lblIDS.Name = "lblIDS" + Me.lblIDS.ReadOnly = True + Me.lblIDS.Size = New System.Drawing.Size(171, 22) + Me.lblIDS.TabIndex = 0 + Me.lblIDS.Text = "IDS" ' 'Label11 ' @@ -199,7 +199,7 @@ Partial Class usrCntlIDSPreise Me.Controls.Add(Me.btnOfferteSpeichern) Me.Controls.Add(Me.btnEditIDS) Me.Controls.Add(Me.Label11) - Me.Controls.Add(Me.lblOffert) + Me.Controls.Add(Me.lblIDS) Me.Controls.Add(Me.dgvOfferteDetails) Me.Margin = New System.Windows.Forms.Padding(2) Me.Name = "usrCntlIDSPreise" @@ -211,7 +211,7 @@ Partial Class usrCntlIDSPreise Me.PerformLayout() End Sub - Friend WithEvents lblOffert As System.Windows.Forms.TextBox + Friend WithEvents lblIDS As System.Windows.Forms.TextBox Friend WithEvents Label11 As System.Windows.Forms.Label Friend WithEvents dgvOfferteDetails As System.Windows.Forms.DataGridView Friend WithEvents btnEditIDS As VERAG_PROG_ALLGEMEIN.FlatButton diff --git a/SDL/kunden/usrCntlIDSPreise.vb b/SDL/kunden/usrCntlIDSPreise.vb index 0dbdb615..6b70d7a8 100644 --- a/SDL/kunden/usrCntlIDSPreise.vb +++ b/SDL/kunden/usrCntlIDSPreise.vb @@ -434,7 +434,7 @@ Public Class usrCntlIDSPreise Do Dim nextCellIndex As Integer = (nextCell.ColumnIndex + j) Mod dgvOfferteDetails.ColumnCount Dim nextRowIndex As Integer = If(nextCellIndex = 0, (nextCell.RowIndex + 1) Mod dgvOfferteDetails.RowCount, nextCell.RowIndex) - lblOffert.Text = "C" & nextCellIndex & "R" & nextRowIndex & "RO" & IIf(nextCell.[ReadOnly], "1", "0") & "H" & IIf(Not nextCell.Visible, "1", "0") + 'lblIDS.Text = "C" & nextCellIndex & "R" & nextRowIndex & "RO" & IIf(nextCell.[ReadOnly], "1", "0") & "H" & IIf(Not nextCell.Visible, "1", "0") nextCell = dgvOfferteDetails.Rows(nextRowIndex).Cells(nextCellIndex) i += 1 j = 1 From 08f3e41f855521c61995e2c7b888f889dc6e04a8 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 26 Aug 2025 12:56:13 +0200 Subject: [PATCH 05/12] impo --- SDL/My Project/AssemblyInfo.vb | 4 ++-- SDL/kunden/usrCntlIDSPreise.vb | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index da9771d0..c035e4b0 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/usrCntlIDSPreise.vb b/SDL/kunden/usrCntlIDSPreise.vb index 6b70d7a8..e62c1d5e 100644 --- a/SDL/kunden/usrCntlIDSPreise.vb +++ b/SDL/kunden/usrCntlIDSPreise.vb @@ -1,8 +1,4 @@ - - -Imports DocumentFormat.OpenXml.Office.Word -Imports VERAG_PROG_ALLGEMEIN -Imports VERAG_PROG_ALLGEMEIN.TESTJSON +Imports VERAG_PROG_ALLGEMEIN Public Class usrCntlIDSPreise From abaa5161401450122215a68b09070813db6f23f1 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 27 Aug 2025 14:04:08 +0200 Subject: [PATCH 06/12] bugfix --- SDL/Fakturierung/frmFaktEmail.Designer.vb | 15 +++++- SDL/Fakturierung/frmFaktEmail.vb | 17 ++++++- SDL/kunden/frmKundenblatt.Designer.vb | 62 +++++++++++------------ SDL/kunden/frmKundenblatt.vb | 1 + SDL/mdm/frmMDMDatenverarbetiung.vb | 9 +--- SDL/mdm/usrCntlMDMAuswertungen.vb | 6 --- VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb | 52 +++++++++---------- 7 files changed, 89 insertions(+), 73 deletions(-) diff --git a/SDL/Fakturierung/frmFaktEmail.Designer.vb b/SDL/Fakturierung/frmFaktEmail.Designer.vb index 914a811b..3b2704c5 100644 --- a/SDL/Fakturierung/frmFaktEmail.Designer.vb +++ b/SDL/Fakturierung/frmFaktEmail.Designer.vb @@ -86,6 +86,7 @@ Partial Class frmFaktEmail Me.cbxMDMReKopie = New System.Windows.Forms.CheckBox() Me.cbxMDMAnh = New System.Windows.Forms.CheckBox() Me.Button6 = New System.Windows.Forms.Button() + Me.cbxVZ = New System.Windows.Forms.CheckBox() CType(Me.dgvEmailBCC, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvEmailCC, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvEmail, System.ComponentModel.ISupportInitialize).BeginInit() @@ -137,7 +138,7 @@ Partial Class frmFaktEmail 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(12, 169) + Me.Label2.Location = New System.Drawing.Point(12, 164) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(31, 13) Me.Label2.TabIndex = 7 @@ -733,12 +734,23 @@ Partial Class frmFaktEmail Me.Button6.UseVisualStyleBackColor = True Me.Button6.Visible = False ' + 'cbxVZ + ' + Me.cbxVZ.AutoSize = True + Me.cbxVZ.Location = New System.Drawing.Point(18, 181) + Me.cbxVZ.Name = "cbxVZ" + Me.cbxVZ.Size = New System.Drawing.Size(40, 17) + Me.cbxVZ.TabIndex = 98 + Me.cbxVZ.Text = "VZ" + Me.cbxVZ.UseVisualStyleBackColor = True + ' 'frmFaktEmail ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.WhiteSmoke Me.ClientSize = New System.Drawing.Size(750, 850) + Me.Controls.Add(Me.cbxVZ) Me.Controls.Add(Me.Button6) Me.Controls.Add(Me.cbxMDMAnh) Me.Controls.Add(Me.cbxMDMReKopie) @@ -852,4 +864,5 @@ Partial Class frmFaktEmail Friend WithEvents cbxMDMReKopie As CheckBox Friend WithEvents cbxMDMAnh As CheckBox Friend WithEvents Button6 As Button + Friend WithEvents cbxVZ As CheckBox End Class diff --git a/SDL/Fakturierung/frmFaktEmail.vb b/SDL/Fakturierung/frmFaktEmail.vb index 77011bb3..ea1875f2 100644 --- a/SDL/Fakturierung/frmFaktEmail.vb +++ b/SDL/Fakturierung/frmFaktEmail.vb @@ -357,7 +357,7 @@ Public Class frmFaktEmail Else Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - Dim listOfTextconserven As cTextkonserve_LIST = New cTextkonserve_LIST(1, "", Firma_ID) + Dim listOfTextconserven As cTextkonserve_LIST = New cTextkonserve_LIST(IIf(cbxVZ.Checked, 7, 1), "", Firma_ID) Dim mailText As String = "" Dim spracheRechnung As String = "EN" 'Defaultsprache @@ -1370,6 +1370,21 @@ Public Class frmFaktEmail Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click setMailText(KdNr, "RO") End Sub + + Private Sub cbxVZ_CheckedChanged(sender As Object, e As EventArgs) Handles cbxVZ.CheckedChanged + If KdNr > 0 Then + If SR Then + + Dim AD = New VERAG_PROG_ALLGEMEIN.cAdressen(KdNr) + setMailText(KdNr, AD.LandKz) + + Else + If RECHNUNG IsNot Nothing Then setMailText(KdNr, RECHNUNG.RechnungsLandKz) + + End If + End If + + End Sub End Class diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index f17087df..fbd36690 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -324,7 +324,7 @@ Partial Class frmKundenblatt Me.tbFirmendaten.Location = New System.Drawing.Point(4, 25) Me.tbFirmendaten.Name = "tbFirmendaten" Me.tbFirmendaten.Padding = New System.Windows.Forms.Padding(3) - Me.tbFirmendaten.Size = New System.Drawing.Size(1644, 1356) + Me.tbFirmendaten.Size = New System.Drawing.Size(1644, 1390) Me.tbFirmendaten.TabIndex = 3 Me.tbFirmendaten.Text = "Firmendaten" ' @@ -334,7 +334,7 @@ Partial Class frmKundenblatt Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel4.Location = New System.Drawing.Point(3, 3) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(1638, 1350) + Me.Panel4.Size = New System.Drawing.Size(1638, 1384) Me.Panel4.TabIndex = 0 ' 'UsrcntlKundeBearbeitenFull1 @@ -344,7 +344,7 @@ Partial Class frmKundenblatt Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0) Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1" - Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1638, 1350) + Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1638, 1384) Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 ' 'tbcntrMain @@ -364,7 +364,7 @@ Partial Class frmKundenblatt Me.tbcntrMain.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMain.Name = "tbcntrMain" Me.tbcntrMain.SelectedIndex = 0 - Me.tbcntrMain.Size = New System.Drawing.Size(1652, 1402) + Me.tbcntrMain.Size = New System.Drawing.Size(1652, 1419) Me.tbcntrMain.TabIndex = 3 ' 'tbAllgemein @@ -405,7 +405,7 @@ Partial Class frmKundenblatt Me.tbAllgemein.Margin = New System.Windows.Forms.Padding(0) Me.tbAllgemein.Name = "tbAllgemein" Me.tbAllgemein.Padding = New System.Windows.Forms.Padding(3) - Me.tbAllgemein.Size = New System.Drawing.Size(1644, 1373) + Me.tbAllgemein.Size = New System.Drawing.Size(1644, 1390) Me.tbAllgemein.TabIndex = 0 Me.tbAllgemein.Text = "Allgemein" ' @@ -486,7 +486,7 @@ Partial Class frmKundenblatt Me.TabControl1.Location = New System.Drawing.Point(8, 582) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(718, 785) + Me.TabControl1.Size = New System.Drawing.Size(718, 802) Me.TabControl1.TabIndex = 186 ' 'TabPage1 @@ -498,7 +498,7 @@ Partial Class frmKundenblatt 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(710, 759) + Me.TabPage1.Size = New System.Drawing.Size(710, 776) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Offene Posten" Me.TabPage1.UseVisualStyleBackColor = True @@ -557,7 +557,7 @@ Partial Class frmKundenblatt Me.dgvOffenePosten.RowHeadersDefaultCellStyle = DataGridViewCellStyle4 Me.dgvOffenePosten.RowHeadersVisible = False Me.dgvOffenePosten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvOffenePosten.Size = New System.Drawing.Size(707, 724) + Me.dgvOffenePosten.Size = New System.Drawing.Size(707, 741) Me.dgvOffenePosten.TabIndex = 175 ' 'Label10 @@ -590,7 +590,7 @@ Partial Class frmKundenblatt 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(710, 742) + Me.TabPage2.Size = New System.Drawing.Size(710, 776) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Umsatzbericht" Me.TabPage2.UseVisualStyleBackColor = True @@ -635,7 +635,7 @@ Partial Class frmKundenblatt Me.dgvUmsaetze.RowHeadersDefaultCellStyle = DataGridViewCellStyle8 Me.dgvUmsaetze.RowHeadersVisible = False Me.dgvUmsaetze.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 717) + Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 751) Me.dgvUmsaetze.TabIndex = 182 ' 'Label13 @@ -683,7 +683,7 @@ Partial Class frmKundenblatt Me.TabPage3.Controls.Add(Me.dgvUmsatzNachLeistngsNr) Me.TabPage3.Location = New System.Drawing.Point(4, 22) Me.TabPage3.Name = "TabPage3" - Me.TabPage3.Size = New System.Drawing.Size(710, 742) + Me.TabPage3.Size = New System.Drawing.Size(710, 776) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "Umsatz nach LeistungsNr" Me.TabPage3.UseVisualStyleBackColor = True @@ -739,7 +739,7 @@ Partial Class frmKundenblatt Me.dgvUmsatzNachLeistngsNr.RowHeadersDefaultCellStyle = DataGridViewCellStyle12 Me.dgvUmsatzNachLeistngsNr.RowHeadersVisible = False Me.dgvUmsatzNachLeistngsNr.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(705, 719) + Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(705, 753) Me.dgvUmsatzNachLeistngsNr.TabIndex = 183 ' 'lblAdressenzusatz @@ -1100,7 +1100,7 @@ Partial Class frmKundenblatt Me.dgvSperrliste.Name = "dgvSperrliste" Me.dgvSperrliste.ReadOnly = True Me.dgvSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle15 - Me.dgvSperrliste.Size = New System.Drawing.Size(446, 1329) + Me.dgvSperrliste.Size = New System.Drawing.Size(446, 1346) Me.dgvSperrliste.TabIndex = 23 ' 'PictureBox2 @@ -1154,7 +1154,7 @@ Partial Class frmKundenblatt Me.tbZoll.Location = New System.Drawing.Point(4, 25) Me.tbZoll.Name = "tbZoll" Me.tbZoll.Padding = New System.Windows.Forms.Padding(3) - Me.tbZoll.Size = New System.Drawing.Size(1644, 1356) + Me.tbZoll.Size = New System.Drawing.Size(1644, 1390) Me.tbZoll.TabIndex = 9 Me.tbZoll.Text = "ZOLL" Me.tbZoll.UseVisualStyleBackColor = True @@ -1166,7 +1166,7 @@ Partial Class frmKundenblatt Me.tbcntrZOLL.Location = New System.Drawing.Point(3, 3) Me.tbcntrZOLL.Name = "tbcntrZOLL" Me.tbcntrZOLL.SelectedIndex = 0 - Me.tbcntrZOLL.Size = New System.Drawing.Size(1638, 1350) + Me.tbcntrZOLL.Size = New System.Drawing.Size(1638, 1384) Me.tbcntrZOLL.TabIndex = 0 ' 'tabZoll_Artikel @@ -1174,7 +1174,7 @@ Partial Class frmKundenblatt Me.tabZoll_Artikel.Location = New System.Drawing.Point(4, 22) Me.tabZoll_Artikel.Name = "tabZoll_Artikel" Me.tabZoll_Artikel.Padding = New System.Windows.Forms.Padding(3) - Me.tabZoll_Artikel.Size = New System.Drawing.Size(1630, 1324) + Me.tabZoll_Artikel.Size = New System.Drawing.Size(1630, 1358) Me.tabZoll_Artikel.TabIndex = 1 Me.tabZoll_Artikel.Text = "Artikel" Me.tabZoll_Artikel.UseVisualStyleBackColor = True @@ -1185,7 +1185,7 @@ Partial Class frmKundenblatt Me.tbMdm.Location = New System.Drawing.Point(4, 25) Me.tbMdm.Name = "tbMdm" Me.tbMdm.Padding = New System.Windows.Forms.Padding(3) - Me.tbMdm.Size = New System.Drawing.Size(1644, 1356) + Me.tbMdm.Size = New System.Drawing.Size(1644, 1390) Me.tbMdm.TabIndex = 10 Me.tbMdm.Text = "MDM" Me.tbMdm.UseVisualStyleBackColor = True @@ -1204,7 +1204,7 @@ Partial Class frmKundenblatt Me.tbcntrMDM.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMDM.Name = "tbcntrMDM" Me.tbcntrMDM.SelectedIndex = 0 - Me.tbcntrMDM.Size = New System.Drawing.Size(1638, 1350) + Me.tbcntrMDM.Size = New System.Drawing.Size(1638, 1384) Me.tbcntrMDM.TabIndex = 0 ' 'tbSDL @@ -1216,7 +1216,7 @@ Partial Class frmKundenblatt Me.tbSDL.Margin = New System.Windows.Forms.Padding(0) Me.tbSDL.Name = "tbSDL" Me.tbSDL.Padding = New System.Windows.Forms.Padding(3) - Me.tbSDL.Size = New System.Drawing.Size(1630, 1324) + Me.tbSDL.Size = New System.Drawing.Size(1630, 1358) Me.tbSDL.TabIndex = 5 Me.tbSDL.Text = "SDL-Leistungen" Me.tbSDL.UseVisualStyleBackColor = True @@ -1258,7 +1258,7 @@ Partial Class frmKundenblatt DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle21 Me.dgvSDLLeistungenFull.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1624, 1128) + Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1624, 1162) Me.dgvSDLLeistungenFull.TabIndex = 5 ' 'Panel6 @@ -1363,7 +1363,7 @@ Partial Class frmKundenblatt Me.Panel5.Controls.Add(Me.lblLetzterSA_SDL) Me.Panel5.Controls.Add(Me.rtbVermerke) Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel5.Location = New System.Drawing.Point(3, 1178) + Me.Panel5.Location = New System.Drawing.Point(3, 1212) Me.Panel5.Name = "Panel5" Me.Panel5.Size = New System.Drawing.Size(1624, 143) Me.Panel5.TabIndex = 177 @@ -2249,7 +2249,7 @@ Partial Class frmKundenblatt Me.tbOfferte.Location = New System.Drawing.Point(4, 25) Me.tbOfferte.Margin = New System.Windows.Forms.Padding(2) Me.tbOfferte.Name = "tbOfferte" - Me.tbOfferte.Size = New System.Drawing.Size(1644, 1356) + Me.tbOfferte.Size = New System.Drawing.Size(1644, 1390) Me.tbOfferte.TabIndex = 11 Me.tbOfferte.Text = "Offerte" Me.tbOfferte.UseVisualStyleBackColor = True @@ -2261,7 +2261,7 @@ Partial Class frmKundenblatt Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0) Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1) Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" - Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1644, 1356) + Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1644, 1390) Me.UsrCntlOfferte1.TabIndex = 0 ' 'tbUSTV @@ -2269,7 +2269,7 @@ Partial Class frmKundenblatt Me.tbUSTV.Controls.Add(Me.tbcntrUSTV) Me.tbUSTV.Location = New System.Drawing.Point(4, 25) Me.tbUSTV.Name = "tbUSTV" - Me.tbUSTV.Size = New System.Drawing.Size(1644, 1356) + Me.tbUSTV.Size = New System.Drawing.Size(1644, 1390) Me.tbUSTV.TabIndex = 12 Me.tbUSTV.Text = "USTV" Me.tbUSTV.UseVisualStyleBackColor = True @@ -2283,7 +2283,7 @@ Partial Class frmKundenblatt Me.tbcntrUSTV.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrUSTV.Name = "tbcntrUSTV" Me.tbcntrUSTV.SelectedIndex = 0 - Me.tbcntrUSTV.Size = New System.Drawing.Size(1644, 1356) + Me.tbcntrUSTV.Size = New System.Drawing.Size(1644, 1390) Me.tbcntrUSTV.TabIndex = 1 ' 'tbUSTVDokumente @@ -2296,7 +2296,7 @@ Partial Class frmKundenblatt Me.tbUSTVDokumente.Controls.Add(Me.scanUSTVVollmachten) Me.tbUSTVDokumente.Location = New System.Drawing.Point(4, 22) Me.tbUSTVDokumente.Name = "tbUSTVDokumente" - Me.tbUSTVDokumente.Size = New System.Drawing.Size(1636, 1330) + Me.tbUSTVDokumente.Size = New System.Drawing.Size(1636, 1364) Me.tbUSTVDokumente.TabIndex = 8 Me.tbUSTVDokumente.Text = "Dokumente" Me.tbUSTVDokumente.UseVisualStyleBackColor = True @@ -2419,7 +2419,7 @@ Partial Class frmKundenblatt Me.tbFIBU.Controls.Add(Me.txtFIBUKuerzel) Me.tbFIBU.Location = New System.Drawing.Point(4, 25) Me.tbFIBU.Name = "tbFIBU" - Me.tbFIBU.Size = New System.Drawing.Size(1644, 1373) + Me.tbFIBU.Size = New System.Drawing.Size(1644, 1390) Me.tbFIBU.TabIndex = 13 Me.tbFIBU.Text = "FIBU" Me.tbFIBU.UseVisualStyleBackColor = True @@ -2446,7 +2446,7 @@ Partial Class frmKundenblatt ' Me.btnFirmendatenFormularSpeichern.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnFirmendatenFormularSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnFirmendatenFormularSpeichern.Location = New System.Drawing.Point(1514, 18) + Me.btnFirmendatenFormularSpeichern.Location = New System.Drawing.Point(-1390, 18) Me.btnFirmendatenFormularSpeichern.Name = "btnFirmendatenFormularSpeichern" Me.btnFirmendatenFormularSpeichern.Size = New System.Drawing.Size(71, 52) Me.btnFirmendatenFormularSpeichern.TabIndex = 17 @@ -2478,7 +2478,7 @@ Partial Class frmKundenblatt Me.tbRechnungen.Controls.Add(Me.MyPanel1) Me.tbRechnungen.Location = New System.Drawing.Point(4, 25) Me.tbRechnungen.Name = "tbRechnungen" - Me.tbRechnungen.Size = New System.Drawing.Size(1644, 1373) + Me.tbRechnungen.Size = New System.Drawing.Size(1644, 1390) Me.tbRechnungen.TabIndex = 14 Me.tbRechnungen.Text = "Rechnungen" Me.tbRechnungen.UseVisualStyleBackColor = True @@ -2497,7 +2497,7 @@ Partial Class frmKundenblatt Me.dgvRg.ReadOnly = True Me.dgvRg.RowHeadersVisible = False Me.dgvRg.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvRg.Size = New System.Drawing.Size(1644, 1313) + Me.dgvRg.Size = New System.Drawing.Size(1644, 1330) Me.dgvRg.TabIndex = 3 ' 'MyPanel1 @@ -2892,7 +2892,7 @@ Partial Class frmKundenblatt Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScroll = True Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(1595, 1531) + Me.ClientSize = New System.Drawing.Size(1595, 1548) Me.Controls.Add(Me.lblAbfVerb) Me.Controls.Add(Me.btnAbfVerb) Me.Controls.Add(Me.tbcntrMain) diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb index 69026718..7211e266 100644 --- a/SDL/kunden/frmKundenblatt.vb +++ b/SDL/kunden/frmKundenblatt.vb @@ -2370,5 +2370,6 @@ Public Class frmKundenblatt dgvRg.RELOAD() End Sub + End Class diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index 55fd8a4c..d7665415 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -2425,8 +2425,7 @@ Public Class frmMDMDatenverarbetiung WHERE Offertenpositionen.KundenNr='" & KdNr & "' and tblUTAImportNew.Rechnungsdatum = '" & DateTimePicker2.Text & "' ) as qryUTA_Fakturierungspositionen WHERE (((qryUTA_Fakturierungspositionen.Gesamtbetrag_Brutto_in_Darstellwährung)<>0)) - order by LicencePlateNumber, [Card Type] - " + order by LicencePlateNumber, [Card Type]" ' sqlstr &= " group by plose_ProduktCode" ' sqlstr &= " order by plp_Land, plose_DatumTransaktion" @@ -3626,12 +3625,6 @@ Public Class frmMDMDatenverarbetiung POS.Anzahl = 1 ' POS.BGebLeistungsNr = BGebLeistungsNr - - If POS.LeistungsNr = 441 Then - MsgBox("") - End If - - RG.POSITIONEN.Add(POS) End If diff --git a/SDL/mdm/usrCntlMDMAuswertungen.vb b/SDL/mdm/usrCntlMDMAuswertungen.vb index 879d9259..4623b299 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.vb +++ b/SDL/mdm/usrCntlMDMAuswertungen.vb @@ -1,11 +1,5 @@ Imports System.Data.SqlClient -Imports System.DirectoryServices.ActiveDirectory Imports System.IO -Imports com.sun.org.apache.bcel.internal.generic -Imports com.sun.org.glassfish.external.statistics.annotations -Imports com.sun.tools.internal.ws.wsdl.framework -Imports java.awt.geom -Imports javax.print.attribute.standard Imports Microsoft.Office.Interop.Outlook Imports Microsoft.VisualBasic.FileIO Imports VERAG_PROG_ALLGEMEIN diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb b/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb index 1d32d337..ee4e99c4 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb @@ -301,11 +301,11 @@ Public Class cIDS Dim str As String = "" For Each i In list If Not i.isPrimaryParam Then - str &= "" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," End If Next str = str.Substring(0, str.Length - 1) 'wg. ',' - Return (" UPDATE tblIDSTransactionsNew] SET " & str & " WHERE YearMonthDay=@YearMonthDay AND Paymentsummarynumber=@Paymentsummarynumber AND CustomerCode=@CustomerCode AND OutletCountryCode=@OutletCountryCode AND OutletCode=@OutletCode AND ProductTypeCode=@ProductTypeCode " & IIf(PARAM <> "" AndAlso VALUE <> "", " AND " & PARAM & "=" & VALUE, "") & " AND isnull(charged,0) = 0 ") + Return (" UPDATE [tblIDSTransactionsNew] SET " & str & " WHERE YearMonthDay=@YearMonthDay AND Paymentsummarynumber=@Paymentsummarynumber AND CustomerCode=@CustomerCode AND OutletCountryCode=@OutletCountryCode AND OutletCode=@OutletCode AND ProductTypeCode=@ProductTypeCode " & IIf(PARAM <> "" AndAlso VALUE <> "", " AND " & PARAM & "=" & VALUE, "") & " AND isnull(charged,0) = 0 ") Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) @@ -321,7 +321,7 @@ Public Class cIDS Dim values As String = "" For Each i In list If Not i.isPrimaryParam Then - str &= "" & i.Text & "]," + str &= "[" & i.Text & "]," values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," End If Next @@ -544,31 +544,31 @@ Public Class cIDS Using cmd As New SqlCommand("SELECT tblIDSTransactionsNew.KdNrVERAG as Kundennummer, - ISNULL(tblIDSTransactionsNew.OBONumber],ISNULL(tblIDSTransactionsNew.VRNumber], tblIDSTransactionsNew.Paymentsummarynumber])) AS Rechnungsnummer, - tblIDSTransactionsNew.YearMonthDay] AS Rechnungsdatum, - SUM(tblIDSTransactionsNew.VATAmount]) AS Steuerbetrag + ISNULL(tblIDSTransactionsNew.[OBONumber],ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber])) AS Rechnungsnummer, + tblIDSTransactionsNew.[YearMonthDay] AS Rechnungsdatum, + SUM(tblIDSTransactionsNew.[VATAmount]) AS Steuerbetrag FROM tblIDSTransactionsNew INNER JOIN tbl_IDS_Länder - ON tblIDSTransactionsNew.OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode + ON tblIDSTransactionsNew.[OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode WHERE - tblIDSTransactionsNew.YearMonthDay] BETWEEN @von AND @bis + tblIDSTransactionsNew.[YearMonthDay] BETWEEN @von AND @bis AND tblIDSTransactionsNew.KdNrVERAG = @AdressenNr - AND tbl_IDS_Länder.Lieferland_ISO2] = @LandKZ - AND tblIDSTransactionsNew.VATAmount] <> 0 + AND tbl_IDS_Länder.[Lieferland_ISO2] = @LandKZ + AND tblIDSTransactionsNew.[VATAmount] <> 0 " & IIf(Archiv, " ", " AND isnull(UStVAn_ID,0) = 0 ") & " GROUP BY tblIDSTransactionsNew.KdNrVERAG, - tblIDSTransactionsNew.YearMonthDay], - ISNULL(tblIDSTransactionsNew.OBONumber], - ISNULL(tblIDSTransactionsNew.VRNumber], tblIDSTransactionsNew.Paymentsummarynumber])) + tblIDSTransactionsNew.[YearMonthDay], + ISNULL(tblIDSTransactionsNew.[OBONumber], + ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber])) ORDER BY tblIDSTransactionsNew.KdNrVERAG, - tblIDSTransactionsNew.YearMonthDay], - ISNULL(tblIDSTransactionsNew.OBONumber], - ISNULL(tblIDSTransactionsNew.VRNumber], tblIDSTransactionsNew.Paymentsummarynumber]));", conn) + tblIDSTransactionsNew.[YearMonthDay], + ISNULL(tblIDSTransactionsNew.[OBONumber], + ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber]));", conn) cmd.Parameters.AddWithValue("@LandKZ", LandKZ) cmd.Parameters.AddWithValue("@von", von) @@ -607,11 +607,11 @@ Public Class cIDS Return SQL.doSQLVarList("update tblIDSTransactionsNew set UStVAn_ID = @UStVAn_ID FROM tblIDSTransactionsNew INNER JOIN tbl_IDS_Länder - ON tblIDSTransactionsNew.OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode + ON tblIDSTransactionsNew.[OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode WHERE - tblIDSTransactionsNew.YearMonthDay] = @reDat AND ISNULL(tblIDSTransactionsNew.OBONumber], ISNULL(tblIDSTransactionsNew.VRNumber], tblIDSTransactionsNew.Paymentsummarynumber])) = @reNr + tblIDSTransactionsNew.[YearMonthDay] = @reDat AND ISNULL(tblIDSTransactionsNew.[OBONumber], ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber])) = @reNr AND tblIDSTransactionsNew.KdNrVERAG = @ids_kdNr - AND tbl_IDS_Länder.Lieferland_ISO2] = @country", "FMZOLL",, list) + AND tbl_IDS_Länder.[Lieferland_ISO2] = @country", "FMZOLL",, list) Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try @@ -624,7 +624,7 @@ Public Class cIDS Shared apiSettingsloaded As Boolean = False Shared SQL As New VERAG_PROG_ALLGEMEIN.SQL Shared Function GET_PARAM_ByName(tcParam_name, TESTSYSTEM) As String - Return SQL.getValueTxtBySql("SELECT TOP 1 Param_value] FROM tblPartnersystem_Paramter] WHERE Param_system='IDS' AND Param_name]='" & tcParam_name & "' AND Param_testsystem = " & IIf(TESTSYSTEM, 1, 0), , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(False)) + Return SQL.getValueTxtBySql("SELECT TOP 1 [Param_value] FROM [tblPartnersystem_Paramter] WHERE Param_system='IDS' AND [Param_name]='" & tcParam_name & "' AND Param_testsystem = " & IIf(TESTSYSTEM, 1, 0), , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(False)) End Function Shared Function getFTPConenction(ByRef API_String As String, ByRef API As DataTable, ByRef program As String) As Boolean @@ -770,11 +770,11 @@ Public Class cIDSInvoice Dim str As String = "" For Each i In list If Not i.isPrimaryParam Then - str &= "" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," End If Next str = str.Substring(0, str.Length - 1) 'wg. ',' - Return (" UPDATE tblIDSInvoicesNew] SET " & str & " WHERE YearMonthDay=@YearMonthDay AND CustomerCode=@CustomerCode AND Invoicenumber=@Invoicenumber") + Return (" UPDATE [tblIDSInvoicesNew] SET " & str & " WHERE YearMonthDay=@YearMonthDay AND CustomerCode=@CustomerCode AND Invoicenumber=@Invoicenumber") Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) @@ -788,7 +788,7 @@ Public Class cIDSInvoice Dim values As String = "" For Each i In list If Not i.isPrimaryParam Then - str &= "" & i.Text & "]," + str &= "[" & i.Text & "]," values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," End If Next @@ -1005,11 +1005,11 @@ Public Class cIDSInvoiceSplittedByCountry Dim str As String = "" For Each i In list If Not i.isPrimaryParam Then - str &= "" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," End If Next str = str.Substring(0, str.Length - 1) 'wg. ',' - Return (" UPDATE tblIDSInvoicesNewSplittedByCountry] SET " & str & " WHERE YearMonthDay=@YearMonthDay AND CustomerCode=@CustomerCode AND Invoicenumber=@Invoicenumber AND Country=@Country") + Return (" UPDATE [tblIDSInvoicesNewSplittedByCountry] SET " & str & " WHERE YearMonthDay=@YearMonthDay AND CustomerCode=@CustomerCode AND Invoicenumber=@Invoicenumber AND Country=@Country") Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) @@ -1023,7 +1023,7 @@ Public Class cIDSInvoiceSplittedByCountry Dim values As String = "" For Each i In list If Not i.isPrimaryParam Then - str &= "" & i.Text & "]," + str &= "[" & i.Text & "]," values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," End If Next From 410fcd8d6ef8a828be8e90c76bb5cefe0b0f81f4 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 27 Aug 2025 14:10:04 +0200 Subject: [PATCH 07/12] version --- SDL/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index c035e4b0..cdd56e0c 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: ' - - + + From c71f1ef352d14c06c771295f7fa5846a781cde0f Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 27 Aug 2025 15:54:42 +0200 Subject: [PATCH 08/12] =?UTF-8?q?fakt.=20Pos=20zur=C3=BCcksetzen,=20etc.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SDL/Fakturierung/usrCntlFaktAbrechnung.vb | 44 +++++++-- SDL/USTV/frmMDM_USTVAntrag.Designer.vb | 69 +++++++++----- SDL/USTV/frmMDM_USTVAntrag.vb | 111 +++++++++++++++------- 3 files changed, 155 insertions(+), 69 deletions(-) diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index b66cb8c2..e49244a3 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -1426,13 +1426,19 @@ Public Class usrCntlFaktAbrechnung For Each r In dgvOfferteDetailsUebersicht.Rows - If r.Cells("LeistungsBez").Value.Contains("Fremd-RG") AndAlso r.Cells("Anzahl").Value <> 0 AndAlso IsNumeric(r.Cells("Preis").Value) Then + Dim OFFERT_RMC As Boolean = False + Dim OFFERT_FREMD As Boolean = False + + If Not IsDBNull(r.Cells("RMC").Value) AndAlso r.Cells("RMC").Value IsNot Nothing Then OFFERT_RMC = r.Cells("RMC").Value + If Not IsDBNull(r.Cells("Fremd").Value) AndAlso r.Cells("Fremd").Value IsNot Nothing Then OFFERT_FREMD = r.Cells("Fremd").Value + + If OFFERT_FREMD AndAlso r.Cells("Anzahl").Value <> 0 AndAlso IsNumeric(r.Cells("Preis").Value) Then containFremd = True bearbNrFremd = IIf(Not IsDBNull(r.Cells("BGebLeistungsNr").Value), r.Cells("BGebLeistungsNr").Value, 0) minBetragFremd = IIf(Not IsDBNull(r.Cells("BGebMinBetrag").Value), r.Cells("BGebMinBetrag").Value, 0) sumOffertFremd = Math.Round(r.Cells("Anzahl").Value * CDbl(r.Cells("Preis").Value * r.Cells("BGebProzent").Value), 2) End If - If r.Cells("LeistungsBez").Value.Contains("RMC-RG") AndAlso r.Cells("Anzahl").Value <> 0 AndAlso IsNumeric(r.Cells("Preis").Value) Then + If OFFERT_RMC AndAlso r.Cells("Anzahl").Value <> 0 AndAlso IsNumeric(r.Cells("Preis").Value) Then containRMC = True bearbNrRMC = IIf(Not IsDBNull(r.Cells("BGebLeistungsNr").Value), r.Cells("BGebLeistungsNr").Value, 0) sumOffertRMC = Math.Round(r.Cells("Anzahl").Value * CDbl(r.Cells("Preis").Value * r.Cells("BGebProzent").Value), 2) @@ -1443,11 +1449,22 @@ Public Class usrCntlFaktAbrechnung Dim preistaffelIsSet As Boolean = False + For Each r In dgvOfferteDetailsUebersicht.Rows - If r.Cells("Anzahl").Value <> 0 And r.Cells("Preis").Value <> 0 AndAlso IsNumeric(r.Cells("Preis").Value) AndAlso r.Cells("LeistungsNr").Value <> bearbNrRMC Then + Dim isMWSTBearb As Boolean = False - If Not preistaffelIsSet Then setMWSTABRfromSPEDinPOS(r, landNr, landBez, summeRMC, summeFremd, (containRMC AndAlso containFremd), posSet, preistaffelIsSet, antrag, isVZ, True, sumOffertRMC, minBetragRMC, sumOffertFremd, minBetragFremd) + Select Case r.Cells("LeistungsNr").Value + Case 124, 125, 126, 117, 118, 119, bearbNrRMC : isMWSTBearb = True + End Select + + + + If r IsNot Nothing AndAlso r.Cells("Anzahl").Value <> 0 AndAlso IsNumeric(r.Cells("Preis").Value) AndAlso r.Cells("Preis").Value <> 0 AndAlso isMWSTBearb Then 'r.Cells("LeistungsNr").Value <> bearbNrRMC AndAlso + + If Not preistaffelIsSet Then + setMWSTABRfromSPEDinPOS(r, landNr, landBez, summeRMC, summeFremd, (containRMC AndAlso containFremd), posSet, preistaffelIsSet, antrag, isVZ, True, sumOffertRMC, minBetragRMC, sumOffertFremd, minBetragFremd) + End If 'If posSet Then Exit For End If @@ -2674,9 +2691,12 @@ Public Class usrCntlFaktAbrechnung If (BGebLeistungsNr > 0 AndAlso BGebProzent > 0 AndAlso BGebBgl <> 0) Then Dim minBetragRMCUsed As Boolean = False - Dim curBGebMinBetrag = BGebMinBetrag + Dim OFFERT_VZ As Boolean = False + Dim OFFERT_RMC As Boolean = False + Dim OFFERT_FREMD As Boolean = False + Dim curBGebErrBetrag As Double = Math.Round(BGebBgl * BGebProzent, 1) Dim curBGebBetrag As Double = 0 curBGebBetrag = curBGebErrBetrag @@ -2688,16 +2708,20 @@ Public Class usrCntlFaktAbrechnung curBGebMinBetrag = 0 - curBGebMinBetrag 'Vorzeichen in Plus ändern. End If + If Not IsDBNull(r.Cells("VZ").Value) AndAlso r.Cells("VZ").Value IsNot Nothing Then OFFERT_VZ = r.Cells("VZ").Value + If Not IsDBNull(r.Cells("RMC").Value) AndAlso r.Cells("RMC").Value IsNot Nothing Then OFFERT_RMC = r.Cells("RMC").Value + If Not IsDBNull(r.Cells("Fremd").Value) AndAlso r.Cells("Fremd").Value IsNot Nothing Then OFFERT_FREMD = r.Cells("Fremd").Value + 'Größeren Betrag bereitstellen. If curBGebErrBetrag > curBGebMinBetrag Then curBGebBetrag = curBGebErrBetrag 'Errechneten Betrag verwenden - summeFremdBearb += If(r.Cells("LeistungsBez").Value.Contains("Fremd-RG"), curBGebErrBetrag, 0) - summeRMCBearb += If(r.Cells("LeistungsBez").Value.Contains("RMC-RG"), curBGebErrBetrag, 0) + summeFremdBearb += If(OFFERT_FREMD, curBGebErrBetrag, 0) + summeRMCBearb += If(OFFERT_RMC, curBGebErrBetrag, 0) Else curBGebBetrag = curBGebMinBetrag 'Mindestbetrag verwenden - summeFremdBearb += If(r.Cells("LeistungsBez").Value.Contains("Fremd-RG"), curBGebErrBetrag, 0) - summeRMCBearb += If(r.Cells("LeistungsBez").Value.Contains("Fremd-RG"), curBGebErrBetrag, 0) - minBetragRMCUsed = IIf(r.Cells("LeistungsBez").Value.Contains("Fremd-RG") OrElse r.Cells("LeistungsBez").Value.Contains("RMC-RG"), True, False) + summeFremdBearb += If(OFFERT_FREMD, curBGebErrBetrag, 0) + summeRMCBearb += If(OFFERT_FREMD, curBGebErrBetrag, 0) + minBetragRMCUsed = IIf(OFFERT_FREMD OrElse OFFERT_RMC, True, False) End If 'Vorzeichen einstellen. diff --git a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb index 36ffebbc..0f30a344 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb @@ -113,7 +113,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() @@ -124,7 +123,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() @@ -135,10 +133,14 @@ Partial Class frmMDM_USTVAntrag Me.VorauszahlungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DeaktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.FakturiertZurücksetzenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ncs_Belege = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() + Me.FakturiertToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition() + Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition() Me.pnlBottom.SuspendLayout() CType(Me.pb_Beleg, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.picExcel, System.ComponentModel.ISupportInitialize).BeginInit() @@ -1515,14 +1517,6 @@ Partial Class frmMDM_USTVAntrag Me.Panel2.Size = New System.Drawing.Size(1438, 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(1282, 261) - Me.UstCntlUSTV_AntragPosition1.TabIndex = 0 - ' 'Panel4 ' Me.Panel4.BackColor = System.Drawing.Color.WhiteSmoke @@ -1668,14 +1662,6 @@ Partial Class frmMDM_USTVAntrag Me.pnlErstattungsdetails.Size = New System.Drawing.Size(1436, 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(1280, 259) - Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2 - ' 'Panel1 ' Me.Panel1.BackColor = System.Drawing.Color.WhiteSmoke @@ -1733,15 +1719,15 @@ Partial Class frmMDM_USTVAntrag ' 'cns_vorauszahlen ' - Me.cns_vorauszahlen.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VorauszahlungToolStripMenuItem}) + Me.cns_vorauszahlen.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VorauszahlungToolStripMenuItem, Me.FakturiertZurücksetzenToolStripMenuItem}) Me.cns_vorauszahlen.Name = "cns_vorauszahlen" - Me.cns_vorauszahlen.Size = New System.Drawing.Size(152, 26) + Me.cns_vorauszahlen.Size = New System.Drawing.Size(212, 70) ' 'VorauszahlungToolStripMenuItem ' Me.VorauszahlungToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AktivierenToolStripMenuItem, Me.DeaktivierenToolStripMenuItem}) Me.VorauszahlungToolStripMenuItem.Name = "VorauszahlungToolStripMenuItem" - Me.VorauszahlungToolStripMenuItem.Size = New System.Drawing.Size(151, 22) + Me.VorauszahlungToolStripMenuItem.Size = New System.Drawing.Size(211, 22) Me.VorauszahlungToolStripMenuItem.Text = "Vorauszahlung" ' 'AktivierenToolStripMenuItem @@ -1756,31 +1742,60 @@ Partial Class frmMDM_USTVAntrag Me.DeaktivierenToolStripMenuItem.Size = New System.Drawing.Size(138, 22) Me.DeaktivierenToolStripMenuItem.Text = "deaktivieren" ' + 'FakturiertZurücksetzenToolStripMenuItem + ' + Me.FakturiertZurücksetzenToolStripMenuItem.Name = "FakturiertZurücksetzenToolStripMenuItem" + Me.FakturiertZurücksetzenToolStripMenuItem.Size = New System.Drawing.Size(211, 22) + Me.FakturiertZurücksetzenToolStripMenuItem.Text = "abgerechnet zurücksetzen" + ' 'ncs_Belege ' - Me.ncs_Belege.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem1}) + Me.ncs_Belege.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem1, Me.FakturiertToolStripMenuItem}) Me.ncs_Belege.Name = "cns_vorauszahlen" - Me.ncs_Belege.Size = New System.Drawing.Size(181, 48) + Me.ncs_Belege.Size = New System.Drawing.Size(196, 48) ' 'ToolStripMenuItem1 ' Me.ToolStripMenuItem1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem2, Me.ToolStripMenuItem3}) Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1" - Me.ToolStripMenuItem1.Size = New System.Drawing.Size(180, 22) + Me.ToolStripMenuItem1.Size = New System.Drawing.Size(195, 22) Me.ToolStripMenuItem1.Text = "Vorauszahlung" ' 'ToolStripMenuItem2 ' Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2" - Me.ToolStripMenuItem2.Size = New System.Drawing.Size(180, 22) + Me.ToolStripMenuItem2.Size = New System.Drawing.Size(138, 22) Me.ToolStripMenuItem2.Text = "aktivieren" ' 'ToolStripMenuItem3 ' Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3" - Me.ToolStripMenuItem3.Size = New System.Drawing.Size(180, 22) + Me.ToolStripMenuItem3.Size = New System.Drawing.Size(138, 22) Me.ToolStripMenuItem3.Text = "deaktivieren" ' + 'FakturiertToolStripMenuItem + ' + Me.FakturiertToolStripMenuItem.Name = "FakturiertToolStripMenuItem" + Me.FakturiertToolStripMenuItem.Size = New System.Drawing.Size(195, 22) + Me.FakturiertToolStripMenuItem.Text = "Fakturiert zurücksetzen" + Me.FakturiertToolStripMenuItem.Visible = False + ' + '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(1282, 261) + Me.UstCntlUSTV_AntragPosition1.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(1280, 259) + Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2 + ' 'frmMDM_USTVAntrag ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1942,4 +1957,6 @@ Partial Class frmMDM_USTVAntrag Friend WithEvents ToolStripMenuItem2 As ToolStripMenuItem Friend WithEvents ToolStripMenuItem3 As ToolStripMenuItem Friend WithEvents cbxSicherheit As CheckBox + Friend WithEvents FakturiertToolStripMenuItem As ToolStripMenuItem + Friend WithEvents FakturiertZurücksetzenToolStripMenuItem As ToolStripMenuItem End Class diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 36595acd..2d607f19 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -3424,9 +3424,9 @@ Public Class frmMDM_USTVAntrag If sender Is dgvUSTVPositionen Then If dgvUSTVPositionen.SelectedRows.Count > 0 Then - If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_USTVA_bearbeiten", Me.FindForm) OrElse VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then - cns_vorauszahlen.Show(Cursor.Position) - End If + + cns_vorauszahlen.Show(Cursor.Position) + End If End If @@ -3439,61 +3439,73 @@ Public Class frmMDM_USTVAntrag Private Sub AktivierenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AktivierenToolStripMenuItem.Click - If vbYes = MsgBox("Möchten Sie die Vorauszahlung der markierten Positionen setzen?", vbYesNoCancel) Then + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_USTVA_bearbeiten", Me.FindForm) OrElse VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then - For Each r As DataGridViewRow In dgvUSTVPositionen.SelectedRows + If vbYes = MsgBox("Möchten Sie die Vorauszahlung der markierten Positionen setzen?", vbYesNoCancel) Then - If IsDBNull(r.Cells("UStVPo_VZ_RKID").Value) OrElse r.Cells("UStVPo_VZ_RKID").Value Is Nothing Then + For Each r As DataGridViewRow In dgvUSTVPositionen.SelectedRows - Dim USTV_POS = New VERAG_PROG_ALLGEMEIN.cUStVPositionen(UStVAn_ID, r.Cells("UStVPo_ID").Value) + If IsDBNull(r.Cells("UStVPo_VZ_RKID").Value) OrElse r.Cells("UStVPo_VZ_RKID").Value Is Nothing Then + + Dim USTV_POS = New VERAG_PROG_ALLGEMEIN.cUStVPositionen(UStVAn_ID, r.Cells("UStVPo_ID").Value) + + If IsDBNull(USTV_POS.UStVPo_VZ) OrElse USTV_POS.UStVPo_VZ = False Then + USTV_POS.UStVPo_VZ = True + USTV_POS.SAVE() + End If - If IsDBNull(USTV_POS.UStVPo_VZ) OrElse USTV_POS.UStVPo_VZ = False Then - USTV_POS.UStVPo_VZ = True - USTV_POS.SAVE() End If - End If + Next - Next + SQL.doSQL("UPDATE [tblUStVAntrag] SET UStVAn_VZoffen = 1 WHERE [UStVAn_ID] IN (SELECT distinct([UStVAn_ID]) FROM [tblUStVPositionen] WHERE isnull([UStVPo_VZ],0) = 1 and isnull([UStVPo_VZ_RKID],0) = 0)", "FMZOLL") 'Aktualisierung - SQL.doSQL("UPDATE [tblUStVAntrag] SET UStVAn_VZoffen = 1 WHERE [UStVAn_ID] IN (SELECT distinct([UStVAn_ID]) FROM [tblUStVPositionen] WHERE isnull([UStVPo_VZ],0) = 1 and isnull([UStVPo_VZ_RKID],0) = 0)", "FMZOLL") 'Aktualisierung - - init() + init() + End If + Else + MsgBox("NICHT BERECHTIGT") End If End Sub Private Sub DeaktivierenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DeaktivierenToolStripMenuItem.Click - If vbYes = MsgBox("Möchten Sie die Vorauszahlung der markierten Positionen deaktiveren?", vbYesNoCancel) Then + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_USTVA_bearbeiten", Me.FindForm) OrElse VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then - For Each r As DataGridViewRow In dgvUSTVPositionen.SelectedRows + If vbYes = MsgBox("Möchten Sie die Vorauszahlung der markierten Positionen deaktiveren?", vbYesNoCancel) Then - If IsDBNull(r.Cells("UStVPo_VZ_RKID").Value) OrElse r.Cells("UStVPo_VZ_RKID").Value Is Nothing Then 'nur noch nicht abgerech. dürfen gesetzt werden! + For Each r As DataGridViewRow In dgvUSTVPositionen.SelectedRows - Dim USTV_POS = New VERAG_PROG_ALLGEMEIN.cUStVPositionen(UStVAn_ID, r.Cells("UStVPo_ID").Value) + If IsDBNull(r.Cells("UStVPo_VZ_RKID").Value) OrElse r.Cells("UStVPo_VZ_RKID").Value Is Nothing Then 'nur noch nicht abgerech. dürfen gesetzt werden! - If IsDBNull(USTV_POS.UStVPo_VZ) OrElse USTV_POS.UStVPo_VZ = True Then - USTV_POS.UStVPo_VZ = False - USTV_POS.SAVE() + Dim USTV_POS = New VERAG_PROG_ALLGEMEIN.cUStVPositionen(UStVAn_ID, r.Cells("UStVPo_ID").Value) + + If IsDBNull(USTV_POS.UStVPo_VZ) OrElse USTV_POS.UStVPo_VZ = True Then + USTV_POS.UStVPo_VZ = False + USTV_POS.SAVE() + End If End If + + Next + + 'würde prüfung nochmals für alle machen, performance allerdings nicht gut.... + 'SQL.doSQL("UPDATE [tblUStVAntrag] SET UStVAn_VZoffen = 0 WHERE [UStVAn_ID] IN (SELECT [UStVAn_ID] FROM [tblUStVPositionen] WHERE isnull([UStVPo_VZ],0) = 1 and isnull(UStVPo_VZ_RKID,0) <> 0)") + + Dim count_nichtAbgerVZ As Integer = -1 + count_nichtAbgerVZ = CInt(SQL.getValueTxtBySql("SELECT COUNT(*) FROM [tblUStVPositionen] WHERE [UStVAn_ID] = " & USTV_ANTRAG.UStVAn_ID & " and [UStVPo_VZ] = 1 and isnull(UStVPo_VZ_RKID,0) = 0", "FMZOLL")) + If count_nichtAbgerVZ = 0 Then + SQL.doSQL("UPDATE [tblUStVAntrag] SET UStVAn_VZoffen = 0 WHERE [UStVAn_ID] =" & USTV_ANTRAG.UStVAn_ID, "FMZOLL") End If - Next - - 'würde prüfung nochmals für alle machen, performance allerdings nicht gut.... - 'SQL.doSQL("UPDATE [tblUStVAntrag] SET UStVAn_VZoffen = 0 WHERE [UStVAn_ID] IN (SELECT [UStVAn_ID] FROM [tblUStVPositionen] WHERE isnull([UStVPo_VZ],0) = 1 and isnull(UStVPo_VZ_RKID,0) <> 0)") - - Dim count_nichtAbgerVZ As Integer = -1 - count_nichtAbgerVZ = CInt(SQL.getValueTxtBySql("SELECT COUNT(*) FROM [tblUStVPositionen] WHERE [UStVAn_ID] = " & USTV_ANTRAG.UStVAn_ID & " and [UStVPo_VZ] = 1 and isnull(UStVPo_VZ_RKID,0) = 0", "FMZOLL")) - If count_nichtAbgerVZ = 0 Then - SQL.doSQL("UPDATE [tblUStVAntrag] SET UStVAn_VZoffen = 0 WHERE [UStVAn_ID] =" & USTV_ANTRAG.UStVAn_ID, "FMZOLL") + init() End If - init() - End If + Else + MsgBox("NICHT BERECHTIGT") + + End If End Sub Private Sub initScanUSTVA() @@ -3548,8 +3560,41 @@ Public Class frmMDM_USTVAntrag End Sub + Private Sub FakturiertZurücksetzenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles FakturiertZurücksetzenToolStripMenuItem.Click + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG("MDM_Fakturierung", Me) = 0 OrElse VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then + + If vbYes = MsgBox("Möchten Sie die bereits " & IIf(dgvUSTVPositionen.SelectedRows.Count > 1, " abgerechneten Positionen ", " abgerechnete Position ") & "zurücksetzen?" & vbNewLine & "Dies darf nur durchgeführt werden wenn der ursprüngliche Beleg storniert wurde!", vbYesNoCancel, "ACHTUNG") Then + Dim isSet As Boolean = False + For Each r As DataGridViewRow In dgvUSTVPositionen.SelectedRows + + If Not IsDBNull(r.Cells("UStVPo_VZ").Value) AndAlso Not IsDBNull(r.Cells("UStVPo_VZ_RKID").Value) AndAlso IsNumeric(r.Cells("UStVPo_VZ_RKID").Value) Then 'nur noch nicht abgerech. dürfen gesetzt werden! + + Dim USTV_POS = New VERAG_PROG_ALLGEMEIN.cUStVPositionen(UStVAn_ID, r.Cells("UStVPo_ID").Value) + + If Not IsDBNull(USTV_POS.UStVPo_VZ_RKID) AndAlso USTV_POS.UStVPo_VZ = True Then + USTV_POS.UStVPo_VZ_RKID = Nothing + isSet = USTV_POS.SAVE() + End If + End If + + Next + + If isSet Then SQL.doSQL("UPDATE [tblUStVAntrag] SET UStVAn_VZoffen = 1 WHERE [UStVAn_ID] IN (SELECT distinct([UStVAn_ID]) FROM [tblUStVPositionen] WHERE isnull([UStVPo_VZ],0) = 1 and isnull([UStVPo_VZ_RKID],0) = 0)", "FMZOLL") 'Aktualisierung + + init() + End If + + Else + + + MsgBox("NICHT BERECHTIGT") + + End If + + End Sub + Private Sub mnuItemBelegeOpenPDF_Clicked(sender As Object, e As EventArgs) ncs_Belege.Hide() Dim item As ToolStripMenuItem = TryCast(sender, ToolStripMenuItem) From 4e000b0bdd4b86e7972305d72e77efe32bec2511 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 27 Aug 2025 16:45:55 +0200 Subject: [PATCH 09/12] =?UTF-8?q?ustve-Prr=C3=BCfung?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SDL/My Project/AssemblyInfo.vb | 4 ++-- SDL/USTV/frmMDM_USTVAntrag.vb | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index cdd56e0c..4f76127f 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/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 2d607f19..bd76ff01 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -3545,6 +3545,12 @@ Public Class frmMDM_USTVAntrag Else + Dim Fehlertext As String = "" + If Not checkSpedbuchEintrag(Fehlertext) Then + If Fehlertext <> "" Then MsgBox(Fehlertext) + Exit Sub + End If + Dim hasVZ = IIf(item.Name.Contains("_VZ"), True, False) Dim f As New SDL.frmAbrechnungsMaskeEinzeln(USTV_ANTRAG.FilialenNr, USTV_ANTRAG.AbfertigungsNr, IIf(USTV_ANTRAG.UStVAn_ErstattungsbetragEUR >= 0, "AG", "AR"), hasVZ) @@ -3616,5 +3622,28 @@ Public Class frmMDM_USTVAntrag End Sub + Private Function checkSpedbuchEintrag(ByRef Fehlertext As String) + + Dim spedBuch As New cSpeditionsbuch(USTV_ANTRAG.FilialenNr, USTV_ANTRAG.AbfertigungsNr, 0) + + 'If spedBuch.VermittlerOffertenNr <> spedBuch.Abfertigungsart Then + + If spedBuch.VermittlerOffertenNr <> (CInt(spedBuch.Abfertigungsart) - 100) Then + Fehlertext = "Speditionsbucheintrag prüfen!" & vbNewLine & "OffertenNr stimmen nicht überein!" + Return False + End If + + If spedBuch.ErfassungsNr = "" Then + Fehlertext = "Speditionsbucheintrag prüfen!" & vbNewLine & "Erfassungs-Nr nicht gesetzt!" + Return False + End If + + Return True + + + + + End Function + End Class \ No newline at end of file From 98fd7c20e8e612c0dcf417771c3250ebb1a82778 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 28 Aug 2025 10:07:43 +0200 Subject: [PATCH 10/12] ustva, kundeblatt --- SDL/USTV/frmMDM_USTVAntrag.vb | 11 +- SDL/USTV/usrCntlUSTV.Designer.vb | 50 ++++--- SDL/USTV/usrCntlUSTV.resx | 2 +- SDL/USTV/usrCntlUSTV.vb | 33 ++++- SDL/kunden/frmKundenblatt.Designer.vb | 196 +++++++++++++------------- 5 files changed, 168 insertions(+), 124 deletions(-) diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index bd76ff01..0d3c9ee7 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -2175,15 +2175,16 @@ Public Class frmMDM_USTVAntrag Private Function excelAuswertung(ByRef Optional filepath As String = "", Optional feedback As Boolean = False, Optional openExcel As Boolean = True) As Boolean - Dim sqlStr = "Select [UStVPo_ReDat] As InvoiceDate , [UStVPo_ReNr] As InvoiceNumber, antr.UStVAn_Name As Company, 'FR' as CountryOfRefund ,'EUR' as Currency ,replace([UStVPo_Leistender],'FR','') as SupplierName, leist.[UstV_Leistender_Strasse] AS SupplierStreet, leist.[UstV_Leistender_StrasseNr] as SupplierStreetNumber, leist.[UstV_Leistender_PLZ] as SupplierPostalCode, leist.[UstV_Leistender_Stadt] as SupplierCity, leist.[UstV_Leistender_Land] as SupplierCountry, leist.[UstV_Leistender_UstNr] as SupplierVAT_TaxNumber, [UStVPo_Leistungsbezeichnung] as ExpenseCategory ,Round((1119/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseGrossAmount, [UStVPo_USteuerbetragEUR] as ExpenseVATAmount,Round((100/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseNetAmount + Dim sqlStr = "Select [UStVPo_ReDat] As InvoiceDate , [UStVPo_ReNr] As InvoiceNumber, antr.UStVAn_Name As Company, LandKz as CountryOfRefund ,'EUR' as Currency ,replace([UStVPo_Leistender],'FR','') as SupplierName, leist.[UstV_Leistender_Strasse] AS SupplierStreet, leist.[UstV_Leistender_StrasseNr] as SupplierStreetNumber, leist.[UstV_Leistender_PLZ] as SupplierPostalCode, leist.[UstV_Leistender_Stadt] as SupplierCity, leist.[UstV_Leistender_Land] as SupplierCountry, leist.[UstV_Leistender_UstNr] as SupplierVAT_TaxNumber, [UStVPo_Leistungsbezeichnung] as ExpenseCategory ,Round((1119/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseGrossAmount, [UStVPo_USteuerbetragEUR] as ExpenseVATAmount,Round((100/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseNetAmount From [tblUStVPositionen] inner Join [tblUStVLeistender] as leist on leist.UStV_Leistender = [tblUStVPositionen].[UStVPo_Leistender] inner Join [tblUStVAntrag] as antr on antr.UStVAn_ID = [tblUStVPositionen].UStVAn_ID + inner join [Länderverzeichnis für die Außenhandelsstatistik] on UStVAn_LandNr=Landnr Where [tblUStVPositionen].UStVAn_ID ='" & UStVAn_ID & "' ORDER BY UStVPo_ID" Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL") If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then - filepath = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt, {"N1:N" & (dt.Rows.Count + 1), "O1:O" & (dt.Rows.Count + 1), "P1:P" & (dt.Rows.Count + 1)},,,, openExcel) + filepath = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt, {"N1:N" & (dt.Rows.Count + 1), "O1:O" & (dt.Rows.Count + 1), "P1:P" & (dt.Rows.Count + 1)},,,, openExcel,,, True) Return True Else If feedback Then MsgBox("keine Daten vorhanden!") @@ -2209,7 +2210,7 @@ Public Class frmMDM_USTVAntrag Dim subject As String = "" subject &= IIf(USTV_ANTRAG.UStVAn_Name <> "", USTV_ANTRAG.UStVAn_Name & "_", "") - subject &= IIf(USTV_ANTRAG.UStVAn_LandKz <> "", USTV_ANTRAG.UStVAn_LandKz & "_", "") + subject &= IIf(Antrag_LandKz <> "", Antrag_LandKz & "_", "") subject &= IIf(USTV_ANTRAG.UStVAn_ReDatVon IsNot Nothing AndAlso USTV_ANTRAG.UStVAn_ReDatBis IsNot Nothing, CDate(USTV_ANTRAG.UStVAn_ReDatVon).ToShortDateString & "-" & CDate(USTV_ANTRAG.UStVAn_ReDatBis).ToShortDateString, "") Mail.Subject = subject @@ -3628,7 +3629,9 @@ Public Class frmMDM_USTVAntrag 'If spedBuch.VermittlerOffertenNr <> spedBuch.Abfertigungsart Then - If spedBuch.VermittlerOffertenNr <> (CInt(spedBuch.Abfertigungsart) - 100) Then + '31 und 14 ist in Ordnung (weil Sonderfall). + Dim AbfArt As Integer = (CInt(spedBuch.Abfertigungsart) - 100) + If spedBuch.VermittlerOffertenNr <> AbfArt AndAlso Not (spedBuch.VermittlerOffertenNr = 31 AndAlso AbfArt = 14) Then Fehlertext = "Speditionsbucheintrag prüfen!" & vbNewLine & "OffertenNr stimmen nicht überein!" Return False End If diff --git a/SDL/USTV/usrCntlUSTV.Designer.vb b/SDL/USTV/usrCntlUSTV.Designer.vb index e1871724..1178990d 100644 --- a/SDL/USTV/usrCntlUSTV.Designer.vb +++ b/SDL/USTV/usrCntlUSTV.Designer.vb @@ -23,7 +23,7 @@ Partial Class usrCntlUSTV 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 resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlUSTV)) Me.pnlFilter = New System.Windows.Forms.Panel() Me.dgvUSTV = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) @@ -71,6 +71,7 @@ Partial Class usrCntlUSTV Me.btnUSTVAloeschen = New System.Windows.Forms.Button() Me.Panel2 = New System.Windows.Forms.Panel() Me.Panel3 = New System.Windows.Forms.Panel() + Me.Button3 = New System.Windows.Forms.Button() Me.Button2 = New System.Windows.Forms.Button() Me.btnVorschau = New System.Windows.Forms.Button() Me.btnMail = New System.Windows.Forms.Button() @@ -80,7 +81,7 @@ Partial Class usrCntlUSTV Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.Button3 = New System.Windows.Forms.Button() + Me.Button4 = New System.Windows.Forms.Button() CType(Me.dgvUSTV, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() Me.Panel2.SuspendLayout() @@ -102,8 +103,8 @@ Partial Class usrCntlUSTV Me.dgvUSTV.AKTUALISIERUNGS_INTERVALL = -1 Me.dgvUSTV.AllowUserToAddRows = False Me.dgvUSTV.AllowUserToDeleteRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUSTV.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUSTV.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 Me.dgvUSTV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvUSTV.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvUSTV.Location = New System.Drawing.Point(0, 108) @@ -769,6 +770,7 @@ Partial Class usrCntlUSTV 'Panel3 ' Me.Panel3.AutoSize = True + Me.Panel3.Controls.Add(Me.Button4) Me.Panel3.Controls.Add(Me.Button3) Me.Panel3.Controls.Add(Me.Button2) Me.Panel3.Controls.Add(Me.btnVorschau) @@ -785,6 +787,19 @@ Partial Class usrCntlUSTV Me.Panel3.Size = New System.Drawing.Size(1627, 77) Me.Panel3.TabIndex = 0 ' + 'Button3 + ' + Me.Button3.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button3.ForeColor = System.Drawing.Color.Black + Me.Button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button3.Location = New System.Drawing.Point(982, 5) + Me.Button3.Name = "Button3" + Me.Button3.Size = New System.Drawing.Size(104, 39) + Me.Button3.TabIndex = 28 + Me.Button3.Text = "Vorauszahlungen" + Me.Button3.UseVisualStyleBackColor = True + ' 'Button2 ' Me.Button2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -831,7 +846,7 @@ Partial Class usrCntlUSTV Me.btnPLOSEAlle.ForeColor = System.Drawing.Color.Black Me.btnPLOSEAlle.Image = CType(resources.GetObject("btnPLOSEAlle.Image"), System.Drawing.Image) Me.btnPLOSEAlle.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnPLOSEAlle.Location = New System.Drawing.Point(367, 8) + Me.btnPLOSEAlle.Location = New System.Drawing.Point(516, 7) Me.btnPLOSEAlle.Name = "btnPLOSEAlle" Me.btnPLOSEAlle.Size = New System.Drawing.Size(132, 40) Me.btnPLOSEAlle.TabIndex = 24 @@ -882,18 +897,20 @@ Partial Class usrCntlUSTV Me.ContextMenuStrip3.Name = "ContextMenuStrip1" Me.ContextMenuStrip3.Size = New System.Drawing.Size(61, 4) ' - 'Button3 + 'Button4 ' - Me.Button3.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button3.ForeColor = System.Drawing.Color.Black - Me.Button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button3.Location = New System.Drawing.Point(982, 5) - Me.Button3.Name = "Button3" - Me.Button3.Size = New System.Drawing.Size(104, 39) - Me.Button3.TabIndex = 28 - Me.Button3.Text = "Vorauszahlungen" - Me.Button3.UseVisualStyleBackColor = True + Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button4.Image = Global.SDL.My.Resources.Resources.statistik_small + Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button4.Location = New System.Drawing.Point(367, 7) + Me.Button4.Margin = New System.Windows.Forms.Padding(0) + Me.Button4.Name = "Button4" + Me.Button4.Size = New System.Drawing.Size(128, 41) + Me.Button4.TabIndex = 29 + Me.Button4.Text = "Nicht Eingereichte Anträge" + Me.Button4.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button4.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText + Me.Button4.UseVisualStyleBackColor = True ' 'usrCntlUSTV ' @@ -969,4 +986,5 @@ Partial Class usrCntlUSTV Friend WithEvents Label12 As Label Friend WithEvents lblID As Label Friend WithEvents Button3 As Button + Friend WithEvents Button4 As Button End Class diff --git a/SDL/USTV/usrCntlUSTV.resx b/SDL/USTV/usrCntlUSTV.resx index 05433731..a008b450 100644 --- a/SDL/USTV/usrCntlUSTV.resx +++ b/SDL/USTV/usrCntlUSTV.resx @@ -769,7 +769,7 @@ XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ - 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEAAACxABrSO9dQAAB4JJREFUSEu9lntM1FcW + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDwAACw8BkvkDpQAAB4JJREFUSEu9lntM1FcW x0+yNWpdBURGEJ0ZXtVqZX0hFJAB5gVILVbQTRCQ1wwDw7wYGMSCgiI+IoivtbpBwOLqqnUXq30YlVrX bXAFu6Ua2ShG0jVoq1ZFwQffzb3zhG22/+0vOZnf3Nz8Pjn3nPs9X1qx10yqpnWU27iOEuo0pG6qpMKP qyljXxkpt6hozdF6qvxkN2XuW0OymiwqO1I33tBUPTNhsypTUpVuydhTOi5jTynNL08mQUEkiQwyEhql diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb index aee86f15..0fde37b4 100644 --- a/SDL/USTV/usrCntlUSTV.vb +++ b/SDL/USTV/usrCntlUSTV.vb @@ -382,7 +382,7 @@ Public Class usrCntlUSTV If Not col.ColumnName.Contains(colName) Then col.ColumnName = col.ColumnName.Replace("UStVAn_", "") Next - cProgramFunctions.genExcelFromDT_NEW(dtNew, {"J1:N" & (dtNew.Rows.Count + 1)},,,,, True) + cProgramFunctions.genExcelFromDT_NEW(dtNew, {"K1:K" & (dtNew.Rows.Count + 1), "O1:T" & (dtNew.Rows.Count + 1)},,,,, True) End If @@ -407,7 +407,7 @@ Public Class usrCntlUSTV Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL") If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then - cProgramFunctions.genExcelFromDT_NEW(dt, {"J1:N" & (dt.Rows.Count + 1)},,,,, True) + cProgramFunctions.genExcelFromDT_NEW(dt, {"J1:M" & (dt.Rows.Count + 1)},,,,, True) Else MsgBox("Keine Daten!") End If @@ -696,17 +696,18 @@ Public Class usrCntlUSTV Private Function excelAuswertung(Optional ByRef filepath As String = "", Optional feedback As Boolean = False, Optional openExcel As Boolean = True) As Boolean - Dim sqlStr = "SELECT [UStVPo_ReDat] as InvoiceDate , [UStVPo_ReNr] As InvoiceNumber, antr.UStVAn_Name as Company, 'FR' as CountryOfRefund ,'EUR' as Currency ,[UStVPo_Leistender] as SupplierName, leist.[UstV_Leistender_Strasse] AS SupplierStreet, leist.[UstV_Leistender_StrasseNr] as SupplierStreetNumber, leist.[UstV_Leistender_PLZ] as SupplierPostalCode, leist.[UstV_Leistender_Stadt] as SupplierCity, leist.[UstV_Leistender_Land] as SupplierCountry, leist.[UstV_Leistender_UstNr] as SupplierVAT_TaxNumber, [UStVPo_Leistungsbezeichnung] as ExpenseCategory ,Round((1119/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseGrossAmount, [UStVPo_USteuerbetragEUR] as ExpenseVATAmount,Round((100/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseNetAmount + Dim sqlStr = "SELECT [UStVPo_ReDat] as InvoiceDate , [UStVPo_ReNr] As InvoiceNumber, antr.UStVAn_Name as Company, LandKz as CountryOfRefund ,'EUR' as Currency ,[UStVPo_Leistender] as SupplierName, leist.[UstV_Leistender_Strasse] AS SupplierStreet, leist.[UstV_Leistender_StrasseNr] as SupplierStreetNumber, leist.[UstV_Leistender_PLZ] as SupplierPostalCode, leist.[UstV_Leistender_Stadt] as SupplierCity, leist.[UstV_Leistender_Land] as SupplierCountry, leist.[UstV_Leistender_UstNr] as SupplierVAT_TaxNumber, [UStVPo_Leistungsbezeichnung] as ExpenseCategory ,Round((1119/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseGrossAmount, [UStVPo_USteuerbetragEUR] as ExpenseVATAmount,Round((100/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseNetAmount FROM [tblUStVPositionen] inner Join [tblUStVLeistender] as leist on leist.UStV_Leistender = [tblUStVPositionen].[UStVPo_Leistender] inner join [tblUStVAntrag] as antr on antr.UStVAn_ID = [tblUStVPositionen].UStVAn_ID + inner join [Länderverzeichnis für die Außenhandelsstatistik] on UStVAn_LandNr=Landnr where [tblUStVPositionen].UStVAn_ID ='" & dgvUSTV.SelectedRows(0).Cells("UStVAn_ID").Value & "' ORDER BY UStVPo_ID" Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL") 'filepath = "" If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then - filepath = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt, {"N1:N" & (dt.Rows.Count + 1), "O1:O" & (dt.Rows.Count + 1), "P1:P" & (dt.Rows.Count + 1)},,,, openExcel) + filepath = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt, {"N1:N" & (dt.Rows.Count + 1), "O1:O" & (dt.Rows.Count + 1), "P1:P" & (dt.Rows.Count + 1)},,,, openExcel,,, True) Return True Else MsgBox("Keine Daten!") @@ -724,7 +725,7 @@ Public Class usrCntlUSTV Dim subject As String = "" subject &= IIf(dgvUSTV.CurrentRow.Cells("UStVAn_Name").Value <> "", dgvUSTV.CurrentRow.Cells("UStVAn_Name").Value & "_", "") - 'subject &= If(dgvUSTV.CurrentRow.Cells("UStVAn_LandKz").Value <> "", dgvUSTV.CurrentRow.Cells("UStVAn_LandKz").Value & "_") + subject &= IIf(dgvUSTV.CurrentRow.Cells("Land_Antrag").Value <> "", dgvUSTV.CurrentRow.Cells("Land_Antrag").Value & "_", "") If (dgvUSTV.CurrentRow.Cells("UStVAn_ReDatVon").Value IsNot Nothing AndAlso dgvUSTV.CurrentRow.Cells("UStVAn_ReDatBis").Value IsNot Nothing) Then subject &= CDate(dgvUSTV.CurrentRow.Cells("UStVAn_ReDatVon").Value).ToShortDateString & "-" & CDate(dgvUSTV.CurrentRow.Cells("UStVAn_ReDatBis").Value).ToShortDateString End If @@ -1472,4 +1473,26 @@ Public Class usrCntlUSTV End Sub + + Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click + + + Dim sqlStr = "SELECT [UStVAn_ID] as ID,[UStVAn_KuNr] as KundenNr,[UStVAn_Name] as Kundename,Adressen.LandKz as Land_Kunde, case when UstIdKz is not null and UstIdNr is not null THEN UstIdKz +'' + UstIdNr ELSE isnull(Steuernummer,'') END as SteuerUIDNr, LfdA .LandKz Land_Antrag,cast([UStVAn_ReDatVon] as Date) as ReDatVon,cast([UStVAn_ReDatBis] as Date) as ReDatBis , cast(UStVAn_AntragEingereichtAm as Date) as EingereichtAm,[UStVAn_3470] as An3470 ,[UStVAn_Währungscode] as Währung,[UStVAn_USteuerbetrag] as Steuerbetrag,[UStVAn_Erstattungsbetrag] as Erstattungsbetrag,[UStVAn_USteuerbetragEUR] as SteuerbetragEUR,[UStVAn_ErstattungsbetragEUR] as ErstattungsbetragEUR,(cast([UStVAn_USteuerbetragEUR] as decimal(17,2)) - cast( [UStVAn_ErstattungsbetragEUR] as decimal(17,2))) as DifferenzbetragEUR, UStVAn_VZBetrag as Vorauszahlungsbetrag, [UStVAn_Sachbearbeiter] as Sachbearbeiter, UStVAn_AntragArt as Art, stnr.[StNrFürRückerstattungUSt] as SteuerNr + FROM [tblUStVAntrag] + inner join [Länderverzeichnis für die Außenhandelsstatistik] as LfdA on UStVAn_LandNr=Landnr + inner join Adressen on AdressenNr=UStVAn_KuNr + left join [tblSteuernummern] as stnr on stnr.AdressenNr = UStVAn_KuNr and stnr.LandNr=UStVAn_LandNr + where 1=1 AND UStVAn_AntragEingereichtAm is null + order by UStVAn_KuNr,UStVAn_Name,datepart(year,[UStVAn_ReDatVon] ) desc,LfdA .LandKz,[UStVAn_ReDatVon] desc" + + Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL") + If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then + cProgramFunctions.genExcelFromDT_NEW(dt, {"J1:M" & (dt.Rows.Count + 1)},,,,, True) + Else + MsgBox("Keine Daten!") + End If + + End Sub + + End Class diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index fbd36690..df1da98f 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -53,7 +53,6 @@ Partial Class frmKundenblatt Me.txtInfotext = New System.Windows.Forms.Label() Me.tbFirmendaten = New System.Windows.Forms.TabPage() Me.Panel4 = New System.Windows.Forms.Panel() - Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull() Me.tbcntrMain = New System.Windows.Forms.TabControl() Me.tbAllgemein = New System.Windows.Forms.TabPage() Me.FlatButton6 = New VERAG_PROG_ALLGEMEIN.FlatButton() @@ -149,10 +148,8 @@ Partial Class frmKundenblatt Me.lblLetzterSA_SDL = New System.Windows.Forms.Label() Me.rtbVermerke = New System.Windows.Forms.RichTextBox() Me.tbSDLKarten = New System.Windows.Forms.TabPage() - Me.usrcntlKarten = New SDL.usrCntlKartenDaten() Me.tbLKW = New System.Windows.Forms.TabPage() Me.pnlLKWRight = New System.Windows.Forms.Panel() - Me.UsrCntlLKW1 = New SDL.usrCntlLKW() Me.pnlLKW = New System.Windows.Forms.Panel() Me.dgvLKW = New System.Windows.Forms.DataGridView() Me.pnlLKWBottom = New System.Windows.Forms.Panel() @@ -184,7 +181,6 @@ Partial Class frmKundenblatt Me.tbBesuchsberichte = New System.Windows.Forms.TabPage() Me.tbFremdrechnungen = New System.Windows.Forms.TabPage() Me.tbOfferte = New System.Windows.Forms.TabPage() - Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() Me.tbUSTV = New System.Windows.Forms.TabPage() Me.tbcntrUSTV = New System.Windows.Forms.TabControl() Me.tbUSTVDokumente = New System.Windows.Forms.TabPage() @@ -195,7 +191,6 @@ Partial Class frmKundenblatt Me.scanUSTVFABest = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.scanUSTVVollmachten = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.tbUSTVAntrage = New System.Windows.Forms.TabPage() - Me.UsrCntlUSTV = New SDL.usrCntlUSTV() Me.tbFIBU = New System.Windows.Forms.TabPage() Me.Label12 = New System.Windows.Forms.Label() Me.rtbGespreachsbericht = New System.Windows.Forms.RichTextBox() @@ -237,6 +232,11 @@ 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.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull() + Me.usrcntlKarten = New SDL.usrCntlKartenDaten() + Me.UsrCntlLKW1 = New SDL.usrCntlLKW() + Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() + Me.UsrCntlUSTV = New SDL.usrCntlUSTV() Me.pnlInfo.SuspendLayout() Me.tbFirmendaten.SuspendLayout() Me.Panel4.SuspendLayout() @@ -324,7 +324,7 @@ Partial Class frmKundenblatt Me.tbFirmendaten.Location = New System.Drawing.Point(4, 25) Me.tbFirmendaten.Name = "tbFirmendaten" Me.tbFirmendaten.Padding = New System.Windows.Forms.Padding(3) - Me.tbFirmendaten.Size = New System.Drawing.Size(1644, 1390) + Me.tbFirmendaten.Size = New System.Drawing.Size(1644, 1441) Me.tbFirmendaten.TabIndex = 3 Me.tbFirmendaten.Text = "Firmendaten" ' @@ -334,19 +334,9 @@ Partial Class frmKundenblatt Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel4.Location = New System.Drawing.Point(3, 3) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(1638, 1384) + Me.Panel4.Size = New System.Drawing.Size(1638, 1435) Me.Panel4.TabIndex = 0 ' - 'UsrcntlKundeBearbeitenFull1 - ' - Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White - Me.UsrcntlKundeBearbeitenFull1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0) - Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1" - Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1638, 1384) - Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 - ' 'tbcntrMain ' Me.tbcntrMain.Appearance = System.Windows.Forms.TabAppearance.FlatButtons @@ -364,7 +354,7 @@ Partial Class frmKundenblatt Me.tbcntrMain.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMain.Name = "tbcntrMain" Me.tbcntrMain.SelectedIndex = 0 - Me.tbcntrMain.Size = New System.Drawing.Size(1652, 1419) + Me.tbcntrMain.Size = New System.Drawing.Size(1652, 1470) Me.tbcntrMain.TabIndex = 3 ' 'tbAllgemein @@ -405,7 +395,7 @@ Partial Class frmKundenblatt Me.tbAllgemein.Margin = New System.Windows.Forms.Padding(0) Me.tbAllgemein.Name = "tbAllgemein" Me.tbAllgemein.Padding = New System.Windows.Forms.Padding(3) - Me.tbAllgemein.Size = New System.Drawing.Size(1644, 1390) + Me.tbAllgemein.Size = New System.Drawing.Size(1644, 1458) Me.tbAllgemein.TabIndex = 0 Me.tbAllgemein.Text = "Allgemein" ' @@ -486,7 +476,7 @@ Partial Class frmKundenblatt Me.TabControl1.Location = New System.Drawing.Point(8, 582) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(718, 802) + Me.TabControl1.Size = New System.Drawing.Size(718, 870) Me.TabControl1.TabIndex = 186 ' 'TabPage1 @@ -498,7 +488,7 @@ Partial Class frmKundenblatt 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(710, 776) + Me.TabPage1.Size = New System.Drawing.Size(710, 844) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Offene Posten" Me.TabPage1.UseVisualStyleBackColor = True @@ -557,7 +547,7 @@ Partial Class frmKundenblatt Me.dgvOffenePosten.RowHeadersDefaultCellStyle = DataGridViewCellStyle4 Me.dgvOffenePosten.RowHeadersVisible = False Me.dgvOffenePosten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvOffenePosten.Size = New System.Drawing.Size(707, 741) + Me.dgvOffenePosten.Size = New System.Drawing.Size(707, 809) Me.dgvOffenePosten.TabIndex = 175 ' 'Label10 @@ -590,7 +580,7 @@ Partial Class frmKundenblatt 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(710, 776) + Me.TabPage2.Size = New System.Drawing.Size(710, 827) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Umsatzbericht" Me.TabPage2.UseVisualStyleBackColor = True @@ -635,7 +625,7 @@ Partial Class frmKundenblatt Me.dgvUmsaetze.RowHeadersDefaultCellStyle = DataGridViewCellStyle8 Me.dgvUmsaetze.RowHeadersVisible = False Me.dgvUmsaetze.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 751) + Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 802) Me.dgvUmsaetze.TabIndex = 182 ' 'Label13 @@ -683,7 +673,7 @@ Partial Class frmKundenblatt Me.TabPage3.Controls.Add(Me.dgvUmsatzNachLeistngsNr) Me.TabPage3.Location = New System.Drawing.Point(4, 22) Me.TabPage3.Name = "TabPage3" - Me.TabPage3.Size = New System.Drawing.Size(710, 776) + Me.TabPage3.Size = New System.Drawing.Size(710, 827) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "Umsatz nach LeistungsNr" Me.TabPage3.UseVisualStyleBackColor = True @@ -739,7 +729,7 @@ Partial Class frmKundenblatt Me.dgvUmsatzNachLeistngsNr.RowHeadersDefaultCellStyle = DataGridViewCellStyle12 Me.dgvUmsatzNachLeistngsNr.RowHeadersVisible = False Me.dgvUmsatzNachLeistngsNr.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(705, 753) + Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(705, 804) Me.dgvUmsatzNachLeistngsNr.TabIndex = 183 ' 'lblAdressenzusatz @@ -1100,7 +1090,7 @@ Partial Class frmKundenblatt Me.dgvSperrliste.Name = "dgvSperrliste" Me.dgvSperrliste.ReadOnly = True Me.dgvSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle15 - Me.dgvSperrliste.Size = New System.Drawing.Size(446, 1346) + Me.dgvSperrliste.Size = New System.Drawing.Size(446, 1414) Me.dgvSperrliste.TabIndex = 23 ' 'PictureBox2 @@ -1154,7 +1144,7 @@ Partial Class frmKundenblatt Me.tbZoll.Location = New System.Drawing.Point(4, 25) Me.tbZoll.Name = "tbZoll" Me.tbZoll.Padding = New System.Windows.Forms.Padding(3) - Me.tbZoll.Size = New System.Drawing.Size(1644, 1390) + Me.tbZoll.Size = New System.Drawing.Size(1644, 1441) Me.tbZoll.TabIndex = 9 Me.tbZoll.Text = "ZOLL" Me.tbZoll.UseVisualStyleBackColor = True @@ -1166,7 +1156,7 @@ Partial Class frmKundenblatt Me.tbcntrZOLL.Location = New System.Drawing.Point(3, 3) Me.tbcntrZOLL.Name = "tbcntrZOLL" Me.tbcntrZOLL.SelectedIndex = 0 - Me.tbcntrZOLL.Size = New System.Drawing.Size(1638, 1384) + Me.tbcntrZOLL.Size = New System.Drawing.Size(1638, 1435) Me.tbcntrZOLL.TabIndex = 0 ' 'tabZoll_Artikel @@ -1174,7 +1164,7 @@ Partial Class frmKundenblatt Me.tabZoll_Artikel.Location = New System.Drawing.Point(4, 22) Me.tabZoll_Artikel.Name = "tabZoll_Artikel" Me.tabZoll_Artikel.Padding = New System.Windows.Forms.Padding(3) - Me.tabZoll_Artikel.Size = New System.Drawing.Size(1630, 1358) + Me.tabZoll_Artikel.Size = New System.Drawing.Size(1630, 1409) Me.tabZoll_Artikel.TabIndex = 1 Me.tabZoll_Artikel.Text = "Artikel" Me.tabZoll_Artikel.UseVisualStyleBackColor = True @@ -1185,7 +1175,7 @@ Partial Class frmKundenblatt Me.tbMdm.Location = New System.Drawing.Point(4, 25) Me.tbMdm.Name = "tbMdm" Me.tbMdm.Padding = New System.Windows.Forms.Padding(3) - Me.tbMdm.Size = New System.Drawing.Size(1644, 1390) + Me.tbMdm.Size = New System.Drawing.Size(1644, 1441) Me.tbMdm.TabIndex = 10 Me.tbMdm.Text = "MDM" Me.tbMdm.UseVisualStyleBackColor = True @@ -1204,7 +1194,7 @@ Partial Class frmKundenblatt Me.tbcntrMDM.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMDM.Name = "tbcntrMDM" Me.tbcntrMDM.SelectedIndex = 0 - Me.tbcntrMDM.Size = New System.Drawing.Size(1638, 1384) + Me.tbcntrMDM.Size = New System.Drawing.Size(1638, 1435) Me.tbcntrMDM.TabIndex = 0 ' 'tbSDL @@ -1216,7 +1206,7 @@ Partial Class frmKundenblatt Me.tbSDL.Margin = New System.Windows.Forms.Padding(0) Me.tbSDL.Name = "tbSDL" Me.tbSDL.Padding = New System.Windows.Forms.Padding(3) - Me.tbSDL.Size = New System.Drawing.Size(1630, 1358) + Me.tbSDL.Size = New System.Drawing.Size(1630, 1409) Me.tbSDL.TabIndex = 5 Me.tbSDL.Text = "SDL-Leistungen" Me.tbSDL.UseVisualStyleBackColor = True @@ -1258,7 +1248,7 @@ Partial Class frmKundenblatt DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle21 Me.dgvSDLLeistungenFull.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1624, 1162) + Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1624, 1213) Me.dgvSDLLeistungenFull.TabIndex = 5 ' 'Panel6 @@ -1363,7 +1353,7 @@ Partial Class frmKundenblatt Me.Panel5.Controls.Add(Me.lblLetzterSA_SDL) Me.Panel5.Controls.Add(Me.rtbVermerke) Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel5.Location = New System.Drawing.Point(3, 1212) + Me.Panel5.Location = New System.Drawing.Point(3, 1263) Me.Panel5.Name = "Panel5" Me.Panel5.Size = New System.Drawing.Size(1624, 143) Me.Panel5.TabIndex = 177 @@ -1747,21 +1737,11 @@ Partial Class frmKundenblatt Me.tbSDLKarten.Location = New System.Drawing.Point(4, 22) Me.tbSDLKarten.Name = "tbSDLKarten" Me.tbSDLKarten.Padding = New System.Windows.Forms.Padding(3) - Me.tbSDLKarten.Size = New System.Drawing.Size(178, 39) + Me.tbSDLKarten.Size = New System.Drawing.Size(1630, 1409) Me.tbSDLKarten.TabIndex = 7 Me.tbSDLKarten.Text = "SDL-Kartenverwaltung" Me.tbSDLKarten.UseVisualStyleBackColor = True ' - 'usrcntlKarten - ' - Me.usrcntlKarten.Cursor = System.Windows.Forms.Cursors.Default - Me.usrcntlKarten.Dock = System.Windows.Forms.DockStyle.Fill - Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3) - Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.usrcntlKarten.Name = "usrcntlKarten" - Me.usrcntlKarten.Size = New System.Drawing.Size(172, 33) - Me.usrcntlKarten.TabIndex = 0 - ' 'tbLKW ' Me.tbLKW.Controls.Add(Me.pnlLKWRight) @@ -1769,7 +1749,7 @@ Partial Class frmKundenblatt Me.tbLKW.Location = New System.Drawing.Point(4, 22) Me.tbLKW.Name = "tbLKW" Me.tbLKW.Padding = New System.Windows.Forms.Padding(3) - Me.tbLKW.Size = New System.Drawing.Size(178, 39) + Me.tbLKW.Size = New System.Drawing.Size(1630, 1409) Me.tbLKW.TabIndex = 4 Me.tbLKW.Text = "LKWs" Me.tbLKW.UseVisualStyleBackColor = True @@ -1781,22 +1761,9 @@ Partial Class frmKundenblatt Me.pnlLKWRight.Location = New System.Drawing.Point(309, 3) Me.pnlLKWRight.Name = "pnlLKWRight" Me.pnlLKWRight.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0) - Me.pnlLKWRight.Size = New System.Drawing.Size(0, 33) + Me.pnlLKWRight.Size = New System.Drawing.Size(1318, 1403) Me.pnlLKWRight.TabIndex = 2 ' - 'UsrCntlLKW1 - ' - Me.UsrCntlLKW1.BackColor = System.Drawing.Color.White - Me.UsrCntlLKW1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.UsrCntlLKW1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.UsrCntlLKW1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlLKW1.Location = New System.Drawing.Point(10, 0) - Me.UsrCntlLKW1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrCntlLKW1.MaximumSize = New System.Drawing.Size(1200, 1000) - Me.UsrCntlLKW1.Name = "UsrCntlLKW1" - Me.UsrCntlLKW1.Size = New System.Drawing.Size(0, 33) - Me.UsrCntlLKW1.TabIndex = 0 - ' 'pnlLKW ' Me.pnlLKW.Controls.Add(Me.dgvLKW) @@ -1805,7 +1772,7 @@ Partial Class frmKundenblatt Me.pnlLKW.Dock = System.Windows.Forms.DockStyle.Left Me.pnlLKW.Location = New System.Drawing.Point(3, 3) Me.pnlLKW.Name = "pnlLKW" - Me.pnlLKW.Size = New System.Drawing.Size(306, 33) + Me.pnlLKW.Size = New System.Drawing.Size(306, 1403) Me.pnlLKW.TabIndex = 3 ' 'dgvLKW @@ -1846,7 +1813,7 @@ Partial Class frmKundenblatt Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle25 Me.dgvLKW.RowHeadersVisible = False Me.dgvLKW.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvLKW.Size = New System.Drawing.Size(306, 0) + Me.dgvLKW.Size = New System.Drawing.Size(306, 1229) Me.dgvLKW.TabIndex = 2 ' 'pnlLKWBottom @@ -1858,7 +1825,7 @@ Partial Class frmKundenblatt Me.pnlLKWBottom.Controls.Add(Me.Button13) Me.pnlLKWBottom.Controls.Add(Me.lblErgebnisse) Me.pnlLKWBottom.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlLKWBottom.Location = New System.Drawing.Point(0, -79) + Me.pnlLKWBottom.Location = New System.Drawing.Point(0, 1291) Me.pnlLKWBottom.Name = "pnlLKWBottom" Me.pnlLKWBottom.Size = New System.Drawing.Size(306, 112) Me.pnlLKWBottom.TabIndex = 3 @@ -1999,7 +1966,7 @@ Partial Class frmKundenblatt Me.tbVERAGCard.Location = New System.Drawing.Point(4, 22) Me.tbVERAGCard.Name = "tbVERAGCard" Me.tbVERAGCard.Padding = New System.Windows.Forms.Padding(3) - Me.tbVERAGCard.Size = New System.Drawing.Size(178, 39) + Me.tbVERAGCard.Size = New System.Drawing.Size(1630, 1409) Me.tbVERAGCard.TabIndex = 6 Me.tbVERAGCard.Text = "VERAG Card" Me.tbVERAGCard.UseVisualStyleBackColor = True @@ -2011,7 +1978,7 @@ Partial Class frmKundenblatt 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(172, 33) + Me.Panel3.Size = New System.Drawing.Size(1624, 1403) Me.Panel3.TabIndex = 0 ' 'tbDokumente @@ -2029,7 +1996,7 @@ Partial Class frmKundenblatt Me.tbDokumente.Controls.Add(Me.scanVertragVeragKd) Me.tbDokumente.Location = New System.Drawing.Point(4, 22) Me.tbDokumente.Name = "tbDokumente" - Me.tbDokumente.Size = New System.Drawing.Size(178, 39) + Me.tbDokumente.Size = New System.Drawing.Size(1630, 1409) Me.tbDokumente.TabIndex = 8 Me.tbDokumente.Text = "Dokumente" Me.tbDokumente.UseVisualStyleBackColor = True @@ -2229,7 +2196,7 @@ Partial Class frmKundenblatt Me.tbBesuchsberichte.Location = New System.Drawing.Point(4, 22) Me.tbBesuchsberichte.Name = "tbBesuchsberichte" Me.tbBesuchsberichte.Padding = New System.Windows.Forms.Padding(3) - Me.tbBesuchsberichte.Size = New System.Drawing.Size(178, 39) + Me.tbBesuchsberichte.Size = New System.Drawing.Size(1630, 1409) Me.tbBesuchsberichte.TabIndex = 9 Me.tbBesuchsberichte.Text = "Besuchsberichte" Me.tbBesuchsberichte.UseVisualStyleBackColor = True @@ -2238,7 +2205,7 @@ Partial Class frmKundenblatt ' Me.tbFremdrechnungen.Location = New System.Drawing.Point(4, 22) Me.tbFremdrechnungen.Name = "tbFremdrechnungen" - Me.tbFremdrechnungen.Size = New System.Drawing.Size(178, 39) + Me.tbFremdrechnungen.Size = New System.Drawing.Size(1630, 1409) Me.tbFremdrechnungen.TabIndex = 10 Me.tbFremdrechnungen.Text = "Fremdrechnungen" Me.tbFremdrechnungen.UseVisualStyleBackColor = True @@ -2249,27 +2216,17 @@ Partial Class frmKundenblatt Me.tbOfferte.Location = New System.Drawing.Point(4, 25) Me.tbOfferte.Margin = New System.Windows.Forms.Padding(2) Me.tbOfferte.Name = "tbOfferte" - Me.tbOfferte.Size = New System.Drawing.Size(1644, 1390) + Me.tbOfferte.Size = New System.Drawing.Size(1644, 1441) Me.tbOfferte.TabIndex = 11 Me.tbOfferte.Text = "Offerte" Me.tbOfferte.UseVisualStyleBackColor = True ' - 'UsrCntlOfferte1 - ' - Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White - Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0) - Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1) - Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" - Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1644, 1390) - Me.UsrCntlOfferte1.TabIndex = 0 - ' 'tbUSTV ' Me.tbUSTV.Controls.Add(Me.tbcntrUSTV) Me.tbUSTV.Location = New System.Drawing.Point(4, 25) Me.tbUSTV.Name = "tbUSTV" - Me.tbUSTV.Size = New System.Drawing.Size(1644, 1390) + Me.tbUSTV.Size = New System.Drawing.Size(1644, 1441) Me.tbUSTV.TabIndex = 12 Me.tbUSTV.Text = "USTV" Me.tbUSTV.UseVisualStyleBackColor = True @@ -2283,7 +2240,7 @@ Partial Class frmKundenblatt Me.tbcntrUSTV.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrUSTV.Name = "tbcntrUSTV" Me.tbcntrUSTV.SelectedIndex = 0 - Me.tbcntrUSTV.Size = New System.Drawing.Size(1644, 1390) + Me.tbcntrUSTV.Size = New System.Drawing.Size(1644, 1441) Me.tbcntrUSTV.TabIndex = 1 ' 'tbUSTVDokumente @@ -2296,7 +2253,7 @@ Partial Class frmKundenblatt Me.tbUSTVDokumente.Controls.Add(Me.scanUSTVVollmachten) Me.tbUSTVDokumente.Location = New System.Drawing.Point(4, 22) Me.tbUSTVDokumente.Name = "tbUSTVDokumente" - Me.tbUSTVDokumente.Size = New System.Drawing.Size(1636, 1364) + Me.tbUSTVDokumente.Size = New System.Drawing.Size(1636, 1415) Me.tbUSTVDokumente.TabIndex = 8 Me.tbUSTVDokumente.Text = "Dokumente" Me.tbUSTVDokumente.UseVisualStyleBackColor = True @@ -2397,19 +2354,11 @@ Partial Class frmKundenblatt Me.tbUSTVAntrage.Location = New System.Drawing.Point(4, 22) Me.tbUSTVAntrage.Name = "tbUSTVAntrage" Me.tbUSTVAntrage.Padding = New System.Windows.Forms.Padding(3) - Me.tbUSTVAntrage.Size = New System.Drawing.Size(184, 45) + Me.tbUSTVAntrage.Size = New System.Drawing.Size(1636, 1415) Me.tbUSTVAntrage.TabIndex = 9 Me.tbUSTVAntrage.Text = "USTV-Anträge" Me.tbUSTVAntrage.UseVisualStyleBackColor = True ' - 'UsrCntlUSTV - ' - Me.UsrCntlUSTV.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlUSTV.Location = New System.Drawing.Point(3, 3) - Me.UsrCntlUSTV.Name = "UsrCntlUSTV" - Me.UsrCntlUSTV.Size = New System.Drawing.Size(178, 39) - Me.UsrCntlUSTV.TabIndex = 0 - ' 'tbFIBU ' Me.tbFIBU.Controls.Add(Me.Label12) @@ -2419,7 +2368,7 @@ Partial Class frmKundenblatt Me.tbFIBU.Controls.Add(Me.txtFIBUKuerzel) Me.tbFIBU.Location = New System.Drawing.Point(4, 25) Me.tbFIBU.Name = "tbFIBU" - Me.tbFIBU.Size = New System.Drawing.Size(1644, 1390) + Me.tbFIBU.Size = New System.Drawing.Size(1644, 1441) Me.tbFIBU.TabIndex = 13 Me.tbFIBU.Text = "FIBU" Me.tbFIBU.UseVisualStyleBackColor = True @@ -2446,7 +2395,7 @@ Partial Class frmKundenblatt ' Me.btnFirmendatenFormularSpeichern.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnFirmendatenFormularSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnFirmendatenFormularSpeichern.Location = New System.Drawing.Point(-1390, 18) + Me.btnFirmendatenFormularSpeichern.Location = New System.Drawing.Point(1543, 18) Me.btnFirmendatenFormularSpeichern.Name = "btnFirmendatenFormularSpeichern" Me.btnFirmendatenFormularSpeichern.Size = New System.Drawing.Size(71, 52) Me.btnFirmendatenFormularSpeichern.TabIndex = 17 @@ -2478,7 +2427,7 @@ Partial Class frmKundenblatt Me.tbRechnungen.Controls.Add(Me.MyPanel1) Me.tbRechnungen.Location = New System.Drawing.Point(4, 25) Me.tbRechnungen.Name = "tbRechnungen" - Me.tbRechnungen.Size = New System.Drawing.Size(1644, 1390) + Me.tbRechnungen.Size = New System.Drawing.Size(1644, 1441) Me.tbRechnungen.TabIndex = 14 Me.tbRechnungen.Text = "Rechnungen" Me.tbRechnungen.UseVisualStyleBackColor = True @@ -2497,7 +2446,7 @@ Partial Class frmKundenblatt Me.dgvRg.ReadOnly = True Me.dgvRg.RowHeadersVisible = False Me.dgvRg.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvRg.Size = New System.Drawing.Size(1644, 1330) + Me.dgvRg.Size = New System.Drawing.Size(1644, 1381) Me.dgvRg.TabIndex = 3 ' 'MyPanel1 @@ -2724,7 +2673,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" ' @@ -2886,13 +2835,64 @@ Partial Class frmKundenblatt Me.tbiVERAGCard.Size = New System.Drawing.Size(186, 22) Me.tbiVERAGCard.Text = "VERAG Card" ' + 'UsrcntlKundeBearbeitenFull1 + ' + Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White + Me.UsrcntlKundeBearbeitenFull1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0) + Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1" + Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1638, 1435) + Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 + ' + 'usrcntlKarten + ' + Me.usrcntlKarten.Cursor = System.Windows.Forms.Cursors.Default + Me.usrcntlKarten.Dock = System.Windows.Forms.DockStyle.Fill + Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3) + Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.usrcntlKarten.Name = "usrcntlKarten" + Me.usrcntlKarten.Size = New System.Drawing.Size(1624, 1403) + Me.usrcntlKarten.TabIndex = 0 + ' + 'UsrCntlLKW1 + ' + Me.UsrCntlLKW1.BackColor = System.Drawing.Color.White + Me.UsrCntlLKW1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.UsrCntlLKW1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.UsrCntlLKW1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlLKW1.Location = New System.Drawing.Point(10, 0) + Me.UsrCntlLKW1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrCntlLKW1.MaximumSize = New System.Drawing.Size(1200, 1000) + Me.UsrCntlLKW1.Name = "UsrCntlLKW1" + Me.UsrCntlLKW1.Size = New System.Drawing.Size(1200, 1000) + Me.UsrCntlLKW1.TabIndex = 0 + ' + 'UsrCntlOfferte1 + ' + Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White + Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0) + Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1) + Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" + Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1644, 1441) + Me.UsrCntlOfferte1.TabIndex = 0 + ' + 'UsrCntlUSTV + ' + Me.UsrCntlUSTV.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlUSTV.Location = New System.Drawing.Point(3, 3) + Me.UsrCntlUSTV.Name = "UsrCntlUSTV" + Me.UsrCntlUSTV.Size = New System.Drawing.Size(1630, 1409) + Me.UsrCntlUSTV.TabIndex = 0 + ' 'frmKundenblatt ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScroll = True Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(1595, 1548) + Me.ClientSize = New System.Drawing.Size(1595, 1599) Me.Controls.Add(Me.lblAbfVerb) Me.Controls.Add(Me.btnAbfVerb) Me.Controls.Add(Me.tbcntrMain) From 214de858775c8ae7d422e54bd4e924d2ab792037 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 28 Aug 2025 10:09:07 +0200 Subject: [PATCH 11/12] kundeblatt --- SDL/kunden/frmKundenblatt.Designer.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index df1da98f..82c6e2ed 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -625,7 +625,7 @@ Partial Class frmKundenblatt Me.dgvUmsaetze.RowHeadersDefaultCellStyle = DataGridViewCellStyle8 Me.dgvUmsaetze.RowHeadersVisible = False Me.dgvUmsaetze.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 802) + Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 819) Me.dgvUmsaetze.TabIndex = 182 ' 'Label13 @@ -729,7 +729,7 @@ Partial Class frmKundenblatt Me.dgvUmsatzNachLeistngsNr.RowHeadersDefaultCellStyle = DataGridViewCellStyle12 Me.dgvUmsatzNachLeistngsNr.RowHeadersVisible = False Me.dgvUmsatzNachLeistngsNr.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(705, 804) + Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(705, 821) Me.dgvUmsatzNachLeistngsNr.TabIndex = 183 ' 'lblAdressenzusatz @@ -2673,7 +2673,7 @@ Partial Class frmKundenblatt ' Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM" - Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4 + Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8 Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4) Me.cntxtCntxtMDM.Text = "cntxtMDM" ' From adc518664897e73bbfe272cf4179ddaf4cfb87ed Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 28 Aug 2025 10:09:37 +0200 Subject: [PATCH 12/12] version --- SDL/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 4f76127f..3a05961d 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: ' - - + +