chat, essenebstellungen, vollmachten (gültig bis), bugfix laden bei sendungsdetails kunden (fehlermeldung), sprache bei verzollungsunterlagen BAR, Rechung an Atilla

2024-07-29 09:35:57 +02:00
parent f84d9184ab
commit df27c0c389
15 changed files with 1131 additions and 113 deletions
--- a/SDL/Fakturierung/cFakturierung.vb
+++ b/SDL/Fakturierung/cFakturierung.vb
@@ -1644,7 +1644,11 @@ Public Class cFakturierung
                                    Mail.HTMLBody &= "<br><br><br>Best regards<br><br>" & getSignature(RECHNUNG)
                            End Select
                            Mail.HTMLBody = "<div style=""font-family:Calibri, Arial"">" & Mail.HTMLBody & "</div>"
-                            Mail.To = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(RECHNUNG.RechnungsKundenNr, "Rechnung an")
+
+                            Dim emai_receipt As String = ""
+                            If RECHNUNG.FilialenNr = "4801" Or RECHNUNG.FilialenNr = "4802" Then emai_receipt = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(RECHNUNG.RechnungsKundenNr, "Rechnung an (ATILLA)")
+
+                            Mail.To = IIf(emai_receipt = "", VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(RECHNUNG.RechnungsKundenNr, "Rechnung an"), emai_receipt)
                            Mail.Attachments.Add(tmpPath, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , "Rechnung.pdf")
                            Mail.Display()

--- a/SDL/Fakturierung/frmAbrechnungsMaske.vb
+++ b/SDL/Fakturierung/frmAbrechnungsMaske.vb
@@ -522,7 +522,13 @@ Public Class frmAbrechnungsMaske
                    End Select
                    Mail.HTMLBody = "<div style=""font-family:Calibri, Arial"">" & Mail.HTMLBody & "</div>"
                    Dim KdNrTmp = getSelectionKdNr()
-                    Mail.To = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(If(IsNumeric(KdNrTmp), KdNrTmp, -1), "Rechnung an")
+
+                    Dim emai_receipt As String = ""
+
+                    If getSelection("FilialenNr") = "4801" Or getSelection("FilialenNr") = "4802" Then emai_receipt = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(If(IsNumeric(KdNrTmp), KdNrTmp, -1), "Rechnung an (ATILLA)")
+
+                    Mail.To = IIf(emai_receipt = "", VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(If(IsNumeric(KdNrTmp), KdNrTmp, -1), "Rechnung an"), emai_receipt)
+
                    Mail.Display()


--- a/SDL/Fakturierung/frmFaktEmail.vb
+++ b/SDL/Fakturierung/frmFaktEmail.vb
@@ -152,11 +152,28 @@ Public Class frmFaktEmail
        If AD.E_Mail IsNot Nothing AndAlso AD.E_Mail <> "" Then lkl.Text = """" & AD.E_Mail & """ anfügen" : lkl.Tag = AD.E_Mail
        lblKunde.Text = AD.AdressenNr & " - " & AD.Ordnungsbegriff

-        Dim EMAILTMP = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(AD.AdressenNr, "Rechnung an")
+        Dim email_receipt As String = ""
+        If SR Then
+            Dim allAtilla = IIf(Firma_ID = 7, True, False)
+            If SR_DT IsNot Nothing AndAlso SR_DT.Rows.Count > 0 Then
+                For Each r In SR_DT.Rows
+                    If "4801" <> r("FilialenNr") And "4802" <> r("FilialenNr") Then
+                        allAtilla = False
+                        Exit For
+                    End If
+                Next
+            End If
+            email_receipt = IIf(allAtilla, VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(AD.AdressenNr, "Rechnung an (ATILLA)"), "")
+        Else
+            If RECHNUNG.FilialenNr = "4801" Or RECHNUNG.FilialenNr = "4802" Then email_receipt = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(AD.AdressenNr, "Rechnung an (ATILLA)")
+        End If
+
+
+        Dim EMAILTMP = IIf(email_receipt = "", VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(AD.AdressenNr, "Rechnung an"), email_receipt) 'VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(AD.AdressenNr, "Rechnung an")
        If EMAILTMP <> "" Then dgvEmail.Rows.Add(EMAILTMP)
-        Dim EMAILTMPCC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(AD.AdressenNr, "Rechnung an")
+        Dim EMAILTMPCC = IIf(email_receipt = "", VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(AD.AdressenNr, "Rechnung an"), VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(AD.AdressenNr, "Rechnung an (ATILLA)"))
        If EMAILTMPCC <> "" Then dgvEmailCC.Rows.Add(EMAILTMPCC)
-        Dim EMAILTMPBCC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(AD.AdressenNr, "Rechnung an")
+        Dim EMAILTMPBCC = IIf(email_receipt = "", VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(AD.AdressenNr, "Rechnung an"), VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(AD.AdressenNr, "Rechnung an (ATILLA)"))
        If EMAILTMPBCC <> "" Then dgvEmailBCC.Rows.Add(EMAILTMPBCC)

        initDGVAnhaenge()
--- a/SDL/Fakturierung/frmFaktSammelRgDrucken.vb
+++ b/SDL/Fakturierung/frmFaktSammelRgDrucken.vb
@@ -288,7 +288,14 @@ Public Class frmFaktSammelRgDrucken
                                Mail = outl.CreateItem(0)
                                Mail.Subject = "VERAG Sammel-Rechnung"
                                Mail.HTMLBody = getSammelRgTExt(getSelectionLandKz)
-                                If IsNumeric(getSelectionKdNr) Then Mail.To = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(CInt(getSelectionKdNr()), "Rechnung an")
+
+                                If IsNumeric(getSelectionKdNr) Then
+                                    Dim email_receipt As String = ""
+                                    If cboFirma._value = "7" Then email_receipt = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(CInt(getSelectionKdNr()), "Rechnung an (ATILLA)")
+                                    Mail.To = IIf(email_receipt = "", VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(CInt(getSelectionKdNr()), "Rechnung an"), email_receipt)
+                                End If
+
+
                                For Each pdf In listPDFs
                                    Mail.Attachments.Add(pdf, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
                                Next
@@ -320,7 +327,13 @@ Public Class frmFaktSammelRgDrucken
                                    Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
                                    Mail = outl.CreateItem(0)
                                    Mail.Subject = "VERAG Sammel-Rechnung"
-                                    If IsNumeric(getSelectionKdNr) Then Mail.To = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(CInt(getSelectionKdNr()), "Rechnung an")
+
+                                    If IsNumeric(getSelectionKdNr) Then
+                                        Dim email_receipt As String = ""
+                                        If cboFirma._value = "7" Then email_receipt = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(CInt(getSelectionKdNr()), "Rechnung an (ATILLA)")
+                                        Mail.To = IIf(email_receipt = "", VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(CInt(getSelectionKdNr()), "Rechnung an"), email_receipt)
+                                    End If
+
                                    Mail.HTMLBody = getSammelRgTExt(getSelectionLandKz) '  Sehr geehrte Damen und Herren,<br><br>anbei erhalten Sie Ihre Sammel-Rechnung."
                                    Mail.Attachments.Add(pdf, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
                                    Mail.Display()
--- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb
+++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb
@@ -374,7 +374,7 @@ Public Class usrCntlFaktAbrechnung
    Sub setControlsEnabled(pnl As Panel, pnlEnabled As Boolean)
        For Each c In pnl.Controls
            If c.GetType Is GetType(VERAG_PROG_ALLGEMEIN.MyTextBox) Or c.GetType Is GetType(VERAG_PROG_ALLGEMEIN.KdSearchBox) Then
-                c.Enabled = pnlEnabled
+                c.Enabled = IIf(cboFiliale._value = "5701" AndAlso VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AMBAR_ALLE_RECHNUNGSEMPFÄNGER", "SDL"), True, pnlEnabled)
            End If
        Next
    End Sub
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen_BAR.vb
+++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen_BAR.vb
@@ -69,6 +69,7 @@
                                                         txtAdresse1.Text = (If(ADRESSE.LandKz, "") & " " & If(ADRESSE.PLZ, "") & " " & If(ADRESSE.Ort, "")).ToString.Trim
                                                     End If
                                                 End If
+
                                                 RaiseEvent KDNR_CHANGED(KdNR)
                                             End Sub
        initControlsHandler()
@@ -93,6 +94,17 @@
        cboRechnungAn.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("4 - Avisierer", "4"))


+        If Not cboTEXT._value = "DE_FISKAL" Then
+            If txtFirma.KdNr_value > 0 AndAlso txtFirma.KdData_ADRESSEN IsNot Nothing Then
+                If txtFirma.KdData_ADRESSEN.LandKz = "DE" Or txtFirma.KdData_ADRESSEN.LandKz = "AT" Then
+                    cboSprache.changeItem("DE")
+                Else
+                    cboSprache.changeItem("EN")
+                End If
+            End If
+        End If
+
+
        loaded = True
    End Sub

@@ -108,6 +120,7 @@
            cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Englisch", "EN"))
            'cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Französisch", "FR")) ??
            cboSprache.changeItem("DE")
+
        End If

    End Sub
--- a/SDL/UsrCntlEssensbestellungen.Designer.vb
+++ b/SDL/UsrCntlEssensbestellungen.Designer.vb
@@ -24,6 +24,8 @@ Partial Class UsrCntlessensbestellungen
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
        Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
+        Me.txtAnzahlKeb = New System.Windows.Forms.Label()
+        Me.Label6 = New System.Windows.Forms.Label()
        Me.lblWarning = New System.Windows.Forms.Label()
        Me.txtPreis = New System.Windows.Forms.Label()
        Me.Label2 = New System.Windows.Forms.Label()
@@ -76,8 +78,11 @@ Partial Class UsrCntlessensbestellungen
        Me.cbxMenu = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cbxAbteilung = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Label5 = New System.Windows.Forms.Label()
-        Me.txtAnzahlKeb = New System.Windows.Forms.Label()
-        Me.Label6 = New System.Windows.Forms.Label()
+        Me.cbxAlt_montag = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cbxAlt_dienstag = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cbxAlt_mittwoch = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cbxAlt_donnerstag = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cbxAlt_freitag = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.MyPanel1.SuspendLayout()
        Me.GroupBoxDienstag.SuspendLayout()
        Me.GroupBoxMontag.SuspendLayout()
@@ -107,6 +112,24 @@ Partial Class UsrCntlessensbestellungen
        Me.MyPanel1.Size = New System.Drawing.Size(667, 266)
        Me.MyPanel1.TabIndex = 19
        '
+        'txtAnzahlKeb
+        '
+        Me.txtAnzahlKeb.AutoSize = True
+        Me.txtAnzahlKeb.Location = New System.Drawing.Point(580, 154)
+        Me.txtAnzahlKeb.Name = "txtAnzahlKeb"
+        Me.txtAnzahlKeb.Size = New System.Drawing.Size(13, 13)
+        Me.txtAnzahlKeb.TabIndex = 35
+        Me.txtAnzahlKeb.Text = "0"
+        '
+        'Label6
+        '
+        Me.Label6.AutoSize = True
+        Me.Label6.Location = New System.Drawing.Point(463, 154)
+        Me.Label6.Name = "Label6"
+        Me.Label6.Size = New System.Drawing.Size(112, 13)
+        Me.Label6.TabIndex = 34
+        Me.Label6.Text = "Anzahl Kebap/Dürüm:"
+        '
        'lblWarning
        '
        Me.lblWarning.AutoSize = True
@@ -137,6 +160,7 @@ Partial Class UsrCntlessensbestellungen
        'GroupBoxDienstag
        '
        Me.GroupBoxDienstag.Controls.Add(Me.txtMenu_dienstag)
+        Me.GroupBoxDienstag.Controls.Add(Me.cbxAlt_dienstag)
        Me.GroupBoxDienstag.Controls.Add(Me.cb_dienstag)
        Me.GroupBoxDienstag.Controls.Add(Me.txtAlt_dienstag)
        Me.GroupBoxDienstag.Controls.Add(Me.rbMenuAlt_dienstag)
@@ -181,12 +205,12 @@ Partial Class UsrCntlessensbestellungen
        Me.txtAlt_dienstag._Waehrung = False
        Me.txtAlt_dienstag._WaehrungZeichen = True
        Me.txtAlt_dienstag.ForeColor = System.Drawing.Color.Black
-        Me.txtAlt_dienstag.Location = New System.Drawing.Point(3, 93)
+        Me.txtAlt_dienstag.Location = New System.Drawing.Point(130, 94)
        Me.txtAlt_dienstag.MaxLineLength = -1
        Me.txtAlt_dienstag.MaxLines_Warning = ""
        Me.txtAlt_dienstag.MaxLines_Warning_Label = Nothing
        Me.txtAlt_dienstag.Name = "txtAlt_dienstag"
-        Me.txtAlt_dienstag.Size = New System.Drawing.Size(177, 20)
+        Me.txtAlt_dienstag.Size = New System.Drawing.Size(61, 20)
        Me.txtAlt_dienstag.TabIndex = 2
        Me.txtAlt_dienstag.Visible = False
        '
@@ -225,6 +249,7 @@ Partial Class UsrCntlessensbestellungen
        '
        'GroupBoxMontag
        '
+        Me.GroupBoxMontag.Controls.Add(Me.cbxAlt_montag)
        Me.GroupBoxMontag.Controls.Add(Me.txtMenu_montag)
        Me.GroupBoxMontag.Controls.Add(Me.cb_montag)
        Me.GroupBoxMontag.Controls.Add(Me.txtAlt_montag)
@@ -270,12 +295,12 @@ Partial Class UsrCntlessensbestellungen
        Me.txtAlt_montag._Waehrung = False
        Me.txtAlt_montag._WaehrungZeichen = True
        Me.txtAlt_montag.ForeColor = System.Drawing.Color.Black
-        Me.txtAlt_montag.Location = New System.Drawing.Point(3, 92)
+        Me.txtAlt_montag.Location = New System.Drawing.Point(124, 94)
        Me.txtAlt_montag.MaxLineLength = -1
        Me.txtAlt_montag.MaxLines_Warning = ""
        Me.txtAlt_montag.MaxLines_Warning_Label = Nothing
        Me.txtAlt_montag.Name = "txtAlt_montag"
-        Me.txtAlt_montag.Size = New System.Drawing.Size(177, 20)
+        Me.txtAlt_montag.Size = New System.Drawing.Size(67, 20)
        Me.txtAlt_montag.TabIndex = 2
        Me.txtAlt_montag.Visible = False
        '
@@ -309,6 +334,7 @@ Partial Class UsrCntlessensbestellungen
        Me.GroupBoxFreitag.Controls.Add(Me.cb_freitag)
        Me.GroupBoxFreitag.Controls.Add(Me.txtAlt_freitag)
        Me.GroupBoxFreitag.Controls.Add(Me.rbMenuAlt_freitag)
+        Me.GroupBoxFreitag.Controls.Add(Me.cbxAlt_freitag)
        Me.GroupBoxFreitag.Controls.Add(Me.rbMenu__freitag)
        Me.GroupBoxFreitag.Location = New System.Drawing.Point(219, 135)
        Me.GroupBoxFreitag.Name = "GroupBoxFreitag"
@@ -350,12 +376,12 @@ Partial Class UsrCntlessensbestellungen
        Me.txtAlt_freitag._Waehrung = False
        Me.txtAlt_freitag._WaehrungZeichen = True
        Me.txtAlt_freitag.ForeColor = System.Drawing.Color.Black
-        Me.txtAlt_freitag.Location = New System.Drawing.Point(3, 97)
+        Me.txtAlt_freitag.Location = New System.Drawing.Point(136, 95)
        Me.txtAlt_freitag.MaxLineLength = -1
        Me.txtAlt_freitag.MaxLines_Warning = ""
        Me.txtAlt_freitag.MaxLines_Warning_Label = Nothing
        Me.txtAlt_freitag.Name = "txtAlt_freitag"
-        Me.txtAlt_freitag.Size = New System.Drawing.Size(177, 20)
+        Me.txtAlt_freitag.Size = New System.Drawing.Size(61, 20)
        Me.txtAlt_freitag.TabIndex = 2
        Me.txtAlt_freitag.Visible = False
        '
@@ -405,6 +431,7 @@ Partial Class UsrCntlessensbestellungen
        '
        Me.Mittwoch.Controls.Add(Me.txtMenu_mittwoch)
        Me.Mittwoch.Controls.Add(Me.cb_mittwoch)
+        Me.Mittwoch.Controls.Add(Me.cbxAlt_mittwoch)
        Me.Mittwoch.Controls.Add(Me.txtAlt_mittwoch)
        Me.Mittwoch.Controls.Add(Me.rbMenuAlt_mittwoch)
        Me.Mittwoch.Controls.Add(Me.rbMenu_mittwoch)
@@ -448,12 +475,12 @@ Partial Class UsrCntlessensbestellungen
        Me.txtAlt_mittwoch._Waehrung = False
        Me.txtAlt_mittwoch._WaehrungZeichen = True
        Me.txtAlt_mittwoch.ForeColor = System.Drawing.Color.Black
-        Me.txtAlt_mittwoch.Location = New System.Drawing.Point(3, 93)
+        Me.txtAlt_mittwoch.Location = New System.Drawing.Point(126, 92)
        Me.txtAlt_mittwoch.MaxLineLength = -1
        Me.txtAlt_mittwoch.MaxLines_Warning = ""
        Me.txtAlt_mittwoch.MaxLines_Warning_Label = Nothing
        Me.txtAlt_mittwoch.Name = "txtAlt_mittwoch"
-        Me.txtAlt_mittwoch.Size = New System.Drawing.Size(177, 20)
+        Me.txtAlt_mittwoch.Size = New System.Drawing.Size(65, 20)
        Me.txtAlt_mittwoch.TabIndex = 2
        Me.txtAlt_mittwoch.Visible = False
        '
@@ -486,6 +513,7 @@ Partial Class UsrCntlessensbestellungen
        Me.GroupBoxDonnerstag.Controls.Add(Me.txtMenu_donnerstag)
        Me.GroupBoxDonnerstag.Controls.Add(Me.cbdonnerstag)
        Me.GroupBoxDonnerstag.Controls.Add(Me.txtAlt_donnerstag)
+        Me.GroupBoxDonnerstag.Controls.Add(Me.cbxAlt_donnerstag)
        Me.GroupBoxDonnerstag.Controls.Add(Me.rbMenuAlt_donnerstag)
        Me.GroupBoxDonnerstag.Controls.Add(Me.rbMenu_donnerstag)
        Me.GroupBoxDonnerstag.Location = New System.Drawing.Point(3, 135)
@@ -528,12 +556,12 @@ Partial Class UsrCntlessensbestellungen
        Me.txtAlt_donnerstag._Waehrung = False
        Me.txtAlt_donnerstag._WaehrungZeichen = True
        Me.txtAlt_donnerstag.ForeColor = System.Drawing.Color.Black
-        Me.txtAlt_donnerstag.Location = New System.Drawing.Point(3, 97)
+        Me.txtAlt_donnerstag.Location = New System.Drawing.Point(127, 95)
        Me.txtAlt_donnerstag.MaxLineLength = -1
        Me.txtAlt_donnerstag.MaxLines_Warning = ""
        Me.txtAlt_donnerstag.MaxLines_Warning_Label = Nothing
        Me.txtAlt_donnerstag.Name = "txtAlt_donnerstag"
-        Me.txtAlt_donnerstag.Size = New System.Drawing.Size(177, 20)
+        Me.txtAlt_donnerstag.Size = New System.Drawing.Size(64, 20)
        Me.txtAlt_donnerstag.TabIndex = 2
        Me.txtAlt_donnerstag.Visible = False
        '
@@ -723,23 +751,70 @@ Partial Class UsrCntlessensbestellungen
        Me.Label5.TabIndex = 39
        Me.Label5.Text = "Abteilung:"
        '
-        'txtAnzahlKeb
+        'cbxAlt_montag
        '
-        Me.txtAnzahlKeb.AutoSize = True
-        Me.txtAnzahlKeb.Location = New System.Drawing.Point(580, 154)
-        Me.txtAnzahlKeb.Name = "txtAnzahlKeb"
-        Me.txtAnzahlKeb.Size = New System.Drawing.Size(13, 13)
-        Me.txtAnzahlKeb.TabIndex = 35
-        Me.txtAnzahlKeb.Text = "0"
+        Me.cbxAlt_montag._allowedValuesFreiText = Nothing
+        Me.cbxAlt_montag._allowFreiText = True
+        Me.cbxAlt_montag._value = ""
+        Me.cbxAlt_montag.DropDownWidth = 120
+        Me.cbxAlt_montag.FormattingEnabled = True
+        Me.cbxAlt_montag.Location = New System.Drawing.Point(0, 94)
+        Me.cbxAlt_montag.Name = "cbxAlt_montag"
+        Me.cbxAlt_montag.Size = New System.Drawing.Size(100, 21)
+        Me.cbxAlt_montag.TabIndex = 41
+        Me.cbxAlt_montag.Visible = False
        '
-        'Label6
+        'cbxAlt_dienstag
        '
-        Me.Label6.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(463, 154)
-        Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(112, 13)
-        Me.Label6.TabIndex = 34
-        Me.Label6.Text = "Anzahl Kebap/Dürüm:"
+        Me.cbxAlt_dienstag._allowedValuesFreiText = Nothing
+        Me.cbxAlt_dienstag._allowFreiText = True
+        Me.cbxAlt_dienstag._value = ""
+        Me.cbxAlt_dienstag.DropDownWidth = 120
+        Me.cbxAlt_dienstag.FormattingEnabled = True
+        Me.cbxAlt_dienstag.Location = New System.Drawing.Point(0, 93)
+        Me.cbxAlt_dienstag.Name = "cbxAlt_dienstag"
+        Me.cbxAlt_dienstag.Size = New System.Drawing.Size(100, 21)
+        Me.cbxAlt_dienstag.TabIndex = 42
+        Me.cbxAlt_dienstag.Visible = False
+        '
+        'cbxAlt_mittwoch
+        '
+        Me.cbxAlt_mittwoch._allowedValuesFreiText = Nothing
+        Me.cbxAlt_mittwoch._allowFreiText = True
+        Me.cbxAlt_mittwoch._value = ""
+        Me.cbxAlt_mittwoch.DropDownWidth = 120
+        Me.cbxAlt_mittwoch.FormattingEnabled = True
+        Me.cbxAlt_mittwoch.Location = New System.Drawing.Point(0, 92)
+        Me.cbxAlt_mittwoch.Name = "cbxAlt_mittwoch"
+        Me.cbxAlt_mittwoch.Size = New System.Drawing.Size(100, 21)
+        Me.cbxAlt_mittwoch.TabIndex = 43
+        Me.cbxAlt_mittwoch.Visible = False
+        '
+        'cbxAlt_donnerstag
+        '
+        Me.cbxAlt_donnerstag._allowedValuesFreiText = Nothing
+        Me.cbxAlt_donnerstag._allowFreiText = True
+        Me.cbxAlt_donnerstag._value = ""
+        Me.cbxAlt_donnerstag.DropDownWidth = 120
+        Me.cbxAlt_donnerstag.FormattingEnabled = True
+        Me.cbxAlt_donnerstag.Location = New System.Drawing.Point(3, 97)
+        Me.cbxAlt_donnerstag.Name = "cbxAlt_donnerstag"
+        Me.cbxAlt_donnerstag.Size = New System.Drawing.Size(100, 21)
+        Me.cbxAlt_donnerstag.TabIndex = 44
+        Me.cbxAlt_donnerstag.Visible = False
+        '
+        'cbxAlt_freitag
+        '
+        Me.cbxAlt_freitag._allowedValuesFreiText = Nothing
+        Me.cbxAlt_freitag._allowFreiText = True
+        Me.cbxAlt_freitag._value = ""
+        Me.cbxAlt_freitag.DropDownWidth = 120
+        Me.cbxAlt_freitag.FormattingEnabled = True
+        Me.cbxAlt_freitag.Location = New System.Drawing.Point(0, 97)
+        Me.cbxAlt_freitag.Name = "cbxAlt_freitag"
+        Me.cbxAlt_freitag.Size = New System.Drawing.Size(100, 21)
+        Me.cbxAlt_freitag.TabIndex = 45
+        Me.cbxAlt_freitag.Visible = False
        '
        'UsrCntlessensbestellungen
        '
@@ -834,4 +909,9 @@ Partial Class UsrCntlessensbestellungen
    Friend WithEvents Label5 As Label
    Friend WithEvents txtAnzahlKeb As Label
    Friend WithEvents Label6 As Label
+    Friend WithEvents cbxAlt_dienstag As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents cbxAlt_montag As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents cbxAlt_freitag As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents cbxAlt_mittwoch As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents cbxAlt_donnerstag As VERAG_PROG_ALLGEMEIN.MyComboBox
 End Class
--- a/SDL/UsrCntlEssensbestellungen.vb
+++ b/SDL/UsrCntlEssensbestellungen.vb
@@ -1,5 +1,7 @@

 Imports System.Data.SqlTypes
+Imports System.Windows.Documents
+Imports io.konik.zugferd.unqualified
 Imports VERAG_PROG_ALLGEMEIN

 Public Class UsrCntlessensbestellungen
@@ -78,41 +80,53 @@ Public Class UsrCntlessensbestellungen
        cbxAbteilung.Enabled = False
        txtAnmerkung.Text = If(essen.eb_anmerkung IsNot Nothing, essen.eb_anmerkung.ToString, "")

+
+
    End Sub


    Private Sub rbaLaCarte_CheckedChanged(sender As Object, e As EventArgs) Handles rbMenuAlt_montag.CheckedChanged, rbMenuAlt_dienstag.CheckedChanged, rbMenuAlt_donnerstag.CheckedChanged, rbMenuAlt_mittwoch.CheckedChanged, rbMenuAlt_freitag.CheckedChanged

        If rbMenuAlt_montag.Checked Then
-            txtAlt_montag.Visible = True
+            'txtAlt_montag.Visible = True
+            cbxAlt_montag.Visible = True
        Else
-            txtAlt_montag.Visible = False
+            cbxAlt_montag.Visible = False
+            'txtAlt_montag.Visible = False
        End If

        If rbMenuAlt_dienstag.Checked Then
-            txtAlt_dienstag.Visible = True
+            cbxAlt_dienstag.Visible = True
+            'txtAlt_dienstag.Visible = True
        Else

-            txtAlt_dienstag.Visible = False
+            cbxAlt_dienstag.Visible = False
+            'txtAlt_dienstag.Visible = False
        End If

        If rbMenuAlt_mittwoch.Checked Then
-            txtAlt_mittwoch.Visible = True
+            cbxAlt_mittwoch.Visible = True
+            'txtAlt_mittwoch.Visible = True
        Else
-            txtAlt_mittwoch.Visible = False
+            cbxAlt_mittwoch.Visible = False
+            'txtAlt_mittwoch.Visible = False
        End If


        If rbMenuAlt_donnerstag.Checked Then
-            txtAlt_donnerstag.Visible = True
+            cbxAlt_donnerstag.Visible = True
+            'txtAlt_donnerstag.Visible = True
        Else
-            txtAlt_donnerstag.Visible = False
+            cbxAlt_donnerstag.Visible = False
+            'txtAlt_donnerstag.Visible = False
        End If

        If rbMenuAlt_freitag.Checked Then
-            txtAlt_freitag.Visible = True
+            cbxAlt_freitag.Visible = True
+            'txtAlt_freitag.Visible = True
        Else
-            txtAlt_freitag.Visible = False
+            cbxAlt_freitag.Visible = False
+            'txtAlt_freitag.Visible = False
        End If
        countChecks()
    End Sub
@@ -242,6 +256,9 @@ Public Class UsrCntlessensbestellungen
        txtAnzahlLaCart.Text = countlaCarte.ToString
        txtAnzahlKeb.Text = countKebab.ToString

+        If dt.Rows.Count < 1 Then Exit Sub
+
+
        If CDate(dt.Rows(0).Item("MenuDateVon")).ToString("dd.MM.yyyy") >= DateTime.Parse("01/06/2024") Then

            txtPreis.Text = (CDbl(countKebab) + CDbl(countMenus)) * 3 + CDbl(countlaCarte) * 5
@@ -289,6 +306,10 @@ Public Class UsrCntlessensbestellungen

        essen = New cEssensbestellung(cbxMenu._value, cbxMitarbeiter._value, cbxGebäude._value, cbxAbteilung._value, cbxMitarbeiter.Text, txtAnmerkung.Text)

+
+
+
+
        If cb_montag.Checked Then
            If rbMenu_montag.Checked Then
                essen.eb_montag = menu
@@ -546,13 +567,17 @@ Public Class UsrCntlessensbestellungen
    Private Sub initPanelFields()


+
        If essen.eb_montag IsNot Nothing Then
            cb_montag.Checked = True
            If essen.eb_montag.ToString = menu Then
                rbMenu_montag.Checked = True
            Else
                rbMenuAlt_montag.Checked = True
-                If essen.eb_montag IsNot Nothing Then txtAlt_montag.Text = essen.eb_montag.ToString
+                If essen.eb_montag IsNot Nothing Then cbxAlt_montag.changeItem(essen.eb_montag)
+                If cbxAlt_montag.SelectedValue = Nothing Then
+                    cbxAlt_montag.Text = essen.eb_montag.ToString
+                End If 
            End If
        Else
            cb_montag.Checked = False
@@ -564,7 +589,10 @@ Public Class UsrCntlessensbestellungen
                rbMenu_dienstag.Checked = True
            Else
                rbMenuAlt_dienstag.Checked = True
-                If essen.eb_dienstag IsNot Nothing Then txtAlt_dienstag.Text = essen.eb_dienstag.ToString
+                If essen.eb_dienstag IsNot Nothing Then cbxAlt_dienstag.changeItem(essen.eb_dienstag)
+                If cbxAlt_dienstag.SelectedValue = Nothing Then
+                    cbxAlt_dienstag.Text = essen.eb_dienstag.ToString
+                End If
            End If
        Else
            cb_dienstag.Checked = False
@@ -577,7 +605,10 @@ Public Class UsrCntlessensbestellungen
                rbMenu_mittwoch.Checked = True
            Else
                rbMenuAlt_mittwoch.Checked = True
-                If essen.eb_mittwoch IsNot Nothing Then txtAlt_mittwoch.Text = essen.eb_mittwoch.ToString
+                If essen.eb_mittwoch IsNot Nothing Then cbxAlt_mittwoch.changeItem(essen.eb_mittwoch)
+                If cbxAlt_mittwoch.SelectedValue = Nothing Then
+                    cbxAlt_mittwoch.Text = essen.eb_mittwoch.ToString
+                End If
            End If
        Else
            cb_mittwoch.Checked = False
@@ -589,7 +620,10 @@ Public Class UsrCntlessensbestellungen
                rbMenu_donnerstag.Checked = True
            Else
                rbMenuAlt_donnerstag.Checked = True
-                If essen.eb_donnerstag IsNot Nothing Then txtAlt_donnerstag.Text = essen.eb_donnerstag.ToString
+                If essen.eb_donnerstag IsNot Nothing Then cbxAlt_donnerstag.changeItem(essen.eb_donnerstag)
+                If cbxAlt_donnerstag.SelectedValue = Nothing Then
+                    cbxAlt_donnerstag.Text = essen.eb_donnerstag.ToString
+                End If
            End If
        Else
            cbdonnerstag.Checked = False
@@ -602,7 +636,10 @@ Public Class UsrCntlessensbestellungen
                rbMenu__freitag.Checked = True
            Else
                rbMenuAlt_freitag.Checked = True
-                If essen.eb_freitag IsNot Nothing Then txtAlt_freitag.Text = essen.eb_freitag.ToString
+                If essen.eb_freitag IsNot Nothing Then cbxAlt_freitag.changeItem(essen.eb_freitag)
+                If cbxAlt_freitag.SelectedValue = Nothing Then
+                    cbxAlt_freitag.Text = essen.eb_freitag.ToString
+                End If
            End If
        Else
            cb_freitag.Checked = False
@@ -643,6 +680,22 @@ Public Class UsrCntlessensbestellungen
        cbxGebäude.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Maut", "Maut"))
        cbxGebäude.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))

+
+        Dim list As New List(Of MyListItem)
+        list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Kebap", "Kebap"))
+        list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Dürüm", "Dürüm"))
+        'list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
+
+        cbxAlt_montag.Items.AddRange(list.ToArray())
+        cbxAlt_dienstag.Items.AddRange(list.ToArray())
+        cbxAlt_mittwoch.Items.AddRange(list.ToArray())
+        cbxAlt_donnerstag.Items.AddRange(list.ToArray())
+        cbxAlt_freitag.Items.AddRange(list.ToArray())
+
+    End Sub
+
+    Private Sub cbxAlt_montag_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cbxAlt_montag.SelectedValueChanged, cbxAlt_dienstag.SelectedValueChanged, cbxAlt_mittwoch.SelectedValueChanged, cbxAlt_donnerstag.SelectedValueChanged, cbxAlt_freitag.SelectedValueChanged, cbxAlt_montag.TextChanged, cbxAlt_dienstag.TextChanged, cbxAlt_mittwoch.TextChanged, cbxAlt_donnerstag.TextChanged, cbxAlt_freitag.TextChanged
+        countChecks()
    End Sub

 End Class
--- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/cDakosyInterface_Send.vb
+++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/cDakosyInterface_Send.vb
@@ -534,7 +534,7 @@ Class DAKOSY_Interface_SEND
                If u.ezaWP_AHStatWert IsNot Nothing AndAlso IsNumeric(u.ezaWP_AHStatWert) Then WP.AHStatWert = CInt(u.ezaWP_AHStatWert)
                If u.ezaWP_AHStatWertManuellKZ IsNot Nothing Then WP.AHStatWertManuellKZ = CInt(Int(u.ezaWP_AHStatWertManuellKZ))
                If u.ezaWP_KostenEUSt IsNot Nothing Then WP.KostenEUSt = u.ezaWP_KostenEUSt
-                If u.ezaWP_PackstueckAnzahl IsNot Nothing Then WP.PackstueckAnzahl = u.ezaWP_PackstueckAnzahl.ToString.Replace(".", "")
+                If u.ezaWP_PackstueckAnzahl IsNot Nothing Then WP.PackstueckAnzahl = u.ezaWP_PackstueckAnzahl.ToString.Replace(".", "").Replace(" ", "")
                If u.ezaWP_PackstueckArt IsNot Nothing Then WP.PackstueckArt = u.ezaWP_PackstueckArt
                If u.ezaWP_PackstueckZeichen IsNot Nothing Then WP.PackstueckZeichen = u.ezaWP_PackstueckZeichen

--- a/SDL/buchhaltung/frmBU_Mahnlauf.vb
+++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb
@@ -487,10 +487,9 @@ Public Class frmBU_Mahnlauf
                                                 to which future reminders should be sent.<br>
                                                 In the meantime, we ask you to forward them to the responsible persons in your company.</i>"
                                Mail_HTMLBody &= "<br><br><br>" & cFakturierung.getSignature(AD.LandKz, FIRMA.Firma_ID)
+
                            Case "A", "AT", "D", "DE", "CH"

-
-
                                Mail_Subject = MAHNTEXT & IIf(KdNr > 0, " - KdNr.: " & KdNr, "")
                                Mail_HTMLBody = "Sehr geehrte Damen und Herren,<br><br>im Anhang finden Sie ihre Mahnung, mit der Bitte um Bearbeitung. "
                                Mail_HTMLBody &= "<br><br><br>"
@@ -500,6 +499,7 @@ Public Class frmBU_Mahnlauf
                                Mail_HTMLBody &= "<br><br><br>Mit freundlichen Grüßen<br><br>" & cFakturierung.getSignature(AD.LandKz, FIRMA.Firma_ID)

                            Case Else
+
                                Mail_Subject = "PAYMENT REMINDER" & IIf(KdNr > 0, " - Cust.: " & KdNr, "")
                                Mail_HTMLBody = "Dear Sear or Madam,<br><br>attached we send you the invoice reminder."
                                Mail_HTMLBody &= "<br><br><br>"
@@ -527,7 +527,6 @@ Public Class frmBU_Mahnlauf

                                VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mail_To, Mail_Subject, Mail_HTMLBody, IIf(FIRMA.Firma_E_Mail_Mahnungen <> "", FIRMA.Firma_E_Mail_Mahnungen, "buchhaltung@verag.ag"), False, False, Mail_CC, Mail_BCC, list)

-
                            Case Else
                                Dim outl As New Outlook.Application
                                Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
--- a/SDL/kunden/usrCntlKundenBesonderheiten.vb
+++ b/SDL/kunden/usrCntlKundenBesonderheiten.vb
@@ -84,14 +84,15 @@ Public Class usrCntlKundenBesonderheiten
        End Try
    End Sub
    Private Sub initDGV(Optional kdnrTmp = -1, Optional simpleView = False, Optional preferedKategorie = "", Optional preferedKategorieOtherIN = "")
-        'If dgvBesonderheiten IsNot Nothing Then Exit Sub
+        'If dgvBesonderheiten i Nothing Then Exit Sub

-        If dgvBesonderheiten.Columns IsNot Nothing AndAlso dgvBesonderheiten.Columns.Count > 0 Then
-            Try
-                dgvBesonderheiten.Columns.Clear()
-            Catch
-            End Try
-        End If
+        'If dgvBesonderheiten.ColumnCount > 0 Then
+        '    Try
+        '        dgvBesonderheiten.Columns.Clear()
+        '    Catch ex As Exception
+        '        VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        '    End Try
+        'End If

        If kdnrTmp > 0 Then Me.kdNr = kdnrTmp
        If kdNr <= 0 Then Exit Sub
@@ -172,7 +173,9 @@ Public Class usrCntlKundenBesonderheiten
            colm.Name = "clmnRufzeichen"
            colm.DefaultCellStyle.ForeColor = Color.Red
            colm.DefaultCellStyle.Font = New Font(.DefaultCellStyle.Font.FontFamily, .DefaultCellStyle.Font.Size, FontStyle.Bold)
-            .Columns.Insert(2, colm)
+            If Not .Columns.Contains(colm.Name) Then
+                .Columns.Insert(2, colm)
+            End If

            ' .GetOrder()
            initDGV_CLMN()
--- a/SDL/kunden/usrCntlKundenuebersicht.vb
+++ b/SDL/kunden/usrCntlKundenuebersicht.vb
@@ -941,6 +941,8 @@ Public Class usrCntlKundenuebersicht
                    r.DefaultCellStyle.ForeColor = Color.Gray
                ElseIf IsDate(r.Cells("kdvm_erhalten_Datum").Value) AndAlso CDate(r.Cells("kdvm_erhalten_Datum").Value) < Now.AddYears(-2) Then
                    r.DefaultCellStyle.ForeColor = Color.Red
+                ElseIf IsDate(r.Cells("kdvm_gueltig_bis").Value) AndAlso (CDate(r.Cells("kdvm_gueltig_bis").Value) < Today) Then
+                    r.DefaultCellStyle.ForeColor = Color.Red
                End If

                If True Then