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

SDL/Fakturierung/cFakturierung.vb

@@ -645,6 +645,9 @@ Public Class cFakturierung
         End Select
         '  MsgBox(sqlStr & " order by Firma_ID desc,LandKz desc,Offertennr desc")
 
+        If RECHNUNG.[Vorkasse] Then
+            sqlStr &= " AND (Textschlüssel<>16) " 'Bei Vorkasse soll dieser Text nicht aufscheinen (AMBAR)
+        End If
         Dim dt_RechnungsTexte As DataTable = SQL.loadDgvBySql(sqlStr & " order by Firma_ID desc,LandKz desc,Offertennr desc", "FMZOLL")
 
 

SDL/Fakturierung/frmFaktEmail.vb

@@ -393,8 +393,15 @@ Public Class frmFaktEmail
 
                         addAttachments(Mail, lastAktuelle_RgNr, cbxMergePDF.Checked)
 
+                    If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
+                        Try
+                            Mail.SentOnBehalfOfName = "buchhaltung@ambarlog.de"
+                        Catch ex2 As Exception
+                            MsgBox(ex2.Message)
+                        End Try
+                    End If
 
-                        Mail.Display()
+                    Mail.Display()
                         '------------------------------------------------------------------------------------------
                         ' STB  /FA   SR: ABFRAGE FISKAL-VZ 
                         If isFiskal Then
@@ -511,6 +518,16 @@ Public Class frmFaktEmail
                     addAttachments(Mail, RECHNUNG.RechnungsNr, cbxMergePDF.Checked)
                     '-----------------------------------------------------------------
 
+
+                    If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
+                        Try
+                            Mail.SentOnBehalfOfName = "buchhaltung@ambarlog.de"
+                        Catch ex2 As Exception
+                            MsgBox(ex2.Message)
+                        End Try
+                    End If
+
+
                     Mail.Display()
 
                     '------------------------------------------------------------------------------------------

SDL/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.2.9.8")>
+<Assembly: AssemblyVersion("1.2.9.9")>
-<Assembly: AssemblyFileVersion("1.2.9.8")>
+<Assembly: AssemblyFileVersion("1.2.9.9")>

SDL/ZOLLSYSTEM/DAKOSY/ATLAS/EZA/usrCntlATLAS_EZA.vb

@@ -204,7 +204,7 @@ Public Class usrCntlATLAS_EZA
         End Select
 
 
-        cboStammreferenz.fillWithSQL("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='EZA'  and dySr_dy_Mandant='" & txtDyMandant.Text & "'  and dySr_dy_Niederlassung='" & txtDyNiederlassung.Text & "'  and dySr_visible=1", False, "FMZOLL", True)
+        cboStammreferenz.fillWithSQL("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='EZA'  and dySr_dy_Mandant='" & txtDyMandant.Text & "'  and dySr_dy_Niederlassung='" & txtDyNiederlassung.Text.Replace("DTB", "SUB") & "'  and dySr_visible=1", False, "FMZOLL", True)
         cboStammreferenz.changeItem("")
 
 

SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS004/usrCntlATLAS_NCTS004.vb

@@ -174,7 +174,7 @@ Public Class usrCntlATLAS_NCTS004
         End Select
 
 
-        cboStammreferenz.fillWithSQL("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='NCTS'  and dySr_dy_Mandant='" & txtDyMandant.Text & "'  and dySr_dy_Niederlassung IN ('','" & txtDyNiederlassung.Text & "')  and dySr_visible=1", False, "FMZOLL", True)
+        cboStammreferenz.fillWithSQL("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='NCTS'  and dySr_dy_Mandant='" & txtDyMandant.Text & "'  and dySr_dy_Niederlassung IN ('','" & txtDyNiederlassung.Text.Replace("DTB", "SUB") & "')  and dySr_visible=1", False, "FMZOLL", True)
         cboStammreferenz.changeItem("")
 
         SICHERHEIT = New usrCntlATLAS_NCTS004_Sicherheit(ncts_OUT, FIRMA_DY)

SDL/ZOLLSYSTEM/DAKOSY/Stammreferenz/frmDakosyStammreferenz.vb

@@ -32,7 +32,7 @@
         SelectNL = False
         Select Case FIRMA_DY
             Case "VERAG" : txtDyMandant.Text = "VERG"
-                txtDyNiederlassung.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
+                txtDyNiederlassung.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG.ToString.Replace("DTB", "SUB")
                 '  Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
                 'Case "SUB" : txtDyNiederlassung.Text = "VERG"
                 'Case "SUW" : txtDyNiederlassung.Text = "ATIL"

SDL/kunden/frmLKW_AnhaengeDatenarchiv.Designer.vb

@@ -25,15 +25,6 @@ Partial Class frmLKW_AnhaengeDatenarchiv
         Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmLKW_AnhaengeDatenarchiv))
         Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
-        Me.clmnLKW = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.clmnZulassung_docID = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.clmnCEMT_docID = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.clmnLeasing_docID = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.clmnMiete_docID = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.clmnZulassung = New System.Windows.Forms.DataGridViewCheckBoxColumn()
-        Me.clmnCEMT = New System.Windows.Forms.DataGridViewCheckBoxColumn()
-        Me.clmnLeasing = New System.Windows.Forms.DataGridViewCheckBoxColumn()
-        Me.Column1 = New System.Windows.Forms.DataGridViewCheckBoxColumn()
         Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
         Me.cbxMiete = New System.Windows.Forms.CheckBox()
         Me.cbxLeasing = New System.Windows.Forms.CheckBox()
@@ -44,6 +35,21 @@ Partial Class frmLKW_AnhaengeDatenarchiv
         Me.Button1 = New System.Windows.Forms.Button()
         Me.CheckBox4 = New System.Windows.Forms.CheckBox()
         Me.Button2 = New System.Windows.Forms.Button()
+        Me.cbxCIF = New System.Windows.Forms.CheckBox()
+        Me.cbxCOC = New System.Windows.Forms.CheckBox()
+        Me.clmnLKW = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.clmnZulassung_docID = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.clmnCEMT_docID = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.clmnLeasing_docID = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.clmnMiete_docID = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.clmnCIF_docID = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.clmnCOC_docID = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.clmnZulassung = New System.Windows.Forms.DataGridViewCheckBoxColumn()
+        Me.clmnCEMT = New System.Windows.Forms.DataGridViewCheckBoxColumn()
+        Me.clmnLeasing = New System.Windows.Forms.DataGridViewCheckBoxColumn()
+        Me.Column1 = New System.Windows.Forms.DataGridViewCheckBoxColumn()
+        Me.clmnCIF = New System.Windows.Forms.DataGridViewCheckBoxColumn()
+        Me.clmnCOC = New System.Windows.Forms.DataGridViewCheckBoxColumn()
         CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.MyPanel1.SuspendLayout()
         Me.SuspendLayout()
@@ -56,82 +62,17 @@ Partial Class frmLKW_AnhaengeDatenarchiv
         Me.MyDatagridview1.AllowUserToResizeColumns = False
         Me.MyDatagridview1.AllowUserToResizeRows = False
         Me.MyDatagridview1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.MyDatagridview1.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnLKW, Me.clmnZulassung_docID, Me.clmnCEMT_docID, Me.clmnLeasing_docID, Me.clmnMiete_docID, Me.clmnZulassung, Me.clmnCEMT, Me.clmnLeasing, Me.Column1})
+        Me.MyDatagridview1.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnLKW, Me.clmnZulassung_docID, Me.clmnCEMT_docID, Me.clmnLeasing_docID, Me.clmnMiete_docID, Me.clmnCIF_docID, Me.clmnCOC_docID, Me.clmnZulassung, Me.clmnCEMT, Me.clmnLeasing, Me.Column1, Me.clmnCIF, Me.clmnCOC})
         Me.MyDatagridview1.Location = New System.Drawing.Point(13, 36)
         Me.MyDatagridview1.Name = "MyDatagridview1"
         Me.MyDatagridview1.ReadOnly = True
-        Me.MyDatagridview1.Size = New System.Drawing.Size(555, 383)
+        Me.MyDatagridview1.Size = New System.Drawing.Size(678, 383)
         Me.MyDatagridview1.TabIndex = 0
         '
-        'clmnLKW
-        '
-        Me.clmnLKW.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
-        Me.clmnLKW.HeaderText = "Bezeichnung"
-        Me.clmnLKW.Name = "clmnLKW"
-        Me.clmnLKW.ReadOnly = True
-        '
-        'clmnZulassung_docID
-        '
-        Me.clmnZulassung_docID.HeaderText = "Column1"
-        Me.clmnZulassung_docID.Name = "clmnZulassung_docID"
-        Me.clmnZulassung_docID.ReadOnly = True
-        Me.clmnZulassung_docID.Visible = False
-        '
-        'clmnCEMT_docID
-        '
-        Me.clmnCEMT_docID.HeaderText = "Column1"
-        Me.clmnCEMT_docID.Name = "clmnCEMT_docID"
-        Me.clmnCEMT_docID.ReadOnly = True
-        Me.clmnCEMT_docID.Visible = False
-        '
-        'clmnLeasing_docID
-        '
-        Me.clmnLeasing_docID.HeaderText = "Column1"
-        Me.clmnLeasing_docID.Name = "clmnLeasing_docID"
-        Me.clmnLeasing_docID.ReadOnly = True
-        Me.clmnLeasing_docID.Visible = False
-        '
-        'clmnMiete_docID
-        '
-        Me.clmnMiete_docID.HeaderText = "Column2"
-        Me.clmnMiete_docID.Name = "clmnMiete_docID"
-        Me.clmnMiete_docID.ReadOnly = True
-        Me.clmnMiete_docID.Visible = False
-        '
-        'clmnZulassung
-        '
-        Me.clmnZulassung.HeaderText = "Zulassung"
-        Me.clmnZulassung.Name = "clmnZulassung"
-        Me.clmnZulassung.ReadOnly = True
-        Me.clmnZulassung.Resizable = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.clmnZulassung.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic
-        Me.clmnZulassung.Width = 60
-        '
-        'clmnCEMT
-        '
-        Me.clmnCEMT.HeaderText = "CEMT"
-        Me.clmnCEMT.Name = "clmnCEMT"
-        Me.clmnCEMT.ReadOnly = True
-        Me.clmnCEMT.Width = 60
-        '
-        'clmnLeasing
-        '
-        Me.clmnLeasing.HeaderText = "Leasing"
-        Me.clmnLeasing.Name = "clmnLeasing"
-        Me.clmnLeasing.ReadOnly = True
-        Me.clmnLeasing.Width = 60
-        '
-        'Column1
-        '
-        Me.Column1.HeaderText = "Miete"
-        Me.Column1.Name = "Column1"
-        Me.Column1.ReadOnly = True
-        Me.Column1.Resizable = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic
-        Me.Column1.Width = 60
-        '
         'MyPanel1
         '
+        Me.MyPanel1.Controls.Add(Me.cbxCOC)
+        Me.MyPanel1.Controls.Add(Me.cbxCIF)
         Me.MyPanel1.Controls.Add(Me.cbxMiete)
         Me.MyPanel1.Controls.Add(Me.cbxLeasing)
         Me.MyPanel1.Controls.Add(Me.cbxCEMT)
@@ -139,7 +80,7 @@ Partial Class frmLKW_AnhaengeDatenarchiv
         Me.MyPanel1.Controls.Add(Me.cbx)
         Me.MyPanel1.Location = New System.Drawing.Point(13, 12)
         Me.MyPanel1.Name = "MyPanel1"
-        Me.MyPanel1.Size = New System.Drawing.Size(555, 26)
+        Me.MyPanel1.Size = New System.Drawing.Size(678, 26)
         Me.MyPanel1.TabIndex = 1
         '
         'cbxMiete
@@ -191,7 +132,7 @@ Partial Class frmLKW_AnhaengeDatenarchiv
         'Button3
         '
         Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button3.Location = New System.Drawing.Point(377, 443)
+        Me.Button3.Location = New System.Drawing.Point(560, 425)
         Me.Button3.Name = "Button3"
         Me.Button3.Size = New System.Drawing.Size(131, 54)
         Me.Button3.TabIndex = 17
@@ -203,7 +144,7 @@ Partial Class frmLKW_AnhaengeDatenarchiv
         Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button1.Image = Global.SDL.My.Resources.Resources.email_big1
         Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button1.Location = New System.Drawing.Point(274, 443)
+        Me.Button1.Location = New System.Drawing.Point(457, 425)
         Me.Button1.Name = "Button1"
         Me.Button1.Size = New System.Drawing.Size(97, 54)
         Me.Button1.TabIndex = 18
@@ -226,7 +167,7 @@ Partial Class frmLKW_AnhaengeDatenarchiv
         Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button2.Image = Global.SDL.My.Resources.Resources.open
         Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button2.Location = New System.Drawing.Point(156, 444)
+        Me.Button2.Location = New System.Drawing.Point(339, 426)
         Me.Button2.Name = "Button2"
         Me.Button2.Size = New System.Drawing.Size(112, 54)
         Me.Button2.TabIndex = 20
@@ -234,12 +175,129 @@ Partial Class frmLKW_AnhaengeDatenarchiv
         Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         Me.Button2.UseVisualStyleBackColor = True
         '
+        'cbxCIF
+        '
+        Me.cbxCIF.AutoSize = True
+        Me.cbxCIF.Location = New System.Drawing.Point(579, 4)
+        Me.cbxCIF.Name = "cbxCIF"
+        Me.cbxCIF.Size = New System.Drawing.Size(15, 14)
+        Me.cbxCIF.TabIndex = 5
+        Me.cbxCIF.UseVisualStyleBackColor = True
+        '
+        'cbxCOC
+        '
+        Me.cbxCOC.AutoSize = True
+        Me.cbxCOC.Location = New System.Drawing.Point(640, 4)
+        Me.cbxCOC.Name = "cbxCOC"
+        Me.cbxCOC.Size = New System.Drawing.Size(15, 14)
+        Me.cbxCOC.TabIndex = 6
+        Me.cbxCOC.UseVisualStyleBackColor = True
+        '
+        'clmnLKW
+        '
+        Me.clmnLKW.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
+        Me.clmnLKW.HeaderText = "Bezeichnung"
+        Me.clmnLKW.Name = "clmnLKW"
+        Me.clmnLKW.ReadOnly = True
+        '
+        'clmnZulassung_docID
+        '
+        Me.clmnZulassung_docID.HeaderText = "Column1"
+        Me.clmnZulassung_docID.Name = "clmnZulassung_docID"
+        Me.clmnZulassung_docID.ReadOnly = True
+        Me.clmnZulassung_docID.Visible = False
+        '
+        'clmnCEMT_docID
+        '
+        Me.clmnCEMT_docID.HeaderText = "Column1"
+        Me.clmnCEMT_docID.Name = "clmnCEMT_docID"
+        Me.clmnCEMT_docID.ReadOnly = True
+        Me.clmnCEMT_docID.Visible = False
+        '
+        'clmnLeasing_docID
+        '
+        Me.clmnLeasing_docID.HeaderText = "Column1"
+        Me.clmnLeasing_docID.Name = "clmnLeasing_docID"
+        Me.clmnLeasing_docID.ReadOnly = True
+        Me.clmnLeasing_docID.Visible = False
+        '
+        'clmnMiete_docID
+        '
+        Me.clmnMiete_docID.HeaderText = "Column2"
+        Me.clmnMiete_docID.Name = "clmnMiete_docID"
+        Me.clmnMiete_docID.ReadOnly = True
+        Me.clmnMiete_docID.Visible = False
+        '
+        'clmnCIF_docID
+        '
+        Me.clmnCIF_docID.HeaderText = "Column2"
+        Me.clmnCIF_docID.Name = "clmnCIF_docID"
+        Me.clmnCIF_docID.ReadOnly = True
+        Me.clmnCIF_docID.Visible = False
+        '
+        'clmnCOC_docID
+        '
+        Me.clmnCOC_docID.HeaderText = "Column2"
+        Me.clmnCOC_docID.Name = "clmnCOC_docID"
+        Me.clmnCOC_docID.ReadOnly = True
+        Me.clmnCOC_docID.Visible = False
+        '
+        'clmnZulassung
+        '
+        Me.clmnZulassung.HeaderText = "Zulassung"
+        Me.clmnZulassung.Name = "clmnZulassung"
+        Me.clmnZulassung.ReadOnly = True
+        Me.clmnZulassung.Resizable = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.clmnZulassung.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic
+        Me.clmnZulassung.Width = 60
+        '
+        'clmnCEMT
+        '
+        Me.clmnCEMT.HeaderText = "CEMT"
+        Me.clmnCEMT.Name = "clmnCEMT"
+        Me.clmnCEMT.ReadOnly = True
+        Me.clmnCEMT.Width = 60
+        '
+        'clmnLeasing
+        '
+        Me.clmnLeasing.HeaderText = "Leasing"
+        Me.clmnLeasing.Name = "clmnLeasing"
+        Me.clmnLeasing.ReadOnly = True
+        Me.clmnLeasing.Width = 60
+        '
+        'Column1
+        '
+        Me.Column1.HeaderText = "Miete"
+        Me.Column1.Name = "Column1"
+        Me.Column1.ReadOnly = True
+        Me.Column1.Resizable = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic
+        Me.Column1.Width = 60
+        '
+        'clmnCIF
+        '
+        Me.clmnCIF.HeaderText = "CIF"
+        Me.clmnCIF.Name = "clmnCIF"
+        Me.clmnCIF.ReadOnly = True
+        Me.clmnCIF.Resizable = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.clmnCIF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic
+        Me.clmnCIF.Width = 60
+        '
+        'clmnCOC
+        '
+        Me.clmnCOC.HeaderText = "COC"
+        Me.clmnCOC.Name = "clmnCOC"
+        Me.clmnCOC.ReadOnly = True
+        Me.clmnCOC.Resizable = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.clmnCOC.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic
+        Me.clmnCOC.Width = 60
+        '
         'frmLKW_AnhaengeDatenarchiv
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.Color.White
-        Me.ClientSize = New System.Drawing.Size(582, 503)
+        Me.ClientSize = New System.Drawing.Size(704, 490)
         Me.Controls.Add(Me.Button2)
         Me.Controls.Add(Me.CheckBox4)
         Me.Controls.Add(Me.Button1)
@@ -268,13 +326,19 @@ Partial Class frmLKW_AnhaengeDatenarchiv
     Friend WithEvents CheckBox4 As CheckBox
     Friend WithEvents Button2 As Button
     Friend WithEvents cbxMiete As CheckBox
+    Friend WithEvents cbxCOC As CheckBox
+    Friend WithEvents cbxCIF As CheckBox
     Friend WithEvents clmnLKW As DataGridViewTextBoxColumn
     Friend WithEvents clmnZulassung_docID As DataGridViewTextBoxColumn
     Friend WithEvents clmnCEMT_docID As DataGridViewTextBoxColumn
     Friend WithEvents clmnLeasing_docID As DataGridViewTextBoxColumn
     Friend WithEvents clmnMiete_docID As DataGridViewTextBoxColumn
+    Friend WithEvents clmnCIF_docID As DataGridViewTextBoxColumn
+    Friend WithEvents clmnCOC_docID As DataGridViewTextBoxColumn
     Friend WithEvents clmnZulassung As DataGridViewCheckBoxColumn
     Friend WithEvents clmnCEMT As DataGridViewCheckBoxColumn
     Friend WithEvents clmnLeasing As DataGridViewCheckBoxColumn
     Friend WithEvents Column1 As DataGridViewCheckBoxColumn
+    Friend WithEvents clmnCIF As DataGridViewCheckBoxColumn
+    Friend WithEvents clmnCOC As DataGridViewCheckBoxColumn
 End Class

SDL/kunden/frmLKW_AnhaengeDatenarchiv.resx

@@ -132,6 +132,12 @@
   <metadata name="clmnMiete_docID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="clmnCIF_docID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="clmnCOC_docID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="clmnZulassung.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -144,6 +150,12 @@
   <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="clmnCIF.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="clmnCOC.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

SDL/kunden/frmLKW_AnhaengeDatenarchiv.vb

@@ -57,16 +57,20 @@ Public Class frmLKW_AnhaengeDatenarchiv
                 Dim CEMT = ""
                 Dim Leasing = ""
                 Dim Miete = ""
+                Dim CIF = ""
+                Dim COC = ""
                 For Each r In dt.Rows
                     If r("coll_pfad") IsNot DBNull.Value AndAlso r("coll_pfad") <> "" Then
                         If r("da_name") = "Zulassungsschein" Then Zulassungsschein = r("coll_pfad")
                         If r("da_name") = "CEMT" Then CEMT = r("coll_pfad")
                         If r("da_name") = "Leasing-Vertrag" Then Leasing = r("coll_pfad")
                         If r("da_name") = "Miet-Vertrag" Then Miete = r("coll_pfad")
+                        If r("da_name") = "CIF-Dokument" Then CIF = r("coll_pfad")
+                        If r("da_name") = "COC-Dokument" Then COC = r("coll_pfad")
                     End If
                 Next
 
-                MyDatagridview1.Rows.Add(l, Zulassungsschein, CEMT, Leasing, Miete, (Zulassungsschein <> ""), (CEMT <> ""), (Leasing <> ""), (Miete <> ""))
+                MyDatagridview1.Rows.Add(l, Zulassungsschein, CEMT, Leasing, Miete, CIF, COC, (Zulassungsschein <> ""), (CEMT <> ""), (Leasing <> ""), (Miete <> ""), (CIF <> ""), (COC <> ""))
             Next
         Catch ex As Exception
             MsgBox(ex.Message & ex.StackTrace)
@@ -101,6 +105,8 @@ Public Class frmLKW_AnhaengeDatenarchiv
             If cbxCEMT.Checked Then If r.Cells("clmnCEMT_docID").Value <> "" Then myList.Add(copyFileToTMP(r.Cells("clmnCEMT_docID").Value, r.Cells("clmnLKW").Value, "CEMT", zielPfad)) 'r.Cells("clmnCEMT_docID").Value)
             If cbxLeasing.Checked Then If r.Cells("clmnLeasing_docID").Value <> "" Then myList.Add(copyFileToTMP(r.Cells("clmnLeasing_docID").Value, r.Cells("clmnLKW").Value, "Leasing", zielPfad)) 'r.Cells("clmnLeasing_docID").Value)
             If cbxMiete.Checked Then If r.Cells("clmnMiete_docID").Value <> "" Then myList.Add(copyFileToTMP(r.Cells("clmnMiete_docID").Value, r.Cells("clmnLKW").Value, "Miete", zielPfad)) 'r.Cells("clmnLeasing_docID").Value)
+            If cbxCIF.Checked Then If r.Cells("clmnCIF_docID").Value <> "" Then myList.Add(copyFileToTMP(r.Cells("clmnCIF_docID").Value, r.Cells("clmnLKW").Value, "CIF", zielPfad)) 'r.Cells("clmnLeasing_docID").Value)
+            If cbxCOC.Checked Then If r.Cells("clmnCOC_docID").Value <> "" Then myList.Add(copyFileToTMP(r.Cells("clmnCOC_docID").Value, r.Cells("clmnLKW").Value, "COC", zielPfad)) 'r.Cells("clmnLeasing_docID").Value)
         Next
         'zusammenfassen
         If CheckBox4.Checked Then

SDL/kunden/usrCntlCBAM.vb

@@ -50,7 +50,7 @@ Public Class usrCntlCBAM
                   OR   ezaWP_WarennummerEZT like '280410%'
                      )
                   and ezaWP_WarennummerEZT not like '310560%'
-                   and eza_status between 50 and 60 
+                    and (eza_status between 50  and 60 or [eza_ANR] LIKE 'ATC%')
             "
 
             If cbxVERAG.Checked Then
@@ -334,7 +334,7 @@ Public Class usrCntlCBAM
                   OR   ezaWP_WarennummerEZT like '280410%' 
                   )
                   and ezaWP_WarennummerEZT not like '310560%' 
-                   and eza_status between 50  and 60
+                     and (eza_status between 50  and 60 or [eza_ANR] LIKE 'ATC%')
                   
             "
 
@@ -409,7 +409,7 @@ Public Class usrCntlCBAM
    
                   )
                     and ezaWP_WarennummerEZT not like '310560%'
-                      and eza_status between 50  and 60
+                        and (eza_status between 50  and 60 or [eza_ANR] LIKE 'ATC%')
                     
             "
 

SDL/kunden/usrCntlKundenBesonderheiten.vb

@@ -84,9 +84,13 @@ Public Class usrCntlKundenBesonderheiten
         End Try
     End Sub
     Private Sub initDGV(Optional kdnrTmp = -1, Optional simpleView = False, Optional preferedKategorie = "", Optional preferedKategorieOtherIN = "")
+        'If dgvBesonderheiten IsNot Nothing Then Exit Sub
 
         If dgvBesonderheiten.Columns IsNot Nothing AndAlso dgvBesonderheiten.Columns.Count > 0 Then
-            dgvBesonderheiten.Columns.Clear()
+            Try
+                dgvBesonderheiten.Columns.Clear()
+            Catch
+            End Try
         End If
 
         If kdnrTmp > 0 Then Me.kdNr = kdnrTmp

SDL/kunden/usrCntlKundenuebersicht.Designer.vb

@@ -23,19 +23,19 @@ Partial Class usrCntlKundenuebersicht
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
-        Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlKundenuebersicht))
-        Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle32 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle33 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle34 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle36 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle35 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.cntxtAddVM = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.DToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.btnExcel = New System.Windows.Forms.Button()
@@ -43,6 +43,8 @@ Partial Class usrCntlKundenuebersicht
         Me.Label30 = New System.Windows.Forms.Label()
         Me.tbWeitereKundenDetails = New System.Windows.Forms.TabControl()
         Me.tbOfferten = New System.Windows.Forms.TabPage()
+        Me.Label12 = New System.Windows.Forms.Label()
+        Me.txtSammelrechnung = New System.Windows.Forms.TextBox()
         Me.dgvOfferteDetailsUebersicht = New System.Windows.Forms.DataGridView()
         Me.dgvOffertenSperrliste = New System.Windows.Forms.DataGridView()
         Me.lblKeineSperren = New System.Windows.Forms.Label()
@@ -87,8 +89,6 @@ Partial Class usrCntlKundenuebersicht
         Me.UsrCntlKundenBesonderheiten1 = New SDL.usrCntlKundenBesonderheiten()
         Me.lblAbfertigungsverbot = New System.Windows.Forms.Label()
         Me.Label45 = New System.Windows.Forms.Label()
-        Me.txtSammelrechnung = New System.Windows.Forms.TextBox()
-        Me.Label12 = New System.Windows.Forms.Label()
         Me.pnlVERAGSnspr = New System.Windows.Forms.Panel()
         Me.txtKundenbetreuerTeam = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.btnVeragAnspr = New VERAG_PROG_ALLGEMEIN.FlatButton()
@@ -139,6 +139,8 @@ Partial Class usrCntlKundenuebersicht
         Me.lblKreditlimit = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.lblVorkasse = New System.Windows.Forms.Label()
         Me.txtZahlungsziel = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txtVeranlKd = New System.Windows.Forms.TextBox()
+        Me.lblVeranlKd = New System.Windows.Forms.Label()
         Me.grpAdresse = New System.Windows.Forms.GroupBox()
         Me.tbKontakt = New System.Windows.Forms.TabControl()
         Me.tbKontaktKontakt = New System.Windows.Forms.TabPage()
@@ -209,7 +211,7 @@ Partial Class usrCntlKundenuebersicht
         Me.Label14 = New System.Windows.Forms.Label()
         Me.Label43 = New System.Windows.Forms.Label()
         Me.cbxKdAuftragsNr = New System.Windows.Forms.CheckBox()
-        Me.RichTextBox1 = New System.Windows.Forms.RichTextBox()
+        Me.rtbLKWWichtigeHinweise = New System.Windows.Forms.RichTextBox()
         Me.Label31 = New System.Windows.Forms.Label()
         Me.rtbLKWFreigabeSenden = New System.Windows.Forms.RichTextBox()
         Me.Label10 = New System.Windows.Forms.Label()
@@ -257,8 +259,6 @@ Partial Class usrCntlKundenuebersicht
         Me.btnReloadOP = New System.Windows.Forms.Button()
         Me.cboFirmaFMZOLL = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.SessionService1 = New VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.session.sessionService()
-        Me.lblVeranlKd = New System.Windows.Forms.Label()
-        Me.txtVeranlKd = New System.Windows.Forms.TextBox()
         Me.cntxtAddVM.SuspendLayout()
         Me.tbWeitereKundenDetails.SuspendLayout()
         Me.tbOfferten.SuspendLayout()
@@ -393,14 +393,35 @@ Partial Class usrCntlKundenuebersicht
         Me.tbOfferten.TabIndex = 4
         Me.tbOfferten.Text = "Offerte/Sperrliste"
         '
+        'Label12
+        '
+        Me.Label12.AutoSize = True
+        Me.Label12.Location = New System.Drawing.Point(11, 244)
+        Me.Label12.Name = "Label12"
+        Me.Label12.Size = New System.Drawing.Size(59, 13)
+        Me.Label12.TabIndex = 23
+        Me.Label12.Text = "Sammelrg.:"
+        '
+        'txtSammelrechnung
+        '
+        Me.txtSammelrechnung.BackColor = System.Drawing.Color.White
+        Me.txtSammelrechnung.BorderStyle = System.Windows.Forms.BorderStyle.None
+        Me.txtSammelrechnung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtSammelrechnung.ForeColor = System.Drawing.Color.Black
+        Me.txtSammelrechnung.Location = New System.Drawing.Point(76, 244)
+        Me.txtSammelrechnung.Name = "txtSammelrechnung"
+        Me.txtSammelrechnung.ReadOnly = True
+        Me.txtSammelrechnung.Size = New System.Drawing.Size(95, 13)
+        Me.txtSammelrechnung.TabIndex = 24
+        '
         'dgvOfferteDetailsUebersicht
         '
         Me.dgvOfferteDetailsUebersicht.AllowUserToAddRows = False
         Me.dgvOfferteDetailsUebersicht.AllowUserToDeleteRows = False
         Me.dgvOfferteDetailsUebersicht.AllowUserToOrderColumns = True
         Me.dgvOfferteDetailsUebersicht.AllowUserToResizeRows = False
-        DataGridViewCellStyle25.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle25
+        Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle13
         Me.dgvOfferteDetailsUebersicht.BackgroundColor = System.Drawing.Color.White
         Me.dgvOfferteDetailsUebersicht.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
         Me.dgvOfferteDetailsUebersicht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
@@ -420,8 +441,8 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvOffertenSperrliste.AllowUserToDeleteRows = False
         Me.dgvOffertenSperrliste.AllowUserToOrderColumns = True
         Me.dgvOffertenSperrliste.AllowUserToResizeRows = False
-        DataGridViewCellStyle26.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvOffertenSperrliste.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle26
+        Me.dgvOffertenSperrliste.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14
         Me.dgvOffertenSperrliste.BackgroundColor = System.Drawing.Color.White
         Me.dgvOffertenSperrliste.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
         Me.dgvOffertenSperrliste.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
@@ -431,10 +452,10 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvOffertenSperrliste.Name = "dgvOffertenSperrliste"
         Me.dgvOffertenSperrliste.ReadOnly = True
         Me.dgvOffertenSperrliste.RowHeadersVisible = False
-        DataGridViewCellStyle27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle27.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer))
+        DataGridViewCellStyle15.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer))
-        DataGridViewCellStyle27.SelectionForeColor = System.Drawing.Color.Black
+        DataGridViewCellStyle15.SelectionForeColor = System.Drawing.Color.Black
-        Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle27
+        Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle15
         Me.dgvOffertenSperrliste.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
         Me.dgvOffertenSperrliste.Size = New System.Drawing.Size(173, 257)
         Me.dgvOffertenSperrliste.TabIndex = 0
@@ -572,8 +593,8 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvOffenePosten.AllowUserToAddRows = False
         Me.dgvOffenePosten.AllowUserToDeleteRows = False
         Me.dgvOffenePosten.AllowUserToResizeRows = False
-        DataGridViewCellStyle28.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle28
+        Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle16
         Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White
         Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvOffenePosten.Dock = System.Windows.Forms.DockStyle.Fill
@@ -653,8 +674,8 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvUmsatzbericht.AllowUserToDeleteRows = False
         Me.dgvUmsatzbericht.AllowUserToOrderColumns = True
         Me.dgvUmsatzbericht.AllowUserToResizeRows = False
-        DataGridViewCellStyle29.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle29
+        Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17
         Me.dgvUmsatzbericht.BackgroundColor = System.Drawing.Color.White
         Me.dgvUmsatzbericht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvUmsatzbericht.Dock = System.Windows.Forms.DockStyle.Fill
@@ -716,8 +737,8 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvAnhaenge.AllowUserToAddRows = False
         Me.dgvAnhaenge.AllowUserToDeleteRows = False
         Me.dgvAnhaenge.AllowUserToResizeRows = False
-        DataGridViewCellStyle30.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvAnhaenge.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle30
+        Me.dgvAnhaenge.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle18
         Me.dgvAnhaenge.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White
         Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
@@ -1043,27 +1064,6 @@ Partial Class usrCntlKundenuebersicht
         Me.Label45.Size = New System.Drawing.Size(0, 13)
         Me.Label45.TabIndex = 36
         '
-        'txtSammelrechnung
-        '
-        Me.txtSammelrechnung.BackColor = System.Drawing.Color.White
-        Me.txtSammelrechnung.BorderStyle = System.Windows.Forms.BorderStyle.None
-        Me.txtSammelrechnung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSammelrechnung.ForeColor = System.Drawing.Color.Black
-        Me.txtSammelrechnung.Location = New System.Drawing.Point(76, 244)
-        Me.txtSammelrechnung.Name = "txtSammelrechnung"
-        Me.txtSammelrechnung.ReadOnly = True
-        Me.txtSammelrechnung.Size = New System.Drawing.Size(95, 13)
-        Me.txtSammelrechnung.TabIndex = 24
-        '
-        'Label12
-        '
-        Me.Label12.AutoSize = True
-        Me.Label12.Location = New System.Drawing.Point(11, 244)
-        Me.Label12.Name = "Label12"
-        Me.Label12.Size = New System.Drawing.Size(59, 13)
-        Me.Label12.TabIndex = 23
-        Me.Label12.Text = "Sammelrg.:"
-        '
         'pnlVERAGSnspr
         '
         Me.pnlVERAGSnspr.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
@@ -1939,6 +1939,27 @@ Partial Class usrCntlKundenuebersicht
         Me.txtZahlungsziel.TabIndex = 34
         Me.txtZahlungsziel.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
         '
+        'txtVeranlKd
+        '
+        Me.txtVeranlKd.BackColor = System.Drawing.Color.White
+        Me.txtVeranlKd.BorderStyle = System.Windows.Forms.BorderStyle.None
+        Me.txtVeranlKd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtVeranlKd.ForeColor = System.Drawing.Color.Black
+        Me.txtVeranlKd.Location = New System.Drawing.Point(556, 230)
+        Me.txtVeranlKd.Name = "txtVeranlKd"
+        Me.txtVeranlKd.ReadOnly = True
+        Me.txtVeranlKd.Size = New System.Drawing.Size(35, 13)
+        Me.txtVeranlKd.TabIndex = 49
+        '
+        'lblVeranlKd
+        '
+        Me.lblVeranlKd.AutoSize = True
+        Me.lblVeranlKd.Location = New System.Drawing.Point(492, 230)
+        Me.lblVeranlKd.Name = "lblVeranlKd"
+        Me.lblVeranlKd.Size = New System.Drawing.Size(59, 13)
+        Me.lblVeranlKd.TabIndex = 47
+        Me.lblVeranlKd.Text = "Veranl.Kd.:"
+        '
         'grpAdresse
         '
         Me.grpAdresse.BackColor = System.Drawing.Color.White
@@ -2461,8 +2482,8 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvVollmachten.AllowUserToDeleteRows = False
         Me.dgvVollmachten.AllowUserToOrderColumns = True
         Me.dgvVollmachten.AllowUserToResizeRows = False
-        DataGridViewCellStyle31.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle22.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvVollmachten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle31
+        Me.dgvVollmachten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle22
         Me.dgvVollmachten.BackgroundColor = System.Drawing.Color.White
         Me.dgvVollmachten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvVollmachten.Dock = System.Windows.Forms.DockStyle.Fill
@@ -2515,8 +2536,8 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvVertraege.AllowUserToDeleteRows = False
         Me.dgvVertraege.AllowUserToOrderColumns = True
         Me.dgvVertraege.AllowUserToResizeRows = False
-        DataGridViewCellStyle32.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle23.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvVertraege.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle32
+        Me.dgvVertraege.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle23
         Me.dgvVertraege.BackgroundColor = System.Drawing.Color.White
         Me.dgvVertraege.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvVertraege.Dock = System.Windows.Forms.DockStyle.Fill
@@ -2691,8 +2712,8 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvGestGarantie.AllowUserToDeleteRows = False
         Me.dgvGestGarantie.AllowUserToOrderColumns = True
         Me.dgvGestGarantie.AllowUserToResizeRows = False
-        DataGridViewCellStyle33.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        DataGridViewCellStyle24.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvGestGarantie.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle33
+        Me.dgvGestGarantie.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle24
         Me.dgvGestGarantie.BackgroundColor = System.Drawing.Color.White
         Me.dgvGestGarantie.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvGestGarantie.Dock = System.Windows.Forms.DockStyle.Fill
@@ -2830,6 +2851,7 @@ Partial Class usrCntlKundenuebersicht
         '
         'UsrCntlKundenAvisoMailBenachrichtigung1
         '
+        Me.UsrCntlKundenAvisoMailBenachrichtigung1.AutoScroll = True
         Me.UsrCntlKundenAvisoMailBenachrichtigung1.BackColor = System.Drawing.Color.White
         Me.UsrCntlKundenAvisoMailBenachrichtigung1.Dock = System.Windows.Forms.DockStyle.Fill
         Me.UsrCntlKundenAvisoMailBenachrichtigung1.Location = New System.Drawing.Point(3, 3)
@@ -2842,7 +2864,7 @@ Partial Class usrCntlKundenuebersicht
         Me.tbKdSpez.Controls.Add(Me.Label14)
         Me.tbKdSpez.Controls.Add(Me.Label43)
         Me.tbKdSpez.Controls.Add(Me.cbxKdAuftragsNr)
-        Me.tbKdSpez.Controls.Add(Me.RichTextBox1)
+        Me.tbKdSpez.Controls.Add(Me.rtbLKWWichtigeHinweise)
         Me.tbKdSpez.Controls.Add(Me.Label31)
         Me.tbKdSpez.Controls.Add(Me.rtbLKWFreigabeSenden)
         Me.tbKdSpez.Controls.Add(Me.Label10)
@@ -2886,14 +2908,14 @@ Partial Class usrCntlKundenuebersicht
         Me.cbxKdAuftragsNr.Text = "Kunde verwendet eigene Auftragsnummern"
         Me.cbxKdAuftragsNr.UseVisualStyleBackColor = True
         '
-        'RichTextBox1
+        'rtbLKWWichtigeHinweise
         '
-        Me.RichTextBox1.Location = New System.Drawing.Point(235, 84)
+        Me.rtbLKWWichtigeHinweise.Location = New System.Drawing.Point(235, 84)
-        Me.RichTextBox1.Name = "RichTextBox1"
+        Me.rtbLKWWichtigeHinweise.Name = "rtbLKWWichtigeHinweise"
-        Me.RichTextBox1.Size = New System.Drawing.Size(222, 50)
+        Me.rtbLKWWichtigeHinweise.Size = New System.Drawing.Size(222, 50)
-        Me.RichTextBox1.TabIndex = 8
+        Me.rtbLKWWichtigeHinweise.TabIndex = 8
-        Me.RichTextBox1.Text = ""
+        Me.rtbLKWWichtigeHinweise.Text = ""
-        Me.RichTextBox1.Visible = False
+        Me.rtbLKWWichtigeHinweise.Visible = False
         '
         'Label31
         '
@@ -3145,24 +3167,24 @@ Partial Class usrCntlKundenuebersicht
         Me.dgvAufschub.AllowUserToResizeColumns = False
         Me.dgvAufschub.AllowUserToResizeRows = False
         Me.dgvAufschub.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle34.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvAufschub.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle34
+        Me.dgvAufschub.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle19
         Me.dgvAufschub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvAufschub.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.KtoId, Me.Art, Me.HZA, Me.KontoNr, Me.EORI, Me.NL})
-        DataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle36.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvAufschub.DefaultCellStyle = DataGridViewCellStyle36
+        Me.dgvAufschub.DefaultCellStyle = DataGridViewCellStyle21
         Me.dgvAufschub.Location = New System.Drawing.Point(13, 61)
         Me.dgvAufschub.MultiSelect = False
         Me.dgvAufschub.Name = "dgvAufschub"
@@ -3189,8 +3211,8 @@ Partial Class usrCntlKundenuebersicht
         '
         'HZA
         '
-        DataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
+        DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
-        Me.HZA.DefaultCellStyle = DataGridViewCellStyle35
+        Me.HZA.DefaultCellStyle = DataGridViewCellStyle20
         Me.HZA.HeaderText = "HZA"
         Me.HZA.Name = "HZA"
         Me.HZA.ReadOnly = True
@@ -3374,27 +3396,6 @@ Partial Class usrCntlKundenuebersicht
         Me.SessionService1.Url = "https://finanzonline.bmf.gv.at/fonws/ws/session"
         Me.SessionService1.UseDefaultCredentials = False
         '
-        'lblVeranlKd
-        '
-        Me.lblVeranlKd.AutoSize = True
-        Me.lblVeranlKd.Location = New System.Drawing.Point(492, 230)
-        Me.lblVeranlKd.Name = "lblVeranlKd"
-        Me.lblVeranlKd.Size = New System.Drawing.Size(59, 13)
-        Me.lblVeranlKd.TabIndex = 47
-        Me.lblVeranlKd.Text = "Veranl.Kd.:"
-        '
-        'txtVeranlKd
-        '
-        Me.txtVeranlKd.BackColor = System.Drawing.Color.White
-        Me.txtVeranlKd.BorderStyle = System.Windows.Forms.BorderStyle.None
-        Me.txtVeranlKd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtVeranlKd.ForeColor = System.Drawing.Color.Black
-        Me.txtVeranlKd.Location = New System.Drawing.Point(556, 230)
-        Me.txtVeranlKd.Name = "txtVeranlKd"
-        Me.txtVeranlKd.ReadOnly = True
-        Me.txtVeranlKd.Size = New System.Drawing.Size(35, 13)
-        Me.txtVeranlKd.TabIndex = 49
-        '
         'usrCntlKundenuebersicht
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -3620,7 +3621,7 @@ Partial Class usrCntlKundenuebersicht
     Friend WithEvents tbKdSpez As TabPage
     Friend WithEvents Label43 As Label
     Friend WithEvents cbxKdAuftragsNr As CheckBox
-    Friend WithEvents RichTextBox1 As RichTextBox
+    Friend WithEvents rtbLKWWichtigeHinweise As RichTextBox
     Friend WithEvents Label31 As Label
     Friend WithEvents rtbLKWFreigabeSenden As RichTextBox
     Friend WithEvents Label10 As Label

SDL/kunden/usrCntlKundenuebersicht.vb

@@ -3182,4 +3182,5 @@ Public Class usrCntlKundenuebersicht
         Me.Cursor = Cursors.Default
     End Sub
 
+
 End Class

SDL/mdm/usrCntlKartenDaten.vb

@@ -1203,10 +1203,10 @@ Public Class usrCntlKartenDaten
                 Case 210 : odoc = getWordRetourniert_SI(odoc, kdNr, datum)
                 Case 211 : odoc = getWordRetourniert_MULTI(odoc, kdNr, datum)
                 Case 213 : odoc = getWordRetourniert_HUGO(odoc, kdNr, datum)
-                Case 214 : odoc = getWordRetourniert_PLOSE(odoc, kdNr, datum)
+                Case 214 : odoc = getWordRetourniert_PLOSE(odoc, kdNr, datum, "214")
                 Case 215 : odoc = getWordRetourniert_PLOSE_IT(odoc, kdNr, datum)
                 Case 216 : odoc = getWordRetourniert_PLOSE_MEDPASS(odoc, kdNr, datum)
-                Case 217 : odoc = getWordRetourniert_PLOSE(odoc, kdNr, datum)
+                Case 217 : odoc = getWordRetourniert_PLOSE(odoc, kdNr, datum, "217")
                 Case 218 : odoc = getWordRetourniert_PLOSE_TRUCKMASTER(odoc, kdNr, datum)
                 Case Else : odoc.Close() : MsgBox("Falsche Leistung")
             End Select
@@ -1365,9 +1365,9 @@ Public Class usrCntlKartenDaten
         End Try
         Return odoc
     End Function
-    Function getWordRetourniert_PLOSE(odoc As Microsoft.Office.Interop.Word.Document, kdNr As Integer, datum As Date) As Microsoft.Office.Interop.Word.Document
+    Function getWordRetourniert_PLOSE(odoc As Microsoft.Office.Interop.Word.Document, kdNr As Integer, datum As Date, SDLNr As String) As Microsoft.Office.Interop.Word.Document
         Try
-            Dim dt As DataTable = SQL.loadDgvBySql("SELECT * FROM SDL WHERE KundenNr=" & kdNr & " AND SDLNr=214 AND Retourniert=1 AND RetourniertAm between '" & datum.ToShortDateString & " 00:00:00' and '" & datum.ToShortDateString & " 23:59:59'")
+            Dim dt As DataTable = SQL.loadDgvBySql("SELECT * FROM SDL WHERE KundenNr=" & kdNr & " AND SDLNr IN (" & SDLNr & ") AND Retourniert=1 AND RetourniertAm between '" & datum.ToShortDateString & " 00:00:00' and '" & datum.ToShortDateString & " 23:59:59'")
             Dim KUNDE = kundenSQL.getKundeFMZOLLByKdNr(kdNr)
             If KUNDE Is Nothing Then MsgBox("Kunde nicht gefunden!") : Return odoc
             Dim PartnerKdNrFromFMZOLL As cPartnerKdNRFMZoll = kundenSQL.getPartnerKdNrFromFMZOLL(kdNr)
@@ -1386,6 +1386,7 @@ Public Class usrCntlKartenDaten
                     oTable = odoc.Bookmarks("TabelleKarten2").Range.Tables(1)
                     Dim i = 1
                     For Each r As DataRow In dt.Rows
+                        ' MsgBox(cSqlDb.checkNullStr(r("OBUID")))
                         oTable.Rows(i + 1).Cells(1).Range.Text = cSqlDb.checkNullStr(r("KfzKennzeichen"))
                         oTable.Rows(i + 1).Cells(2).Range.Text = cSqlDb.checkNullStr(r("KartenNr"))
                         oTable.Rows(i + 1).Cells(3).Range.Text = cSqlDb.checkNullStr(r("OBUID"))