From 1d9713216728e713cd0fdc9155aae3274027d5a4 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 14 Aug 2025 08:35:30 +0200 Subject: [PATCH] Spedbuch, ustv. --- .../usrCntlSpeditionsBuchSuche.Designer.vb | 297 ++++++++++------- .../usrCntlSpeditionsBuchSuche.resx | 3 + .../usrCntlSpeditionsBuchSuche.vb | 301 +++++++++--------- SDL/USTV/usrCntlUSTV.vb | 2 +- 4 files changed, 334 insertions(+), 269 deletions(-) diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb index 59a51032..75e8e43b 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb @@ -23,12 +23,12 @@ Partial Class usrCntlSpeditionsBuchSuche Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() + 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 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 resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlSpeditionsBuchSuche)) Me.TabPage1 = New System.Windows.Forms.TabPage() Me.cntxtCntxtSpeditionsbuch = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -79,7 +79,6 @@ Partial Class usrCntlSpeditionsBuchSuche Me.ZFSteyrZeitraumAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AuswertungDiversZeitraumAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.cboHandlingssatz = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Button20 = New System.Windows.Forms.Button() Me.Label46 = New System.Windows.Forms.Label() @@ -100,7 +99,6 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Button9 = New System.Windows.Forms.Button() Me.btnQSAufteilung = New System.Windows.Forms.Button() Me.Label31 = New System.Windows.Forms.Label() - Me.Button8 = New System.Windows.Forms.Button() Me.Panel1 = New System.Windows.Forms.Panel() Me.cbxRptDetailsZahlungsdetails = New System.Windows.Forms.CheckBox() Me.cboDetailberichtKdAtrNr = New VERAG_PROG_ALLGEMEIN.MyComboBox() @@ -205,6 +203,12 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Label45 = New System.Windows.Forms.Label() Me.cboFilialeHandling = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.SplitContainer = New System.Windows.Forms.SplitContainer() + Me.Button8 = New System.Windows.Forms.Button() + Me.Panel3 = New System.Windows.Forms.Panel() + Me.MenuStrip2 = New System.Windows.Forms.MenuStrip() + Me.ToolStripMenuItem14 = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripMenuItem19 = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.cntxtCntxtSpeditionsbuch.SuspendLayout() Me.pnlRechts.SuspendLayout() CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit() @@ -227,6 +231,8 @@ Partial Class usrCntlSpeditionsBuchSuche Me.SplitContainer.Panel1.SuspendLayout() Me.SplitContainer.Panel2.SuspendLayout() Me.SplitContainer.SuspendLayout() + Me.Panel3.SuspendLayout() + Me.MenuStrip2.SuspendLayout() Me.SuspendLayout() ' 'TabPage1 @@ -670,35 +676,35 @@ Partial Class usrCntlSpeditionsBuchSuche Me.DataGridView.AllowUserToDeleteRows = False Me.DataGridView.AllowUserToOrderColumns = True Me.DataGridView.AllowUserToResizeRows = False - DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.DataGridView.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control + 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.WindowText + DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.DataGridView.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle7 Me.DataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.DataGridView.ContextMenuStrip = Me.cntxtCntxtSpeditionsbuch - DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.DataGridView.DefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.DataGridView.DefaultCellStyle = DataGridViewCellStyle8 Me.DataGridView.Dock = System.Windows.Forms.DockStyle.Fill Me.DataGridView.Location = New System.Drawing.Point(450, 0) Me.DataGridView.Name = "DataGridView" - DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.DataGridView.RowHeadersDefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.DataGridView.RowHeadersDefaultCellStyle = DataGridViewCellStyle9 Me.DataGridView.Size = New System.Drawing.Size(770, 200) Me.DataGridView.TabIndex = 0 ' @@ -725,35 +731,35 @@ Partial Class usrCntlSpeditionsBuchSuche Me.dgvLKW.AllowUserToOrderColumns = True Me.dgvLKW.AllowUserToResizeRows = False Me.dgvLKW.BackgroundColor = System.Drawing.Color.WhiteSmoke - DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvLKW.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvLKW.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1 Me.dgvLKW.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvLKW.ContextMenuStrip = Me.cntxtCntxtSpeditionsbuch - DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvLKW.DefaultCellStyle = DataGridViewCellStyle5 + DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvLKW.DefaultCellStyle = DataGridViewCellStyle2 Me.dgvLKW.Dock = System.Windows.Forms.DockStyle.Left Me.dgvLKW.Location = New System.Drawing.Point(0, 0) Me.dgvLKW.Name = "dgvLKW" - DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 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.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle6 + DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle3 Me.dgvLKW.Size = New System.Drawing.Size(450, 200) Me.dgvLKW.TabIndex = 35 Me.dgvLKW.Visible = False @@ -761,6 +767,7 @@ Partial Class usrCntlSpeditionsBuchSuche 'pnlOpt ' Me.pnlOpt.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnlOpt.Controls.Add(Me.Panel3) Me.pnlOpt.Controls.Add(Me.pnlBerichte) Me.pnlOpt.Controls.Add(Me.pnl) Me.pnlOpt.Controls.Add(Me.btnExcel) @@ -776,43 +783,34 @@ Partial Class usrCntlSpeditionsBuchSuche ' 'pnlBerichte ' + Me.pnlBerichte.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.pnlBerichte.Controls.Add(Me.cbxDetailbericht) Me.pnlBerichte.Controls.Add(Me.MyComboBox2) Me.pnlBerichte.Controls.Add(Me.Button25) Me.pnlBerichte.Controls.Add(Me.Button24) Me.pnlBerichte.Controls.Add(Me.Button23) - Me.pnlBerichte.Controls.Add(Me.Button22) - Me.pnlBerichte.Controls.Add(Me.Button21) - Me.pnlBerichte.Controls.Add(Me.btnSpedBuchEinnahmen) Me.pnlBerichte.Controls.Add(Me.lblKdAusFortschritt) - Me.pnlBerichte.Controls.Add(Me.MenuStrip1) Me.pnlBerichte.Controls.Add(Me.cboHandlingssatz) + Me.pnlBerichte.Controls.Add(Me.MenuStrip1) Me.pnlBerichte.Controls.Add(Me.Button20) Me.pnlBerichte.Controls.Add(Me.Label46) Me.pnlBerichte.Controls.Add(Me.Button19) Me.pnlBerichte.Controls.Add(Me.Button18) Me.pnlBerichte.Controls.Add(Me.Button16) Me.pnlBerichte.Controls.Add(Me.Button17) - Me.pnlBerichte.Controls.Add(Me.cbxFilterInBericht) - Me.pnlBerichte.Controls.Add(Me.txtUeberschr) - Me.pnlBerichte.Controls.Add(Me.Label42) Me.pnlBerichte.Controls.Add(Me.btnCSAufteilung) Me.pnlBerichte.Controls.Add(Me.Button14) - Me.pnlBerichte.Controls.Add(Me.cbxSpedBerichtBar) Me.pnlBerichte.Controls.Add(Me.txtMax) Me.pnlBerichte.Controls.Add(Me.cboRolle) Me.pnlBerichte.Controls.Add(Me.Label35) Me.pnlBerichte.Controls.Add(Me.Label34) Me.pnlBerichte.Controls.Add(Me.Button9) Me.pnlBerichte.Controls.Add(Me.btnQSAufteilung) - Me.pnlBerichte.Controls.Add(Me.Label31) - Me.pnlBerichte.Controls.Add(Me.Button8) - Me.pnlBerichte.Controls.Add(Me.Panel1) Me.pnlBerichte.Controls.Add(Me.Label43) - Me.pnlBerichte.Dock = System.Windows.Forms.DockStyle.Left - Me.pnlBerichte.Location = New System.Drawing.Point(197, 0) + Me.pnlBerichte.Location = New System.Drawing.Point(588, 0) Me.pnlBerichte.Name = "pnlBerichte" - Me.pnlBerichte.Size = New System.Drawing.Size(886, 188) + Me.pnlBerichte.Size = New System.Drawing.Size(495, 186) Me.pnlBerichte.TabIndex = 6 Me.pnlBerichte.Visible = False ' @@ -820,7 +818,7 @@ Partial Class usrCntlSpeditionsBuchSuche ' Me.cbxDetailbericht.AutoSize = True Me.cbxDetailbericht.BackColor = System.Drawing.Color.WhiteSmoke - Me.cbxDetailbericht.Location = New System.Drawing.Point(725, 139) + Me.cbxDetailbericht.Location = New System.Drawing.Point(333, 141) Me.cbxDetailbericht.Name = "cbxDetailbericht" Me.cbxDetailbericht.Size = New System.Drawing.Size(85, 17) Me.cbxDetailbericht.TabIndex = 59 @@ -835,7 +833,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.MyComboBox2.DropDownWidth = 250 Me.MyComboBox2.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.MyComboBox2.FormattingEnabled = True - Me.MyComboBox2.Location = New System.Drawing.Point(561, 160) + Me.MyComboBox2.Location = New System.Drawing.Point(169, 162) Me.MyComboBox2.Name = "MyComboBox2" Me.MyComboBox2.Size = New System.Drawing.Size(128, 22) Me.MyComboBox2.TabIndex = 53 @@ -845,7 +843,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Button25.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button25.Image = Global.SDL.My.Resources.Resources.statistik_small Me.Button25.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button25.Location = New System.Drawing.Point(561, 132) + Me.Button25.Location = New System.Drawing.Point(169, 134) Me.Button25.Margin = New System.Windows.Forms.Padding(0) Me.Button25.Name = "Button25" Me.Button25.Size = New System.Drawing.Size(128, 28) @@ -860,7 +858,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Button24.BackgroundImage = Global.SDL.My.Resources.Resources.Excel_logo Me.Button24.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center Me.Button24.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button24.Location = New System.Drawing.Point(714, 7) + Me.Button24.Location = New System.Drawing.Point(322, 7) Me.Button24.Name = "Button24" Me.Button24.Size = New System.Drawing.Size(41, 34) Me.Button24.TabIndex = 43 @@ -871,7 +869,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Button23.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button23.Image = Global.SDL.My.Resources.Resources.statistik_small Me.Button23.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button23.Location = New System.Drawing.Point(788, 81) + Me.Button23.Location = New System.Drawing.Point(396, 83) Me.Button23.Margin = New System.Windows.Forms.Padding(0) Me.Button23.Name = "Button23" Me.Button23.Size = New System.Drawing.Size(83, 28) @@ -884,7 +882,7 @@ Partial Class usrCntlSpeditionsBuchSuche ' Me.Button22.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button22.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button22.Location = New System.Drawing.Point(308, 129) + Me.Button22.Location = New System.Drawing.Point(308, 135) Me.Button22.Margin = New System.Windows.Forms.Padding(0) Me.Button22.Name = "Button22" Me.Button22.Size = New System.Drawing.Size(62, 25) @@ -898,7 +896,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Button21.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button21.Image = Global.SDL.My.Resources.Resources.statistik_small Me.Button21.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button21.Location = New System.Drawing.Point(155, 129) + Me.Button21.Location = New System.Drawing.Point(155, 135) Me.Button21.Margin = New System.Windows.Forms.Padding(0) Me.Button21.Name = "Button21" Me.Button21.Size = New System.Drawing.Size(154, 25) @@ -912,7 +910,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.btnSpedBuchEinnahmen.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnSpedBuchEinnahmen.Image = Global.SDL.My.Resources.Resources.statistik_small Me.btnSpedBuchEinnahmen.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnSpedBuchEinnahmen.Location = New System.Drawing.Point(9, 114) + Me.btnSpedBuchEinnahmen.Location = New System.Drawing.Point(9, 120) Me.btnSpedBuchEinnahmen.Margin = New System.Windows.Forms.Padding(0) Me.btnSpedBuchEinnahmen.Name = "btnSpedBuchEinnahmen" Me.btnSpedBuchEinnahmen.Size = New System.Drawing.Size(127, 41) @@ -924,8 +922,7 @@ Partial Class usrCntlSpeditionsBuchSuche ' 'lblKdAusFortschritt ' - Me.lblKdAusFortschritt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.lblKdAusFortschritt.Location = New System.Drawing.Point(806, 135) + Me.lblKdAusFortschritt.Location = New System.Drawing.Point(418, 142) Me.lblKdAusFortschritt.Name = "lblKdAusFortschritt" Me.lblKdAusFortschritt.Size = New System.Drawing.Size(77, 14) Me.lblKdAusFortschritt.TabIndex = 43 @@ -936,16 +933,16 @@ Partial Class usrCntlSpeditionsBuchSuche Me.MenuStrip1.Dock = System.Windows.Forms.DockStyle.None Me.MenuStrip1.ImageScalingSize = New System.Drawing.Size(24, 24) Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KundenauswertungenToolStripMenuItem1}) - Me.MenuStrip1.Location = New System.Drawing.Point(715, 158) + Me.MenuStrip1.Location = New System.Drawing.Point(322, 156) Me.MenuStrip1.Name = "MenuStrip1" - Me.MenuStrip1.Size = New System.Drawing.Size(283, 27) + Me.MenuStrip1.Size = New System.Drawing.Size(163, 27) Me.MenuStrip1.TabIndex = 89 Me.MenuStrip1.Text = "Kundenauswertungen" ' 'KundenauswertungenToolStripMenuItem1 ' Me.KundenauswertungenToolStripMenuItem1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.KundenauswertungenToolStripMenuItem1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem, Me.ZFSteyrZeitraumAuswählenToolStripMenuItem, Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem, Me.AuswertungDiversZeitraumAuswählenToolStripMenuItem, Me.ToolStripMenuItem1}) + Me.KundenauswertungenToolStripMenuItem1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem, Me.ZFSteyrZeitraumAuswählenToolStripMenuItem, Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem, Me.AuswertungDiversZeitraumAuswählenToolStripMenuItem}) Me.KundenauswertungenToolStripMenuItem1.Font = New System.Drawing.Font("Segoe UI", 10.0!) Me.KundenauswertungenToolStripMenuItem1.ForeColor = System.Drawing.Color.White Me.KundenauswertungenToolStripMenuItem1.Name = "KundenauswertungenToolStripMenuItem1" @@ -983,13 +980,6 @@ Partial Class usrCntlSpeditionsBuchSuche Me.AuswertungDiversZeitraumAuswählenToolStripMenuItem.Text = "Flender Bocholt (Zeitraum auswählen)" Me.AuswertungDiversZeitraumAuswählenToolStripMenuItem.Visible = False ' - 'ToolStripMenuItem1 - ' - Me.ToolStripMenuItem1.Image = Global.SDL.My.Resources.Resources.Excel_logo - Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1" - Me.ToolStripMenuItem1.Size = New System.Drawing.Size(316, 30) - Me.ToolStripMenuItem1.Text = "div Kunde (Zeitraum auswählen)" - ' 'cboHandlingssatz ' Me.cboHandlingssatz._allowedValuesFreiText = Nothing @@ -997,7 +987,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.cboHandlingssatz._value = "" Me.cboHandlingssatz.DropDownWidth = 300 Me.cboHandlingssatz.FormattingEnabled = True - Me.cboHandlingssatz.Location = New System.Drawing.Point(399, 160) + Me.cboHandlingssatz.Location = New System.Drawing.Point(7, 162) Me.cboHandlingssatz.Name = "cboHandlingssatz" Me.cboHandlingssatz.Size = New System.Drawing.Size(159, 21) Me.cboHandlingssatz.TabIndex = 60 @@ -1007,7 +997,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Button20.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button20.Image = Global.SDL.My.Resources.Resources.statistik_small Me.Button20.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button20.Location = New System.Drawing.Point(399, 132) + Me.Button20.Location = New System.Drawing.Point(7, 134) Me.Button20.Margin = New System.Windows.Forms.Padding(0) Me.Button20.Name = "Button20" Me.Button20.Size = New System.Drawing.Size(159, 28) @@ -1021,7 +1011,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Label46.AutoSize = True Me.Label46.BackColor = System.Drawing.Color.WhiteSmoke Me.Label46.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label46.Location = New System.Drawing.Point(396, 119) + Me.Label46.Location = New System.Drawing.Point(4, 121) Me.Label46.Name = "Label46" Me.Label46.Size = New System.Drawing.Size(61, 13) Me.Label46.TabIndex = 58 @@ -1032,7 +1022,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Button19.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button19.Image = Global.SDL.My.Resources.Resources.statistik_small Me.Button19.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button19.Location = New System.Drawing.Point(788, 54) + Me.Button19.Location = New System.Drawing.Point(396, 56) Me.Button19.Margin = New System.Windows.Forms.Padding(0) Me.Button19.Name = "Button19" Me.Button19.Size = New System.Drawing.Size(83, 28) @@ -1046,7 +1036,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Button18.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button18.Image = Global.SDL.My.Resources.Resources.statistik_small Me.Button18.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button18.Location = New System.Drawing.Point(606, 54) + Me.Button18.Location = New System.Drawing.Point(214, 56) Me.Button18.Margin = New System.Windows.Forms.Padding(0) Me.Button18.Name = "Button18" Me.Button18.Size = New System.Drawing.Size(183, 28) @@ -1060,7 +1050,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Button16.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button16.Image = Global.SDL.My.Resources.Resources.statistik_small Me.Button16.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button16.Location = New System.Drawing.Point(685, 96) + Me.Button16.Location = New System.Drawing.Point(293, 98) Me.Button16.Margin = New System.Windows.Forms.Padding(0) Me.Button16.Name = "Button16" Me.Button16.Size = New System.Drawing.Size(80, 25) @@ -1075,7 +1065,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Button17.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button17.Image = Global.SDL.My.Resources.Resources.statistik_small Me.Button17.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button17.Location = New System.Drawing.Point(606, 96) + Me.Button17.Location = New System.Drawing.Point(214, 98) Me.Button17.Margin = New System.Windows.Forms.Padding(0) Me.Button17.Name = "Button17" Me.Button17.Size = New System.Drawing.Size(80, 25) @@ -1089,7 +1079,7 @@ Partial Class usrCntlSpeditionsBuchSuche ' Me.cbxFilterInBericht.AutoSize = True Me.cbxFilterInBericht.BackColor = System.Drawing.Color.White - Me.cbxFilterInBericht.Location = New System.Drawing.Point(10, 76) + Me.cbxFilterInBericht.Location = New System.Drawing.Point(10, 82) Me.cbxFilterInBericht.Name = "cbxFilterInBericht" Me.cbxFilterInBericht.Size = New System.Drawing.Size(95, 17) Me.cbxFilterInBericht.TabIndex = 52 @@ -1112,7 +1102,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtUeberschr._WaehrungZeichen = True Me.txtUeberschr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtUeberschr.ForeColor = System.Drawing.Color.Black - Me.txtUeberschr.Location = New System.Drawing.Point(204, 101) + Me.txtUeberschr.Location = New System.Drawing.Point(204, 107) Me.txtUeberschr.MaxLineLength = -1 Me.txtUeberschr.MaxLines_Warning = "" Me.txtUeberschr.MaxLines_Warning_Label = Nothing @@ -1124,7 +1114,7 @@ Partial Class usrCntlSpeditionsBuchSuche 'Label42 ' Me.Label42.AutoSize = True - Me.Label42.Location = New System.Drawing.Point(152, 104) + Me.Label42.Location = New System.Drawing.Point(152, 110) Me.Label42.Name = "Label42" Me.Label42.Size = New System.Drawing.Size(46, 13) Me.Label42.TabIndex = 50 @@ -1135,7 +1125,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.btnCSAufteilung.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnCSAufteilung.Image = Global.SDL.My.Resources.Resources.statistik_small Me.btnCSAufteilung.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCSAufteilung.Location = New System.Drawing.Point(399, 36) + Me.btnCSAufteilung.Location = New System.Drawing.Point(7, 38) Me.btnCSAufteilung.Margin = New System.Windows.Forms.Padding(0) Me.btnCSAufteilung.Name = "btnCSAufteilung" Me.btnCSAufteilung.Size = New System.Drawing.Size(154, 25) @@ -1150,7 +1140,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Button14.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button14.Image = Global.SDL.My.Resources.Resources.statistik_small Me.Button14.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button14.Location = New System.Drawing.Point(399, 64) + Me.Button14.Location = New System.Drawing.Point(7, 66) Me.Button14.Margin = New System.Windows.Forms.Padding(0) Me.Button14.Name = "Button14" Me.Button14.Size = New System.Drawing.Size(154, 25) @@ -1188,7 +1178,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtMax._WaehrungZeichen = True Me.txtMax.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtMax.ForeColor = System.Drawing.Color.Black - Me.txtMax.Location = New System.Drawing.Point(793, 11) + Me.txtMax.Location = New System.Drawing.Point(401, 13) Me.txtMax.MaxLineLength = -1 Me.txtMax.MaxLines_Warning = "" Me.txtMax.MaxLines_Warning_Label = Nothing @@ -1203,7 +1193,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.cboRolle._value = "" Me.cboRolle.DropDownWidth = 300 Me.cboRolle.FormattingEnabled = True - Me.cboRolle.Location = New System.Drawing.Point(793, 30) + Me.cboRolle.Location = New System.Drawing.Point(401, 32) Me.cboRolle.Name = "cboRolle" Me.cboRolle.Size = New System.Drawing.Size(76, 21) Me.cboRolle.TabIndex = 39 @@ -1211,7 +1201,7 @@ Partial Class usrCntlSpeditionsBuchSuche 'Label35 ' Me.Label35.AutoSize = True - Me.Label35.Location = New System.Drawing.Point(759, 14) + Me.Label35.Location = New System.Drawing.Point(367, 16) Me.Label35.Name = "Label35" Me.Label35.Size = New System.Drawing.Size(30, 13) Me.Label35.TabIndex = 32 @@ -1220,7 +1210,7 @@ Partial Class usrCntlSpeditionsBuchSuche 'Label34 ' Me.Label34.AutoSize = True - Me.Label34.Location = New System.Drawing.Point(759, 33) + Me.Label34.Location = New System.Drawing.Point(367, 35) Me.Label34.Name = "Label34" Me.Label34.Size = New System.Drawing.Size(34, 13) Me.Label34.TabIndex = 39 @@ -1231,7 +1221,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button9.Image = Global.SDL.My.Resources.Resources.statistik_small Me.Button9.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button9.Location = New System.Drawing.Point(606, 8) + Me.Button9.Location = New System.Drawing.Point(214, 10) Me.Button9.Margin = New System.Windows.Forms.Padding(0) Me.Button9.Name = "Button9" Me.Button9.Size = New System.Drawing.Size(106, 41) @@ -1245,7 +1235,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.btnQSAufteilung.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnQSAufteilung.Image = Global.SDL.My.Resources.Resources.statistik_small Me.btnQSAufteilung.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnQSAufteilung.Location = New System.Drawing.Point(399, 8) + Me.btnQSAufteilung.Location = New System.Drawing.Point(7, 10) Me.btnQSAufteilung.Margin = New System.Windows.Forms.Padding(0) Me.btnQSAufteilung.Name = "btnQSAufteilung" Me.btnQSAufteilung.Size = New System.Drawing.Size(154, 25) @@ -1265,20 +1255,6 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Label31.TabIndex = 32 Me.Label31.Text = "Auswertungen:" ' - 'Button8 - ' - Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button8.Image = Global.SDL.My.Resources.Resources.statistik_small - Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button8.Location = New System.Drawing.Point(9, 19) - Me.Button8.Margin = New System.Windows.Forms.Padding(0) - Me.Button8.Name = "Button8" - Me.Button8.Size = New System.Drawing.Size(127, 41) - Me.Button8.TabIndex = 5 - Me.Button8.Text = "Speditionsbericht" - Me.Button8.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button8.UseVisualStyleBackColor = True - ' 'Panel1 ' Me.Panel1.BackColor = System.Drawing.Color.WhiteSmoke @@ -1291,7 +1267,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Panel1.Controls.Add(Me.CheckBox2) Me.Panel1.Controls.Add(Me.Button10) Me.Panel1.Controls.Add(Me.cbxSpedDetailBem) - Me.Panel1.Location = New System.Drawing.Point(150, -1) + Me.Panel1.Location = New System.Drawing.Point(150, 5) Me.Panel1.Name = "Panel1" Me.Panel1.Size = New System.Drawing.Size(227, 100) Me.Panel1.TabIndex = 48 @@ -1406,7 +1382,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Label43.AutoSize = True Me.Label43.BackColor = System.Drawing.Color.WhiteSmoke Me.Label43.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label43.Location = New System.Drawing.Point(603, 83) + Me.Label43.Location = New System.Drawing.Point(211, 85) Me.Label43.Name = "Label43" Me.Label43.Size = New System.Drawing.Size(86, 13) Me.Label43.TabIndex = 55 @@ -1414,6 +1390,7 @@ Partial Class usrCntlSpeditionsBuchSuche ' 'pnl ' + Me.pnl.Controls.Add(Me.MenuStrip2) Me.pnl.Controls.Add(Me.Button15) Me.pnl.Controls.Add(Me.Label32) Me.pnl.Controls.Add(Me.Button1) @@ -2855,6 +2832,74 @@ Partial Class usrCntlSpeditionsBuchSuche Me.SplitContainer.SplitterWidth = 2 Me.SplitContainer.TabIndex = 3 ' + 'Button8 + ' + Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button8.Image = Global.SDL.My.Resources.Resources.statistik_small + Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button8.Location = New System.Drawing.Point(9, 25) + Me.Button8.Margin = New System.Windows.Forms.Padding(0) + Me.Button8.Name = "Button8" + Me.Button8.Size = New System.Drawing.Size(127, 41) + Me.Button8.TabIndex = 5 + Me.Button8.Text = "Speditionsbericht" + Me.Button8.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button8.UseVisualStyleBackColor = True + ' + 'Panel3 + ' + Me.Panel3.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Panel3.Controls.Add(Me.cbxSpedBerichtBar) + Me.Panel3.Controls.Add(Me.Label31) + Me.Panel3.Controls.Add(Me.Button8) + Me.Panel3.Controls.Add(Me.Panel1) + Me.Panel3.Controls.Add(Me.Label42) + Me.Panel3.Controls.Add(Me.txtUeberschr) + Me.Panel3.Controls.Add(Me.Button22) + Me.Panel3.Controls.Add(Me.cbxFilterInBericht) + Me.Panel3.Controls.Add(Me.Button21) + Me.Panel3.Controls.Add(Me.btnSpedBuchEinnahmen) + Me.Panel3.Location = New System.Drawing.Point(200, 3) + Me.Panel3.Name = "Panel3" + Me.Panel3.Size = New System.Drawing.Size(386, 186) + Me.Panel3.TabIndex = 95 + ' + 'MenuStrip2 + ' + Me.MenuStrip2.Dock = System.Windows.Forms.DockStyle.None + Me.MenuStrip2.ImageScalingSize = New System.Drawing.Size(24, 24) + Me.MenuStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem14}) + Me.MenuStrip2.Location = New System.Drawing.Point(16, 71) + Me.MenuStrip2.Name = "MenuStrip2" + Me.MenuStrip2.Size = New System.Drawing.Size(283, 27) + Me.MenuStrip2.TabIndex = 93 + Me.MenuStrip2.Text = "Kundenauswertungen" + ' + 'ToolStripMenuItem14 + ' + Me.ToolStripMenuItem14.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.ToolStripMenuItem14.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem1, Me.ToolStripMenuItem19}) + Me.ToolStripMenuItem14.Font = New System.Drawing.Font("Segoe UI", 10.0!) + Me.ToolStripMenuItem14.ForeColor = System.Drawing.Color.White + Me.ToolStripMenuItem14.Name = "ToolStripMenuItem14" + Me.ToolStripMenuItem14.Size = New System.Drawing.Size(155, 23) + Me.ToolStripMenuItem14.Text = "Kundenauswertungen" + ' + 'ToolStripMenuItem19 + ' + Me.ToolStripMenuItem19.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.ToolStripMenuItem19.Name = "ToolStripMenuItem19" + Me.ToolStripMenuItem19.Size = New System.Drawing.Size(344, 30) + Me.ToolStripMenuItem19.Text = "Detailkundenbericht (Zeitraum auswählen)" + ' + 'ToolStripMenuItem1 + ' + Me.ToolStripMenuItem1.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1" + Me.ToolStripMenuItem1.Size = New System.Drawing.Size(344, 30) + Me.ToolStripMenuItem1.Text = "Kundenbericht (Zeitraum auswählen)" + ' 'usrCntlSpeditionsBuchSuche ' Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None @@ -2896,6 +2941,10 @@ Partial Class usrCntlSpeditionsBuchSuche Me.SplitContainer.Panel2.ResumeLayout(False) CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainer.ResumeLayout(False) + Me.Panel3.ResumeLayout(False) + Me.Panel3.PerformLayout() + Me.MenuStrip2.ResumeLayout(False) + Me.MenuStrip2.PerformLayout() Me.ResumeLayout(False) End Sub @@ -2943,7 +2992,6 @@ Partial Class usrCntlSpeditionsBuchSuche Friend WithEvents Button9 As System.Windows.Forms.Button Friend WithEvents btnQSAufteilung As System.Windows.Forms.Button Friend WithEvents Label31 As System.Windows.Forms.Label - Friend WithEvents Button8 As System.Windows.Forms.Button Friend WithEvents Panel1 As System.Windows.Forms.Panel Friend WithEvents Label38 As System.Windows.Forms.Label Friend WithEvents CheckBox3 As System.Windows.Forms.CheckBox @@ -3073,5 +3121,10 @@ Partial Class usrCntlSpeditionsBuchSuche Friend WithEvents ZFSteyrZeitraumAuswählenToolStripMenuItem As ToolStripMenuItem Friend WithEvents cbxRptDetailsZahlungsdetails As CheckBox Friend WithEvents cbxDetailbericht As CheckBox + Friend WithEvents Panel3 As Panel + Friend WithEvents Button8 As Button + Friend WithEvents MenuStrip2 As MenuStrip + Friend WithEvents ToolStripMenuItem14 As ToolStripMenuItem + Friend WithEvents ToolStripMenuItem19 As ToolStripMenuItem Friend WithEvents ToolStripMenuItem1 As ToolStripMenuItem End Class diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx index 0e290de1..0c182916 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx @@ -126,6 +126,9 @@ 431, 17 + + 546, 17 + diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb index 15eeea4f..98e39c77 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb @@ -1669,191 +1669,191 @@ Public Class usrCntlSpeditionsBuchSuche Dim print As New frmPrintLayout - print.Text = "Handling / Front-Office" + print.Text = "Handling / Front-Office" - Dim rpt As New rptSpeditionsbericht_HandlingAussenstellen + Dim rpt As New rptSpeditionsbericht_HandlingAussenstellen - Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA - Case "IMEX" : rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple : rpt.Label28.Text = "IMEX Customs Service GmbH" - Case "ATILLA" : rpt.picVERAG.Image = My.Resources.Atilla : rpt.Label28.Text = "ATILLA Spedition" - Case "AMBAR" : rpt.picVERAG.Image = My.Resources.ambar_simple : rpt.Label28.Text = "AMBAR Logistc Services GmbH" : print.Text = "Handling / AMBAR Bad Reichenhall" + Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Case "IMEX" : rpt.picVERAG.Image = My.Resources.IMEX_LOGO_simple : rpt.Label28.Text = "IMEX Customs Service GmbH" + Case "ATILLA" : rpt.picVERAG.Image = My.Resources.Atilla : rpt.Label28.Text = "ATILLA Spedition" + Case "AMBAR" : rpt.picVERAG.Image = My.Resources.ambar_simple : rpt.Label28.Text = "AMBAR Logistc Services GmbH" : print.Text = "Handling / AMBAR Bad Reichenhall" - Case Else - End Select + Case Else + End Select - rpt.DataSource = dt + rpt.DataSource = dt - If CheckBox1.Checked Then - rpt.GroupHeader1.DataField = "Abfertigungsart" 'Gruppierung - End If + If CheckBox1.Checked Then + rpt.GroupHeader1.DataField = "Abfertigungsart" 'Gruppierung + End If - If rpt.DataSource.rows.count = 0 Then - rpt.Dispose() : print.Dispose() - MsgBox("Keine Daten vorhanden!") - Return "" - End If + If rpt.DataSource.rows.count = 0 Then + rpt.Dispose() : print.Dispose() + MsgBox("Keine Daten vorhanden!") + Return "" + End If - Dim sum = 0 - rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME - 'rpt.lblMandantNiederlassung.Text = PERSONAL.Mandant & " / " & PERSONAL.Niederlassung + Dim sum = 0 + rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME + 'rpt.lblMandantNiederlassung.Text = PERSONAL.Mandant & " / " & PERSONAL.Niederlassung - Dim defaultHandlingPreis As Double = 15 + Dim defaultHandlingPreis As Double = 15 - Dim HandlingList As VERAG_PROG_ALLGEMEIN.cHandlingssaetzeInternLIST = Nothing - If Handlingssatz <> "" Then - HandlingList = New VERAG_PROG_ALLGEMEIN.cHandlingssaetzeInternLIST(Handlingssatz) - End If + Dim HandlingList As VERAG_PROG_ALLGEMEIN.cHandlingssaetzeInternLIST = Nothing + If Handlingssatz <> "" Then + HandlingList = New VERAG_PROG_ALLGEMEIN.cHandlingssaetzeInternLIST(Handlingssatz) + End If - 'Dim cnt As Integer = 0 - rpt.lblDat.Text = Now.ToLongDateString - 'Dim sumRg As Double = 0 - 'Dim gesSumAnz As Double = 0 - 'Dim gesSumBar As Double = 0 - 'Dim gesSumRg As Double = 0 - 'Dim gesgesSumAnz As Double = 0 - 'Dim gesgesSumBar As Double = 0 - 'Dim gesgesSumRg As Double = 0 - 'Dim SumAnzLKW As Double = 0 - 'Dim gesSumAnzLKW As Double = 0 - 'Dim gesgesSumAnzLKW As Double = 0 + 'Dim cnt As Integer = 0 + rpt.lblDat.Text = Now.ToLongDateString + 'Dim sumRg As Double = 0 + 'Dim gesSumAnz As Double = 0 + 'Dim gesSumBar As Double = 0 + 'Dim gesSumRg As Double = 0 + 'Dim gesgesSumAnz As Double = 0 + 'Dim gesgesSumBar As Double = 0 + 'Dim gesgesSumRg As Double = 0 + 'Dim SumAnzLKW As Double = 0 + 'Dim gesSumAnzLKW As Double = 0 + 'Dim gesgesSumAnzLKW As Double = 0 - Dim gesAnz As Double = 0 - Dim gesBar As Double = 0 - Dim geshandling As Double = 0 - Dim geszukassBAR As Double = 0 + Dim gesAnz As Double = 0 + Dim gesBar As Double = 0 + Dim geshandling As Double = 0 + Dim geszukassBAR As Double = 0 - Dim sumAnz As Double = 0 - Dim sumBar As Double = 0 - Dim sumhandling As Double = 0 - Dim sumzukassBAR As Double = 0 + Dim sumAnz As Double = 0 + Dim sumBar As Double = 0 + Dim sumhandling As Double = 0 + Dim sumzukassBAR As Double = 0 - Dim sumAbfBez = "" - Dim gesFilBez = "" + Dim sumAbfBez = "" + Dim gesFilBez = "" - ' Dim gesgesAbfBez = "" - Dim SumText = "" - AddHandler rpt.Detail.Format, Sub() - ' rpt.lblVon.Text = CDate(rpt.Fields.Item("von").Value).ToShortDateString - ' rpt.lblLKWNr.Text = CDate(rpt.Fields.Item("bis").Value).ToShortDateString + ' Dim gesgesAbfBez = "" + Dim SumText = "" + AddHandler rpt.Detail.Format, Sub() + ' rpt.lblVon.Text = CDate(rpt.Fields.Item("von").Value).ToShortDateString + ' rpt.lblLKWNr.Text = CDate(rpt.Fields.Item("bis").Value).ToShortDateString - rpt.lblPosNr.Text = rpt.Fields.Item("FilialenNr").Value & " " & rpt.Fields.Item("AbfertigungsNr").Value & " " & rpt.Fields.Item("UnterNr").Value - rpt.lblAbfDatum.Text = rpt.Fields.Item("Abfertigungsdatum").Value + rpt.lblPosNr.Text = rpt.Fields.Item("FilialenNr").Value & " " & rpt.Fields.Item("AbfertigungsNr").Value & " " & rpt.Fields.Item("UnterNr").Value + rpt.lblAbfDatum.Text = rpt.Fields.Item("Abfertigungsdatum").Value - rpt.lblEndEmpfKdNr.Text = checkNull(rpt.Fields.Item("EmpfängerKundenNr").Value) - rpt.lblEndEmpf.Text = checkNull(rpt.Fields.Item("Empfänger").Value) + rpt.lblEndEmpfKdNr.Text = checkNull(rpt.Fields.Item("EmpfängerKundenNr").Value) + rpt.lblEndEmpf.Text = checkNull(rpt.Fields.Item("Empfänger").Value) - Dim bar As Double = 0 - Dim handling As Double = 0 - Dim zukassBAR As Double = 0 - ' Dim rg As Double = 0 - Dim anz As Double = 0 + Dim bar As Double = 0 + Dim handling As Double = 0 + Dim zukassBAR As Double = 0 + ' Dim rg As Double = 0 + Dim anz As Double = 0 - If IsNumeric(checkNull(rpt.Fields.Item("Barzahlungsbetrag").Value)) Then bar = CDbl(rpt.Fields.Item("Barzahlungsbetrag").Value()) - If IsNumeric(checkNull(rpt.Fields.Item("HandlingZuKassieren").Value)) Then zukassBAR = CDbl(rpt.Fields.Item("HandlingZuKassieren").Value()) - ' If IsNumeric(checkNull(rpt.Fields.Item("Rechnungsbetrag").Value)) Then rg = CDbl(rpt.Fields.Item("Rechnungsbetrag").Value()) - If IsNumeric(checkNull(rpt.Fields.Item("Abfertigungsanzahl").Value)) Then anz = CDbl(rpt.Fields.Item("Abfertigungsanzahl").Value) - Dim Abfertigungsart = checkNull(rpt.Fields.Item("Abfertigungsart").Value) - handling = getHandlingKostByListe(Abfertigungsart, defaultHandlingPreis, HandlingList) * anz + If IsNumeric(checkNull(rpt.Fields.Item("Barzahlungsbetrag").Value)) Then bar = CDbl(rpt.Fields.Item("Barzahlungsbetrag").Value()) + If IsNumeric(checkNull(rpt.Fields.Item("HandlingZuKassieren").Value)) Then zukassBAR = CDbl(rpt.Fields.Item("HandlingZuKassieren").Value()) + ' If IsNumeric(checkNull(rpt.Fields.Item("Rechnungsbetrag").Value)) Then rg = CDbl(rpt.Fields.Item("Rechnungsbetrag").Value()) + If IsNumeric(checkNull(rpt.Fields.Item("Abfertigungsanzahl").Value)) Then anz = CDbl(rpt.Fields.Item("Abfertigungsanzahl").Value) + Dim Abfertigungsart = checkNull(rpt.Fields.Item("Abfertigungsart").Value) + handling = getHandlingKostByListe(Abfertigungsart, defaultHandlingPreis, HandlingList) * anz - ' rpt.lblLKWNr.Text = checkNull(rpt.Fields.Item("LKW Kennzeichen").Value) - rpt.lblAnzahl.Text = checkNull(rpt.Fields.Item("Abfertigungsanzahl").Value) - rpt.lblAbfertigungsart.Text = checkNull(rpt.Fields.Item("Abfertigungsbezeichnung").Value) - ' rpt.lblAbs.Text = checkNull(rpt.Fields.Item("Abfertigungsbezeichnung").Value) + ' rpt.lblLKWNr.Text = checkNull(rpt.Fields.Item("LKW Kennzeichen").Value) + rpt.lblAnzahl.Text = checkNull(rpt.Fields.Item("Abfertigungsanzahl").Value) + rpt.lblAbfertigungsart.Text = checkNull(rpt.Fields.Item("Abfertigungsbezeichnung").Value) + ' rpt.lblAbs.Text = checkNull(rpt.Fields.Item("Abfertigungsbezeichnung").Value) - rpt.lblBarzahlungsbetrag.Text = CDbl(bar).ToString("C2") - rpt.lblzuKassierenHandling.Text = CDbl(zukassBAR).ToString("C2") - rpt.lblHandlingsgebuehr.Text = CDbl(handling).ToString("C2") - 'sumBar += CDbl(rpt.Fields.Item("Barzahlungsbetrag").Value) + rpt.lblBarzahlungsbetrag.Text = CDbl(bar).ToString("C2") + rpt.lblzuKassierenHandling.Text = CDbl(zukassBAR).ToString("C2") + rpt.lblHandlingsgebuehr.Text = CDbl(handling).ToString("C2") + 'sumBar += CDbl(rpt.Fields.Item("Barzahlungsbetrag").Value) - sumAbfBez = checkNull(rpt.Fields.Item("Abfertigungsbezeichnung").Value) + sumAbfBez = checkNull(rpt.Fields.Item("Abfertigungsbezeichnung").Value) - Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA - Case "AMBAR" - rpt.lblBarzahlungsbetrag.Visible = False - rpt.lblzuKassierenHandling.Visible = False - End Select + Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Case "AMBAR" + rpt.lblBarzahlungsbetrag.Visible = False + rpt.lblzuKassierenHandling.Visible = False + End Select - sumAnz += anz - sumBar += bar - sumhandling += handling - sumzukassBAR += zukassBAR + sumAnz += anz + sumBar += bar + sumhandling += handling + sumzukassBAR += zukassBAR - gesAnz += anz - gesBar += bar - geshandling += handling - geszukassBAR += zukassBAR + gesAnz += anz + gesBar += bar + geshandling += handling + geszukassBAR += zukassBAR - End Sub + End Sub - Dim bezeichnung = "" - AddHandler rpt.ReportFooter1.Format, Sub() - rpt.lblGesGesSumAnzahl.Text = sumAnz.ToString("N0") - rpt.lblSumBarzahlungsbetrag.Text = sumBar.ToString("N2") - rpt.lblSumzuKassierenHandling.Text = sumzukassBAR.ToString("N2") - rpt.lblSumHandlingsgebuehr.Text = sumhandling.ToString("N2") + Dim bezeichnung = "" + AddHandler rpt.ReportFooter1.Format, Sub() + rpt.lblGesGesSumAnzahl.Text = sumAnz.ToString("N0") + rpt.lblSumBarzahlungsbetrag.Text = sumBar.ToString("N2") + rpt.lblSumzuKassierenHandling.Text = sumzukassBAR.ToString("N2") + rpt.lblSumHandlingsgebuehr.Text = sumhandling.ToString("N2") - rpt.txtUebersicht.Text = SumText + rpt.txtUebersicht.Text = SumText - Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA - Case "AMBAR" - rpt.lblSumBarzahlungsbetrag.Visible = False - rpt.lblSumzuKassierenHandling.Visible = False - End Select + Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Case "AMBAR" + rpt.lblSumBarzahlungsbetrag.Visible = False + rpt.lblSumzuKassierenHandling.Visible = False + End Select - End Sub - AddHandler rpt.GroupHeader1.Format, Sub() + End Sub + AddHandler rpt.GroupHeader1.Format, Sub() - rpt.lblAbfArtUeberschrift.Text = checkNull(rpt.Fields.Item("Abfertigungsart").Value) & " - " & checkNull(rpt.Fields.Item("Abfertigungsbezeichnung").Value) - bezeichnung = rpt.lblAbfArtUeberschrift.Text + rpt.lblAbfArtUeberschrift.Text = checkNull(rpt.Fields.Item("Abfertigungsart").Value) & " - " & checkNull(rpt.Fields.Item("Abfertigungsbezeichnung").Value) + bezeichnung = rpt.lblAbfArtUeberschrift.Text - gesAnz = 0 - gesBar = 0 - geshandling = 0 - geszukassBAR = 0 + gesAnz = 0 + gesBar = 0 + geshandling = 0 + geszukassBAR = 0 - End Sub - AddHandler rpt.GroupFooter1.Format, Sub() - rpt.lblGesSumAnzahl.Text = gesAnz.ToString("N0") - rpt.lblGesBarzahlungsbetrag.Text = gesBar.ToString("N2") - rpt.lblGeszuKassierenHandling.Text = geszukassBAR.ToString("N2") - rpt.lblGesHandlingsgebuehr.Text = geshandling.ToString("N2") - SumText &= gesAnz.ToString("N0") & vbTab & bezeichnung & vbNewLine - - Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA - Case "AMBAR" - rpt.lblGesBarzahlungsbetrag.Visible = False - rpt.lblGeszuKassierenHandling.Visible = False - End Select - End Sub - If showDok Then - print.Viewer.LoadDocument(rpt) - print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous - print.Show() - Else - - Dim tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("HandlingFO.pdf", ".pdf", True, False) - Dim p As New GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport - rpt.Run(False) - p.NeverEmbedFonts = "" - p.Export(rpt.Document, tmpPath) - - rpt.Dispose() - Return tmpPath - - End If + End Sub + AddHandler rpt.GroupFooter1.Format, Sub() + rpt.lblGesSumAnzahl.Text = gesAnz.ToString("N0") + rpt.lblGesBarzahlungsbetrag.Text = gesBar.ToString("N2") + rpt.lblGeszuKassierenHandling.Text = geszukassBAR.ToString("N2") + rpt.lblGesHandlingsgebuehr.Text = geshandling.ToString("N2") + SumText &= gesAnz.ToString("N0") & vbTab & bezeichnung & vbNewLine + Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Case "AMBAR" + rpt.lblGesBarzahlungsbetrag.Visible = False + rpt.lblGeszuKassierenHandling.Visible = False + End Select + End Sub + If showDok Then + print.Viewer.LoadDocument(rpt) + print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous + print.Show() + Else + Dim tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("HandlingFO.pdf", ".pdf", True, False) + Dim p As New GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport + rpt.Run(False) + p.NeverEmbedFonts = "" + p.Export(rpt.Document, tmpPath) + rpt.Dispose() + Return tmpPath End If - Return "" + + + + + End If + Return "" End Function Function getHandlingKostByListe(AbfertigungsArt As Integer, defaultHandlingPreis As Double, HandlingList As VERAG_PROG_ALLGEMEIN.cHandlingssaetzeInternLIST) As Double @@ -2793,14 +2793,23 @@ Public Class usrCntlSpeditionsBuchSuche End Sub - Private Sub ToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem1.Click + Private Sub ToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem1.Click, ToolStripMenuItem19.Click Dim kdnrsrch As Integer = -1 Dim KUNDE + Dim Detailbericht As Boolean = False + + + If sender Is ToolStripMenuItem1 Then + Detailbericht = False + ElseIf sender Is ToolStripMenuItem19 Then + Detailbericht = True + End If If kdnrsrch < 0 Then Dim inputKdNr = InputBox("Bitte KdNr eingeben", "Kundenauswertung generieren") + If inputKdNr <> "" Then inputKdNr = inputKdNr.Trim() If inputKdNr <> "" AndAlso IsNumeric(inputKdNr) AndAlso inputKdNr > 0 Then kdnrsrch = inputKdNr @@ -2844,13 +2853,13 @@ Public Class usrCntlSpeditionsBuchSuche Dim Blatt As Object 'Microsoft.Office.Interop.Excel.Worksheet 'As Object 'as Worksheet exclApp = CreateObject("Excel.Application") - If cbxDetailbericht.Checked Then + If Detailbericht Then With exclApp .Visible = False Try - Path = sPath & KUNDE.KundenNr & "_" & txtAbfertDat.Text & "-" & txtAbfertDatBis.Text & "" & " .xlsx" + Path = sPath & "Detailbericht_" & KUNDE.KundenNr & "_" & txtAbfertDat.Text & "-" & txtAbfertDatBis.Text & "" & " .xlsx" While System.IO.File.Exists(Path) Path = sPath & KUNDE.KundenNr & txtAbfertDat.Text & "-" & txtAbfertDatBis.Text & "_" & Now.ToString("ddMMyyyyHHmmss") & ".xlsx" End While @@ -2987,7 +2996,7 @@ Public Class usrCntlSpeditionsBuchSuche .Visible = False Try - Path = sPath & KUNDE.KundenNr & txtAbfertDat.Text & "-" & txtAbfertDatBis.Text & "" & " .xlsx" + Path = sPath & "Bericht_" & KUNDE.KundenNr & txtAbfertDat.Text & "-" & txtAbfertDatBis.Text & "" & " .xlsx" While System.IO.File.Exists(Path) Path = sPath & KUNDE.KundenNr & txtAbfertDat.Text & "-" & txtAbfertDatBis.Text & "_" & Now.ToString("ddMMyyyyHHmmss") & ".xlsx" End While @@ -3054,7 +3063,7 @@ Public Class usrCntlSpeditionsBuchSuche lblKdAusFortschritt.Text = "fertig" Catch ex As Exception MsgBox(ex.Message & ex.StackTrace) - lblKdAusFortschritt.Text = "Fehler" + lblKdAusFortschritt.Text = "Fehler" End Try Me.Cursor = Cursors.Default End Sub diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb index 75c2a87d..f64b4fcb 100644 --- a/SDL/USTV/usrCntlUSTV.vb +++ b/SDL/USTV/usrCntlUSTV.vb @@ -1456,7 +1456,7 @@ Public Class usrCntlUSTV WHERE dbo.tblUStVErstattung.UStVAn_ID = dbo.tblUStVAntrag.UStVAn_ID), 0) ELSE 0 END AS UStVAn_VZBetragAktuell FROM dbo.tblUStVAntrag INNER JOIN dbo.Adressen ON dbo.tblUStVAntrag.UStVAn_KuNr = dbo.Adressen.AdressenNr - WHERE (dbo.tblUStVAntrag.UStVAn_VZBetrag IS NOT NULL)" & IIf(sqlKunde <> "", sqlKunde, "") & whereStr + WHERE (dbo.tblUStVAntrag.UStVAn_VZBetrag IS NOT NULL)" & sqlKunde & whereStr Dim dtVorauszahlung As DataTable = SQL.loadDgvBySql(sqlQery, "FMZOLL")