diff --git a/SDL/Formulare/KDFormulare/frmFormulare.Designer.vb b/SDL/Formulare/KDFormulare/frmFormulare.Designer.vb index 7c382b9b..065025c1 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.Designer.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.Designer.vb @@ -206,7 +206,7 @@ Partial Class frmFormulare Me.pnlBody.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlBody.Location = New System.Drawing.Point(0, 166) Me.pnlBody.Name = "pnlBody" - Me.pnlBody.Size = New System.Drawing.Size(1326, 570) + Me.pnlBody.Size = New System.Drawing.Size(1326, 615) Me.pnlBody.TabIndex = 1 ' 'MyFlowLayoutPanel1 @@ -219,7 +219,7 @@ Partial Class frmFormulare Me.MyFlowLayoutPanel1.Location = New System.Drawing.Point(0, 0) Me.MyFlowLayoutPanel1.MinimumSize = New System.Drawing.Size(1000, 100) Me.MyFlowLayoutPanel1.Name = "MyFlowLayoutPanel1" - Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(1324, 568) + Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(1324, 613) Me.MyFlowLayoutPanel1.TabIndex = 0 ' 'pnlBottom @@ -238,7 +238,7 @@ Partial Class frmFormulare Me.pnlBottom.Controls.Add(Me.Button2) Me.pnlBottom.Controls.Add(Me.btn) Me.pnlBottom.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlBottom.Location = New System.Drawing.Point(0, 736) + Me.pnlBottom.Location = New System.Drawing.Point(0, 781) Me.pnlBottom.Name = "pnlBottom" Me.pnlBottom.Size = New System.Drawing.Size(1326, 61) Me.pnlBottom.TabIndex = 2 @@ -408,7 +408,7 @@ Partial Class frmFormulare ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1326, 797) + Me.ClientSize = New System.Drawing.Size(1326, 842) Me.Controls.Add(Me.pnlBody) Me.Controls.Add(Me.pnlBottom) Me.Controls.Add(Me.pnl) diff --git a/SDL/frmdynMailvorlage.Designer.vb b/SDL/frmdynMailvorlage.Designer.vb index 72bf9408..1dc40de2 100644 --- a/SDL/frmdynMailvorlage.Designer.vb +++ b/SDL/frmdynMailvorlage.Designer.vb @@ -76,9 +76,6 @@ Partial Class frmdynMailvorlagen ' 'mainPanel ' - Me.mainPanel.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.mainPanel.Controls.Add(Me.TextBox2) Me.mainPanel.Controls.Add(Me.cbxTyp) Me.mainPanel.Controls.Add(Me.Label13) @@ -109,9 +106,10 @@ Partial Class frmdynMailvorlagen Me.mainPanel.Controls.Add(Me.btnSave) Me.mainPanel.Controls.Add(Me.cbxAktiv) Me.mainPanel.Controls.Add(Me.Label1) - Me.mainPanel.Location = New System.Drawing.Point(0, 425) + Me.mainPanel.Dock = System.Windows.Forms.DockStyle.Bottom + Me.mainPanel.Location = New System.Drawing.Point(0, 429) Me.mainPanel.Name = "mainPanel" - Me.mainPanel.Size = New System.Drawing.Size(1283, 457) + Me.mainPanel.Size = New System.Drawing.Size(1295, 457) Me.mainPanel.TabIndex = 101 ' 'TextBox2 @@ -262,7 +260,7 @@ Partial Class frmdynMailvorlagen Me.btn.BackgroundImage = Global.SDL.My.Resources.Resources.email_big Me.btn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btn.Location = New System.Drawing.Point(1100, 405) + Me.btn.Location = New System.Drawing.Point(1112, 405) Me.btn.Margin = New System.Windows.Forms.Padding(5) Me.btn.Name = "btn" Me.btn.Padding = New System.Windows.Forms.Padding(5) @@ -413,6 +411,7 @@ Partial Class frmdynMailvorlagen ' 'btnAdd ' + Me.btnAdd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnAdd.BackgroundImage = Global.SDL.My.Resources.Resources.plus Me.btnAdd.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.btnAdd.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -424,6 +423,7 @@ Partial Class frmdynMailvorlagen ' 'btnDelete ' + Me.btnDelete.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnDelete.BackgroundImage = Global.SDL.My.Resources.Resources.del Me.btnDelete.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.btnDelete.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -558,6 +558,9 @@ Partial Class frmdynMailvorlagen Me.dgvMailvorlagen.AKTUALISIERUNGS_INTERVALL = -1 Me.dgvMailvorlagen.AllowUserToAddRows = False Me.dgvMailvorlagen.AllowUserToDeleteRows = False + Me.dgvMailvorlagen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.dgvMailvorlagen.BackgroundColor = System.Drawing.Color.White Me.dgvMailvorlagen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvMailvorlagen.Location = New System.Drawing.Point(0, 54) @@ -569,12 +572,12 @@ Partial Class frmdynMailvorlagen ' Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KopierenToolStripMenuItem}) Me.ContextMenuStrip1.Name = "ContextMenuStrip1" - Me.ContextMenuStrip1.Size = New System.Drawing.Size(181, 48) + Me.ContextMenuStrip1.Size = New System.Drawing.Size(122, 26) ' 'KopierenToolStripMenuItem ' Me.KopierenToolStripMenuItem.Name = "KopierenToolStripMenuItem" - Me.KopierenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.KopierenToolStripMenuItem.Size = New System.Drawing.Size(121, 22) Me.KopierenToolStripMenuItem.Text = "Kopieren" ' 'frmdynMailvorlagen diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb index 4f624358..4b87a510 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb @@ -4143,7 +4143,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.Kunden.Location = New System.Drawing.Point(4, 22) Me.Kunden.Name = "Kunden" Me.Kunden.Padding = New System.Windows.Forms.Padding(3) - Me.Kunden.Size = New System.Drawing.Size(651, 175) + Me.Kunden.Size = New System.Drawing.Size(651, 164) Me.Kunden.TabIndex = 1 Me.Kunden.Text = "Kundenpreise" Me.Kunden.UseVisualStyleBackColor = True @@ -4176,7 +4176,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvIDS_Rabatte.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvIDS_Rabatte.Location = New System.Drawing.Point(3, 3) Me.dgvIDS_Rabatte.Name = "dgvIDS_Rabatte" - Me.dgvIDS_Rabatte.Size = New System.Drawing.Size(645, 169) + Me.dgvIDS_Rabatte.Size = New System.Drawing.Size(645, 158) Me.dgvIDS_Rabatte.TabIndex = 34 ' 'TabPage2 @@ -4188,7 +4188,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.TabPage2.Location = New System.Drawing.Point(4, 22) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(651, 175) + Me.TabPage2.Size = New System.Drawing.Size(651, 164) Me.TabPage2.TabIndex = 2 Me.TabPage2.Text = "ATEZ KundenNr" Me.TabPage2.UseVisualStyleBackColor = True @@ -5497,7 +5497,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.txtEmail2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtEmail2.Location = New System.Drawing.Point(107, 120) - Me.txtEmail2.MaxLength = 40 + Me.txtEmail2.MaxLength = 100 Me.txtEmail2.Name = "txtEmail2" Me.txtEmail2.Size = New System.Drawing.Size(333, 20) Me.txtEmail2.TabIndex = 9 @@ -5506,7 +5506,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.txtEmail.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtEmail.Location = New System.Drawing.Point(107, 94) - Me.txtEmail.MaxLength = 40 + Me.txtEmail.MaxLength = 100 Me.txtEmail.Name = "txtEmail" Me.txtEmail.Size = New System.Drawing.Size(333, 20) Me.txtEmail.TabIndex = 7 diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index 645a067a..2aed4815 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -885,14 +885,25 @@ Public Class usrcntlKundeBearbeitenFull txtERROR.Text = err : Exit Sub End If - Dim allowdelete = Not (KUNDE.hasEntry And ADRESSE.hasEntry) ' wenn der Eintrag bereits existiert + Dim Email1 As String = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(txtEmail.Text) + If Email1 <> "" Then + txtERROR.Text = Email1 & " ist keine gültige Email!" : Exit Sub + End If - If Not checkAbfertigungsverbot() Then - txtERROR.Text = "Grund für Abfertigungsverbot angeben!" : Exit Sub + Dim Email2 As String = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(txtEmail2.Text) + If Email2 <> "" Then + txtERROR.Text = Email2 & " ist keine gültige Email!" : Exit Sub End If - If ADRESSE.SAVE() Then + Dim allowdelete = Not (KUNDE.hasEntry And ADRESSE.hasEntry) ' wenn der Eintrag bereits existiert + + If Not checkAbfertigungsverbot() Then + txtERROR.Text = "Grund für Abfertigungsverbot angeben!" : Exit Sub + End If + + + If ADRESSE.SAVE() Then If KUNDE.SAVE() Then If FISKAL.SAVE AndAlso KUNDE_ERW.SAVE Then If usrCntlAufschubkonten.SAVE() Then