edv/AVISO
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
d.breimaier
2024-04-11 16:53:18 +02:00
parent 150cce3b37 87fcf230d6
commit 0e7ce7f848
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Aviso/My Project/AssemblyInfo.vb
View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.9.8.5")> <Assembly: AssemblyVersion("3.9.8.6")>
<Assembly: AssemblyFileVersion("3.9.8.5")> <Assembly: AssemblyFileVersion("3.9.8.6")>

7
Aviso/frmHauptfenster.vb
View File

@@ -4088,10 +4088,13 @@ Public Class frmHauptfenster
' newNotify(frmNotify.cNotify_ART.NEUER_CHAT, 0, "XXX Chat-Nachricht!", -1) 'TEST ' newNotify(frmNotify.cNotify_ART.NEUER_CHAT, 0, "XXX Chat-Nachricht!", -1) 'TEST
If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_ChatBenutzer And picAVISOMessenger.Visible Then If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_ChatBenutzer And picAVISOMessenger.Visible Then
VERAG_PROG_ALLGEMEIN.cMessenger.NEW_MESSGE = False 'NEUE NACHTICHTEN
Dim newMsg = VERAG_PROG_ALLGEMEIN.cMessenger.GET_NewMSG_COUNT() Dim newMsg = VERAG_PROG_ALLGEMEIN.cMessenger.GET_NewMSG_COUNT()
Label20.Text = newMsg Label20.Text = newMsg.ToString
Label20.Visible = (newMsg > 0) Label20.Visible = (newMsg > 0)
If newMsg Then VERAG_PROG_ALLGEMEIN.cMessenger.NEW_MESSGE = True 'NEUE NACHTICHTEN
If newMsg > 0 Then
Me.Icon = My.Resources.avisoNewMsg Me.Icon = My.Resources.avisoNewMsg
Dim isshown = False Dim isshown = False

9
Aviso/frmSendungsdetailsNEU.vb
View File

@@ -311,7 +311,7 @@ Public Class frmSendungsdetailsNEU
Sub initGrenzstelle() Sub initGrenzstelle()
lblGrenze.Text = "" lblGrenze.Text = ""
If AVISO.Grenzstelle.Replace("???", "") = "" Then If AVISO.Grenzstelle.Replace("???", "").Replace("WO_FREMD", "") = "" Then
'lblGrenze.Text = SQL.getValueTxtBySql("Select basncd_dstnr +' - ' + [basncd_name] FROM basncd WHERE basncd_dstnr='" & If(AVISO.Zollstelle, "") & "' ", "ATLAS") 'lblGrenze.Text = SQL.getValueTxtBySql("Select basncd_dstnr +' - ' + [basncd_name] FROM basncd WHERE basncd_dstnr='" & If(AVISO.Zollstelle, "") & "' ", "ATLAS")
lblGrenze.Text = SQL.getValueTxtBySql("SELECT Code +' - ' + [Description] FROM tbl_DY_ZollDE_C0141_Zollstellen WHERE Code='" & If(AVISO.Zollstelle, "") & "' AND ((StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()))", "FMZOLL") lblGrenze.Text = SQL.getValueTxtBySql("SELECT Code +' - ' + [Description] FROM tbl_DY_ZollDE_C0141_Zollstellen WHERE Code='" & If(AVISO.Zollstelle, "") & "' AND ((StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()))", "FMZOLL")
Else Else
@@ -1064,6 +1064,7 @@ Public Class frmSendungsdetailsNEU
newRow.tblSnd_AbklaerungTR_MA = Nothing newRow.tblSnd_AbklaerungTR_MA = Nothing
newRow.tblSnd_AbfertigungTR = Nothing newRow.tblSnd_AbfertigungTR = Nothing
newRow.tblSnd_AbfertigungTR_MA = Nothing newRow.tblSnd_AbfertigungTR_MA = Nothing
newRow.tblSnd_SpeditionsbuchEingetragen = False
newRow.tblSnd_SendungID = -1 newRow.tblSnd_SendungID = -1
@@ -2273,9 +2274,15 @@ Public Class frmSendungsdetailsNEU
If cboAbfertigungsart._value = "23" Then If cboAbfertigungsart._value = "23" Then
SENDUNG_LIST(CURRENT_INDEX).tblSnd_aufschub = "" SENDUNG_LIST(CURRENT_INDEX).tblSnd_aufschub = ""
txtDyRef.Visible = False
picDy.Visible = False
txtDyRef.Text = ""
ElseIf cboAbfertigungsart._value = "9" Then ElseIf cboAbfertigungsart._value = "9" Then
btnLeihgeld.Enabled = True btnLeihgeld.Enabled = True
Else Else
txtDyRef.Visible = (SENDUNG_LIST(CURRENT_INDEX).FilialenNr = "5601") 'UNISPED
picDy.Visible = (SENDUNG_LIST(CURRENT_INDEX).FilialenNr = "5601") 'UNISPED
' If SENDUNG_LIST(CURRENT_INDEX).tblSnd_aufschub = "" Then SENDUNG_LIST(CURRENT_INDEX).tblSnd_aufschub = "VERAG" ' If SENDUNG_LIST(CURRENT_INDEX).tblSnd_aufschub = "" Then SENDUNG_LIST(CURRENT_INDEX).tblSnd_aufschub = "VERAG"
initAufschubBtn() initAufschubBtn()
End If End If