diff --git a/DAKOSY_Worker/DAKOSY/ATLAS/NCTS/cDakosyNCTSOut004.vb b/DAKOSY_Worker/DAKOSY/ATLAS/NCTS/cDakosyNCTSOut004.vb index 3d6e379..cb927bf 100644 --- a/DAKOSY_Worker/DAKOSY/ATLAS/NCTS/cDakosyNCTSOut004.vb +++ b/DAKOSY_Worker/DAKOSY/ATLAS/NCTS/cDakosyNCTSOut004.vb @@ -3565,6 +3565,7 @@ Public Class cDakosy_NCTSOut004_HouseConsignment p.nctsHCCI_NctsHCId = nctsHCId p.nctsHCCI_NctsId = ncts_id If Not p.INSERT() Then + p.INSERT_Packing(p.nctsHCCI_Id, p.nctsHCCI_NctsHCId, p.nctsHCCI_NctsId) Return False End If Next diff --git a/initATLASAufschubkonten/cBuergschaften.vb b/initATLASAufschubkonten/cBuergschaften.vb index 6d2ddaf..b2c8b0b 100644 --- a/initATLASAufschubkonten/cBuergschaften.vb +++ b/initATLASAufschubkonten/cBuergschaften.vb @@ -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() diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index af52180..a20ff87 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -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