From 2c1de3334b5c7f48a466668d54ece471b7a33258 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Wed, 14 Dec 2022 21:20:36 +0100 Subject: [PATCH] WARENORT-AVISO, EN-Anpassung, Benachrichtigungen, ATILLA-Indonesien, AVISO-TV --- AVISOUPDATER/AVISOUPDATER_Version.txt | 2 +- AVISOUPDATER/UPDATERfrm.vb | 8 +- .../Benachrichtigung/frmAvisoWeiterleiten.vb | 30 +- .../usrCntlBenachrichtigungen.Designer.vb | 33 +- .../usrCntlBenachrichtigungen.vb | 14 +- Aviso/My Project/AssemblyInfo.vb | 4 +- Aviso/frmAddAktenvermerkShort.Designer.vb | 66 +- Aviso/frmAddAktenvermerkShort.vb | 23 +- Aviso/frmAddSendungsvermerkShort.Designer.vb | 36 +- Aviso/frmAddSendungsvermerkShort.vb | 15 +- Aviso/frmEintragAviso.vb | 377 +++++----- Aviso/frmHauptfenster.Designer.vb | 661 ++++++++++-------- Aviso/frmHauptfenster.resx | 2 +- Aviso/frmHauptfenster.vb | 224 +++++- Aviso/frmLogin.vb | 14 +- Aviso/usrcntlAktDetails.Designer.vb | 594 ++++++++-------- Aviso/usrcntlAktDetails.vb | 42 +- Aviso/usrcntlAktDetailsATILLANeu.Designer.vb | 464 +++++++----- Aviso/usrcntlAktDetailsATILLANeu.resx | 26 +- Aviso/usrcntlAktDetailsATILLANeu.vb | 43 +- AvisoTV/AvisoTV.vbproj | 4 + AvisoTV/frmAnzeige.vb | 7 +- 22 files changed, 1582 insertions(+), 1107 deletions(-) diff --git a/AVISOUPDATER/AVISOUPDATER_Version.txt b/AVISOUPDATER/AVISOUPDATER_Version.txt index 7104585..986084f 100644 --- a/AVISOUPDATER/AVISOUPDATER_Version.txt +++ b/AVISOUPDATER/AVISOUPDATER_Version.txt @@ -1 +1 @@ -7.0 \ No newline at end of file +7.1 \ No newline at end of file diff --git a/AVISOUPDATER/UPDATERfrm.vb b/AVISOUPDATER/UPDATERfrm.vb index 8b76eea..e9cf396 100644 --- a/AVISOUPDATER/UPDATERfrm.vb +++ b/AVISOUPDATER/UPDATERfrm.vb @@ -107,7 +107,7 @@ Public Class UPDATERfrm If CopyIncremental Then - cProgrammeUpdate.copyProgramLIST(F, AppDomain.CurrentDomain.BaseDirectory, {"AVISOUPDATER", "NOT_DEL_"}) + cProgrammeUpdate.copyProgramLIST(F, AppDomain.CurrentDomain.BaseDirectory, {"AVISOUPDATER", "NOT_DEL_", "Standort.txt"}) Else delFiles() FileCopier() @@ -256,7 +256,7 @@ Public Class UPDATERfrm For Each file_source In IO.Directory.GetFiles(F) 'jedes File in F:\ Dim found = False For Each file As String In IO.Directory.GetFiles(AppDomain.CurrentDomain.BaseDirectory) ' Ermittelt alle Dateien des Ordners - If Not cut_file(file).Contains("AVISOUPDATER") And Not cut_file(file).Contains("NOT_DEL_") Then 'alles außer den Updater + If Not cut_file(file).Contains("AVISOUPDATER") And Not cut_file(file).Contains("NOT_DEL_") And Not cut_file(file).Contains("Standort.txt") Then 'alles außer den Updater If cut_file(file) = cut_file(file_source) Then 'Gleicher Name If CompareFiles(file, file_source) Then 'selbe Datei --> Nichts @@ -279,7 +279,7 @@ Public Class UPDATERfrm For Each file As String In IO.Directory.GetFiles(AppDomain.CurrentDomain.BaseDirectory) ' Ermittelt alle Dateien des Ordners Dim found = False For Each file_source In IO.Directory.GetFiles(F) 'jedes File in F:\ - If Not cut_file(file).Contains("AVISOUPDATER") And Not cut_file(file).Contains("NOT_DEL_") Then 'alles außer den Updater + If Not cut_file(file).Contains("AVISOUPDATER") And Not cut_file(file).Contains("NOT_DEL_") And Not cut_file(file).Contains("Standort.txt") Then 'alles außer den Updater If cut_file(file) = cut_file(file_source) Then 'Gleicher Name found = True End If @@ -312,7 +312,7 @@ Public Class UPDATERfrm 'Dim f As String = "no" Try For Each file As String In IO.Directory.GetFiles(AppDomain.CurrentDomain.BaseDirectory) ' Ermittelt alle Dateien des Ordners - If Not cut_file(file).Contains("AVISOUPDATER") And Not cut_file(file).Contains("NOT_DEL_") Then + If Not cut_file(file).Contains("AVISOUPDATER") And Not cut_file(file).Contains("NOT_DEL_") And Not cut_file(file).Contains("Standort.txt") Then ' f = file My.Computer.FileSystem.DeleteFile(file) 'Löscht das AVISO-Programm, außer den Updater ' IO.File.Delete(file) diff --git a/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb b/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb index f8018b0..7892337 100644 --- a/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb +++ b/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb @@ -163,13 +163,35 @@ Public Class frmAvisoWeiterleiten End If - If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" And WLart = "A" And bezeichnung = "VERIMEX" Then - If vbYes = MsgBox("Akt auf Status 'VERIMEX' setzten?", vbYesNoCancel) Then - Dim FUNC As New AvisoStatusFunctions - FUNC.setVorbereitet(AvisoId) + + + 'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" And WLart = "A" And bezeichnung = "VERIMEX" Then + ' If vbYes = MsgBox("Akt auf Status 'VERIMEX' setzten?", vbYesNoCancel) Then + ' Dim FUNC As New AvisoStatusFunctions + ' FUNC.setVorbereitet(AvisoId) + ' End If + 'End If + + + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then + If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("STATUS_ATILLA") Then + If WLart = "T" And bezeichnungFirma = "VERIMEX" Or WLart = "F" And bezeichnung = "VERIMEX" Then + If vbYes = MsgBox("Akt auf Status 'AN VERIMEX' setzten?", vbYesNoCancel) Then + Dim FUNC As New AvisoStatusFunctions + FUNC.setAnVERIMEX(AvisoId) + End If + End If + If WLart = "T" And bezeichnung = "INDONESIEN" Then + If vbYes = MsgBox("Akt auf Status 'AN INDONESIEN' setzten?", vbYesNoCancel) Then + Dim FUNC As New AvisoStatusFunctions + FUNC.setAnINDONESIEN(AvisoId) + End If + End If End If End If + + ' Me.Close() ' End If diff --git a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb index 6e1bfe4..7309048 100644 --- a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb +++ b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb @@ -28,6 +28,7 @@ Partial Class usrCntlBenachrichtigungen Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.gridAvisoBenachrichtigungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel4 = New System.Windows.Forms.Panel() + Me.txtVermerk = New System.Windows.Forms.TextBox() Me.cbxNeukunden = New System.Windows.Forms.CheckBox() Me.Button10 = New System.Windows.Forms.Button() Me.Panel3 = New System.Windows.Forms.Panel() @@ -35,7 +36,7 @@ Partial Class usrCntlBenachrichtigungen Me.cbxTeams = New System.Windows.Forms.CheckBox() Me.Label22 = New System.Windows.Forms.Label() Me.Label25 = New System.Windows.Forms.Label() - Me.txtVermerk = New System.Windows.Forms.TextBox() + Me.cbxVerwarung = New System.Windows.Forms.CheckBox() Me.Panel2.SuspendLayout() CType(Me.gridAvisoBenachrichtigungen, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel4.SuspendLayout() @@ -93,6 +94,7 @@ Partial Class usrCntlBenachrichtigungen 'Panel4 ' Me.Panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Panel4.Controls.Add(Me.cbxVerwarung) Me.Panel4.Controls.Add(Me.txtVermerk) Me.Panel4.Controls.Add(Me.cbxNeukunden) Me.Panel4.Controls.Add(Me.Button10) @@ -102,6 +104,16 @@ Partial Class usrCntlBenachrichtigungen Me.Panel4.Size = New System.Drawing.Size(284, 38) Me.Panel4.TabIndex = 5 ' + 'txtVermerk + ' + Me.txtVermerk.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtVermerk.Location = New System.Drawing.Point(7, -1) + Me.txtVermerk.Name = "txtVermerk" + Me.txtVermerk.ReadOnly = True + Me.txtVermerk.Size = New System.Drawing.Size(146, 20) + Me.txtVermerk.TabIndex = 31 + ' 'cbxNeukunden ' Me.cbxNeukunden.AutoSize = True @@ -189,15 +201,17 @@ Partial Class usrCntlBenachrichtigungen Me.Label25.Text = "0 Akte vom Arbeitsplatz übernommen" Me.Label25.TextAlign = System.Drawing.ContentAlignment.TopRight ' - 'txtVermerk + 'cbxVerwarung ' - Me.txtVermerk.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.txtVermerk.Location = New System.Drawing.Point(7, -1) - Me.txtVermerk.Name = "txtVermerk" - Me.txtVermerk.ReadOnly = True - Me.txtVermerk.Size = New System.Drawing.Size(146, 20) - Me.txtVermerk.TabIndex = 31 + Me.cbxVerwarung.AutoSize = True + Me.cbxVerwarung.ForeColor = System.Drawing.Color.Black + Me.cbxVerwarung.Location = New System.Drawing.Point(85, 19) + Me.cbxVerwarung.Name = "cbxVerwarung" + Me.cbxVerwarung.Size = New System.Drawing.Size(83, 17) + Me.cbxVerwarung.TabIndex = 32 + Me.cbxVerwarung.Text = "Verwahrung" + Me.cbxVerwarung.UseVisualStyleBackColor = True + Me.cbxVerwarung.Visible = False ' 'usrCntlBenachrichtigungen ' @@ -228,4 +242,5 @@ Partial Class usrCntlBenachrichtigungen Friend WithEvents cbxCluster As CheckBox Friend WithEvents cbxNeukunden As CheckBox Friend WithEvents txtVermerk As TextBox + Friend WithEvents cbxVerwarung As CheckBox End Class diff --git a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb index ebe55ce..6fec449 100644 --- a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb +++ b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb @@ -1,4 +1,6 @@ -Public Class usrCntlBenachrichtigungen +Imports DAKOSY_Worker.SumAErledigungsinformationVorpapier + +Public Class usrCntlBenachrichtigungen Dim VERAGSQL As New VERAG_PROG_ALLGEMEIN.SQL Dim ASF As New AvisoStatusFunctions @@ -48,6 +50,12 @@ whereMA &= " OR (ab_TO_Art='F' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "') " End If + If cbxVerwarung.Checked Then + Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Case "VERAG" + whereMA &= " OR (ab_TO_Art='T' AND ab_TO_Code='26') " 'TEAM_VERWARUNG --> VERAG + End Select + End If If cbxTeams.Checked Then whereMA &= " Or (ab_TO_Art='T' AND ab_TO_Code IN (SELECT [team_id] FROM ADMIN.dbo.[tblTeams] WHERE team_firma = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "')) " @@ -205,6 +213,10 @@ 'cbxNeukunden.Checked = True End If + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("BENACHRICHTIGUNGEN_SeeVerwahrung", "AVISO") Then + cbxVerwarung.Visible = True + cbxVerwarung.Checked = True + End If 'NEIN; weils zB Waidhaus dann alles sieht und übernimmt diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index a31d765..cda8f9c 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmAddAktenvermerkShort.Designer.vb b/Aviso/frmAddAktenvermerkShort.Designer.vb index 7ed4792..342ea10 100644 --- a/Aviso/frmAddAktenvermerkShort.Designer.vb +++ b/Aviso/frmAddAktenvermerkShort.Designer.vb @@ -25,7 +25,7 @@ Partial Class frmAddAktenvermerkShort Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAddAktenvermerkShort)) Me.pnlAktenVermerk = New System.Windows.Forms.Panel() - Me.Button2 = New System.Windows.Forms.Button() + Me.btnLKWUmmelden = New System.Windows.Forms.Button() Me.btnLKWumgemeldet = New System.Windows.Forms.Button() Me.btnDEZollDIGITAL = New System.Windows.Forms.Button() Me.Panel1 = New System.Windows.Forms.Panel() @@ -47,7 +47,7 @@ Partial Class frmAddAktenvermerkShort Me.Label2 = New System.Windows.Forms.Label() Me.btnLKWFertig = New System.Windows.Forms.Button() Me.btnAktUebernehmen = New System.Windows.Forms.Button() - Me.Button1 = New System.Windows.Forms.Button() + Me.btnClose = New System.Windows.Forms.Button() Me.pnl = New System.Windows.Forms.Panel() Me.btnNichtEingetroffen = New System.Windows.Forms.Button() Me.btnFreigabe = New System.Windows.Forms.Button() @@ -76,7 +76,7 @@ Partial Class frmAddAktenvermerkShort ' Me.pnlAktenVermerk.BackColor = System.Drawing.Color.White Me.pnlAktenVermerk.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.pnlAktenVermerk.Controls.Add(Me.Button2) + Me.pnlAktenVermerk.Controls.Add(Me.btnLKWUmmelden) Me.pnlAktenVermerk.Controls.Add(Me.btnLKWumgemeldet) Me.pnlAktenVermerk.Controls.Add(Me.btnDEZollDIGITAL) Me.pnlAktenVermerk.Controls.Add(Me.Panel1) @@ -91,7 +91,7 @@ Partial Class frmAddAktenvermerkShort Me.pnlAktenVermerk.Controls.Add(Me.Label2) Me.pnlAktenVermerk.Controls.Add(Me.btnLKWFertig) Me.pnlAktenVermerk.Controls.Add(Me.btnAktUebernehmen) - Me.pnlAktenVermerk.Controls.Add(Me.Button1) + Me.pnlAktenVermerk.Controls.Add(Me.btnClose) Me.pnlAktenVermerk.Controls.Add(Me.pnl) Me.pnlAktenVermerk.Controls.Add(Me.btnSpaetAvisiert) Me.pnlAktenVermerk.Controls.Add(Me.btnLKWStandzeitFeierteage) @@ -107,19 +107,19 @@ Partial Class frmAddAktenvermerkShort Me.pnlAktenVermerk.Size = New System.Drawing.Size(401, 509) Me.pnlAktenVermerk.TabIndex = 0 ' - 'Button2 + 'btnLKWUmmelden ' - Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button2.Image = Global.AVISO.My.Resources.Resources.lorry_ummelden - Me.Button2.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.Button2.Location = New System.Drawing.Point(298, 145) - Me.Button2.Margin = New System.Windows.Forms.Padding(0) - Me.Button2.Name = "Button2" - Me.Button2.Size = New System.Drawing.Size(89, 83) - Me.Button2.TabIndex = 109 - Me.Button2.Text = "LKW ummelden..." - Me.Button2.TextAlign = System.Drawing.ContentAlignment.BottomCenter - Me.Button2.UseVisualStyleBackColor = True + Me.btnLKWUmmelden.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnLKWUmmelden.Image = Global.AVISO.My.Resources.Resources.lorry_ummelden + Me.btnLKWUmmelden.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnLKWUmmelden.Location = New System.Drawing.Point(298, 145) + Me.btnLKWUmmelden.Margin = New System.Windows.Forms.Padding(0) + Me.btnLKWUmmelden.Name = "btnLKWUmmelden" + Me.btnLKWUmmelden.Size = New System.Drawing.Size(89, 83) + Me.btnLKWUmmelden.TabIndex = 109 + Me.btnLKWUmmelden.Text = "LKW ummelden..." + Me.btnLKWUmmelden.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.btnLKWUmmelden.UseVisualStyleBackColor = True ' 'btnLKWumgemeldet ' @@ -391,22 +391,22 @@ Partial Class frmAddAktenvermerkShort Me.btnAktUebernehmen.TextAlign = System.Drawing.ContentAlignment.BottomCenter Me.btnAktUebernehmen.UseVisualStyleBackColor = True ' - 'Button1 + 'btnClose ' - Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Button1.BackColor = System.Drawing.Color.Red - Me.Button1.FlatAppearance.BorderColor = System.Drawing.Color.White - Me.Button1.FlatAppearance.BorderSize = 0 - Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Button1.ForeColor = System.Drawing.Color.White - Me.Button1.Location = New System.Drawing.Point(346, 0) - Me.Button1.Name = "Button1" - Me.Button1.RightToLeft = System.Windows.Forms.RightToLeft.Yes - Me.Button1.Size = New System.Drawing.Size(54, 20) - Me.Button1.TabIndex = 94 - Me.Button1.Text = "X" - Me.Button1.UseVisualStyleBackColor = False + Me.btnClose.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnClose.BackColor = System.Drawing.Color.Red + Me.btnClose.FlatAppearance.BorderColor = System.Drawing.Color.White + Me.btnClose.FlatAppearance.BorderSize = 0 + Me.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnClose.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnClose.ForeColor = System.Drawing.Color.White + Me.btnClose.Location = New System.Drawing.Point(346, 0) + Me.btnClose.Name = "btnClose" + Me.btnClose.RightToLeft = System.Windows.Forms.RightToLeft.Yes + Me.btnClose.Size = New System.Drawing.Size(54, 20) + Me.btnClose.TabIndex = 94 + Me.btnClose.Text = "X" + Me.btnClose.UseVisualStyleBackColor = False ' 'pnl ' @@ -688,7 +688,7 @@ Partial Class frmAddAktenvermerkShort Friend WithEvents btnVorbereitet As System.Windows.Forms.Button Friend WithEvents btnVorgeschrieben As System.Windows.Forms.Button Friend WithEvents btnNichtEingetroffen As System.Windows.Forms.Button - Friend WithEvents Button1 As System.Windows.Forms.Button + Friend WithEvents btnClose As System.Windows.Forms.Button Friend WithEvents btnLKWFertig As System.Windows.Forms.Button Friend WithEvents btnAktUebernehmen As System.Windows.Forms.Button Friend WithEvents Label2 As System.Windows.Forms.Label @@ -702,7 +702,7 @@ Partial Class frmAddAktenvermerkShort Friend WithEvents btnDEZollDIGITAL As Button Friend WithEvents Panel1 As Panel Friend WithEvents btnLKWumgemeldet As Button - Friend WithEvents Button2 As Button + Friend WithEvents btnLKWUmmelden As Button Friend WithEvents cntxt As ContextMenuStrip Friend WithEvents XXXToolStripMenuItem As ToolStripMenuItem End Class diff --git a/Aviso/frmAddAktenvermerkShort.vb b/Aviso/frmAddAktenvermerkShort.vb index dcbaad0..d4b91c9 100644 --- a/Aviso/frmAddAktenvermerkShort.vb +++ b/Aviso/frmAddAktenvermerkShort.vb @@ -123,6 +123,25 @@ Public Class frmAddAktenvermerkShort End If + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("WARENORT", "AVISO") Then + For Each c As Control In Me.Controls + Dim enabledTmp = False + If c Is btnAktUebernehmen Then enabledTmp = True + If c Is btnLKWUmmelden Then enabledTmp = True + If c Is btnZollDEEingereicht Then enabledTmp = True + If c Is txtSonstiges Then enabledTmp = True + If c Is btnSonstiges Then enabledTmp = True + If c Is btnAnkunft Then enabledTmp = True + If c Is btnFreigabe Then enabledTmp = True + If c Is btnLKWFertig Then enabledTmp = True + If c Is btnLKWStandzeitWE Then enabledTmp = True + If c Is btnLKWStandzeitFeierteage Then enabledTmp = True + If c Is btnClose Then enabledTmp = True + + c.Enabled = enabledTmp + Next + End If + End Sub @@ -281,7 +300,7 @@ btnZollDEEingereicht.Click, btnSBG.Click, btnNKD.Click, btnWAI.Click, btnSFD.Cli - Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles Button1.Click + Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles btnClose.Click Me.Close() End Sub Private Sub Button1_Click(sender As Object, e As EventArgs) @@ -310,7 +329,7 @@ btnZollDEEingereicht.Click, btnSBG.Click, btnNKD.Click, btnWAI.Click, btnSFD.Cli End Try End Sub - Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click + Private Sub Button2_Click(sender As Object, e As EventArgs) Handles btnLKWUmmelden.Click cntxt.Show(Cursor.Position) End Sub End Class diff --git a/Aviso/frmAddSendungsvermerkShort.Designer.vb b/Aviso/frmAddSendungsvermerkShort.Designer.vb index 987b27c..21b2c85 100644 --- a/Aviso/frmAddSendungsvermerkShort.Designer.vb +++ b/Aviso/frmAddSendungsvermerkShort.Designer.vb @@ -40,7 +40,7 @@ Partial Class frmAddSendungsvermerkShort Me.lblErrSpedition = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label() Me.lblErrGrund = New System.Windows.Forms.Label() - Me.Button1 = New System.Windows.Forms.Button() + Me.btnCLose = New System.Windows.Forms.Button() Me.lblErrDokument = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() Me.txtSpedition = New System.Windows.Forms.TextBox() @@ -111,7 +111,7 @@ Partial Class frmAddSendungsvermerkShort Me.pnlSendungsVermker.Controls.Add(Me.lblErrSpedition) Me.pnlSendungsVermker.Controls.Add(Me.Label2) Me.pnlSendungsVermker.Controls.Add(Me.lblErrGrund) - Me.pnlSendungsVermker.Controls.Add(Me.Button1) + Me.pnlSendungsVermker.Controls.Add(Me.btnCLose) Me.pnlSendungsVermker.Controls.Add(Me.lblErrDokument) Me.pnlSendungsVermker.Controls.Add(Me.Label1) Me.pnlSendungsVermker.Controls.Add(Me.txtSpedition) @@ -290,22 +290,22 @@ Partial Class frmAddSendungsvermerkShort Me.lblErrGrund.Text = "Bitte einen Grund angegeben!" Me.lblErrGrund.Visible = False ' - 'Button1 + 'btnCLose ' - Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Button1.BackColor = System.Drawing.Color.Red - Me.Button1.FlatAppearance.BorderColor = System.Drawing.Color.White - Me.Button1.FlatAppearance.BorderSize = 0 - Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Button1.ForeColor = System.Drawing.Color.White - Me.Button1.Location = New System.Drawing.Point(399, -1) - Me.Button1.Name = "Button1" - Me.Button1.RightToLeft = System.Windows.Forms.RightToLeft.Yes - Me.Button1.Size = New System.Drawing.Size(54, 20) - Me.Button1.TabIndex = 0 - Me.Button1.Text = "X" - Me.Button1.UseVisualStyleBackColor = False + Me.btnCLose.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnCLose.BackColor = System.Drawing.Color.Red + Me.btnCLose.FlatAppearance.BorderColor = System.Drawing.Color.White + Me.btnCLose.FlatAppearance.BorderSize = 0 + Me.btnCLose.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnCLose.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnCLose.ForeColor = System.Drawing.Color.White + Me.btnCLose.Location = New System.Drawing.Point(399, -1) + Me.btnCLose.Name = "btnCLose" + Me.btnCLose.RightToLeft = System.Windows.Forms.RightToLeft.Yes + Me.btnCLose.Size = New System.Drawing.Size(54, 20) + Me.btnCLose.TabIndex = 0 + Me.btnCLose.Text = "X" + Me.btnCLose.UseVisualStyleBackColor = False ' 'lblErrDokument ' @@ -707,7 +707,7 @@ Partial Class frmAddSendungsvermerkShort Friend WithEvents optSendungInVorbereitung As System.Windows.Forms.CheckBox Friend WithEvents PictureBox1 As System.Windows.Forms.PictureBox Friend WithEvents lblErrDokument As System.Windows.Forms.Label - Friend WithEvents Button1 As System.Windows.Forms.Button + Friend WithEvents btnCLose As System.Windows.Forms.Button Friend WithEvents Label2 As System.Windows.Forms.Label Friend WithEvents optUeberwachungsdok As System.Windows.Forms.CheckBox Friend WithEvents cbxRgBest As CheckBox diff --git a/Aviso/frmAddSendungsvermerkShort.vb b/Aviso/frmAddSendungsvermerkShort.vb index 7788d39..69e597f 100644 --- a/Aviso/frmAddSendungsvermerkShort.vb +++ b/Aviso/frmAddSendungsvermerkShort.vb @@ -97,6 +97,19 @@ Public Class frmAddSendungsvermerkShort ' optDokumente.Focus() + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("WARENORT", "AVISO") Then + For Each c As Control In Me.Controls + Dim enabledTmp = False + If c Is btnCLose Then enabledTmp = True + If c Is optFremd_SendungAvisiert Then enabledTmp = True + If c Is optFremd_ATB Then enabledTmp = True + If c Is optATAangefordert Then enabledTmp = True + If c Is txtDetail Then enabledTmp = True + If c Is btnOK Then enabledTmp = True + c.Enabled = enabledTmp + Next + End If + End Sub @@ -316,7 +329,7 @@ Public Class frmAddSendungsvermerkShort cbxAuftrag.Focus() End Sub - Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnCLose.Click Me.Close() End Sub diff --git a/Aviso/frmEintragAviso.vb b/Aviso/frmEintragAviso.vb index 346644b..7b18c2a 100644 --- a/Aviso/frmEintragAviso.vb +++ b/Aviso/frmEintragAviso.vb @@ -319,209 +319,214 @@ Public Class frmEintragAviso cboGrenzstelle.changeItem("AMB") End If Else + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("WARENORT", "AVISO") Then + Me.Close() + End If + + Me.Text = "Änderung LKW-Aviso" - 'If myAviso.Status = cGlobal.Status_Ankunft Or myAviso.Status = cGlobal.Status_Freigegeben Then datVoraussichtlichesEintreffen.Visible = False + 'If myAviso.Status = cGlobal.Status_Ankunft Or myAviso.Status = cGlobal.Status_Freigegeben Then datVoraussichtlichesEintreffen.Visible = False - txtInfo.Visible = False - Label3.Visible = False - 'ausgewählter Datensatz wird geladen - grpAktVerzollung.Visible = False - cbxSendungsvorlagen.Visible = False - Button3.Visible = False + txtInfo.Visible = False + Label3.Visible = False + 'ausgewählter Datensatz wird geladen + grpAktVerzollung.Visible = False + cbxSendungsvorlagen.Visible = False + Button3.Visible = False - myAviso = AvisoDAL.LesenAviso(cGlobal.Aktive_ID, "") + myAviso = AvisoDAL.LesenAviso(cGlobal.Aktive_ID, "") - 'Werte(zuweisen) - dtpDatum.Value = myAviso.Datum - If myAviso.Frächter_KdNr > 0 Then - kdFrächter.KdNr = myAviso.Frächter_KdNr - Else - kdFrächter.Text = myAviso.Frächter - End If + 'Werte(zuweisen) + dtpDatum.Value = myAviso.Datum + If myAviso.Frächter_KdNr > 0 Then + kdFrächter.KdNr = myAviso.Frächter_KdNr + Else + kdFrächter.Text = myAviso.Frächter + End If - If myAviso.Auftraggeber_KdNr > 0 Then - kdAvisierer.KdNr = myAviso.Auftraggeber_KdNr - Else - kdAvisierer.Text = myAviso.Auftraggeber - End If + If myAviso.Auftraggeber_KdNr > 0 Then + kdAvisierer.KdNr = myAviso.Auftraggeber_KdNr + Else + kdAvisierer.Text = myAviso.Auftraggeber + End If - txtInfo.Text = myAviso.Info.Trim - txtLKW_Nr.Text = myAviso.LKW_Nr - sbLkwNationalitaet.SET_VALUE(myAviso.LKW_Nationalitaet) - txtFahrerHandy.Text = If(myAviso.FahrerHandy, "") - txtAvisiererAuftragsNr.Text = If(myAviso.KdAuftragsNr_Avisierer, "") - If myAviso.VoraussichtlichesEintreffen IsNot Nothing Then - datVoraussichtlichesEintreffen.Value = myAviso.VoraussichtlichesEintreffen - Else - datVoraussichtlichesEintreffen.Value = myAviso.Datum.AddDays(-1) - End If - - - txtÄnderungen.Text = myAviso.Änderungen.Trim - optOhneAviso.Visible = False 'bei Änderung kann kein Eingang ohne Aviso erfolgen, da Datum bereits bei Anlage gesetzt - optAvisoEingang.Checked = True 'bei Änderung kann kein Eingang ohne Aviso erfolgen... - dtpAvisoEingangDatum.Visible = True - dtpAvisoEingangZeit.Visible = True - If myAviso.Telefonisch = "Telefon" Then - optTelefonisch.Checked = True - ElseIf myAviso.Telefonisch = "Schriftl." Then - optSchriftlich.Checked = True - Else - optUnbekannt.Checked = True - End If - cboGrenzstelle.changeItem(myAviso.Grenzstelle) - cboTransportmittelart.changeItem(myAviso.Transportmittelart) - - cboImEx.Text = If(myAviso.ImEx, "") - hStatus = myAviso.Status - If myAviso.Ankunft = LeerDatum Then - dtpAnkunft.Value = Now.Date - dtpAnkunftZeit.Value = Now - Else - dtpAnkunft.Value = myAviso.Ankunft - dtpAnkunftZeit.Value = myAviso.Ankunft - End If - If myAviso.AvisoEingang = LeerDatum Then - dtpAvisoEingangDatum.Value = dtpDatum.Value.Date - dtpAvisoEingangZeit.Value = dtpDatum.Value - Else - dtpAvisoEingangDatum.Value = myAviso.AvisoEingang - dtpAvisoEingangZeit.Value = myAviso.AvisoEingang - End If - If myAviso.Freigabe = LeerDatum Then - dtpFreigabe.Value = Now.Date - dtpFreigabeZeit.Value = Now - Else - dtpFreigabe.Value = myAviso.Freigabe - dtpFreigabeZeit.Value = myAviso.Freigabe - End If - If myAviso.Vorbereitet = LeerDatum Then - dtpVorbereitet.Value = Now.Date - dtpVorbereitetZeit.Value = Now - Else - dtpVorbereitet.Value = myAviso.Vorbereitet - dtpVorbereitetZeit.Value = myAviso.Vorbereitet - End If - If myAviso.Vorgeschrieben = LeerDatum Then - dtpVorgeschrieben.Value = Now.Date - dtpVorgeschriebenZeit.Value = Now - Else - dtpVorgeschrieben.Value = myAviso.Vorgeschrieben - dtpVorgeschriebenZeit.Value = myAviso.Vorgeschrieben - End If - - txtDauer.Text = Minuten_auf_Text(myAviso.Dauer) - cbxHandling.Checked = myAviso.Handling - cbxSammelakt.Checked = myAviso.Sammelakt - txtSendungen.Text = myAviso.Sendungen_Gesamtanzahl - If myAviso.Status <> cGlobal.Status_Erfasst Then txtInfo.Enabled = False - - 'optOhneAviso.Checked = txtÄnderungen.Text.Contains("Neuanlage Ankunft ohne Aviso") - - 'Status anzeigen - - Select Case hStatus - Case cGlobal.Status_Ankunft - lblStatus.Text = "Ankunft" - If myAviso.Ankunft <> LeerDatum Then lblStatus.Text += " " & Format(myAviso.Ankunft, "dd.MM. HH:mm") - lblStatus.ForeColor = Color.Blue - optAnkunft.Checked = True - Case cGlobal.Status_Erfasst - lblStatus.Text = "erfasst" - lblStatus.ForeColor = Color.Red - optErfasst.Checked = True - Case cGlobal.Status_Freigegeben - lblStatus.Text = "Freigabe " & Format(myAviso.Freigabe, "dd.MM. HH:mm") - lblStatus.ForeColor = Color.Green - btnOK.Enabled = bearb - optFreigegeben.Checked = True - Case cGlobal.Status_NichtEingetroffen - lblStatus.Text = "LKW nicht eingetroffen" - lblStatus.ForeColor = Color.DarkGray - btnOK.Enabled = bearb - optNichtEingetroffen.Checked = True - Case cGlobal.Status_Vorbereitet - lblStatus.Text = "Vorbereitet" - lblStatus.ForeColor = Color.Brown - btnOK.Enabled = bearb - optVorbereitet.Checked = True - Case cGlobal.Status_Vorgeschrieben - lblStatus.Text = "Vorgeschrieben" - lblStatus.ForeColor = Color.Purple - btnOK.Enabled = bearb - optVorgeschrieben.Checked = True - Case Else - lblStatus.Text = "" - End Select - lblStatus.Text = " " & lblStatus.Text & " " 'für bessere farbliche Hervorhebung - cboFirma.changeItem("") - cboFirma.changeItem(myAviso.FIRMA) - - If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_ZeitenBearbeiten", "SDL") Then - panAdmin.Visible = bearb 'Administrator bekommt mehr Edit-Möglichkeiten - End If - - 'Vorpapier laden - UsrCntlAviso_Vorpapiere1.setVorpapiere(myAviso) - - - ' If FIRMA_TMP = "IMEX" Then - txtBestimmungszollstelle.SET_VALUE(If(myAviso.Zollstelle, "")) - cbxWarenort.Checked = myAviso.Warenort - ' End If - - - If FIRMA_TMP = "ATILLA" Then - cbxAktenzettelDrucken.Checked = AktenzetteldruckenVisible - UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle1.SET_VALUE(If(myAviso.Durchgangszollstelle1, "")) - UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle2.SET_VALUE(If(myAviso.Durchgangszollstelle2, "")) - UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle3.SET_VALUE(If(myAviso.Durchgangszollstelle3, "")) - UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle4.SET_VALUE(If(myAviso.Durchgangszollstelle4, "")) - UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle5.SET_VALUE(If(myAviso.Durchgangszollstelle5, "")) - UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle6.SET_VALUE(If(myAviso.Durchgangszollstelle6, "")) - UsrCntlEintragAvisoAtilla.txtAusgangszstAndere.Text = "" - - If myAviso.Ausgangszollstelle IsNot Nothing Then - For Each s In myAviso.Ausgangszollstelle.split(";") - Select Case s - Case "KA" : UsrCntlEintragAvisoAtilla.rbtnKaptainAndreevo.Checked = True - Case "L" : UsrCntlEintragAvisoAtilla.rbtnLesovo.Checked = True - Case "BB" : UsrCntlEintragAvisoAtilla.rbtnBatrovici.Checked = True - Case "HR" : UsrCntlEintragAvisoAtilla.rbtnHorgos.Checked = True - Case "TK" : UsrCntlEintragAvisoAtilla.rbtnTompa.Checked = True - Case "T" : UsrCntlEintragAvisoAtilla.rbtnTrieste.Checked = True - Case "KI" : UsrCntlEintragAvisoAtilla.rbtnKipi.Checked = True - Case "TS" : UsrCntlEintragAvisoAtilla.rbtnTovarnik.Checked = True - Case Else : If s <> "" Then UsrCntlEintragAvisoAtilla.rbtnAndere.Checked = True : UsrCntlEintragAvisoAtilla.txtAusgangszstAndere.Text = s - End Select - Next + txtInfo.Text = myAviso.Info.Trim + txtLKW_Nr.Text = myAviso.LKW_Nr + sbLkwNationalitaet.SET_VALUE(myAviso.LKW_Nationalitaet) + txtFahrerHandy.Text = If(myAviso.FahrerHandy, "") + txtAvisiererAuftragsNr.Text = If(myAviso.KdAuftragsNr_Avisierer, "") + If myAviso.VoraussichtlichesEintreffen IsNot Nothing Then + datVoraussichtlichesEintreffen.Value = myAviso.VoraussichtlichesEintreffen + Else + datVoraussichtlichesEintreffen.Value = myAviso.Datum.AddDays(-1) End If - UsrCntlEintragAvisoAtilla.txtTransporttemp.Text = If(myAviso.TransportTemperatur, "") - UsrCntlEintragAvisoAtilla.txtZugmaschine.Text = If(myAviso.Zugmaschine, "") - Dim sndId = ADMIN.getValueTxtBySql("SELECT TOP 1 isnull(tblSnd_SendungID,-1) FROM [tblSendungen] WHERE [tblSnd_AvisoID]=" & myAviso.AvisoID, "AVISO") - If IsNumeric(sndId) AndAlso sndId > 0 Then - TMP_SND_Atilla = New VERAG_PROG_ALLGEMEIN.cSendungen(sndId) + txtÄnderungen.Text = myAviso.Änderungen.Trim + optOhneAviso.Visible = False 'bei Änderung kann kein Eingang ohne Aviso erfolgen, da Datum bereits bei Anlage gesetzt + optAvisoEingang.Checked = True 'bei Änderung kann kein Eingang ohne Aviso erfolgen... + dtpAvisoEingangDatum.Visible = True + dtpAvisoEingangZeit.Visible = True + If myAviso.Telefonisch = "Telefon" Then + optTelefonisch.Checked = True + ElseIf myAviso.Telefonisch = "Schriftl." Then + optSchriftlich.Checked = True + Else + optUnbekannt.Checked = True End If - If TMP_SND_Atilla IsNot Nothing Then - UsrCntlEintragAvisoAtilla.txtWarenbezeichnung.Text = If(TMP_SND_Atilla.tblSnd_Warenbezeichnung, "") - UsrCntlEintragAvisoAtilla.txtColli.Text = If(TMP_SND_Atilla.tblSnd_Colli, "") - UsrCntlEintragAvisoAtilla.txtGewicht.Text = If(TMP_SND_Atilla.tblSnd_Gewicht, "") - UsrCntlEintragAvisoAtilla.txtAnmerkung.Text = If(TMP_SND_Atilla.tblSnd_Anmerkung, "") + cboGrenzstelle.changeItem(myAviso.Grenzstelle) + cboTransportmittelart.changeItem(myAviso.Transportmittelart) + + cboImEx.Text = If(myAviso.ImEx, "") + hStatus = myAviso.Status + If myAviso.Ankunft = LeerDatum Then + dtpAnkunft.Value = Now.Date + dtpAnkunftZeit.Value = Now + Else + dtpAnkunft.Value = myAviso.Ankunft + dtpAnkunftZeit.Value = myAviso.Ankunft + End If + If myAviso.AvisoEingang = LeerDatum Then + dtpAvisoEingangDatum.Value = dtpDatum.Value.Date + dtpAvisoEingangZeit.Value = dtpDatum.Value + Else + dtpAvisoEingangDatum.Value = myAviso.AvisoEingang + dtpAvisoEingangZeit.Value = myAviso.AvisoEingang + End If + If myAviso.Freigabe = LeerDatum Then + dtpFreigabe.Value = Now.Date + dtpFreigabeZeit.Value = Now + Else + dtpFreigabe.Value = myAviso.Freigabe + dtpFreigabeZeit.Value = myAviso.Freigabe + End If + If myAviso.Vorbereitet = LeerDatum Then + dtpVorbereitet.Value = Now.Date + dtpVorbereitetZeit.Value = Now + Else + dtpVorbereitet.Value = myAviso.Vorbereitet + dtpVorbereitetZeit.Value = myAviso.Vorbereitet + End If + If myAviso.Vorgeschrieben = LeerDatum Then + dtpVorgeschrieben.Value = Now.Date + dtpVorgeschriebenZeit.Value = Now + Else + dtpVorgeschrieben.Value = myAviso.Vorgeschrieben + dtpVorgeschriebenZeit.Value = myAviso.Vorgeschrieben + End If + + txtDauer.Text = Minuten_auf_Text(myAviso.Dauer) + cbxHandling.Checked = myAviso.Handling + cbxSammelakt.Checked = myAviso.Sammelakt + txtSendungen.Text = myAviso.Sendungen_Gesamtanzahl + If myAviso.Status <> cGlobal.Status_Erfasst Then txtInfo.Enabled = False + + 'optOhneAviso.Checked = txtÄnderungen.Text.Contains("Neuanlage Ankunft ohne Aviso") + + 'Status anzeigen + + Select Case hStatus + Case cGlobal.Status_Ankunft + lblStatus.Text = "Ankunft" + If myAviso.Ankunft <> LeerDatum Then lblStatus.Text += " " & Format(myAviso.Ankunft, "dd.MM. HH:mm") + lblStatus.ForeColor = Color.Blue + optAnkunft.Checked = True + Case cGlobal.Status_Erfasst + lblStatus.Text = "erfasst" + lblStatus.ForeColor = Color.Red + optErfasst.Checked = True + Case cGlobal.Status_Freigegeben + lblStatus.Text = "Freigabe " & Format(myAviso.Freigabe, "dd.MM. HH:mm") + lblStatus.ForeColor = Color.Green + btnOK.Enabled = bearb + optFreigegeben.Checked = True + Case cGlobal.Status_NichtEingetroffen + lblStatus.Text = "LKW nicht eingetroffen" + lblStatus.ForeColor = Color.DarkGray + btnOK.Enabled = bearb + optNichtEingetroffen.Checked = True + Case cGlobal.Status_Vorbereitet + lblStatus.Text = "Vorbereitet" + lblStatus.ForeColor = Color.Brown + btnOK.Enabled = bearb + optVorbereitet.Checked = True + Case cGlobal.Status_Vorgeschrieben + lblStatus.Text = "Vorgeschrieben" + lblStatus.ForeColor = Color.Purple + btnOK.Enabled = bearb + optVorgeschrieben.Checked = True + Case Else + lblStatus.Text = "" + End Select + lblStatus.Text = " " & lblStatus.Text & " " 'für bessere farbliche Hervorhebung + cboFirma.changeItem("") + cboFirma.changeItem(myAviso.FIRMA) + + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_ZeitenBearbeiten", "SDL") Then + panAdmin.Visible = bearb 'Administrator bekommt mehr Edit-Möglichkeiten + End If + + 'Vorpapier laden + UsrCntlAviso_Vorpapiere1.setVorpapiere(myAviso) - If TMP_SND_Atilla.tblSnd_AuftraggeberKdNr > 0 Then - kdAuftraggeber.KdNr = TMP_SND_Atilla.tblSnd_AuftraggeberKdNr - Else - kdAuftraggeber.Text = TMP_SND_Atilla.tblSnd_Auftraggeber + ' If FIRMA_TMP = "IMEX" Then + txtBestimmungszollstelle.SET_VALUE(If(myAviso.Zollstelle, "")) + cbxWarenort.Checked = myAviso.Warenort + ' End If + + + If FIRMA_TMP = "ATILLA" Then + cbxAktenzettelDrucken.Checked = AktenzetteldruckenVisible + UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle1.SET_VALUE(If(myAviso.Durchgangszollstelle1, "")) + UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle2.SET_VALUE(If(myAviso.Durchgangszollstelle2, "")) + UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle3.SET_VALUE(If(myAviso.Durchgangszollstelle3, "")) + UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle4.SET_VALUE(If(myAviso.Durchgangszollstelle4, "")) + UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle5.SET_VALUE(If(myAviso.Durchgangszollstelle5, "")) + UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle6.SET_VALUE(If(myAviso.Durchgangszollstelle6, "")) + UsrCntlEintragAvisoAtilla.txtAusgangszstAndere.Text = "" + + If myAviso.Ausgangszollstelle IsNot Nothing Then + For Each s In myAviso.Ausgangszollstelle.split(";") + Select Case s + Case "KA" : UsrCntlEintragAvisoAtilla.rbtnKaptainAndreevo.Checked = True + Case "L" : UsrCntlEintragAvisoAtilla.rbtnLesovo.Checked = True + Case "BB" : UsrCntlEintragAvisoAtilla.rbtnBatrovici.Checked = True + Case "HR" : UsrCntlEintragAvisoAtilla.rbtnHorgos.Checked = True + Case "TK" : UsrCntlEintragAvisoAtilla.rbtnTompa.Checked = True + Case "T" : UsrCntlEintragAvisoAtilla.rbtnTrieste.Checked = True + Case "KI" : UsrCntlEintragAvisoAtilla.rbtnKipi.Checked = True + Case "TS" : UsrCntlEintragAvisoAtilla.rbtnTovarnik.Checked = True + Case Else : If s <> "" Then UsrCntlEintragAvisoAtilla.rbtnAndere.Checked = True : UsrCntlEintragAvisoAtilla.txtAusgangszstAndere.Text = s + End Select + Next End If + + UsrCntlEintragAvisoAtilla.txtTransporttemp.Text = If(myAviso.TransportTemperatur, "") + UsrCntlEintragAvisoAtilla.txtZugmaschine.Text = If(myAviso.Zugmaschine, "") + Dim sndId = ADMIN.getValueTxtBySql("SELECT TOP 1 isnull(tblSnd_SendungID,-1) FROM [tblSendungen] WHERE [tblSnd_AvisoID]=" & myAviso.AvisoID, "AVISO") + If IsNumeric(sndId) AndAlso sndId > 0 Then + TMP_SND_Atilla = New VERAG_PROG_ALLGEMEIN.cSendungen(sndId) + End If + If TMP_SND_Atilla IsNot Nothing Then + UsrCntlEintragAvisoAtilla.txtWarenbezeichnung.Text = If(TMP_SND_Atilla.tblSnd_Warenbezeichnung, "") + UsrCntlEintragAvisoAtilla.txtColli.Text = If(TMP_SND_Atilla.tblSnd_Colli, "") + UsrCntlEintragAvisoAtilla.txtGewicht.Text = If(TMP_SND_Atilla.tblSnd_Gewicht, "") + UsrCntlEintragAvisoAtilla.txtAnmerkung.Text = If(TMP_SND_Atilla.tblSnd_Anmerkung, "") + + + If TMP_SND_Atilla.tblSnd_AuftraggeberKdNr > 0 Then + kdAuftraggeber.KdNr = TMP_SND_Atilla.tblSnd_AuftraggeberKdNr + Else + kdAuftraggeber.Text = TMP_SND_Atilla.tblSnd_Auftraggeber + End If + + End If End If End If - End If - If bearb Then Me.Text += " (Verwaltung)" + If bearb Then Me.Text += " (Verwaltung)" hÄnderung = False diff --git a/Aviso/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb index 5c0aa43..660a54c 100644 --- a/Aviso/frmHauptfenster.Designer.vb +++ b/Aviso/frmHauptfenster.Designer.vb @@ -24,24 +24,26 @@ Partial Class frmHauptfenster Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmHauptfenster)) + Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.mnuInfo = New System.Windows.Forms.ToolStripMenuItem() Me.conÜbernehmen = New System.Windows.Forms.ToolStripMenuItem() Me.conMenuAviso = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator() Me.conFertig = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() - Me.conVorgeschrieben = New System.Windows.Forms.ToolStripMenuItem() Me.conVorbereitet = New System.Windows.Forms.ToolStripMenuItem() + Me.conVorgeschrieben = New System.Windows.Forms.ToolStripMenuItem() Me.conAnkunft = New System.Windows.Forms.ToolStripMenuItem() + Me.conAnVerimex = New System.Windows.Forms.ToolStripMenuItem() + Me.conAnIndonesien = New System.Windows.Forms.ToolStripMenuItem() Me.conFreigabe = New System.Windows.Forms.ToolStripMenuItem() Me.conNichtEingetroffen = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator() @@ -91,6 +93,7 @@ Partial Class frmHauptfenster Me.DTBToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SpracheWechselnToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DeutschToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.EnglishToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TürkischToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.StandarddruckerWechselnToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.NacherfassungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -108,7 +111,7 @@ Partial Class frmHauptfenster Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.MRNBarcodedruckToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator12 = New System.Windows.Forms.ToolStripSeparator() - Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() + Me.tool_BRGXLS = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem4 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem5 = New System.Windows.Forms.ToolStripMenuItem() Me.BürgschaftenExcelToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -231,7 +234,7 @@ Partial Class frmHauptfenster Me.btnSpedBuch = New System.Windows.Forms.Button() Me.Button6 = New System.Windows.Forms.Button() Me.Button7 = New System.Windows.Forms.Button() - Me.Button1 = New System.Windows.Forms.Button() + Me.btnZollwebseiten = New System.Windows.Forms.Button() Me.lblDauer = New System.Windows.Forms.Label() Me.lblMitarbeiter = New System.Windows.Forms.Label() Me.lblGrenzstelle = New System.Windows.Forms.Label() @@ -267,13 +270,16 @@ Partial Class frmHauptfenster Me.SplitContainer3 = New System.Windows.Forms.SplitContainer() Me.pnl = New System.Windows.Forms.Panel() Me.Button10 = New System.Windows.Forms.Button() + Me.gridMyAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel6 = New System.Windows.Forms.Panel() Me.btnColor = New System.Windows.Forms.Button() Me.lblMeineAviso = New System.Windows.Forms.Label() + Me.cboMy_Grenzstelle = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lblMySnd_Grenzstelle = New System.Windows.Forms.Label() Me.cbx_My_LKW = New System.Windows.Forms.CheckBox() Me.cboMy_QS = New System.Windows.Forms.CheckBox() Me.cboMy_VB = New System.Windows.Forms.CheckBox() + Me.cboMyAvisoAnzeige = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lblMySND_Anzeige = New System.Windows.Forms.Label() Me.lblAkte = New System.Windows.Forms.Label() Me.btnClose = New System.Windows.Forms.Button() @@ -289,19 +295,27 @@ Partial Class frmHauptfenster Me.tabAlle = New System.Windows.Forms.TabPage() Me.tabErfasst = New System.Windows.Forms.TabPage() Me.tbcntrAviso = New System.Windows.Forms.TabControl() + Me.tabVERIMEX = New System.Windows.Forms.TabPage() + Me.tabINDONESIEN = New System.Windows.Forms.TabPage() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() Me.pnlDetailsLinks = New System.Windows.Forms.Panel() Me.splitMain = New System.Windows.Forms.SplitContainer() + Me.gridAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel1 = New System.Windows.Forms.Panel() + Me.txtBestimmungszollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox() Me.Label10 = New System.Windows.Forms.Label() + Me.cboImEx = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label21 = New System.Windows.Forms.Label() Me.cbxCluster = New System.Windows.Forms.CheckBox() + Me.cboTeams = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lblErweitereSuche = New System.Windows.Forms.LinkLabel() Me.Label16 = New System.Windows.Forms.Label() Me.Label8 = New System.Windows.Forms.Label() Me.lblEintraege = New System.Windows.Forms.Label() + Me.cboGrenzstelle = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label4 = New System.Windows.Forms.Label() Me.pnlTime = New System.Windows.Forms.Panel() + Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.pnlSearch = New System.Windows.Forms.Panel() Me.txtDyRef = New System.Windows.Forms.TextBox() Me.Label19 = New System.Windows.Forms.Label() @@ -320,6 +334,7 @@ Partial Class frmHauptfenster Me.Button4 = New System.Windows.Forms.Button() Me.lblErwEmpfänger = New System.Windows.Forms.Label() Me.txtEmpfänger = New System.Windows.Forms.TextBox() + Me.cboFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.txtAbfertigungsnummer = New System.Windows.Forms.TextBox() Me.lblErwFilialePos = New System.Windows.Forms.Label() Me.lblErwAuftraggeber = New System.Windows.Forms.Label() @@ -353,17 +368,7 @@ Partial Class frmHauptfenster Me.ToolStripMenuItem20 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem21 = New System.Windows.Forms.ToolStripMenuItem() Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem() - Me.gridAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.txtBestimmungszollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox() - Me.cboImEx = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.cboTeams = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.cboGrenzstelle = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.cboFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen() - Me.gridMyAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.cboMy_Grenzstelle = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.cboMyAvisoAnzeige = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.conMenuAviso.SuspendLayout() Me.MenuStrip1.SuspendLayout() Me.Top.SuspendLayout() @@ -382,6 +387,7 @@ Partial Class frmHauptfenster Me.SplitContainer3.Panel2.SuspendLayout() Me.SplitContainer3.SuspendLayout() Me.pnl.SuspendLayout() + CType(Me.gridMyAviso, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel6.SuspendLayout() Me.tbcntrAviso.SuspendLayout() CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -393,14 +399,13 @@ Partial Class frmHauptfenster Me.splitMain.Panel1.SuspendLayout() Me.splitMain.Panel2.SuspendLayout() Me.splitMain.SuspendLayout() + CType(Me.gridAviso, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() Me.pnlTime.SuspendLayout() Me.pnlSearch.SuspendLayout() Me.pnlOptionen.SuspendLayout() Me.cntxt.SuspendLayout() Me.ctxtFarben.SuspendLayout() - CType(Me.gridAviso, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.gridMyAviso, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'mnuInfo @@ -418,9 +423,9 @@ Partial Class frmHauptfenster 'conMenuAviso ' Me.conMenuAviso.ImageScalingSize = New System.Drawing.Size(24, 24) - Me.conMenuAviso.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.conÜbernehmen, Me.ToolStripSeparator5, Me.conFertig, Me.ToolStripSeparator1, Me.conVorgeschrieben, Me.conVorbereitet, Me.conAnkunft, Me.conFreigabe, Me.conNichtEingetroffen, Me.ToolStripSeparator2, Me.conÄndern}) + Me.conMenuAviso.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.conÜbernehmen, Me.ToolStripSeparator5, Me.conFertig, Me.ToolStripSeparator1, Me.conVorbereitet, Me.conVorgeschrieben, Me.conAnkunft, Me.conAnVerimex, Me.conAnIndonesien, Me.conFreigabe, Me.conNichtEingetroffen, Me.ToolStripSeparator2, Me.conÄndern}) Me.conMenuAviso.Name = "conMenuTage" - Me.conMenuAviso.Size = New System.Drawing.Size(285, 198) + Me.conMenuAviso.Size = New System.Drawing.Size(285, 242) ' 'ToolStripSeparator5 ' @@ -438,25 +443,36 @@ Partial Class frmHauptfenster Me.ToolStripSeparator1.Name = "ToolStripSeparator1" Me.ToolStripSeparator1.Size = New System.Drawing.Size(281, 6) ' + 'conVorbereitet + ' + Me.conVorbereitet.Name = "conVorbereitet" + Me.conVorbereitet.Size = New System.Drawing.Size(284, 22) + Me.conVorbereitet.Text = "auf Status VORBEREITET setzen" + ' 'conVorgeschrieben ' Me.conVorgeschrieben.Name = "conVorgeschrieben" Me.conVorgeschrieben.Size = New System.Drawing.Size(284, 22) Me.conVorgeschrieben.Text = "auf Status VORGESCHRIEBEN setzen" ' - 'conVorbereitet - ' - Me.conVorbereitet.Name = "conVorbereitet" - Me.conVorbereitet.Size = New System.Drawing.Size(284, 22) - Me.conVorbereitet.Text = "auf Status VORBEREITET setzen" - Me.conVorbereitet.Visible = False - ' 'conAnkunft ' Me.conAnkunft.Name = "conAnkunft" Me.conAnkunft.Size = New System.Drawing.Size(284, 22) Me.conAnkunft.Text = "auf Status ANKUNFT setzen" ' + 'conAnVerimex + ' + Me.conAnVerimex.Name = "conAnVerimex" + Me.conAnVerimex.Size = New System.Drawing.Size(284, 22) + Me.conAnVerimex.Text = "auf Status AN VERIMEX setzen" + ' + 'conAnIndonesien + ' + Me.conAnIndonesien.Name = "conAnIndonesien" + Me.conAnIndonesien.Size = New System.Drawing.Size(284, 22) + Me.conAnIndonesien.Text = "auf Status AN INDONESIEN setzen" + ' 'conFreigabe ' Me.conFreigabe.Name = "conFreigabe" @@ -758,7 +774,7 @@ Partial Class frmHauptfenster ' 'SpracheWechselnToolStripMenuItem ' - Me.SpracheWechselnToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DeutschToolStripMenuItem, Me.TürkischToolStripMenuItem}) + Me.SpracheWechselnToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DeutschToolStripMenuItem, Me.EnglishToolStripMenuItem, Me.TürkischToolStripMenuItem}) Me.SpracheWechselnToolStripMenuItem.Name = "SpracheWechselnToolStripMenuItem" Me.SpracheWechselnToolStripMenuItem.Size = New System.Drawing.Size(213, 22) Me.SpracheWechselnToolStripMenuItem.Text = "Sprache wechseln" @@ -769,6 +785,12 @@ Partial Class frmHauptfenster Me.DeutschToolStripMenuItem.Size = New System.Drawing.Size(118, 22) Me.DeutschToolStripMenuItem.Text = "Deutsch" ' + 'EnglishToolStripMenuItem + ' + Me.EnglishToolStripMenuItem.Name = "EnglishToolStripMenuItem" + Me.EnglishToolStripMenuItem.Size = New System.Drawing.Size(118, 22) + Me.EnglishToolStripMenuItem.Text = "Englisch" + ' 'TürkischToolStripMenuItem ' Me.TürkischToolStripMenuItem.Name = "TürkischToolStripMenuItem" @@ -809,7 +831,7 @@ Partial Class frmHauptfenster ' 'FunktionenToolStripMenuItem ' - Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GenerelleGestellungenDurchsuchenToolStripMenuItem, Me.KundenVonFremdenSpeditionenToolStripMenuItem, Me.KundenverwaltungToolStripMenuItem, Me.MDMParkplatzkartenToolStripMenuItem, Me.SMSSendenToolStripMenuItem, Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem, Me.MRNBarcodedruckToolStripMenuItem, Me.ToolStripSeparator12, Me.ToolStripMenuItem3, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.BürgschaftenExcelToolStripMenuItem, Me.ToolStripMenuItem6, Me.ToolStripMenuItem10, Me.TICKETWaidhausToolStripMenuItem, Me.ToolStripSeparator10, Me.DAKOSYToolStripMenuItem, Me.ToolStripSeparator11, Me.SDLAbholaufträgeToolStripMenuItem, Me.ToolStripMenuItem13, Me.VorauskassenToolStripMenuItem, Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem, Me.ATGesamtsicherheitVeragAGToolStripMenuItem, Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem, Me.ATGesamtsicherheitVeragCSToolStripMenuItem, Me.EssensbestellungenToolStripMenuItem}) + Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GenerelleGestellungenDurchsuchenToolStripMenuItem, Me.KundenVonFremdenSpeditionenToolStripMenuItem, Me.KundenverwaltungToolStripMenuItem, Me.MDMParkplatzkartenToolStripMenuItem, Me.SMSSendenToolStripMenuItem, Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem, Me.MRNBarcodedruckToolStripMenuItem, Me.ToolStripSeparator12, Me.tool_BRGXLS, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.BürgschaftenExcelToolStripMenuItem, Me.ToolStripMenuItem6, Me.ToolStripMenuItem10, Me.TICKETWaidhausToolStripMenuItem, Me.ToolStripSeparator10, Me.DAKOSYToolStripMenuItem, Me.ToolStripSeparator11, Me.SDLAbholaufträgeToolStripMenuItem, Me.ToolStripMenuItem13, Me.VorauskassenToolStripMenuItem, Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem, Me.ATGesamtsicherheitVeragAGToolStripMenuItem, Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem, Me.ATGesamtsicherheitVeragCSToolStripMenuItem, Me.EssensbestellungenToolStripMenuItem}) Me.FunktionenToolStripMenuItem.Name = "FunktionenToolStripMenuItem" Me.FunktionenToolStripMenuItem.Size = New System.Drawing.Size(79, 20) Me.FunktionenToolStripMenuItem.Text = "Funktionen" @@ -875,11 +897,11 @@ Partial Class frmHauptfenster Me.ToolStripSeparator12.Name = "ToolStripSeparator12" Me.ToolStripSeparator12.Size = New System.Drawing.Size(380, 6) ' - 'ToolStripMenuItem3 + 'tool_BRGXLS ' - Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3" - Me.ToolStripMenuItem3.Size = New System.Drawing.Size(383, 22) - Me.ToolStripMenuItem3.Text = "Bürgschaften Excel" + Me.tool_BRGXLS.Name = "tool_BRGXLS" + Me.tool_BRGXLS.Size = New System.Drawing.Size(383, 22) + Me.tool_BRGXLS.Text = "Bürgschaften Excel" ' 'ToolStripMenuItem4 ' @@ -1262,81 +1284,81 @@ Partial Class frmHauptfenster ' Me.GVMSToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 Me.GVMSToolStripMenuItem.Name = "GVMSToolStripMenuItem" - Me.GVMSToolStripMenuItem.Size = New System.Drawing.Size(248, 22) + Me.GVMSToolStripMenuItem.Size = New System.Drawing.Size(256, 30) Me.GVMSToolStripMenuItem.Text = "GVMS" ' 'GVMSUKIMportToolStripMenuItem ' Me.GVMSUKIMportToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 Me.GVMSUKIMportToolStripMenuItem.Name = "GVMSUKIMportToolStripMenuItem" - Me.GVMSUKIMportToolStripMenuItem.Size = New System.Drawing.Size(248, 22) + Me.GVMSUKIMportToolStripMenuItem.Size = New System.Drawing.Size(256, 30) Me.GVMSUKIMportToolStripMenuItem.Text = "GVMS (UK Import)" ' 'GVMSBeschreibungToolStripMenuItem ' Me.GVMSBeschreibungToolStripMenuItem.Enabled = False Me.GVMSBeschreibungToolStripMenuItem.Name = "GVMSBeschreibungToolStripMenuItem" - Me.GVMSBeschreibungToolStripMenuItem.Size = New System.Drawing.Size(248, 22) + Me.GVMSBeschreibungToolStripMenuItem.Size = New System.Drawing.Size(256, 30) Me.GVMSBeschreibungToolStripMenuItem.Text = "GVMS Beschreibung" ' 'ToolStripSeparator14 ' Me.ToolStripSeparator14.Name = "ToolStripSeparator14" - Me.ToolStripSeparator14.Size = New System.Drawing.Size(245, 6) + Me.ToolStripSeparator14.Size = New System.Drawing.Size(253, 6) ' 'TicketIBFInlandBorderFacilitiesToolStripMenuItem ' Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem.Name = "TicketIBFInlandBorderFacilitiesToolStripMenuItem" - Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem.Size = New System.Drawing.Size(248, 22) + Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem.Size = New System.Drawing.Size(256, 30) Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem.Text = "Ticket IBF (InlandBorderFacilities)" ' 'TicketIBFBeschreibungToolStripMenuItem ' Me.TicketIBFBeschreibungToolStripMenuItem.Name = "TicketIBFBeschreibungToolStripMenuItem" - Me.TicketIBFBeschreibungToolStripMenuItem.Size = New System.Drawing.Size(248, 22) + Me.TicketIBFBeschreibungToolStripMenuItem.Size = New System.Drawing.Size(256, 30) Me.TicketIBFBeschreibungToolStripMenuItem.Text = "Ticket IBF Beschreibung" ' 'IBFStatusToolStripMenuItem ' Me.IBFStatusToolStripMenuItem.Name = "IBFStatusToolStripMenuItem" - Me.IBFStatusToolStripMenuItem.Size = New System.Drawing.Size(248, 22) + Me.IBFStatusToolStripMenuItem.Size = New System.Drawing.Size(256, 30) Me.IBFStatusToolStripMenuItem.Text = "IBF Status" ' 'ToolStripSeparator15 ' Me.ToolStripSeparator15.Name = "ToolStripSeparator15" - Me.ToolStripSeparator15.Size = New System.Drawing.Size(245, 6) + Me.ToolStripSeparator15.Size = New System.Drawing.Size(253, 6) ' 'FREnveloppeSmartBorderToolStripMenuItem ' Me.FREnveloppeSmartBorderToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 Me.FREnveloppeSmartBorderToolStripMenuItem.Name = "FREnveloppeSmartBorderToolStripMenuItem" - Me.FREnveloppeSmartBorderToolStripMenuItem.Size = New System.Drawing.Size(248, 22) + Me.FREnveloppeSmartBorderToolStripMenuItem.Size = New System.Drawing.Size(256, 30) Me.FREnveloppeSmartBorderToolStripMenuItem.Text = "FR: Enveloppe (SmartBorder)" ' 'ToolStripSeparator16 ' Me.ToolStripSeparator16.Name = "ToolStripSeparator16" - Me.ToolStripSeparator16.Size = New System.Drawing.Size(245, 6) + Me.ToolStripSeparator16.Size = New System.Drawing.Size(253, 6) ' 'PBNIrelandFähreToolStripMenuItem ' Me.PBNIrelandFähreToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 Me.PBNIrelandFähreToolStripMenuItem.Name = "PBNIrelandFähreToolStripMenuItem" - Me.PBNIrelandFähreToolStripMenuItem.Size = New System.Drawing.Size(248, 22) + Me.PBNIrelandFähreToolStripMenuItem.Size = New System.Drawing.Size(256, 30) Me.PBNIrelandFähreToolStripMenuItem.Text = "PBN (Ireland Fähre)" ' 'ToolStripSeparator20 ' Me.ToolStripSeparator20.Name = "ToolStripSeparator20" - Me.ToolStripSeparator20.Size = New System.Drawing.Size(245, 6) + Me.ToolStripSeparator20.Size = New System.Drawing.Size(253, 6) ' 'WARENORTToolStripMenuItem ' Me.WARENORTToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ATFormularZa282ToolStripMenuItem, Me.ATInfoToolStripMenuItem, Me.ToolStripSeparator17, Me.DEFormular0442ToolStripMenuItem, Me.DEInfoToolStripMenuItem}) Me.WARENORTToolStripMenuItem.Name = "WARENORTToolStripMenuItem" - Me.WARENORTToolStripMenuItem.Size = New System.Drawing.Size(248, 22) + Me.WARENORTToolStripMenuItem.Size = New System.Drawing.Size(256, 30) Me.WARENORTToolStripMenuItem.Text = "REX" ' 'ATFormularZa282ToolStripMenuItem @@ -1372,7 +1394,7 @@ Partial Class frmHauptfenster ' Me.ToolStripMenuItem14.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem16, Me.ToolStripSeparator19}) Me.ToolStripMenuItem14.Name = "ToolStripMenuItem14" - Me.ToolStripMenuItem14.Size = New System.Drawing.Size(248, 22) + Me.ToolStripMenuItem14.Size = New System.Drawing.Size(256, 30) Me.ToolStripMenuItem14.Text = "WARENORT" ' 'ToolStripMenuItem16 @@ -1389,20 +1411,20 @@ Partial Class frmHauptfenster 'ToolStripSeparator18 ' Me.ToolStripSeparator18.Name = "ToolStripSeparator18" - Me.ToolStripSeparator18.Size = New System.Drawing.Size(245, 6) + Me.ToolStripSeparator18.Size = New System.Drawing.Size(253, 6) ' 'EORIUKGeneriertenToolStripMenuItem ' Me.EORIUKGeneriertenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.fragezeichen1 Me.EORIUKGeneriertenToolStripMenuItem.Name = "EORIUKGeneriertenToolStripMenuItem" - Me.EORIUKGeneriertenToolStripMenuItem.Size = New System.Drawing.Size(248, 22) + Me.EORIUKGeneriertenToolStripMenuItem.Size = New System.Drawing.Size(256, 30) Me.EORIUKGeneriertenToolStripMenuItem.Text = "EORI UK generierten" ' 'KAPKentAccessPermitToolStripMenuItem ' Me.KAPKentAccessPermitToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.fragezeichen Me.KAPKentAccessPermitToolStripMenuItem.Name = "KAPKentAccessPermitToolStripMenuItem" - Me.KAPKentAccessPermitToolStripMenuItem.Size = New System.Drawing.Size(248, 22) + Me.KAPKentAccessPermitToolStripMenuItem.Size = New System.Drawing.Size(256, 30) Me.KAPKentAccessPermitToolStripMenuItem.Text = "KAP (KentAccessPermit)" ' 'mnuFragezeichen @@ -1839,20 +1861,20 @@ Partial Class frmHauptfenster Me.Button7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button7.UseVisualStyleBackColor = True ' - 'Button1 + 'btnZollwebseiten ' - Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button1.ForeColor = System.Drawing.Color.Black - Me.Button1.Image = CType(resources.GetObject("Button1.Image"), System.Drawing.Image) - Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button1.Location = New System.Drawing.Point(5, 57) - Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(121, 33) - Me.Button1.TabIndex = 0 - Me.Button1.TabStop = False - Me.Button1.Text = "Zoll-Webseiten" - Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button1.UseVisualStyleBackColor = True + Me.btnZollwebseiten.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnZollwebseiten.ForeColor = System.Drawing.Color.Black + Me.btnZollwebseiten.Image = CType(resources.GetObject("btnZollwebseiten.Image"), System.Drawing.Image) + Me.btnZollwebseiten.ImageAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnZollwebseiten.Location = New System.Drawing.Point(5, 57) + Me.btnZollwebseiten.Name = "btnZollwebseiten" + Me.btnZollwebseiten.Size = New System.Drawing.Size(121, 33) + Me.btnZollwebseiten.TabIndex = 0 + Me.btnZollwebseiten.TabStop = False + Me.btnZollwebseiten.Text = "Zoll-Webseiten" + Me.btnZollwebseiten.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnZollwebseiten.UseVisualStyleBackColor = True ' 'lblDauer ' @@ -2073,7 +2095,7 @@ Partial Class frmHauptfenster Me.Panel2.Controls.Add(Me.Label7) Me.Panel2.Controls.Add(Me.lblErrVermerk) Me.Panel2.Controls.Add(Me.Button7) - Me.Panel2.Controls.Add(Me.Button1) + Me.Panel2.Controls.Add(Me.btnZollwebseiten) Me.Panel2.Controls.Add(Me.lblHinweis) Me.Panel2.Dock = System.Windows.Forms.DockStyle.Top Me.Panel2.Location = New System.Drawing.Point(0, 0) @@ -2160,7 +2182,7 @@ Partial Class frmHauptfenster ' Me.pic.BackgroundImage = Global.AVISO.My.Resources.Resources.disconnect Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.pic.Location = New System.Drawing.Point(170, 117) + Me.pic.Location = New System.Drawing.Point(69, 117) Me.pic.Name = "pic" Me.pic.Size = New System.Drawing.Size(59, 50) Me.pic.TabIndex = 5 @@ -2279,6 +2301,50 @@ Partial Class frmHauptfenster Me.Button10.Text = "<" Me.Button10.UseVisualStyleBackColor = False ' + 'gridMyAviso + ' + Me.gridMyAviso.AKTUALISIERUNGS_INTERVALL = -1 + Me.gridMyAviso.AllowUserToAddRows = False + Me.gridMyAviso.AllowUserToDeleteRows = False + Me.gridMyAviso.AllowUserToOrderColumns = True + Me.gridMyAviso.AllowUserToResizeRows = False + DataGridViewCellStyle10.BackColor = System.Drawing.Color.Azure + Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10 + Me.gridMyAviso.BackgroundColor = System.Drawing.Color.White + DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle11 + Me.gridMyAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle12 + Me.gridMyAviso.Dock = System.Windows.Forms.DockStyle.Fill + Me.gridMyAviso.Location = New System.Drawing.Point(0, 21) + Me.gridMyAviso.Name = "gridMyAviso" + Me.gridMyAviso.ReadOnly = True + DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle13 + Me.gridMyAviso.RowHeadersVisible = False + Me.gridMyAviso.RowHeadersWidth = 62 + Me.gridMyAviso.Size = New System.Drawing.Size(488, 279) + Me.gridMyAviso.TabIndex = 0 + ' 'Panel6 ' Me.Panel6.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) @@ -2320,6 +2386,23 @@ Partial Class frmHauptfenster Me.lblMeineAviso.TabIndex = 0 Me.lblMeineAviso.Text = "Meine Sendungen:" ' + 'cboMy_Grenzstelle + ' + Me.cboMy_Grenzstelle._allowedValuesFreiText = Nothing + Me.cboMy_Grenzstelle._allowFreiText = False + Me.cboMy_Grenzstelle._value = "" + Me.cboMy_Grenzstelle.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.cboMy_Grenzstelle.BackColor = System.Drawing.Color.WhiteSmoke + Me.cboMy_Grenzstelle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboMy_Grenzstelle.DropDownWidth = 120 + Me.cboMy_Grenzstelle.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.cboMy_Grenzstelle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.cboMy_Grenzstelle.FormattingEnabled = True + Me.cboMy_Grenzstelle.Location = New System.Drawing.Point(113, 1) + Me.cboMy_Grenzstelle.Name = "cboMy_Grenzstelle" + Me.cboMy_Grenzstelle.Size = New System.Drawing.Size(64, 21) + Me.cboMy_Grenzstelle.TabIndex = 26 + ' 'lblMySnd_Grenzstelle ' Me.lblMySnd_Grenzstelle.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -2371,6 +2454,22 @@ Partial Class frmHauptfenster Me.cboMy_VB.ThreeState = True Me.cboMy_VB.UseVisualStyleBackColor = True ' + 'cboMyAvisoAnzeige + ' + Me.cboMyAvisoAnzeige._allowedValuesFreiText = Nothing + Me.cboMyAvisoAnzeige._allowFreiText = False + Me.cboMyAvisoAnzeige._value = "" + Me.cboMyAvisoAnzeige.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.cboMyAvisoAnzeige.BackColor = System.Drawing.Color.WhiteSmoke + Me.cboMyAvisoAnzeige.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboMyAvisoAnzeige.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.cboMyAvisoAnzeige.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.cboMyAvisoAnzeige.FormattingEnabled = True + Me.cboMyAvisoAnzeige.Location = New System.Drawing.Point(232, 1) + Me.cboMyAvisoAnzeige.Name = "cboMyAvisoAnzeige" + Me.cboMyAvisoAnzeige.Size = New System.Drawing.Size(127, 21) + Me.cboMyAvisoAnzeige.TabIndex = 21 + ' 'lblMySND_Anzeige ' Me.lblMySND_Anzeige.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -2541,6 +2640,8 @@ Partial Class frmHauptfenster Me.tbcntrAviso.Controls.Add(Me.tabVorbereitet) Me.tbcntrAviso.Controls.Add(Me.tabVorgeschrieben) Me.tbcntrAviso.Controls.Add(Me.tabAnkunft) + Me.tbcntrAviso.Controls.Add(Me.tabVERIMEX) + Me.tbcntrAviso.Controls.Add(Me.tabINDONESIEN) Me.tbcntrAviso.Controls.Add(Me.tabFreigegeben) Me.tbcntrAviso.Controls.Add(Me.tabNichtEingetroffen) Me.tbcntrAviso.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -2553,6 +2654,24 @@ Partial Class frmHauptfenster Me.tbcntrAviso.Size = New System.Drawing.Size(393, 32) Me.tbcntrAviso.TabIndex = 10 ' + 'tabVERIMEX + ' + Me.tabVERIMEX.Location = New System.Drawing.Point(4, 34) + Me.tabVERIMEX.Name = "tabVERIMEX" + Me.tabVERIMEX.Size = New System.Drawing.Size(385, 0) + Me.tabVERIMEX.TabIndex = 7 + Me.tabVERIMEX.Text = "VERIMEX" + Me.tabVERIMEX.UseVisualStyleBackColor = True + ' + 'tabINDONESIEN + ' + Me.tabINDONESIEN.Location = New System.Drawing.Point(4, 34) + Me.tabINDONESIEN.Name = "tabINDONESIEN" + Me.tabINDONESIEN.Size = New System.Drawing.Size(385, 0) + Me.tabINDONESIEN.TabIndex = 8 + Me.tabINDONESIEN.Text = "INDONESIEN" + Me.tabINDONESIEN.UseVisualStyleBackColor = True + ' 'SplitContainer1 ' Me.SplitContainer1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle @@ -2612,6 +2731,60 @@ Partial Class frmHauptfenster Me.splitMain.SplitterDistance = 288 Me.splitMain.TabIndex = 0 ' + 'gridAviso + ' + Me.gridAviso.AKTUALISIERUNGS_INTERVALL = -1 + Me.gridAviso.AllowUserToAddRows = False + Me.gridAviso.AllowUserToDeleteRows = False + Me.gridAviso.AllowUserToResizeRows = False + DataGridViewCellStyle14.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14 + Me.gridAviso.BackgroundColor = System.Drawing.Color.DarkGray + Me.gridAviso.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable + DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle15.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle15.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle15 + Me.gridAviso.ColumnHeadersHeight = 25 + Me.gridAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing + DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle16 + Me.gridAviso.Dock = System.Windows.Forms.DockStyle.Fill + Me.gridAviso.Location = New System.Drawing.Point(0, 220) + Me.gridAviso.MultiSelect = False + Me.gridAviso.Name = "gridAviso" + Me.gridAviso.ReadOnly = True + DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle17 + Me.gridAviso.RowHeadersVisible = False + Me.gridAviso.RowHeadersWidth = 62 + Me.gridAviso.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing + DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle18 + Me.gridAviso.RowTemplate.ReadOnly = True + Me.gridAviso.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.gridAviso.Size = New System.Drawing.Size(815, 68) + Me.gridAviso.TabIndex = 1 + Me.gridAviso.TabStop = False + ' 'Panel1 ' Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) @@ -2645,6 +2818,32 @@ Partial Class frmHauptfenster Me.Panel1.Size = New System.Drawing.Size(815, 220) Me.Panel1.TabIndex = 2 ' + 'txtBestimmungszollstelle + ' + Me.txtBestimmungszollstelle._allowFreitext = False + Me.txtBestimmungszollstelle._AllowSetValue = False + Me.txtBestimmungszollstelle._allowSpaceAsSplitter = False + Me.txtBestimmungszollstelle._autoSizeGross = False + Me.txtBestimmungszollstelle._hideIfListEmpty = True + Me.txtBestimmungszollstelle._value = Nothing + Me.txtBestimmungszollstelle.conn_art = "FMZOLL" + Me.txtBestimmungszollstelle.dgvpos = "LEFT" + Me.txtBestimmungszollstelle.DISPLAY_PARAM = Nothing + Me.txtBestimmungszollstelle.INVISIBLE_COLUMNS = Nothing + Me.txtBestimmungszollstelle.key_visible = False + Me.txtBestimmungszollstelle.KEYPARAM = Nothing + Me.txtBestimmungszollstelle.Location = New System.Drawing.Point(379, 55) + Me.txtBestimmungszollstelle.MaxLength = 50 + Me.txtBestimmungszollstelle.Name = "txtBestimmungszollstelle" + Me.txtBestimmungszollstelle.searchActive = True + Me.txtBestimmungszollstelle.Size = New System.Drawing.Size(211, 20) + Me.txtBestimmungszollstelle.SQL_ORDER_BY = Nothing + Me.txtBestimmungszollstelle.SQL_SELECT = Nothing + Me.txtBestimmungszollstelle.SQL_WHERE = Nothing + Me.txtBestimmungszollstelle.SQL_WhereParamList = Nothing + Me.txtBestimmungszollstelle.TabIndex = 25 + Me.txtBestimmungszollstelle.usrcntl = Nothing + ' 'Label10 ' Me.Label10.AutoSize = True @@ -2655,6 +2854,22 @@ Partial Class frmHauptfenster Me.Label10.TabIndex = 26 Me.Label10.Text = "Zollamt:" ' + 'cboImEx + ' + Me.cboImEx._allowedValuesFreiText = Nothing + Me.cboImEx._allowFreiText = False + Me.cboImEx._value = "" + Me.cboImEx.BackColor = System.Drawing.Color.WhiteSmoke + Me.cboImEx.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboImEx.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.cboImEx.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cboImEx.FormattingEnabled = True + Me.cboImEx.Items.AddRange(New Object() {"ALLE", "SUB", "SBG", "WAI", "NKD"}) + Me.cboImEx.Location = New System.Drawing.Point(828, 3) + Me.cboImEx.Name = "cboImEx" + Me.cboImEx.Size = New System.Drawing.Size(78, 24) + Me.cboImEx.TabIndex = 24 + ' 'Label21 ' Me.Label21.AutoSize = True @@ -2678,6 +2893,22 @@ Partial Class frmHauptfenster Me.cbxCluster.Text = "Firmenverbund" Me.cbxCluster.UseVisualStyleBackColor = True ' + 'cboTeams + ' + Me.cboTeams._allowedValuesFreiText = Nothing + Me.cboTeams._allowFreiText = False + Me.cboTeams._value = "" + Me.cboTeams.BackColor = System.Drawing.Color.WhiteSmoke + Me.cboTeams.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboTeams.DropDownWidth = 200 + Me.cboTeams.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.cboTeams.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cboTeams.FormattingEnabled = True + Me.cboTeams.Location = New System.Drawing.Point(379, 3) + Me.cboTeams.Name = "cboTeams" + Me.cboTeams.Size = New System.Drawing.Size(107, 24) + Me.cboTeams.TabIndex = 19 + ' 'lblErweitereSuche ' Me.lblErweitereSuche.AutoSize = True @@ -2723,6 +2954,23 @@ Partial Class frmHauptfenster Me.lblEintraege.Text = "0 Einträge" Me.lblEintraege.TextAlign = System.Drawing.ContentAlignment.TopRight ' + 'cboGrenzstelle + ' + Me.cboGrenzstelle._allowedValuesFreiText = Nothing + Me.cboGrenzstelle._allowFreiText = False + Me.cboGrenzstelle._value = "" + Me.cboGrenzstelle.BackColor = System.Drawing.Color.WhiteSmoke + Me.cboGrenzstelle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboGrenzstelle.DropDownWidth = 200 + Me.cboGrenzstelle.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.cboGrenzstelle.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cboGrenzstelle.FormattingEnabled = True + Me.cboGrenzstelle.Items.AddRange(New Object() {"ALLE", "SUB", "SBG", "WAI", "NKD", "NEU", "AMB", "???"}) + Me.cboGrenzstelle.Location = New System.Drawing.Point(379, 30) + Me.cboGrenzstelle.Name = "cboGrenzstelle" + Me.cboGrenzstelle.Size = New System.Drawing.Size(107, 24) + Me.cboGrenzstelle.TabIndex = 13 + ' 'Label4 ' Me.Label4.AutoSize = True @@ -2750,6 +2998,22 @@ Partial Class frmHauptfenster Me.pnlTime.Size = New System.Drawing.Size(437, 57) Me.pnlTime.TabIndex = 12 ' + 'MyComboBox1 + ' + Me.MyComboBox1._allowedValuesFreiText = Nothing + Me.MyComboBox1._allowFreiText = False + Me.MyComboBox1._value = "" + Me.MyComboBox1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.MyComboBox1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.MyComboBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.MyComboBox1.ForeColor = System.Drawing.Color.White + Me.MyComboBox1.FormattingEnabled = True + Me.MyComboBox1.Location = New System.Drawing.Point(46, 1) + Me.MyComboBox1.MaxLength = 4 + Me.MyComboBox1.Name = "MyComboBox1" + Me.MyComboBox1.Size = New System.Drawing.Size(98, 21) + Me.MyComboBox1.TabIndex = 7 + ' 'pnlSearch ' Me.pnlSearch.Controls.Add(Me.txtDyRef) @@ -2957,6 +3221,20 @@ Partial Class frmHauptfenster Me.txtEmpfänger.Size = New System.Drawing.Size(236, 23) Me.txtEmpfänger.TabIndex = 5 ' + 'cboFiliale + ' + Me.cboFiliale._allowedValuesFreiText = Nothing + Me.cboFiliale._allowFreiText = False + Me.cboFiliale._value = "" + Me.cboFiliale.DropDownWidth = 300 + Me.cboFiliale.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cboFiliale.FormattingEnabled = True + Me.cboFiliale.Location = New System.Drawing.Point(389, 13) + Me.cboFiliale.MaxLength = 4 + Me.cboFiliale.Name = "cboFiliale" + Me.cboFiliale.Size = New System.Drawing.Size(70, 24) + Me.cboFiliale.TabIndex = 3 + ' 'txtAbfertigungsnummer ' Me.txtAbfertigungsnummer.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -3227,165 +3505,6 @@ Partial Class frmHauptfenster Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28) Me.UsrCntlTestsystem1.TabIndex = 8 ' - 'gridAviso - ' - Me.gridAviso.AKTUALISIERUNGS_INTERVALL = -1 - Me.gridAviso.AllowUserToAddRows = False - Me.gridAviso.AllowUserToDeleteRows = False - Me.gridAviso.AllowUserToResizeRows = False - DataGridViewCellStyle14.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14 - Me.gridAviso.BackgroundColor = System.Drawing.Color.DarkGray - Me.gridAviso.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable - DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle15.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle15.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle15 - Me.gridAviso.ColumnHeadersHeight = 25 - Me.gridAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle16 - Me.gridAviso.Dock = System.Windows.Forms.DockStyle.Fill - Me.gridAviso.Location = New System.Drawing.Point(0, 220) - Me.gridAviso.MultiSelect = False - Me.gridAviso.Name = "gridAviso" - Me.gridAviso.ReadOnly = True - DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle17 - Me.gridAviso.RowHeadersVisible = False - Me.gridAviso.RowHeadersWidth = 62 - Me.gridAviso.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle18 - Me.gridAviso.RowTemplate.ReadOnly = True - Me.gridAviso.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.gridAviso.Size = New System.Drawing.Size(815, 68) - Me.gridAviso.TabIndex = 1 - Me.gridAviso.TabStop = False - ' - 'txtBestimmungszollstelle - ' - Me.txtBestimmungszollstelle._allowFreitext = False - Me.txtBestimmungszollstelle._AllowSetValue = False - Me.txtBestimmungszollstelle._allowSpaceAsSplitter = False - Me.txtBestimmungszollstelle._autoSizeGross = False - Me.txtBestimmungszollstelle._hideIfListEmpty = True - Me.txtBestimmungszollstelle._value = Nothing - Me.txtBestimmungszollstelle.conn_art = "FMZOLL" - Me.txtBestimmungszollstelle.dgvpos = "LEFT" - Me.txtBestimmungszollstelle.DISPLAY_PARAM = Nothing - Me.txtBestimmungszollstelle.INVISIBLE_COLUMNS = Nothing - Me.txtBestimmungszollstelle.key_visible = False - Me.txtBestimmungszollstelle.KEYPARAM = Nothing - Me.txtBestimmungszollstelle.Location = New System.Drawing.Point(379, 55) - Me.txtBestimmungszollstelle.MaxLength = 50 - Me.txtBestimmungszollstelle.Name = "txtBestimmungszollstelle" - Me.txtBestimmungszollstelle.searchActive = True - Me.txtBestimmungszollstelle.Size = New System.Drawing.Size(211, 20) - Me.txtBestimmungszollstelle.SQL_ORDER_BY = Nothing - Me.txtBestimmungszollstelle.SQL_SELECT = Nothing - Me.txtBestimmungszollstelle.SQL_WHERE = Nothing - Me.txtBestimmungszollstelle.SQL_WhereParamList = Nothing - Me.txtBestimmungszollstelle.TabIndex = 25 - Me.txtBestimmungszollstelle.usrcntl = Nothing - ' - 'cboImEx - ' - Me.cboImEx._allowedValuesFreiText = Nothing - Me.cboImEx._allowFreiText = False - Me.cboImEx._value = "" - Me.cboImEx.BackColor = System.Drawing.Color.WhiteSmoke - Me.cboImEx.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboImEx.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.cboImEx.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cboImEx.FormattingEnabled = True - Me.cboImEx.Items.AddRange(New Object() {"ALLE", "SUB", "SBG", "WAI", "NKD"}) - Me.cboImEx.Location = New System.Drawing.Point(828, 3) - Me.cboImEx.Name = "cboImEx" - Me.cboImEx.Size = New System.Drawing.Size(78, 24) - Me.cboImEx.TabIndex = 24 - ' - 'cboTeams - ' - Me.cboTeams._allowedValuesFreiText = Nothing - Me.cboTeams._allowFreiText = False - Me.cboTeams._value = "" - Me.cboTeams.BackColor = System.Drawing.Color.WhiteSmoke - Me.cboTeams.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboTeams.DropDownWidth = 200 - Me.cboTeams.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.cboTeams.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cboTeams.FormattingEnabled = True - Me.cboTeams.Location = New System.Drawing.Point(379, 3) - Me.cboTeams.Name = "cboTeams" - Me.cboTeams.Size = New System.Drawing.Size(107, 24) - Me.cboTeams.TabIndex = 19 - ' - 'cboGrenzstelle - ' - Me.cboGrenzstelle._allowedValuesFreiText = Nothing - Me.cboGrenzstelle._allowFreiText = False - Me.cboGrenzstelle._value = "" - Me.cboGrenzstelle.BackColor = System.Drawing.Color.WhiteSmoke - Me.cboGrenzstelle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboGrenzstelle.DropDownWidth = 200 - Me.cboGrenzstelle.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.cboGrenzstelle.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cboGrenzstelle.FormattingEnabled = True - Me.cboGrenzstelle.Items.AddRange(New Object() {"ALLE", "SUB", "SBG", "WAI", "NKD", "NEU", "AMB", "???"}) - Me.cboGrenzstelle.Location = New System.Drawing.Point(379, 30) - Me.cboGrenzstelle.Name = "cboGrenzstelle" - Me.cboGrenzstelle.Size = New System.Drawing.Size(107, 24) - Me.cboGrenzstelle.TabIndex = 13 - ' - 'MyComboBox1 - ' - Me.MyComboBox1._allowedValuesFreiText = Nothing - Me.MyComboBox1._allowFreiText = False - Me.MyComboBox1._value = "" - Me.MyComboBox1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.MyComboBox1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.MyComboBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.MyComboBox1.ForeColor = System.Drawing.Color.White - Me.MyComboBox1.FormattingEnabled = True - Me.MyComboBox1.Location = New System.Drawing.Point(46, 1) - Me.MyComboBox1.MaxLength = 4 - Me.MyComboBox1.Name = "MyComboBox1" - Me.MyComboBox1.Size = New System.Drawing.Size(98, 21) - Me.MyComboBox1.TabIndex = 7 - ' - 'cboFiliale - ' - Me.cboFiliale._allowedValuesFreiText = Nothing - Me.cboFiliale._allowFreiText = False - Me.cboFiliale._value = "" - Me.cboFiliale.DropDownWidth = 300 - Me.cboFiliale.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cboFiliale.FormattingEnabled = True - Me.cboFiliale.Location = New System.Drawing.Point(389, 13) - Me.cboFiliale.MaxLength = 4 - Me.cboFiliale.Name = "cboFiliale" - Me.cboFiliale.Size = New System.Drawing.Size(70, 24) - Me.cboFiliale.TabIndex = 3 - ' 'UsrCntlBenachrichtigungen1 ' Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill @@ -3395,83 +3514,6 @@ Partial Class frmHauptfenster Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(158, 300) Me.UsrCntlBenachrichtigungen1.TabIndex = 0 ' - 'gridMyAviso - ' - Me.gridMyAviso.AKTUALISIERUNGS_INTERVALL = -1 - Me.gridMyAviso.AllowUserToAddRows = False - Me.gridMyAviso.AllowUserToDeleteRows = False - Me.gridMyAviso.AllowUserToOrderColumns = True - Me.gridMyAviso.AllowUserToResizeRows = False - DataGridViewCellStyle10.BackColor = System.Drawing.Color.Azure - Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10 - Me.gridMyAviso.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle11 - Me.gridMyAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle12 - Me.gridMyAviso.Dock = System.Windows.Forms.DockStyle.Fill - Me.gridMyAviso.Location = New System.Drawing.Point(0, 21) - Me.gridMyAviso.Name = "gridMyAviso" - Me.gridMyAviso.ReadOnly = True - DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle13 - Me.gridMyAviso.RowHeadersVisible = False - Me.gridMyAviso.RowHeadersWidth = 62 - Me.gridMyAviso.Size = New System.Drawing.Size(488, 279) - Me.gridMyAviso.TabIndex = 0 - ' - 'cboMy_Grenzstelle - ' - Me.cboMy_Grenzstelle._allowedValuesFreiText = Nothing - Me.cboMy_Grenzstelle._allowFreiText = False - Me.cboMy_Grenzstelle._value = "" - Me.cboMy_Grenzstelle.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.cboMy_Grenzstelle.BackColor = System.Drawing.Color.WhiteSmoke - Me.cboMy_Grenzstelle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboMy_Grenzstelle.DropDownWidth = 120 - Me.cboMy_Grenzstelle.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.cboMy_Grenzstelle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.cboMy_Grenzstelle.FormattingEnabled = True - Me.cboMy_Grenzstelle.Location = New System.Drawing.Point(113, 1) - Me.cboMy_Grenzstelle.Name = "cboMy_Grenzstelle" - Me.cboMy_Grenzstelle.Size = New System.Drawing.Size(64, 21) - Me.cboMy_Grenzstelle.TabIndex = 26 - ' - 'cboMyAvisoAnzeige - ' - Me.cboMyAvisoAnzeige._allowedValuesFreiText = Nothing - Me.cboMyAvisoAnzeige._allowFreiText = False - Me.cboMyAvisoAnzeige._value = "" - Me.cboMyAvisoAnzeige.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.cboMyAvisoAnzeige.BackColor = System.Drawing.Color.WhiteSmoke - Me.cboMyAvisoAnzeige.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboMyAvisoAnzeige.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.cboMyAvisoAnzeige.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.cboMyAvisoAnzeige.FormattingEnabled = True - Me.cboMyAvisoAnzeige.Location = New System.Drawing.Point(232, 1) - Me.cboMyAvisoAnzeige.Name = "cboMyAvisoAnzeige" - Me.cboMyAvisoAnzeige.Size = New System.Drawing.Size(127, 21) - Me.cboMyAvisoAnzeige.TabIndex = 21 - ' 'frmHauptfenster ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -3515,6 +3557,7 @@ Partial Class frmHauptfenster CType(Me.SplitContainer3, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainer3.ResumeLayout(False) Me.pnl.ResumeLayout(False) + CType(Me.gridMyAviso, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel6.ResumeLayout(False) Me.Panel6.PerformLayout() Me.tbcntrAviso.ResumeLayout(False) @@ -3529,6 +3572,7 @@ Partial Class frmHauptfenster Me.splitMain.Panel2.ResumeLayout(False) CType(Me.splitMain, System.ComponentModel.ISupportInitialize).EndInit() Me.splitMain.ResumeLayout(False) + CType(Me.gridAviso, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() Me.pnlTime.ResumeLayout(False) @@ -3538,8 +3582,6 @@ Partial Class frmHauptfenster Me.pnlOptionen.ResumeLayout(False) Me.cntxt.ResumeLayout(False) Me.ctxtFarben.ResumeLayout(False) - CType(Me.gridAviso, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.gridMyAviso, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -3584,7 +3626,7 @@ Partial Class frmHauptfenster Friend WithEvents txtSuche As System.Windows.Forms.TextBox Friend WithEvents Top As System.Windows.Forms.Panel Friend WithEvents btnRefresh As System.Windows.Forms.Button - Friend WithEvents Button1 As System.Windows.Forms.Button + Friend WithEvents btnZollwebseiten As System.Windows.Forms.Button Friend WithEvents btnKunden As System.Windows.Forms.Button Friend WithEvents btnSpedBuch As System.Windows.Forms.Button Friend WithEvents lblDauer As System.Windows.Forms.Label @@ -3741,7 +3783,7 @@ Partial Class frmHauptfenster Friend WithEvents EUTaricToolStripMenuItem As ToolStripMenuItem Friend WithEvents BürgschaftenExcelToolStripMenuItem As ToolStripMenuItem Friend WithEvents ToolStripSeparator12 As ToolStripSeparator - Friend WithEvents ToolStripMenuItem3 As ToolStripMenuItem + Friend WithEvents tool_BRGXLS As ToolStripMenuItem Friend WithEvents ToolStripMenuItem4 As ToolStripMenuItem Friend WithEvents ToolStripMenuItem5 As ToolStripMenuItem Friend WithEvents WAIDHAUSToolStripMenuItem As ToolStripMenuItem @@ -3806,7 +3848,7 @@ Partial Class frmHauptfenster Friend WithEvents MRNBarcodedruckToolStripMenuItem As ToolStripMenuItem Friend WithEvents SecretAvisoToolStripMenuItem As ToolStripMenuItem Friend WithEvents SpracheWechselnToolStripMenuItem As ToolStripMenuItem - Friend WithEvents DeutschToolStripMenuItem As ToolStripMenuItem + Friend WithEvents EnglishToolStripMenuItem As ToolStripMenuItem Friend WithEvents TürkischToolStripMenuItem As ToolStripMenuItem Friend WithEvents Button11 As Button Friend WithEvents BREXITToolStripMenuItem As ToolStripMenuItem @@ -3875,4 +3917,9 @@ Partial Class frmHauptfenster Friend WithEvents RoutenverwaltungToolStripMenuItem As ToolStripMenuItem Friend WithEvents StandarddruckerWechselnToolStripMenuItem As ToolStripMenuItem Friend WithEvents EssensbestellungenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents DeutschToolStripMenuItem As ToolStripMenuItem + Friend WithEvents tabVERIMEX As TabPage + Friend WithEvents tabINDONESIEN As TabPage + Friend WithEvents conAnVerimex As ToolStripMenuItem + Friend WithEvents conAnIndonesien As ToolStripMenuItem End Class diff --git a/Aviso/frmHauptfenster.resx b/Aviso/frmHauptfenster.resx index bad4092..0a40422 100644 --- a/Aviso/frmHauptfenster.resx +++ b/Aviso/frmHauptfenster.resx @@ -150,7 +150,7 @@ ISWDhLo0WMEYobZQ+AVKvQF7kkl9rIbjgwAAAABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAhBJREFUSEvt 1k1LVFEcgPE7hLYoKQva+Q2ibbve1pL0AYzIXCVIpbVJaqHSJxCswLULKXeBIFRgqwJDJTNQsY0YtdLE diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index ac60044..d88e656 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -12,6 +12,7 @@ Imports com.esendex.sdk.messaging Imports Newtonsoft.Json Imports System.Reflection Imports System.Runtime.InteropServices +Imports GrapeCity.Viewer.Common.Model 'Imports UID @@ -388,17 +389,17 @@ Public Class frmHauptfenster - If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("WARENORT", "AVISO") Then + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("WARENORT", "AVISO") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("SRI_LANKA", "AVISO") Then 'MenuStrip1.Items.Clear() - MenuStrip1.Items.Remove(FunktionenToolStripMenuItem) - MenuStrip1.Items.Remove(StatistikToolStripMenuItem) + ' MenuStrip1.Items.Remove(FunktionenToolStripMenuItem)'-->Siehe unten + MenuStrip1.Items.Remove(ToolStripFormulare) StatistikToolStripMenuItem.DropDownItems.Remove(SDLAuswertungenToolStripMenuItem1) StatistikToolStripMenuItem.DropDownItems.Remove(SDLAuswertungenToolStripMenuItem) For Each i In FunktionenToolStripMenuItem.DropDownItems - If i IsNot ToolStripMenuItem3 Then + If i.name <> "tool_BRGXLS" Then i.Visible = False End If Next @@ -416,10 +417,18 @@ Public Class frmHauptfenster ' splitMain.Panel2Collapsed = True End If + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("WARENORT", "AVISO") Then + MenuStrip1.Items.Remove(FunktionenToolStripMenuItem) + MenuStrip1.Items.Remove(StatistikToolStripMenuItem) + btnZollwebseiten.Visible = False + lblErweitereSuche.Visible = False + End If + If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("KUNDEN", "AVISO") Then btnKunden.Visible = False End If + MyComboBox1.Items.Clear() MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", UStatus_none)) MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Aviso-Eingang", UStatus_AVEingang)) @@ -694,7 +703,7 @@ Public Class frmHauptfenster For Each r As DataGridViewRow In .Rows If r.Cells("Dauer").Value Is DBNull.Value Or r.Cells("Dauer").Value = 0 Then - If CInt(r.Cells("Status").Value) = VERAG_PROG_ALLGEMEIN.cGlobal.Status_Ankunft Then + If CInt(r.Cells("Status").Value) = VERAG_PROG_ALLGEMEIN.cGlobal.Status_Ankunft Or CInt(r.Cells("Status").Value) = VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_VERIMEX Or CInt(r.Cells("Status").Value) = VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_INDONESIEN Then If Not IsDBNull(r.Cells("Ankunft").Value) AndAlso Not CDate(r.Cells("Ankunft").Value) = LeerDatum Then Dim dauerTmp = DateDiff(DateInterval.Minute, CDate(VarToDate(r.Cells("Ankunft").Value)), Now) If IsNumeric(dauerTmp) AndAlso dauerTmp > 0 Then @@ -890,6 +899,10 @@ Public Class frmHauptfenster hSQL += " AND Status = 3" ElseIf tbcntrAviso.SelectedTab Is tabFreigegeben Then 'Freigegeben hSQL += " AND Status = 1" + ElseIf tbcntrAviso.SelectedTab Is tabVERIMEX Then 'Nicht Eingetroffen + hSQL += " AND Status = " & VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_VERIMEX + ElseIf tbcntrAviso.SelectedTab Is tabINDONESIEN Then 'Nicht Eingetroffen + hSQL += " AND Status = " & VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_INDONESIEN ElseIf tbcntrAviso.SelectedTab Is tabNichtEingetroffen Then 'Nicht Eingetroffen hSQL += " AND Status = 2" End If @@ -1093,12 +1106,14 @@ Public Class frmHauptfenster '---------------------------------------------------------------------------------------------------------------------------------- sqlStr = " SELECT AvisoID, CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig], [Status],CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END as [statVorb], LKW_Nr, Dauer, Datum, AvisoEingang, Ankunft, Grenzstelle, Freigabe,LetzterMitarbeiterId AS maId, LetzterMitarbeiterId ,/* CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END as Vorbereitung,*/LetzterMitarbeiter,AvisoTVHinweis " & " FROM Aviso " & - " WHERE ( Status IN (0, 3, 4, 5) OR ( Status = 1 AND [Abgeschlossen] = 0 )) " & + " WHERE ( Status IN (0, 3, 4, 5,6,7) OR ( Status = 1 AND [Abgeschlossen] = 0 )) " & sqlStrFirma & " AND (LetzterMitarbeiterId=@maId) " If cboMy_Grenzstelle._value <> "" Then sqlStr &= " AND Grenzstelle = '" & cboMy_Grenzstelle._value & "'" sqlStr &= " ORDER BY case " & " when [Status] =3 then 0 " & + " when [Status] =6 then 0.5 " & + " when [Status] =7 then 0.5 " & " when [Status] =0 then 1 " & " when [Status] =99 then 2 " & " when [Status] =4 then 3 " & @@ -1432,12 +1447,16 @@ Public Class frmHauptfenster If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then If Not cbx_My_LKW.Checked Then Select Case r.Cells("Status").Value - Case "1", "2" + Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_NichtEingetroffen, VERAG_PROG_ALLGEMEIN.cGlobal.Status_Freigegeben '"1", "2" ' Freigabe, N.Eingetr. - Case "3" + Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_Ankunft '"3" ' Ankunft r.DefaultCellStyle.BackColor = Color.IndianRed r.Cells("DauerText").Style.ForeColor = Color.White + Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_VERIMEX, VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_INDONESIEN + ' Ankunft + r.DefaultCellStyle.BackColor = Color.SteelBlue + r.Cells("DauerText").Style.ForeColor = Color.White Case Else 'Alle anderen Status: If r.Cells("VoraussichtlichesEintreffen").Value IsNot DBNull.Value AndAlso IsDate(r.Cells("VoraussichtlichesEintreffen").Value) Then @@ -1588,6 +1607,8 @@ Public Class frmHauptfenster Case 3 : e.Value = "Ankunft" : gridMyAviso.Rows(e.RowIndex).Cells("Status").Style.Font = New Font(gridMyAviso.Font.FontFamily, gridMyAviso.Font.Size, FontStyle.Bold) 'New Font(gridMyAviso.DefaultCellStyle.Font, 8.0F) Case 4 : e.Value = "Vorbereitet" Case 5 : e.Value = "Vorgeschrieben" + Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_INDONESIEN : e.Value = "An Indonesien" + Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_VERIMEX : e.Value = "An Verimex" ' Case 99 : e.Value = "in Vorbereitung" : gridMyAviso.Rows(e.RowIndex).DefaultCellStyle.Font = New Font(gridMyAviso.Font.FontFamily, gridMyAviso.Font.Size, FontStyle.Bold) 'New Font(gridMyAviso.DefaultCellStyle.Font, 8.0F) 'gridMyAviso.Rows(e.RowIndex).DefaultCellStyle.ForeColor = Color.Brown ' gridMyAviso.Rows(e.RowIndex).Cells("Status").Style.Font = New Font(gridMyAviso.Font.FontFamily, gridMyAviso.Font.Size, FontStyle.Bold) 'New Font(gridMyAviso.DefaultCellStyle.Font, 8.0F) @@ -1630,6 +1651,8 @@ Public Class frmHauptfenster Case 3 : e.Value = "Ankunft" Case 4 : e.Value = "Vorbereitet" Case 5 : e.Value = "Vorgeschrieben" + Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_INDONESIEN : e.Value = "An Indonesien" + Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_VERIMEX : e.Value = "An Verimex" Case Else : e.Value = "unbekannt" End Select @@ -2017,7 +2040,7 @@ Public Class frmHauptfenster GridZeichnenAviso() End Sub - Private Sub btnErfasst_MouseHover(sender As Object, e As EventArgs) Handles Button1.MouseEnter, Button7.MouseEnter, Button6.MouseEnter, Button5.MouseEnter, btnSpedBuch.MouseEnter, btnRg.MouseEnter, btnRefresh.MouseEnter, btnNeu.MouseEnter, btnKunden.MouseEnter, btnKassenbuch.MouseEnter, btnDrucken.MouseEnter + Private Sub btnErfasst_MouseHover(sender As Object, e As EventArgs) Handles btnZollwebseiten.MouseEnter, Button7.MouseEnter, Button6.MouseEnter, Button5.MouseEnter, btnSpedBuch.MouseEnter, btnRg.MouseEnter, btnRefresh.MouseEnter, btnNeu.MouseEnter, btnKunden.MouseEnter, btnKassenbuch.MouseEnter, btnDrucken.MouseEnter Try Dim cF As Color = DirectCast(sender, Button).ForeColor Dim cB As Color = DirectCast(sender, Button).BackColor @@ -2028,7 +2051,7 @@ Public Class frmHauptfenster End Try End Sub - Private Sub btnErfasst_MouseLeave(sender As Object, e As EventArgs) Handles Button1.MouseLeave, Button7.MouseLeave, Button6.MouseLeave, Button5.MouseLeave, btnSpedBuch.MouseLeave, btnRg.MouseLeave, btnRefresh.MouseLeave, btnNeu.MouseLeave, btnKunden.MouseLeave, btnKassenbuch.MouseLeave, btnDrucken.MouseLeave + Private Sub btnErfasst_MouseLeave(sender As Object, e As EventArgs) Handles btnZollwebseiten.MouseLeave, Button7.MouseLeave, Button6.MouseLeave, Button5.MouseLeave, btnSpedBuch.MouseLeave, btnRg.MouseLeave, btnRefresh.MouseLeave, btnNeu.MouseLeave, btnKunden.MouseLeave, btnKassenbuch.MouseLeave, btnDrucken.MouseLeave Try Dim cF As Color = DirectCast(sender, Button).ForeColor Dim cB As Color = DirectCast(sender, Button).BackColor @@ -2042,6 +2065,10 @@ Public Class frmHauptfenster Private Sub gridAviso_DoubleClick(sender As Object, e As System.EventArgs) Handles gridAviso.DoubleClick + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("WARENORT", "AVISO") Then + Exit Sub + End If + If gridAviso.SelectedRows.Count = 0 Then Exit Sub Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm() @@ -2435,7 +2462,7 @@ Public Class frmHauptfenster End Sub - Private Sub conMenu_Click(sender As Object, e As System.EventArgs) Handles conVorgeschrieben.Click, conVorbereitet.Click, conÜbernehmen.Click, conNichtEingetroffen.Click, conFreigabe.Click, conFertig.Click, conAnkunft.Click ',conVermerkLöschen.Click + Private Sub conMenu_Click(sender As Object, e As System.EventArgs) Handles conVorgeschrieben.Click, conVorbereitet.Click, conÜbernehmen.Click, conNichtEingetroffen.Click, conFreigabe.Click, conFertig.Click, conAnkunft.Click, conAnVerimex.Click, conAnIndonesien.Click ',conVermerkLöschen.Click, Timer1.Enabled = False @@ -2471,6 +2498,14 @@ Public Class frmHauptfenster ' End If End If + If sender Is conAnVerimex Then + FUNC.setAnVERIMEX(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + End If + + If sender Is conAnIndonesien Then + FUNC.setAnINDONESIEN(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + End If + If sender Is conFreigabe Then FUNC.setFreigabe(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID, Me) 'If btnFreigabe.Visible Then @@ -2541,10 +2576,10 @@ Public Class frmHauptfenster If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then 'btnGenerelleGestellungen.Visible = False Button6.Visible = False - If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("ALLOW_STATUS2_VERIMEX") Then - tabVorbereitet.Text = "2. VERIMEX/INDONESIEN" - ' tbcntrAviso.TabPages.RemoveAt(2) + 'tabVorbereitet.Text = "2. VERIMEX/INDONESIEN" + tbcntrAviso.TabPages.Remove(tabVorgeschrieben) + tbcntrAviso.TabPages.Remove(tabVorbereitet) End If btnWichtigeStandort.Visible = False @@ -2554,6 +2589,8 @@ Public Class frmHauptfenster BürgschaftenExcelToolStripMenuItem.Visible = True ToolStripMenuItem4.Visible = True ToolStripMenuItem5.Visible = True + ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then + 'nix ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then 'btnGenerelleGestellungen.Visible = False ToolStripMenuItem4.Visible = True @@ -2569,6 +2606,17 @@ Public Class frmHauptfenster End If End If + If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("STATUS_ATILLA") Then + 'tabVorbereitet.Text = "2. VERIMEX/INDONESIEN" + tbcntrAviso.TabPages.Remove(tabVorgeschrieben) + tbcntrAviso.TabPages.Remove(tabVorbereitet) + Else + tbcntrAviso.TabPages.Remove(tabINDONESIEN) + tbcntrAviso.TabPages.Remove(tabVERIMEX) + conAnVerimex.Visible = False + conAnIndonesien.Visible = False + End If + 'Wenn Teamzuweisung --> Backoffice --> Meine Senungen größer! @@ -2586,10 +2634,15 @@ Public Class frmHauptfenster ' ' If SplitContainer2.Panel2.Width > 900 Then SplitContainer2.SplitterDistance = SplitContainer2.Width - 900 'End If - If SplitContainer2.Width > 1000 Then + If SplitContainer2.Width > 1300 Then SplitContainer2.SplitterDistance = 350 'SplitContainer2.Width - 750 + SplitContainer3.SplitterDistance = 400 + ElseIf SplitContainer2.Width > 1200 Then + SplitContainer2.SplitterDistance = 180 'SplitContainer2.Width - 750 + SplitContainer3.SplitterDistance = 300 Else SplitContainer2.SplitterDistance = 160 'SplitContainer2.Width - 750 + SplitContainer3.SplitterDistance = 250 End If @@ -2649,7 +2702,7 @@ Public Class frmHauptfenster - Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnZollwebseiten.Click cntxt.Show(Cursor.Position) End Sub @@ -3619,7 +3672,7 @@ Public Class frmHauptfenster End If frmBundesanzeigerZollTarif.BringToFront() End Sub - Private Sub ToolStripMenuItem3_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem3.Click + Private Sub ToolStripMenuItem3_Click(sender As Object, e As EventArgs) Handles tool_BRGXLS.Click Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "ATILLA", "", "ATILLA_Bürgschaften") DS.OPEN_SINGLE() End Sub @@ -3992,6 +4045,14 @@ Public Class frmHauptfenster MsgBox("Keine Berechtigung!") End If End Sub + Private Sub EnglishToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EnglishToolStripMenuItem.Click + If True Then + VERAG_PROG_ALLGEMEIN.cAllgemein._LAN = "EN" + showMeNew() + Else + MsgBox("Keine Berechtigung!") + End If + End Sub Private Sub Button11_Click_1(sender As Object, e As EventArgs) Handles Button11.Click cHMRC.VATTEST(InputBox("Token")) @@ -4242,6 +4303,8 @@ Public Class frmHauptfenster Dim f As New frmEssensbestellungen() f.ShowDialog(Me) End Sub + + End Class Public Class AvisoStatusFunctions @@ -4339,7 +4402,7 @@ Public Class AvisoStatusFunctions Dim Aviso As New cAviso Aviso = AvisoDAL.LesenAviso(AvisoID, "") If Aviso Is Nothing Then Return False - If Aviso.Abgeschlossen Then MsgBox("Der Akt wurde bereichts abgeschlossen.", vbInformation) : Return False + If Aviso.Abgeschlossen Then MsgBox("Der Akt wurde bereits abgeschlossen.", vbInformation) : Return False Dim msg As String @@ -4385,7 +4448,9 @@ Public Class AvisoStatusFunctions 'E-Mail sendAnkunftBenachrichtigung(Aviso.AvisoID) - + If Aviso.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_VERIMEX Or Aviso.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_INDONESIEN Then + Rücksetzen = True + End If 'Fahrer Handy-Nr. @@ -4789,7 +4854,7 @@ Public Class AvisoStatusFunctions Dim Aviso As New cAviso Aviso = AvisoDAL.LesenAviso(AvisoID, "") If Aviso Is Nothing Then Return False - If Aviso.Abgeschlossen Then MsgBox("Der Akt wurde bereichts abgeschlossen.", vbInformation) : Return False + If Aviso.Abgeschlossen Then MsgBox("Der Akt wurde bereits abgeschlossen.", vbInformation) : Return False Dim msg As String Dim antwort As MsgBoxResult @@ -4899,6 +4964,117 @@ Public Class AvisoStatusFunctions Return (tmpid > 0) End Function + Public Function setAnINDONESIEN(AvisoID) As Boolean + 'If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then + ' MsgBox("Keine Berechtigung!") + ' Return False + 'End If + + 'falls keine Auswahl bzw. kein Datensatz, dann nichts machen + If AvisoID <= 0 Then + MsgBox("Kein Aviso ausgewählt!") + Return False + End If + + 'jetzt ausgewählten Datensatz einlesen + Dim Aviso As New cAviso + Aviso = AvisoDAL.LesenAviso(AvisoID, "") + If Aviso Is Nothing Then Return False + If Aviso.Abgeschlossen Then MsgBox("Der Akt wurde bereits abgeschlossen.", vbInformation) : Return False + + Dim msg As String + Dim antwort As MsgBoxResult + + + If Aviso.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_INDONESIEN Then + MsgBox("Dieses LKW-Aviso ist bereits auf 'AN INDONESIEN' gesetzt.", vbInformation) + Return False + End If + + If Aviso.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_Freigegeben Then + MsgBox("Dieses LKW-Aviso ist bereits auf FREIGABE gesetzt.") + Return False + End If + + + If Aviso.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_NichtEingetroffen Then + msg = "Dieses LKW-Aviso hat bereits den Status 'LKW nicht eingetroffen'." & vbCrLf & vbCrLf & + "Soll es jetzt trotzdem auf VORBEREITET (zurück)gesetzt werden?" + antwort = MsgBox(msg, CType(MsgBoxStyle.YesNo + MsgBoxStyle.DefaultButton2 + MsgBoxStyle.Question, MsgBoxStyle), + "Status-Änderung") + If antwort = vbNo Then Return False + End If + + + 'Status ist offen - jetzt auf 'AN INDONESIEN' setzen + Aviso.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_INDONESIEN + Aviso.Änderungen = "auf 'AN INDONESIEN' gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm") & vbCrLf & Trim(VarToStr(Aviso.Änderungen)) + + Aviso.letzterMitarbeiter = VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter + Aviso.TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId + + Dim tmpid = AvisoDAL.SpeichernAviso(Aviso) + AvisoDAL.addAenderung(tmpid, "auf 'AN INDONESIEN' gesetzt", "auf 'AN INDONESIEN' gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm")) + + Return (tmpid > 0) + End Function + + + Public Function setAnVERIMEX(AvisoID) As Boolean + 'If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then + ' MsgBox("Keine Berechtigung!") + ' Return False + 'End If + + 'falls keine Auswahl bzw. kein Datensatz, dann nichts machen + If AvisoID <= 0 Then + MsgBox("Kein Aviso ausgewählt!") + Return False + End If + + 'jetzt ausgewählten Datensatz einlesen + Dim Aviso As New cAviso + Aviso = AvisoDAL.LesenAviso(AvisoID, "") + If Aviso Is Nothing Then Return False + If Aviso.Abgeschlossen Then MsgBox("Der Akt wurde bereits abgeschlossen.", vbInformation) : Return False + + Dim msg As String + Dim antwort As MsgBoxResult + + + If Aviso.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_VERIMEX Then + MsgBox("Dieses LKW-Aviso ist bereits auf 'AN VERIMEX' gesetzt.", vbInformation) + Return False + End If + + If Aviso.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_Freigegeben Then + MsgBox("Dieses LKW-Aviso ist bereits auf FREIGABE gesetzt.") + Return False + End If + + + If Aviso.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_NichtEingetroffen Then + msg = "Dieses LKW-Aviso hat bereits den Status 'LKW nicht eingetroffen'." & vbCrLf & vbCrLf & + "Soll es jetzt trotzdem auf VORBEREITET (zurück)gesetzt werden?" + antwort = MsgBox(msg, CType(MsgBoxStyle.YesNo + MsgBoxStyle.DefaultButton2 + MsgBoxStyle.Question, MsgBoxStyle), + "Status-Änderung") + If antwort = vbNo Then Return False + End If + + + 'Status ist offen - jetzt auf 'AN VERIMEX' setzen + Aviso.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_VERIMEX + Aviso.Änderungen = "auf 'AN VERIMEX' gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm") & vbCrLf & Trim(VarToStr(Aviso.Änderungen)) + + Aviso.letzterMitarbeiter = VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter + Aviso.TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId + + Dim tmpid = AvisoDAL.SpeichernAviso(Aviso) + AvisoDAL.addAenderung(tmpid, "auf 'AN VERIMEX' gesetzt", "auf 'AN VERIMEX' gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm")) + + Return (tmpid > 0) + End Function + Public Function setVorgeschreiben(AvisoID) As Boolean If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then MsgBox("Keine Berechtigung!") @@ -4915,7 +5091,7 @@ Public Class AvisoStatusFunctions Dim Aviso As New cAviso Aviso = AvisoDAL.LesenAviso(AvisoID, "") If Aviso Is Nothing Then Return False - If Aviso.Abgeschlossen Then MsgBox("Der Akt wurde bereichts abgeschlossen.", vbInformation) : Return False + If Aviso.Abgeschlossen Then MsgBox("Der Akt wurde bereits abgeschlossen.", vbInformation) : Return False Dim msg As String Dim antwort As MsgBoxResult @@ -5050,7 +5226,7 @@ Public Class AvisoStatusFunctions Dim Aviso As New cAviso Aviso = AvisoDAL.LesenAviso(AvisoID, "") If Aviso Is Nothing Then Return False - If Aviso.Abgeschlossen Then MsgBox("Der Akt wurde bereichts abgeschlossen.", vbInformation) : Return False + If Aviso.Abgeschlossen Then MsgBox("Der Akt wurde bereits abgeschlossen.", vbInformation) : Return False Dim msg As String Dim antwort As MsgBoxResult @@ -5261,7 +5437,7 @@ Public Class AvisoStatusFunctions Dim Aviso As New cAviso Aviso = AvisoDAL.LesenAviso(AvisoID, "") If Aviso Is Nothing Then Return False - If Aviso.Abgeschlossen Then MsgBox("Der Akt wurde bereichts abgeschlossen.", vbInformation) : Return False + If Aviso.Abgeschlossen Then MsgBox("Der Akt wurde bereits abgeschlossen.", vbInformation) : Return False Dim msg As String @@ -5586,7 +5762,7 @@ Public Class AvisoStatusFunctions Dim Aviso As New cAviso Aviso = AvisoDAL.LesenAviso(AvisoID, "") If Aviso Is Nothing Then Return False - If Aviso.Abgeschlossen Then MsgBox("Der Akt wurde bereichts abgeschlossen.", vbInformation) : Return False + If Aviso.Abgeschlossen Then MsgBox("Der Akt wurde bereits abgeschlossen.", vbInformation) : Return False Dim msg As String diff --git a/Aviso/frmLogin.vb b/Aviso/frmLogin.vb index c86d820..6b18c8e 100644 --- a/Aviso/frmLogin.vb +++ b/Aviso/frmLogin.vb @@ -239,7 +239,7 @@ Public Class frmLogin cboWarenort.Visible = True picWO.Visible = True lblWO.Visible = True - Case "FO_Wiesentheid", "WO_GE", "WO_IST_LOL", "WO_IST_LOG", "WO_KITA", "WO_MERIS" + Case "FO_WIHD", "FO_Wiesentheid", "WO_GE", "WO_IST_LOL", "WO_IST_LOG", "WO_KITA", "WO_MERIS" 'picLogin.Size = New Size(picLogin.Width, 71) picLogin.Image = Nothing @@ -425,6 +425,16 @@ Public Class frmLogin End Sub Private Sub loginOK() + + 'Prüfen, ob sich eein WO Nutzer in den Firmen-Login schmuggeln möchte: + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("WARENORT", "AVISO") Then + If Not VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG Then + MsgBox("Keine Berechtigung!") + Exit Sub + End If + End If + + 'Prüfen, ob Passwort erneuert werden muss If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_PasswortChanged Is Nothing Then Dim f As New frmChangePWD(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER) @@ -679,7 +689,7 @@ Public Class frmLogin picWO.BackgroundImage = Nothing picWO.Visible = True Select Case cboWarenort._value - Case "FO_Wiesentheid" : picWO.BackgroundImage = My.Resources.Koerfez61 + Case "FO_Wiesentheid", "FO_WIHD" : picWO.BackgroundImage = My.Resources.Koerfez61 Case "WO_GE" : picWO.BackgroundImage = My.Resources.ge_transport Case "WO_IST_LOL" : picWO.BackgroundImage = My.Resources.istLog Case "WO_KITA" : picWO.BackgroundImage = My.Resources.kita diff --git a/Aviso/usrcntlAktDetails.Designer.vb b/Aviso/usrcntlAktDetails.Designer.vb index 890f47f..c1267ec 100644 --- a/Aviso/usrcntlAktDetails.Designer.vb +++ b/Aviso/usrcntlAktDetails.Designer.vb @@ -38,20 +38,24 @@ Partial Class usrcntlAktDetails Me.Panel3 = New System.Windows.Forms.Panel() Me.SplitContainer = New System.Windows.Forms.SplitContainer() Me.pnlAlt = New System.Windows.Forms.Panel() - Me.Button1 = New System.Windows.Forms.Button() + Me.btnSndErstellen = New System.Windows.Forms.Button() Me.grpAktVerzollung = New System.Windows.Forms.GroupBox() Me.lblSendungsanzahl = New System.Windows.Forms.Label() Me.cbxPosNr = New System.Windows.Forms.CheckBox() Me.cboGrenzstelle = New System.Windows.Forms.ComboBox() Me.Label11 = New System.Windows.Forms.Label() Me.lnlSendungText = New System.Windows.Forms.Label() + Me.txtSendungen = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.pnlSBG = New System.Windows.Forms.Panel() Me.lblSndFremd = New System.Windows.Forms.Label() Me.Label21 = New System.Windows.Forms.Label() + Me.txtSndFremd = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label20 = New System.Windows.Forms.Label() Me.Label19 = New System.Windows.Forms.Label() Me.lblFiskde = New System.Windows.Forms.Label() + Me.txtSndFiskalDE = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.lblFiskAT = New System.Windows.Forms.Label() + Me.txtSndFiskalAT = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.cbxSammelakt = New System.Windows.Forms.CheckBox() Me.Button5 = New System.Windows.Forms.Button() Me.Button3 = New System.Windows.Forms.Button() @@ -66,14 +70,17 @@ Partial Class usrcntlAktDetails Me.btnLZDruckDIGITAL = New System.Windows.Forms.Button() Me.btnSendungslisteUNISPED = New System.Windows.Forms.Button() Me.cbxAlleFirmen = New System.Windows.Forms.CheckBox() - Me.Button12 = New System.Windows.Forms.Button() - Me.Button11 = New System.Windows.Forms.Button() - Me.btnKasse_User = New System.Windows.Forms.Button() + Me.btnAlleSteuerbescheide = New System.Windows.Forms.Button() + Me.btnAlleAkendeckel = New System.Windows.Forms.Button() + Me.btnDipoListe = New System.Windows.Forms.Button() + Me.cboFormulareRgAn = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label4 = New System.Windows.Forms.Label() - Me.Button8 = New System.Windows.Forms.Button() + Me.btnSA_Gestellung = New System.Windows.Forms.Button() Me.btnLZDruck = New System.Windows.Forms.Button() - Me.Button9 = New System.Windows.Forms.Button() - Me.btnKasse_LG = New System.Windows.Forms.Button() + Me.btnDipoListeEmail = New System.Windows.Forms.Button() + Me.btnDispohaft = New System.Windows.Forms.Button() + Me.cbxLZRg = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components) + Me.cbxLZT1 = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components) Me.Button18 = New System.Windows.Forms.Button() Me.gridVermerke = New System.Windows.Forms.DataGridView() Me.pnlVermerkeTop = New System.Windows.Forms.Panel() @@ -88,9 +95,11 @@ Partial Class usrcntlAktDetails Me.tbAnhang = New System.Windows.Forms.TabPage() Me.addVermerk = New System.Windows.Forms.Button() Me.pnlMAInfo = New System.Windows.Forms.Panel() + Me.lblSNDChat_MsgCnt = New System.Windows.Forms.Label() Me.picMAinfo_TRVorgeschrieben = New System.Windows.Forms.PictureBox() Me.txtMAinfo_TRVorgeschrieben = New System.Windows.Forms.TextBox() Me.picMAinfo_AbklaerungTR = New System.Windows.Forms.PictureBox() + Me.picAVISOMessengerSNDChat = New System.Windows.Forms.PictureBox() Me.picMAinfo_Vorgeschrieben = New System.Windows.Forms.PictureBox() Me.picMAinfo_VorbereitetQs = New System.Windows.Forms.PictureBox() Me.txtMAinfo_AbklaerungTR = New System.Windows.Forms.TextBox() @@ -164,15 +173,6 @@ Partial Class usrcntlAktDetails Me.btnÄndern = New System.Windows.Forms.Button() Me.btnTV = New System.Windows.Forms.Button() Me.Button10 = New System.Windows.Forms.Button() - Me.lblSNDChat_MsgCnt = New System.Windows.Forms.Label() - Me.picAVISOMessengerSNDChat = New System.Windows.Forms.PictureBox() - Me.txtSendungen = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtSndFremd = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtSndFiskalDE = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtSndFiskalAT = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.cboFormulareRgAn = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.cbxLZRg = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components) - Me.cbxLZT1 = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components) Me.pnlDetailsRechts.SuspendLayout() Me.Panel3.SuspendLayout() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() @@ -192,6 +192,7 @@ Partial Class usrcntlAktDetails Me.pnlMAInfo.SuspendLayout() CType(Me.picMAinfo_TRVorgeschrieben, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.picMAinfo_AbklaerungTR, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.picAVISOMessengerSNDChat, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.picMAinfo_Vorgeschrieben, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.picMAinfo_VorbereitetQs, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel8.SuspendLayout() @@ -209,7 +210,6 @@ Partial Class usrcntlAktDetails Me.conMenuVermerke.SuspendLayout() Me.cntxtFormulare.SuspendLayout() Me.pnlOptionen.SuspendLayout() - CType(Me.picAVISOMessengerSNDChat, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'pnlDetailsRechts @@ -270,7 +270,7 @@ Partial Class usrcntlAktDetails ' 'pnlAlt ' - Me.pnlAlt.Controls.Add(Me.Button1) + Me.pnlAlt.Controls.Add(Me.btnSndErstellen) Me.pnlAlt.Controls.Add(Me.grpAktVerzollung) Me.pnlAlt.Controls.Add(Me.Button5) Me.pnlAlt.Controls.Add(Me.Button3) @@ -282,16 +282,16 @@ Partial Class usrcntlAktDetails Me.pnlAlt.TabIndex = 72 Me.pnlAlt.Visible = False ' - 'Button1 + 'btnSndErstellen ' - Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Button1.Location = New System.Drawing.Point(8, 122) - Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(469, 37) - Me.Button1.TabIndex = 102 - Me.Button1.Text = "Sendungen erstellen" - Me.Button1.UseVisualStyleBackColor = True + Me.btnSndErstellen.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnSndErstellen.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnSndErstellen.Location = New System.Drawing.Point(8, 122) + Me.btnSndErstellen.Name = "btnSndErstellen" + Me.btnSndErstellen.Size = New System.Drawing.Size(469, 37) + Me.btnSndErstellen.TabIndex = 102 + Me.btnSndErstellen.Text = "Sendungen erstellen" + Me.btnSndErstellen.UseVisualStyleBackColor = True ' 'grpAktVerzollung ' @@ -367,6 +367,32 @@ Partial Class usrcntlAktDetails Me.lnlSendungText.TabIndex = 2 Me.lnlSendungText.Text = "Sendung" ' + 'txtSendungen + ' + Me.txtSendungen._DateTimeOnly = False + Me.txtSendungen._numbersOnly = True + Me.txtSendungen._numbersOnlyKommastellen = "" + Me.txtSendungen._numbersOnlyTrennzeichen = True + Me.txtSendungen._Prozent = False + Me.txtSendungen._ShortDateNew = False + Me.txtSendungen._ShortDateOnly = False + Me.txtSendungen._TimeOnly = False + Me.txtSendungen._TimeOnly_Seconds = False + Me.txtSendungen._value = "" + Me.txtSendungen._Waehrung = False + Me.txtSendungen._WaehrungZeichen = True + Me.txtSendungen.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtSendungen.ForeColor = System.Drawing.Color.Black + Me.txtSendungen.Location = New System.Drawing.Point(22, 17) + Me.txtSendungen.MaxLineLength = -1 + Me.txtSendungen.MaxLines_Warning = "" + Me.txtSendungen.MaxLines_Warning_Label = Nothing + Me.txtSendungen.Name = "txtSendungen" + Me.txtSendungen.Size = New System.Drawing.Size(32, 26) + Me.txtSendungen.TabIndex = 1 + Me.txtSendungen.Text = "1" + Me.txtSendungen.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'pnlSBG ' Me.pnlSBG.Controls.Add(Me.lblSndFremd) @@ -403,6 +429,33 @@ Partial Class usrcntlAktDetails Me.Label21.Text = "1" Me.Label21.TextAlign = System.Drawing.ContentAlignment.TopRight ' + 'txtSndFremd + ' + Me.txtSndFremd._DateTimeOnly = False + Me.txtSndFremd._numbersOnly = True + Me.txtSndFremd._numbersOnlyKommastellen = "" + Me.txtSndFremd._numbersOnlyTrennzeichen = True + Me.txtSndFremd._Prozent = False + Me.txtSndFremd._ShortDateNew = False + Me.txtSndFremd._ShortDateOnly = False + Me.txtSndFremd._TimeOnly = False + Me.txtSndFremd._TimeOnly_Seconds = False + Me.txtSndFremd._value = "" + Me.txtSndFremd._Waehrung = False + Me.txtSndFremd._WaehrungZeichen = True + Me.txtSndFremd.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtSndFremd.ForeColor = System.Drawing.Color.Black + Me.txtSndFremd.Location = New System.Drawing.Point(149, 5) + Me.txtSndFremd.MaxLineLength = -1 + Me.txtSndFremd.MaxLines_Warning = "" + Me.txtSndFremd.MaxLines_Warning_Label = Nothing + Me.txtSndFremd.Name = "txtSndFremd" + Me.txtSndFremd.Size = New System.Drawing.Size(32, 26) + Me.txtSndFremd.TabIndex = 83 + Me.txtSndFremd.Text = "0" + Me.txtSndFremd.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + Me.txtSndFremd.Visible = False + ' 'Label20 ' Me.Label20.AutoSize = True @@ -430,6 +483,32 @@ Partial Class usrcntlAktDetails Me.lblFiskde.TabIndex = 6 Me.lblFiskde.Text = "Fiskal DE" ' + 'txtSndFiskalDE + ' + Me.txtSndFiskalDE._DateTimeOnly = False + Me.txtSndFiskalDE._numbersOnly = True + Me.txtSndFiskalDE._numbersOnlyKommastellen = "" + Me.txtSndFiskalDE._numbersOnlyTrennzeichen = True + Me.txtSndFiskalDE._Prozent = False + Me.txtSndFiskalDE._ShortDateNew = False + Me.txtSndFiskalDE._ShortDateOnly = False + Me.txtSndFiskalDE._TimeOnly = False + Me.txtSndFiskalDE._TimeOnly_Seconds = False + Me.txtSndFiskalDE._value = "" + Me.txtSndFiskalDE._Waehrung = False + Me.txtSndFiskalDE._WaehrungZeichen = True + Me.txtSndFiskalDE.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtSndFiskalDE.ForeColor = System.Drawing.Color.Black + Me.txtSndFiskalDE.Location = New System.Drawing.Point(16, 34) + Me.txtSndFiskalDE.MaxLineLength = -1 + Me.txtSndFiskalDE.MaxLines_Warning = "" + Me.txtSndFiskalDE.MaxLines_Warning_Label = Nothing + Me.txtSndFiskalDE.Name = "txtSndFiskalDE" + Me.txtSndFiskalDE.Size = New System.Drawing.Size(32, 26) + Me.txtSndFiskalDE.TabIndex = 5 + Me.txtSndFiskalDE.Text = "0" + Me.txtSndFiskalDE.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'lblFiskAT ' Me.lblFiskAT.AutoSize = True @@ -439,6 +518,32 @@ Partial Class usrcntlAktDetails Me.lblFiskAT.TabIndex = 4 Me.lblFiskAT.Text = "Fiskal AT" ' + 'txtSndFiskalAT + ' + Me.txtSndFiskalAT._DateTimeOnly = False + Me.txtSndFiskalAT._numbersOnly = True + Me.txtSndFiskalAT._numbersOnlyKommastellen = "" + Me.txtSndFiskalAT._numbersOnlyTrennzeichen = True + Me.txtSndFiskalAT._Prozent = False + Me.txtSndFiskalAT._ShortDateNew = False + Me.txtSndFiskalAT._ShortDateOnly = False + Me.txtSndFiskalAT._TimeOnly = False + Me.txtSndFiskalAT._TimeOnly_Seconds = False + Me.txtSndFiskalAT._value = "" + Me.txtSndFiskalAT._Waehrung = False + Me.txtSndFiskalAT._WaehrungZeichen = True + Me.txtSndFiskalAT.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtSndFiskalAT.ForeColor = System.Drawing.Color.Black + Me.txtSndFiskalAT.Location = New System.Drawing.Point(16, 5) + Me.txtSndFiskalAT.MaxLineLength = -1 + Me.txtSndFiskalAT.MaxLines_Warning = "" + Me.txtSndFiskalAT.MaxLines_Warning_Label = Nothing + Me.txtSndFiskalAT.Name = "txtSndFiskalAT" + Me.txtSndFiskalAT.Size = New System.Drawing.Size(32, 26) + Me.txtSndFiskalAT.TabIndex = 3 + Me.txtSndFiskalAT.Text = "0" + Me.txtSndFiskalAT.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'cbxSammelakt ' Me.cbxSammelakt.AutoSize = True @@ -597,15 +702,15 @@ Partial Class usrcntlAktDetails Me.Panel4.Controls.Add(Me.btnLZDruckDIGITAL) Me.Panel4.Controls.Add(Me.btnSendungslisteUNISPED) Me.Panel4.Controls.Add(Me.cbxAlleFirmen) - Me.Panel4.Controls.Add(Me.Button12) - Me.Panel4.Controls.Add(Me.Button11) - Me.Panel4.Controls.Add(Me.btnKasse_User) + Me.Panel4.Controls.Add(Me.btnAlleSteuerbescheide) + Me.Panel4.Controls.Add(Me.btnAlleAkendeckel) + Me.Panel4.Controls.Add(Me.btnDipoListe) Me.Panel4.Controls.Add(Me.cboFormulareRgAn) Me.Panel4.Controls.Add(Me.Label4) - Me.Panel4.Controls.Add(Me.Button8) + Me.Panel4.Controls.Add(Me.btnSA_Gestellung) Me.Panel4.Controls.Add(Me.btnLZDruck) - Me.Panel4.Controls.Add(Me.Button9) - Me.Panel4.Controls.Add(Me.btnKasse_LG) + Me.Panel4.Controls.Add(Me.btnDipoListeEmail) + Me.Panel4.Controls.Add(Me.btnDispohaft) Me.Panel4.Controls.Add(Me.cbxLZRg) Me.Panel4.Controls.Add(Me.cbxLZT1) Me.Panel4.Location = New System.Drawing.Point(203, 27) @@ -691,53 +796,64 @@ Partial Class usrcntlAktDetails Me.cbxAlleFirmen.Text = "alle Firmen" Me.cbxAlleFirmen.UseVisualStyleBackColor = True ' - 'Button12 + 'btnAlleSteuerbescheide ' - Me.Button12.BackColor = System.Drawing.Color.White - Me.Button12.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button12.ForeColor = System.Drawing.Color.Black - Me.Button12.Image = Global.AVISO.My.Resources.Resources.spedbuch_small - Me.Button12.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button12.Location = New System.Drawing.Point(134, 147) - Me.Button12.Margin = New System.Windows.Forms.Padding(0) - Me.Button12.Name = "Button12" - Me.Button12.Size = New System.Drawing.Size(128, 36) - Me.Button12.TabIndex = 110 - Me.Button12.Text = "Alle Steuerbe-" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "scheide drucken" - Me.Button12.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button12.UseVisualStyleBackColor = False + Me.btnAlleSteuerbescheide.BackColor = System.Drawing.Color.White + Me.btnAlleSteuerbescheide.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnAlleSteuerbescheide.ForeColor = System.Drawing.Color.Black + Me.btnAlleSteuerbescheide.Image = Global.AVISO.My.Resources.Resources.spedbuch_small + Me.btnAlleSteuerbescheide.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnAlleSteuerbescheide.Location = New System.Drawing.Point(134, 147) + Me.btnAlleSteuerbescheide.Margin = New System.Windows.Forms.Padding(0) + Me.btnAlleSteuerbescheide.Name = "btnAlleSteuerbescheide" + Me.btnAlleSteuerbescheide.Size = New System.Drawing.Size(128, 36) + Me.btnAlleSteuerbescheide.TabIndex = 110 + Me.btnAlleSteuerbescheide.Text = "Alle Steuerbe-" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "scheide drucken" + Me.btnAlleSteuerbescheide.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnAlleSteuerbescheide.UseVisualStyleBackColor = False ' - 'Button11 + 'btnAlleAkendeckel ' - Me.Button11.BackColor = System.Drawing.Color.White - Me.Button11.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button11.ForeColor = System.Drawing.Color.Black - Me.Button11.Image = Global.AVISO.My.Resources.Resources.spedbuch_small - Me.Button11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button11.Location = New System.Drawing.Point(134, 112) - Me.Button11.Margin = New System.Windows.Forms.Padding(0) - Me.Button11.Name = "Button11" - Me.Button11.Size = New System.Drawing.Size(128, 36) - Me.Button11.TabIndex = 109 - Me.Button11.Text = "Alle Aktendeckel " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "drucken" - Me.Button11.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button11.UseVisualStyleBackColor = False + Me.btnAlleAkendeckel.BackColor = System.Drawing.Color.White + Me.btnAlleAkendeckel.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnAlleAkendeckel.ForeColor = System.Drawing.Color.Black + Me.btnAlleAkendeckel.Image = Global.AVISO.My.Resources.Resources.spedbuch_small + Me.btnAlleAkendeckel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnAlleAkendeckel.Location = New System.Drawing.Point(134, 112) + Me.btnAlleAkendeckel.Margin = New System.Windows.Forms.Padding(0) + Me.btnAlleAkendeckel.Name = "btnAlleAkendeckel" + Me.btnAlleAkendeckel.Size = New System.Drawing.Size(128, 36) + Me.btnAlleAkendeckel.TabIndex = 109 + Me.btnAlleAkendeckel.Text = "Alle Aktendeckel " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "drucken" + Me.btnAlleAkendeckel.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnAlleAkendeckel.UseVisualStyleBackColor = False ' - 'btnKasse_User + 'btnDipoListe ' - Me.btnKasse_User.BackColor = System.Drawing.Color.White - Me.btnKasse_User.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnKasse_User.ForeColor = System.Drawing.Color.Black - Me.btnKasse_User.Image = Global.AVISO.My.Resources.Resources.pdf11 - Me.btnKasse_User.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnKasse_User.Location = New System.Drawing.Point(5, 22) - Me.btnKasse_User.Margin = New System.Windows.Forms.Padding(0) - Me.btnKasse_User.Name = "btnKasse_User" - Me.btnKasse_User.Size = New System.Drawing.Size(123, 36) - Me.btnKasse_User.TabIndex = 4 - Me.btnKasse_User.Text = "Dispoliste" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "alle Sendg." - Me.btnKasse_User.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnKasse_User.UseVisualStyleBackColor = False + Me.btnDipoListe.BackColor = System.Drawing.Color.White + Me.btnDipoListe.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnDipoListe.ForeColor = System.Drawing.Color.Black + Me.btnDipoListe.Image = Global.AVISO.My.Resources.Resources.pdf11 + Me.btnDipoListe.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnDipoListe.Location = New System.Drawing.Point(5, 22) + Me.btnDipoListe.Margin = New System.Windows.Forms.Padding(0) + Me.btnDipoListe.Name = "btnDipoListe" + Me.btnDipoListe.Size = New System.Drawing.Size(123, 36) + Me.btnDipoListe.TabIndex = 4 + Me.btnDipoListe.Text = "Dispoliste" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "alle Sendg." + Me.btnDipoListe.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnDipoListe.UseVisualStyleBackColor = False + ' + 'cboFormulareRgAn + ' + Me.cboFormulareRgAn._allowedValuesFreiText = Nothing + Me.cboFormulareRgAn._allowFreiText = False + Me.cboFormulareRgAn._value = "" + Me.cboFormulareRgAn.FormattingEnabled = True + Me.cboFormulareRgAn.Location = New System.Drawing.Point(40, 2) + Me.cboFormulareRgAn.Name = "cboFormulareRgAn" + Me.cboFormulareRgAn.Size = New System.Drawing.Size(88, 21) + Me.cboFormulareRgAn.TabIndex = 108 ' 'Label4 ' @@ -749,22 +865,22 @@ Partial Class usrcntlAktDetails Me.Label4.Text = "Rg.an:" Me.Label4.TextAlign = System.Drawing.ContentAlignment.TopRight ' - 'Button8 + 'btnSA_Gestellung ' - Me.Button8.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Button8.BackColor = System.Drawing.Color.White - Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button8.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) - Me.Button8.ForeColor = System.Drawing.Color.Black - Me.Button8.Image = Global.AVISO.My.Resources.Resources.spedbuch_small - Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button8.Location = New System.Drawing.Point(134, 186) - Me.Button8.Name = "Button8" - Me.Button8.Size = New System.Drawing.Size(128, 36) - Me.Button8.TabIndex = 106 - Me.Button8.Text = "SA-Gest." - Me.Button8.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button8.UseVisualStyleBackColor = False + Me.btnSA_Gestellung.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnSA_Gestellung.BackColor = System.Drawing.Color.White + Me.btnSA_Gestellung.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnSA_Gestellung.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) + Me.btnSA_Gestellung.ForeColor = System.Drawing.Color.Black + Me.btnSA_Gestellung.Image = Global.AVISO.My.Resources.Resources.spedbuch_small + Me.btnSA_Gestellung.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnSA_Gestellung.Location = New System.Drawing.Point(134, 186) + Me.btnSA_Gestellung.Name = "btnSA_Gestellung" + Me.btnSA_Gestellung.Size = New System.Drawing.Size(128, 36) + Me.btnSA_Gestellung.TabIndex = 106 + Me.btnSA_Gestellung.Text = "SA-Gest." + Me.btnSA_Gestellung.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnSA_Gestellung.UseVisualStyleBackColor = False ' 'btnLZDruck ' @@ -782,36 +898,65 @@ Partial Class usrcntlAktDetails Me.btnLZDruck.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnLZDruck.UseVisualStyleBackColor = False ' - 'Button9 + 'btnDipoListeEmail ' - Me.Button9.BackColor = System.Drawing.Color.White - Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button9.ForeColor = System.Drawing.Color.Black - Me.Button9.Image = Global.AVISO.My.Resources.Resources.email_big1 - Me.Button9.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button9.Location = New System.Drawing.Point(5, 57) - Me.Button9.Margin = New System.Windows.Forms.Padding(0) - Me.Button9.Name = "Button9" - Me.Button9.Size = New System.Drawing.Size(123, 36) - Me.Button9.TabIndex = 5 - Me.Button9.Text = "Dispoliste" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "alle Sendg." - Me.Button9.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button9.UseVisualStyleBackColor = False + Me.btnDipoListeEmail.BackColor = System.Drawing.Color.White + Me.btnDipoListeEmail.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnDipoListeEmail.ForeColor = System.Drawing.Color.Black + Me.btnDipoListeEmail.Image = Global.AVISO.My.Resources.Resources.email_big1 + Me.btnDipoListeEmail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnDipoListeEmail.Location = New System.Drawing.Point(5, 57) + Me.btnDipoListeEmail.Margin = New System.Windows.Forms.Padding(0) + Me.btnDipoListeEmail.Name = "btnDipoListeEmail" + Me.btnDipoListeEmail.Size = New System.Drawing.Size(123, 36) + Me.btnDipoListeEmail.TabIndex = 5 + Me.btnDipoListeEmail.Text = "Dispoliste" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "alle Sendg." + Me.btnDipoListeEmail.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnDipoListeEmail.UseVisualStyleBackColor = False ' - 'btnKasse_LG + 'btnDispohaft ' - Me.btnKasse_LG.BackColor = System.Drawing.Color.White - Me.btnKasse_LG.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnKasse_LG.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.btnKasse_LG.ForeColor = System.Drawing.Color.Black - Me.btnKasse_LG.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnKasse_LG.Location = New System.Drawing.Point(5, 186) - Me.btnKasse_LG.Margin = New System.Windows.Forms.Padding(0) - Me.btnKasse_LG.Name = "btnKasse_LG" - Me.btnKasse_LG.Size = New System.Drawing.Size(123, 36) - Me.btnKasse_LG.TabIndex = 3 - Me.btnKasse_LG.Text = "Dispo.Haft" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(nur T1/T2)" - Me.btnKasse_LG.UseVisualStyleBackColor = False + Me.btnDispohaft.BackColor = System.Drawing.Color.White + Me.btnDispohaft.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnDispohaft.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.btnDispohaft.ForeColor = System.Drawing.Color.Black + Me.btnDispohaft.ImageAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnDispohaft.Location = New System.Drawing.Point(5, 186) + Me.btnDispohaft.Margin = New System.Windows.Forms.Padding(0) + Me.btnDispohaft.Name = "btnDispohaft" + Me.btnDispohaft.Size = New System.Drawing.Size(123, 36) + Me.btnDispohaft.TabIndex = 3 + Me.btnDispohaft.Text = "Dispo.Haft" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(nur T1/T2)" + Me.btnDispohaft.UseVisualStyleBackColor = False + ' + 'cbxLZRg + ' + Me.cbxLZRg._value = "" + Me.cbxLZRg.AutoSize = True + Me.cbxLZRg.Checked = True + Me.cbxLZRg.Checked_value = False + Me.cbxLZRg.CheckedValue = False + Me.cbxLZRg.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbxLZRg.Location = New System.Drawing.Point(134, 93) + Me.cbxLZRg.Name = "cbxLZRg" + Me.cbxLZRg.Size = New System.Drawing.Size(88, 17) + Me.cbxLZRg.TabIndex = 115 + Me.cbxLZRg.Text = "Rechnungen" + Me.cbxLZRg.UseVisualStyleBackColor = True + ' + 'cbxLZT1 + ' + Me.cbxLZT1._value = "" + Me.cbxLZT1.AutoSize = True + Me.cbxLZT1.Checked_value = False + Me.cbxLZT1.CheckedValue = False + Me.cbxLZT1.Location = New System.Drawing.Point(223, 93) + Me.cbxLZT1.Name = "cbxLZT1" + Me.cbxLZT1.Size = New System.Drawing.Size(39, 17) + Me.cbxLZT1.TabIndex = 114 + Me.cbxLZT1.Text = "T1" + Me.cbxLZT1.UseVisualStyleBackColor = True + Me.cbxLZT1.Visible = False ' 'Button18 ' @@ -1036,6 +1181,20 @@ Partial Class usrcntlAktDetails Me.pnlMAInfo.Size = New System.Drawing.Size(575, 34) Me.pnlMAInfo.TabIndex = 106 ' + 'lblSNDChat_MsgCnt + ' + Me.lblSNDChat_MsgCnt.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.lblSNDChat_MsgCnt.BackColor = System.Drawing.Color.Red + Me.lblSNDChat_MsgCnt.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!, System.Drawing.FontStyle.Bold) + Me.lblSNDChat_MsgCnt.ForeColor = System.Drawing.Color.White + Me.lblSNDChat_MsgCnt.Location = New System.Drawing.Point(53, 21) + Me.lblSNDChat_MsgCnt.Name = "lblSNDChat_MsgCnt" + Me.lblSNDChat_MsgCnt.Size = New System.Drawing.Size(22, 11) + Me.lblSNDChat_MsgCnt.TabIndex = 111 + Me.lblSNDChat_MsgCnt.Text = "99" + Me.lblSNDChat_MsgCnt.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.lblSNDChat_MsgCnt.Visible = False + ' 'picMAinfo_TRVorgeschrieben ' Me.picMAinfo_TRVorgeschrieben.BackgroundImage = Global.AVISO.My.Resources.Resources.statusBtn_vorgeschrieben_InAktiv @@ -1074,6 +1233,19 @@ Partial Class usrcntlAktDetails Me.picMAinfo_AbklaerungTR.TabIndex = 109 Me.picMAinfo_AbklaerungTR.TabStop = False ' + 'picAVISOMessengerSNDChat + ' + Me.picAVISOMessengerSNDChat.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.picAVISOMessengerSNDChat.BackgroundImage = Global.AVISO.My.Resources.Resources.aviso_messenger + Me.picAVISOMessengerSNDChat.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.picAVISOMessengerSNDChat.Cursor = System.Windows.Forms.Cursors.Hand + Me.picAVISOMessengerSNDChat.Location = New System.Drawing.Point(30, 1) + Me.picAVISOMessengerSNDChat.Name = "picAVISOMessengerSNDChat" + Me.picAVISOMessengerSNDChat.Size = New System.Drawing.Size(32, 30) + Me.picAVISOMessengerSNDChat.TabIndex = 110 + Me.picAVISOMessengerSNDChat.TabStop = False + Me.picAVISOMessengerSNDChat.Visible = False + ' 'picMAinfo_Vorgeschrieben ' Me.picMAinfo_Vorgeschrieben.BackgroundImage = Global.AVISO.My.Resources.Resources.statusBtn_vorgeschrieben_InAktiv @@ -2061,178 +2233,6 @@ Partial Class usrcntlAktDetails Me.Button10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button10.UseVisualStyleBackColor = False ' - 'lblSNDChat_MsgCnt - ' - Me.lblSNDChat_MsgCnt.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.lblSNDChat_MsgCnt.BackColor = System.Drawing.Color.Red - Me.lblSNDChat_MsgCnt.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!, System.Drawing.FontStyle.Bold) - Me.lblSNDChat_MsgCnt.ForeColor = System.Drawing.Color.White - Me.lblSNDChat_MsgCnt.Location = New System.Drawing.Point(53, 21) - Me.lblSNDChat_MsgCnt.Name = "lblSNDChat_MsgCnt" - Me.lblSNDChat_MsgCnt.Size = New System.Drawing.Size(22, 11) - Me.lblSNDChat_MsgCnt.TabIndex = 111 - Me.lblSNDChat_MsgCnt.Text = "99" - Me.lblSNDChat_MsgCnt.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.lblSNDChat_MsgCnt.Visible = False - ' - 'picAVISOMessengerSNDChat - ' - Me.picAVISOMessengerSNDChat.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.picAVISOMessengerSNDChat.BackgroundImage = Global.AVISO.My.Resources.Resources.aviso_messenger - Me.picAVISOMessengerSNDChat.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.picAVISOMessengerSNDChat.Cursor = System.Windows.Forms.Cursors.Hand - Me.picAVISOMessengerSNDChat.Location = New System.Drawing.Point(30, 1) - Me.picAVISOMessengerSNDChat.Name = "picAVISOMessengerSNDChat" - Me.picAVISOMessengerSNDChat.Size = New System.Drawing.Size(32, 30) - Me.picAVISOMessengerSNDChat.TabIndex = 110 - Me.picAVISOMessengerSNDChat.TabStop = False - Me.picAVISOMessengerSNDChat.Visible = False - ' - 'txtSendungen - ' - Me.txtSendungen._DateTimeOnly = False - Me.txtSendungen._numbersOnly = True - Me.txtSendungen._numbersOnlyKommastellen = "" - Me.txtSendungen._numbersOnlyTrennzeichen = True - Me.txtSendungen._Prozent = False - Me.txtSendungen._ShortDateNew = False - Me.txtSendungen._ShortDateOnly = False - Me.txtSendungen._TimeOnly = False - Me.txtSendungen._TimeOnly_Seconds = False - Me.txtSendungen._value = "" - Me.txtSendungen._Waehrung = False - Me.txtSendungen._WaehrungZeichen = True - Me.txtSendungen.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtSendungen.ForeColor = System.Drawing.Color.Black - Me.txtSendungen.Location = New System.Drawing.Point(22, 17) - Me.txtSendungen.MaxLineLength = -1 - Me.txtSendungen.MaxLines_Warning = "" - Me.txtSendungen.MaxLines_Warning_Label = Nothing - Me.txtSendungen.Name = "txtSendungen" - Me.txtSendungen.Size = New System.Drawing.Size(32, 26) - Me.txtSendungen.TabIndex = 1 - Me.txtSendungen.Text = "1" - Me.txtSendungen.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' - 'txtSndFremd - ' - Me.txtSndFremd._DateTimeOnly = False - Me.txtSndFremd._numbersOnly = True - Me.txtSndFremd._numbersOnlyKommastellen = "" - Me.txtSndFremd._numbersOnlyTrennzeichen = True - Me.txtSndFremd._Prozent = False - Me.txtSndFremd._ShortDateNew = False - Me.txtSndFremd._ShortDateOnly = False - Me.txtSndFremd._TimeOnly = False - Me.txtSndFremd._TimeOnly_Seconds = False - Me.txtSndFremd._value = "" - Me.txtSndFremd._Waehrung = False - Me.txtSndFremd._WaehrungZeichen = True - Me.txtSndFremd.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtSndFremd.ForeColor = System.Drawing.Color.Black - Me.txtSndFremd.Location = New System.Drawing.Point(149, 5) - Me.txtSndFremd.MaxLineLength = -1 - Me.txtSndFremd.MaxLines_Warning = "" - Me.txtSndFremd.MaxLines_Warning_Label = Nothing - Me.txtSndFremd.Name = "txtSndFremd" - Me.txtSndFremd.Size = New System.Drawing.Size(32, 26) - Me.txtSndFremd.TabIndex = 83 - Me.txtSndFremd.Text = "0" - Me.txtSndFremd.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - Me.txtSndFremd.Visible = False - ' - 'txtSndFiskalDE - ' - Me.txtSndFiskalDE._DateTimeOnly = False - Me.txtSndFiskalDE._numbersOnly = True - Me.txtSndFiskalDE._numbersOnlyKommastellen = "" - Me.txtSndFiskalDE._numbersOnlyTrennzeichen = True - Me.txtSndFiskalDE._Prozent = False - Me.txtSndFiskalDE._ShortDateNew = False - Me.txtSndFiskalDE._ShortDateOnly = False - Me.txtSndFiskalDE._TimeOnly = False - Me.txtSndFiskalDE._TimeOnly_Seconds = False - Me.txtSndFiskalDE._value = "" - Me.txtSndFiskalDE._Waehrung = False - Me.txtSndFiskalDE._WaehrungZeichen = True - Me.txtSndFiskalDE.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtSndFiskalDE.ForeColor = System.Drawing.Color.Black - Me.txtSndFiskalDE.Location = New System.Drawing.Point(16, 34) - Me.txtSndFiskalDE.MaxLineLength = -1 - Me.txtSndFiskalDE.MaxLines_Warning = "" - Me.txtSndFiskalDE.MaxLines_Warning_Label = Nothing - Me.txtSndFiskalDE.Name = "txtSndFiskalDE" - Me.txtSndFiskalDE.Size = New System.Drawing.Size(32, 26) - Me.txtSndFiskalDE.TabIndex = 5 - Me.txtSndFiskalDE.Text = "0" - Me.txtSndFiskalDE.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' - 'txtSndFiskalAT - ' - Me.txtSndFiskalAT._DateTimeOnly = False - Me.txtSndFiskalAT._numbersOnly = True - Me.txtSndFiskalAT._numbersOnlyKommastellen = "" - Me.txtSndFiskalAT._numbersOnlyTrennzeichen = True - Me.txtSndFiskalAT._Prozent = False - Me.txtSndFiskalAT._ShortDateNew = False - Me.txtSndFiskalAT._ShortDateOnly = False - Me.txtSndFiskalAT._TimeOnly = False - Me.txtSndFiskalAT._TimeOnly_Seconds = False - Me.txtSndFiskalAT._value = "" - Me.txtSndFiskalAT._Waehrung = False - Me.txtSndFiskalAT._WaehrungZeichen = True - Me.txtSndFiskalAT.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtSndFiskalAT.ForeColor = System.Drawing.Color.Black - Me.txtSndFiskalAT.Location = New System.Drawing.Point(16, 5) - Me.txtSndFiskalAT.MaxLineLength = -1 - Me.txtSndFiskalAT.MaxLines_Warning = "" - Me.txtSndFiskalAT.MaxLines_Warning_Label = Nothing - Me.txtSndFiskalAT.Name = "txtSndFiskalAT" - Me.txtSndFiskalAT.Size = New System.Drawing.Size(32, 26) - Me.txtSndFiskalAT.TabIndex = 3 - Me.txtSndFiskalAT.Text = "0" - Me.txtSndFiskalAT.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' - 'cboFormulareRgAn - ' - Me.cboFormulareRgAn._allowedValuesFreiText = Nothing - Me.cboFormulareRgAn._allowFreiText = False - Me.cboFormulareRgAn._value = "" - Me.cboFormulareRgAn.FormattingEnabled = True - Me.cboFormulareRgAn.Location = New System.Drawing.Point(40, 2) - Me.cboFormulareRgAn.Name = "cboFormulareRgAn" - Me.cboFormulareRgAn.Size = New System.Drawing.Size(88, 21) - Me.cboFormulareRgAn.TabIndex = 108 - ' - 'cbxLZRg - ' - Me.cbxLZRg._value = "" - Me.cbxLZRg.AutoSize = True - Me.cbxLZRg.Checked = True - Me.cbxLZRg.Checked_value = False - Me.cbxLZRg.CheckedValue = False - Me.cbxLZRg.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxLZRg.Location = New System.Drawing.Point(134, 93) - Me.cbxLZRg.Name = "cbxLZRg" - Me.cbxLZRg.Size = New System.Drawing.Size(88, 17) - Me.cbxLZRg.TabIndex = 115 - Me.cbxLZRg.Text = "Rechnungen" - Me.cbxLZRg.UseVisualStyleBackColor = True - ' - 'cbxLZT1 - ' - Me.cbxLZT1._value = "" - Me.cbxLZT1.AutoSize = True - Me.cbxLZT1.Checked_value = False - Me.cbxLZT1.CheckedValue = False - Me.cbxLZT1.Location = New System.Drawing.Point(223, 93) - Me.cbxLZT1.Name = "cbxLZT1" - Me.cbxLZT1.Size = New System.Drawing.Size(39, 17) - Me.cbxLZT1.TabIndex = 114 - Me.cbxLZT1.Text = "T1" - Me.cbxLZT1.UseVisualStyleBackColor = True - Me.cbxLZT1.Visible = False - ' 'usrcntlAktDetails ' Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None @@ -2265,6 +2265,7 @@ Partial Class usrcntlAktDetails Me.pnlMAInfo.PerformLayout() CType(Me.picMAinfo_TRVorgeschrieben, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.picMAinfo_AbklaerungTR, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.picAVISOMessengerSNDChat, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.picMAinfo_Vorgeschrieben, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.picMAinfo_VorbereitetQs, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel8.ResumeLayout(False) @@ -2291,7 +2292,6 @@ Partial Class usrcntlAktDetails Me.conMenuVermerke.ResumeLayout(False) Me.cntxtFormulare.ResumeLayout(False) Me.pnlOptionen.ResumeLayout(False) - CType(Me.picAVISOMessengerSNDChat, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -2360,7 +2360,7 @@ Partial Class usrcntlAktDetails Friend WithEvents btnLöschen As System.Windows.Forms.Button Friend WithEvents btnÄndern As System.Windows.Forms.Button Friend WithEvents btnTV As System.Windows.Forms.Button - Friend WithEvents Button1 As System.Windows.Forms.Button + Friend WithEvents btnSndErstellen As System.Windows.Forms.Button Friend WithEvents grpAktVerzollung As System.Windows.Forms.GroupBox Friend WithEvents lnlSendungText As System.Windows.Forms.Label Friend WithEvents txtSendungen As VERAG_PROG_ALLGEMEIN.MyTextBox @@ -2388,19 +2388,19 @@ Partial Class usrcntlAktDetails Friend WithEvents btnFormulare As System.Windows.Forms.Button Friend WithEvents btnLkwBeleg As System.Windows.Forms.Button Friend WithEvents Button7 As System.Windows.Forms.Button - Friend WithEvents Button8 As System.Windows.Forms.Button + Friend WithEvents btnSA_Gestellung As System.Windows.Forms.Button Friend WithEvents Panel4 As Panel - Friend WithEvents btnKasse_User As Button - Friend WithEvents btnKasse_LG As Button + Friend WithEvents btnDipoListe As Button + Friend WithEvents btnDispohaft As Button Friend WithEvents tbAnhang As TabPage Friend WithEvents Button18 As Button - Friend WithEvents Button9 As Button + Friend WithEvents btnDipoListeEmail As Button Friend WithEvents btnLZDruck As Button Friend WithEvents cboFormulareRgAn As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents Label4 As Label - Friend WithEvents Button11 As Button + Friend WithEvents btnAlleAkendeckel As Button Friend WithEvents HervorhebenToolStripMenuItem As ToolStripMenuItem - Friend WithEvents Button12 As Button + Friend WithEvents btnAlleSteuerbescheide As Button Friend WithEvents cbxAlleFirmen As CheckBox Friend WithEvents btnSendungslisteUNISPED As Button Friend WithEvents Button14 As Button diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index afa3b85..51c6278 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -236,6 +236,24 @@ Public Class usrcntlAktDetails btnErfasst.Visible = True End If + + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("WARENORT", "AVISO") Then + btnOptionen.Enabled = False + btnLkwBeleg.Visible = False + tbcntlVermerke.TabPages.Remove(tbAnhang) + + btnDipoListeEmail.Visible = False + btnLZDruckDIGITAL.Visible = False + btnAlleAkendeckel.Visible = False + + btnAlleSteuerbescheide.Visible = False + btnDispohaft.Visible = False + btnSA_Gestellung.Visible = False + btnSndErstellen.Enabled = False + + End If + + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN", Me.FindForm) Then Button2.Visible = True End If @@ -245,7 +263,7 @@ Public Class usrcntlAktDetails 'End If If VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG = "WAI" Then - Button8.Text = "Gest.Liste" + btnSA_Gestellung.Text = "Gest.Liste" End If VERAG_PROG_ALLGEMEIN.cAllgemein._TRANSLATE(Me) End Sub @@ -634,7 +652,7 @@ Public Class usrcntlAktDetails r.Cells("Abfertigungsart").Value = r.Cells("tblSnd_FremdspeditionText").Value Else 'Nomal r.Cells("Abfertigungsart").Value = ADMIN.getValueTxtBySql("SELECT Abfertigungsbezeichnung FROM Abfertigungsarten WHERE [Abfertigungsart]='" & r.Cells("tblSnd_Abfertigungsart_ID").Value.ToString & "'", "FMZOLL") - If r.Cells("Abfertigungsart").Value.ToString.Length > 15 Then r.Cells("Abfertigungsart").Value = r.Cells("Abfertigungsart").Value.Substring(0, 15) & ".." + If r.Cells("Abfertigungsart").Value.ToString.Length > 15 Then r.Cells("Abfertigungsart").Value = r.Cells("Abfertigungsart").Value.Substring(0, 15) & ".." End If r.Cells("FilialenNr").Style.ForeColor = Color.White @@ -793,7 +811,7 @@ Public Class usrcntlAktDetails gridVermerke.Columns.Clear() lblInfoAviso.Visible = False infotxt = "" - ' MsgBox("SO") + ' MsgBox("SO") ' If setAkive_AuswahlID() = -1 Then Exit Sub If AvisoID <= 0 Then Exit Sub @@ -1578,6 +1596,10 @@ Public Class usrcntlAktDetails ' Private Sub Button7_Click(sender As Object, e As EventArgs) Handles Button7.Click Private Sub dgvSendungen_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvSendungen.CellDoubleClick + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("WARENORT", "AVISO") Then + Exit Sub + End If + Dim sendId = -1 If dgvSendungen.SelectedRows.Count > 0 Then sendId = dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value @@ -2575,7 +2597,7 @@ Public Class usrcntlAktDetails End Sub - Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles Button1.Click + Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles btnSndErstellen.Click 'Die Sendungen eintragen: If IsNumeric(txtSendungen.Text) And IsNumeric(txtSndFiskalAT.Text) And IsNumeric(txtSndFiskalDE.Text) And IsNumeric(txtSndFremd.Text) Then 'AndAlso txtSendungen.Text > 0 Then Dim filiale_tmp As Integer = 0 @@ -2778,12 +2800,12 @@ Public Class usrcntlAktDetails End If End Sub - Private Sub Button8_Click_2(sender As Object, e As EventArgs) Handles Button8.Click + Private Sub Button8_Click_2(sender As Object, e As EventArgs) Handles btnSA_Gestellung.Click SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.SA_Gestellung, FraechterKdNr, {AvisoID}) Panel4.Visible = False End Sub - Private Sub btnKasse_LG_Click(sender As Object, e As EventArgs) Handles btnKasse_LG.Click + Private Sub btnKasse_LG_Click(sender As Object, e As EventArgs) Handles btnDispohaft.Click If DispolisteVermerk() Then SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.DispoListe, FraechterKdNr, {AvisoID}) Panel4.Visible = False @@ -2799,7 +2821,7 @@ Public Class usrcntlAktDetails End If Return True End Function - Private Sub btnKasse_User_Click(sender As Object, e As EventArgs) Handles Button9.Click + Private Sub btnKasse_User_Click(sender As Object, e As EventArgs) Handles btnDipoListeEmail.Click If DispolisteVermerk() Then Dim path = SDL.FormularManagerNEU.DispSendungslisteoListe(AvisoID, False,, cboFormulareRgAn._value) @@ -2866,7 +2888,7 @@ Public Class usrcntlAktDetails f.Show(Me) End Sub - Private Sub Button9_Click(sender As Object, e As EventArgs) Handles btnKasse_User.Click + Private Sub Button9_Click(sender As Object, e As EventArgs) Handles btnDipoListe.Click If DispolisteVermerk() Then Dim path = SDL.FormularManagerNEU.DispSendungslisteoListe(AvisoID, False,, cboFormulareRgAn._value) If path <> "" And IO.File.Exists(path) Then Process.Start(path) @@ -3068,7 +3090,7 @@ Public Class usrcntlAktDetails pnlDetailsRechts.Cursor = Cursors.Default End Sub - Private Sub Button11_Click(sender As Object, e As EventArgs) Handles Button11.Click + Private Sub Button11_Click(sender As Object, e As EventArgs) Handles btnAlleAkendeckel.Click 'If vbYes = MsgBox("Möchten Sie alle Aktendeckel drucken?", vbYesNoCancel) Then ' Me.Cursor = Cursors.WaitCursor @@ -3194,7 +3216,7 @@ Public Class usrcntlAktDetails Vermerke_anzeigen(index) End Sub - Private Sub Button12_Click(sender As Object, e As EventArgs) Handles Button12.Click + Private Sub Button12_Click(sender As Object, e As EventArgs) Handles btnAlleSteuerbescheide.Click Try If vbYes = MsgBox("Möchten Sie alle Steuerbescheide drucken?", vbYesNoCancel) Then diff --git a/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb b/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb index fa0a9c8..a604905 100644 --- a/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb +++ b/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb @@ -23,27 +23,27 @@ Partial Class usrcntlAktDetailsATILLANeu _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle66 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle67 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle68 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle69 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle70 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle71 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle72 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle73 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle74 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle75 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle76 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle77 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle78 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle79 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle80 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrcntlAktDetailsATILLANeu)) - Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle61 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle62 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle63 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle64 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle65 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.pnlDetailsRechts = New System.Windows.Forms.Panel() Me.Panel3 = New System.Windows.Forms.Panel() Me.SplitContainer = New System.Windows.Forms.SplitContainer() @@ -105,7 +105,6 @@ Partial Class usrcntlAktDetailsATILLANeu Me.Panel9 = New System.Windows.Forms.Panel() Me.btnErfasst = New System.Windows.Forms.Button() Me.lblTimeErfasst = New System.Windows.Forms.Label() - Me.Panel10 = New System.Windows.Forms.Panel() Me.Panel6 = New System.Windows.Forms.Panel() Me.btnVERIMEX = New System.Windows.Forms.Button() Me.Label7 = New System.Windows.Forms.Label() @@ -141,6 +140,12 @@ Partial Class usrcntlAktDetailsATILLANeu Me.UmbenennenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.LöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AusZwischenablageEinfügenPasteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.Panel14 = New System.Windows.Forms.Panel() + Me.btnAnVerimex = New System.Windows.Forms.Button() + Me.Label8 = New System.Windows.Forms.Label() + Me.Panel15 = New System.Windows.Forms.Panel() + Me.btnAnIndonesien = New System.Windows.Forms.Button() + Me.Label11 = New System.Windows.Forms.Label() Me.pnlDetailsRechts.SuspendLayout() Me.Panel3.SuspendLayout() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() @@ -178,6 +183,8 @@ Partial Class usrcntlAktDetailsATILLANeu Me.cntxtFormulare.SuspendLayout() Me.cntxtZollantrag.SuspendLayout() Me.cntxt.SuspendLayout() + Me.Panel14.SuspendLayout() + Me.Panel15.SuspendLayout() Me.SuspendLayout() ' 'pnlDetailsRechts @@ -202,9 +209,9 @@ Partial Class usrcntlAktDetailsATILLANeu Me.Panel3.Controls.Add(Me.SplitContainer) Me.Panel3.Controls.Add(Me.Panel8) Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill - Me.Panel3.Location = New System.Drawing.Point(0, 160) + Me.Panel3.Location = New System.Drawing.Point(0, 197) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(575, 487) + Me.Panel3.Size = New System.Drawing.Size(575, 450) Me.Panel3.TabIndex = 91 ' 'SplitContainer @@ -226,8 +233,8 @@ Partial Class usrcntlAktDetailsATILLANeu Me.SplitContainer.Panel2.Controls.Add(Me.gridVermerke) Me.SplitContainer.Panel2.Controls.Add(Me.pnlVermerkeTop) Me.SplitContainer.Panel2.Controls.Add(Me.addVermerk) - Me.SplitContainer.Size = New System.Drawing.Size(575, 321) - Me.SplitContainer.SplitterDistance = 207 + Me.SplitContainer.Size = New System.Drawing.Size(575, 284) + Me.SplitContainer.SplitterDistance = 183 Me.SplitContainer.TabIndex = 91 ' 'tbcntr @@ -240,7 +247,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.tbcntr.Location = New System.Drawing.Point(0, 0) Me.tbcntr.Name = "tbcntr" Me.tbcntr.SelectedIndex = 0 - Me.tbcntr.Size = New System.Drawing.Size(575, 207) + Me.tbcntr.Size = New System.Drawing.Size(575, 183) Me.tbcntr.TabIndex = 100 ' 'tbVermerke @@ -249,7 +256,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.tbVermerke.Location = New System.Drawing.Point(4, 22) Me.tbVermerke.Name = "tbVermerke" Me.tbVermerke.Padding = New System.Windows.Forms.Padding(3) - Me.tbVermerke.Size = New System.Drawing.Size(567, 181) + Me.tbVermerke.Size = New System.Drawing.Size(567, 157) Me.tbVermerke.TabIndex = 0 Me.tbVermerke.Text = "Vermerk eintragen" Me.tbVermerke.UseVisualStyleBackColor = True @@ -262,7 +269,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.UsrCntlVermerkeATilla1.Location = New System.Drawing.Point(3, 3) Me.UsrCntlVermerkeATilla1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.UsrCntlVermerkeATilla1.Name = "UsrCntlVermerkeATilla1" - Me.UsrCntlVermerkeATilla1.Size = New System.Drawing.Size(561, 175) + Me.UsrCntlVermerkeATilla1.Size = New System.Drawing.Size(561, 151) Me.UsrCntlVermerkeATilla1.TabIndex = 0 ' 'tbZollanmeldungen @@ -291,44 +298,44 @@ Partial Class usrcntlAktDetailsATILLANeu Me.dgvZollAnmeldungen.AllowUserToAddRows = False Me.dgvZollAnmeldungen.AllowUserToDeleteRows = False Me.dgvZollAnmeldungen.AllowUserToResizeRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvZollAnmeldungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle66.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle66.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvZollAnmeldungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle66 Me.dgvZollAnmeldungen.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle2.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle2.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvZollAnmeldungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle67.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle67.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle67.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle67.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle67.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle67.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle67.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvZollAnmeldungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle67 Me.dgvZollAnmeldungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvZollAnmeldungen.DefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle68.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle68.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle68.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle68.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle68.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle68.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle68.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvZollAnmeldungen.DefaultCellStyle = DataGridViewCellStyle68 Me.dgvZollAnmeldungen.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvZollAnmeldungen.Location = New System.Drawing.Point(0, 31) Me.dgvZollAnmeldungen.MultiSelect = False Me.dgvZollAnmeldungen.Name = "dgvZollAnmeldungen" Me.dgvZollAnmeldungen.ReadOnly = True - DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvZollAnmeldungen.RowHeadersDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle69.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle69.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle69.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle69.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle69.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle69.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle69.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvZollAnmeldungen.RowHeadersDefaultCellStyle = DataGridViewCellStyle69 Me.dgvZollAnmeldungen.RowHeadersVisible = False Me.dgvZollAnmeldungen.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvZollAnmeldungen.RowsDefaultCellStyle = DataGridViewCellStyle5 + DataGridViewCellStyle70.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvZollAnmeldungen.RowsDefaultCellStyle = DataGridViewCellStyle70 Me.dgvZollAnmeldungen.RowTemplate.Height = 20 Me.dgvZollAnmeldungen.RowTemplate.ReadOnly = True Me.dgvZollAnmeldungen.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -390,44 +397,44 @@ Partial Class usrcntlAktDetailsATILLANeu Me.dgvSpeditionsbuch.AllowUserToAddRows = False Me.dgvSpeditionsbuch.AllowUserToDeleteRows = False Me.dgvSpeditionsbuch.AllowUserToResizeRows = False - DataGridViewCellStyle6.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSpeditionsbuch.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6 + DataGridViewCellStyle71.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle71.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSpeditionsbuch.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle71 Me.dgvSpeditionsbuch.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle7.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle7.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSpeditionsbuch.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle7 + DataGridViewCellStyle72.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle72.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle72.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle72.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle72.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle72.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle72.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSpeditionsbuch.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle72 Me.dgvSpeditionsbuch.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvSpeditionsbuch.DefaultCellStyle = DataGridViewCellStyle8 + DataGridViewCellStyle73.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle73.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle73.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle73.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle73.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle73.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle73.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvSpeditionsbuch.DefaultCellStyle = DataGridViewCellStyle73 Me.dgvSpeditionsbuch.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvSpeditionsbuch.Location = New System.Drawing.Point(3, 34) Me.dgvSpeditionsbuch.MultiSelect = False Me.dgvSpeditionsbuch.Name = "dgvSpeditionsbuch" Me.dgvSpeditionsbuch.ReadOnly = True - DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSpeditionsbuch.RowHeadersDefaultCellStyle = DataGridViewCellStyle9 + DataGridViewCellStyle74.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle74.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle74.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle74.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle74.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle74.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle74.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSpeditionsbuch.RowHeadersDefaultCellStyle = DataGridViewCellStyle74 Me.dgvSpeditionsbuch.RowHeadersVisible = False Me.dgvSpeditionsbuch.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSpeditionsbuch.RowsDefaultCellStyle = DataGridViewCellStyle10 + DataGridViewCellStyle75.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSpeditionsbuch.RowsDefaultCellStyle = DataGridViewCellStyle75 Me.dgvSpeditionsbuch.RowTemplate.Height = 20 Me.dgvSpeditionsbuch.RowTemplate.ReadOnly = True Me.dgvSpeditionsbuch.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -489,43 +496,43 @@ Partial Class usrcntlAktDetailsATILLANeu Me.dgvanhaenge.AllowUserToAddRows = False Me.dgvanhaenge.AllowUserToDeleteRows = False Me.dgvanhaenge.AllowUserToResizeRows = False - DataGridViewCellStyle11.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvanhaenge.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11 + DataGridViewCellStyle76.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle76.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvanhaenge.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle76 Me.dgvanhaenge.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle12.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle12.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvanhaenge.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle12 + DataGridViewCellStyle77.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle77.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle77.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle77.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle77.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle77.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle77.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvanhaenge.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle77 Me.dgvanhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvanhaenge.DefaultCellStyle = DataGridViewCellStyle13 + DataGridViewCellStyle78.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle78.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle78.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle78.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle78.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle78.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle78.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvanhaenge.DefaultCellStyle = DataGridViewCellStyle78 Me.dgvanhaenge.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvanhaenge.Location = New System.Drawing.Point(3, 3) Me.dgvanhaenge.Name = "dgvanhaenge" Me.dgvanhaenge.ReadOnly = True - DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvanhaenge.RowHeadersDefaultCellStyle = DataGridViewCellStyle14 + DataGridViewCellStyle79.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle79.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle79.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle79.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle79.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle79.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle79.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvanhaenge.RowHeadersDefaultCellStyle = DataGridViewCellStyle79 Me.dgvanhaenge.RowHeadersVisible = False Me.dgvanhaenge.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvanhaenge.RowsDefaultCellStyle = DataGridViewCellStyle15 + DataGridViewCellStyle80.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvanhaenge.RowsDefaultCellStyle = DataGridViewCellStyle80 Me.dgvanhaenge.RowTemplate.Height = 30 Me.dgvanhaenge.RowTemplate.ReadOnly = True Me.dgvanhaenge.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -612,7 +619,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.Panel7.Location = New System.Drawing.Point(4, 19) Me.Panel7.MaximumSize = New System.Drawing.Size(2, 250) Me.Panel7.Name = "Panel7" - Me.Panel7.Size = New System.Drawing.Size(1, 79) + Me.Panel7.Size = New System.Drawing.Size(1, 250) Me.Panel7.TabIndex = 15 ' 'gridVermerke @@ -620,51 +627,51 @@ Partial Class usrcntlAktDetailsATILLANeu Me.gridVermerke.AllowUserToAddRows = False Me.gridVermerke.AllowUserToDeleteRows = False Me.gridVermerke.AllowUserToResizeRows = False - DataGridViewCellStyle16.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle16 + DataGridViewCellStyle61.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle61.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle61 Me.gridVermerke.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle17.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle17.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle17 + DataGridViewCellStyle62.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle62.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle62.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle62.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle62.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle62.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle62.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle62 Me.gridVermerke.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridVermerke.DefaultCellStyle = DataGridViewCellStyle18 + DataGridViewCellStyle63.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle63.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle63.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle63.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle63.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle63.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle63.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridVermerke.DefaultCellStyle = DataGridViewCellStyle63 Me.gridVermerke.Dock = System.Windows.Forms.DockStyle.Fill Me.gridVermerke.Location = New System.Drawing.Point(0, 29) Me.gridVermerke.MultiSelect = False Me.gridVermerke.Name = "gridVermerke" Me.gridVermerke.ReadOnly = True - DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.RowHeadersDefaultCellStyle = DataGridViewCellStyle19 + DataGridViewCellStyle64.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle64.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle64.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle64.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle64.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle64.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle64.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.RowHeadersDefaultCellStyle = DataGridViewCellStyle64 Me.gridVermerke.RowHeadersVisible = False Me.gridVermerke.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle20 + DataGridViewCellStyle65.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle65 Me.gridVermerke.RowTemplate.Height = 20 Me.gridVermerke.RowTemplate.ReadOnly = True Me.gridVermerke.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] Me.gridVermerke.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.gridVermerke.ShowCellErrors = False Me.gridVermerke.ShowRowErrors = False - Me.gridVermerke.Size = New System.Drawing.Size(575, 81) + Me.gridVermerke.Size = New System.Drawing.Size(575, 68) Me.gridVermerke.TabIndex = 70 Me.gridVermerke.TabStop = False ' @@ -1124,16 +1131,17 @@ Partial Class usrcntlAktDetailsATILLANeu ' Me.FlowLayoutPanel.AutoSize = True Me.FlowLayoutPanel.Controls.Add(Me.Panel9) - Me.FlowLayoutPanel.Controls.Add(Me.Panel10) - Me.FlowLayoutPanel.Controls.Add(Me.Panel6) Me.FlowLayoutPanel.Controls.Add(Me.Panel13) Me.FlowLayoutPanel.Controls.Add(Me.Panel11) + Me.FlowLayoutPanel.Controls.Add(Me.Panel14) + Me.FlowLayoutPanel.Controls.Add(Me.Panel15) Me.FlowLayoutPanel.Controls.Add(Me.Panel12) Me.FlowLayoutPanel.Controls.Add(Me.Panel2) + Me.FlowLayoutPanel.Controls.Add(Me.Panel6) Me.FlowLayoutPanel.Dock = System.Windows.Forms.DockStyle.Top Me.FlowLayoutPanel.Location = New System.Drawing.Point(0, 36) Me.FlowLayoutPanel.Name = "FlowLayoutPanel" - Me.FlowLayoutPanel.Size = New System.Drawing.Size(575, 124) + Me.FlowLayoutPanel.Size = New System.Drawing.Size(575, 161) Me.FlowLayoutPanel.TabIndex = 13 ' 'Panel9 @@ -1142,8 +1150,9 @@ Partial Class usrcntlAktDetailsATILLANeu Me.Panel9.Controls.Add(Me.btnErfasst) Me.Panel9.Controls.Add(Me.lblTimeErfasst) Me.Panel9.Location = New System.Drawing.Point(3, 3) + Me.Panel9.Margin = New System.Windows.Forms.Padding(3, 3, 2, 3) Me.Panel9.Name = "Panel9" - Me.Panel9.Size = New System.Drawing.Size(100, 74) + Me.Panel9.Size = New System.Drawing.Size(90, 74) Me.Panel9.TabIndex = 15 ' 'btnErfasst @@ -1153,13 +1162,13 @@ Partial Class usrcntlAktDetailsATILLANeu Me.btnErfasst.Cursor = System.Windows.Forms.Cursors.Hand Me.btnErfasst.Dock = System.Windows.Forms.DockStyle.Fill Me.btnErfasst.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnErfasst.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnErfasst.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) Me.btnErfasst.ForeColor = System.Drawing.Color.White Me.btnErfasst.Location = New System.Drawing.Point(0, 0) Me.btnErfasst.Margin = New System.Windows.Forms.Padding(0) - Me.btnErfasst.MinimumSize = New System.Drawing.Size(100, 0) + Me.btnErfasst.MinimumSize = New System.Drawing.Size(90, 0) Me.btnErfasst.Name = "btnErfasst" - Me.btnErfasst.Size = New System.Drawing.Size(100, 62) + Me.btnErfasst.Size = New System.Drawing.Size(90, 62) Me.btnErfasst.TabIndex = 12 Me.btnErfasst.Text = "1. " & Global.Microsoft.VisualBasic.ChrW(10) & "ERFASST" Me.btnErfasst.UseVisualStyleBackColor = False @@ -1170,28 +1179,21 @@ Partial Class usrcntlAktDetailsATILLANeu Me.lblTimeErfasst.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblTimeErfasst.Location = New System.Drawing.Point(0, 62) Me.lblTimeErfasst.Name = "lblTimeErfasst" - Me.lblTimeErfasst.Size = New System.Drawing.Size(100, 12) + Me.lblTimeErfasst.Size = New System.Drawing.Size(90, 12) Me.lblTimeErfasst.TabIndex = 0 Me.lblTimeErfasst.Text = "-" Me.lblTimeErfasst.TextAlign = System.Drawing.ContentAlignment.TopCenter ' - 'Panel10 - ' - Me.Panel10.AutoSize = True - Me.Panel10.Location = New System.Drawing.Point(109, 3) - Me.Panel10.Name = "Panel10" - Me.Panel10.Size = New System.Drawing.Size(0, 0) - Me.Panel10.TabIndex = 16 - ' 'Panel6 ' Me.Panel6.AutoSize = True Me.Panel6.Controls.Add(Me.btnVERIMEX) Me.Panel6.Controls.Add(Me.Label7) - Me.Panel6.Location = New System.Drawing.Point(115, 3) + Me.Panel6.Location = New System.Drawing.Point(75, 84) Me.Panel6.Name = "Panel6" Me.Panel6.Size = New System.Drawing.Size(111, 74) Me.Panel6.TabIndex = 19 + Me.Panel6.Visible = False ' 'btnVERIMEX ' @@ -1200,7 +1202,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.btnVERIMEX.Cursor = System.Windows.Forms.Cursors.Hand Me.btnVERIMEX.Dock = System.Windows.Forms.DockStyle.Fill Me.btnVERIMEX.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnVERIMEX.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnVERIMEX.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) Me.btnVERIMEX.ForeColor = System.Drawing.Color.White Me.btnVERIMEX.Location = New System.Drawing.Point(0, 0) Me.btnVERIMEX.Margin = New System.Windows.Forms.Padding(0) @@ -1227,9 +1229,10 @@ Partial Class usrcntlAktDetailsATILLANeu Me.Panel13.AutoSize = True Me.Panel13.Controls.Add(Me.btnVorgeschrieben) Me.Panel13.Controls.Add(Me.lblTimeVorgeschreiben) - Me.Panel13.Location = New System.Drawing.Point(232, 3) + Me.Panel13.Location = New System.Drawing.Point(97, 3) + Me.Panel13.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.Panel13.Name = "Panel13" - Me.Panel13.Size = New System.Drawing.Size(112, 75) + Me.Panel13.Size = New System.Drawing.Size(98, 75) Me.Panel13.TabIndex = 17 ' 'btnVorgeschrieben @@ -1239,13 +1242,13 @@ Partial Class usrcntlAktDetailsATILLANeu Me.btnVorgeschrieben.Cursor = System.Windows.Forms.Cursors.Hand Me.btnVorgeschrieben.Dock = System.Windows.Forms.DockStyle.Fill Me.btnVorgeschrieben.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnVorgeschrieben.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnVorgeschrieben.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) Me.btnVorgeschrieben.ForeColor = System.Drawing.Color.White Me.btnVorgeschrieben.Location = New System.Drawing.Point(0, 0) Me.btnVorgeschrieben.Margin = New System.Windows.Forms.Padding(0) - Me.btnVorgeschrieben.MinimumSize = New System.Drawing.Size(100, 0) + Me.btnVorgeschrieben.MinimumSize = New System.Drawing.Size(90, 0) Me.btnVorgeschrieben.Name = "btnVorgeschrieben" - Me.btnVorgeschrieben.Size = New System.Drawing.Size(112, 62) + Me.btnVorgeschrieben.Size = New System.Drawing.Size(98, 62) Me.btnVorgeschrieben.TabIndex = 14 Me.btnVorgeschrieben.Text = "3." & Global.Microsoft.VisualBasic.ChrW(10) & "VORGESCHR." Me.btnVorgeschrieben.UseVisualStyleBackColor = False @@ -1256,7 +1259,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.lblTimeVorgeschreiben.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblTimeVorgeschreiben.Location = New System.Drawing.Point(0, 62) Me.lblTimeVorgeschreiben.Name = "lblTimeVorgeschreiben" - Me.lblTimeVorgeschreiben.Size = New System.Drawing.Size(112, 13) + Me.lblTimeVorgeschreiben.Size = New System.Drawing.Size(98, 13) Me.lblTimeVorgeschreiben.TabIndex = 0 Me.lblTimeVorgeschreiben.Text = "-" Me.lblTimeVorgeschreiben.TextAlign = System.Drawing.ContentAlignment.TopCenter @@ -1266,9 +1269,10 @@ Partial Class usrcntlAktDetailsATILLANeu Me.Panel11.AutoSize = True Me.Panel11.Controls.Add(Me.btnAnkunft) Me.Panel11.Controls.Add(Me.lblTimeAnkunft) - Me.Panel11.Location = New System.Drawing.Point(350, 3) + Me.Panel11.Location = New System.Drawing.Point(199, 3) + Me.Panel11.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.Panel11.Name = "Panel11" - Me.Panel11.Size = New System.Drawing.Size(100, 75) + Me.Panel11.Size = New System.Drawing.Size(90, 75) Me.Panel11.TabIndex = 17 ' 'btnAnkunft @@ -1278,13 +1282,13 @@ Partial Class usrcntlAktDetailsATILLANeu Me.btnAnkunft.Cursor = System.Windows.Forms.Cursors.Hand Me.btnAnkunft.Dock = System.Windows.Forms.DockStyle.Fill Me.btnAnkunft.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnAnkunft.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnAnkunft.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) Me.btnAnkunft.ForeColor = System.Drawing.Color.White Me.btnAnkunft.Location = New System.Drawing.Point(0, 0) Me.btnAnkunft.Margin = New System.Windows.Forms.Padding(0) - Me.btnAnkunft.MinimumSize = New System.Drawing.Size(100, 0) + Me.btnAnkunft.MinimumSize = New System.Drawing.Size(90, 0) Me.btnAnkunft.Name = "btnAnkunft" - Me.btnAnkunft.Size = New System.Drawing.Size(100, 62) + Me.btnAnkunft.Size = New System.Drawing.Size(90, 62) Me.btnAnkunft.TabIndex = 12 Me.btnAnkunft.Text = "4." & Global.Microsoft.VisualBasic.ChrW(10) & "ANKUNFT" Me.btnAnkunft.UseVisualStyleBackColor = False @@ -1295,7 +1299,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.lblTimeAnkunft.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblTimeAnkunft.Location = New System.Drawing.Point(0, 62) Me.lblTimeAnkunft.Name = "lblTimeAnkunft" - Me.lblTimeAnkunft.Size = New System.Drawing.Size(100, 13) + Me.lblTimeAnkunft.Size = New System.Drawing.Size(90, 13) Me.lblTimeAnkunft.TabIndex = 0 Me.lblTimeAnkunft.Text = "-" Me.lblTimeAnkunft.TextAlign = System.Drawing.ContentAlignment.TopCenter @@ -1305,9 +1309,10 @@ Partial Class usrcntlAktDetailsATILLANeu Me.Panel12.AutoSize = True Me.Panel12.Controls.Add(Me.btnFreigabe) Me.Panel12.Controls.Add(Me.lblTimeFreigabe) - Me.Panel12.Location = New System.Drawing.Point(456, 3) + Me.Panel12.Location = New System.Drawing.Point(475, 3) + Me.Panel12.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) Me.Panel12.Name = "Panel12" - Me.Panel12.Size = New System.Drawing.Size(100, 74) + Me.Panel12.Size = New System.Drawing.Size(90, 74) Me.Panel12.TabIndex = 17 ' 'btnFreigabe @@ -1317,13 +1322,13 @@ Partial Class usrcntlAktDetailsATILLANeu Me.btnFreigabe.Cursor = System.Windows.Forms.Cursors.Hand Me.btnFreigabe.Dock = System.Windows.Forms.DockStyle.Fill Me.btnFreigabe.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnFreigabe.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnFreigabe.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) Me.btnFreigabe.ForeColor = System.Drawing.Color.White Me.btnFreigabe.Location = New System.Drawing.Point(0, 0) Me.btnFreigabe.Margin = New System.Windows.Forms.Padding(0) - Me.btnFreigabe.MinimumSize = New System.Drawing.Size(100, 0) + Me.btnFreigabe.MinimumSize = New System.Drawing.Size(90, 0) Me.btnFreigabe.Name = "btnFreigabe" - Me.btnFreigabe.Size = New System.Drawing.Size(100, 62) + Me.btnFreigabe.Size = New System.Drawing.Size(90, 62) Me.btnFreigabe.TabIndex = 12 Me.btnFreigabe.Text = "5." & Global.Microsoft.VisualBasic.ChrW(10) & "FREIGABE" Me.btnFreigabe.UseVisualStyleBackColor = False @@ -1334,7 +1339,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.lblTimeFreigabe.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblTimeFreigabe.Location = New System.Drawing.Point(0, 62) Me.lblTimeFreigabe.Name = "lblTimeFreigabe" - Me.lblTimeFreigabe.Size = New System.Drawing.Size(100, 12) + Me.lblTimeFreigabe.Size = New System.Drawing.Size(90, 12) Me.lblTimeFreigabe.TabIndex = 0 Me.lblTimeFreigabe.Text = "-" Me.lblTimeFreigabe.TextAlign = System.Drawing.ContentAlignment.TopCenter @@ -1355,7 +1360,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.btnNichtEingetroffen.Cursor = System.Windows.Forms.Cursors.Hand Me.btnNichtEingetroffen.Dock = System.Windows.Forms.DockStyle.Fill Me.btnNichtEingetroffen.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnNichtEingetroffen.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnNichtEingetroffen.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) Me.btnNichtEingetroffen.ForeColor = System.Drawing.Color.White Me.btnNichtEingetroffen.Location = New System.Drawing.Point(0, 0) Me.btnNichtEingetroffen.Margin = New System.Windows.Forms.Padding(0) @@ -1534,6 +1539,88 @@ Partial Class usrcntlAktDetailsATILLANeu Me.AusZwischenablageEinfügenPasteToolStripMenuItem.Size = New System.Drawing.Size(279, 30) Me.AusZwischenablageEinfügenPasteToolStripMenuItem.Text = "Aus Zwischenablage einfügen (Paste)" ' + 'Panel14 + ' + Me.Panel14.AutoSize = True + Me.Panel14.Controls.Add(Me.btnAnVerimex) + Me.Panel14.Controls.Add(Me.Label8) + Me.Panel14.Location = New System.Drawing.Point(293, 3) + Me.Panel14.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.Panel14.Name = "Panel14" + Me.Panel14.Size = New System.Drawing.Size(80, 75) + Me.Panel14.TabIndex = 20 + Me.Panel14.Visible = False + ' + 'btnAnVerimex + ' + Me.btnAnVerimex.AutoSize = True + Me.btnAnVerimex.BackColor = System.Drawing.Color.SteelBlue + Me.btnAnVerimex.Cursor = System.Windows.Forms.Cursors.Hand + Me.btnAnVerimex.Dock = System.Windows.Forms.DockStyle.Fill + Me.btnAnVerimex.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnAnVerimex.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) + Me.btnAnVerimex.ForeColor = System.Drawing.Color.White + Me.btnAnVerimex.Location = New System.Drawing.Point(0, 0) + Me.btnAnVerimex.Margin = New System.Windows.Forms.Padding(0) + Me.btnAnVerimex.MinimumSize = New System.Drawing.Size(80, 0) + Me.btnAnVerimex.Name = "btnAnVerimex" + Me.btnAnVerimex.Size = New System.Drawing.Size(80, 62) + Me.btnAnVerimex.TabIndex = 12 + Me.btnAnVerimex.Text = "An:" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "VERIMEX" + Me.btnAnVerimex.UseVisualStyleBackColor = False + ' + 'Label8 + ' + Me.Label8.Dock = System.Windows.Forms.DockStyle.Bottom + Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label8.Location = New System.Drawing.Point(0, 62) + Me.Label8.Name = "Label8" + Me.Label8.Size = New System.Drawing.Size(80, 13) + Me.Label8.TabIndex = 0 + Me.Label8.Text = "-" + Me.Label8.TextAlign = System.Drawing.ContentAlignment.TopCenter + ' + 'Panel15 + ' + Me.Panel15.AutoSize = True + Me.Panel15.Controls.Add(Me.btnAnIndonesien) + Me.Panel15.Controls.Add(Me.Label11) + Me.Panel15.Location = New System.Drawing.Point(377, 3) + Me.Panel15.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.Panel15.Name = "Panel15" + Me.Panel15.Size = New System.Drawing.Size(94, 75) + Me.Panel15.TabIndex = 21 + Me.Panel15.Visible = False + ' + 'btnAnIndonesien + ' + Me.btnAnIndonesien.AutoSize = True + Me.btnAnIndonesien.BackColor = System.Drawing.Color.SteelBlue + Me.btnAnIndonesien.Cursor = System.Windows.Forms.Cursors.Hand + Me.btnAnIndonesien.Dock = System.Windows.Forms.DockStyle.Fill + Me.btnAnIndonesien.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnAnIndonesien.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) + Me.btnAnIndonesien.ForeColor = System.Drawing.Color.White + Me.btnAnIndonesien.Location = New System.Drawing.Point(0, 0) + Me.btnAnIndonesien.Margin = New System.Windows.Forms.Padding(0) + Me.btnAnIndonesien.MinimumSize = New System.Drawing.Size(80, 0) + Me.btnAnIndonesien.Name = "btnAnIndonesien" + Me.btnAnIndonesien.Size = New System.Drawing.Size(94, 62) + Me.btnAnIndonesien.TabIndex = 12 + Me.btnAnIndonesien.Text = "An:" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "INDONESIEN" + Me.btnAnIndonesien.UseVisualStyleBackColor = False + ' + 'Label11 + ' + Me.Label11.Dock = System.Windows.Forms.DockStyle.Bottom + Me.Label11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label11.Location = New System.Drawing.Point(0, 62) + Me.Label11.Name = "Label11" + Me.Label11.Size = New System.Drawing.Size(94, 13) + Me.Label11.TabIndex = 0 + Me.Label11.Text = "-" + Me.Label11.TextAlign = System.Drawing.ContentAlignment.TopCenter + ' 'usrcntlAktDetailsATILLANeu ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1592,6 +1679,10 @@ Partial Class usrcntlAktDetailsATILLANeu Me.cntxtFormulare.ResumeLayout(False) Me.cntxtZollantrag.ResumeLayout(False) Me.cntxt.ResumeLayout(False) + Me.Panel14.ResumeLayout(False) + Me.Panel14.PerformLayout() + Me.Panel15.ResumeLayout(False) + Me.Panel15.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -1607,7 +1698,6 @@ Partial Class usrcntlAktDetailsATILLANeu Friend WithEvents Panel9 As System.Windows.Forms.Panel Friend WithEvents btnErfasst As System.Windows.Forms.Button Friend WithEvents lblTimeErfasst As System.Windows.Forms.Label - Friend WithEvents Panel10 As System.Windows.Forms.Panel Friend WithEvents Panel13 As System.Windows.Forms.Panel Friend WithEvents btnVorgeschrieben As System.Windows.Forms.Button Friend WithEvents lblTimeVorgeschreiben As System.Windows.Forms.Label @@ -1693,4 +1783,10 @@ Partial Class usrcntlAktDetailsATILLANeu Friend WithEvents Panel6 As Panel Friend WithEvents btnVERIMEX As Button Friend WithEvents Label7 As Label + Friend WithEvents Panel14 As Panel + Friend WithEvents btnAnVerimex As Button + Friend WithEvents Label8 As Label + Friend WithEvents Panel15 As Panel + Friend WithEvents btnAnIndonesien As Button + Friend WithEvents Label11 As Label End Class diff --git a/Aviso/usrcntlAktDetailsATILLANeu.resx b/Aviso/usrcntlAktDetailsATILLANeu.resx index ae757b4..a488ee9 100644 --- a/Aviso/usrcntlAktDetailsATILLANeu.resx +++ b/Aviso/usrcntlAktDetailsATILLANeu.resx @@ -118,6 +118,19 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAZ1JREFUOE+l + kTlLA0EYhvMTtLIyjbHzwsKI2rgeSSF4gUVEPIIgqIiCQSxsRJSYgC6mCBaKF4IW7tqYJsEjaFBEC0nU + WGoniKlMxNfMhFmS7BjdtXiGnW+/9+Fd1gBAN/GuCRDeO0Zv2Uy19FeIKDG/irf2EUSt/Tit60yOdQpD + oWtF9mDpw3FtB3bLGyGazF/cQC6ILBKJIhAI4r65F4GaNuyUCVg2mTFnrOCHfoLKwimZfOjD1vY+tksF + LBVVUZkmYUxuQDj8CL//DJJ8hI2tPTjdHjimZxUZ2eOGsyGy91MHntercSClZAuuFSpjsF1VOBsqO5mk + sidPJe6cJZh3ilwZISOcTXozJruaKcbJhJErI2Rc0onJgqrZJZGNG+EbLIBky0+uqXOqAYH3mbQZk3Xz + ZQTVQGm2pq0ZI+Pya7NfZATl4b/NGPTQ+wN40OPzwhtXNyvULCOkHoJevGwMJ/7TjGHA4dTX684Yzhd7 + sDlu/WDNDmx5yff8UC4MTZYW3IgD2HW0wm0X4LLXJ/Q0Y1AhQRyySLwFbcDwDUJWbE0CgQrjAAAAAElF + TkSuQmCC + + iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -167,19 +180,6 @@ 1q9bd3Hp0qWfE6i+kpLS3D+JP4ukpCQlLy9P0el0WbIeimS9GSSIXnBwsHlsbOyWrKys3Vwu9yCPx7MX CARHhELhMT6ff7SiosJe1M9ms3fHxcVtJVNvTsDLra2tNczNzeWZTKbEvHnzXlNETFB/AFyHwBGvedXw AAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAZ1JREFUOE+l - kTlLA0EYhvMTtLIyjbHzwsKI2rgeSSF4gUVEPIIgqIiCQSxsRJSYgC6mCBaKF4IW7tqYJsEjaFBEC0nU - WGoniKlMxNfMhFmS7BjdtXiGnW+/9+Fd1gBAN/GuCRDeO0Zv2Uy19FeIKDG/irf2EUSt/Tit60yOdQpD - oWtF9mDpw3FtB3bLGyGazF/cQC6ILBKJIhAI4r65F4GaNuyUCVg2mTFnrOCHfoLKwimZfOjD1vY+tksF - LBVVUZkmYUxuQDj8CL//DJJ8hI2tPTjdHjimZxUZ2eOGsyGy91MHntercSClZAuuFSpjsF1VOBsqO5mk - sidPJe6cJZh3ilwZISOcTXozJruaKcbJhJErI2Rc0onJgqrZJZGNG+EbLIBky0+uqXOqAYH3mbQZk3Xz - ZQTVQGm2pq0ZI+Pya7NfZATl4b/NGPTQ+wN40OPzwhtXNyvULCOkHoJevGwMJ/7TjGHA4dTX684Yzhd7 - sDlu/WDNDmx5yff8UC4MTZYW3IgD2HW0wm0X4LLXJ/Q0Y1AhQRyySLwFbcDwDUJWbE0CgQrjAAAAAElF - TkSuQmCC diff --git a/Aviso/usrcntlAktDetailsATILLANeu.vb b/Aviso/usrcntlAktDetailsATILLANeu.vb index cad8186..121d05c 100644 --- a/Aviso/usrcntlAktDetailsATILLANeu.vb +++ b/Aviso/usrcntlAktDetailsATILLANeu.vb @@ -233,15 +233,24 @@ Public Class usrcntlAktDetailsATILLANeu timer.Interval = 100 reload(AvisoID) If My.Computer.Screen.WorkingArea.Width < 1300 Then - btnAnkunft.Text = "ANKUNFT" - btnErfasst.Text = "ERFASST" - ' btnVorbereitet.Text = "VORB.QS" - btnVorgeschrieben.Text = "VORGESCHR." - btnFreigabe.Text = "FREIGABE" + 'btnAnkunft.Text = "ANKUNFT" + 'btnErfasst.Text = "ERFASST" + '' btnVorbereitet.Text = "VORB.QS" + 'btnVorgeschrieben.Text = "VORGESCHR." + 'btnFreigabe.Text = "FREIGABE" 'btnVorgeschrieben.Text = "VORGESCHR." 'btnVorgeschrieben.Text = "VORGESCHR." End If + If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("STATUS_ATILLA") Then + Panel14.Visible = True + Panel15.Visible = True + Else + Panel14.Visible = False + Panel15.Visible = False + End If + + If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("ALLOW_STATUS2_VERIMEX") Then Panel6.Visible = True Else @@ -289,8 +298,12 @@ Public Class usrcntlAktDetailsATILLANeu lblStatus.Text = "ERFASST" : pnlStatus.BackColor = btnErfasst.BackColor 'Case VERAG_PROG_ALLGEMEIN.cglobal.Status_Vorbereitet ' lblStatus.Text = "VORBEREITET - QS" : pnlStatus.BackColor = btnVorbereitet.BackColor - Case VERAG_PROG_ALLGEMEIN.cglobal.Status_Vorgeschrieben + Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_Vorgeschrieben lblStatus.Text = "VORGESCHRIEBEN" : pnlStatus.BackColor = btnVorgeschrieben.BackColor + Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_VERIMEX + lblStatus.Text = "AN VERIMEX" : pnlStatus.BackColor = btnAnVerimex.BackColor + Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_INDONESIEN + lblStatus.Text = "AN INDONESIEN" : pnlStatus.BackColor = btnAnIndonesien.BackColor Case VERAG_PROG_ALLGEMEIN.cglobal.Status_Freigegeben lblStatus.Text = "FREIGABE" : pnlStatus.BackColor = btnFreigabe.BackColor Button3.Visible = True @@ -1579,4 +1592,22 @@ Public Class usrcntlAktDetailsATILLANeu frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) End If End Sub + + Private Sub FlowLayoutPanel_Paint(sender As Object, e As PaintEventArgs) Handles FlowLayoutPanel.Paint + + End Sub + + Private Sub btnAnVerimex_Click(sender As Object, e As EventArgs) Handles btnAnVerimex.Click + If FUNC.setAnVERIMEX(AvisoID) Then + frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + End If + End Sub + + Private Sub btnAnIndonesien_Click(sender As Object, e As EventArgs) Handles btnAnIndonesien.Click + If FUNC.setAnINDONESIEN(AvisoID) Then + frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + End If + End Sub End Class diff --git a/AvisoTV/AvisoTV.vbproj b/AvisoTV/AvisoTV.vbproj index be9f4c8..78c3487 100644 --- a/AvisoTV/AvisoTV.vbproj +++ b/AvisoTV/AvisoTV.vbproj @@ -164,6 +164,10 @@ + + {a3b497bd-842c-4a2b-b398-ed1976849df1} + VERAG_PROG_ALLGEMEIN + {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5} Gemeinsames diff --git a/AvisoTV/frmAnzeige.vb b/AvisoTV/frmAnzeige.vb index 1e0b895..007956a 100644 --- a/AvisoTV/frmAnzeige.vb +++ b/AvisoTV/frmAnzeige.vb @@ -211,19 +211,20 @@ Public Class frmAnzeige If StandortATILLA Then buero = " , Buero " End If - Dim stat_tmp As String = cGlobal.Status_Ankunft.ToString + Dim stat_tmp As String = cGlobal.Status_Ankunft.ToString & ", " & cGlobal.Status_ATILLA_VERIMEX.ToString & ", " & cGlobal.Status_ATILLA_INDONESIEN.ToString Dim ank_tmp As String = "" If seiten Then ank_tmp = " And Ankunft > " & SQLDatumZeitSekunden(Merk_Ankunftsdatum) If onlyOK Then ank_tmp = " And LKW_fertig = 1 " If False Then 'alle Staten - stat_tmp = "3,99,4,5,0" + stat_tmp = "3,6,7,99,4,5,0" ank_tmp = "" End If where = " WHERE " Dim hSQL As String = "SELECT AvisoID, Status, UPPER(LKW_Nr) as LKW_Nr, Ankunft, Dauer, letzterMitarbeiter,WeiterleitungTextTV, LKW_fertig " & buero & " , AvisoTVHinweis, ImEx, ZOLLDigitalEingereicht FROM Aviso " where &= " Status IN( " & stat_tmp & ") " + where &= " AND Ankunft is not null " If CLUSTER <> "" Then where &= " AND (Firma= '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR Cluster= '" & CLUSTER & "') " ElseIf Standort <> "WAI" And Standort <> "SBG" And Standort <> "NKD" Then @@ -235,6 +236,8 @@ Public Class frmAnzeige hSQL &= where hSQL += ank_tmp & " ORDER BY CASE " & " when [Status] =3 then 1 " & + " when [Status] =6 then 0.5 " & + " when [Status] =7 then 0.5 " & " when [Status] =99 then 2 " & " when [Status] =4 then 3 " & " when [Status] =5 then 4 " &