This commit is contained in:
2020-01-08 15:01:48 +01:00
parent c860c222c7
commit e879fb6881
89 changed files with 8692 additions and 3571 deletions

View File

@@ -300,6 +300,13 @@ Public Class SendungOptions
VALUES.Empfaenger_eigBIN = "eig. BIN"
End Select
If CBool(VERAGSQL.getValueTxtBySql("SELECT TOP 1 isnull([Vorkasse],0) FROM [Kunden] where KundenNr=" & SENDUNG.tblSnd_EmpfaengerKdNr, "FMZOLL",,, False)) Then VALUES.Empfaenger_VK = "€ VK"
If CBool(VERAGSQL.getValueTxtBySql("SELECT TOP 1 isnull([Vorkasse],0) FROM [Kunden] where KundenNr=" & SENDUNG.tblSnd_AbsenderKdNr, "FMZOLL",,, False)) Then VALUES.Absender_VK = "€ VK"
If CBool(VERAGSQL.getValueTxtBySql("SELECT TOP 1 isnull([Vorkasse],0) FROM [Kunden] where KundenNr=" & AVISO.Auftraggeber_KdNr, "FMZOLL",,, False)) Then VALUES.Avisierer_VK = "€ VK"
If CBool(VERAGSQL.getValueTxtBySql("SELECT TOP 1 isnull([Vorkasse],0) FROM [Kunden] where KundenNr=" & AVISO.Frächter_KdNr, "FMZOLL",,, False)) Then VALUES.Frachtfuehrer_VK = "€ VK"
If CBool(VERAGSQL.getValueTxtBySql("SELECT TOP 1 isnull([Vorkasse],0) FROM [Kunden] where KundenNr=" & SENDUNG.tblSnd_AuftraggeberKdNr, "FMZOLL",,, False)) Then VALUES.Auftraggeber_VK = "€ VK"
SENDUNG.LOAD_ABRECHNUNG() 'Daten holen
Dim abfertKostKdnr As Integer = -1
@@ -414,7 +421,9 @@ Public Class SendungOptions
ZOLLANMELDUNG = Nothing
End If
Dim rpt As New Gemeinsames.rptSendungen(VALUES, imgpath, ZOLLANMELDUNG)
Dim rpt As New Gemeinsames.rptSendungen(VALUES, imgpath, ZOLLANMELDUNG, SENDUNG.HANDLING)
rpt.Document.CacheToDisk = False
'rpt.Document.CacheToDisk = True
@@ -439,7 +448,7 @@ Public Class SendungOptions
End If
Catch ex As Exception
MsgBox(ex.Message)
MsgBox(ex.Message & ex.StackTrace)
End Try
' If art = "PRINT" Then
'fm.fillPDF(name, list, listTowrite, , True, Printername, barcode, barcodeLKW)
@@ -722,11 +731,11 @@ Public Class SendungOptions
If art = "PRINT" Then
fm.fillPDF(name, Nothing, listTowrite, , True, Printername,,, SDL.FormularManagerNEU.getUO2)
fm.fillPDF(name, Nothing, listTowrite, , True, Printername,,, SDL.FormularManagerNEU.getUO2(SENDUNG.FilialenNr))
ElseIf art = "DIALOG" Then
fm.fillPDF(name, Nothing, listTowrite, , True,,,, SDL.FormularManagerNEU.getUO2)
fm.fillPDF(name, Nothing, listTowrite, , True,,,, SDL.FormularManagerNEU.getUO2(SENDUNG.FilialenNr))
Else
fm.fillPDF(name, Nothing, listTowrite,,,,,, SDL.FormularManagerNEU.getUO2)
fm.fillPDF(name, Nothing, listTowrite,,,,,, SDL.FormularManagerNEU.getUO2(SENDUNG.FilialenNr))
End If