Merge

2024-03-20 22:05:23 +01:00
parent 8c7eb4751e 61753531d1
commit ce24856bac
19 changed files with 699 additions and 153 deletions
--- a/SDL/Fakturierung/frmFaktEmail.vb
+++ b/SDL/Fakturierung/frmFaktEmail.vb
@@ -161,7 +161,7 @@ Public Class frmFaktEmail

        initDGVAnhaenge()

-        If FISKAL IsNot Nothing AndAlso (SPEDBUCH.AbfertigungsNr = 26 Or SPEDBUCH.AbfertigungsNr = 28) AndAlso (SPEDBUCH.FilialenNr = 4805 Or SPEDBUCH.FilialenNr = 4811) Then 'Prüfung 
+        If FISKAL IsNot Nothing AndAlso SPEDBUCH IsNot Nothing AndAlso SPEDBUCH.Abfertigungsart IsNot Nothing AndAlso IsNumeric(SPEDBUCH.Abfertigungsart) AndAlso (SPEDBUCH.Abfertigungsart = 26 Or SPEDBUCH.Abfertigungsart = 28) AndAlso (SPEDBUCH.FilialenNr = 4805 Or SPEDBUCH.FilialenNr = 4811) Then 'Prüfung 
            cbxSteuerberaterEmail.Checked = (If(FISKAL.fisk_schreibenSB_Mail, "") <> "")
            txtSteuerberaterEmail.Text = If(FISKAL.fisk_schreibenSB_Mail, "")
            cbxFAEmail.Checked = (If(FISKAL.fisk_schreibenFA_Mail, "") <> "")
@@ -739,7 +739,7 @@ Public Class frmFaktEmail
        For Each r In SR_DT.Rows 
            Dim SPEDBUCH As New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch(r("FilialenNr"), r("AbfertigungsNr"), r("SpeditionsbuchUnterNr"))
            initRowSpedbuch(SPEDBUCH)
-            If (SPEDBUCH.AbfertigungsNr = 26 Or SPEDBUCH.AbfertigungsNr = 28) AndAlso (SPEDBUCH.FilialenNr = 4805 Or SPEDBUCH.FilialenNr = 4811) Then
+            If SPEDBUCH IsNot Nothing AndAlso SPEDBUCH.Abfertigungsart IsNot Nothing AndAlso IsNumeric(SPEDBUCH.Abfertigungsart) AndAlso (SPEDBUCH.Abfertigungsart = 26 Or SPEDBUCH.Abfertigungsart = 28) AndAlso (SPEDBUCH.FilialenNr = 4805 Or SPEDBUCH.FilialenNr = 4811) Then
                isFiskal = True
            End If
        Next
--- a/SDL/Fakturierung/frmFaktSammelRgDrucken.vb
+++ b/SDL/Fakturierung/frmFaktSammelRgDrucken.vb
@@ -333,7 +333,7 @@ Public Class frmFaktSammelRgDrucken
            '-------------- ENDE -------------- 

        Catch ex As Exception
-            MsgBox(ex.Message & ex.StackTrace)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
        End Try
        initDGV()
        Me.Enabled = True
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEinfuhrverbot.Designer.vb
+++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEinfuhrverbot.Designer.vb
@@ -0,0 +1,246 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class usrcntlEinfuhrverbot
+    Inherits System.Windows.Forms.UserControl
+
+    'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()>
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()>
+    Private Sub InitializeComponent()
+        Me.lblEinfuhrverbot = New System.Windows.Forms.Label()
+        Me.lbl = New System.Windows.Forms.Label()
+        Me.txtAdresse2 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txtAdresse1 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.pic = New System.Windows.Forms.PictureBox()
+        Me.btnDown = New System.Windows.Forms.Button()
+        Me.btnUp = New System.Windows.Forms.Button()
+        Me.btnDel = New System.Windows.Forms.Button()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.txtFirma = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.cboSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SuspendLayout()
+        '
+        'lblEinfuhrverbot
+        '
+        Me.lblEinfuhrverbot.AutoSize = True
+        Me.lblEinfuhrverbot.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblEinfuhrverbot.Location = New System.Drawing.Point(43, 9)
+        Me.lblEinfuhrverbot.Name = "lblEinfuhrverbot"
+        Me.lblEinfuhrverbot.Size = New System.Drawing.Size(201, 20)
+        Me.lblEinfuhrverbot.TabIndex = 1
+        Me.lblEinfuhrverbot.Text = "Y824 / EU VO 833/2014"
+        '
+        'lbl
+        '
+        Me.lbl.AutoSize = True
+        Me.lbl.Location = New System.Drawing.Point(170, 37)
+        Me.lbl.Name = "lbl"
+        Me.lbl.Size = New System.Drawing.Size(78, 13)
+        Me.lbl.TabIndex = 6
+        Me.lbl.Text = "Firmenwortlaut:"
+        '
+        'txtAdresse2
+        '
+        Me.txtAdresse2._DateTimeOnly = False
+        Me.txtAdresse2._numbersOnly = False
+        Me.txtAdresse2._numbersOnlyKommastellen = ""
+        Me.txtAdresse2._numbersOnlyTrennzeichen = True
+        Me.txtAdresse2._Prozent = False
+        Me.txtAdresse2._ShortDateNew = False
+        Me.txtAdresse2._ShortDateOnly = False
+        Me.txtAdresse2._TimeOnly = False
+        Me.txtAdresse2._TimeOnly_Seconds = False
+        Me.txtAdresse2._value = Nothing
+        Me.txtAdresse2._Waehrung = False
+        Me.txtAdresse2._WaehrungZeichen = True
+        Me.txtAdresse2.ForeColor = System.Drawing.Color.Black
+        Me.txtAdresse2.Location = New System.Drawing.Point(254, 73)
+        Me.txtAdresse2.MaxLineLength = -1
+        Me.txtAdresse2.MaxLines_Warning = ""
+        Me.txtAdresse2.MaxLines_Warning_Label = Nothing
+        Me.txtAdresse2.Name = "txtAdresse2"
+        Me.txtAdresse2.Size = New System.Drawing.Size(709, 20)
+        Me.txtAdresse2.TabIndex = 13
+        '
+        'txtAdresse1
+        '
+        Me.txtAdresse1._DateTimeOnly = False
+        Me.txtAdresse1._numbersOnly = False
+        Me.txtAdresse1._numbersOnlyKommastellen = ""
+        Me.txtAdresse1._numbersOnlyTrennzeichen = True
+        Me.txtAdresse1._Prozent = False
+        Me.txtAdresse1._ShortDateNew = False
+        Me.txtAdresse1._ShortDateOnly = False
+        Me.txtAdresse1._TimeOnly = False
+        Me.txtAdresse1._TimeOnly_Seconds = False
+        Me.txtAdresse1._value = Nothing
+        Me.txtAdresse1._Waehrung = False
+        Me.txtAdresse1._WaehrungZeichen = True
+        Me.txtAdresse1.ForeColor = System.Drawing.Color.Black
+        Me.txtAdresse1.Location = New System.Drawing.Point(254, 54)
+        Me.txtAdresse1.MaxLineLength = -1
+        Me.txtAdresse1.MaxLines_Warning = ""
+        Me.txtAdresse1.MaxLines_Warning_Label = Nothing
+        Me.txtAdresse1.Name = "txtAdresse1"
+        Me.txtAdresse1.Size = New System.Drawing.Size(709, 20)
+        Me.txtAdresse1.TabIndex = 12
+        '
+        'pic
+        '
+        Me.pic.BackgroundImage = Global.SDL.My.Resources.Resources.pdf
+        Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
+        Me.pic.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.pic.Location = New System.Drawing.Point(5, 5)
+        Me.pic.Name = "pic"
+        Me.pic.Size = New System.Drawing.Size(32, 32)
+        Me.pic.TabIndex = 30
+        Me.pic.TabStop = False
+        '
+        'btnDown
+        '
+        Me.btnDown.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnDown.BackgroundImage = Global.SDL.My.Resources.Resources.pfeil_unten
+        Me.btnDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.btnDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnDown.Location = New System.Drawing.Point(976, 42)
+        Me.btnDown.Name = "btnDown"
+        Me.btnDown.Size = New System.Drawing.Size(25, 21)
+        Me.btnDown.TabIndex = 9
+        Me.btnDown.UseVisualStyleBackColor = True
+        '
+        'btnUp
+        '
+        Me.btnUp.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnUp.BackgroundImage = Global.SDL.My.Resources.Resources.pfeil_oben
+        Me.btnUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.btnUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnUp.Location = New System.Drawing.Point(976, 22)
+        Me.btnUp.Name = "btnUp"
+        Me.btnUp.Size = New System.Drawing.Size(25, 21)
+        Me.btnUp.TabIndex = 4
+        Me.btnUp.UseVisualStyleBackColor = True
+        '
+        'btnDel
+        '
+        Me.btnDel.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnDel.BackgroundImage = Global.SDL.My.Resources.Resources.del
+        Me.btnDel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.btnDel.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnDel.Location = New System.Drawing.Point(976, -1)
+        Me.btnDel.Name = "btnDel"
+        Me.btnDel.Size = New System.Drawing.Size(25, 21)
+        Me.btnDel.TabIndex = 0
+        Me.btnDel.UseVisualStyleBackColor = True
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(170, 57)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(48, 13)
+        Me.Label1.TabIndex = 58
+        Me.Label1.Text = "Adresse:"
+        '
+        'txtFirma
+        '
+        Me.txtFirma._AlleFirmenCLUSTER = False
+        Me.txtFirma._AllowSetValue = True
+        Me.txtFirma._autoSizeGross = False
+        Me.txtFirma._display_Name1 = True
+        Me.txtFirma._displayAVISO_Email = False
+        Me.txtFirma._displayFullName = False
+        Me.txtFirma._displayWoelflKd = False
+        Me.txtFirma._hideIfListEmpty = True
+        Me.txtFirma._loadKdData = True
+        Me.txtFirma._searchName1 = True
+        Me.txtFirma._UseFIRMA = ""
+        Me.txtFirma._ValueKdAndName = False
+        Me.txtFirma.dgvpos = "LEFT"
+        Me.txtFirma.KdName = Nothing
+        Me.txtFirma.KdNr = "-1"
+        Me.txtFirma.kdNrField = Nothing
+        Me.txtFirma.KdNrNullInt = Nothing
+        Me.txtFirma.Location = New System.Drawing.Point(254, 35)
+        Me.txtFirma.Name = "txtFirma"
+        Me.txtFirma.nurAktive = True
+        Me.txtFirma.searchActive = True
+        Me.txtFirma.Size = New System.Drawing.Size(709, 20)
+        Me.txtFirma.TabIndex = 53
+        Me.txtFirma.TIMER_SEARCH = True
+        Me.txtFirma.usrcntl = Nothing
+        '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.Location = New System.Drawing.Point(44, 38)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(50, 13)
+        Me.Label4.TabIndex = 59
+        Me.Label4.Text = "Sprache:"
+        '
+        'cboSprache
+        '
+        Me.cboSprache._allowedValuesFreiText = Nothing
+        Me.cboSprache._allowFreiText = False
+        Me.cboSprache._value = ""
+        Me.cboSprache.FormattingEnabled = True
+        Me.cboSprache.Location = New System.Drawing.Point(47, 54)
+        Me.cboSprache.Name = "cboSprache"
+        Me.cboSprache.Size = New System.Drawing.Size(89, 21)
+        Me.cboSprache.TabIndex = 60
+        '
+        'usrcntlEinfuhrverbot
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.BackColor = System.Drawing.Color.WhiteSmoke
+        Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Controls.Add(Me.Label4)
+        Me.Controls.Add(Me.cboSprache)
+        Me.Controls.Add(Me.lblEinfuhrverbot)
+        Me.Controls.Add(Me.Label1)
+        Me.Controls.Add(Me.txtFirma)
+        Me.Controls.Add(Me.btnDown)
+        Me.Controls.Add(Me.btnUp)
+        Me.Controls.Add(Me.btnDel)
+        Me.Controls.Add(Me.pic)
+        Me.Controls.Add(Me.txtAdresse2)
+        Me.Controls.Add(Me.txtAdresse1)
+        Me.Controls.Add(Me.lbl)
+        Me.Name = "usrcntlEinfuhrverbot"
+        Me.Size = New System.Drawing.Size(1000, 108)
+        CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+    Friend WithEvents lblEinfuhrverbot As System.Windows.Forms.Label
+    Friend WithEvents lbl As System.Windows.Forms.Label
+    Friend WithEvents txtAdresse1 As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents txtAdresse2 As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents pic As System.Windows.Forms.PictureBox
+    Friend WithEvents btnDown As System.Windows.Forms.Button
+    Friend WithEvents btnUp As System.Windows.Forms.Button
+    Friend WithEvents btnDel As System.Windows.Forms.Button
+    Friend WithEvents Label1 As Label
+    Friend WithEvents txtFirma As VERAG_PROG_ALLGEMEIN.KdSearchBox
+    Friend WithEvents Label4 As Label
+    Friend WithEvents cboSprache As VERAG_PROG_ALLGEMEIN.MyComboBox
+End Class
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEinfuhrverbot.resx
+++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEinfuhrverbot.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEinfuhrverbot.vb
+++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEinfuhrverbot.vb
@@ -0,0 +1,89 @@
+Public Class usrcntlEinfuhrverbot
+    Implements FormualrInterface
+
+    Public Event CHANGED(name, value)
+    Public Event KDNR_CHANGED(kdnr)
+    Public Event DELETE(c As Control)
+    Public Event MOVE_UP(c As Control)
+    Public Event MOVE_DOWN(c As Control)
+
+    Public KdNR As Integer = -1
+    Public Sub ChangeKDNr(kdnr As Integer) _
+       Implements FormualrInterface.ChangeKDNr
+        'initKdNR(kdnr)
+        txtFirma.KdNr = kdnr
+    End Sub
+
+    Sub initControlsHandler()
+        For Each c In Me.Controls
+            Select Case c.GetType.ToString
+                Case GetType(VERAG_PROG_ALLGEMEIN.MyTextBox).ToString
+                    AddHandler DirectCast(c, VERAG_PROG_ALLGEMEIN.MyTextBox).Leave, Sub()
+                                                                                        RaiseEvent CHANGED(c.name, c.text)
+                                                                                    End Sub
+                Case GetType(VERAG_PROG_ALLGEMEIN.MyComboBox).ToString
+                    AddHandler DirectCast(c, VERAG_PROG_ALLGEMEIN.MyComboBox).SelectedIndexChanged, Sub()
+                                                                                                        RaiseEvent CHANGED(c.name, c._value)
+                                                                                                    End Sub
+                Case GetType(TextBox).ToString
+                    AddHandler DirectCast(c, TextBox).Leave, Sub()
+                                                                 RaiseEvent CHANGED(c.name, c.text)
+                                                             End Sub
+            End Select
+        Next
+    End Sub
+
+    Private Sub btnDel_Click(sender As Object, e As EventArgs) Handles btnDel.Click
+        RaiseEvent DELETE(Me)
+    End Sub
+
+    Private Sub btnup_Click(sender As Object, e As EventArgs) Handles btnUp.Click
+        RaiseEvent MOVE_UP(Me)
+    End Sub
+
+    Private Sub btnDown_Click(sender As Object, e As EventArgs) Handles btnDown.Click
+        RaiseEvent MOVE_DOWN(Me)
+    End Sub
+
+    Private Sub Button1_Click(sender As Object, e As EventArgs)
+
+    End Sub
+
+    Private Sub usrcntlEinfuhrverbot_Load(sender As Object, e As EventArgs) Handles Me.Load
+
+        txtFirma.initKdBox(Me.FindForm)
+        AddHandler txtFirma.PropertyChanged, Sub()
+                                                 Me.KdNR = txtFirma.KdNr_value
+                                                 If txtFirma.KdNr_value > 0 Then
+                                                     If txtFirma.KdData_ADRESSEN IsNot Nothing Then
+                                                         Dim ADRESSE = txtFirma.KdData_ADRESSEN
+                                                         Dim KUNDE = txtFirma.KdData_KUNDE
+                                                         txtFirma.Text = If(ADRESSE.Name_1, ADRESSE.Ordnungsbegriff)
+                                                         txtAdresse1.Text = If(ADRESSE.Straße, "")
+                                                         txtAdresse2.Text = (If(ADRESSE.LandKz, "") & " " & If(ADRESSE.PLZ, "") & " " & If(ADRESSE.Ort, "")).ToString.Trim
+                                                     End If
+                                                 End If
+                                                 RaiseEvent KDNR_CHANGED(KdNR)
+                                             End Sub
+        initControlsHandler()
+        cboSprache.Items.Clear()
+        cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Deutsch", "DE"))
+        cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Englisch", "EN"))
+        cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Türkisch", "TR"))
+
+        cboSprache.changeItem("EN")
+
+        If KdNR > 0 Then txtFirma.KdNr = KdNR
+
+    End Sub
+
+    Private Sub pic_Click(sender As Object, e As EventArgs) Handles pic.Click
+        FormularManagerNEU.genPDF(Me, True)
+    End Sub
+
+
+
+    Private Sub PictureBox1_Click(sender As Object, e As EventArgs)
+        FormularManagerNEU.genPDF(Me, , , , True)
+    End Sub
+End Class
--- a/SDL/Formulare/KDFormulare/frmFormulare.vb
+++ b/SDL/Formulare/KDFormulare/frmFormulare.vb
@@ -286,6 +286,7 @@ Public Class frmFormulare
                MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Auftrag Überwachungsdokument", FormularManagerArten.QS_UeDok))

                MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Qualitätskontrolle Antrag", FormularManagerArten.Qualitaetskontrolle))
+                MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Y824 / EU VO 833/2014", FormularManagerArten.Einfuhrverbot))
                ' MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VerpflichtungserklärungFahrer", FormularManagerArten.VerpflichtungserklärungFahrer))


@@ -788,7 +789,15 @@ Public Class frmFormulare
                        MyFlowLayoutPanel1.Controls.Add(c)
                    End If

-
+                Case FormularManagerArten.Einfuhrverbot
+                    Dim displayName = ""
+                    Dim c As New usrcntlEinfuhrverbot
+                    c.Width = MyFlowLayoutPanel1.Width - 6
+                    c.KdNR = KdNr
+                    AddHandler c.DELETE, AddressOf ControlDELETE
+                    AddHandler c.MOVE_UP, AddressOf ControlMoveUp
+                    AddHandler c.MOVE_DOWN, AddressOf ControlMoveDown
+                    MyFlowLayoutPanel1.Controls.Add(c)


                Case Else '"VUB_AG", "VUB_CS"
@@ -1282,10 +1291,6 @@ Public Class frmFormulare
                    addForm(FormularManagerArten.Verzollungspreise, {"VZ_FISKAL_DE"})
                    addForm(FormularManagerArten.VUB_AG)
                    addForm(FormularManagerArten.DE_InformationsblattFiskalverzollung)
-
-
-
-
                Case FormularVorlagenGruppe.NeukundeAT_IMEX
                    MyFlowLayoutPanel1.Controls.Clear()
                    addForm(FormularManagerArten.AT_Vollmacht_EV)
@@ -1402,6 +1407,9 @@ Public Class FormularManagerNEU
            Case GetType(usrCntlZollbeschau).ToString
                retStr = FormularManagerNEU.Zollbeschau(c)

+            Case GetType(usrcntlEinfuhrverbot).ToString
+                retStr = FormularManagerNEU.Einfuhrverbot(c)
+
        End Select
        If retStr <> "" Then
            striList.Add(retStr)
@@ -2057,7 +2065,6 @@ Public Class FormularManagerNEU


                Case "AMBAR"
-                    'test
                    rpt.txtFirmaInfo_VERAG.Visible = False
                    rpt.txtFirmeninfo_ambar.Visible = True
                    rpt.picVERAG.Image = My.Resources.ambar_simple1
@@ -5407,6 +5414,25 @@ Public Class FormularManagerNEU
        Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "Zollstopp", listTowrite)
    End Function

+
+    Shared Function Einfuhrverbot(usrcntl As usrcntlEinfuhrverbot) As String
+        Dim fm As New VERAG_PROG_ALLGEMEIN.cFormularManager
+
+        Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues)
+
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrcntl.txtFirma.Text, 40, 150, 100, 20, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrcntl.txtAdresse1.Text, 40, 155, 110, 20, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrcntl.txtAdresse2.Text, 40, 160, 110, 20, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT))
+
+        Select Case usrcntl.cboSprache._value
+            Case "EN"
+                Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "Import_prohibition_EN", listTowrite)
+            Case Else
+                Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "Import_prohibition_EN", listTowrite)
+        End Select
+
+    End Function
+
    Shared Function Bonitaetsauskunft(usrCntl As usrcntlCreditreformBoniAuskunft) As String
        Dim fm As New VERAG_PROG_ALLGEMEIN.cFormularManager

@@ -5896,6 +5922,7 @@ Public Class FormularManagerArten
    Shared Property Zollbeschau_Protokoll = "Zollbeschau Protokoll"

    Shared Property Qualitaetskontrolle = "Qualitätskontrolle"
+    Shared Property Einfuhrverbot = "Y824 / EU VO 833/2014"



--- a/SDL/SDL.vbproj
+++ b/SDL/SDL.vbproj
@@ -610,6 +610,12 @@
    <Compile Include="Formulare\KDFormulare\FormulareBaukasten\usrCntlQualitaetskontrolle.vb">
      <SubType>UserControl</SubType>
    </Compile>
+    <Compile Include="Formulare\KDFormulare\FormulareBaukasten\usrcntlEinfuhrverbot.Designer.vb">
+      <DependentUpon>usrcntlEinfuhrverbot.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Formulare\KDFormulare\FormulareBaukasten\usrcntlEinfuhrverbot.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
    <Compile Include="Formulare\KDFormulare\FormulareBaukasten\usrcntlVollmacht_DE_indirekt.Designer.vb">
      <DependentUpon>usrcntlVollmacht_DE_indirekt.vb</DependentUpon>
    </Compile>
@@ -3113,6 +3119,9 @@
    <EmbeddedResource Include="Formulare\KDFormulare\FormulareBaukasten\usrCntlQualitaetskontrolle.resx">
      <DependentUpon>usrCntlQualitaetskontrolle.vb</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="Formulare\KDFormulare\FormulareBaukasten\usrcntlEinfuhrverbot.resx">
+      <DependentUpon>usrcntlEinfuhrverbot.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="Formulare\KDFormulare\FormulareBaukasten\usrcntlVollmacht_DE_indirekt.resx">
      <DependentUpon>usrcntlVollmacht_DE_indirekt.vb</DependentUpon>
    </EmbeddedResource>
--- a/SDL/frmEssensbestellungen.vb
+++ b/SDL/frmEssensbestellungen.vb
@@ -28,7 +28,7 @@ Public Class frmEssensbestellungen
        loadDGVBestellungen()

        cbxGebauede.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Frontoffice", "Frontoffice"))
-        cbxGebauede.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Backoffice", "Backoffice"))
+        'cbxGebauede.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Backoffice", "Backoffice"))
        cbxGebauede.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verag VERR", "Verag Verrechnung"))
        cbxGebauede.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Maut", "Maut"))
        cbxGebauede.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Suben West", "Suben West"))
--- a/SDL/frmEssensbestellungenAdministration.vb
+++ b/SDL/frmEssensbestellungenAdministration.vb
@@ -11,7 +11,7 @@ Public Class frmEssensbestellungenAdministration

    Private Sub frmEssensbestellungenAdministration_Load(sender As Object, e As EventArgs) Handles MyBase.Load
        lblWarning.Text = ""
-        txtBestellDat.Text = Date.Parse("01.01.2001")
+        txtBestellDat.Text = Today.ToShortDateString 'Date.Parse("01.01.2001")
        txtBestellDatBis.Text = Today.AddDays(7).ToShortDateString
        btnMonat.Text = MONAT.ToString("MMMM")
        btnJahr.Text = JAHR.Year
@@ -31,7 +31,7 @@ Public Class frmEssensbestellungenAdministration

        cbKW.fillWithSQL("SELECT DISTINCT(eb_kw) FROM [tblEssensbestellungen]  UNION SELECT (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' +  Convert(varchar, Year(MenuDateVon)) as kwDateNew FROM [tblEBMenu] where MenuDateVon > GETDATE() ORDER BY eb_kw desc", False, "AVISO", True)

-        cbxMailKW.fillWithSQL("SELECT DISTINCT(eb_kw) FROM [tblEssensbestellungen] ORDER BY eb_kw desc", False, "AVISO", True)
+        cbxMailKW.fillWithSQL("SELECT top(30) DISTINCT(eb_kw) FROM [tblEssensbestellungen] ORDER BY eb_kw desc", False, "AVISO", True)
        cbxMailKW.changeItem("")

        cbxMailGebäude.changeItem("")
@@ -720,6 +720,19 @@ Public Class frmEssensbestellungenAdministration
        Next


+
+        Dim SQLStringMenues As String = "SELECT TOP (1)  [MenuEssenMoDate] as Montag
+                                                ,[MenuEssenDiDate] as Dienstag
+                                                ,[MenuEssenMiDate] as Mittwoch
+                                                ,[MenuEssenDoDate] as Donnerstag
+                                                ,[MenuEssenFrDate] as Freitag
+                                    FROM 
+                                    [tblEBMenu] WHERE eb_kw = '" & cbxMailKW._value & "' AND eb_gebaeude = '" & cbxMailGebäude._value & "' AND ISNULL(eb_storniert,1)=0 " & sqlWhere & " Order by eb_datum"
+
+        Dim dtMenu = SQL.loadDgvBySql(SQLStringMenues, "AVISO", 100, True)
+
+
+
        Dim R As DataRow = dtBestellungen.NewRow
        R("ID") = "0"
        R("KW") = "-"
--- a/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb
+++ b/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb
@@ -35,10 +35,12 @@ Partial Class frmKundenUebersichtZOLL
        Me.tabZolltarife = New System.Windows.Forms.TabPage()
        Me.pnlZollTarife = New System.Windows.Forms.Panel()
        Me.tabKundendaten = New System.Windows.Forms.TabPage()
+        Me.usrcntlKundenuebersicht = New SDL.usrCntlKundenuebersicht()
        Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
        Me.tbcntrKundenDaten = New System.Windows.Forms.TabControl()
        Me.TabPage1 = New System.Windows.Forms.TabPage()
+        Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte()
        Me.tbStatistik = New System.Windows.Forms.TabPage()
        Me.cboKundenblattFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Button1 = New System.Windows.Forms.Button()
@@ -93,6 +95,7 @@ Partial Class frmKundenUebersichtZOLL
        Me.Label40 = New System.Windows.Forms.Label()
        Me.tbSpeditionsbuch = New System.Windows.Forms.TabPage()
        Me.tbFiskaluebersicht = New System.Windows.Forms.TabPage()
+        Me.UsrcntlFiskaluebersicht1 = New SDL.usrcntlFiskaluebersicht()
        Me.tbCBAM = New System.Windows.Forms.TabPage()
        Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon(Me.components)
        Me.Panel1 = New System.Windows.Forms.Panel()
@@ -121,6 +124,7 @@ Partial Class frmKundenUebersichtZOLL
        Me.VeragCustomsServiceToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMenuItem19 = New System.Windows.Forms.ToolStripMenuItem()
        Me.EORIAntragToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.EinfuhrverbotToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.mnueCBAM = New System.Windows.Forms.ToolStripMenuItem()
        Me.mnueFiskaluebersicht = New System.Windows.Forms.ToolStripMenuItem()
        Me.mnueFiskal = New System.Windows.Forms.ToolStripMenuItem()
@@ -148,9 +152,6 @@ Partial Class frmKundenUebersichtZOLL
        Me.PDFLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.usrcntlKundenuebersicht = New SDL.usrCntlKundenuebersicht()
-        Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte()
-        Me.UsrcntlFiskaluebersicht1 = New SDL.usrcntlFiskaluebersicht()
        Me.ContextMenuStrip1.SuspendLayout()
        Me.tabZolltarife.SuspendLayout()
        Me.tabKundendaten.SuspendLayout()
@@ -223,6 +224,17 @@ Partial Class frmKundenUebersichtZOLL
        Me.tabKundendaten.TabIndex = 0
        Me.tabKundendaten.Text = "Kundendaten"
        '
+        'usrcntlKundenuebersicht
+        '
+        Me.usrcntlKundenuebersicht.BackColor = System.Drawing.Color.White
+        Me.usrcntlKundenuebersicht.BER_STUFE = 0
+        Me.usrcntlKundenuebersicht.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.usrcntlKundenuebersicht.Location = New System.Drawing.Point(3, 3)
+        Me.usrcntlKundenuebersicht.Margin = New System.Windows.Forms.Padding(2)
+        Me.usrcntlKundenuebersicht.Name = "usrcntlKundenuebersicht"
+        Me.usrcntlKundenuebersicht.Size = New System.Drawing.Size(1176, 691)
+        Me.usrcntlKundenuebersicht.TabIndex = 0
+        '
        'ContextMenuStrip2
        '
        Me.ContextMenuStrip2.ImageScalingSize = New System.Drawing.Size(24, 24)
@@ -268,6 +280,16 @@ Partial Class frmKundenUebersichtZOLL
        Me.TabPage1.TabIndex = 2
        Me.TabPage1.Text = "Offerte"
        '
+        'UsrCntlOfferte1
+        '
+        Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrCntlOfferte1.Location = New System.Drawing.Point(3, 3)
+        Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(2)
+        Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1"
+        Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1176, 691)
+        Me.UsrCntlOfferte1.TabIndex = 0
+        '
        'tbStatistik
        '
        Me.tbStatistik.BackColor = System.Drawing.Color.White
@@ -955,6 +977,15 @@ Partial Class frmKundenUebersichtZOLL
        Me.tbFiskaluebersicht.Text = "Fiskal-Analyse"
        Me.tbFiskaluebersicht.UseVisualStyleBackColor = True
        '
+        'UsrcntlFiskaluebersicht1
+        '
+        Me.UsrcntlFiskaluebersicht1.BackColor = System.Drawing.Color.White
+        Me.UsrcntlFiskaluebersicht1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrcntlFiskaluebersicht1.Location = New System.Drawing.Point(0, 0)
+        Me.UsrcntlFiskaluebersicht1.Name = "UsrcntlFiskaluebersicht1"
+        Me.UsrcntlFiskaluebersicht1.Size = New System.Drawing.Size(1182, 697)
+        Me.UsrcntlFiskaluebersicht1.TabIndex = 0
+        '
        'tbCBAM
        '
        Me.tbCBAM.Location = New System.Drawing.Point(4, 25)
@@ -1084,7 +1115,7 @@ Partial Class frmKundenUebersichtZOLL
        'mneFormulare
        '
        Me.mneFormulare.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.mneFormulare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MANAGERToolStripMenuItem, Me.ToolStripSeparator3, Me.ToolStripMenuItem4, Me.ToolStripMenuItem9, Me.ToolStripMenuItem10, Me.ToolStripMenuItem14, Me.ToolStripMenuItem16, Me.ToolStripMenuItem17, Me.ToolStripMenuItem19, Me.EORIAntragToolStripMenuItem})
+        Me.mneFormulare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MANAGERToolStripMenuItem, Me.ToolStripSeparator3, Me.ToolStripMenuItem4, Me.ToolStripMenuItem9, Me.ToolStripMenuItem10, Me.ToolStripMenuItem14, Me.ToolStripMenuItem16, Me.ToolStripMenuItem17, Me.ToolStripMenuItem19, Me.EORIAntragToolStripMenuItem, Me.EinfuhrverbotToolStripMenuItem})
        Me.mneFormulare.Enabled = False
        Me.mneFormulare.Font = New System.Drawing.Font("Segoe UI", 9.0!)
        Me.mneFormulare.ForeColor = System.Drawing.Color.White
@@ -1202,6 +1233,12 @@ Partial Class frmKundenUebersichtZOLL
        Me.EORIAntragToolStripMenuItem.Size = New System.Drawing.Size(242, 22)
        Me.EORIAntragToolStripMenuItem.Text = "EORI Antrag"
        '
+        'EinfuhrverbotToolStripMenuItem
+        '
+        Me.EinfuhrverbotToolStripMenuItem.Name = "EinfuhrverbotToolStripMenuItem"
+        Me.EinfuhrverbotToolStripMenuItem.Size = New System.Drawing.Size(242, 22)
+        Me.EinfuhrverbotToolStripMenuItem.Text = "Y824 / EU VO 833/2014"
+        '
        'mnueCBAM
        '
        Me.mnueCBAM.Enabled = False
@@ -1468,36 +1505,6 @@ Partial Class frmKundenUebersichtZOLL
        Me.DataGridViewTextBoxColumn2.HeaderText = "KundenNr"
        Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2"
        '
-        'usrcntlKundenuebersicht
-        '
-        Me.usrcntlKundenuebersicht.BackColor = System.Drawing.Color.White
-        Me.usrcntlKundenuebersicht.BER_STUFE = 0
-        Me.usrcntlKundenuebersicht.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.usrcntlKundenuebersicht.Location = New System.Drawing.Point(3, 3)
-        Me.usrcntlKundenuebersicht.Margin = New System.Windows.Forms.Padding(2)
-        Me.usrcntlKundenuebersicht.Name = "usrcntlKundenuebersicht"
-        Me.usrcntlKundenuebersicht.Size = New System.Drawing.Size(1176, 691)
-        Me.usrcntlKundenuebersicht.TabIndex = 0
-        '
-        'UsrCntlOfferte1
-        '
-        Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrCntlOfferte1.Location = New System.Drawing.Point(3, 3)
-        Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(2)
-        Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1"
-        Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1176, 691)
-        Me.UsrCntlOfferte1.TabIndex = 0
-        '
-        'UsrcntlFiskaluebersicht1
-        '
-        Me.UsrcntlFiskaluebersicht1.BackColor = System.Drawing.Color.White
-        Me.UsrcntlFiskaluebersicht1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrcntlFiskaluebersicht1.Location = New System.Drawing.Point(0, 0)
-        Me.UsrcntlFiskaluebersicht1.Name = "UsrcntlFiskaluebersicht1"
-        Me.UsrcntlFiskaluebersicht1.Size = New System.Drawing.Size(1182, 697)
-        Me.UsrcntlFiskaluebersicht1.TabIndex = 0
-        '
        'frmKundenUebersichtZOLL
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1669,4 +1676,5 @@ Partial Class frmKundenUebersichtZOLL
    Friend WithEvents EORIAntragToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents tbCBAM As TabPage
    Friend WithEvents mnueCBAM As ToolStripMenuItem
+    Friend WithEvents EinfuhrverbotToolStripMenuItem As ToolStripMenuItem
 End Class
--- a/SDL/kunden/frmKundenUebersichtZOLL.vb
+++ b/SDL/kunden/frmKundenUebersichtZOLL.vb
@@ -1443,7 +1443,9 @@ Public Class frmKundenUebersichtZOLL
        changeTab(8, mnueStatistik)
    End Sub

-
+    Private Sub EinfuhrverbotToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EinfuhrverbotToolStripMenuItem.Click
+        SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.Einfuhrverbot, kdNr, {})
+    End Sub
 End Class


--- a/SDL/kunden/frmKundenZOLLVollmachten.vb
+++ b/SDL/kunden/frmKundenZOLLVollmachten.vb
@@ -1,20 +1,4 @@
-Imports System.Web.UI.WebControls.Expressions
-Imports System.Windows
-Imports System.Windows.Interop
-Imports com.sun.org.apache.xpath.internal.functions
-Imports DAKOSY_Worker.TR100
-Imports DocumentFormat.OpenXml.Drawing
-Imports DocumentFormat.OpenXml.Drawing.Charts
-'Imports DocumentFormat.OpenXml.Wordprocessing
-Imports GrapeCity.ActiveReports
-Imports GrapeCity.ActiveReports.Design.DdrDesigner.Services
-Imports GrapeCity.ActiveReports.Design.QueryDesignerImpl.SqlParser.Irony.Parsing
-Imports javax.validation.constraints
-Imports sun.misc
-Imports TAlex.WPF.Helpers
-Imports SDL.EORI
-Imports System.Drawing
-Imports System.Runtime.DesignerServices
+

 Public Class frmKundenZOLLVollmachten
    Public kdnr As Integer = -1
@@ -23,13 +7,13 @@ Public Class frmKundenZOLLVollmachten
    Public archiviert As Boolean = False
    Public geloescht As Boolean = False
    Dim id As Integer = -1
-    'Dim cDATENSERVER As New VERAG_PROG_ALLGEMEIN.cDATENSERVER
    Dim ksql As New kundenSQL
    Dim vollmachtartId As Integer
    Dim emailId As Integer
    Dim vermerk As String = ""
    Dim vmId As Integer = -1
    Dim currentVM As New VERAG_PROG_ALLGEMEIN.cKundenVollmachten
+    Dim enableEdit As Boolean = False

    Sub New(kdnr, vollmachtartId)
        Me.InitializeComponent()
@@ -68,14 +52,28 @@ Public Class frmKundenZOLLVollmachten
                'Me.Height = Me.Height - Panel1.Height
        End Select

+        Dim KUNDE = New VERAG_PROG_ALLGEMEIN.cKunde(kdnr)
+        Dim KdFirma = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(KUNDE.FilialenNr)
+        If KdFirma <> VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Then
+            enableEdit = False
+            btnNeu.Enabled = False
+            If Not (KdFirma = "IMEX" And VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO")) Then
+                If Not VERAG_PROG_ALLGEMEIN.cAllgemein.isCLUSTER Then
+                    If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_CLUSTER", "SDL") And
+                         ((KdFirma = "IMEX" Or KdFirma = "VERAG" Or KdFirma = "VERIMEX") And VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL")) Then
+                        btnNeu.Enabled = True
+                        enableEdit = True
+                    End If
+                End If
+            End If

-    End Sub
+        Else
+            btnNeu.Enabled = True
+            enableEdit = True

+        End If


-
-    Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click
-
    End Sub

    Sub saveVM(VM As VERAG_PROG_ALLGEMEIN.cKundenVollmachten)
@@ -178,16 +176,16 @@ Public Class frmKundenZOLLVollmachten


        Dim FirmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
-        Dim where = " And art.kdvma_Firma='" & FirmaTmp & "'"
+        Dim where = "" '" And art.kdvma_Firma='" & FirmaTmp & "'"

-        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGIMEX", "SDL") Then
-            FirmaTmp = "VERAGIMEX"
-        End If
+        'If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGIMEX", "SDL") Then
+        '    FirmaTmp = "VERAGIMEX"
+        'End If

-        Select Case FirmaTmp
-            Case "VERAGIMEX"
-                where = " AND  art.kdvma_Firma IN ('VERAG', 'IMEX') "
-        End Select
+        'Select Case FirmaTmp
+        '    Case "VERAGIMEX"
+        '        where = " AND  art.kdvma_Firma IN ('VERAG', 'IMEX') "
+        'End Select



@@ -195,7 +193,7 @@ Public Class frmKundenZOLLVollmachten
            dgvVollmachtenEmbedded.Enabled = True
        End If

-        pnlDetails.Enabled = enalblePanel
+        pnlDetails.Enabled = IIf(enableEdit, enalblePanel, enableEdit)

        With dgvVollmachtenEmbedded
            .Columns.Clear()
@@ -297,6 +295,8 @@ Public Class frmKundenZOLLVollmachten

    Private Sub dgvvollmachtenembedded_cellmouseclick(sender As Object, e As DataGridViewCellMouseEventArgs) Handles dgvVollmachtenEmbedded.CellMouseClick
        'für die Ermittlung des Contextmenüs -> VM löschen
+        If Not enableEdit Then Exit Sub
+
        If e.Button = Windows.Forms.MouseButtons.Right Then
            If dgvVollmachtenEmbedded.SelectedRows.Count > 0 Then
                ContextMenuStrip1.Show(Cursor.Position)
@@ -317,7 +317,7 @@ Public Class frmKundenZOLLVollmachten
    End Sub

    Private Sub loadChangedVMToPanel(enablePanel As Boolean, VM As VERAG_PROG_ALLGEMEIN.cKundenVollmachten)
-        pnlDetails.Enabled = enablePanel
+        pnlDetails.Enabled = IIf(enableEdit, enablePanel, enableEdit)

        cbxArchiviert.Checked = VM.kdvm_archiviert
        txtVermerk.Text = VM.kdvm_vermerk
--- a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb
+++ b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb
@@ -22,6 +22,7 @@ Partial Class usrCntlKundenuebersicht
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
@@ -35,7 +36,7 @@ Partial Class usrCntlKundenuebersicht
        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Me.cntxtAddVM = New System.Windows.Forms.ContextMenuStrip()
+        Me.cntxtAddVM = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.DToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.btnExcel = New System.Windows.Forms.Button()
        Me.lblInaktiv = New System.Windows.Forms.Label()
@@ -102,7 +103,7 @@ Partial Class usrCntlKundenuebersicht
        Me.Label33 = New System.Windows.Forms.Label()
        Me.txtUmsatzJahr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.Label29 = New System.Windows.Forms.Label()
-        Me.cbxFiskalabfertigung = New VERAG_PROG_ALLGEMEIN.MyCheckbox()
+        Me.cbxFiskalabfertigung = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components)
        Me.lblFisk = New System.Windows.Forms.Label()
        Me.txtAbf_ErsteAbfertigung = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.Label41 = New System.Windows.Forms.Label()
@@ -226,25 +227,25 @@ Partial Class usrCntlKundenuebersicht
        Me.lblUid = New System.Windows.Forms.TextBox()
        Me.lblEORI = New System.Windows.Forms.TextBox()
        Me.lblEORINr = New System.Windows.Forms.Label()
-        Me.dgvAufschub = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
+        Me.dgvAufschub = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.KtoId = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.Art = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.HZA = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.KontoNr = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.EORI = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.NL = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip()
+        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.KopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip()
+        Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ÄndernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.HochladenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ScannenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.PDFLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip()
+        Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
        Me.lblFirma = New System.Windows.Forms.Label()
-        Me.ContextMenuStrip4 = New System.Windows.Forms.ContextMenuStrip()
+        Me.ContextMenuStrip4 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMenuItem4 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMenuItem5 = New System.Windows.Forms.ToolStripMenuItem()
--- a/SDL/kunden/usrCntlKundenuebersicht.vb
+++ b/SDL/kunden/usrCntlKundenuebersicht.vb
@@ -230,7 +230,6 @@ Public Class usrCntlKundenuebersicht

            End Select

-
            If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("UID_EORI_Prüfung", "SDL") Then
                If Not VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then
                    Button1.Visible = True
@@ -372,6 +371,7 @@ Public Class usrCntlKundenuebersicht
            If KdFirma <> VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Then
                lblFirma.Text = KdFirma
                lblFirma.Visible = True
+                btnVMhinzufuegen.Enabled = False
                If Not (KdFirma = "IMEX" And VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO")) Then
                    If Not VERAG_PROG_ALLGEMEIN.cAllgemein.isCLUSTER Then
                        If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_CLUSTER", "SDL") And
@@ -381,6 +381,8 @@ Public Class usrCntlKundenuebersicht
                            dgvUmsatzbericht.Visible = False
                            usrCntlAnhaenge.Visible = False
                            rtbAbf_Besonderheiten.Visible = False
+                        Else
+                            btnVMhinzufuegen.Enabled = True
                        End If
                    End If
                End If
@@ -389,6 +391,7 @@ Public Class usrCntlKundenuebersicht
                    dgvOffenePosten.Visible = True
                End If
            Else
+                btnVMhinzufuegen.Enabled = True
                lblFirma.Visible = False
            End If
            ' Me.dataFirma.AcceptChanges()
@@ -802,21 +805,21 @@ Public Class usrCntlKundenuebersicht
        With dgvVollmachten
            .Columns.Clear()
            Dim FirmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
-            Dim where = " AND art.kdvma_Firma='" & FirmaTmp & "' "
+            Dim where = "" '" AND art.kdvma_Firma='" & FirmaTmp & "' "

-            If VERAG_PROG_ALLGEMEIN.cAllgemein.isCLUSTER Then
-                where = " AND art.kdvma_Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(KUNDE.FilialenNr) & "' "
-            End If
+            'If VERAG_PROG_ALLGEMEIN.cAllgemein.isCLUSTER Then
+            '    where = " AND art.kdvma_Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(KUNDE.FilialenNr) & "' "
+            'End If


-            If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGIMEX", "SDL") Then
-                FirmaTmp = "VERAGIMEX"
-            End If
+            'If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGIMEX", "SDL") Then
+            '    FirmaTmp = "VERAGIMEX"
+            'End If

-            Select Case FirmaTmp
-                Case "VERAGIMEX"
-                    where = " AND  art.kdvma_Firma IN ('VERAG', 'IMEX') "
-            End Select
+            'Select Case FirmaTmp
+            '    Case "VERAGIMEX"
+            '        where = " AND  art.kdvma_Firma IN ('VERAG', 'IMEX') "
+            'End Select



@@ -1615,7 +1618,6 @@ Public Class usrCntlKundenuebersicht
        If dgvVollmachten.Columns(e.ColumnIndex).Name = "clmnPDF" Then

            If dgvVollmachten.Rows(e.RowIndex).Cells("kdvm_datenarchivId").Value IsNot DBNull.Value AndAlso CInt(dgvVollmachten.Rows(e.RowIndex).Cells("kdvm_datenarchivId").Value) > 0 Then
-                ' cDATENSERVER.openDataTMPByDatenarchivId(dgvVollmachten.Rows(e.RowIndex).Cells("kdvm_datenarchivId").Value)
                Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dgvVollmachten.Rows(e.RowIndex).Cells("kdvm_datenarchivId").Value)
                DS.OPEN_SINGLE(True)
            End If
@@ -1626,13 +1628,9 @@ Public Class usrCntlKundenuebersicht

                If tmprowindex < 0 Then Exit Sub
                Dim frmGrayOut = cProgramFunctions.grayoutForm(Me)
-                'Dim datum = IIf(dgvVollmachten.Rows(tmprowindex).Cells("kdvm_erhalten_Datum").Value Is DBNull.Value, Now, dgvVollmachten.Rows(tmprowindex).Cells("kdvm_erhalten_Datum").Value)
-                'Dim gueltigBis = IIf(dgvVollmachten.Rows(tmprowindex).Cells("kdvm_gueltig_bis").Value Is DBNull.Value, Nothing, dgvVollmachten.Rows(tmprowindex).Cells("kdvm_gueltig_bis").Value)
-                'Dim l As New frmKundenZOLLVollmachten(kdNr, dgvVollmachten.Rows(tmprowindex).Cells("kdvma_Id").Value, dgvVollmachten.Rows(tmprowindex).Cells("kdvma_Id").Value, dgvVollmachten.Rows(tmprowindex).Cells("kdvm_erhalten").Value, dgvVollmachten.Rows(tmprowindex).Cells("kdvm_archiviert").Value, dgvVollmachten.Rows(tmprowindex).Cells("kdvm_erhalten_Datum").Value, dgvVollmachten.Rows(tmprowindex).Cells("kdvm_gueltig_bis").Value, dgvVollmachten.Rows(tmprowindex).Cells("kdvm_vermerk").Value, dgvVollmachten.Rows(tmprowindex).Cells("kdvm_datenarchivId").Value)
                Dim l As New frmKundenZOLLVollmachten(kdNr, dgvVollmachten.Rows(tmprowindex).Cells("kdvma_Id").Value) '
                If l.ShowDialog(frmGrayOut) = DialogResult.OK Then
                    l.initDGVVollmachtenEmbedded(False)
-                    'initDGVVollmachten()
                End If
                frmGrayOut.Close()
                initDGVVollmachten()
--- a/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb
@@ -374,7 +374,7 @@ Public Class cMessenger
        End Function

        Public Function READ_ALL_MESSAGES() As Boolean
-            Dim sqlstr = "UPDATE tblMessenger_ChatMessageStatus SET chatMgSt_gelesen=1  FROM [tblMessenger_Chat] INNER JOIN tblMessenger_ChatMessages ON [chat_id]=chatMg_chatId  INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chat_id=" & Me.chat_id & " AND chatMgSt_MaId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & " AND chatMgSt_gelesen=0  "
+            Dim sqlstr = "UPDATE tblMessenger_ChatMessageStatus SET chatMgSt_gelesen=1, chatMgSt_datetimeGelesen = GETDATE() FROM [tblMessenger_Chat] INNER JOIN tblMessenger_ChatMessages ON [chat_id]=chatMg_chatId  INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chat_id=" & Me.chat_id & " AND chatMgSt_MaId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & " AND chatMgSt_gelesen=0  "
            Return SQL.doSQL(sqlstr, "ADMIN")
        End Function

@@ -634,7 +634,6 @@ Public Class cMessenger
            Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
            list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_chatMsgId", chatMgSt_chatMsgId))
            list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_MaId", chatMgSt_MaId))
-
            list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_gelesen", chatMgSt_gelesen))
            list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_datetime", chatMgSt_datetime))

@@ -898,11 +897,12 @@ Public Class cMessenger
                If CHAT_MEMBERS IsNot Nothing Then
                    For Each MB In CHAT_MEMBERS
                        Dim gelesen = False
+                        Dim gelesenDatetime = Nothing
                        If MB.chatMb_maId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID Then
                            gelesen = True
+                            gelesenDatetime = Now()
                        End If
-                        Dim STAT As New cMessenger_ChatMessageStatus(Me.chatMg_id, MB.chatMb_maId, gelesen)
-
+                        Dim STAT As New cMessenger_ChatMessageStatus(Me.chatMg_id, MB.chatMb_maId, gelesen, gelesenDatetime)
                        STAT.SAVE()
                    Next
                End If
@@ -961,6 +961,7 @@ Public Class cMessenger
        Property chatMgSt_RM_Option As Object = Nothing
        Property chatMgSt_RM_Text As Object = Nothing
        Property chatMgSt_datetimeBestaetigt As Object = Nothing
+        Property chatMgSt_datetimeGelesen As Object = Nothing

        Dim SQL As New SQL

@@ -971,13 +972,14 @@ Public Class cMessenger
            LOAD()
        End Sub

-        Sub New(chatMgSt_chatMsgId, chatMgSt_MaId, chatMgSt_gelesen, Optional chatMgSt_art = "STAT", Optional chatMgSt_flag = False)
+        Sub New(chatMgSt_chatMsgId, chatMgSt_MaId, chatMgSt_gelesen, chatMgSt_datetimeGelesen, Optional chatMgSt_art = "STAT", Optional chatMgSt_flag = False, Optional chatMgSt_bestaetigt = Nothing)
            Me.chatMgSt_chatMsgId = chatMgSt_chatMsgId
            Me.chatMgSt_MaId = chatMgSt_MaId
            Me.chatMgSt_gelesen = chatMgSt_gelesen
            '  Me.chatMgSt_art = chatMgSt_art
            Me.chatMgSt_flag = chatMgSt_flag
            Me.chatMgSt_bestaetigt = chatMgSt_bestaetigt
+            Me.chatMgSt_datetimeGelesen = IIf(chatMgSt_datetimeGelesen = Nothing, DBNull.Value, chatMgSt_datetimeGelesen)
        End Sub

        Sub New(chatMgSt_chatMsgId, chatMgSt_MaId, chatMgSt_gelesen, chatMgSt_bestaetigt, chatMgSt_RM_Option, chatMgSt_RM_Text)
@@ -1002,6 +1004,7 @@ Public Class cMessenger
            list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_RM_Option", chatMgSt_RM_Option))
            list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_RM_Text", chatMgSt_RM_Text))
            list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_datetimeBestaetigt", [chatMgSt_datetimeBestaetigt]))
+            list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMgSt_datetimeGelesen", chatMgSt_datetimeGelesen))

            Return list
        End Function
--- a/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb
@@ -306,8 +306,8 @@ Public Class cMitarbeiter
    'End Sub


-    Public Function LOAD(ByVal id As Integer) As Boolean
-        Dim sqlstr As String = "SELECT * FROM tblMitarbeiter WHERE mit_id = " & id & ""
+    Public Function LOAD(ByVal id As Integer, Optional isTimas As Boolean = False) As Boolean
+        Dim sqlstr As String = "SELECT * FROM tblMitarbeiter WHERE " & IIf(isTimas, "mit_timasId = " & id & "", "mit_id = " & id & "")
        '  adasdas()
        '       Dim d As VERAG_PROG_ALLGEMEIN.cMitarbeiter = Nothing
        Try
--- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/frmVorlagenUpload.vb
+++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/frmVorlagenUpload.vb
@@ -1,11 +1,9 @@
 Public Class frmVorlagenUpload

-
-
-
    Private Sub btnUpload_Click(sender As Object, e As EventArgs) Handles btnUpload.Click
        Try
            Dim cDATENSERVER As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(tzxtKategorie.Text, txtOrdner.Text, txtUnterordner1._value, txtUnterordner2._value, "", txtName.Text)
+            cDATENSERVER.da_vorlage = True
            If cDATENSERVER.uploadDataToDATENSERVERFileDialog() <> "" Then Me.Close()
        Catch ex As Exception
            MsgBox(ex.Message)
--- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb
+++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb
@@ -5,7 +5,7 @@ Partial Class frmMessenger
    Inherits System.Windows.Forms.Form

    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
        Try
            If disposing AndAlso components IsNot Nothing Then
@@ -22,7 +22,7 @@ Partial Class frmMessenger
    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb
@@ -2,6 +2,8 @@
 Imports System.Text
 Imports System.Threading
 Imports System.Windows.Forms
+Imports DocumentFormat.OpenXml.EMMA
+
 Public Class frmUeberstundenauszahlen

    Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
@@ -33,44 +35,18 @@ Public Class frmUeberstundenauszahlen
        customFields = timas.getEmployeecustomFields(MA.mit_timasId)
        timas.getTimeaccountList(dt)

+        Dim dv = New DataView(dt)
+        dv.RowFilter = "accountid = 65 Or accountid = 69 Or accountid = 70 Or accountid = 72 Or accountid = 73 Or accountid = 1209 Or accountid = 1235 Or accountid = 1550 Or accountid = 1551 Or accountid = 1553"
        '65;"01-Lfd Saldo"
-        '66;02-Krank
-        '67;03-Urlaub
        '69;"10-Na 22-06"
        '70;"11-Sa 00-24"
        '72;"13-So 00-24"
        '73;"14-FtN 00-24"
-        '438;04-Sonstige
-        '986;Stundenlohn
-        '987;FT-Ersatzzeit
-        '993;"Ausz. ÜS"
        '1209;Mehrarbeit
-        '1210;"Script hilfskonto WSaldo"
-        '1227;Schichtzulage
-        '1231;Urlaubsstunden
        '1235;"Überstunden 100% gesamt"
-        '1257;Zuschlag
-        '1272;"unbezahlter Urlaub"
-        '1366;"Mehrarbeit am 25. des Monats gesamt"
-        '1393;"Urlaub (Stunden)"
        '1550;"AUSZ ÜS 100%"
        '1551;"AUSZ ÜS 50%"
-
-        '65
-        '69
-        '70
-        '72
-        '73
-        '1209
-        '1235
-        '1550
-        '1551
-        '1553
-
-
-
-        Dim dv = New DataView(dt)
-        dv.RowFilter = "accountid = 65 Or accountid = 69 Or accountid = 70 Or accountid = 72 Or accountid = 73 Or accountid = 1209 Or accountid = 1235 Or accountid = 1550 Or accountid = 1551 Or accountid = 1553"
+        '1553;"AUSZ ÜS MA 25%"
        timeaccountdt = dv.ToTable

        getUeberstunden(False)
@@ -447,6 +423,30 @@ Public Class frmUeberstundenauszahlen

    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click

+        '65;"01-Lfd Saldo"
+        '66;02-Krank
+        '67;03-Urlaub
+        '69;"10-Na 22-06"
+        '70;"11-Sa 00-24"
+        '72;"13-So 00-24"
+        '73;"14-FtN 00-24"
+        '438;04-Sonstige
+        '986;Stundenlohn
+        '987;FT-Ersatzzeit
+        '993;"Ausz. ÜS"
+        '1209;Mehrarbeit
+        '1210;"Script hilfskonto WSaldo"
+        '1227;Schichtzulage
+        '1231;Urlaubsstunden
+        '1235;"Überstunden 100% gesamt"
+        '1257;Zuschlag
+        '1272;"unbezahlter Urlaub"
+        '1366;"Mehrarbeit am 25. des Monats gesamt"
+        '1393;"Urlaub (Stunden)"
+        '1550;"AUSZ ÜS 100%"
+        '1551;"AUSZ ÜS 50%"
+        '1598; Korrektur MJ - ÜBER API ansprechen!
+

        Dim sum100, sum50, sum0, gesamt As Double
        sum100 = RoundOfDigits(CDbl(txtAusz100.Text) * 100 / 200, 2) 'Übergabe in ZE-System als heruntergerechnete 100%ige bzw. 50%ige ÜS!
@@ -476,25 +476,41 @@ Public Class frmUeberstundenauszahlen
                dtsetEntries.Rows.InsertAt(row, dtsetEntries.Rows.Count)
            End If

-            If sum50 > 0 Then
+            If (sum50 > 0 Or sum0 > 0) And Not istTeilzeit Then
                Dim row = dtsetEntries.NewRow
                row.Item("accountid") = 1551
-                row.Item("value") = sum50.ToString.Replace(",", ".")
+                row.Item("value") = (sum50 + sum0).ToString.Replace(",", ".")
                dtsetEntries.Rows.InsertAt(row, dtsetEntries.Rows.Count)
+
+            End If
+            If istTeilzeit Then
+                If sum50 > 0 Then
+                    Dim row = dtsetEntries.NewRow
+                    row.Item("accountid") = 1551
+                    row.Item("value") = sum50.ToString.Replace(",", ".")
+                    dtsetEntries.Rows.InsertAt(row, dtsetEntries.Rows.Count)
+                End If
+
+                If sum0 > 0 Then
+                    Dim row = dtsetEntries.NewRow
+                    row.Item("accountid") = 1553
+                    row.Item("value") = sum0.ToString.Replace(",", ".")
+                    dtsetEntries.Rows.InsertAt(row, dtsetEntries.Rows.Count)
+                End If
            End If

-            If sum0 > 0 Then
-                Dim row = dtsetEntries.NewRow
-                row.Item("accountid") = IIf(istTeilzeit, 1553, 1551)
-                row.Item("value") = sum0.ToString.Replace(",", ".")
-                dtsetEntries.Rows.InsertAt(row, dtsetEntries.Rows.Count)
-            End If

            If gesamt > 0 Then 'vom ldf Saldo, ev. über API Möglich monatliche Korrektur direkt zu befüllen, dann muss dieser If Zweig überarbeitet werden!!!!!!!!!!!!!!
                Dim row = dtsetEntries.NewRow
+                row.Item("accountid") = 1598
+                row.Item("value") = gesamt.ToString.Replace(",", ".") * (-1)
+                dtsetEntries.Rows.InsertAt(row, dtsetEntries.Rows.Count)
+
+                row = dtsetEntries.NewRow
                row.Item("accountid") = 993
                row.Item("value") = gesamt.ToString.Replace(",", ".")
                dtsetEntries.Rows.InsertAt(row, dtsetEntries.Rows.Count)
+
            End If

            Dim ues As New cUeberstunden(MA.mit_id, auszahlugsdatum.ToShortDateString, Now())
@@ -535,7 +551,7 @@ Public Class frmUeberstundenauszahlen
        txtAusgabe.Append("100% ÜS: " & txtberAusz100.Text & vbNewLine)
        txtAusgabe.Append("50% ÜS: " & txtberAusz50.Text + IIf(Not istTeilzeit, CDbl(txtberAusz25.Text), 0) & vbNewLine)
        If istTeilzeit Then txtAusgabe.Append("25% ÜS: " & CDbl(txtberAusz25.Text) & vbNewLine)
-        txtAusgabe.Append("ÜS gesamt: " & CDbl(txtberAusz100.Text) + CDbl(txtberAusz50.Text) + CDbl(txtberAusz25.Text))
+        'txtAusgabe.Append("ÜS gesamt: " & CDbl(txtberAusz100.Text) + CDbl(txtberAusz50.Text) + CDbl(txtberAusz25.Text))


        Dim aksAuszahlung As MsgBoxResult = MsgBox(txtAusgabe.ToString, vbYesNo)
@@ -546,6 +562,10 @@ Public Class frmUeberstundenauszahlen


            Dim rowNew = dtdeleteEntries.NewRow
+            rowNew.Item("accountid") = 1598
+            dtdeleteEntries.Rows.InsertAt(rowNew, dtdeleteEntries.Rows.Count)
+
+            rowNew = dtdeleteEntries.NewRow
            rowNew.Item("accountid") = 993
            dtdeleteEntries.Rows.InsertAt(rowNew, dtdeleteEntries.Rows.Count)

@@ -568,6 +588,18 @@ Public Class frmUeberstundenauszahlen
            End If

            If timas.deleteTimeAccounts(auszahlugsdatum, auszahlugsdatum, MA.mit_timasId, dtdeleteEntries) Then
+
+                'Dim dtEntriesset0 As New DataTable
+                'dtEntriesset0.Columns.Add("accountid", GetType(Integer))
+                'dtEntriesset0.Columns.Add("value", GetType(Double))
+                'Dim row0 = dtEntriesset0.NewRow
+                'row0.Item("accountid") = 1598
+                'row0.Item("value") = -0.000001 'darf nicht 0 sein!!!!
+                'dtEntriesset0.Rows.InsertAt(row0, dtEntriesset0.Rows.Count)
+                'timas.setTimeAccountEntries(MA, dtEntriesset0, auszahlugsdatum, "")
+
+
+
                Dim ues As New cUeberstunden(MA.mit_id, auszahlugsdatum.ToString("dd/MM/yyyy"))
                ues.uest_deleted = True
                ues.uest_lastChanged = Now()