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

2023-03-16 21:11:55 +01:00
parent e07dbd591f ee42303808
commit e2cca4a98e
35 changed files with 1812 additions and 469 deletions
--- a/SDL/kunden/frmKundenblatt.Designer.vb
+++ b/SDL/kunden/frmKundenblatt.Designer.vb
@@ -225,7 +225,7 @@ Partial Class frmKundenblatt
        Me.pnlInfo.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer))
        Me.pnlInfo.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
        Me.pnlInfo.Controls.Add(Me.txtInfotext)
-        Me.pnlInfo.Location = New System.Drawing.Point(321, 6)
+        Me.pnlInfo.Location = New System.Drawing.Point(325, 6)
        Me.pnlInfo.Name = "pnlInfo"
        Me.pnlInfo.Size = New System.Drawing.Size(602, 35)
        Me.pnlInfo.TabIndex = 1
@@ -247,7 +247,7 @@ Partial Class frmKundenblatt
        Me.tbFirmendaten.Location = New System.Drawing.Point(4, 25)
        Me.tbFirmendaten.Name = "tbFirmendaten"
        Me.tbFirmendaten.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbFirmendaten.Size = New System.Drawing.Size(1623, 710)
+        Me.tbFirmendaten.Size = New System.Drawing.Size(1623, 727)
        Me.tbFirmendaten.TabIndex = 3
        Me.tbFirmendaten.Text = "Firmendaten"
        '
@@ -257,7 +257,7 @@ Partial Class frmKundenblatt
        Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill
        Me.Panel4.Location = New System.Drawing.Point(3, 3)
        Me.Panel4.Name = "Panel4"
-        Me.Panel4.Size = New System.Drawing.Size(1617, 704)
+        Me.Panel4.Size = New System.Drawing.Size(1617, 721)
        Me.Panel4.TabIndex = 0
        '
        'tbcntrMain
@@ -274,7 +274,7 @@ Partial Class frmKundenblatt
        Me.tbcntrMain.Margin = New System.Windows.Forms.Padding(0)
        Me.tbcntrMain.Name = "tbcntrMain"
        Me.tbcntrMain.SelectedIndex = 0
-        Me.tbcntrMain.Size = New System.Drawing.Size(1631, 739)
+        Me.tbcntrMain.Size = New System.Drawing.Size(1638, 756)
        Me.tbcntrMain.TabIndex = 3
        '
        'tbAllgemein
@@ -307,7 +307,7 @@ Partial Class frmKundenblatt
        Me.tbAllgemein.Margin = New System.Windows.Forms.Padding(0)
        Me.tbAllgemein.Name = "tbAllgemein"
        Me.tbAllgemein.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbAllgemein.Size = New System.Drawing.Size(1623, 710)
+        Me.tbAllgemein.Size = New System.Drawing.Size(1630, 744)
        Me.tbAllgemein.TabIndex = 0
        Me.tbAllgemein.Text = "Allgemein"
        '
@@ -642,7 +642,7 @@ Partial Class frmKundenblatt
        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
        Me.dgvSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle6
-        Me.dgvSperrliste.Size = New System.Drawing.Size(828, 600)
+        Me.dgvSperrliste.Size = New System.Drawing.Size(835, 634)
        Me.dgvSperrliste.TabIndex = 23
        '
        'PictureBox2
@@ -696,7 +696,7 @@ Partial Class frmKundenblatt
        Me.tbZoll.Location = New System.Drawing.Point(4, 25)
        Me.tbZoll.Name = "tbZoll"
        Me.tbZoll.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbZoll.Size = New System.Drawing.Size(1623, 710)
+        Me.tbZoll.Size = New System.Drawing.Size(1623, 727)
        Me.tbZoll.TabIndex = 9
        Me.tbZoll.Text = "ZOLL"
        Me.tbZoll.UseVisualStyleBackColor = True
@@ -708,7 +708,7 @@ Partial Class frmKundenblatt
        Me.tbcntrZOLL.Location = New System.Drawing.Point(3, 3)
        Me.tbcntrZOLL.Name = "tbcntrZOLL"
        Me.tbcntrZOLL.SelectedIndex = 0
-        Me.tbcntrZOLL.Size = New System.Drawing.Size(1617, 704)
+        Me.tbcntrZOLL.Size = New System.Drawing.Size(1617, 721)
        Me.tbcntrZOLL.TabIndex = 0
        '
        'tabZoll_Artikel
@@ -716,7 +716,7 @@ Partial Class frmKundenblatt
        Me.tabZoll_Artikel.Location = New System.Drawing.Point(4, 22)
        Me.tabZoll_Artikel.Name = "tabZoll_Artikel"
        Me.tabZoll_Artikel.Padding = New System.Windows.Forms.Padding(3)
-        Me.tabZoll_Artikel.Size = New System.Drawing.Size(1609, 678)
+        Me.tabZoll_Artikel.Size = New System.Drawing.Size(1609, 695)
        Me.tabZoll_Artikel.TabIndex = 1
        Me.tabZoll_Artikel.Text = "Artikel"
        Me.tabZoll_Artikel.UseVisualStyleBackColor = True
@@ -727,7 +727,7 @@ Partial Class frmKundenblatt
        Me.tbMdm.Location = New System.Drawing.Point(4, 25)
        Me.tbMdm.Name = "tbMdm"
        Me.tbMdm.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbMdm.Size = New System.Drawing.Size(1623, 710)
+        Me.tbMdm.Size = New System.Drawing.Size(1630, 727)
        Me.tbMdm.TabIndex = 10
        Me.tbMdm.Text = "MDM"
        Me.tbMdm.UseVisualStyleBackColor = True
@@ -745,7 +745,7 @@ Partial Class frmKundenblatt
        Me.tbcntrMDM.Margin = New System.Windows.Forms.Padding(0)
        Me.tbcntrMDM.Name = "tbcntrMDM"
        Me.tbcntrMDM.SelectedIndex = 0
-        Me.tbcntrMDM.Size = New System.Drawing.Size(1617, 704)
+        Me.tbcntrMDM.Size = New System.Drawing.Size(1624, 721)
        Me.tbcntrMDM.TabIndex = 0
        '
        'tbSDL
@@ -757,7 +757,7 @@ Partial Class frmKundenblatt
        Me.tbSDL.Margin = New System.Windows.Forms.Padding(0)
        Me.tbSDL.Name = "tbSDL"
        Me.tbSDL.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbSDL.Size = New System.Drawing.Size(1609, 678)
+        Me.tbSDL.Size = New System.Drawing.Size(1616, 712)
        Me.tbSDL.TabIndex = 5
        Me.tbSDL.Text = "SDL-Leistungen"
        Me.tbSDL.UseVisualStyleBackColor = True
@@ -799,7 +799,7 @@ Partial Class frmKundenblatt
        DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
        Me.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle10
        Me.dgvSDLLeistungenFull.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1603, 482)
+        Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1610, 516)
        Me.dgvSDLLeistungenFull.TabIndex = 5
        '
        'Panel6
@@ -813,7 +813,7 @@ Partial Class frmKundenblatt
        Me.Panel6.Dock = System.Windows.Forms.DockStyle.Top
        Me.Panel6.Location = New System.Drawing.Point(3, 3)
        Me.Panel6.Name = "Panel6"
-        Me.Panel6.Size = New System.Drawing.Size(1603, 47)
+        Me.Panel6.Size = New System.Drawing.Size(1610, 47)
        Me.Panel6.TabIndex = 178
        '
        'Label28
@@ -903,9 +903,9 @@ Partial Class frmKundenblatt
        Me.Panel5.Controls.Add(Me.lblLetzterSA_SDL)
        Me.Panel5.Controls.Add(Me.rtbVermerke)
        Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.Panel5.Location = New System.Drawing.Point(3, 532)
+        Me.Panel5.Location = New System.Drawing.Point(3, 566)
        Me.Panel5.Name = "Panel5"
-        Me.Panel5.Size = New System.Drawing.Size(1603, 143)
+        Me.Panel5.Size = New System.Drawing.Size(1610, 143)
        Me.Panel5.TabIndex = 177
        '
        'Label35
@@ -1276,7 +1276,7 @@ Partial Class frmKundenblatt
        Me.tbSDLKarten.Location = New System.Drawing.Point(4, 22)
        Me.tbSDLKarten.Name = "tbSDLKarten"
        Me.tbSDLKarten.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbSDLKarten.Size = New System.Drawing.Size(1609, 678)
+        Me.tbSDLKarten.Size = New System.Drawing.Size(1609, 695)
        Me.tbSDLKarten.TabIndex = 7
        Me.tbSDLKarten.Text = "SDL-Kartenverwaltung"
        Me.tbSDLKarten.UseVisualStyleBackColor = True
@@ -1288,7 +1288,7 @@ Partial Class frmKundenblatt
        Me.tbLKW.Location = New System.Drawing.Point(4, 22)
        Me.tbLKW.Name = "tbLKW"
        Me.tbLKW.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbLKW.Size = New System.Drawing.Size(1609, 678)
+        Me.tbLKW.Size = New System.Drawing.Size(1616, 695)
        Me.tbLKW.TabIndex = 4
        Me.tbLKW.Text = "LKWs"
        Me.tbLKW.UseVisualStyleBackColor = True
@@ -1300,7 +1300,7 @@ Partial Class frmKundenblatt
        Me.pnlLKWRight.Location = New System.Drawing.Point(309, 3)
        Me.pnlLKWRight.Name = "pnlLKWRight"
        Me.pnlLKWRight.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0)
-        Me.pnlLKWRight.Size = New System.Drawing.Size(1297, 672)
+        Me.pnlLKWRight.Size = New System.Drawing.Size(1304, 689)
        Me.pnlLKWRight.TabIndex = 2
        '
        'pnlLKW
@@ -1311,7 +1311,7 @@ Partial Class frmKundenblatt
        Me.pnlLKW.Dock = System.Windows.Forms.DockStyle.Left
        Me.pnlLKW.Location = New System.Drawing.Point(3, 3)
        Me.pnlLKW.Name = "pnlLKW"
-        Me.pnlLKW.Size = New System.Drawing.Size(306, 672)
+        Me.pnlLKW.Size = New System.Drawing.Size(306, 689)
        Me.pnlLKW.TabIndex = 3
        '
        'dgvLKW
@@ -1352,7 +1352,7 @@ Partial Class frmKundenblatt
        Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle14
        Me.dgvLKW.RowHeadersVisible = False
        Me.dgvLKW.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvLKW.Size = New System.Drawing.Size(306, 498)
+        Me.dgvLKW.Size = New System.Drawing.Size(306, 515)
        Me.dgvLKW.TabIndex = 2
        '
        'pnlLKWBottom
@@ -1364,7 +1364,7 @@ Partial Class frmKundenblatt
        Me.pnlLKWBottom.Controls.Add(Me.Button13)
        Me.pnlLKWBottom.Controls.Add(Me.lblErgebnisse)
        Me.pnlLKWBottom.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.pnlLKWBottom.Location = New System.Drawing.Point(0, 560)
+        Me.pnlLKWBottom.Location = New System.Drawing.Point(0, 577)
        Me.pnlLKWBottom.Name = "pnlLKWBottom"
        Me.pnlLKWBottom.Size = New System.Drawing.Size(306, 112)
        Me.pnlLKWBottom.TabIndex = 3
@@ -1505,7 +1505,7 @@ Partial Class frmKundenblatt
        Me.tbVERAGCard.Location = New System.Drawing.Point(4, 22)
        Me.tbVERAGCard.Name = "tbVERAGCard"
        Me.tbVERAGCard.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbVERAGCard.Size = New System.Drawing.Size(1609, 678)
+        Me.tbVERAGCard.Size = New System.Drawing.Size(1609, 695)
        Me.tbVERAGCard.TabIndex = 6
        Me.tbVERAGCard.Text = "VERAG Card"
        Me.tbVERAGCard.UseVisualStyleBackColor = True
@@ -1517,7 +1517,7 @@ Partial Class frmKundenblatt
        Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill
        Me.Panel3.Location = New System.Drawing.Point(3, 3)
        Me.Panel3.Name = "Panel3"
-        Me.Panel3.Size = New System.Drawing.Size(1603, 672)
+        Me.Panel3.Size = New System.Drawing.Size(1603, 689)
        Me.Panel3.TabIndex = 0
        '
        'tbDokumente
@@ -1535,7 +1535,7 @@ Partial Class frmKundenblatt
        Me.tbDokumente.Controls.Add(Me.scanVertragVeragKd)
        Me.tbDokumente.Location = New System.Drawing.Point(4, 22)
        Me.tbDokumente.Name = "tbDokumente"
-        Me.tbDokumente.Size = New System.Drawing.Size(1609, 678)
+        Me.tbDokumente.Size = New System.Drawing.Size(1609, 695)
        Me.tbDokumente.TabIndex = 8
        Me.tbDokumente.Text = "Dokumente"
        Me.tbDokumente.UseVisualStyleBackColor = True
@@ -1733,7 +1733,7 @@ Partial Class frmKundenblatt
        Me.tbBesuchsberichte.Location = New System.Drawing.Point(4, 22)
        Me.tbBesuchsberichte.Name = "tbBesuchsberichte"
        Me.tbBesuchsberichte.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbBesuchsberichte.Size = New System.Drawing.Size(1609, 678)
+        Me.tbBesuchsberichte.Size = New System.Drawing.Size(1609, 695)
        Me.tbBesuchsberichte.TabIndex = 9
        Me.tbBesuchsberichte.Text = "Besuchsberichte"
        Me.tbBesuchsberichte.UseVisualStyleBackColor = True
@@ -1744,7 +1744,7 @@ Partial Class frmKundenblatt
        Me.tbOfferte.Location = New System.Drawing.Point(4, 25)
        Me.tbOfferte.Margin = New System.Windows.Forms.Padding(2)
        Me.tbOfferte.Name = "tbOfferte"
-        Me.tbOfferte.Size = New System.Drawing.Size(1623, 710)
+        Me.tbOfferte.Size = New System.Drawing.Size(1623, 727)
        Me.tbOfferte.TabIndex = 11
        Me.tbOfferte.Text = "Offerte"
        Me.tbOfferte.UseVisualStyleBackColor = True
@@ -1774,7 +1774,7 @@ Partial Class frmKundenblatt
        Me.btnAbfVerb.BackColor = System.Drawing.Color.White
        Me.btnAbfVerb.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnAbfVerb.ForeColor = System.Drawing.Color.Black
-        Me.btnAbfVerb.Location = New System.Drawing.Point(1003, 43)
+        Me.btnAbfVerb.Location = New System.Drawing.Point(1010, 43)
        Me.btnAbfVerb.Name = "btnAbfVerb"
        Me.btnAbfVerb.Size = New System.Drawing.Size(165, 25)
        Me.btnAbfVerb.TabIndex = 1
@@ -1788,7 +1788,7 @@ Partial Class frmKundenblatt
        Me.lblAbfVerb.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
        Me.lblAbfVerb.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.lblAbfVerb.ForeColor = System.Drawing.Color.White
-        Me.lblAbfVerb.Location = New System.Drawing.Point(1389, 117)
+        Me.lblAbfVerb.Location = New System.Drawing.Point(1396, 117)
        Me.lblAbfVerb.Name = "lblAbfVerb"
        Me.lblAbfVerb.Size = New System.Drawing.Size(242, 20)
        Me.lblAbfVerb.TabIndex = 2
@@ -1838,7 +1838,7 @@ Partial Class frmKundenblatt
        Me.mne.Location = New System.Drawing.Point(0, 31)
        Me.mne.Name = "mne"
        Me.mne.Padding = New System.Windows.Forms.Padding(5, 0, 0, 0)
-        Me.mne.Size = New System.Drawing.Size(1631, 81)
+        Me.mne.Size = New System.Drawing.Size(1638, 81)
        Me.mne.TabIndex = 3
        Me.mne.Text = "mnue"
        '
@@ -1934,7 +1934,7 @@ Partial Class frmKundenblatt
        Me.pnl.Dock = System.Windows.Forms.DockStyle.Top
        Me.pnl.Location = New System.Drawing.Point(0, 0)
        Me.pnl.Name = "pnl"
-        Me.pnl.Size = New System.Drawing.Size(1631, 112)
+        Me.pnl.Size = New System.Drawing.Size(1638, 112)
        Me.pnl.TabIndex = 0
        '
        'lblINAKTIV
@@ -1961,6 +1961,7 @@ Partial Class frmKundenblatt
        Me.KdSearchBox1._displayWoelflKd = False
        Me.KdSearchBox1._hideIfListEmpty = True
        Me.KdSearchBox1._loadKdData = False
+        Me.KdSearchBox1._searchName1 = True
        Me.KdSearchBox1._UseFIRMA = ""
        Me.KdSearchBox1._ValueKdAndName = True
        Me.KdSearchBox1.BackColor = System.Drawing.Color.White
@@ -1978,7 +1979,7 @@ Partial Class frmKundenblatt
        Me.KdSearchBox1.Name = "KdSearchBox1"
        Me.KdSearchBox1.nurAktive = False
        Me.KdSearchBox1.searchActive = True
-        Me.KdSearchBox1.Size = New System.Drawing.Size(1631, 34)
+        Me.KdSearchBox1.Size = New System.Drawing.Size(1638, 34)
        Me.KdSearchBox1.TabIndex = 0
        Me.KdSearchBox1.TIMER_SEARCH = True
        Me.KdSearchBox1.usrcntl = Nothing
@@ -2014,7 +2015,7 @@ Partial Class frmKundenblatt
        Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0)
        Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1"
-        Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1617, 704)
+        Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1617, 721)
        Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0
        '
        'usrcntlKarten
@@ -2024,7 +2025,7 @@ Partial Class frmKundenblatt
        Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3)
        Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.usrcntlKarten.Name = "usrcntlKarten"
-        Me.usrcntlKarten.Size = New System.Drawing.Size(1603, 672)
+        Me.usrcntlKarten.Size = New System.Drawing.Size(1603, 689)
        Me.usrcntlKarten.TabIndex = 0
        '
        'UsrCntlLKW1
@@ -2037,7 +2038,7 @@ Partial Class frmKundenblatt
        Me.UsrCntlLKW1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.UsrCntlLKW1.MaximumSize = New System.Drawing.Size(1200, 1000)
        Me.UsrCntlLKW1.Name = "UsrCntlLKW1"
-        Me.UsrCntlLKW1.Size = New System.Drawing.Size(1200, 672)
+        Me.UsrCntlLKW1.Size = New System.Drawing.Size(1200, 689)
        Me.UsrCntlLKW1.TabIndex = 0
        '
        'UsrCntlOfferte1
@@ -2047,7 +2048,7 @@ Partial Class frmKundenblatt
        Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0)
        Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1)
        Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1"
-        Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1623, 710)
+        Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1623, 727)
        Me.UsrCntlOfferte1.TabIndex = 0
        '
        'frmKundenblatt
@@ -2056,7 +2057,7 @@ Partial Class frmKundenblatt
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.AutoScroll = True
        Me.BackColor = System.Drawing.Color.White
-        Me.ClientSize = New System.Drawing.Size(1180, 868)
+        Me.ClientSize = New System.Drawing.Size(1180, 885)
        Me.Controls.Add(Me.lblAbfVerb)
        Me.Controls.Add(Me.btnAbfVerb)
        Me.Controls.Add(Me.tbcntrMain)
--- a/SDL/kunden/usrCntlLKW.Designer.vb
+++ b/SDL/kunden/usrCntlLKW.Designer.vb
@@ -40,7 +40,7 @@ Partial Class usrCntlLKW
        Me.Label3 = New System.Windows.Forms.Label()
        Me.btnNextSDL = New System.Windows.Forms.Button()
        Me.btnPrevSDL = New System.Windows.Forms.Button()
-        Me.Button3 = New System.Windows.Forms.Button()
+        Me.btnAddLeistung = New System.Windows.Forms.Button()
        Me.cntxtAddSdl = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.DToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
@@ -52,11 +52,11 @@ Partial Class usrCntlLKW
        Me.Label7 = New System.Windows.Forms.Label()
        Me.Label8 = New System.Windows.Forms.Label()
        Me.TabPage2 = New System.Windows.Forms.TabPage()
+        Me.scanMietVertrag = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
        Me.scanSonstiges = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
        Me.scanZulassungsschein = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
        Me.scanLeasingVertrag = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
        Me.scanCEMT = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
-        Me.scanMietVertrag = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
        CType(Me.dgvSDLLeistungen, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.cntxtSDLLeistungenOptions.SuspendLayout()
        Me.pnlSDLLeistungenDetails.SuspendLayout()
@@ -228,19 +228,19 @@ Partial Class usrCntlLKW
        Me.btnPrevSDL.Text = "⇑"
        Me.btnPrevSDL.UseVisualStyleBackColor = True
        '
-        'Button3
+        'btnAddLeistung
        '
-        Me.Button3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
-        Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button3.Image = Global.SDL.My.Resources.Resources.plus
-        Me.Button3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Button3.Location = New System.Drawing.Point(354, 2)
-        Me.Button3.Name = "Button3"
-        Me.Button3.Size = New System.Drawing.Size(146, 49)
-        Me.Button3.TabIndex = 151
-        Me.Button3.Text = "Leistung hinzufügen"
-        Me.Button3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button3.UseVisualStyleBackColor = True
+        Me.btnAddLeistung.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
+        Me.btnAddLeistung.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnAddLeistung.Image = Global.SDL.My.Resources.Resources.plus
+        Me.btnAddLeistung.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnAddLeistung.Location = New System.Drawing.Point(354, 2)
+        Me.btnAddLeistung.Name = "btnAddLeistung"
+        Me.btnAddLeistung.Size = New System.Drawing.Size(146, 49)
+        Me.btnAddLeistung.TabIndex = 151
+        Me.btnAddLeistung.Text = "Leistung hinzufügen"
+        Me.btnAddLeistung.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnAddLeistung.UseVisualStyleBackColor = True
        '
        'cntxtAddSdl
        '
@@ -315,7 +315,7 @@ Partial Class usrCntlLKW
        Me.TabPage1.Controls.Add(Me.Label7)
        Me.TabPage1.Controls.Add(Me.btnNextSDL)
        Me.TabPage1.Controls.Add(Me.Label8)
-        Me.TabPage1.Controls.Add(Me.Button3)
+        Me.TabPage1.Controls.Add(Me.btnAddLeistung)
        Me.TabPage1.Location = New System.Drawing.Point(4, 19)
        Me.TabPage1.Name = "TabPage1"
        Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
@@ -366,6 +366,26 @@ Partial Class usrCntlLKW
        Me.TabPage2.Text = "Dokumente"
        Me.TabPage2.UseVisualStyleBackColor = True
        '
+        'scanMietVertrag
+        '
+        Me.scanMietVertrag._ARCHIV = True
+        Me.scanMietVertrag._DATENSERVER_KATEGORIE = "DOKUMENTE"
+        Me.scanMietVertrag._DATENSERVER_ORDNER = "MDM"
+        Me.scanMietVertrag._DATENSERVER_UOrdner1 = Nothing
+        Me.scanMietVertrag._DATENSERVER_UOrdner2 = Nothing
+        Me.scanMietVertrag._DATENSERVER_UOrdner3 = Nothing
+        Me.scanMietVertrag._MULTI_FILES = True
+        Me.scanMietVertrag._TEXT_PDF = "Miet-Vertrag"
+        Me.scanMietVertrag.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+        Me.scanMietVertrag.BackColor = System.Drawing.Color.White
+        Me.scanMietVertrag.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.scanMietVertrag.Cursor = System.Windows.Forms.Cursors.Default
+        Me.scanMietVertrag.Enabled = False
+        Me.scanMietVertrag.Location = New System.Drawing.Point(138, 29)
+        Me.scanMietVertrag.Name = "scanMietVertrag"
+        Me.scanMietVertrag.Size = New System.Drawing.Size(126, 22)
+        Me.scanMietVertrag.TabIndex = 163
+        '
        'scanSonstiges
        '
        Me.scanSonstiges._DATENSERVER_KATEGORIE = "DOKUMENTE"
@@ -446,26 +466,6 @@ Partial Class usrCntlLKW
        Me.scanCEMT.Size = New System.Drawing.Size(126, 22)
        Me.scanCEMT.TabIndex = 159
        '
-        'scanMietVertrag
-        '
-        Me.scanMietVertrag._ARCHIV = True
-        Me.scanMietVertrag._DATENSERVER_KATEGORIE = "DOKUMENTE"
-        Me.scanMietVertrag._DATENSERVER_ORDNER = "MDM"
-        Me.scanMietVertrag._DATENSERVER_UOrdner1 = Nothing
-        Me.scanMietVertrag._DATENSERVER_UOrdner2 = Nothing
-        Me.scanMietVertrag._DATENSERVER_UOrdner3 = Nothing
-        Me.scanMietVertrag._MULTI_FILES = True
-        Me.scanMietVertrag._TEXT_PDF = "Miet-Vertrag"
-        Me.scanMietVertrag.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
-        Me.scanMietVertrag.BackColor = System.Drawing.Color.White
-        Me.scanMietVertrag.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.scanMietVertrag.Cursor = System.Windows.Forms.Cursors.Default
-        Me.scanMietVertrag.Enabled = False
-        Me.scanMietVertrag.Location = New System.Drawing.Point(138, 29)
-        Me.scanMietVertrag.Name = "scanMietVertrag"
-        Me.scanMietVertrag.Size = New System.Drawing.Size(126, 22)
-        Me.scanMietVertrag.TabIndex = 163
-        '
        'usrCntlLKW
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -506,7 +506,7 @@ Partial Class usrCntlLKW
    Friend WithEvents btnNextSDL As System.Windows.Forms.Button
    Friend WithEvents btnPrevSDL As System.Windows.Forms.Button
    Friend WithEvents Label4 As System.Windows.Forms.Label
-    Friend WithEvents Button3 As System.Windows.Forms.Button
+    Friend WithEvents btnAddLeistung As System.Windows.Forms.Button
    Friend WithEvents cntxtAddSdl As System.Windows.Forms.ContextMenuStrip
    Friend WithEvents DToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
    Friend WithEvents cntxtSDLLeistungenOptions As System.Windows.Forms.ContextMenuStrip
--- a/SDL/kunden/usrCntlLKW.vb
+++ b/SDL/kunden/usrCntlLKW.vb
@@ -2,6 +2,7 @@
 Imports System.Reflection
 Imports System.ComponentModel
 Imports System.Windows.Media
+Imports sun.reflect

 Public Class usrCntlLKW
    Dim kdnr As String
@@ -34,7 +35,7 @@ Public Class usrCntlLKW
    End Sub
    'Dim usrCntlBinding As cBinding = Nothing

- 
+

    '    Private Sub usrCntlLKW_Changed(kdNr As Object, newKfz As Object, SDLNr As Object, History As Object) Handles Me.Changed
    '      init(kdNr, kz, lkwNationalitaet, erfassungsdatum, aenderungsdatum, sachbearbeiter)
@@ -45,7 +46,7 @@ Public Class usrCntlLKW
        init(kdnr, kz, lkwNationalitaet, erfassungsdatum, aenderungsdatum, sachbearbeiter)

        If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_Leistungen_bearbeiten", Me.FindForm) Then
-            Button3.Enabled = False
+            btnAddLeistung.Enabled = False
        End If
        loaded = True
    End Sub
@@ -436,6 +437,17 @@ Public Class usrCntlLKW
                                                End Sub


+                ElseIf dgvSDLLeistungen.SelectedRows(0).Cells(2).Value = 2017 Then ' PLOSE CZ
+                    Dim usrcntl As New usrCntlSDLLeistungenPLOSE_MEDPASS(dgvSDLLeistungen.SelectedRows(0).Cells(0).Value, dgvSDLLeistungen.SelectedRows(0).Cells(1).Value, dgvSDLLeistungen.SelectedRows(0).Cells(2).Value, dgvSDLLeistungen.SelectedRows(0).Cells(3).Value)
+                    pnlSDLLeistungenDetails.Controls.Add(usrcntl)
+                    AddHandler usrcntl.LKWChanged, Sub(kdNr, newKfz, SDLNr, History)
+                                                       RaiseEvent LKWChanged(kdNr, newKfz, SDLNr, History)
+                                                   End Sub
+                    AddHandler usrcntl.CHANGED, Sub(kdNr, newKfz, SDLNr, History)
+                                                    doChange(kdNr, newKfz, SDLNr, History)
+                                                End Sub
+
+
                ElseIf dgvSDLLeistungen.SelectedRows(0).Cells(2).Value = 500 Then ' MAN
                    Dim usrcntl As New usrCntlSDLLeistungenMANAbgas(dgvSDLLeistungen.SelectedRows(0).Cells(0).Value, dgvSDLLeistungen.SelectedRows(0).Cells(1).Value, dgvSDLLeistungen.SelectedRows(0).Cells(2).Value, dgvSDLLeistungen.SelectedRows(0).Cells(3).Value)
                    pnlSDLLeistungenDetails.Controls.Add(usrcntl)
@@ -456,6 +468,16 @@ Public Class usrCntlLKW
                                                    doChange(kdNr, newKfz, SDLNr, History)
                                                End Sub

+                ElseIf dgvSDLLeistungen.SelectedRows(0).Cells(2).Value = 502 Then ' parkplatz
+                    Dim usrcntl As New usrCntlSDLLeistungVERAGCardNEU(dgvSDLLeistungen.SelectedRows(0).Cells(0).Value, dgvSDLLeistungen.SelectedRows(0).Cells(1).Value, dgvSDLLeistungen.SelectedRows(0).Cells(2).Value, dgvSDLLeistungen.SelectedRows(0).Cells(3).Value)
+                    pnlSDLLeistungenDetails.Controls.Add(usrcntl)
+                    AddHandler usrcntl.LKWChanged, Sub(kdNr, newKfz, SDLNr, History)
+                                                       RaiseEvent LKWChanged(kdNr, newKfz, SDLNr, History)
+                                                   End Sub
+                    AddHandler usrcntl.CHANGED, Sub(kdNr, newKfz, SDLNr, History)
+                                                    doChange(kdNr, newKfz, SDLNr, History)
+                                                End Sub
+
                End If

                ' If Not usrCntlBinding Is Nothing Then
@@ -487,7 +509,7 @@ Public Class usrCntlLKW
        list.RemoveHandler(obj, list(obj))
    End Sub

-  
+

    'Private Sub setChange()
    '     valueChanged = True
@@ -524,18 +546,25 @@ Public Class usrCntlLKW
    End Sub


-    Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
+    Private Sub Button3_Click(sender As Object, e As EventArgs) Handles btnAddLeistung.Click
        Dim Speditionsdienstleistungen As List(Of cSpeditionsdienstleistungen) = kundenSQL.getSpeditionsdienstleistungenByKdNr(kdnr)
        cntxtAddSdl.Items.Clear()
        For Each s In Speditionsdienstleistungen
+            'Select Case s.SDLNr
+            '    Case 501, 502 ' Parkplatzkarten sollten hier nicht hinzugefügt werden können....
+
+
+            'Case Else
            Dim i As New ToolStripMenuItem
-            i.Text = s.SDLNr & " - " & s.SDLBez
-            i.Name = "tsmiSDLNr_" & s.SDLNr
-            cntxtAddSdl.Items.Add(i)
-            If s.Sperre <> 0 Then i.Enabled = False : i.Text = i.Text & " (gesperrt)"
-            AddHandler i.Click, AddressOf DToolStripMenuItem_Click
+                    i.Text = s.SDLNr & " - " & s.SDLBez
+                    i.Name = "tsmiSDLNr_" & s.SDLNr
+                    cntxtAddSdl.Items.Add(i)
+                    If s.Sperre <> 0 Then i.Enabled = False : i.Text = i.Text & " (gesperrt)"
+                    AddHandler i.Click, AddressOf DToolStripMenuItem_Click
+
+            ' End Select
        Next
-        Button3.ContextMenuStrip = cntxtAddSdl
+        btnAddLeistung.ContextMenuStrip = cntxtAddSdl
        ' cntxtAddSdl
        Dim ptLowerLeft As New Point(sender.width, sender.Height)
        ptLowerLeft = sender.PointToScreen(ptLowerLeft)
@@ -553,11 +582,12 @@ Public Class usrCntlLKW
            Dim cpf As New cProgramFunctions

            Dim hist = -1
-            If sdlNr = "501" Then
-                hist = cpf.newEntryVERAG_Card(kdnr, kz, sdlNr)
-            Else
-                hist = cpf.newEntry(kdnr, kz, sdlNr)
-            End If
+            Select Case sdlNr
+                Case 501, 502
+                    hist = cpf.newEntryVERAG_Card(kdnr, kz, sdlNr)
+                Case Else
+                    hist = cpf.newEntry(kdnr, kz, sdlNr)
+            End Select


            If hist > 0 Then
@@ -609,7 +639,7 @@ Public Class usrCntlLKW

    Sub deletedgvSDLLeistungenRow()
        If dgvSDLLeistungen.SelectedRows.Count > 0 Then
-            If dgvSDLLeistungen.SelectedRows(0).Cells(2).Value = "501" Then
+            If dgvSDLLeistungen.SelectedRows(0).Cells(2).Value = "501" Or dgvSDLLeistungen.SelectedRows(0).Cells(2).Value = "502" Then
                MsgBox("VERAG-Parkplatzkarten können nicht gelöscht werden. Bitte auf gesperrt/verloren/gestohlen/defekt setzen!")
                Exit Sub
            End If
--- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb
+++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb
@@ -764,6 +764,7 @@ Public Class usrcntlKundeBearbeitenFull
        cboSonst_Rechnungsdruck.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Formular", "0"))
        cboSonst_Rechnungsdruck.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Fax", "1"))
        cboSonst_Rechnungsdruck.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("E-Mail", "2"))
+        cboSonst_Rechnungsdruck.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Mail+Kopie", "5"))

        cboAbf_Sammelrechnung.Items.Clear()
        cboAbf_Sammelrechnung.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("0 - nein", "0"))