MS merge commit
This commit is contained in:
@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
|
|||||||
<Assembly: AssemblyCompany("Digital Data")>
|
<Assembly: AssemblyCompany("Digital Data")>
|
||||||
<Assembly: AssemblyProduct("TaskFlow")>
|
<Assembly: AssemblyProduct("TaskFlow")>
|
||||||
<Assembly: AssemblyCopyright("Copyright © Digital Data 2023")>
|
<Assembly: AssemblyCopyright("Copyright © Digital Data 2023")>
|
||||||
<Assembly: AssemblyTrademark("2.4.2.0")>
|
<Assembly: AssemblyTrademark("2.4.2.2")>
|
||||||
|
|
||||||
<Assembly: ComVisible(False)>
|
<Assembly: ComVisible(False)>
|
||||||
|
|
||||||
|
|||||||
@@ -701,7 +701,9 @@
|
|||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
<LastGenOutput>Resources.Designer.vb</LastGenOutput>
|
<LastGenOutput>Resources.Designer.vb</LastGenOutput>
|
||||||
</EmbeddedResource>
|
</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">
|
<EmbeddedResource Include="Translations\frmMain_Strings.fr.resx">
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
|
|||||||
@@ -1578,7 +1578,9 @@ Public Class frmMain
|
|||||||
' -----------------------------
|
' -----------------------------
|
||||||
|
|
||||||
If oIds.Count = 0 Then
|
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
|
Exit Sub
|
||||||
End If
|
End If
|
||||||
Dim oDelete = $"DELETE FROM TBPM_VALIDATION_PROFILE_GROUP_USER WHERE UserID = {USER_ID}"
|
Dim oDelete = $"DELETE FROM TBPM_VALIDATION_PROFILE_GROUP_USER WHERE UserID = {USER_ID}"
|
||||||
|
|||||||
Reference in New Issue
Block a user