neu

SDL/Administration/Auswertungen/frmZollUserStat.Designer.vb

@@ -38,13 +38,14 @@ Partial Class frmZollUserStat
         Me.MyListBox1 = New VERAG_PROG_ALLGEMEIN.MyListBox()
         Me.DataGridView1 = New System.Windows.Forms.DataGridView()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Button8 = New System.Windows.Forms.Button()
+        Me.cbxNachAbfertigungsartSplitten = New System.Windows.Forms.CheckBox()
         Me.Label5 = New System.Windows.Forms.Label()
         Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Panel2 = New System.Windows.Forms.Panel()
-        Me.cbxNachAbfertigungsartSplitten = New System.Windows.Forms.CheckBox()
+        Me.Button9 = New System.Windows.Forms.Button()
-        Me.Button8 = New System.Windows.Forms.Button()
-        Me.Label4 = New System.Windows.Forms.Label()
-        Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel1.SuspendLayout()
         Me.Panel2.SuspendLayout()
@@ -71,13 +72,16 @@ Partial Class frmZollUserStat
         '
         'MyTextBox1
         '
+        Me.MyTextBox1._DateTimeOnly = False
         Me.MyTextBox1._numbersOnly = False
+        Me.MyTextBox1._numbersOnlyKommastellen = ""
         Me.MyTextBox1._Prozent = False
         Me.MyTextBox1._ShortDateNew = False
         Me.MyTextBox1._ShortDateOnly = True
         Me.MyTextBox1._TimeOnly = False
         Me.MyTextBox1._value = ""
         Me.MyTextBox1._Waehrung = False
+        Me.MyTextBox1._WaehrungZeichen = True
         Me.MyTextBox1.ForeColor = System.Drawing.Color.Black
         Me.MyTextBox1.Location = New System.Drawing.Point(43, 47)
         Me.MyTextBox1.MaxLength = 10
@@ -99,13 +103,16 @@ Partial Class frmZollUserStat
         '
         'MyTextBox3
         '
+        Me.MyTextBox3._DateTimeOnly = False
         Me.MyTextBox3._numbersOnly = False
+        Me.MyTextBox3._numbersOnlyKommastellen = ""
         Me.MyTextBox3._Prozent = False
         Me.MyTextBox3._ShortDateNew = False
         Me.MyTextBox3._ShortDateOnly = True
         Me.MyTextBox3._TimeOnly = False
         Me.MyTextBox3._value = ""
         Me.MyTextBox3._Waehrung = False
+        Me.MyTextBox3._WaehrungZeichen = True
         Me.MyTextBox3.ForeColor = System.Drawing.Color.Black
         Me.MyTextBox3.Location = New System.Drawing.Point(156, 47)
         Me.MyTextBox3.MaxLength = 10
@@ -214,6 +221,7 @@ Partial Class frmZollUserStat
         '
         'Panel1
         '
+        Me.Panel1.Controls.Add(Me.Button9)
         Me.Panel1.Controls.Add(Me.Label4)
         Me.Panel1.Controls.Add(Me.MyComboBox1)
         Me.Panel1.Controls.Add(Me.Button8)
@@ -236,6 +244,50 @@ Partial Class frmZollUserStat
         Me.Panel1.Size = New System.Drawing.Size(841, 186)
         Me.Panel1.TabIndex = 10
         '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.Location = New System.Drawing.Point(12, 91)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(32, 13)
+        Me.Label4.TabIndex = 11
+        Me.Label4.Text = "Firma"
+        '
+        'MyComboBox1
+        '
+        Me.MyComboBox1._allowedValuesFreiText = Nothing
+        Me.MyComboBox1._allowFreiText = False
+        Me.MyComboBox1._value = ""
+        Me.MyComboBox1.FormattingEnabled = True
+        Me.MyComboBox1.Location = New System.Drawing.Point(15, 108)
+        Me.MyComboBox1.Name = "MyComboBox1"
+        Me.MyComboBox1.Size = New System.Drawing.Size(217, 21)
+        Me.MyComboBox1.TabIndex = 12
+        '
+        'Button8
+        '
+        Me.Button8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
+        Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button8.Image = Global.SDL.My.Resources.Resources.Excel_logo
+        Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button8.Location = New System.Drawing.Point(755, 132)
+        Me.Button8.Name = "Button8"
+        Me.Button8.Size = New System.Drawing.Size(80, 40)
+        Me.Button8.TabIndex = 10
+        Me.Button8.Text = "Excel"
+        Me.Button8.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button8.UseVisualStyleBackColor = True
+        '
+        'cbxNachAbfertigungsartSplitten
+        '
+        Me.cbxNachAbfertigungsartSplitten.AutoSize = True
+        Me.cbxNachAbfertigungsartSplitten.Location = New System.Drawing.Point(247, 110)
+        Me.cbxNachAbfertigungsartSplitten.Name = "cbxNachAbfertigungsartSplitten"
+        Me.cbxNachAbfertigungsartSplitten.Size = New System.Drawing.Size(160, 17)
+        Me.cbxNachAbfertigungsartSplitten.TabIndex = 9
+        Me.cbxNachAbfertigungsartSplitten.Text = "nach Abfertigungsart splitten"
+        Me.cbxNachAbfertigungsartSplitten.UseVisualStyleBackColor = True
+        '
         'Label5
         '
         Me.Label5.AutoSize = True
@@ -267,49 +319,15 @@ Partial Class frmZollUserStat
         Me.Panel2.Size = New System.Drawing.Size(234, 716)
         Me.Panel2.TabIndex = 11
         '
-        'cbxNachAbfertigungsartSplitten
+        'Button9
         '
-        Me.cbxNachAbfertigungsartSplitten.AutoSize = True
+        Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.cbxNachAbfertigungsartSplitten.Location = New System.Drawing.Point(247, 110)
+        Me.Button9.Location = New System.Drawing.Point(427, 132)
-        Me.cbxNachAbfertigungsartSplitten.Name = "cbxNachAbfertigungsartSplitten"
+        Me.Button9.Name = "Button9"
-        Me.cbxNachAbfertigungsartSplitten.Size = New System.Drawing.Size(160, 17)
+        Me.Button9.Size = New System.Drawing.Size(174, 40)
-        Me.cbxNachAbfertigungsartSplitten.TabIndex = 9
+        Me.Button9.TabIndex = 13
-        Me.cbxNachAbfertigungsartSplitten.Text = "nach Abfertigungsart splitten"
+        Me.Button9.Text = "AUSWERTUNG QS"
-        Me.cbxNachAbfertigungsartSplitten.UseVisualStyleBackColor = True
+        Me.Button9.UseVisualStyleBackColor = True
-        '
-        'Button8
-        '
-        Me.Button8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
-        Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button8.Image = Global.SDL.My.Resources.Excel_logo
-        Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button8.Location = New System.Drawing.Point(755, 132)
-        Me.Button8.Name = "Button8"
-        Me.Button8.Size = New System.Drawing.Size(80, 40)
-        Me.Button8.TabIndex = 10
-        Me.Button8.Text = "Excel"
-        Me.Button8.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Button8.UseVisualStyleBackColor = True
-        '
-        'Label4
-        '
-        Me.Label4.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(12, 91)
-        Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(32, 13)
-        Me.Label4.TabIndex = 11
-        Me.Label4.Text = "Firma"
-        '
-        'MyComboBox1
-        '
-        Me.MyComboBox1._allowedValuesFreiText = Nothing
-        Me.MyComboBox1._allowFreiText = False
-        Me.MyComboBox1._value = ""
-        Me.MyComboBox1.FormattingEnabled = True
-        Me.MyComboBox1.Location = New System.Drawing.Point(15, 108)
-        Me.MyComboBox1.Name = "MyComboBox1"
-        Me.MyComboBox1.Size = New System.Drawing.Size(217, 21)
-        Me.MyComboBox1.TabIndex = 12
         '
         'frmZollUserStat
         '
@@ -352,4 +370,5 @@ Partial Class frmZollUserStat
     Friend WithEvents Button8 As System.Windows.Forms.Button
     Friend WithEvents Label4 As System.Windows.Forms.Label
     Friend WithEvents MyComboBox1 As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Button9 As Button
 End Class

SDL/Administration/Auswertungen/frmZollUserStat.vb

@@ -2,21 +2,28 @@
 
 Public Class frmZollUserStat
     Dim dbSQL As New SQL
-    Private Sub Button7_Click(sender As Object, e As EventArgs) Handles Button7.Click
+    Private Sub Button7_Click(sender As Object, e As EventArgs) Handles Button7.Click, Button9.Click
         Me.Cursor = Cursors.WaitCursor
         DataGridView1.Columns.Clear()
         Try
             'Dim sql As String = " SELECT [Personal].[Name], [Personal].Niederlassung,/*COUNT(distinct ([AbfertigungsNr]))*/ sum(Abfertigungsanzahl) as anzahl "
             ' sql &= " FROM [Speditionsbuch] INNER JOIN [Personal] ON [ID]=[Personalnummer] "
             ' sql &= " WHERE 1=1 AND "
-            Dim sql As String = " SELECT mit_nname + ' ' + mit_vname as [Name], mit_niederlassung , [dstma_wochenStunden], "
+            Dim sql As String = " SELECT mit_nname + ' ' + mit_vname as [Name], mit_niederlassung , "
+            sql &= " (SELECT TOP 1 isnull([dstma_wochenStunden],0) FROM [SQLGUIDE01.verag.ost.dmn\SQLEXPRESS].ADMIN.dbo.tblDienstMitarb where [dstma_mitId]=mit_id ) as dstma_wochenStunden, "
             sql &= " isnull((SELECT sum(Abfertigungsanzahl) as anzahl FROM [Speditionsbuch] WHERE Abfertigungsdatum BETWEEN '" & MyTextBox1.Text & "' AND '" & MyTextBox3.Text & "' "
+
             If MyListBox1.SelectedItems.Count > 0 Then sql &= " AND Abfertigungsart IN (" & getValues() & ") "
-            sql &= " AND [Personalnummer] = (case when mit_FMZollPersIDKasseIsnotSpedBuch = 1 then mit_FMZollPersIDSpedBuch else mit_fmzollpersid end )),0) as anzahl "
+
+            If sender Is Button7 Then
+                sql &= " AND isnull([Personalnummer],0)>0 AND  [Personalnummer] = (case when mit_FMZollPersIDKasseIsnotSpedBuch = 1 then mit_FMZollPersIDSpedBuch else mit_fmzollpersid end )),0) as anzahl "
+            Else
+                sql &= " AND isnull([PersonalnummerQS],0)>0 AND  [PersonalnummerQS] = mit_id),0) as anzahl "
+            End If
 
             sql &= getAbfArtSplitter()
 
-            sql &= " FROM " & VERAG_PROG_ALLGEMEIN.cAllgemein.AVISO_SERVER & ".ADMIN.dbo.tblMitarbeiter left join " & VERAG_PROG_ALLGEMEIN.cAllgemein.AVISO_SERVER & ".ADMIN.dbo.tblDienstMitarb ON [dstma_mitId]=mit_id"
+            sql &= " FROM " & VERAG_PROG_ALLGEMEIN.cAllgemein.AVISO_SERVER & ".ADMIN.dbo.tblMitarbeiter " 'left join " & VERAG_PROG_ALLGEMEIN.cAllgemein.AVISO_SERVER & ".ADMIN.dbo.tblDienstMitarb ON [dstma_mitId]=mit_id"
             sql &= " WHERE 1=1  "
             sql &= " and mit_abteilung IN ('ZOLL','QS') and mit_pseudoUser=0"
             sql &= " and mit_gekuendigt = 0"
@@ -33,9 +40,9 @@ Public Class frmZollUserStat
 
             ' filter += " AND [Personalnummer] is not null "
 
-            Dim grouporder As String = " ORDER BY mit_abteilung desc, anzahl desc "
+            Dim grouporder As String = " ORDER BY  anzahl desc "
             sql += filter + grouporder
-            'MsgBox(sql)
+            ' MsgBox(sql)
             Dim data As DataTable = dbSQL.loadDgvBySql(sql, "FMZOLL", 300)
             DataGridView1.DataSource = data
             initDGV()
@@ -60,6 +67,7 @@ Public Class frmZollUserStat
             c.Width = 200
             c.Name = "anzahlShowBar"
             .Columns.Insert(2, c)
+
             '.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCellsExceptHeader
             For Each col In .Columns
                 Try : col.MinimumWidth = 50
@@ -93,7 +101,12 @@ Public Class frmZollUserStat
         MyListBox1.fillWithSQL(" SELECT [Abfertigungsart],[Abfertigungsbezeichnung] FROM [Abfertigungsarten] ", , "FMZOLL")
         '     MyComboBox1.fillWithSQL("SELECT Filialen.FilialenNr, Filialen.Grenzstelle FROM Filialen WHERE (((Filialen.Fil_Status)='A')) ORDER BY Filialen.FilialenNr ", , "FMZOLL")
         MyComboBox1.Items.Clear()
+        MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
         MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG"))
+        MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX"))
+        MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISPED"))
+        MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FRONTOFFICE", "FRONTOFFICE"))
+        MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "AMBAR"))
         MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "ATILLA"))
         MyComboBox1.changeItem("VERAG")
         MyComboBox2.fillWithSQL("SELECT [nl_kuerzel] ,nl_kuerzel FROM [ADMIN].[dbo].[tblNiederlassungen]", False, "ADMIN")
@@ -154,6 +167,7 @@ Public Class frmZollUserStat
         If DataGridView1.Rows.Count = 0 Then Exit Sub
 
         Dim topvalue As Integer = DataGridView1.Rows(0).Cells("Anzahl").Value
+        If topvalue = 0 Then Exit Sub
         If DataGridView1.Columns("anzahlShowBar") Is Nothing Then Exit Sub
         If e.ColumnIndex = DataGridView1.Columns("anzahlShowBar").Index Then ' Or DataGridView1.Columns(e.ColumnIndex).Name.StartsWith("davon") Then
 

SDL/Checkliste/frmCheckliste.vb

@@ -304,7 +304,9 @@ Public Class frmCheckliste
 
     'Komfortable EORI-Prüfung
     Private Sub btnCheckEORI_Click(sender As Object, e As EventArgs) Handles btnCheckEORI.Click
-        Dim eorilink As String = "http://ec.europa.eu/taxation_customs/dds2/eos/eori_validation.jsp?Lang=de&EoriNumb=" & txtEori.Text & "&Expand=true"
+        Dim eorilink As String = "https://ec.europa.eu/taxation_customs/dds2/eos/eori_validation.jsp?Lang=de&EoriNumb=" & txtEori.Text & "&Expand=true"
+
+        ' Dim eorilink As String = "http://ec.europa.eu/taxation_customs/dds2/eos/eori_validation.jsp?Lang=de&EoriNumb=" & txtEori.Text & "&Expand=true"
         frmEoriLink.link = eorilink
         frmEoriLink.frmCheckliste = Me
         frmEoriLink.Show()
@@ -583,6 +585,9 @@ Public Class frmCheckliste
         Dim doFilling = True
         Dim doFilling2 = False
 
+        WebBrowser.ScriptErrorsSuppressed = True
+
+
         AddHandler WebBrowser.DocumentCompleted, Sub()
                                                      ' Print the document now that it is fully loaded.
                                                      If WebBrowser.ReadyState = WebBrowserReadyState.Complete Then

SDL/Checkliste/frmEoriLink.vb

@@ -6,6 +6,8 @@
     Private Sub Form1_Load(sender As Object, e As EventArgs) Handles Me.Load
         Button1.Enabled = (VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID > 0)
 
+        WebBrowser1.ScriptErrorsSuppressed = True
+
         If frmCheckliste.txtEori.Text <> "" Then
             WebBrowser1.Navigate(link)
             Label3.Text = frmCheckliste.txtFirma.Text

SDL/Fakturierung/cFakturierung.vb

@@ -280,14 +280,15 @@ Public Class cFakturierung
                         End If
                     Else
                         Dim VK = VERAG_PROG_ALLGEMEIN.cVorauskasse.LOADByFilialeAbfNr(RECHNUNG.FilialenNr, RECHNUNG.AbfertigungsNr)
-                        If VK IsNot Nothing AndAlso CDbl(VK.vk_Betrag) > 0 Then ' Wenn 0 dann Fehler
+                        If VK IsNot Nothing AndAlso CDbl(VK.vk_Betrag) > 0 Then
-                            If CDbl(VK.vk_Betrag) = CDbl(RECHNUNG.SteuerfreierGesamtbetrag + RECHNUNG.SteuerpflichtigerGesamtbetrag) Then
+                            If VK.vk_GeldEingetroffen Then ' Wenn 0 dann Fehler
-                                strText = strText & "Der Rechnungsbetrag wurde bereits per Vorauszahlung beglichen." & vbCrLf
+                                If CDbl(VK.vk_Betrag) = CDbl(RECHNUNG.SteuerfreierGesamtbetrag + RECHNUNG.SteuerpflichtigerGesamtbetrag) Then
-                            Else
+                                    strText = strText & "Der Rechnungsbetrag wurde bereits per Vorauszahlung beglichen." & vbCrLf
-                                strText = strText & "Zu dieser Rechnung wurde bereits eine Vorauszahlung geleistet, bitte überweisen Sie den Differenzbetrag." & vbCrLf
+                                Else
+                                    strText = strText & "Zu dieser Rechnung wurde bereits eine Vorauszahlung geleistet, bitte überweisen Sie den Differenzbetrag." & vbCrLf
+                                End If
                             End If
                         End If
-
                     End If
                 Case 71 'GS
                     If RECHNUNG.Lastschrift Then
@@ -418,8 +419,8 @@ Public Class cFakturierung
         rpt.lblUID.Text = If(FIRMA.Firma_UID, "")
         rpt.lblEORI.Text = If(FIRMA.Firma_EORI, "")
 
-        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+        Select Case FIRMA.Firma_ID'VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
-            Case "IMEX"
+            Case 20 '"IMEX"
                 If Rechnung.RechnungsLandKz = "TR" Then
                     'rpt.txtBank1.Text = "Garanti Bank " & vbNewLine & "IBAN:TR84 0006 2001 6040 0009 0987 13 " & vbNewLine & "BLZ Sube.: 1604 - Beykent Ticari - Hesap: 9098713"
                     rpt.txtBank1.Text = "Garanti Bank " & vbNewLine & "IBAN:TR21 0006 2000 5440 0009 0818 67" & vbNewLine & "BLZ Sube.: 544 - Beykent Ticari - Hesap: 9081867"
@@ -439,11 +440,19 @@ Public Class cFakturierung
                     End If
                 End If
             Case Else 'VERAG,ATILLA
+
                 rpt.txtBank1.Text = If(FIRMA.Firma_Bankverbindung1, "") & vbNewLine & If(FIRMA.Firma_IBAN1, "") & vbNewLine & If(FIRMA.Firma_BIC1, "").ToString.Trim
                 rpt.txtBank2.Text = If(FIRMA.Firma_Bankverbindung2, "") & vbNewLine & If(FIRMA.Firma_IBAN2, "") & vbNewLine & If(FIRMA.Firma_BIC2, "").ToString.Trim
 
                 rpt.txtBank1.Text = rpt.txtBank1.Text.Replace("Österreich: ", "Österreich:" & vbNewLine).Replace("BRD: ", "BRD:" & vbNewLine).Replace("Deutschland: ", "Deutschland:" & vbNewLine)
                 rpt.txtBank2.Text = rpt.txtBank2.Text.Replace("Österreich: ", "Österreich:" & vbNewLine).Replace("BRD: ", "BRD:" & vbNewLine).Replace("Deutschland: ", "Deutschland:" & vbNewLine)
+
+                'TR Bankverbindung
+                'Dim RgBetrag = (Rechnung.SteuerfreierGesamtbetrag + Rechnung.SteuerpflichtigerGesamtbetrag)
+                'If Rechnung.RechnungsLandKz = "TR" And RgBetrag <= 500 And RgBetrag >= -500 Then
+                '    rpt.txtBank2.Text = "Garanti Bank " & vbNewLine & "Eur Iban: TR 96 0006 2000 5440 0009 0672 28" & vbNewLine & "Kto: 544  Swift kodu: TGBATRISXXX"
+                'End If
+
         End Select
 
 
@@ -625,6 +634,7 @@ Public Class cFakturierung
                 Case 7 : rpt.picVERAG.Image = My.Resources.Atilla_big_med : rpt.Picture1.Image = Nothing
                 Case 11 : rpt.picVERAG.Image = My.Resources.Verag_Customs_Service_GMBH_Logo : rpt.Picture1.Image = Nothing
                 Case 20 : rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple : rpt.Picture1.Image = My.Resources.aeo_AT_imex
+                Case 17 : rpt.picVERAG.Image = My.Resources.FrontOfficeSUB_Horizontal : rpt.Picture1.Image = Nothing
             End Select
 
 
@@ -665,6 +675,7 @@ Public Class cFakturierung
             rpt.lblRechnung_Name2.Text = If(RECHNUNG.RechnungsName_2, "")
             rpt.lblRechnung_Strasse.Text = If(RECHNUNG.RechnungsStraße, "")
             rpt.lblRechnung_Ort.Text = If(RECHNUNG.RechnungsOrt, "")
+            rpt.lblRechnung_Land.Text = cProgramFunctions.getLandBez_fromISO1Land(RECHNUNG.RechnungsLandKz, "").ToString.ToUpper
 
 
             If KD_RG IsNot Nothing AndAlso If(KD_RG.Steuernummer, "") <> String.Empty Then
@@ -863,7 +874,8 @@ Public Class cFakturierung
                 End If
 
                 'Rechnugnsdruck  =  Individuell für deise Rechnung, wird optional mitgegeben
-                Dim RG_Bezeichnung = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "_Rechnung_" & If(RECHNUNG.RechnungsNr, "") & ".pdf"
+                ' Dim RG_Bezeichnung = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "_Rechnung_" & If(RECHNUNG.RechnungsNr, "") & ".pdf"
+                Dim RG_Bezeichnung = "Rechnung_" & If(RECHNUNG.RechnungsNr, "") & ".pdf"
 
                 'Immer Exportieren, da in Therefore speichern
                 Dim tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(RG_Bezeichnung, ".pdf", , False)
@@ -974,7 +986,7 @@ Public Class cFakturierung
                 Case "ATILLA" : firma = 7
                 Case "UNISPED" : firma = 21
                 Case "AMBAR" : firma = 22
-                Case "FRONTOFFICE" : firma = 23
+                Case "FRONTOFFICE" : firma = 17
                 Case Else : firma = 1
             End Select
         End If
@@ -1390,6 +1402,7 @@ Public Class cFakturierung
             rpt.lblRechnung_Name2.Text = If(ROW("RechnungsName 2") IsNot DBNull.Value, ROW("RechnungsName 2"), "")
             rpt.lblRechnung_Strasse.Text = If(ROW("RechnungsStraße") IsNot DBNull.Value, ROW("RechnungsStraße"), "")
             rpt.lblRechnung_Ort.Text = If(ROW("RechnungsOrt") IsNot DBNull.Value, ROW("RechnungsOrt"), "")
+            rpt.lblRechnung_Land.Text = cProgramFunctions.getLandBez_fromISO1Land(ROW("RechnungsLandKz"), "").ToString.ToUpper
 
 
             If KD_RG IsNot Nothing AndAlso If(KD_RG.Steuernummer, "") <> String.Empty Then
@@ -1523,7 +1536,8 @@ Public Class cFakturierung
 
             'ORIGINAL
             Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(ROW("RechnungsKundenNr"))
-            Dim RG_Bezeichnung = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & " _Rechnung_" & RechnungsNr & ".pdf"
+            'Dim RG_Bezeichnung = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & " _Rechnung_" & RechnungsNr & ".pdf"
+            Dim RG_Bezeichnung = "Rechnung_" & RechnungsNr & ".pdf"
             'Rechnugnsdruck  =  Individuell für deise Rechnung, wird optional mitgegeben
 
             Dim tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(RG_Bezeichnung, ".pdf", , False)
@@ -1693,6 +1707,7 @@ Public Class cFakturierung
             rpt.lblRechnung_Name2.Text = If(ROW("RechnungsName 2") IsNot DBNull.Value, ROW("RechnungsName 2"), "")
             rpt.lblRechnung_Strasse.Text = If(ROW("RechnungsStraße") IsNot DBNull.Value, ROW("RechnungsStraße"), "")
             rpt.lblRechnung_Ort.Text = If(ROW("RechnungsOrt") IsNot DBNull.Value, ROW("RechnungsOrt"), "")
+            rpt.lblRechnung_Land.Text = cProgramFunctions.getLandBez_fromISO1Land(ROW("RechnungsLandKz"), "").ToString.ToUpper
 
 
             If KD_RG IsNot Nothing AndAlso If(KD_RG.Steuernummer, "") <> String.Empty Then
@@ -1821,7 +1836,8 @@ Public Class cFakturierung
 
                 'ORIGINAL
                 Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(ROW("RechnungsKundenNr"))
-                Dim RG_Bezeichnung = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "_Rechnung_" & RechnungsNr & ".pdf"
+                Dim RG_Bezeichnung = "Rechnung_" & RechnungsNr & ".pdf"
+                ' Dim RG_Bezeichnung = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "_Rechnung_" & RechnungsNr & ".pdf"
                 'Rechnugnsdruck  =  Individuell für deise Rechnung, wird optional mitgegeben
                 '  MsgBox("RechnungsdruckArt2: " & If(Rechnugnsdruck > 0, Rechnugnsdruck, If(AD.Rechnungsdruck, 0)))
 
@@ -1921,7 +1937,8 @@ Public Class cFakturierung
 	                      tblFirma.Firma_Firmenbuch, tblFirma.Firma_UID, tblFirma.Firma_EORI, tblFirma.Firma_Bankverbindung1, tblFirma.Firma_BLZ1, tblFirma.Firma_KTO1, 
 	                      tblFirma.Firma_IBAN1, tblFirma.Firma_BIC1, tblFirma.Firma_Bankverbindung2, tblFirma.Firma_BLZ2, tblFirma.Firma_KTO2, tblFirma.Firma_IBAN2, 
 	                      tblFirma.Firma_BIC2, tblFirma.Firma_Ort, tblFirma.Firma_Straße, tblFirma.Firma_Telefon, tblFirma.Firma_Telefax, tblFirma.[Firma_E-Mail], 
-	                      tblFirma.Firma_Webadresse, MIN(Rechnungsausgang.KdAuftragsNr) as KdAuftragsNr
+	                      tblFirma.Firma_Webadresse, MIN(Rechnungsausgang.KdAuftragsNr) as KdAuftragsNr,
+                        MIN(Rechnungsausgang.RechnungsLandKz) AS RechnungsLandKz
                     FROM ((Adressen INNER JOIN ((Rechnungsausgang INNER JOIN Filialen ON Rechnungsausgang.FilialenNr = Filialen.FilialenNr) INNER JOIN Steuertabelle ON Rechnungsausgang.Steuerschlüssel = Steuertabelle.Steuerschlüssel) ON Adressen.AdressenNr = Rechnungsausgang.RechnungsKundenNr) INNER JOIN tblFirma ON Rechnungsausgang.Firma_ID = tblFirma.Firma_ID) INNER JOIN RechnungsausgangPositionen ON Rechnungsausgang.RK_ID = RechnungsausgangPositionen.RK_ID
 
                     where Status IN (" & Status & ") and CONVERT(datetime,DruckDatumZeit ,104)='" & DruckDatumZeit.ToString("dd.MM.yyyy HH:mm:ss.fff") & "'  and RechnungsNr='" & RechnungsNr & "'

SDL/Fakturierung/frmAbrechnungsMaske.vb

@@ -35,7 +35,13 @@ Public Class frmAbrechnungsMaske
         MyComboBox1.changeItem("")
 
         'BERECHTIGUNG 90 = FAKTURIERUNG!!!
-        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+
+        Dim FirmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Then
+            FirmaTmp = "VERAGIMEX"
+        End If
+
+        Select Case FirmaTmp
             Case "VERAG"
                 cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez]  FROM  [tblFirma] WHERE Firma_ID<>20", False, "FMZOLL")
                 cboFirma.changeItem("1")
@@ -44,6 +50,13 @@ Public Class frmAbrechnungsMaske
                 cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez]  FROM  [tblFirma] WHERE Firma_ID=20", False, "FMZOLL")
                 cboFirma.changeItem("20")
                 MyComboBox2.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where  mit_firma='IMEX'  and mit_gekuendigt=0 AND  (mit_abteilung IN ('VRR','BH')	OR (SELECT COUNT(*)  FROM [tblBerechtigungsObjekteZuordnung]  where [beroz_beroId]=90 AND [beroz_bergrId]=[mit_id] AND beroz_art='B')>0) order by mit_username", False, "ADMIN", True)
+            Case "VERAGIMEX"
+                cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez]  FROM  [tblFirma] ", False, "FMZOLL")
+                Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+                    Case "VERAG" : cboFirma.changeItem("1")
+                    Case "IMEX" : cboFirma.changeItem("20")
+                End Select
+                MyComboBox2.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where  mit_firma IN ('IMEX','VERAG'" & If(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN", ",'ALL'", "") & ") AND mit_gekuendigt=0 AND  (mit_abteilung IN ('VRR','BH')	OR (SELECT COUNT(*)  FROM [tblBerechtigungsObjekteZuordnung]  where [beroz_beroId]=90 AND [beroz_bergrId]=[mit_id] AND beroz_art='B')>0) order by mit_username", False, "ADMIN", True)
         End Select
         ' MyComboBox2.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.USRID) 'Benutzerwechsel
         'If MyComboBox2.Items.Count > 0 Then MyComboBox2.SelectedIndex = 0

SDL/Fakturierung/frmFaktSammelRgDrucken.vb

@@ -88,7 +88,12 @@ Public Class frmFaktSammelRgDrucken
         txtZeitraumBis.Text = Now.ToShortDateString
         txtRechnungsdatum.Text = Now.ToShortDateString
 
-        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+        Dim FirmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Then
+            FirmaTmp = "VERAGIMEX"
+        End If
+
+        Select Case FirmaTmp
             Case "VERAG"
                 cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez]  FROM  [tblFirma] WHERE Firma_ID<>20", False, "FMZOLL")
                 cboFirma.changeItem("1")
@@ -97,6 +102,13 @@ Public Class frmFaktSammelRgDrucken
                 cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez]  FROM  [tblFirma] WHERE Firma_ID=20", False, "FMZOLL")
                 cboFirma.changeItem("20")
                 cboSB.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where  mit_firma='IMEX'  and mit_gekuendigt=0 AND  (mit_abteilung IN ('VRR','BH')	OR (SELECT COUNT(*)  FROM [tblBerechtigungsObjekteZuordnung]  where [beroz_beroId]=90 AND [beroz_bergrId]=[mit_id] AND beroz_art='B')>0) order by mit_username", False, "ADMIN", True)
+            Case "VERAGIMEX"
+                cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez]  FROM  [tblFirma] ", False, "FMZOLL")
+                Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+                    Case "VERAG" : cboFirma.changeItem("1")
+                    Case "IMEX" : cboFirma.changeItem("20")
+                End Select
+                cboSB.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where mit_firma IN ('IMEX','VERAG'" & If(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN", ",'ALL'", "") & ") and mit_gekuendigt=0 AND  (mit_abteilung IN ('VRR','BH')	OR [mit_id] IN (SELECT  [beroz_bergrId]  FROM [tblBerechtigungsObjekteZuordnung]  where [beroz_beroId]=90 AND  beroz_art='B')) order by mit_username", False, "ADMIN", True)
         End Select
         '  cboFirma.fillWithSQL("SELECT  [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE Firma_ID NOT IN(3) ORDER BY Firma_ID  ", True, "FMZOLL")
         cboFirma.changeItem(Firma)

SDL/Fakturierung/frmRechnungenSuche.vb

@@ -216,10 +216,18 @@ Public Class frmRechnungenSuche
         MyListBox1.fillWithSQL(" SELECT [Abfertigungsart],[Abfertigungsbezeichnung] FROM [Abfertigungsarten] ORDER BY Abfertigungsart ", , "FMZOLL")
          Button4.PerformClick()
 
-        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+        Dim FirmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Then
+            FirmaTmp = "VERAGIMEX"
+        End If
+
+        Select Case FirmaTmp
             Case "IMEX"
                 cboFiliale.changeItem("5501")
                 cboFiliale.Enabled = False
+            Case "VERAGIMEX"
+                cboFiliale.changeItem("5501")
+
         End Select
 
         cboDatum.Items.Clear()

SDL/Fakturierung/rptRechnungDruck.Designer.vb

@@ -76,6 +76,7 @@ Partial Public Class rptRechnungDruck
         Me.txtKdAuftragsNr = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
         Me.Line15 = New GrapeCity.ActiveReports.SectionReportModel.Line()
         Me.lblFirma = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.lblRechnung_Land = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.ReportFooter1 = New GrapeCity.ActiveReports.SectionReportModel.ReportFooter()
         Me.Line8 = New GrapeCity.ActiveReports.SectionReportModel.Line()
         Me.Line9 = New GrapeCity.ActiveReports.SectionReportModel.Line()
@@ -98,6 +99,8 @@ Partial Public Class rptRechnungDruck
         Me.Line14 = New GrapeCity.ActiveReports.SectionReportModel.Line()
         Me.lblZwText = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.Line17 = New GrapeCity.ActiveReports.SectionReportModel.Line()
+        Me.txtHandlingATA = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
+        Me.lblHandlingATA = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.GroupHeader4 = New GrapeCity.ActiveReports.SectionReportModel.GroupHeader()
         Me.Label11 = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.Label4 = New GrapeCity.ActiveReports.SectionReportModel.Label()
@@ -124,8 +127,6 @@ Partial Public Class rptRechnungDruck
         Me.Line13 = New GrapeCity.ActiveReports.SectionReportModel.Line()
         Me.Line16 = New GrapeCity.ActiveReports.SectionReportModel.Line()
         Me.GroupFooter4 = New GrapeCity.ActiveReports.SectionReportModel.GroupFooter()
-        Me.txtHandlingATA = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
-        Me.lblHandlingATA = New GrapeCity.ActiveReports.SectionReportModel.Label()
         CType(Me.lblLeistungNr, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblAnzahl, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSteuerfrei, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -176,6 +177,7 @@ Partial Public Class rptRechnungDruck
         CType(Me.txtKdAuftragsNr_Ueberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.txtKdAuftragsNr, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblFirma, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.lblRechnung_Land, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSummeUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSteuerfreiGes, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSteuerpflichtigGes, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -189,6 +191,8 @@ Partial Public Class rptRechnungDruck
         CType(Me.lblAnlagenUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.txtAnlagen, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblZwText, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.txtHandlingATA, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.lblHandlingATA, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.Label11, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.Label4, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.Label8, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -209,8 +213,6 @@ Partial Public Class rptRechnungDruck
         CType(Me.txtBef<EFBFBD>rderungsmittel, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.Label43, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.txtSendungsdaten, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.txtHandlingATA, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.lblHandlingATA, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me, System.ComponentModel.ISupportInitialize).BeginInit()
         '
         'PageHeader
@@ -243,11 +245,11 @@ Partial Public Class rptRechnungDruck
         Me.lblAnzahl.HyperLink = Nothing
         Me.lblAnzahl.Left = 3.380315!
         Me.lblAnzahl.Name = "lblAnzahl"
-        Me.lblAnzahl.Style = "font-size: 9pt; font-weight: normal; text-align: center; text-justify: auto; ddo-" &
+        Me.lblAnzahl.Style = "font-size: 9pt; font-weight: normal; text-align: right; text-justify: auto; ddo-c" &
-    "char-set: 1"
+    "har-set: 1"
         Me.lblAnzahl.Text = "999"
         Me.lblAnzahl.Top = 0!
-        Me.lblAnzahl.Width = 0.5771656!
+        Me.lblAnzahl.Width = 0.5492127!
         '
         'lblSteuerfrei
         '
@@ -388,7 +390,7 @@ Partial Public Class rptRechnungDruck
         '
         'ReportHeader1
         '
-        Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblRgNr, Me.lblRgNrUeberschrift, Me.Picture1, Me.picVERAG, Me.Label3, Me.lblUeberschriftRG_GS, Me.lblKundenNr, Me.Line3, Me.lblFirmaOrt, Me.lblFirmaStrasse, Me.lblFirmaTel, Me.lblFirmaFax, Me.lblFirmaEmail, Me.lblFirmaWeb, Me.lblRgDatumUeberschrift, Me.lblRgDatum, Me.Label20, Me.lblAbfertigungsNr, Me.Label22, Me.lblAbfertigungsDatum, Me.Label24, Me.lblLKWId, Me.Label26, Me.lblSachbearbeiter, Me.Label29, Me.lblFirmenbuch, Me.Label31, Me.lblUID, Me.lblRechnung_Name1, Me.lblRechnung_Name2, Me.lblRechnung_Strasse, Me.lblRechnung_Ort, Me.Label48, Me.lblEORI, Me.lblRechnung_UID_Ueberschrift, Me.lblRechnung_UID, Me.lblRechnung_Steuernummer_Ueberschrift, Me.lblRechnung_Steuernummer, Me.txtKdAuftragsNr_Ueberschrift, Me.txtKdAuftragsNr, Me.Line15, Me.lblFirma})
+        Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblRgNr, Me.lblRgNrUeberschrift, Me.Picture1, Me.picVERAG, Me.Label3, Me.lblUeberschriftRG_GS, Me.lblKundenNr, Me.Line3, Me.lblFirmaOrt, Me.lblFirmaStrasse, Me.lblFirmaTel, Me.lblFirmaFax, Me.lblFirmaEmail, Me.lblFirmaWeb, Me.lblRgDatumUeberschrift, Me.lblRgDatum, Me.Label20, Me.lblAbfertigungsNr, Me.Label22, Me.lblAbfertigungsDatum, Me.Label24, Me.lblLKWId, Me.Label26, Me.lblSachbearbeiter, Me.Label29, Me.lblFirmenbuch, Me.Label31, Me.lblUID, Me.lblRechnung_Name1, Me.lblRechnung_Name2, Me.lblRechnung_Strasse, Me.lblRechnung_Ort, Me.Label48, Me.lblEORI, Me.lblRechnung_UID_Ueberschrift, Me.lblRechnung_UID, Me.lblRechnung_Steuernummer_Ueberschrift, Me.lblRechnung_Steuernummer, Me.txtKdAuftragsNr_Ueberschrift, Me.txtKdAuftragsNr, Me.Line15, Me.lblFirma, Me.lblRechnung_Land})
         Me.ReportHeader1.Height = 3.470997!
         Me.ReportHeader1.Name = "ReportHeader1"
         '
@@ -736,7 +738,7 @@ Partial Public Class rptRechnungDruck
         Me.lblRechnung_Name1.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
     "do-char-set: 1"
         Me.lblRechnung_Name1.Text = "VERAG Spedition AG"
-        Me.lblRechnung_Name1.Top = 1.974016!
+        Me.lblRechnung_Name1.Top = 1.879134!
         Me.lblRechnung_Name1.Width = 4.589764!
         '
         'lblRechnung_Name2
@@ -748,7 +750,7 @@ Partial Public Class rptRechnungDruck
         Me.lblRechnung_Name2.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
     "do-char-set: 1"
         Me.lblRechnung_Name2.Text = "Abteilung: ZOLL"
-        Me.lblRechnung_Name2.Top = 2.151181!
+        Me.lblRechnung_Name2.Top = 2.056299!
         Me.lblRechnung_Name2.Width = 4.589763!
         '
         'lblRechnung_Strasse
@@ -760,7 +762,7 @@ Partial Public Class rptRechnungDruck
         Me.lblRechnung_Strasse.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
     "do-char-set: 1"
         Me.lblRechnung_Strasse.Text = "Suben Nr. 100"
-        Me.lblRechnung_Strasse.Top = 2.328346!
+        Me.lblRechnung_Strasse.Top = 2.233464!
         Me.lblRechnung_Strasse.Width = 4.589763!
         '
         'lblRechnung_Ort
@@ -772,7 +774,7 @@ Partial Public Class rptRechnungDruck
         Me.lblRechnung_Ort.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
     "do-char-set: 1"
         Me.lblRechnung_Ort.Text = "A 4975 SUBEN"
-        Me.lblRechnung_Ort.Top = 2.505512!
+        Me.lblRechnung_Ort.Top = 2.41063!
         Me.lblRechnung_Ort.Width = 4.589763!
         '
         'Label48
@@ -876,12 +878,12 @@ Partial Public Class rptRechnungDruck
         Me.Line15.Left = 0.514567!
         Me.Line15.LineWeight = 1.0!
         Me.Line15.Name = "Line15"
-        Me.Line15.Top = 1.946851!
+        Me.Line15.Top = 1.851969!
         Me.Line15.Width = 3.619684!
         Me.Line15.X1 = 0.514567!
         Me.Line15.X2 = 4.134251!
-        Me.Line15.Y1 = 1.946851!
+        Me.Line15.Y1 = 1.851969!
-        Me.Line15.Y2 = 1.946851!
+        Me.Line15.Y2 = 1.851969!
         '
         'lblFirma
         '
@@ -892,9 +894,21 @@ Partial Public Class rptRechnungDruck
         Me.lblFirma.Style = "font-size: 7pt; font-weight: normal; text-align: left; vertical-align: middle; dd" &
     "o-char-set: 1"
         Me.lblFirma.Text = "VERAG Spedition AG, A-4975 Suben"
-        Me.lblFirma.Top = 1.793307!
+        Me.lblFirma.Top = 1.698425!
         Me.lblFirma.Width = 3.619686!
         '
+        'lblRechnung_Land
+        '
+        Me.lblRechnung_Land.Height = 0.1771653!
+        Me.lblRechnung_Land.HyperLink = Nothing
+        Me.lblRechnung_Land.Left = 0.514567!
+        Me.lblRechnung_Land.Name = "lblRechnung_Land"
+        Me.lblRechnung_Land.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
+    "do-char-set: 1"
+        Me.lblRechnung_Land.Text = "<EFBFBD>STERREICH"
+        Me.lblRechnung_Land.Top = 2.587795!
+        Me.lblRechnung_Land.Width = 4.589763!
+        '
         'ReportFooter1
         '
         Me.ReportFooter1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Line8, Me.Line9, Me.lblSummeUeberschrift, Me.lblSteuerfreiGes, Me.lblSteuerpflichtigGes, Me.lblSumme, Me.Label46, Me.Line1, Me.Line5, Me.lblZWSumme, Me.lblSteuerbetrag, Me.lblSteuersatz, Me.txtVermerk, Me.txtInfo, Me.lblAnlagenUeberschrift, Me.txtAnlagen, Me.Line6, Me.Line7, Me.Line14, Me.lblZwText, Me.Line17, Me.txtHandlingATA, Me.lblHandlingATA})
@@ -1158,6 +1172,29 @@ Partial Public Class rptRechnungDruck
         Me.Line17.Y1 = 0!
         Me.Line17.Y2 = 0.1035433!
         '
+        'txtHandlingATA
+        '
+        Me.txtHandlingATA.Height = 0.1574803!
+        Me.txtHandlingATA.Left = 5.054331!
+        Me.txtHandlingATA.Name = "txtHandlingATA"
+        Me.txtHandlingATA.Style = "font-size: 9pt; font-weight: normal; text-align: left; text-justify: auto; ddo-ch" &
+    "ar-set: 1"
+        Me.txtHandlingATA.Text = "ATC1812345678"
+        Me.txtHandlingATA.Top = 1.433071!
+        Me.txtHandlingATA.Width = 2.324409!
+        '
+        'lblHandlingATA
+        '
+        Me.lblHandlingATA.Height = 0.1574803!
+        Me.lblHandlingATA.HyperLink = Nothing
+        Me.lblHandlingATA.Left = 4.377953!
+        Me.lblHandlingATA.Name = "lblHandlingATA"
+        Me.lblHandlingATA.Style = "font-size: 8pt; font-weight: bold; text-align: left; vertical-align: top; ddo-cha" &
+    "r-set: 1"
+        Me.lblHandlingATA.Text = "Handling:"
+        Me.lblHandlingATA.Top = 1.433071!
+        Me.lblHandlingATA.Width = 0.676378!
+        '
         'GroupHeader4
         '
         Me.GroupHeader4.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Label11, Me.Label4, Me.Label8, Me.Label6, Me.Line4, Me.lblAbsenderUeberschrift, Me.lblAvisiererUeberschrift, Me.lblEmpfaengerUeberschrift, Me.txtAbsender, Me.txtEmpfaenger, Me.txtAvisierer, Me.Label37, Me.txtZollbelegNr, Me.Label39, Me.txtWarenwert, Me.txtGrenzeUeberschrift, Me.txtGrenze, Me.Label42, Me.txtBef<EFBFBD>rderungsmittel, Me.Label43, Me.txtSendungsdaten, Me.Line12, Me.Line13, Me.Line16})
@@ -1196,8 +1233,8 @@ Partial Public Class rptRechnungDruck
         Me.Label8.HyperLink = Nothing
         Me.Label8.Left = 3.380315!
         Me.Label8.Name = "Label8"
-        Me.Label8.Style = "font-size: 8pt; font-weight: bold; text-align: center; text-justify: auto; ddo-ch" &
+        Me.Label8.Style = "font-size: 8pt; font-weight: bold; text-align: right; text-justify: auto; ddo-cha" &
-    "ar-set: 1"
+    "r-set: 1"
         Me.Label8.Text = "Anzahl"
         Me.Label8.Top = 1.566536!
         Me.Label8.Width = 0.5771656!
@@ -1454,29 +1491,6 @@ Partial Public Class rptRechnungDruck
         Me.GroupFooter4.Height = 0!
         Me.GroupFooter4.Name = "GroupFooter4"
         '
-        'txtHandlingATA
-        '
-        Me.txtHandlingATA.Height = 0.1574803!
-        Me.txtHandlingATA.Left = 5.054331!
-        Me.txtHandlingATA.Name = "txtHandlingATA"
-        Me.txtHandlingATA.Style = "font-size: 9pt; font-weight: normal; text-align: left; text-justify: auto; ddo-ch" &
-    "ar-set: 1"
-        Me.txtHandlingATA.Text = "ATC1812345678"
-        Me.txtHandlingATA.Top = 1.433071!
-        Me.txtHandlingATA.Width = 2.324409!
-        '
-        'lblHandlingATA
-        '
-        Me.lblHandlingATA.Height = 0.1574803!
-        Me.lblHandlingATA.HyperLink = Nothing
-        Me.lblHandlingATA.Left = 4.377953!
-        Me.lblHandlingATA.Name = "lblHandlingATA"
-        Me.lblHandlingATA.Style = "font-size: 8pt; font-weight: bold; text-align: left; vertical-align: top; ddo-cha" &
-    "r-set: 1"
-        Me.lblHandlingATA.Text = "Handling:"
-        Me.lblHandlingATA.Top = 1.433071!
-        Me.lblHandlingATA.Width = 0.676378!
-        '
         'rptRechnungDruck
         '
         Me.MasterReport = False
@@ -1550,6 +1564,7 @@ Partial Public Class rptRechnungDruck
         CType(Me.txtKdAuftragsNr_Ueberschrift, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.txtKdAuftragsNr, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblFirma, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.lblRechnung_Land, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblSummeUeberschrift, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblSteuerfreiGes, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblSteuerpflichtigGes, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1563,6 +1578,8 @@ Partial Public Class rptRechnungDruck
         CType(Me.lblAnlagenUeberschrift, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.txtAnlagen, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblZwText, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.txtHandlingATA, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.lblHandlingATA, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.Label11, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.Label4, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.Label8, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1583,8 +1600,6 @@ Partial Public Class rptRechnungDruck
         CType(Me.txtBef<EFBFBD>rderungsmittel, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.Label43, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.txtSendungsdaten, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.txtHandlingATA, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.lblHandlingATA, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me, System.ComponentModel.ISupportInitialize).EndInit()
 
     End Sub
@@ -1695,4 +1710,5 @@ Partial Public Class rptRechnungDruck
     Private WithEvents Line17 As GrapeCity.ActiveReports.SectionReportModel.Line
     Public WithEvents txtHandlingATA As GrapeCity.ActiveReports.SectionReportModel.TextBox
     Public WithEvents lblHandlingATA As GrapeCity.ActiveReports.SectionReportModel.Label
+    Public WithEvents lblRechnung_Land As GrapeCity.ActiveReports.SectionReportModel.Label
 End Class

SDL/Fakturierung/rptSammelRechnungAnlagenDruck.Designer.vb

@@ -71,6 +71,7 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         Me.lblRechnung_Steuernummer = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.Line13 = New GrapeCity.ActiveReports.SectionReportModel.Line()
         Me.lblFirma = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.lblRechnung_Land = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.ReportFooter1 = New GrapeCity.ActiveReports.SectionReportModel.ReportFooter()
         Me.Line8 = New GrapeCity.ActiveReports.SectionReportModel.Line()
         Me.Line9 = New GrapeCity.ActiveReports.SectionReportModel.Line()
@@ -145,6 +146,7 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         CType(Me.lblRechnung_Steuernummer_Ueberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblRechnung_Steuernummer, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblFirma, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.lblRechnung_Land, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.Label9, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSteuerfreiGes, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSteuerpflichtigGes, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -369,7 +371,7 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         '
         'ReportHeader1
         '
-        Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblRgNr, Me.Label16, Me.Picture1, Me.picVERAG, Me.Label3, Me.lblUeberschriftRG_GS, Me.lblKundenNr, Me.Line3, Me.lblFirmaOrt, Me.lblFirmaStrasse, Me.lblFirmaTel, Me.lblFirmaFax, Me.lblFirmaEmail, Me.lblFirmaWeb, Me.Label18, Me.lblRgDatum, Me.Label26, Me.lblSachbearbeiter, Me.Label29, Me.lblFirmenbuch, Me.Label31, Me.lblUID, Me.lblRechnung_Name1, Me.lblRechnung_Name2, Me.lblRechnung_Strasse, Me.lblRechnung_Ort, Me.Label48, Me.lblEORI, Me.lblRechnung_UID_Ueberschrift, Me.lblRechnung_UID, Me.lblRechnung_Steuernummer_Ueberschrift, Me.lblRechnung_Steuernummer, Me.Line13, Me.lblFirma})
+        Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblRgNr, Me.Label16, Me.Picture1, Me.picVERAG, Me.Label3, Me.lblUeberschriftRG_GS, Me.lblKundenNr, Me.Line3, Me.lblFirmaOrt, Me.lblFirmaStrasse, Me.lblFirmaTel, Me.lblFirmaFax, Me.lblFirmaEmail, Me.lblFirmaWeb, Me.Label18, Me.lblRgDatum, Me.Label26, Me.lblSachbearbeiter, Me.Label29, Me.lblFirmenbuch, Me.Label31, Me.lblUID, Me.lblRechnung_Name1, Me.lblRechnung_Name2, Me.lblRechnung_Strasse, Me.lblRechnung_Ort, Me.Label48, Me.lblEORI, Me.lblRechnung_UID_Ueberschrift, Me.lblRechnung_UID, Me.lblRechnung_Steuernummer_Ueberschrift, Me.lblRechnung_Steuernummer, Me.Line13, Me.lblFirma, Me.lblRechnung_Land})
         Me.ReportHeader1.Height = 4.168913!
         Me.ReportHeader1.Name = "ReportHeader1"
         '
@@ -645,7 +647,7 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         Me.lblRechnung_Name1.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
     "do-char-set: 1"
         Me.lblRechnung_Name1.Text = "VERAG Spedition AG"
-        Me.lblRechnung_Name1.Top = 1.974016!
+        Me.lblRechnung_Name1.Top = 1.871654!
         Me.lblRechnung_Name1.Width = 4.589764!
         '
         'lblRechnung_Name2
@@ -657,7 +659,7 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         Me.lblRechnung_Name2.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
     "do-char-set: 1"
         Me.lblRechnung_Name2.Text = "Abteilung: ZOLL"
-        Me.lblRechnung_Name2.Top = 2.151181!
+        Me.lblRechnung_Name2.Top = 2.048819!
         Me.lblRechnung_Name2.Width = 4.589763!
         '
         'lblRechnung_Strasse
@@ -669,7 +671,7 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         Me.lblRechnung_Strasse.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
     "do-char-set: 1"
         Me.lblRechnung_Strasse.Text = "Suben Nr. 100"
-        Me.lblRechnung_Strasse.Top = 2.328346!
+        Me.lblRechnung_Strasse.Top = 2.225984!
         Me.lblRechnung_Strasse.Width = 4.589763!
         '
         'lblRechnung_Ort
@@ -681,7 +683,7 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         Me.lblRechnung_Ort.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
     "do-char-set: 1"
         Me.lblRechnung_Ort.Text = "A 4975 SUBEN"
-        Me.lblRechnung_Ort.Top = 2.505512!
+        Me.lblRechnung_Ort.Top = 2.40315!
         Me.lblRechnung_Ort.Width = 4.589763!
         '
         'Label48
@@ -762,25 +764,37 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         Me.Line13.Left = 0.514567!
         Me.Line13.LineWeight = 1.0!
         Me.Line13.Name = "Line13"
-        Me.Line13.Top = 1.907087!
+        Me.Line13.Top = 1.804725!
         Me.Line13.Width = 3.619684!
         Me.Line13.X1 = 0.514567!
         Me.Line13.X2 = 4.134251!
-        Me.Line13.Y1 = 1.907087!
+        Me.Line13.Y1 = 1.804725!
-        Me.Line13.Y2 = 1.907087!
+        Me.Line13.Y2 = 1.804725!
         '
         'lblFirma
         '
         Me.lblFirma.Height = 0.1181102!
         Me.lblFirma.HyperLink = Nothing
-        Me.lblFirma.Left = 0.5145668!
+        Me.lblFirma.Left = 0.5145667!
         Me.lblFirma.Name = "lblFirma"
         Me.lblFirma.Style = "font-size: 7pt; font-weight: normal; text-align: left; vertical-align: middle; dd" &
     "o-char-set: 1"
         Me.lblFirma.Text = "VERAG Spedition AG, A-4975 Suben"
-        Me.lblFirma.Top = 1.753544!
+        Me.lblFirma.Top = 1.651182!
         Me.lblFirma.Width = 3.619685!
         '
+        'lblRechnung_Land
+        '
+        Me.lblRechnung_Land.Height = 0.1771653!
+        Me.lblRechnung_Land.HyperLink = Nothing
+        Me.lblRechnung_Land.Left = 0.514567!
+        Me.lblRechnung_Land.Name = "lblRechnung_Land"
+        Me.lblRechnung_Land.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
+    "do-char-set: 1"
+        Me.lblRechnung_Land.Text = "<EFBFBD>STERREICH"
+        Me.lblRechnung_Land.Top = 2.540945!
+        Me.lblRechnung_Land.Width = 4.589763!
+        '
         'ReportFooter1
         '
         Me.ReportFooter1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Line8, Me.Line9, Me.Label9, Me.lblSteuerfreiGes, Me.lblSteuerpflichtigGes, Me.lblSumme, Me.Label46, Me.Line1, Me.Line5, Me.lblZWSumme, Me.lblSteuerbetrag, Me.lblSteuersatz, Me.Line6, Me.Line7, Me.Line14, Me.lblZwText})
@@ -1193,6 +1207,7 @@ Partial Public Class rptSammelRechnungAnlagenDruck
         CType(Me.lblRechnung_Steuernummer_Ueberschrift, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblRechnung_Steuernummer, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblFirma, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.lblRechnung_Land, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.Label9, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblSteuerfreiGes, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblSteuerpflichtigGes, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1291,4 +1306,5 @@ Partial Public Class rptSammelRechnungAnlagenDruck
     Public WithEvents txtSendungsdetails As GrapeCity.ActiveReports.SectionReportModel.TextBox
     Public WithEvents lblFirma As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents txtPackstuecke As GrapeCity.ActiveReports.SectionReportModel.TextBox
+    Public WithEvents lblRechnung_Land As GrapeCity.ActiveReports.SectionReportModel.Label
 End Class

SDL/Fakturierung/rptSammelRechnungDruck.Designer.vb

@@ -70,6 +70,7 @@ Partial Public Class rptSammelRechnungDruck
         Me.lblFirma = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.Label24 = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblLKWId = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.lblRechnung_Land = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.ReportFooter1 = New GrapeCity.ActiveReports.SectionReportModel.ReportFooter()
         Me.Line8 = New GrapeCity.ActiveReports.SectionReportModel.Line()
         Me.Line9 = New GrapeCity.ActiveReports.SectionReportModel.Line()
@@ -144,6 +145,7 @@ Partial Public Class rptSammelRechnungDruck
         CType(Me.lblFirma, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.Label24, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblLKWId, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.lblRechnung_Land, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.Label9, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSteuerfreiGes, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSteuerpflichtigGes, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -336,7 +338,7 @@ Partial Public Class rptSammelRechnungDruck
         '
         'ReportHeader1
         '
-        Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblRgNr, Me.Label16, Me.Picture1, Me.picVERAG, Me.Label3, Me.lblUeberschriftRG_GS, Me.lblKundenNr, Me.Line3, Me.lblFirmaOrt, Me.lblFirmaStrasse, Me.lblFirmaTel, Me.lblFirmaFax, Me.lblFirmaEmail, Me.lblFirmaWeb, Me.Label18, Me.lblRgDatum, Me.Label26, Me.lblSachbearbeiter, Me.Label29, Me.lblFirmenbuch, Me.Label31, Me.lblUID, Me.lblRechnung_Name1, Me.lblRechnung_Name2, Me.lblRechnung_Strasse, Me.lblRechnung_Ort, Me.Label48, Me.lblEORI, Me.lblRechnung_UID_Ueberschrift, Me.lblRechnung_UID, Me.lblRechnung_Steuernummer_Ueberschrift, Me.lblRechnung_Steuernummer, Me.Line13, Me.lblFirma, Me.Label24, Me.lblLKWId})
+        Me.ReportHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblRgNr, Me.Label16, Me.Picture1, Me.picVERAG, Me.Label3, Me.lblUeberschriftRG_GS, Me.lblKundenNr, Me.Line3, Me.lblFirmaOrt, Me.lblFirmaStrasse, Me.lblFirmaTel, Me.lblFirmaFax, Me.lblFirmaEmail, Me.lblFirmaWeb, Me.Label18, Me.lblRgDatum, Me.Label26, Me.lblSachbearbeiter, Me.Label29, Me.lblFirmenbuch, Me.Label31, Me.lblUID, Me.lblRechnung_Name1, Me.lblRechnung_Name2, Me.lblRechnung_Strasse, Me.lblRechnung_Ort, Me.Label48, Me.lblEORI, Me.lblRechnung_UID_Ueberschrift, Me.lblRechnung_UID, Me.lblRechnung_Steuernummer_Ueberschrift, Me.lblRechnung_Steuernummer, Me.Line13, Me.lblFirma, Me.Label24, Me.lblLKWId, Me.lblRechnung_Land})
         Me.ReportHeader1.Height = 4.168913!
         Me.ReportHeader1.Name = "ReportHeader1"
         '
@@ -612,7 +614,7 @@ Partial Public Class rptSammelRechnungDruck
         Me.lblRechnung_Name1.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
     "do-char-set: 1"
         Me.lblRechnung_Name1.Text = "VERAG Spedition AG"
-        Me.lblRechnung_Name1.Top = 1.974016!
+        Me.lblRechnung_Name1.Top = 1.871654!
         Me.lblRechnung_Name1.Width = 3.592914!
         '
         'lblRechnung_Name2
@@ -624,7 +626,7 @@ Partial Public Class rptSammelRechnungDruck
         Me.lblRechnung_Name2.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
     "do-char-set: 1"
         Me.lblRechnung_Name2.Text = "Abteilung: ZOLL"
-        Me.lblRechnung_Name2.Top = 2.151181!
+        Me.lblRechnung_Name2.Top = 2.048819!
         Me.lblRechnung_Name2.Width = 3.592913!
         '
         'lblRechnung_Strasse
@@ -636,7 +638,7 @@ Partial Public Class rptSammelRechnungDruck
         Me.lblRechnung_Strasse.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
     "do-char-set: 1"
         Me.lblRechnung_Strasse.Text = "Suben Nr. 100"
-        Me.lblRechnung_Strasse.Top = 2.328346!
+        Me.lblRechnung_Strasse.Top = 2.225984!
         Me.lblRechnung_Strasse.Width = 3.592913!
         '
         'lblRechnung_Ort
@@ -648,7 +650,7 @@ Partial Public Class rptSammelRechnungDruck
         Me.lblRechnung_Ort.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
     "do-char-set: 1"
         Me.lblRechnung_Ort.Text = "A 4975 SUBEN"
-        Me.lblRechnung_Ort.Top = 2.505512!
+        Me.lblRechnung_Ort.Top = 2.40315!
         Me.lblRechnung_Ort.Width = 3.592913!
         '
         'Label48
@@ -729,23 +731,23 @@ Partial Public Class rptSammelRechnungDruck
         Me.Line13.Left = 0.514567!
         Me.Line13.LineWeight = 1.0!
         Me.Line13.Name = "Line13"
-        Me.Line13.Top = 1.907087!
+        Me.Line13.Top = 1.804725!
         Me.Line13.Width = 3.619684!
         Me.Line13.X1 = 0.514567!
         Me.Line13.X2 = 4.134251!
-        Me.Line13.Y1 = 1.907087!
+        Me.Line13.Y1 = 1.804725!
-        Me.Line13.Y2 = 1.907087!
+        Me.Line13.Y2 = 1.804725!
         '
         'lblFirma
         '
         Me.lblFirma.Height = 0.1181102!
         Me.lblFirma.HyperLink = Nothing
-        Me.lblFirma.Left = 0.5145668!
+        Me.lblFirma.Left = 0.5145667!
         Me.lblFirma.Name = "lblFirma"
         Me.lblFirma.Style = "font-size: 7pt; font-weight: normal; text-align: left; vertical-align: middle; dd" &
     "o-char-set: 1"
         Me.lblFirma.Text = "VERAG Spedition AG, A-4975 Suben"
-        Me.lblFirma.Top = 1.753544!
+        Me.lblFirma.Top = 1.651182!
         Me.lblFirma.Width = 3.619685!
         '
         'Label24
@@ -772,6 +774,18 @@ Partial Public Class rptSammelRechnungDruck
         Me.lblLKWId.Top = 1.065354!
         Me.lblLKWId.Width = 1.958268!
         '
+        'lblRechnung_Land
+        '
+        Me.lblRechnung_Land.Height = 0.1771653!
+        Me.lblRechnung_Land.HyperLink = Nothing
+        Me.lblRechnung_Land.Left = 0.514567!
+        Me.lblRechnung_Land.Name = "lblRechnung_Land"
+        Me.lblRechnung_Land.Style = "font-size: 10pt; font-weight: normal; text-align: left; vertical-align: middle; d" &
+    "do-char-set: 1"
+        Me.lblRechnung_Land.Text = "<EFBFBD>STERREICH"
+        Me.lblRechnung_Land.Top = 2.580315!
+        Me.lblRechnung_Land.Width = 4.589763!
+        '
         'ReportFooter1
         '
         Me.ReportFooter1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Line8, Me.Line9, Me.Label9, Me.lblSteuerfreiGes, Me.lblSteuerpflichtigGes, Me.lblSumme, Me.Label46, Me.Line1, Me.Line5, Me.lblZWSumme, Me.lblSteuerbetrag, Me.lblSteuersatz, Me.txtVermerk, Me.txtInfo, Me.Line6, Me.Line7, Me.Line14, Me.lblZwText})
@@ -1193,6 +1207,7 @@ Partial Public Class rptSammelRechnungDruck
         CType(Me.lblFirma, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.Label24, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblLKWId, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.lblRechnung_Land, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.Label9, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblSteuerfreiGes, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblSteuerpflichtigGes, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1292,4 +1307,5 @@ Partial Public Class rptSammelRechnungDruck
     Public WithEvents Label24 As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblLKWId As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblFirma As GrapeCity.ActiveReports.SectionReportModel.Label
+    Public WithEvents lblRechnung_Land As GrapeCity.ActiveReports.SectionReportModel.Label
 End Class

SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb

@@ -1029,6 +1029,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.kdFirmaAvisierer._displayWoelflKd = False
         Me.kdFirmaAvisierer._hideIfListEmpty = True
         Me.kdFirmaAvisierer._loadKdData = True
+        Me.kdFirmaAvisierer._UseFIRMA = ""
         Me.kdFirmaAvisierer._ValueKdAndName = False
         Me.kdFirmaAvisierer.BackColor = System.Drawing.Color.White
         Me.kdFirmaAvisierer.dgvpos = "LEFT"
@@ -1406,6 +1407,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.kdFirmaAuftraggeber._displayWoelflKd = False
         Me.kdFirmaAuftraggeber._hideIfListEmpty = True
         Me.kdFirmaAuftraggeber._loadKdData = True
+        Me.kdFirmaAuftraggeber._UseFIRMA = ""
         Me.kdFirmaAuftraggeber._ValueKdAndName = False
         Me.kdFirmaAuftraggeber.BackColor = System.Drawing.Color.White
         Me.kdFirmaAuftraggeber.dgvpos = "LEFT"
@@ -1829,6 +1831,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.kdFirmaRechnungAn._displayWoelflKd = False
         Me.kdFirmaRechnungAn._hideIfListEmpty = True
         Me.kdFirmaRechnungAn._loadKdData = True
+        Me.kdFirmaRechnungAn._UseFIRMA = ""
         Me.kdFirmaRechnungAn._ValueKdAndName = False
         Me.kdFirmaRechnungAn.dgvpos = "LEFT"
         Me.kdFirmaRechnungAn.KdName = Nothing
@@ -2159,6 +2162,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.kdFirmaAbsender._displayWoelflKd = False
         Me.kdFirmaAbsender._hideIfListEmpty = True
         Me.kdFirmaAbsender._loadKdData = True
+        Me.kdFirmaAbsender._UseFIRMA = ""
         Me.kdFirmaAbsender._ValueKdAndName = False
         Me.kdFirmaAbsender.BackColor = System.Drawing.Color.White
         Me.kdFirmaAbsender.dgvpos = "LEFT"
@@ -2824,6 +2828,7 @@ Partial Class usrCntlFaktAbrechnung
         Me.kdFirmaEmpfaenger._displayWoelflKd = False
         Me.kdFirmaEmpfaenger._hideIfListEmpty = True
         Me.kdFirmaEmpfaenger._loadKdData = True
+        Me.kdFirmaEmpfaenger._UseFIRMA = ""
         Me.kdFirmaEmpfaenger._ValueKdAndName = False
         Me.kdFirmaEmpfaenger.BackColor = System.Drawing.Color.White
         Me.kdFirmaEmpfaenger.dgvpos = "LEFT"

SDL/Fakturierung/usrCntlFaktAbrechnung.vb

@@ -48,9 +48,9 @@ Public Class usrCntlFaktAbrechnung
         initRECHNUNG()
 
         Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
-            Case "IMEX"
+            'Case "IMEX"
-                Firma = 20 'VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+                'Firma = 20 'VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
-                cboFiliale.changeItem(5501)
+                'cboFiliale.changeItem(5501)
             Case "UNISPED"
                 Firma = 21
                 cboFiliale.changeItem(5601)
@@ -58,7 +58,7 @@ Public Class usrCntlFaktAbrechnung
                 Firma = 22
                 cboFiliale.changeItem(5701)
             Case "FRONT-OFFICE"
-                Firma = 23
+                Firma = 17
                 cboFiliale.changeItem(5801)
 
         End Select
@@ -477,12 +477,13 @@ Public Class usrCntlFaktAbrechnung
         Dim whereFirma = ""
 
         Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
-            Case "VERAG" : whereFirma = " AND Firma_ID<>20 " : pnlDocs.Visible = True
+            Case "VERAG", "IMEX" : whereFirma = " AND Firma_ID NOT IN (21,22) " : pnlDocs.Visible = True
-            Case "IMEX" : whereFirma = " AND Firma_ID=20 "
+            'Case "VERAG" : whereFirma = " AND Firma_ID<>20 " : pnlDocs.Visible = True
+            'Case "IMEX" : whereFirma = " AND Firma_ID=20 "
             Case "ATILLA" : whereFirma = " AND Firma_ID=7 " : pnlDocs.Visible = True
             Case "UNISPED" : whereFirma = " AND Firma_ID=21 "
             Case "AMBAR" : whereFirma = " AND Firma_ID=22 "
-            Case "FRONT-OFFICE" : whereFirma = " AND Firma_ID=23 "
+            Case "FRONT-OFFICE" : whereFirma = " AND Firma_ID=17 "
         End Select
 
         cboFirma.fillWithSQL("SELECT  [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE Firma_ID NOT IN(3) " & whereFirma & " ORDER BY Firma_ID  ", True, "FMZOLL")
@@ -1467,7 +1468,7 @@ Public Class usrCntlFaktAbrechnung
                 pnlTop.BackColor = Color.FromArgb(192, 0, 0) : errCOlor = Color.DarkRed
             Case 22 : pic.BackgroundImage = My.Resources.ambar_simple
                 pnlTop.BackColor = Color.FromArgb(0, 120, 120) : errCOlor = Color.DarkRed
-            Case 23 ': pic.BackgroundImage = My.Resources.front
+            Case 17 : pic.BackgroundImage = My.Resources.FrontOfficeSUB_Horizontal
                 pnlTop.BackColor = Color.FromArgb(192, 0, 0) : errCOlor = Color.DarkRed
 
         End Select
@@ -1516,7 +1517,7 @@ Public Class usrCntlFaktAbrechnung
 
             Case "5601" : cboFirma.changeItem(21) : RECHNUNG.Firma_ID = 21 'UNISPED
             Case "5701" : cboFirma.changeItem(22) : RECHNUNG.Firma_ID = 22'AMBAR
-            Case "5801" : cboFirma.changeItem(23) : RECHNUNG.Firma_ID = 23 'FRONT-OFFICE
+            Case "5801" : cboFirma.changeItem(17) : RECHNUNG.Firma_ID = 17 'FRONT-OFFICE
 
             Case Else
                 If SPEDBUCH IsNot Nothing AndAlso SPEDBUCH.Abfertigungsart = 38 Then 'EV-VZ
@@ -2669,6 +2670,7 @@ Public Class usrCntlFaktAbrechnung
             cboSpedBuchUnterNr.Items.Clear()
         End If
     End Sub
+
     Private Sub txtAbfertigungsnummer_Leave(sender As Object, e As EventArgs) Handles txtAbfertigungsnummer.Leave
         If IsNumeric(txtAbfertigungsnummer.Text) AndAlso txtAbfertigungsnummer.Text.Length <= 6 Then
             txtAbfertigungsnummer.Text = Now.ToString("yy") & CInt(txtAbfertigungsnummer.Text).ToString("000000")
@@ -3318,13 +3320,18 @@ Nächste_Textzeile_lesen:
 
     Sub loadEUST()
         Dim whereKTO = ""
-        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+        Select Case cboFirma._value
-            Case "IMEX"
+            Case 20 : whereKTO = " AND AKTO IN ('002719','002718') "
-                whereKTO = " AND AKTO IN ('002719','002718') "
+            Case Else : whereKTO = " AND AKTO IN ('006136','006128','3517233') "
-            Case Else
-                whereKTO = " AND AKTO IN ('006136','006128','3517233') "
         End Select
 
+        'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+        '    Case "IMEX"
+        '        whereKTO = " AND AKTO IN ('002719','002718') "
+        '    Case Else
+        '        whereKTO = " AND AKTO IN ('006136','006128','3517233') "
+        'End Select
+
         Dim dt As DataTable = SQL.loadDgvBySql("SELECT [Index] FROM [Zkteing] where Bezugsnummer='" & SPEDBUCH.AtlasBezNrEZA & "' AND LeistungsNr IN (20,77) AND [Status] IS NULL " & whereKTO, "FMZOLL")
         For Each r In dt.Rows
             VERAG_PROG_ALLGEMEIN.cZkteing.UPDATE_Status("X", r("Index"))
@@ -3336,13 +3343,18 @@ Nächste_Textzeile_lesen:
     'Case 482
     Sub loadZOLL()
         Dim whereKTO = ""
-        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+        Select Case cboFirma._value
-            Case "IMEX"
+            Case 20 : whereKTO = " AND AKTO IN ('002719','002718') "
-                whereKTO = " AND AKTO IN ('002719','002718') "
+            Case Else : whereKTO = " AND AKTO IN ('006136','006128','3517233') "
-            Case Else
-                whereKTO = " AND AKTO IN ('006136','006128','3517233') "
         End Select
 
+        'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+        '    Case "IMEX"
+        '        whereKTO = " AND AKTO IN ('002719','002718') "
+        '    Case Else
+        '        whereKTO = " AND AKTO IN ('006136','006128','3517233') "
+        'End Select
+
         Dim dt As DataTable = SQL.loadDgvBySql("SELECT [Index] FROM [Zkteing] where Bezugsnummer='" & SPEDBUCH.AtlasBezNrEZA & "' AND LeistungsNr NOT IN (20,77) AND [Status] IS NULL " & whereKTO, "FMZOLL")
         For Each r In dt.Rows
             VERAG_PROG_ALLGEMEIN.cZkteing.UPDATE_Status("X", r("Index"))
@@ -3406,4 +3418,6 @@ Nächste_Textzeile_lesen:
     Private Sub Label53_Click(sender As Object, e As EventArgs) Handles Label53.Click
         Label53.Visible = False
     End Sub
+
+
 End Class

SDL/Formulare/Einheitspapier/usrCntlEinheitspapier.vb

@@ -151,6 +151,7 @@
             If txt.StartsWith(" - ") Then txt = txt.Replace(" - ", "")
         End If
         txtUnterschrift.Text = "i.A.u.i.V." & vbNewLine & txt & vbNewLine & "" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
+        If txtUnterschrift.Text.Length > txtUnterschrift.MaxLength Then txtUnterschrift.Text = txtUnterschrift.Text.Substring(0, txtUnterschrift.MaxLength)
     End Sub
 
 

SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb

@@ -283,16 +283,27 @@
     End Function
 
     Private Sub txtUid_TextChanged(sender As Object, e As EventArgs) Handles txtUid.TextChanged
-        If sender.text.trim <> "" Then
+        Dim bool_steuerberechnung = True
-            txtMwstProzent._value = "0"
+
-            txtMwstProzent.Visible = False
+        If sender.text.trim = "" Then
-            txtMWST.Visible = False
+            bool_steuerberechnung = True
-            Label14.Visible = False
         Else
+            bool_steuerberechnung = False
+            If sender.text.ToString.StartsWith("AT") Then
+                bool_steuerberechnung = True
+            End If
+        End If
+
+        If bool_steuerberechnung Then
             txtMwstProzent.Visible = True
             txtMWST.Visible = True
             Label14.Visible = True
             txtMwstProzent._value = "0,2"
+        Else
+            txtMwstProzent._value = "0"
+            txtMwstProzent.Visible = False
+            txtMWST.Visible = False
+            Label14.Visible = False
         End If
         txtMwstProzent.Visible = (sender.text.trim = "")
         txtMWST.Visible = (sender.text.trim = "")
@@ -308,12 +319,14 @@
     End Sub
 
     Private Sub MyComboBox2_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboFirma.SelectedIndexChanged
-        Select Case cboFirma._value
+        If txtEustProzent._value <> "0" Then ' Wenn =, soll das bleiben
-            Case "CS"
+            Select Case cboFirma._value
-                txtEustProzent.changeItem("0,20")
+                Case "CS"
-            Case "AG"
+                    txtEustProzent.changeItem("0,20")
-                txtEustProzent.changeItem("0,19")
+                Case "AG"
-        End Select
+                    txtEustProzent.changeItem("0,19")
+            End Select
+        End If
     End Sub
 
     Private Sub pnlBottom_Paint(sender As Object, e As PaintEventArgs) Handles pnlBottom.Paint

SDL/My Project/Resources.Designer.vb

@@ -190,6 +190,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die  ähnelt.
+        '''</summary>
+        Friend ReadOnly Property asdasdasdasfdgh56dfbnnmmmm() As String
+            Get
+                Return ResourceManager.GetString("asdasdasdasfdgh56dfbnnmmmm", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -458,15 +467,6 @@ Namespace My.Resources
             End Get
         End Property
         
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die  ähnelt.
-        '''</summary>
-        Friend ReadOnly Property ddasdasasasd() As String
-            Get
-                Return ResourceManager.GetString("ddasdasasasd", resourceCulture)
-            End Get
-        End Property
-        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -2081,7 +2081,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die 1.1.4.7 ähnelt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die 1.1.5.3 ähnelt.
         '''</summary>
         Friend ReadOnly Property Version() As String
             Get

SDL/My Project/Resources.resx

@@ -623,7 +623,7 @@
     <value>..\Resources\email.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Version" xml:space="preserve">
-    <value>1.1.4.7</value>
+    <value>1.1.5.3</value>
   </data>
   <data name="axxes1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\axxes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -760,7 +760,7 @@
   <data name="aviso_messenger" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\aviso_messenger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ddasdasasasd" xml:space="preserve">
+  <data name="asdasdasdasfdgh56dfbnnmmmm" xml:space="preserve">
     <value />
   </data>
 </root>

SDL/SDL.vbproj

@@ -72,16 +72,17 @@
     <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestCertificateThumbprint>8DC35AB60F9990B5FAA4DDF7D719288BAD997167</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>2508FAE878AAAD6136689CC8171DC8A749727DD4</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestKeyFile>SDL_TemporaryKey.pfx</ManifestKeyFile>
+    <ManifestKeyFile>
+    </ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
     <GenerateManifests>true</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <SignManifests>false</SignManifests>
+    <SignManifests>true</SignManifests>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Accessibility" />
@@ -351,186 +352,186 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="cSqlDb.vb" />
-    <Compile Include="DAKOSY\ATLAS\cDakosyInterface_Send.vb" />
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\AES\usrCntlATLAS_AES.Designer.vb">
-    <Compile Include="DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA.Designer.vb">
-      <DependentUpon>usrCntlATLAS_EZA.vb</DependentUpon>
-    </Compile>
-    <Compile Include="DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA.vb">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_DV1.Designer.vb">
-      <DependentUpon>usrCntlATLAS_EZA_DV1.vb</DependentUpon>
-    </Compile>
-    <Compile Include="DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_DV1.vb">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_Adressen.Designer.vb">
-      <DependentUpon>usrCntlATLAS_EZA_Adressen.vb</DependentUpon>
-    </Compile>
-    <Compile Include="DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_Adressen.vb">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_Allg.Designer.vb">
-      <DependentUpon>usrCntlATLAS_EZA_Allg.vb</DependentUpon>
-    </Compile>
-    <Compile Include="DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_Allg.vb">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_Position.Designer.vb">
-      <DependentUpon>usrCntlATLAS_EZA_Position.vb</DependentUpon>
-    </Compile>
-    <Compile Include="DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_Position.vb">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_Positionen.Designer.vb">
-      <DependentUpon>usrCntlATLAS_EZA_Positionen.vb</DependentUpon>
-    </Compile>
-    <Compile Include="DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_Positionen.vb">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="DAKOSY\ATLAS\AES\usrCntlATLAS_AES_PassiveVeredelung.Designer.vb">
-      <DependentUpon>usrCntlATLAS_AES_PassiveVeredelung.vb</DependentUpon>
-    </Compile>
-    <Compile Include="DAKOSY\ATLAS\AES\usrCntlATLAS_AES_PassiveVeredelung.vb">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="DAKOSY\ATLAS\AES\usrCntlATLAS_AES_Allg.Designer.vb">
-      <DependentUpon>usrCntlATLAS_AES_Allg.vb</DependentUpon>
-    </Compile>
-    <Compile Include="DAKOSY\ATLAS\AES\usrCntlATLAS_AES_Allg.vb">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="DAKOSY\ATLAS\AES\usrCntlATLAS_AES_Adressen.Designer.vb">
-      <DependentUpon>usrCntlATLAS_AES_Adressen.vb</DependentUpon>
-    </Compile>
-    <Compile Include="DAKOSY\ATLAS\AES\usrCntlATLAS_AES_Adressen.vb">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="DAKOSY\ATLAS\AES\usrCntlATLAS_AES_Position.Designer.vb">
-      <DependentUpon>usrCntlATLAS_AES_Position.vb</DependentUpon>
-    </Compile>
-    <Compile Include="DAKOSY\ATLAS\AES\usrCntlATLAS_AES_Position.vb">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="DAKOSY\ATLAS\AES\usrCntlATLAS_AES_Positionen.Designer.vb">
-      <DependentUpon>usrCntlATLAS_AES_Positionen.vb</DependentUpon>
-    </Compile>
-    <Compile Include="DAKOSY\ATLAS\AES\usrCntlATLAS_AES_Positionen.vb">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="DAKOSY\ATLAS\AES\usrCntlATLAS_AES.Designer.vb">
       <DependentUpon>usrCntlATLAS_AES.vb</DependentUpon>
     </Compile>
-    <Compile Include="DAKOSY\ATLAS\AES\usrCntlATLAS_AES.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\AES\usrCntlATLAS_AES.vb">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="DAKOSY\ATLAS\frmDY_LogBuch.Designer.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\cDakosyInterface_Send.vb" />
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA.Designer.vb">
+      <DependentUpon>usrCntlATLAS_EZA.vb</DependentUpon>
+    </Compile>
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_DV1.Designer.vb">
+      <DependentUpon>usrCntlATLAS_EZA_DV1.vb</DependentUpon>
+    </Compile>
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_DV1.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_Adressen.Designer.vb">
+      <DependentUpon>usrCntlATLAS_EZA_Adressen.vb</DependentUpon>
+    </Compile>
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_Adressen.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_Allg.Designer.vb">
+      <DependentUpon>usrCntlATLAS_EZA_Allg.vb</DependentUpon>
+    </Compile>
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_Allg.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_Position.Designer.vb">
+      <DependentUpon>usrCntlATLAS_EZA_Position.vb</DependentUpon>
+    </Compile>
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_Position.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_Positionen.Designer.vb">
+      <DependentUpon>usrCntlATLAS_EZA_Positionen.vb</DependentUpon>
+    </Compile>
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_Positionen.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\AES\usrCntlATLAS_AES_PassiveVeredelung.Designer.vb">
+      <DependentUpon>usrCntlATLAS_AES_PassiveVeredelung.vb</DependentUpon>
+    </Compile>
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\AES\usrCntlATLAS_AES_PassiveVeredelung.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\AES\usrCntlATLAS_AES_Allg.Designer.vb">
+      <DependentUpon>usrCntlATLAS_AES_Allg.vb</DependentUpon>
+    </Compile>
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\AES\usrCntlATLAS_AES_Allg.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\AES\usrCntlATLAS_AES_Adressen.Designer.vb">
+      <DependentUpon>usrCntlATLAS_AES_Adressen.vb</DependentUpon>
+    </Compile>
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\AES\usrCntlATLAS_AES_Adressen.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\AES\usrCntlATLAS_AES_Position.Designer.vb">
+      <DependentUpon>usrCntlATLAS_AES_Position.vb</DependentUpon>
+    </Compile>
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\AES\usrCntlATLAS_AES_Position.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\AES\usrCntlATLAS_AES_Positionen.Designer.vb">
+      <DependentUpon>usrCntlATLAS_AES_Positionen.vb</DependentUpon>
+    </Compile>
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\AES\usrCntlATLAS_AES_Positionen.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\frmDY_LogBuch.Designer.vb">
       <DependentUpon>frmDY_LogBuch.vb</DependentUpon>
     </Compile>
-    <Compile Include="DAKOSY\ATLAS\frmDY_LogBuch.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\frmDY_LogBuch.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DAKOSY\ATLAS\NCTS\frmRoutenauswahl.Designer.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\frmRoutenauswahl.Designer.vb">
       <DependentUpon>frmRoutenauswahl.vb</DependentUpon>
     </Compile>
-    <Compile Include="DAKOSY\ATLAS\NCTS\frmRoutenauswahl.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\frmRoutenauswahl.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DAKOSY\ATLAS\NCTS\frmRoutenAuswahlDetails.Designer.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\frmRoutenAuswahlDetails.Designer.vb">
       <DependentUpon>frmRoutenAuswahlDetails.vb</DependentUpon>
     </Compile>
-    <Compile Include="DAKOSY\ATLAS\NCTS\frmRoutenAuswahlDetails.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\frmRoutenAuswahlDetails.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Verschluesse.Designer.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Verschluesse.Designer.vb">
       <DependentUpon>usrCntlATLAS_NCTS_Verschluesse.vb</DependentUpon>
     </Compile>
-    <Compile Include="DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Verschluesse.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Verschluesse.vb">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Adressen.Designer.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Adressen.Designer.vb">
       <DependentUpon>usrCntlATLAS_NCTS_Adressen.vb</DependentUpon>
     </Compile>
-    <Compile Include="DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Adressen.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Adressen.vb">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Sicherheit.Designer.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Sicherheit.Designer.vb">
       <DependentUpon>usrCntlATLAS_NCTS_Sicherheit.vb</DependentUpon>
     </Compile>
-    <Compile Include="DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Sicherheit.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Sicherheit.vb">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Position.Designer.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Position.Designer.vb">
       <DependentUpon>usrCntlATLAS_NCTS_Position.vb</DependentUpon>
     </Compile>
-    <Compile Include="DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Position.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Position.vb">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Positionen.Designer.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Positionen.Designer.vb">
       <DependentUpon>usrCntlATLAS_NCTS_Positionen.vb</DependentUpon>
     </Compile>
-    <Compile Include="DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Positionen.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Positionen.vb">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Allg.Designer.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Allg.Designer.vb">
       <DependentUpon>usrCntlATLAS_NCTS_Allg.vb</DependentUpon>
     </Compile>
-    <Compile Include="DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Allg.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Allg.vb">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_SicherheitPos.Designer.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_SicherheitPos.Designer.vb">
       <DependentUpon>usrCntlATLAS_NCTS_SicherheitPos.vb</DependentUpon>
     </Compile>
-    <Compile Include="DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_SicherheitPos.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_SicherheitPos.vb">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS.Designer.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS.Designer.vb">
       <DependentUpon>usrCntlATLAS_NCTS.vb</DependentUpon>
     </Compile>
-    <Compile Include="DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS.vb">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="DAKOSY\frmDakosy_SelFirma.Designer.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\frmDakosy_SelFirma.Designer.vb">
       <DependentUpon>frmDakosy_SelFirma.vb</DependentUpon>
     </Compile>
-    <Compile Include="DAKOSY\frmDakosy_SelFirma.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\frmDakosy_SelFirma.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DAKOSY\Stammreferenz\frmStammreferenzPopup.Designer.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\Stammreferenz\frmStammreferenzPopup.Designer.vb">
       <DependentUpon>frmStammreferenzPopup.vb</DependentUpon>
     </Compile>
-    <Compile Include="DAKOSY\Stammreferenz\frmStammreferenzPopup.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\Stammreferenz\frmStammreferenzPopup.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DAKOSY\Stammreferenz\frmDakosyStammreferenz.Designer.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\Stammreferenz\frmDakosyStammreferenz.Designer.vb">
       <DependentUpon>frmDakosyStammreferenz.vb</DependentUpon>
     </Compile>
-    <Compile Include="DAKOSY\Stammreferenz\frmDakosyStammreferenz.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\Stammreferenz\frmDakosyStammreferenz.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DAKOSY\frmZollanmeldung.Designer.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\frmZollanmeldung.Designer.vb">
       <DependentUpon>frmZollanmeldung.vb</DependentUpon>
     </Compile>
-    <Compile Include="DAKOSY\frmZollanmeldung.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\frmZollanmeldung.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DAKOSY\KundenExport\VERAG_KundenStamm_Export.Designer.vb" />
+    <Compile Include="ZOLLSYSTEM\DAKOSY\KundenExport\VERAG_KundenStamm_Export.Designer.vb" />
-    <Compile Include="DAKOSY\Stammreferenz\frmDakosyStammreferenzVerwalten.Designer.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\Stammreferenz\frmDakosyStammreferenzVerwalten.Designer.vb">
       <DependentUpon>frmDakosyStammreferenzVerwalten.vb</DependentUpon>
     </Compile>
-    <Compile Include="DAKOSY\Stammreferenz\frmDakosyStammreferenzVerwalten.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\Stammreferenz\frmDakosyStammreferenzVerwalten.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DAKOSY\usrCntlAdresseEZA.Designer.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\usrCntlAdresseEZA.Designer.vb">
       <DependentUpon>usrCntlAdresseEZA.vb</DependentUpon>
     </Compile>
-    <Compile Include="DAKOSY\usrCntlAdresseEZA.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\usrCntlAdresseEZA.vb">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="DAKOSY\usrCntlAdresse.Designer.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\usrCntlAdresse.Designer.vb">
       <DependentUpon>usrCntlAdresse.vb</DependentUpon>
     </Compile>
-    <Compile Include="DAKOSY\usrCntlAdresse.vb">
+    <Compile Include="ZOLLSYSTEM\DAKOSY\usrCntlAdresse.vb">
       <SubType>UserControl</SubType>
     </Compile>
     <Compile Include="Dienstplan\usrCntlDienstWoche.Designer.vb">
@@ -1564,6 +1565,12 @@
     <Compile Include="kunden\frmKundenUebersichtZollRg.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="mdm\usrCntlWoelfl_IM_CSVRg.Designer.vb">
+      <DependentUpon>usrCntlWoelfl_IM_CSVRg.vb</DependentUpon>
+    </Compile>
+    <Compile Include="mdm\usrCntlWoelfl_IM_CSVRg.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="My Project\Resources.Designer.vb">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -2180,6 +2187,25 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Reference.map</DependentUpon>
     </Compile>
+    <Compile Include="ZOLLSYSTEM\TELOTEC\cTelotecInterface_Send.vb" />
+    <Compile Include="ZOLLSYSTEM\TELOTEC\eZOLL\EZA\usrCntlTCeZOLL_EZA_Allg.Designer.vb">
+      <DependentUpon>usrCntlTCeZOLL_EZA_Allg.vb</DependentUpon>
+    </Compile>
+    <Compile Include="ZOLLSYSTEM\TELOTEC\eZOLL\EZA\usrCntlTCeZOLL_EZA_Allg.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ZOLLSYSTEM\TELOTEC\eZOLL\EZA\usrCntlTCeZOLL_EZA.Designer.vb">
+      <DependentUpon>usrCntlTCeZOLL_EZA.vb</DependentUpon>
+    </Compile>
+    <Compile Include="ZOLLSYSTEM\TELOTEC\eZOLL\EZA\usrCntlTCeZOLL_EZA.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ZOLLSYSTEM\TELOTEC\frmTCZollanmeldung.Designer.vb">
+      <DependentUpon>frmTCZollanmeldung.vb</DependentUpon>
+    </Compile>
+    <Compile Include="ZOLLSYSTEM\TELOTEC\frmTCZollanmeldung.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="zoll\frmAddArtikelATLAS.Designer.vb">
       <DependentUpon>frmAddArtikelATLAS.vb</DependentUpon>
     </Compile>
@@ -2342,94 +2368,94 @@
     <EmbeddedResource Include="Checkliste\subRptVM.resx">
       <DependentUpon>subRptVM.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA.resx">
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\AES\usrCntlATLAS_AES.resx">
-      <DependentUpon>usrCntlATLAS_EZA.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_DV1.resx">
-      <DependentUpon>usrCntlATLAS_EZA_DV1.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_Adressen.resx">
-      <DependentUpon>usrCntlATLAS_EZA_Adressen.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_Allg.resx">
-      <DependentUpon>usrCntlATLAS_EZA_Allg.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_Position.resx">
-      <DependentUpon>usrCntlATLAS_EZA_Position.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_Positionen.resx">
-      <DependentUpon>usrCntlATLAS_EZA_Positionen.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\ATLAS\AES\usrCntlATLAS_AES_PassiveVeredelung.resx">
-      <DependentUpon>usrCntlATLAS_AES_PassiveVeredelung.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\ATLAS\AES\usrCntlATLAS_AES_Allg.resx">
-      <DependentUpon>usrCntlATLAS_AES_Allg.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\ATLAS\AES\usrCntlATLAS_AES_Adressen.resx">
-      <DependentUpon>usrCntlATLAS_AES_Adressen.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\ATLAS\AES\usrCntlATLAS_AES_Position.resx">
-      <DependentUpon>usrCntlATLAS_AES_Position.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\ATLAS\AES\usrCntlATLAS_AES_Positionen.resx">
-      <DependentUpon>usrCntlATLAS_AES_Positionen.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\ATLAS\AES\usrCntlATLAS_AES.resx">
       <DependentUpon>usrCntlATLAS_AES.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\ATLAS\frmDY_LogBuch.resx">
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA.resx">
+      <DependentUpon>usrCntlATLAS_EZA.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_DV1.resx">
+      <DependentUpon>usrCntlATLAS_EZA_DV1.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_Adressen.resx">
+      <DependentUpon>usrCntlATLAS_EZA_Adressen.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_Allg.resx">
+      <DependentUpon>usrCntlATLAS_EZA_Allg.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_Position.resx">
+      <DependentUpon>usrCntlATLAS_EZA_Position.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\EZA\usrCntlATLAS_EZA_Positionen.resx">
+      <DependentUpon>usrCntlATLAS_EZA_Positionen.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\AES\usrCntlATLAS_AES_PassiveVeredelung.resx">
+      <DependentUpon>usrCntlATLAS_AES_PassiveVeredelung.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\AES\usrCntlATLAS_AES_Allg.resx">
+      <DependentUpon>usrCntlATLAS_AES_Allg.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\AES\usrCntlATLAS_AES_Adressen.resx">
+      <DependentUpon>usrCntlATLAS_AES_Adressen.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\AES\usrCntlATLAS_AES_Position.resx">
+      <DependentUpon>usrCntlATLAS_AES_Position.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\AES\usrCntlATLAS_AES_Positionen.resx">
+      <DependentUpon>usrCntlATLAS_AES_Positionen.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\frmDY_LogBuch.resx">
       <DependentUpon>frmDY_LogBuch.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\ATLAS\NCTS\frmRoutenauswahl.resx">
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\frmRoutenauswahl.resx">
       <DependentUpon>frmRoutenauswahl.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\ATLAS\NCTS\frmRoutenAuswahlDetails.resx">
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\frmRoutenAuswahlDetails.resx">
       <DependentUpon>frmRoutenAuswahlDetails.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Verschluesse.resx">
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Verschluesse.resx">
       <DependentUpon>usrCntlATLAS_NCTS_Verschluesse.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Adressen.resx">
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Adressen.resx">
       <DependentUpon>usrCntlATLAS_NCTS_Adressen.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Sicherheit.resx">
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Sicherheit.resx">
       <DependentUpon>usrCntlATLAS_NCTS_Sicherheit.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Position.resx">
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Position.resx">
       <DependentUpon>usrCntlATLAS_NCTS_Position.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Positionen.resx">
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Positionen.resx">
       <DependentUpon>usrCntlATLAS_NCTS_Positionen.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Allg.resx">
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_Allg.resx">
       <DependentUpon>usrCntlATLAS_NCTS_Allg.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_SicherheitPos.resx">
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS_SicherheitPos.resx">
       <DependentUpon>usrCntlATLAS_NCTS_SicherheitPos.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS.resx">
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\ATLAS\NCTS\usrCntlATLAS_NCTS.resx">
       <DependentUpon>usrCntlATLAS_NCTS.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\frmDakosy_SelFirma.resx">
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\frmDakosy_SelFirma.resx">
       <DependentUpon>frmDakosy_SelFirma.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\Stammreferenz\frmStammreferenzPopup.resx">
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\Stammreferenz\frmStammreferenzPopup.resx">
       <DependentUpon>frmStammreferenzPopup.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\Stammreferenz\frmDakosyStammreferenz.resx">
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\Stammreferenz\frmDakosyStammreferenz.resx">
       <DependentUpon>frmDakosyStammreferenz.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\frmZollanmeldung.resx">
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\frmZollanmeldung.resx">
       <DependentUpon>frmZollanmeldung.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\Stammreferenz\frmDakosyStammreferenzVerwalten.resx">
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\Stammreferenz\frmDakosyStammreferenzVerwalten.resx">
       <DependentUpon>frmDakosyStammreferenzVerwalten.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\usrCntlAdresseEZA.resx">
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\usrCntlAdresseEZA.resx">
       <DependentUpon>usrCntlAdresseEZA.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DAKOSY\usrCntlAdresse.resx">
+    <EmbeddedResource Include="ZOLLSYSTEM\DAKOSY\usrCntlAdresse.resx">
       <DependentUpon>usrCntlAdresse.vb</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Dienstplan\usrCntlDienstWoche.resx">
@@ -2945,6 +2971,9 @@
     <EmbeddedResource Include="kunden\frmKundenUebersichtZollRg.resx">
       <DependentUpon>frmKundenUebersichtZollRg.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="mdm\usrCntlWoelfl_IM_CSVRg.resx">
+      <DependentUpon>usrCntlWoelfl_IM_CSVRg.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="My Project\licenses.licx" />
     <EmbeddedResource Include="PopUp\frmPopUpInfo.resx">
       <DependentUpon>frmPopUpInfo.vb</DependentUpon>
@@ -3246,6 +3275,15 @@
     <EmbeddedResource Include="usrCntlWelcome.resx">
       <DependentUpon>usrCntlWelcome.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="ZOLLSYSTEM\TELOTEC\eZOLL\EZA\usrCntlTCeZOLL_EZA_Allg.resx">
+      <DependentUpon>usrCntlTCeZOLL_EZA_Allg.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ZOLLSYSTEM\TELOTEC\eZOLL\EZA\usrCntlTCeZOLL_EZA.resx">
+      <DependentUpon>usrCntlTCeZOLL_EZA.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ZOLLSYSTEM\TELOTEC\frmTCZollanmeldung.resx">
+      <DependentUpon>frmTCZollanmeldung.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="zoll\frmAddArtikelATLAS.resx">
       <DependentUpon>frmAddArtikelATLAS.vb</DependentUpon>
     </EmbeddedResource>
@@ -3303,7 +3341,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="ClassDiagram1.cd" />
-    <None Include="DAKOSY\KundenExport\VERAG_KundenStamm_Export.xsd">
+    <None Include="ZOLLSYSTEM\DAKOSY\KundenExport\VERAG_KundenStamm_Export.xsd">
       <SubType>Designer</SubType>
     </None>
     <None Include="Lizenzen\DynamsoftDotNetTwain.lic" />
@@ -3953,6 +3991,7 @@
     <ProjectReference Include="..\..\..\Parkzeit\Parkzeit\Parkzeit\Parkzeit.vbproj">
       <Project>{e4190547-b222-4ae3-a0be-a44eaee70335}</Project>
       <Name>Parkzeit</Name>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
     </ProjectReference>
     <ProjectReference Include="..\..\RKAesIcm\RKAesIcm.csproj">
       <Project>{4167823d-7cb2-497d-958b-d579d6492e6b}</Project>
@@ -4021,6 +4060,9 @@
     </WebReferenceUrl>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>D:\Andreas\Programmierung\VB\Zertifikate\signtool.exe sign /f D:\Andreas\Programmierung\VB\Zertifikate\Zert_20092019.pfx /p BmWr501956 "SDL.exe"</PostBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb

@@ -301,6 +301,8 @@ Public Class frmNacherfassungNEU
         cboFilialeHandling.changeItem(If(SPEDITIONSBUCH.FilialenNrHandling, ""))
         txtHandlingZuKassieren._value = SPEDITIONSBUCH.HandlingZuKassieren
 
+        cboGrenze.changeItem(If(SPEDITIONSBUCH.Grenzstelle, ""))
+
         lblLastMa.Text = SPEDITIONSBUCH.Sachbearbeiter
         If SPEDITIONSBUCH.AvisoID IsNot Nothing Then avisoLinkId = SPEDITIONSBUCH.AvisoID
 
@@ -322,7 +324,7 @@ Public Class frmNacherfassungNEU
 
                     If .RowCount > 0 Then .Rows.Clear()
                     If (txtAbfertigungsnummer.Text.Trim <> "" AndAlso IsNumeric(txtAbfertigungsnummer.Text) AndAlso txtAbfertigungsnummer.Text > 0) And (cboFiliale._value.Trim <> "" AndAlso IsNumeric(cboFiliale._value) AndAlso cboFiliale._value > 0) Then
-                        .DataSource = SQL.loadDgvBySql("SELECT  rksv_BelegId, rksv_umsatz ,BelegNr,BelegDat,Benutzer,[Name],LKW_Beleg FROM [tblEABelegnummer] INNER JOIN Personal ON ID=Benutzer where ((FilialenNr='" & SPEDITIONSBUCH.FilialenNr & "' and AbfertigungsNr='" & SPEDITIONSBUCH.AbfertigungsNr & "') OR LKW_id='" & If(SPEDITIONSBUCH.AvisoID, -123456) & "') and storniert=0 and gebuchtstorno=0 order by rksv_BelegId", "FMZOLL")
+                        .DataSource = SQL.loadDgvBySql("SELECT  rksv_BelegId, rksv_umsatz ,BelegNr,BelegDat,Benutzer,[Name],LKW_Beleg FROM [tblEABelegnummer] INNER JOIN Personal ON ID=Benutzer where ((FilialenNr='" & SPEDITIONSBUCH.FilialenNr & "' and AbfertigungsNr='" & SPEDITIONSBUCH.AbfertigungsNr & "' and FilialenNr>0 and AbfertigungsNr>0) OR LKW_id='" & If(SPEDITIONSBUCH.AvisoID, -123456) & "') and storniert=0 and gebuchtstorno=0 order by rksv_BelegId", "FMZOLL")
                         'AND UnterNr='" & SPEDITIONSBUCH.UnterNr & "'  --> Unternr gibts ned
                         'MsgBox("SELECT  rksv_BelegId, rksv_umsatz ,BelegNr,BelegDat,Benutzer FROM [tblEABelegnummer]  where AbfertigungsNr='" & txtAbfertigungsnummer.Text & "' and FilialenNr='" & cboFiliale._value & "' and storniert=0 and gebuchtstorno=0 order by rksv_BelegId")
                         .Columns("rksv_BelegId").HeaderText = "Beleg-Id"
@@ -616,6 +618,17 @@ Public Class frmNacherfassungNEU
         cboFiskalSchreiben.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Endempfänger", "ENDEMPF"))
         cboFiskalSchreiben.SelectedIndex = 0
 
+
+        cboGrenze.Items.Clear()
+        cboGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
+        cboGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SUB", "SUB"))
+        cboGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SBG", "SBG"))
+        cboGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("WAI", "WAI"))
+        cboGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NKD", "NKD"))
+        cboGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SUA", "SUA"))
+        cboGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("???", "???"))
+
+
         If avisoLinkId > 0 Then
             Dim SQLAVISO As New VERAG_PROG_ALLGEMEIN.cavisoDAL
             Me.AVISO = SQLAVISO.LesenAviso(avisoLinkId, "")
@@ -944,6 +957,9 @@ Public Class frmNacherfassungNEU
         SPEDITIONSBUCH.FilialenNrHandling = cProgramFunctions.isLeerNothing(cboFilialeHandling._value)
         SPEDITIONSBUCH.HandlingZuKassieren = If(IsNumeric(txtHandlingZuKassieren._value), CDbl(txtHandlingZuKassieren._value), 0)
 
+        SPEDITIONSBUCH.Grenzstelle = cProgramFunctions.isLeerNothing(cboGrenze._value)
+
+
 
         SPEDITIONSBUCH.SB_CMRDatum = Nothing
         If pnlFiskal.Visible Then
@@ -1161,6 +1177,15 @@ Public Class frmNacherfassungNEU
                 btnWeiter.Focus()
             End If
         End If
+
+        Dim FirmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(cboFiliale._value, True, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
+        txtAvisierer._UseFIRMA = FirmaTmp
+        txtAbsender._UseFIRMA = FirmaTmp
+        txtEmpfaenger._UseFIRMA = FirmaTmp
+        txtAuftraggeber._UseFIRMA = FirmaTmp
+        txtFraechter._UseFIRMA = FirmaTmp
+        txtEndEmpf._UseFIRMA = FirmaTmp
+
     End Sub
 
 

SDL/Speditionsbuch/Nacherfassung/rptSpeditionsbericht_HandlingAussenstellen.Designer.vb

@@ -18,15 +18,6 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen
     Private Sub InitializeComponent()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(rptSpeditionsbericht_HandlingAussenstellen))
         Me.PageHeader = New GrapeCity.ActiveReports.SectionReportModel.PageHeader()
-        Me.Label7 = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.Line4 = New GrapeCity.ActiveReports.SectionReportModel.Line()
-        Me.Label6 = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.Label8 = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.Label4 = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.Label5 = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.Line12 = New GrapeCity.ActiveReports.SectionReportModel.Line()
-        Me.Label1 = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.Label2 = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.Detail = New GrapeCity.ActiveReports.SectionReportModel.Detail()
         Me.lblPosNr = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblAbfertigungsart = New GrapeCity.ActiveReports.SectionReportModel.Label()
@@ -56,13 +47,28 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen
         Me.lblSumHandlingsgebuehr = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblSumzuKassierenHandling = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblSumBarzahlungsbetrag = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        CType(Me.Label7, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.Line5 = New GrapeCity.ActiveReports.SectionReportModel.Line()
-        CType(Me.Label6, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.Label12 = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        CType(Me.Label8, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.txtUebersicht = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
-        CType(Me.Label4, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.GroupHeader1 = New GrapeCity.ActiveReports.SectionReportModel.GroupHeader()
-        CType(Me.Label5, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.Label7 = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        CType(Me.Label1, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.Line4 = New GrapeCity.ActiveReports.SectionReportModel.Line()
-        CType(Me.Label2, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.Label6 = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.Label8 = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.Label4 = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.Label5 = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.Line12 = New GrapeCity.ActiveReports.SectionReportModel.Line()
+        Me.Label1 = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.Label2 = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.lblAbfArtUeberschrift = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.GroupFooter1 = New GrapeCity.ActiveReports.SectionReportModel.GroupFooter()
+        Me.Label9 = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.lblGesSumAnzahl = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.Line1 = New GrapeCity.ActiveReports.SectionReportModel.Line()
+        Me.Line3 = New GrapeCity.ActiveReports.SectionReportModel.Line()
+        Me.lblGesHandlingsgebuehr = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.lblGeszuKassierenHandling = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.lblGesBarzahlungsbetrag = New GrapeCity.ActiveReports.SectionReportModel.Label()
         CType(Me.lblPosNr, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblAbfertigungsart, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblAbfDatum, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -84,124 +90,28 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen
         CType(Me.lblSumHandlingsgebuehr, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSumzuKassierenHandling, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSumBarzahlungsbetrag, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.Label12, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.txtUebersicht, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.Label7, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.Label6, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.Label8, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.Label4, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.Label5, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.Label1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.Label2, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.lblAbfArtUeberschrift, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.Label9, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.lblGesSumAnzahl, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.lblGesHandlingsgebuehr, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.lblGeszuKassierenHandling, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.lblGesBarzahlungsbetrag, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me, System.ComponentModel.ISupportInitialize).BeginInit()
         '
         'PageHeader
         '
-        Me.PageHeader.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Label7, Me.Line4, Me.Label6, Me.Label8, Me.Label4, Me.Label5, Me.Line12, Me.Label1, Me.Label2})
+        Me.PageHeader.Height = 0.08698601!
-        Me.PageHeader.Height = 0.2536527!
         Me.PageHeader.Name = "PageHeader"
         '
-        'Label7
-        '
-        Me.Label7.Height = 0.1744094!
-        Me.Label7.HyperLink = Nothing
-        Me.Label7.Left = 1.556693!
-        Me.Label7.Name = "Label7"
-        Me.Label7.Style = "background-color: #003680; color: White; font-size: 8pt; font-weight: bold; text-" &
-    "align: left; vertical-align: middle; ddo-char-set: 1"
-        Me.Label7.Text = "Anz."
-        Me.Label7.Top = 0.03622048!
-        Me.Label7.Width = 0.3149606!
-        '
-        'Line4
-        '
-        Me.Line4.Height = 0!
-        Me.Line4.Left = 0!
-        Me.Line4.LineWeight = 1.0!
-        Me.Line4.Name = "Line4"
-        Me.Line4.Top = 0.2106299!
-        Me.Line4.Width = 7.475195!
-        Me.Line4.X1 = 0!
-        Me.Line4.X2 = 7.475195!
-        Me.Line4.Y1 = 0.2106299!
-        Me.Line4.Y2 = 0.2106299!
-        '
-        'Label6
-        '
-        Me.Label6.Height = 0.1744094!
-        Me.Label6.HyperLink = Nothing
-        Me.Label6.Left = 5.608268!
-        Me.Label6.Name = "Label6"
-        Me.Label6.Style = "background-color: #003680; color: White; font-size: 7pt; font-weight: bold; text-" &
-    "align: right; vertical-align: middle; ddo-char-set: 1"
-        Me.Label6.Text = "Handling"
-        Me.Label6.Top = 0.03622048!
-        Me.Label6.Width = 0.6208658!
-        '
-        'Label8
-        '
-        Me.Label8.Height = 0.1744094!
-        Me.Label8.HyperLink = Nothing
-        Me.Label8.Left = 3.158662!
-        Me.Label8.Name = "Label8"
-        Me.Label8.Style = "background-color: #003680; color: White; font-size: 8pt; font-weight: bold; text-" &
-    "align: left; text-justify: auto; vertical-align: middle; ddo-char-set: 1"
-        Me.Label8.Text = "Empf<EFBFBD>nger"
-        Me.Label8.Top = 0.03622048!
-        Me.Label8.Width = 2.433859!
-        '
-        'Label4
-        '
-        Me.Label4.Height = 0.1744093!
-        Me.Label4.HyperLink = Nothing
-        Me.Label4.Left = 1.829921!
-        Me.Label4.Name = "Label4"
-        Me.Label4.Style = "background-color: #003680; color: White; font-size: 8pt; font-weight: bold; text-" &
-    "align: left; text-justify: auto; vertical-align: middle; ddo-char-set: 1"
-        Me.Label4.Text = "Abfertigungsart"
-        Me.Label4.Top = 0.03622048!
-        Me.Label4.Width = 1.328741!
-        '
-        'Label5
-        '
-        Me.Label5.Height = 0.1744094!
-        Me.Label5.HyperLink = Nothing
-        Me.Label5.Left = 0.01023625!
-        Me.Label5.Name = "Label5"
-        Me.Label5.Style = "background-color: #003680; color: White; font-size: 8pt; font-weight: bold; text-" &
-    "align: left; vertical-align: middle; ddo-char-set: 1"
-        Me.Label5.Text = "Abfertigung"
-        Me.Label5.Top = 0.03622048!
-        Me.Label5.Width = 1.546457!
-        '
-        'Line12
-        '
-        Me.Line12.Height = 0.2035433!
-        Me.Line12.Left = 5.592486!
-        Me.Line12.LineWeight = 2.0!
-        Me.Line12.Name = "Line12"
-        Me.Line12.Top = 0.03622048!
-        Me.Line12.Width = 0.00003433228!
-        Me.Line12.X1 = 5.59252!
-        Me.Line12.X2 = 5.592486!
-        Me.Line12.Y1 = 0.03622048!
-        Me.Line12.Y2 = 0.2397638!
-        '
-        'Label1
-        '
-        Me.Label1.Height = 0.1744094!
-        Me.Label1.HyperLink = Nothing
-        Me.Label1.Left = 6.229134!
-        Me.Label1.Name = "Label1"
-        Me.Label1.Style = "background-color: #003680; color: White; font-size: 7pt; font-weight: bold; text-" &
-    "align: right; vertical-align: middle; ddo-char-set: 1"
-        Me.Label1.Text = "zu kassieren"
-        Me.Label1.Top = 0.03622048!
-        Me.Label1.Width = 0.6208658!
-        '
-        'Label2
-        '
-        Me.Label2.Height = 0.1744094!
-        Me.Label2.HyperLink = Nothing
-        Me.Label2.Left = 6.854331!
-        Me.Label2.Name = "Label2"
-        Me.Label2.Style = "background-color: #003680; color: White; font-size: 7pt; font-weight: bold; text-" &
-    "align: right; vertical-align: middle; ddo-char-set: 1"
-        Me.Label2.Text = "(kassiert)"
-        Me.Label2.Top = 0.03622048!
-        Me.Label2.Width = 0.6208658!
-        '
         'Detail
         '
         Me.Detail.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lblPosNr, Me.lblAbfertigungsart, Me.lblAbfDatum, Me.lblAnzahl, Me.lblEndEmpf, Me.lblEndEmpfKdNr, Me.Line11, Me.lblHandlingsgebuehr, Me.lblzuKassierenHandling, Me.lblBarzahlungsbetrag})
@@ -257,7 +167,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen
         '
         Me.lblEndEmpf.Height = 0.1574804!
         Me.lblEndEmpf.HyperLink = Nothing
-        Me.lblEndEmpf.Left = 3.572049!
+        Me.lblEndEmpf.Left = 3.634646!
         Me.lblEndEmpf.MultiLine = False
         Me.lblEndEmpf.Name = "lblEndEmpf"
         Me.lblEndEmpf.Padding = New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0)
@@ -265,7 +175,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen
     "ar-set: 1"
         Me.lblEndEmpf.Text = "VERAG"
         Me.lblEndEmpf.Top = 0.03149619!
-        Me.lblEndEmpf.Width = 2.020472!
+        Me.lblEndEmpf.Width = 1.957875!
         '
         'lblEndEmpfKdNr
         '
@@ -276,9 +186,9 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen
         Me.lblEndEmpfKdNr.Padding = New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0)
         Me.lblEndEmpfKdNr.Style = "font-size: 8pt; font-weight: normal; text-align: left; text-justify: auto; ddo-ch" &
     "ar-set: 1"
-        Me.lblEndEmpfKdNr.Text = "100000 VERAG"
+        Me.lblEndEmpfKdNr.Text = "1000001 VERAG"
         Me.lblEndEmpfKdNr.Top = 0.03149607!
-        Me.lblEndEmpfKdNr.Width = 0.4133847!
+        Me.lblEndEmpfKdNr.Width = 0.4759839!
         '
         'Line11
         '
@@ -436,8 +346,8 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen
         '
         'ReportFooter1
         '
-        Me.ReportFooter1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Label10, Me.lblGesGesSumAnzahl, Me.Line8, Me.Line9, Me.lblSumHandlingsgebuehr, Me.lblSumzuKassierenHandling, Me.lblSumBarzahlungsbetrag})
+        Me.ReportFooter1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Label10, Me.lblGesGesSumAnzahl, Me.Line8, Me.Line9, Me.lblSumHandlingsgebuehr, Me.lblSumzuKassierenHandling, Me.lblSumBarzahlungsbetrag, Me.Line5, Me.Label12, Me.txtUebersicht})
-        Me.ReportFooter1.Height = 0.2433071!
+        Me.ReportFooter1.Height = 0.838189!
         Me.ReportFooter1.KeepTogether = True
         Me.ReportFooter1.Name = "ReportFooter1"
         '
@@ -449,45 +359,45 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen
         Me.Label10.Name = "Label10"
         Me.Label10.Style = "font-size: 7pt; font-weight: bold; text-align: left; ddo-char-set: 1"
         Me.Label10.Text = " Abfertigungen"
-        Me.Label10.Top = 0.08582678!
+        Me.Label10.Top = 0.2110237!
         Me.Label10.Width = 0.8287402!
         '
         'lblGesGesSumAnzahl
         '
         Me.lblGesGesSumAnzahl.Height = 0.1574803!
         Me.lblGesGesSumAnzahl.HyperLink = Nothing
-        Me.lblGesGesSumAnzahl.Left = 0.003937038!
+        Me.lblGesGesSumAnzahl.Left = 0.003937068!
         Me.lblGesGesSumAnzahl.Name = "lblGesGesSumAnzahl"
         Me.lblGesGesSumAnzahl.Style = "font-size: 7pt; font-weight: bold; text-align: right; ddo-char-set: 1"
         Me.lblGesGesSumAnzahl.Text = "0000"
-        Me.lblGesGesSumAnzahl.Top = 0.08582678!
+        Me.lblGesGesSumAnzahl.Top = 0.2110237!
         Me.lblGesGesSumAnzahl.Width = 0.3606307!
         '
         'Line8
         '
         Me.Line8.Height = 0!
-        Me.Line8.Left = 0.0039363!
+        Me.Line8.Left = 0.00393633!
         Me.Line8.LineWeight = 2.0!
         Me.Line8.Name = "Line8"
-        Me.Line8.Top = 0.03628609!
+        Me.Line8.Top = 0.161483!
         Me.Line8.Width = 7.475195!
-        Me.Line8.X1 = 0.0039363!
+        Me.Line8.X1 = 0.00393633!
         Me.Line8.X2 = 7.479131!
-        Me.Line8.Y1 = 0.03628609!
+        Me.Line8.Y1 = 0.161483!
-        Me.Line8.Y2 = 0.03628609!
+        Me.Line8.Y2 = 0.161483!
         '
         'Line9
         '
         Me.Line9.Height = 0!
-        Me.Line9.Left = 0.002755197!
+        Me.Line9.Left = 0.002755227!
         Me.Line9.LineWeight = 2.0!
         Me.Line9.Name = "Line9"
-        Me.Line9.Top = 0.00006568432!
+        Me.Line9.Top = 0.1252626!
         Me.Line9.Width = 7.475194!
-        Me.Line9.X1 = 0.002755197!
+        Me.Line9.X1 = 0.002755227!
         Me.Line9.X2 = 7.477949!
-        Me.Line9.Y1 = 0.00006568432!
+        Me.Line9.Y1 = 0.1252626!
-        Me.Line9.Y2 = 0.00006568432!
+        Me.Line9.Y2 = 0.1252626!
         '
         'lblSumHandlingsgebuehr
         '
@@ -499,7 +409,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen
         Me.lblSumHandlingsgebuehr.Style = "font-size: 8pt; font-weight: normal; text-align: right; text-justify: auto; ddo-c" &
     "har-set: 1"
         Me.lblSumHandlingsgebuehr.Text = "1.000,00"
-        Me.lblSumHandlingsgebuehr.Top = 0.08582678!
+        Me.lblSumHandlingsgebuehr.Top = 0.2110237!
         Me.lblSumHandlingsgebuehr.Width = 0.6208655!
         '
         'lblSumzuKassierenHandling
@@ -512,7 +422,7 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen
         Me.lblSumzuKassierenHandling.Style = "font-size: 8pt; font-weight: normal; text-align: right; text-justify: auto; ddo-c" &
     "har-set: 1"
         Me.lblSumzuKassierenHandling.Text = "1.000,00"
-        Me.lblSumzuKassierenHandling.Top = 0.08582678!
+        Me.lblSumzuKassierenHandling.Top = 0.2110237!
         Me.lblSumzuKassierenHandling.Width = 0.6208655!
         '
         'lblSumBarzahlungsbetrag
@@ -525,9 +435,264 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen
         Me.lblSumBarzahlungsbetrag.Style = "font-size: 8pt; font-weight: normal; text-align: right; text-justify: auto; ddo-c" &
     "har-set: 1"
         Me.lblSumBarzahlungsbetrag.Text = "1.000,00"
-        Me.lblSumBarzahlungsbetrag.Top = 0.08582678!
+        Me.lblSumBarzahlungsbetrag.Top = 0.2110237!
         Me.lblSumBarzahlungsbetrag.Width = 0.6208655!
         '
+        'Line5
+        '
+        Me.Line5.Height = 0!
+        Me.Line5.Left = 0.001968504!
+        Me.Line5.LineWeight = 2.0!
+        Me.Line5.Name = "Line5"
+        Me.Line5.Top = 0.1251969!
+        Me.Line5.Width = 7.475195!
+        Me.Line5.X1 = 0.001968504!
+        Me.Line5.X2 = 7.477164!
+        Me.Line5.Y1 = 0.1251969!
+        Me.Line5.Y2 = 0.1251969!
+        '
+        'Label12
+        '
+        Me.Label12.Height = 0.1574803!
+        Me.Label12.HyperLink = Nothing
+        Me.Label12.Left = 0!
+        Me.Label12.Name = "Label12"
+        Me.Label12.Style = "font-size: 7pt; font-weight: bold; text-align: left; text-decoration: underline; " &
+    "ddo-char-set: 1"
+        Me.Label12.Text = "<EFBFBD>bersicht:"
+        Me.Label12.Top = 0.4807087!
+        Me.Label12.Width = 0.8287402!
+        '
+        'txtUebersicht
+        '
+        Me.txtUebersicht.Height = 0.2!
+        Me.txtUebersicht.Left = 0!
+        Me.txtUebersicht.Name = "txtUebersicht"
+        Me.txtUebersicht.Style = "font-family: Microsoft Sans Serif; font-size: 8.25pt; ddo-char-set: 1"
+        Me.txtUebersicht.Text = Nothing
+        Me.txtUebersicht.Top = 0.638189!
+        Me.txtUebersicht.Width = 3.75!
+        '
+        'GroupHeader1
+        '
+        Me.GroupHeader1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Label7, Me.Line4, Me.Label6, Me.Label8, Me.Label4, Me.Label5, Me.Line12, Me.Label1, Me.Label2, Me.lblAbfArtUeberschrift})
+        Me.GroupHeader1.Height = 0.5973535!
+        Me.GroupHeader1.Name = "GroupHeader1"
+        '
+        'Label7
+        '
+        Me.Label7.Height = 0.1744094!
+        Me.Label7.HyperLink = Nothing
+        Me.Label7.Left = 1.559449!
+        Me.Label7.Name = "Label7"
+        Me.Label7.Style = "background-color: #003680; color: White; font-size: 8pt; font-weight: bold; text-" &
+    "align: left; vertical-align: middle; ddo-char-set: 1"
+        Me.Label7.Text = "Anz."
+        Me.Label7.Top = 0.3799213!
+        Me.Label7.Width = 0.3149606!
+        '
+        'Line4
+        '
+        Me.Line4.Height = 0!
+        Me.Line4.Left = 0.002755877!
+        Me.Line4.LineWeight = 1.0!
+        Me.Line4.Name = "Line4"
+        Me.Line4.Top = 0.5543307!
+        Me.Line4.Width = 7.475194!
+        Me.Line4.X1 = 0.002755877!
+        Me.Line4.X2 = 7.47795!
+        Me.Line4.Y1 = 0.5543307!
+        Me.Line4.Y2 = 0.5543307!
+        '
+        'Label6
+        '
+        Me.Label6.Height = 0.1744094!
+        Me.Label6.HyperLink = Nothing
+        Me.Label6.Left = 5.611023!
+        Me.Label6.Name = "Label6"
+        Me.Label6.Style = "background-color: #003680; color: White; font-size: 7pt; font-weight: bold; text-" &
+    "align: right; vertical-align: middle; ddo-char-set: 1"
+        Me.Label6.Text = "Handling"
+        Me.Label6.Top = 0.3799213!
+        Me.Label6.Width = 0.6208658!
+        '
+        'Label8
+        '
+        Me.Label8.Height = 0.1744094!
+        Me.Label8.HyperLink = Nothing
+        Me.Label8.Left = 3.161418!
+        Me.Label8.Name = "Label8"
+        Me.Label8.Style = "background-color: #003680; color: White; font-size: 8pt; font-weight: bold; text-" &
+    "align: left; text-justify: auto; vertical-align: middle; ddo-char-set: 1"
+        Me.Label8.Text = "Empf<EFBFBD>nger"
+        Me.Label8.Top = 0.3799213!
+        Me.Label8.Width = 2.433859!
+        '
+        'Label4
+        '
+        Me.Label4.Height = 0.1744093!
+        Me.Label4.HyperLink = Nothing
+        Me.Label4.Left = 1.832677!
+        Me.Label4.Name = "Label4"
+        Me.Label4.Style = "background-color: #003680; color: White; font-size: 8pt; font-weight: bold; text-" &
+    "align: left; text-justify: auto; vertical-align: middle; ddo-char-set: 1"
+        Me.Label4.Text = "Abfertigungsart"
+        Me.Label4.Top = 0.3799213!
+        Me.Label4.Width = 1.328741!
+        '
+        'Label5
+        '
+        Me.Label5.Height = 0.1744094!
+        Me.Label5.HyperLink = Nothing
+        Me.Label5.Left = 0.01299213!
+        Me.Label5.Name = "Label5"
+        Me.Label5.Style = "background-color: #003680; color: White; font-size: 8pt; font-weight: bold; text-" &
+    "align: left; vertical-align: middle; ddo-char-set: 1"
+        Me.Label5.Text = "Abfertigung"
+        Me.Label5.Top = 0.3799213!
+        Me.Label5.Width = 1.546457!
+        '
+        'Line12
+        '
+        Me.Line12.Height = 0.2035433!
+        Me.Line12.Left = 5.595242!
+        Me.Line12.LineWeight = 2.0!
+        Me.Line12.Name = "Line12"
+        Me.Line12.Top = 0.3799213!
+        Me.Line12.Width = 0.00003385544!
+        Me.Line12.X1 = 5.595276!
+        Me.Line12.X2 = 5.595242!
+        Me.Line12.Y1 = 0.3799213!
+        Me.Line12.Y2 = 0.5834646!
+        '
+        'Label1
+        '
+        Me.Label1.Height = 0.1744094!
+        Me.Label1.HyperLink = Nothing
+        Me.Label1.Left = 6.23189!
+        Me.Label1.Name = "Label1"
+        Me.Label1.Style = "background-color: #003680; color: White; font-size: 7pt; font-weight: bold; text-" &
+    "align: right; vertical-align: middle; ddo-char-set: 1"
+        Me.Label1.Text = "zu kassieren"
+        Me.Label1.Top = 0.3799213!
+        Me.Label1.Width = 0.6208658!
+        '
+        'Label2
+        '
+        Me.Label2.Height = 0.1744094!
+        Me.Label2.HyperLink = Nothing
+        Me.Label2.Left = 6.857087!
+        Me.Label2.Name = "Label2"
+        Me.Label2.Style = "background-color: #003680; color: White; font-size: 7pt; font-weight: bold; text-" &
+    "align: right; vertical-align: middle; ddo-char-set: 1"
+        Me.Label2.Text = "(kassiert)"
+        Me.Label2.Top = 0.3799213!
+        Me.Label2.Width = 0.6208658!
+        '
+        'lblAbfArtUeberschrift
+        '
+        Me.lblAbfArtUeberschrift.Height = 0.2161417!
+        Me.lblAbfArtUeberschrift.HyperLink = Nothing
+        Me.lblAbfArtUeberschrift.Left = 0!
+        Me.lblAbfArtUeberschrift.Name = "lblAbfArtUeberschrift"
+        Me.lblAbfArtUeberschrift.Style = "background-color: DimGray; color: White; font-size: 10pt; font-weight: bold; text" &
+    "-align: left; vertical-align: middle; ddo-char-set: 1"
+        Me.lblAbfArtUeberschrift.Text = "1 - ZA"
+        Me.lblAbfArtUeberschrift.Top = 0.1519685!
+        Me.lblAbfArtUeberschrift.Width = 7.480316!
+        '
+        'GroupFooter1
+        '
+        Me.GroupFooter1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Label9, Me.lblGesSumAnzahl, Me.Line1, Me.Line3, Me.lblGesHandlingsgebuehr, Me.lblGeszuKassierenHandling, Me.lblGesBarzahlungsbetrag})
+        Me.GroupFooter1.Name = "GroupFooter1"
+        '
+        'Label9
+        '
+        Me.Label9.Height = 0.1574803!
+        Me.Label9.HyperLink = Nothing
+        Me.Label9.Left = 0.3610249!
+        Me.Label9.Name = "Label9"
+        Me.Label9.Style = "font-size: 7pt; font-weight: bold; text-align: left; ddo-char-set: 1"
+        Me.Label9.Text = " Abfertigungen"
+        Me.Label9.Top = 0.08914042!
+        Me.Label9.Width = 0.8287402!
+        '
+        'lblGesSumAnzahl
+        '
+        Me.lblGesSumAnzahl.Height = 0.1574803!
+        Me.lblGesSumAnzahl.HyperLink = Nothing
+        Me.lblGesSumAnzahl.Left = 0.00315094!
+        Me.lblGesSumAnzahl.Name = "lblGesSumAnzahl"
+        Me.lblGesSumAnzahl.Style = "font-size: 7pt; font-weight: bold; text-align: right; ddo-char-set: 1"
+        Me.lblGesSumAnzahl.Text = "0000"
+        Me.lblGesSumAnzahl.Top = 0.08914042!
+        Me.lblGesSumAnzahl.Width = 0.3606307!
+        '
+        'Line1
+        '
+        Me.Line1.Height = 0!
+        Me.Line1.Left = 0.003150202!
+        Me.Line1.LineWeight = 2.0!
+        Me.Line1.Name = "Line1"
+        Me.Line1.Top = 0.03959971!
+        Me.Line1.Width = 7.475196!
+        Me.Line1.X1 = 0.003150202!
+        Me.Line1.X2 = 7.478346!
+        Me.Line1.Y1 = 0.03959971!
+        Me.Line1.Y2 = 0.03959971!
+        '
+        'Line3
+        '
+        Me.Line3.Height = 0!
+        Me.Line3.Left = 0.001969099!
+        Me.Line3.LineWeight = 2.0!
+        Me.Line3.Name = "Line3"
+        Me.Line3.Top = 0.0033793!
+        Me.Line3.Width = 7.475196!
+        Me.Line3.X1 = 0.001969099!
+        Me.Line3.X2 = 7.477165!
+        Me.Line3.Y1 = 0.0033793!
+        Me.Line3.Y2 = 0.0033793!
+        '
+        'lblGesHandlingsgebuehr
+        '
+        Me.lblGesHandlingsgebuehr.Height = 0.1574803!
+        Me.lblGesHandlingsgebuehr.HyperLink = Nothing
+        Me.lblGesHandlingsgebuehr.Left = 5.607481!
+        Me.lblGesHandlingsgebuehr.Name = "lblGesHandlingsgebuehr"
+        Me.lblGesHandlingsgebuehr.Padding = New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0)
+        Me.lblGesHandlingsgebuehr.Style = "font-size: 8pt; font-weight: normal; text-align: right; text-justify: auto; ddo-c" &
+    "har-set: 1"
+        Me.lblGesHandlingsgebuehr.Text = "1.000,00"
+        Me.lblGesHandlingsgebuehr.Top = 0.08914042!
+        Me.lblGesHandlingsgebuehr.Width = 0.6208655!
+        '
+        'lblGeszuKassierenHandling
+        '
+        Me.lblGeszuKassierenHandling.Height = 0.1574803!
+        Me.lblGeszuKassierenHandling.HyperLink = Nothing
+        Me.lblGeszuKassierenHandling.Left = 6.228348!
+        Me.lblGeszuKassierenHandling.Name = "lblGeszuKassierenHandling"
+        Me.lblGeszuKassierenHandling.Padding = New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0)
+        Me.lblGeszuKassierenHandling.Style = "font-size: 8pt; font-weight: normal; text-align: right; text-justify: auto; ddo-c" &
+    "har-set: 1"
+        Me.lblGeszuKassierenHandling.Text = "1.000,00"
+        Me.lblGeszuKassierenHandling.Top = 0.08914042!
+        Me.lblGeszuKassierenHandling.Width = 0.6208655!
+        '
+        'lblGesBarzahlungsbetrag
+        '
+        Me.lblGesBarzahlungsbetrag.Height = 0.1574803!
+        Me.lblGesBarzahlungsbetrag.HyperLink = Nothing
+        Me.lblGesBarzahlungsbetrag.Left = 6.853545!
+        Me.lblGesBarzahlungsbetrag.Name = "lblGesBarzahlungsbetrag"
+        Me.lblGesBarzahlungsbetrag.Padding = New GrapeCity.ActiveReports.PaddingEx(1, 0, 0, 0)
+        Me.lblGesBarzahlungsbetrag.Style = "font-size: 8pt; font-weight: normal; text-align: right; text-justify: auto; ddo-c" &
+    "har-set: 1"
+        Me.lblGesBarzahlungsbetrag.Text = "1.000,00"
+        Me.lblGesBarzahlungsbetrag.Top = 0.08914042!
+        Me.lblGesBarzahlungsbetrag.Width = 0.6208655!
+        '
         'rptSpeditionsbericht_HandlingAussenstellen
         '
         Me.MasterReport = False
@@ -540,7 +705,9 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen
         Me.PrintWidth = 7.480315!
         Me.Sections.Add(Me.ReportHeader1)
         Me.Sections.Add(Me.PageHeader)
+        Me.Sections.Add(Me.GroupHeader1)
         Me.Sections.Add(Me.Detail)
+        Me.Sections.Add(Me.GroupFooter1)
         Me.Sections.Add(Me.PageFooter)
         Me.Sections.Add(Me.ReportFooter1)
         Me.StyleSheet.Add(New DDCssLib.StyleSheetRule("font-family: Arial; font-style: normal; text-decoration: none; font-weight: norma" &
@@ -549,13 +716,6 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen
         Me.StyleSheet.Add(New DDCssLib.StyleSheetRule("font-family: Times New Roman; font-size: 14pt; font-weight: bold; font-style: ita" &
             "lic", "Heading2", "Normal"))
         Me.StyleSheet.Add(New DDCssLib.StyleSheetRule("font-size: 13pt; font-weight: bold", "Heading3", "Normal"))
-        CType(Me.Label7, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.Label6, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.Label8, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.Label4, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.Label5, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.Label1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.Label2, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblPosNr, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblAbfertigungsart, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblAbfDatum, System.ComponentModel.ISupportInitialize).EndInit()
@@ -577,6 +737,21 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen
         CType(Me.lblSumHandlingsgebuehr, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblSumzuKassierenHandling, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblSumBarzahlungsbetrag, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.Label12, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.txtUebersicht, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.Label7, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.Label6, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.Label8, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.Label4, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.Label5, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.Label1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.Label2, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.lblAbfArtUeberschrift, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.Label9, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.lblGesSumAnzahl, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.lblGesHandlingsgebuehr, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.lblGeszuKassierenHandling, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.lblGesBarzahlungsbetrag, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me, System.ComponentModel.ISupportInitialize).EndInit()
 
     End Sub
@@ -598,19 +773,11 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen
     Private WithEvents Line9 As GrapeCity.ActiveReports.SectionReportModel.Line
     Public WithEvents ReportFooter1 As GrapeCity.ActiveReports.SectionReportModel.ReportFooter
     Public WithEvents lblGesGesSumAnzahl As GrapeCity.ActiveReports.SectionReportModel.Label
-    Private WithEvents Line4 As GrapeCity.ActiveReports.SectionReportModel.Line
-    Private WithEvents Label6 As GrapeCity.ActiveReports.SectionReportModel.Label
-    Private WithEvents Label8 As GrapeCity.ActiveReports.SectionReportModel.Label
-    Private WithEvents Label4 As GrapeCity.ActiveReports.SectionReportModel.Label
-    Private WithEvents Label5 As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents picVERAG As GrapeCity.ActiveReports.SectionReportModel.Picture
     Private WithEvents Line11 As GrapeCity.ActiveReports.SectionReportModel.Line
     Private WithEvents Line As GrapeCity.ActiveReports.SectionReportModel.Line
-    Private WithEvents Line12 As GrapeCity.ActiveReports.SectionReportModel.Line
     Public WithEvents lblEndEmpf As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblEndEmpfKdNr As GrapeCity.ActiveReports.SectionReportModel.Label
-    Private WithEvents Label1 As GrapeCity.ActiveReports.SectionReportModel.Label
-    Private WithEvents Label2 As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblBarzahlungsbetrag As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblSumHandlingsgebuehr As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblSumzuKassierenHandling As GrapeCity.ActiveReports.SectionReportModel.Label
@@ -618,4 +785,25 @@ Partial Public Class rptSpeditionsbericht_HandlingAussenstellen
     Public WithEvents lblzuKassierenHandling As GrapeCity.ActiveReports.SectionReportModel.Label
     Public WithEvents lblSumBarzahlungsbetrag As GrapeCity.ActiveReports.SectionReportModel.Label
     Private WithEvents Label7 As GrapeCity.ActiveReports.SectionReportModel.Label
+    Private WithEvents Line4 As GrapeCity.ActiveReports.SectionReportModel.Line
+    Private WithEvents Label6 As GrapeCity.ActiveReports.SectionReportModel.Label
+    Private WithEvents Label8 As GrapeCity.ActiveReports.SectionReportModel.Label
+    Private WithEvents Label4 As GrapeCity.ActiveReports.SectionReportModel.Label
+    Private WithEvents Label5 As GrapeCity.ActiveReports.SectionReportModel.Label
+    Private WithEvents Line12 As GrapeCity.ActiveReports.SectionReportModel.Line
+    Private WithEvents Label1 As GrapeCity.ActiveReports.SectionReportModel.Label
+    Private WithEvents Label2 As GrapeCity.ActiveReports.SectionReportModel.Label
+    Public WithEvents lblAbfArtUeberschrift As GrapeCity.ActiveReports.SectionReportModel.Label
+    Public WithEvents GroupHeader1 As GrapeCity.ActiveReports.SectionReportModel.GroupHeader
+    Public WithEvents GroupFooter1 As GrapeCity.ActiveReports.SectionReportModel.GroupFooter
+    Private WithEvents Line5 As GrapeCity.ActiveReports.SectionReportModel.Line
+    Private WithEvents Line1 As GrapeCity.ActiveReports.SectionReportModel.Line
+    Private WithEvents Line3 As GrapeCity.ActiveReports.SectionReportModel.Line
+    Public WithEvents Label9 As GrapeCity.ActiveReports.SectionReportModel.Label
+    Public WithEvents lblGesSumAnzahl As GrapeCity.ActiveReports.SectionReportModel.Label
+    Public WithEvents lblGesHandlingsgebuehr As GrapeCity.ActiveReports.SectionReportModel.Label
+    Public WithEvents lblGeszuKassierenHandling As GrapeCity.ActiveReports.SectionReportModel.Label
+    Public WithEvents lblGesBarzahlungsbetrag As GrapeCity.ActiveReports.SectionReportModel.Label
+    Private WithEvents Label12 As GrapeCity.ActiveReports.SectionReportModel.Label
+    Public WithEvents txtUebersicht As GrapeCity.ActiveReports.SectionReportModel.TextBox
 End Class

SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb

@@ -345,13 +345,20 @@ Public Class usrCntlSpeditionsBuchSuche
         kdtxtAuftraggeber.initKdBox(Me.FindForm, txtAuftraggeberKdnr) 'initKdAuftraggeber()
         kdtxtFrachtfuehrer.initKdBox(Me.FindForm, txtFrachtfuehrerKdnr) 'initKdFrachtfuehrer()
         kdtxtEndempfaenger.initKdBox(Me.FindForm, txtEndempfaengerKdnr) 'initKdEndempfaenger()
+        kdtxtAvisierer.initKdBox(Me.FindForm, txtAvisiererKdNr) 'initKdEndempfaenger()
 
 
+        Dim FirmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Then
+            FirmaTmp = "VERAGIMEX"
+        End If
+
         Dim sbWhere = ""
 
-        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+        Select Case FirmaTmp
             Case "ATILLA" : sbWhere = " AND Niederlassung = 'SUA' "
             Case "IMEX" : sbWhere = " AND Mandant = 'IMEX' "
+            Case "VERAGIMEX" : sbWhere = " "
             Case Else
                 sbWhere = " AND Mandant <> 'IMEX' "
 
@@ -364,7 +371,7 @@ Public Class usrCntlSpeditionsBuchSuche
 
         cboHandlingssatz.fillWithSQL("SELECT [hs_Bezeichnung]   FROM [tblHandlingssaetzeIntern] group by [hs_Bezeichnung] ", False, "FMZOLL", True)
 
-        If VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE <> "" And Not VERAG_PROG_ALLGEMEIN.cAllgemein.isCLUSTER Then
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE <> "" And Not VERAG_PROG_ALLGEMEIN.cAllgemein.isCLUSTER And FirmaTmp <> "VERAGIMEX" Then
             If VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER = "FRONTOFFICE" Then
                 Dim whereCluster = ""
                 If VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER = "FRONTOFFICE" Then whereCluster = ",'5801'"
@@ -420,6 +427,7 @@ Public Class usrCntlSpeditionsBuchSuche
         lstGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("WAI", "WAI"))
         lstGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NKD", "NKD"))
         lstGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SUA", "SUA"))
+        lstGrenze.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("???", "???"))
 
 
 
@@ -1403,7 +1411,7 @@ Public Class usrCntlSpeditionsBuchSuche
             sqlstr &= " WHERE 1=1 "
             sqlstr &= getSpedBuchWhere()
             '    sqlstr &= " order by FilialenNr, AvisoId,Speditionsbuch.Abfertigungsart,Abfertigungsdatum"
-            sqlstr &= " order by FilialenNr, Speditionsbuch.Abfertigungsart,Abfertigungsdatum"
+            sqlstr &= " order by  Speditionsbuch.Abfertigungsart,FilialenNr,Abfertigungsdatum"
 
             Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL", , getSpedbuchList())
 
@@ -1421,6 +1429,9 @@ Public Class usrCntlSpeditionsBuchSuche
             rpt.DataSource = dt
 
 
+            If CheckBox1.Checked Then
+                rpt.GroupHeader1.DataField = "Abfertigungsart" 'Gruppierung
+            End If
 
             If rpt.DataSource.rows.count = 0 Then
                 rpt.Dispose() : print.Dispose()
@@ -1454,16 +1465,24 @@ Public Class usrCntlSpeditionsBuchSuche
             'Dim gesSumAnzLKW As Double = 0
             'Dim gesgesSumAnzLKW As Double = 0
 
+
+            Dim gesAnz As Double = 0
+            Dim gesBar As Double = 0
+            Dim geshandling As Double = 0
+            Dim geszukassBAR As Double = 0
+
             Dim sumAnz As Double = 0
             Dim sumBar As Double = 0
             Dim sumhandling As Double = 0
             Dim sumzukassBAR As Double = 0
 
+
+
             Dim sumAbfBez = ""
             Dim gesFilBez = ""
 
             '   Dim gesgesAbfBez = ""
-
+            Dim SumText = ""
             AddHandler rpt.Detail.Format, Sub()
                                               ' rpt.lblVon.Text = CDate(rpt.Fields.Item("von").Value).ToShortDateString
                                               ' rpt.lblLKWNr.Text = CDate(rpt.Fields.Item("bis").Value).ToShortDateString
@@ -1506,15 +1525,42 @@ Public Class usrCntlSpeditionsBuchSuche
                                               sumhandling += handling
                                               sumzukassBAR += zukassBAR
 
+                                              gesAnz += anz
+                                              gesBar += bar
+                                              geshandling += handling
+                                              geszukassBAR += zukassBAR
+
                                           End Sub
 
+            Dim bezeichnung = ""
             AddHandler rpt.ReportFooter1.Format, Sub()
                                                      rpt.lblGesGesSumAnzahl.Text = sumAnz.ToString("N0")
                                                      rpt.lblSumBarzahlungsbetrag.Text = sumBar.ToString("N2")
                                                      rpt.lblSumzuKassierenHandling.Text = sumzukassBAR.ToString("N2")
                                                      rpt.lblSumHandlingsgebuehr.Text = sumhandling.ToString("N2")
 
+                                                     rpt.txtUebersicht.Text = SumText
+
                                                  End Sub
+            AddHandler rpt.GroupHeader1.Format, Sub()
+
+                                                    rpt.lblAbfArtUeberschrift.Text = checkNull(rpt.Fields.Item("Abfertigungsart").Value) & " - " & checkNull(rpt.Fields.Item("Abfertigungsbezeichnung").Value)
+                                                    bezeichnung = rpt.lblAbfArtUeberschrift.Text
+
+                                                    gesAnz = 0
+                                                    gesBar = 0
+                                                    geshandling = 0
+                                                    geszukassBAR = 0
+
+                                                End Sub
+            AddHandler rpt.GroupFooter1.Format, Sub()
+                                                    rpt.lblGesSumAnzahl.Text = gesAnz.ToString("N0")
+                                                    rpt.lblGesBarzahlungsbetrag.Text = gesBar.ToString("N2")
+                                                    rpt.lblGeszuKassierenHandling.Text = geszukassBAR.ToString("N2")
+                                                    rpt.lblGesHandlingsgebuehr.Text = geshandling.ToString("N2")
+                                                    SumText &= gesAnz.ToString("N0") & vbTab & bezeichnung & vbNewLine
+
+                                                End Sub
             If showDok Then
                 print.Viewer.LoadDocument(rpt)
                 print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous

SDL/ZOLLSYSTEM/DAKOSY/ATLAS/AES/usrCntlATLAS_AES.vb

@@ -120,7 +120,7 @@ Public Class usrCntlATLAS_AES
         'Soloagne bis die Bezugsnummer noch nicht existiert
         While DAKOSY_Worker.cDakosy_Zollanmeldungen.ExistsBezugsNr(BezugsNr) 'IsNot Nothing
             BezugsNr = SENDUNG.FilialenNr & "/" & SENDUNG.AbfertigungsNr & "/" & zusatz
-              If zusatz.Length = 1 Then
+            If zusatz.Length = 1 Then
                 zusatz = Chr(Asc(zusatz.ToString) + 1)
             Else
                 zusatz = zusatz.Substring(0, 1) & Chr(Asc(zusatz.Substring(0, 2).ToString) + 1)

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

@@ -421,7 +421,72 @@ Public Class usrCntlATLAS_EZA
             End If
 
             If SENDUNG IsNot Nothing Then
-                EZA.eza_GesamtRohmasse = SENDUNG.tblSnd_Gewicht
+                Dim Vorsystem = False
+                If (SENDUNG.VORSYSTEM IsNot Nothing) AndAlso MsgBox("Möchten Sie die Daten aus dem Vorsystem laden?", vbYesNoCancel) Then
+                    Try
+                        Dim SH As New VERAG_PROG_ALLGEMEIN.cVERAG_in_eza_FULL(CInt(SENDUNG.VORSYSTEM_Id))
+                        If SH IsNot Nothing Then
+
+                            EZA.eza_GesamtRohmasse = SH.EZA.TotGrossWeight
+                            If If(SH.EZA.Incoterm, "") <> "" Then EZA.eza_LieferbedingungCode = SH.EZA.Incoterm
+                            'EZA.pack= SH.EZA.TotPackage
+                            'EZA.eza_Rechnungspreis = SH.EZA.TotGrossWeight
+                            'EZA.eza_Rechnungswaehrung = SENDUNG.tblSnd_WarenwertWaehrung
+                           ' If If(SH.EZA.TransportModeBorder, "") <> "" Then EZA.eza_BeförderungsmittelGrenzeArt = SH.EZA.TransportModeBorder
+                            'If If(SH.EZA.TransportBorderType, "") <> "" Then EZA.bef = SH.EZA.TransportBorderType
+
+                            For Each SH_POS In SH.EZA.POSITIONS
+                                Dim EZA_POS As New DAKOSY_Worker.cDakosy_EZA_Warenposition
+                                EZA_POS.ezaWP_PackstueckAnzahl = SH_POS.NumberOfPackages
+                                EZA_POS.ezaWP_Rohmasse = SH_POS.GrossWeight
+                                EZA_POS.ezaWP_Eigenmasse = SH_POS.NetWeight
+                                EZA_POS.ezaWP_Warenbezeichnung = SH_POS.GoodsDescription
+                                EZA_POS.ezaWP_WarennummerEZT = SH_POS.GoodsTariff
+
+                                EZA_POS.ezaWP_UrsprungslandCode = SH_POS.OriginCountryCode
+                                If If(SH_POS.KindOfPackages, "") <> "" Then EZA_POS.ezaWP_PackstueckArt = SH_POS.KindOfPackages
+
+                                If SH_POS.ItemInvoiceAmount IsNot Nothing Then
+                                    EZA_POS.ezaWP_Artikelpreis = SH_POS.ItemInvoiceAmount
+                                    EZA_POS.ezaWP_AHStatWert = SH_POS.ItemInvoiceAmount
+                                Else
+
+                                End If
+
+
+                                EZA.eza_WARENPOS.Add(EZA_POS)
+                            Next
+
+                            For Each SH_AD In SH.EZA.ADDRESS
+                                Dim EZA_AD As New DAKOSY_Worker.cDakosy_EZA_Adressen
+                                EZA_AD.ezaAd_AdressTyp = SH_AD.AddressCode
+                                EZA_AD.ezaAd_LandCode = SH_AD.CountryCode
+
+                                EZA_AD.ezaAd_TeilnehmerEORI = SH_AD.EORI
+                                EZA_AD.ezaAd_TeilnehmerNLNR = SH_AD.NLNR
+                                EZA_AD.ezaAd_NameFirma1 = SH_AD.Name1
+                                EZA_AD.ezaAd_NameFirma2 = SH_AD.Name2
+                                EZA_AD.ezaAd_NameFirma3 = SH_AD.Name3
+                                EZA_AD.ezaAd_StrasseHausNr1 = SH_AD.Street1
+                                EZA_AD.ezaAd_StrasseHausNr2 = SH_AD.Street2
+                                EZA_AD.ezaAd_Ort = SH_AD.City
+                                EZA_AD.ezaAd_PLZ = SH_AD.PostalCode
+                                EZA_AD.ezaAd_UStIDAnmelder = SH_AD.UStID
+
+                                EZA.eza_ADRESSEN.Add(EZA_AD)
+                            Next
+
+                            Vorsystem = True
+                        End If
+
+                    Catch ex As Exception
+                        MsgBox(ex.Message & ex.StackTrace)
+                    End Try
+                End If
+
+                If Not Vorsystem Then
+
+                    EZA.eza_GesamtRohmasse = SENDUNG.tblSnd_Gewicht
                 EZA.eza_Rechnungspreis = SENDUNG.tblSnd_Warenwert
                 EZA.eza_Rechnungswaehrung = SENDUNG.tblSnd_WarenwertWaehrung
 
@@ -482,6 +547,7 @@ Public Class usrCntlATLAS_EZA
 
                     End If
 
+                    End If
 
                 End If
             End If