fix

SDL/Formulare/CMR/frmCMR.vb

@@ -109,6 +109,7 @@ Public Class frmCMR
         uCmr.txtNachfolgendeFF.Text &= If(CMR.CMR_Nachf_Frachtführer_3 IsNot Nothing, Environment.NewLine & CMR.CMR_Nachf_Frachtführer_3, "")
         uCmr.txtNachfolgendeFF.Text &= If(CMR.CMR_Nachf_Frachtführer_4 IsNot Nothing, Environment.NewLine & CMR.CMR_Nachf_Frachtführer_4, "")
 
+        uCmr.txtAuslieferungsort_OPTIONAL.Text = If(CMR.CMR_Auslieferung_Ort, "")
         uCmr.txtAuslieferungsort.Text = If(CMR.CMR_Auslieferung_Ort, "")
         uCmr.txtAuslieferungsLand.Text = If(CMR.CMR_Auslieferung_Land, "")
 
@@ -226,6 +227,7 @@ Public Class frmCMR
         If s.Length > 2 Then CMR.CMR_Nachf_Frachtführer_3 = s(2) Else CMR.CMR_Nachf_Frachtführer_3 = ""
         If s.Length > 3 Then CMR.CMR_Nachf_Frachtführer_4 = s(3) Else CMR.CMR_Nachf_Frachtführer_4 = ""
 
+
         CMR.CMR_Auslieferung_Ort = uCmr.txtAuslieferungsort.Text
         CMR.CMR_Auslieferung_Land = uCmr.txtAuslieferungsLand.Text
 

SDL/Formulare/CMR/usrcntlCMR.Designer.vb

@@ -23,9 +23,11 @@ Partial Class usrcntlCMR
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
-        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.Panel3 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
+        Me.LinkLabel9 = New System.Windows.Forms.LinkLabel()
+        Me.LinkLabel8 = New System.Windows.Forms.LinkLabel()
         Me.LinkLabel7 = New System.Windows.Forms.LinkLabel()
         Me.LinkLabel6 = New System.Windows.Forms.LinkLabel()
         Me.lbl_errCMR_1 = New System.Windows.Forms.Label()
@@ -87,8 +89,7 @@ Partial Class usrcntlCMR
         Me.txtAuslieferungsort = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtFrachtführer = New VERAG_PROG_ALLGEMEIN.MyRichTextBox()
         Me.pic = New System.Windows.Forms.PictureBox()
-        Me.LinkLabel8 = New System.Windows.Forms.LinkLabel()
+        Me.txtAuslieferungsort_OPTIONAL = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.LinkLabel9 = New System.Windows.Forms.LinkLabel()
         Me.Panel3.SuspendLayout()
         CType(Me.dgvLadungenKurz, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.dgvLadungen, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -103,6 +104,7 @@ Partial Class usrcntlCMR
         '
         Me.Panel3.AutoScroll = True
         Me.Panel3.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+        Me.Panel3.Controls.Add(Me.txtAuslieferungsort_OPTIONAL)
         Me.Panel3.Controls.Add(Me.LinkLabel9)
         Me.Panel3.Controls.Add(Me.LinkLabel8)
         Me.Panel3.Controls.Add(Me.LinkLabel7)
@@ -161,6 +163,28 @@ Partial Class usrcntlCMR
         Me.Panel3.Size = New System.Drawing.Size(857, 786)
         Me.Panel3.TabIndex = 0
         '
+        'LinkLabel9
+        '
+        Me.LinkLabel9.AutoSize = True
+        Me.LinkLabel9.BackColor = System.Drawing.Color.White
+        Me.LinkLabel9.Location = New System.Drawing.Point(492, 1024)
+        Me.LinkLabel9.Name = "LinkLabel9"
+        Me.LinkLabel9.Size = New System.Drawing.Size(45, 13)
+        Me.LinkLabel9.TabIndex = 498
+        Me.LinkLabel9.TabStop = True
+        Me.LinkLabel9.Text = "AMBAR"
+        '
+        'LinkLabel8
+        '
+        Me.LinkLabel8.AutoSize = True
+        Me.LinkLabel8.BackColor = System.Drawing.Color.White
+        Me.LinkLabel8.Location = New System.Drawing.Point(200, 1024)
+        Me.LinkLabel8.Name = "LinkLabel8"
+        Me.LinkLabel8.Size = New System.Drawing.Size(45, 13)
+        Me.LinkLabel8.TabIndex = 497
+        Me.LinkLabel8.TabStop = True
+        Me.LinkLabel8.Text = "AMBAR"
+        '
         'LinkLabel7
         '
         Me.LinkLabel7.AutoSize = True
@@ -217,14 +241,14 @@ Partial Class usrcntlCMR
         Me.dgvLadungenKurz.BackgroundColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
         Me.dgvLadungenKurz.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvLadungenKurz.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn2, Me.DataGridViewTextBoxColumn3, Me.DataGridViewTextBoxColumn4, Me.DataGridViewTextBoxColumn6})
-        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvLadungenKurz.DefaultCellStyle = DataGridViewCellStyle3
+        Me.dgvLadungenKurz.DefaultCellStyle = DataGridViewCellStyle1
         Me.dgvLadungenKurz.GridColor = System.Drawing.Color.Gray
         Me.dgvLadungenKurz.Location = New System.Drawing.Point(32, 519)
         Me.dgvLadungenKurz.Name = "dgvLadungenKurz"
@@ -268,14 +292,14 @@ Partial Class usrcntlCMR
         Me.dgvLadungen.BackgroundColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
         Me.dgvLadungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvLadungen.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.ZeNr, Me.anz, Me.art, Me.bez, Me.statNr, Me.gewicht, Me.umfang})
-        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvLadungen.DefaultCellStyle = DataGridViewCellStyle4
+        Me.dgvLadungen.DefaultCellStyle = DataGridViewCellStyle2
         Me.dgvLadungen.GridColor = System.Drawing.Color.Gray
         Me.dgvLadungen.Location = New System.Drawing.Point(32, 519)
         Me.dgvLadungen.Name = "dgvLadungen"
@@ -1023,27 +1047,30 @@ Partial Class usrcntlCMR
         Me.pic.TabIndex = 3
         Me.pic.TabStop = False
         '
-        'LinkLabel8
+        'txtAuslieferungsort_OPTIONAL
         '
-        Me.LinkLabel8.AutoSize = True
+        Me.txtAuslieferungsort_OPTIONAL._DateTimeOnly = False
-        Me.LinkLabel8.BackColor = System.Drawing.Color.White
+        Me.txtAuslieferungsort_OPTIONAL._numbersOnly = False
-        Me.LinkLabel8.Location = New System.Drawing.Point(200, 1024)
+        Me.txtAuslieferungsort_OPTIONAL._numbersOnlyKommastellen = ""
-        Me.LinkLabel8.Name = "LinkLabel8"
+        Me.txtAuslieferungsort_OPTIONAL._numbersOnlyTrennzeichen = True
-        Me.LinkLabel8.Size = New System.Drawing.Size(45, 13)
+        Me.txtAuslieferungsort_OPTIONAL._Prozent = False
-        Me.LinkLabel8.TabIndex = 497
+        Me.txtAuslieferungsort_OPTIONAL._ShortDateNew = False
-        Me.LinkLabel8.TabStop = True
+        Me.txtAuslieferungsort_OPTIONAL._ShortDateOnly = False
-        Me.LinkLabel8.Text = "AMBAR"
+        Me.txtAuslieferungsort_OPTIONAL._TimeOnly = False
-        '
+        Me.txtAuslieferungsort_OPTIONAL._TimeOnly_Seconds = False
-        'LinkLabel9
+        Me.txtAuslieferungsort_OPTIONAL._value = Nothing
-        '
+        Me.txtAuslieferungsort_OPTIONAL._Waehrung = False
-        Me.LinkLabel9.AutoSize = True
+        Me.txtAuslieferungsort_OPTIONAL._WaehrungZeichen = True
-        Me.LinkLabel9.BackColor = System.Drawing.Color.White
+        Me.txtAuslieferungsort_OPTIONAL.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.LinkLabel9.Location = New System.Drawing.Point(492, 1024)
+        Me.txtAuslieferungsort_OPTIONAL.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
-        Me.LinkLabel9.Name = "LinkLabel9"
+        Me.txtAuslieferungsort_OPTIONAL.Location = New System.Drawing.Point(78, 271)
-        Me.LinkLabel9.Size = New System.Drawing.Size(45, 13)
+        Me.txtAuslieferungsort_OPTIONAL.MaxLength = 35
-        Me.LinkLabel9.TabIndex = 498
+        Me.txtAuslieferungsort_OPTIONAL.MaxLineLength = -1
-        Me.LinkLabel9.TabStop = True
+        Me.txtAuslieferungsort_OPTIONAL.MaxLines_Warning = ""
-        Me.LinkLabel9.Text = "AMBAR"
+        Me.txtAuslieferungsort_OPTIONAL.MaxLines_Warning_Label = Nothing
+        Me.txtAuslieferungsort_OPTIONAL.Name = "txtAuslieferungsort_OPTIONAL"
+        Me.txtAuslieferungsort_OPTIONAL.Size = New System.Drawing.Size(319, 21)
+        Me.txtAuslieferungsort_OPTIONAL.TabIndex = 499
         '
         'usrcntlCMR
         '
@@ -1128,4 +1155,5 @@ Partial Class usrcntlCMR
     Friend WithEvents umfang As DataGridViewTextBoxColumn
     Friend WithEvents LinkLabel9 As LinkLabel
     Friend WithEvents LinkLabel8 As LinkLabel
+    Public WithEvents txtAuslieferungsort_OPTIONAL As VERAG_PROG_ALLGEMEIN.MyTextBox
 End Class

SDL/kunden/frmKundenblatt.vb

@@ -65,7 +65,7 @@ Public Class frmKundenblatt
     Sub changeTab(index As Integer, tsi As ToolStripItem, Optional subItemIndexMDM As Integer = -1, Optional subItemIndexZoll As Integer = -1)
         If kdNr <= 0 Then
             If index <> 7 Then
-                Exit Sub 'Kein Wechsel --> Kundenerfassung
+                'Exit Sub 'Kein Wechsel --> Kundenerfassung
             Else
 
             End If
@@ -143,10 +143,20 @@ Public Class frmKundenblatt
         changeTab(0, AllgemeinToolStripMenuItem)
 
 
+
+
+
+
         If isAVISO() Then
             tbcntrMain.TabPages.Remove(tbFirmendatenSDL)
+            If FilialeNr > 0 Then
+                UsrcntlKundeBearbeitenFull1.Filiale = FilialeNr
+            End If
         Else
             tbcntrMain.TabPages.Remove(tbFirmendaten)
+            If FilialeNr > 0 Then
+                UsrcntlKundeBearbeitenFull_SDL1.Filiale = FilialeNr
+            End If
         End If
 
         tbcntrMDM.TabPages.Remove(tbVERAGCard) 'Jetzt in SDL LEintstungen
@@ -261,7 +271,7 @@ Public Class frmKundenblatt
     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
+        If kdNr <= 0 Then changeTab(7, ToolStripMenuItem2) : Exit Sub
 
         If Me.loaded Then ' wenn fertig
             '  lblKdnr.Text = "KdNr: " & kdNr
@@ -349,10 +359,10 @@ Public Class frmKundenblatt
 
     Sub initTABSDL_Firmendaten()
         If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG("Kundendaten_bearbeiten", Me) = 0 Then
-            tbcntrMain.TabPages(1).Enabled = False
+            tbcntrMain.TabPages(7).Enabled = False
 
         End If
-        tbcntrMain.TabPages(1).Enabled = True
+        tbcntrMain.TabPages(7).Enabled = True
         UsrcntlKundeBearbeitenFull1.Enabled = True
 
         UsrcntlKundeBearbeitenFull1.init(kdNr, isVerag360)
@@ -440,6 +450,7 @@ Public Class frmKundenblatt
         usrcntlKarten.kdNr_filter = True
         usrcntlKarten.kdNr = kdNr
         usrcntlKarten.init()
+
     End Sub
 
 
@@ -493,7 +504,7 @@ Public Class frmKundenblatt
 
     Sub initTABLKW(Optional kz As String = "")
         If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG("MDM_LKW_bearbeiten", Me) = 0 Then
-            tbcntrMain.TabPages(2).Enabled = False
+            'tbcntrMain.TabPages(2).Enabled = False
             ' cProgramFunctions.setAllReadOnly(tabLKW)
         End If
 
@@ -1753,7 +1764,7 @@ Public Class frmKundenblatt
     End Sub
 
 
-    Private Sub FlatButton2_Click(sender As Object, e As EventArgs)
+    Private Sub FlatButton2_Click(sender As Object, e As EventArgs) Handles FlatButton2.Click
         Me.WindowState = FormWindowState.Minimized
     End Sub
 
@@ -1935,7 +1946,7 @@ Public Class frmKundenblatt
     End Sub
 
 
-    Private Sub ToolStripMenuItem8_Click(sender As Object, e As EventArgs)
+    Private Sub ToolStripMenuItem8_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem8.Click
 
         changeTab(4, sender)
     End Sub
@@ -2204,9 +2215,6 @@ Public Class frmKundenblatt
         End If
     End Sub
 
-    Private Sub Button7_Click_1(sender As Object, e As EventArgs)
-
-    End Sub
 
     Sub initDGVUmsatz()
         With dgvUmsaetze