From 794df0a03e902b3470f9ce744ae53e880feafc57 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 23 Feb 2026 15:47:39 +0100 Subject: [PATCH] USTVA, Mahnungen,etc. --- .../usrCntlFaktAbrechnung.Designer.vb | 298 +++++++++--------- SDL/USTV/frmMDM_USTVAntrag.Designer.vb | 28 +- SDL/USTV/frmMDM_USTVAntrag.vb | 34 +- SDL/USTV/usrCntlUSTV.vb | 40 ++- SDL/USTV/ustCntlUSTV_AntragPosition.vb | 3 + SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb | 2 +- SDL/buchhaltung/frmBU_Mahnlauf.vb | 29 +- .../Classes/USTV/cUSTVAntrag.vb | 6 +- 8 files changed, 272 insertions(+), 168 deletions(-) diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb index 89fc6214..d529c6e1 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb @@ -23,27 +23,27 @@ Partial Class usrCntlFaktAbrechnung Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle1 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 DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle6 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 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 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 DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle27 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 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 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 resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlFaktAbrechnung)) Me.Label9 = New System.Windows.Forms.Label() Me.Label4 = New System.Windows.Forms.Label() @@ -924,36 +924,36 @@ Partial Class usrCntlFaktAbrechnung Me.dgvAnhaenge.AllowUserToResizeColumns = False Me.dgvAnhaenge.AllowUserToResizeRows = False Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvAnhaenge.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control + 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.WindowText + DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvAnhaenge.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle22 Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvAnhaenge.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.optAnhSel, Me.DataGridViewTextBoxColumn2, Me.clmnBezeichnung, Me.clmnDsId, Me.clmnAnhId}) - DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window - 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.ControlText - DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvAnhaenge.DefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvAnhaenge.DefaultCellStyle = DataGridViewCellStyle25 Me.dgvAnhaenge.Location = New System.Drawing.Point(493, 911) Me.dgvAnhaenge.MultiSelect = False Me.dgvAnhaenge.Name = "dgvAnhaenge" Me.dgvAnhaenge.ReadOnly = True - DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control - 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.WindowText - DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvAnhaenge.RowHeadersDefaultCellStyle = DataGridViewCellStyle5 + DataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle26.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvAnhaenge.RowHeadersDefaultCellStyle = DataGridViewCellStyle26 Me.dgvAnhaenge.RowHeadersVisible = False Me.dgvAnhaenge.RowHeadersWidth = 62 Me.dgvAnhaenge.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect @@ -975,10 +975,10 @@ Partial Class usrCntlFaktAbrechnung ' 'DataGridViewTextBoxColumn2 ' - DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle2.Format = "N0" - DataGridViewCellStyle2.NullValue = Nothing - Me.DataGridViewTextBoxColumn2.DefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle23.Format = "N0" + DataGridViewCellStyle23.NullValue = Nothing + Me.DataGridViewTextBoxColumn2.DefaultCellStyle = DataGridViewCellStyle23 Me.DataGridViewTextBoxColumn2.HeaderText = "Art" Me.DataGridViewTextBoxColumn2.MinimumWidth = 8 Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" @@ -988,9 +988,9 @@ Partial Class usrCntlFaktAbrechnung 'clmnBezeichnung ' Me.clmnBezeichnung.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle3.Format = "c2" - Me.clmnBezeichnung.DefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle24.Format = "c2" + Me.clmnBezeichnung.DefaultCellStyle = DataGridViewCellStyle24 Me.clmnBezeichnung.FillWeight = 121.2598! Me.clmnBezeichnung.HeaderText = "Bezeichnung" Me.clmnBezeichnung.MinimumWidth = 8 @@ -2318,7 +2318,7 @@ Partial Class usrCntlFaktAbrechnung Me.txtKdAuftragsNr.BackColor = System.Drawing.Color.Yellow Me.txtKdAuftragsNr.ForeColor = System.Drawing.Color.Black Me.txtKdAuftragsNr.Location = New System.Drawing.Point(101, 123) - Me.txtKdAuftragsNr.MaxLength = 35 + Me.txtKdAuftragsNr.MaxLength = 50 Me.txtKdAuftragsNr.MaxLineLength = -1 Me.txtKdAuftragsNr.MaxLines_Warning = "" Me.txtKdAuftragsNr.MaxLines_Warning_Label = Nothing @@ -2995,35 +2995,35 @@ Partial Class usrCntlFaktAbrechnung Me.dgvRechnungenPositionen.AllowUserToResizeColumns = False Me.dgvRechnungenPositionen.AllowUserToResizeRows = False Me.dgvRechnungenPositionen.BackgroundColor = System.Drawing.Color.White - 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.dgvRechnungenPositionen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle6 + 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.dgvRechnungenPositionen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle27 Me.dgvRechnungenPositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvRechnungenPositionen.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.Leistung, Me.Anzahl, Me.Preis, Me.SteuerpflichtigerBetrag, Me.SteuerfreierBetrag, Me.Aufschubkonto}) - DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvRechnungenPositionen.DefaultCellStyle = DataGridViewCellStyle11 + DataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle32.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle32.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvRechnungenPositionen.DefaultCellStyle = DataGridViewCellStyle32 Me.dgvRechnungenPositionen.Location = New System.Drawing.Point(10, 258) Me.dgvRechnungenPositionen.Name = "dgvRechnungenPositionen" Me.dgvRechnungenPositionen.ReadOnly = True - 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.dgvRechnungenPositionen.RowHeadersDefaultCellStyle = DataGridViewCellStyle12 + DataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle33.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle33.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvRechnungenPositionen.RowHeadersDefaultCellStyle = DataGridViewCellStyle33 Me.dgvRechnungenPositionen.RowHeadersVisible = False Me.dgvRechnungenPositionen.RowHeadersWidth = 62 Me.dgvRechnungenPositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect @@ -3041,10 +3041,10 @@ Partial Class usrCntlFaktAbrechnung ' 'Anzahl ' - DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle7.Format = "N0" - DataGridViewCellStyle7.NullValue = Nothing - Me.Anzahl.DefaultCellStyle = DataGridViewCellStyle7 + DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle28.Format = "N0" + DataGridViewCellStyle28.NullValue = Nothing + Me.Anzahl.DefaultCellStyle = DataGridViewCellStyle28 Me.Anzahl.HeaderText = "Anzahl" Me.Anzahl.MinimumWidth = 8 Me.Anzahl.Name = "Anzahl" @@ -3053,9 +3053,9 @@ Partial Class usrCntlFaktAbrechnung ' 'Preis ' - DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle8.Format = "c2" - Me.Preis.DefaultCellStyle = DataGridViewCellStyle8 + DataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle29.Format = "c2" + Me.Preis.DefaultCellStyle = DataGridViewCellStyle29 Me.Preis.HeaderText = "Preis" Me.Preis.MinimumWidth = 8 Me.Preis.Name = "Preis" @@ -3064,9 +3064,9 @@ Partial Class usrCntlFaktAbrechnung ' 'SteuerpflichtigerBetrag ' - DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle9.Format = "c2" - Me.SteuerpflichtigerBetrag.DefaultCellStyle = DataGridViewCellStyle9 + DataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle30.Format = "c2" + Me.SteuerpflichtigerBetrag.DefaultCellStyle = DataGridViewCellStyle30 Me.SteuerpflichtigerBetrag.HeaderText = "Steuerpfl." Me.SteuerpflichtigerBetrag.MinimumWidth = 8 Me.SteuerpflichtigerBetrag.Name = "SteuerpflichtigerBetrag" @@ -3075,10 +3075,10 @@ Partial Class usrCntlFaktAbrechnung ' 'SteuerfreierBetrag ' - DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle10.Format = "C2" - DataGridViewCellStyle10.NullValue = Nothing - Me.SteuerfreierBetrag.DefaultCellStyle = DataGridViewCellStyle10 + DataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle31.Format = "C2" + DataGridViewCellStyle31.NullValue = Nothing + Me.SteuerfreierBetrag.DefaultCellStyle = DataGridViewCellStyle31 Me.SteuerfreierBetrag.HeaderText = "Steuerfrei" Me.SteuerfreierBetrag.MinimumWidth = 8 Me.SteuerfreierBetrag.Name = "SteuerfreierBetrag" @@ -3101,41 +3101,41 @@ Partial Class usrCntlFaktAbrechnung Me.dgvOffertenSperrliste.AllowUserToResizeRows = False Me.dgvOffertenSperrliste.BackgroundColor = System.Drawing.Color.White Me.dgvOffertenSperrliste.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D - DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control - 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.WindowText - DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvOffertenSperrliste.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle13 + DataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle34.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvOffertenSperrliste.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle34 Me.dgvOffertenSperrliste.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvOffertenSperrliste.DefaultCellStyle = DataGridViewCellStyle14 + DataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle35.BackColor = System.Drawing.SystemColors.Window + 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.ControlText + DataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvOffertenSperrliste.DefaultCellStyle = DataGridViewCellStyle35 Me.dgvOffertenSperrliste.Location = New System.Drawing.Point(11, 29) Me.dgvOffertenSperrliste.MultiSelect = False Me.dgvOffertenSperrliste.Name = "dgvOffertenSperrliste" Me.dgvOffertenSperrliste.ReadOnly = True - 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.dgvOffertenSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle15 + DataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Control + 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.WindowText + DataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvOffertenSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle36 Me.dgvOffertenSperrliste.RowHeadersVisible = False Me.dgvOffertenSperrliste.RowHeadersWidth = 62 - DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle16.SelectionBackColor = System.Drawing.Color.PapayaWhip - DataGridViewCellStyle16.SelectionForeColor = System.Drawing.Color.Black - Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle16 + DataGridViewCellStyle37.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle37.SelectionBackColor = System.Drawing.Color.PapayaWhip + DataGridViewCellStyle37.SelectionForeColor = System.Drawing.Color.Black + Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle37 Me.dgvOffertenSperrliste.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvOffertenSperrliste.Size = New System.Drawing.Size(204, 201) Me.dgvOffertenSperrliste.TabIndex = 2 @@ -3148,44 +3148,44 @@ Partial Class usrCntlFaktAbrechnung Me.dgvOfferteDetailsUebersicht.AllowUserToDeleteRows = False Me.dgvOfferteDetailsUebersicht.AllowUserToOrderColumns = True Me.dgvOfferteDetailsUebersicht.AllowUserToResizeRows = False - DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17 + DataGridViewCellStyle38.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle38 Me.dgvOfferteDetailsUebersicht.BackgroundColor = System.Drawing.Color.White Me.dgvOfferteDetailsUebersicht.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D - 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.dgvOfferteDetailsUebersicht.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle18 + DataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle39.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle39.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle39.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle39.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle39.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvOfferteDetailsUebersicht.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle39 Me.dgvOfferteDetailsUebersicht.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.dgvOfferteDetailsUebersicht.DefaultCellStyle = DataGridViewCellStyle19 + DataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle40.BackColor = System.Drawing.SystemColors.Window + 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.ControlText + DataGridViewCellStyle40.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle40.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvOfferteDetailsUebersicht.DefaultCellStyle = DataGridViewCellStyle40 Me.dgvOfferteDetailsUebersicht.Location = New System.Drawing.Point(220, 29) Me.dgvOfferteDetailsUebersicht.MultiSelect = False Me.dgvOfferteDetailsUebersicht.Name = "dgvOfferteDetailsUebersicht" - DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvOfferteDetailsUebersicht.RowHeadersDefaultCellStyle = DataGridViewCellStyle20 + DataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle41.BackColor = System.Drawing.SystemColors.Control + 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.WindowText + DataGridViewCellStyle41.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle41.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvOfferteDetailsUebersicht.RowHeadersDefaultCellStyle = DataGridViewCellStyle41 Me.dgvOfferteDetailsUebersicht.RowHeadersVisible = False Me.dgvOfferteDetailsUebersicht.RowHeadersWidth = 62 - DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle21.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer)) - DataGridViewCellStyle21.SelectionForeColor = System.Drawing.Color.Black - Me.dgvOfferteDetailsUebersicht.RowsDefaultCellStyle = DataGridViewCellStyle21 + DataGridViewCellStyle42.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle42.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer)) + DataGridViewCellStyle42.SelectionForeColor = System.Drawing.Color.Black + Me.dgvOfferteDetailsUebersicht.RowsDefaultCellStyle = DataGridViewCellStyle42 Me.dgvOfferteDetailsUebersicht.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvOfferteDetailsUebersicht.Size = New System.Drawing.Size(601, 201) Me.dgvOfferteDetailsUebersicht.TabIndex = 3 diff --git a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb index 3ad7b23a..6a837465 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb @@ -24,8 +24,8 @@ 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 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() Me.pnlBottom = New System.Windows.Forms.Panel() Me.pbXMLExport = New System.Windows.Forms.PictureBox() Me.btnRMCQuartal = New System.Windows.Forms.Button() @@ -144,6 +144,7 @@ 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.cbxInterneNr = New System.Windows.Forms.CheckBox() Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition() Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition() Me.pnlBottom.SuspendLayout() @@ -603,6 +604,7 @@ Partial Class frmMDM_USTVAntrag ' Me.Panel8.BackColor = System.Drawing.Color.WhiteSmoke Me.Panel8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Panel8.Controls.Add(Me.cbxInterneNr) Me.Panel8.Controls.Add(Me.cbxSicherheit) Me.Panel8.Controls.Add(Me.Label16) Me.Panel8.Controls.Add(Me.txtRZam) @@ -1560,8 +1562,8 @@ Partial Class frmMDM_USTVAntrag Me.dgvUSTVPositionen.AKTUALISIERUNGS_INTERVALL = 500 Me.dgvUSTVPositionen.AllowUserToAddRows = False Me.dgvUSTVPositionen.AllowUserToDeleteRows = False - 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 + 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 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) @@ -1714,8 +1716,8 @@ Partial Class frmMDM_USTVAntrag Me.dgvErstattungspositionen.AKTUALISIERUNGS_INTERVALL = 500 Me.dgvErstattungspositionen.AllowUserToAddRows = False Me.dgvErstattungspositionen.AllowUserToDeleteRows = False - 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 + 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 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) @@ -1860,6 +1862,19 @@ Partial Class frmMDM_USTVAntrag Me.FakturiertToolStripMenuItem.Text = "Fakturiert zurücksetzen" Me.FakturiertToolStripMenuItem.Visible = False ' + 'cbxInterneNr + ' + Me.cbxInterneNr.AutoSize = True + Me.cbxInterneNr.BackColor = System.Drawing.Color.Transparent + Me.cbxInterneNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxInterneNr.ForeColor = System.Drawing.Color.Black + Me.cbxInterneNr.Location = New System.Drawing.Point(15, 91) + Me.cbxInterneNr.Name = "cbxInterneNr" + Me.cbxInterneNr.Size = New System.Drawing.Size(141, 20) + Me.cbxInterneNr.TabIndex = 57 + Me.cbxInterneNr.Text = "interne Nr anzeigen" + Me.cbxInterneNr.UseVisualStyleBackColor = False + ' 'UstCntlUSTV_AntragPosition1 ' Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill @@ -2046,4 +2061,5 @@ Partial Class frmMDM_USTVAntrag Friend WithEvents txtSumme As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents btnRMCQuartal As Button Friend WithEvents pbXMLExport As PictureBox + Friend WithEvents cbxInterneNr As CheckBox End Class diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 0090532c..9bb42bac 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -76,7 +76,7 @@ Public Class frmMDM_USTVAntrag ' left join [tblUStVLeistender] as leist on leist.UStV_Leistender = [tblUStVPositionen].[UStVPo_Leistender] ' where UStVAn_ID='" & UStVAn_ID & "' ORDER BY UStVPo_ID", "FMZOLL") - .SET_SQL("SELECT [UStVAn_ID] ,[UStVPo_ID] ,[UStVPo_ReDat],[UStVPo_ReNr],[UStVPo_Leistungsbezeichnung],[UStVPo_Nettobetrag],[UStVPo_NettobetragEUR],[UStVPo_Leistender],leist.[UstV_Leistender_Strasse] + ' ' + leist.[UstV_Leistender_StrasseNr] as [UstV_Leistender_Strasse],leist.[UstV_Leistender_PLZ],leist.[UstV_Leistender_Stadt],leist.[UstV_Leistender_Land],leist.[UstV_Leistender_UstNr],[UStVPo_USteuerbetrag],[UStVPo_Schnittstelle],[UStVPo_SchnittstellenNr],[UStVPo_Umrechnungskurs],[UStVPo_USteuerbetragEUR],[UStVPo_Sachbearbeiter], [UStVPo_daId], [UStVPo_daId_loeschbar] ,[UStVPo_VZ],[UStVPo_VZ_RKID] ,cast(case when isnull([UStVPo_VZ_RKID],0) = 0 then 0 else 1 end as bit) as VZabrechnet + .SET_SQL("SELECT [UStVAn_ID] ,[UStVPo_ID] " & IIf(cbxInterneNr.Checked, ",[UStVPo_interneNr] as intNr", "") & " ,[UStVPo_ReDat],[UStVPo_ReNr],[UStVPo_Leistungsbezeichnung],[UStVPo_Nettobetrag],[UStVPo_NettobetragEUR],[UStVPo_Leistender],leist.[UstV_Leistender_Strasse] + ' ' + leist.[UstV_Leistender_StrasseNr] as [UstV_Leistender_Strasse],leist.[UstV_Leistender_PLZ],leist.[UstV_Leistender_Stadt],leist.[UstV_Leistender_Land],leist.[UstV_Leistender_UstNr],[UStVPo_USteuerbetrag],[UStVPo_Schnittstelle],[UStVPo_SchnittstellenNr],[UStVPo_Umrechnungskurs],[UStVPo_USteuerbetragEUR],[UStVPo_Sachbearbeiter], [UStVPo_daId], [UStVPo_daId_loeschbar] ,[UStVPo_VZ],[UStVPo_VZ_RKID] ,cast(case when isnull([UStVPo_VZ_RKID],0) = 0 then 0 else 1 end as bit) as VZabrechnet FROM [tblUStVPositionen] LEFT JOIN [tblUStVLeistender] as leist ON ([tblUStVPositionen].[UStVPo_LeistenderId] > 0 @@ -1009,7 +1009,7 @@ Public Class frmMDM_USTVAntrag USTV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME USTV_POS.UStVPo_Zeitstempel = Now() - USTV_POS.UStVPo_daId = 0 + USTV_POS.UStVPo_daId = 0 '0 weil immer autom. vom System vergeben (bei SchnittstellenNr 1 wird das Feld daid als Info für die RK_ID verwendet!) Dim rkID = sql.getValueTxtBySql("SELECT TOP(1) isnull(RK_ID,0) FROM Rechnungsausgang where cast(Rechnungsausgang.RechnungsDatum as Date) ='" & USTV_POS.UStVPo_ReDat & "' and Rechnungsausgang.RechnungsNr='" & USTV_POS.UStVPo_ReNr & "' AND FilialenNr = " & r.Item("FilialenNr") & " AND RK_ID is not null", "FMZOLL") @@ -1018,7 +1018,7 @@ Public Class frmMDM_USTVAntrag If USTV_POS.UStVPo_daId > 0 Then USTV_POS.UStVPo_daId_loeschbar = False Else - USTV_POS.UStVPo_daId_loeschbar = True + USTV_POS.UStVPo_daId_loeschbar = False 'bei Schnittstelle Nr1 gehe ich immer davon aus, das eine Rechnung im System existiert!!! End If @@ -2236,7 +2236,11 @@ Public Class frmMDM_USTVAntrag Dim DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "MDM", "MDM", "MDM_DATEN", "USTVA_" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID & "_" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_interneNr, "SONSTIGE", USTV_ANTRAG.UStVAn_KuNr) If DS IsNot Nothing AndAlso DS.da_id IsNot Nothing Then - DS.DELETE_COMPLETE() + If DS.DELETE_COMPLETE() Then + 'löschen nicht vorhandenen Verweis! + SQL.doSQL("update tblUStVPositionen set UStVPo_daId = NULL where UStVAn_ID = " & UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID & " and UStVPo_daId > 0 and isnull(UStVPo_daId, 0) not in (select da_id from tblDatenarchiv) ", "FMZOLL") + + End If End If ElseIf UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_daId > 0 Then @@ -2244,7 +2248,11 @@ Public Class frmMDM_USTVAntrag Dim DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER(UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_daId) If DS IsNot Nothing AndAlso DS.da_id IsNot Nothing Then - DS.DELETE_COMPLETE() + If DS.DELETE_COMPLETE() Then + 'löschen nicht vorhandenen Verweis! + SQL.doSQL("update tblUStVPositionen set UStVPo_daId = NULL where UStVAn_ID = " & UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID & " and UStVPo_daId > 0 and isnull(UStVPo_daId, 0) not in (select da_id from tblDatenarchiv) ", "FMZOLL") + End If + End If End If @@ -4134,6 +4142,18 @@ Public Class frmMDM_USTVAntrag BANK_IBAN = FIRMA.Firma_IBAN1 BANK_BIC = FIRMA.Firma_BIC1 + If BANK_BIC.ToString.Contains("BIC:") Then + BANK_BIC = BANK_BIC.ToString.Replace("BIC:", "") + BANK_BIC = BANK_BIC.Trim() + BANK_BIC = BANK_BIC.ToString.Replace(" ", "") + End If + + If BANK_IBAN.ToString.Contains("IBAN:") Then + BANK_IBAN = BANK_IBAN.ToString.Replace("IBAN:", "") + BANK_IBAN = BANK_IBAN.Trim() + BANK_IBAN = BANK_IBAN.ToString.Replace(" ", "") + End If + Case Else 'Bank aus Kunden! Dim dtBank As New DataTable @@ -4470,6 +4490,10 @@ Public Class frmMDM_USTVAntrag End If End Function + Private Sub cbxInterneNr_CheckedChanged(sender As Object, e As EventArgs) Handles cbxInterneNr.CheckedChanged + init() + End Sub + Private Function setXMLExportVisible(ISOLand As String) Dim valid As Boolean = True diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb index da7ad4e0..364b6251 100644 --- a/SDL/USTV/usrCntlUSTV.vb +++ b/SDL/USTV/usrCntlUSTV.vb @@ -678,6 +678,12 @@ Public Class usrCntlUSTV ContextMenuStrip1.Items.Add(oa) End If + If Not ContextMenuStrip1.Items.ContainsKey("checkPDF") Then + Dim pdf = New ToolStripMenuItem() With {.Text = "PDF-Verknüpfungen prüfen", .Name = "checkPDF", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)} + AddHandler pdf.Click, AddressOf mnuItem_Clicked + ContextMenuStrip1.Items.Add(pdf) + End If + ContextMenuStrip1.Show(Cursor.Position) @@ -724,11 +730,15 @@ Public Class usrCntlUSTV frm.Show() End If + ElseIf item.Name = "checkPDF" Then + checkPDF() Else - MsgBox("Funktion nicht implementiert!") - End If - End If + + MsgBox("Funktion nicht implementiert!") + End If + + End If End Sub @@ -756,6 +766,30 @@ Public Class usrCntlUSTV End Function + Private Function checkPDF(Optional ByRef filepath As String = "", Optional feedback As Boolean = False, Optional openExcel As Boolean = True) As Boolean + + 'INFO -> Schnittstelle beinhaltet ald DA-ID die RK-ID (Feld wird missbraucht!!!) + + Dim sqlStr = "select tblUStVAntrag.UStVAn_ID,[Länderverzeichnis für die Außenhandelsstatistik].LandKz, UStVPo_interneNr, UStVPo_ID, UStVPo_SchnittstellenNr, UStVPo_daId, UStVPo_daId_loeschbar + from tblUStVAntrag + inner join tblUStVPositionen on tblUStVAntrag.UStVAn_ID = tblUStVPositionen.UStVAn_ID + inner join [Länderverzeichnis für die Außenhandelsstatistik] on Landnr = tblUStVAntrag.UStVAn_LandNr + where isnull(UStVPo_daId, 0) <> 0 and isnull(UStVPo_daId, 0) not in (select da_id from tblDatenarchiv) and UStVPo_SchnittstellenNr <> 1 + order by UStVAn_ID " + + Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL") + + 'filepath = "" + If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then + filepath = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, openExcel,,, True) + Return True + Else + MsgBox("Keine Daten!") + Return False + End If + + End Function + Private Sub mailmitExcelauswertung() Try diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.vb index ed325d98..0ee01221 100644 --- a/SDL/USTV/ustCntlUSTV_AntragPosition.vb +++ b/SDL/USTV/ustCntlUSTV_AntragPosition.vb @@ -642,6 +642,9 @@ Public Class ustCntlUSTV_AntragPosition Private Sub scanSonstiges_FileDeleted() Handles scanSonstiges.FileDeleted getValues(UStV_POS, True) UStV_POS.UStVPo_daId = Nothing + + sql.doSQL("update tblUStVPositionen set UStVPo_daId = NULL where UStVAn_ID = " & UStV_POS.UStVAn_ID & " and UStVPo_daId > 0 and isnull(UStVPo_daId, 0) not in (select da_id from tblDatenarchiv) ", "FMZOLL") + If UStV_POS.SAVE() Then RaiseEvent CHANGED(UStV_POS.UStVPo_ID) End Sub diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb b/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb index 72ea74ea..0f250c3d 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb @@ -704,5 +704,5 @@ Partial Class frmBU_Mahnlauf Friend WithEvents Label9 As Label Friend WithEvents lblBetreuer As Label Friend WithEvents cboBetreuer As VERAG_PROG_ALLGEMEIN.MyComboBox - Friend WithEvents cbxNewDGV As CheckBox + Public Shared WithEvents cbxNewDGV As CheckBox End Class diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.vb b/SDL/buchhaltung/frmBU_Mahnlauf.vb index eed51fa6..962526b4 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb @@ -858,10 +858,33 @@ Public Class frmBU_Mahnlauf End If + If Firma_ID = 7 AndAlso (cbxNewDGV IsNot Nothing And cbxNewDGV.Checked) Then + Mail_To = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(AD.AdressenNr, "Mahnung an (ATILLA)") + Mail_CC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(AD.AdressenNr, "Mahnung an (ATILLA)") + Mail_BCC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(AD.AdressenNr, "Mahnung an (ATILLA)") + + Mail_BCC &= "buchhaltung@verag.ag;" + + If Mail_To = "" AndAlso Mail_CC = "" Then 'fallback -> falls nicht korrekt hinterlegt!! + Mail_To = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(AD.AdressenNr, "Mahnung an") + Mail_CC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(AD.AdressenNr, "Mahnung an") + Mail_BCC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(AD.AdressenNr, "Mahnung an") + + Mail_BCC &= "buchhaltung@verag.ag;" + + End If + Else + + Mail_To = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(AD.AdressenNr, "Mahnung an") + Mail_CC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(AD.AdressenNr, "Mahnung an") + Mail_BCC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(AD.AdressenNr, "Mahnung an") + + End If + + + Mail_HTMLBody = "
" & Mail_HTMLBody & "
" - Mail_To = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(AD.AdressenNr, "Mahnung an") - Mail_CC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(AD.AdressenNr, "Mahnung an") - Mail_BCC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(AD.AdressenNr, "Mahnung an") + If Firma_ID = 19 Then Select Case AD.LandKz diff --git a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb index 3987030c..862752af 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb @@ -351,6 +351,8 @@ Public Class cUStVPositionen Property UStVPo_Nettobetrag As Object = Nothing Property UStVPo_NettobetragEUR As Object = Nothing + Public hasEntry = False + Dim SQL As New SQL Sub New(UStVAn_ID, UStVPo_ID) @@ -372,6 +374,8 @@ Public Class cUStVPositionen Public Sub LOAD(UStVAn_ID, UStVPo_ID) Try + hasEntry = False + Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() Using cmd As New SqlCommand("SELECT * FROM [tblUStVPositionen] WHERE UStVAn_ID=@UStVAn_ID AND UStVPo_ID=@UStVPo_ID ", conn) cmd.Parameters.AddWithValue("@UStVAn_ID", UStVAn_ID) @@ -387,7 +391,7 @@ Public Class cUStVPositionen propInfo.SetValue(Me, dr.Item(i.Text)) End If Next - + hasEntry = True End If dr.Close() End Using