From 805a05b5fe8d99ce312aad7fac9f6c8fd532f786 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 12 May 2025 11:21:10 +0200 Subject: [PATCH 1/4] ustva -> RZ --- SDL/USTV/frmMDM_USTVAntrag.Designer.vb | 187 ++++++++++++++++++------- SDL/USTV/frmMDM_USTVAntrag.vb | 16 +++ 2 files changed, 154 insertions(+), 49 deletions(-) diff --git a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb index c0601e37..fe2b4650 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb @@ -107,7 +107,6 @@ Partial Class frmMDM_USTVAntrag Me.dgvUSTVPositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.pnlAntragsPosDetails = New System.Windows.Forms.Panel() Me.Panel2 = New System.Windows.Forms.Panel() - Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition() Me.Panel4 = New System.Windows.Forms.Panel() Me.cbxKIUploaddelete = New System.Windows.Forms.CheckBox() Me.scanUSTVA = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() @@ -118,13 +117,18 @@ Partial Class frmMDM_USTVAntrag Me.Panel3 = New System.Windows.Forms.Panel() Me.dgvErstattungspositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.pnlErstattungsdetails = New System.Windows.Forms.Panel() - Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition() Me.Panel1 = New System.Windows.Forms.Panel() Me.Button2 = New System.Windows.Forms.Button() Me.Button3 = New System.Windows.Forms.Button() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.cnS_KIUPLOAD = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition() + Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition() + Me.Label16 = New System.Windows.Forms.Label() + Me.txtRZam = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label17 = New System.Windows.Forms.Label() + Me.txtRZ = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.pnlBottom.SuspendLayout() CType(Me.pb_Beleg, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.picExcel, System.ComponentModel.ISupportInitialize).BeginInit() @@ -348,7 +352,7 @@ Partial Class frmMDM_USTVAntrag Me.pnlHeader.Dock = System.Windows.Forms.DockStyle.Top Me.pnlHeader.Location = New System.Drawing.Point(0, 0) Me.pnlHeader.Name = "pnlHeader" - Me.pnlHeader.Size = New System.Drawing.Size(1454, 177) + Me.pnlHeader.Size = New System.Drawing.Size(1454, 201) Me.pnlHeader.TabIndex = 0 ' 'lblGesamtUSteuer @@ -456,7 +460,7 @@ Partial Class frmMDM_USTVAntrag Me.Panel9.Dock = System.Windows.Forms.DockStyle.Left Me.Panel9.Location = New System.Drawing.Point(0, 0) Me.Panel9.Name = "Panel9" - Me.Panel9.Size = New System.Drawing.Size(65, 90) + Me.Panel9.Size = New System.Drawing.Size(65, 86) Me.Panel9.TabIndex = 20 ' 'cbxLand @@ -483,7 +487,7 @@ Partial Class frmMDM_USTVAntrag Me.lblLand.ForeColor = System.Drawing.Color.Black Me.lblLand.Location = New System.Drawing.Point(0, 0) Me.lblLand.Name = "lblLand" - Me.lblLand.Size = New System.Drawing.Size(65, 90) + Me.lblLand.Size = New System.Drawing.Size(65, 86) Me.lblLand.TabIndex = 11 Me.lblLand.Text = "AT" Me.lblLand.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -492,6 +496,10 @@ Partial Class frmMDM_USTVAntrag ' Me.Panel8.BackColor = System.Drawing.Color.WhiteSmoke Me.Panel8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Panel8.Controls.Add(Me.Label16) + Me.Panel8.Controls.Add(Me.txtRZam) + Me.Panel8.Controls.Add(Me.Label17) + Me.Panel8.Controls.Add(Me.txtRZ) Me.Panel8.Controls.Add(Me.Label15) Me.Panel8.Controls.Add(Me.txtVZam) Me.Panel8.Controls.Add(Me.btnAbfertigungsNrVergeben) @@ -519,9 +527,9 @@ Partial Class frmMDM_USTVAntrag Me.Panel8.Controls.Add(Me.txtVon) Me.Panel8.Controls.Add(Me.txtBis) Me.Panel8.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel8.Location = New System.Drawing.Point(0, 90) + Me.Panel8.Location = New System.Drawing.Point(0, 86) Me.Panel8.Name = "Panel8" - Me.Panel8.Size = New System.Drawing.Size(973, 87) + Me.Panel8.Size = New System.Drawing.Size(973, 115) Me.Panel8.TabIndex = 19 ' 'Label15 @@ -565,11 +573,12 @@ Partial Class frmMDM_USTVAntrag 'btnAbfertigungsNrVergeben ' Me.btnAbfertigungsNrVergeben.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnAbfertigungsNrVergeben.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnAbfertigungsNrVergeben.ForeColor = System.Drawing.Color.Black Me.btnAbfertigungsNrVergeben.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnAbfertigungsNrVergeben.Location = New System.Drawing.Point(773, 30) + Me.btnAbfertigungsNrVergeben.Location = New System.Drawing.Point(736, 32) Me.btnAbfertigungsNrVergeben.Name = "btnAbfertigungsNrVergeben" - Me.btnAbfertigungsNrVergeben.Size = New System.Drawing.Size(51, 27) + Me.btnAbfertigungsNrVergeben.Size = New System.Drawing.Size(43, 27) Me.btnAbfertigungsNrVergeben.TabIndex = 50 Me.btnAbfertigungsNrVergeben.Text = "AbfNr" Me.btnAbfertigungsNrVergeben.UseVisualStyleBackColor = True @@ -582,11 +591,11 @@ Partial Class frmMDM_USTVAntrag Me.Label14.Cursor = System.Windows.Forms.Cursors.Hand Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label14.ForeColor = System.Drawing.Color.Black - Me.Label14.Location = New System.Drawing.Point(524, 64) + Me.Label14.Location = New System.Drawing.Point(800, 39) Me.Label14.Name = "Label14" - Me.Label14.Size = New System.Drawing.Size(101, 17) + Me.Label14.Size = New System.Drawing.Size(62, 17) Me.Label14.TabIndex = 27 - Me.Label14.Text = "eingereicht am" + Me.Label14.Text = "eing. am" ' 'txtEingereichtAm ' @@ -604,7 +613,7 @@ Partial Class frmMDM_USTVAntrag Me.txtEingereichtAm._WaehrungZeichen = False Me.txtEingereichtAm.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) Me.txtEingereichtAm.ForeColor = System.Drawing.Color.Black - Me.txtEingereichtAm.Location = New System.Drawing.Point(654, 60) + Me.txtEingereichtAm.Location = New System.Drawing.Point(865, 31) Me.txtEingereichtAm.MaxLength = 10 Me.txtEingereichtAm.MaxLineLength = -1 Me.txtEingereichtAm.MaxLines_Warning = "" @@ -708,11 +717,11 @@ Partial Class frmMDM_USTVAntrag Me.Label9.Cursor = System.Windows.Forms.Cursors.Hand Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label9.ForeColor = System.Drawing.Color.Black - Me.Label9.Location = New System.Drawing.Point(826, 35) + Me.Label9.Location = New System.Drawing.Point(524, 64) Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(30, 17) + Me.Label9.Size = New System.Drawing.Size(107, 17) Me.Label9.TabIndex = 19 - Me.Label9.Text = "VZ:" + Me.Label9.Text = "Vorauszahlung:" ' 'txtVZ ' @@ -730,13 +739,13 @@ Partial Class frmMDM_USTVAntrag Me.txtVZ._WaehrungZeichen = True Me.txtVZ.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) Me.txtVZ.ForeColor = System.Drawing.Color.Black - Me.txtVZ.Location = New System.Drawing.Point(865, 31) + Me.txtVZ.Location = New System.Drawing.Point(654, 59) Me.txtVZ.MaxLength = 10 Me.txtVZ.MaxLineLength = -1 Me.txtVZ.MaxLines_Warning = "" Me.txtVZ.MaxLines_Warning_Label = Nothing Me.txtVZ.Name = "txtVZ" - Me.txtVZ.Size = New System.Drawing.Size(100, 23) + Me.txtVZ.Size = New System.Drawing.Size(125, 23) Me.txtVZ.TabIndex = 20 ' 'txtAbfNr @@ -755,13 +764,13 @@ Partial Class frmMDM_USTVAntrag Me.txtAbfNr._WaehrungZeichen = False Me.txtAbfNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) Me.txtAbfNr.ForeColor = System.Drawing.Color.Red - Me.txtAbfNr.Location = New System.Drawing.Point(654, 33) + Me.txtAbfNr.Location = New System.Drawing.Point(624, 33) Me.txtAbfNr.MaxLength = 10 Me.txtAbfNr.MaxLineLength = -1 Me.txtAbfNr.MaxLines_Warning = "" Me.txtAbfNr.MaxLines_Warning_Label = Nothing Me.txtAbfNr.Name = "txtAbfNr" - Me.txtAbfNr.Size = New System.Drawing.Size(117, 23) + Me.txtAbfNr.Size = New System.Drawing.Size(111, 23) Me.txtAbfNr.TabIndex = 18 ' 'Label8 @@ -773,9 +782,9 @@ Partial Class frmMDM_USTVAntrag Me.Label8.ForeColor = System.Drawing.Color.Black Me.Label8.Location = New System.Drawing.Point(524, 37) Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(112, 17) + Me.Label8.Size = New System.Drawing.Size(57, 17) Me.Label8.TabIndex = 17 - Me.Label8.Text = "Abfertigungs-Nr:" + Me.Label8.Text = "Abf.-Nr:" ' 'cbxFiliale ' @@ -832,13 +841,13 @@ Partial Class frmMDM_USTVAntrag Me.txtBezugsNr._WaehrungZeichen = False Me.txtBezugsNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) Me.txtBezugsNr.ForeColor = System.Drawing.Color.Red - Me.txtBezugsNr.Location = New System.Drawing.Point(654, 4) + Me.txtBezugsNr.Location = New System.Drawing.Point(641, 4) Me.txtBezugsNr.MaxLength = 10 Me.txtBezugsNr.MaxLineLength = -1 Me.txtBezugsNr.MaxLines_Warning = "" Me.txtBezugsNr.MaxLines_Warning_Label = Nothing Me.txtBezugsNr.Name = "txtBezugsNr" - Me.txtBezugsNr.Size = New System.Drawing.Size(146, 23) + Me.txtBezugsNr.Size = New System.Drawing.Size(138, 23) Me.txtBezugsNr.TabIndex = 14 ' 'cbxWahrung @@ -1085,7 +1094,7 @@ Partial Class frmMDM_USTVAntrag Me.Panel5.Location = New System.Drawing.Point(973, 0) Me.Panel5.Margin = New System.Windows.Forms.Padding(0) Me.Panel5.Name = "Panel5" - Me.Panel5.Size = New System.Drawing.Size(481, 177) + Me.Panel5.Size = New System.Drawing.Size(481, 201) Me.Panel5.TabIndex = 9 ' 'Panel7 @@ -1093,7 +1102,7 @@ Partial Class frmMDM_USTVAntrag Me.Panel7.Controls.Add(Me.Label6) Me.Panel7.Controls.Add(Me.rtbStatusText) Me.Panel7.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel7.Location = New System.Drawing.Point(0, 50) + Me.Panel7.Location = New System.Drawing.Point(0, 74) Me.Panel7.Name = "Panel7" Me.Panel7.Size = New System.Drawing.Size(481, 69) Me.Panel7.TabIndex = 20 @@ -1132,7 +1141,7 @@ Partial Class frmMDM_USTVAntrag Me.FlowLayoutPanel.Controls.Add(Me.btnStorno) Me.FlowLayoutPanel.Controls.Add(Me.lblAntragAbgeschlossen) Me.FlowLayoutPanel.Dock = System.Windows.Forms.DockStyle.Bottom - Me.FlowLayoutPanel.Location = New System.Drawing.Point(0, 119) + Me.FlowLayoutPanel.Location = New System.Drawing.Point(0, 143) Me.FlowLayoutPanel.Margin = New System.Windows.Forms.Padding(0) Me.FlowLayoutPanel.Name = "FlowLayoutPanel" Me.FlowLayoutPanel.Size = New System.Drawing.Size(481, 58) @@ -1323,9 +1332,9 @@ Partial Class frmMDM_USTVAntrag Me.pnlBody.BackColor = System.Drawing.Color.White Me.pnlBody.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.pnlBody.Controls.Add(Me.TabControl1) - Me.pnlBody.Location = New System.Drawing.Point(0, 177) + Me.pnlBody.Location = New System.Drawing.Point(0, 206) Me.pnlBody.Name = "pnlBody" - Me.pnlBody.Size = New System.Drawing.Size(1454, 472) + Me.pnlBody.Size = New System.Drawing.Size(1454, 443) Me.pnlBody.TabIndex = 1 ' 'TabControl1 @@ -1336,7 +1345,7 @@ Partial Class frmMDM_USTVAntrag Me.TabControl1.Location = New System.Drawing.Point(0, 0) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(1452, 470) + Me.TabControl1.Size = New System.Drawing.Size(1452, 441) Me.TabControl1.TabIndex = 1 ' 'TabPage1 @@ -1346,7 +1355,7 @@ Partial Class frmMDM_USTVAntrag Me.TabPage1.Location = New System.Drawing.Point(4, 22) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(1444, 444) + Me.TabPage1.Size = New System.Drawing.Size(1444, 415) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Antragspositionen" Me.TabPage1.UseVisualStyleBackColor = True @@ -1369,14 +1378,14 @@ Partial Class frmMDM_USTVAntrag Me.dgvUSTVPositionen.RowHeadersVisible = False Me.dgvUSTVPositionen.RowHeadersWidth = 62 Me.dgvUSTVPositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUSTVPositionen.Size = New System.Drawing.Size(1438, 169) + Me.dgvUSTVPositionen.Size = New System.Drawing.Size(1438, 140) Me.dgvUSTVPositionen.TabIndex = 0 ' 'pnlAntragsPosDetails ' Me.pnlAntragsPosDetails.Controls.Add(Me.Panel2) Me.pnlAntragsPosDetails.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlAntragsPosDetails.Location = New System.Drawing.Point(3, 178) + Me.pnlAntragsPosDetails.Location = New System.Drawing.Point(3, 149) Me.pnlAntragsPosDetails.Name = "pnlAntragsPosDetails" Me.pnlAntragsPosDetails.Size = New System.Drawing.Size(1438, 263) Me.pnlAntragsPosDetails.TabIndex = 2 @@ -1393,14 +1402,6 @@ Partial Class frmMDM_USTVAntrag Me.Panel2.Size = New System.Drawing.Size(1438, 263) Me.Panel2.TabIndex = 1 ' - 'UstCntlUSTV_AntragPosition1 - ' - Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0) - Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1" - Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1282, 261) - Me.UstCntlUSTV_AntragPosition1.TabIndex = 0 - ' 'Panel4 ' Me.Panel4.BackColor = System.Drawing.Color.WhiteSmoke @@ -1546,14 +1547,6 @@ Partial Class frmMDM_USTVAntrag Me.pnlErstattungsdetails.Size = New System.Drawing.Size(1436, 261) Me.pnlErstattungsdetails.TabIndex = 0 ' - 'UstCntlUSTV_AntragErstattungen1 - ' - Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0) - Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1" - Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1280, 259) - Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2 - ' 'Panel1 ' Me.Panel1.BackColor = System.Drawing.Color.WhiteSmoke @@ -1609,6 +1602,98 @@ Partial Class frmMDM_USTVAntrag Me.cnS_KIUPLOAD.Name = "ContextMenuStrip1" Me.cnS_KIUPLOAD.Size = New System.Drawing.Size(61, 4) ' + 'UstCntlUSTV_AntragPosition1 + ' + Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0) + Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1" + Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1282, 261) + Me.UstCntlUSTV_AntragPosition1.TabIndex = 0 + ' + 'UstCntlUSTV_AntragErstattungen1 + ' + Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0) + Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1" + Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1280, 259) + Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2 + ' + 'Label16 + ' + Me.Label16.AutoSize = True + Me.Label16.BackColor = System.Drawing.Color.Transparent + Me.Label16.Cursor = System.Windows.Forms.Cursors.Hand + Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label16.ForeColor = System.Drawing.Color.Black + Me.Label16.Location = New System.Drawing.Point(800, 91) + Me.Label16.Name = "Label16" + Me.Label16.Size = New System.Drawing.Size(54, 17) + Me.Label16.TabIndex = 55 + Me.Label16.Text = "RZ am:" + ' + 'txtRZam + ' + Me.txtRZam._DateTimeOnly = False + Me.txtRZam._numbersOnly = False + Me.txtRZam._numbersOnlyKommastellen = "" + Me.txtRZam._numbersOnlyTrennzeichen = False + Me.txtRZam._Prozent = False + Me.txtRZam._ShortDateNew = False + Me.txtRZam._ShortDateOnly = True + Me.txtRZam._TimeOnly = False + Me.txtRZam._TimeOnly_Seconds = False + Me.txtRZam._value = "" + Me.txtRZam._Waehrung = False + Me.txtRZam._WaehrungZeichen = False + Me.txtRZam.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.txtRZam.ForeColor = System.Drawing.Color.Black + Me.txtRZam.Location = New System.Drawing.Point(865, 87) + Me.txtRZam.MaxLength = 10 + Me.txtRZam.MaxLineLength = -1 + Me.txtRZam.MaxLines_Warning = "" + Me.txtRZam.MaxLines_Warning_Label = Nothing + Me.txtRZam.Name = "txtRZam" + Me.txtRZam.Size = New System.Drawing.Size(100, 23) + Me.txtRZam.TabIndex = 56 + ' + 'Label17 + ' + Me.Label17.AutoSize = True + Me.Label17.BackColor = System.Drawing.Color.Transparent + Me.Label17.Cursor = System.Windows.Forms.Cursors.Hand + Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label17.ForeColor = System.Drawing.Color.Black + Me.Label17.Location = New System.Drawing.Point(524, 91) + Me.Label17.Name = "Label17" + Me.Label17.Size = New System.Drawing.Size(94, 17) + Me.Label17.TabIndex = 53 + Me.Label17.Text = "Rückzahlung:" + ' + 'txtRZ + ' + Me.txtRZ._DateTimeOnly = False + Me.txtRZ._numbersOnly = True + Me.txtRZ._numbersOnlyKommastellen = "" + Me.txtRZ._numbersOnlyTrennzeichen = True + Me.txtRZ._Prozent = False + Me.txtRZ._ShortDateNew = False + Me.txtRZ._ShortDateOnly = False + Me.txtRZ._TimeOnly = False + Me.txtRZ._TimeOnly_Seconds = False + Me.txtRZ._value = "" + Me.txtRZ._Waehrung = True + Me.txtRZ._WaehrungZeichen = True + Me.txtRZ.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.txtRZ.ForeColor = System.Drawing.Color.Black + Me.txtRZ.Location = New System.Drawing.Point(654, 87) + Me.txtRZ.MaxLength = 10 + Me.txtRZ.MaxLineLength = -1 + Me.txtRZ.MaxLines_Warning = "" + Me.txtRZ.MaxLines_Warning_Label = Nothing + Me.txtRZ.Name = "txtRZ" + Me.txtRZ.Size = New System.Drawing.Size(125, 23) + Me.txtRZ.TabIndex = 54 + ' 'frmMDM_USTVAntrag ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1754,4 +1839,8 @@ Partial Class frmMDM_USTVAntrag Friend WithEvents cnS_KIUPLOAD As ContextMenuStrip Friend WithEvents cbxKIUploaddelete As CheckBox Friend WithEvents pb_Beleg As PictureBox + Friend WithEvents Label16 As Label + Friend WithEvents txtRZam As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label17 As Label + Friend WithEvents txtRZ As VERAG_PROG_ALLGEMEIN.MyTextBox End Class diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 481a5179..02f805a3 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -325,6 +325,10 @@ Public Class frmMDM_USTVAntrag txtVZ.Text = If(USTV_ANTRAG.UStVAn_VZBetrag, "") txtVZam._value = If(USTV_ANTRAG.UStVAn_VZDatum, "") + + txtRZ.Text = If(USTV_ANTRAG.UStVAn_RZBetragVZ, "") + txtRZam._value = If(USTV_ANTRAG.UStVAn_RZDatumVZ, "") + txtBezugsNr.Text = If(USTV_ANTRAG.UStVAn_BezugsNr, "") txtAbfNr.Text = If(USTV_ANTRAG.AbfertigungsNr, "") txtEingereichtAm.Text = If(USTV_ANTRAG.UStVAn_AntragEingereichtAm, "") @@ -366,6 +370,18 @@ Public Class frmMDM_USTVAntrag USTV_ANTRAG.UStVAn_VZDatum = Nothing End If + If txtRZ.Text <> "" AndAlso IsNumeric(txtRZ.Text) Then + USTV_ANTRAG.UStVAn_RZBetragVZ = CDbl(txtRZ.Text) + Else + USTV_ANTRAG.UStVAn_RZBetragVZ = Nothing + End If + + If txtRZam.Text <> "" AndAlso IsDate(txtRZam.Text) Then + USTV_ANTRAG.UStVAn_RZDatumVZ = CDate(txtRZam.Text) + Else + USTV_ANTRAG.UStVAn_RZDatumVZ = Nothing + End If + USTV_ANTRAG.UStVAn_BezugsNr = txtBezugsNr.Text USTV_ANTRAG.AbfertigungsNr = txtAbfNr.Text From 2091855ea6dfd08234cd3de9863a99c1510abe3e Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 12 May 2025 13:20:34 +0200 Subject: [PATCH 2/4] Erstattung. --- SDL/My Project/AssemblyInfo.vb | 4 +-- SDL/USTV/frmMDM_USTVAntrag.vb | 28 ++++++++++++++++--- ...stCntlUSTV_ErstattungPosition .Designer.vb | 2 +- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index e1fbd712..78a3d88c 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 02f805a3..2d0bedc7 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -21,6 +21,8 @@ Public Class frmMDM_USTVAntrag Dim func As New cMDMFunctionsAllgemein Dim dTLANDEU As New DataTable Dim DiffernezbetragEUR As Double + Dim GesamtUSteuerEUR As Double + Dim GesamtUSteuer As Double Sub New(UStVAn_ID) @@ -192,11 +194,11 @@ Public Class frmMDM_USTVAntrag End With - Dim GesamtUSteuerEUR As Double = SQL.DLookup("isnull(sum(UStVPo_USteuerbetragEUR),0)", "tblUStVPositionen", "UStVAn_ID='" & UStVAn_ID & "'", "FMZOLL", "0") + GesamtUSteuerEUR = SQL.DLookup("isnull(sum(UStVPo_USteuerbetragEUR),0)", "tblUStVPositionen", "UStVAn_ID='" & UStVAn_ID & "'", "FMZOLL", "0") Dim GesamtErstattungEUR As Double = SQL.DLookup("isnull(sum(UStVEr_USteuerbetragEUR),0)", "tblUStVErstattung", "UStVAn_ID='" & UStVAn_ID & "'", "FMZOLL", "0") DiffernezbetragEUR = GesamtUSteuerEUR - GesamtErstattungEUR - Dim GesamtUSteuer As Double = SQL.DLookup("isnull(sum(UStVPo_USteuerbetrag),0)", "tblUStVPositionen", "UStVAn_ID='" & UStVAn_ID & "'", "FMZOLL", "0") + GesamtUSteuer = SQL.DLookup("isnull(sum(UStVPo_USteuerbetrag),0)", "tblUStVPositionen", "UStVAn_ID='" & UStVAn_ID & "'", "FMZOLL", "0") Dim GesamtErstattung As Double = SQL.DLookup("isnull(sum(UStVEr_USteuerbetrag),0)", "tblUStVErstattung", "UStVAn_ID='" & UStVAn_ID & "'", "FMZOLL", "0") Dim Differnezbetrag As Double = GesamtUSteuer - GesamtErstattung @@ -1571,14 +1573,32 @@ Public Class frmMDM_USTVAntrag VERAG_PROG_ALLGEMEIN.cMDMFunctionsAllgemein.Update_UStVASummenNeuBerechnen_USTVA(USTV_ANTRAG.UStVAn_ID) + If USTV_ANTRAG.UStVAn_Währungscode IsNot Nothing AndAlso USTV_ANTRAG.UStVAn_Währungscode <> "EUR" AndAlso USTV_ANTRAG.UStVAn_Währungscode <> "" Then + Dim averageUmrechnungskurs As Double = 1 + If dgvUSTVPositionen.Rows.Count > 0 Then + For Each row In dgvUSTVPositionen.Rows + averageUmrechnungskurs += row.Cells("UStVPo_Umrechnungskurs").Value + Next + averageUmrechnungskurs = averageUmrechnungskurs / dgvUSTVPositionen.Rows.Count + End If + + Dim abw As Double = Math.Abs(Math.Round(GesamtUSteuer / averageUmrechnungskurs, 2) - Math.Round(GesamtUSteuerEUR, 2)) + + If abw >= 250 Then + MsgBox("Bitte Umrechnungskurs in den Antragspositionen kontrollieren!" & vbNewLine & "Der Steuerbetrag weicht um " & Math.Round(abw, 2) & "€ vom FW-Steuerbetrag ab! ") + End If + + End If + + Else - Dim USTV_ANTRAG = New VERAG_PROG_ALLGEMEIN.cUSTVAntrag() + Dim USTV_ANTRAG = New VERAG_PROG_ALLGEMEIN.cUSTVAntrag() Dim ADR As New cAdressen(KundenNr) Dim ERW As New cKundenErweitert(KundenNr) Dim FIRMA As New cFirmen(1) 'Nr 1 weil Kontodaten von Verag..... - If KundenNr < 0 Then + If KundenNr <0 Then MsgBox("Kunde auswählen!") Exit Sub End If diff --git a/SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb b/SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb index 4011f1f8..d1e1e982 100644 --- a/SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb +++ b/SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb @@ -403,7 +403,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtBemerkung._WaehrungZeichen = True Me.txtBemerkung.ForeColor = System.Drawing.Color.Red Me.txtBemerkung.Location = New System.Drawing.Point(468, 179) - Me.txtBemerkung.MaxLength = 50 + Me.txtBemerkung.MaxLength = 255 Me.txtBemerkung.MaxLineLength = -1 Me.txtBemerkung.MaxLines_Warning = "" Me.txtBemerkung.MaxLines_Warning_Label = Nothing From 0ecbd1f2422ea38b15673fd8f638db8519d103ac Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 12 May 2025 16:29:54 +0200 Subject: [PATCH 3/4] Mahnlauf, etc. --- SDL/buchhaltung/frmBU_Mahnlauf.vb | 124 +++++++++++++++++++++++++++--- SDL/frmdynMailvorlage.Designer.vb | 24 +++--- 2 files changed, 124 insertions(+), 24 deletions(-) diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.vb b/SDL/buchhaltung/frmBU_Mahnlauf.vb index 975a62ae..665b8dd1 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb @@ -129,6 +129,20 @@ Public Class frmBU_Mahnlauf '.Columns("Faelligkeit").Width = 75 '.Columns("Faelligkeit").HeaderText = "Fälligkeit" .Columns("AV").Width = 30 + + .Columns("Saldo").DefaultCellStyle.Format = "###,###.##" + .Columns("Saldo").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight + .Columns("Ausstand").DefaultCellStyle.Format = "###,###.##" + .Columns("Ausstand").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight + .Columns("3470").DefaultCellStyle.Format = "###,###.##" + .Columns("3470").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight + .Columns("Risiko").DefaultCellStyle.Format = "###,###.##" + .Columns("Risiko").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight + .Columns("V").DefaultCellStyle.Format = "###,###.##" + .Columns("V").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight + .Columns("Gutschrift").DefaultCellStyle.Format = "###,###.##" + .Columns("Gutschrift").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight + Else .Columns("Email").Width = 150 .Columns("Ort").Width = 150 @@ -376,7 +390,11 @@ Public Class frmBU_Mahnlauf Dim sum = 0 Select Case Sprache Case "EN" - ' rpt.lblUeberschriftRG_GS.Text = "REMINDER" + rpt.lblSummeUeberschrift.Text = "Total:" + rpt.lblSteuersatz.Text = "Late payment interest of 9.5% p.a. from due date" + rpt.lblZwText.Text = "Dunning fee" + rpt.lblZwischensumme.Text = "Subtotal" + Case "RO" rpt.lblSummeUeberschrift.Text = "Total:" rpt.lblSteuersatz.Text = "Late payment interest of 9.5% p.a. from due date" rpt.lblZwText.Text = "Dunning fee" @@ -473,14 +491,39 @@ Public Class frmBU_Mahnlauf Dim VerzugszinsenGes As Double = 0 Dim ZinssatzVerzugszinsen As Double = 0.095 - Select Case MAHNSTUFE - Case -2 : Mahngeb = 0 : rpt.Label24.Visible = False : rpt.lblSteuersatz.Visible = False : rpt.Label23.Visible = False : rpt.lblZwText.Visible = False - Case -1 : Mahngeb = 0 - Case 0 : Mahngeb = 5 - Case 1 : Mahngeb = 5 - Case 2 : Mahngeb = 20 - Case >= 3 : Mahngeb = 30 - End Select + If Not Firma_ID = 19 Then + + Select Case MAHNSTUFE + Case -2 : Mahngeb = 0 : rpt.Label24.Visible = False : rpt.lblSteuersatz.Visible = False : rpt.Label23.Visible = False : rpt.lblZwText.Visible = False + Case -1 : Mahngeb = 0 + Case 0 : Mahngeb = 5 + Case 1 : Mahngeb = 5 + Case 2 : Mahngeb = 20 + Case >= 3 : Mahngeb = 30 + End Select + + + Else + + Select Case MAHNSTUFE + Case -2 : Mahngeb = 0 : rpt.Label24.Visible = False : rpt.lblSteuersatz.Visible = False : rpt.Label23.Visible = False : rpt.lblZwText.Visible = False + Case -1 : Mahngeb = 0 + Case 0 : Mahngeb = 0 + Case 1 : Mahngeb = 10 + Case 2 : Mahngeb = 20 + Case 3 : Mahngeb = 30 + Case 4 : Mahngeb = 40 + Case 5 : Mahngeb = 50 + Case 6 : Mahngeb = 60 + Case 7 : Mahngeb = 70 + Case 8 : Mahngeb = 80 + Case 9 : Mahngeb = 90 + Case >= 10 : Mahngeb = 100 + End Select + + End If + + Dim MahnTEXT_VOR = "" @@ -493,8 +536,7 @@ Public Class frmBU_Mahnlauf rpt.txtMahnungstextVOR.Text = MahnTEXT_VOR rpt.txtVermerk.Text = MahnTEXT_NACH Else - 'über Übersetzung geregelt, alle anderen über getMahnstufe (sollte in Zukunft noch abgeändert werden!) - getMahnstufetext("DE", MAHNSTUFE, MahnTEXT_VOR, MahnTEXT_NACH, MAHNTEXT) + getMahnstufetextMDM(MAHNSTUFE, MahnTEXT_VOR, MahnTEXT_NACH, MAHNTEXT) rpt.lblUeberschriftRG_GS.Text = MAHNTEXT rpt.txtMahnungstextVOR.Text = MahnTEXT_VOR rpt.txtVermerk.Text = MahnTEXT_NACH @@ -657,6 +699,7 @@ Public Class frmBU_Mahnlauf Mail_Subject = Mail_Subject.Replace("%KdNr%", KdNr) Mail_Subject = Mail_Subject.Replace("%Mahntext%", MAHNTEXT) Mail_Subject = Mail_Subject.Replace("%KdName%", AD.Ordnungsbegriff) + Mail_Subject = Mail_Subject.Replace("%Mahnstufe%", MAHNSTUFE) TextHTML = TextHTML.Replace("%email_mahnung%", emailMahnungen) @@ -1067,6 +1110,61 @@ Public Class frmBU_Mahnlauf End Sub + Private Shared Sub getMahnstufetextMDM(MAHNSTUFE, ByRef MahnTEXT_VOR, ByRef MahnTEXT_NACH, ByRef MAHNTEXT) + + Select Case MAHNSTUFE + Case -2 + MahnTEXT_VOR = "Nachstehend ersehen Sie die Übersicht Ihrer offenen Rechnungen:" + MahnTEXT_NACH = "Sollten Sie Kopien der fehlenden Belege benötigen, lassen Sie es uns bitte wissen. Wir senden Sie Ihnen gerne nochmals zu." + MAHNTEXT = "Liste - Offene Posten" + + Case -1 + MahnTEXT_VOR = "Nachstehend ersehen Sie die Übersicht Ihrer offenen Rechnungen:" + MahnTEXT_NACH = "Die oben genannten Beträge werden per SEPA-Lastschriftmandat von Ihrer angegebenen Bankverbindung eingezogen." + MAHNTEXT = "Liste - Offene Posten" + + + Case 0 + MahnTEXT_VOR = "für nachstehende Rechnungen konnten wir bisher noch keinen Zahlungseingang verzeichnen:" + MahnTEXT_NACH = "" + MAHNTEXT = "Zahlungserinnerung" + + + Case 1 + MahnTEXT_VOR = "für nachstehende Rechnungen konnten wir bisher noch keinen Zahlungseingang verzeichnen:" + MahnTEXT_NACH = "Sicherlich handelt es sich dabei um ein organisatorisches Versehen und wir ersuchen die Zahlung nachzuholen." & vbNewLine & "Sollten Sie zwischenzeitlich Zahlung geleistet haben, betrachten Sie dieses Schreiben als gegenstandslos." + MAHNTEXT = "1. Mahnung" + + + Case 2 + MahnTEXT_VOR = "Trotz unserer 1. Mahnung wurden die nachstehenden Rechnungen immer noch nicht beglichen." + MahnTEXT_NACH = "Zur Vermeidung weiterer Kosten und Unannehmlichkeiten fordern wir Sie nunmehr mit aller Bestimmtheit auf, den überfälligen Betrag bis FREITAG zu begleichen." & vbNewLine & "Sollten Sie zwischenzeitlich Zahlung geleistet haben, senden Sie uns bitte umgehend eine Kopie Ihres Überweisungsbelegs. " + MAHNTEXT = MAHNSTUFE & ". MAHNUNG" + + + Case 3 + MahnTEXT_VOR = "Trotz zweifacher Mahnung sind nachstehende Rechnungen immer noch nicht beglichen." + MahnTEXT_NACH = "NWir fordern Sie hiermit letztmalig auf, den überfälligen Betrag unverzüglich bis DONNERSTAG zu entrichten." & vbNewLine & "Sollten wir zum Ablauf der neuerlichen Frist keine Kopie Ihres Überweisungsbelegs erhalten, müssen wir Ihre Konten sperren!" + MAHNTEXT = MAHNSTUFE & ". MAHNUNG" + + + Case >= 4 And MAHNSTUFE <= 7 + MahnTEXT_VOR = "Trotz mehrfacher Mahnung sind nachstehende Rechnungen immer noch nicht beglichen." & vbNewLine & "Wir fordern Sie hiermit letztmalig auf, den offenen Betrag unverzüglich bis MITTWOCH zur Einzahlung zu bringen. Bitte senden Sie uns eine Kopie des Überweisungsbelegs!" + MahnTEXT_NACH = "NNach erfolglosem Ablauf dieser neuerlichen Frist sind wir gezwungen, ohne weitere vorherige Ankündigung rechtliche Schritte einzuleiten." + MAHNTEXT = MAHNSTUFE & ". MAHNUNG" + + + Case >= 8 + MahnTEXT_VOR = "Trotz mehrfacher Mahnung sind nachstehende Rechnungen immer noch nicht beglichen." & vbNewLine & "Wir fordern Sie hiermit letztmalig auf, den offenen Betrag unverzüglich HEUTE zur Einzahlung zu bringen. Bitte senden Sie uns eine Kopie des Überweisungsbelegs!" + MahnTEXT_NACH = "Nach erfolglosem Ablauf dieser neuerlichen Frist wären wir dann gezwungen, aber ohne weitere vorherige Ankündigung rechtliche Schritte einzuleiten." + MAHNTEXT = MAHNSTUFE & ". MAHNUNG" + End Select + + + + End Sub + + Private Sub MyDatagridview1_SelectionChanged(sender As Object, e As EventArgs) Handles MyDatagridview1.SelectionChanged 'MyComboBox1.changeItem("") If MyDatagridview1.SelectedRows.Count > 0 Then @@ -1091,8 +1189,10 @@ Public Class frmBU_Mahnlauf If MyDatagridview1.SelectedRows.Count > 0 Then Dim KontoList As New List(Of String) + Dim i As Integer = 0 For Each r As DataGridViewRow In MyDatagridview1.SelectedRows - KontoList.Add(MyDatagridview1.SelectedRows(0).Cells("Konto").Value) + KontoList.Add(MyDatagridview1.SelectedRows(i).Cells("Konto").Value) + i += 1 Next diff --git a/SDL/frmdynMailvorlage.Designer.vb b/SDL/frmdynMailvorlage.Designer.vb index 16d469d1..76299877 100644 --- a/SDL/frmdynMailvorlage.Designer.vb +++ b/SDL/frmdynMailvorlage.Designer.vb @@ -24,6 +24,7 @@ Partial Class frmdynMailvorlagen Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Me.mainPanel = New System.Windows.Forms.Panel() + Me.TextBox2 = New System.Windows.Forms.TextBox() Me.cbxTyp = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label13 = New System.Windows.Forms.Label() Me.TextBox1 = New System.Windows.Forms.TextBox() @@ -65,7 +66,6 @@ Partial Class frmdynMailvorlagen Me.Label3 = New System.Windows.Forms.Label() Me.cbxFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.dgvMailvorlagen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.TextBox2 = New System.Windows.Forms.TextBox() Me.mainPanel.SuspendLayout() Me.pnlTop.SuspendLayout() CType(Me.dgvMailvorlagen, System.ComponentModel.ISupportInitialize).BeginInit() @@ -111,6 +111,17 @@ Partial Class frmdynMailvorlagen Me.mainPanel.Size = New System.Drawing.Size(1283, 457) Me.mainPanel.TabIndex = 101 ' + 'TextBox2 + ' + Me.TextBox2.BackColor = System.Drawing.SystemColors.Control + Me.TextBox2.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.TextBox2.Location = New System.Drawing.Point(469, 3) + Me.TextBox2.Name = "TextBox2" + Me.TextBox2.Size = New System.Drawing.Size(409, 13) + Me.TextBox2.TabIndex = 47 + Me.TextBox2.Text = "* %KdNr%; %Mahntext%; %KdName%, %Mahnstufe%" + Me.TextBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'cbxTyp ' Me.cbxTyp._allowedValuesFreiText = Nothing @@ -551,17 +562,6 @@ Partial Class frmdynMailvorlagen Me.dgvMailvorlagen.Size = New System.Drawing.Size(1283, 365) Me.dgvMailvorlagen.TabIndex = 104 ' - 'TextBox2 - ' - Me.TextBox2.BackColor = System.Drawing.SystemColors.Control - Me.TextBox2.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.TextBox2.Location = New System.Drawing.Point(469, 3) - Me.TextBox2.Name = "TextBox2" - Me.TextBox2.Size = New System.Drawing.Size(409, 13) - Me.TextBox2.TabIndex = 47 - Me.TextBox2.Text = "* %KdNr%; %Mahntext%; %KdName%" - Me.TextBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' 'frmdynMailvorlagen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) From fa8d9ae20938dfb31ada753cdfddb216a9d1e30d Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 13 May 2025 15:54:07 +0200 Subject: [PATCH 4/4] Mahnung, Kundebearbeiten, USTVA-Antrag --- SDL/USTV/frmMDM_USTVAntrag.Designer.vb | 219 ++++---- SDL/USTV/frmMDM_USTVAntrag.vb | 15 +- SDL/USTV/ustCntlUSTV_ErstattungPosition .vb | 12 +- SDL/buchhaltung/frmBU_Mahnlauf.vb | 12 +- .../usrcntlKundeBearbeitenFull.Designer.vb | 522 ++++++++++-------- SDL/kunden/usrcntlKundeBearbeitenFull.vb | 27 + .../Classes/USTV/cUSTVAntrag.vb | 5 +- 7 files changed, 482 insertions(+), 330 deletions(-) diff --git a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb index fe2b4650..8d57723e 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb @@ -40,6 +40,7 @@ Partial Class frmMDM_USTVAntrag Me.Button1 = New System.Windows.Forms.Button() Me.lbl_EintrageVerarbetiet = New System.Windows.Forms.Label() Me.pnlHeader = New System.Windows.Forms.Panel() + Me.cbxRGretour = New System.Windows.Forms.CheckBox() Me.lblGesamtUSteuer = New System.Windows.Forms.Label() Me.lblDiffernezbetrag = New System.Windows.Forms.Label() Me.lblGesamtErstattung = New System.Windows.Forms.Label() @@ -50,6 +51,10 @@ Partial Class frmMDM_USTVAntrag Me.cbxLand = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lblLand = New System.Windows.Forms.Label() Me.Panel8 = New System.Windows.Forms.Panel() + Me.Label16 = New System.Windows.Forms.Label() + Me.txtRZam = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label17 = New System.Windows.Forms.Label() + Me.txtRZ = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label15 = New System.Windows.Forms.Label() Me.txtVZam = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.btnAbfertigungsNrVergeben = New System.Windows.Forms.Button() @@ -107,6 +112,7 @@ Partial Class frmMDM_USTVAntrag Me.dgvUSTVPositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.pnlAntragsPosDetails = New System.Windows.Forms.Panel() Me.Panel2 = New System.Windows.Forms.Panel() + Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition() Me.Panel4 = New System.Windows.Forms.Panel() Me.cbxKIUploaddelete = New System.Windows.Forms.CheckBox() Me.scanUSTVA = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() @@ -117,18 +123,13 @@ Partial Class frmMDM_USTVAntrag Me.Panel3 = New System.Windows.Forms.Panel() Me.dgvErstattungspositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.pnlErstattungsdetails = New System.Windows.Forms.Panel() + Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition() Me.Panel1 = New System.Windows.Forms.Panel() Me.Button2 = New System.Windows.Forms.Button() Me.Button3 = New System.Windows.Forms.Button() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.cnS_KIUPLOAD = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition() - Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition() - Me.Label16 = New System.Windows.Forms.Label() - Me.txtRZam = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label17 = New System.Windows.Forms.Label() - Me.txtRZ = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.pnlBottom.SuspendLayout() CType(Me.pb_Beleg, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.picExcel, System.ComponentModel.ISupportInitialize).BeginInit() @@ -331,6 +332,7 @@ Partial Class frmMDM_USTVAntrag 'pnlHeader ' Me.pnlHeader.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.pnlHeader.Controls.Add(Me.cbxRGretour) Me.pnlHeader.Controls.Add(Me.lblGesamtUSteuer) Me.pnlHeader.Controls.Add(Me.lblDiffernezbetrag) Me.pnlHeader.Controls.Add(Me.lblGesamtErstattung) @@ -355,6 +357,18 @@ Partial Class frmMDM_USTVAntrag Me.pnlHeader.Size = New System.Drawing.Size(1454, 201) Me.pnlHeader.TabIndex = 0 ' + 'cbxRGretour + ' + Me.cbxRGretour.AutoSize = True + Me.cbxRGretour.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxRGretour.ForeColor = System.Drawing.Color.White + Me.cbxRGretour.Location = New System.Drawing.Point(483, 13) + Me.cbxRGretour.Name = "cbxRGretour" + Me.cbxRGretour.Size = New System.Drawing.Size(89, 20) + Me.cbxRGretour.TabIndex = 52 + Me.cbxRGretour.Text = "RG Retour" + Me.cbxRGretour.UseVisualStyleBackColor = True + ' 'lblGesamtUSteuer ' Me.lblGesamtUSteuer.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -532,6 +546,82 @@ Partial Class frmMDM_USTVAntrag Me.Panel8.Size = New System.Drawing.Size(973, 115) Me.Panel8.TabIndex = 19 ' + 'Label16 + ' + Me.Label16.AutoSize = True + Me.Label16.BackColor = System.Drawing.Color.Transparent + Me.Label16.Cursor = System.Windows.Forms.Cursors.Hand + Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label16.ForeColor = System.Drawing.Color.Black + Me.Label16.Location = New System.Drawing.Point(800, 91) + Me.Label16.Name = "Label16" + Me.Label16.Size = New System.Drawing.Size(54, 17) + Me.Label16.TabIndex = 55 + Me.Label16.Text = "RZ am:" + ' + 'txtRZam + ' + Me.txtRZam._DateTimeOnly = False + Me.txtRZam._numbersOnly = False + Me.txtRZam._numbersOnlyKommastellen = "" + Me.txtRZam._numbersOnlyTrennzeichen = False + Me.txtRZam._Prozent = False + Me.txtRZam._ShortDateNew = False + Me.txtRZam._ShortDateOnly = True + Me.txtRZam._TimeOnly = False + Me.txtRZam._TimeOnly_Seconds = False + Me.txtRZam._value = "" + Me.txtRZam._Waehrung = False + Me.txtRZam._WaehrungZeichen = False + Me.txtRZam.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.txtRZam.ForeColor = System.Drawing.Color.Black + Me.txtRZam.Location = New System.Drawing.Point(865, 87) + Me.txtRZam.MaxLength = 10 + Me.txtRZam.MaxLineLength = -1 + Me.txtRZam.MaxLines_Warning = "" + Me.txtRZam.MaxLines_Warning_Label = Nothing + Me.txtRZam.Name = "txtRZam" + Me.txtRZam.Size = New System.Drawing.Size(100, 23) + Me.txtRZam.TabIndex = 56 + ' + 'Label17 + ' + Me.Label17.AutoSize = True + Me.Label17.BackColor = System.Drawing.Color.Transparent + Me.Label17.Cursor = System.Windows.Forms.Cursors.Hand + Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label17.ForeColor = System.Drawing.Color.Black + Me.Label17.Location = New System.Drawing.Point(524, 91) + Me.Label17.Name = "Label17" + Me.Label17.Size = New System.Drawing.Size(94, 17) + Me.Label17.TabIndex = 53 + Me.Label17.Text = "Rückzahlung:" + ' + 'txtRZ + ' + Me.txtRZ._DateTimeOnly = False + Me.txtRZ._numbersOnly = True + Me.txtRZ._numbersOnlyKommastellen = "" + Me.txtRZ._numbersOnlyTrennzeichen = True + Me.txtRZ._Prozent = False + Me.txtRZ._ShortDateNew = False + Me.txtRZ._ShortDateOnly = False + Me.txtRZ._TimeOnly = False + Me.txtRZ._TimeOnly_Seconds = False + Me.txtRZ._value = "" + Me.txtRZ._Waehrung = True + Me.txtRZ._WaehrungZeichen = True + Me.txtRZ.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.txtRZ.ForeColor = System.Drawing.Color.Black + Me.txtRZ.Location = New System.Drawing.Point(654, 87) + Me.txtRZ.MaxLength = 10 + Me.txtRZ.MaxLineLength = -1 + Me.txtRZ.MaxLines_Warning = "" + Me.txtRZ.MaxLines_Warning_Label = Nothing + Me.txtRZ.Name = "txtRZ" + Me.txtRZ.Size = New System.Drawing.Size(125, 23) + Me.txtRZ.TabIndex = 54 + ' 'Label15 ' Me.Label15.AutoSize = True @@ -1402,6 +1492,14 @@ Partial Class frmMDM_USTVAntrag Me.Panel2.Size = New System.Drawing.Size(1438, 263) Me.Panel2.TabIndex = 1 ' + 'UstCntlUSTV_AntragPosition1 + ' + Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0) + Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1" + Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1282, 261) + Me.UstCntlUSTV_AntragPosition1.TabIndex = 0 + ' 'Panel4 ' Me.Panel4.BackColor = System.Drawing.Color.WhiteSmoke @@ -1497,7 +1595,7 @@ Partial Class frmMDM_USTVAntrag 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(1444, 444) + Me.TabPage2.Size = New System.Drawing.Size(1444, 415) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Erstattungspositionen" Me.TabPage2.UseVisualStyleBackColor = True @@ -1511,7 +1609,7 @@ Partial Class frmMDM_USTVAntrag Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel3.Location = New System.Drawing.Point(3, 3) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(1438, 438) + Me.Panel3.Size = New System.Drawing.Size(1438, 409) Me.Panel3.TabIndex = 3 ' 'dgvErstattungspositionen @@ -1532,7 +1630,7 @@ Partial Class frmMDM_USTVAntrag Me.dgvErstattungspositionen.RowHeadersVisible = False Me.dgvErstattungspositionen.RowHeadersWidth = 62 Me.dgvErstattungspositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvErstattungspositionen.Size = New System.Drawing.Size(1438, 172) + Me.dgvErstattungspositionen.Size = New System.Drawing.Size(1438, 143) Me.dgvErstattungspositionen.TabIndex = 1 ' 'pnlErstattungsdetails @@ -1542,11 +1640,19 @@ Partial Class frmMDM_USTVAntrag Me.pnlErstattungsdetails.Controls.Add(Me.UstCntlUSTV_AntragErstattungen1) Me.pnlErstattungsdetails.Controls.Add(Me.Panel1) Me.pnlErstattungsdetails.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlErstattungsdetails.Location = New System.Drawing.Point(0, 175) + Me.pnlErstattungsdetails.Location = New System.Drawing.Point(0, 146) Me.pnlErstattungsdetails.Name = "pnlErstattungsdetails" Me.pnlErstattungsdetails.Size = New System.Drawing.Size(1436, 261) Me.pnlErstattungsdetails.TabIndex = 0 ' + 'UstCntlUSTV_AntragErstattungen1 + ' + Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0) + Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1" + Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1280, 259) + Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2 + ' 'Panel1 ' Me.Panel1.BackColor = System.Drawing.Color.WhiteSmoke @@ -1602,98 +1708,6 @@ Partial Class frmMDM_USTVAntrag Me.cnS_KIUPLOAD.Name = "ContextMenuStrip1" Me.cnS_KIUPLOAD.Size = New System.Drawing.Size(61, 4) ' - 'UstCntlUSTV_AntragPosition1 - ' - Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0) - Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1" - Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1282, 261) - Me.UstCntlUSTV_AntragPosition1.TabIndex = 0 - ' - 'UstCntlUSTV_AntragErstattungen1 - ' - Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0) - Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1" - Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1280, 259) - Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2 - ' - 'Label16 - ' - Me.Label16.AutoSize = True - Me.Label16.BackColor = System.Drawing.Color.Transparent - Me.Label16.Cursor = System.Windows.Forms.Cursors.Hand - Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label16.ForeColor = System.Drawing.Color.Black - Me.Label16.Location = New System.Drawing.Point(800, 91) - Me.Label16.Name = "Label16" - Me.Label16.Size = New System.Drawing.Size(54, 17) - Me.Label16.TabIndex = 55 - Me.Label16.Text = "RZ am:" - ' - 'txtRZam - ' - Me.txtRZam._DateTimeOnly = False - Me.txtRZam._numbersOnly = False - Me.txtRZam._numbersOnlyKommastellen = "" - Me.txtRZam._numbersOnlyTrennzeichen = False - Me.txtRZam._Prozent = False - Me.txtRZam._ShortDateNew = False - Me.txtRZam._ShortDateOnly = True - Me.txtRZam._TimeOnly = False - Me.txtRZam._TimeOnly_Seconds = False - Me.txtRZam._value = "" - Me.txtRZam._Waehrung = False - Me.txtRZam._WaehrungZeichen = False - Me.txtRZam.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.txtRZam.ForeColor = System.Drawing.Color.Black - Me.txtRZam.Location = New System.Drawing.Point(865, 87) - Me.txtRZam.MaxLength = 10 - Me.txtRZam.MaxLineLength = -1 - Me.txtRZam.MaxLines_Warning = "" - Me.txtRZam.MaxLines_Warning_Label = Nothing - Me.txtRZam.Name = "txtRZam" - Me.txtRZam.Size = New System.Drawing.Size(100, 23) - Me.txtRZam.TabIndex = 56 - ' - 'Label17 - ' - Me.Label17.AutoSize = True - Me.Label17.BackColor = System.Drawing.Color.Transparent - Me.Label17.Cursor = System.Windows.Forms.Cursors.Hand - Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label17.ForeColor = System.Drawing.Color.Black - Me.Label17.Location = New System.Drawing.Point(524, 91) - Me.Label17.Name = "Label17" - Me.Label17.Size = New System.Drawing.Size(94, 17) - Me.Label17.TabIndex = 53 - Me.Label17.Text = "Rückzahlung:" - ' - 'txtRZ - ' - Me.txtRZ._DateTimeOnly = False - Me.txtRZ._numbersOnly = True - Me.txtRZ._numbersOnlyKommastellen = "" - Me.txtRZ._numbersOnlyTrennzeichen = True - Me.txtRZ._Prozent = False - Me.txtRZ._ShortDateNew = False - Me.txtRZ._ShortDateOnly = False - Me.txtRZ._TimeOnly = False - Me.txtRZ._TimeOnly_Seconds = False - Me.txtRZ._value = "" - Me.txtRZ._Waehrung = True - Me.txtRZ._WaehrungZeichen = True - Me.txtRZ.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.txtRZ.ForeColor = System.Drawing.Color.Black - Me.txtRZ.Location = New System.Drawing.Point(654, 87) - Me.txtRZ.MaxLength = 10 - Me.txtRZ.MaxLineLength = -1 - Me.txtRZ.MaxLines_Warning = "" - Me.txtRZ.MaxLines_Warning_Label = Nothing - Me.txtRZ.Name = "txtRZ" - Me.txtRZ.Size = New System.Drawing.Size(125, 23) - Me.txtRZ.TabIndex = 54 - ' 'frmMDM_USTVAntrag ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1843,4 +1857,5 @@ Partial Class frmMDM_USTVAntrag Friend WithEvents txtRZam As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label17 As Label Friend WithEvents txtRZ As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents cbxRGretour As CheckBox End Class diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 2d0bedc7..9891b8d1 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -336,6 +336,7 @@ Public Class frmMDM_USTVAntrag txtEingereichtAm.Text = If(USTV_ANTRAG.UStVAn_AntragEingereichtAm, "") cbxFiliale.changeItem(If(USTV_ANTRAG.FilialenNr, "")) cbxWahrung.changeItem(If(USTV_ANTRAG.UStVAn_Währungscode, "")) + cbxRGretour.Checked = USTV_ANTRAG.UStVAn_RGRetour End Sub @@ -350,6 +351,8 @@ Public Class frmMDM_USTVAntrag USTV_ANTRAG.UStVAn_AntragArt = cboAntragArt._value USTV_ANTRAG.UStVAn_StatusText = rtbStatusText.Text + USTV_ANTRAG.UStVAn_RGRetour = cbxRGretour.Checked + USTV_ANTRAG.FilialenNr = cbxFiliale._value USTV_ANTRAG.FilialenNr = cbxFiliale._value @@ -1014,7 +1017,7 @@ Public Class frmMDM_USTVAntrag USTV_POS.UStVPo_ReDat = r.Item("rmc_reDatum") USTV_POS.UStVPo_ReNr = r.Item("rmc_reNr").ToString USTV_POS.UStVPo_SchnittstellenNr = bytSchnittstellenNr - USTV_POS.UStVPo_daId = r.Item("rmc_daId") + 'USTV_POS.UStVPo_daId = r.Item("rmc_daId") If IsNumeric(USTV_POS.UStVPo_daId) AndAlso USTV_POS.UStVPo_daId > 0 Then USTV_POS.UStVPo_daId_loeschbar = False Else @@ -3140,6 +3143,16 @@ Public Class frmMDM_USTVAntrag End Sub + Private Sub cbxRGretour_CheckedChanged(sender As Object, e As EventArgs) Handles cbxRGretour.CheckedChanged + + If cbxRGretour.Checked Then + cbxRGretour.ForeColor = Color.Red + Else + cbxRGretour.ForeColor = Color.White + End If + + End Sub + Private Sub initScanUSTVA() If USTV_ANTRAG IsNot Nothing Then scanUSTVA.INIT(USTV_ANTRAG.UStVAn_KuNr, "MDM", "USTVA_KI_" & USTV_ANTRAG.UStVAn_ID) diff --git a/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb b/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb index add5c64e..d15a5d78 100644 --- a/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb +++ b/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb @@ -225,7 +225,7 @@ Public Class ustCntlUSTV_ErstattungPosition ' txtUSTBetrag.Text = Math.Floor((txtUSTBetragEUR._value * txtUmrechnungskurs._value) * 100 + 0.5) / 100 ' 'values_changed() 'End If - + If IsNumeric(txtUSTBetragEUR) Then txtChanged = True If IsNumeric(txtUSTBetragEUR.Text) AndAlso IsNumeric(txtUSTBetrag.Text) Then @@ -250,19 +250,29 @@ Public Class ustCntlUSTV_ErstattungPosition If txtBelegDatum.Text <> "" Then txtBelegDatum.Text = txtBelegDatum.Text.Replace("-", ".") End If + txtChanged = True ElseIf sender Is txtBerufungsdatum Then If txtBerufungsdatum.Text <> "" Then txtBerufungsdatum.Text = txtBerufungsdatum.Text.Replace("-", ".") End If + txtChanged = True ElseIf sender Is txtGuDatum Then If txtGuDatum.Text <> "" Then txtGuDatum.Text = txtGuDatum.Text.Replace("-", ".") End If + txtChanged = True + + ElseIf sender Is txtBemerkung Then + + If txtBemerkung.Text <> "" Then + txtBemerkung.Text = txtBemerkung.Text + End If + txtChanged = True End If End If diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.vb b/SDL/buchhaltung/frmBU_Mahnlauf.vb index 665b8dd1..392e562a 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb @@ -391,13 +391,13 @@ Public Class frmBU_Mahnlauf Select Case Sprache Case "EN" rpt.lblSummeUeberschrift.Text = "Total:" - rpt.lblSteuersatz.Text = "Late payment interest of 9.5% p.a. from due date" - rpt.lblZwText.Text = "Dunning fee" + rpt.lblSteuersatz.Text = "Interest for late payment 9.5% " + rpt.lblZwText.Text = "Reminder Fee" rpt.lblZwischensumme.Text = "Subtotal" Case "RO" rpt.lblSummeUeberschrift.Text = "Total:" - rpt.lblSteuersatz.Text = "Late payment interest of 9.5% p.a. from due date" - rpt.lblZwText.Text = "Dunning fee" + rpt.lblSteuersatz.Text = "Penalitati întârziere la plată 9,5 % " + rpt.lblZwText.Text = "Taxa somatie" rpt.lblZwischensumme.Text = "Subtotal" End Select @@ -1112,6 +1112,8 @@ Public Class frmBU_Mahnlauf Private Shared Sub getMahnstufetextMDM(MAHNSTUFE, ByRef MahnTEXT_VOR, ByRef MahnTEXT_NACH, ByRef MAHNTEXT) + 'nur Deutsch, weil übersetzung über tblTranslate! + Select Case MAHNSTUFE Case -2 MahnTEXT_VOR = "Nachstehend ersehen Sie die Übersicht Ihrer offenen Rechnungen:" @@ -1504,7 +1506,7 @@ Public Class frmBU_Mahnlauf End If End If - 'noch keine unterscheidung der Abteilungen bei MDM, daher hardcodiert. + 'noch keine Unterscheidung der Abteilungen bei MDM, daher hardcodiert. Dim MautVertrMail = "z.batinic@verag.ag;alex@verag.ag;maut.ro@verag.ag;ma@verag.ag;n.ljubas@verag.ag;s.vidovic@verag.ag;" Dim MautFaktMail = "s.kriegner@verag.ag;" diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb index 9d328acd..c8b32820 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb @@ -23,28 +23,31 @@ Partial Class usrcntlKundeBearbeitenFull 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() - Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle32 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle33 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle34 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle35 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle36 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle37 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle38 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle39 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle40 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle41 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle42 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle43 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle44 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle45 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle46 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle47 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle48 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle49 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle50 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.tbcntrDetails = New System.Windows.Forms.TabControl() Me.tbAbfertigung = New System.Windows.Forms.TabPage() Me.cbxVerzolltBeiExport = New System.Windows.Forms.CheckBox() @@ -101,6 +104,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.UsrCntlKundeFiskaldaten1 = New SDL.usrCntlKundeFiskaldaten() Me.tbVerrechnung = New System.Windows.Forms.TabPage() Me.pnlverag360 = New System.Windows.Forms.Panel() + Me.txtFR = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.cbxFR = New System.Windows.Forms.CheckBox() Me.txtAnmerkungAntraege = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.gbMWSTAntraege = New System.Windows.Forms.GroupBox() Me.rbJ = New System.Windows.Forms.RadioButton() @@ -257,6 +262,10 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtUSt_GVAusgestelltAm = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtUSt_GVAngefordertAm = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.tbSonstiges = New System.Windows.Forms.TabPage() + Me.Label113 = New System.Windows.Forms.Label() + Me.Label112 = New System.Windows.Forms.Label() + Me.dgvIDS_Rabatte = New System.Windows.Forms.DataGridView() + Me.lblIDS_Rabatte = New System.Windows.Forms.Label() Me.txtSumVerag = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtSonst_KdNrVerag = New System.Windows.Forms.TextBox() Me.Label110 = New System.Windows.Forms.Label() @@ -393,8 +402,6 @@ 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.txtFR = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.cbxFR = New System.Windows.Forms.CheckBox() Me.tbcntrDetails.SuspendLayout() Me.tbAbfertigung.SuspendLayout() Me.tbcntrAbf.SuspendLayout() @@ -420,6 +427,7 @@ Partial Class usrcntlKundeBearbeitenFull CType(Me.dgvMWST, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvUstv_LaenderUndSteuernummern, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbSonstiges.SuspendLayout() + CType(Me.dgvIDS_Rabatte, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvSonst_IDSKunden, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbSchnittstellen.SuspendLayout() CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -1194,6 +1202,41 @@ Partial Class usrcntlKundeBearbeitenFull Me.pnlverag360.Size = New System.Drawing.Size(252, 169) Me.pnlverag360.TabIndex = 49 ' + 'txtFR + ' + Me.txtFR._DateTimeOnly = False + Me.txtFR._numbersOnly = False + Me.txtFR._numbersOnlyKommastellen = "" + Me.txtFR._numbersOnlyTrennzeichen = False + Me.txtFR._Prozent = False + Me.txtFR._ShortDateNew = False + Me.txtFR._ShortDateOnly = False + Me.txtFR._TimeOnly = False + Me.txtFR._TimeOnly_Seconds = False + Me.txtFR._value = "" + Me.txtFR._Waehrung = False + Me.txtFR._WaehrungZeichen = False + Me.txtFR.ForeColor = System.Drawing.Color.Red + Me.txtFR.Location = New System.Drawing.Point(110, 146) + Me.txtFR.MaxLength = 10 + Me.txtFR.MaxLineLength = -1 + Me.txtFR.MaxLines_Warning = "" + Me.txtFR.MaxLines_Warning_Label = Nothing + Me.txtFR.Name = "txtFR" + Me.txtFR.Size = New System.Drawing.Size(123, 20) + Me.txtFR.TabIndex = 51 + ' + 'cbxFR + ' + Me.cbxFR.AutoSize = True + Me.cbxFR.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxFR.Location = New System.Drawing.Point(8, 146) + Me.cbxFR.Name = "cbxFR" + Me.cbxFR.Size = New System.Drawing.Size(100, 17) + Me.cbxFR.TabIndex = 50 + Me.cbxFR.Text = "Fremdrechnung" + Me.cbxFR.UseVisualStyleBackColor = True + ' 'txtAnmerkungAntraege ' Me.txtAnmerkungAntraege._DateTimeOnly = False @@ -3023,8 +3066,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvUmsatzbericht.AllowUserToDeleteRows = False Me.dgvUmsatzbericht.AllowUserToOrderColumns = True Me.dgvUmsatzbericht.AllowUserToResizeRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle32.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle32 Me.dgvUmsatzbericht.BackgroundColor = System.Drawing.Color.White Me.dgvUmsatzbericht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvUmsatzbericht.Location = New System.Drawing.Point(6, 25) @@ -3123,8 +3166,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvOffenePosten.AllowUserToDeleteRows = False Me.dgvOffenePosten.AllowUserToOrderColumns = True Me.dgvOffenePosten.AllowUserToResizeRows = False - DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle33.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle33 Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvOffenePosten.Location = New System.Drawing.Point(6, 38) @@ -3285,41 +3328,41 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvKreditkarten.AllowUserToDeleteRows = False Me.dgvKreditkarten.AllowUserToOrderColumns = True Me.dgvKreditkarten.AllowUserToResizeRows = False - DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle34.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle34 Me.dgvKreditkarten.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle35.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle35.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle35.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle35 Me.dgvKreditkarten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle5 + DataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle36.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle36 Me.dgvKreditkarten.Location = New System.Drawing.Point(9, 20) Me.dgvKreditkarten.MultiSelect = False Me.dgvKreditkarten.Name = "dgvKreditkarten" Me.dgvKreditkarten.ReadOnly = True - DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle6 + DataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle37.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle37.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle37.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle37.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle37.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle37 Me.dgvKreditkarten.RowHeadersVisible = False - DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle7 + DataGridViewCellStyle38.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle38 Me.dgvKreditkarten.RowTemplate.DefaultCellStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.dgvKreditkarten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvKreditkarten.Size = New System.Drawing.Size(642, 312) @@ -3399,26 +3442,26 @@ Partial Class usrcntlKundeBearbeitenFull ' 'dgvMWST ' - DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvMWST.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8 + DataGridViewCellStyle39.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvMWST.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle39 Me.dgvMWST.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvMWST.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle9 + DataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle40.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle40.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle40.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle40.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle40.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvMWST.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle40 Me.dgvMWST.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvMWST.DefaultCellStyle = DataGridViewCellStyle10 + DataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle41.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle41.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle41.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle41.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle41.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvMWST.DefaultCellStyle = DataGridViewCellStyle41 Me.dgvMWST.Location = New System.Drawing.Point(9, 359) Me.dgvMWST.Name = "dgvMWST" Me.dgvMWST.Size = New System.Drawing.Size(171, 125) @@ -3503,26 +3546,26 @@ Partial Class usrcntlKundeBearbeitenFull ' 'dgvUstv_LaenderUndSteuernummern ' - DataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11 + DataGridViewCellStyle42.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle42 Me.dgvUstv_LaenderUndSteuernummern.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle12 + DataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle43.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle43.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle43.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle43.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle43.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle43 Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvUstv_LaenderUndSteuernummern.DefaultCellStyle = DataGridViewCellStyle13 + DataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle44.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle44.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle44.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle44.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle44.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle44.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvUstv_LaenderUndSteuernummern.DefaultCellStyle = DataGridViewCellStyle44 Me.dgvUstv_LaenderUndSteuernummern.Location = New System.Drawing.Point(9, 94) Me.dgvUstv_LaenderUndSteuernummern.Name = "dgvUstv_LaenderUndSteuernummern" Me.dgvUstv_LaenderUndSteuernummern.Size = New System.Drawing.Size(657, 259) @@ -3658,6 +3701,10 @@ Partial Class usrcntlKundeBearbeitenFull ' 'tbSonstiges ' + Me.tbSonstiges.Controls.Add(Me.Label113) + Me.tbSonstiges.Controls.Add(Me.Label112) + Me.tbSonstiges.Controls.Add(Me.dgvIDS_Rabatte) + Me.tbSonstiges.Controls.Add(Me.lblIDS_Rabatte) Me.tbSonstiges.Controls.Add(Me.txtSumVerag) Me.tbSonstiges.Controls.Add(Me.txtSonst_KdNrVerag) Me.tbSonstiges.Controls.Add(Me.Label110) @@ -3699,6 +3746,67 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbSonstiges.Text = "Sonstiges" Me.tbSonstiges.UseVisualStyleBackColor = True ' + 'Label113 + ' + Me.Label113.AutoSize = True + Me.Label113.Enabled = False + Me.Label113.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label113.Location = New System.Drawing.Point(6, 34) + Me.Label113.Name = "Label113" + Me.Label113.Size = New System.Drawing.Size(28, 13) + Me.Label113.TabIndex = 36 + Me.Label113.Text = "IDS:" + Me.Label113.Visible = False + ' + 'Label112 + ' + Me.Label112.AutoSize = True + Me.Label112.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label112.Location = New System.Drawing.Point(425, 92) + Me.Label112.Name = "Label112" + Me.Label112.Size = New System.Drawing.Size(119, 13) + Me.Label112.TabIndex = 35 + Me.Label112.Text = "CSV-Daten bereitstellen" + ' + 'dgvIDS_Rabatte + ' + Me.dgvIDS_Rabatte.AllowUserToResizeRows = False + DataGridViewCellStyle26.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvIDS_Rabatte.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle26 + Me.dgvIDS_Rabatte.BackgroundColor = System.Drawing.Color.White + DataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvIDS_Rabatte.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle27 + Me.dgvIDS_Rabatte.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle28.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvIDS_Rabatte.DefaultCellStyle = DataGridViewCellStyle28 + Me.dgvIDS_Rabatte.Location = New System.Drawing.Point(9, 317) + Me.dgvIDS_Rabatte.MultiSelect = False + Me.dgvIDS_Rabatte.Name = "dgvIDS_Rabatte" + Me.dgvIDS_Rabatte.Size = New System.Drawing.Size(657, 172) + Me.dgvIDS_Rabatte.TabIndex = 34 + ' + 'lblIDS_Rabatte + ' + Me.lblIDS_Rabatte.AutoSize = True + Me.lblIDS_Rabatte.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblIDS_Rabatte.Location = New System.Drawing.Point(7, 301) + Me.lblIDS_Rabatte.Name = "lblIDS_Rabatte" + Me.lblIDS_Rabatte.Size = New System.Drawing.Size(100, 13) + Me.lblIDS_Rabatte.TabIndex = 33 + Me.lblIDS_Rabatte.Text = "IDS-Rabatte/Preise" + ' 'txtSumVerag ' Me.txtSumVerag._DateTimeOnly = False @@ -3714,7 +3822,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtSumVerag._Waehrung = False Me.txtSumVerag._WaehrungZeichen = True Me.txtSumVerag.ForeColor = System.Drawing.Color.Black - Me.txtSumVerag.Location = New System.Drawing.Point(254, 230) + Me.txtSumVerag.Location = New System.Drawing.Point(258, 163) Me.txtSumVerag.MaxLineLength = -1 Me.txtSumVerag.MaxLines_Warning = "" Me.txtSumVerag.MaxLines_Warning_Label = Nothing @@ -3724,7 +3832,7 @@ Partial Class usrcntlKundeBearbeitenFull ' 'txtSonst_KdNrVerag ' - Me.txtSonst_KdNrVerag.Location = New System.Drawing.Point(119, 231) + Me.txtSonst_KdNrVerag.Location = New System.Drawing.Point(123, 164) Me.txtSonst_KdNrVerag.MaxLength = 20 Me.txtSonst_KdNrVerag.Name = "txtSonst_KdNrVerag" Me.txtSonst_KdNrVerag.Size = New System.Drawing.Size(122, 20) @@ -3735,7 +3843,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.Label110.AutoSize = True Me.Label110.Enabled = False Me.Label110.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label110.Location = New System.Drawing.Point(6, 233) + Me.Label110.Location = New System.Drawing.Point(7, 163) Me.Label110.Name = "Label110" Me.Label110.Size = New System.Drawing.Size(82, 13) Me.Label110.TabIndex = 30 @@ -3755,7 +3863,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.Label99.AutoSize = True Me.Label99.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label99.Location = New System.Drawing.Point(6, 34) + Me.Label99.Location = New System.Drawing.Point(427, 9) Me.Label99.Name = "Label99" Me.Label99.Size = New System.Drawing.Size(71, 13) Me.Label99.TabIndex = 24 @@ -3763,34 +3871,36 @@ Partial Class usrcntlKundeBearbeitenFull ' 'txtCreditsafe ' - Me.txtCreditsafe.Location = New System.Drawing.Point(119, 31) + Me.txtCreditsafe.Location = New System.Drawing.Point(540, 6) Me.txtCreditsafe.Name = "txtCreditsafe" Me.txtCreditsafe.Size = New System.Drawing.Size(122, 20) Me.txtCreditsafe.TabIndex = 23 ' 'txtSonst_KdNrTOBB ' - Me.txtSonst_KdNrTOBB.Location = New System.Drawing.Point(119, 208) + Me.txtSonst_KdNrTOBB.Location = New System.Drawing.Point(540, 50) Me.txtSonst_KdNrTOBB.MaxLength = 20 Me.txtSonst_KdNrTOBB.Name = "txtSonst_KdNrTOBB" Me.txtSonst_KdNrTOBB.Size = New System.Drawing.Size(122, 20) Me.txtSonst_KdNrTOBB.TabIndex = 22 + Me.txtSonst_KdNrTOBB.Visible = False ' 'Label96 ' Me.Label96.AutoSize = True Me.Label96.Enabled = False Me.Label96.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label96.Location = New System.Drawing.Point(6, 211) + Me.Label96.Location = New System.Drawing.Point(427, 53) Me.Label96.Name = "Label96" Me.Label96.Size = New System.Drawing.Size(83, 13) Me.Label96.TabIndex = 21 Me.Label96.Text = "KdNr bei TOBB:" + Me.Label96.Visible = False ' 'txtSonst_KdNrPLOSE ' Me.txtSonst_KdNrPLOSE.Enabled = False - Me.txtSonst_KdNrPLOSE.Location = New System.Drawing.Point(119, 182) + Me.txtSonst_KdNrPLOSE.Location = New System.Drawing.Point(123, 134) Me.txtSonst_KdNrPLOSE.Name = "txtSonst_KdNrPLOSE" Me.txtSonst_KdNrPLOSE.Size = New System.Drawing.Size(122, 20) Me.txtSonst_KdNrPLOSE.TabIndex = 20 @@ -3800,7 +3910,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.Label83.AutoSize = True Me.Label83.Enabled = False Me.Label83.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label83.Location = New System.Drawing.Point(6, 185) + Me.Label83.Location = New System.Drawing.Point(7, 134) Me.Label83.Name = "Label83" Me.Label83.Size = New System.Drawing.Size(89, 13) Me.Label83.TabIndex = 19 @@ -3810,7 +3920,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.Label76.AutoSize = True Me.Label76.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label76.Location = New System.Drawing.Point(4, 262) + Me.Label76.Location = New System.Drawing.Point(7, 192) Me.Label76.Name = "Label76" Me.Label76.Size = New System.Drawing.Size(65, 13) Me.Label76.TabIndex = 17 @@ -3819,75 +3929,75 @@ Partial Class usrcntlKundeBearbeitenFull 'dgvSonst_IDSKunden ' Me.dgvSonst_IDSKunden.AllowUserToResizeRows = False - DataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14 + DataGridViewCellStyle29.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle29 Me.dgvSonst_IDSKunden.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSonst_IDSKunden.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle15 + DataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle30.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle30.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle30.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle30.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle30.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSonst_IDSKunden.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle30 Me.dgvSonst_IDSKunden.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvSonst_IDSKunden.DefaultCellStyle = DataGridViewCellStyle16 - Me.dgvSonst_IDSKunden.Location = New System.Drawing.Point(9, 308) + DataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle31.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvSonst_IDSKunden.DefaultCellStyle = DataGridViewCellStyle31 + Me.dgvSonst_IDSKunden.Location = New System.Drawing.Point(9, 214) Me.dgvSonst_IDSKunden.MultiSelect = False Me.dgvSonst_IDSKunden.Name = "dgvSonst_IDSKunden" - Me.dgvSonst_IDSKunden.Size = New System.Drawing.Size(657, 144) + Me.dgvSonst_IDSKunden.Size = New System.Drawing.Size(657, 84) Me.dgvSonst_IDSKunden.TabIndex = 18 ' 'cbxSonst_CsvAsfinag ' Me.cbxSonst_CsvAsfinag.AutoSize = True - Me.cbxSonst_CsvAsfinag.Location = New System.Drawing.Point(114, 261) + Me.cbxSonst_CsvAsfinag.Location = New System.Drawing.Point(428, 131) Me.cbxSonst_CsvAsfinag.Name = "cbxSonst_CsvAsfinag" - Me.cbxSonst_CsvAsfinag.Size = New System.Drawing.Size(264, 17) + Me.cbxSonst_CsvAsfinag.Size = New System.Drawing.Size(136, 17) Me.cbxSonst_CsvAsfinag.TabIndex = 15 - Me.cbxSonst_CsvAsfinag.Text = "ASFINAG-Abrechnungsdaten als CSV bereitstellen" + Me.cbxSonst_CsvAsfinag.Text = "AT-Abrechnungsdaten " Me.cbxSonst_CsvAsfinag.UseVisualStyleBackColor = True ' 'cbxSonst_CsvUTA ' Me.cbxSonst_CsvUTA.AutoSize = True - Me.cbxSonst_CsvUTA.Location = New System.Drawing.Point(429, 155) + Me.cbxSonst_CsvUTA.Location = New System.Drawing.Point(428, 177) Me.cbxSonst_CsvUTA.Name = "cbxSonst_CsvUTA" - Me.cbxSonst_CsvUTA.Size = New System.Drawing.Size(240, 17) + Me.cbxSonst_CsvUTA.Size = New System.Drawing.Size(144, 17) Me.cbxSonst_CsvUTA.TabIndex = 14 - Me.cbxSonst_CsvUTA.Text = "UTA-Abrechnungsdaten als CSV bereitstellen" + Me.cbxSonst_CsvUTA.Text = "UTA-Abrechnungsdaten " Me.cbxSonst_CsvUTA.UseVisualStyleBackColor = True ' 'cbxSonst_CsvMSE ' Me.cbxSonst_CsvMSE.AutoSize = True - Me.cbxSonst_CsvMSE.Location = New System.Drawing.Point(429, 103) + Me.cbxSonst_CsvMSE.Location = New System.Drawing.Point(428, 154) Me.cbxSonst_CsvMSE.Name = "cbxSonst_CsvMSE" - Me.cbxSonst_CsvMSE.Size = New System.Drawing.Size(241, 17) + Me.cbxSonst_CsvMSE.Size = New System.Drawing.Size(142, 17) Me.cbxSonst_CsvMSE.TabIndex = 9 - Me.cbxSonst_CsvMSE.Text = "MSE-Abrechnungsdaten als CSV bereitstellen" + Me.cbxSonst_CsvMSE.Text = "MSE-Abrechnungsdaten" Me.cbxSonst_CsvMSE.UseVisualStyleBackColor = True ' 'cbxSonst_CsvMautbericht ' Me.cbxSonst_CsvMautbericht.AutoSize = True - Me.cbxSonst_CsvMautbericht.Location = New System.Drawing.Point(429, 7) + Me.cbxSonst_CsvMautbericht.Location = New System.Drawing.Point(428, 111) Me.cbxSonst_CsvMautbericht.Name = "cbxSonst_CsvMautbericht" - Me.cbxSonst_CsvMautbericht.Size = New System.Drawing.Size(181, 17) + Me.cbxSonst_CsvMautbericht.Size = New System.Drawing.Size(82, 17) Me.cbxSonst_CsvMautbericht.TabIndex = 2 - Me.cbxSonst_CsvMautbericht.Text = "Mautbericht als CSV bereitstellen" + Me.cbxSonst_CsvMautbericht.Text = "Mautbericht" Me.cbxSonst_CsvMautbericht.UseVisualStyleBackColor = True ' 'txtSonst_KdNrUTA ' - Me.txtSonst_KdNrUTA.Location = New System.Drawing.Point(119, 156) + Me.txtSonst_KdNrUTA.Location = New System.Drawing.Point(123, 108) Me.txtSonst_KdNrUTA.Name = "txtSonst_KdNrUTA" Me.txtSonst_KdNrUTA.Size = New System.Drawing.Size(122, 20) Me.txtSonst_KdNrUTA.TabIndex = 13 @@ -3896,7 +4006,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.Label75.AutoSize = True Me.Label75.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label75.Location = New System.Drawing.Point(6, 159) + Me.Label75.Location = New System.Drawing.Point(7, 108) Me.Label75.Name = "Label75" Me.Label75.Size = New System.Drawing.Size(76, 13) Me.Label75.TabIndex = 12 @@ -3904,7 +4014,7 @@ Partial Class usrcntlKundeBearbeitenFull ' 'txtSonst_KdNrTelepass ' - Me.txtSonst_KdNrTelepass.Location = New System.Drawing.Point(119, 130) + Me.txtSonst_KdNrTelepass.Location = New System.Drawing.Point(540, 73) Me.txtSonst_KdNrTelepass.Name = "txtSonst_KdNrTelepass" Me.txtSonst_KdNrTelepass.Size = New System.Drawing.Size(122, 20) Me.txtSonst_KdNrTelepass.TabIndex = 11 @@ -3913,7 +4023,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.Label74.AutoSize = True Me.Label74.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label74.Location = New System.Drawing.Point(6, 133) + Me.Label74.Location = New System.Drawing.Point(425, 76) Me.Label74.Name = "Label74" Me.Label74.Size = New System.Drawing.Size(109, 13) Me.Label74.TabIndex = 10 @@ -3921,7 +4031,7 @@ Partial Class usrcntlKundeBearbeitenFull ' 'txtSonst_KdNrMSE ' - Me.txtSonst_KdNrMSE.Location = New System.Drawing.Point(119, 104) + Me.txtSonst_KdNrMSE.Location = New System.Drawing.Point(123, 79) Me.txtSonst_KdNrMSE.Name = "txtSonst_KdNrMSE" Me.txtSonst_KdNrMSE.Size = New System.Drawing.Size(122, 20) Me.txtSonst_KdNrMSE.TabIndex = 8 @@ -3930,7 +4040,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.Label73.AutoSize = True Me.Label73.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label73.Location = New System.Drawing.Point(6, 107) + Me.Label73.Location = New System.Drawing.Point(7, 79) Me.Label73.Name = "Label73" Me.Label73.Size = New System.Drawing.Size(77, 13) Me.Label73.TabIndex = 7 @@ -3938,7 +4048,7 @@ Partial Class usrcntlKundeBearbeitenFull ' 'txtSonst_KdNrWOELFL ' - Me.txtSonst_KdNrWOELFL.Location = New System.Drawing.Point(119, 78) + Me.txtSonst_KdNrWOELFL.Location = New System.Drawing.Point(123, 53) Me.txtSonst_KdNrWOELFL.Name = "txtSonst_KdNrWOELFL" Me.txtSonst_KdNrWOELFL.Size = New System.Drawing.Size(122, 20) Me.txtSonst_KdNrWOELFL.TabIndex = 6 @@ -3947,7 +4057,7 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.Label72.AutoSize = True Me.Label72.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label72.Location = New System.Drawing.Point(6, 81) + Me.Label72.Location = New System.Drawing.Point(7, 53) Me.Label72.Name = "Label72" Me.Label72.Size = New System.Drawing.Size(78, 13) Me.Label72.TabIndex = 5 @@ -3956,21 +4066,23 @@ Partial Class usrcntlKundeBearbeitenFull 'txtSonst_KdNrIDS ' Me.txtSonst_KdNrIDS.Enabled = False - Me.txtSonst_KdNrIDS.Location = New System.Drawing.Point(119, 52) + Me.txtSonst_KdNrIDS.Location = New System.Drawing.Point(540, 28) Me.txtSonst_KdNrIDS.Name = "txtSonst_KdNrIDS" Me.txtSonst_KdNrIDS.Size = New System.Drawing.Size(122, 20) Me.txtSonst_KdNrIDS.TabIndex = 4 + Me.txtSonst_KdNrIDS.Visible = False ' 'Label70 ' Me.Label70.AutoSize = True Me.Label70.Enabled = False Me.Label70.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label70.Location = New System.Drawing.Point(6, 55) + Me.Label70.Location = New System.Drawing.Point(427, 28) Me.Label70.Name = "Label70" Me.Label70.Size = New System.Drawing.Size(72, 13) Me.Label70.TabIndex = 3 Me.Label70.Text = "KdNr bei IDS:" + Me.Label70.Visible = False ' 'Label71 ' @@ -3997,7 +4109,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtSumPLOSE._Waehrung = False Me.txtSumPLOSE._WaehrungZeichen = True Me.txtSumPLOSE.ForeColor = System.Drawing.Color.Black - Me.txtSumPLOSE.Location = New System.Drawing.Point(254, 182) + Me.txtSumPLOSE.Location = New System.Drawing.Point(258, 134) Me.txtSumPLOSE.MaxLineLength = -1 Me.txtSumPLOSE.MaxLines_Warning = "" Me.txtSumPLOSE.MaxLines_Warning_Label = Nothing @@ -4020,7 +4132,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtSumUTA._Waehrung = False Me.txtSumUTA._WaehrungZeichen = True Me.txtSumUTA.ForeColor = System.Drawing.Color.Black - Me.txtSumUTA.Location = New System.Drawing.Point(254, 159) + Me.txtSumUTA.Location = New System.Drawing.Point(258, 111) Me.txtSumUTA.MaxLineLength = -1 Me.txtSumUTA.MaxLines_Warning = "" Me.txtSumUTA.MaxLines_Warning_Label = Nothing @@ -4043,7 +4155,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtSumMSE._Waehrung = False Me.txtSumMSE._WaehrungZeichen = True Me.txtSumMSE.ForeColor = System.Drawing.Color.Black - Me.txtSumMSE.Location = New System.Drawing.Point(254, 104) + Me.txtSumMSE.Location = New System.Drawing.Point(258, 79) Me.txtSumMSE.MaxLineLength = -1 Me.txtSumMSE.MaxLines_Warning = "" Me.txtSumMSE.MaxLines_Warning_Label = Nothing @@ -4066,7 +4178,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtSumIDS._Waehrung = False Me.txtSumIDS._WaehrungZeichen = True Me.txtSumIDS.ForeColor = System.Drawing.Color.Black - Me.txtSumIDS.Location = New System.Drawing.Point(254, 52) + Me.txtSumIDS.Location = New System.Drawing.Point(256, 31) Me.txtSumIDS.MaxLineLength = -1 Me.txtSumIDS.MaxLines_Warning = "" Me.txtSumIDS.MaxLines_Warning_Label = Nothing @@ -4082,7 +4194,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.btnSonstAendSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnSonstAendSpeichern.ForeColor = System.Drawing.Color.Black Me.btnSonstAendSpeichern.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnSonstAendSpeichern.Location = New System.Drawing.Point(512, 214) + Me.btnSonstAendSpeichern.Location = New System.Drawing.Point(512, 189) Me.btnSonstAendSpeichern.Name = "btnSonstAendSpeichern" Me.btnSonstAendSpeichern.Size = New System.Drawing.Size(157, 23) Me.btnSonstAendSpeichern.TabIndex = 16 @@ -4147,26 +4259,26 @@ Partial Class usrcntlKundeBearbeitenFull 'DataGridView1 ' Me.DataGridView1.AllowUserToResizeRows = False - DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17 + DataGridViewCellStyle45.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle45 Me.DataGridView1.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.DataGridView1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle18 + DataGridViewCellStyle46.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle46.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle46.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle46.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle46.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle46.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle46.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.DataGridView1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle46 Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.DataGridView1.DefaultCellStyle = DataGridViewCellStyle19 + DataGridViewCellStyle47.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle47.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle47.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle47.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle47.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle47.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle47.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.DataGridView1.DefaultCellStyle = DataGridViewCellStyle47 Me.DataGridView1.Enabled = False Me.DataGridView1.Location = New System.Drawing.Point(6, 111) Me.DataGridView1.MultiSelect = False @@ -4220,26 +4332,26 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.dgvBankverbindungen.AllowUserToDeleteRows = False Me.dgvBankverbindungen.AllowUserToResizeRows = False - DataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvBankverbindungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle20 + DataGridViewCellStyle48.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvBankverbindungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle48 Me.dgvBankverbindungen.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvBankverbindungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle21 + DataGridViewCellStyle49.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle49.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle49.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle49.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle49.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle49.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle49.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvBankverbindungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle49 Me.dgvBankverbindungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvBankverbindungen.DefaultCellStyle = DataGridViewCellStyle22 + DataGridViewCellStyle50.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle50.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle50.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle50.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle50.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle50.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle50.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvBankverbindungen.DefaultCellStyle = DataGridViewCellStyle50 Me.dgvBankverbindungen.Location = New System.Drawing.Point(3, 40) Me.dgvBankverbindungen.MultiSelect = False Me.dgvBankverbindungen.Name = "dgvBankverbindungen" @@ -5368,41 +5480,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.DataGridViewTextBoxColumn2.HeaderText = "E-Mail" Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" ' - 'txtFR - ' - Me.txtFR._DateTimeOnly = False - Me.txtFR._numbersOnly = False - Me.txtFR._numbersOnlyKommastellen = "" - Me.txtFR._numbersOnlyTrennzeichen = False - Me.txtFR._Prozent = False - Me.txtFR._ShortDateNew = False - Me.txtFR._ShortDateOnly = False - Me.txtFR._TimeOnly = False - Me.txtFR._TimeOnly_Seconds = False - Me.txtFR._value = "" - Me.txtFR._Waehrung = False - Me.txtFR._WaehrungZeichen = False - Me.txtFR.ForeColor = System.Drawing.Color.Red - Me.txtFR.Location = New System.Drawing.Point(110, 146) - Me.txtFR.MaxLength = 10 - Me.txtFR.MaxLineLength = -1 - Me.txtFR.MaxLines_Warning = "" - Me.txtFR.MaxLines_Warning_Label = Nothing - Me.txtFR.Name = "txtFR" - Me.txtFR.Size = New System.Drawing.Size(123, 20) - Me.txtFR.TabIndex = 51 - ' - 'cbxFR - ' - Me.cbxFR.AutoSize = True - Me.cbxFR.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxFR.Location = New System.Drawing.Point(8, 146) - Me.cbxFR.Name = "cbxFR" - Me.cbxFR.Size = New System.Drawing.Size(100, 17) - Me.cbxFR.TabIndex = 50 - Me.cbxFR.Text = "Fremdrechnung" - Me.cbxFR.UseVisualStyleBackColor = True - ' 'usrcntlKundeBearbeitenFull ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -5478,6 +5555,7 @@ Partial Class usrcntlKundeBearbeitenFull CType(Me.dgvUstv_LaenderUndSteuernummern, System.ComponentModel.ISupportInitialize).EndInit() Me.tbSonstiges.ResumeLayout(False) Me.tbSonstiges.PerformLayout() + CType(Me.dgvIDS_Rabatte, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.dgvSonst_IDSKunden, System.ComponentModel.ISupportInitialize).EndInit() Me.tbSchnittstellen.ResumeLayout(False) Me.tbSchnittstellen.PerformLayout() @@ -5853,4 +5931,8 @@ Partial Class usrcntlKundeBearbeitenFull Friend WithEvents btnMWSTspeichern As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents txtFR As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents cbxFR As CheckBox + Friend WithEvents dgvIDS_Rabatte As DataGridView + Friend WithEvents lblIDS_Rabatte As Label + Friend WithEvents Label113 As Label + Friend WithEvents Label112 As Label End Class diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index f81d2888..93556951 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -2157,6 +2157,32 @@ End Sub + Private Sub initdgvIDSRabatte() + + + Dim KundeOhneRabatt As Integer = CInt(sql.getValueTxtBySql("select count(*) from tbl_IDS_Kunden_ohne_Rabatt where CustomerCode = " & KUNDE.KundenNr, "FMZOLL")) + lblIDS_Rabatte.Text = "IDS-Rabatte/Preise" & IIf(KundeOhneRabatt > 0, " - KUNDE OHNE RABATT", "") + + With dgvIDS_Rabatte + + + .DataSource = sql.loadDgvBySql("SELECT P.ProductDescription, C.OutletCountry, S.OutletName, RW.Rechenwert, Kz FROM [VERAG].[dbo].[tbl_IDS_Rechenwerte] as RW + left join [VERAG].[dbo].[tbl_IDS_Produkte] as P on P.ProductTypeCode = RW.ProductTypeCode + left join [VERAG].[dbo].[tbl_IDS_Länder] as C on C.OutletCountryCode = RW.OutletCountryCode + left join [VERAG].[dbo].[tbl_IDS_Stationen] as S on S.[OutletCode] = RW.OutletCode where CustomerCode =" & KUNDE.KundenNr, "FMZOLL") + + .ReadOnly = True + + + .Columns(0).HeaderText = "Produkt" + .Columns(1).HeaderText = "Land" + .Columns(2).HeaderText = "Station" + .Columns(4).HeaderText = "Rabatt/Preis" + + End With + + End Sub + Private Sub initdgvOP() With dgvOffenePosten @@ -2265,6 +2291,7 @@ If tbcntrDetails.SelectedTab Is tbSonstiges Then initdgvIDSKunden() + initdgvIDSRabatte() End If If tbcntrDetails.SelectedTab Is tbBankverbindungen Then diff --git a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb index 3ec5fc4e..cdef5b24 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb @@ -57,6 +57,8 @@ Public Class cUSTVAntrag Property UStVAn_Status As Object = Nothing Property UStVAn_StatusText As Object = Nothing Property UStVAn_AntragArt As Object = Nothing + Property UStVAn_RGRetour As Object = Nothing + Property POSITIONEN As New List(Of cUStVPositionen) '= Nothing @@ -123,7 +125,8 @@ Public Class cUSTVAntrag list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVAn_Zeitstempel", UStVAn_Zeitstempel)) ' DATETIME Default (getdate()) NULL, list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVAn_Status", UStVAn_Status)) ' DATETIME Default (getdate()) NULL, list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVAn_StatusText", UStVAn_StatusText)) ' DATETIME Default (getdate()) NULL, - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVAn_AntragArt", UStVAn_AntragArt)) ' DATETIME Default (getdate()) NULL, + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVAn_AntragArt", UStVAn_AntragArt)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVAn_RGRetour", UStVAn_RGRetour)) ' DATETIME Default (getdate()) NULL, Return list