ms nOTIFICATIONS UND LANGUAGE

app/DD_PM_WINDREAM/frmMain.vb

@@ -2366,10 +2366,12 @@ Public Class frmMain
         Await Decide_Load(True)
         Handling_DEBUG_USER()
 
-        Dim oSQL = $"SELECT * FROM TBDD_NOTIFICATIONS_SYSTEM 
+        Dim oSQL = $"SELECT * FROM TBDD_NOTIFICATIONS_SYSTEM NOTE
-            where DISPLAY_UNTIL <= CONVERT(DATE,GETDATE()) or DISPLAY_UNTIL IS NULL AND MODULE = 'PM' 
+INNER JOIN (SELECT * FROM TBDD_NOTIFICATIONS_SYSTEM WHERE LANG_CODE = '{USER_LANGUAGE}' OR LANG_CODE = 'ALL') LANG ON NOTE.GUID = LANG.GUID
-            AND GUID NOT IN (SELECT NOTIFY_ID FROM TBDD_NOTIFICATIONS_USER_HISTORY WHERE USR_ID = {USER_ID})"
+where (CONVERT(DATE,GETDATE()) <= NOTE.DISPLAY_UNTIL or NOTE.DISPLAY_UNTIL IS NULL) AND NOTE.MODULE = 'PM' 
+            AND NOTE.GUID NOT IN (SELECT NOTIFY_ID FROM TBDD_NOTIFICATIONS_USER_HISTORY WHERE USR_ID = {USER_ID})"
         Dim oDT As DataTable = DatabaseFallback.GetDatatable("TBDD_NOTIFICATIONS_SYSTEM", New GetDatatableOptions(oSQL, DatabaseType.ECM))
+
         If Not IsNothing(oDT) Then
             If oDT.Rows.Count > 0 Then
                 Dim oEnvironment = GetEnvironment()