From 04441b28b3de03a0c63dde61e0ed23d47f99de3e Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 25 Mar 2024 10:41:17 +0100 Subject: [PATCH] =?UTF-8?q?frmVollmachten,=20Pr=C3=BCfimg=20auf=20gesperrt?= =?UTF-8?q?=20auch=20wenn=20nur=201=20DS=20in=20DGV.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frmKundenZOLLVollmachten.Designer.vb | 40 +++++-------- SDL/kunden/frmKundenZOLLVollmachten.vb | 56 ++++++++++++------- 2 files changed, 50 insertions(+), 46 deletions(-) diff --git a/SDL/kunden/frmKundenZOLLVollmachten.Designer.vb b/SDL/kunden/frmKundenZOLLVollmachten.Designer.vb index eadc1eaa..2b4abe64 100644 --- a/SDL/kunden/frmKundenZOLLVollmachten.Designer.vb +++ b/SDL/kunden/frmKundenZOLLVollmachten.Designer.vb @@ -25,7 +25,6 @@ Partial Class frmKundenZOLLVollmachten Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmKundenZOLLVollmachten)) Me.pnl = New System.Windows.Forms.Panel() - Me.btnUploadPDF = New System.Windows.Forms.Button() Me.lblPDFavailable = New System.Windows.Forms.Label() Me.btnNeu = New System.Windows.Forms.Button() Me.dgvVollmachtenEmbedded = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) @@ -69,11 +68,11 @@ Partial Class frmKundenZOLLVollmachten ' Me.pnl.BackColor = System.Drawing.Color.White Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.pnl.Controls.Add(Me.btnUploadPDF) Me.pnl.Controls.Add(Me.lblPDFavailable) Me.pnl.Controls.Add(Me.btnNeu) Me.pnl.Controls.Add(Me.dgvVollmachtenEmbedded) Me.pnl.Controls.Add(Me.MyComboBox1) + Me.pnl.Controls.Add(Me.Panel1) Me.pnl.Controls.Add(Me.Button1) Me.pnl.Controls.Add(Me.Label1) Me.pnl.Controls.Add(Me.cbxErhaltenAm) @@ -82,25 +81,14 @@ Partial Class frmKundenZOLLVollmachten Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill Me.pnl.Location = New System.Drawing.Point(0, 0) Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(513, 383) + Me.pnl.Size = New System.Drawing.Size(513, 389) Me.pnl.TabIndex = 1 ' - 'btnUploadPDF - ' - Me.btnUploadPDF.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnUploadPDF.Location = New System.Drawing.Point(155, 179) - Me.btnUploadPDF.Name = "btnUploadPDF" - Me.btnUploadPDF.Size = New System.Drawing.Size(134, 25) - Me.btnUploadPDF.TabIndex = 12 - Me.btnUploadPDF.Text = "PDF hochladen" - Me.btnUploadPDF.UseVisualStyleBackColor = True - Me.btnUploadPDF.Visible = False - ' 'lblPDFavailable ' - Me.lblPDFavailable.Location = New System.Drawing.Point(297, 182) + Me.lblPDFavailable.Location = New System.Drawing.Point(36, 210) Me.lblPDFavailable.Name = "lblPDFavailable" - Me.lblPDFavailable.Size = New System.Drawing.Size(140, 13) + Me.lblPDFavailable.Size = New System.Drawing.Size(140, 25) Me.lblPDFavailable.TabIndex = 13 Me.lblPDFavailable.Text = "Kein PDF vorhanden." Me.lblPDFavailable.TextAlign = System.Drawing.ContentAlignment.TopRight @@ -201,16 +189,15 @@ Partial Class frmKundenZOLLVollmachten Me.pnlDetails.Controls.Add(Me.cbxVMarchivieren) Me.pnlDetails.Controls.Add(Me.Label3) Me.pnlDetails.Controls.Add(Me.txtVermerk) - Me.pnlDetails.Controls.Add(Me.Panel1) Me.pnlDetails.Controls.Add(Me.lblGueltigBis) Me.pnlDetails.Controls.Add(Me.txtGueltigVon) Me.pnlDetails.Controls.Add(Me.txtGueltigBis) Me.pnlDetails.Controls.Add(Me.cbxArchiviert) Me.pnlDetails.Controls.Add(Me.btnOK) Me.pnlDetails.Controls.Add(Me.btnSave) - Me.pnlDetails.Location = New System.Drawing.Point(4, 219) + Me.pnlDetails.Location = New System.Drawing.Point(24, 267) Me.pnlDetails.Name = "pnlDetails" - Me.pnlDetails.Size = New System.Drawing.Size(492, 159) + Me.pnlDetails.Size = New System.Drawing.Size(463, 109) Me.pnlDetails.TabIndex = 28 ' 'lblWarning @@ -236,7 +223,7 @@ Partial Class frmKundenZOLLVollmachten 'cbxVMarchivieren ' Me.cbxVMarchivieren.AutoSize = True - Me.cbxVMarchivieren.Location = New System.Drawing.Point(20, 127) + Me.cbxVMarchivieren.Location = New System.Drawing.Point(235, 49) Me.cbxVMarchivieren.Name = "cbxVMarchivieren" Me.cbxVMarchivieren.Size = New System.Drawing.Size(198, 17) Me.cbxVMarchivieren.TabIndex = 27 @@ -275,7 +262,7 @@ Partial Class frmKundenZOLLVollmachten Me.txtVermerk.MaxLines_Warning = "" Me.txtVermerk.MaxLines_Warning_Label = Nothing Me.txtVermerk.Name = "txtVermerk" - Me.txtVermerk.Size = New System.Drawing.Size(390, 23) + Me.txtVermerk.Size = New System.Drawing.Size(364, 23) Me.txtVermerk.TabIndex = 25 ' 'Panel1 @@ -284,7 +271,7 @@ Partial Class frmKundenZOLLVollmachten Me.Panel1.Controls.Add(Me.picEmail) Me.Panel1.Controls.Add(Me.picDeletePDF) Me.Panel1.Controls.Add(Me.picPDF) - Me.Panel1.Location = New System.Drawing.Point(356, 45) + Me.Panel1.Location = New System.Drawing.Point(307, 190) Me.Panel1.Name = "Panel1" Me.Panel1.Size = New System.Drawing.Size(130, 74) Me.Panel1.TabIndex = 17 @@ -397,7 +384,7 @@ Partial Class frmKundenZOLLVollmachten 'cbxArchiviert ' Me.cbxArchiviert.AutoSize = True - Me.cbxArchiviert.Location = New System.Drawing.Point(20, 102) + Me.cbxArchiviert.Location = New System.Drawing.Point(229, 80) Me.cbxArchiviert.Name = "cbxArchiviert" Me.cbxArchiviert.Size = New System.Drawing.Size(70, 17) Me.cbxArchiviert.TabIndex = 21 @@ -408,7 +395,7 @@ Partial Class frmKundenZOLLVollmachten ' Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnOK.Location = New System.Drawing.Point(410, 124) + Me.btnOK.Location = New System.Drawing.Point(358, 75) Me.btnOK.Name = "btnOK" Me.btnOK.Size = New System.Drawing.Size(66, 24) Me.btnOK.TabIndex = 10 @@ -418,7 +405,7 @@ Partial Class frmKundenZOLLVollmachten 'btnSave ' Me.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnSave.Location = New System.Drawing.Point(410, 125) + Me.btnSave.Location = New System.Drawing.Point(358, 75) Me.btnSave.Name = "btnSave" Me.btnSave.Size = New System.Drawing.Size(66, 24) Me.btnSave.TabIndex = 29 @@ -451,7 +438,7 @@ Partial Class frmKundenZOLLVollmachten ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(513, 383) + Me.ClientSize = New System.Drawing.Size(513, 389) Me.Controls.Add(Me.pnl) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) @@ -474,7 +461,6 @@ Partial Class frmKundenZOLLVollmachten End Sub Friend WithEvents pnl As System.Windows.Forms.Panel Friend WithEvents lblPDFavailable As System.Windows.Forms.Label - Friend WithEvents btnUploadPDF As System.Windows.Forms.Button Friend WithEvents Button1 As System.Windows.Forms.Button Friend WithEvents btnOK As System.Windows.Forms.Button Friend WithEvents MyComboBox1 As VERAG_PROG_ALLGEMEIN.MyComboBox diff --git a/SDL/kunden/frmKundenZOLLVollmachten.vb b/SDL/kunden/frmKundenZOLLVollmachten.vb index 3c396c56..9f9903f8 100644 --- a/SDL/kunden/frmKundenZOLLVollmachten.vb +++ b/SDL/kunden/frmKundenZOLLVollmachten.vb @@ -52,26 +52,7 @@ 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 - Else - btnNeu.Enabled = True - enableEdit = True - - End If End Sub @@ -186,6 +167,26 @@ Public Class frmKundenZOLLVollmachten ' Case "VERAGIMEX" ' where = " AND art.kdvma_Firma IN ('VERAG', 'IMEX') " '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 + + Else + btnNeu.Enabled = True + enableEdit = True + + End If @@ -193,6 +194,9 @@ Public Class frmKundenZOLLVollmachten dgvVollmachtenEmbedded.Enabled = True End If + + + pnlDetails.Enabled = IIf(enableEdit, enalblePanel, enableEdit) With dgvVollmachtenEmbedded @@ -277,6 +281,8 @@ Public Class frmKundenZOLLVollmachten Next End With + + End Sub Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles cbxVMarchivieren.CheckedChanged @@ -319,6 +325,15 @@ Public Class frmKundenZOLLVollmachten Private Sub loadChangedVMToPanel(enablePanel As Boolean, VM As VERAG_PROG_ALLGEMEIN.cKundenVollmachten) pnlDetails.Enabled = IIf(enableEdit, enablePanel, enableEdit) + Panel1.Enabled = pnlDetails.Enabled + + If Not Panel1.Enabled Then + Panel1.Enabled = True + picDeleteEmail.Enabled = False + picDeletePDF.Enabled = False + End If + + cbxArchiviert.Checked = VM.kdvm_archiviert txtVermerk.Text = VM.kdvm_vermerk txtGueltigVon.Text = VM.kdvm_erhalten_Datum @@ -609,4 +624,7 @@ Public Class frmKundenZOLLVollmachten picEmail.Visible = False End Sub + Private Sub btnUploadPDF_Click(sender As Object, e As EventArgs) + + End Sub End Class \ No newline at end of file