Vollmachten überarbeitet

This commit is contained in:
2024-03-15 11:02:18 +01:00
parent 3671255c45
commit d4125d6529
3 changed files with 55 additions and 56 deletions

View File

@@ -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()