MDM-Word Logo, divers

2023-03-06 21:30:46 +01:00
parent ff705db787
commit 397738ca5f
40 changed files with 167 additions and 80 deletions
--- a/SDL/Classes/cGenWord.vb
+++ b/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
+            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)

--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/subRptLaufzettelZollDE_ATZOLL.Designer.vb
+++ b/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.txtRechnungspreis, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.TextBox2, 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.Height = 0.4483269!
+        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.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.txtRechnungspreis, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.TextBox2, 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
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/subRptLaufzettelZollDE_ATZOLL.vb
+++ b/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
--- a/SDL/Formulare/KDFormulare/frmFormulare.vb
+++ b/SDL/Formulare/KDFormulare/frmFormulare.vb
@@ -2085,6 +2085,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

@@ -2111,6 +2112,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
@@ -2140,12 +2142,22 @@ 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
                                                          ATAMRN_List = SND.HANDLING
@@ -2201,7 +2213,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
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("1.2.4.1")>
-<Assembly: AssemblyFileVersion("1.2.4.1")>
+<Assembly: AssemblyVersion("1.2.4.3")>
+<Assembly: AssemblyFileVersion("1.2.4.3")>
--- a/SDL/Resources/MDM_Schreiben/Abholbereit/Abholbereit_DE.dotx
+++ b/SDL/Resources/MDM_Schreiben/Abholbereit/Abholbereit_DE.dotx
--- a/SDL/Resources/MDM_Schreiben/Abholbereit/Abholbereit_HUGO_DE.dotx
+++ b/SDL/Resources/MDM_Schreiben/Abholbereit/Abholbereit_HUGO_DE.dotx
--- a/SDL/Resources/MDM_Schreiben/Abholbereit/Abholbereit_HUGO_RO.dotx
+++ b/SDL/Resources/MDM_Schreiben/Abholbereit/Abholbereit_HUGO_RO.dotx
--- a/SDL/Resources/MDM_Schreiben/Abholbereit/Abholbereit_HUGO_YU.dotx
+++ b/SDL/Resources/MDM_Schreiben/Abholbereit/Abholbereit_HUGO_YU.dotx
--- a/SDL/Resources/MDM_Schreiben/Abholbereit/Abholbereit_RO.dotx
+++ b/SDL/Resources/MDM_Schreiben/Abholbereit/Abholbereit_RO.dotx
--- a/SDL/Resources/MDM_Schreiben/Abholbereit/Abholbereit_TR.dotx
+++ b/SDL/Resources/MDM_Schreiben/Abholbereit/Abholbereit_TR.dotx
--- a/SDL/Resources/MDM_Schreiben/Abholbereit/Abholbereit_YU.dotx
+++ b/SDL/Resources/MDM_Schreiben/Abholbereit/Abholbereit_YU.dotx
--- a/SDL/Resources/MDM_Schreiben/Abholbereit/IDS/Abholbereit_IDS_DE.dotx
+++ b/SDL/Resources/MDM_Schreiben/Abholbereit/IDS/Abholbereit_IDS_DE.dotx
--- a/SDL/Resources/MDM_Schreiben/Abholbereit/IDS/Abholbereit_IDS_RO.dotx
+++ b/SDL/Resources/MDM_Schreiben/Abholbereit/IDS/Abholbereit_IDS_RO.dotx
--- a/SDL/Resources/MDM_Schreiben/Abholbereit/IDS/Abholbereit_IDS_YU.dotx
+++ b/SDL/Resources/MDM_Schreiben/Abholbereit/IDS/Abholbereit_IDS_YU.dotx
--- a/SDL/Resources/MDM_Schreiben/Abholbereit/MSE/Abholbereit_MSE_DE.dotx
+++ b/SDL/Resources/MDM_Schreiben/Abholbereit/MSE/Abholbereit_MSE_DE.dotx
--- a/SDL/Resources/MDM_Schreiben/Abholbereit/MSE/Abholbereit_MSE_RO.dotx
+++ b/SDL/Resources/MDM_Schreiben/Abholbereit/MSE/Abholbereit_MSE_RO.dotx
--- a/SDL/Resources/MDM_Schreiben/Abholbereit/MSE/Abholbereit_MSE_YU.dotx
+++ b/SDL/Resources/MDM_Schreiben/Abholbereit/MSE/Abholbereit_MSE_YU.dotx
--- a/SDL/Resources/MDM_Schreiben/Abholbereit/PL/Abholbereit_PL_DE.dotx
+++ b/SDL/Resources/MDM_Schreiben/Abholbereit/PL/Abholbereit_PL_DE.dotx
--- a/SDL/Resources/MDM_Schreiben/Abholbereit/PL/Abholbereit_PL_TR.dotx
+++ b/SDL/Resources/MDM_Schreiben/Abholbereit/PL/Abholbereit_PL_TR.dotx
--- a/SDL/Resources/MDM_Schreiben/Abholbereit/PL/Abholbereit_PL_YU.dotx
+++ b/SDL/Resources/MDM_Schreiben/Abholbereit/PL/Abholbereit_PL_YU.dotx
--- a/SDL/Resources/MDM_Schreiben/Bestellfomulare/Bestellung_MAN_Abgasplakette.dotx
+++ b/SDL/Resources/MDM_Schreiben/Bestellfomulare/Bestellung_MAN_Abgasplakette.dotx
--- a/SDL/Resources/MDM_Schreiben/Retour/CZ.doc
+++ b/SDL/Resources/MDM_Schreiben/Retour/CZ.doc
--- a/SDL/Resources/MDM_Schreiben/Retour/HUGO.doc
+++ b/SDL/Resources/MDM_Schreiben/Retour/HUGO.doc
--- a/SDL/Resources/MDM_Schreiben/Retour/MULTIBOX.doc
+++ b/SDL/Resources/MDM_Schreiben/Retour/MULTIBOX.doc
--- a/SDL/Resources/MDM_Schreiben/Retour/PLOSE.doc
+++ b/SDL/Resources/MDM_Schreiben/Retour/PLOSE.doc
--- a/SDL/Resources/MDM_Schreiben/Retour/PLOSE_CZ.doc
+++ b/SDL/Resources/MDM_Schreiben/Retour/PLOSE_CZ.doc
--- a/SDL/Resources/MDM_Schreiben/Retour/PLOSE_IT.doc
+++ b/SDL/Resources/MDM_Schreiben/Retour/PLOSE_IT.doc
--- a/SDL/Resources/MDM_Schreiben/Retour/SI.doc
+++ b/SDL/Resources/MDM_Schreiben/Retour/SI.doc
--- a/SDL/Resources/MDM_Schreiben/Retour/TELEPASS.doc
+++ b/SDL/Resources/MDM_Schreiben/Retour/TELEPASS.doc
--- a/SDL/Resources/MDM_Schreiben/Retour/VIATOLL.doc
+++ b/SDL/Resources/MDM_Schreiben/Retour/VIATOLL.doc
--- a/SDL/Resources/MDM_Schreiben/Uebernahmebestätigung/ÜBERNAHMEBESTÄTIGUNG.dotx
+++ b/SDL/Resources/MDM_Schreiben/Uebernahmebestätigung/ÜBERNAHMEBESTÄTIGUNG.dotx
--- a/SDL/Resources/MDM_Schreiben/Uebernahmebestätigung/ÜBERNAHMEBESTÄTIGUNG_Kuvert.dotx
+++ b/SDL/Resources/MDM_Schreiben/Uebernahmebestätigung/ÜBERNAHMEBESTÄTIGUNG_Kuvert.dotx
--- a/SDL/Resources/MDM_Schreiben/Uebernahmebestätigung/ÜBERNAHMEBESTÄTIGUNG_Kuvert_RO.dotx
+++ b/SDL/Resources/MDM_Schreiben/Uebernahmebestätigung/ÜBERNAHMEBESTÄTIGUNG_Kuvert_RO.dotx
--- a/SDL/mdm/SDLAbholung/frmSDLAbholungEintrag.vb
+++ b/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
--- a/SDL/mdm/usrCntlDatenDetails.vb
+++ b/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)
--- a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte
+++ b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte
@@ -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' "
--- a/VERAG_PROG_ALLGEMEIN/Classes/cAvisoBenachrichtigungen.vb
+++ b/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
--- a/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb
+++ b/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)
-        Else
+            '  Return GET_NewMSG_COUNT_CHATID(VERAG_PROG_ALLGEMEIN.cAllgemein.USRID, chat_id)
+            ' 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)
-        Else
+            ' Return GET_NewMSG_COUNT_CHATID(VERAG_PROG_ALLGEMEIN.cAllgemein.USRID, chat_id)
+            '   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)
--- a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb
+++ b/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::::::::::::::::::::::