From 6c662876da1e18276002b87321ea57f78827aa95 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 28 Aug 2024 16:46:57 +0200 Subject: [PATCH] =?UTF-8?q?Druckerermittlung,=20Spedistionsbuch=C3=BCberse?= =?UTF-8?q?tzung,=20Kunendatenblatt=20f=C3=BCr=20Verag360?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../usrCntlSpeditionsBuchSuche.Designer.vb | 675 +++++++++--------- .../usrCntlSpeditionsBuchSuche.vb | 28 +- SDL/kunden/frmKundenblatt.Designer.vb | 34 +- SDL/kunden/frmKundenblatt.vb | 2 +- .../usrcntlKundeBearbeitenFull.Designer.vb | 130 ++-- SDL/kunden/usrcntlKundeBearbeitenFull.vb | 197 +++-- .../DATENSERVER/cDATENSERVER.vb | 2 +- 7 files changed, 587 insertions(+), 481 deletions(-) diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb index b8b49cde..d4ccf789 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb @@ -34,7 +34,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.cntxtCntxtSpeditionsbuch = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.EintragLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.txtAvisoId = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label39 = New System.Windows.Forms.Label() + Me.lblLKWId = New System.Windows.Forms.Label() Me.lstFiliale = New VERAG_PROG_ALLGEMEIN.MyListBox() Me.kdtxtAuftraggeber = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.txtAuftraggeberKdnr = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -42,20 +42,20 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtBelegNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.cboVersLand = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboBestLand = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.Label25 = New System.Windows.Forms.Label() + Me.lblBestimmungsland = New System.Windows.Forms.Label() Me.txtPackstücke = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label36 = New System.Windows.Forms.Label() + Me.lblPackst = New System.Windows.Forms.Label() Me.Button11 = New System.Windows.Forms.Button() Me.Label15 = New System.Windows.Forms.Label() - Me.Label33 = New System.Windows.Forms.Label() + Me.lblAvisierer = New System.Windows.Forms.Label() Me.kdtxtAvisierer = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.txtAvisiererKdNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.pnlRechts = New System.Windows.Forms.Panel() - Me.Button12 = New System.Windows.Forms.Button() + Me.btnNurAbf = New System.Windows.Forms.Button() Me.MyListBox1 = New VERAG_PROG_ALLGEMEIN.MyListBox() - Me.Button2 = New System.Windows.Forms.Button() - Me.Button13 = New System.Windows.Forms.Button() - Me.Label14 = New System.Windows.Forms.Label() + Me.btnAlle = New System.Windows.Forms.Button() + Me.btnKeine = New System.Windows.Forms.Button() + Me.lblAbfertigungsarten = New System.Windows.Forms.Label() Me.Label17 = New System.Windows.Forms.Label() Me.txtFiskalEndempfaenger = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.DataGridView = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) @@ -63,6 +63,8 @@ Partial Class usrCntlSpeditionsBuchSuche Me.dgvLKW = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.pnlOpt = New System.Windows.Forms.Panel() Me.pnlBerichte = New System.Windows.Forms.Panel() + Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Button25 = New System.Windows.Forms.Button() Me.Button24 = New System.Windows.Forms.Button() Me.Button23 = New System.Windows.Forms.Button() Me.Button22 = New System.Windows.Forms.Button() @@ -115,18 +117,18 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtMaxSrch = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.lblErgebnis = New System.Windows.Forms.Label() Me.Button3 = New System.Windows.Forms.Button() - Me.Label6 = New System.Windows.Forms.Label() - Me.Label20 = New System.Windows.Forms.Label() - Me.Label10 = New System.Windows.Forms.Label() - Me.Label7 = New System.Windows.Forms.Label() + Me.lblAbsender = New System.Windows.Forms.Label() + Me.lblBelegNr = New System.Windows.Forms.Label() + Me.lblEndempf = New System.Windows.Forms.Label() + Me.lblFirmenbezeichnung = New System.Windows.Forms.Label() Me.TabPage2 = New System.Windows.Forms.TabPage() Me.tbcntr = New System.Windows.Forms.TabControl() Me.Label29 = New System.Windows.Forms.Label() Me.pnlTop = New System.Windows.Forms.Panel() Me.Label30 = New System.Windows.Forms.Label() - Me.Label4 = New System.Windows.Forms.Label() + Me.lblUeberschrift = New System.Windows.Forms.Label() Me.Label22 = New System.Windows.Forms.Label() - Me.Label5 = New System.Windows.Forms.Label() + Me.lblEmpfaenger = New System.Windows.Forms.Label() Me.kdtxtFrachtfuehrer = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.cboSB_Qs = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.txtAbfertDat = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -138,7 +140,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtAbfertigungsnummer = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Button7 = New System.Windows.Forms.Button() Me.Button6 = New System.Windows.Forms.Button() - Me.Button5 = New System.Windows.Forms.Button() + Me.btnToday = New System.Windows.Forms.Button() Me.btnSuche = New System.Windows.Forms.Button() Me.pnlSearch = New System.Windows.Forms.Panel() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() @@ -153,33 +155,33 @@ Partial Class usrCntlSpeditionsBuchSuche Me.btnMonat = New System.Windows.Forms.Button() Me.btnBisMonat = New System.Windows.Forms.Button() Me.btnVonMonat = New System.Windows.Forms.Button() - Me.Button4 = New System.Windows.Forms.Button() + Me.btnDetailsuche = New System.Windows.Forms.Button() Me.Label26 = New System.Windows.Forms.Label() Me.DateTimePicker2 = New System.Windows.Forms.DateTimePicker() Me.Label27 = New System.Windows.Forms.Label() Me.Label13 = New System.Windows.Forms.Label() Me.lblAbfertigungsdatum = New System.Windows.Forms.Label() - Me.Label1 = New System.Windows.Forms.Label() - Me.Label2 = New System.Windows.Forms.Label() - Me.Label3 = New System.Windows.Forms.Label() - Me.Label12 = New System.Windows.Forms.Label() + Me.lblFiliale = New System.Windows.Forms.Label() + Me.lblAbfertigungsnr = New System.Windows.Forms.Label() + Me.lblUnterNr = New System.Windows.Forms.Label() + Me.lblSachbearbeiter = New System.Windows.Forms.Label() Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker() Me.txtVermerk = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label48 = New System.Windows.Forms.Label() + Me.lblVermerke = New System.Windows.Forms.Label() Me.txtZollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox() Me.cbxEIDR = New System.Windows.Forms.CheckBox() Me.cbxCMR = New System.Windows.Forms.CheckBox() Me.Label41 = New System.Windows.Forms.Label() Me.txtKdAuftragsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.lstGrenze = New VERAG_PROG_ALLGEMEIN.MyListBox() - Me.Label40 = New System.Windows.Forms.Label() - Me.Label9 = New System.Windows.Forms.Label() - Me.Label8 = New System.Windows.Forms.Label() + Me.lblKdAuftragsNr = New System.Windows.Forms.Label() + Me.lblAuftraggeber = New System.Windows.Forms.Label() + Me.lblFrachtf = New System.Windows.Forms.Label() Me.MyTextBox14 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label11 = New System.Windows.Forms.Label() Me.kdtxtEmpfaenger = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.cbxFakturiert = New System.Windows.Forms.CheckBox() - Me.Label18 = New System.Windows.Forms.Label() + Me.lblLKW_KZ = New System.Windows.Forms.Label() Me.txtAbsenderKdnr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.kdtxtEndempfaenger = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.cbxBar = New System.Windows.Forms.CheckBox() @@ -187,10 +189,10 @@ Partial Class usrCntlSpeditionsBuchSuche Me.kdtxtAbsender = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.txtFrachtfuehrerKdnr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtEndempfaengerKdnr = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label19 = New System.Windows.Forms.Label() + Me.lblCRNNr = New System.Windows.Forms.Label() Me.txtErfassungsnNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label24 = New System.Windows.Forms.Label() - Me.Label16 = New System.Windows.Forms.Label() + Me.lblVersendungsland = New System.Windows.Forms.Label() + Me.lblErfassungsNr = New System.Windows.Forms.Label() Me.cbxOderEmpfanger = New System.Windows.Forms.CheckBox() Me.Panel2 = New System.Windows.Forms.Panel() Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() @@ -198,8 +200,6 @@ 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.Button25 = New System.Windows.Forms.Button() - Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cntxtCntxtSpeditionsbuch.SuspendLayout() Me.pnlRechts.SuspendLayout() CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit() @@ -273,14 +273,14 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtAvisoId.TabIndex = 43 Me.txtAvisoId.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' - 'Label39 + 'lblLKWId ' - Me.Label39.AutoSize = True - Me.Label39.Location = New System.Drawing.Point(301, 196) - Me.Label39.Name = "Label39" - Me.Label39.Size = New System.Drawing.Size(46, 13) - Me.Label39.TabIndex = 42 - Me.Label39.Text = "LKW-Id:" + Me.lblLKWId.AutoSize = True + Me.lblLKWId.Location = New System.Drawing.Point(301, 196) + Me.lblLKWId.Name = "lblLKWId" + Me.lblLKWId.Size = New System.Drawing.Size(46, 13) + Me.lblLKWId.TabIndex = 42 + Me.lblLKWId.Text = "LKW-Id:" ' 'lstFiliale ' @@ -418,14 +418,14 @@ Partial Class usrCntlSpeditionsBuchSuche Me.cboBestLand.Size = New System.Drawing.Size(118, 21) Me.cboBestLand.TabIndex = 25 ' - 'Label25 + 'lblBestimmungsland ' - Me.Label25.AutoSize = True - Me.Label25.Location = New System.Drawing.Point(858, 55) - Me.Label25.Name = "Label25" - Me.Label25.Size = New System.Drawing.Size(92, 13) - Me.Label25.TabIndex = 20 - Me.Label25.Text = "Bestimmungsland:" + Me.lblBestimmungsland.AutoSize = True + Me.lblBestimmungsland.Location = New System.Drawing.Point(858, 55) + Me.lblBestimmungsland.Name = "lblBestimmungsland" + Me.lblBestimmungsland.Size = New System.Drawing.Size(92, 13) + Me.lblBestimmungsland.TabIndex = 20 + Me.lblBestimmungsland.Text = "Bestimmungsland:" ' 'txtPackstücke ' @@ -451,14 +451,14 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtPackstücke.Size = New System.Drawing.Size(64, 20) Me.txtPackstücke.TabIndex = 41 ' - 'Label36 + 'lblPackst ' - Me.Label36.AutoSize = True - Me.Label36.Location = New System.Drawing.Point(490, 93) - Me.Label36.Name = "Label36" - Me.Label36.Size = New System.Drawing.Size(67, 13) - Me.Label36.TabIndex = 40 - Me.Label36.Text = "Packstücke:" + Me.lblPackst.AutoSize = True + Me.lblPackst.Location = New System.Drawing.Point(490, 93) + Me.lblPackst.Name = "lblPackst" + Me.lblPackst.Size = New System.Drawing.Size(67, 13) + Me.lblPackst.TabIndex = 40 + Me.lblPackst.Text = "Packstücke:" ' 'Button11 ' @@ -483,14 +483,14 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Label15.TabIndex = 3 Me.Label15.Text = "Filiale:" ' - 'Label33 + 'lblAvisierer ' - Me.Label33.AutoSize = True - Me.Label33.Location = New System.Drawing.Point(14, 111) - Me.Label33.Name = "Label33" - Me.Label33.Size = New System.Drawing.Size(50, 13) - Me.Label33.TabIndex = 36 - Me.Label33.Text = "Avisierer:" + Me.lblAvisierer.AutoSize = True + Me.lblAvisierer.Location = New System.Drawing.Point(14, 111) + Me.lblAvisierer.Name = "lblAvisierer" + Me.lblAvisierer.Size = New System.Drawing.Size(50, 13) + Me.lblAvisierer.TabIndex = 36 + Me.lblAvisierer.Text = "Avisierer:" ' 'kdtxtAvisierer ' @@ -549,27 +549,27 @@ Partial Class usrCntlSpeditionsBuchSuche 'pnlRechts ' Me.pnlRechts.AutoSize = True - Me.pnlRechts.Controls.Add(Me.Button12) + Me.pnlRechts.Controls.Add(Me.btnNurAbf) Me.pnlRechts.Controls.Add(Me.MyListBox1) - Me.pnlRechts.Controls.Add(Me.Button2) - Me.pnlRechts.Controls.Add(Me.Button13) - Me.pnlRechts.Controls.Add(Me.Label14) + Me.pnlRechts.Controls.Add(Me.btnAlle) + Me.pnlRechts.Controls.Add(Me.btnKeine) + Me.pnlRechts.Controls.Add(Me.lblAbfertigungsarten) Me.pnlRechts.Dock = System.Windows.Forms.DockStyle.Right Me.pnlRechts.Location = New System.Drawing.Point(986, 0) Me.pnlRechts.Name = "pnlRechts" Me.pnlRechts.Size = New System.Drawing.Size(234, 217) Me.pnlRechts.TabIndex = 35 ' - 'Button12 + 'btnNurAbf ' - Me.Button12.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button12.Location = New System.Drawing.Point(4, 191) - Me.Button12.Margin = New System.Windows.Forms.Padding(0) - Me.Button12.Name = "Button12" - Me.Button12.Size = New System.Drawing.Size(225, 26) - Me.Button12.TabIndex = 42 - Me.Button12.Text = "Nur Abfertigungs Leistungen" - Me.Button12.UseVisualStyleBackColor = True + Me.btnNurAbf.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnNurAbf.Location = New System.Drawing.Point(4, 191) + Me.btnNurAbf.Margin = New System.Windows.Forms.Padding(0) + Me.btnNurAbf.Name = "btnNurAbf" + Me.btnNurAbf.Size = New System.Drawing.Size(225, 26) + Me.btnNurAbf.TabIndex = 42 + Me.btnNurAbf.Text = "Nur Abfertigungs Leistungen" + Me.btnNurAbf.UseVisualStyleBackColor = True ' 'MyListBox1 ' @@ -584,36 +584,36 @@ Partial Class usrCntlSpeditionsBuchSuche Me.MyListBox1.Size = New System.Drawing.Size(225, 147) Me.MyListBox1.TabIndex = 1 ' - 'Button2 + 'btnAlle ' - Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button2.Location = New System.Drawing.Point(4, 166) - Me.Button2.Margin = New System.Windows.Forms.Padding(0) - Me.Button2.Name = "Button2" - Me.Button2.Size = New System.Drawing.Size(115, 26) - Me.Button2.TabIndex = 41 - Me.Button2.Text = "Alle" - Me.Button2.UseVisualStyleBackColor = True + Me.btnAlle.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnAlle.Location = New System.Drawing.Point(4, 166) + Me.btnAlle.Margin = New System.Windows.Forms.Padding(0) + Me.btnAlle.Name = "btnAlle" + Me.btnAlle.Size = New System.Drawing.Size(115, 26) + Me.btnAlle.TabIndex = 41 + Me.btnAlle.Text = "Alle" + Me.btnAlle.UseVisualStyleBackColor = True ' - 'Button13 + 'btnKeine ' - Me.Button13.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button13.Location = New System.Drawing.Point(118, 166) - Me.Button13.Margin = New System.Windows.Forms.Padding(0) - Me.Button13.Name = "Button13" - Me.Button13.Size = New System.Drawing.Size(111, 26) - Me.Button13.TabIndex = 40 - Me.Button13.Text = "Keine" - Me.Button13.UseVisualStyleBackColor = True + Me.btnKeine.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnKeine.Location = New System.Drawing.Point(118, 166) + Me.btnKeine.Margin = New System.Windows.Forms.Padding(0) + Me.btnKeine.Name = "btnKeine" + Me.btnKeine.Size = New System.Drawing.Size(111, 26) + Me.btnKeine.TabIndex = 40 + Me.btnKeine.Text = "Keine" + Me.btnKeine.UseVisualStyleBackColor = True ' - 'Label14 + 'lblAbfertigungsarten ' - Me.Label14.AutoSize = True - Me.Label14.Location = New System.Drawing.Point(3, 4) - Me.Label14.Name = "Label14" - Me.Label14.Size = New System.Drawing.Size(93, 13) - Me.Label14.TabIndex = 0 - Me.Label14.Text = "Abfertigungsarten:" + Me.lblAbfertigungsarten.AutoSize = True + Me.lblAbfertigungsarten.Location = New System.Drawing.Point(3, 4) + Me.lblAbfertigungsarten.Name = "lblAbfertigungsarten" + Me.lblAbfertigungsarten.Size = New System.Drawing.Size(93, 13) + Me.lblAbfertigungsarten.TabIndex = 0 + Me.lblAbfertigungsarten.Text = "Abfertigungsarten:" ' 'Label17 ' @@ -804,6 +804,33 @@ Partial Class usrCntlSpeditionsBuchSuche Me.pnlBerichte.TabIndex = 6 Me.pnlBerichte.Visible = False ' + 'MyComboBox2 + ' + Me.MyComboBox2._allowedValuesFreiText = Nothing + Me.MyComboBox2._allowFreiText = False + Me.MyComboBox2._value = "" + 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.Name = "MyComboBox2" + Me.MyComboBox2.Size = New System.Drawing.Size(128, 22) + Me.MyComboBox2.TabIndex = 53 + ' + 'Button25 + ' + 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.Margin = New System.Windows.Forms.Padding(0) + Me.Button25.Name = "Button25" + Me.Button25.Size = New System.Drawing.Size(128, 28) + Me.Button25.TabIndex = 94 + Me.Button25.Text = "Handling (AMBAR)" + Me.Button25.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button25.UseVisualStyleBackColor = True + ' 'Button24 ' Me.Button24.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) @@ -906,7 +933,7 @@ Partial Class usrCntlSpeditionsBuchSuche ' Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Image = CType(resources.GetObject("ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Image"), System.Drawing.Image) Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Name = "ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem" - Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(316, 30) + Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(308, 24) Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Text = "ZF Passau (Zeitraum auswählen)" Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Visible = False ' @@ -1473,41 +1500,41 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Button3.UseVisualStyleBackColor = True Me.Button3.Visible = False ' - 'Label6 + 'lblAbsender ' - Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(14, 51) - Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(55, 13) - Me.Label6.TabIndex = 4 - Me.Label6.Text = "Absender:" + Me.lblAbsender.AutoSize = True + Me.lblAbsender.Location = New System.Drawing.Point(14, 51) + Me.lblAbsender.Name = "lblAbsender" + Me.lblAbsender.Size = New System.Drawing.Size(55, 13) + Me.lblAbsender.TabIndex = 4 + Me.lblAbsender.Text = "Absender:" ' - 'Label20 + 'lblBelegNr ' - Me.Label20.AutoSize = True - Me.Label20.Location = New System.Drawing.Point(490, 54) - Me.Label20.Name = "Label20" - Me.Label20.Size = New System.Drawing.Size(144, 13) - Me.Label20.TabIndex = 3 - Me.Label20.Text = "Beleg-Nummer ZA / T1 / T2:" + Me.lblBelegNr.AutoSize = True + Me.lblBelegNr.Location = New System.Drawing.Point(490, 54) + Me.lblBelegNr.Name = "lblBelegNr" + Me.lblBelegNr.Size = New System.Drawing.Size(144, 13) + Me.lblBelegNr.TabIndex = 3 + Me.lblBelegNr.Text = "Beleg-Nummer ZA / T1 / T2:" ' - 'Label10 + 'lblEndempf ' - Me.Label10.AutoSize = True - Me.Label10.Location = New System.Drawing.Point(14, 157) - Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(79, 13) - Me.Label10.TabIndex = 27 - Me.Label10.Text = "Endempfänger:" + Me.lblEndempf.AutoSize = True + Me.lblEndempf.Location = New System.Drawing.Point(14, 157) + Me.lblEndempf.Name = "lblEndempf" + Me.lblEndempf.Size = New System.Drawing.Size(79, 13) + Me.lblEndempf.TabIndex = 27 + Me.lblEndempf.Text = "Endempfänger:" ' - 'Label7 + 'lblFirmenbezeichnung ' - Me.Label7.AutoSize = True - Me.Label7.Location = New System.Drawing.Point(132, 10) - Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(102, 13) - Me.Label7.TabIndex = 1 - Me.Label7.Text = "Firmenbezeichnung:" + Me.lblFirmenbezeichnung.AutoSize = True + Me.lblFirmenbezeichnung.Location = New System.Drawing.Point(132, 10) + Me.lblFirmenbezeichnung.Name = "lblFirmenbezeichnung" + Me.lblFirmenbezeichnung.Size = New System.Drawing.Size(102, 13) + Me.lblFirmenbezeichnung.TabIndex = 1 + Me.lblFirmenbezeichnung.Text = "Firmenbezeichnung:" ' 'TabPage2 ' @@ -1548,7 +1575,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.pnlTop.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) Me.pnlTop.Controls.Add(Me.Label30) Me.pnlTop.Controls.Add(Me.Label29) - Me.pnlTop.Controls.Add(Me.Label4) + Me.pnlTop.Controls.Add(Me.lblUeberschrift) Me.pnlTop.Controls.Add(Me.Label22) Me.pnlTop.Dock = System.Windows.Forms.DockStyle.Top Me.pnlTop.Location = New System.Drawing.Point(0, 0) @@ -1566,16 +1593,16 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Label30.TabIndex = 2 Me.Label30.Text = "akt. Pos-Nr. (4803):" ' - 'Label4 + 'lblUeberschrift ' - Me.Label4.AutoSize = True - Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 16.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label4.ForeColor = System.Drawing.Color.White - Me.Label4.Location = New System.Drawing.Point(10, 13) - Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(250, 26) - Me.Label4.TabIndex = 0 - Me.Label4.Text = "Speditionsbuch-Suche" + Me.lblUeberschrift.AutoSize = True + Me.lblUeberschrift.Font = New System.Drawing.Font("Microsoft Sans Serif", 16.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblUeberschrift.ForeColor = System.Drawing.Color.White + Me.lblUeberschrift.Location = New System.Drawing.Point(10, 13) + Me.lblUeberschrift.Name = "lblUeberschrift" + Me.lblUeberschrift.Size = New System.Drawing.Size(250, 26) + Me.lblUeberschrift.TabIndex = 0 + Me.lblUeberschrift.Text = "Speditionsbuch-Suche" ' 'Label22 ' @@ -1587,14 +1614,15 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Label22.TabIndex = 1 Me.Label22.Text = "(Erweiterte suche: * vor oder nach dem Text )" ' - 'Label5 + 'lblEmpfaenger ' - Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(14, 73) - Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(87, 13) - Me.Label5.TabIndex = 9 - Me.Label5.Text = "(Rg.) Empfänger:" + Me.lblEmpfaenger.AutoSize = True + Me.lblEmpfaenger.Cursor = System.Windows.Forms.Cursors.Default + Me.lblEmpfaenger.Location = New System.Drawing.Point(14, 73) + Me.lblEmpfaenger.Name = "lblEmpfaenger" + Me.lblEmpfaenger.Size = New System.Drawing.Size(87, 13) + Me.lblEmpfaenger.TabIndex = 9 + Me.lblEmpfaenger.Text = "(Rg.) Empfänger:" ' 'kdtxtFrachtfuehrer ' @@ -1819,19 +1847,19 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Button6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button6.UseVisualStyleBackColor = True ' - 'Button5 + 'btnToday ' - Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.Button5.ForeColor = System.Drawing.Color.Black - Me.Button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button5.Location = New System.Drawing.Point(197, 4) - Me.Button5.Margin = New System.Windows.Forms.Padding(0) - Me.Button5.Name = "Button5" - Me.Button5.Size = New System.Drawing.Size(87, 23) - Me.Button5.TabIndex = 10 - Me.Button5.Text = "Heute" - Me.Button5.UseVisualStyleBackColor = True + Me.btnToday.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnToday.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.btnToday.ForeColor = System.Drawing.Color.Black + Me.btnToday.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnToday.Location = New System.Drawing.Point(197, 4) + Me.btnToday.Margin = New System.Windows.Forms.Padding(0) + Me.btnToday.Name = "btnToday" + Me.btnToday.Size = New System.Drawing.Size(87, 23) + Me.btnToday.TabIndex = 10 + Me.btnToday.Text = "Heute" + Me.btnToday.UseVisualStyleBackColor = True ' 'btnSuche ' @@ -1882,7 +1910,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.SplitContainer1.Panel1.Controls.Add(Me.txtAbfertigungsnummer) Me.SplitContainer1.Panel1.Controls.Add(Me.Button7) Me.SplitContainer1.Panel1.Controls.Add(Me.Button6) - Me.SplitContainer1.Panel1.Controls.Add(Me.Button5) + Me.SplitContainer1.Panel1.Controls.Add(Me.btnToday) Me.SplitContainer1.Panel1.Controls.Add(Me.btnSuche) Me.SplitContainer1.Panel1.Controls.Add(Me.Label28) Me.SplitContainer1.Panel1.Controls.Add(Me.Label21) @@ -1893,58 +1921,58 @@ Partial Class usrCntlSpeditionsBuchSuche Me.SplitContainer1.Panel1.Controls.Add(Me.btnMonat) Me.SplitContainer1.Panel1.Controls.Add(Me.btnBisMonat) Me.SplitContainer1.Panel1.Controls.Add(Me.btnVonMonat) - Me.SplitContainer1.Panel1.Controls.Add(Me.Button4) + Me.SplitContainer1.Panel1.Controls.Add(Me.btnDetailsuche) Me.SplitContainer1.Panel1.Controls.Add(Me.Label26) Me.SplitContainer1.Panel1.Controls.Add(Me.DateTimePicker2) Me.SplitContainer1.Panel1.Controls.Add(Me.Label27) Me.SplitContainer1.Panel1.Controls.Add(Me.Label13) Me.SplitContainer1.Panel1.Controls.Add(Me.lblAbfertigungsdatum) - Me.SplitContainer1.Panel1.Controls.Add(Me.Label1) - Me.SplitContainer1.Panel1.Controls.Add(Me.Label2) - Me.SplitContainer1.Panel1.Controls.Add(Me.Label3) - Me.SplitContainer1.Panel1.Controls.Add(Me.Label12) + Me.SplitContainer1.Panel1.Controls.Add(Me.lblFiliale) + Me.SplitContainer1.Panel1.Controls.Add(Me.lblAbfertigungsnr) + Me.SplitContainer1.Panel1.Controls.Add(Me.lblUnterNr) + Me.SplitContainer1.Panel1.Controls.Add(Me.lblSachbearbeiter) Me.SplitContainer1.Panel1.Controls.Add(Me.DateTimePicker1) ' 'SplitContainer1.Panel2 ' Me.SplitContainer1.Panel2.Controls.Add(Me.txtVermerk) - Me.SplitContainer1.Panel2.Controls.Add(Me.Label48) + Me.SplitContainer1.Panel2.Controls.Add(Me.lblVermerke) Me.SplitContainer1.Panel2.Controls.Add(Me.txtZollstelle) Me.SplitContainer1.Panel2.Controls.Add(Me.cbxEIDR) Me.SplitContainer1.Panel2.Controls.Add(Me.cbxCMR) Me.SplitContainer1.Panel2.Controls.Add(Me.Label41) Me.SplitContainer1.Panel2.Controls.Add(Me.txtKdAuftragsNr) Me.SplitContainer1.Panel2.Controls.Add(Me.lstGrenze) - Me.SplitContainer1.Panel2.Controls.Add(Me.Label40) + Me.SplitContainer1.Panel2.Controls.Add(Me.lblKdAuftragsNr) Me.SplitContainer1.Panel2.Controls.Add(Me.txtAvisoId) - Me.SplitContainer1.Panel2.Controls.Add(Me.Label39) + Me.SplitContainer1.Panel2.Controls.Add(Me.lblLKWId) Me.SplitContainer1.Panel2.Controls.Add(Me.kdtxtAuftraggeber) Me.SplitContainer1.Panel2.Controls.Add(Me.txtAuftraggeberKdnr) Me.SplitContainer1.Panel2.Controls.Add(Me.txtCRN) Me.SplitContainer1.Panel2.Controls.Add(Me.txtBelegNr) Me.SplitContainer1.Panel2.Controls.Add(Me.cboVersLand) Me.SplitContainer1.Panel2.Controls.Add(Me.cboBestLand) - Me.SplitContainer1.Panel2.Controls.Add(Me.Label25) + Me.SplitContainer1.Panel2.Controls.Add(Me.lblBestimmungsland) Me.SplitContainer1.Panel2.Controls.Add(Me.txtPackstücke) - Me.SplitContainer1.Panel2.Controls.Add(Me.Label36) + Me.SplitContainer1.Panel2.Controls.Add(Me.lblPackst) Me.SplitContainer1.Panel2.Controls.Add(Me.Button11) - Me.SplitContainer1.Panel2.Controls.Add(Me.Label33) + Me.SplitContainer1.Panel2.Controls.Add(Me.lblAvisierer) Me.SplitContainer1.Panel2.Controls.Add(Me.kdtxtAvisierer) Me.SplitContainer1.Panel2.Controls.Add(Me.txtAvisiererKdNr) Me.SplitContainer1.Panel2.Controls.Add(Me.pnlRechts) - Me.SplitContainer1.Panel2.Controls.Add(Me.Label6) - Me.SplitContainer1.Panel2.Controls.Add(Me.Label20) - Me.SplitContainer1.Panel2.Controls.Add(Me.Label10) - Me.SplitContainer1.Panel2.Controls.Add(Me.Label7) - Me.SplitContainer1.Panel2.Controls.Add(Me.Label5) - Me.SplitContainer1.Panel2.Controls.Add(Me.Label9) - Me.SplitContainer1.Panel2.Controls.Add(Me.Label8) + Me.SplitContainer1.Panel2.Controls.Add(Me.lblAbsender) + Me.SplitContainer1.Panel2.Controls.Add(Me.lblBelegNr) + Me.SplitContainer1.Panel2.Controls.Add(Me.lblEndempf) + Me.SplitContainer1.Panel2.Controls.Add(Me.lblFirmenbezeichnung) + Me.SplitContainer1.Panel2.Controls.Add(Me.lblEmpfaenger) + Me.SplitContainer1.Panel2.Controls.Add(Me.lblAuftraggeber) + Me.SplitContainer1.Panel2.Controls.Add(Me.lblFrachtf) Me.SplitContainer1.Panel2.Controls.Add(Me.kdtxtFrachtfuehrer) Me.SplitContainer1.Panel2.Controls.Add(Me.MyTextBox14) Me.SplitContainer1.Panel2.Controls.Add(Me.Label11) Me.SplitContainer1.Panel2.Controls.Add(Me.kdtxtEmpfaenger) Me.SplitContainer1.Panel2.Controls.Add(Me.cbxFakturiert) - Me.SplitContainer1.Panel2.Controls.Add(Me.Label18) + Me.SplitContainer1.Panel2.Controls.Add(Me.lblLKW_KZ) Me.SplitContainer1.Panel2.Controls.Add(Me.txtAbsenderKdnr) Me.SplitContainer1.Panel2.Controls.Add(Me.kdtxtEndempfaenger) Me.SplitContainer1.Panel2.Controls.Add(Me.cbxBar) @@ -1952,10 +1980,10 @@ Partial Class usrCntlSpeditionsBuchSuche Me.SplitContainer1.Panel2.Controls.Add(Me.kdtxtAbsender) Me.SplitContainer1.Panel2.Controls.Add(Me.txtFrachtfuehrerKdnr) Me.SplitContainer1.Panel2.Controls.Add(Me.txtEndempfaengerKdnr) - Me.SplitContainer1.Panel2.Controls.Add(Me.Label19) + Me.SplitContainer1.Panel2.Controls.Add(Me.lblCRNNr) Me.SplitContainer1.Panel2.Controls.Add(Me.txtErfassungsnNr) - Me.SplitContainer1.Panel2.Controls.Add(Me.Label24) - Me.SplitContainer1.Panel2.Controls.Add(Me.Label16) + Me.SplitContainer1.Panel2.Controls.Add(Me.lblVersendungsland) + Me.SplitContainer1.Panel2.Controls.Add(Me.lblErfassungsNr) Me.SplitContainer1.Panel2.Controls.Add(Me.cbxOderEmpfanger) Me.SplitContainer1.Panel2.Controls.Add(Me.Panel2) Me.SplitContainer1.Size = New System.Drawing.Size(1220, 305) @@ -2100,24 +2128,24 @@ Partial Class usrCntlSpeditionsBuchSuche Me.btnVonMonat.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnVonMonat.UseVisualStyleBackColor = True ' - 'Button4 + 'btnDetailsuche ' - Me.Button4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Button4.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer)) - Me.Button4.FlatAppearance.BorderColor = System.Drawing.Color.Black - Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button4.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold) - Me.Button4.ForeColor = System.Drawing.Color.White - Me.Button4.Image = Global.SDL.My.Resources.Resources.pfeil_unten - Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button4.Location = New System.Drawing.Point(1053, 57) - Me.Button4.Margin = New System.Windows.Forms.Padding(0) - Me.Button4.Name = "Button4" - Me.Button4.Padding = New System.Windows.Forms.Padding(0, 0, 10, 0) - Me.Button4.Size = New System.Drawing.Size(162, 27) - Me.Button4.TabIndex = 29 - Me.Button4.Text = "Detailsuche" - Me.Button4.UseVisualStyleBackColor = False + Me.btnDetailsuche.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnDetailsuche.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer)) + Me.btnDetailsuche.FlatAppearance.BorderColor = System.Drawing.Color.Black + Me.btnDetailsuche.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnDetailsuche.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold) + Me.btnDetailsuche.ForeColor = System.Drawing.Color.White + Me.btnDetailsuche.Image = Global.SDL.My.Resources.Resources.pfeil_unten + Me.btnDetailsuche.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnDetailsuche.Location = New System.Drawing.Point(1053, 57) + Me.btnDetailsuche.Margin = New System.Windows.Forms.Padding(0) + Me.btnDetailsuche.Name = "btnDetailsuche" + Me.btnDetailsuche.Padding = New System.Windows.Forms.Padding(0, 0, 10, 0) + Me.btnDetailsuche.Size = New System.Drawing.Size(162, 27) + Me.btnDetailsuche.TabIndex = 29 + Me.btnDetailsuche.Text = "Detailsuche" + Me.btnDetailsuche.UseVisualStyleBackColor = False ' 'Label26 ' @@ -2167,45 +2195,45 @@ Partial Class usrCntlSpeditionsBuchSuche Me.lblAbfertigungsdatum.TabIndex = 0 Me.lblAbfertigungsdatum.Text = "Abfertigungsdatum" ' - 'Label1 + 'lblFiliale ' - Me.Label1.AutoSize = True - Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(330, 12) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(40, 13) - Me.Label1.TabIndex = 6 - Me.Label1.Text = "Filiale" + Me.lblFiliale.AutoSize = True + Me.lblFiliale.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblFiliale.Location = New System.Drawing.Point(330, 12) + Me.lblFiliale.Name = "lblFiliale" + Me.lblFiliale.Size = New System.Drawing.Size(40, 13) + Me.lblFiliale.TabIndex = 6 + Me.lblFiliale.Text = "Filiale" ' - 'Label2 + 'lblAbfertigungsnr ' - Me.Label2.AutoSize = True - Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label2.Location = New System.Drawing.Point(432, 12) - Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(121, 13) - Me.Label2.TabIndex = 7 - Me.Label2.Text = "Abfertigungsnummer" + Me.lblAbfertigungsnr.AutoSize = True + Me.lblAbfertigungsnr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblAbfertigungsnr.Location = New System.Drawing.Point(432, 12) + Me.lblAbfertigungsnr.Name = "lblAbfertigungsnr" + Me.lblAbfertigungsnr.Size = New System.Drawing.Size(121, 13) + Me.lblAbfertigungsnr.TabIndex = 7 + Me.lblAbfertigungsnr.Text = "Abfertigungsnummer" ' - 'Label3 + 'lblUnterNr ' - Me.Label3.AutoSize = True - Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label3.Location = New System.Drawing.Point(630, 12) - Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(51, 13) - Me.Label3.TabIndex = 9 - Me.Label3.Text = "UnterNr" + Me.lblUnterNr.AutoSize = True + Me.lblUnterNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblUnterNr.Location = New System.Drawing.Point(630, 12) + Me.lblUnterNr.Name = "lblUnterNr" + Me.lblUnterNr.Size = New System.Drawing.Size(51, 13) + Me.lblUnterNr.TabIndex = 9 + Me.lblUnterNr.Text = "UnterNr" ' - 'Label12 + 'lblSachbearbeiter ' - Me.Label12.AutoSize = True - Me.Label12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label12.Location = New System.Drawing.Point(703, 12) - Me.Label12.Name = "Label12" - Me.Label12.Size = New System.Drawing.Size(168, 13) - Me.Label12.TabIndex = 11 - Me.Label12.Text = "Sachbearbeiter (Verzollung):" + Me.lblSachbearbeiter.AutoSize = True + Me.lblSachbearbeiter.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblSachbearbeiter.Location = New System.Drawing.Point(703, 12) + Me.lblSachbearbeiter.Name = "lblSachbearbeiter" + Me.lblSachbearbeiter.Size = New System.Drawing.Size(168, 13) + Me.lblSachbearbeiter.TabIndex = 11 + Me.lblSachbearbeiter.Text = "Sachbearbeiter (Verzollung):" ' 'DateTimePicker1 ' @@ -2242,14 +2270,14 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtVermerk.Size = New System.Drawing.Size(64, 20) Me.txtVermerk.TabIndex = 57 ' - 'Label48 + 'lblVermerke ' - Me.Label48.AutoSize = True - Me.Label48.Location = New System.Drawing.Point(563, 93) - Me.Label48.Name = "Label48" - Me.Label48.Size = New System.Drawing.Size(49, 13) - Me.Label48.TabIndex = 56 - Me.Label48.Text = "Vermerk:" + Me.lblVermerke.AutoSize = True + Me.lblVermerke.Location = New System.Drawing.Point(563, 93) + Me.lblVermerke.Name = "lblVermerke" + Me.lblVermerke.Size = New System.Drawing.Size(49, 13) + Me.lblVermerke.TabIndex = 56 + Me.lblVermerke.Text = "Vermerk:" ' 'txtZollstelle ' @@ -2349,32 +2377,32 @@ Partial Class usrCntlSpeditionsBuchSuche Me.lstGrenze.Size = New System.Drawing.Size(105, 82) Me.lstGrenze.TabIndex = 47 ' - 'Label40 + 'lblKdAuftragsNr ' - Me.Label40.AutoSize = True - Me.Label40.Location = New System.Drawing.Point(490, 10) - Me.Label40.Name = "Label40" - Me.Label40.Size = New System.Drawing.Size(102, 13) - Me.Label40.TabIndex = 45 - Me.Label40.Text = "Kd-Auftragsnummer:" + Me.lblKdAuftragsNr.AutoSize = True + Me.lblKdAuftragsNr.Location = New System.Drawing.Point(490, 10) + Me.lblKdAuftragsNr.Name = "lblKdAuftragsNr" + Me.lblKdAuftragsNr.Size = New System.Drawing.Size(102, 13) + Me.lblKdAuftragsNr.TabIndex = 45 + Me.lblKdAuftragsNr.Text = "Kd-Auftragsnummer:" ' - 'Label9 + 'lblAuftraggeber ' - Me.Label9.AutoSize = True - Me.Label9.Location = New System.Drawing.Point(14, 29) - Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(71, 13) - Me.Label9.TabIndex = 16 - Me.Label9.Text = "Auftraggeber:" + Me.lblAuftraggeber.AutoSize = True + Me.lblAuftraggeber.Location = New System.Drawing.Point(14, 29) + Me.lblAuftraggeber.Name = "lblAuftraggeber" + Me.lblAuftraggeber.Size = New System.Drawing.Size(71, 13) + Me.lblAuftraggeber.TabIndex = 16 + Me.lblAuftraggeber.Text = "Auftraggeber:" ' - 'Label8 + 'lblFrachtf ' - Me.Label8.AutoSize = True - Me.Label8.Location = New System.Drawing.Point(14, 130) - Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(67, 13) - Me.Label8.TabIndex = 21 - Me.Label8.Text = "Frachtführer:" + Me.lblFrachtf.AutoSize = True + Me.lblFrachtf.Location = New System.Drawing.Point(14, 130) + Me.lblFrachtf.Name = "lblFrachtf" + Me.lblFrachtf.Size = New System.Drawing.Size(67, 13) + Me.lblFrachtf.TabIndex = 21 + Me.lblFrachtf.Text = "Frachtführer:" ' 'MyTextBox14 ' @@ -2451,14 +2479,14 @@ Partial Class usrCntlSpeditionsBuchSuche Me.cbxFakturiert.ThreeState = True Me.cbxFakturiert.UseVisualStyleBackColor = False ' - 'Label18 + 'lblLKW_KZ ' - Me.Label18.AutoSize = True - Me.Label18.Location = New System.Drawing.Point(12, 195) - Me.Label18.Name = "Label18" - Me.Label18.Size = New System.Drawing.Size(99, 13) - Me.Label18.TabIndex = 26 - Me.Label18.Text = "LKW-Kennzeichen:" + Me.lblLKW_KZ.AutoSize = True + Me.lblLKW_KZ.Location = New System.Drawing.Point(12, 195) + Me.lblLKW_KZ.Name = "lblLKW_KZ" + Me.lblLKW_KZ.Size = New System.Drawing.Size(99, 13) + Me.lblLKW_KZ.TabIndex = 26 + Me.lblLKW_KZ.Text = "LKW-Kennzeichen:" ' 'txtAbsenderKdnr ' @@ -2634,14 +2662,14 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtEndempfaengerKdnr.Size = New System.Drawing.Size(79, 20) Me.txtEndempfaengerKdnr.TabIndex = 29 ' - 'Label19 + 'lblCRNNr ' - Me.Label19.AutoSize = True - Me.Label19.Location = New System.Drawing.Point(735, 10) - Me.Label19.Name = "Label19" - Me.Label19.Size = New System.Drawing.Size(47, 13) - Me.Label19.TabIndex = 13 - Me.Label19.Text = "CRN-Nr:" + Me.lblCRNNr.AutoSize = True + Me.lblCRNNr.Location = New System.Drawing.Point(735, 10) + Me.lblCRNNr.Name = "lblCRNNr" + Me.lblCRNNr.Size = New System.Drawing.Size(47, 13) + Me.lblCRNNr.TabIndex = 13 + Me.lblCRNNr.Text = "CRN-Nr:" ' 'txtErfassungsnNr ' @@ -2667,23 +2695,23 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtErfassungsnNr.Size = New System.Drawing.Size(110, 20) Me.txtErfassungsnNr.TabIndex = 14 ' - 'Label24 + 'lblVersendungsland ' - Me.Label24.AutoSize = True - Me.Label24.Location = New System.Drawing.Point(735, 55) - Me.Label24.Name = "Label24" - Me.Label24.Size = New System.Drawing.Size(92, 13) - Me.Label24.TabIndex = 19 - Me.Label24.Text = "Versendungsland:" + Me.lblVersendungsland.AutoSize = True + Me.lblVersendungsland.Location = New System.Drawing.Point(735, 55) + Me.lblVersendungsland.Name = "lblVersendungsland" + Me.lblVersendungsland.Size = New System.Drawing.Size(92, 13) + Me.lblVersendungsland.TabIndex = 19 + Me.lblVersendungsland.Text = "Versendungsland:" ' - 'Label16 + 'lblErfassungsNr ' - Me.Label16.AutoSize = True - Me.Label16.Location = New System.Drawing.Point(490, 138) - Me.Label16.Name = "Label16" - Me.Label16.Size = New System.Drawing.Size(99, 13) - Me.Label16.TabIndex = 12 - Me.Label16.Text = "Erfassungsnummer:" + Me.lblErfassungsNr.AutoSize = True + Me.lblErfassungsNr.Location = New System.Drawing.Point(490, 138) + Me.lblErfassungsNr.Name = "lblErfassungsNr" + Me.lblErfassungsNr.Size = New System.Drawing.Size(99, 13) + Me.lblErfassungsNr.TabIndex = 12 + Me.lblErfassungsNr.Text = "Erfassungsnummer:" ' 'cbxOderEmpfanger ' @@ -2777,33 +2805,6 @@ Partial Class usrCntlSpeditionsBuchSuche Me.SplitContainer.SplitterWidth = 2 Me.SplitContainer.TabIndex = 3 ' - 'Button25 - ' - 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.Margin = New System.Windows.Forms.Padding(0) - Me.Button25.Name = "Button25" - Me.Button25.Size = New System.Drawing.Size(128, 28) - Me.Button25.TabIndex = 94 - Me.Button25.Text = "Handling (AMBAR)" - Me.Button25.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button25.UseVisualStyleBackColor = True - ' - 'MyComboBox2 - ' - Me.MyComboBox2._allowedValuesFreiText = Nothing - Me.MyComboBox2._allowFreiText = False - Me.MyComboBox2._value = "" - 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.Name = "MyComboBox2" - Me.MyComboBox2.Size = New System.Drawing.Size(128, 22) - Me.MyComboBox2.TabIndex = 53 - ' 'usrCntlSpeditionsBuchSuche ' Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None @@ -2852,7 +2853,7 @@ Partial Class usrCntlSpeditionsBuchSuche Friend WithEvents cntxtCntxtSpeditionsbuch As System.Windows.Forms.ContextMenuStrip Friend WithEvents EintragLöschenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents txtAvisoId As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents Label39 As System.Windows.Forms.Label + Friend WithEvents lblLKWId As System.Windows.Forms.Label Friend WithEvents lstFiliale As VERAG_PROG_ALLGEMEIN.MyListBox Friend WithEvents kdtxtAuftraggeber As VERAG_PROG_ALLGEMEIN.KdSearchBox Friend WithEvents txtAuftraggeberKdnr As VERAG_PROG_ALLGEMEIN.MyTextBox @@ -2860,19 +2861,19 @@ Partial Class usrCntlSpeditionsBuchSuche Friend WithEvents txtBelegNr As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents cboVersLand As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents cboBestLand As VERAG_PROG_ALLGEMEIN.MyComboBox - Friend WithEvents Label25 As System.Windows.Forms.Label + Friend WithEvents lblBestimmungsland As System.Windows.Forms.Label Friend WithEvents txtPackstücke As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents Label36 As System.Windows.Forms.Label + Friend WithEvents lblPackst As System.Windows.Forms.Label Friend WithEvents Button11 As System.Windows.Forms.Button Friend WithEvents Label15 As System.Windows.Forms.Label - Friend WithEvents Label33 As System.Windows.Forms.Label + Friend WithEvents lblAvisierer As System.Windows.Forms.Label Friend WithEvents kdtxtAvisierer As VERAG_PROG_ALLGEMEIN.KdSearchBox Friend WithEvents txtAvisiererKdNr As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents pnlRechts As System.Windows.Forms.Panel Friend WithEvents MyListBox1 As VERAG_PROG_ALLGEMEIN.MyListBox - Friend WithEvents Button2 As System.Windows.Forms.Button - Friend WithEvents Button13 As System.Windows.Forms.Button - Friend WithEvents Label14 As System.Windows.Forms.Label + Friend WithEvents btnAlle As System.Windows.Forms.Button + Friend WithEvents btnKeine As System.Windows.Forms.Button + Friend WithEvents lblAbfertigungsarten As System.Windows.Forms.Label Friend WithEvents Label17 As System.Windows.Forms.Label Friend WithEvents txtFiskalEndempfaenger As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents DataGridView As VERAG_PROG_ALLGEMEIN.MyDatagridview @@ -2906,18 +2907,18 @@ Partial Class usrCntlSpeditionsBuchSuche Friend WithEvents FlatButton7 As System.Windows.Forms.Button Friend WithEvents lblErgebnis As System.Windows.Forms.Label Friend WithEvents Button3 As System.Windows.Forms.Button - Friend WithEvents Label6 As System.Windows.Forms.Label - Friend WithEvents Label20 As System.Windows.Forms.Label - Friend WithEvents Label10 As System.Windows.Forms.Label - Friend WithEvents Label7 As System.Windows.Forms.Label + Friend WithEvents lblAbsender As System.Windows.Forms.Label + Friend WithEvents lblBelegNr As System.Windows.Forms.Label + Friend WithEvents lblEndempf As System.Windows.Forms.Label + Friend WithEvents lblFirmenbezeichnung As System.Windows.Forms.Label Friend WithEvents TabPage2 As System.Windows.Forms.TabPage Friend WithEvents tbcntr As System.Windows.Forms.TabControl Friend WithEvents Label29 As System.Windows.Forms.Label Friend WithEvents pnlTop As System.Windows.Forms.Panel Friend WithEvents Label30 As System.Windows.Forms.Label - Friend WithEvents Label4 As System.Windows.Forms.Label + Friend WithEvents lblUeberschrift As System.Windows.Forms.Label Friend WithEvents Label22 As System.Windows.Forms.Label - Friend WithEvents Label5 As System.Windows.Forms.Label + Friend WithEvents lblEmpfaenger As System.Windows.Forms.Label Friend WithEvents kdtxtFrachtfuehrer As VERAG_PROG_ALLGEMEIN.KdSearchBox Friend WithEvents cboSB_Qs As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents txtAbfertDat As VERAG_PROG_ALLGEMEIN.MyTextBox @@ -2929,7 +2930,7 @@ Partial Class usrCntlSpeditionsBuchSuche Friend WithEvents txtAbfertigungsnummer As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Button7 As System.Windows.Forms.Button Friend WithEvents Button6 As System.Windows.Forms.Button - Friend WithEvents Button5 As System.Windows.Forms.Button + Friend WithEvents btnToday As System.Windows.Forms.Button Friend WithEvents btnSuche As System.Windows.Forms.Button Friend WithEvents pnlSearch As System.Windows.Forms.Panel Friend WithEvents SplitContainer1 As System.Windows.Forms.SplitContainer @@ -2942,24 +2943,24 @@ Partial Class usrCntlSpeditionsBuchSuche Friend WithEvents btnMonat As System.Windows.Forms.Button Friend WithEvents btnBisMonat As System.Windows.Forms.Button Friend WithEvents btnVonMonat As System.Windows.Forms.Button - Friend WithEvents Button4 As System.Windows.Forms.Button + Friend WithEvents btnDetailsuche As System.Windows.Forms.Button Friend WithEvents Label26 As System.Windows.Forms.Label Friend WithEvents DateTimePicker2 As System.Windows.Forms.DateTimePicker Friend WithEvents Label27 As System.Windows.Forms.Label Friend WithEvents Label13 As System.Windows.Forms.Label Friend WithEvents lblAbfertigungsdatum As System.Windows.Forms.Label - Friend WithEvents Label1 As System.Windows.Forms.Label - Friend WithEvents Label2 As System.Windows.Forms.Label - Friend WithEvents Label3 As System.Windows.Forms.Label - Friend WithEvents Label12 As System.Windows.Forms.Label + Friend WithEvents lblFiliale As System.Windows.Forms.Label + Friend WithEvents lblAbfertigungsnr As System.Windows.Forms.Label + Friend WithEvents lblUnterNr As System.Windows.Forms.Label + Friend WithEvents lblSachbearbeiter As System.Windows.Forms.Label Friend WithEvents DateTimePicker1 As System.Windows.Forms.DateTimePicker - Friend WithEvents Label9 As System.Windows.Forms.Label - Friend WithEvents Label8 As System.Windows.Forms.Label + Friend WithEvents lblAuftraggeber As System.Windows.Forms.Label + Friend WithEvents lblFrachtf As System.Windows.Forms.Label Friend WithEvents MyTextBox14 As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label11 As System.Windows.Forms.Label Friend WithEvents kdtxtEmpfaenger As VERAG_PROG_ALLGEMEIN.KdSearchBox Friend WithEvents cbxFakturiert As System.Windows.Forms.CheckBox - Friend WithEvents Label18 As System.Windows.Forms.Label + Friend WithEvents lblLKW_KZ As System.Windows.Forms.Label Friend WithEvents txtAbsenderKdnr As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents kdtxtEndempfaenger As VERAG_PROG_ALLGEMEIN.KdSearchBox Friend WithEvents cbxBar As System.Windows.Forms.CheckBox @@ -2967,15 +2968,15 @@ Partial Class usrCntlSpeditionsBuchSuche Friend WithEvents kdtxtAbsender As VERAG_PROG_ALLGEMEIN.KdSearchBox Friend WithEvents txtFrachtfuehrerKdnr As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents txtEndempfaengerKdnr As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents Label19 As System.Windows.Forms.Label + Friend WithEvents lblCRNNr As System.Windows.Forms.Label Friend WithEvents txtErfassungsnNr As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents Label24 As System.Windows.Forms.Label - Friend WithEvents Label16 As System.Windows.Forms.Label + Friend WithEvents lblVersendungsland As System.Windows.Forms.Label + Friend WithEvents lblErfassungsNr As System.Windows.Forms.Label Friend WithEvents SplitContainer As System.Windows.Forms.SplitContainer Friend WithEvents cbxOderEmpfanger As System.Windows.Forms.CheckBox Friend WithEvents Button15 As System.Windows.Forms.Button Friend WithEvents txtKdAuftragsNr As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents Label40 As System.Windows.Forms.Label + Friend WithEvents lblKdAuftragsNr As System.Windows.Forms.Label Friend WithEvents Label41 As System.Windows.Forms.Label Friend WithEvents lstGrenze As VERAG_PROG_ALLGEMEIN.MyListBox Friend WithEvents txtUeberschr As VERAG_PROG_ALLGEMEIN.MyTextBox @@ -3007,14 +3008,14 @@ Partial Class usrCntlSpeditionsBuchSuche Friend WithEvents lblKdAusFortschritt As Label Friend WithEvents cbxEIDR As CheckBox Friend WithEvents btnSpedBuchEinnahmen As Button - Friend WithEvents Button12 As Button + Friend WithEvents btnNurAbf As Button Friend WithEvents Button21 As Button Friend WithEvents Button22 As Button Friend WithEvents Button23 As Button Friend WithEvents txtZollstelle As VERAG_PROG_ALLGEMEIN.MySearchBox Friend WithEvents FlenderBocholtZeitraumAuswählenToolStripMenuItem As ToolStripMenuItem Friend WithEvents txtVermerk As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents Label48 As Label + Friend WithEvents lblVermerke As Label Friend WithEvents Button24 As Button Friend WithEvents Button25 As Button Friend WithEvents MyComboBox2 As VERAG_PROG_ALLGEMEIN.MyComboBox diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb index a8906031..c020f294 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb @@ -344,6 +344,8 @@ Public Class usrCntlSpeditionsBuchSuche End Function Private Sub frmSpeditionsbuchSuche_Load(sender As Object, e As EventArgs) Handles MyBase.Load + VERAG_PROG_ALLGEMEIN.cAllgemein._TRANSLATE(Me) + If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then AVISOSERVER = "[DEVELOPER\DEVSQL].AVISO_new.dbo.AVISO" End If @@ -513,7 +515,7 @@ Public Class usrCntlSpeditionsBuchSuche cboSB_TR.fillWithSQL("SELECT [mit_id],[mit_vname] + ' '+ [mit_nname] as NAME " & " FROM [tblMitarbeiter] WHERE mit_firma IN ('VERIMEX') AND [mit_gekuendigt]=0 order by name", False, "ADMIN", True) - Button4.PerformClick() + btnDetailsuche.PerformClick() cboRolle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Auftraggeber", "VermittlerKundenNr")) cboRolle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Avisierer", "AvisiererKundenNr")) @@ -627,7 +629,7 @@ Public Class usrCntlSpeditionsBuchSuche ' Next 'End Sub ' - Private Sub Button13_Click(sender As Object, e As EventArgs) Handles Button13.Click + Private Sub Button13_Click(sender As Object, e As EventArgs) Handles btnKeine.Click For i = 0 To MyListBox1.Items.Count - 1 MyListBox1.SetSelected(i, False) Next @@ -639,7 +641,7 @@ Public Class usrCntlSpeditionsBuchSuche Next End Sub - Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click + Private Sub Button2_Click(sender As Object, e As EventArgs) Handles btnAlle.Click For i = 0 To MyListBox1.Items.Count - 1 MyListBox1.SetSelected(i, True) Next @@ -895,13 +897,13 @@ Public Class usrCntlSpeditionsBuchSuche DateTimePicker1.Value = srcTAG DateTimePicker2.Value = srcTAG If srcTAG = Now.ToShortDateString Then - Button5.Text = "Heute" + btnToday.Text = "Heute" ElseIf srcTAG = Now.AddDays(-1).ToShortDateString Then - Button5.Text = "Gestern" + btnToday.Text = "Gestern" ElseIf srcTAG = Now.AddDays(-2).ToShortDateString Then - Button5.Text = "Vorgestern" + btnToday.Text = "Vorgestern" Else - Button5.Text = srcTAG.ToString("dd.MM") + btnToday.Text = srcTAG.ToString("dd.MM") End If 'End If @@ -936,7 +938,7 @@ Public Class usrCntlSpeditionsBuchSuche initBtns("Jahr") End Sub - Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click + Private Sub Button4_Click(sender As Object, e As EventArgs) Handles btnDetailsuche.Click Try SplitContainer1.Panel2Collapsed = Not SplitContainer1.Panel2Collapsed @@ -949,10 +951,10 @@ Public Class usrCntlSpeditionsBuchSuche SplitContainer.SplitterDistance += 200 End If - If Button4.Image Is SDL.My.Resources.Resources.pfeil_unten Then - Button4.Image = SDL.My.Resources.Resources.pfeil_oben + If btnDetailsuche.Image Is SDL.My.Resources.Resources.pfeil_unten Then + btnDetailsuche.Image = SDL.My.Resources.Resources.pfeil_oben Else - Button4.Image = SDL.My.Resources.Resources.pfeil_unten + btnDetailsuche.Image = SDL.My.Resources.Resources.pfeil_unten End If Catch ex As Exception @@ -975,7 +977,7 @@ Public Class usrCntlSpeditionsBuchSuche initBtns("Tag") End Sub - Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click + Private Sub Button5_Click(sender As Object, e As EventArgs) Handles btnToday.Click initBtns("Tag") End Sub @@ -2325,7 +2327,7 @@ Public Class usrCntlSpeditionsBuchSuche End If End Sub - Private Sub Button12_Click_1(sender As Object, e As EventArgs) Handles Button12.Click + Private Sub Button12_Click_1(sender As Object, e As EventArgs) Handles btnNurAbf.Click Dim dt = SQL.loadDgvBySql("SELECT Abfertigungsart FROM [Abfertigungsarten] where isAbfertigung=1", "FMZOLL") MyListBox1.ClearSelected() If dt IsNot Nothing Then diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index fc55b1e7..e21c9bec 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -274,7 +274,7 @@ Partial Class frmKundenblatt Me.tbFirmendaten.Location = New System.Drawing.Point(4, 25) Me.tbFirmendaten.Name = "tbFirmendaten" Me.tbFirmendaten.Padding = New System.Windows.Forms.Padding(3) - Me.tbFirmendaten.Size = New System.Drawing.Size(1630, 897) + Me.tbFirmendaten.Size = New System.Drawing.Size(1630, 914) Me.tbFirmendaten.TabIndex = 3 Me.tbFirmendaten.Text = "Firmendaten" ' @@ -284,7 +284,7 @@ Partial Class frmKundenblatt Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel4.Location = New System.Drawing.Point(3, 3) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(1624, 891) + Me.Panel4.Size = New System.Drawing.Size(1624, 908) Me.Panel4.TabIndex = 0 ' 'UsrcntlKundeBearbeitenFull1 @@ -294,7 +294,7 @@ Partial Class frmKundenblatt Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0) Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1" - Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1624, 891) + Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1624, 908) Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 ' 'tbcntrMain @@ -845,7 +845,7 @@ Partial Class frmKundenblatt Me.tbZoll.Location = New System.Drawing.Point(4, 25) Me.tbZoll.Name = "tbZoll" Me.tbZoll.Padding = New System.Windows.Forms.Padding(3) - Me.tbZoll.Size = New System.Drawing.Size(1630, 897) + Me.tbZoll.Size = New System.Drawing.Size(1630, 914) Me.tbZoll.TabIndex = 9 Me.tbZoll.Text = "ZOLL" Me.tbZoll.UseVisualStyleBackColor = True @@ -857,7 +857,7 @@ Partial Class frmKundenblatt Me.tbcntrZOLL.Location = New System.Drawing.Point(3, 3) Me.tbcntrZOLL.Name = "tbcntrZOLL" Me.tbcntrZOLL.SelectedIndex = 0 - Me.tbcntrZOLL.Size = New System.Drawing.Size(1624, 891) + Me.tbcntrZOLL.Size = New System.Drawing.Size(1624, 908) Me.tbcntrZOLL.TabIndex = 0 ' 'tabZoll_Artikel @@ -865,7 +865,7 @@ Partial Class frmKundenblatt Me.tabZoll_Artikel.Location = New System.Drawing.Point(4, 22) Me.tabZoll_Artikel.Name = "tabZoll_Artikel" Me.tabZoll_Artikel.Padding = New System.Windows.Forms.Padding(3) - Me.tabZoll_Artikel.Size = New System.Drawing.Size(1616, 865) + Me.tabZoll_Artikel.Size = New System.Drawing.Size(1616, 882) Me.tabZoll_Artikel.TabIndex = 1 Me.tabZoll_Artikel.Text = "Artikel" Me.tabZoll_Artikel.UseVisualStyleBackColor = True @@ -876,7 +876,7 @@ Partial Class frmKundenblatt Me.tbMdm.Location = New System.Drawing.Point(4, 25) Me.tbMdm.Name = "tbMdm" Me.tbMdm.Padding = New System.Windows.Forms.Padding(3) - Me.tbMdm.Size = New System.Drawing.Size(1630, 897) + Me.tbMdm.Size = New System.Drawing.Size(1630, 914) Me.tbMdm.TabIndex = 10 Me.tbMdm.Text = "MDM" Me.tbMdm.UseVisualStyleBackColor = True @@ -894,7 +894,7 @@ Partial Class frmKundenblatt Me.tbcntrMDM.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMDM.Name = "tbcntrMDM" Me.tbcntrMDM.SelectedIndex = 0 - Me.tbcntrMDM.Size = New System.Drawing.Size(1624, 891) + Me.tbcntrMDM.Size = New System.Drawing.Size(1624, 908) Me.tbcntrMDM.TabIndex = 0 ' 'tbSDL @@ -906,7 +906,7 @@ Partial Class frmKundenblatt Me.tbSDL.Margin = New System.Windows.Forms.Padding(0) Me.tbSDL.Name = "tbSDL" Me.tbSDL.Padding = New System.Windows.Forms.Padding(3) - Me.tbSDL.Size = New System.Drawing.Size(1616, 865) + Me.tbSDL.Size = New System.Drawing.Size(1616, 882) Me.tbSDL.TabIndex = 5 Me.tbSDL.Text = "SDL-Leistungen" Me.tbSDL.UseVisualStyleBackColor = True @@ -948,7 +948,7 @@ Partial Class frmKundenblatt DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle13 Me.dgvSDLLeistungenFull.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1610, 669) + Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1610, 686) Me.dgvSDLLeistungenFull.TabIndex = 5 ' 'Panel6 @@ -1052,7 +1052,7 @@ Partial Class frmKundenblatt Me.Panel5.Controls.Add(Me.lblLetzterSA_SDL) Me.Panel5.Controls.Add(Me.rtbVermerke) Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel5.Location = New System.Drawing.Point(3, 719) + Me.Panel5.Location = New System.Drawing.Point(3, 736) Me.Panel5.Name = "Panel5" Me.Panel5.Size = New System.Drawing.Size(1610, 143) Me.Panel5.TabIndex = 177 @@ -1916,7 +1916,7 @@ Partial Class frmKundenblatt Me.tbOfferte.Location = New System.Drawing.Point(4, 25) Me.tbOfferte.Margin = New System.Windows.Forms.Padding(2) Me.tbOfferte.Name = "tbOfferte" - Me.tbOfferte.Size = New System.Drawing.Size(1630, 897) + Me.tbOfferte.Size = New System.Drawing.Size(1630, 914) Me.tbOfferte.TabIndex = 11 Me.tbOfferte.Text = "Offerte" Me.tbOfferte.UseVisualStyleBackColor = True @@ -1928,7 +1928,7 @@ Partial Class frmKundenblatt Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0) Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1) Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" - Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1630, 897) + Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1630, 914) Me.UsrCntlOfferte1.TabIndex = 0 ' 'tbUSTV @@ -1936,7 +1936,7 @@ Partial Class frmKundenblatt Me.tbUSTV.Controls.Add(Me.tbcntrUSTV) Me.tbUSTV.Location = New System.Drawing.Point(4, 25) Me.tbUSTV.Name = "tbUSTV" - Me.tbUSTV.Size = New System.Drawing.Size(1630, 897) + Me.tbUSTV.Size = New System.Drawing.Size(1630, 914) Me.tbUSTV.TabIndex = 12 Me.tbUSTV.Text = "USTV" Me.tbUSTV.UseVisualStyleBackColor = True @@ -1950,7 +1950,7 @@ Partial Class frmKundenblatt Me.tbcntrUSTV.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrUSTV.Name = "tbcntrUSTV" Me.tbcntrUSTV.SelectedIndex = 0 - Me.tbcntrUSTV.Size = New System.Drawing.Size(1630, 897) + Me.tbcntrUSTV.Size = New System.Drawing.Size(1630, 914) Me.tbcntrUSTV.TabIndex = 1 ' 'tbUSTVDokumente @@ -1963,7 +1963,7 @@ Partial Class frmKundenblatt Me.tbUSTVDokumente.Controls.Add(Me.scanUSTVVollmachten) Me.tbUSTVDokumente.Location = New System.Drawing.Point(4, 22) Me.tbUSTVDokumente.Name = "tbUSTVDokumente" - Me.tbUSTVDokumente.Size = New System.Drawing.Size(1622, 871) + Me.tbUSTVDokumente.Size = New System.Drawing.Size(1622, 888) Me.tbUSTVDokumente.TabIndex = 8 Me.tbUSTVDokumente.Text = "Dokumente" Me.tbUSTVDokumente.UseVisualStyleBackColor = True @@ -2216,7 +2216,7 @@ Partial Class frmKundenblatt ' Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM" - Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8 + Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4 Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4) Me.cntxtCntxtMDM.Text = "cntxtMDM" ' diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb index 269b37fe..b545c965 100644 --- a/SDL/kunden/frmKundenblatt.vb +++ b/SDL/kunden/frmKundenblatt.vb @@ -142,7 +142,7 @@ Public Class frmKundenblatt TabControl1_TabIndexChanged(tbcntrMain, New EventArgs) Catch ex As Exception - MsgBox(ex.Message & vbNewLine & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try End Sub KdSearchBox1.KdNr = kdNr ' Ruft initKUNDE auf diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb index 8e4ab1d7..0ec4370e 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb @@ -258,7 +258,10 @@ Partial Class usrcntlKundeBearbeitenFull Me.Label91 = New System.Windows.Forms.Label() Me.Label92 = New System.Windows.Forms.Label() Me.DataGridView1 = New System.Windows.Forms.DataGridView() - Me.Label33 = New System.Windows.Forms.Label() + Me.tbZahlungsinfo = New System.Windows.Forms.TabPage() + Me.Label102 = New System.Windows.Forms.Label() + Me.rtb_Zahlungsinfo = New System.Windows.Forms.RichTextBox() + Me.lblEORI = New System.Windows.Forms.Label() Me.Label84 = New System.Windows.Forms.Label() Me.GroupBox3 = New System.Windows.Forms.GroupBox() Me.PictureBox5 = New System.Windows.Forms.PictureBox() @@ -339,9 +342,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboAuswahl = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.tbZahlungsinfo = New System.Windows.Forms.TabPage() - Me.rtb_Zahlungsinfo = New System.Windows.Forms.RichTextBox() - Me.Label102 = New System.Windows.Forms.Label() + Me.lblHandelregisterNr = New System.Windows.Forms.Label() + Me.txtHandelsregisterNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.tbcntrDetails.SuspendLayout() Me.tbAbfertigung.SuspendLayout() Me.tbcntrAbf.SuspendLayout() @@ -367,6 +369,7 @@ Partial Class usrcntlKundeBearbeitenFull CType(Me.dgvSonst_IDSKunden, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbSchnittstellen.SuspendLayout() CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.tbZahlungsinfo.SuspendLayout() Me.GroupBox3.SuspendLayout() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox1.SuspendLayout() @@ -374,7 +377,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.TabPage10.SuspendLayout() Me.TabPage11.SuspendLayout() Me.pnlNeukunde.SuspendLayout() - Me.tbZahlungsinfo.SuspendLayout() Me.SuspendLayout() ' 'tbcntrDetails @@ -3590,15 +3592,44 @@ Partial Class usrcntlKundeBearbeitenFull Me.DataGridView1.Size = New System.Drawing.Size(657, 358) Me.DataGridView1.TabIndex = 22 ' - 'Label33 + 'tbZahlungsinfo ' - Me.Label33.AutoSize = True - Me.Label33.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label33.Location = New System.Drawing.Point(8, 161) - Me.Label33.Name = "Label33" - Me.Label33.Size = New System.Drawing.Size(78, 13) - Me.Label33.TabIndex = 12 - Me.Label33.Text = "EORI / NL-Nr.:" + Me.tbZahlungsinfo.Controls.Add(Me.Label102) + Me.tbZahlungsinfo.Controls.Add(Me.rtb_Zahlungsinfo) + Me.tbZahlungsinfo.Location = New System.Drawing.Point(4, 22) + Me.tbZahlungsinfo.Name = "tbZahlungsinfo" + Me.tbZahlungsinfo.Size = New System.Drawing.Size(672, 458) + Me.tbZahlungsinfo.TabIndex = 11 + Me.tbZahlungsinfo.Text = "Zahlungsinfo" + Me.tbZahlungsinfo.UseVisualStyleBackColor = True + ' + 'Label102 + ' + Me.Label102.AutoSize = True + Me.Label102.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label102.Location = New System.Drawing.Point(3, 18) + Me.Label102.Name = "Label102" + Me.Label102.Size = New System.Drawing.Size(66, 13) + Me.Label102.TabIndex = 132 + Me.Label102.Text = "Zahlunginfo:" + ' + 'rtb_Zahlungsinfo + ' + Me.rtb_Zahlungsinfo.Location = New System.Drawing.Point(6, 35) + Me.rtb_Zahlungsinfo.Name = "rtb_Zahlungsinfo" + Me.rtb_Zahlungsinfo.Size = New System.Drawing.Size(660, 412) + Me.rtb_Zahlungsinfo.TabIndex = 40 + Me.rtb_Zahlungsinfo.Text = "" + ' + 'lblEORI + ' + Me.lblEORI.AutoSize = True + Me.lblEORI.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblEORI.Location = New System.Drawing.Point(8, 161) + Me.lblEORI.Name = "lblEORI" + Me.lblEORI.Size = New System.Drawing.Size(78, 13) + Me.lblEORI.TabIndex = 12 + Me.lblEORI.Text = "EORI / NL-Nr.:" ' 'Label84 ' @@ -3612,6 +3643,7 @@ Partial Class usrcntlKundeBearbeitenFull ' 'GroupBox3 ' + Me.GroupBox3.Controls.Add(Me.txtHandelsregisterNr) Me.GroupBox3.Controls.Add(Me.PictureBox5) Me.GroupBox3.Controls.Add(Me.Label100) Me.GroupBox3.Controls.Add(Me.txtAdresseZusatz) @@ -3622,7 +3654,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.GroupBox3.Controls.Add(Me.txtEORINL) Me.GroupBox3.Controls.Add(Me.Label5) Me.GroupBox3.Controls.Add(Me.txtEORI) - Me.GroupBox3.Controls.Add(Me.Label33) + Me.GroupBox3.Controls.Add(Me.lblEORI) Me.GroupBox3.Controls.Add(Me.txtFirmenname1) Me.GroupBox3.Controls.Add(Me.cboUSt_UstIdNrLand) Me.GroupBox3.Controls.Add(Me.Label15) @@ -3634,6 +3666,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.GroupBox3.Controls.Add(Me.Label16) Me.GroupBox3.Controls.Add(Me.txtUSt_Steuernummer) Me.GroupBox3.Controls.Add(Me.Label84) + Me.GroupBox3.Controls.Add(Me.lblHandelregisterNr) Me.GroupBox3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.GroupBox3.Location = New System.Drawing.Point(3, 3) Me.GroupBox3.Name = "GroupBox3" @@ -4087,9 +4120,9 @@ Partial Class usrcntlKundeBearbeitenFull Me.Label13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label13.Location = New System.Drawing.Point(3, 123) Me.Label13.Name = "Label13" - Me.Label13.Size = New System.Drawing.Size(39, 13) + Me.Label13.Size = New System.Drawing.Size(48, 13) Me.Label13.TabIndex = 8 - Me.Label13.Text = "E-Mail:" + Me.Label13.Text = "E-Mail 2:" ' 'Label11 ' @@ -4563,34 +4596,41 @@ Partial Class usrcntlKundeBearbeitenFull Me.DataGridViewTextBoxColumn2.HeaderText = "E-Mail" Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" ' - 'tbZahlungsinfo + 'lblHandelregisterNr ' - Me.tbZahlungsinfo.Controls.Add(Me.Label102) - Me.tbZahlungsinfo.Controls.Add(Me.rtb_Zahlungsinfo) - Me.tbZahlungsinfo.Location = New System.Drawing.Point(4, 22) - Me.tbZahlungsinfo.Name = "tbZahlungsinfo" - Me.tbZahlungsinfo.Size = New System.Drawing.Size(672, 458) - Me.tbZahlungsinfo.TabIndex = 11 - Me.tbZahlungsinfo.Text = "Zahlungsinfo" - Me.tbZahlungsinfo.UseVisualStyleBackColor = True + Me.lblHandelregisterNr.AutoSize = True + Me.lblHandelregisterNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblHandelregisterNr.Location = New System.Drawing.Point(6, 161) + Me.lblHandelregisterNr.Name = "lblHandelregisterNr" + Me.lblHandelregisterNr.Size = New System.Drawing.Size(100, 13) + Me.lblHandelregisterNr.TabIndex = 132 + Me.lblHandelregisterNr.Text = "Handelsregister-Nr.:" + Me.lblHandelregisterNr.Visible = False ' - 'rtb_Zahlungsinfo + 'txtHandelsregisterNr ' - Me.rtb_Zahlungsinfo.Location = New System.Drawing.Point(6, 35) - Me.rtb_Zahlungsinfo.Name = "rtb_Zahlungsinfo" - Me.rtb_Zahlungsinfo.Size = New System.Drawing.Size(660, 412) - Me.rtb_Zahlungsinfo.TabIndex = 40 - Me.rtb_Zahlungsinfo.Text = "" - ' - 'Label102 - ' - Me.Label102.AutoSize = True - Me.Label102.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label102.Location = New System.Drawing.Point(3, 18) - Me.Label102.Name = "Label102" - Me.Label102.Size = New System.Drawing.Size(66, 13) - Me.Label102.TabIndex = 132 - Me.Label102.Text = "Zahlunginfo:" + Me.txtHandelsregisterNr._DateTimeOnly = False + Me.txtHandelsregisterNr._numbersOnly = False + Me.txtHandelsregisterNr._numbersOnlyKommastellen = "" + Me.txtHandelsregisterNr._numbersOnlyTrennzeichen = True + Me.txtHandelsregisterNr._Prozent = False + Me.txtHandelsregisterNr._ShortDateNew = False + Me.txtHandelsregisterNr._ShortDateOnly = False + Me.txtHandelsregisterNr._TimeOnly = False + Me.txtHandelsregisterNr._TimeOnly_Seconds = False + Me.txtHandelsregisterNr._value = "" + Me.txtHandelsregisterNr._Waehrung = False + Me.txtHandelsregisterNr._WaehrungZeichen = True + Me.txtHandelsregisterNr.ForeColor = System.Drawing.Color.Black + Me.txtHandelsregisterNr.Location = New System.Drawing.Point(111, 158) + Me.txtHandelsregisterNr.MaxLength = 17 + Me.txtHandelsregisterNr.MaxLineLength = -1 + Me.txtHandelsregisterNr.MaxLines_Warning = "" + Me.txtHandelsregisterNr.MaxLines_Warning_Label = Nothing + Me.txtHandelsregisterNr.Name = "txtHandelsregisterNr" + Me.txtHandelsregisterNr.Size = New System.Drawing.Size(333, 20) + Me.txtHandelsregisterNr.TabIndex = 133 + Me.txtHandelsregisterNr.Visible = False ' 'usrcntlKundeBearbeitenFull ' @@ -4666,6 +4706,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbSchnittstellen.ResumeLayout(False) Me.tbSchnittstellen.PerformLayout() CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).EndInit() + Me.tbZahlungsinfo.ResumeLayout(False) + Me.tbZahlungsinfo.PerformLayout() Me.GroupBox3.ResumeLayout(False) Me.GroupBox3.PerformLayout() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit() @@ -4677,8 +4719,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.TabPage11.ResumeLayout(False) Me.pnlNeukunde.ResumeLayout(False) Me.pnlNeukunde.PerformLayout() - Me.tbZahlungsinfo.ResumeLayout(False) - Me.tbZahlungsinfo.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -4889,7 +4929,7 @@ Partial Class usrcntlKundeBearbeitenFull Friend WithEvents txtVersUebergebenOPSaldo As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents tbAufschub As System.Windows.Forms.TabPage Friend WithEvents txtEORI As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents Label33 As System.Windows.Forms.Label + Friend WithEvents lblEORI As System.Windows.Forms.Label Friend WithEvents usrCntlAufschubkonten As SDL.usrCntlAufschubkonten Friend WithEvents Button1 As System.Windows.Forms.Button Friend WithEvents Label28 As System.Windows.Forms.Label @@ -4987,4 +5027,6 @@ Partial Class usrcntlKundeBearbeitenFull Friend WithEvents tbZahlungsinfo As TabPage Friend WithEvents Label102 As Label Friend WithEvents rtb_Zahlungsinfo As RichTextBox + Friend WithEvents txtHandelsregisterNr As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents lblHandelregisterNr As Label End Class diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index f08c7993..8de917fe 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -20,6 +20,7 @@ Public Class usrcntlKundeBearbeitenFull Public Event KD_SAVED(kdnr) Dim FUNC As New cProgramFunctions + Dim isVerag360 As Boolean = False ' Public BERECHTIGUNEN As List(Of cBerechtigungen) = Nothing Sub New() @@ -60,6 +61,8 @@ Public Class usrcntlKundeBearbeitenFull FISKAL = New cFiskal_Daten(kdnr) KUNDE_ERW = New VERAG_PROG_ALLGEMEIN.cKundenErweitert(kdnr) + If Not IsDBNull(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_firmaFMZoll) AndAlso CInt(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_firmaFMZoll) = 19 Then isVerag360 = True + cboFiliale.changeItem(loadValue(KUNDE.FilialenNr, "")) 'zuerst Filiale, dmait Kundennummernkreis später den Wert überschreiben kann! Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA @@ -67,65 +70,21 @@ Public Class usrcntlKundeBearbeitenFull cbxFiBuLG.Visible = True End Select + + + txtEORI.Visible = Not isVerag360 + txtEORINL.Visible = Not isVerag360 + lblEORI.Visible = Not isVerag360 + txtHandelsregisterNr.Visible = isVerag360 + lblHandelregisterNr.Visible = isVerag360 + + If ADRESSE.AdressenNr <= 0 Then KUNDE_ERW.kde_BesonderheitenNeu = 1 cboKundenkreis.Items.Clear() - If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Then - cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 500000-599999: EV - Kunden", "500000-599999")) - cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 700000-799999: ZOLL Abrechnung", "728000-799999")) - cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 5-stellig: Fiskal (keine Abrechnung)", "30000-49999")) - cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 800000-899999: BREXIT", "800000-899999")) - cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 900000-999999: Sonstige", "900000-999999")) - cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("1000000-1099999: IMEX", "1080000-1099990")) - Else - - Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA - Case "IMEX" - cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("1000000-1099999: IMEX", "1080000-1099990")) - cboKundenkreis.changeItem("1080000-1099990") - Case "UNISPED" - cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("2000000-2099999: UNISPED", "2000000-2099990")) - cboKundenkreis.changeItem("2000000-2099990") - Case "AMBAR" - cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("3000000-3099999: AMBAR", "3000000-3099990")) - cboKundenkreis.changeItem("3000000-3099990") - KUNDE.Zahlungsziel = 0 - ADRESSE.Rechnungsdruck = 2 - Case "ATILLA" - cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 100000-199999: ATILLA", "100000-199999")) - cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 900000-999999: Sonstige", "900000-999999")) - 'ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 700000-799999: ZOLL Abrechnung", "728000-799999")) - ' ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 900000-999999: Sonstige", "900000-999999")) - cboKundenkreis.changeItem("100000-199999") - - Case Else - If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ATILLA_VERWALTUNG", "AVISO") Then - cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 100000-199999: ATILLA", "100000-199999")) - End If - cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 500000-599999: EV - Kunden", "500000-599999")) - cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 700000-799999: ZOLL Abrechnung", "728000-799999")) - cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 5-stellig: Fiskal (keine Abrechnung)", "30000-49999")) - ' ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 800000-899999: XXXXXX", "800000-899999")) - cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 800000-899999: BREXIT", "800000-899999")) - cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 900000-999999: Sonstige", "900000-999999")) - - ' ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("1000000-1099999: IMEX", "1080000-1099990")) - cboKundenkreis.changeItem("728000-799999") - End Select - End If - - If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_AWOR", "SDL") Then - cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("4000000-4099999: AWOR", "4001000-4099999")) - End If - If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_UNISPED_BREXIT", "SDL") Then - cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("2800000-2899999: UNISPED BREXIT", "2800000-2899999")) - End If - If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "AMBAR" And VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_AMBAR", "SDL") Then - cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("3000000-3099999: AMBAR", "3000000-3099990")) - - End If + initKundennummernkreise() pnlNeukunde.Visible = True btnUIDPruef.Visible = False @@ -133,11 +92,11 @@ Public Class usrcntlKundeBearbeitenFull btnUIDPruef.Visible = True End If - If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" And Not isVerag360 Then If Not cboKundenkreis.hasItem("3000000-3099990") Then cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("3000000-3099999: AMBAR", "3000000-3099990")) End If - If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" And Not isVerag360 Then cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 9900000-9999999: FRONT-OFFICE - Kunden", "9900000-9999999")) End If @@ -152,7 +111,7 @@ Public Class usrcntlKundeBearbeitenFull 'USRCNTL_FISK.Dock = DockStyle.Fill 'tbFiskal.Controls.Add(USRCNTL_FISK) - checkEORI_Aufschub() + If Not isVerag360 Then checkEORI_Aufschub() ' ----- Adressdaten ----- lblKundennr.Text = If(ADRESSE.AdressenNr > 0, ADRESSE.AdressenNr, "-") @@ -414,6 +373,87 @@ Public Class usrcntlKundeBearbeitenFull Return retValue End Function + Sub initKundennummernkreise() + + If isVerag360 Then + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 100000-199999: TR - KUNDEN", "100000-199999")) + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 130000-139999: 360 TR - KUNDEN", "130000-139999")) + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 150000-159999: 360 RMC - KUNDEN", "150000-159999")) + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 140000-149999: 360 DURMAZ - KUNDEN", "140000-149999")) + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 160000-169999: AT - KUNDEN", "160000-169999")) + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 200000-299999: RO - KUNDEN", "200000-299999")) + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 300000-302999: BG - KUNDEN", "300000-302999")) + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 303000-303999: DE - KUNDEN", "303000-303999")) + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 400000-499999: YU - KUNDEN", "400000-499999")) + + + Else + + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_VERAGIMEX", "SDL") Then + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 500000-599999: EV - Kunden", "500000-599999")) + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 700000-799999: ZOLL Abrechnung", "728000-799999")) + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 5-stellig: Fiskal (keine Abrechnung)", "30000-49999")) + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 800000-899999: BREXIT", "800000-899999")) + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 900000-999999: Sonstige", "900000-999999")) + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("1000000-1099999: IMEX", "1080000-1099990")) + + Else + + Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Case "IMEX" + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("1000000-1099999: IMEX", "1080000-1099990")) + cboKundenkreis.changeItem("1080000-1099990") + Case "UNISPED" + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("2000000-2099999: UNISPED", "2000000-2099990")) + cboKundenkreis.changeItem("2000000-2099990") + Case "AMBAR" + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("3000000-3099999: AMBAR", "3000000-3099990")) + cboKundenkreis.changeItem("3000000-3099990") + KUNDE.Zahlungsziel = 0 + ADRESSE.Rechnungsdruck = 2 + Case "ATILLA" + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 100000-199999: ATILLA", "100000-199999")) + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 900000-999999: Sonstige", "900000-999999")) + 'ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 700000-799999: ZOLL Abrechnung", "728000-799999")) + ' ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 900000-999999: Sonstige", "900000-999999")) + cboKundenkreis.changeItem("100000-199999") + + Case Else + + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ATILLA_VERWALTUNG", "AVISO") Then + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 100000-199999: ATILLA", "100000-199999")) + End If + + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 500000-599999: EV - Kunden", "500000-599999")) + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 700000-799999: ZOLL Abrechnung", "728000-799999")) + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 5-stellig: Fiskal (keine Abrechnung)", "30000-49999")) + ' ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 800000-899999: XXXXXX", "800000-899999")) + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 800000-899999: BREXIT", "800000-899999")) + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(" 900000-999999: Sonstige", "900000-999999")) + + ' ComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("1000000-1099999: IMEX", "1080000-1099990")) + cboKundenkreis.changeItem("728000-799999") + + + + End Select + End If + + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_AWOR", "SDL") Then + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("4000000-4099999: AWOR", "4001000-4099999")) + End If + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_UNISPED_BREXIT", "SDL") Then + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("2800000-2899999: UNISPED BREXIT", "2800000-2899999")) + End If + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "AMBAR" And VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_FREMD_AMBAR", "SDL") Then + cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("3000000-3099999: AMBAR", "3000000-3099990")) + + End If + + End If + + End Sub + Function loadDataInKdAd() As Boolean If ADRESSE.AdressenNr <= 0 Then @@ -1263,23 +1303,44 @@ Public Class usrcntlKundeBearbeitenFull Case "500000-599999" : cbxFiBu.Checked = True : cboFirma.changeItem("1") : cboFiliale.changeItem("4803") Case "900000-999999" : cbxFiBu.Checked = False : cboFirma.changeItem("1") : cboFiliale.changeItem("4803") Case "800000-899999" : cbxFiBu.Checked = False : cboFirma.changeItem("1") : cboFiliale.changeItem("4803") - Case "100000-199999" : cbxFiBu.Checked = False : cboFirma.changeItem("1") : cboFiliale.changeItem("4803") Case "9900000-9999999" : cbxFiBu.Checked = False : cboFirma.changeItem("17") : cboFiliale.changeItem("5801") + '--------------------- VERAG360---------------------------- + + Case "400000-499999" : cbxFiBu.Checked = False : cboFirma.changeItem("19") : cboFiliale.changeItem("8001") + Case "200000-299999" : cbxFiBu.Checked = False : cboFirma.changeItem("19") : cboFiliale.changeItem("8001") + Case "160000-169999" : cbxFiBu.Checked = False : cboFirma.changeItem("19") : cboFiliale.changeItem("8001") + Case "303000-303999" : cbxFiBu.Checked = False : cboFirma.changeItem("19") : cboFiliale.changeItem("8001") + Case "130000-139999" : cbxFiBu.Checked = False : cboFirma.changeItem("19") : cboFiliale.changeItem("8001") + Case "150000-159999" : cbxFiBu.Checked = False : cboFirma.changeItem("19") : cboFiliale.changeItem("8001") + Case "140000-149999" : cbxFiBu.Checked = False : cboFirma.changeItem("19") : cboFiliale.changeItem("8001") + + + Case "100000-199999" + + If isVerag360 Then + cbxFiBu.Checked = False : cboFirma.changeItem("19") : cboFiliale.changeItem("8001") + Else + cbxFiBu.Checked = False : cboFirma.changeItem("1") : cboFiliale.changeItem("4803") + End If + End Select End If - Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA - Case "VERAG" - If cboKundenkreis._value = "100000-199999" Then - cboFiliale.changeItem("4801") - ElseIf cboKundenkreis._value = "1000000-1099999" Then - cboFiliale.changeItem("5501") - Else - If cboFiliale._value = "4801" Then cboFiliale.changeItem("4803") - End If + If Not isVerag360 Then + Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Case "VERAG" + If cboKundenkreis._value = "100000-199999" Then + cboFiliale.changeItem("4801") + ElseIf cboKundenkreis._value = "1000000-1099999" Then + cboFiliale.changeItem("5501") + Else + If cboFiliale._value = "4801" Then cboFiliale.changeItem("4803") + End If + + End Select + End If - End Select End Sub Dim selCheck = True diff --git a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb index 2bb571cb..0bf60972 100644 --- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb +++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb @@ -1311,7 +1311,7 @@ Public Class cFormularManager Exit Sub End If - If Not printerPaperSizeA4 Then + If False Then 'Not printerPaperSizeA4 MsgBox("Der ermittelte Drucker " & printerName & " unterstützt keinen A4 Ausdrucke!" & vbNewLine & "Vorang wird abgebrochen!") Exit Sub End If