From d4125d6529c6798498a3e1773c392be2c78bc229 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 15 Mar 2024 11:02:18 +0100 Subject: [PATCH] =?UTF-8?q?Vollmachten=20=C3=BCberarbeitet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SDL/kunden/frmKundenZOLLVollmachten.vb | 64 +++++++++---------- .../usrCntlKundenuebersicht.Designer.vb | 15 +++-- SDL/kunden/usrCntlKundenuebersicht.vb | 32 +++++----- 3 files changed, 55 insertions(+), 56 deletions(-) diff --git a/SDL/kunden/frmKundenZOLLVollmachten.vb b/SDL/kunden/frmKundenZOLLVollmachten.vb index bf4c23f2..3c396c56 100644 --- a/SDL/kunden/frmKundenZOLLVollmachten.vb +++ b/SDL/kunden/frmKundenZOLLVollmachten.vb @@ -1,20 +1,4 @@ -Imports System.Web.UI.WebControls.Expressions -Imports System.Windows -Imports System.Windows.Interop -Imports com.sun.org.apache.xpath.internal.functions -Imports DAKOSY_Worker.TR100 -Imports DocumentFormat.OpenXml.Drawing -Imports DocumentFormat.OpenXml.Drawing.Charts -'Imports DocumentFormat.OpenXml.Wordprocessing -Imports GrapeCity.ActiveReports -Imports GrapeCity.ActiveReports.Design.DdrDesigner.Services -Imports GrapeCity.ActiveReports.Design.QueryDesignerImpl.SqlParser.Irony.Parsing -Imports javax.validation.constraints -Imports sun.misc -Imports TAlex.WPF.Helpers -Imports SDL.EORI -Imports System.Drawing -Imports System.Runtime.DesignerServices + Public Class frmKundenZOLLVollmachten Public kdnr As Integer = -1 @@ -23,13 +7,13 @@ Public Class frmKundenZOLLVollmachten Public archiviert As Boolean = False Public geloescht As Boolean = False Dim id As Integer = -1 - 'Dim cDATENSERVER As New VERAG_PROG_ALLGEMEIN.cDATENSERVER Dim ksql As New kundenSQL Dim vollmachtartId As Integer Dim emailId As Integer Dim vermerk As String = "" Dim vmId As Integer = -1 Dim currentVM As New VERAG_PROG_ALLGEMEIN.cKundenVollmachten + Dim enableEdit As Boolean = False Sub New(kdnr, vollmachtartId) Me.InitializeComponent() @@ -68,14 +52,28 @@ Public Class frmKundenZOLLVollmachten 'Me.Height = Me.Height - Panel1.Height End Select + Dim KUNDE = New VERAG_PROG_ALLGEMEIN.cKunde(kdnr) + Dim KdFirma = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(KUNDE.FilialenNr) + If KdFirma <> VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Then + enableEdit = False + btnNeu.Enabled = False + If Not (KdFirma = "IMEX" And VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO")) Then + If Not VERAG_PROG_ALLGEMEIN.cAllgemein.isCLUSTER Then + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_CLUSTER", "SDL") And + ((KdFirma = "IMEX" Or KdFirma = "VERAG" Or KdFirma = "VERIMEX") And VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL")) Then + btnNeu.Enabled = True + enableEdit = True + End If + End If + End If - End Sub + Else + btnNeu.Enabled = True + enableEdit = True + End If - - Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click - End Sub Sub saveVM(VM As VERAG_PROG_ALLGEMEIN.cKundenVollmachten) @@ -178,16 +176,16 @@ Public Class frmKundenZOLLVollmachten Dim FirmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA - Dim where = " And art.kdvma_Firma='" & FirmaTmp & "'" + Dim where = "" '" And art.kdvma_Firma='" & FirmaTmp & "'" - If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGIMEX", "SDL") Then - FirmaTmp = "VERAGIMEX" - End If + 'If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGIMEX", "SDL") Then + ' FirmaTmp = "VERAGIMEX" + 'End If - Select Case FirmaTmp - Case "VERAGIMEX" - where = " AND art.kdvma_Firma IN ('VERAG', 'IMEX') " - End Select + 'Select Case FirmaTmp + ' Case "VERAGIMEX" + ' where = " AND art.kdvma_Firma IN ('VERAG', 'IMEX') " + 'End Select @@ -195,7 +193,7 @@ Public Class frmKundenZOLLVollmachten dgvVollmachtenEmbedded.Enabled = True End If - pnlDetails.Enabled = enalblePanel + pnlDetails.Enabled = IIf(enableEdit, enalblePanel, enableEdit) With dgvVollmachtenEmbedded .Columns.Clear() @@ -297,6 +295,8 @@ Public Class frmKundenZOLLVollmachten Private Sub dgvvollmachtenembedded_cellmouseclick(sender As Object, e As DataGridViewCellMouseEventArgs) Handles dgvVollmachtenEmbedded.CellMouseClick 'für die Ermittlung des Contextmenüs -> VM löschen + If Not enableEdit Then Exit Sub + If e.Button = Windows.Forms.MouseButtons.Right Then If dgvVollmachtenEmbedded.SelectedRows.Count > 0 Then ContextMenuStrip1.Show(Cursor.Position) @@ -317,7 +317,7 @@ Public Class frmKundenZOLLVollmachten End Sub Private Sub loadChangedVMToPanel(enablePanel As Boolean, VM As VERAG_PROG_ALLGEMEIN.cKundenVollmachten) - pnlDetails.Enabled = enablePanel + pnlDetails.Enabled = IIf(enableEdit, enablePanel, enableEdit) cbxArchiviert.Checked = VM.kdvm_archiviert txtVermerk.Text = VM.kdvm_vermerk diff --git a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb index 4dad9da8..259ddc6f 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb @@ -22,6 +22,7 @@ Partial Class usrCntlKundenuebersicht 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() @@ -35,7 +36,7 @@ Partial Class usrCntlKundenuebersicht Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Me.cntxtAddVM = New System.Windows.Forms.ContextMenuStrip() + Me.cntxtAddVM = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.btnExcel = New System.Windows.Forms.Button() Me.lblInaktiv = New System.Windows.Forms.Label() @@ -102,7 +103,7 @@ Partial Class usrCntlKundenuebersicht Me.Label33 = New System.Windows.Forms.Label() Me.txtUmsatzJahr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label29 = New System.Windows.Forms.Label() - Me.cbxFiskalabfertigung = New VERAG_PROG_ALLGEMEIN.MyCheckbox() + Me.cbxFiskalabfertigung = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components) Me.lblFisk = New System.Windows.Forms.Label() Me.txtAbf_ErsteAbfertigung = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label41 = New System.Windows.Forms.Label() @@ -226,25 +227,25 @@ Partial Class usrCntlKundenuebersicht Me.lblUid = New System.Windows.Forms.TextBox() Me.lblEORI = New System.Windows.Forms.TextBox() Me.lblEORINr = New System.Windows.Forms.Label() - Me.dgvAufschub = New VERAG_PROG_ALLGEMEIN.MyDatagridview() + Me.dgvAufschub = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.KtoId = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.Art = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.HZA = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.KontoNr = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.EORI = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.NL = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip() + Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.KopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip() + Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() Me.ÄndernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.HochladenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ScannenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.PDFLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip() + Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem() Me.lblFirma = New System.Windows.Forms.Label() - Me.ContextMenuStrip4 = New System.Windows.Forms.ContextMenuStrip() + Me.ContextMenuStrip4 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem4 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem5 = New System.Windows.Forms.ToolStripMenuItem() diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index ad7dfadc..8f6b6f41 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -230,7 +230,6 @@ Public Class usrCntlKundenuebersicht End Select - If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("UID_EORI_Prüfung", "SDL") Then If Not VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then Button1.Visible = True @@ -372,6 +371,7 @@ Public Class usrCntlKundenuebersicht If KdFirma <> VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Then lblFirma.Text = KdFirma lblFirma.Visible = True + btnVMhinzufuegen.Enabled = False If Not (KdFirma = "IMEX" And VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO")) Then If Not VERAG_PROG_ALLGEMEIN.cAllgemein.isCLUSTER Then If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_CLUSTER", "SDL") And @@ -381,6 +381,8 @@ Public Class usrCntlKundenuebersicht dgvUmsatzbericht.Visible = False usrCntlAnhaenge.Visible = False rtbAbf_Besonderheiten.Visible = False + Else + btnVMhinzufuegen.Enabled = True End If End If End If @@ -389,6 +391,7 @@ Public Class usrCntlKundenuebersicht dgvOffenePosten.Visible = True End If Else + btnVMhinzufuegen.Enabled = True lblFirma.Visible = False End If ' Me.dataFirma.AcceptChanges() @@ -802,21 +805,21 @@ Public Class usrCntlKundenuebersicht With dgvVollmachten .Columns.Clear() Dim FirmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA - Dim where = " AND art.kdvma_Firma='" & FirmaTmp & "' " + Dim where = "" '" AND art.kdvma_Firma='" & FirmaTmp & "' " - If VERAG_PROG_ALLGEMEIN.cAllgemein.isCLUSTER Then - where = " AND art.kdvma_Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(KUNDE.FilialenNr) & "' " - End If + 'If VERAG_PROG_ALLGEMEIN.cAllgemein.isCLUSTER Then + ' where = " AND art.kdvma_Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(KUNDE.FilialenNr) & "' " + 'End If - If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGIMEX", "SDL") Then - FirmaTmp = "VERAGIMEX" - End If + 'If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGIMEX", "SDL") Then + ' FirmaTmp = "VERAGIMEX" + 'End If - Select Case FirmaTmp - Case "VERAGIMEX" - where = " AND art.kdvma_Firma IN ('VERAG', 'IMEX') " - End Select + 'Select Case FirmaTmp + ' Case "VERAGIMEX" + ' where = " AND art.kdvma_Firma IN ('VERAG', 'IMEX') " + 'End Select @@ -1615,7 +1618,6 @@ Public Class usrCntlKundenuebersicht If dgvVollmachten.Columns(e.ColumnIndex).Name = "clmnPDF" Then If dgvVollmachten.Rows(e.RowIndex).Cells("kdvm_datenarchivId").Value IsNot DBNull.Value AndAlso CInt(dgvVollmachten.Rows(e.RowIndex).Cells("kdvm_datenarchivId").Value) > 0 Then - ' cDATENSERVER.openDataTMPByDatenarchivId(dgvVollmachten.Rows(e.RowIndex).Cells("kdvm_datenarchivId").Value) Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dgvVollmachten.Rows(e.RowIndex).Cells("kdvm_datenarchivId").Value) DS.OPEN_SINGLE(True) End If @@ -1626,13 +1628,9 @@ Public Class usrCntlKundenuebersicht If tmprowindex < 0 Then Exit Sub Dim frmGrayOut = cProgramFunctions.grayoutForm(Me) - 'Dim datum = IIf(dgvVollmachten.Rows(tmprowindex).Cells("kdvm_erhalten_Datum").Value Is DBNull.Value, Now, dgvVollmachten.Rows(tmprowindex).Cells("kdvm_erhalten_Datum").Value) - 'Dim gueltigBis = IIf(dgvVollmachten.Rows(tmprowindex).Cells("kdvm_gueltig_bis").Value Is DBNull.Value, Nothing, dgvVollmachten.Rows(tmprowindex).Cells("kdvm_gueltig_bis").Value) - 'Dim l As New frmKundenZOLLVollmachten(kdNr, dgvVollmachten.Rows(tmprowindex).Cells("kdvma_Id").Value, dgvVollmachten.Rows(tmprowindex).Cells("kdvma_Id").Value, dgvVollmachten.Rows(tmprowindex).Cells("kdvm_erhalten").Value, dgvVollmachten.Rows(tmprowindex).Cells("kdvm_archiviert").Value, dgvVollmachten.Rows(tmprowindex).Cells("kdvm_erhalten_Datum").Value, dgvVollmachten.Rows(tmprowindex).Cells("kdvm_gueltig_bis").Value, dgvVollmachten.Rows(tmprowindex).Cells("kdvm_vermerk").Value, dgvVollmachten.Rows(tmprowindex).Cells("kdvm_datenarchivId").Value) Dim l As New frmKundenZOLLVollmachten(kdNr, dgvVollmachten.Rows(tmprowindex).Cells("kdvma_Id").Value) ' If l.ShowDialog(frmGrayOut) = DialogResult.OK Then l.initDGVVollmachtenEmbedded(False) - 'initDGVVollmachten() End If frmGrayOut.Close() initDGVVollmachten()