Merge branch 'ADMIN' of https://git.it.verag.ag/edv/ADMIN into ADMIN

DAKOSY_Worker/DAKOSY/ATLAS/NCTS/cDakosyNCTSOut004.vb

@@ -1612,10 +1612,10 @@ Public Class cDakosyNCTSOut004
 
         'Transaktion:
         XML.Transaktion = New VersandanmeldungNCTSDE_004.TransaktionNCTSTyp
-        XML.Transaktion.IOPartner = cDakosyFunftions.getIOPartner(cDY.ncts_firma) 'If(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "VERA", "VERG")
+        XML.Transaktion.IOPartner = cDakosyFunftions.getIOPartner(cDY.ncts_firma, "NCTS") 'If(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "VERA", "VERG")
         XML.Transaktion.IODatumZeit = Now
         XML.Transaktion.IOReferenz = cDY.ncts_Trans_Referenz
-        If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then XML.Transaktion.IODivision3 = cDakosyFunftions.getDivision(cDY.ncts_firma) '"SUW"
+        If Not VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then XML.Transaktion.IODivision3 = cDakosyFunftions.getDivision(cDY.ncts_firma, "NCTS") '"SUW"
         XML.Transaktion.Version = Interface_VERSION
         ' XML.Transaktion.IODivision3 = "DUR"
         XML.EinzelVersandanmeldung = New VersandanmeldungNCTSDE_004.EinzelVersandanmeldungTyp

DAKOSY_Worker/cDakosyFunftions.vb

@@ -1,4 +1,5 @@
-Imports Renci.SshNet
+Imports com.sun.tools.internal.xjc.reader.gbind
+Imports Renci.SshNet
 Imports System.IO
 Imports System.Windows.Forms
 
@@ -51,7 +52,7 @@ Public Class cDakosyFunftions
             MsgBox(ex.Message & ex.StackTrace)
         End Try
     End Sub
-    Shared Function getDivision(FIRMA_DY, Optional fiskal = False) As String
+    Shared Function getDivision(FIRMA_DY, PROCEDURE, Optional fiskal = False) As String
         If If(FIRMA_DY, "") = "" Then FIRMA_DY = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
         If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
             Return "SUB"
@@ -62,25 +63,37 @@ Public Class cDakosyFunftions
                 Case "AMBAR"
                     Return "AMBWO"
                 Case "VERAG"
-                    If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER IsNot Nothing Then
+
-                        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_niederlassung
+                    Select Case PROCEDURE ' Wenn EZA,... -> Alles über Suben
-                            Case "SUB" : Return "SUB"
+                        Case "EZA", "AA", "AES"
-                            Case "SBG" : Return "SBG"
+                            Return "SUB"
-                            Case "NKD" : Return "NKD"
+                        Case Else '  -->  NCTS
-                            Case "NEU" : Return "NEU"
+                            If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER IsNot Nothing Then
-                            Case "WAI" : Return "WAI"
+                                Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_niederlassung
-                            Case Else : Return "SUB"
+                                    Case "SUB" : Return "SUB"
-                        End Select
+                                    Case "SBG" : Return "SBG"
-                    Else
+                                    Case "NKD" : Return "NKD"
-                        Return "SUB"
+                                    Case "NEU" : Return "NEU"
-                    End If
+                                    Case "WAI" : Return "WAI"
+                                    Case Else : Return "SUB"
+                                End Select
+                            Else
+                                Return "SUB"
+                            End If
+                    End Select
+
                 Case "UNISPED"
                     Return ""'"ATSP"
                 Case "IMEX"
                     If fiskal Then
                         Return "GLO"
                     Else
-                        Return "IME"
+                        Select Case PROCEDURE ' Wenn AA,... -> Alles über VERG/SUB
+                            Case "AA"
+                                Return "SUB"
+                            Case Else
+                                Return "IME"
+                        End Select
                     End If
                 Case Else : Return "SUB"
             End Select
@@ -88,7 +101,7 @@ Public Class cDakosyFunftions
 
     End Function
 
-    Shared Function getIOPartner(FIRMA_DY) As String
+    Shared Function getIOPartner(FIRMA_DY, PROCEDURE) As String
         If If(FIRMA_DY, "") = "" Then FIRMA_DY = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
         If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
             Return "VERA"
@@ -101,7 +114,12 @@ Public Class cDakosyFunftions
                 Case "DURMAZ"
                     Return "DUR"
                 Case "IMEX"
-                    Return "IMEX"
+                    Select Case PROCEDURE ' Wenn AA,... -> Alles über VERAG
+                        Case "AA"
+                            Return "VERG"
+                        Case Else
+                            Return "IMEX"
+                    End Select
                 Case "UNISPED"
                     Return "UNAT"
                 Case "AMBAR"