RO übersetzungen MDM Abholinfos, NCTS_TR ATEZ Anpassungen

SDL/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.2.3.6")>
+<Assembly: AssemblyVersion("1.2.3.7")>
-<Assembly: AssemblyFileVersion("1.2.3.6")>
+<Assembly: AssemblyFileVersion("1.2.3.7")>

SDL/kunden/Vorauskasse/frmVorauskasse.vb

@@ -666,14 +666,14 @@ Public Class cVorauskasseOptions
             'Wenn Benutzer der Vorauskasse nicht online, dann Benutzer der Sendung...
             If vk_QS_SachbearbeiterId IsNot Nothing Then
                 sendToID = vk_QS_SachbearbeiterId
-                If sendToID < 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID)) Then
+                If sendToID <= 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID)) Then
                     sendToID = SQL.DLookup("LetzterMitarbeiterId", "Aviso", "AvisoId='" & AvisoId & "'", "AVISO")
                     art = "B"
                 End If
             End If
 
             'Wenn Benutzer der Sendung nicht online, dann Benutzer der Sendung ..
-            If sendToID < 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID)) Then
+            If sendToID <= 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID)) Then
                 sendToID = SQL.DLookup("LetzterMitarbeiterId", "Aviso", "AvisoId='" & AvisoId & "'", "AVISO")
                 art = "B"
             End If
@@ -682,7 +682,7 @@ Public Class cVorauskasseOptions
             Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA ' --> Bezieht sich auf BU MA
                 Case "IMEX" ' Bie IMEX kommen die MA durhc verschobene Dienstzeiten oft später
                 Case Else
-                    If sendToID < 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID)) Then
+                    If sendToID <= 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID)) Then
                         sendToID = SQL.DLookup("tblSnd_TeamId", "tblSendungen", "tblSnd_SendungID='" & SendungID & "'", "AVISO")
                         art = "T"
                     End If

SDL/zoll/usrCntlBrgBuchungenFremd.vb

@@ -82,7 +82,7 @@ Public Class usrCntlBrgBuchungenFremd
             sqlatr &= "  AND    (SELECT COUNT(*) FROM [tblDakosy_Statusmeldungen] WHERE [dySt_dyId]=ncts_dyaAnmID AND  [dySt_status] = 50  AND	CONVERT(date, [dySt_ergZeitpunkt] ,104 ) BETWEEN '" & datVon.Value.ToShortDateString & "' AND '" & datBis.Value.ToShortDateString & "')>0 "
             Dim dt As DataTable = SQL.loadDgvBySql(sqlatr, "FMZOLL", 120)
 
-
+            MsgBox(sqlatr)
             'Bei IMEX kein E-ZOLL
             If MyComboBox1._value = "VERAG/ATILLA" Then
                 If cbxEZollDaten.Checked Then

VERAG_PROG_ALLGEMEIN/Classes/cAvisoBenachrichtigungen.vb

@@ -84,12 +84,12 @@ Public Class cAvisoBenachrichtigungen
     End Function
 
     Public Shared Function BESTAETIGEN_BENACHRICHTIGUNG_ALL(ab_AvisoID, onlytype) As Boolean
-        Dim sqlstr = " Update [tblAvisoBenachrichtigungen] SET ab_Status = 1,ab_Bestaetigt_MaId=-1,ab_Bestaetigt_Datum=getDate() WHERE ab_AvisoID=" & ab_AvisoID & If(onlytype, " and ab_art='A' ", "")
+        Dim sqlstr = " Update [tblAvisoBenachrichtigungen] SET ab_Status = 1,ab_Bestaetigt_MaId='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "',ab_Bestaetigt_Datum=getDate() WHERE ab_AvisoID=" & ab_AvisoID & If(onlytype, " and ab_art='A' ", "")
         Return SQL.doSQL(sqlstr, "AVISO")
     End Function
 
     Public Shared Function BESTAETIGEN_BENACHRICHTIGUNG_SND([ab_SendungID], onlytype) As Boolean
-        Dim sqlstr = " Update [tblAvisoBenachrichtigungen] SET ab_Status = 1,ab_Bestaetigt_MaId=-1,ab_Bestaetigt_Datum=getDate() WHERE [ab_SendungID]=" & [ab_SendungID]
+        Dim sqlstr = " Update [tblAvisoBenachrichtigungen] SET ab_Status = 1,ab_Bestaetigt_MaId='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "',ab_Bestaetigt_Datum=getDate() WHERE [ab_SendungID]=" & [ab_SendungID]
         Return SQL.doSQL(sqlstr, "AVISO")
     End Function
 
@@ -235,3 +235,15 @@ Public Class cAvisoBenachrichtigungen
 
 
 End Class
+
+Public Class cAvisoBenachrichtigungenCodes
+
+    Public Shared Neukunde_bitte_Abklärung As Integer = 1
+    Public Shared Neukunde_abgeklärt As Integer = 2
+    Public Shared An_Abklärung As Integer = 3
+    Public Shared Abklärung_OK As Integer = 4
+    Public Shared Vermerke_Reminder As Integer = 5
+    Public Shared Vorauskasse_OK As Integer = 6
+    Public Shared ZOLL_Dokumentenbeschau As Integer = 7
+
+End Class

VERAG_PROG_ALLGEMEIN/Classes/cEZB_Waehrungskurse.vb

@@ -146,4 +146,14 @@ Public Class cEZB_Waehrungskurse
         Return (New SQL).doSQL(sqlstr, "FMZOLL")
     End Function
 
+    Shared Function GET_KURS(ezb_waehrungscode As String, datum As Date) As Double
+        Dim sqlstr = " SELECT TOP 1 [ezb_kurs]  FROM [tblEZB_Waehrungskurse]  where ezb_waehrungscode='" & ezb_waehrungscode & "' and ezb_datum<='" & datum.ToShortTimeString & "' order by ezb_datum desc"
+        Return (New SQL).getValueTxtBySql(sqlstr, "FMZOLL",,, 0)
+    End Function
+
+    Shared Function EXCHANGE(betrag As Double, waehrungscode As String, datum As Date) As Double
+        Dim sqlstr = " SELECT TOP 1 [ezb_kurs]  FROM [tblEZB_Waehrungskurse]  where ezb_waehrungscode='" & waehrungscode & "' and ezb_datum<='" & datum.ToShortTimeString & "' order by ezb_datum desc"
+        Return (New SQL).getValueTxtBySql(sqlstr, "FMZOLL",,, 0) * betrag
+    End Function
+
 End Class

VERAG_PROG_ALLGEMEIN/Classes/cNCTS_TR.vb

@@ -981,7 +981,9 @@ Public Class cNCTS_TR_Sicherheitsangaben
     Property nctsSA_ArtCode As Object = Nothing
     Property nctsSA_BezeichnungBescheinigun As Object = Nothing
     Property nctsSA_AbgabenBetrag As Object = Nothing
+    Property nctsSA_AbgabenBetragFremdWaehrung As Object = Nothing
     Property nctsSA_GRN As Object = Nothing
+    Property nctsSA_Waerung As Object = Nothing
     Property nctsSA_Zugriffcode As Object = Nothing
     Property nctsSA_TIN As Object = Nothing
 
@@ -1008,6 +1010,8 @@ Public Class cNCTS_TR_Sicherheitsangaben
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nctsSA_BezeichnungBescheinigun", nctsSA_BezeichnungBescheinigun))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nctsSA_AbgabenBetrag", nctsSA_AbgabenBetrag))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nctsSA_GRN", nctsSA_GRN))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nctsSA_AbgabenBetragFremdWaehrung", nctsSA_AbgabenBetragFremdWaehrung))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nctsSA_Waerung", nctsSA_Waerung))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nctsSA_Zugriffcode", nctsSA_Zugriffcode))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nctsSA_TIN", nctsSA_TIN))
 

VERAG_PROG_ALLGEMEIN/Schnittstellen/cNCTS_Helper.vb

@@ -29,8 +29,7 @@
             sqlatr &= "  AND    (SELECT COUNT(*) FROM [tblDakosy_Statusmeldungen] WHERE [dySt_dyId]=ncts_dyaAnmID AND  [dySt_status] = 50  AND	CONVERT(date, [dySt_ergZeitpunkt] ,104 ) BETWEEN '" & datVon.ToShortDateString & "' AND '" & datBis.ToShortDateString & "')>0 "
             sqlatr &= "  ORDER BY Datum "
             Dim dt As DataTable = SQL.loadDgvBySql(sqlatr, "FMZOLL", 120)
-
+            ' MsgBox(sqlatr)
-
             'Bei IMEX kein E-ZOLL
             If _COMPANY = "VERAG/ATILLA" Then
                 If _EZOLL Then

VERAG_PROG_ALLGEMEIN/cAllgemein.vb

@@ -446,10 +446,9 @@ End Class
 
 Public Class cNCTS_GUARANTEES
 
-
     Public Shared TOBB() As String = {"17TR0004000032349", "20TR0004000069756", "13TR0004000009323", "21TR0004000097157", "12TR0004000004665", "15TR0004000020917",
         "17TR0004000029518", "20DE0000000078205", "19IT01TR000003323", "21TR0004000079552", "21TR0004000078157", "21TR0004000090364", "21TR0004000092350", "20TR0004000069557",
-        "21TR0004000097564", "21TR0004000084967", "19TR0004000056358", "19TR0004000053175", "19TR0004000053356"}
+        "21TR0004000097564", "21TR0004000084967", "19TR0004000056358", "19TR0004000053175", "19TR0004000053356", "22TR0004000126963", "22TR0004000114169", "19TR0004000059957", "21TR0004000097555"}
     'old: {"15TR0004000020917", "12TR0004000004665", "17TR0004000032349", "17TR0004000029518"f, "21TR0004000079552", "21TR00x04000078157", "21TR0004000092350", "20TR0004000069756", "21TR0004000090364", "21TR0004000097157"}
     Public Shared OREGON() As String = {"18DE0000000073276", "19DE0000000075520", "18DE0000000075520", "15TR0004000020500", "ITTR0000000000153", "21DE0000000079716", "21DE0000000081910"}
     Public Shared VERAG() As String = {"17DE0000000071678", "05AT510000G000FP7"}