Merge Commit. Was kann schon schief gehen...

Aviso/Auswertung/frmAuswertung.vb

@@ -644,8 +644,8 @@ Public Class frmAuswertung
                     While dr.Read
 
                         Dim kdnr = dr.Item("KundenNr").ToString
-                        Dim LIST_EMAILS = New SDL.cEmailBenachrichtigungList(kdnr, 1)
+                        Dim LIST_EMAILS = New VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigungList(kdnr, 1)
-                        Dim LIST_EMAILS2 = New SDL.cEmailBenachrichtigungList(kdnr, 2)
+                        Dim LIST_EMAILS2 = New VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigungList(kdnr, 2)
 
                         Dim eMail = (dr.Item("eMail")).ToString.Replace(" ", "")
                         Dim eMail2 = (dr.Item("eMail2")).ToString.Replace(" ", "")

Aviso/Auswertung/usrctlStatVERIMEX.Designer.vb

@@ -25,16 +25,17 @@ Partial Class usrctlStatVERIMEX
         Me.Panel3 = New System.Windows.Forms.Panel()
         Me.Label9 = New System.Windows.Forms.Label()
         Me.Panel4 = New System.Windows.Forms.Panel()
+        Me.Button3 = New System.Windows.Forms.Button()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.Button2 = New System.Windows.Forms.Button()
         Me.dgvAbklaerungTR = New System.Windows.Forms.DataGridView()
         Me.Label10 = New System.Windows.Forms.Label()
         Me.Label6 = New System.Windows.Forms.Label()
-        Me.Button1 = New System.Windows.Forms.Button()
         Me.datStatBis = New System.Windows.Forms.DateTimePicker()
         Me.datStatVon = New System.Windows.Forms.DateTimePicker()
-        Me.Button3 = New System.Windows.Forms.Button()
+        Me.Button2 = New System.Windows.Forms.Button()
+        Me.Button1 = New System.Windows.Forms.Button()
+        Me.Button4 = New System.Windows.Forms.Button()
         Me.Panel3.SuspendLayout()
         Me.Panel4.SuspendLayout()
         CType(Me.dgvAbklaerungTR, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -42,24 +43,23 @@ Partial Class usrctlStatVERIMEX
         '
         'Panel3
         '
+        Me.Panel3.Controls.Add(Me.Button4)
         Me.Panel3.Controls.Add(Me.Label9)
         Me.Panel3.Controls.Add(Me.Panel4)
         Me.Panel3.Controls.Add(Me.Button2)
         Me.Panel3.Controls.Add(Me.Button1)
-        Me.Panel3.Location = New System.Drawing.Point(22, 26)
+        Me.Panel3.Location = New System.Drawing.Point(15, 17)
-        Me.Panel3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.Panel3.Name = "Panel3"
-        Me.Panel3.Size = New System.Drawing.Size(1052, 651)
+        Me.Panel3.Size = New System.Drawing.Size(701, 423)
         Me.Panel3.TabIndex = 0
         '
         'Label9
         '
         Me.Label9.AutoSize = True
         Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label9.Location = New System.Drawing.Point(4, 12)
+        Me.Label9.Location = New System.Drawing.Point(3, 8)
-        Me.Label9.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label9.Name = "Label9"
-        Me.Label9.Size = New System.Drawing.Size(204, 20)
+        Me.Label9.Size = New System.Drawing.Size(139, 13)
         Me.Label9.TabIndex = 0
         Me.Label9.Text = "Sendungserfassung TR"
         '
@@ -74,19 +74,27 @@ Partial Class usrctlStatVERIMEX
         Me.Panel4.Controls.Add(Me.Label6)
         Me.Panel4.Controls.Add(Me.datStatBis)
         Me.Panel4.Controls.Add(Me.datStatVon)
-        Me.Panel4.Location = New System.Drawing.Point(4, 37)
+        Me.Panel4.Location = New System.Drawing.Point(3, 24)
-        Me.Panel4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.Panel4.Name = "Panel4"
-        Me.Panel4.Size = New System.Drawing.Size(1005, 552)
+        Me.Panel4.Size = New System.Drawing.Size(670, 359)
         Me.Panel4.TabIndex = 1
         '
+        'Button3
+        '
+        Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button3.Location = New System.Drawing.Point(532, 8)
+        Me.Button3.Name = "Button3"
+        Me.Button3.Size = New System.Drawing.Size(135, 23)
+        Me.Button3.TabIndex = 6
+        Me.Button3.Text = "Auswerten"
+        Me.Button3.UseVisualStyleBackColor = True
+        '
         'Label1
         '
         Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(519, 20)
+        Me.Label1.Location = New System.Drawing.Point(346, 13)
-        Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(53, 20)
+        Me.Label1.Size = New System.Drawing.Size(35, 13)
         Me.Label1.TabIndex = 0
         Me.Label1.Text = "Firma:"
         '
@@ -96,101 +104,93 @@ Partial Class usrctlStatVERIMEX
         Me.cboFirma._allowFreiText = False
         Me.cboFirma._value = ""
         Me.cboFirma.FormattingEnabled = True
-        Me.cboFirma.Location = New System.Drawing.Point(579, 17)
+        Me.cboFirma.Location = New System.Drawing.Point(386, 11)
+        Me.cboFirma.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
         Me.cboFirma.Name = "cboFirma"
-        Me.cboFirma.Size = New System.Drawing.Size(164, 28)
+        Me.cboFirma.Size = New System.Drawing.Size(111, 21)
         Me.cboFirma.TabIndex = 5
         '
-        'Button2
-        '
-        Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button2.Location = New System.Drawing.Point(897, 599)
-        Me.Button2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.Button2.Name = "Button2"
-        Me.Button2.Size = New System.Drawing.Size(112, 35)
-        Me.Button2.TabIndex = 3
-        Me.Button2.Text = "Bericht"
-        Me.Button2.UseVisualStyleBackColor = True
-        '
         'dgvAbklaerungTR
         '
         Me.dgvAbklaerungTR.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.dgvAbklaerungTR.Location = New System.Drawing.Point(9, 58)
+        Me.dgvAbklaerungTR.Location = New System.Drawing.Point(6, 38)
-        Me.dgvAbklaerungTR.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.dgvAbklaerungTR.Name = "dgvAbklaerungTR"
         Me.dgvAbklaerungTR.RowHeadersWidth = 62
-        Me.dgvAbklaerungTR.Size = New System.Drawing.Size(992, 489)
+        Me.dgvAbklaerungTR.Size = New System.Drawing.Size(661, 318)
         Me.dgvAbklaerungTR.TabIndex = 7
         '
         'Label10
         '
         Me.Label10.AutoSize = True
-        Me.Label10.Location = New System.Drawing.Point(269, 23)
+        Me.Label10.Location = New System.Drawing.Point(179, 15)
-        Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label10.Name = "Label10"
-        Me.Label10.Size = New System.Drawing.Size(14, 20)
+        Me.Label10.Size = New System.Drawing.Size(10, 13)
         Me.Label10.TabIndex = 3
         Me.Label10.Text = "-"
         '
         'Label6
         '
         Me.Label6.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(4, 23)
+        Me.Label6.Location = New System.Drawing.Point(3, 15)
-        Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(76, 20)
+        Me.Label6.Size = New System.Drawing.Size(51, 13)
         Me.Label6.TabIndex = 1
         Me.Label6.Text = "Zeitraum:"
         '
-        'Button1
-        '
-        Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button1.Location = New System.Drawing.Point(775, 599)
-        Me.Button1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(112, 35)
-        Me.Button1.TabIndex = 2
-        Me.Button1.Text = "Excel"
-        Me.Button1.UseVisualStyleBackColor = True
-        '
         'datStatBis
         '
         Me.datStatBis.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
-        Me.datStatBis.Location = New System.Drawing.Point(291, 18)
+        Me.datStatBis.Location = New System.Drawing.Point(194, 12)
-        Me.datStatBis.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.datStatBis.Name = "datStatBis"
-        Me.datStatBis.Size = New System.Drawing.Size(156, 26)
+        Me.datStatBis.Size = New System.Drawing.Size(105, 20)
         Me.datStatBis.TabIndex = 4
         '
         'datStatVon
         '
         Me.datStatVon.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
-        Me.datStatVon.Location = New System.Drawing.Point(105, 18)
+        Me.datStatVon.Location = New System.Drawing.Point(70, 12)
-        Me.datStatVon.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.datStatVon.Name = "datStatVon"
-        Me.datStatVon.Size = New System.Drawing.Size(156, 26)
+        Me.datStatVon.Size = New System.Drawing.Size(105, 20)
         Me.datStatVon.TabIndex = 2
         '
-        'Button3
+        'Button2
         '
-        Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button3.Location = New System.Drawing.Point(798, 13)
+        Me.Button2.Location = New System.Drawing.Point(598, 389)
-        Me.Button3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.Button2.Name = "Button2"
-        Me.Button3.Name = "Button3"
+        Me.Button2.Size = New System.Drawing.Size(75, 23)
-        Me.Button3.Size = New System.Drawing.Size(203, 35)
+        Me.Button2.TabIndex = 3
-        Me.Button3.TabIndex = 6
+        Me.Button2.Text = "Bericht"
-        Me.Button3.Text = "Auswerten"
+        Me.Button2.UseVisualStyleBackColor = True
-        Me.Button3.UseVisualStyleBackColor = True
+        '
+        'Button1
+        '
+        Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button1.Location = New System.Drawing.Point(517, 389)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(75, 23)
+        Me.Button1.TabIndex = 2
+        Me.Button1.Text = "Excel"
+        Me.Button1.UseVisualStyleBackColor = True
+        '
+        'Button4
+        '
+        Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button4.Location = New System.Drawing.Point(310, 389)
+        Me.Button4.Name = "Button4"
+        Me.Button4.Size = New System.Drawing.Size(135, 23)
+        Me.Button4.TabIndex = 4
+        Me.Button4.Text = "Detailbericht (Excel)"
+        Me.Button4.UseVisualStyleBackColor = True
         '
         'usrctlStatVERIMEX
         '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!)
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.Color.White
         Me.Controls.Add(Me.Panel3)
-        Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.Name = "usrctlStatVERIMEX"
-        Me.Size = New System.Drawing.Size(1266, 785)
+        Me.Size = New System.Drawing.Size(844, 510)
         Me.Panel3.ResumeLayout(False)
         Me.Panel3.PerformLayout()
         Me.Panel4.ResumeLayout(False)
@@ -213,4 +213,5 @@ Partial Class usrctlStatVERIMEX
     Friend WithEvents Label1 As Label
     Friend WithEvents cboFirma As VERAG_PROG_ALLGEMEIN.MyComboBox
     Friend WithEvents Button3 As Button
+    Friend WithEvents Button4 As Button
 End Class

Aviso/Auswertung/usrctlStatVERIMEX.vb

@@ -21,9 +21,10 @@ Public Class usrctlStatVERIMEX
             Dim sqlstr = "SELECT  mit_vname + ' ' + mit_nname as Mitarbeiter ,count(*) as Sendungen ,count(distinct(avisoid)) as LKW
                   FROM [tblSendungen] inner join Aviso on AvisoID = tblSnd_AvisoID inner join admin.dbo.tblMitarbeiter on mit_id=tblSnd_AbklaerungTR_MA
                   " & innerJoinFiliale & "
-                  where cast(Datum as date) BETWEEN '" & datStatVon.Value & "' and '" & datStatBis.Value & "'  and tblSnd_AbklaerungTR_MA is not null
+                  where cast(tblSnd_AbklaerungTR as date) BETWEEN '" & datStatVon.Value & "' and '" & datStatBis.Value & "'  and tblSnd_AbklaerungTR_MA is not null 
                   " & whereFiliale & "
                   group by mit_vname,mit_nname"
+            'früher: Datum statt tblSnd_AbklaerungTR
 
             dgvAbklaerungTR.DataSource = SQL.loadDgvBySql(sqlstr, "AVISO")
 
@@ -122,4 +123,37 @@ Public Class usrctlStatVERIMEX
             init()
         End If
     End Sub
+
+    Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
+        Me.Cursor = Cursors.WaitCursor
+
+        Try
+
+
+            Dim whereFiliale = ""
+            Dim innerJoinFiliale = ""
+        Select Case cboFirma._value
+            Case ""
+            Case 0 : whereFiliale = " and tblSendungen.FilialenNr <=0 "
+            Case Else
+                whereFiliale = " and Filialen.Firma='" & cboFirma._value & "' "
+                innerJoinFiliale = "inner join " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".VERAG.dbo.Filialen on [tblSendungen].FilialenNr=Filialen.FilialenNr"
+        End Select
+
+
+        Dim sqlstr = "SELECT   (Select isnull(Filialen.firma,'') FROM [FMZOLL\SQLFMZOLL].VERAG.dbo.Filialen WHERE [tblSendungen].FilialenNr=Filialen.FilialenNr) Firma,
+                        mit_vname + ' ' + mit_nname as Mitarbeiter, aviso.LKW_Nr [LKW Kennzeichen],tblSnd_AvisoID [LKW-ID], Auftraggeber as Avisierer, Frächter, tblSnd_Empfaenger as Empfänger, tblSnd_Colli Colli, tblSnd_Gewicht Gewicht, tblSnd_Abfertigungsart_ID Abfertigungsart, tblSendungen.FilialenNr , tblSendungen.AbfertigungsNr, replace(Ankunft,'1899-12-30 00:00:00','') Ankunft, replace(Freigabe,'1899-12-30 00:00:00','') Freigabe
+                        FROM [tblSendungen] inner join Aviso on AvisoID = tblSnd_AvisoID inner join admin.dbo.tblMitarbeiter on mit_id=tblSnd_AbklaerungTR_MA
+                        " & innerJoinFiliale & "
+                        where cast(tblSnd_AbklaerungTR as date) BETWEEN  '" & datStatVon.Value & "' and '" & datStatBis.Value & "' and tblSnd_AbklaerungTR_MA is not null 
+                        " & whereFiliale & "
+                        ORDER BY Firma, Mitarbeiter,Auftraggeber,LKW_Nr,tblSnd_PosUnterNr"
+
+            SDL.cProgramFunctions.genExcelFromDT_NEW(SQL.loadDgvBySql(sqlstr, "AVISO"))
+
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
+        Me.Cursor = Cursors.Default
+    End Sub
 End Class

Aviso/Classes/cSendungsoptions.vb

@@ -171,8 +171,7 @@ Public Class SendungOptions
 
         If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("RPT_SND_Grenzstelle") Then
             If AVISO.Zollstelle IsNot Nothing AndAlso AVISO.Zollstelle <> "" Then
-                Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+                VALUES.Grenze = VERAGSQL.getValueTxtBySql("SELECT basncd_dstnr +' - ' + [basncd_name]  FROM basncd WHERE basncd_dstnr='" & AVISO.Zollstelle & "' ", "ATLAS")
-                VALUES.Grenze = SQL.getValueTxtBySql("SELECT basncd_dstnr +' - ' + [basncd_name]  FROM basncd WHERE basncd_dstnr='" & AVISO.Zollstelle & "' ", "ATLAS")
             Else
                 If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" Then
                     VALUES.Grenze = ""
@@ -316,6 +315,10 @@ Public Class SendungOptions
         End If
         VALUES.SchnellAbfertigung = (SendungsAnzahlAviso = 1)
 
+        VALUES.VG_MA = VERAGSQL.DLookup("mit_vname + ' ' + mit_nname", "tblMitarbeiter", "mit_id='" & SENDUNG.tblSnd_VG_MA & "'", "ADMIN", "")
+        VALUES.QS_MA = VERAGSQL.DLookup("mit_vname + ' ' + mit_nname", "tblMitarbeiter", "mit_id='" & SENDUNG.tblSnd_QS_MA & "'", "ADMIN", "")
+
+
         SENDUNG.LOAD_ABRECHNUNG() 'Daten holen
         Dim abfertKostKdnr As Integer = -1
         Dim cnt_fr As Integer = 0

Aviso/My Project/AssemblyInfo.vb

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

Aviso/My Project/Resources.Designer.vb

@@ -1149,6 +1149,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die  ähnelt.
+        '''</summary>
+        Friend ReadOnly Property sdfsdf3sdfsd34sdfgsdg() As String
+            Get
+                Return ResourceManager.GetString("sdfsdf3sdfsd34sdfgsdg", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -1489,7 +1498,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die 4.6.0.8 ähnelt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die 3.6.2.4 ähnelt.
         '''</summary>
         Friend ReadOnly Property Version() As String
             Get

Aviso/My Project/Resources.resx

@@ -536,7 +536,7 @@
     <value>..\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Version" xml:space="preserve">
-    <value>4.6.0.8</value>
+    <value>3.6.2.4</value>
   </data>
   <data name="statusBtn_vorgeschrieben_Aktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\statusBtn_vorgeschrieben_Aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -604,4 +604,7 @@
   <data name="ATANAK_Instructions_Export_T1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ATANAK_Instructions_Export_T1.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="sdfsdf3sdfsd34sdfgsdg" xml:space="preserve">
+    <value />
+  </data>
 </root>

Aviso/frmHauptfenster.vb

@@ -3888,15 +3888,15 @@ Public Class AvisoStatusFunctions
                 Dim EMails_CC As String = ""
                 Dim EMails_BCC As String = ""
 
-                Dim Emails_list_sent As New SDL.cEmailBenachrichtigungList
+                Dim Emails_list_sent As New VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigungList
 
 
-                eMails_einlesen(AVISO.Auftraggeber_KdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
+                VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(AVISO.Auftraggeber_KdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
                 Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, AVISO.Auftraggeber_KdNr)
 
                 'Frächter und Avisierer werden getrennt voneinander eingelesen, damit es kein Problem mit gesendeten VBD/Steuerbescheiden gibt!
                 If AVISO.Frächter_KdNr <> AVISO.Auftraggeber_KdNr Then
-                    eMails_einlesen(AVISO.Frächter_KdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
+                    VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(AVISO.Frächter_KdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
                     Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, AVISO.Frächter_KdNr)
                 End If
 
@@ -3905,14 +3905,14 @@ Public Class AvisoStatusFunctions
                     SENDUNG_LIST.Add(New VERAG_PROG_ALLGEMEIN.cSendungen(r("tblSnd_SendungID")))
                 Next
                 For Each s In SENDUNG_LIST
-                    eMails_einlesen(s.tblSnd_EmpfaengerKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
+                    VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(s.tblSnd_EmpfaengerKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
                     Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, s.tblSnd_EmpfaengerKdNr)
-                    eMails_einlesen(s.tblSnd_AuftraggeberKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
+                    VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(s.tblSnd_AuftraggeberKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
                     Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, s.tblSnd_AuftraggeberKdNr)
 
-                    eMails_einlesen(s.tblSnd_FrachtfuehrerKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
+                    VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(s.tblSnd_FrachtfuehrerKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
                     Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, s.tblSnd_FrachtfuehrerKdNr)
-                    eMails_einlesen(s.tblSnd_AvisiererKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
+                    VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(s.tblSnd_AvisiererKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
                     Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, s.tblSnd_AvisiererKdNr)
                 Next
 
@@ -3937,14 +3937,14 @@ Public Class AvisoStatusFunctions
                 Dim EMails_BCC As String = ""
 
 
-                Dim Emails_list_sent As New SDL.cEmailBenachrichtigungList
+                Dim Emails_list_sent As New VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigungList
 
-                eMails_einlesen(AVISO.Auftraggeber_KdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
+                VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(AVISO.Auftraggeber_KdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
                 Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, AVISO.Auftraggeber_KdNr, ForceMail)
 
                 'Frächter und Avisierer werden getrennt voneinander eingelesen, damit es kein Problem mit gesendeten VBD/Steuerbescheiden gibt!
                 If AVISO.Frächter_KdNr <> AVISO.Auftraggeber_KdNr Then
-                    eMails_einlesen(AVISO.Frächter_KdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
+                    VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(AVISO.Frächter_KdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
                     Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, AVISO.Frächter_KdNr, ForceMail)
                 End If
 
@@ -3953,14 +3953,14 @@ Public Class AvisoStatusFunctions
                     SENDUNG_LIST.Add(New VERAG_PROG_ALLGEMEIN.cSendungen(r("tblSnd_SendungID")))
                 Next
                 For Each s In SENDUNG_LIST
-                    eMails_einlesen(s.tblSnd_EmpfaengerKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
+                    VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(s.tblSnd_EmpfaengerKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
                     Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, s.tblSnd_EmpfaengerKdNr, ForceMail)
-                    eMails_einlesen(s.tblSnd_AuftraggeberKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
+                    VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(s.tblSnd_AuftraggeberKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
                     Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, s.tblSnd_AuftraggeberKdNr, ForceMail)
 
-                    eMails_einlesen(s.tblSnd_FrachtfuehrerKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
+                    VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(s.tblSnd_FrachtfuehrerKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
                     Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, s.tblSnd_FrachtfuehrerKdNr, ForceMail)
-                    eMails_einlesen(s.tblSnd_AvisiererKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
+                    VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(s.tblSnd_AvisiererKdNr, art, EMails, EMails_CC, EMails_BCC, Emails_list_sent)
                     Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, s.tblSnd_AvisiererKdNr, ForceMail)
                 Next
 
@@ -4033,15 +4033,15 @@ Public Class AvisoStatusFunctions
                 mailsTXT &= "BCC: " & EMails_BCC & "<br><br>"
 
 
-                VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(ForceMail, hBetreff, mailsTXT & hBody, getAbsenderEmail(), False, False, "", "", anhaenge)
+                VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(ForceMail, hBetreff, mailsTXT & hBody, VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.getAbsenderEmail(), False, False, "", "", anhaenge)
 
             Else
 
 
-                EMails_BCC &= If(EMails_BCC <> "", ";", "") & getAbsenderEmail() 'Damit Mails gespeichert werden.
+                EMails_BCC &= If(EMails_BCC <> "", ";", "") & VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.getAbsenderEmail() 'Damit Mails gespeichert werden.
 
 
-                If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, hBetreff, hBody, getAbsenderEmail(), False, False, EMails_CC, EMails_BCC, anhaenge) Then
+                If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, hBetreff, hBody, VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.getAbsenderEmail(), False, False, EMails_CC, EMails_BCC, anhaenge) Then
                     Dim txt = " E-Mail gesendet an: " & EMails
                     If EMails_CC.ToString.Trim <> "" Then txt &= " CC: " & EMails_CC
                     If EMails_BCC.ToString.Trim <> "" Then txt &= " BCC: " & EMails_BCC
@@ -4067,15 +4067,7 @@ Public Class AvisoStatusFunctions
         End If
     End Sub
 
-    Public Shared Function getAbsenderEmail() As String
+
-        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
-            Case "IMEX" : Return "noreply@imex-group.at"
-            Case "ATILLA" : Return "noreply@verag.ag"
-            Case "UNISPED" : Return "No-Reply@unisped.at"
-            Case "FRONTOFFICE" : Return "noreply@front-office.eu"
-            Case Else : Return "noreply@verag.ag"
-        End Select
-    End Function
 
     Public Function setVorbereitet(AvisoID) As Boolean
         'If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then
@@ -5238,140 +5230,6 @@ Public Class AvisoStatusFunctions
 
     ' End Function
 
-    Shared Sub eMails_einlesen(Kdnr As String, art As Integer, ByRef Emails As String, ByRef Emails_CC As String, ByRef Emails_BCC As String, Emails_list_sent As SDL.cEmailBenachrichtigungList)
-        'ART:
-        '1=Ankunft
-        '2=Freigabe
-        '3=Ankunft Export
-        '4=Freigabe Export
-        Dim Firmen As New cFirmenDAL
-        Dim Firma As New cFirma
-
-        Emails = ""
-        Emails_CC = ""
-        Emails_BCC = ""
-
-        If Kdnr Is Nothing OrElse Not IsNumeric(Kdnr) Then Exit Sub
-        '  Dim Avisierer As New cKunde(hAuftraggeber_kdnr)
-        '  Dim Fraechter As New cKunde(hFrächter_kdnr)
-        Dim Kdnr_Mails As New SDL.cEmailBenachrichtigungList(Kdnr, art)
-        ' Dim Fraechter_Mails As New SDL.cEmailBenachrichtigungList(hFrächter_kdnr, art)
-        '  If hAuftraggeber_kdnr <> hFrächter_kdnr Then Fraechter_Mails = New SDL.cEmailBenachrichtigungList(hFrächter_kdnr, art)
-
-        Dim Emails_list As New SDL.cEmailBenachrichtigungList
-        Dim Emails_CC_list As New SDL.cEmailBenachrichtigungList
-        Dim Emails_BCC_list As New SDL.cEmailBenachrichtigungList
-
-        'Dim Emails As String
-        For Each i In Kdnr_Mails.LIST
-            If i.eb_bcc Then
-                If Not existing(Kdnr, i.eb_EMail, Emails_BCC_list.LIST, Emails_CC_list.LIST, Emails_list.LIST) And Not existing(Kdnr, i.eb_EMail, Emails_list_sent.LIST) Then Emails_BCC_list.LIST.Add(i) ' &= i.eb_EMail & ";"
-            ElseIf i.eb_cc Then
-                If Not existing(Kdnr, i.eb_EMail, Emails_BCC_list.LIST, Emails_CC_list.LIST, Emails_list.LIST) And Not existing(Kdnr, i.eb_EMail, Emails_list_sent.LIST) Then Emails_CC_list.LIST.Add(i) ' &= i.eb_EMail & ";"
-            Else
-                If Not existing(Kdnr, i.eb_EMail, Emails_BCC_list.LIST, Emails_CC_list.LIST, Emails_list.LIST) And Not existing(Kdnr, i.eb_EMail, Emails_list_sent.LIST) Then Emails_list.LIST.Add(i) ' &= i.eb_EMail & ";"
-            End If
-        Next
-        'For Each i In Fraechter_Mails.LIST
-        '    If i.eb_bcc Then
-        '        If Not existing(hFrächter_kdnr, i.eb_EMail, Emails_BCC_list.LIST, Emails_CC_list.LIST, Emails_list.LIST) And Not existing(hFrächter_kdnr, i.eb_EMail, Emails_list_sent.LIST) Then Emails_BCC_list.LIST.Add(i) ' &= i.eb_EMail & ";"
-        '    ElseIf i.eb_cc Then
-        '        If Not existing(hFrächter_kdnr, i.eb_EMail, Emails_BCC_list.LIST, Emails_CC_list.LIST, Emails_list.LIST) And Not existing(hFrächter_kdnr, i.eb_EMail, Emails_list_sent.LIST) Then Emails_CC_list.LIST.Add(i) ' &= i.eb_EMail & ";"
-        '    Else
-        '        If Not existing(hFrächter_kdnr, i.eb_EMail, Emails_BCC_list.LIST, Emails_CC_list.LIST, Emails_list.LIST) And Not existing(hFrächter_kdnr, i.eb_EMail, Emails_list_sent.LIST) Then Emails_list.LIST.Add(i) ' &= i.eb_EMail & ";"
-        '    End If
-        'Next
-
-        For Each i In Emails_list.LIST
-            Emails &= i.eb_EMail & ";"
-        Next
-        For Each i In Emails_CC_list.LIST
-            Emails_CC &= i.eb_EMail & ";"
-        Next
-        For Each i In Emails_BCC_list.LIST
-            Emails_BCC &= i.eb_EMail & ";"
-        Next
-
-        For Each i In Emails_list.LIST : Emails_list_sent.LIST.Add(i) : Next
-        For Each i In Emails_CC_list.LIST : Emails_list_sent.LIST.Add(i) : Next
-        For Each i In Emails_BCC_list.LIST : Emails_list_sent.LIST.Add(i) : Next
-
-    End Sub
-
-    Shared Sub eMails_einlesenOLD(hFrächter_kdnr As String, hAuftraggeber_kdnr As String, art As Integer, ByRef Emails As String, ByRef Emails_CC As String, ByRef Emails_BCC As String, Emails_list_sent As SDL.cEmailBenachrichtigungList)
-        'ART:
-        '1=Ankunft
-        '2=Freigabe
-        '3=Ankunft Export
-        '4=Freigabe Export
-        Dim Firmen As New cFirmenDAL
-        Dim Firma As New cFirma
-
-        Emails = ""
-        Emails_CC = ""
-        Emails_BCC = ""
-
-        '  Dim Avisierer As New cKunde(hAuftraggeber_kdnr)
-        '  Dim Fraechter As New cKunde(hFrächter_kdnr)
-        Dim Avisierer_Mails As New SDL.cEmailBenachrichtigungList(hAuftraggeber_kdnr, art)
-        Dim Fraechter_Mails As New SDL.cEmailBenachrichtigungList(hFrächter_kdnr, art)
-        If hAuftraggeber_kdnr <> hFrächter_kdnr Then Fraechter_Mails = New SDL.cEmailBenachrichtigungList(hFrächter_kdnr, art)
-
-        Dim Emails_list As New SDL.cEmailBenachrichtigungList
-        Dim Emails_CC_list As New SDL.cEmailBenachrichtigungList
-        Dim Emails_BCC_list As New SDL.cEmailBenachrichtigungList
-
-        'Dim Emails As String
-        For Each i In Avisierer_Mails.LIST
-            If i.eb_bcc Then
-                If Not existing(hFrächter_kdnr, i.eb_EMail, Emails_BCC_list.LIST, Emails_CC_list.LIST, Emails_list.LIST) And Not existing(hFrächter_kdnr, i.eb_EMail, Emails_list_sent.LIST) Then Emails_BCC_list.LIST.Add(i) ' &= i.eb_EMail & ";"
-            ElseIf i.eb_cc Then
-                If Not existing(hFrächter_kdnr, i.eb_EMail, Emails_BCC_list.LIST, Emails_CC_list.LIST, Emails_list.LIST) And Not existing(hFrächter_kdnr, i.eb_EMail, Emails_list_sent.LIST) Then Emails_CC_list.LIST.Add(i) ' &= i.eb_EMail & ";"
-            Else
-                If Not existing(hFrächter_kdnr, i.eb_EMail, Emails_BCC_list.LIST, Emails_CC_list.LIST, Emails_list.LIST) And Not existing(hFrächter_kdnr, i.eb_EMail, Emails_list_sent.LIST) Then Emails_list.LIST.Add(i) ' &= i.eb_EMail & ";"
-            End If
-        Next
-        For Each i In Fraechter_Mails.LIST
-            If i.eb_bcc Then
-                If Not existing(hFrächter_kdnr, i.eb_EMail, Emails_BCC_list.LIST, Emails_CC_list.LIST, Emails_list.LIST) And Not existing(hFrächter_kdnr, i.eb_EMail, Emails_list_sent.LIST) Then Emails_BCC_list.LIST.Add(i) ' &= i.eb_EMail & ";"
-            ElseIf i.eb_cc Then
-                If Not existing(hFrächter_kdnr, i.eb_EMail, Emails_BCC_list.LIST, Emails_CC_list.LIST, Emails_list.LIST) And Not existing(hFrächter_kdnr, i.eb_EMail, Emails_list_sent.LIST) Then Emails_CC_list.LIST.Add(i) ' &= i.eb_EMail & ";"
-            Else
-                If Not existing(hFrächter_kdnr, i.eb_EMail, Emails_BCC_list.LIST, Emails_CC_list.LIST, Emails_list.LIST) And Not existing(hFrächter_kdnr, i.eb_EMail, Emails_list_sent.LIST) Then Emails_list.LIST.Add(i) ' &= i.eb_EMail & ";"
-            End If
-        Next
-
-        For Each i In Emails_list.LIST
-            Emails &= i.eb_EMail & ";"
-        Next
-        For Each i In Emails_CC_list.LIST
-            Emails_CC &= i.eb_EMail & ";"
-        Next
-        For Each i In Emails_BCC_list.LIST
-            Emails_BCC &= i.eb_EMail & ";"
-        Next
-
-        For Each i In Emails_list.LIST : Emails_list_sent.LIST.Add(i) : Next
-
-    End Sub
-    Shared Function existing(KundenNr As Integer, Email As String, Emails_list As List(Of SDL.cEmailBenachrichtigung), Optional ListEmails_CC_list As List(Of SDL.cEmailBenachrichtigung) = Nothing, Optional ListEmails_BCC_list As List(Of SDL.cEmailBenachrichtigung) = Nothing) As Boolean
-        If Emails_list IsNot Nothing Then
-            For Each i In Emails_list
-                If i.eb_EMail = Email And i.eb_KundenNr = KundenNr Then Return True
-            Next
-        End If
-        If ListEmails_CC_list IsNot Nothing Then
-            For Each i In ListEmails_CC_list
-                If i.eb_EMail = Email And i.eb_KundenNr = KundenNr Then Return True
-            Next
-        End If
-        If ListEmails_BCC_list IsNot Nothing Then
-            For Each i In ListEmails_BCC_list
-                If i.eb_EMail = Email And i.eb_KundenNr = KundenNr Then Return True
-            Next
-        End If
-        Return False
-    End Function
 
     Shared Function getGrenzstelleZollstelle(hGrenzstelle As String, AVISO As VERAG_PROG_ALLGEMEIN.cAviso) As String
         If hGrenzstelle <> "" Then

Aviso/frmSendungsdetailsNEU.Designer.vb

@@ -23,14 +23,14 @@ Partial Class frmSendungsdetailsNEU
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
-        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSendungsdetailsNEU))
-        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.pnl = New System.Windows.Forms.Panel()
         Me.Panel4 = New System.Windows.Forms.Panel()
         Me.TabControl1 = New System.Windows.Forms.TabControl()
@@ -259,6 +259,8 @@ Partial Class frmSendungsdetailsNEU
         Me.txtKdAuftragsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.LinkLabel4 = New System.Windows.Forms.LinkLabel()
         Me.Panel5 = New System.Windows.Forms.Panel()
+        Me.txtAnzahlPos = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label4 = New System.Windows.Forms.Label()
         Me.lblAbfNrExists = New System.Windows.Forms.Label()
         Me.cbxFremdspedition = New System.Windows.Forms.CheckBox()
         Me.lblAbfNr_Err = New System.Windows.Forms.Label()
@@ -357,6 +359,7 @@ Partial Class frmSendungsdetailsNEU
         Me.ATANAKToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ImportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ExportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ExportT1ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ToolStripMenuItem15 = New System.Windows.Forms.ToolStripMenuItem()
         Me.SpeditionSUBENToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -364,10 +367,10 @@ Partial Class frmSendungsdetailsNEU
         Me.IMEXToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
         Me.UNISPEDToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.VERAGToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.AuftragATANAKToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ToolStripMenuItem14 = New System.Windows.Forms.ToolStripMenuItem()
         Me.NurÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ExportT1ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.pnl.SuspendLayout()
         Me.Panel4.SuspendLayout()
         Me.TabControl1.SuspendLayout()
@@ -485,14 +488,14 @@ Partial Class frmSendungsdetailsNEU
         Me.dgvAnhang.AllowUserToResizeColumns = False
         Me.dgvAnhang.AllowUserToResizeRows = False
         Me.dgvAnhang.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvAnhang.DefaultCellStyle = DataGridViewCellStyle8
+        Me.dgvAnhang.DefaultCellStyle = DataGridViewCellStyle1
         Me.dgvAnhang.Dock = System.Windows.Forms.DockStyle.Fill
         Me.dgvAnhang.Location = New System.Drawing.Point(0, 45)
         Me.dgvAnhang.Name = "dgvAnhang"
@@ -1332,44 +1335,44 @@ Partial Class frmSendungsdetailsNEU
         Me.gridVermerke.AllowUserToAddRows = False
         Me.gridVermerke.AllowUserToDeleteRows = False
         Me.gridVermerke.AllowUserToResizeRows = False
-        DataGridViewCellStyle9.BackColor = System.Drawing.Color.Azure
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.Azure
-        DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
+        Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
         Me.gridVermerke.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle10.BackColor = System.Drawing.Color.LightBlue
+        DataGridViewCellStyle3.BackColor = System.Drawing.Color.LightBlue
-        DataGridViewCellStyle10.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle3.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle10
+        Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle3
         Me.gridVermerke.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing
-        DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.gridVermerke.DefaultCellStyle = DataGridViewCellStyle11
+        Me.gridVermerke.DefaultCellStyle = DataGridViewCellStyle4
         Me.gridVermerke.Dock = System.Windows.Forms.DockStyle.Fill
         Me.gridVermerke.Location = New System.Drawing.Point(0, 0)
         Me.gridVermerke.MultiSelect = False
         Me.gridVermerke.Name = "gridVermerke"
         Me.gridVermerke.ReadOnly = True
-        DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridVermerke.RowHeadersDefaultCellStyle = DataGridViewCellStyle12
+        Me.gridVermerke.RowHeadersDefaultCellStyle = DataGridViewCellStyle5
         Me.gridVermerke.RowHeadersVisible = False
         Me.gridVermerke.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing
-        DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle13
+        Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle6
         Me.gridVermerke.RowTemplate.Height = 20
         Me.gridVermerke.RowTemplate.ReadOnly = True
         Me.gridVermerke.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False]
@@ -1876,7 +1879,7 @@ Partial Class frmSendungsdetailsNEU
         'txtVK_Preis
         '
         Me.txtVK_Preis._DateTimeOnly = False
-        Me.txtVK_Preis._numbersOnly = False
+        Me.txtVK_Preis._numbersOnly = True
         Me.txtVK_Preis._numbersOnlyKommastellen = ""
         Me.txtVK_Preis._Prozent = False
         Me.txtVK_Preis._ShortDateNew = False
@@ -1906,7 +1909,7 @@ Partial Class frmSendungsdetailsNEU
         Me.txtVK_Leistung._TimeOnly = False
         Me.txtVK_Leistung._value = ""
         Me.txtVK_Leistung._Waehrung = False
-        Me.txtVK_Leistung._WaehrungZeichen = True
+        Me.txtVK_Leistung._WaehrungZeichen = False
         Me.txtVK_Leistung.ForeColor = System.Drawing.Color.Black
         Me.txtVK_Leistung.Location = New System.Drawing.Point(129, 205)
         Me.txtVK_Leistung.MaxLength = 30
@@ -1985,8 +1988,8 @@ Partial Class frmSendungsdetailsNEU
         'clmnPreis
         '
         Me.clmnPreis.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
-        DataGridViewCellStyle14.Format = "C2"
+        DataGridViewCellStyle7.Format = "C2"
-        Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle14
+        Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle7
         Me.clmnPreis.HeaderText = "Preis"
         Me.clmnPreis.MaxInputLength = 15
         Me.clmnPreis.Name = "clmnPreis"
@@ -3617,6 +3620,8 @@ Partial Class frmSendungsdetailsNEU
         '
         Me.Panel5.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
         Me.Panel5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Panel5.Controls.Add(Me.txtAnzahlPos)
+        Me.Panel5.Controls.Add(Me.Label4)
         Me.Panel5.Controls.Add(Me.lblAbfNrExists)
         Me.Panel5.Controls.Add(Me.cbxFremdspedition)
         Me.Panel5.Controls.Add(Me.lblAbfNr_Err)
@@ -3639,6 +3644,41 @@ Partial Class frmSendungsdetailsNEU
         Me.Panel5.Size = New System.Drawing.Size(1214, 69)
         Me.Panel5.TabIndex = 0
         '
+        'txtAnzahlPos
+        '
+        Me.txtAnzahlPos._DateTimeOnly = False
+        Me.txtAnzahlPos._numbersOnly = True
+        Me.txtAnzahlPos._numbersOnlyKommastellen = ""
+        Me.txtAnzahlPos._Prozent = False
+        Me.txtAnzahlPos._ShortDateNew = False
+        Me.txtAnzahlPos._ShortDateOnly = False
+        Me.txtAnzahlPos._TimeOnly = False
+        Me.txtAnzahlPos._value = ""
+        Me.txtAnzahlPos._Waehrung = False
+        Me.txtAnzahlPos._WaehrungZeichen = True
+        Me.txtAnzahlPos.Font = New System.Drawing.Font("Microsoft Tai Le", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtAnzahlPos.Location = New System.Drawing.Point(802, 27)
+        Me.txtAnzahlPos.MaxLength = 3
+        Me.txtAnzahlPos.MaxLineLength = -1
+        Me.txtAnzahlPos.MaxLines_Warning = ""
+        Me.txtAnzahlPos.MaxLines_Warning_Label = Nothing
+        Me.txtAnzahlPos.Name = "txtAnzahlPos"
+        Me.txtAnzahlPos.Size = New System.Drawing.Size(41, 24)
+        Me.txtAnzahlPos.TabIndex = 17
+        Me.txtAnzahlPos.Visible = False
+        '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label4.ForeColor = System.Drawing.Color.White
+        Me.Label4.Location = New System.Drawing.Point(799, 6)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(64, 17)
+        Me.Label4.TabIndex = 16
+        Me.Label4.Text = "Pos.Anz:"
+        Me.Label4.Visible = False
+        '
         'lblAbfNrExists
         '
         Me.lblAbfNrExists.AutoSize = True
@@ -4602,7 +4642,7 @@ Partial Class frmSendungsdetailsNEU
         '
         Me.ctxtWeitereFormulare.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolGelangensbestätigung, Me.toolOriginalSendungsunterlagen, Me.LaufzettelDruckenToolStripMenuItem, Me.ZollstoppAMBARToolStripMenuItem, Me.ATANAKToolStripMenuItem})
         Me.ctxtWeitereFormulare.Name = "cntxt"
-        Me.ctxtWeitereFormulare.Size = New System.Drawing.Size(263, 136)
+        Me.ctxtWeitereFormulare.Size = New System.Drawing.Size(263, 114)
         '
         'toolGelangensbestätigung
         '
@@ -4651,20 +4691,26 @@ Partial Class frmSendungsdetailsNEU
         'ImportToolStripMenuItem
         '
         Me.ImportToolStripMenuItem.Name = "ImportToolStripMenuItem"
-        Me.ImportToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ImportToolStripMenuItem.Size = New System.Drawing.Size(123, 22)
         Me.ImportToolStripMenuItem.Text = "Import"
         '
         'ExportToolStripMenuItem
         '
         Me.ExportToolStripMenuItem.Name = "ExportToolStripMenuItem"
-        Me.ExportToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ExportToolStripMenuItem.Size = New System.Drawing.Size(123, 22)
         Me.ExportToolStripMenuItem.Text = "Export"
         '
+        'ExportT1ToolStripMenuItem
+        '
+        Me.ExportT1ToolStripMenuItem.Name = "ExportT1ToolStripMenuItem"
+        Me.ExportT1ToolStripMenuItem.Size = New System.Drawing.Size(123, 22)
+        Me.ExportT1ToolStripMenuItem.Text = "Export T1"
+        '
         'ContextMenuStrip1
         '
-        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem15, Me.SpeditionSUBENToolStripMenuItem, Me.ToolStripMenuItem16})
+        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem15, Me.SpeditionSUBENToolStripMenuItem, Me.ToolStripMenuItem16, Me.AuftragATANAKToolStripMenuItem})
         Me.ContextMenuStrip1.Name = "cntxtAnh"
-        Me.ContextMenuStrip1.Size = New System.Drawing.Size(171, 70)
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(171, 92)
         '
         'ToolStripMenuItem15
         '
@@ -4705,6 +4751,13 @@ Partial Class frmSendungsdetailsNEU
         Me.VERAGToolStripMenuItem.Size = New System.Drawing.Size(121, 22)
         Me.VERAGToolStripMenuItem.Text = "VERAG"
         '
+        'AuftragATANAKToolStripMenuItem
+        '
+        Me.AuftragATANAKToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.email_big1
+        Me.AuftragATANAKToolStripMenuItem.Name = "AuftragATANAKToolStripMenuItem"
+        Me.AuftragATANAKToolStripMenuItem.Size = New System.Drawing.Size(170, 22)
+        Me.AuftragATANAKToolStripMenuItem.Text = "Auftrag ATANAK "
+        '
         'ContextMenuStrip2
         '
         Me.ContextMenuStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem14, Me.NurÖffnenToolStripMenuItem})
@@ -4726,12 +4779,6 @@ Partial Class frmSendungsdetailsNEU
         Me.NurÖffnenToolStripMenuItem.Size = New System.Drawing.Size(247, 22)
         Me.NurÖffnenToolStripMenuItem.Text = "nur öffnen"
         '
-        'ExportT1ToolStripMenuItem
-        '
-        Me.ExportT1ToolStripMenuItem.Name = "ExportT1ToolStripMenuItem"
-        Me.ExportT1ToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
-        Me.ExportT1ToolStripMenuItem.Text = "Export T1"
-        '
         'frmSendungsdetailsNEU
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)
@@ -5164,4 +5211,7 @@ Partial Class frmSendungsdetailsNEU
     Friend WithEvents ImportToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents ExportToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents ExportT1ToolStripMenuItem As ToolStripMenuItem
+    Public WithEvents txtAnzahlPos As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents Label4 As Label
+    Friend WithEvents AuftragATANAKToolStripMenuItem As ToolStripMenuItem
 End Class

Aviso/frmSendungsdetailsNEU.resx

@@ -1480,9 +1480,6 @@
         mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg==
 </value>
   </data>
-  <metadata name="MenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>296, 17</value>
-  </metadata>
   <data name="Button6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V
@@ -1603,18 +1600,6 @@
   <metadata name="clmnPreis.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="clmnVK_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="clmnFirma.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="clmnLeistung.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="clmnPreis.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <data name="Button9.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAHtJREFUSEvt
@@ -1847,9 +1832,6 @@
   <metadata name="cntxtOptions.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>174, 17</value>
   </metadata>
-  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>404, 17</value>
-  </metadata>
   <metadata name="ctxtWeitereFormulare.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>596, 17</value>
   </metadata>

Aviso/frmSendungsdetailsNEU.vb

@@ -339,7 +339,7 @@ Public Class frmSendungsdetailsNEU
                     cboFiliale._allowFreiText = Nothing
                 Case Else
                     Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
-                        Case "VERAG" : cboFiliale._allowedValuesFreiText = {"4803", "4809", "4805", "4806", "4811", "5003", "5303", "5103", "4839"}
+                        Case "VERAG" : cboFiliale._allowedValuesFreiText = {"4803", "4809", "4805", "4806", "4811", "5003", "5303", "5103", "4839", "7001"}
                         Case "IMEX" : cboFiliale._allowedValuesFreiText = {"5501"}
                         Case "UNISPED" : cboFiliale._allowedValuesFreiText = {"5601"}
                         Case "AMBAR" : cboFiliale._allowedValuesFreiText = {"5701"}
@@ -990,9 +990,9 @@ Public Class frmSendungsdetailsNEU
 
             Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER
                 Case "FRONTOFFICE"
-                    whereFiliale = " AND FilialenNr IN (4803,4805,4811,5003,5303,5103,4839,5501,5601,5701,5801) "
+                    whereFiliale = " AND FilialenNr IN (4803,4805,4811,5003,5303,5103,4839,5501,5601,5701,5801,7001) "
                     If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then
-                        whereFiliale = " AND FilialenNr IN (4803,4805,4811,5003,5303,5103,4839,5501,5601,5801,5701) "
+                        whereFiliale = " AND FilialenNr IN (4803,4805,4811,5003,5303,5103,4839,5501,5601,5801,5701,7001) "
                     End If
 
                 Case Else
@@ -1049,6 +1049,7 @@ Public Class frmSendungsdetailsNEU
             '     txtEmpfaengerBonitaet.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Bonitaet, "")
             '  txtEmpfaengerAnsprechpartner.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Ansprechperson, "")
             txtAnzahl.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_anzahlHandling, String.Empty)
+            txtAnzahlPos.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_anzahlPOS, String.Empty)
 
             ' txtAuftraggeber, "KdNr = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_AuftraggeberKdNr", String.Empty)
             ' txtAbsender, "KdNr = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbsenderKdNr", String.Empty)
@@ -1463,6 +1464,7 @@ Public Class frmSendungsdetailsNEU
         ' SENDUNG_LIST(CURRENT_INDEX).tblSnd_Bonitaet = txtEmpfaengerBonitaet.Text
         '  SENDUNG_LIST(CURRENT_INDEX).tblSnd_Ansprechperson = txtEmpfaengerAnsprechpartner.Text
         SENDUNG_LIST(CURRENT_INDEX).tblSnd_anzahlHandling = txtAnzahl.Text
+        SENDUNG_LIST(CURRENT_INDEX).tblSnd_anzahlPOS = If(IsNumeric(txtAnzahlPos.Text), txtAnzahlPos.Text, Nothing)
 
         ' txtAuftraggeber, "KdNr = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_AuftraggeberKdNr", String.Empty)
         ' txtAbsender, "KdNr = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbsenderKdNr", String.Empty)
@@ -1593,6 +1595,8 @@ Public Class frmSendungsdetailsNEU
         SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier3 = cboVorpapier3.Text.Trim
         SENDUNG_LIST(CURRENT_INDEX).tblSnd_Vorpapier3_Pos = txtVorpapier3Pos.Text.Trim
 
+        SENDUNG_LIST(CURRENT_INDEX).tblSnd_anzahlHandling = txtAnzahlPos.Text.Trim
+
 
     End Sub
     Function getint(o) As Integer
@@ -2673,6 +2677,7 @@ Public Class frmSendungsdetailsNEU
         '  Panel5.Enabled = Not sperren
         '  cboAbfertigungsart.Enabled = Not sperren
         txtAnzahl.Enabled = Not sperren
+        txtAnzahlPos.Enabled = Not sperren
         '  cboFiliale.Enabled = Not sperren
         txtAbfertigungsnummer.Enabled = Not sperren
         txtUnterNr.Enabled = Not sperren
@@ -2682,6 +2687,10 @@ Public Class frmSendungsdetailsNEU
     End Sub
     Private Sub cboFiliale_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboFiliale.SelectedIndexChanged
         '  btnKassenbuchEintrag.Enabled = True
+
+        txtAnzahlPos.Visible = (cboFiliale._value = "7001")
+        Label4.Visible = (cboFiliale._value = "7001")
+
         Dim tmp = cboAbfertigungsart._value
         If IsNumeric(cboFiliale._value) Then
             cboAbfertigungsart.fillWithSQL("SELECT Abfertigungsarten.Abfertigungsart,[Abfertigungsbezeichnung] FROM [Abfertigungsarten] INNER JOIN tblAbfertigungsartenFiliale ON tblAbfertigungsartenFiliale.Abfertigungsart=Abfertigungsarten.Abfertigungsart  where Filialennr=" & cboFiliale._value & "", True, "FMZOLL", True)
@@ -4168,7 +4177,7 @@ Public Class frmSendungsdetailsNEU
                 VK.sndvk_LeistungsNr = 499
                 VK.sndvk_LeistungsBez = txtVK_Leistung.Text.Trim
                 VK.sndvk_Firma = txtVK_Firma.Text.Trim
-                VK.sndvk_Preis = txtVK_Preis._value
+                VK.sndvk_Preis = CDbl(txtVK_Preis._value)
                 'SENDUNG_LIST(CURRENT_INDEX).SAVE()
                 btnVorkostenAdd.BackgroundImage = My.Resources.plus
             Else
@@ -4176,7 +4185,7 @@ Public Class frmSendungsdetailsNEU
                 VK.sndvk_LeistungsNr = 499
                 VK.sndvk_LeistungsBez = txtVK_Leistung.Text.Trim
                 VK.sndvk_Firma = txtVK_Firma.Text.Trim
-                VK.sndvk_Preis = txtVK_Preis._value
+                VK.sndvk_Preis = CDbl(txtVK_Preis._value)
                 SENDUNG_LIST(CURRENT_INDEX).VORKOSTEN.Add(VK)
             End If
             VK_ID = -1
@@ -4487,4 +4496,55 @@ Public Class frmSendungsdetailsNEU
         End Try
         Me.Cursor = Cursors.Default
     End Sub
+
+    Private Sub AuftragATANAKToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AuftragATANAKToolStripMenuItem.Click
+
+        Try
+            VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.clearTMPPath("ClipBoard_TMP")
+            If True Then 'dgvAnhang.SelectedRows.Count >= 1 Then
+                Try
+                    Dim outl As New Outlook.Application
+                    Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
+                    Mail = outl.CreateItem(0)
+
+                    For Each r As DataGridViewRow In dgvAnhang.SelectedRows
+                        Mail.Attachments.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("anh_docId").Value), Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
+                    Next
+                    Mail.Subject = AVISO.ImEx & " / " & AVISO.LKW_Nr & " / " & "ETA: " & If(AVISO.VoraussichtlichesEintreffen IsNot Nothing, CDate(AVISO.VoraussichtlichesEintreffen).ToShortDateString, "") & " // VERAG"
+                    Mail.To = "european@atanak.com"
+
+                    Dim TextHTML = ""
+                    TextHTML &= "Dear Atanak Team,<br>"
+                    TextHTML &= "<br>"
+                    TextHTML &= "eattached our next " & If(AVISO.ImEx = "", "customs", AVISO.ImEx) & " instruction.<br>"
+                    TextHTML &= "<br>"
+                    TextHTML &= "<table style=""font-family:Calibri, Arial;font-size:15px;"">"
+                    TextHTML &= "<tr><td>ETA:</td><td><b>" & If(AVISO.VoraussichtlichesEintreffen IsNot Nothing, CDate(AVISO.VoraussichtlichesEintreffen).ToShortDateString, "") & "</b></td></tr>"
+                    TextHTML &= "<tr><td>Truck:</td><td><b>" & AVISO.LKW_Nr & "</b></td></tr>"
+                    TextHTML &= "<tr><td width=""150"">Customs Office: </td><td><b>" & SQL.getValueTxtBySql("SELECT [basncd_name]  FROM basncd WHERE basncd_dstnr='" & If(AVISO.Zollstelle, "") & "' ", "ATLAS") & "</b></td></tr>"
+                    TextHTML &= "</table>"
+                    TextHTML &= "<br>"
+                    TextHTML &= "<br>"
+
+                    TextHTML &= "Best regards<br>"
+                    TextHTML &= "<b>" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "</b><br>"
+                    TextHTML &= "<br>"
+
+                    Mail.HTMLBody = "<div style=""font-family:Calibri, Arial;font-size:15px;"">" & TextHTML & SDL.cFakturierung.getSignature("EN",,,, "BREXIT_VERAG") & "</div>"
+
+                    Dim answer = MsgBox("Vermerk 'An ATANAK avisiert' eintragen?", vbYesNoCancel)
+                    If vbYes = answer Then
+                        AvisoStatusFunctions.insertSendungsVermerk(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId, "An ATANAK avisiert", 43)
+                    End If
+                    Mail.Display()
+
+                Catch ex As Exception
+                    MsgBox("Fehler beim Öffnen der Mail!")
+                End Try
+            End If
+        Catch ex As Exception
+            MsgBox("Fehler beim Öffnen der Mail!")
+        End Try
+    End Sub
+
 End Class

Aviso/usrCntlBenachrichtigungen.vb

@@ -49,7 +49,7 @@
 
                 whereMA &= " ) "
 
-                Dim sqlStr As String = "SELECT tblAvisoBenachrichtigungen.*, LKW_Nr, Status FROM [tblAvisoBenachrichtigungen] INNER JOIN AVISO on AvisoId=ab_AvisoID WHERE ab_status=0 " & whereMA & " ORDER BY ab_Datum ASC"
+                Dim sqlStr As String = "SELECT tblAvisoBenachrichtigungen.*, LKW_Nr, Status FROM [tblAvisoBenachrichtigungen] INNER JOIN AVISO on AvisoId=ab_AvisoID WHERE ab_status=0 " & whereMA & " ORDER BY ANKUNFT desc,ab_Datum ASC"
 
 
                 Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)

Aviso/usrcntlAktDetails.vb

@@ -581,7 +581,7 @@ Public Class usrcntlAktDetails
 
                     r.Cells("FilialenNr").Style.ForeColor = Color.White
                     Select Case r.Cells("FilialenNr").Value
-                        Case "4803", "4805", "5003", "5103", "5303", "4811"
+                        Case "4803", "4805", "5003", "5103", "5303", "4811", "7001"
                             r.Cells("FilialenNr").Style.BackColor = Color.FromArgb(0, 54, 128)
                             r.Cells("FilialenNr").Style.ForeColor = r.Cells("FilialenNr").Style.BackColor
                         Case "5501"

Gemeinsames/rptSendungen.Designer.vb

@@ -126,6 +126,7 @@ Partial Public Class rptSendungen
         Me.txtAbsender_VK = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
         Me.txtFrachtfuehrer_VK = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
         Me.txtSchnellAbfertigung = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
+        Me.TextBox3 = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
         CType(Me.Picture, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.txtGrenze, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblGrenze, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -233,12 +234,13 @@ Partial Public Class rptSendungen
         CType(Me.txtAbsender_VK, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.txtFrachtfuehrer_VK, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.txtSchnellAbfertigung, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.TextBox3, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me, System.ComponentModel.ISupportInitialize).BeginInit()
         '
         'Detail
         '
         Me.Detail.CanGrow = False
-        Me.Detail.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Picture, Me.txtGrenze, Me.lblGrenze, Me.txtAnmerkungen, Me.txtAbfertigungsart, Me.txtTarifposanzahl, Me.txtFilialeNr, Me.txtAbfertigungsnummer, Me.txtAvisierer_Firma, Me.txtAvisierer_KdNr, Me.txtAuftraggeber_Firma, Me.txtAuftraggeber_KdNr, Me.txtEmpfaenger_Firma, Me.txtEmpfaenger_KdNr, Me.txtAbsender_Firma, Me.txtAbsender_KdNr, Me.txtFrachtfuehrer_Firma, Me.txtFrachtfuehrer_KdNr, Me.txtAvisierer_Zoll, Me.txtAvisierer_Eust, Me.txtAvisierer_Abf, Me.txtAvisierer_Clear, Me.txtAuftraggeber_Zoll, Me.txtAuftraggeber_Eust, Me.txtAuftraggeber_Abf, Me.txtAuftraggeber_Clear, Me.txtEmpfaenger_Zoll, Me.txtEmpfaenger_Eust, Me.txtEmpfaenger_Abf, Me.txtEmpfaenger_Clear, Me.txtAbsender_Zoll, Me.txtAbsender_Eust, Me.txtAbsender_Abf, Me.txtAbsender_Clear, Me.txtFrachtfuehrer_Zoll, Me.txtFrachtfuehrer_Eust, Me.txtFrachtfuehrer_Abf, Me.txtFrachtfuehrer_Clear, Me.txtAvisierer_Leistung1, Me.txtAvisierer_Betrag1, Me.txtAvisierer_Leistung2, Me.txtAvisierer_Betrag2, Me.txtAvisierer_Leistung3, Me.txtAvisierer_Betrag3, Me.txtAuftraggeber_Leistung1, Me.txtAuftraggeber_Betrag, Me.txtAuftraggeber_Leistung2, Me.txtAuftraggeber_Betrag2, Me.txtAuftraggeber_Leistung3, Me.txtAuftraggeber_Betrag3, Me.txtEmpfaenger_Leistung1, Me.txtEmpfaenger_Betrag1, Me.txtEmpfaenger_Leistung2, Me.txtEmpfaenger_Betrag2, Me.txtEmpfaenger_Leistung3, Me.txtEmpfaenger_Betrag3, Me.txtAbsender_Leistung1, Me.txtAbsender_Betrag1, Me.txtAbsender_Leistung2, Me.txtAbsender_Betrag2, Me.txtAbsender_Leistung3, Me.txtAbsender_Betrag3, Me.txtFrachtfuehrer_Leistung1, Me.txtFrachtfuehrer_Betrag1, Me.txtFrachtfuehrer_Leistung2, Me.txtFrachtfuehrer_Betrag2, Me.txtFrachtfuehrer_Leistung3, Me.txtFrachtfuehrer_Betrag3, Me.txtFrachtfuehrer_Bar_BelegNr, Me.txtFrachtfuehrer_Bar_Betrag, Me.txtAvisierer_eigBin, Me.txtAuftraggeber_eigBin, Me.txtEmpfaenger_eigBIN, Me.txtAbsender_eigBIN, Me.txtFrachtfuehrer_eigBIN, Me.txtLKWKennzeichen, Me.txtAnkunft, Me.txtAbfahrt, Me.txtWarenbezeichnung, Me.txtColli, Me.txtGewicht, Me.txtAufschub_VERAG, Me.txtDokZuSend_Ueberschrift, Me.txtDokZuSend_Text, Me.txtBARzuKassieren, Me.TextBox1, Me.barcodeSendung, Me.TextBox2, Me.txtNCTSVZAdr, Me.lblNCTSVZAdr, Me.SubReport, Me.txtFrachtfuehrer_Bar_BelegNr2, Me.txtFrachtfuehrer_Bar_Betrag2, Me.txtFrachtfuehrer_Bar_BelegNr3, Me.txtFrachtfuehrer_Bar_Betrag3, Me.txtAuftraggeber_EUSTKto, Me.txtEmpfaenger_EUSTKto, Me.txtAuftraggeber_ZOLLKto, Me.txtEmpfaenger_ZOLLKto, Me.txtKdAuftrNr, Me.cbxDyUebermittelt, Me.shGrenze, Me.barcodeLKW, Me.txtAvisierer_VK, Me.txtAuftraggeber_VK, Me.txtEmpfaenger_VK, Me.txtAbsender_VK, Me.txtFrachtfuehrer_VK, Me.txtSchnellAbfertigung})
+        Me.Detail.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Picture, Me.txtGrenze, Me.lblGrenze, Me.txtAnmerkungen, Me.txtAbfertigungsart, Me.txtTarifposanzahl, Me.txtFilialeNr, Me.txtAbfertigungsnummer, Me.txtAvisierer_Firma, Me.txtAvisierer_KdNr, Me.txtAuftraggeber_Firma, Me.txtAuftraggeber_KdNr, Me.txtEmpfaenger_Firma, Me.txtEmpfaenger_KdNr, Me.txtAbsender_Firma, Me.txtAbsender_KdNr, Me.txtFrachtfuehrer_Firma, Me.txtFrachtfuehrer_KdNr, Me.txtAvisierer_Zoll, Me.txtAvisierer_Eust, Me.txtAvisierer_Abf, Me.txtAvisierer_Clear, Me.txtAuftraggeber_Zoll, Me.txtAuftraggeber_Eust, Me.txtAuftraggeber_Abf, Me.txtAuftraggeber_Clear, Me.txtEmpfaenger_Zoll, Me.txtEmpfaenger_Eust, Me.txtEmpfaenger_Abf, Me.txtEmpfaenger_Clear, Me.txtAbsender_Zoll, Me.txtAbsender_Eust, Me.txtAbsender_Abf, Me.txtAbsender_Clear, Me.txtFrachtfuehrer_Zoll, Me.txtFrachtfuehrer_Eust, Me.txtFrachtfuehrer_Abf, Me.txtFrachtfuehrer_Clear, Me.txtAvisierer_Leistung1, Me.txtAvisierer_Betrag1, Me.txtAvisierer_Leistung2, Me.txtAvisierer_Betrag2, Me.txtAvisierer_Leistung3, Me.txtAvisierer_Betrag3, Me.txtAuftraggeber_Leistung1, Me.txtAuftraggeber_Betrag, Me.txtAuftraggeber_Leistung2, Me.txtAuftraggeber_Betrag2, Me.txtAuftraggeber_Leistung3, Me.txtAuftraggeber_Betrag3, Me.txtEmpfaenger_Leistung1, Me.txtEmpfaenger_Betrag1, Me.txtEmpfaenger_Leistung2, Me.txtEmpfaenger_Betrag2, Me.txtEmpfaenger_Leistung3, Me.txtEmpfaenger_Betrag3, Me.txtAbsender_Leistung1, Me.txtAbsender_Betrag1, Me.txtAbsender_Leistung2, Me.txtAbsender_Betrag2, Me.txtAbsender_Leistung3, Me.txtAbsender_Betrag3, Me.txtFrachtfuehrer_Leistung1, Me.txtFrachtfuehrer_Betrag1, Me.txtFrachtfuehrer_Leistung2, Me.txtFrachtfuehrer_Betrag2, Me.txtFrachtfuehrer_Leistung3, Me.txtFrachtfuehrer_Betrag3, Me.txtFrachtfuehrer_Bar_BelegNr, Me.txtFrachtfuehrer_Bar_Betrag, Me.txtAvisierer_eigBin, Me.txtAuftraggeber_eigBin, Me.txtEmpfaenger_eigBIN, Me.txtAbsender_eigBIN, Me.txtFrachtfuehrer_eigBIN, Me.txtLKWKennzeichen, Me.txtAnkunft, Me.txtAbfahrt, Me.txtWarenbezeichnung, Me.txtColli, Me.txtGewicht, Me.txtAufschub_VERAG, Me.txtDokZuSend_Ueberschrift, Me.txtDokZuSend_Text, Me.txtBARzuKassieren, Me.TextBox1, Me.barcodeSendung, Me.TextBox2, Me.txtNCTSVZAdr, Me.lblNCTSVZAdr, Me.SubReport, Me.txtFrachtfuehrer_Bar_BelegNr2, Me.txtFrachtfuehrer_Bar_Betrag2, Me.txtFrachtfuehrer_Bar_BelegNr3, Me.txtFrachtfuehrer_Bar_Betrag3, Me.txtAuftraggeber_EUSTKto, Me.txtEmpfaenger_EUSTKto, Me.txtAuftraggeber_ZOLLKto, Me.txtEmpfaenger_ZOLLKto, Me.txtKdAuftrNr, Me.cbxDyUebermittelt, Me.shGrenze, Me.barcodeLKW, Me.txtAvisierer_VK, Me.txtAuftraggeber_VK, Me.txtEmpfaenger_VK, Me.txtAbsender_VK, Me.txtFrachtfuehrer_VK, Me.txtSchnellAbfertigung, Me.TextBox3})
         Me.Detail.Height = 11.68898!
         Me.Detail.Name = "Detail"
         '
@@ -246,7 +248,7 @@ Partial Public Class rptSendungen
         '
         Me.Picture.Height = 11.68898!
         Me.Picture.HyperLink = Nothing
-        Me.Picture.ImageData = Nothing
+        Me.Picture.ImageData = CType(resources.GetObject("Picture.ImageData"), System.IO.Stream)
         Me.Picture.Left = 0.0000004768372!
         Me.Picture.Name = "Picture"
         Me.Picture.SizeMode = GrapeCity.ActiveReports.SectionReportModel.SizeModes.Zoom
@@ -1706,6 +1708,22 @@ Partial Public Class rptSendungen
         Me.txtSchnellAbfertigung.Visible = False
         Me.txtSchnellAbfertigung.Width = 0.6653547!
         '
+        'TextBox3
+        '
+        Me.TextBox3.CanGrow = False
+        Me.TextBox3.DistinctField = ""
+        Me.TextBox3.Height = 0.5547237!
+        Me.TextBox3.Left = 5.119292!
+        Me.TextBox3.Name = "TextBox3"
+        Me.TextBox3.Padding = New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0)
+        Me.TextBox3.Style = "color: Black; font-size: 12pt; font-weight: bold; text-align: left; text-decorati" &
+    "on: none; text-justify: auto; vertical-align: middle; ddo-char-set: 1; ddo-font-" &
+    "vertical: none; ddo-shrink-to-fit: none"
+        Me.TextBox3.SummaryGroup = ""
+        Me.TextBox3.Text = "Abkl.: Andreas Luxbauer" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Dekl.: Roland Asanger"
+        Me.TextBox3.Top = 10.83228!
+        Me.TextBox3.Width = 2.923229!
+        '
         'rptSendungen
         '
         Me.MasterReport = False
@@ -1830,6 +1848,7 @@ Partial Public Class rptSendungen
         CType(Me.txtAbsender_VK, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.txtFrachtfuehrer_VK, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.txtSchnellAbfertigung, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.TextBox3, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me, System.ComponentModel.ISupportInitialize).EndInit()
 
     End Sub
@@ -1943,4 +1962,5 @@ Partial Public Class rptSendungen
     Private WithEvents txtAbsender_VK As GrapeCity.ActiveReports.SectionReportModel.TextBox
     Private WithEvents txtFrachtfuehrer_VK As GrapeCity.ActiveReports.SectionReportModel.TextBox
     Private WithEvents txtSchnellAbfertigung As GrapeCity.ActiveReports.SectionReportModel.TextBox
+    Private WithEvents TextBox3 As GrapeCity.ActiveReports.SectionReportModel.TextBox
 End Class

Gemeinsames/rptSendungen.vb

@@ -134,6 +134,7 @@ Public Class rptSendungen
         txtEmpfaenger_ZOLLKto.Text = VALUES.Empfaenger_ZOLLKto
         cbxDyUebermittelt.Checked = VALUES.DyUebermittelt
 
+        TextBox3.Text = "Abkl.: " & VALUES.QS_MA & vbNewLine & "Dekl.: " & VALUES.VG_MA
 
         If VALUES.Grenze.Trim <> "" Then
             lblGrenze.Visible = True
@@ -333,4 +334,8 @@ Public Class rptSendungenValues
     Property DyUebermittelt As Boolean = False
 
     Property SchnellAbfertigung As Boolean = False
+
+    Property VG_MA As String = ""
+    Property QS_MA As String = ""
+
 End Class