This commit is contained in:
2020-05-31 22:25:35 +02:00
parent 4a358d43fd
commit 083e666fbc
214 changed files with 14292 additions and 4117 deletions

View File

@@ -151,12 +151,12 @@ Public Class cAllgemein
Return (FIRMA = CLUSTER)
End Function
Public Shared Function getFirmaFromFiliale2(FilialenNr As Object, Optional defaultVERAG As Boolean = True) As String
Public Shared Function getFirmaFromFiliale2(FilialenNr As Object, Optional usedefaultFirma As Boolean = True, Optional defaultFIRMA As String = "VERAG") As String
Dim FirmaTMP = ""
If FilialenNr IsNot Nothing AndAlso IsNumeric(FilialenNr) Then
FirmaTMP = SQL.getValueTxtBySql("SELECT TOP 1 [Firma] FROM [Filialen] WHERE FilialenNr='" & FilialenNr & "' ", "FMZOLL")
End If
If defaultVERAG AndAlso FirmaTMP = "" Then FirmaTMP = "VERAG"
If usedefaultFirma AndAlso FirmaTMP = "" Then FirmaTMP = defaultFIRMA
Return FirmaTMP
End Function