DY_Firma

SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb

@@ -71,7 +71,8 @@
     End Sub
 
 
-    Private Sub frmZollanmeldung_Load(sender As Object, e As EventArgs) Handles Me.Load
+    Public Shared Function getFirma_DY(FilialenNr As String, F_ME As Form) As String
+        Dim FIRMA_DY = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
         If (VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO") Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX") And FilialenNr = 5501 Then
             FIRMA_DY = "IMEX"
         ElseIf FilialenNr = 5701 Then
@@ -83,21 +84,23 @@
         Else
             If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then
 
-                If DY Is Nothing Then
-                    '       '  FIRMA_DY = DY.
-                    '   Else
-
-                    Dim f As New frmDakosy_SelFirma
-                    If f.ShowDialog(Me) = DialogResult.OK Then
-                        FIRMA_DY = f.FIMRA_DY
-                    Else
-                        Me.Close()
-                    End If
+                'If DY Is Nothing Then
+                Dim f As New frmDakosy_SelFirma
+                If f.ShowDialog() = DialogResult.OK Then
+                    FIRMA_DY = f.FIMRA_DY
+                Else
+                    If F_ME IsNot Nothing Then F_ME.Close()
                 End If
+                'End If
             Else
                 FIRMA_DY = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(FilialenNr)
             End If
         End If
+        Return FIRMA_DY
+    End Function
+    Private Sub frmZollanmeldung_Load(sender As Object, e As EventArgs) Handles Me.Load
+
+        FIRMA_DY = getFirma_DY(FilialenNr, Me)
 
         Select Case ZOLL_SYSTEM
             Case "SGS"