diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj
index 11f9275..0f4bf3b 100644
--- a/Aviso/Aviso.vbproj
+++ b/Aviso/Aviso.vbproj
@@ -263,17 +263,17 @@
     <Reference Include="NumericBox">
       <HintPath>..\..\..\dll\NumericBox.dll</HintPath>
     </Reference>
-    <Reference Include="Spire.License, Version=1.3.15.46, Culture=neutral, PublicKeyToken=b1144360237c8b3f, processorArchitecture=MSIL">
+    <Reference Include="Spire.License, Version=1.4.0.46, Culture=neutral, PublicKeyToken=b1144360237c8b3f, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\dll\Spire.PDF\2022\Spire.License.dll</HintPath>
+      <HintPath>..\..\..\dll\Spire.PDF\2023\Spire.License.dll</HintPath>
     </Reference>
-    <Reference Include="Spire.Pdf, Version=7.6.0.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
+    <Reference Include="Spire.Pdf, Version=8.1.4.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\dll\Spire.PDF\2022\Spire.Pdf.dll</HintPath>
+      <HintPath>..\..\..\dll\Spire.PDF\2023\Spire.Pdf.dll</HintPath>
     </Reference>
-    <Reference Include="Spire.PdfViewer.Forms, Version=6.6.0.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
+    <Reference Include="Spire.PdfViewer.Forms, Version=7.1.4.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\dll\Spire.PDF\2022\Spire.PdfViewer.Forms.dll</HintPath>
+      <HintPath>..\..\..\dll\Spire.PDF\2023\Spire.PdfViewer.Forms.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb
index d9b1a04..ae94481 100644
--- a/Aviso/My Project/AssemblyInfo.vb	
+++ b/Aviso/My Project/AssemblyInfo.vb	
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("3.8.9.6")>
-<Assembly: AssemblyFileVersion("3.8.9.6")>
+<Assembly: AssemblyVersion("3.8.9.9")>
+<Assembly: AssemblyFileVersion("3.8.9.9")>
diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb
index 480097d..e984839 100644
--- a/Aviso/frmHauptfenster.vb
+++ b/Aviso/frmHauptfenster.vb
@@ -209,6 +209,7 @@ Public Class frmHauptfenster
         Else
             cboGrenzstelle.Items.Clear()
             cboGrenzstelle.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where ([grz_Firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "') AND grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", True,, "ALLE")
+            cboGrenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE WARENORTE", "ALLE_WO"))
             cboGrenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("??? - Andere", "???"))
         End If
 
@@ -249,6 +250,7 @@ Public Class frmHauptfenster
             ''''End If
 
             cboMy_Grenzstelle.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where ([grz_Firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "') AND grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", True, False, "ALLE")
+            cboMy_Grenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE WARENORTE", "ALLE_WO"))
             cboMy_Grenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("??? - Andere", "???"))
             cboMy_Grenzstelle.changeItem("")
             ''''cboMy_Grenzstelle.changeItem("ALLE_BACK") 'greift nur wenn verfügbar..
@@ -928,12 +930,16 @@ Public Class frmHauptfenster
         hSQL &= datumseinschr
 
 
+        If cboGrenzstelle._value = "ALLE_WO" Then
+            hSQL += " AND Grenzstelle IN (SELECT [grz_Grenzstelle] FROM [tblGrenzstelle] where (grz_Warenort=1 AND grz_Firma ='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' ) ) "
 
-        '   If SucheStandort <> "" Then hSQL += " AND Grenzstelle = '" & SucheStandort & "'"
-        If cboGrenzstelle._value <> "" Then hSQL += " AND Grenzstelle = '" & cboGrenzstelle._value & "'"
-        '  Bestimmungs.ZST
-        If cboGrenzstelle._value = "???" And txtBestimmungszollstelle._value <> "" Then
-            hSQL += " AND Zollstelle = '" & txtBestimmungszollstelle._value & "'"
+        Else
+            '   If SucheStandort <> "" Then hSQL += " AND Grenzstelle = '" & SucheStandort & "'"
+            If cboGrenzstelle._value <> "" Then hSQL += " AND Grenzstelle = '" & cboGrenzstelle._value & "'"
+            '  Bestimmungs.ZST
+            If cboGrenzstelle._value = "???" And txtBestimmungszollstelle._value <> "" Then
+                hSQL += " AND Zollstelle = '" & txtBestimmungszollstelle._value & "'"
+            End If
         End If
 
 
@@ -1237,26 +1243,33 @@ Public Class frmHauptfenster
                                        " FROM Aviso " &
                                        " WHERE   (  Status IN (0, 3, 4, 5,6,7)  OR ( Status = 1 AND [Abgeschlossen] = 0 )) " &
                                              sqlStrFirma & " AND (LetzterMitarbeiterId=@maId) "
-                If cboMy_Grenzstelle._value.Replace("ALLE_BACK", "") <> "" Then sqlStr &= " AND Grenzstelle = '" & cboMy_Grenzstelle._value & "'"
+                'If cboMy_Grenzstelle._value.Replace("ALLE_BACK", "") <> "" Then sqlStr &= " AND Grenzstelle = '" & cboMy_Grenzstelle._value & "'"
+
+                If cboMy_Grenzstelle._value = "ALLE_WO" Then
+                    sqlStr += " AND Grenzstelle IN (SELECT [grz_Grenzstelle] FROM [tblGrenzstelle] where (grz_Warenort=1 AND grz_Firma ='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' ) ) "
+                ElseIf cboMy_Grenzstelle._value.Replace("ALLE_BACK", "") <> "" Then
+                    sqlStr &= " AND Grenzstelle = '" & cboMy_Grenzstelle._value & "'"
+
+                End If
 
 
                 sqlStr &= " ORDER BY case	 " &
-                                             " when [Status] =3 then 0 " &
-                                             " when [Status] =6 then 0.5 " &
-                                             " when [Status] =7 then 0.5 " &
-                                             " when [Status] =0 then 1 " &
-                                             " when [Status] =99 then 2 " &
-                                             " when [Status] =4 then 3 " &
-                                             " when [Status] =1 then 4 " &
-                                             " when [Status] =5 then 4 " &
-                                             " when [Status] =0 then 5 " &
-                                     " END, Grenzstelle,Ankunft " & If(cbx_My_LKW.Checked, "", ",tblSnd_SendungID")
-            Else
+                                                 " when [Status] =3 then 0 " &
+                                                 " when [Status] =6 then 0.5 " &
+                                                 " when [Status] =7 then 0.5 " &
+                                                 " when [Status] =0 then 1 " &
+                                                 " when [Status] =99 then 2 " &
+                                                 " when [Status] =4 then 3 " &
+                                                 " when [Status] =1 then 4 " &
+                                                 " when [Status] =5 then 4 " &
+                                                 " when [Status] =0 then 5 " &
+                                         " END, Grenzstelle,Ankunft " & If(cbx_My_LKW.Checked, "", ",tblSnd_SendungID")
+                Else
 
-                '----------------------------------------------------------------------------------------------------------------------------------
-                '--- Sendung ---
-                '----------------------------------------------------------------------------------------------------------------------------------
-                Dim inBearbeitungSQL = " tblSendungen.LetzterMitarbeiterId=@maId " ' 1<>1 " 'DEFAULT = "Benutzer"
+                    '----------------------------------------------------------------------------------------------------------------------------------
+                    '--- Sendung ---
+                    '----------------------------------------------------------------------------------------------------------------------------------
+                    Dim inBearbeitungSQL = " tblSendungen.LetzterMitarbeiterId=@maId " ' 1<>1 " 'DEFAULT = "Benutzer"
                 If cboMyAvisoAnzeige._value <> "" Then
                     If cboMyAvisoAnzeige._value = "ALLE" Then
                         '  inBearbeitungSQL = " 1=1 " 'ALLE
@@ -1286,8 +1299,15 @@ Public Class frmHauptfenster
                     Case CheckState.Unchecked : sqlStr &= " AND tblSnd_Vorbereitet is null	 "
                         ' Case CheckState.Indeterminate : sqlStr &= " AND tblSnd_Vorbereitet is not null	 "
                 End Select
-                If cboMy_Grenzstelle._value.Replace("ALLE_BACK", "") <> "" Then sqlStr &= " AND Grenzstelle = '" & cboMy_Grenzstelle._value & "'"
-                If cboMy_Grenzstelle._value = "ALLE_BACK" Then sqlStr &= " AND FilialenNr NOT IN ('7001','7002','7003') "
+                If cboMy_Grenzstelle._value = "ALLE_WO" Then
+                    sqlStr += " AND Grenzstelle IN (SELECT [grz_Grenzstelle] FROM [tblGrenzstelle] where (grz_Warenort=1 AND grz_Firma ='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' ) ) "
+                Else
+
+                    If cboMy_Grenzstelle._value.Replace("ALLE_BACK", "") <> "" Then sqlStr &= " AND Grenzstelle = '" & cboMy_Grenzstelle._value & "'"
+                    If cboMy_Grenzstelle._value = "ALLE_BACK" Then sqlStr &= " AND FilialenNr NOT IN ('7001','7002','7003') "
+
+                End If
+
                 If cbx_My_Brexit.Visible AndAlso Not cbx_My_Brexit.Checked Then sqlStr &= " AND FilialenNr NOT IN ('7001','7002','7003') "
 
                 'Farbe