diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index 477be57..c51c688 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -1489,6 +1489,10 @@ Always + + + + Always diff --git a/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb b/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb index 5824070..f8018b0 100644 --- a/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb +++ b/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb @@ -101,7 +101,7 @@ Public Class frmAvisoWeiterleiten End Sub - Sub btnWeiterleitung_Clicked(WLart As String, id As String, bezeichnung As String, Optional bezeichnungFirma As String = "") + Sub btnWeiterleitung_Clicked(WLart As String, id As String, bezeichnung As String, Optional bezeichnungFirma As String = "", Optional WL_Text As String = "") Dim text = "" Dim WeiterleitungTextTV = "" Dim code = 3 @@ -123,6 +123,9 @@ Public Class frmAvisoWeiterleiten WeiterleitungTextTV = bezeichnung End Select + + + 'Anhänge: Dim collAnhIds = "" Try @@ -151,7 +154,12 @@ Public Class frmAvisoWeiterleiten Else ASF.insertVermerkAllg(AvisoId, text, 46) If rtbVermerk.Text.Trim <> "" Then ASF.insertVermerkAllg(AvisoId, "WL: " & rtbVermerk.Text.Trim, 46) - ASF.AktUebernehmen_Zuruecksetzen(AvisoId, WeiterleitungTextTV) + If WL_Text <> "" Then + ASF.AktUebernehmen_Zuruecksetzen(AvisoId, WeiterleitungTextTV, WL_Text) + Else + ASF.AktUebernehmen_Zuruecksetzen(AvisoId, WeiterleitungTextTV) + End If + End If @@ -162,10 +170,10 @@ Public Class frmAvisoWeiterleiten End If End If - ' Me.Close() - ' End If + ' Me.Close() + ' End If - Me.Close() + Me.Close() Me.DialogResult = DialogResult.OK End Sub @@ -189,7 +197,11 @@ Public Class frmAvisoWeiterleiten btn.Enabled = enabled AddHandler btn.Click, Sub() - btnWeiterleitung_Clicked(WLart, (btn.Tag), bezeichnung, bezeichnungFirma) + Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Case "ATILLA" : btnWeiterleitung_Clicked(WLart, (btn.Tag), bezeichnung, bezeichnungFirma, "WL: " & If(bezeichnungFirma <> "ATILLA", "[" & bezeichnungFirma & "] ", "") & bezeichnung) + Case Else : btnWeiterleitung_Clicked(WLart, (btn.Tag), bezeichnung, bezeichnungFirma) + End Select + initButtons(flpFirma, btn) End Sub @@ -263,6 +275,12 @@ Public Class frmAvisoWeiterleiten addBtn(flpFirma, "F", "FRONTOFFICE", "FRONT-OFFICE", True) ElseIf sender Is btnATILLA Then addBtn(flpFirma, "F", "ATILLA", "ATILLA", True) + Dim dt As DataTable = SQL.loadDgvBySql("SELECT team_id, team_bezeichnung FROM tblTeams WHERE team_firma='ATILLA' order by team_id", "ADMIN") + If dt IsNot Nothing Then + For Each t In dt.Rows + addBtn(flpTeams, "T", t("team_id"), t("team_bezeichnung"),, "ATILLA") + Next + End If ElseIf sender Is btnVERIMEX Then 'addBtn(flpFirma, "F", "VERIMEX", "VERIMEX", True) Dim whereTeams = "" diff --git a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb index 449e255..6e1bfe4 100644 --- a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb +++ b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb @@ -23,18 +23,19 @@ Partial Class usrCntlBenachrichtigungen _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.Panel2 = New System.Windows.Forms.Panel() Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.gridAvisoBenachrichtigungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel4 = New System.Windows.Forms.Panel() + Me.cbxNeukunden = New System.Windows.Forms.CheckBox() Me.Button10 = New System.Windows.Forms.Button() Me.Panel3 = New System.Windows.Forms.Panel() Me.cbxCluster = New System.Windows.Forms.CheckBox() Me.cbxTeams = New System.Windows.Forms.CheckBox() Me.Label22 = New System.Windows.Forms.Label() Me.Label25 = New System.Windows.Forms.Label() - Me.cbxNeukunden = New System.Windows.Forms.CheckBox() + Me.txtVermerk = New System.Windows.Forms.TextBox() Me.Panel2.SuspendLayout() CType(Me.gridAvisoBenachrichtigungen, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel4.SuspendLayout() @@ -77,8 +78,8 @@ Partial Class usrCntlBenachrichtigungen Me.gridAvisoBenachrichtigungen.AllowUserToDeleteRows = False Me.gridAvisoBenachrichtigungen.AllowUserToOrderColumns = True Me.gridAvisoBenachrichtigungen.AllowUserToResizeRows = False - DataGridViewCellStyle2.BackColor = System.Drawing.Color.Azure - Me.gridAvisoBenachrichtigungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure + Me.gridAvisoBenachrichtigungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.gridAvisoBenachrichtigungen.BackgroundColor = System.Drawing.Color.White Me.gridAvisoBenachrichtigungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.gridAvisoBenachrichtigungen.Dock = System.Windows.Forms.DockStyle.Fill @@ -92,6 +93,7 @@ Partial Class usrCntlBenachrichtigungen 'Panel4 ' Me.Panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Panel4.Controls.Add(Me.txtVermerk) Me.Panel4.Controls.Add(Me.cbxNeukunden) Me.Panel4.Controls.Add(Me.Button10) Me.Panel4.Dock = System.Windows.Forms.DockStyle.Bottom @@ -100,6 +102,18 @@ Partial Class usrCntlBenachrichtigungen Me.Panel4.Size = New System.Drawing.Size(284, 38) Me.Panel4.TabIndex = 5 ' + 'cbxNeukunden + ' + Me.cbxNeukunden.AutoSize = True + Me.cbxNeukunden.ForeColor = System.Drawing.Color.Black + Me.cbxNeukunden.Location = New System.Drawing.Point(7, 19) + Me.cbxNeukunden.Name = "cbxNeukunden" + Me.cbxNeukunden.Size = New System.Drawing.Size(82, 17) + Me.cbxNeukunden.TabIndex = 30 + Me.cbxNeukunden.Text = "Neukunden" + Me.cbxNeukunden.UseVisualStyleBackColor = True + Me.cbxNeukunden.Visible = False + ' 'Button10 ' Me.Button10.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -175,17 +189,15 @@ Partial Class usrCntlBenachrichtigungen Me.Label25.Text = "0 Akte vom Arbeitsplatz übernommen" Me.Label25.TextAlign = System.Drawing.ContentAlignment.TopRight ' - 'cbxNeukunden + 'txtVermerk ' - Me.cbxNeukunden.AutoSize = True - Me.cbxNeukunden.ForeColor = System.Drawing.Color.Black - Me.cbxNeukunden.Location = New System.Drawing.Point(7, 3) - Me.cbxNeukunden.Name = "cbxNeukunden" - Me.cbxNeukunden.Size = New System.Drawing.Size(82, 17) - Me.cbxNeukunden.TabIndex = 30 - Me.cbxNeukunden.Text = "Neukunden" - Me.cbxNeukunden.UseVisualStyleBackColor = True - Me.cbxNeukunden.Visible = False + 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 ' 'usrCntlBenachrichtigungen ' @@ -215,4 +227,5 @@ Partial Class usrCntlBenachrichtigungen Friend WithEvents cbxTeams As CheckBox Friend WithEvents cbxCluster As CheckBox Friend WithEvents cbxNeukunden As CheckBox + Friend WithEvents txtVermerk As TextBox End Class diff --git a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb index 14c6402..ebe55ce 100644 --- a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb +++ b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb @@ -61,7 +61,7 @@ whereMA &= " ) " - Dim sqlStr As String = "SELECT tblAvisoBenachrichtigungen.*, LKW_Nr, Status FROM [tblAvisoBenachrichtigungen] INNER JOIN AVISO on AvisoId=ab_AvisoID WHERE ab_status=0 " & whereMA & " ORDER BY CASE WHEN ANKUNFT <'01.01.2001' THEN '01.01.2999' ELSE ANKUNFT end ASC,ab_Datum ASC" + Dim sqlStr As String = "SELECT tblAvisoBenachrichtigungen.*, LKW_Nr, Status FROM [tblAvisoBenachrichtigungen] INNER JOIN AVISO on AvisoId=ab_AvisoID WHERE ab_status=0 " & whereMA & " ORDER BY CASE WHEN ANKUNFT <'01.01.2001' THEN '01.01.2999' ELSE ANKUNFT end ASC,ab_Datum ASC" Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) @@ -120,6 +120,11 @@ '.Columns("ab_Beschreibung").DefaultCellStyle.ForeColor = Color.White .Columns("ab_Beschreibung").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + '.Columns("ab_Vermerk").MinimumWidth = 50 + '.Columns("ab_Vermerk").HeaderText = "Vermerk" + ''.Columns("ab_Beschreibung").DefaultCellStyle.ForeColor = Color.White + '.Columns("ab_Vermerk").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + If .RowCount = 0 Then .Columns.Clear() : Exit Sub @@ -286,6 +291,11 @@ Private Sub usrCntlBenachrichtigungen_SelectionChanged() Handles gridAvisoBenachrichtigungen.SelectionChanged Button10.Enabled = (gridAvisoBenachrichtigungen.SelectedRows.Count = 1) + txtVermerk.Text = "" + If gridAvisoBenachrichtigungen.SelectedRows.Count > 0 Then + txtVermerk.Text = If(gridAvisoBenachrichtigungen.SelectedRows(0).Cells("ab_vermerk").Value, "") + End If + End Sub Private Sub usrCntlBenachrichtigungen_SelectionChanged(sender As Object, e As EventArgs) Handles gridAvisoBenachrichtigungen.SelectionChanged diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 58738a7..a31d765 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/My Project/Resources.Designer.vb b/Aviso/My Project/Resources.Designer.vb index e0e5a25..432d8e6 100644 --- a/Aviso/My Project/Resources.Designer.vb +++ b/Aviso/My Project/Resources.Designer.vb @@ -668,6 +668,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property ge_transport() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("ge_transport", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -788,6 +798,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property istLog() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("istLog", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -838,6 +858,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Koerfez61() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Koerfez61", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -878,6 +908,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property meris() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("meris", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/Aviso/My Project/Resources.resx b/Aviso/My Project/Resources.resx index 58c434a..a2922bc 100644 --- a/Aviso/My Project/Resources.resx +++ b/Aviso/My Project/Resources.resx @@ -631,4 +631,16 @@ ..\..\Diverses\zollico.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ge_transport.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\istLog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\meris.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\VK1.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Aviso/Resources/VK1.jpg b/Aviso/Resources/VK1.jpg new file mode 100644 index 0000000..815a60a Binary files /dev/null and b/Aviso/Resources/VK1.jpg differ diff --git a/Aviso/Resources/ge_transport.png b/Aviso/Resources/ge_transport.png new file mode 100644 index 0000000..8054740 Binary files /dev/null and b/Aviso/Resources/ge_transport.png differ diff --git a/Aviso/Resources/istLog.png b/Aviso/Resources/istLog.png new file mode 100644 index 0000000..cd9b733 Binary files /dev/null and b/Aviso/Resources/istLog.png differ diff --git a/Aviso/Resources/meris.png b/Aviso/Resources/meris.png new file mode 100644 index 0000000..fcb0ebd Binary files /dev/null and b/Aviso/Resources/meris.png differ diff --git a/Aviso/frmAddSendungsvermerkShort.Designer.vb b/Aviso/frmAddSendungsvermerkShort.Designer.vb index 887ab65..987b27c 100644 --- a/Aviso/frmAddSendungsvermerkShort.Designer.vb +++ b/Aviso/frmAddSendungsvermerkShort.Designer.vb @@ -54,7 +54,7 @@ Partial Class frmAddSendungsvermerkShort Me.Label3 = New System.Windows.Forms.Label() Me.lblErr240Zeichen = New System.Windows.Forms.Label() Me.txtDetail = New System.Windows.Forms.TextBox() - Me.Label18 = New System.Windows.Forms.Label() + Me.lblZustzlFreitext = New System.Windows.Forms.Label() Me.txtSendungSpedition = New System.Windows.Forms.TextBox() Me.cbxNichtLeserlich = New System.Windows.Forms.CheckBox() Me.btnOK = New System.Windows.Forms.Button() @@ -125,7 +125,7 @@ Partial Class frmAddSendungsvermerkShort Me.pnlSendungsVermker.Controls.Add(Me.Label3) Me.pnlSendungsVermker.Controls.Add(Me.lblErr240Zeichen) Me.pnlSendungsVermker.Controls.Add(Me.txtDetail) - Me.pnlSendungsVermker.Controls.Add(Me.Label18) + Me.pnlSendungsVermker.Controls.Add(Me.lblZustzlFreitext) Me.pnlSendungsVermker.Controls.Add(Me.txtSendungSpedition) Me.pnlSendungsVermker.Controls.Add(Me.cbxNichtLeserlich) Me.pnlSendungsVermker.Controls.Add(Me.btnOK) @@ -450,14 +450,14 @@ Partial Class frmAddSendungsvermerkShort Me.txtDetail.TabStop = False Me.txtDetail.WordWrap = False ' - 'Label18 + 'lblZustzlFreitext ' - Me.Label18.AutoSize = True - Me.Label18.Location = New System.Drawing.Point(9, 418) - Me.Label18.Name = "Label18" - Me.Label18.Size = New System.Drawing.Size(142, 13) - Me.Label18.TabIndex = 31 - Me.Label18.Text = "Zusätzl. Vermerk als Freitext:" + Me.lblZustzlFreitext.AutoSize = True + Me.lblZustzlFreitext.Location = New System.Drawing.Point(9, 418) + Me.lblZustzlFreitext.Name = "lblZustzlFreitext" + Me.lblZustzlFreitext.Size = New System.Drawing.Size(142, 13) + Me.lblZustzlFreitext.TabIndex = 31 + Me.lblZustzlFreitext.Text = "Zusätzl. Vermerk als Freitext:" ' 'txtSendungSpedition ' @@ -683,7 +683,7 @@ Partial Class frmAddSendungsvermerkShort Friend WithEvents Label3 As System.Windows.Forms.Label Friend WithEvents lblErr240Zeichen As System.Windows.Forms.Label Friend WithEvents txtDetail As System.Windows.Forms.TextBox - Friend WithEvents Label18 As System.Windows.Forms.Label + Friend WithEvents lblZustzlFreitext As System.Windows.Forms.Label Friend WithEvents txtSendungSpedition As System.Windows.Forms.TextBox Friend WithEvents cbxNichtLeserlich As System.Windows.Forms.CheckBox Friend WithEvents btnOK As System.Windows.Forms.Button diff --git a/Aviso/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb index 4fa17e3..5c0aa43 100644 --- a/Aviso/frmHauptfenster.Designer.vb +++ b/Aviso/frmHauptfenster.Designer.vb @@ -24,15 +24,15 @@ 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 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 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) @@ -265,20 +265,16 @@ Partial Class frmHauptfenster Me.cntxtAtilla = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem17 = New System.Windows.Forms.ToolStripMenuItem() Me.SplitContainer3 = New System.Windows.Forms.SplitContainer() - Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen() 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.Label18 = New System.Windows.Forms.Label() + 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.Label17 = New System.Windows.Forms.Label() + Me.lblMySND_Anzeige = New System.Windows.Forms.Label() Me.lblAkte = New System.Windows.Forms.Label() Me.btnClose = New System.Windows.Forms.Button() Me.TimerAkte = New System.Windows.Forms.Timer(Me.components) @@ -296,22 +292,16 @@ Partial Class frmHauptfenster 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() @@ -330,7 +320,6 @@ 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() @@ -357,13 +346,24 @@ Partial Class frmHauptfenster Me.EmbargosLänderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GüterlisteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components) - Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem() Me.ColorDialog = New System.Windows.Forms.ColorDialog() Me.ctxtFarben = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ALLEToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem19 = New System.Windows.Forms.ToolStripMenuItem() 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,7 +382,6 @@ 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() @@ -394,13 +393,14 @@ 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 @@ -2254,15 +2254,6 @@ Partial Class frmHauptfenster Me.SplitContainer3.SplitterDistance = 158 Me.SplitContainer3.TabIndex = 3 ' - 'UsrCntlBenachrichtigungen1 - ' - Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0) - Me.UsrCntlBenachrichtigungen1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1" - Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(158, 300) - Me.UsrCntlBenachrichtigungen1.TabIndex = 0 - ' 'pnl ' Me.pnl.Controls.Add(Me.Button10) @@ -2288,62 +2279,18 @@ 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 - DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure - Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 - Me.gridMyAviso.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - 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.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2 - Me.gridMyAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, 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.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle3 - 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 - DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, 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.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle4 - 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)) Me.Panel6.Controls.Add(Me.btnColor) Me.Panel6.Controls.Add(Me.lblMeineAviso) Me.Panel6.Controls.Add(Me.cboMy_Grenzstelle) - Me.Panel6.Controls.Add(Me.Label18) + Me.Panel6.Controls.Add(Me.lblMySnd_Grenzstelle) Me.Panel6.Controls.Add(Me.cbx_My_LKW) Me.Panel6.Controls.Add(Me.cboMy_QS) Me.Panel6.Controls.Add(Me.cboMy_VB) Me.Panel6.Controls.Add(Me.cboMyAvisoAnzeige) - Me.Panel6.Controls.Add(Me.Label17) + Me.Panel6.Controls.Add(Me.lblMySND_Anzeige) Me.Panel6.Controls.Add(Me.lblAkte) Me.Panel6.Dock = System.Windows.Forms.DockStyle.Top Me.Panel6.Location = New System.Drawing.Point(0, 0) @@ -2373,33 +2320,16 @@ Partial Class frmHauptfenster Me.lblMeineAviso.TabIndex = 0 Me.lblMeineAviso.Text = "Meine Sendungen:" ' - 'cboMy_Grenzstelle + 'lblMySnd_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 - ' - 'Label18 - ' - Me.Label18.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Label18.AutoSize = True - Me.Label18.ForeColor = System.Drawing.Color.White - Me.Label18.Location = New System.Drawing.Point(45, 4) - Me.Label18.Name = "Label18" - Me.Label18.Size = New System.Drawing.Size(62, 13) - Me.Label18.TabIndex = 25 - Me.Label18.Text = "Grenzstelle:" + Me.lblMySnd_Grenzstelle.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblMySnd_Grenzstelle.AutoSize = True + Me.lblMySnd_Grenzstelle.ForeColor = System.Drawing.Color.White + Me.lblMySnd_Grenzstelle.Location = New System.Drawing.Point(45, 4) + Me.lblMySnd_Grenzstelle.Name = "lblMySnd_Grenzstelle" + Me.lblMySnd_Grenzstelle.Size = New System.Drawing.Size(62, 13) + Me.lblMySnd_Grenzstelle.TabIndex = 25 + Me.lblMySnd_Grenzstelle.Text = "Grenzstelle:" ' 'cbx_My_LKW ' @@ -2441,32 +2371,16 @@ Partial Class frmHauptfenster Me.cboMy_VB.ThreeState = True Me.cboMy_VB.UseVisualStyleBackColor = True ' - 'cboMyAvisoAnzeige + 'lblMySND_Anzeige ' - 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 - ' - 'Label17 - ' - Me.Label17.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Label17.AutoSize = True - Me.Label17.ForeColor = System.Drawing.Color.White - Me.Label17.Location = New System.Drawing.Point(183, 3) - Me.Label17.Name = "Label17" - Me.Label17.Size = New System.Drawing.Size(48, 13) - Me.Label17.TabIndex = 20 - Me.Label17.Text = "Anzeige:" + Me.lblMySND_Anzeige.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblMySND_Anzeige.AutoSize = True + Me.lblMySND_Anzeige.ForeColor = System.Drawing.Color.White + Me.lblMySND_Anzeige.Location = New System.Drawing.Point(183, 3) + Me.lblMySND_Anzeige.Name = "lblMySND_Anzeige" + Me.lblMySND_Anzeige.Size = New System.Drawing.Size(48, 13) + Me.lblMySND_Anzeige.TabIndex = 20 + Me.lblMySND_Anzeige.Text = "Anzeige:" ' 'lblAkte ' @@ -2698,60 +2612,6 @@ 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 - DataGridViewCellStyle5.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5 - Me.gridAviso.BackgroundColor = System.Drawing.Color.DarkGray - Me.gridAviso.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable - DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle6.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle6.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle6 - Me.gridAviso.ColumnHeadersHeight = 25 - Me.gridAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle7 - 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 - DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control - 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.WindowText - DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle8 - Me.gridAviso.RowHeadersVisible = False - Me.gridAviso.RowHeadersWidth = 62 - Me.gridAviso.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle9 - 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)) @@ -2785,32 +2645,6 @@ 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 @@ -2821,22 +2655,6 @@ 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 @@ -2860,22 +2678,6 @@ 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 @@ -2921,23 +2723,6 @@ 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 @@ -2965,22 +2750,6 @@ 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) @@ -3188,20 +2957,6 @@ 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)) @@ -3427,17 +3182,6 @@ Partial Class frmHauptfenster Me.Timer_REFRESH.Enabled = True Me.Timer_REFRESH.Interval = 5000 ' - 'UsrCntlTestsystem1 - ' - Me.UsrCntlTestsystem1.BackColor = System.Drawing.Color.White - Me.UsrCntlTestsystem1.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.UsrCntlTestsystem1.ForeColor = System.Drawing.Color.Red - Me.UsrCntlTestsystem1.Location = New System.Drawing.Point(632, -1) - Me.UsrCntlTestsystem1.Margin = New System.Windows.Forms.Padding(5, 6, 5, 6) - Me.UsrCntlTestsystem1.Name = "UsrCntlTestsystem1" - Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28) - Me.UsrCntlTestsystem1.TabIndex = 8 - ' 'ctxtFarben ' Me.ctxtFarben.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -3472,6 +3216,262 @@ Partial Class frmHauptfenster Me.ToolStripMenuItem21.Size = New System.Drawing.Size(121, 22) Me.ToolStripMenuItem21.Text = "GELB" ' + 'UsrCntlTestsystem1 + ' + Me.UsrCntlTestsystem1.BackColor = System.Drawing.Color.White + Me.UsrCntlTestsystem1.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.UsrCntlTestsystem1.ForeColor = System.Drawing.Color.Red + Me.UsrCntlTestsystem1.Location = New System.Drawing.Point(632, -1) + Me.UsrCntlTestsystem1.Margin = New System.Windows.Forms.Padding(5, 6, 5, 6) + Me.UsrCntlTestsystem1.Name = "UsrCntlTestsystem1" + 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 + Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0) + Me.UsrCntlBenachrichtigungen1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1" + 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,7 +3515,6 @@ 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) @@ -3530,7 +3529,6 @@ 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) @@ -3540,6 +3538,8 @@ 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() @@ -3769,9 +3769,9 @@ Partial Class frmHauptfenster Friend WithEvents cboTeams As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents Label16 As Label Friend WithEvents cboMyAvisoAnzeige As VERAG_PROG_ALLGEMEIN.MyComboBox - Friend WithEvents Label17 As Label + Friend WithEvents lblMySND_Anzeige As Label Friend WithEvents cboMy_Grenzstelle As VERAG_PROG_ALLGEMEIN.MyComboBox - Friend WithEvents Label18 As Label + Friend WithEvents lblMySnd_Grenzstelle As Label Friend WithEvents cbx_My_LKW As CheckBox Friend WithEvents cboMy_QS As CheckBox Friend WithEvents cboMy_VB As CheckBox diff --git a/Aviso/frmHauptfenster.resx b/Aviso/frmHauptfenster.resx index cb80e1a..bad4092 100644 --- a/Aviso/frmHauptfenster.resx +++ b/Aviso/frmHauptfenster.resx @@ -228,6 +228,9 @@ pOTzPwAAAABJRU5ErkJggg== + + 598, 17 + 697, 17 diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index df70016..ac60044 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -390,11 +390,13 @@ Public Class frmHauptfenster If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("WARENORT", "AVISO") Then 'MenuStrip1.Items.Clear() - 'MenuStrip1.Items.Remove(FunktionenToolStripMenuItem) - ' MenuStrip1.Items.Remove(StatistikToolStripMenuItem) + MenuStrip1.Items.Remove(FunktionenToolStripMenuItem) + MenuStrip1.Items.Remove(StatistikToolStripMenuItem) + StatistikToolStripMenuItem.DropDownItems.Remove(SDLAuswertungenToolStripMenuItem1) StatistikToolStripMenuItem.DropDownItems.Remove(SDLAuswertungenToolStripMenuItem) + For Each i In FunktionenToolStripMenuItem.DropDownItems If i IsNot ToolStripMenuItem3 Then i.Visible = False @@ -2541,7 +2543,7 @@ Public Class frmHauptfenster Button6.Visible = False If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("ALLOW_STATUS2_VERIMEX") Then - tabVorbereitet.Text = "2. VERIMEX" + tabVorbereitet.Text = "2. VERIMEX/INDONESIEN" ' tbcntrAviso.TabPages.RemoveAt(2) End If @@ -3816,7 +3818,7 @@ Public Class frmHauptfenster cboMy_QS.Visible = Not cbx_My_LKW.Checked cboMy_VB.Visible = Not cbx_My_LKW.Checked cboMyAvisoAnzeige.Visible = Not cbx_My_LKW.Checked - Label17.Visible = Not cbx_My_LKW.Checked + lblMySND_Anzeige.Visible = Not cbx_My_LKW.Checked If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then btnColor.Visible = Not cbx_My_LKW.Checked @@ -5692,7 +5694,7 @@ Public Class AvisoStatusFunctions - Public Function AktUebernehmen_Zuruecksetzen(AvisoID As Integer, Optional WeiterleitungTextTV As String = "") As Boolean + Public Function AktUebernehmen_Zuruecksetzen(AvisoID As Integer, Optional WeiterleitungTextTV As String = "", Optional letzterMitarbeiter As String = "Weiterleitung") As Boolean Try 'If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then @@ -5715,7 +5717,7 @@ Public Class AvisoStatusFunctions Aviso.LetzterMitarbeiterId = -1 - Aviso.letzterMitarbeiter = "Weiterleitung" ' VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter + Aviso.letzterMitarbeiter = letzterMitarbeiter ' VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter Aviso.WeiterleitungTextTV = WeiterleitungTextTV ' VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter Aviso.TeamId = -1 'VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId @@ -6479,6 +6481,7 @@ Public Class AvisoStatusFunctions Public Sub showKd(kdnr) 'For Each frm As Form In Application.OpenForms.Item("frmKundenUebersichtZOLL") Is Nothing + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("WARENORT", "AVISO") Then Exit Sub For Each openForm In Application.OpenForms() If TypeOf (openForm) Is SDL.frmKundenUebersichtZOLL Then diff --git a/Aviso/frmLogin.designer.vb b/Aviso/frmLogin.designer.vb index 90fca42..aab9406 100644 --- a/Aviso/frmLogin.designer.vb +++ b/Aviso/frmLogin.designer.vb @@ -29,10 +29,7 @@ Partial Class frmLogin Me.btnOK = New System.Windows.Forms.Button() Me.txtSachbear = New System.Windows.Forms.TextBox() Me.Panel1 = New System.Windows.Forms.Panel() - Me.lblTESTSYSTEM = New System.Windows.Forms.Label() - Me.FlatButton1 = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.Panel2 = New System.Windows.Forms.Panel() - Me.FlatButton2 = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.picWO = New System.Windows.Forms.PictureBox() Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem() Me.VERAGToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -46,6 +43,11 @@ Partial Class frmLogin Me.PRODUKTIVToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TESTSYSTEMToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.UpdateToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() + Me.cboWarenort = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.lblTESTSYSTEM = New System.Windows.Forms.Label() + Me.FlatButton1 = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.Panel2 = New System.Windows.Forms.Panel() + Me.FlatButton2 = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.Label3 = New System.Windows.Forms.Label() Me.picLogin = New System.Windows.Forms.PictureBox() Me.lblAlertTxt = New System.Windows.Forms.Label() @@ -55,10 +57,11 @@ Partial Class frmLogin Me.UpdateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() - Me.cboWarenort = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.lblWO = New System.Windows.Forms.Label() Me.Panel1.SuspendLayout() - Me.Panel2.SuspendLayout() + CType(Me.picWO, System.ComponentModel.ISupportInitialize).BeginInit() Me.ContextMenuStrip2.SuspendLayout() + Me.Panel2.SuspendLayout() CType(Me.picLogin, System.ComponentModel.ISupportInitialize).BeginInit() Me.ctxUpdate.SuspendLayout() Me.ContextMenuStrip1.SuspendLayout() @@ -80,7 +83,7 @@ Partial Class frmLogin 'txtKennwort ' Me.txtKennwort.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtKennwort.Location = New System.Drawing.Point(108, 111) + Me.txtKennwort.Location = New System.Drawing.Point(110, 118) Me.txtKennwort.MaxLength = 20 Me.txtKennwort.Name = "txtKennwort" Me.txtKennwort.PasswordChar = Global.Microsoft.VisualBasic.ChrW(42) @@ -91,7 +94,7 @@ Partial Class frmLogin ' Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnOK.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.btnOK.Location = New System.Drawing.Point(108, 148) + Me.btnOK.Location = New System.Drawing.Point(110, 154) Me.btnOK.Name = "btnOK" Me.btnOK.Size = New System.Drawing.Size(100, 29) Me.btnOK.TabIndex = 7 @@ -101,7 +104,7 @@ Partial Class frmLogin 'txtSachbear ' Me.txtSachbear.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtSachbear.Location = New System.Drawing.Point(108, 81) + Me.txtSachbear.Location = New System.Drawing.Point(110, 88) Me.txtSachbear.MaxLength = 20 Me.txtSachbear.Name = "txtSachbear" Me.txtSachbear.Size = New System.Drawing.Size(100, 20) @@ -111,6 +114,8 @@ Partial Class frmLogin ' Me.Panel1.BackColor = System.Drawing.Color.White Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Panel1.Controls.Add(Me.lblWO) + Me.Panel1.Controls.Add(Me.picWO) Me.Panel1.Controls.Add(Me.cboWarenort) Me.Panel1.Controls.Add(Me.lblTESTSYSTEM) Me.Panel1.Controls.Add(Me.FlatButton1) @@ -128,12 +133,117 @@ Partial Class frmLogin Me.Panel1.Size = New System.Drawing.Size(306, 222) Me.Panel1.TabIndex = 0 ' + 'picWO + ' + Me.picWO.BackgroundImage = Global.AVISO.My.Resources.Resources.Verag_AG_Logopng + Me.picWO.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.picWO.ContextMenuStrip = Me.ContextMenuStrip2 + Me.picWO.Location = New System.Drawing.Point(40, -2) + Me.picWO.Name = "picWO" + Me.picWO.Size = New System.Drawing.Size(234, 62) + Me.picWO.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom + Me.picWO.TabIndex = 14 + Me.picWO.TabStop = False + ' + 'ContextMenuStrip2 + ' + Me.ContextMenuStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem2, Me.TESTSYSTEMToolStripMenuItem, Me.UpdateToolStripMenuItem1}) + Me.ContextMenuStrip2.Name = "ctxUpdate" + Me.ContextMenuStrip2.Size = New System.Drawing.Size(141, 70) + ' + 'ToolStripMenuItem2 + ' + Me.ToolStripMenuItem2.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VERAGToolStripMenuItem, Me.ATILLAToolStripMenuItem, Me.IMEXToolStripMenuItem, Me.FRONTOFFICEToolStripMenuItem, Me.UNISPEDToolStripMenuItem, Me.AMBARToolStripMenuItem, Me.VERIMEXToolStripMenuItem}) + Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2" + Me.ToolStripMenuItem2.Size = New System.Drawing.Size(140, 22) + Me.ToolStripMenuItem2.Text = "FIRMA" + ' + 'VERAGToolStripMenuItem + ' + Me.VERAGToolStripMenuItem.Name = "VERAGToolStripMenuItem" + Me.VERAGToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.VERAGToolStripMenuItem.Text = "VERAG" + ' + 'ATILLAToolStripMenuItem + ' + Me.ATILLAToolStripMenuItem.Name = "ATILLAToolStripMenuItem" + Me.ATILLAToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ATILLAToolStripMenuItem.Text = "ATILLA" + ' + 'IMEXToolStripMenuItem + ' + Me.IMEXToolStripMenuItem.Name = "IMEXToolStripMenuItem" + Me.IMEXToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.IMEXToolStripMenuItem.Text = "IMEX" + ' + 'FRONTOFFICEToolStripMenuItem + ' + Me.FRONTOFFICEToolStripMenuItem.Name = "FRONTOFFICEToolStripMenuItem" + Me.FRONTOFFICEToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.FRONTOFFICEToolStripMenuItem.Text = "FRONT-OFFICE" + ' + 'UNISPEDToolStripMenuItem + ' + Me.UNISPEDToolStripMenuItem.Name = "UNISPEDToolStripMenuItem" + Me.UNISPEDToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.UNISPEDToolStripMenuItem.Text = "UNISPED" + ' + 'AMBARToolStripMenuItem + ' + Me.AMBARToolStripMenuItem.Name = "AMBARToolStripMenuItem" + Me.AMBARToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.AMBARToolStripMenuItem.Text = "AMBAR" + ' + 'VERIMEXToolStripMenuItem + ' + Me.VERIMEXToolStripMenuItem.Name = "VERIMEXToolStripMenuItem" + Me.VERIMEXToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.VERIMEXToolStripMenuItem.Text = "VERIMEX" + ' + 'TESTSYSTEMToolStripMenuItem + ' + Me.TESTSYSTEMToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.PRODUKTIVToolStripMenuItem, Me.TESTSYSTEMToolStripMenuItem1}) + Me.TESTSYSTEMToolStripMenuItem.Name = "TESTSYSTEMToolStripMenuItem" + Me.TESTSYSTEMToolStripMenuItem.Size = New System.Drawing.Size(140, 22) + Me.TESTSYSTEMToolStripMenuItem.Text = "TESTSYSTEM" + Me.TESTSYSTEMToolStripMenuItem.Visible = False + ' + 'PRODUKTIVToolStripMenuItem + ' + Me.PRODUKTIVToolStripMenuItem.Name = "PRODUKTIVToolStripMenuItem" + Me.PRODUKTIVToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.PRODUKTIVToolStripMenuItem.Text = "PRODUKTIV" + ' + 'TESTSYSTEMToolStripMenuItem1 + ' + Me.TESTSYSTEMToolStripMenuItem1.Name = "TESTSYSTEMToolStripMenuItem1" + Me.TESTSYSTEMToolStripMenuItem1.Size = New System.Drawing.Size(180, 22) + Me.TESTSYSTEMToolStripMenuItem1.Text = "TESTSYSTEM" + ' + 'UpdateToolStripMenuItem1 + ' + Me.UpdateToolStripMenuItem1.Name = "UpdateToolStripMenuItem1" + Me.UpdateToolStripMenuItem1.Size = New System.Drawing.Size(140, 22) + Me.UpdateToolStripMenuItem1.Text = "Update" + ' + 'cboWarenort + ' + Me.cboWarenort._allowedValuesFreiText = Nothing + Me.cboWarenort._allowFreiText = False + Me.cboWarenort._value = "" + Me.cboWarenort.FormattingEnabled = True + Me.cboWarenort.Location = New System.Drawing.Point(110, 61) + Me.cboWarenort.Name = "cboWarenort" + Me.cboWarenort.Size = New System.Drawing.Size(100, 21) + Me.cboWarenort.TabIndex = 13 + Me.cboWarenort.Visible = False + ' 'lblTESTSYSTEM ' Me.lblTESTSYSTEM.AutoSize = True Me.lblTESTSYSTEM.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblTESTSYSTEM.ForeColor = System.Drawing.Color.Red - Me.lblTESTSYSTEM.Location = New System.Drawing.Point(83, 58) + Me.lblTESTSYSTEM.Location = New System.Drawing.Point(80, 185) Me.lblTESTSYSTEM.Name = "lblTESTSYSTEM" Me.lblTESTSYSTEM.Size = New System.Drawing.Size(145, 20) Me.lblTESTSYSTEM.TabIndex = 1 @@ -183,87 +293,6 @@ Partial Class frmLogin Me.FlatButton2.TabIndex = 13 Me.FlatButton2.UseVisualStyleBackColor = True ' - 'ContextMenuStrip2 - ' - Me.ContextMenuStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem2, Me.TESTSYSTEMToolStripMenuItem, Me.UpdateToolStripMenuItem1}) - Me.ContextMenuStrip2.Name = "ctxUpdate" - Me.ContextMenuStrip2.Size = New System.Drawing.Size(141, 70) - ' - 'ToolStripMenuItem2 - ' - Me.ToolStripMenuItem2.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VERAGToolStripMenuItem, Me.ATILLAToolStripMenuItem, Me.IMEXToolStripMenuItem, Me.FRONTOFFICEToolStripMenuItem, Me.UNISPEDToolStripMenuItem, Me.AMBARToolStripMenuItem, Me.VERIMEXToolStripMenuItem}) - Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2" - Me.ToolStripMenuItem2.Size = New System.Drawing.Size(140, 22) - Me.ToolStripMenuItem2.Text = "FIRMA" - ' - 'VERAGToolStripMenuItem - ' - Me.VERAGToolStripMenuItem.Name = "VERAGToolStripMenuItem" - Me.VERAGToolStripMenuItem.Size = New System.Drawing.Size(154, 22) - Me.VERAGToolStripMenuItem.Text = "VERAG" - ' - 'ATILLAToolStripMenuItem - ' - Me.ATILLAToolStripMenuItem.Name = "ATILLAToolStripMenuItem" - Me.ATILLAToolStripMenuItem.Size = New System.Drawing.Size(154, 22) - Me.ATILLAToolStripMenuItem.Text = "ATILLA" - ' - 'IMEXToolStripMenuItem - ' - Me.IMEXToolStripMenuItem.Name = "IMEXToolStripMenuItem" - Me.IMEXToolStripMenuItem.Size = New System.Drawing.Size(154, 22) - Me.IMEXToolStripMenuItem.Text = "IMEX" - ' - 'FRONTOFFICEToolStripMenuItem - ' - Me.FRONTOFFICEToolStripMenuItem.Name = "FRONTOFFICEToolStripMenuItem" - Me.FRONTOFFICEToolStripMenuItem.Size = New System.Drawing.Size(154, 22) - Me.FRONTOFFICEToolStripMenuItem.Text = "FRONT-OFFICE" - ' - 'UNISPEDToolStripMenuItem - ' - Me.UNISPEDToolStripMenuItem.Name = "UNISPEDToolStripMenuItem" - Me.UNISPEDToolStripMenuItem.Size = New System.Drawing.Size(154, 22) - Me.UNISPEDToolStripMenuItem.Text = "UNISPED" - ' - 'AMBARToolStripMenuItem - ' - Me.AMBARToolStripMenuItem.Name = "AMBARToolStripMenuItem" - Me.AMBARToolStripMenuItem.Size = New System.Drawing.Size(154, 22) - Me.AMBARToolStripMenuItem.Text = "AMBAR" - ' - 'VERIMEXToolStripMenuItem - ' - Me.VERIMEXToolStripMenuItem.Name = "VERIMEXToolStripMenuItem" - Me.VERIMEXToolStripMenuItem.Size = New System.Drawing.Size(154, 22) - Me.VERIMEXToolStripMenuItem.Text = "VERIMEX" - ' - 'TESTSYSTEMToolStripMenuItem - ' - Me.TESTSYSTEMToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.PRODUKTIVToolStripMenuItem, Me.TESTSYSTEMToolStripMenuItem1}) - Me.TESTSYSTEMToolStripMenuItem.Name = "TESTSYSTEMToolStripMenuItem" - Me.TESTSYSTEMToolStripMenuItem.Size = New System.Drawing.Size(140, 22) - Me.TESTSYSTEMToolStripMenuItem.Text = "TESTSYSTEM" - Me.TESTSYSTEMToolStripMenuItem.Visible = False - ' - 'PRODUKTIVToolStripMenuItem - ' - Me.PRODUKTIVToolStripMenuItem.Name = "PRODUKTIVToolStripMenuItem" - Me.PRODUKTIVToolStripMenuItem.Size = New System.Drawing.Size(140, 22) - Me.PRODUKTIVToolStripMenuItem.Text = "PRODUKTIV" - ' - 'TESTSYSTEMToolStripMenuItem1 - ' - Me.TESTSYSTEMToolStripMenuItem1.Name = "TESTSYSTEMToolStripMenuItem1" - Me.TESTSYSTEMToolStripMenuItem1.Size = New System.Drawing.Size(140, 22) - Me.TESTSYSTEMToolStripMenuItem1.Text = "TESTSYSTEM" - ' - 'UpdateToolStripMenuItem1 - ' - Me.UpdateToolStripMenuItem1.Name = "UpdateToolStripMenuItem1" - Me.UpdateToolStripMenuItem1.Size = New System.Drawing.Size(140, 22) - Me.UpdateToolStripMenuItem1.Text = "Update" - ' 'Label3 ' Me.Label3.AutoSize = True @@ -278,7 +307,7 @@ Partial Class frmLogin ' Me.picLogin.ContextMenuStrip = Me.ContextMenuStrip2 Me.picLogin.Image = CType(resources.GetObject("picLogin.Image"), System.Drawing.Image) - Me.picLogin.Location = New System.Drawing.Point(8, 7) + Me.picLogin.Location = New System.Drawing.Point(8, 8) Me.picLogin.Name = "picLogin" Me.picLogin.Size = New System.Drawing.Size(291, 50) Me.picLogin.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom @@ -289,7 +318,7 @@ Partial Class frmLogin ' Me.lblAlertTxt.AutoSize = True Me.lblAlertTxt.ForeColor = System.Drawing.Color.Red - Me.lblAlertTxt.Location = New System.Drawing.Point(68, 132) + Me.lblAlertTxt.Location = New System.Drawing.Point(70, 139) Me.lblAlertTxt.Name = "lblAlertTxt" Me.lblAlertTxt.Size = New System.Drawing.Size(192, 13) Me.lblAlertTxt.TabIndex = 6 @@ -300,7 +329,7 @@ Partial Class frmLogin ' Me.Label5.AutoSize = True Me.Label5.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Label5.Location = New System.Drawing.Point(50, 84) + Me.Label5.Location = New System.Drawing.Point(49, 91) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(52, 13) Me.Label5.TabIndex = 2 @@ -310,7 +339,7 @@ Partial Class frmLogin ' Me.Label6.AutoSize = True Me.Label6.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Label6.Location = New System.Drawing.Point(50, 114) + Me.Label6.Location = New System.Drawing.Point(49, 121) Me.Label6.Name = "Label6" Me.Label6.Size = New System.Drawing.Size(53, 13) Me.Label6.TabIndex = 4 @@ -340,17 +369,15 @@ Partial Class frmLogin Me.ToolStripMenuItem1.Size = New System.Drawing.Size(112, 22) Me.ToolStripMenuItem1.Text = "Update" ' - 'cboWarenort + 'lblWO ' - Me.cboWarenort._allowedValuesFreiText = Nothing - Me.cboWarenort._allowFreiText = False - Me.cboWarenort._value = "" - Me.cboWarenort.FormattingEnabled = True - Me.cboWarenort.Location = New System.Drawing.Point(11, 35) - Me.cboWarenort.Name = "cboWarenort" - Me.cboWarenort.Size = New System.Drawing.Size(288, 21) - Me.cboWarenort.TabIndex = 13 - Me.cboWarenort.Visible = False + Me.lblWO.AutoSize = True + Me.lblWO.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.lblWO.Location = New System.Drawing.Point(50, 64) + Me.lblWO.Name = "lblWO" + Me.lblWO.Size = New System.Drawing.Size(54, 13) + Me.lblWO.TabIndex = 15 + Me.lblWO.Text = "Warenort:" ' 'frmLogin ' @@ -370,9 +397,10 @@ Partial Class frmLogin Me.TopMost = True Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() + CType(Me.picWO, System.ComponentModel.ISupportInitialize).EndInit() + Me.ContextMenuStrip2.ResumeLayout(False) Me.Panel2.ResumeLayout(False) Me.Panel2.PerformLayout() - Me.ContextMenuStrip2.ResumeLayout(False) CType(Me.picLogin, System.ComponentModel.ISupportInitialize).EndInit() Me.ctxUpdate.ResumeLayout(False) Me.ContextMenuStrip1.ResumeLayout(False) @@ -411,4 +439,6 @@ Partial Class frmLogin Friend WithEvents AMBARToolStripMenuItem As ToolStripMenuItem Friend WithEvents VERIMEXToolStripMenuItem As ToolStripMenuItem Friend WithEvents cboWarenort As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents picWO As PictureBox + Friend WithEvents lblWO As Label End Class diff --git a/Aviso/frmLogin.vb b/Aviso/frmLogin.vb index a809378..c86d820 100644 --- a/Aviso/frmLogin.vb +++ b/Aviso/frmLogin.vb @@ -77,7 +77,7 @@ Public Class frmLogin 'initCBOWarenort Dim testSysTMP = VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False - cboWarenort.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM [tblGrenzstelle] where [grz_Warenort]=1", False, "AVISO") + cboWarenort.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM [tblGrenzstelle] where [grz_Warenort]=1 and [grz_aktiv]=1", False, "AVISO") VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = testSysTMP If File.Exists(pfadDatei) Then @@ -89,6 +89,8 @@ Public Class frmLogin If firma = "NKD" Then firma = "VERAG" If firma = "NEU" Then firma = "VERAG" If firma = "SUB" Then firma = "VERAG" + + Else ' FIRMA VON AD HOLEN, wenn keine StandortTxt Try @@ -202,6 +204,8 @@ Public Class frmLogin Sub initstart(Optional secret = False) picLogin.Size = New Size(picLogin.Width, 50) cboWarenort.Visible = False + picWO.Visible = False + lblWO.Visible = False Select Case firma Case "VERAG" ' cGlobal.ConnStrFMZOLL = VERAG_PROG_ALLGEMEIN.My.MySettings.Default.FMZOLL_PRODConnectionString @@ -229,10 +233,27 @@ Public Class frmLogin picLogin.Size = New Size(picLogin.Width, 71) picLogin.Image = My.Resources.FrontOfficeSUB Case "WARENORT" - picLogin.Size = New Size(picLogin.Width, 71) + ' picLogin.Size = New Size(picLogin.Width, 71) picLogin.Image = Nothing cboWarenort.Visible = True + picWO.Visible = True + lblWO.Visible = True + Case "FO_Wiesentheid", "WO_GE", "WO_IST_LOL", "WO_IST_LOG", "WO_KITA", "WO_MERIS" + + 'picLogin.Size = New Size(picLogin.Width, 71) + picLogin.Image = Nothing + + cboWarenort.Visible = True + cboWarenort.Enabled = False + + lblWO.Visible = True + picWO.Visible = True + cboWarenort.changeItem(firma) + + firma = "WARENORT" + + Case "VERIMEX" picLogin.Size = New Size(picLogin.Width, 71) picLogin.Image = My.Resources.verimex @@ -283,6 +304,7 @@ Public Class frmLogin VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL firma = SQL.DLookup("grz_Firma", "tblGrenzstelle", "grz_Grenzstelle='" & cboWarenort._value & "'", "AVISO", "") + ' MsgBox(VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT) If firma = "" Then firma = "WARENORT" : Exit Sub 'NIEDERLASSUNG? VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = testSysTMP @@ -594,22 +616,22 @@ Public Class frmLogin End Sub Private Sub VERAGToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VERAGToolStripMenuItem.Click - firma = "VERAG" + If firma <> "WARENORT" Then firma = "VERAG" initstart() End Sub Private Sub ATILLAToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATILLAToolStripMenuItem.Click - firma = "ATILLA" + If firma <> "WARENORT" Then firma = "ATILLA" initstart() End Sub Private Sub PRODUKTIVToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PRODUKTIVToolStripMenuItem.Click - TESTSYSTEM = False + If firma <> "WARENORT" Then TESTSYSTEM = False Else MsgBox("Nicht verfügbar!") initstart() End Sub Private Sub TESTSYSTEMToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles TESTSYSTEMToolStripMenuItem1.Click - TESTSYSTEM = True + If firma <> "WARENORT" Then TESTSYSTEM = True Else MsgBox("Nicht verfügbar!") initstart() End Sub @@ -625,7 +647,7 @@ Public Class frmLogin Private Sub IMEXToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles IMEXToolStripMenuItem.Click - firma = "IMEX" + If firma <> "WARENORT" Then firma = "IMEX" initstart() End Sub @@ -634,25 +656,38 @@ Public Class frmLogin End Sub Private Sub FRONTOFFICEToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles FRONTOFFICEToolStripMenuItem.Click - firma = "FRONTOFFICE" + If firma <> "WARENORT" Then firma = "FRONTOFFICE" initstart() End Sub Private Sub UNISPEDToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles UNISPEDToolStripMenuItem.Click - firma = "UNISPED" + If firma <> "WARENORT" Then firma = "UNISPED" initstart() End Sub Private Sub AMBARToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AMBARToolStripMenuItem.Click - firma = "AMBAR" + If firma <> "WARENORT" Then firma = "AMBAR" initstart() End Sub Private Sub VERIMEXToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VERIMEXToolStripMenuItem.Click - firma = "VERIMEX" + If firma <> "WARENORT" Then firma = "VERIMEX" initstart() End Sub + Private Sub cboWarenort_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboWarenort.SelectedIndexChanged + picWO.BackgroundImage = Nothing + picWO.Visible = True + Select Case cboWarenort._value + Case "FO_Wiesentheid" : 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 + Case "WO_MERIS" : picWO.BackgroundImage = My.Resources.meris + End Select + End Sub + Private Sub FlatButton2_Click(sender As Object, e As EventArgs) Handles FlatButton2.Click + End Sub End Class \ No newline at end of file diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index 7869f52..afa3b85 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -489,6 +489,7 @@ Public Class usrcntlAktDetails .Columns("tblSnd_Empfaenger").MinimumWidth = 130 .Columns("tblSnd_Empfaenger").HeaderText = "Empfaenger" + .Columns("tblSnd_Empfaenger").HeaderText = VERAG_PROG_ALLGEMEIN.cAllgemein._getTRANSLATE_SUB(Me, dgvSendungen, .Columns("tblSnd_Empfaenger"), .Columns("tblSnd_Empfaenger").HeaderText) .Columns("tblSnd_Empfaenger").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill ' .Columns("Vermerke_Anzahl").Width = 60 @@ -617,6 +618,7 @@ Public Class usrcntlAktDetails Dim t = New DataGridViewTextBoxColumn t.Name = "Abfertigungsart" t.HeaderText = "Abfertigungsart" + t.HeaderText = VERAG_PROG_ALLGEMEIN.cAllgemein._getTRANSLATE_SUB(Me, dgvSendungen, t, t.HeaderText) t.Width = 100 : t.DefaultCellStyle.Padding = New Padding(2) : t.DefaultCellStyle.BackColor = Color.White 't.ToolTipText = "" .Columns.Insert(3, t) @@ -2084,14 +2086,14 @@ Public Class usrcntlAktDetails Next Try - tbcntlVermerke.TabPages(0).Text = "Alle (" & ADMIN.getValueTxtBySql("SELECT COUNT(*) FROM Vermerke WHERE [AvisoID]=" & AvisoID & "", "AVISO") & ")" - tbcntlVermerke.TabPages(1).Text = "Aktenvermerke (" & ADMIN.getValueTxtBySql("SELECT COUNT(*) FROM Vermerke WHERE [AvisoID]=" & AvisoID & " AND [VermerkArt]='A' ", "AVISO") & ")" + tbcntlVermerke.TabPages(0).Text = VERAG_PROG_ALLGEMEIN.cAllgemein._getTRANSLATE(Me, tbAlle, "Alle") & " (" & ADMIN.getValueTxtBySql("SELECT COUNT(*) FROM Vermerke WHERE [AvisoID]=" & AvisoID & "", "AVISO") & ")" + tbcntlVermerke.TabPages(1).Text = VERAG_PROG_ALLGEMEIN.cAllgemein._getTRANSLATE(Me, tbAkenvermerk, "Aktenvermerke") & " (" & ADMIN.getValueTxtBySql("SELECT COUNT(*) FROM Vermerke WHERE [AvisoID]=" & AvisoID & " AND [VermerkArt]='A' ", "AVISO") & ")" If dgvSendungen.SelectedRows.Count > 0 Then - tbcntlVermerke.TabPages(2).Text = "Sendungsvermerke (" & ADMIN.getValueTxtBySql("SELECT COUNT(*) FROM Vermerke WHERE [AvisoID]=" & AvisoID & " AND [VermerkArt]='S' AND [SendungID]='" & dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value & "' ", "AVISO") & ")" + tbcntlVermerke.TabPages(2).Text = VERAG_PROG_ALLGEMEIN.cAllgemein._getTRANSLATE(Me, tbSndvermerk, "Sendungsvermerke") & " (" & ADMIN.getValueTxtBySql("SELECT COUNT(*) FROM Vermerke WHERE [AvisoID]=" & AvisoID & " AND [VermerkArt]='S' AND [SendungID]='" & dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value & "' ", "AVISO") & ")" Else - tbcntlVermerke.TabPages(2).Text = "Sendungsvermerke" + tbcntlVermerke.TabPages(2).Text = VERAG_PROG_ALLGEMEIN.cAllgemein._getTRANSLATE(Me, tbSndvermerk, "Sendungsvermerke") & "" End If - tbcntlVermerke.TabPages(3).Text = "Anhang (" & ADMIN.getValueTxtBySql("SELECT COUNT(*) FROM [tblAvisoAnhaenge] WHERE [anh_AvisoId]='" & AvisoID & "' AND isnull(anh_SendungsId,0) <=0 ", "AVISO") & ")" + tbcntlVermerke.TabPages(3).Text = VERAG_PROG_ALLGEMEIN.cAllgemein._getTRANSLATE(Me, tbAnhang, "Anhang") & " (" & ADMIN.getValueTxtBySql("SELECT COUNT(*) FROM [tblAvisoAnhaenge] WHERE [anh_AvisoId]='" & AvisoID & "' AND isnull(anh_SendungsId,0) <=0 ", "AVISO") & ")" Catch ex As Exception End Try @@ -2404,9 +2406,11 @@ Public Class usrcntlAktDetails If AVISO.LetzterMitarbeiterId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID Then btnAktUebernehmen.Image = My.Resources.weiterleiten_small1 btnAktUebernehmen.Text = "Akt weiterleiten..." + 'VERAG_PROG_ALLGEMEIN.cAllgemein._getTRANSLATE(Me, btnAktUebernehmen) Else btnAktUebernehmen.Image = My.Resources.personCheck_small btnAktUebernehmen.Text = "Akt übernehmen" + VERAG_PROG_ALLGEMEIN.cAllgemein._getTRANSLATE(Me, btnAktUebernehmen) End If End Sub Public Sub showInfo(t As String, s As Double) diff --git a/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb b/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb index b7c949e..fa0a9c8 100644 --- a/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb +++ b/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb @@ -270,7 +270,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.tbZollanmeldungen.Controls.Add(Me.Panel1) Me.tbZollanmeldungen.Location = New System.Drawing.Point(4, 22) Me.tbZollanmeldungen.Name = "tbZollanmeldungen" - Me.tbZollanmeldungen.Size = New System.Drawing.Size(567, 157) + Me.tbZollanmeldungen.Size = New System.Drawing.Size(567, 181) Me.tbZollanmeldungen.TabIndex = 2 Me.tbZollanmeldungen.Text = "Zollanmeldungen" Me.tbZollanmeldungen.UseVisualStyleBackColor = True @@ -283,7 +283,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel1.Location = New System.Drawing.Point(0, 0) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(567, 157) + Me.Panel1.Size = New System.Drawing.Size(567, 181) Me.Panel1.TabIndex = 0 ' 'dgvZollAnmeldungen @@ -335,7 +335,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.dgvZollAnmeldungen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvZollAnmeldungen.ShowCellErrors = False Me.dgvZollAnmeldungen.ShowRowErrors = False - Me.dgvZollAnmeldungen.Size = New System.Drawing.Size(565, 124) + Me.dgvZollAnmeldungen.Size = New System.Drawing.Size(565, 148) Me.dgvZollAnmeldungen.TabIndex = 102 Me.dgvZollAnmeldungen.TabStop = False ' @@ -380,7 +380,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.tbSpedBuch.Location = New System.Drawing.Point(4, 22) Me.tbSpedBuch.Name = "tbSpedBuch" Me.tbSpedBuch.Padding = New System.Windows.Forms.Padding(3) - Me.tbSpedBuch.Size = New System.Drawing.Size(567, 157) + Me.tbSpedBuch.Size = New System.Drawing.Size(567, 181) Me.tbSpedBuch.TabIndex = 1 Me.tbSpedBuch.Text = "Speditionsbuch" Me.tbSpedBuch.UseVisualStyleBackColor = True @@ -434,7 +434,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.dgvSpeditionsbuch.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvSpeditionsbuch.ShowCellErrors = False Me.dgvSpeditionsbuch.ShowRowErrors = False - Me.dgvSpeditionsbuch.Size = New System.Drawing.Size(561, 120) + Me.dgvSpeditionsbuch.Size = New System.Drawing.Size(561, 144) Me.dgvSpeditionsbuch.TabIndex = 101 Me.dgvSpeditionsbuch.TabStop = False ' @@ -479,7 +479,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.tbAnhaenge.Location = New System.Drawing.Point(4, 22) Me.tbAnhaenge.Name = "tbAnhaenge" Me.tbAnhaenge.Padding = New System.Windows.Forms.Padding(3) - Me.tbAnhaenge.Size = New System.Drawing.Size(567, 157) + Me.tbAnhaenge.Size = New System.Drawing.Size(567, 181) Me.tbAnhaenge.TabIndex = 3 Me.tbAnhaenge.Text = "Anhänge" Me.tbAnhaenge.UseVisualStyleBackColor = True @@ -532,7 +532,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.dgvanhaenge.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvanhaenge.ShowCellErrors = False Me.dgvanhaenge.ShowRowErrors = False - Me.dgvanhaenge.Size = New System.Drawing.Size(561, 113) + Me.dgvanhaenge.Size = New System.Drawing.Size(561, 137) Me.dgvanhaenge.TabIndex = 102 Me.dgvanhaenge.TabStop = False ' @@ -543,7 +543,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.Panel5.Controls.Add(Me.Button4) Me.Panel5.Controls.Add(Me.Button10) Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel5.Location = New System.Drawing.Point(3, 116) + Me.Panel5.Location = New System.Drawing.Point(3, 140) Me.Panel5.Name = "Panel5" Me.Panel5.Size = New System.Drawing.Size(561, 38) Me.Panel5.TabIndex = 112 @@ -1190,7 +1190,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.Panel6.Controls.Add(Me.Label7) Me.Panel6.Location = New System.Drawing.Point(115, 3) Me.Panel6.Name = "Panel6" - Me.Panel6.Size = New System.Drawing.Size(100, 74) + Me.Panel6.Size = New System.Drawing.Size(111, 74) Me.Panel6.TabIndex = 19 ' 'btnVERIMEX @@ -1206,9 +1206,9 @@ Partial Class usrcntlAktDetailsATILLANeu Me.btnVERIMEX.Margin = New System.Windows.Forms.Padding(0) Me.btnVERIMEX.MinimumSize = New System.Drawing.Size(100, 0) Me.btnVERIMEX.Name = "btnVERIMEX" - Me.btnVERIMEX.Size = New System.Drawing.Size(100, 62) + Me.btnVERIMEX.Size = New System.Drawing.Size(111, 62) Me.btnVERIMEX.TabIndex = 12 - Me.btnVERIMEX.Text = "2. " & Global.Microsoft.VisualBasic.ChrW(10) & "VERIMEX" + Me.btnVERIMEX.Text = "2. " & Global.Microsoft.VisualBasic.ChrW(10) & "VERIMEX/IND." Me.btnVERIMEX.UseVisualStyleBackColor = False ' 'Label7 @@ -1217,7 +1217,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label7.Location = New System.Drawing.Point(0, 62) Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(100, 12) + Me.Label7.Size = New System.Drawing.Size(111, 12) Me.Label7.TabIndex = 0 Me.Label7.Text = "-" Me.Label7.TextAlign = System.Drawing.ContentAlignment.TopCenter @@ -1227,7 +1227,7 @@ 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(221, 3) + Me.Panel13.Location = New System.Drawing.Point(232, 3) Me.Panel13.Name = "Panel13" Me.Panel13.Size = New System.Drawing.Size(112, 75) Me.Panel13.TabIndex = 17 @@ -1266,7 +1266,7 @@ 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(339, 3) + Me.Panel11.Location = New System.Drawing.Point(350, 3) Me.Panel11.Name = "Panel11" Me.Panel11.Size = New System.Drawing.Size(100, 75) Me.Panel11.TabIndex = 17 @@ -1305,7 +1305,7 @@ 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(445, 3) + Me.Panel12.Location = New System.Drawing.Point(456, 3) Me.Panel12.Name = "Panel12" Me.Panel12.Size = New System.Drawing.Size(100, 74) Me.Panel12.TabIndex = 17 diff --git a/Diverses/logosWO/Koerfez61.jpg b/Diverses/logosWO/Koerfez61.jpg new file mode 100644 index 0000000..815a60a Binary files /dev/null and b/Diverses/logosWO/Koerfez61.jpg differ diff --git a/Diverses/logosWO/ge_transport.png b/Diverses/logosWO/ge_transport.png new file mode 100644 index 0000000..8054740 Binary files /dev/null and b/Diverses/logosWO/ge_transport.png differ diff --git a/Diverses/logosWO/istLog.png b/Diverses/logosWO/istLog.png new file mode 100644 index 0000000..cd9b733 Binary files /dev/null and b/Diverses/logosWO/istLog.png differ diff --git a/Diverses/logosWO/kita.png b/Diverses/logosWO/kita.png new file mode 100644 index 0000000..e01884d Binary files /dev/null and b/Diverses/logosWO/kita.png differ diff --git a/Diverses/logosWO/meris.png b/Diverses/logosWO/meris.png new file mode 100644 index 0000000..fcb0ebd Binary files /dev/null and b/Diverses/logosWO/meris.png differ