From 67071f84e9ff3956d46bf096bfca0136ff4639d5 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Thu, 29 Dec 2022 07:54:17 +0100 Subject: [PATCH] "VerzolltBei" Fremdspedition Export --- .../usrCntlKundenuebersicht.Designer.vb | 117 ++++++++++++------ SDL/kunden/usrCntlKundenuebersicht.vb | 10 +- .../usrcntlKundeBearbeitenFull.Designer.vb | 59 ++++++++- SDL/kunden/usrcntlKundeBearbeitenFull.vb | 14 +++ .../Classes/cKundenErweitert.vb | 4 + 5 files changed, 162 insertions(+), 42 deletions(-) diff --git a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb index 90cbc390..232b3de4 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb @@ -22,6 +22,7 @@ Partial Class usrCntlKundenuebersicht 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() @@ -35,7 +36,7 @@ Partial Class usrCntlKundenuebersicht Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Me.cntxtAddVM = New System.Windows.Forms.ContextMenuStrip() + Me.cntxtAddVM = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.btnExcel = New System.Windows.Forms.Button() Me.lblInaktiv = New System.Windows.Forms.Label() @@ -79,6 +80,7 @@ Partial Class usrCntlKundenuebersicht Me.Label15 = New System.Windows.Forms.Label() Me.lblAviso = New System.Windows.Forms.TextBox() Me.Label2 = New System.Windows.Forms.Label() + Me.UsrCntlKundenBesonderheiten1 = New SDL.usrCntlKundenBesonderheiten() Me.lblAbfertigungsverbot = New System.Windows.Forms.Label() Me.Label45 = New System.Windows.Forms.Label() Me.txtSammelrechnung = New System.Windows.Forms.TextBox() @@ -97,7 +99,7 @@ Partial Class usrCntlKundenuebersicht Me.Label33 = New System.Windows.Forms.Label() Me.txtUmsatzJahr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label29 = New System.Windows.Forms.Label() - Me.cbxFiskalabfertigung = New VERAG_PROG_ALLGEMEIN.MyCheckbox() + Me.cbxFiskalabfertigung = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components) Me.lblFisk = New System.Windows.Forms.Label() Me.txtAbf_ErsteAbfertigung = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label41 = New System.Windows.Forms.Label() @@ -146,6 +148,7 @@ Partial Class usrCntlKundenuebersicht Me.PictureBox3 = New System.Windows.Forms.PictureBox() Me.PictureBox5 = New System.Windows.Forms.PictureBox() Me.tbKontaktSpez = New System.Windows.Forms.TabPage() + Me.ucKundenKontakte = New SDL.usrCntlKundenKontakte() Me.Label38 = New System.Windows.Forms.Label() Me.txtDebitorennr = New System.Windows.Forms.TextBox() Me.lblFwlFiskal = New System.Windows.Forms.LinkLabel() @@ -191,6 +194,7 @@ Partial Class usrCntlKundenuebersicht Me.Button8 = New System.Windows.Forms.Button() Me.Button9 = New System.Windows.Forms.Button() Me.tbAvisoMail = New System.Windows.Forms.TabPage() + Me.UsrCntlKundenAvisoMailBenachrichtigung1 = New SDL.usrCntlKundenAvisoMailBenachrichtigung() Me.tbKdSpez = New System.Windows.Forms.TabPage() Me.Label14 = New System.Windows.Forms.Label() Me.Label43 = New System.Windows.Forms.Label() @@ -215,25 +219,25 @@ Partial Class usrCntlKundenuebersicht Me.lblUid = New System.Windows.Forms.TextBox() Me.lblEORI = New System.Windows.Forms.TextBox() Me.lblEORINr = New System.Windows.Forms.Label() - Me.dgvAufschub = New VERAG_PROG_ALLGEMEIN.MyDatagridview() + Me.dgvAufschub = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.KtoId = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.Art = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.HZA = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.KontoNr = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.EORI = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.NL = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip() + Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.KopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip() + Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() Me.ÄndernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.HochladenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ScannenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.PDFLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip() + Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem() Me.lblFirma = New System.Windows.Forms.Label() - Me.ContextMenuStrip4 = New System.Windows.Forms.ContextMenuStrip() + Me.ContextMenuStrip4 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem4 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem5 = New System.Windows.Forms.ToolStripMenuItem() @@ -242,9 +246,9 @@ Partial Class usrCntlKundenuebersicht Me.GültigungültigToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.btnReloadOP = New System.Windows.Forms.Button() Me.cboFirmaFMZOLL = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.UsrCntlKundenBesonderheiten1 = New SDL.usrCntlKundenBesonderheiten() - Me.ucKundenKontakte = New SDL.usrCntlKundenKontakte() - Me.UsrCntlKundenAvisoMailBenachrichtigung1 = New SDL.usrCntlKundenAvisoMailBenachrichtigung() + Me.txtVerzolltBeiExport = New System.Windows.Forms.TextBox() + Me.Label3 = New System.Windows.Forms.Label() + Me.Panel9 = New System.Windows.Forms.Panel() Me.cntxtAddVM.SuspendLayout() Me.tbWeitereKundenDetails.SuspendLayout() Me.tbOfferten.SuspendLayout() @@ -293,6 +297,7 @@ Partial Class usrCntlKundenuebersicht Me.ContextMenuStrip3.SuspendLayout() Me.ContextMenuStrip2.SuspendLayout() Me.ContextMenuStrip4.SuspendLayout() + Me.Panel9.SuspendLayout() Me.SuspendLayout() ' 'cntxtAddVM @@ -800,13 +805,13 @@ Partial Class usrCntlKundenuebersicht Me.grpAbfertigung.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.grpAbfertigung.BackColor = System.Drawing.Color.White + Me.grpAbfertigung.Controls.Add(Me.Panel9) Me.grpAbfertigung.Controls.Add(Me.rtbInfo) Me.grpAbfertigung.Controls.Add(Me.txtNeutralisierung) Me.grpAbfertigung.Controls.Add(Me.lblNeutralisierung) Me.grpAbfertigung.Controls.Add(Me.lklGanzerText) Me.grpAbfertigung.Controls.Add(Me.lblNoGespr) Me.grpAbfertigung.Controls.Add(Me.txtVorauskasse) - Me.grpAbfertigung.Controls.Add(Me.Label15) Me.grpAbfertigung.Controls.Add(Me.lblAviso) Me.grpAbfertigung.Controls.Add(Me.Label2) Me.grpAbfertigung.Controls.Add(Me.UsrCntlKundenBesonderheiten1) @@ -833,7 +838,6 @@ Partial Class usrCntlKundenuebersicht Me.grpAbfertigung.Controls.Add(Me.Panel5) Me.grpAbfertigung.Controls.Add(Me.Panel7) Me.grpAbfertigung.Controls.Add(Me.lblVorkasse) - Me.grpAbfertigung.Controls.Add(Me.txtVerzolltBei) Me.grpAbfertigung.Cursor = System.Windows.Forms.Cursors.Default Me.grpAbfertigung.Location = New System.Drawing.Point(509, 3) Me.grpAbfertigung.Name = "grpAbfertigung" @@ -916,7 +920,7 @@ Partial Class usrCntlKundenuebersicht 'Label15 ' Me.Label15.AutoSize = True - Me.Label15.Location = New System.Drawing.Point(11, 237) + Me.Label15.Location = New System.Drawing.Point(3, 4) Me.Label15.Name = "Label15" Me.Label15.Size = New System.Drawing.Size(61, 13) Me.Label15.TabIndex = 15 @@ -945,6 +949,16 @@ Partial Class usrCntlKundenuebersicht Me.Label2.Text = "Aviso:" Me.Label2.Visible = False ' + 'UsrCntlKundenBesonderheiten1 + ' + Me.UsrCntlKundenBesonderheiten1.BackColor = System.Drawing.Color.White + Me.UsrCntlKundenBesonderheiten1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.UsrCntlKundenBesonderheiten1.Location = New System.Drawing.Point(7, 32) + Me.UsrCntlKundenBesonderheiten1.Name = "UsrCntlKundenBesonderheiten1" + Me.UsrCntlKundenBesonderheiten1.Size = New System.Drawing.Size(107, 52) + Me.UsrCntlKundenBesonderheiten1.TabIndex = 6 + Me.UsrCntlKundenBesonderheiten1.Visible = False + ' 'lblAbfertigungsverbot ' Me.lblAbfertigungsverbot.BackColor = System.Drawing.Color.Red @@ -1781,14 +1795,14 @@ Partial Class usrCntlKundenuebersicht ' 'txtVerzolltBei ' - Me.txtVerzolltBei.BackColor = System.Drawing.Color.White + Me.txtVerzolltBei.BackColor = System.Drawing.Color.WhiteSmoke Me.txtVerzolltBei.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtVerzolltBei.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtVerzolltBei.ForeColor = System.Drawing.Color.Black - Me.txtVerzolltBei.Location = New System.Drawing.Point(78, 237) + Me.txtVerzolltBei.Location = New System.Drawing.Point(70, 4) Me.txtVerzolltBei.Name = "txtVerzolltBei" Me.txtVerzolltBei.ReadOnly = True - Me.txtVerzolltBei.Size = New System.Drawing.Size(295, 13) + Me.txtVerzolltBei.Size = New System.Drawing.Size(128, 13) Me.txtVerzolltBei.TabIndex = 16 ' 'grpAdresse @@ -2021,6 +2035,14 @@ Partial Class usrCntlKundenuebersicht Me.tbKontaktSpez.Text = "Spezifisch" Me.tbKontaktSpez.UseVisualStyleBackColor = True ' + 'ucKundenKontakte + ' + Me.ucKundenKontakte.Dock = System.Windows.Forms.DockStyle.Fill + Me.ucKundenKontakte.Location = New System.Drawing.Point(3, 3) + Me.ucKundenKontakte.Name = "ucKundenKontakte" + Me.ucKundenKontakte.Size = New System.Drawing.Size(473, 158) + Me.ucKundenKontakte.TabIndex = 0 + ' 'Label38 ' Me.Label38.AutoSize = True @@ -2647,6 +2669,15 @@ Partial Class usrCntlKundenuebersicht Me.tbAvisoMail.Text = "Aviso E-Mails" Me.tbAvisoMail.UseVisualStyleBackColor = True ' + 'UsrCntlKundenAvisoMailBenachrichtigung1 + ' + Me.UsrCntlKundenAvisoMailBenachrichtigung1.BackColor = System.Drawing.Color.White + Me.UsrCntlKundenAvisoMailBenachrichtigung1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlKundenAvisoMailBenachrichtigung1.Location = New System.Drawing.Point(3, 3) + Me.UsrCntlKundenAvisoMailBenachrichtigung1.Name = "UsrCntlKundenAvisoMailBenachrichtigung1" + Me.UsrCntlKundenAvisoMailBenachrichtigung1.Size = New System.Drawing.Size(473, 158) + Me.UsrCntlKundenAvisoMailBenachrichtigung1.TabIndex = 0 + ' 'tbKdSpez ' Me.tbKdSpez.Controls.Add(Me.Label14) @@ -3178,32 +3209,39 @@ Partial Class usrCntlKundenuebersicht Me.cboFirmaFMZOLL.TabIndex = 10 Me.cboFirmaFMZOLL.Visible = False ' - 'UsrCntlKundenBesonderheiten1 + 'txtVerzolltBeiExport ' - Me.UsrCntlKundenBesonderheiten1.BackColor = System.Drawing.Color.White - Me.UsrCntlKundenBesonderheiten1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.UsrCntlKundenBesonderheiten1.Location = New System.Drawing.Point(7, 32) - Me.UsrCntlKundenBesonderheiten1.Name = "UsrCntlKundenBesonderheiten1" - Me.UsrCntlKundenBesonderheiten1.Size = New System.Drawing.Size(107, 52) - Me.UsrCntlKundenBesonderheiten1.TabIndex = 6 - Me.UsrCntlKundenBesonderheiten1.Visible = False + Me.txtVerzolltBeiExport.BackColor = System.Drawing.Color.WhiteSmoke + Me.txtVerzolltBeiExport.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtVerzolltBeiExport.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtVerzolltBeiExport.ForeColor = System.Drawing.Color.Black + Me.txtVerzolltBeiExport.Location = New System.Drawing.Point(243, 4) + Me.txtVerzolltBeiExport.Name = "txtVerzolltBeiExport" + Me.txtVerzolltBeiExport.ReadOnly = True + Me.txtVerzolltBeiExport.Size = New System.Drawing.Size(106, 13) + Me.txtVerzolltBeiExport.TabIndex = 44 ' - 'ucKundenKontakte + 'Label3 ' - Me.ucKundenKontakte.Dock = System.Windows.Forms.DockStyle.Fill - Me.ucKundenKontakte.Location = New System.Drawing.Point(3, 3) - Me.ucKundenKontakte.Name = "ucKundenKontakte" - Me.ucKundenKontakte.Size = New System.Drawing.Size(473, 158) - Me.ucKundenKontakte.TabIndex = 0 + Me.Label3.AutoSize = True + Me.Label3.Location = New System.Drawing.Point(197, 4) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(40, 13) + Me.Label3.TabIndex = 45 + Me.Label3.Text = "Export:" ' - 'UsrCntlKundenAvisoMailBenachrichtigung1 + 'Panel9 ' - Me.UsrCntlKundenAvisoMailBenachrichtigung1.BackColor = System.Drawing.Color.White - Me.UsrCntlKundenAvisoMailBenachrichtigung1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlKundenAvisoMailBenachrichtigung1.Location = New System.Drawing.Point(3, 3) - Me.UsrCntlKundenAvisoMailBenachrichtigung1.Name = "UsrCntlKundenAvisoMailBenachrichtigung1" - Me.UsrCntlKundenAvisoMailBenachrichtigung1.Size = New System.Drawing.Size(473, 158) - Me.UsrCntlKundenAvisoMailBenachrichtigung1.TabIndex = 0 + Me.Panel9.BackColor = System.Drawing.Color.WhiteSmoke + Me.Panel9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Panel9.Controls.Add(Me.Label3) + Me.Panel9.Controls.Add(Me.Label15) + Me.Panel9.Controls.Add(Me.txtVerzolltBeiExport) + Me.Panel9.Controls.Add(Me.txtVerzolltBei) + Me.Panel9.Location = New System.Drawing.Point(7, 231) + Me.Panel9.Name = "Panel9" + Me.Panel9.Size = New System.Drawing.Size(356, 24) + Me.Panel9.TabIndex = 46 ' 'usrCntlKundenuebersicht ' @@ -3288,6 +3326,8 @@ Partial Class usrCntlKundenuebersicht Me.ContextMenuStrip3.ResumeLayout(False) Me.ContextMenuStrip2.ResumeLayout(False) Me.ContextMenuStrip4.ResumeLayout(False) + Me.Panel9.ResumeLayout(False) + Me.Panel9.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -3503,4 +3543,7 @@ Partial Class usrCntlKundenuebersicht Friend WithEvents Panel7 As Panel Friend WithEvents btnVMhinzufuegen As Button Friend WithEvents Panel8 As Panel + Friend WithEvents Panel9 As Panel + Friend WithEvents Label3 As Label + Friend WithEvents txtVerzolltBeiExport As TextBox End Class diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index 4d46f1e1..33ecc365 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -522,7 +522,15 @@ Public Class usrCntlKundenuebersicht txtVerzolltBei.BackColor = Color.Yellow Else txtVerzolltBei.Text = "" - txtVerzolltBei.BackColor = Color.White + txtVerzolltBei.BackColor = Color.WhiteSmoke + End If + + If KUNDE_ERW.kde_KundeFremdspeditionExport Then + txtVerzolltBeiExport.Text = If(KUNDE_ERW.kde_verzolltBeiExport, "FREMD") + txtVerzolltBeiExport.BackColor = Color.Yellow + Else + txtVerzolltBeiExport.Text = "" + txtVerzolltBeiExport.BackColor = Color.WhiteSmoke End If diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb index ed0aa612..db2bedcf 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb @@ -317,6 +317,10 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboAuswahl = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.txtERROR = New System.Windows.Forms.TextBox() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.cboFremdspeditionExport = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cbxVerzolltBeiExport = New System.Windows.Forms.CheckBox() + Me.Panel1 = New System.Windows.Forms.Panel() + Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel() Me.tbcntrDetails.SuspendLayout() Me.tbAbfertigung.SuspendLayout() Me.tbcntrAbf.SuspendLayout() @@ -370,6 +374,10 @@ Partial Class usrcntlKundeBearbeitenFull ' 'tbAbfertigung ' + Me.tbAbfertigung.Controls.Add(Me.cbxVerzolltBeiExport) + Me.tbAbfertigung.Controls.Add(Me.txtAbf_Planzahl) + Me.tbAbfertigung.Controls.Add(Me.Label42) + Me.tbAbfertigung.Controls.Add(Me.cboFremdspeditionExport) Me.tbAbfertigung.Controls.Add(Me.lblHinweisKdNr) Me.tbAbfertigung.Controls.Add(Me.cboFremdspedition) Me.tbAbfertigung.Controls.Add(Me.cbxVerzolltBei) @@ -377,8 +385,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbAbfertigung.Controls.Add(Me.UsrCntlKundenBesonderheiten1) Me.tbAbfertigung.Controls.Add(Me.tbcntrAbf) Me.tbAbfertigung.Controls.Add(Me.cbxAbf_Ausfuhr) - Me.tbAbfertigung.Controls.Add(Me.txtAbf_Planzahl) - Me.tbAbfertigung.Controls.Add(Me.Label42) Me.tbAbfertigung.Controls.Add(Me.txtAbf_Euroeinführung) Me.tbAbfertigung.Controls.Add(Me.txtAbf_ErsteAbfertigung) Me.tbAbfertigung.Controls.Add(Me.cbxAbf_Fiskal) @@ -388,6 +394,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbAbfertigung.Controls.Add(Me.Label41) Me.tbAbfertigung.Controls.Add(Me.Label37) Me.tbAbfertigung.Controls.Add(Me.rtbAbf_Besonderheiten) + Me.tbAbfertigung.Controls.Add(Me.Panel1) Me.tbAbfertigung.Location = New System.Drawing.Point(4, 22) Me.tbAbfertigung.Name = "tbAbfertigung" Me.tbAbfertigung.Padding = New System.Windows.Forms.Padding(3) @@ -466,6 +473,7 @@ Partial Class usrcntlKundeBearbeitenFull ' 'TabPage4 ' + Me.TabPage4.Controls.Add(Me.FlowLayoutPanel1) Me.TabPage4.Controls.Add(Me.UsrCntlKundenAvisoMailBenachrichtigung1) Me.TabPage4.Controls.Add(Me.rtbLKWFreigabeSenden) Me.TabPage4.Controls.Add(Me.Label18) @@ -756,7 +764,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtAbf_Planzahl._Waehrung = False Me.txtAbf_Planzahl._WaehrungZeichen = True Me.txtAbf_Planzahl.ForeColor = System.Drawing.Color.Black - Me.txtAbf_Planzahl.Location = New System.Drawing.Point(526, 225) + Me.txtAbf_Planzahl.Location = New System.Drawing.Point(526, 248) Me.txtAbf_Planzahl.MaxLineLength = -1 Me.txtAbf_Planzahl.MaxLines_Warning = "" Me.txtAbf_Planzahl.MaxLines_Warning_Label = Nothing @@ -768,7 +776,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.Label42.AutoSize = True Me.Label42.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label42.Location = New System.Drawing.Point(470, 228) + Me.Label42.Location = New System.Drawing.Point(470, 251) Me.Label42.Name = "Label42" Me.Label42.Size = New System.Drawing.Size(50, 13) Me.Label42.TabIndex = 14 @@ -4306,6 +4314,45 @@ Partial Class usrcntlKundeBearbeitenFull Me.DataGridViewTextBoxColumn2.HeaderText = "E-Mail" Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" ' + 'cboFremdspeditionExport + ' + Me.cboFremdspeditionExport._allowedValuesFreiText = Nothing + Me.cboFremdspeditionExport._allowFreiText = False + Me.cboFremdspeditionExport._value = "" + Me.cboFremdspeditionExport.Enabled = False + Me.cboFremdspeditionExport.FormattingEnabled = True + Me.cboFremdspeditionExport.Items.AddRange(New Object() {"SEBERT", "SCHENKER", "AS-SPED", "NIETEN", "BUCHAUER"}) + Me.cboFremdspeditionExport.Location = New System.Drawing.Point(526, 222) + Me.cboFremdspeditionExport.Name = "cboFremdspeditionExport" + Me.cboFremdspeditionExport.Size = New System.Drawing.Size(126, 21) + Me.cboFremdspeditionExport.TabIndex = 240 + Me.cboFremdspeditionExport.Text = "SEBERT" + ' + 'cbxVerzolltBeiExport + ' + Me.cbxVerzolltBeiExport.AutoSize = True + Me.cbxVerzolltBeiExport.Location = New System.Drawing.Point(465, 224) + Me.cbxVerzolltBeiExport.Name = "cbxVerzolltBeiExport" + Me.cbxVerzolltBeiExport.Size = New System.Drawing.Size(59, 17) + Me.cbxVerzolltBeiExport.TabIndex = 241 + Me.cbxVerzolltBeiExport.Text = "Export:" + Me.cbxVerzolltBeiExport.UseVisualStyleBackColor = True + ' + 'Panel1 + ' + Me.Panel1.BackColor = System.Drawing.Color.WhiteSmoke + Me.Panel1.Location = New System.Drawing.Point(167, 219) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(499, 26) + Me.Panel1.TabIndex = 242 + ' + 'FlowLayoutPanel1 + ' + Me.FlowLayoutPanel1.Location = New System.Drawing.Point(249, 94) + Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1" + Me.FlowLayoutPanel1.Size = New System.Drawing.Size(200, 100) + Me.FlowLayoutPanel1.TabIndex = 7 + ' 'usrcntlKundeBearbeitenFull ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -4677,4 +4724,8 @@ Partial Class usrcntlKundeBearbeitenFull Friend WithEvents CheckBox1 As CheckBox Friend WithEvents btnUIDPruef As Button Friend WithEvents Button13 As Button + Friend WithEvents cbxVerzolltBeiExport As CheckBox + Friend WithEvents cboFremdspeditionExport As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents FlowLayoutPanel1 As FlowLayoutPanel + Friend WithEvents Panel1 As Panel End Class diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index f1042813..3ada9bd2 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -367,6 +367,8 @@ Public Class usrcntlKundeBearbeitenFull cbxVerzolltBei.Checked = KUNDE_ERW.kde_KundeFremdspedition cboFremdspedition.Text = If(KUNDE_ERW.kde_verzolltBei, "") + cbxVerzolltBeiExport.Checked = KUNDE_ERW.kde_KundeFremdspeditionExport + cboFremdspeditionExport.Text = If(KUNDE_ERW.kde_verzolltBeiExport, "") initBesonderheitenNEU() @@ -585,6 +587,14 @@ Public Class usrcntlKundeBearbeitenFull KUNDE_ERW.kde_verzolltBei = Nothing End If + ' ----- Fremdsped ----- + KUNDE_ERW.kde_KundeFremdspeditionExport = cbxVerzolltBeiExport.Checked + If KUNDE_ERW.kde_KundeFremdspeditionExport Then + KUNDE_ERW.kde_verzolltBeiExport = cboFremdspeditionExport.Text + Else + KUNDE_ERW.kde_verzolltBeiExport = Nothing + End If + ' ----- Abfertigungsverbot ----- KUNDE.Abfertigungsverbot = cboAbfVerb_Abfertigungsverbot.Checked @@ -1303,6 +1313,10 @@ Public Class usrcntlKundeBearbeitenFull cboFremdspedition.Enabled = cbxVerzolltBei.Checked End Sub + Private Sub cbxVerzolltBeiExport_CheckedChanged(sender As Object, e As EventArgs) Handles cbxVerzolltBeiExport.CheckedChanged + cboFremdspeditionExport.Enabled = cbxVerzolltBeiExport.Checked + End Sub + Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click Dim WunschKdnr = InputBox("Bitte geben Sie die gewünschte Kundennummer ein:") diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb index 6f5c38cc..fdb4f190 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb @@ -63,6 +63,8 @@ Public Class cKundenErweitert Property kde_InfoAuftragsNr As Object = Nothing Property kde_KundeFremdspedition As Boolean = False Property kde_verzolltBei As Object = Nothing + Property kde_KundeFremdspeditionExport As Boolean = False + Property kde_verzolltBeiExport As Object = Nothing Property kde_API_Tradeshift As Boolean = False Property kde_FakturierungSR_Details As Boolean = False Property kde_Fakturierung_Sprache As Object = Nothing @@ -129,6 +131,8 @@ Public Class cKundenErweitert list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_InfoAuftragsNr", kde_InfoAuftragsNr)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_KundeFremdspedition", kde_KundeFremdspedition)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_verzolltBei", kde_verzolltBei)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_KundeFremdspeditionExport", kde_KundeFremdspeditionExport)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_verzolltBeiExport", kde_verzolltBeiExport)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_API_Tradeshift", kde_API_Tradeshift)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_FakturierungSR_Details", kde_FakturierungSR_Details)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_Fakturierung_Sprache", kde_Fakturierung_Sprache))