Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

SDL/kunden/usrCntlKundenuebersicht.vb

@@ -862,11 +862,21 @@ Public Class usrCntlKundenuebersicht
             End If
 
 
-            Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+            Dim FirmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+            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
+           ' Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
                 Case "UNISPED", "IMEX"
                     .Columns("clmnVermerk").Visible = True
                     .Columns("clmnTherefore").Visible = False
                     .Columns("clmnPDF").Visible = True
+                Case "VERAGIMEX"
+                    .Columns("clmnVermerk").Visible = True
+                    .Columns("clmnTherefore").Visible = True
+                    .Columns("clmnPDF").Visible = True
                 Case "FRONTOFFICE"
                     .Columns("clmnVermerk").Visible = True
                     .Columns("clmnTherefore").Visible = True
@@ -2351,10 +2361,36 @@ Public Class usrCntlKundenuebersicht
         Me.Cursor = Cursors.Default
     End Sub
 
-    Private Sub Button11_Click(sender As Object, e As EventArgs)
+    Private Sub Button11_Click(sender As Object, e As EventArgs) Handles Button11.Click
+        If cboVertrag._value <> "" And datVertrag._value <> "" Then
+            Dim KV As New VERAG_PROG_ALLGEMEIN.cKundenVertraege
+            If Button12.Visible Then
+                If dgvVertraege.SelectedRows.Count = 1 Then
+                    KV = New VERAG_PROG_ALLGEMEIN.cKundenVertraege(dgvVertraege.SelectedRows(0).Cells("kv_id").Value)
+                Else
+                    Exit Sub
+                End If
+            End If
+            KV.kv_KundenNr = kdNr
+            KV.kv_erhalten_Datum = datVertrag._value
+            'KV.kv_Zollamt = If(cbxKV.Checked, "GENERELL", txtT1VerzollungsadresseBestimmungszollstelle._value)
 
+            'If Not Button9.Visible AndAlso VERAG_PROG_ALLGEMEIN.cKundenVertraege.ENTRY_Exists(kdNr, KV.kv_Zollamt) Then
+            '    MsgBox("Der Eintrag existiert bereits!")
+            '    Exit Sub
+            'End If
+
+            KV.kv_vertragArtId = cboVertrag._value
+            KV.kv_Info = txtVertragVermerk.Text
+
+            If KV.SAVE Then
+                setKD(kdNr)
+            End If
+            clearKV()
+        End If
     End Sub
 
+
     Private Sub Button12_Click(sender As Object, e As EventArgs) Handles Button12.Click
         clearKV()
     End Sub
@@ -2424,7 +2460,7 @@ Public Class usrCntlKundenuebersicht
         End If
     End Sub
 
-    Private Sub ToolStripMenuItem7_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem7.Click, Button11.Click
+    Private Sub ToolStripMenuItem7_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem7.Click
         If dgvVertraege.SelectedRows.Count = 1 Then
             If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Kundendaten_bearbeiten", "SDL") Then
                 If vbYes = MsgBox("Möchten Sie das PDF wirklich löschen?", vbYesNoCancel) Then