From eb7d05101e3a86e255f7a5cc89547a403aad8653 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 16 Dec 2025 11:20:03 +0100 Subject: [PATCH] ustva, etc. --- SDL/Fakturierung/cFakturierung.vb | 4 +- SDL/USTV/frmMDM_USTVAntrag.Designer.vb | 128 +++++++++--------- SDL/USTV/frmMDM_USTVAntrag.vb | 1 + .../MyTextBox.vb | 24 ++-- 4 files changed, 79 insertions(+), 78 deletions(-) diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index b25a4544..b43a5d95 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -2662,8 +2662,8 @@ Public Class cFakturierung rpt.lblZWSumme.Visible = True If RECHNUNG.Firma_ID = 19 Then 'Bei MDM ausblenden! - rpt.lblSteuersatz.Text = "" - rpt.lblSteuerbetrag.Visible = False + 'rpt.lblSteuersatz.Text = "" + 'rpt.lblSteuerbetrag.Visible = False Else rpt.lblSteuerbetrag.Text = CDbl(getReverseChargeSummeRKID(firma, RECHNUNG)).ToString("N2", CultureInfo.CurrentCulture) rpt.lblSteuersatz.Visible = True diff --git a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb index 1e3788a7..2617090d 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb @@ -24,9 +24,11 @@ Partial Class frmMDM_USTVAntrag Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMDM_USTVAntrag)) - 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 DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.pnlBottom = New System.Windows.Forms.Panel() + Me.Label18 = New System.Windows.Forms.Label() + Me.txtSumme = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.pbMail = New System.Windows.Forms.PictureBox() Me.pb_Beleg = New System.Windows.Forms.PictureBox() Me.Button5 = New System.Windows.Forms.Button() @@ -114,7 +116,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() @@ -125,7 +126,6 @@ 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() @@ -142,8 +142,8 @@ Partial Class frmMDM_USTVAntrag Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() Me.FakturiertToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.txtSumme = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label18 = New System.Windows.Forms.Label() + Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition() + Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition() Me.pnlBottom.SuspendLayout() CType(Me.pbMail, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.pb_Beleg, System.ComponentModel.ISupportInitialize).BeginInit() @@ -196,6 +196,41 @@ Partial Class frmMDM_USTVAntrag Me.pnlBottom.Size = New System.Drawing.Size(1444, 100) Me.pnlBottom.TabIndex = 3 ' + 'Label18 + ' + Me.Label18.AutoSize = True + Me.Label18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label18.Location = New System.Drawing.Point(1090, 58) + Me.Label18.Name = "Label18" + Me.Label18.Size = New System.Drawing.Size(45, 13) + Me.Label18.TabIndex = 54 + Me.Label18.Text = "Summe:" + ' + 'txtSumme + ' + Me.txtSumme._DateTimeOnly = False + Me.txtSumme._numbersOnly = False + Me.txtSumme._numbersOnlyKommastellen = "" + Me.txtSumme._numbersOnlyTrennzeichen = False + Me.txtSumme._Prozent = False + Me.txtSumme._ShortDateNew = False + Me.txtSumme._ShortDateOnly = False + Me.txtSumme._TimeOnly = False + Me.txtSumme._TimeOnly_Seconds = False + Me.txtSumme._value = "" + Me.txtSumme._Waehrung = True + Me.txtSumme._WaehrungZeichen = True + Me.txtSumme.ForeColor = System.Drawing.Color.Black + Me.txtSumme.Location = New System.Drawing.Point(1145, 51) + Me.txtSumme.MaxLineLength = -1 + Me.txtSumme.MaxLines_Warning = "" + Me.txtSumme.MaxLines_Warning_Label = Nothing + Me.txtSumme.Name = "txtSumme" + Me.txtSumme.ReadOnly = True + Me.txtSumme.Size = New System.Drawing.Size(88, 20) + Me.txtSumme.TabIndex = 53 + Me.txtSumme.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'pbMail ' Me.pbMail.Image = CType(resources.GetObject("pbMail.Image"), System.Drawing.Image) @@ -643,7 +678,7 @@ Partial Class frmMDM_USTVAntrag ' Me.txtRZ._DateTimeOnly = False Me.txtRZ._numbersOnly = True - Me.txtRZ._numbersOnlyKommastellen = "" + Me.txtRZ._numbersOnlyKommastellen = "2" Me.txtRZ._numbersOnlyTrennzeichen = True Me.txtRZ._Prozent = False Me.txtRZ._ShortDateNew = False @@ -859,7 +894,7 @@ Partial Class frmMDM_USTVAntrag ' Me.txtVZ._DateTimeOnly = False Me.txtVZ._numbersOnly = True - Me.txtVZ._numbersOnlyKommastellen = "" + Me.txtVZ._numbersOnlyKommastellen = "2" Me.txtVZ._numbersOnlyTrennzeichen = True Me.txtVZ._Prozent = False Me.txtVZ._ShortDateNew = False @@ -1024,7 +1059,7 @@ Partial Class frmMDM_USTVAntrag ' Me.txt3470._DateTimeOnly = False Me.txt3470._numbersOnly = True - Me.txt3470._numbersOnlyKommastellen = "" + Me.txt3470._numbersOnlyKommastellen = "2" Me.txt3470._numbersOnlyTrennzeichen = True Me.txt3470._Prozent = False Me.txt3470._ShortDateNew = False @@ -1497,8 +1532,8 @@ Partial Class frmMDM_USTVAntrag Me.dgvUSTVPositionen.AKTUALISIERUNGS_INTERVALL = 500 Me.dgvUSTVPositionen.AllowUserToAddRows = False Me.dgvUSTVPositionen.AllowUserToDeleteRows = False - DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUSTVPositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUSTVPositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.dgvUSTVPositionen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -1534,14 +1569,6 @@ Partial Class frmMDM_USTVAntrag Me.Panel2.Size = New System.Drawing.Size(1428, 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(1272, 261) - Me.UstCntlUSTV_AntragPosition1.TabIndex = 0 - ' 'Panel4 ' Me.Panel4.BackColor = System.Drawing.Color.WhiteSmoke @@ -1637,7 +1664,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(1434, 415) + Me.TabPage2.Size = New System.Drawing.Size(1434, 433) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Erstattungspositionen" Me.TabPage2.UseVisualStyleBackColor = True @@ -1651,7 +1678,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(1428, 409) + Me.Panel3.Size = New System.Drawing.Size(1428, 427) Me.Panel3.TabIndex = 3 ' 'dgvErstattungspositionen @@ -1659,8 +1686,8 @@ Partial Class frmMDM_USTVAntrag Me.dgvErstattungspositionen.AKTUALISIERUNGS_INTERVALL = 500 Me.dgvErstattungspositionen.AllowUserToAddRows = False Me.dgvErstattungspositionen.AllowUserToDeleteRows = False - DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvErstattungspositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvErstattungspositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 Me.dgvErstattungspositionen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -1672,7 +1699,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(1428, 143) + Me.dgvErstattungspositionen.Size = New System.Drawing.Size(1428, 161) Me.dgvErstattungspositionen.TabIndex = 1 ' 'pnlErstattungsdetails @@ -1682,19 +1709,11 @@ 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, 146) + Me.pnlErstattungsdetails.Location = New System.Drawing.Point(0, 164) Me.pnlErstattungsdetails.Name = "pnlErstattungsdetails" Me.pnlErstattungsdetails.Size = New System.Drawing.Size(1426, 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(1270, 259) - Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2 - ' 'Panel1 ' Me.Panel1.BackColor = System.Drawing.Color.WhiteSmoke @@ -1813,40 +1832,21 @@ Partial Class frmMDM_USTVAntrag Me.FakturiertToolStripMenuItem.Text = "Fakturiert zurücksetzen" Me.FakturiertToolStripMenuItem.Visible = False ' - 'txtSumme + 'UstCntlUSTV_AntragPosition1 ' - Me.txtSumme._DateTimeOnly = False - Me.txtSumme._numbersOnly = False - Me.txtSumme._numbersOnlyKommastellen = "" - Me.txtSumme._numbersOnlyTrennzeichen = False - Me.txtSumme._Prozent = False - Me.txtSumme._ShortDateNew = False - Me.txtSumme._ShortDateOnly = False - Me.txtSumme._TimeOnly = False - Me.txtSumme._TimeOnly_Seconds = False - Me.txtSumme._value = "" - Me.txtSumme._Waehrung = True - Me.txtSumme._WaehrungZeichen = True - Me.txtSumme.ForeColor = System.Drawing.Color.Black - Me.txtSumme.Location = New System.Drawing.Point(1145, 51) - Me.txtSumme.MaxLineLength = -1 - Me.txtSumme.MaxLines_Warning = "" - Me.txtSumme.MaxLines_Warning_Label = Nothing - Me.txtSumme.Name = "txtSumme" - Me.txtSumme.ReadOnly = True - Me.txtSumme.Size = New System.Drawing.Size(88, 20) - Me.txtSumme.TabIndex = 53 - Me.txtSumme.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + 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(1272, 261) + Me.UstCntlUSTV_AntragPosition1.TabIndex = 0 ' - 'Label18 + 'UstCntlUSTV_AntragErstattungen1 ' - Me.Label18.AutoSize = True - Me.Label18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label18.Location = New System.Drawing.Point(1090, 58) - Me.Label18.Name = "Label18" - Me.Label18.Size = New System.Drawing.Size(45, 13) - Me.Label18.TabIndex = 54 - Me.Label18.Text = "Summe:" + 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(1270, 259) + Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2 ' 'frmMDM_USTVAntrag ' diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 2b643877..b90b8284 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -2818,6 +2818,7 @@ Public Class frmMDM_USTVAntrag Dim USTV_POS As New VERAG_PROG_ALLGEMEIN.cUStVPositionen USTV_POS.UStVAn_ID = USTV_POS_temp.UStVAn_ID USTV_POS.UStVPo_ID = USTV_ANTRAG.getMaxPosNr + USTV_POS.UStVPo_interneNr = USTV_ANTRAG.getMaxPosinterneNr USTV_POS.UStVPo_ReDat = USTV_POS_temp.UStVPo_ReDat USTV_POS.UStVPo_ReNr = USTV_POS_temp.UStVPo_ReNr USTV_POS.UStVPo_SchnittstellenNr = -1 diff --git a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/MyTextBox.vb b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/MyTextBox.vb index 47b99a75..0f569611 100644 --- a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/MyTextBox.vb +++ b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/MyTextBox.vb @@ -296,14 +296,14 @@ Public Class MyTextBox pruefungHandled = True Try If Not _numbersOnlyTrennzeichen And IsNumeric(sender.text) Then - Me._value = CLng(sender.text) + Me._value = CDbl(sender.text) ElseIf IsNumeric(_numbersOnlyKommastellen) And IsNumeric(sender.text) Then - sender.text = CLng(sender.text).ToString("N" & _numbersOnlyKommastellen) ' , CultureInfo.InvariantCulture) - Me._value = CLng(sender.text) + sender.text = CDbl(sender.text).ToString("N" & _numbersOnlyKommastellen) ' , CultureInfo.InvariantCulture) + Me._value = CDbl(sender.text) ' Else ' sender.text = CDbl(sender.text) ElseIf IsNumeric(sender.text) Then - Me._value = CLng(sender.text) + Me._value = CDbl(sender.text) Else Me._value = "" End If @@ -591,13 +591,13 @@ Public Class MyTextBox ElseIf _numbersOnly Then If Not _numbersOnlyTrennzeichen And IsNumeric(v) Then - Propvalue = CLng(v) + Propvalue = CDbl(v) Me.Text = v ElseIf IsNumeric(Me._numbersOnlyKommastellen) And IsNumeric(v) Then - Propvalue = CLng(v) - Me.Text = CLng(v).ToString("N" & Me._numbersOnlyKommastellen) ' , CultureInfo.InvariantCulture) + Propvalue = CDbl(v) + Me.Text = CDbl(v).ToString("N" & Me._numbersOnlyKommastellen) ' , CultureInfo.InvariantCulture) ElseIf IsNumeric(v) Then - Propvalue = CLng(v) + Propvalue = CDbl(v) Me.Text = v Else Propvalue = "" @@ -635,11 +635,11 @@ Public Class MyTextBox Try 'String.Format("{0:N2}", CDbl(sender.text)) If Not _numbersOnlyTrennzeichen And IsNumeric(sender.text) Then - sender.text = CLng(sender.text) + sender.text = CDbl(sender.text) ElseIf IsNumeric(_numbersOnlyKommastellen) And IsNumeric(sender.text) Then - sender.text = CLng(sender.text).ToString("N" & _numbersOnlyKommastellen) ' , CultureInfo.InvariantCulture) + sender.text = CDbl(sender.text).ToString("N" & _numbersOnlyKommastellen) ' , CultureInfo.InvariantCulture) Else - sender.text = CLng(sender.text) + sender.text = CDbl(sender.text) End If e.Cancel = False Catch ex As Exception @@ -652,7 +652,7 @@ Public Class MyTextBox If _Waehrung Then Try 'String.Format("{0:N2}", CDbl(sender.text)) - CLng(sender.text).ToString(If(_WaehrungZeichen, "C2", "N2")) + CDbl(sender.text).ToString(If(_WaehrungZeichen, "C2", "N2")) e.Cancel = False Catch ex As Exception errDescription = "Die Eingabe muss eine Zahl sein! (z.B. 123,45)"