diff --git a/DAKOSY_Worker/DAKOSY/ATLAS/AES/cDakosyAES.vb b/DAKOSY_Worker/DAKOSY/ATLAS/AES/cDakosyAES.vb
index b0b2f4f..78ac5dc 100644
--- a/DAKOSY_Worker/DAKOSY/ATLAS/AES/cDakosyAES.vb
+++ b/DAKOSY_Worker/DAKOSY/ATLAS/AES/cDakosyAES.vb
@@ -665,49 +665,113 @@ Public Class cDakosyAES
Function insertIntoSpedBuch(DY As cDakosy_Zollanmeldungen) As Boolean
Dim SPEDBUCH As New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch
- If If(Me.aes_firma, "") = "IMEX" Then
- If countSpedbuchEntrys(5501, Me.AES_ObjectName) = 0 Then
- SPEDBUCH.FilialenNr = 5501
- SPEDBUCH.AbfertigungsNr = VERAG_PROG_ALLGEMEIN.cAllgemein.getMaxPosNrIncrement(SPEDBUCH.FilialenNr, Now.Year)
- SPEDBUCH.NewUNTER_NR()
+ Dim cZOLL_IMPORT As New cZOLL_IMPORT
- SPEDBUCH.AtlasBezNrNCTS = Me.aes_ObjectName
- SPEDBUCH.Zollsystem = "D"
+ Dim firmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+ VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = If(If(Me.aes_firma, "") <> "", Me.aes_firma, "VERAG")
+ If DY.dy_SendungsId IsNot Nothing Then
+ 'Filiale erkennen:
+ Dim filialeBez = ""
+ Dim filiale = cDakosyEZA.getFiliale(Me.aes_ObjectName, filialeBez)
+ Dim abfertigungsnummer = cDakosyEZA.getAbfertigungsnummer(Me.aes_ObjectName)
- Dim notfound = False
- DakosyAESDatenbereitstellung(SPEDBUCH, Me.AES_ObjectName, notfound)
+ If abfertigungsnummer = "" Then
+ cDakosyEZA.getFilialeAbfertigungsnummerFromSendung(filiale, abfertigungsnummer, DY.dy_SendungsId)
+ End If
+
+ If filiale <> "" And abfertigungsnummer <> "" Then
+ If cDakosyEZA.countSpedbuchEntrysFilialeAbf(filiale, abfertigungsnummer) = 0 Then
+ ' VERAG_PROG_ALLGEMEIN.cErrorHandler.sendERRORperMail("HEUREKA EZA ", "" & Me.aes_ObjectName, Now.ToString("yyyy.MM.dd HH:mm"), "al@verag.ag", "")
+ SPEDBUCH.FilialenNr = filiale
+ SPEDBUCH.AbfertigungsNr = abfertigungsnummer
+ SPEDBUCH.NewUNTER_NR()
+
+ SPEDBUCH.Abfertigungsart = "7"
+ SPEDBUCH.Abfertigungsanzahl = 1
+ SPEDBUCH.Fakturiert = 0
+ SPEDBUCH.AtlasBezNrAES = Me.aes_ObjectName
+ SPEDBUCH.Zollsystem = "D"
+ SPEDBUCH.Sachbearbeiter = "AUTO"
+
+ SPEDBUCH.AvisoID = DY.dy_AvisoId
+ SPEDBUCH.SendungID = DY.dy_SendungsId
+
+ Dim ZOLL_IMPORT As New cZOLL_IMPORT
+ Dim notfound = False
+ Dim posAnzahl = 0
+ SPEDBUCH = ZOLL_IMPORT.IMPORT(SPEDBUCH, DY.dy_AvisoId, DY.dy_SendungsId, "VERA", filialeBez, 2, "", "", notfound, True,, Me.aes_ObjectName)
+
+ If notfound Then Return False
+ ' VERAG_PROG_ALLGEMEIN.cErrorHandler.sendERRORperMail("HEUREKA EZA !!", "" & Me.aes_ObjectName, Now.ToString("yyyy.MM.dd HH:mm"), "al@verag.ag", "")
+
+ ' MsgBox(SPEDBUCH.FilialenNr & " - " & SPEDBUCH.AbfertigungsNr)
+ VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = firmaTmp
+
+ If SPEDBUCH.SAVE Then
+ VERAG_PROG_ALLGEMEIN.cSendungen.SET_SpedbuchEntry(DY.dy_SendungsId, True)
+ Return True
+ Else
+ Return False
+ End If
+
+
+ ' MsgBox(SQL.getValueTxtBySql("select count(*) FROM [VERAG].[dbo].[Speditionsbuch] where AbfertigungsNr = 18035380", "FMZOLL"))
- If Not notfound Then
- Return SPEDBUCH.SAVE
- Else
- Return False
End If
End If
-
- If DY.dy_SendungsId IsNot Nothing Then
-
- Else
- Return False 'Ohne Sendungsverweis kein eintrag...
- End If
-
- Return SPEDBUCH.SAVE
Else
- If False Then 'NOCH NCIHT....
-
- If DY.dy_SendungsId IsNot Nothing Then
-
- Else
- Return False 'Ohne Sendungsverweis kein eintrag...
- End If
-
- Return SPEDBUCH.SAVE
- End If
+ Return False 'Ohne Sendungsverweis kein eintrag...
End If
Return False
End Function
+ 'Function insertIntoSpedBuch(DY As cDakosy_Zollanmeldungen) As Boolean
+ ' Dim SPEDBUCH As New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch
+ ' If If(Me.aes_firma, "") = "IMEX" Then
+ ' If countSpedbuchEntrys(5501, Me.AES_ObjectName) = 0 Then
+ ' SPEDBUCH.FilialenNr = 5501
+ ' SPEDBUCH.AbfertigungsNr = VERAG_PROG_ALLGEMEIN.cAllgemein.getMaxPosNrIncrement(SPEDBUCH.FilialenNr, Now.Year)
+ ' SPEDBUCH.NewUNTER_NR()
+
+ ' SPEDBUCH.AtlasBezNrNCTS = Me.aes_ObjectName
+ ' SPEDBUCH.Zollsystem = "D"
+
+ ' Dim notfound = False
+ ' DakosyAESDatenbereitstellung(SPEDBUCH, Me.AES_ObjectName, notfound)
+
+ ' If Not notfound Then
+ ' Return SPEDBUCH.SAVE
+ ' Else
+ ' Return False
+ ' End If
+ ' End If
+
+ ' If DY.dy_SendungsId IsNot Nothing Then
+
+ ' Else
+ ' Return False 'Ohne Sendungsverweis kein eintrag...
+ ' End If
+
+ ' Return SPEDBUCH.SAVE
+ ' Else
+ ' If False Then 'NOCH NCIHT....
+
+ ' If DY.dy_SendungsId IsNot Nothing Then
+
+ ' Else
+ ' Return False 'Ohne Sendungsverweis kein eintrag...
+ ' End If
+
+ ' Return SPEDBUCH.SAVE
+ ' End If
+ ' End If
+ ' Return False
+
+ 'End Function
+
+
Public Shared Sub DakosyAESDatenbereitstellung(ByVal SPEDITIONSBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch, AES_Nr As String, ByVal notFound As Boolean)
Dim DY As DAKOSY_Worker.cDakosyAES = DAKOSY_Worker.cDakosyAES.LOADByBezugsNr(AES_Nr, True)
If DY Is Nothing Then
diff --git a/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb b/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb
index 20f8d5a..bc6ffae 100644
--- a/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb
+++ b/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb
@@ -863,7 +863,8 @@ Public Class cDakosyEZA
- Function countSpedbuchEntrysFilialeAbf(filiale, abfertigungsnummer) As Integer
+ Shared Function countSpedbuchEntrysFilialeAbf(filiale, abfertigungsnummer) As Integer
+ Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
If If(abfertigungsnummer, "") = "" Then Return 0
Return SQL.getValueTxtBySqlVarList("SELECT isnull(count(*),0) FROM Speditionsbuch WHERE [FilialenNr]='" & filiale & "' AND AbfertigungsNr='" & abfertigungsnummer & "'", "FMZOLL")
End Function
@@ -1010,7 +1011,7 @@ Public Class cDakosyEZA
Return ""
End Function
- Sub getFilialeAbfertigungsnummerFromSendung(ByRef filiale, ByRef abfertigungsnummer, dy_SendungsId)
+ Shared Sub getFilialeAbfertigungsnummerFromSendung(ByRef filiale, ByRef abfertigungsnummer, dy_SendungsId)
If dy_SendungsId IsNot Nothing AndAlso IsNumeric(dy_SendungsId) Then
Dim SND As New VERAG_PROG_ALLGEMEIN.cSendungen(dy_SendungsId)
If SND IsNot Nothing Then
diff --git a/DAKOSY_Worker/cIMPORT_Codelisten.vb b/DAKOSY_Worker/cIMPORT_Codelisten.vb
index 98808f9..3bbb9b6 100644
--- a/DAKOSY_Worker/cIMPORT_Codelisten.vb
+++ b/DAKOSY_Worker/cIMPORT_Codelisten.vb
@@ -3,6 +3,7 @@ Imports System.Xml
Imports System.IO
Imports System.Text
Imports System.Data.SqlClient
+Imports DAKOSY_Worker.cAES_ZustaendigeZST
Public Class cIMPORT_Codelisten
@@ -31,6 +32,8 @@ Public Class cIMPORT_Codelisten
Return Import_I0700(TESTSYSTEM)
Case "C0141"
Return Import_C0141(TESTSYSTEM)
+ Case "I0610"
+ Return Import_I0610(TESTSYSTEM)
End Select
Return False
End Function
@@ -403,7 +406,7 @@ Public Class cIMPORT_Codelisten
Dim Code = ""
Dim Description = ""
If Entry.SelectNodes("Code").Count > 0 Then Code = Entry.SelectNodes("Code")(0).InnerText
- If Entry.SelectNodes("Description").Count > 0 Then Description = Entry.SelectNodes("Description")(0).InnerText
+ If Entry.SelectNodes("Description").Count > 0 Then Description = Entry.SelectNodes("Description")(0).InnerText
LC.Add(New cBeteiligtenKonstellationen.cBeteiligtenKonstellation(Code, Description))
@@ -525,6 +528,53 @@ Public Class cIMPORT_Codelisten
End Function
+
+ Shared Function Import_I0610(TESTSYSTEM) As Boolean
+ Dim MyData As String = ""
+ Try
+ System.Net.ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12
+
+ Using WC As New System.Net.WebClient()
+ ' C0008_URL()
+ WC.Encoding = ASCIIEncoding.UTF8
+ Dim URL = cDY_Paramter.GET_PARAM_ByName("I0610_URL", TESTSYSTEM, "VERAG")
+ If URL = String.Empty Then Return False
+ ' MsgBox(URL)
+ MyData = WC.DownloadString(URL)
+ Dim doc As New XmlDocument()
+ doc.LoadXml(MyData)
+
+ Dim LC As New cAES_ZustaendigeZST
+ If doc.HasChildNodes Then
+ If doc.GetElementsByTagName("Codelist").Count > 0 Then
+ If doc.GetElementsByTagName("Codelist")(0).HasChildNodes Then
+ For Each Entry As XmlNode In doc.GetElementsByTagName("Codelist")(0).ChildNodes
+ Dim Code = ""
+ Dim Qualifier = ""
+ Dim Description = ""
+ If Entry.SelectNodes("Code").Count > 0 Then Code = Entry.SelectNodes("Code")(0).InnerText
+ If Entry.SelectNodes("Qualifier").Count > 0 Then Qualifier = Entry.SelectNodes("Qualifier")(0).InnerText
+ If Entry.SelectNodes("Description").Count > 0 Then Description = Entry.SelectNodes("Description")(0).InnerText
+
+ LC.Add(New cAES_ZustaendigeZST.cAES_ZustaendigeZST_I0610(Code, Qualifier, Description))
+
+ Next
+ End If
+ End If
+ End If
+ If LC.Count > 0 Then
+ Return LC.INSERT_DB(TESTSYSTEM)
+ End If
+ End Using
+
+ Catch ex As Exception
+ MsgBox(ex.Message)
+ End Try
+ Return False
+
+ End Function
+
+
Shared Function Import_I0700(TESTSYSTEM) As Boolean
Dim MyData As String = ""
Try
@@ -717,6 +767,47 @@ Class cEZA_Unterlagearten
End Class
+
+
+Class cAES_ZustaendigeZST
+ Inherits List(Of cAES_ZustaendigeZST_I0610)
+
+ Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+
+ Function INSERT_DB(TESTSSYSTEM) As Boolean
+
+ If SQL.doSQL("DELETE FROM [tbl_DY_ZollDE_I0610_ZustaendigeZSTAES]", , , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(TESTSSYSTEM)) Then
+ Dim ok = True
+ For Each l In Me
+ Dim List As New List(Of VERAG_PROG_ALLGEMEIN.MyListItem2)
+ List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("Code", l.Code))
+ List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("Qualifier", l.Qualifier))
+ List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("Description", l.Description))
+ If Not SQL.doSQL("INSERT INTO [tbl_DY_ZollDE_I0610_ZustaendigeZSTAES] (Code, Qualifier, Description) VALUES (@Code, @Qualifier, @Description); ", "FMZOLL", , List, SQL.GetNewOpenConnectionFMZOLL_SYSTEM(TESTSSYSTEM)) Then
+ ok = False
+ End If
+ Next
+ Return ok
+ End If
+ Return False
+ End Function
+
+ Class cAES_ZustaendigeZST_I0610
+ Property Code As String = ""
+ Property Qualifier As String = ""
+ Property Description As String = ""
+
+ Sub New(Code, Qualifier, Description)
+ Me.Code = Code
+ Me.Qualifier = Qualifier
+ Me.Description = Description
+
+ End Sub
+ End Class
+
+End Class
+
+
Class cLaenderCodesC0010
Inherits List(Of cLaenderCodesC0010)
diff --git a/DAKOSY_Worker/cZOLL_IMPORT.vb b/DAKOSY_Worker/cZOLL_IMPORT.vb
index 2b54f4b..1815ba2 100644
--- a/DAKOSY_Worker/cZOLL_IMPORT.vb
+++ b/DAKOSY_Worker/cZOLL_IMPORT.vb
@@ -479,7 +479,7 @@ Public Class cZOLL_IMPORT
End Function
'Zollsystem 0,1
- Public Function IMPORT(SPEDITIONSBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch, avisoLinkId As Integer, SendungId As Integer, strManNr As String, strManNl As String, Zollsystem As String, EZA_Nr As String, NCTS_Nr As String, ByRef notFound As Boolean, Optional autoImport As Boolean = False, Optional Personalnummer As Integer = -1) As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch
+ Public Function IMPORT(SPEDITIONSBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch, avisoLinkId As Integer, SendungId As Integer, strManNr As String, strManNl As String, Zollsystem As String, EZA_Nr As String, NCTS_Nr As String, ByRef notFound As Boolean, Optional autoImport As Boolean = False, Optional Personalnummer As Integer = -1, Optional AES_Nr As String = "") As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch
Me.SPEDITIONSBUCH = SPEDITIONSBUCH
Me.strManNr = strManNr
@@ -535,16 +535,19 @@ Public Class cZOLL_IMPORT
notFound = Me.notFound
Case 2 'dakosy
SPEDITIONSBUCH.Zollsystem = "D"
- If EZA_Nr <> "" Then
+ If AES_Nr <> "" Then
+ ' SPEDITIONSBUCH.AtlasBezNrNCTS = NCTS_Nr
+ DAKOSY_Worker.cDakosyEZA.DakosyAESDatenbereitstellung(SPEDITIONSBUCH, AES_Nr, notFound, PosAnzahl)
+ ElseIf EZA_Nr <> "" Then
If SPEDITIONSBUCH.Abfertigungsart = "7" Then
DAKOSY_Worker.cDakosyEZA.DakosyAESDatenbereitstellung(SPEDITIONSBUCH, EZA_Nr, notFound, PosAnzahl)
Else
DAKOSY_Worker.cDakosyEZA.DakosyEZADatenbereitstellung(SPEDITIONSBUCH, EZA_Nr, notFound, PosAnzahl)
End If
ElseIf NCTS_Nr <> "" Then
- ' SPEDITIONSBUCH.AtlasBezNrNCTS = NCTS_Nr
- DAKOSY_Worker.cDakosyNCTSOut.DakosyNCTSDatenbereitstellung(SPEDITIONSBUCH, NCTS_Nr, notFound)
- End If
+ ' SPEDITIONSBUCH.AtlasBezNrNCTS = NCTS_Nr
+ DAKOSY_Worker.cDakosyNCTSOut.DakosyNCTSDatenbereitstellung(SPEDITIONSBUCH, NCTS_Nr, notFound)
+ Else End If
Me.notFound = notFound
Case 3 'telotec
SPEDITIONSBUCH.Zollsystem = "T"
@@ -680,6 +683,9 @@ Public Class cZOLL_IMPORT
If SPEDITIONSBUCH.Grenzstelle Is Nothing OrElse SPEDITIONSBUCH.Grenzstelle = "" Then
SPEDITIONSBUCH.Grenzstelle = If(Aviso.Grenzstelle, "")
End If
+ If SPEDITIONSBUCH.Zollstelle Is Nothing OrElse SPEDITIONSBUCH.Zollstelle = "" Then
+ SPEDITIONSBUCH.Zollstelle = If(Aviso.Zollstelle, "")
+ End If
End If
End If
diff --git a/cNCTSPartnerWorker/NCTSPartnerWorker.vbproj b/cNCTSPartnerWorker/NCTSPartnerWorker.vbproj
index 2630034..96aded6 100644
--- a/cNCTSPartnerWorker/NCTSPartnerWorker.vbproj
+++ b/cNCTSPartnerWorker/NCTSPartnerWorker.vbproj
@@ -52,9 +52,6 @@
-
- ..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll
-
@@ -109,5 +106,11 @@
Settings.Designer.vb
+
+
+ {a3b497bd-842c-4a2b-b398-ed1976849df1}
+ VERAG_PROG_ALLGEMEIN
+
+
\ No newline at end of file
diff --git a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb
index ef0f711..b4f3bf1 100644
--- a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb
+++ b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb
@@ -2086,6 +2086,7 @@ Public Class frmDYNachrichtenVerarbeitung
Dim AES_TMP As DAKOSY_Worker.cDakosyAES = saveDY_AES(STATUS, DY_TMP, messageID, messageTstmp, , MRN)
' If If(AES_TMP.aes_firma, "") = "IMEX" Then AES_TMP.insertIntoSpedBuch(DY_TMP)
+ AES_TMP.insertIntoSpedBuch(DY_TMP)
'SaveAES_FirmaNL(AES_TMP, "") 'KEINE NIEDERLASSUNG
@@ -2201,7 +2202,7 @@ Public Class frmDYNachrichtenVerarbeitung
Dim AES_TMP As DAKOSY_Worker.cDakosyAES = saveDY_AES(STATUS, DY_TMP, messageID, messageTstmp, , MRN)
'SaveAES_FirmaNL(AES_TMP, "") 'KEINE NIEDERLASSUNG
-
+ AES_TMP.insertIntoSpedBuch(DY_TMP)
If DY_TMP IsNot Nothing Then STATUS.dySt_dyId = DY_TMP.dy_Id
STATUS.SAVE()
diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb
index b785f6b..8950c42 100644
--- a/initATLASAufschubkonten/frmStartOptions.Designer.vb
+++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb
@@ -25,6 +25,7 @@ Partial Class frmStartOptions
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmStartOptions))
Me.pnl = New System.Windows.Forms.Panel()
+ Me.Label21 = New System.Windows.Forms.Label()
Me.Button16 = New System.Windows.Forms.Button()
Me.Button14 = New System.Windows.Forms.Button()
Me.Label20 = New System.Windows.Forms.Label()
@@ -159,7 +160,8 @@ Partial Class frmStartOptions
Me.lklAufschubkontenATLASEZOLL = New System.Windows.Forms.LinkLabel()
Me.lblRoutineManager = New System.Windows.Forms.Label()
Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox()
- Me.Label21 = New System.Windows.Forms.Label()
+ Me.LinkLabel38 = New System.Windows.Forms.LinkLabel()
+ Me.PictureBox17 = New System.Windows.Forms.PictureBox()
Me.pnl.SuspendLayout()
CType(Me.piceZollAnh, System.ComponentModel.ISupportInitialize).BeginInit()
Me.tbcntr.SuspendLayout()
@@ -184,6 +186,7 @@ Partial Class frmStartOptions
CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.PictureBox17, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'pnl
@@ -253,6 +256,16 @@ Partial Class frmStartOptions
Me.pnl.Size = New System.Drawing.Size(861, 827)
Me.pnl.TabIndex = 0
'
+ 'Label21
+ '
+ Me.Label21.AutoSize = True
+ Me.Label21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
+ Me.Label21.Location = New System.Drawing.Point(264, 298)
+ Me.Label21.Name = "Label21"
+ Me.Label21.Size = New System.Drawing.Size(75, 13)
+ Me.Label21.TabIndex = 69
+ Me.Label21.Text = "Geschäftsjahr:"
+ '
'Button16
'
Me.Button16.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -653,6 +666,8 @@ Partial Class frmStartOptions
'
'TabPage1
'
+ Me.TabPage1.Controls.Add(Me.LinkLabel38)
+ Me.TabPage1.Controls.Add(Me.PictureBox17)
Me.TabPage1.Controls.Add(Me.LinkLabel37)
Me.TabPage1.Controls.Add(Me.PictureBox16)
Me.TabPage1.Controls.Add(Me.Button15)
@@ -1931,15 +1946,27 @@ Partial Class frmStartOptions
Me.txtGJ_UNISPED.Size = New System.Drawing.Size(53, 20)
Me.txtGJ_UNISPED.TabIndex = 68
'
- 'Label21
+ 'LinkLabel38
'
- Me.Label21.AutoSize = True
- Me.Label21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
- Me.Label21.Location = New System.Drawing.Point(264, 298)
- Me.Label21.Name = "Label21"
- Me.Label21.Size = New System.Drawing.Size(75, 13)
- Me.Label21.TabIndex = 69
- Me.Label21.Text = "Geschäftsjahr:"
+ Me.LinkLabel38.AutoSize = True
+ Me.LinkLabel38.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+ Me.LinkLabel38.Location = New System.Drawing.Point(475, 125)
+ Me.LinkLabel38.Name = "LinkLabel38"
+ Me.LinkLabel38.Size = New System.Drawing.Size(141, 13)
+ Me.LinkLabel38.TabIndex = 59
+ Me.LinkLabel38.TabStop = True
+ Me.LinkLabel38.Text = "I0610 - Zust. Zollstelle (AES)"
+ '
+ 'PictureBox17
+ '
+ Me.PictureBox17.BackgroundImage = CType(resources.GetObject("PictureBox17.BackgroundImage"), System.Drawing.Image)
+ Me.PictureBox17.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+ Me.PictureBox17.Location = New System.Drawing.Point(630, 120)
+ Me.PictureBox17.Name = "PictureBox17"
+ Me.PictureBox17.Size = New System.Drawing.Size(18, 18)
+ Me.PictureBox17.TabIndex = 60
+ Me.PictureBox17.TabStop = False
+ Me.PictureBox17.Visible = False
'
'frmStartOptions
'
@@ -1982,6 +2009,7 @@ Partial Class frmStartOptions
CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.PictureBox17, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
End Sub
@@ -2121,4 +2149,6 @@ Partial Class frmStartOptions
Friend WithEvents PictureBox16 As PictureBox
Friend WithEvents Label21 As Label
Friend WithEvents txtGJ_UNISPED As VERAG_PROG_ALLGEMEIN.MyTextBox
+ Friend WithEvents LinkLabel38 As LinkLabel
+ Friend WithEvents PictureBox17 As PictureBox
End Class
diff --git a/initATLASAufschubkonten/frmStartOptions.resx b/initATLASAufschubkonten/frmStartOptions.resx
index 2f8f7a4..a055b7d 100644
--- a/initATLASAufschubkonten/frmStartOptions.resx
+++ b/initATLASAufschubkonten/frmStartOptions.resx
@@ -140,6 +140,30 @@
WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
+ oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
+ QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
+ j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
+ VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
+ XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
+ 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
+ VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
+ 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
+ pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
+ lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
+ d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
+ hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
+ LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
+ 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
+ NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
+ ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
+ WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
+ nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
+ CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb
index 095b75f..febb19a 100644
--- a/initATLASAufschubkonten/frmStartOptions.vb
+++ b/initATLASAufschubkonten/frmStartOptions.vb
@@ -195,11 +195,34 @@ Public Class frmStartOptions
Me.Refresh()
DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("C0014", True)
DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("C0014", False)
-
Me.Refresh()
DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("C0141", True)
DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("C0141", False)
Me.Refresh()
+ DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("I0400", True)
+ DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("I0400", False)
+ Me.Refresh()
+ DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("I0700", True)
+ DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("I0700", False)
+ Me.Refresh()
+ DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("C0010", True)
+ DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("C0010", False)
+ Me.Refresh()
+ DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("C0013", True)
+ DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("C0013", False)
+ Me.Refresh()
+ DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("A0122", True)
+ DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("A0122", False)
+ Me.Refresh()
+ DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("A0127", True)
+ DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("A0127", False)
+ Me.Refresh()
+ DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("I0200", True)
+ DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("I0200", False)
+ Me.Refresh()
+ DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("I6010", True)
+ DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("I6010", False)
+ Me.Refresh()
closeMe()
End Sub
Case "KD_DATA_DAKOSY"
@@ -1941,7 +1964,13 @@ Public Class frmStartOptions
End Sub
Private Sub LinkLabel12_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel12.LinkClicked
-
+ Me.Cursor = Cursors.WaitCursor
+ Try
+ DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("A0127", True) 'TESTSYSTEM
+ Dim erg = DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("A0127", False) 'ECHTSYSTEM
+ showPic(erg, PictureBox5)
+ Catch ex As Exception : VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name) : End Try
+ Me.Cursor = Cursors.Default
End Sub
Private Sub LinkLabel13_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel13.LinkClicked
@@ -3213,4 +3242,14 @@ Public Class frmStartOptions
Catch ex As Exception : VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name) : End Try
Me.Cursor = Cursors.Default
End Sub
+
+ Private Sub LinkLabel38_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel38.LinkClicked
+ Me.Cursor = Cursors.WaitCursor
+ Try
+ DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("I0610", True) 'TESTSYSTEM
+ Dim erg = DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("I0610", False) 'ECHTSYSTEM
+ showPic(erg, PictureBox17)
+ Catch ex As Exception : VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name) : End Try
+ Me.Cursor = Cursors.Default
+ End Sub
End Class
\ No newline at end of file