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

SDL/Classes/cGenWord.vb

@@ -156,10 +156,16 @@ Public Class cGenWord
 
 
 
-    Public Function genUebernahmebestaetigungKuvert(dt As DataTable, kdNr As Integer, sachbearbeiter As String, autodruck As Boolean, Optional PrinterName As String = "", Optional AuftragsNr As Integer = 0, Optional ByRef pfadWord As String = "", Optional visible As Boolean = True) As Microsoft.Office.Interop.Word.Document
+    Public Function genUebernahmebestaetigungKuvert(dt As DataTable, kdNr As Integer, sachbearbeiter As String, autodruck As Boolean, Optional PrinterName As String = "", Optional AuftragsNr As Integer = 0, Optional ByRef pfadWord As String = "", Optional visible As Boolean = True, Optional sprache As String = "") As Microsoft.Office.Interop.Word.Document
         Dim odoc As Microsoft.Office.Interop.Word.Document = Nothing
         Try
-            pfadWord = AppDomain.CurrentDomain.BaseDirectory & "Resources\MDM_Schreiben\Uebernahmebestätigung\ÜBERNAHMEBESTÄTIGUNG_Kuvert.dotx"
+            Select Case sprache
+                Case "RO"
+                    pfadWord = AppDomain.CurrentDomain.BaseDirectory & "Resources\MDM_Schreiben\Uebernahmebestätigung\ÜBERNAHMEBESTÄTIGUNG_Kuvert_RO.dotx"
+                Case Else
+                    pfadWord = AppDomain.CurrentDomain.BaseDirectory & "Resources\MDM_Schreiben\Uebernahmebestätigung\ÜBERNAHMEBESTÄTIGUNG_Kuvert.dotx"
+            End Select
+
             Dim oWord As New Microsoft.Office.Interop.Word.Application
             odoc = openWord(pfadWord, (Not autodruck And visible), oWord)
 

SDL/Formulare/KDFormulare/FormulareBaukasten/subRptLaufzettelZollDE_ATZOLL.Designer.vb

@@ -15,8 +15,10 @@ Partial Public Class subRptLaufzettelZollDE_ATA
     Private WithEvents Detail As GrapeCity.ActiveReports.SectionReportModel.Detail
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
-        Dim resources As System.Resources.ResourceManager = New System.Resources.ResourceManager(GetType(subRptLaufzettelZollDE_ATA))
         Me.Detail = New GrapeCity.ActiveReports.SectionReportModel.Detail()
+        Me.txtVorpapier = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
+        Me.txtRechnungspreisHeader = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
+        Me.txtRechnungspreis = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
         Me.picBarcodeATAMRN = New GrapeCity.ActiveReports.SectionReportModel.Picture()
         Me.txtATAMRN = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
         Me.txtColli = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
@@ -24,12 +26,13 @@ Partial Public Class subRptLaufzettelZollDE_ATA
         Me.txtGewicht = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
         Me.TextBox3 = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
         Me.lblSieheFremdspedition = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
-        Me.txtVorpapier = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
         Me.txtATNr = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
-        Me.txtRechnungspreisHeader = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
-        Me.txtRechnungspreis = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
         Me.GroupHeader1 = New GrapeCity.ActiveReports.SectionReportModel.GroupHeader()
         Me.GroupFooter1 = New GrapeCity.ActiveReports.SectionReportModel.GroupFooter()
+        Me.TextBox2 = New GrapeCity.ActiveReports.SectionReportModel.TextBox()
+        CType(Me.txtVorpapier, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.txtRechnungspreisHeader, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.txtRechnungspreis, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.picBarcodeATAMRN, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.txtATAMRN, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.txtColli, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -37,23 +40,56 @@ Partial Public Class subRptLaufzettelZollDE_ATA
         CType(Me.txtGewicht, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TextBox3, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSieheFremdspedition, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.txtVorpapier, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.txtATNr, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.txtRechnungspreisHeader, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.TextBox2, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.txtRechnungspreis, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me, System.ComponentModel.ISupportInitialize).BeginInit()
         '
         'Detail
         '
-        Me.Detail.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.txtVorpapier, Me.txtRechnungspreisHeader, Me.txtRechnungspreis, Me.picBarcodeATAMRN, Me.txtATAMRN, Me.txtColli, Me.TextBox1, Me.txtGewicht, Me.TextBox3, Me.lblSieheFremdspedition, Me.txtATNr})
+        Me.Detail.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.txtVorpapier, Me.txtRechnungspreisHeader, Me.txtRechnungspreis, Me.picBarcodeATAMRN, Me.txtATAMRN, Me.txtColli, Me.TextBox1, Me.txtGewicht, Me.TextBox3, Me.lblSieheFremdspedition, Me.txtATNr, Me.TextBox2})
-        Me.Detail.Height = 0.4483269!
+        Me.Detail.Height = 0.4484253!
         Me.Detail.Name = "Detail"
         '
+        'txtVorpapier
+        '
+        Me.txtVorpapier.Height = 0.1669292!
+        Me.txtVorpapier.Left = 2.448425!
+        Me.txtVorpapier.Name = "txtVorpapier"
+        Me.txtVorpapier.Style = "font-size: 8pt; font-style: italic; font-weight: bold; text-align: left; vertical" &
+    "-align: top; ddo-char-set: 1"
+        Me.txtVorpapier.Text = "VORPAPIER"
+        Me.txtVorpapier.Top = 0.2188977!
+        Me.txtVorpapier.Visible = False
+        Me.txtVorpapier.Width = 2.779922!
+        '
+        'txtRechnungspreisHeader
+        '
+        Me.txtRechnungspreisHeader.Height = 0.1669292!
+        Me.txtRechnungspreisHeader.Left = 3.501969!
+        Me.txtRechnungspreisHeader.Name = "txtRechnungspreisHeader"
+        Me.txtRechnungspreisHeader.Style = "font-size: 7pt; text-align: left; vertical-align: bottom; ddo-char-set: 1"
+        Me.txtRechnungspreisHeader.Text = "Rechnungspreis:"
+        Me.txtRechnungspreisHeader.Top = 0.2188977!
+        Me.txtRechnungspreisHeader.Visible = False
+        Me.txtRechnungspreisHeader.Width = 0.9181101!
+        '
+        'txtRechnungspreis
+        '
+        Me.txtRechnungspreis.Height = 0.1669291!
+        Me.txtRechnungspreis.Left = 4.420079!
+        Me.txtRechnungspreis.Name = "txtRechnungspreis"
+        Me.txtRechnungspreis.Style = "font-size: 8pt; font-style: normal; font-weight: bold; text-align: right; vertica" &
+    "l-align: bottom; ddo-char-set: 1"
+        Me.txtRechnungspreis.Text = Nothing
+        Me.txtRechnungspreis.Top = 0.2188977!
+        Me.txtRechnungspreis.Visible = False
+        Me.txtRechnungspreis.Width = 0.8082676!
+        '
         'picBarcodeATAMRN
         '
         Me.picBarcodeATAMRN.Height = 0.2188976!
         Me.picBarcodeATAMRN.HyperLink = Nothing
-        Me.picBarcodeATAMRN.ImageData = Nothing
+        Me.picBarcodeATAMRN.ImageBytes = Nothing
         Me.picBarcodeATAMRN.Left = 0!
         Me.picBarcodeATAMRN.Name = "picBarcodeATAMRN"
         Me.picBarcodeATAMRN.PictureAlignment = GrapeCity.ActiveReports.SectionReportModel.PictureAlignment.TopLeft
@@ -128,18 +164,6 @@ Partial Public Class subRptLaufzettelZollDE_ATA
         Me.lblSieheFremdspedition.Visible = False
         Me.lblSieheFremdspedition.Width = 1.667323!
         '
-        'txtVorpapier
-        '
-        Me.txtVorpapier.Height = 0.1669292!
-        Me.txtVorpapier.Left = 2.448425!
-        Me.txtVorpapier.Name = "txtVorpapier"
-        Me.txtVorpapier.Style = "font-size: 8pt; font-style: italic; font-weight: bold; text-align: left; vertical" &
-    "-align: top; ddo-char-set: 1"
-        Me.txtVorpapier.Text = "VORPAPIER"
-        Me.txtVorpapier.Top = 0.2188977!
-        Me.txtVorpapier.Visible = False
-        Me.txtVorpapier.Width = 2.779922!
-        '
         'txtATNr
         '
         Me.txtATNr.Height = 0.25!
@@ -152,29 +176,6 @@ Partial Public Class subRptLaufzettelZollDE_ATA
         Me.txtATNr.Visible = False
         Me.txtATNr.Width = 3.561024!
         '
-        'txtRechnungspreisHeader
-        '
-        Me.txtRechnungspreisHeader.Height = 0.1669292!
-        Me.txtRechnungspreisHeader.Left = 3.501969!
-        Me.txtRechnungspreisHeader.Name = "txtRechnungspreisHeader"
-        Me.txtRechnungspreisHeader.Style = "font-size: 7pt; text-align: left; vertical-align: bottom; ddo-char-set: 1"
-        Me.txtRechnungspreisHeader.Text = "Rechnungspreis:"
-        Me.txtRechnungspreisHeader.Top = 0.2188977!
-        Me.txtRechnungspreisHeader.Visible = False
-        Me.txtRechnungspreisHeader.Width = 0.9181101!
-        '
-        'txtRechnungspreis
-        '
-        Me.txtRechnungspreis.Height = 0.1669291!
-        Me.txtRechnungspreis.Left = 4.420079!
-        Me.txtRechnungspreis.Name = "txtRechnungspreis"
-        Me.txtRechnungspreis.Style = "font-size: 8pt; font-style: normal; font-weight: bold; text-align: right; vertica" &
-    "l-align: bottom; ddo-char-set: 1"
-        Me.txtRechnungspreis.Text = Nothing
-        Me.txtRechnungspreis.Top = 0.2188977!
-        Me.txtRechnungspreis.Visible = False
-        Me.txtRechnungspreis.Width = 0.8082676!
-        '
         'GroupHeader1
         '
         Me.GroupHeader1.Height = 0!
@@ -185,9 +186,18 @@ Partial Public Class subRptLaufzettelZollDE_ATA
         Me.GroupFooter1.Height = 0!
         Me.GroupFooter1.Name = "GroupFooter1"
         '
+        'TextBox2
+        '
+        Me.TextBox2.Height = 0.03149614!
+        Me.TextBox2.Left = 3.501969!
+        Me.TextBox2.Name = "TextBox2"
+        Me.TextBox2.Style = "font-size: 7pt; text-align: left; vertical-align: bottom; ddo-char-set: 1"
+        Me.TextBox2.Top = 0.4169292!
+        Me.TextBox2.Visible = False
+        Me.TextBox2.Width = 1.726378!
+        '
         'subRptLaufzettelZollDE_ATA
         '
-        Me.MasterReport = False
         Me.PageSettings.PaperHeight = 11.0!
         Me.PageSettings.PaperWidth = 8.5!
         Me.PrintWidth = 5.275591!
@@ -200,6 +210,9 @@ Partial Public Class subRptLaufzettelZollDE_ATA
         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.txtVorpapier, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.txtRechnungspreisHeader, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.txtRechnungspreis, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.picBarcodeATAMRN, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.txtATAMRN, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.txtColli, System.ComponentModel.ISupportInitialize).EndInit()
@@ -207,10 +220,8 @@ Partial Public Class subRptLaufzettelZollDE_ATA
         CType(Me.txtGewicht, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TextBox3, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblSieheFremdspedition, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.txtVorpapier, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.txtATNr, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.txtRechnungspreisHeader, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.TextBox2, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.txtRechnungspreis, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me, System.ComponentModel.ISupportInitialize).EndInit()
 
     End Sub
@@ -227,4 +238,5 @@ Partial Public Class subRptLaufzettelZollDE_ATA
     Private WithEvents txtATNr As GrapeCity.ActiveReports.SectionReportModel.TextBox
     Public WithEvents txtRechnungspreisHeader As GrapeCity.ActiveReports.SectionReportModel.TextBox
     Public WithEvents txtRechnungspreis As GrapeCity.ActiveReports.SectionReportModel.TextBox
+    Public WithEvents TextBox2 As GrapeCity.ActiveReports.SectionReportModel.TextBox
 End Class

SDL/Formulare/KDFormulare/FormulareBaukasten/subRptLaufzettelZollDE_ATZOLL.vb

@@ -7,9 +7,10 @@ Public Class subRptLaufzettelZollDE_ATA
     Dim Fremdspedition As Boolean
     Dim Vorpapier As String
     Dim Rechnungspreis As Object = Nothing
+    Dim Handelsrechnung As Object = Nothing
     Dim Rechnungswaehrung As Object = Nothing
 
-    Sub New(ATA As List(Of VERAG_PROG_ALLGEMEIN.cSendHandling), Fremdspedition As Boolean, Vorpapier As String, Rechnungspreis As Object, Rechnungswaehrung As Object)
+    Sub New(ATA As List(Of VERAG_PROG_ALLGEMEIN.cSendHandling), Fremdspedition As Boolean, Vorpapier As String, Rechnungspreis As Object, Rechnungswaehrung As Object, Handelsrechnung As Object)
 
         ' Dieser Aufruf ist f<>r den Designer erforderlich.
         InitializeComponent()
@@ -17,6 +18,7 @@ Public Class subRptLaufzettelZollDE_ATA
         Me.Fremdspedition = Fremdspedition
         Me.Vorpapier = Vorpapier
         Me.Rechnungspreis = Rechnungspreis
+        Me.Handelsrechnung = Handelsrechnung
         Me.Rechnungswaehrung = Rechnungswaehrung
         ' F<>gen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
     End Sub
@@ -84,6 +86,11 @@ Public Class subRptLaufzettelZollDE_ATA
             If Me.Fields.Item("Colli").Value IsNot Nothing Then txtColli.Text = CDbl(Me.Fields.Item("Colli").Value).ToString("N0") & " Pk"
             If Me.Fields.Item("Gewicht").Value IsNot Nothing Then txtGewicht.Text = CDbl(Me.Fields.Item("Gewicht").Value).ToString("N1") & " kg"
 
+            If If(Handelsrechnung, "") <> "" Then
+                TextBox2.Text = "Handelsrg.: " & Handelsrechnung
+                TextBox2.Visible = True
+            End If
+
         End If
 
     End Sub

SDL/Formulare/KDFormulare/frmFormulare.vb

@@ -2117,6 +2117,7 @@ Public Class FormularManagerNEU
             AddHandler rpt.Detail.Format, Sub()
                                               Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNGEN(rpt.Fields.Item("Nr").Value)
 
+
                                               Dim ZOLLANMELDUNG As New DAKOSY_Worker.cZollsysteme_Aktenbeschriftung
                                               ZOLLANMELDUNG.getDataByBezugsnummer(SND.FilialenNr & "/" & SND.AbfertigungsNr, SND.tblSnd_Abfertigungsart_ID.ToString, SND.tblSnd_DakosyRef) ' Die weiteren Daten werden hier geladen
 
@@ -2143,6 +2144,7 @@ Public Class FormularManagerNEU
                                                       Select Case SND.tblSnd_Abfertigungsart_ID
                                                           Case 1 : rpt.txtAbfertigungsart.Text = "Zollabfertigung"
                                                           Case 23 : rpt.txtAbfertigungsart.Text = "ATA-Nr."
+
                                                           Case 26, 28
                                                               rpt.txtAbfertigungsart.Text = VERAG_PROG_ALLGEMEIN.cAbfertigungsarten.getAbfertigungsartBezById(SND.tblSnd_Abfertigungsart_ID)
                                                               fiskal_bool = True
@@ -2172,28 +2174,38 @@ Public Class FormularManagerNEU
                                               '  If If(SENDUNG.NCTS_Verzollungsadresse_EORI, "") <> "" Then VALUES.NCTS_VZAdr &= "EORI:" & If(SND.NCTS_Verzollungsadresse_EORI, "") & If(SND.NCTS_Verzollungsadresse_EORI_NL, "")
 
 
+
+                                              ''-- Handelsrechnung --
+                                              ' If SND.tblSnd_Abfertigungsart_ID = 5 Then
+                                              ' NCTS_VZAdr &= vbNewLine & "Handelsrg.: " & ZOLLANMELDUNG.Handelsrechnung
+                                              ' End If
+
+
                                               rpt.txtVerzollungsadresse.Text = NCTS_VZAdr.Trim
 
                                               Dim ATAMRN_List As New List(Of VERAG_PROG_ALLGEMEIN.cSendHandling)
                                               Dim ATAMRN = ""
                                               SND.LOAD_HANDLING()
 
+
+
+
                                               If SND.tblSnd_Abfertigungsart_ID = 23 AndAlso SND.tblSnd_ATANr IsNot Nothing Then
-                                                  If SND.HANDLING.Count > 0 Then
+                                                      If SND.HANDLING.Count > 0 Then
-                                                      ATAMRN_List = SND.HANDLING
+                                                          ATAMRN_List = SND.HANDLING
 
-                                                      '    Else
+                                                          '    Else
-                                                      '        ATAMRN = SND.tblSnd_ATANr
+                                                          '        ATAMRN = SND.tblSnd_ATANr
-                                                      '        If ATAMRN <> "" Then ATAMRN_List.Add(New VERAG_PROG_ALLGEMEIN.cSendHandling(-1, "", ATAMRN, If(IsNumeric(SND.tblSnd_Colli), SND.tblSnd_Colli, ""), If(IsNumeric(SND.tblSnd_Gewicht), SND.tblSnd_Gewicht, "")))
+                                                          '        If ATAMRN <> "" Then ATAMRN_List.Add(New VERAG_PROG_ALLGEMEIN.cSendHandling(-1, "", ATAMRN, If(IsNumeric(SND.tblSnd_Colli), SND.tblSnd_Colli, ""), If(IsNumeric(SND.tblSnd_Gewicht), SND.tblSnd_Gewicht, "")))
-                                                      '    End If
+                                                          '    End If
-                                                      'Else
+                                                          'Else
-                                                      '    Dim ZOLLANMELDUNG As New DAKOSY_Worker.cZollsysteme_Aktenbeschriftung
+                                                          '    Dim ZOLLANMELDUNG As New DAKOSY_Worker.cZollsysteme_Aktenbeschriftung
-                                                      '    ATAMRN = ZOLLANMELDUNG.getATAMRNBezugsnummer(SND.FilialenNr & "/" & SND.AbfertigungsNr, SND.tblSnd_Abfertigungsart_ID.ToString)
+                                                          '    ATAMRN = ZOLLANMELDUNG.getATAMRNBezugsnummer(SND.FilialenNr & "/" & SND.AbfertigungsNr, SND.tblSnd_Abfertigungsart_ID.ToString)
-                                                      '    If ATAMRN <> "" Then ATAMRN_List.Add(New VERAG_PROG_ALLGEMEIN.cSendHandling(-1, "", ATAMRN, If(IsNumeric(SND.tblSnd_Colli), SND.tblSnd_Colli, ""), If(IsNumeric(SND.tblSnd_Gewicht), SND.tblSnd_Gewicht, "")))
+                                                          '    If ATAMRN <> "" Then ATAMRN_List.Add(New VERAG_PROG_ALLGEMEIN.cSendHandling(-1, "", ATAMRN, If(IsNumeric(SND.tblSnd_Colli), SND.tblSnd_Colli, ""), If(IsNumeric(SND.tblSnd_Gewicht), SND.tblSnd_Gewicht, "")))
+                                                      End If
                                                   End If
-                                              End If
 
-                                              If ATAMRN_List.Count = 0 Then 'kein Handling
+                                                  If ATAMRN_List.Count = 0 Then 'kein Handling
                                                   'Dim ZOLLANMELDUNG As New DAKOSY_Worker.cZollsysteme_Aktenbeschriftung
                                                   'ATAMRN = ZOLLANMELDUNG.getATAMRNBezugsnummer(SND.FilialenNr & "/" & SND.AbfertigungsNr, SND.tblSnd_Abfertigungsart_ID.ToString)
 
@@ -2233,7 +2245,7 @@ Public Class FormularManagerNEU
                                                       gesColli += a.sndhdg_colli
                                                       gesGewicht += a.sndhdg_gewicht
                                                   Next
-                                                  Dim SubRpt As New subRptLaufzettelZollDE_ATA(ATAMRN_List, SND.tblSnd_Fremdspedition, ZOLLANMELDUNG.Vorpapier, SND.tblSnd_Warenwert, SND.tblSnd_WarenwertWaehrung)
+                                                  Dim SubRpt As New subRptLaufzettelZollDE_ATA(ATAMRN_List, SND.tblSnd_Fremdspedition, ZOLLANMELDUNG.Vorpapier, SND.tblSnd_Warenwert, SND.tblSnd_WarenwertWaehrung, ZOLLANMELDUNG.Handelsrechnung)
                                                   rpt.SubReport.Report = SubRpt
 
                                               End If

SDL/My Project/AssemblyInfo.vb

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

SDL/My Project/Resources.Designer.vb

@@ -1234,6 +1234,46 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property pay_card() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("pay_card", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property pay_card_s() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("pay_card_s", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property pay_card_s1() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("pay_card_s1", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property pay_cash_s() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("pay_cash_s", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>

SDL/My Project/Resources.resx

@@ -148,6 +148,9 @@
   <data name="person1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\person.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="vorauszahlung" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\vorauszahlung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="verag_Card1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\verag_Card1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -163,17 +166,17 @@
   <data name="LEX" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\LEX.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="pay_card_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\pay_card_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="positionen" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\liste-logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="axxes" 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>
   </data>
-  <data name="Plakette1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="RG_ZF" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Plakette1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\RG_ZF.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="WAI" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\WAI.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="dakosy1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\dakosy1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -205,6 +208,9 @@
   <data name="uhr_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\uhr_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="pay_card_s1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\pay_card_s1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="kunden" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\kunden.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -223,6 +229,9 @@
   <data name="add_person" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\android-add-contact.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="zoll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\zoll.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="_exit" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\exit.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -322,8 +331,8 @@
   <data name="lorry_motion" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\lorry_motion.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="zoll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Route1_IR" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\zoll.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Route1_IR.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="uhr_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\uhr_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -331,6 +340,9 @@
   <data name="statistik" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\statistik.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="pfeil_rechts" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\pfeil_rechts.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="aeo_CS" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>F:\Grafik\VERAG\AEO\aeo_CS.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -346,9 +358,6 @@
   <data name="sgs" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sgs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Route1_IR" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Route1_IR.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="passpic" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\passpic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -406,9 +415,6 @@
   <data name="Excel_logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Excel_2013_logo-155x110.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="compose" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\compose.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="picboxNext_Enter" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\picboxNext_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -460,6 +466,9 @@
   <data name="unisped_aeo_ZS_AT" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\unisped_aeo_ZS_AT.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="pay_card" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\pay_card.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="ok_gray" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ok_gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -490,8 +499,8 @@
   <data name="awor" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\..\..\data\awor.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="asfinag" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="WAI" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\asfinag.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\WAI.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Verag-AG-Logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Verag-AG-Logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -514,12 +523,12 @@
   <data name="SBG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\SBG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="beleg_rot_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\beleg_rot1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="sms" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sms.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Verag_Customs_Service_AEO" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\..\..\..\AVISO\Aviso\Diverses\Verag_Customs_Service_AEO.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="Route4" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Route4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -532,6 +541,9 @@
   <data name="email1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\email1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="plose_medpass" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\plose_medpass.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="person" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\person.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -586,6 +598,9 @@
   <data name="Unisped_DE_logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Unisped_DE_logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="checklist1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\checklist.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="list_new_small1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\list_new_small1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -664,8 +679,8 @@
   <data name="Route3" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Route3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="RG_ZF" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="compose" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\RG_ZF.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\compose.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="transfer" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\transfer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -715,8 +730,8 @@
   <data name="Einheitspapier_0735_bottom" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Einheitspapier-0735_bottom.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Atilla__sig" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="documents" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Atilla _sig.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\documents.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Einheitspapier_0735_top" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Einheitspapier-0735_top.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -739,14 +754,14 @@
   <data name="Einheitspapier_0735_Position" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Einheitspapier-0735_Position.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="beleg_rot_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Plakette1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\beleg_rot1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Plakette1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="pdf1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\pdf1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="pfeil_rechts" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="asfinag" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\pfeil_rechts.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\asfinag.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="NDK" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\NDK.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -754,8 +769,8 @@
   <data name="email_big1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\email_big1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="vorauszahlung" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Verag_Customs_Service_AEO" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\vorauszahlung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\..\..\..\AVISO\Aviso\Diverses\Verag_Customs_Service_AEO.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="sicherheit1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sicherheit1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -835,8 +850,8 @@
   <data name="Einheitspapier_0777_Position" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Einheitspapier-0777_Position.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="checklist1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Atilla__sig" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\checklist.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Atilla _sig.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Verag_AG_Logo_med" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Verag-AG-Logo21.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -850,10 +865,7 @@
   <data name="flagge_A" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\flagge_A.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="documents" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="pay_cash_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\documents.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\pay_cash_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="plose_medpass" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\plose_medpass.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>

SDL/SDL.vbproj

@@ -4322,6 +4322,10 @@
     <None Include="Resources\food1.png" />
     <None Include="Resources\food2.png" />
     <None Include="Resources\plose_medpass.png" />
+    <None Include="Resources\pay_card.png" />
+    <None Include="Resources\pay_card_s.png" />
+    <None Include="Resources\pay_card_s1.png" />
+    <None Include="Resources\pay_cash_s.png" />
     <Content Include="Resources\Verag_Customs_Service_AEO.jpg" />
     <None Include="Resources\mic-logo.jpg" />
     <None Include="Resources\mic-logo - short.jpg" />

SDL/kassenbuch/frmBelegNeu.Designer.vb

@@ -98,15 +98,13 @@ Partial Class frmBelegNeu
         Me.Label1 = New System.Windows.Forms.Label()
         Me.kdkunde = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
         Me.pnlOPt = New System.Windows.Forms.Panel()
-        Me.btnPOS = New System.Windows.Forms.Button()
+        Me.cboPrinter = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.cbxBelegOffnen = New System.Windows.Forms.CheckBox()
         Me.lblStorno = New System.Windows.Forms.Label()
         Me.Label17 = New System.Windows.Forms.Label()
         Me.Label18 = New System.Windows.Forms.Label()
         Me.cboKassen = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.Button3 = New System.Windows.Forms.Button()
         Me.Label3 = New System.Windows.Forms.Label()
-        Me.cboPrinter = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.pnlBetrag = New System.Windows.Forms.Panel()
         Me.Label23 = New System.Windows.Forms.Label()
         Me.lblBetrag_Netto = New System.Windows.Forms.Label()
@@ -114,6 +112,11 @@ Partial Class frmBelegNeu
         Me.lblBetrag_Steuern = New System.Windows.Forms.Label()
         Me.Label25 = New System.Windows.Forms.Label()
         Me.lblBetrag_Brutto = New System.Windows.Forms.Label()
+        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.Label27 = New System.Windows.Forms.Label()
+        Me.Label26 = New System.Windows.Forms.Label()
+        Me.btnPOS = New System.Windows.Forms.Button()
+        Me.Button3 = New System.Windows.Forms.Button()
         Me.pnlOptionen = New System.Windows.Forms.Panel()
         Me.txtEinzelpreis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -143,6 +146,7 @@ Partial Class frmBelegNeu
         Me.pnlData.SuspendLayout()
         Me.pnlOPt.SuspendLayout()
         Me.pnlBetrag.SuspendLayout()
+        Me.Panel1.SuspendLayout()
         Me.pnlOptionen.SuspendLayout()
         Me.SuspendLayout()
         '
@@ -424,17 +428,18 @@ Partial Class frmBelegNeu
         '
         'btnPrint
         '
+        Me.btnPrint.BackgroundImage = Global.SDL.My.Resources.Resources.pay_cash_s
+        Me.btnPrint.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
         Me.btnPrint.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnPrint.ForeColor = System.Drawing.Color.Black
-        Me.btnPrint.Image = Global.SDL.My.Resources.Resources.printer2
         Me.btnPrint.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnPrint.Location = New System.Drawing.Point(556, 33)
+        Me.btnPrint.Location = New System.Drawing.Point(71, 29)
         Me.btnPrint.Name = "btnPrint"
         Me.btnPrint.Padding = New System.Windows.Forms.Padding(0, 0, 5, 0)
-        Me.btnPrint.Size = New System.Drawing.Size(64, 59)
+        Me.btnPrint.Size = New System.Drawing.Size(73, 59)
         Me.btnPrint.TabIndex = 13
-        Me.btnPrint.Text = "Beleg drucken" & Global.Microsoft.VisualBasic.ChrW(10) & "und buchen"
+        Me.btnPrint.Text = "BAR"
-        Me.btnPrint.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnPrint.TextAlign = System.Drawing.ContentAlignment.BottomCenter
         Me.btnPrint.UseVisualStyleBackColor = True
         '
         'FlowLayoutPanel
@@ -1154,6 +1159,7 @@ Partial Class frmBelegNeu
         Me.kdkunde._displayWoelflKd = False
         Me.kdkunde._hideIfListEmpty = True
         Me.kdkunde._loadKdData = True
+        Me.kdkunde._searchName1 = True
         Me.kdkunde._UseFIRMA = ""
         Me.kdkunde._ValueKdAndName = False
         Me.kdkunde.dgvpos = "LEFT"
@@ -1173,42 +1179,37 @@ Partial Class frmBelegNeu
         '
         'pnlOPt
         '
-        Me.pnlOPt.Controls.Add(Me.btnPOS)
+        Me.pnlOPt.Controls.Add(Me.cboPrinter)
         Me.pnlOPt.Controls.Add(Me.cbxBelegOffnen)
         Me.pnlOPt.Controls.Add(Me.lblStorno)
         Me.pnlOPt.Controls.Add(Me.Label17)
         Me.pnlOPt.Controls.Add(Me.Label18)
         Me.pnlOPt.Controls.Add(Me.cboKassen)
         Me.pnlOPt.Controls.Add(Me.lblMandant)
-        Me.pnlOPt.Controls.Add(Me.Button3)
         Me.pnlOPt.Controls.Add(Me.lblKassenbuchNr)
         Me.pnlOPt.Controls.Add(Me.Label3)
         Me.pnlOPt.Controls.Add(Me.Label14)
         Me.pnlOPt.Controls.Add(Me.lblSachbearbeiter)
         Me.pnlOPt.Controls.Add(Me.lblMandant_niederlassung)
         Me.pnlOPt.Controls.Add(Me.Label15)
-        Me.pnlOPt.Controls.Add(Me.btnPrint)
-        Me.pnlOPt.Controls.Add(Me.cboPrinter)
         Me.pnlOPt.Controls.Add(Me.pnlBetrag)
+        Me.pnlOPt.Controls.Add(Me.Panel1)
         Me.pnlOPt.Dock = System.Windows.Forms.DockStyle.Bottom
         Me.pnlOPt.Location = New System.Drawing.Point(498, 212)
         Me.pnlOPt.Name = "pnlOPt"
         Me.pnlOPt.Size = New System.Drawing.Size(624, 92)
         Me.pnlOPt.TabIndex = 6
         '
-        'btnPOS
+        'cboPrinter
         '
-        Me.btnPOS.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.cboPrinter._allowedValuesFreiText = Nothing
-        Me.btnPOS.ForeColor = System.Drawing.Color.Black
+        Me.cboPrinter._allowFreiText = False
-        Me.btnPOS.Image = Global.SDL.My.Resources.Resources.verag_Card1
+        Me.cboPrinter._value = ""
-        Me.btnPOS.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.cboPrinter.FormattingEnabled = True
-        Me.btnPOS.Location = New System.Drawing.Point(486, 33)
+        Me.cboPrinter.Location = New System.Drawing.Point(331, 6)
-        Me.btnPOS.Name = "btnPOS"
+        Me.cboPrinter.Name = "cboPrinter"
-        Me.btnPOS.Padding = New System.Windows.Forms.Padding(0, 0, 5, 0)
+        Me.cboPrinter.Size = New System.Drawing.Size(141, 21)
-        Me.btnPOS.Size = New System.Drawing.Size(64, 59)
+        Me.cboPrinter.TabIndex = 3
-        Me.btnPOS.TabIndex = 16
-        Me.btnPOS.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnPOS.UseVisualStyleBackColor = True
         '
         'cbxBelegOffnen
         '
@@ -1269,42 +1270,16 @@ Partial Class frmBelegNeu
         Me.cboKassen.Size = New System.Drawing.Size(226, 21)
         Me.cboKassen.TabIndex = 1
         '
-        'Button3
-        '
-        Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button3.ForeColor = System.Drawing.Color.Black
-        Me.Button3.Image = Global.SDL.My.Resources.Resources.save
-        Me.Button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button3.Location = New System.Drawing.Point(590, 67)
-        Me.Button3.Name = "Button3"
-        Me.Button3.Size = New System.Drawing.Size(31, 25)
-        Me.Button3.TabIndex = 14
-        Me.Button3.Text = "Beleg speichern" & Global.Microsoft.VisualBasic.ChrW(10) & "(wird nicht boniert)"
-        Me.Button3.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Button3.UseVisualStyleBackColor = True
-        Me.Button3.Visible = False
-        '
         'Label3
         '
         Me.Label3.AutoSize = True
         Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label3.Location = New System.Drawing.Point(301, 9)
+        Me.Label3.Location = New System.Drawing.Point(284, 9)
         Me.Label3.Name = "Label3"
         Me.Label3.Size = New System.Drawing.Size(48, 13)
         Me.Label3.TabIndex = 2
         Me.Label3.Text = "Drucker:"
         '
-        'cboPrinter
-        '
-        Me.cboPrinter._allowedValuesFreiText = Nothing
-        Me.cboPrinter._allowFreiText = False
-        Me.cboPrinter._value = ""
-        Me.cboPrinter.FormattingEnabled = True
-        Me.cboPrinter.Location = New System.Drawing.Point(355, 6)
-        Me.cboPrinter.Name = "cboPrinter"
-        Me.cboPrinter.Size = New System.Drawing.Size(265, 21)
-        Me.cboPrinter.TabIndex = 3
-        '
         'pnlBetrag
         '
         Me.pnlBetrag.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
@@ -1317,7 +1292,7 @@ Partial Class frmBelegNeu
         Me.pnlBetrag.Controls.Add(Me.lblBetrag_Brutto)
         Me.pnlBetrag.Location = New System.Drawing.Point(280, 33)
         Me.pnlBetrag.Name = "pnlBetrag"
-        Me.pnlBetrag.Size = New System.Drawing.Size(206, 59)
+        Me.pnlBetrag.Size = New System.Drawing.Size(196, 59)
         Me.pnlBetrag.TabIndex = 12
         '
         'Label23
@@ -1329,7 +1304,6 @@ Partial Class frmBelegNeu
         Me.Label23.Size = New System.Drawing.Size(85, 13)
         Me.Label23.TabIndex = 4
         Me.Label23.Text = "Bruttobetrag:"
-        Me.Label23.TextAlign = System.Drawing.ContentAlignment.TopRight
         '
         'lblBetrag_Netto
         '
@@ -1351,7 +1325,6 @@ Partial Class frmBelegNeu
         Me.Label24.Size = New System.Drawing.Size(85, 13)
         Me.Label24.TabIndex = 2
         Me.Label24.Text = "Steuern:"
-        Me.Label24.TextAlign = System.Drawing.ContentAlignment.TopRight
         '
         'lblBetrag_Steuern
         '
@@ -1373,7 +1346,6 @@ Partial Class frmBelegNeu
         Me.Label25.Size = New System.Drawing.Size(85, 13)
         Me.Label25.TabIndex = 0
         Me.Label25.Text = "Nettobetrag:"
-        Me.Label25.TextAlign = System.Drawing.ContentAlignment.TopRight
         '
         'lblBetrag_Brutto
         '
@@ -1386,6 +1358,73 @@ Partial Class frmBelegNeu
         Me.lblBetrag_Brutto.Text = "0,00 €"
         Me.lblBetrag_Brutto.TextAlign = System.Drawing.ContentAlignment.TopRight
         '
+        'Panel1
+        '
+        Me.Panel1.BackColor = System.Drawing.Color.Cornsilk
+        Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Panel1.Controls.Add(Me.Label27)
+        Me.Panel1.Controls.Add(Me.Label26)
+        Me.Panel1.Controls.Add(Me.btnPOS)
+        Me.Panel1.Controls.Add(Me.btnPrint)
+        Me.Panel1.Controls.Add(Me.Button3)
+        Me.Panel1.Location = New System.Drawing.Point(475, 3)
+        Me.Panel1.Name = "Panel1"
+        Me.Panel1.Size = New System.Drawing.Size(145, 89)
+        Me.Panel1.TabIndex = 13
+        '
+        'Label27
+        '
+        Me.Label27.Cursor = System.Windows.Forms.Cursors.Default
+        Me.Label27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label27.Location = New System.Drawing.Point(3, 14)
+        Me.Label27.Name = "Label27"
+        Me.Label27.Size = New System.Drawing.Size(135, 13)
+        Me.Label27.TabIndex = 6
+        Me.Label27.Text = "Beleg drucken"
+        Me.Label27.TextAlign = System.Drawing.ContentAlignment.TopCenter
+        '
+        'Label26
+        '
+        Me.Label26.Cursor = System.Windows.Forms.Cursors.Default
+        Me.Label26.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Underline), System.Drawing.FontStyle))
+        Me.Label26.Location = New System.Drawing.Point(3, 1)
+        Me.Label26.Name = "Label26"
+        Me.Label26.Size = New System.Drawing.Size(137, 20)
+        Me.Label26.TabIndex = 17
+        Me.Label26.Text = "Zahlung"
+        Me.Label26.TextAlign = System.Drawing.ContentAlignment.TopCenter
+        '
+        'btnPOS
+        '
+        Me.btnPOS.BackgroundImage = Global.SDL.My.Resources.Resources.pay_card_s1
+        Me.btnPOS.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.btnPOS.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnPOS.ForeColor = System.Drawing.Color.Black
+        Me.btnPOS.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnPOS.Location = New System.Drawing.Point(-1, 29)
+        Me.btnPOS.Name = "btnPOS"
+        Me.btnPOS.Padding = New System.Windows.Forms.Padding(0, 0, 5, 0)
+        Me.btnPOS.Size = New System.Drawing.Size(73, 59)
+        Me.btnPOS.TabIndex = 16
+        Me.btnPOS.Text = "mit Karte"
+        Me.btnPOS.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+        Me.btnPOS.UseVisualStyleBackColor = True
+        '
+        'Button3
+        '
+        Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button3.ForeColor = System.Drawing.Color.Black
+        Me.Button3.Image = Global.SDL.My.Resources.Resources.save
+        Me.Button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button3.Location = New System.Drawing.Point(96, 59)
+        Me.Button3.Name = "Button3"
+        Me.Button3.Size = New System.Drawing.Size(31, 25)
+        Me.Button3.TabIndex = 14
+        Me.Button3.Text = "Beleg speichern" & Global.Microsoft.VisualBasic.ChrW(10) & "(wird nicht boniert)"
+        Me.Button3.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button3.UseVisualStyleBackColor = True
+        Me.Button3.Visible = False
+        '
         'pnlOptionen
         '
         Me.pnlOptionen.BackColor = System.Drawing.Color.White
@@ -1561,6 +1600,7 @@ Partial Class frmBelegNeu
         Me.kdFrachtf._displayWoelflKd = False
         Me.kdFrachtf._hideIfListEmpty = True
         Me.kdFrachtf._loadKdData = True
+        Me.kdFrachtf._searchName1 = True
         Me.kdFrachtf._UseFIRMA = ""
         Me.kdFrachtf._ValueKdAndName = False
         Me.kdFrachtf.dgvpos = "LEFT"
@@ -1690,6 +1730,7 @@ Partial Class frmBelegNeu
         Me.pnlOPt.ResumeLayout(False)
         Me.pnlOPt.PerformLayout()
         Me.pnlBetrag.ResumeLayout(False)
+        Me.Panel1.ResumeLayout(False)
         Me.pnlOptionen.ResumeLayout(False)
         Me.pnlOptionen.PerformLayout()
         Me.ResumeLayout(False)
@@ -1809,4 +1850,7 @@ Partial Class frmBelegNeu
     Friend WithEvents Label22 As System.Windows.Forms.Label
     Friend WithEvents btnPOS As Button
     Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
+    Friend WithEvents Panel1 As Panel
+    Friend WithEvents Label27 As Label
+    Friend WithEvents Label26 As Label
 End Class

SDL/mdm/SDLAbholung/frmSDLAbholungEintrag.vb

@@ -391,7 +391,7 @@ Public Class frmSDLAbholungEintrag
                 'Dim f As New frmSDLAbholungEintrag(getSDLAbholung())
                 ' If f.ShowDialog(Me) = Windows.Forms.DialogResult.OK Then
                 genFormular = cGenWord.genUebernahmebestaetigung(cProgramFunctions.dgridViewTods(dgvPositionen), KdNr, VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME, print, printername, SDL_ABHOLUNG.sdlAb_Id, WordPath, TMPvisible)
-                genFormular = cGenWord.genUebernahmebestaetigungKuvert(cProgramFunctions.dgridViewTods(dgvPositionen), KdNr, VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME, print, printername, SDL_ABHOLUNG.sdlAb_Id, WordPath, TMPvisible)
+                genFormular = cGenWord.genUebernahmebestaetigungKuvert(cProgramFunctions.dgridViewTods(dgvPositionen), KdNr, VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME, print, printername, SDL_ABHOLUNG.sdlAb_Id, WordPath, TMPvisible, sprache)
                 'End If
 
             Else
@@ -446,7 +446,7 @@ Public Class frmSDLAbholungEintrag
                 'If f.ShowDialog(Me) = Windows.Forms.DialogResult.OK Then
 
                 genFormular = cGenWord.genUebernahmebestaetigung(cProgramFunctions.dgridViewTods(dgvPositionen), KdNr, VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME, print, printername, SDL_ABHOLUNG.sdlAb_Id, WordPath, TMPvisible)
-                genFormular = cGenWord.genUebernahmebestaetigungKuvert(cProgramFunctions.dgridViewTods(dgvPositionen), KdNr, VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME, print, printername, SDL_ABHOLUNG.sdlAb_Id, WordPath, TMPvisible)
+                genFormular = cGenWord.genUebernahmebestaetigungKuvert(cProgramFunctions.dgridViewTods(dgvPositionen), KdNr, VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME, print, printername, SDL_ABHOLUNG.sdlAb_Id, WordPath, TMPvisible, sprache)
                 'End If
             Else
                 If SDLNr = 999 Then 'Spezialfall PL+CZ

SDL/mdm/usrCntlDatenDetails.vb

@@ -254,6 +254,18 @@ Public Class usrCntlDatenDetails
                                             RaiseEvent DataChanged(kdNr, Kfz, SDLNr, History)
                                         End Sub
 
+        ElseIf SDLLeistung = 217 Then ' PLOSE cz
+            pic.Image = Nothing
+            Dim usrcntl As New usrCntlSDLLeistungenPLOSE_MEDPASS(kdnr, KfzKennzeichen, SDLLeistung, history)
+            usrcntl.Dock = DockStyle.Fill
+            pnlSDLLeistungenDetails.Controls.Add(usrcntl)
+            AddHandler usrcntl.LKWChanged, Sub(kdNr, newKfz, SDLNr, History)
+                                               RaiseEvent Changed(kdNr, newKfz, SDLNr, History)
+                                           End Sub
+            AddHandler usrcntl.CHANGED, Sub(kdNr, Kfz, SDLNr, History)
+                                            RaiseEvent DataChanged(kdNr, Kfz, SDLNr, History)
+                                        End Sub
+
         ElseIf SDLLeistung = 500 Then ' MAN
             pic.Image = Nothing
             Dim usrcntl As New usrCntlSDLLeistungenMANAbgas(kdnr, KfzKennzeichen, SDLLeistung, history)

VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/KdSearchBox.vb

@@ -22,6 +22,7 @@ Public Class KdSearchBox
     Public Property _display_Name1 As Boolean = False ' nur wenn _loadKdData
 
     Public Property _ValueKdAndName As Boolean = True
+    Public Property _searchName1 As Boolean = True
     Public Property _loadKdData As Boolean = False
 
     Public Property _hideIfListEmpty As Boolean = True
@@ -341,7 +342,9 @@ Public Class KdSearchBox
                 SQLstr &= "  INNER JOIN Filialen on Filialen.FilialenNr=isnull(Kunden.FilialenNr,4803) "
                 SQLstr &= "  WHERE 1=1 "
                 SQLstr &= " AND (  "
-                SQLstr &= "   Ordnungsbegriff LIKE '" & srch & "%'   " : If IsNumeric(srch) Then SQLstr &= "  OR AdressenNr LIKE '" & srch & "%'   "
+                SQLstr &= "   Ordnungsbegriff LIKE '" & srch & "%'   "
+                If IsNumeric(srch) Then SQLstr &= "  OR AdressenNr LIKE '" & srch & "%'   "
+                If _searchName1 Then SQLstr &= "  OR Adressen.[Name 1] LIKE '" & srch & "%'   "
                 SQLstr &= "   ) "
                 If srch2 <> "" Then SQLstr &= " AND (Filialen.Firma LIKE '" & srch2 & "%' OR ( Adressen.PLZ LIKE '" & srch2 & "%' OR Adressen.Ort LIKE '" & srch2 & "%' OR Adressen.LandKz LIKE '" & srch2 & "%' OR Adressen.Straße LIKE '" & srch2 & "%' )) "
                 SQLstr &= "  AND [Auswahl]='A' "
@@ -423,7 +426,9 @@ Public Class KdSearchBox
                 SQLstr &= "  INNER JOIN Filialen on Filialen.FilialenNr=isnull(Kunden.FilialenNr,4803) "
                 SQLstr &= "  WHERE 1=1 "
                 SQLstr &= " AND (  "
-                SQLstr &= "   Ordnungsbegriff LIKE '" & srch & "%'   " : If IsNumeric(srch) Then SQLstr &= "  OR AdressenNr LIKE '" & srch & "%'   "
+                SQLstr &= "   Ordnungsbegriff LIKE '" & srch & "%'   "
+                If IsNumeric(srch) Then SQLstr &= "  OR AdressenNr LIKE '" & srch & "%'   "
+                If _searchName1 Then SQLstr &= "  OR Adressen.[Name 1] LIKE '" & srch & "%'   "
                 SQLstr &= "   ) "
                 If srch2 <> "" Then SQLstr &= " AND (Filialen.Firma LIKE '" & srch2 & "%' OR ( Adressen.PLZ LIKE '" & srch2 & "%' OR Adressen.Ort LIKE '" & srch2 & "%' OR Adressen.LandKz LIKE '" & srch2 & "%' OR Adressen.Straße LIKE '" & srch2 & "%' )) "
                 SQLstr &= "  AND [Auswahl]='I' "

VERAG_PROG_ALLGEMEIN/Classes/cAvisoBenachrichtigungen.vb

@@ -246,5 +246,7 @@ Public Class cAvisoBenachrichtigungenCodes
     Public Shared Vorauskasse_OK As Integer = 6
     Public Shared ZOLL_Dokumentenbeschau As Integer = 7
     Public Shared ZOLL_Rueckweisung As Integer = 8
+    Public Shared ZOLL_Mitteilung As Integer = 9
+
 
 End Class

VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb

@@ -64,22 +64,41 @@ Public Class cMessenger
     End Function
 
     Public Shared Function GET_NewMSG_COUNT_AVISOID(AvisoId As Integer) As Integer
-        Dim chat_id = SQL.DLookup("chat_id", "tblMessenger_ChatMembers inner join tblMessenger_Chat on chat_id=chatMb_chatId", "chat_AvisoId='" & AvisoId & "' and [chatMb_maId]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "'", "ADMIN", -1)
+        'Dim chat_id = SQL.DLookup("chat_id", "tblMessenger_ChatMembers inner join tblMessenger_Chat on chat_id=chatMb_chatId", "chat_AvisoId='" & AvisoId & "' and [chatMb_maId]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "'", "ADMIN", -1)
+        Dim chat_id = SQL.DLookup("chat_id", "tblMessenger_Chat ", "chat_AvisoId='" & AvisoId & "'  AND (chat_SendungsId is null or chat_SendungsId<=0)", "ADMIN", -1)
         If chat_id > 0 Then 'Ich bin Member vom Chat.
-            Return GET_NewMSG_COUNT_CHATID(VERAG_PROG_ALLGEMEIN.cAllgemein.USRID, chat_id)
+            '  Return GET_NewMSG_COUNT_CHATID(VERAG_PROG_ALLGEMEIN.cAllgemein.USRID, chat_id)
-        Else
+            ' Else
             ' MsgBox(SQL.DLookup("isnull(count(*),0)", "tblMessenger_ChatMessages inner join tblMessenger_Chat on chat_id=chatMg_chatId", "chat_AvisoId='" & AvisoId & "'", "ADMIN", 0))
-            Return SQL.DLookup("isnull(count(*),0)", "tblMessenger_ChatMessages inner join tblMessenger_Chat on chat_id=chatMg_chatId", "chat_AvisoId='" & AvisoId & "'", "ADMIN", 0)
+            Return SQL.DLookup("isnull(count(*),0)", "tblMessenger_ChatMessages inner join tblMessenger_Chat on chat_id=chatMg_chatId", "chat_AvisoId='" & AvisoId & "'  AND (chat_SendungsId is null or chat_SendungsId<=0) ", "ADMIN", 0)
         End If
     End Function
     Public Shared Function GET_NewMSG_COUNT_SendungsID(SendungsID As Integer) As Integer
-        Dim chat_id = SQL.DLookup("chat_id", "tblMessenger_ChatMembers inner join tblMessenger_Chat on chat_id=chatMb_chatId", "chat_SendungsId='" & SendungsID & "' and [chatMb_maId]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "'", "ADMIN", -1)
+        Dim chat_id = SQL.DLookup("chat_id", "tblMessenger_Chat ", "chat_SendungsId='" & SendungsID & "'", "ADMIN", -1)
         If chat_id > 0 Then 'Ich bin Member vom Chat.
-            Return GET_NewMSG_COUNT_CHATID(VERAG_PROG_ALLGEMEIN.cAllgemein.USRID, chat_id)
+            ' Return GET_NewMSG_COUNT_CHATID(VERAG_PROG_ALLGEMEIN.cAllgemein.USRID, chat_id)
-        Else
+            '   Else
             Return SQL.DLookup("isnull(count(*),0)", "tblMessenger_ChatMessages inner join tblMessenger_Chat on chat_id=chatMg_chatId", "chat_SendungsId='" & SendungsID & "'", "ADMIN", 0)
         End If
     End Function
+    Public Shared Function isACTIVE_AVISOID(AvisoId As Integer) As Boolean
+        Dim chat_idCNT = SQL.DLookup("COUNT(*)", "tblMessenger_Chat", "chat_AvisoId='" & AvisoId & "' AND (SendungsID is null or SendungsID<=0)", "ADMIN", -1)
+        If chat_idCNT > 0 Then 'Ich bin Member vom Chat.
+            Return True
+        Else
+            Return False
+        End If
+    End Function
+    Public Shared Function isACTIVE_SendungsID(SendungsID As Integer) As Boolean
+        Dim chat_idCNT = SQL.DLookup("COUNT(*)", "tblMessenger_Chat", "chat_SendungsId='" & SendungsID & "'", "ADMIN", -1)
+        If chat_idCNT > 0 Then 'Ich bin Member vom Chat.
+            Return True
+        Else
+            Return False
+        End If
+    End Function
+
+
 
     Public Shared Function GET_CHAT_LIST() As List(Of cMessenger_Chat)
         Dim LIST As New List(Of cMessenger_Chat)

VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb

@@ -350,6 +350,18 @@ Public Class cProgramFunctions
         End Try
 
 
+        'Prüfen, ob Empfänger angegeben:
+        If Msg.To.Count = 0 And Msg.CC.Count = 0 And Msg.Bcc.Count = 0 Then
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Kein Empfänger!", "TO:  " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
+            Return False
+        End If
+
+        'Msg.To.Clear()
+        'Msg.CC.Clear()
+        'Msg.Bcc.Clear()
+        'Msg.To.Add("al@verag.ag")
+
+
 
         Try
             'SENDEN::::::::::::::::::::::
@@ -358,7 +370,7 @@ Public Class cProgramFunctions
         Catch ex As Exception
             Try 'Falls Fehler nicht beim Senden, sonder was anderes.
 
-                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "TO: " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
+                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "TO:  " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
             Catch ex3 As Exception
             End Try