Merge branch 'ADMIN' of https://git.it.verag.ag/edv/ADMIN into ADMIN
This commit is contained in:
@@ -15,11 +15,12 @@ Public Class cBuergschaften
|
||||
Return cn
|
||||
End Function
|
||||
Public Shared Function GetNewOpenConnectionFMZOLL() As SqlConnection
|
||||
Dim cn As New SqlConnection()
|
||||
cn.ConnectionString = "Data Source=FMZOLL\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;"
|
||||
' cn.ConnectionString = "Data Source=DEVELOPER\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;"
|
||||
cn.Open()
|
||||
Return cn
|
||||
Return (VERAG_PROG_ALLGEMEIN.SQL).GetNewOpenConnectionFMZOLL()
|
||||
'Dim cn As New SqlConnection()
|
||||
'cn.ConnectionString = "Data Source=FMZOLL\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;"
|
||||
'' cn.ConnectionString = "Data Source=DEVELOPER\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;"
|
||||
'cn.Open()
|
||||
'Return cn
|
||||
End Function
|
||||
Public Shared Function GetNewOpenConnectionBUCHHALTUNG() As SqlConnection
|
||||
Dim cn As New SqlConnection()
|
||||
|
||||
@@ -1240,7 +1240,11 @@ Public Class frmStartOptions
|
||||
|
||||
Dim betreff = cStandort.eMail_Zollbeleg_Betreff '"Zollbeleg"
|
||||
|
||||
|
||||
If KundenNr = 770931 Then ' Sonderfall Kanadevia
|
||||
If KdAtrNr.ToString.Contains("/") Then
|
||||
KdAtrNr = KdAtrNr.ToString.Split("/")(0) 'nur vorderer Teil nehmen
|
||||
End If
|
||||
End If
|
||||
|
||||
'Wenn ein fixer BEtreff verwendet werden sollte:
|
||||
If KD_ERW.EmailFreigabeBeleg_Betreff Then
|
||||
|
||||
Reference in New Issue
Block a user