Kundenlimit Verag360

SDL/Fakturierung/frmAbrechnungsMaske.vb

@@ -53,7 +53,7 @@ Public Class frmAbrechnungsMaske
             FirmaTmp = "VERAGIMEX"
         End If
 
-        'FirmaTmp = "AMBAR"
+        FirmaTmp = "AMBAR"
 
         cboSachbearbeiter.Items.Clear()
 

SDL/Fakturierung/frmRechnungenSuche.vb

@@ -10,7 +10,7 @@ Public Class frmRechnungenSuche
         Dim sqlstr As String = ""
         Dim TopMax = If(IsNumeric(txtMaxSrch.Text), " TOP " & txtMaxSrch.Text, "")
         sqlstr &= "SELECT " & TopMax & " RK_ID,[RechnungsNr],cast([RechnungsDatum] as date) RechnungsDatum, Sammelrechnung, [FilialenNr],[AbfertigungsNr],[UnterNr],cast(Abfertigungsdatum as date) Abfertigungsdatum,  isnull(cast(RechnungsKundenNr as nvarchar(10)) + ' ','') + [RechnungsName 1] as [RechnungAn], " &
-                " /* isnull(cast([AbsenderKundenNr] as nvarchar(10)) + ' ','') + [AbsenderName 1] as Absender,isnull(cast([EmpfängerKundenNr] as nvarchar(10)) + ' ','') + [EmpfängerName 1] as Empfänger,*/ isnull(cast([VermittlerKundenNr] as nvarchar(10)) + ' ','') + [VermittlerName 1] as Vermittler, [LKW Kennzeichen],Sachbearbeiter,[SteuerpflichtigerGesamtbetrag],[SteuerfreierGesamtbetrag] " &
+                " /* isnull(cast([AbsenderKundenNr] as nvarchar(10)) + ' ','') + [AbsenderName 1] as Absender,isnull(cast([EmpfängerKundenNr] as nvarchar(10)) + ' ','') + [EmpfängerName 1] as Empfänger,*/ isnull(cast([VermittlerKundenNr] as nvarchar(10)) + ' ','') + [VermittlerName 1] as Vermittler, [LKW Kennzeichen],Sachbearbeiter,[SteuerpflichtigerGesamtbetrag],[SteuerfreierGesamtbetrag], isnull(zugferdcheck,0) as ZUGFeRD " &
                 " FROM [Rechnungsausgang] WHERE 1=1 "
 
         With DataGridView
@@ -85,6 +85,9 @@ Public Class frmRechnungenSuche
             .Columns("SteuerfreierGesamtbetrag").HeaderText = "Betrag (stfr.)"
             .Columns("SteuerfreierGesamtbetrag").DefaultCellStyle.Format = "N2"
 
+            .Columns("ZUGFeRD").Width = 60
+            .Columns("ZUGFeRD").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter
+
             lblErgebnis.Text = "Ergebnisse: " & .RowCount
             lblunterschRe.Text = "Anz. untersch. Belege: " & .Rows.Cast(Of DataGridViewRow)().[Select](Function(r) CInt(IIf(Not IsDBNull(r.Cells("RechnungsNr").Value), r.Cells("RechnungsNr").Value, 0))).Distinct().Count()
 

SDL/Fakturierung/usrCntlFaktAbrechnung.vb

@@ -4806,7 +4806,11 @@ Nächste_Textzeile_lesen:
             End Select
         Next
 
-        If Not PosWithWEustOrVerz Then Exit Sub
+        If Not PosWithWEustOrVerz Then
+            MsgBox("Rechnung enthält keine Verzollung und/oder EUST!" & vbNewLine & "Vorgang wird abgebrochen.")
+            Exit Sub
+        End If
+
 
         If vbYes = MsgBox(abfrage, vbYesNoCancel) Then
             saveMe()

SDL/kunden/frmKundenblatt.Designer.vb

@@ -56,7 +56,6 @@ Partial Class frmKundenblatt
         Me.txtInfotext = New System.Windows.Forms.Label()
         Me.tbFirmendaten = New System.Windows.Forms.TabPage()
         Me.Panel4 = New System.Windows.Forms.Panel()
-        Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull()
         Me.tbcntrMain = New System.Windows.Forms.TabControl()
         Me.tbAllgemein = New System.Windows.Forms.TabPage()
         Me.Button8 = New System.Windows.Forms.Button()
@@ -161,10 +160,8 @@ Partial Class frmKundenblatt
         Me.lblLetzterSA_SDL = New System.Windows.Forms.Label()
         Me.rtbVermerke = New System.Windows.Forms.RichTextBox()
         Me.tbSDLKarten = New System.Windows.Forms.TabPage()
-        Me.usrcntlKarten = New SDL.usrCntlKartenDaten()
         Me.tbLKW = New System.Windows.Forms.TabPage()
         Me.pnlLKWRight = New System.Windows.Forms.Panel()
-        Me.UsrCntlLKW1 = New SDL.usrCntlLKW()
         Me.pnlLKW = New System.Windows.Forms.Panel()
         Me.dgvLKW = New System.Windows.Forms.DataGridView()
         Me.pnlLKWBottom = New System.Windows.Forms.Panel()
@@ -194,11 +191,9 @@ Partial Class frmKundenblatt
         Me.scanPersonalAusweisGF = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
         Me.scanBankGarantie = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
         Me.scanVertragVeragKd = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
-        Me.UsrCntlKundenlogin1 = New SDL.usrCntlKundenlogin()
         Me.tbBesuchsberichte = New System.Windows.Forms.TabPage()
         Me.tbFremdrechnungen = New System.Windows.Forms.TabPage()
         Me.tbOfferte = New System.Windows.Forms.TabPage()
-        Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte()
         Me.tbUSTV = New System.Windows.Forms.TabPage()
         Me.tbcntrUSTV = New System.Windows.Forms.TabControl()
         Me.tbUSTVDokumente = New System.Windows.Forms.TabPage()
@@ -209,7 +204,6 @@ Partial Class frmKundenblatt
         Me.scanUSTVFABest = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
         Me.scanUSTVVollmachten = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
         Me.tbUSTVAntrage = New System.Windows.Forms.TabPage()
-        Me.UsrCntlUSTV = New SDL.usrCntlUSTV()
         Me.tbFIBU = New System.Windows.Forms.TabPage()
         Me.txtZinsbelastungTolInTagen = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.Label23 = New System.Windows.Forms.Label()
@@ -263,6 +257,14 @@ Partial Class frmKundenblatt
         Me.tbiLKW = New System.Windows.Forms.ToolStripMenuItem()
         Me.tbiVERAGCard = New System.Windows.Forms.ToolStripMenuItem()
         Me.cm_goboxen = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull()
+        Me.usrcntlKarten = New SDL.usrCntlKartenDaten()
+        Me.UsrCntlLKW1 = New SDL.usrCntlLKW()
+        Me.UsrCntlKundenlogin1 = New SDL.usrCntlKundenlogin()
+        Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte()
+        Me.UsrCntlUSTV = New SDL.usrCntlUSTV()
+        Me.Label24 = New System.Windows.Forms.Label()
+        Me.txtKundenlimit = New System.Windows.Forms.TextBox()
         Me.pnlInfo.SuspendLayout()
         Me.tbFirmendaten.SuspendLayout()
         Me.Panel4.SuspendLayout()
@@ -365,16 +367,6 @@ Partial Class frmKundenblatt
         Me.Panel4.Size = New System.Drawing.Size(1675, 990)
         Me.Panel4.TabIndex = 0
         '
-        'UsrcntlKundeBearbeitenFull1
-        '
-        Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White
-        Me.UsrcntlKundeBearbeitenFull1.Dock = System.Windows.Forms.DockStyle.Fill
-        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(1675, 990)
-        Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0
-        '
         'tbcntrMain
         '
         Me.tbcntrMain.Appearance = System.Windows.Forms.TabAppearance.FlatButtons
@@ -1573,6 +1565,8 @@ Partial Class frmKundenblatt
         '
         'Panel5
         '
+        Me.Panel5.Controls.Add(Me.txtKundenlimit)
+        Me.Panel5.Controls.Add(Me.Label24)
         Me.Panel5.Controls.Add(Me.Label22)
         Me.Panel5.Controls.Add(Me.btnBestelldateiErzeugen)
         Me.Panel5.Controls.Add(Me.Label35)
@@ -1974,7 +1968,7 @@ Partial Class frmKundenblatt
         Me.rtbVermerke.Location = New System.Drawing.Point(6, 18)
         Me.rtbVermerke.Name = "rtbVermerke"
         Me.rtbVermerke.ReadOnly = True
-        Me.rtbVermerke.Size = New System.Drawing.Size(442, 119)
+        Me.rtbVermerke.Size = New System.Drawing.Size(442, 104)
         Me.rtbVermerke.TabIndex = 7
         Me.rtbVermerke.Text = ""
         '
@@ -1984,21 +1978,11 @@ 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(178, 39)
+        Me.tbSDLKarten.Size = New System.Drawing.Size(1667, 964)
         Me.tbSDLKarten.TabIndex = 7
         Me.tbSDLKarten.Text = "SDL-Kartenverwaltung"
         Me.tbSDLKarten.UseVisualStyleBackColor = True
         '
-        'usrcntlKarten
-        '
-        Me.usrcntlKarten.Cursor = System.Windows.Forms.Cursors.Default
-        Me.usrcntlKarten.Dock = System.Windows.Forms.DockStyle.Fill
-        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(172, 33)
-        Me.usrcntlKarten.TabIndex = 0
-        '
         'tbLKW
         '
         Me.tbLKW.Controls.Add(Me.pnlLKWRight)
@@ -2006,7 +1990,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(178, 39)
+        Me.tbLKW.Size = New System.Drawing.Size(1667, 964)
         Me.tbLKW.TabIndex = 4
         Me.tbLKW.Text = "LKWs"
         Me.tbLKW.UseVisualStyleBackColor = True
@@ -2018,22 +2002,9 @@ 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(0, 33)
+        Me.pnlLKWRight.Size = New System.Drawing.Size(1355, 958)
         Me.pnlLKWRight.TabIndex = 2
         '
-        'UsrCntlLKW1
-        '
-        Me.UsrCntlLKW1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlLKW1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.UsrCntlLKW1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.UsrCntlLKW1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrCntlLKW1.Location = New System.Drawing.Point(10, 0)
-        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(0, 33)
-        Me.UsrCntlLKW1.TabIndex = 0
-        '
         'pnlLKW
         '
         Me.pnlLKW.Controls.Add(Me.dgvLKW)
@@ -2042,7 +2013,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, 33)
+        Me.pnlLKW.Size = New System.Drawing.Size(306, 958)
         Me.pnlLKW.TabIndex = 3
         '
         'dgvLKW
@@ -2083,7 +2054,7 @@ Partial Class frmKundenblatt
         Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle28
         Me.dgvLKW.RowHeadersVisible = False
         Me.dgvLKW.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvLKW.Size = New System.Drawing.Size(306, 0)
+        Me.dgvLKW.Size = New System.Drawing.Size(306, 784)
         Me.dgvLKW.TabIndex = 2
         '
         'pnlLKWBottom
@@ -2095,7 +2066,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, -79)
+        Me.pnlLKWBottom.Location = New System.Drawing.Point(0, 846)
         Me.pnlLKWBottom.Name = "pnlLKWBottom"
         Me.pnlLKWBottom.Size = New System.Drawing.Size(306, 112)
         Me.pnlLKWBottom.TabIndex = 3
@@ -2236,7 +2207,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(178, 39)
+        Me.tbVERAGCard.Size = New System.Drawing.Size(1667, 964)
         Me.tbVERAGCard.TabIndex = 6
         Me.tbVERAGCard.Text = "VERAG Card"
         Me.tbVERAGCard.UseVisualStyleBackColor = True
@@ -2248,7 +2219,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(172, 33)
+        Me.Panel3.Size = New System.Drawing.Size(1661, 958)
         Me.Panel3.TabIndex = 0
         '
         'tbDokumente
@@ -2268,7 +2239,7 @@ Partial Class frmKundenblatt
         Me.tbDokumente.Controls.Add(Me.UsrCntlKundenlogin1)
         Me.tbDokumente.Location = New System.Drawing.Point(4, 22)
         Me.tbDokumente.Name = "tbDokumente"
-        Me.tbDokumente.Size = New System.Drawing.Size(178, 39)
+        Me.tbDokumente.Size = New System.Drawing.Size(1667, 964)
         Me.tbDokumente.TabIndex = 8
         Me.tbDokumente.Text = "Dokumente"
         Me.tbDokumente.UseVisualStyleBackColor = True
@@ -2473,19 +2444,12 @@ Partial Class frmKundenblatt
         Me.scanVertragVeragKd.Size = New System.Drawing.Size(168, 24)
         Me.scanVertragVeragKd.TabIndex = 0
         '
-        'UsrCntlKundenlogin1
-        '
-        Me.UsrCntlKundenlogin1.Location = New System.Drawing.Point(799, 40)
-        Me.UsrCntlKundenlogin1.Name = "UsrCntlKundenlogin1"
-        Me.UsrCntlKundenlogin1.Size = New System.Drawing.Size(452, 236)
-        Me.UsrCntlKundenlogin1.TabIndex = 7
-        '
         'tbBesuchsberichte
         '
         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(178, 39)
+        Me.tbBesuchsberichte.Size = New System.Drawing.Size(1667, 964)
         Me.tbBesuchsberichte.TabIndex = 9
         Me.tbBesuchsberichte.Text = "Besuchsberichte"
         Me.tbBesuchsberichte.UseVisualStyleBackColor = True
@@ -2494,7 +2458,7 @@ Partial Class frmKundenblatt
         '
         Me.tbFremdrechnungen.Location = New System.Drawing.Point(4, 22)
         Me.tbFremdrechnungen.Name = "tbFremdrechnungen"
-        Me.tbFremdrechnungen.Size = New System.Drawing.Size(178, 39)
+        Me.tbFremdrechnungen.Size = New System.Drawing.Size(1667, 964)
         Me.tbFremdrechnungen.TabIndex = 10
         Me.tbFremdrechnungen.Text = "Fremdrechnungen"
         Me.tbFremdrechnungen.UseVisualStyleBackColor = True
@@ -2510,16 +2474,6 @@ Partial Class frmKundenblatt
         Me.tbOfferte.Text = "Offerte"
         Me.tbOfferte.UseVisualStyleBackColor = True
         '
-        'UsrCntlOfferte1
-        '
-        Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill
-        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(1681, 996)
-        Me.UsrCntlOfferte1.TabIndex = 0
-        '
         'tbUSTV
         '
         Me.tbUSTV.Controls.Add(Me.tbcntrUSTV)
@@ -2653,19 +2607,11 @@ Partial Class frmKundenblatt
         Me.tbUSTVAntrage.Location = New System.Drawing.Point(4, 22)
         Me.tbUSTVAntrage.Name = "tbUSTVAntrage"
         Me.tbUSTVAntrage.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbUSTVAntrage.Size = New System.Drawing.Size(184, 45)
+        Me.tbUSTVAntrage.Size = New System.Drawing.Size(1673, 970)
         Me.tbUSTVAntrage.TabIndex = 9
         Me.tbUSTVAntrage.Text = "USTV-Anträge"
         Me.tbUSTVAntrage.UseVisualStyleBackColor = True
         '
-        'UsrCntlUSTV
-        '
-        Me.UsrCntlUSTV.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrCntlUSTV.Location = New System.Drawing.Point(3, 3)
-        Me.UsrCntlUSTV.Name = "UsrCntlUSTV"
-        Me.UsrCntlUSTV.Size = New System.Drawing.Size(178, 39)
-        Me.UsrCntlUSTV.TabIndex = 0
-        '
         'tbFIBU
         '
         Me.tbFIBU.Controls.Add(Me.txtZinsbelastungTolInTagen)
@@ -3138,7 +3084,7 @@ Partial Class frmKundenblatt
         '
         Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM"
-        Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8
+        Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4
         Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4)
         Me.cntxtCntxtMDM.Text = "cntxtMDM"
         '
@@ -3305,6 +3251,82 @@ Partial Class frmKundenblatt
         Me.cm_goboxen.Name = "cm_goboxen"
         Me.cm_goboxen.Size = New System.Drawing.Size(61, 4)
         '
+        'UsrcntlKundeBearbeitenFull1
+        '
+        Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White
+        Me.UsrcntlKundeBearbeitenFull1.Dock = System.Windows.Forms.DockStyle.Fill
+        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(1675, 990)
+        Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0
+        '
+        'usrcntlKarten
+        '
+        Me.usrcntlKarten.Cursor = System.Windows.Forms.Cursors.Default
+        Me.usrcntlKarten.Dock = System.Windows.Forms.DockStyle.Fill
+        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(1661, 958)
+        Me.usrcntlKarten.TabIndex = 0
+        '
+        'UsrCntlLKW1
+        '
+        Me.UsrCntlLKW1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlLKW1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.UsrCntlLKW1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.UsrCntlLKW1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrCntlLKW1.Location = New System.Drawing.Point(10, 0)
+        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, 958)
+        Me.UsrCntlLKW1.TabIndex = 0
+        '
+        'UsrCntlKundenlogin1
+        '
+        Me.UsrCntlKundenlogin1.Location = New System.Drawing.Point(799, 40)
+        Me.UsrCntlKundenlogin1.Name = "UsrCntlKundenlogin1"
+        Me.UsrCntlKundenlogin1.Size = New System.Drawing.Size(452, 236)
+        Me.UsrCntlKundenlogin1.TabIndex = 7
+        '
+        'UsrCntlOfferte1
+        '
+        Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill
+        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(1681, 996)
+        Me.UsrCntlOfferte1.TabIndex = 0
+        '
+        'UsrCntlUSTV
+        '
+        Me.UsrCntlUSTV.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrCntlUSTV.Location = New System.Drawing.Point(3, 3)
+        Me.UsrCntlUSTV.Name = "UsrCntlUSTV"
+        Me.UsrCntlUSTV.Size = New System.Drawing.Size(1667, 964)
+        Me.UsrCntlUSTV.TabIndex = 0
+        '
+        'Label24
+        '
+        Me.Label24.AutoSize = True
+        Me.Label24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label24.Location = New System.Drawing.Point(4, 125)
+        Me.Label24.Name = "Label24"
+        Me.Label24.Size = New System.Drawing.Size(64, 13)
+        Me.Label24.TabIndex = 181
+        Me.Label24.Text = "Kundenlimit:"
+        '
+        'txtKundenlimit
+        '
+        Me.txtKundenlimit.Enabled = False
+        Me.txtKundenlimit.Location = New System.Drawing.Point(74, 122)
+        Me.txtKundenlimit.Name = "txtKundenlimit"
+        Me.txtKundenlimit.Size = New System.Drawing.Size(147, 20)
+        Me.txtKundenlimit.TabIndex = 4
+        '
         'frmKundenblatt
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -3616,4 +3638,6 @@ Partial Class frmKundenblatt
     Friend WithEvents cm_goboxen As ContextMenuStrip
     Friend WithEvents txtZinsbelastungTolInTagen As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents Label23 As Label
+    Friend WithEvents Label24 As Label
+    Friend WithEvents txtKundenlimit As TextBox
 End Class

SDL/kunden/frmKundenblatt.vb

@@ -105,7 +105,7 @@ Public Class frmKundenblatt
         tbcntrMain.Visible = True
     End Sub
 
-    Private Sub frmKundenblatt_Load(sender As Object, e As EventArgs) Handles Me.Load
+    Private Sub frmKundenblatt_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         'TabControl1.ItemSize = New Size(0, 0)
         ' Me.TabControl1.Visible = False
         tbcntrMain.Appearance = TabAppearance.FlatButtons
@@ -269,7 +269,7 @@ Public Class frmKundenblatt
         End If
         ' lblFirma.Text = KUNDE.Kurzname
     End Sub
-    Private Sub TabControl1_TabIndexChanged(sender As Object, e As EventArgs) Handles tbcntrMain.SelectedIndexChanged, tbcntrMDM.SelectedIndexChanged, tbcntrUSTV.SelectedIndexChanged
+    Private Sub TabControl1_TabIndexChanged(sender As Object, e As EventArgs) Handles tbcntrUSTV.SelectedIndexChanged, tbcntrMDM.SelectedIndexChanged, tbcntrMain.SelectedIndexChanged
         ' tbcntrMDM.SuspendLayout()
         '  If kdNr <= 0 Then changeTab(0, AllgemeinToolStripMenuItem) : Exit Sub
         If kdNr <= 0 Then changeTab(1, ToolStripMenuItem2) : Exit Sub
@@ -532,7 +532,7 @@ Public Class frmKundenblatt
         'Dim d As New SqlDataAdapter()
         Try
             Dim connectionString As String = cSqlDb.GetSDLConnectionString
-            Dim sqlstr As String = " SELECT KundenSDL.SDLNr, Speditionsdienstleistungen.SDLBez,[Sperre], [Sperrdatum], [Vertretungsvollmacht], [Auszahlungsvollmacht], [Finanzamtbestätigung], [Antragsdatum],[Vermerk],  KundenSDL.[Erfassungsdatum], KundenSDL.[Änderungsdatum],KundenSDL.[Sachbearbeiter] " &
+            Dim sqlstr As String = " SELECT KundenSDL.SDLNr, Speditionsdienstleistungen.SDLBez,[Sperre], [Sperrdatum], [Vertretungsvollmacht], [Auszahlungsvollmacht], [Finanzamtbestätigung], [Antragsdatum],[Vermerk],  KundenSDL.[Erfassungsdatum], KundenSDL.[Änderungsdatum],KundenSDL.[Sachbearbeiter],KundenSDL.Kundenlimit " &
                                    " FROM KundenSDL INNER JOIN Speditionsdienstleistungen ON Speditionsdienstleistungen.SDLNr=KundenSDL.SDLNr WHERE KundenSDL.KundenNr='" & kdNr & "' AND [SDLTypNr] <=2 ORDER BY Sperre,Speditionsdienstleistungen.SDLBez "
             Me.dataAdapterSDL = New SqlDataAdapter(sqlstr, connectionString)
         Catch ex As SqlException
@@ -559,20 +559,7 @@ Public Class frmKundenblatt
     End Sub
 
     Private Sub dgvSDLLeistungenFull_CellValueChanged(sender As Object, e As DataGridViewCellEventArgs) Handles dgvSDLLeistungenFull.CellValueChanged
-        ' btnUpdateSDL.Enabled = True
-        If e.ColumnIndex <> 9 And e.ColumnIndex <> 10 And e.ColumnIndex <> 11 Then
-            Try
-                dgvSDLLeistungenFull.Rows(e.RowIndex).Cells(11).Value = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
 
-                If dgvSDLLeistungenFull.Rows(e.RowIndex).Cells(9).Value.ToString = "" Then ' Neueintrag
-                    dgvSDLLeistungenFull.Rows(e.RowIndex).Cells(9).Value = Now.ToString("dd.MM.yyyy HH:mm")
-                Else 'Änderung
-                    dgvSDLLeistungenFull.Rows(e.RowIndex).Cells(10).Value = Now.ToString("dd.MM.yyyy HH:mm")
-                End If
-
-            Catch ex As Exception
-            End Try
-        End If
     End Sub
     Private Sub dgvSDLLeistungenFull_UserDeletedRow(sender As Object, e As DataGridViewRowEventArgs) Handles dgvSDLLeistungenFull.UserDeletedRow
         'btnUpdateSDL.Enabled = True
@@ -626,6 +613,7 @@ Public Class frmKundenblatt
             .Columns(9).Visible = False
             .Columns(10).Visible = False
             .Columns(11).Visible = False
+            .Columns(12).Visible = False
 
             .ClearSelection()
             For Each r As DataGridViewRow In .Rows
@@ -1324,7 +1312,7 @@ Public Class frmKundenblatt
     'End Sub
 
     'Keine Auswahl zulassen
-    Private Sub dgv_SelectionChanged(sender As Object, e As EventArgs) Handles dgvOfferte.SelectionChanged, dgvSperrliste.SelectionChanged
+    Private Sub dgv_SelectionChanged(sender As Object, e As EventArgs) Handles dgvSperrliste.SelectionChanged, dgvOfferte.SelectionChanged
         sender.ClearSelection()
     End Sub
 
@@ -1374,7 +1362,7 @@ Public Class frmKundenblatt
 
 
 
-    Private Sub dgvLKW_SelectionChanged(sender As Object, e As EventArgs) Handles dgvLKW.Click ', dgvLKW.CellContentClick
+    Private Sub dgvLKW_SelectionChanged(sender As Object, e As EventArgs) Handles dgvLKW.Click  ', dgvLKW.CellContentClick
         If Not gridReady Then Exit Sub
         '  MsgBox("SEL!!!!")
         If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_Leistungen_bearbeiten", "SDL") Then FlatButton2.Enabled = (dgvLKW.SelectedCells.Count > 0)
@@ -1522,41 +1510,47 @@ Public Class frmKundenblatt
             '   scanJaraVertretung.INIT(kdNr, "MDM_Leistung", "SDL_" & tmpSDLNr)
             scanSDLSonst.INIT(kdNr, "MDM_Leistung", "SDL_" & tmpSDLNr)
 
-            Select Case tmpSDLNr
+            If Not IsDBNull(dgvSDLLeistungenFull.SelectedRows(0).Cells("Kundenlimit").Value) Then
-                Case 100 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.IDSKundenNr 'IDS
+                txtKundenlimit.Text = dgvSDLLeistungenFull.SelectedRows(0).Cells("Kundenlimit").Value
-                Case 200 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.ATKundenNr : btnBestelldateiErzeugen.Visible = True
+            Else
-                Case 212 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.UTAKundenNr 'UTA
+                txtKundenlimit.Text = ""
-                Case 101 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.WölflKundenNr 'WÖLFL
+            End If
-                Case 202 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.TELEPASS_Kd_Nr 'TELEPASS
-                Case 214, 215, 216, 217, 218 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.PLOSE_KundenNr 'PLOSE
-
-                Case 201 : grpMautDE.Visible = True : Panel2.Visible = False 'MAUT DE
-                    txtMautDE_FlottenPIN.Text = PartnerKdNrFromFMZOLL.MautDE_FlottenPIN 'MAUT DE
-                    txtMautDEMasterPIN.Text = PartnerKdNrFromFMZOLL.MautDE_MasterPIN 'MAUT DE
-                    txtMautDE_BenutzerNr.Text = PartnerKdNrFromFMZOLL.MautDE_BenutzerNr 'MAUT DE
-                Case 203, 204, 206, 207, 208, 209, 211, 205, 213 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.MSEKundenNr 'MSE 205??
-                Case 210, 500 : Panel2.Visible = False
-                Case Else : Panel2.Visible = False : Exit Sub
-            End Select
 
             Select Case tmpSDLNr
-                Case 202
+                    Case 100 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.IDSKundenNr 'IDS
-                    scanJaraVereinbarung.Visible = True
+                    Case 200 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.ATKundenNr : btnBestelldateiErzeugen.Visible = True
-                    '     scanJaraVertretung.Visible = True
+                    Case 212 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.UTAKundenNr 'UTA
-                    scanErstbestellung.Visible = True
+                    Case 101 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.WölflKundenNr 'WÖLFL
-                Case 203 : scanErstbestellung.Visible = True
+                    Case 202 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.TELEPASS_Kd_Nr 'TELEPASS
-                Case 209 : scanErstbestellung.Visible = True
+                    Case 214, 215, 216, 217, 218 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.PLOSE_KundenNr 'PLOSE
-                Case 215 : scanErstbestellung.Visible = True' PLOSE IT
-                Case 214, 217, 218 : scanErstbestellung.Visible = True 'PLOSE Roadmaster
-                Case 211
-                    '    scanErstbestellung.Visible = True
-                    scanMWSTAgreement.Visible = True
-                    ' Case 100 : scanErstbestellung.Visible = True
-                    '  Case 212 : scanErstbestellung.Visible = True
 
-                Case Else : Exit Sub
+                    Case 201 : grpMautDE.Visible = True : Panel2.Visible = False 'MAUT DE
-            End Select
+                        txtMautDE_FlottenPIN.Text = PartnerKdNrFromFMZOLL.MautDE_FlottenPIN 'MAUT DE
-        End If
+                        txtMautDEMasterPIN.Text = PartnerKdNrFromFMZOLL.MautDE_MasterPIN 'MAUT DE
+                        txtMautDE_BenutzerNr.Text = PartnerKdNrFromFMZOLL.MautDE_BenutzerNr 'MAUT DE
+                    Case 203, 204, 206, 207, 208, 209, 211, 205, 213 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.MSEKundenNr 'MSE 205??
+                    Case 210, 500 : Panel2.Visible = False
+                    Case Else : Panel2.Visible = False : Exit Sub
+                End Select
+
+                Select Case tmpSDLNr
+                    Case 202
+                        scanJaraVereinbarung.Visible = True
+                        '     scanJaraVertretung.Visible = True
+                        scanErstbestellung.Visible = True
+                    Case 203 : scanErstbestellung.Visible = True
+                    Case 209 : scanErstbestellung.Visible = True
+                    Case 215 : scanErstbestellung.Visible = True' PLOSE IT
+                    Case 214, 217, 218 : scanErstbestellung.Visible = True 'PLOSE Roadmaster
+                    Case 211
+                        '    scanErstbestellung.Visible = True
+                        scanMWSTAgreement.Visible = True
+                        ' Case 100 : scanErstbestellung.Visible = True
+                        '  Case 212 : scanErstbestellung.Visible = True
+
+                    Case Else : Exit Sub
+                End Select
+            End If
     End Sub
 
     Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click, Button15.Click
@@ -1641,7 +1635,7 @@ Public Class frmKundenblatt
 
 
     ' DGV mit CRTL+S speichern
-    Private Sub Form1_KeyDown(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyEventArgs) Handles Me.KeyDown
+    Private Sub Form1_KeyDown(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyEventArgs) Handles MyBase.KeyDown
         If dgvLKW.Focused Or (Not dgvLKW.EditingControl Is Nothing AndAlso dgvLKW.EditingControl.Focused) Then ' wenn DGV fokusiert, oder in Bearbeitung
             If e.Modifiers = Keys.Control Then
                 If e.KeyCode = Keys.S Then
@@ -1964,7 +1958,7 @@ Public Class frmKundenblatt
         End Try
         Return False
     End Function
-    Private Sub frmKundenblatt_Shown(sender As Object, e As EventArgs) Handles Me.Shown
+    Private Sub frmKundenblatt_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown
         If showEdit Then changeTab(1, ToolStripMenuItem2)
 
         If My.Computer.Screen.WorkingArea.Width * 0.8 > Me.MinimumSize.Width Then
@@ -1997,7 +1991,7 @@ Public Class frmKundenblatt
         End If
     End Sub
 
-    Private Sub txtMautDE_BenutzerNr_TextChanged(sender As Object, e As KeyEventArgs) Handles txtMautDE_BenutzerNr.KeyDown, txtMautDEMasterPIN.KeyDown, txtMautDE_FlottenPIN.KeyDown
+    Private Sub txtMautDE_BenutzerNr_TextChanged(sender As Object, e As KeyEventArgs) Handles txtMautDEMasterPIN.KeyDown, txtMautDE_FlottenPIN.KeyDown, txtMautDE_BenutzerNr.KeyDown
         If e.KeyCode = Keys.Return Then
             Button15.PerformClick()
         End If

SDL/kunden/frmSDLDetails.Designer.vb

@@ -37,7 +37,9 @@ Partial Class frmSDLDetails
         Me.Button2 = New System.Windows.Forms.Button()
         Me.Label5 = New System.Windows.Forms.Label()
         Me.pnl = New System.Windows.Forms.Panel()
+        Me.Label6 = New System.Windows.Forms.Label()
         Me.TextBox2 = New System.Windows.Forms.RichTextBox()
+        Me.txtKundenlimit = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.pnl.SuspendLayout()
         Me.SuspendLayout()
         '
@@ -71,7 +73,7 @@ Partial Class frmSDLDetails
         'CheckBox1
         '
         Me.CheckBox1.AutoSize = True
-        Me.CheckBox1.Location = New System.Drawing.Point(177, 74)
+        Me.CheckBox1.Location = New System.Drawing.Point(177, 69)
         Me.CheckBox1.Name = "CheckBox1"
         Me.CheckBox1.Size = New System.Drawing.Size(125, 17)
         Me.CheckBox1.TabIndex = 5
@@ -82,7 +84,7 @@ Partial Class frmSDLDetails
         'CheckBox2
         '
         Me.CheckBox2.AutoSize = True
-        Me.CheckBox2.Location = New System.Drawing.Point(177, 97)
+        Me.CheckBox2.Location = New System.Drawing.Point(177, 92)
         Me.CheckBox2.Name = "CheckBox2"
         Me.CheckBox2.Size = New System.Drawing.Size(131, 17)
         Me.CheckBox2.TabIndex = 6
@@ -93,7 +95,7 @@ Partial Class frmSDLDetails
         'CheckBox3
         '
         Me.CheckBox3.AutoSize = True
-        Me.CheckBox3.Location = New System.Drawing.Point(12, 74)
+        Me.CheckBox3.Location = New System.Drawing.Point(12, 69)
         Me.CheckBox3.Name = "CheckBox3"
         Me.CheckBox3.Size = New System.Drawing.Size(129, 17)
         Me.CheckBox3.TabIndex = 7
@@ -103,7 +105,7 @@ Partial Class frmSDLDetails
         'Label3
         '
         Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(9, 94)
+        Me.Label3.Location = New System.Drawing.Point(9, 89)
         Me.Label3.Name = "Label3"
         Me.Label3.Size = New System.Drawing.Size(97, 13)
         Me.Label3.TabIndex = 8
@@ -112,7 +114,7 @@ Partial Class frmSDLDetails
         'DateTimePicker1
         '
         Me.DateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
-        Me.DateTimePicker1.Location = New System.Drawing.Point(12, 110)
+        Me.DateTimePicker1.Location = New System.Drawing.Point(12, 105)
         Me.DateTimePicker1.Name = "DateTimePicker1"
         Me.DateTimePicker1.ShowCheckBox = True
         Me.DateTimePicker1.Size = New System.Drawing.Size(120, 20)
@@ -172,6 +174,8 @@ Partial Class frmSDLDetails
         'pnl
         '
         Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.pnl.Controls.Add(Me.txtKundenlimit)
+        Me.pnl.Controls.Add(Me.Label6)
         Me.pnl.Controls.Add(Me.TextBox2)
         Me.pnl.Controls.Add(Me.Label2)
         Me.pnl.Controls.Add(Me.Label5)
@@ -192,6 +196,15 @@ Partial Class frmSDLDetails
         Me.pnl.Size = New System.Drawing.Size(478, 479)
         Me.pnl.TabIndex = 0
         '
+        'Label6
+        '
+        Me.Label6.AutoSize = True
+        Me.Label6.Location = New System.Drawing.Point(11, 139)
+        Me.Label6.Name = "Label6"
+        Me.Label6.Size = New System.Drawing.Size(64, 13)
+        Me.Label6.TabIndex = 14
+        Me.Label6.Text = "Kundenlimit:"
+        '
         'TextBox2
         '
         Me.TextBox2.Location = New System.Drawing.Point(12, 176)
@@ -200,6 +213,29 @@ Partial Class frmSDLDetails
         Me.TextBox2.TabIndex = 11
         Me.TextBox2.Text = ""
         '
+        'txtKundenlimit
+        '
+        Me.txtKundenlimit._DateTimeOnly = False
+        Me.txtKundenlimit._numbersOnly = True
+        Me.txtKundenlimit._numbersOnlyKommastellen = ""
+        Me.txtKundenlimit._numbersOnlyTrennzeichen = True
+        Me.txtKundenlimit._Prozent = False
+        Me.txtKundenlimit._ShortDateNew = False
+        Me.txtKundenlimit._ShortDateOnly = False
+        Me.txtKundenlimit._TimeOnly = False
+        Me.txtKundenlimit._TimeOnly_Seconds = False
+        Me.txtKundenlimit._value = ""
+        Me.txtKundenlimit._Waehrung = False
+        Me.txtKundenlimit._WaehrungZeichen = True
+        Me.txtKundenlimit.ForeColor = System.Drawing.Color.Black
+        Me.txtKundenlimit.Location = New System.Drawing.Point(81, 136)
+        Me.txtKundenlimit.MaxLineLength = -1
+        Me.txtKundenlimit.MaxLines_Warning = ""
+        Me.txtKundenlimit.MaxLines_Warning_Label = Nothing
+        Me.txtKundenlimit.Name = "txtKundenlimit"
+        Me.txtKundenlimit.Size = New System.Drawing.Size(130, 20)
+        Me.txtKundenlimit.TabIndex = 15
+        '
         'frmSDLDetails
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -232,4 +268,6 @@ Partial Class frmSDLDetails
     Friend WithEvents Label5 As System.Windows.Forms.Label
     Friend WithEvents pnl As System.Windows.Forms.Panel
     Friend WithEvents TextBox2 As System.Windows.Forms.RichTextBox
+    Friend WithEvents Label6 As Label
+    Friend WithEvents txtKundenlimit As VERAG_PROG_ALLGEMEIN.MyTextBox
 End Class

SDL/kunden/frmSDLDetails.vb

@@ -46,6 +46,7 @@
             DateTimePicker1.Value = bindingSDL.bindingdataTable.Rows(0).Item("Antragsdatum").ToString
         End If
         TextBox2.Text = bindingSDL.bindingdataTable.Rows(0).Item("Vermerk").ToString
+        txtKundenlimit.Text = bindingSDL.bindingdataTable.Rows(0).Item("Kundenlimit").ToString
 
         '   grpMautDE.Visible = (sdlNr = 201)
         '    GroupBox1.Visible = (sdlNr = 200)
@@ -76,6 +77,14 @@
                 bindingSDL.bindingdataTable.Rows(0).Item("Antragsdatum") = DateTimePicker1.Value
             End If
             bindingSDL.bindingdataTable.Rows(0).Item("Vermerk") = TextBox2.Text
+
+            If txtKundenlimit.Text <> "" AndAlso IsNumeric(txtKundenlimit.Text) Then
+                bindingSDL.bindingdataTable.Rows(0).Item("Kundenlimit") = txtKundenlimit.Text
+            Else
+                bindingSDL.bindingdataTable.Rows(0).Item("Kundenlimit") = DBNull.Value
+            End If
+
+
             bindingSDL.bindingdataTable.Rows(0).Item("Sperre") = DS_sperre
             '     MsgBox(bindingSDL.bindingtable.Rows(0).Item("Sperre"))
             If bindingSDL.bindingdataTable.Rows(0).Item("Sperre") = 0 Then
@@ -145,4 +154,5 @@
         End If
 
     End Sub
+
 End Class