Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO
This commit is contained in:
@@ -324,6 +324,10 @@
|
|||||||
<Reference Include="ThoughtWorks.QRCode">
|
<Reference Include="ThoughtWorks.QRCode">
|
||||||
<HintPath>..\..\..\dll\ThoughtWorks.QRCode.dll</HintPath>
|
<HintPath>..\..\..\dll\ThoughtWorks.QRCode.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
<Reference Include="VERAG_PROG_ALLGEMEIN, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
|
||||||
|
<SpecificVersion>False</SpecificVersion>
|
||||||
|
<HintPath>..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
<Reference Include="WindowsBase" />
|
<Reference Include="WindowsBase" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@@ -1433,10 +1437,6 @@
|
|||||||
<Project>{289bcd77-bc00-4ba1-95ed-a79176d99525}</Project>
|
<Project>{289bcd77-bc00-4ba1-95ed-a79176d99525}</Project>
|
||||||
<Name>SDL</Name>
|
<Name>SDL</Name>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
<ProjectReference Include="..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj">
|
|
||||||
<Project>{a3b497bd-842c-4a2b-b398-ed1976849df1}</Project>
|
|
||||||
<Name>VERAG_PROG_ALLGEMEIN</Name>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\Gemeinsames\Gemeinsames.vbproj">
|
<ProjectReference Include="..\Gemeinsames\Gemeinsames.vbproj">
|
||||||
<Project>{110c923b-cb02-4fd0-af24-95e0f0eeeff5}</Project>
|
<Project>{110c923b-cb02-4fd0-af24-95e0f0eeeff5}</Project>
|
||||||
<Name>Gemeinsames</Name>
|
<Name>Gemeinsames</Name>
|
||||||
|
|||||||
2866
Aviso/frmSendungsdetailsNEU.Designer.vb
generated
2866
Aviso/frmSendungsdetailsNEU.Designer.vb
generated
File diff suppressed because it is too large
Load Diff
@@ -3003,8 +3003,10 @@ Public Class frmSendungsdetailsNEU
|
|||||||
|
|
||||||
If SENDUNG_LIST(CURRENT_INDEX).LetzterMitarbeiterId IsNot Nothing AndAlso SENDUNG_LIST(CURRENT_INDEX).LetzterMitarbeiterId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID Then
|
If SENDUNG_LIST(CURRENT_INDEX).LetzterMitarbeiterId IsNot Nothing AndAlso SENDUNG_LIST(CURRENT_INDEX).LetzterMitarbeiterId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID Then
|
||||||
btnQS_MA.Image = My.Resources.personCheck_blue_small
|
btnQS_MA.Image = My.Resources.personCheck_blue_small
|
||||||
|
Button18.Enabled = True
|
||||||
Else
|
Else
|
||||||
btnQS_MA.Image = My.Resources.personCheck_small
|
btnQS_MA.Image = My.Resources.personCheck_small
|
||||||
|
Button18.Enabled = False
|
||||||
End If
|
End If
|
||||||
'If SENDUNG_LIST(CURRENT_INDEX).tblSnd_QS_MA IsNot Nothing AndAlso IsNumeric(SENDUNG_LIST(CURRENT_INDEX).tblSnd_QS_MA) Then
|
'If SENDUNG_LIST(CURRENT_INDEX).tblSnd_QS_MA IsNot Nothing AndAlso IsNumeric(SENDUNG_LIST(CURRENT_INDEX).tblSnd_QS_MA) Then
|
||||||
|
|
||||||
@@ -5883,4 +5885,15 @@ Public Class frmSendungsdetailsNEU
|
|||||||
initAnhang()
|
initAnhang()
|
||||||
End If
|
End If
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
Private Sub Button18_Click_1(sender As Object, e As EventArgs) Handles Button18.Click
|
||||||
|
|
||||||
|
|
||||||
|
Dim f As New frmAvisoWeiterleiten("S", AvisoId, VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID) '--> Weitereliten
|
||||||
|
If f.ShowDialog(Me) = DialogResult.OK Then
|
||||||
|
Me.Close()
|
||||||
|
End If
|
||||||
|
|
||||||
|
|
||||||
|
End Sub
|
||||||
End Class
|
End Class
|
||||||
|
|||||||
Reference in New Issue
Block a user