Merge

2023-01-10 22:01:38 +01:00
parent 9422b791d5 fc89dc23ef
commit 46e58fee5f
10 changed files with 806 additions and 44 deletions
--- a/Aviso/Aviso.vbproj
+++ b/Aviso/Aviso.vbproj
@@ -855,6 +855,12 @@
    <Compile Include="frmWarenbezeichnungBegriffeEdit.vb">
      <SubType>Form</SubType>
    </Compile>
+    <Compile Include="frmWarenorte.Designer.vb">
+      <DependentUpon>frmWarenorte.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmWarenorte.vb">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="frmWechselStandarddrucker.Designer.vb">
      <DependentUpon>frmWechselStandarddrucker.vb</DependentUpon>
    </Compile>
@@ -1268,6 +1274,9 @@
    <EmbeddedResource Include="frmWarenbezeichnungBegriffeEdit.resx">
      <DependentUpon>frmWarenbezeichnungBegriffeEdit.vb</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="frmWarenorte.resx">
+      <DependentUpon>frmWarenorte.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="frmWechselStandarddrucker.resx">
      <DependentUpon>frmWechselStandarddrucker.vb</DependentUpon>
    </EmbeddedResource>
--- a/Aviso/UsrCntlEssensbestellungen.Designer.vb
+++ b/Aviso/UsrCntlEssensbestellungen.Designer.vb
@@ -92,7 +92,7 @@ Partial Class UsrCntlessensbestellungen
        Me.MyPanel1.Controls.Add(Me.Mittwoch)
        Me.MyPanel1.Controls.Add(Me.GroupBoxDonnerstag)
        Me.MyPanel1.Controls.Add(Me.txtAnzahlMenu)
-        Me.MyPanel1.Location = New System.Drawing.Point(3, 40)
+        Me.MyPanel1.Location = New System.Drawing.Point(3, 48)
        Me.MyPanel1.Name = "MyPanel1"
        Me.MyPanel1.Size = New System.Drawing.Size(667, 266)
        Me.MyPanel1.TabIndex = 19
@@ -563,7 +563,7 @@ Partial Class UsrCntlessensbestellungen
        'CheckBox1
        '
        Me.CheckBox1.AutoSize = True
-        Me.CheckBox1.Location = New System.Drawing.Point(121, 9)
+        Me.CheckBox1.Location = New System.Drawing.Point(121, 14)
        Me.CheckBox1.Name = "CheckBox1"
        Me.CheckBox1.Size = New System.Drawing.Size(63, 17)
        Me.CheckBox1.TabIndex = 20
@@ -573,7 +573,7 @@ Partial Class UsrCntlessensbestellungen
        'CheckBox2
        '
        Me.CheckBox2.AutoSize = True
-        Me.CheckBox2.Location = New System.Drawing.Point(12, 9)
+        Me.CheckBox2.Location = New System.Drawing.Point(12, 14)
        Me.CheckBox2.Name = "CheckBox2"
        Me.CheckBox2.Size = New System.Drawing.Size(86, 17)
        Me.CheckBox2.TabIndex = 21
@@ -583,7 +583,7 @@ Partial Class UsrCntlessensbestellungen
        'Button1
        '
        Me.Button1.DialogResult = System.Windows.Forms.DialogResult.OK
-        Me.Button1.Location = New System.Drawing.Point(285, 312)
+        Me.Button1.Location = New System.Drawing.Point(595, 320)
        Me.Button1.Name = "Button1"
        Me.Button1.Size = New System.Drawing.Size(75, 23)
        Me.Button1.TabIndex = 22
@@ -605,7 +605,7 @@ Partial Class UsrCntlessensbestellungen
        Me.txtGebäude._Waehrung = False
        Me.txtGebäude._WaehrungZeichen = True
        Me.txtGebäude.ForeColor = System.Drawing.Color.Black
-        Me.txtGebäude.Location = New System.Drawing.Point(514, -3)
+        Me.txtGebäude.Location = New System.Drawing.Point(514, 2)
        Me.txtGebäude.MaxLineLength = -1
        Me.txtGebäude.MaxLines_Warning = ""
        Me.txtGebäude.MaxLines_Warning_Label = Nothing
@@ -616,7 +616,7 @@ Partial Class UsrCntlessensbestellungen
        'Label1
        '
        Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(444, 0)
+        Me.Label1.Location = New System.Drawing.Point(444, 5)
        Me.Label1.Name = "Label1"
        Me.Label1.Size = New System.Drawing.Size(54, 13)
        Me.Label1.TabIndex = 30
@@ -625,7 +625,7 @@ Partial Class UsrCntlessensbestellungen
        'CheckBox3
        '
        Me.CheckBox3.AutoSize = True
-        Me.CheckBox3.Location = New System.Drawing.Point(225, 9)
+        Me.CheckBox3.Location = New System.Drawing.Point(225, 14)
        Me.CheckBox3.Name = "CheckBox3"
        Me.CheckBox3.Size = New System.Drawing.Size(70, 17)
        Me.CheckBox3.TabIndex = 31
@@ -635,7 +635,7 @@ Partial Class UsrCntlessensbestellungen
        'Label3
        '
        Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(444, 17)
+        Me.Label3.Location = New System.Drawing.Point(444, 26)
        Me.Label3.Name = "Label3"
        Me.Label3.Size = New System.Drawing.Size(64, 13)
        Me.Label3.TabIndex = 32
@@ -656,7 +656,7 @@ Partial Class UsrCntlessensbestellungen
        Me.txtAnmerkung._Waehrung = False
        Me.txtAnmerkung._WaehrungZeichen = True
        Me.txtAnmerkung.ForeColor = System.Drawing.Color.Black
-        Me.txtAnmerkung.Location = New System.Drawing.Point(514, 14)
+        Me.txtAnmerkung.Location = New System.Drawing.Point(514, 23)
        Me.txtAnmerkung.MaxLineLength = -1
        Me.txtAnmerkung.MaxLines_Warning = ""
        Me.txtAnmerkung.MaxLines_Warning_Label = Nothing
@@ -678,7 +678,7 @@ Partial Class UsrCntlessensbestellungen
        Me.Controls.Add(Me.CheckBox1)
        Me.Controls.Add(Me.MyPanel1)
        Me.Name = "UsrCntlessensbestellungen"
-        Me.Size = New System.Drawing.Size(690, 358)
+        Me.Size = New System.Drawing.Size(700, 350)
        Me.MyPanel1.ResumeLayout(False)
        Me.MyPanel1.PerformLayout()
        Me.GroupBoxDienstag.ResumeLayout(False)
--- a/Aviso/UsrCntlEssensbestellungen.vb
+++ b/Aviso/UsrCntlEssensbestellungen.vb
@@ -24,7 +24,7 @@ Public Class UsrCntlessensbestellungen
    End Sub


-    Sub New(storniert As Boolean, abgerechnet As Boolean, menu As String)
+    Sub New(storniert As Boolean, abgerechnet As Boolean, menutitle As String)


        ' Dieser Aufruf ist für den Designer erforderlich.
@@ -34,11 +34,11 @@ Public Class UsrCntlessensbestellungen
        Me.CheckBox1.Checked = storniert
        Me.CheckBox2.Checked = abgerechnet
        'dt = SQL.loadDgvBySql("SELECT Top 1 * FROM tblEBMenu where [MenuTitel] = '" & menu & "' order by MenuDateVon desc", "AVISO", 100, True)
-        dt = SQL.loadDgvBySql("Select Case Top 1 * from (Select (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' +  Convert(varchar, Year(MenuDateVon)) as kwDate, * FROM tblEBMenu) kwDate where kwDate = '" & menu & "'", "AVISO", 100, True)
+        dt = SQL.loadDgvBySql("Select Top 1 * from (Select (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' +  Convert(varchar, Year(MenuDateVon)) as kwDate, * FROM tblEBMenu) kwDate where kwDate = '" & menutitle & "'", "AVISO", 100, True)
        loadMenuInfo(dt)
        essen = New cEssensbestellung()
        txtGebäude.Text = essen.eb_gebaeude.ToString
-        txtAnmerkung.Text = essen.eb_anmerkung.ToString
+        txtAnmerkung.Text = If(essen.eb_anmerkung IsNot Nothing, essen.eb_anmerkung.ToString, "")

    End Sub

@@ -55,10 +55,10 @@ Public Class UsrCntlessensbestellungen
        Me.CheckBox1.Checked = essen.eb_storniert
        Me.CheckBox2.Checked = essen.eb_abgerechnet
        'dt = SQL.loadDgvBySql("SELECT Top 1 * FROM tblEBMenu where [MenuTitel] = '" & menutitle & "' order by MenuDateVon desc", "AVISO", 100, True)
-        dt = SQL.loadDgvBySql("Select Case Top 1 * from (Select (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' +  Convert(varchar, Year(MenuDateVon)) as kwDate, * FROM tblEBMenu) kwDate where kwDate = '" & menutitle & "'", "AVISO", 100, True)
+        dt = SQL.loadDgvBySql("Select Top 1 * from (Select (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' +  Convert(varchar, Year(MenuDateVon)) as kwDate, * FROM tblEBMenu) kwDate where kwDate = '" & menutitle & "'", "AVISO", 100, True)
        loadMenuInfo(dt)
        txtGebäude.Text = essen.eb_gebaeude.ToString
-        txtAnmerkung.Text = essen.eb_anmerkung.ToString
+        txtAnmerkung.Text = If(essen.eb_anmerkung IsNot Nothing, essen.eb_anmerkung.ToString, "")

    End Sub

--- a/Aviso/frmEssensbestellungenAdministration.Designer.vb
+++ b/Aviso/frmEssensbestellungenAdministration.Designer.vb
@@ -70,6 +70,7 @@ Partial Class frmEssensbestellungenAdministration
        Me.Button1 = New System.Windows.Forms.Button()
        Me.lblWarning = New System.Windows.Forms.Label()
        Me.Button2 = New System.Windows.Forms.Button()
+        Me.Label9 = New System.Windows.Forms.Label()
        Me.pnlTop.SuspendLayout()
        Me.Panel1.SuspendLayout()
        Me.ContextMenuStrip1.SuspendLayout()
@@ -506,7 +507,7 @@ Partial Class frmEssensbestellungenAdministration
        '
        Me.AbgerechnetToolStripMenuItem.Name = "AbgerechnetToolStripMenuItem"
        Me.AbgerechnetToolStripMenuItem.Size = New System.Drawing.Size(282, 22)
-        Me.AbgerechnetToolStripMenuItem.Text = "abgerechnet"
+        Me.AbgerechnetToolStripMenuItem.Text = "abgerechnen"
        '
        'BearbeitenToolStripMenuItem
        '
@@ -522,17 +523,18 @@ Partial Class frmEssensbestellungenAdministration
        '
        'txtAnzahlDS
        '
-        Me.txtAnzahlDS.Location = New System.Drawing.Point(1170, 741)
+        Me.txtAnzahlDS.Location = New System.Drawing.Point(1020, 744)
        Me.txtAnzahlDS.Name = "txtAnzahlDS"
        Me.txtAnzahlDS.ReadOnly = True
-        Me.txtAnzahlDS.Size = New System.Drawing.Size(60, 20)
+        Me.txtAnzahlDS.Size = New System.Drawing.Size(42, 20)
        Me.txtAnzahlDS.TabIndex = 45
+        Me.txtAnzahlDS.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
        '
        'Label27
        '
        Me.Label27.AutoSize = True
        Me.Label27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label27.Location = New System.Drawing.Point(860, 744)
+        Me.Label27.Location = New System.Drawing.Point(1080, 748)
        Me.Label27.Name = "Label27"
        Me.Label27.Size = New System.Drawing.Size(45, 13)
        Me.Label27.TabIndex = 46
@@ -542,7 +544,7 @@ Partial Class frmEssensbestellungenAdministration
        '
        Me.Label5.AutoSize = True
        Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label5.Location = New System.Drawing.Point(1065, 745)
+        Me.Label5.Location = New System.Drawing.Point(913, 747)
        Me.Label5.Name = "Label5"
        Me.Label5.Size = New System.Drawing.Size(99, 13)
        Me.Label5.TabIndex = 44
@@ -563,7 +565,7 @@ Partial Class frmEssensbestellungenAdministration
        Me.txtSumme._Waehrung = True
        Me.txtSumme._WaehrungZeichen = True
        Me.txtSumme.ForeColor = System.Drawing.Color.Black
-        Me.txtSumme.Location = New System.Drawing.Point(931, 741)
+        Me.txtSumme.Location = New System.Drawing.Point(1130, 744)
        Me.txtSumme.MaxLineLength = -1
        Me.txtSumme.MaxLines_Warning = ""
        Me.txtSumme.MaxLines_Warning_Label = Nothing
@@ -571,6 +573,7 @@ Partial Class frmEssensbestellungenAdministration
        Me.txtSumme.ReadOnly = True
        Me.txtSumme.Size = New System.Drawing.Size(100, 20)
        Me.txtSumme.TabIndex = 47
+        Me.txtSumme.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
        '
        'dgvBestellungen
        '
@@ -665,11 +668,23 @@ Partial Class frmEssensbestellungenAdministration
        Me.Button2.Text = "Excel"
        Me.Button2.UseVisualStyleBackColor = True
        '
+        'Label9
+        '
+        Me.Label9.AutoSize = True
+        Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label9.Location = New System.Drawing.Point(1145, 728)
+        Me.Label9.Name = "Label9"
+        Me.Label9.Size = New System.Drawing.Size(85, 13)
+        Me.Label9.TabIndex = 60
+        Me.Label9.Text = "Gesamtbetrag"
+        Me.Label9.TextAlign = System.Drawing.ContentAlignment.TopRight
+        '
        'frmEssensbestellungenAdministration
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.ClientSize = New System.Drawing.Size(1242, 767)
+        Me.Controls.Add(Me.Label9)
        Me.Controls.Add(Me.Button2)
        Me.Controls.Add(Me.lblWarning)
        Me.Controls.Add(Me.Button1)
@@ -745,4 +760,5 @@ Partial Class frmEssensbestellungenAdministration
    Friend WithEvents Button1 As Button
    Friend WithEvents lblWarning As Label
    Friend WithEvents Button2 As Button
+    Friend WithEvents Label9 As Label
 End Class
--- a/Aviso/frmEssensbestellungenAdministration.vb
+++ b/Aviso/frmEssensbestellungenAdministration.vb
@@ -218,7 +218,7 @@ Public Class frmEssensbestellungenAdministration
    End Sub

    Private Sub FlatButton7_Click(sender As Object, e As EventArgs) Handles FlatButton7.Click
-
+        cbKW.changeItem("")
        txtMitarbeiter.Text = ""
        cboGebaeude.changeItem("")
        cboAbteilung.changeItem("")
@@ -251,7 +251,7 @@ Public Class frmEssensbestellungenAdministration
        Using UserControl1 As UsrCntlessensbestellungen = New UsrCntlessensbestellungen(bestellung)
            Using tmpForm As Form = New Form()
                tmpForm.Width = UserControl1.Width
-                tmpForm.Height = UserControl1.Height
+                tmpForm.Height = UserControl1.Height + 40
                tmpForm.Text = bestellung.eb_kw.ToString & " - " & bestellung.eb_mitname.ToString
                tmpForm.StartPosition = tmpForm.StartPosition.CenterParent
                tmpForm.Controls.Add(UserControl1)
@@ -269,7 +269,7 @@ Public Class frmEssensbestellungenAdministration
        If dgvBestellungen.SelectedRows.Count = 0 Then Exit Sub

        Select Case sender.Text
-            Case "abgerechnet"
+            Case "abgerechnen"
                Select Case dgvBestellungen.SelectedRows.Count
                    Case 1
                        If vbYes = MsgBox("Möchten Sie die Essensbestellung '" & dgvBestellungen.SelectedRows(0).Cells("eb_kw").Value & " von Mitarbeiter " & dgvBestellungen.SelectedRows(0).Cells("eb_mitname").Value & " abrechnen", vbYesNoCancel) Then
@@ -616,36 +616,35 @@ Public Class frmEssensbestellungenAdministration


        For Each el In uniqueMenusMontag
-            resultMontag &= IIf(el.Key.Montag <> "", String.Format("{0} {1}x ", el.Key.Montag, el.Count()), "")
+            resultMontag &= IIf(el.Key.Montag <> "", String.Format("{1}x {0}, ", el.Key.Montag, el.Count()), "")
        Next

        For Each el In uniqueMenusDienstag
-            resultDienstag &= IIf(el.Key.Dienstag <> "", String.Format("{0} {1}x ", el.Key.Dienstag, el.Count()), "")
+            resultDienstag &= IIf(el.Key.Dienstag <> "", String.Format("{1}x {0}, ", el.Key.Dienstag, el.Count()), "")
        Next

        For Each el In uniqueMenusMittwoch
-            resultMittwoch &= IIf(el.Key.Mittwoch <> "", String.Format("{0} {1}x ", el.Key.Mittwoch, el.Count()), "")
+            resultMittwoch &= IIf(el.Key.Mittwoch <> "", String.Format("{1}x {0}, ", el.Key.Mittwoch, el.Count()), "")
        Next

        For Each el In uniqueMenusDonnerstag
-            resultDonnerstag &= IIf(el.Key.Donnerstag <> "", String.Format("{0} {1}x ", el.Key.Donnerstag, el.Count()), "")
+            resultDonnerstag &= IIf(el.Key.Donnerstag <> "", String.Format("{1}x {0}, ", el.Key.Donnerstag, el.Count()), "")
        Next
        For Each el In uniqueMenusFreitag
-            resultFreitag &= IIf(el.Key.Freitag <> "", String.Format("{0} {1}x ", el.Key.Freitag, el.Count()), "")
+            resultFreitag &= IIf(el.Key.Freitag <> "", String.Format("{1}x {0}, ", el.Key.Freitag, el.Count()), "")
        Next


        Dim R As DataRow = dtBestellungen.NewRow
-        R("ID") = 0
+        R("ID") = "0"
        R("KW") = "-"
-        R("Name") = "-"
-        R("KW") = "Summe"
-        R("Gebaeude") = "-"
-        R("Name") = "-"
+        R("Name") = "SUMME"
        R("Gebaeude") = "-"
+        R("Name") = DBNull.Value
        R("Abteilung") = "-"
-        R("Datum") = DateTime.Now()
-        R("Storniert") = True
+        R("Anmerkung") = DBNull.Value
+        R("Datum") = DBNull.Value
+        R("Storniert") = DBNull.Value
        R("Montag") = String.Join(" ", resultMontag)
        R("Dienstag") = String.Join(" ", resultDienstag)
        R("Mittwoch") = String.Join(" ", resultMittwoch)
--- a/Aviso/frmHauptfenster.Designer.vb
+++ b/Aviso/frmHauptfenster.Designer.vb
@@ -130,6 +130,8 @@ Partial Class frmHauptfenster
        Me.ToolStripMenuItem13 = New System.Windows.Forms.ToolStripMenuItem()
        Me.VorauskassenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.EssensbestellungenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.AdministrationEssensbestellungenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.WarenorteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.StatistikToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.LKWBerichtToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.StatistikADMINToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -369,7 +371,6 @@ Partial Class frmHauptfenster
        Me.ToolStripMenuItem20 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMenuItem21 = New System.Windows.Forms.ToolStripMenuItem()
        Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem()
-        Me.AdministrationEssensbestellungenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.conMenuAviso.SuspendLayout()
        Me.MenuStrip1.SuspendLayout()
        Me.Top.SuspendLayout()
@@ -832,7 +833,7 @@ Partial Class frmHauptfenster
        '
        'FunktionenToolStripMenuItem
        '
-        Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GenerelleGestellungenDurchsuchenToolStripMenuItem, Me.KundenVonFremdenSpeditionenToolStripMenuItem, Me.KundenverwaltungToolStripMenuItem, Me.MDMParkplatzkartenToolStripMenuItem, Me.SMSSendenToolStripMenuItem, Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem, Me.MRNBarcodedruckToolStripMenuItem, Me.ToolStripSeparator12, Me.tool_BRGXLS, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.BürgschaftenExcelToolStripMenuItem, Me.ToolStripMenuItem6, Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem, Me.ATGesamtsicherheitVeragAGToolStripMenuItem, Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem, Me.ATGesamtsicherheitVeragCSToolStripMenuItem, Me.ToolStripMenuItem10, Me.TICKETWaidhausToolStripMenuItem, Me.ToolStripSeparator10, Me.DAKOSYToolStripMenuItem, Me.ToolStripSeparator11, Me.SDLAbholaufträgeToolStripMenuItem, Me.ToolStripMenuItem13, Me.VorauskassenToolStripMenuItem, Me.EssensbestellungenToolStripMenuItem, Me.AdministrationEssensbestellungenToolStripMenuItem})
+        Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GenerelleGestellungenDurchsuchenToolStripMenuItem, Me.KundenVonFremdenSpeditionenToolStripMenuItem, Me.KundenverwaltungToolStripMenuItem, Me.MDMParkplatzkartenToolStripMenuItem, Me.SMSSendenToolStripMenuItem, Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem, Me.MRNBarcodedruckToolStripMenuItem, Me.ToolStripSeparator12, Me.tool_BRGXLS, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.BürgschaftenExcelToolStripMenuItem, Me.ToolStripMenuItem6, Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem, Me.ATGesamtsicherheitVeragAGToolStripMenuItem, Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem, Me.ATGesamtsicherheitVeragCSToolStripMenuItem, Me.ToolStripMenuItem10, Me.TICKETWaidhausToolStripMenuItem, Me.ToolStripSeparator10, Me.DAKOSYToolStripMenuItem, Me.ToolStripSeparator11, Me.SDLAbholaufträgeToolStripMenuItem, Me.ToolStripMenuItem13, Me.VorauskassenToolStripMenuItem, Me.EssensbestellungenToolStripMenuItem, Me.AdministrationEssensbestellungenToolStripMenuItem, Me.WarenorteToolStripMenuItem})
        Me.FunktionenToolStripMenuItem.Name = "FunktionenToolStripMenuItem"
        Me.FunktionenToolStripMenuItem.Size = New System.Drawing.Size(79, 20)
        Me.FunktionenToolStripMenuItem.Text = "Funktionen"
@@ -1020,6 +1021,20 @@ Partial Class frmHauptfenster
        Me.EssensbestellungenToolStripMenuItem.Text = "Essensbestellungen"
        Me.EssensbestellungenToolStripMenuItem.Visible = False
        '
+        'AdministrationEssensbestellungenToolStripMenuItem
+        '
+        Me.AdministrationEssensbestellungenToolStripMenuItem.Name = "AdministrationEssensbestellungenToolStripMenuItem"
+        Me.AdministrationEssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.AdministrationEssensbestellungenToolStripMenuItem.Text = "Administration Essensbestellungen"
+        Me.AdministrationEssensbestellungenToolStripMenuItem.Visible = False
+        '
+        'WarenorteToolStripMenuItem
+        '
+        Me.WarenorteToolStripMenuItem.Name = "WarenorteToolStripMenuItem"
+        Me.WarenorteToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.WarenorteToolStripMenuItem.Text = "Warenorte"
+        Me.WarenorteToolStripMenuItem.Visible = False
+        '
        'StatistikToolStripMenuItem
        '
        Me.StatistikToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LKWBerichtToolStripMenuItem, Me.StatistikADMINToolStripMenuItem, Me.ToolStripSeparator8, Me.BürgschafrtsbuchungenFremdToolStripMenuItem, Me.LKWEingetroffenNachToolStripMenuItem, Me.ToolStripSeparator7, Me.SDLAuswertungenToolStripMenuItem, Me.SDLAuswertungenToolStripMenuItem1})
@@ -3515,12 +3530,6 @@ Partial Class frmHauptfenster
        Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28)
        Me.UsrCntlTestsystem1.TabIndex = 8
        '
-        'AdministrationEssensbestellungenToolStripMenuItem
-        '
-        Me.AdministrationEssensbestellungenToolStripMenuItem.Name = "AdministrationEssensbestellungenToolStripMenuItem"
-        Me.AdministrationEssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
-        Me.AdministrationEssensbestellungenToolStripMenuItem.Text = "Administration Essensbestellungen"
-        '
        'frmHauptfenster
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -3930,4 +3939,5 @@ Partial Class frmHauptfenster
    Friend WithEvents conAnVerimex As ToolStripMenuItem
    Friend WithEvents conAnIndonesien As ToolStripMenuItem
    Friend WithEvents AdministrationEssensbestellungenToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents WarenorteToolStripMenuItem As ToolStripMenuItem
 End Class
--- a/Aviso/frmHauptfenster.vb
+++ b/Aviso/frmHauptfenster.vb
@@ -554,6 +554,17 @@ Public Class frmHauptfenster
            End Select
        End If

+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN_ESSENSBESTELLUNGEN", "AVISO") Then
+            AdministrationEssensbestellungenToolStripMenuItem.Visible = True
+        End If
+
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("WARENORTE", "AVISO") Then
+            WarenorteToolStripMenuItem.Visible = True
+        End If
+
+
+
+
        Panel1.Height -= pnlSearch.Height

        If Now.ToShortDateString >= DateTime.Parse("01/01/2023") Then
@@ -4327,6 +4338,11 @@ Public Class frmHauptfenster
        Dim f As New frmEssensbestellungenAdministration()
        f.ShowDialog(Me)
    End Sub
+
+    Private Sub WarenorteToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles WarenorteToolStripMenuItem.Click
+        Dim f As New frmWarenorte()
+        f.ShowDialog(Me)
+    End Sub
 End Class

 Public Class AvisoStatusFunctions
--- a/Aviso/frmWarenorte.Designer.vb
+++ b/Aviso/frmWarenorte.Designer.vb
@@ -0,0 +1,381 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frmWarenorte
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular ü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.components = New System.ComponentModel.Container()
+        Me.pnlTop = New System.Windows.Forms.Panel()
+        Me.lblWarning = New System.Windows.Forms.Label()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.cbxFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.btnAdd = New System.Windows.Forms.Button()
+        Me.btnDelete = New System.Windows.Forms.Button()
+        Me.txtWarenort = New System.Windows.Forms.TextBox()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.txtBezeichnung = New System.Windows.Forms.TextBox()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.txtOrt = New System.Windows.Forms.TextBox()
+        Me.Label6 = New System.Windows.Forms.Label()
+        Me.Label7 = New System.Windows.Forms.Label()
+        Me.txtKennr = New System.Windows.Forms.TextBox()
+        Me.cbxAktiv = New System.Windows.Forms.CheckBox()
+        Me.cbxGrenzstelle = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Label8 = New System.Windows.Forms.Label()
+        Me.txtCluster = New System.Windows.Forms.TextBox()
+        Me.mainPanel = New System.Windows.Forms.Panel()
+        Me.cbxFirmaChange = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Label = New System.Windows.Forms.Label()
+        Me.Label9 = New System.Windows.Forms.Label()
+        Me.txtReihenfolge = New System.Windows.Forms.TextBox()
+        Me.btnSave = New System.Windows.Forms.Button()
+        Me.dgvWarenorteNew = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.pnlTop.SuspendLayout()
+        Me.mainPanel.SuspendLayout()
+        CType(Me.dgvWarenorteNew, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SuspendLayout()
+        '
+        'pnlTop
+        '
+        Me.pnlTop.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.pnlTop.Controls.Add(Me.lblWarning)
+        Me.pnlTop.Controls.Add(Me.Label4)
+        Me.pnlTop.Controls.Add(Me.Label3)
+        Me.pnlTop.Controls.Add(Me.cbxFirma)
+        Me.pnlTop.Dock = System.Windows.Forms.DockStyle.Top
+        Me.pnlTop.Location = New System.Drawing.Point(0, 0)
+        Me.pnlTop.Name = "pnlTop"
+        Me.pnlTop.Size = New System.Drawing.Size(549, 48)
+        Me.pnlTop.TabIndex = 2
+        '
+        'lblWarning
+        '
+        Me.lblWarning.AutoSize = True
+        Me.lblWarning.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblWarning.ForeColor = System.Drawing.Color.Red
+        Me.lblWarning.Location = New System.Drawing.Point(166, 13)
+        Me.lblWarning.Name = "lblWarning"
+        Me.lblWarning.Size = New System.Drawing.Size(0, 13)
+        Me.lblWarning.TabIndex = 14
+        '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 16.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label4.ForeColor = System.Drawing.Color.White
+        Me.Label4.Location = New System.Drawing.Point(10, 13)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(122, 26)
+        Me.Label4.TabIndex = 0
+        Me.Label4.Text = "Warenorte"
+        '
+        'Label3
+        '
+        Me.Label3.AutoSize = True
+        Me.Label3.ForeColor = System.Drawing.Color.White
+        Me.Label3.Location = New System.Drawing.Point(414, 0)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(32, 13)
+        Me.Label3.TabIndex = 5
+        Me.Label3.Text = "Firma"
+        '
+        'cbxFirma
+        '
+        Me.cbxFirma._allowedValuesFreiText = Nothing
+        Me.cbxFirma._allowFreiText = False
+        Me.cbxFirma._value = ""
+        Me.cbxFirma.FormattingEnabled = True
+        Me.cbxFirma.Location = New System.Drawing.Point(417, 15)
+        Me.cbxFirma.Name = "cbxFirma"
+        Me.cbxFirma.Size = New System.Drawing.Size(100, 21)
+        Me.cbxFirma.TabIndex = 13
+        '
+        'btnAdd
+        '
+        Me.btnAdd.BackgroundImage = Global.AVISO.My.Resources.Resources.plus
+        Me.btnAdd.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.btnAdd.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnAdd.Location = New System.Drawing.Point(97, 283)
+        Me.btnAdd.Name = "btnAdd"
+        Me.btnAdd.Size = New System.Drawing.Size(24, 20)
+        Me.btnAdd.TabIndex = 97
+        Me.btnAdd.UseVisualStyleBackColor = True
+        '
+        'btnDelete
+        '
+        Me.btnDelete.BackgroundImage = Global.AVISO.My.Resources.Resources.del
+        Me.btnDelete.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.btnDelete.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnDelete.Location = New System.Drawing.Point(120, 283)
+        Me.btnDelete.Name = "btnDelete"
+        Me.btnDelete.Size = New System.Drawing.Size(24, 20)
+        Me.btnDelete.TabIndex = 96
+        Me.btnDelete.UseVisualStyleBackColor = True
+        '
+        'txtWarenort
+        '
+        Me.txtWarenort.Location = New System.Drawing.Point(19, 25)
+        Me.txtWarenort.Name = "txtWarenort"
+        Me.txtWarenort.Size = New System.Drawing.Size(100, 20)
+        Me.txtWarenort.TabIndex = 0
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(16, 9)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(51, 13)
+        Me.Label1.TabIndex = 1
+        Me.Label1.Text = "Warenort"
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.Location = New System.Drawing.Point(137, 9)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(69, 13)
+        Me.Label2.TabIndex = 3
+        Me.Label2.Text = "Bezeichnung"
+        '
+        'txtBezeichnung
+        '
+        Me.txtBezeichnung.Location = New System.Drawing.Point(140, 25)
+        Me.txtBezeichnung.Name = "txtBezeichnung"
+        Me.txtBezeichnung.Size = New System.Drawing.Size(100, 20)
+        Me.txtBezeichnung.TabIndex = 2
+        '
+        'Label5
+        '
+        Me.Label5.AutoSize = True
+        Me.Label5.Location = New System.Drawing.Point(137, 63)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(21, 13)
+        Me.Label5.TabIndex = 7
+        Me.Label5.Text = "Ort"
+        '
+        'txtOrt
+        '
+        Me.txtOrt.Location = New System.Drawing.Point(140, 79)
+        Me.txtOrt.Name = "txtOrt"
+        Me.txtOrt.Size = New System.Drawing.Size(100, 20)
+        Me.txtOrt.TabIndex = 6
+        '
+        'Label6
+        '
+        Me.Label6.AutoSize = True
+        Me.Label6.Location = New System.Drawing.Point(16, 164)
+        Me.Label6.Name = "Label6"
+        Me.Label6.Size = New System.Drawing.Size(65, 13)
+        Me.Label6.TabIndex = 9
+        Me.Label6.Text = "Grenzestelle"
+        '
+        'Label7
+        '
+        Me.Label7.AutoSize = True
+        Me.Label7.Location = New System.Drawing.Point(137, 114)
+        Me.Label7.Name = "Label7"
+        Me.Label7.Size = New System.Drawing.Size(46, 13)
+        Me.Label7.TabIndex = 11
+        Me.Label7.Text = "Kenn-Nr"
+        '
+        'txtKennr
+        '
+        Me.txtKennr.Location = New System.Drawing.Point(140, 130)
+        Me.txtKennr.Name = "txtKennr"
+        Me.txtKennr.Size = New System.Drawing.Size(100, 20)
+        Me.txtKennr.TabIndex = 10
+        '
+        'cbxAktiv
+        '
+        Me.cbxAktiv.AutoSize = True
+        Me.cbxAktiv.Location = New System.Drawing.Point(293, 8)
+        Me.cbxAktiv.Name = "cbxAktiv"
+        Me.cbxAktiv.Size = New System.Drawing.Size(50, 17)
+        Me.cbxAktiv.TabIndex = 12
+        Me.cbxAktiv.Text = "Aktiv"
+        Me.cbxAktiv.UseVisualStyleBackColor = True
+        '
+        'cbxGrenzstelle
+        '
+        Me.cbxGrenzstelle._allowedValuesFreiText = Nothing
+        Me.cbxGrenzstelle._allowFreiText = False
+        Me.cbxGrenzstelle._value = ""
+        Me.cbxGrenzstelle.DropDownWidth = 120
+        Me.cbxGrenzstelle.FormattingEnabled = True
+        Me.cbxGrenzstelle.Location = New System.Drawing.Point(19, 180)
+        Me.cbxGrenzstelle.Name = "cbxGrenzstelle"
+        Me.cbxGrenzstelle.Size = New System.Drawing.Size(100, 21)
+        Me.cbxGrenzstelle.TabIndex = 14
+        '
+        'Label8
+        '
+        Me.Label8.AutoSize = True
+        Me.Label8.Location = New System.Drawing.Point(16, 63)
+        Me.Label8.Name = "Label8"
+        Me.Label8.Size = New System.Drawing.Size(39, 13)
+        Me.Label8.TabIndex = 16
+        Me.Label8.Text = "Cluster"
+        '
+        'txtCluster
+        '
+        Me.txtCluster.Location = New System.Drawing.Point(19, 79)
+        Me.txtCluster.Name = "txtCluster"
+        Me.txtCluster.Size = New System.Drawing.Size(100, 20)
+        Me.txtCluster.TabIndex = 15
+        '
+        'mainPanel
+        '
+        Me.mainPanel.Controls.Add(Me.cbxFirmaChange)
+        Me.mainPanel.Controls.Add(Me.Label)
+        Me.mainPanel.Controls.Add(Me.Label9)
+        Me.mainPanel.Controls.Add(Me.txtReihenfolge)
+        Me.mainPanel.Controls.Add(Me.btnSave)
+        Me.mainPanel.Controls.Add(Me.cbxAktiv)
+        Me.mainPanel.Controls.Add(Me.Label1)
+        Me.mainPanel.Controls.Add(Me.Label8)
+        Me.mainPanel.Controls.Add(Me.txtWarenort)
+        Me.mainPanel.Controls.Add(Me.txtCluster)
+        Me.mainPanel.Controls.Add(Me.txtBezeichnung)
+        Me.mainPanel.Controls.Add(Me.cbxGrenzstelle)
+        Me.mainPanel.Controls.Add(Me.Label2)
+        Me.mainPanel.Controls.Add(Me.txtOrt)
+        Me.mainPanel.Controls.Add(Me.Label7)
+        Me.mainPanel.Controls.Add(Me.Label5)
+        Me.mainPanel.Controls.Add(Me.txtKennr)
+        Me.mainPanel.Controls.Add(Me.Label6)
+        Me.mainPanel.Location = New System.Drawing.Point(150, 54)
+        Me.mainPanel.Name = "mainPanel"
+        Me.mainPanel.Size = New System.Drawing.Size(368, 242)
+        Me.mainPanel.TabIndex = 17
+        '
+        'cbxFirmaChange
+        '
+        Me.cbxFirmaChange._allowedValuesFreiText = Nothing
+        Me.cbxFirmaChange._allowFreiText = False
+        Me.cbxFirmaChange._value = ""
+        Me.cbxFirmaChange.DropDownWidth = 120
+        Me.cbxFirmaChange.Enabled = False
+        Me.cbxFirmaChange.FormattingEnabled = True
+        Me.cbxFirmaChange.Location = New System.Drawing.Point(140, 180)
+        Me.cbxFirmaChange.Name = "cbxFirmaChange"
+        Me.cbxFirmaChange.Size = New System.Drawing.Size(100, 21)
+        Me.cbxFirmaChange.TabIndex = 21
+        Me.cbxFirmaChange.Visible = False
+        '
+        'Label
+        '
+        Me.Label.AutoSize = True
+        Me.Label.Location = New System.Drawing.Point(137, 164)
+        Me.Label.Name = "Label"
+        Me.Label.Size = New System.Drawing.Size(32, 13)
+        Me.Label.TabIndex = 20
+        Me.Label.Text = "Firma"
+        Me.Label.Visible = False
+        '
+        'Label9
+        '
+        Me.Label9.AutoSize = True
+        Me.Label9.Location = New System.Drawing.Point(16, 114)
+        Me.Label9.Name = "Label9"
+        Me.Label9.Size = New System.Drawing.Size(64, 13)
+        Me.Label9.TabIndex = 19
+        Me.Label9.Text = "Reihenfolge"
+        '
+        'txtReihenfolge
+        '
+        Me.txtReihenfolge.Location = New System.Drawing.Point(19, 130)
+        Me.txtReihenfolge.Name = "txtReihenfolge"
+        Me.txtReihenfolge.Size = New System.Drawing.Size(100, 20)
+        Me.txtReihenfolge.TabIndex = 18
+        '
+        'btnSave
+        '
+        Me.btnSave.Location = New System.Drawing.Point(281, 207)
+        Me.btnSave.Name = "btnSave"
+        Me.btnSave.Size = New System.Drawing.Size(75, 23)
+        Me.btnSave.TabIndex = 17
+        Me.btnSave.Text = "Speichern"
+        Me.btnSave.UseVisualStyleBackColor = True
+        '
+        'dgvWarenorteNew
+        '
+        Me.dgvWarenorteNew.AKTUALISIERUNGS_INTERVALL = -1
+        Me.dgvWarenorteNew.AllowUserToAddRows = False
+        Me.dgvWarenorteNew.AllowUserToDeleteRows = False
+        Me.dgvWarenorteNew.BackgroundColor = System.Drawing.Color.White
+        Me.dgvWarenorteNew.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.dgvWarenorteNew.Location = New System.Drawing.Point(0, 49)
+        Me.dgvWarenorteNew.Name = "dgvWarenorteNew"
+        Me.dgvWarenorteNew.Size = New System.Drawing.Size(144, 254)
+        Me.dgvWarenorteNew.TabIndex = 98
+        '
+        'frmWarenorte
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(549, 309)
+        Me.Controls.Add(Me.mainPanel)
+        Me.Controls.Add(Me.btnAdd)
+        Me.Controls.Add(Me.btnDelete)
+        Me.Controls.Add(Me.pnlTop)
+        Me.Controls.Add(Me.dgvWarenorteNew)
+        Me.Name = "frmWarenorte"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+        Me.Text = "Warenorte"
+        Me.pnlTop.ResumeLayout(False)
+        Me.pnlTop.PerformLayout()
+        Me.mainPanel.ResumeLayout(False)
+        Me.mainPanel.PerformLayout()
+        CType(Me.dgvWarenorteNew, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ResumeLayout(False)
+
+    End Sub
+
+    Friend WithEvents pnlTop As Panel
+    Friend WithEvents Label4 As Label
+    Friend WithEvents btnAdd As Button
+    Friend WithEvents btnDelete As Button
+    Friend WithEvents cbxAktiv As CheckBox
+    Friend WithEvents Label7 As Label
+    Friend WithEvents txtKennr As TextBox
+    Friend WithEvents Label6 As Label
+    Friend WithEvents Label5 As Label
+    Friend WithEvents txtOrt As TextBox
+    Friend WithEvents Label3 As Label
+    Friend WithEvents Label2 As Label
+    Friend WithEvents txtBezeichnung As TextBox
+    Friend WithEvents Label1 As Label
+    Friend WithEvents txtWarenort As TextBox
+    Friend WithEvents cbxGrenzstelle As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents cbxFirma As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Label8 As Label
+    Friend WithEvents txtCluster As TextBox
+    Friend WithEvents mainPanel As Panel
+    Friend WithEvents btnSave As Button
+    Friend WithEvents lblWarning As Label
+    Friend WithEvents Label9 As Label
+    Friend WithEvents txtReihenfolge As TextBox
+    Friend WithEvents dgvWarenorteNew As VERAG_PROG_ALLGEMEIN.MyDatagridview
+    Friend WithEvents cbxFirmaChange As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Label As Label
+End Class
--- a/Aviso/frmWarenorte.resx
+++ b/Aviso/frmWarenorte.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/Aviso/frmWarenorte.vb
+++ b/Aviso/frmWarenorte.vb
@@ -0,0 +1,211 @@
+Imports DocumentFormat.OpenXml.Drawing.Diagrams
+Imports Org.BouncyCastle.Crypto.Modes
+Imports VERAG_PROG_ALLGEMEIN
+
+Public Class frmWarenorte
+
+    Dim warenort As New cWarenorte
+
+    Private Sub Warenorte_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        initDGVWarenort()
+        cbxGrenzstelle.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", True)
+        cbxGrenzstelle.changeItem("")
+        cbxFirma.fillWithSQL("SELECT [Firma_Bez]  FROM  [tblFirma] WHERE FIRMENGRUPPE IN ('VERAG') ", False, "FMZOLL", True)
+        cbxFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG"))
+        cbxFirmaChange.Items.AddRange(cbxFirma.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray())
+
+    End Sub
+
+
+    Private Sub initDGVWarenort(Optional firma As String = "")
+
+        lblWarning.Text = ""
+
+        Dim SQLString As String = "SELECT [wo_warenort] ,[wo_bezeichnung], [wo_aktiv], [wo_firma] FROM [tblWarenorte]"
+        Dim SQLWHere = ""
+        If firma <> "" Then
+            SQLWHere = " WHERE wo_firma = '" & firma & "'"
+        End If
+
+
+        dgvWarenorteNew.SET_SQL(SQLString & SQLWHere, "AVISO", ,)
+        dgvWarenorteNew.LOAD()
+
+
+        If dgvWarenorteNew.Columns.Count < 1 Then Exit Sub
+
+        With dgvWarenorteNew
+            If .RowCount = 0 Then Me.Cursor = Cursors.Default : Exit Sub
+            .MultiSelect = False
+            .RowHeadersVisible = False
+            .ReadOnly = True
+            .SelectionMode = DataGridViewSelectionMode.FullRowSelect
+            .Columns("wo_warenort").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+            .Columns("wo_warenort").HeaderText = "Warenort"
+            .Columns("wo_bezeichnung").Visible = False
+            .Columns("wo_aktiv").Visible = False
+            .Columns("wo_firma").Visible = False
+        End With
+
+
+        For Each row As DataGridViewRow In dgvWarenorteNew.Rows
+            If Not IsDBNull(row.Cells("wo_aktiv").Value) Then
+                If Not row.Cells("wo_aktiv").Value Then
+                    row.DefaultCellStyle.BackColor = Color.IndianRed
+                End If
+            End If
+
+        Next
+
+    End Sub
+
+    Private Sub btnAdd_Click(sender As Object, e As EventArgs) Handles btnAdd.Click
+
+        If checkIfFirmaIsFilled() = False Then Exit Sub
+
+        Dim input = InputBox("Bitte geben Sie die Bezeichnung des neuen Warenorts ein:", "Warenort anlegen")
+        If input <> "" Then
+            If checkNameIsValid(input) Then
+                Dim WarenortNew As New cWarenorte(input, cbxFirma._value)
+                WarenortNew.wo_cluster = ""
+                WarenortNew.wo_aktiv = True
+                WarenortNew.wo_bezeichnung = ""
+                WarenortNew.wo_grenzstelle = DBNull.Value
+                WarenortNew.wo_knnr = ""
+                WarenortNew.wo_ort = ""
+                WarenortNew.wo_reihenfolge = "-1"
+
+                If WarenortNew.SAVE() Then
+                    initDGVWarenort(cbxFirma._value)
+                End If
+
+            Else
+                MsgBox("Es existiert bereits ein Warenort " & input & " für die Firma " & cbxFirma._value)
+            End If
+
+        Else
+            MsgBox("Keine Bezeichnung angegeben!")
+        End If
+    End Sub
+
+    Private Sub btnDelete_Click(sender As Object, e As EventArgs) Handles btnDelete.Click
+        If dgvWarenorteNew.SelectedRows.Count > 0 Then
+
+            If vbYes = MsgBox("Möchten Sie diesen Warenort " & dgvWarenorteNew.SelectedRows(0).Cells("wo_warenort").Value & " in " & dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value & "  wirklich löschen?", vbYesNo) Then
+                warenort.deleteWarenort(dgvWarenorteNew.SelectedRows(0).Cells("wo_warenort").Value, dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value)
+                initDGVWarenort(cbxFirma._value)
+            End If
+
+        End If
+
+    End Sub
+
+    Private Function checkNameIsValid(name As String) As Boolean
+
+        If dgvWarenorteNew.Rows.Count = 0 Then Return True
+        If checkIfFirmaIsFilled() = False Then Return False
+
+
+        For Each row As DataGridViewRow In dgvWarenorteNew.Rows
+            If Not IsDBNull(row.Cells("wo_warenort").Value) AndAlso Not IsDBNull(row.Cells("wo_firma").Value) Then
+                If row.Cells("wo_warenort").Value.ToLower = name.ToLower AndAlso row.Cells("wo_firma").Value = cbxFirma._value Then
+                    Return False
+                End If
+            End If
+
+        Next
+
+        Return True
+
+    End Function
+
+
+    Private Sub dgvWarenorteNew_SelectionChanged(sender As Object, e As EventArgs) Handles dgvWarenorteNew.SelectionChanged
+
+        If dgvWarenorteNew.SelectedRows.Count < 1 Then
+            mainPanel.Enabled = False
+            Exit Sub
+        Else
+            mainPanel.Enabled = True
+
+        End If
+
+        Dim WarenortNew As New cWarenorte(dgvWarenorteNew.SelectedRows(0).Cells("wo_warenort").Value, dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value)
+
+        txtWarenort.Text = WarenortNew.wo_warenort
+        txtBezeichnung.Text = WarenortNew.wo_bezeichnung
+        cbxAktiv.Checked = WarenortNew.wo_aktiv
+        txtOrt.Text = WarenortNew.wo_ort
+        cbxGrenzstelle.changeItem(WarenortNew.wo_grenzstelle)
+        cbxFirmaChange.changeItem(WarenortNew.wo_firma)
+        txtCluster.Text = WarenortNew.wo_cluster
+        txtKennr.Text = WarenortNew.wo_knnr
+        txtReihenfolge.Text = WarenortNew.wo_reihenfolge
+
+    End Sub
+
+    Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click
+
+        checkIfFirmaIsFilled()
+
+        Dim WarenortNew As New cWarenorte(dgvWarenorteNew.SelectedRows(0).Cells("wo_warenort").Value, dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value)
+
+
+        WarenortNew.wo_warenort = txtWarenort.Text
+        WarenortNew.wo_bezeichnung = txtBezeichnung.Text
+        WarenortNew.wo_aktiv = cbxAktiv.Checked
+        WarenortNew.wo_ort = txtOrt.Text
+        WarenortNew.wo_grenzstelle = cbxGrenzstelle._value
+        WarenortNew.wo_firma = cbxFirmaChange._value
+        WarenortNew.wo_cluster = txtCluster.Text
+        WarenortNew.wo_knnr = txtKennr.Text
+        WarenortNew.wo_reihenfolge = txtReihenfolge.Text
+
+        If cbxGrenzstelle._value = "" Then
+            lblWarning.Text = "Grenzstelle muss ausgewählt werden!"
+            Exit Sub
+        Else
+            lblWarning.Text = ""
+        End If
+
+        WarenortNew.SAVE()
+        dgvWarenorteNew.GetOrder()
+        initDGVWarenort(cbxFirma._value)
+        dgvWarenorteNew.SetOrder()
+
+
+
+    End Sub
+
+    Private Sub cbxFirma_SelectedValueChanged(sender As Object, e As EventArgs) Handles cbxFirma.SelectedValueChanged
+        dgvWarenorteNew.GetOrder()
+        initDGVWarenort(cbxFirma._value)
+        dgvWarenorteNew.SetOrder()
+    End Sub
+
+    Private Function checkIfFirmaIsFilled()
+
+
+
+        If cbxFirma._value = "" Then
+            If (dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value Is DBNull.Value Or dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value Is Nothing) Then
+
+
+                lblWarning.Text = "Bitte Firma auswählen!"
+                Return False
+            End If
+            lblWarning.Text = ""
+            Return True
+
+        Else
+
+            lblWarning.Text = ""
+            Return True
+
+
+        End If
+
+        Return False
+
+    End Function
+End Class