Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO
This commit is contained in:
@@ -38,11 +38,20 @@ Public Class frmSendungsdetailsNEU
|
||||
|
||||
Sub New()
|
||||
InitializeComponent()
|
||||
Me.DoubleBuffered = True
|
||||
SetStyle(ControlStyles.OptimizedDoubleBuffer Or ControlStyles.UserPaint Or ControlStyles.AllPaintingInWmPaint Or ControlStyles.ResizeRedraw, True)
|
||||
UpdateStyles()
|
||||
|
||||
|
||||
End Sub
|
||||
Sub New(AvisoId, SendungID)
|
||||
InitializeComponent()
|
||||
Me.AvisoId = AvisoId
|
||||
Me.SendungID = SendungID
|
||||
Me.DoubleBuffered = True
|
||||
SetStyle(ControlStyles.OptimizedDoubleBuffer Or ControlStyles.UserPaint Or ControlStyles.AllPaintingInWmPaint Or ControlStyles.ResizeRedraw, True)
|
||||
UpdateStyles()
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub frmSendungsdetails_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
|
||||
@@ -149,7 +158,6 @@ Public Class frmSendungsdetailsNEU
|
||||
'End Select
|
||||
If Not SENDUNG_LIST(CURRENT_INDEX).tblSnd_Fremdspedition Then
|
||||
|
||||
|
||||
If SENDUNG_LIST(CURRENT_INDEX).FilialenNr = 5801 Or (SENDUNG_LIST(CURRENT_INDEX).FilialenNr.ToString = VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE And VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER) Then
|
||||
'Firma=Cluster, zB Front-Office --> darf alle Firmen auswählen.
|
||||
Else
|
||||
@@ -164,6 +172,25 @@ Public Class frmSendungsdetailsNEU
|
||||
End If
|
||||
End If
|
||||
|
||||
|
||||
'If UsrCntlSND_NCTSGestellungsadresse1.Controls.Count > 0 Then
|
||||
' If UsrCntlSND_NCTSGestellungsadresse1.Controls(0).GetType.ToString = GetType(usrCntlSND_ATBGestellung).ToString Then
|
||||
|
||||
' If DirectCast(UsrCntlSND_NCTSGestellungsadresse1.Controls(0), usrCntlSND_ATBGestellung).cbxATBFakturieren.CheckState = CheckState.Indeterminate Then
|
||||
' MsgBox("ATB-Gestllung: Bitte geben Sie an, ob die ATB Gestellung fakturiert (abgerechnet) werden sollte.") : Return False
|
||||
' End If
|
||||
|
||||
|
||||
' End If
|
||||
'End If
|
||||
If SENDUNG_LIST(CURRENT_INDEX).tblSnd_Abfertigungsart_ID = 44 Then ' ATB GEstellung
|
||||
|
||||
If SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATBFakturieren Is Nothing Then
|
||||
MsgBox("ATB-Gestllung: Bitte geben Sie an, ob die ATB Gestellung fakturiert (abgerechnet) werden sollte.") : Return False
|
||||
End If
|
||||
|
||||
|
||||
End If
|
||||
End If
|
||||
|
||||
|
||||
@@ -1118,6 +1145,7 @@ Public Class frmSendungsdetailsNEU
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
loaded = False
|
||||
Try
|
||||
SuspendLayout()
|
||||
lblAbfNr_Err.Visible = False
|
||||
|
||||
' lblAtrAufschubEustTxt.Visible = False
|
||||
@@ -1410,6 +1438,12 @@ Public Class frmSendungsdetailsNEU
|
||||
usrcntl_ATB.txtATBT1.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATB_T1, "")
|
||||
usrcntl_ATB.txtATBNr.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATB_Nr, "")
|
||||
|
||||
If SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATBFakturieren Is Nothing Then
|
||||
usrcntl_ATB.cbxATBFakturieren.CheckState = CheckState.Indeterminate
|
||||
Else
|
||||
usrcntl_ATB.cbxATBFakturieren.Checked = CBool(SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATBFakturieren)
|
||||
End If
|
||||
|
||||
pnlT1.Controls.Add(usrcntl_ATB)
|
||||
End Select
|
||||
|
||||
@@ -1484,11 +1518,11 @@ Public Class frmSendungsdetailsNEU
|
||||
|
||||
|
||||
|
||||
|
||||
'SAVE_ME ??????!!!!!!!
|
||||
Catch ex As Exception
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
||||
End Try
|
||||
ResumeLayout()
|
||||
loaded = True
|
||||
' Me.Enabled = True
|
||||
Me.Cursor = Cursors.Default
|
||||
@@ -1796,6 +1830,13 @@ Public Class frmSendungsdetailsNEU
|
||||
If pnlT1.Controls.Count > 0 AndAlso pnlT1.Controls(0).GetType Is GetType(usrCntlSND_ATBGestellung) Then
|
||||
SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATB_T1 = usrcntl_ATB.txtATBT1.Text
|
||||
SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATB_Nr = usrcntl_ATB.txtATBNr.Text
|
||||
|
||||
Select Case usrcntl_ATB.cbxATBFakturieren.CheckState
|
||||
Case CheckState.Indeterminate : SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATBFakturieren = Nothing
|
||||
Case CheckState.Checked : SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATBFakturieren = True
|
||||
Case CheckState.Unchecked : SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATBFakturieren = False
|
||||
End Select
|
||||
|
||||
End If
|
||||
End Select
|
||||
|
||||
|
||||
Reference in New Issue
Block a user