From d00edda18049d15bf8fd2750425dbf897a7d88ab Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 15 Jan 2026 11:53:55 +0100 Subject: [PATCH] fix --- .../usrCntlKundenuebersicht.Designer.vb | 34 ++++++--------- SDL/kunden/usrCntlKundenuebersicht.vb | 43 +++++-------------- 2 files changed, 23 insertions(+), 54 deletions(-) diff --git a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb index 4d45a751..418c64c5 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb @@ -258,7 +258,6 @@ Partial Class usrCntlKundenuebersicht Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem4 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem5 = New System.Windows.Forms.ToolStripMenuItem() - Me.MailHochladenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem7 = New System.Windows.Forms.ToolStripMenuItem() Me.GültigungültigToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -3367,34 +3366,34 @@ Partial Class usrCntlKundenuebersicht ' Me.ToolStripMenuItem3.Image = Global.SDL.My.Resources.Resources.del Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3" - Me.ToolStripMenuItem3.Size = New System.Drawing.Size(180, 22) + Me.ToolStripMenuItem3.Size = New System.Drawing.Size(139, 22) Me.ToolStripMenuItem3.Text = "Löschen" ' 'ÄndernToolStripMenuItem ' Me.ÄndernToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.stift Me.ÄndernToolStripMenuItem.Name = "ÄndernToolStripMenuItem" - Me.ÄndernToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ÄndernToolStripMenuItem.Size = New System.Drawing.Size(139, 22) Me.ÄndernToolStripMenuItem.Text = "Ändern" ' 'HochladenToolStripMenuItem ' Me.HochladenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.pdf Me.HochladenToolStripMenuItem.Name = "HochladenToolStripMenuItem" - Me.HochladenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.HochladenToolStripMenuItem.Size = New System.Drawing.Size(139, 22) Me.HochladenToolStripMenuItem.Text = "Hochladen" ' 'ScannenToolStripMenuItem ' Me.ScannenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.scanner1 Me.ScannenToolStripMenuItem.Name = "ScannenToolStripMenuItem" - Me.ScannenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ScannenToolStripMenuItem.Size = New System.Drawing.Size(139, 22) Me.ScannenToolStripMenuItem.Text = "Scannen" ' 'PDFLöschenToolStripMenuItem ' Me.PDFLöschenToolStripMenuItem.Name = "PDFLöschenToolStripMenuItem" - Me.PDFLöschenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.PDFLöschenToolStripMenuItem.Size = New System.Drawing.Size(139, 22) Me.PDFLöschenToolStripMenuItem.Text = "PDF löschen" ' 'ContextMenuStrip2 @@ -3423,55 +3422,48 @@ Partial Class usrCntlKundenuebersicht ' 'ContextMenuStrip4 ' - Me.ContextMenuStrip4.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem1, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.MailHochladenToolStripMenuItem1, Me.ToolStripMenuItem6, Me.ToolStripMenuItem7, Me.GültigungültigToolStripMenuItem}) + Me.ContextMenuStrip4.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem1, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.ToolStripMenuItem6, Me.ToolStripMenuItem7, Me.GültigungültigToolStripMenuItem}) Me.ContextMenuStrip4.Name = "ContextMenuStrip1" - Me.ContextMenuStrip4.Size = New System.Drawing.Size(181, 180) + Me.ContextMenuStrip4.Size = New System.Drawing.Size(156, 136) ' 'ToolStripMenuItem1 ' Me.ToolStripMenuItem1.Image = Global.SDL.My.Resources.Resources.del Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1" - Me.ToolStripMenuItem1.Size = New System.Drawing.Size(156, 22) + Me.ToolStripMenuItem1.Size = New System.Drawing.Size(155, 22) Me.ToolStripMenuItem1.Text = "Löschen" ' 'ToolStripMenuItem4 ' Me.ToolStripMenuItem4.Image = Global.SDL.My.Resources.Resources.stift Me.ToolStripMenuItem4.Name = "ToolStripMenuItem4" - Me.ToolStripMenuItem4.Size = New System.Drawing.Size(156, 22) + Me.ToolStripMenuItem4.Size = New System.Drawing.Size(155, 22) Me.ToolStripMenuItem4.Text = "Ändern" ' 'ToolStripMenuItem5 ' Me.ToolStripMenuItem5.Image = Global.SDL.My.Resources.Resources.pdf Me.ToolStripMenuItem5.Name = "ToolStripMenuItem5" - Me.ToolStripMenuItem5.Size = New System.Drawing.Size(156, 22) + Me.ToolStripMenuItem5.Size = New System.Drawing.Size(155, 22) Me.ToolStripMenuItem5.Text = "Hochladen" ' - 'MailHochladenToolStripMenuItem1 - ' - Me.MailHochladenToolStripMenuItem1.Image = Global.SDL.My.Resources.Resources.email_big1 - Me.MailHochladenToolStripMenuItem1.Name = "MailHochladenToolStripMenuItem1" - Me.MailHochladenToolStripMenuItem1.Size = New System.Drawing.Size(180, 22) - Me.MailHochladenToolStripMenuItem1.Text = "EMail hochladen" - ' 'ToolStripMenuItem6 ' Me.ToolStripMenuItem6.Image = Global.SDL.My.Resources.Resources.scanner1 Me.ToolStripMenuItem6.Name = "ToolStripMenuItem6" - Me.ToolStripMenuItem6.Size = New System.Drawing.Size(156, 22) + Me.ToolStripMenuItem6.Size = New System.Drawing.Size(155, 22) Me.ToolStripMenuItem6.Text = "Scannen" ' 'ToolStripMenuItem7 ' Me.ToolStripMenuItem7.Name = "ToolStripMenuItem7" - Me.ToolStripMenuItem7.Size = New System.Drawing.Size(156, 22) + Me.ToolStripMenuItem7.Size = New System.Drawing.Size(155, 22) Me.ToolStripMenuItem7.Text = "PDF löschen" ' 'GültigungültigToolStripMenuItem ' Me.GültigungültigToolStripMenuItem.Name = "GültigungültigToolStripMenuItem" - Me.GültigungültigToolStripMenuItem.Size = New System.Drawing.Size(156, 22) + Me.GültigungültigToolStripMenuItem.Size = New System.Drawing.Size(155, 22) Me.GültigungültigToolStripMenuItem.Text = "gültig/ungültig" ' 'btnReloadOP diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index 252bf3cf..728e8afb 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -1,8 +1,6 @@ Imports System.Data.SqlClient Imports System.Globalization Imports System.IO -Imports GrapeCity.ActiveReports.ReportsCore.Tools -Imports GrapeCity.Viewer.Common.Model Imports org.BouncyCastle.Asn1.Ocsp Imports SDL.EORI Imports sun.util.resources.cldr.aa @@ -2514,8 +2512,6 @@ Public Class usrCntlKundenuebersicht Private Sub HochladenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles HochladenToolStripMenuItem.Click If dgvGestGarantie.SelectedRows.Count = 1 Then - - Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "GESTELLUNGS_GARANTIEN", "", "", "", "GG_" & dgvGestGarantie.SelectedRows(0).Cells("gg_Zollamt").Value, kdNr) If DS.uploadDataToDATENSERVERFileDialog(, ".pdf", , "PDF") Then Dim gg As New VERAG_PROG_ALLGEMEIN.cGestellungsgarantien(dgvGestGarantie.SelectedRows(0).Cells("gg_id").Value) @@ -2523,7 +2519,6 @@ Public Class usrCntlKundenuebersicht gg.SAVE() initDGVGestGarantie() End If - End If End Sub @@ -2648,35 +2643,17 @@ Public Class usrCntlKundenuebersicht End If End Sub - Private Sub ToolStripMenuItem5_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem5.Click, MailHochladenToolStripMenuItem1.Click + Private Sub ToolStripMenuItem5_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem5.Click If dgvVertraege.SelectedRows.Count = 1 Then - - Select Case sender.Name - Case "ToolStripMenuItem5" - - If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Kundendaten_bearbeiten", "SDL") Then - Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "KD_VERTRÄGE", "", "", "", "KV_" & dgvVertraege.SelectedRows(0).Cells("kv_id").Value, kdNr) - If DS.uploadDataToDATENSERVERFileDialog(, ".pdf", , "PDF") Then - Dim KV As New VERAG_PROG_ALLGEMEIN.cKundenVertraege(dgvVertraege.SelectedRows(0).Cells("kv_id").Value) - KV.kv_datenarchivId = DS.da_id - KV.SAVE() - initDGVVertraege() - End If - End If - - Case "MailHochladenToolStripMenuItem1" - - If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Kundendaten_bearbeiten", "SDL") Then - Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "KD_VERTRÄGE", "", "", "", "KV_" & dgvVertraege.SelectedRows(0).Cells("kv_id").Value, kdNr) - If DS.uploadDataToDATENSERVERFileDialog(, ".pdf", , "PDF") Then - Dim KV As New VERAG_PROG_ALLGEMEIN.cKundenVertraege(dgvVertraege.SelectedRows(0).Cells("kv_id").Value) - KV.kv_datenarchivId = DS.da_id - KV.SAVE() - initDGVVertraege() - End If - End If - - End Select + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Kundendaten_bearbeiten", "SDL") Then + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "KD_VERTRÄGE", "", "", "", "KV_" & dgvVertraege.SelectedRows(0).Cells("kv_id").Value, kdNr) + If DS.uploadDataToDATENSERVERFileDialog(, ".pdf", , "PDF") Then + Dim KV As New VERAG_PROG_ALLGEMEIN.cKundenVertraege(dgvVertraege.SelectedRows(0).Cells("kv_id").Value) + KV.kv_datenarchivId = DS.da_id + KV.SAVE() + initDGVVertraege() + End If + End If End If End Sub