MS merge commit
This commit is contained in:
@@ -9,11 +9,11 @@ Imports System.Runtime.InteropServices
|
||||
' Die Werte der Assemblyattribute überprüfen
|
||||
|
||||
<Assembly: AssemblyTitle("TaskFlow")>
|
||||
<Assembly: AssemblyDescription("")>
|
||||
<Assembly: AssemblyDescription("")>
|
||||
<Assembly: AssemblyCompany("Digital Data")>
|
||||
<Assembly: AssemblyProduct("TaskFlow")>
|
||||
<Assembly: AssemblyCopyright("Copyright © Digital Data 2023")>
|
||||
<Assembly: AssemblyTrademark("2.4.2.0")>
|
||||
<Assembly: AssemblyTrademark("2.4.2.2")>
|
||||
|
||||
<Assembly: ComVisible(False)>
|
||||
|
||||
@@ -32,4 +32,4 @@ Imports System.Runtime.InteropServices
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("2.4.2.2")>
|
||||
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
||||
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
||||
|
||||
@@ -701,7 +701,9 @@
|
||||
<SubType>Designer</SubType>
|
||||
<LastGenOutput>Resources.Designer.vb</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Translations\frmMain_Strings.en.resx" />
|
||||
<EmbeddedResource Include="Translations\frmMain_Strings.en.resx">
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Translations\frmMain_Strings.fr.resx">
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
|
||||
@@ -1578,7 +1578,9 @@ Public Class frmMain
|
||||
' -----------------------------
|
||||
|
||||
If oIds.Count = 0 Then
|
||||
MsgBox("System konnte die Profilworkflows nicht auswerten!" & vbNewLine & "Bitte wählen Sie ein Profil durch Klicken auf einen Beleg oder eine Überschrift!", MsgBoxStyle.Information, ADDITIONAL_TITLE)
|
||||
Dim omsg = String.Format(S.System_konnte_die_Profilworkflows_nicht_auswerten_, vbNewLine)
|
||||
FormHelper.ShowInfoMessage(omsg, omsgTitleAttention)
|
||||
'MsgBox("System konnte die Profilworkflows nicht auswerten!" & vbNewLine & "Bitte wählen Sie ein Profil durch Klicken auf einen Beleg oder eine Überschrift!", MsgBoxStyle.Information, ADDITIONAL_TITLE)
|
||||
Exit Sub
|
||||
End If
|
||||
Dim oDelete = $"DELETE FROM TBPM_VALIDATION_PROFILE_GROUP_USER WHERE UserID = {USER_ID}"
|
||||
|
||||
Reference in New Issue
Block a user