diff --git a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb index db99017e..486eacd6 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb @@ -27,6 +27,7 @@ Partial Class frmMDM_USTVAntrag Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMDM_USTVAntrag)) Me.pnlBottom = New System.Windows.Forms.Panel() + Me.Button4 = New System.Windows.Forms.Button() Me.picPDF = New System.Windows.Forms.PictureBox() Me.btnMail = New System.Windows.Forms.Button() Me.btnAntrageeinarbeiten = New System.Windows.Forms.Button() @@ -96,7 +97,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.btnEintragloeschen = New System.Windows.Forms.Button() Me.btnNeuerEintrag = New System.Windows.Forms.Button() @@ -104,13 +104,15 @@ 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.Button4 = New System.Windows.Forms.Button() + Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition() + Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition() + Me.Label14 = New System.Windows.Forms.Label() + Me.txtEingereichtAm = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.pnlBottom.SuspendLayout() CType(Me.picPDF, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnlHeader.SuspendLayout() @@ -150,6 +152,18 @@ Partial Class frmMDM_USTVAntrag Me.pnlBottom.Size = New System.Drawing.Size(1454, 100) Me.pnlBottom.TabIndex = 3 ' + 'Button4 + ' + Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button4.ForeColor = System.Drawing.Color.Black + Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button4.Location = New System.Drawing.Point(979, 30) + Me.Button4.Name = "Button4" + Me.Button4.Size = New System.Drawing.Size(103, 39) + Me.Button4.TabIndex = 28 + Me.Button4.Text = "Sped.-Buch eintragen" + Me.Button4.UseVisualStyleBackColor = True + ' 'picPDF ' Me.picPDF.Image = Global.SDL.My.Resources.Resources.pdf @@ -390,6 +404,8 @@ Partial Class frmMDM_USTVAntrag ' Me.Panel8.BackColor = System.Drawing.Color.WhiteSmoke Me.Panel8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Panel8.Controls.Add(Me.Label14) + Me.Panel8.Controls.Add(Me.txtEingereichtAm) Me.Panel8.Controls.Add(Me.lblMWSTAntrag) Me.Panel8.Controls.Add(Me.Label13) Me.Panel8.Controls.Add(Me.txtGueltig) @@ -424,7 +440,7 @@ Partial Class frmMDM_USTVAntrag Me.lblMWSTAntrag.Cursor = System.Windows.Forms.Cursors.Hand Me.lblMWSTAntrag.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblMWSTAntrag.ForeColor = System.Drawing.Color.Black - Me.lblMWSTAntrag.Location = New System.Drawing.Point(224, 41) + Me.lblMWSTAntrag.Location = New System.Drawing.Point(224, 40) Me.lblMWSTAntrag.Name = "lblMWSTAntrag" Me.lblMWSTAntrag.Size = New System.Drawing.Size(0, 17) Me.lblMWSTAntrag.TabIndex = 25 @@ -436,7 +452,7 @@ Partial Class frmMDM_USTVAntrag Me.Label13.Cursor = System.Windows.Forms.Cursors.Hand Me.Label13.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label13.ForeColor = System.Drawing.Color.Black - Me.Label13.Location = New System.Drawing.Point(10, 65) + Me.Label13.Location = New System.Drawing.Point(10, 64) Me.Label13.Name = "Label13" Me.Label13.Size = New System.Drawing.Size(64, 17) Me.Label13.TabIndex = 24 @@ -458,7 +474,7 @@ Partial Class frmMDM_USTVAntrag Me.txtGueltig._WaehrungZeichen = False Me.txtGueltig.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) Me.txtGueltig.ForeColor = System.Drawing.Color.Black - Me.txtGueltig.Location = New System.Drawing.Point(101, 62) + Me.txtGueltig.Location = New System.Drawing.Point(101, 61) Me.txtGueltig.MaxLength = 10 Me.txtGueltig.MaxLineLength = -1 Me.txtGueltig.MaxLines_Warning = "" @@ -474,7 +490,7 @@ Partial Class frmMDM_USTVAntrag Me.Label11.Cursor = System.Windows.Forms.Cursors.Hand Me.Label11.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label11.ForeColor = System.Drawing.Color.Black - Me.Label11.Location = New System.Drawing.Point(10, 40) + Me.Label11.Location = New System.Drawing.Point(10, 39) Me.Label11.Name = "Label11" Me.Label11.Size = New System.Drawing.Size(74, 17) Me.Label11.TabIndex = 21 @@ -496,7 +512,7 @@ Partial Class frmMDM_USTVAntrag Me.txtStNr._WaehrungZeichen = False Me.txtStNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) Me.txtStNr.ForeColor = System.Drawing.Color.Black - Me.txtStNr.Location = New System.Drawing.Point(101, 37) + Me.txtStNr.Location = New System.Drawing.Point(101, 36) Me.txtStNr.MaxLength = 10 Me.txtStNr.MaxLineLength = -1 Me.txtStNr.MaxLines_Warning = "" @@ -512,7 +528,7 @@ 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(815, 38) + Me.Label9.Location = New System.Drawing.Point(815, 37) Me.Label9.Name = "Label9" Me.Label9.Size = New System.Drawing.Size(30, 17) Me.Label9.TabIndex = 19 @@ -534,7 +550,7 @@ 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, 32) + Me.txtVZ.Location = New System.Drawing.Point(865, 31) Me.txtVZ.MaxLength = 10 Me.txtVZ.MaxLineLength = -1 Me.txtVZ.MaxLines_Warning = "" @@ -559,7 +575,7 @@ 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.Black - Me.txtAbfNr.Location = New System.Drawing.Point(654, 34) + Me.txtAbfNr.Location = New System.Drawing.Point(654, 33) Me.txtAbfNr.MaxLength = 10 Me.txtAbfNr.MaxLineLength = -1 Me.txtAbfNr.MaxLines_Warning = "" @@ -575,7 +591,7 @@ Partial Class frmMDM_USTVAntrag Me.Label8.Cursor = System.Windows.Forms.Cursors.Hand Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label8.ForeColor = System.Drawing.Color.Black - Me.Label8.Location = New System.Drawing.Point(524, 38) + Me.Label8.Location = New System.Drawing.Point(524, 37) Me.Label8.Name = "Label8" Me.Label8.Size = New System.Drawing.Size(112, 17) Me.Label8.TabIndex = 17 @@ -589,7 +605,7 @@ Partial Class frmMDM_USTVAntrag Me.cbxFiliale.DropDownWidth = 150 Me.cbxFiliale.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.cbxFiliale.FormattingEnabled = True - Me.cbxFiliale.Location = New System.Drawing.Point(413, 33) + Me.cbxFiliale.Location = New System.Drawing.Point(413, 32) Me.cbxFiliale.Name = "cbxFiliale" Me.cbxFiliale.Size = New System.Drawing.Size(105, 24) Me.cbxFiliale.TabIndex = 16 @@ -601,7 +617,7 @@ Partial Class frmMDM_USTVAntrag Me.Label4.Cursor = System.Windows.Forms.Cursors.Hand Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label4.ForeColor = System.Drawing.Color.Black - Me.Label4.Location = New System.Drawing.Point(352, 38) + Me.Label4.Location = New System.Drawing.Point(352, 37) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(48, 17) Me.Label4.TabIndex = 15 @@ -614,7 +630,7 @@ Partial Class frmMDM_USTVAntrag Me.Label2.Cursor = System.Windows.Forms.Cursors.Hand Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label2.ForeColor = System.Drawing.Color.Black - Me.Label2.Location = New System.Drawing.Point(524, 9) + Me.Label2.Location = New System.Drawing.Point(524, 8) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(111, 17) Me.Label2.TabIndex = 13 @@ -636,7 +652,7 @@ 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.Black - Me.txtBezugsNr.Location = New System.Drawing.Point(654, 5) + Me.txtBezugsNr.Location = New System.Drawing.Point(654, 4) Me.txtBezugsNr.MaxLength = 10 Me.txtBezugsNr.MaxLineLength = -1 Me.txtBezugsNr.MaxLines_Warning = "" @@ -652,7 +668,7 @@ Partial Class frmMDM_USTVAntrag Me.cbxWahrung._value = "" Me.cbxWahrung.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.cbxWahrung.FormattingEnabled = True - Me.cbxWahrung.Location = New System.Drawing.Point(431, 5) + Me.cbxWahrung.Location = New System.Drawing.Point(431, 4) Me.cbxWahrung.Name = "cbxWahrung" Me.cbxWahrung.Size = New System.Drawing.Size(87, 24) Me.cbxWahrung.TabIndex = 12 @@ -664,7 +680,7 @@ Partial Class frmMDM_USTVAntrag Me.lblWahrung.Cursor = System.Windows.Forms.Cursors.Hand Me.lblWahrung.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblWahrung.ForeColor = System.Drawing.Color.Black - Me.lblWahrung.Location = New System.Drawing.Point(352, 9) + Me.lblWahrung.Location = New System.Drawing.Point(352, 8) Me.lblWahrung.Name = "lblWahrung" Me.lblWahrung.Size = New System.Drawing.Size(70, 17) Me.lblWahrung.TabIndex = 11 @@ -677,7 +693,7 @@ Partial Class frmMDM_USTVAntrag Me.Label1.Cursor = System.Windows.Forms.Cursors.Hand Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label1.ForeColor = System.Drawing.Color.Black - Me.Label1.Location = New System.Drawing.Point(815, 9) + Me.Label1.Location = New System.Drawing.Point(815, 8) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(44, 17) Me.Label1.TabIndex = 10 @@ -699,7 +715,7 @@ Partial Class frmMDM_USTVAntrag Me.txt3470._WaehrungZeichen = True Me.txt3470.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) Me.txt3470.ForeColor = System.Drawing.Color.Black - Me.txt3470.Location = New System.Drawing.Point(865, 3) + Me.txt3470.Location = New System.Drawing.Point(865, 2) Me.txt3470.MaxLength = 10 Me.txt3470.MaxLineLength = -1 Me.txt3470.MaxLines_Warning = "" @@ -715,7 +731,7 @@ Partial Class frmMDM_USTVAntrag Me.Label3.Cursor = System.Windows.Forms.Cursors.Hand Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label3.ForeColor = System.Drawing.Color.Black - Me.Label3.Location = New System.Drawing.Point(10, 13) + Me.Label3.Location = New System.Drawing.Point(10, 12) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(68, 17) Me.Label3.TabIndex = 5 @@ -728,7 +744,7 @@ Partial Class frmMDM_USTVAntrag Me.lblZeitraum.Cursor = System.Windows.Forms.Cursors.Hand Me.lblZeitraum.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblZeitraum.ForeColor = System.Drawing.Color.Black - Me.lblZeitraum.Location = New System.Drawing.Point(207, 12) + Me.lblZeitraum.Location = New System.Drawing.Point(207, 11) Me.lblZeitraum.Name = "lblZeitraum" Me.lblZeitraum.Size = New System.Drawing.Size(14, 17) Me.lblZeitraum.TabIndex = 7 @@ -750,7 +766,7 @@ Partial Class frmMDM_USTVAntrag Me.txtVon._WaehrungZeichen = False Me.txtVon.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) Me.txtVon.ForeColor = System.Drawing.Color.Black - Me.txtVon.Location = New System.Drawing.Point(101, 10) + Me.txtVon.Location = New System.Drawing.Point(101, 9) Me.txtVon.MaxLength = 10 Me.txtVon.MaxLineLength = -1 Me.txtVon.MaxLines_Warning = "" @@ -775,7 +791,7 @@ Partial Class frmMDM_USTVAntrag Me.txtBis._WaehrungZeichen = False Me.txtBis.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) Me.txtBis.ForeColor = System.Drawing.Color.Black - Me.txtBis.Location = New System.Drawing.Point(227, 10) + Me.txtBis.Location = New System.Drawing.Point(227, 9) Me.txtBis.MaxLength = 10 Me.txtBis.MaxLineLength = -1 Me.txtBis.MaxLines_Warning = "" @@ -1197,14 +1213,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 @@ -1301,14 +1309,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 @@ -1359,17 +1359,59 @@ Partial Class frmMDM_USTVAntrag Me.ContextMenuStrip2.Name = "ContextMenuStrip1" Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4) ' - 'Button4 + 'UstCntlUSTV_AntragPosition1 ' - Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button4.ForeColor = System.Drawing.Color.Black - Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button4.Location = New System.Drawing.Point(979, 30) - Me.Button4.Name = "Button4" - Me.Button4.Size = New System.Drawing.Size(103, 39) - Me.Button4.TabIndex = 28 - Me.Button4.Text = "Sped.-Buch eintragen" - Me.Button4.UseVisualStyleBackColor = True + 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 + ' + 'Label14 + ' + Me.Label14.AutoSize = True + Me.Label14.BackColor = System.Drawing.Color.Transparent + 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.Name = "Label14" + Me.Label14.Size = New System.Drawing.Size(101, 17) + Me.Label14.TabIndex = 27 + Me.Label14.Text = "eingereicht am" + ' + 'txtEingereichtAm + ' + Me.txtEingereichtAm._DateTimeOnly = False + Me.txtEingereichtAm._numbersOnly = False + Me.txtEingereichtAm._numbersOnlyKommastellen = "" + Me.txtEingereichtAm._numbersOnlyTrennzeichen = False + Me.txtEingereichtAm._Prozent = False + Me.txtEingereichtAm._ShortDateNew = False + Me.txtEingereichtAm._ShortDateOnly = True + Me.txtEingereichtAm._TimeOnly = False + Me.txtEingereichtAm._TimeOnly_Seconds = False + Me.txtEingereichtAm._value = "" + Me.txtEingereichtAm._Waehrung = False + 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.MaxLength = 10 + Me.txtEingereichtAm.MaxLineLength = -1 + Me.txtEingereichtAm.MaxLines_Warning = "" + Me.txtEingereichtAm.MaxLines_Warning_Label = Nothing + Me.txtEingereichtAm.Name = "txtEingereichtAm" + Me.txtEingereichtAm.Size = New System.Drawing.Size(100, 23) + Me.txtEingereichtAm.TabIndex = 26 ' 'frmMDM_USTVAntrag ' @@ -1499,4 +1541,6 @@ Partial Class frmMDM_USTVAntrag Friend WithEvents Button2 As Button Friend WithEvents Button3 As Button Friend WithEvents Button4 As Button + Friend WithEvents Label14 As Label + Friend WithEvents txtEingereichtAm As VERAG_PROG_ALLGEMEIN.MyTextBox End Class diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index a8e0fa39..e11062e5 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -276,6 +276,7 @@ Public Class frmMDM_USTVAntrag txtVZ.Text = If(USTV_ANTRAG.UStVAn_VZBetrag, "") txtBezugsNr.Text = If(USTV_ANTRAG.UStVAn_BezugsNr, "") txtAbfNr.Text = If(USTV_ANTRAG.AbfertigungsNr, "") + txtEingereichtAm.Text = If(USTV_ANTRAG.UStVAn_AntragEingereichtAm, "") cbxFiliale.changeItem(If(USTV_ANTRAG.FilialenNr, "")) cbxWahrung.changeItem(If(USTV_ANTRAG.UStVAn_Währungscode, "")) @@ -312,43 +313,43 @@ Public Class frmMDM_USTVAntrag USTV_ANTRAG.UStVAn_BezugsNr = txtBezugsNr.Text USTV_ANTRAG.AbfertigungsNr = txtAbfNr.Text - - + If txtEingereichtAm.Text <> "" AndAlso IsDate(txtEingereichtAm.Text) Then USTV_ANTRAG.UStVAn_AntragEingereichtAm = txtEingereichtAm.Text + If txtEingereichtAm.Text = "" Then USTV_ANTRAG.UStVAn_AntragEingereichtAm = Nothing If ADR IsNot Nothing Then - USTV_ANTRAG.UStVAn_KuNr = ADR.AdressenNr - USTV_ANTRAG.UStVAn_Name = ADR.Name_1 - USTV_ANTRAG.UStVAn_Straße = ADR.Straße - USTV_ANTRAG.UStVAn_LandKz = ADR.LandKz - USTV_ANTRAG.UStVAn_Ort = ADR.Ort - USTV_ANTRAG.UStVAn_Steuernummer = ADR.Steuernummer - End If + USTV_ANTRAG.UStVAn_KuNr = ADR.AdressenNr + USTV_ANTRAG.UStVAn_Name = ADR.Name_1 + USTV_ANTRAG.UStVAn_Straße = ADR.Straße + USTV_ANTRAG.UStVAn_LandKz = ADR.LandKz + USTV_ANTRAG.UStVAn_Ort = ADR.Ort + USTV_ANTRAG.UStVAn_Steuernummer = ADR.Steuernummer + End If - If FIRMA IsNot Nothing Then - USTV_ANTRAG.UStVAn_Kontoinhaber = FIRMA.Firma_Bez & "; " & FIRMA.Firma_Straße & ";" & FIRMA.Firma_Ort - USTV_ANTRAG.UStVAn_Bankverbindung = FIRMA.Firma_Bankverbindung1 - USTV_ANTRAG.UStVAn_BLZ = FIRMA.Firma_BLZ1 - USTV_ANTRAG.UStVAn_KTO = FIRMA.Firma_KTO1 + If FIRMA IsNot Nothing Then + USTV_ANTRAG.UStVAn_Kontoinhaber = FIRMA.Firma_Bez & "; " & FIRMA.Firma_Straße & ";" & FIRMA.Firma_Ort + USTV_ANTRAG.UStVAn_Bankverbindung = FIRMA.Firma_Bankverbindung1 + USTV_ANTRAG.UStVAn_BLZ = FIRMA.Firma_BLZ1 + USTV_ANTRAG.UStVAn_KTO = FIRMA.Firma_KTO1 - 'fallback laut FM-ZOLL - If USTV_ANTRAG.UStVAn_Kontoinhaber Is Nothing Then USTV_ANTRAG.UStVAn_Kontoinhaber = "VERAG 360 GmbH; 4975 Suben" - If USTV_ANTRAG.UStVAn_Bankverbindung Is Nothing Then USTV_ANTRAG.UStVAn_Bankverbindung = "Raiba Suben" - If USTV_ANTRAG.UStVAn_KTO Is Nothing Then USTV_ANTRAG.UStVAn_KTO = "4210225" - If USTV_ANTRAG.UStVAn_BLZ Is Nothing Then USTV_ANTRAG.UStVAn_BLZ = "34620" - If USTV_ANTRAG.UStVAn_Gewerbe Is Nothing Then USTV_ANTRAG.UStVAn_Gewerbe = "Transportunternehmer" - If USTV_ANTRAG.UStVAn_Erklärung_9_a Is Nothing Then USTV_ANTRAG.UStVAn_Erklärung_9_a = "Warentransport" - If USTV_ANTRAG.UStVAn_Ausstellungsort Is Nothing Then USTV_ANTRAG.UStVAn_Ausstellungsort = "Suben" + 'fallback laut FM-ZOLL + If USTV_ANTRAG.UStVAn_Kontoinhaber Is Nothing Then USTV_ANTRAG.UStVAn_Kontoinhaber = "VERAG 360 GmbH; 4975 Suben" + If USTV_ANTRAG.UStVAn_Bankverbindung Is Nothing Then USTV_ANTRAG.UStVAn_Bankverbindung = "Raiba Suben" + If USTV_ANTRAG.UStVAn_KTO Is Nothing Then USTV_ANTRAG.UStVAn_KTO = "4210225" + If USTV_ANTRAG.UStVAn_BLZ Is Nothing Then USTV_ANTRAG.UStVAn_BLZ = "34620" + If USTV_ANTRAG.UStVAn_Gewerbe Is Nothing Then USTV_ANTRAG.UStVAn_Gewerbe = "Transportunternehmer" + If USTV_ANTRAG.UStVAn_Erklärung_9_a Is Nothing Then USTV_ANTRAG.UStVAn_Erklärung_9_a = "Warentransport" + If USTV_ANTRAG.UStVAn_Ausstellungsort Is Nothing Then USTV_ANTRAG.UStVAn_Ausstellungsort = "Suben" - If USTV_ANTRAG.UStVAn_Erklärung_9_b_1 Is Nothing Then USTV_ANTRAG.UStVAn_Erklärung_9_b_1 = False - If USTV_ANTRAG.UStVAn_Erklärung_9_b_2 Is Nothing Then USTV_ANTRAG.UStVAn_Erklärung_9_b_2 = False - If USTV_ANTRAG.UStVAn_Erklärung_9_b_3 Is Nothing Then USTV_ANTRAG.UStVAn_Erklärung_9_b_3 = False + If USTV_ANTRAG.UStVAn_Erklärung_9_b_1 Is Nothing Then USTV_ANTRAG.UStVAn_Erklärung_9_b_1 = False + If USTV_ANTRAG.UStVAn_Erklärung_9_b_2 Is Nothing Then USTV_ANTRAG.UStVAn_Erklärung_9_b_2 = False + If USTV_ANTRAG.UStVAn_Erklärung_9_b_3 Is Nothing Then USTV_ANTRAG.UStVAn_Erklärung_9_b_3 = False + End If + End If - End If - End Sub Function Me_Validate() As Boolean If Not IsDate(txtVon._value) Then MsgBox("Datumsformat: Von") : Return False @@ -1334,7 +1335,17 @@ Public Class frmMDM_USTVAntrag End Sub Private Sub btnEingereicht_Click(sender As Object, e As EventArgs) Handles btnEingereicht.Click - cboStatus.changeItem(cUSTVStatus.STAT_EINGEREICHT) + + Dim f As New frmDatumsabfrage("Bitte Einreichtdatum eingeben", False) + f.ShowDialog() + If f.DialogResult = DialogResult.OK Then + Dim pruefdatum As Date = CDate(f.Datum) + USTV_ANTRAG = New VERAG_PROG_ALLGEMEIN.cUSTVAntrag(UStVAn_ID) + USTV_ANTRAG.UStVAn_AntragEingereichtAm = pruefdatum + USTV_ANTRAG.SAVE() + cboStatus.changeItem(cUSTVStatus.STAT_EINGEREICHT) + End If + End Sub Private Sub btnAbgelehnt_Click(sender As Object, e As EventArgs) Handles btnAbgelehnt.Click @@ -1355,7 +1366,8 @@ Public Class frmMDM_USTVAntrag Private Sub Button2_Click(sender As Object, e As EventArgs) Handles btnNeuerEintrag.Click UstCntlUSTV_AntragPosition1.reset() - UstCntlUSTV_AntragPosition1.UStV_POS = Nothing + UstCntlUSTV_AntragPosition1.UStV_POS = New cUStVPositionen(UStVAn_ID) + UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ID = USTV_ANTRAG.getMaxPosNr UstCntlUSTV_AntragPosition1.Enabled = True @@ -2040,7 +2052,8 @@ Public Class frmMDM_USTVAntrag Private Sub Button3_Click_1(sender As Object, e As EventArgs) Handles Button3.Click UstCntlUSTV_AntragErstattungen1.reset() - UstCntlUSTV_AntragErstattungen1.UStV_ERS = Nothing + UstCntlUSTV_AntragErstattungen1.UStV_ERS = New VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen() + UstCntlUSTV_AntragErstattungen1.UStV_ERS.UStVEr_ID = UstCntlUSTV_AntragErstattungen1.UStV_ERS.getMaxPosNr() UstCntlUSTV_AntragErstattungen1.Enabled = True End Sub diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb index 2a4227ce..ec034375 100644 --- a/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb +++ b/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb @@ -439,7 +439,7 @@ Partial Class ustCntlUSTV_AntragPosition Me.btnLeistenderSave.Location = New System.Drawing.Point(876, 162) Me.btnLeistenderSave.Name = "btnLeistenderSave" Me.btnLeistenderSave.Size = New System.Drawing.Size(36, 24) - Me.btnLeistenderSave.TabIndex = 21 + Me.btnLeistenderSave.TabIndex = 16 Me.btnLeistenderSave.TextAlign = System.Drawing.ContentAlignment.TopCenter Me.btnLeistenderSave.UseVisualStyleBackColor = True Me.btnLeistenderSave.Visible = False @@ -466,7 +466,7 @@ Partial Class ustCntlUSTV_AntragPosition Me.sbLeistender.SQL_SELECT = Nothing Me.sbLeistender.SQL_WHERE = Nothing Me.sbLeistender.SQL_WhereParamList = Nothing - Me.sbLeistender.TabIndex = 13 + Me.sbLeistender.TabIndex = 9 Me.sbLeistender.usrcntl = Nothing ' 'pnlAdresse @@ -509,7 +509,7 @@ Partial Class ustCntlUSTV_AntragPosition Me.txtStrasse.MaxLines_Warning_Label = Nothing Me.txtStrasse.Name = "txtStrasse" Me.txtStrasse.Size = New System.Drawing.Size(169, 20) - Me.txtStrasse.TabIndex = 15 + Me.txtStrasse.TabIndex = 10 ' 'txtUIDNr ' @@ -533,7 +533,7 @@ Partial Class ustCntlUSTV_AntragPosition Me.txtUIDNr.MaxLines_Warning_Label = Nothing Me.txtUIDNr.Name = "txtUIDNr" Me.txtUIDNr.Size = New System.Drawing.Size(106, 20) - Me.txtUIDNr.TabIndex = 20 + Me.txtUIDNr.TabIndex = 15 ' 'Label14 ' @@ -587,7 +587,7 @@ Partial Class ustCntlUSTV_AntragPosition Me.txtLand.MaxLines_Warning_Label = Nothing Me.txtLand.Name = "txtLand" Me.txtLand.Size = New System.Drawing.Size(38, 20) - Me.txtLand.TabIndex = 19 + Me.txtLand.TabIndex = 14 ' 'txtPLZ ' @@ -611,7 +611,7 @@ Partial Class ustCntlUSTV_AntragPosition Me.txtPLZ.MaxLines_Warning_Label = Nothing Me.txtPLZ.Name = "txtPLZ" Me.txtPLZ.Size = New System.Drawing.Size(59, 20) - Me.txtPLZ.TabIndex = 17 + Me.txtPLZ.TabIndex = 12 ' 'txtStrassenNr ' @@ -635,7 +635,7 @@ Partial Class ustCntlUSTV_AntragPosition Me.txtStrassenNr.MaxLines_Warning_Label = Nothing Me.txtStrassenNr.Name = "txtStrassenNr" Me.txtStrassenNr.Size = New System.Drawing.Size(45, 20) - Me.txtStrassenNr.TabIndex = 16 + Me.txtStrassenNr.TabIndex = 11 ' 'Label16 ' @@ -669,7 +669,7 @@ Partial Class ustCntlUSTV_AntragPosition Me.txtOrt.MaxLines_Warning_Label = Nothing Me.txtOrt.Name = "txtOrt" Me.txtOrt.Size = New System.Drawing.Size(154, 20) - Me.txtOrt.TabIndex = 18 + Me.txtOrt.TabIndex = 13 ' 'cboSchnittstellennr ' @@ -806,7 +806,7 @@ Partial Class ustCntlUSTV_AntragPosition Me.txtUSTBetragEUR.MaxLines_Warning_Label = Nothing Me.txtUSTBetragEUR.Name = "txtUSTBetragEUR" Me.txtUSTBetragEUR.Size = New System.Drawing.Size(154, 20) - Me.txtUSTBetragEUR.TabIndex = 11 + Me.txtUSTBetragEUR.TabIndex = 19 ' 'txtUmrechnungskurs ' @@ -830,7 +830,7 @@ Partial Class ustCntlUSTV_AntragPosition Me.txtUmrechnungskurs.MaxLines_Warning_Label = Nothing Me.txtUmrechnungskurs.Name = "txtUmrechnungskurs" Me.txtUmrechnungskurs.Size = New System.Drawing.Size(108, 20) - Me.txtUmrechnungskurs.TabIndex = 10 + Me.txtUmrechnungskurs.TabIndex = 18 ' 'txtUSTBetrag ' @@ -854,7 +854,7 @@ Partial Class ustCntlUSTV_AntragPosition Me.txtUSTBetrag.MaxLines_Warning_Label = Nothing Me.txtUSTBetrag.Name = "txtUSTBetrag" Me.txtUSTBetrag.Size = New System.Drawing.Size(154, 20) - Me.txtUSTBetrag.TabIndex = 9 + Me.txtUSTBetrag.TabIndex = 17 ' 'Panel1 ' diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.vb index fa91b51a..597c5b14 100644 --- a/SDL/USTV/ustCntlUSTV_AntragPosition.vb +++ b/SDL/USTV/ustCntlUSTV_AntragPosition.vb @@ -1,5 +1,4 @@ -Imports GrapeCity.ActiveReports.ReportsCore.Tools -Imports VERAG_PROG_ALLGEMEIN +Imports VERAG_PROG_ALLGEMEIN Public Class ustCntlUSTV_AntragPosition Public UStV_POS As VERAG_PROG_ALLGEMEIN.cUStVPositionen = Nothing @@ -32,6 +31,10 @@ Public Class ustCntlUSTV_AntragPosition txtUSTBetragEUR._value = 0 cbxAPI.Checked = False cboSchnittstellennr.changeItem("") + lblAenderungsdatum.Text = "-" + lblSachbearbeiter.Text = "-" + sbLeistender._value = "" + sbLeistender.Text = "" End Sub @@ -80,8 +83,8 @@ Public Class ustCntlUSTV_AntragPosition Sub getValues(ByRef UStV_POS, ByRef save) - If UStV_POS Is Nothing Then UStV_POS = New VERAG_PROG_ALLGEMEIN.cUStVPositionen() - 'UStV_POS. + If UStV_POS Is Nothing OrElse UStV_POS.UStVAn_ID = 0 Then UStV_POS = New VERAG_PROG_ALLGEMEIN.cUStVPositionen() + UStV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME UStV_POS.UStVPo_Zeitstempel = Now @@ -120,6 +123,13 @@ Public Class ustCntlUSTV_AntragPosition save = False End If + If sbLeistender._value IsNot Nothing AndAlso sbLeistender._value <> "" Then + UStV_Leist = New VERAG_PROG_ALLGEMEIN.cUStVLeistender(sbLeistender._value) + UStV_POS.UStVPo_Leistender = UStV_Leist.UStV_Leistender + Else + save = False + End If + UStV_POS.UStVPo_Schnittstelle = cbxAPI.Checked UStV_POS.UStVPo_SchnittstellenNr = IIf(cboSchnittstellennr.SelectedItem IsNot Nothing, cboSchnittstellennr._value, -1) @@ -394,10 +404,15 @@ Public Class ustCntlUSTV_AntragPosition + ElseIf sender Is txtRgDatum Then - End If + If txtRgDatum.Text <> "" Then + txtRgDatum.Text = txtRgDatum.Text.Replace("-", ".") + 'If IsDate(txtRgDatum.Text) Then txtChanged = True + End If + End If End If diff --git a/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb b/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb index f4746a4d..813c3fe1 100644 --- a/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb +++ b/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb @@ -35,8 +35,7 @@ Public Class ustCntlUSTV_ErstattungPosition txtUSTBetrag._value = 0 txtUSTBetragEUR._value = 0 txtBemerkung.Text = "" - - + lblAenderungsdatum.Text = "-" End Sub @@ -239,6 +238,23 @@ Public Class ustCntlUSTV_ErstattungPosition End If + ElseIf sender Is txtBelegDatum Then + + If txtBelegDatum.Text <> "" Then + txtBelegDatum.Text = txtBelegDatum.Text.Replace("-", ".") + End If + + ElseIf sender Is txtBerufungsdatum Then + + If txtBerufungsdatum.Text <> "" Then + txtBerufungsdatum.Text = txtBerufungsdatum.Text.Replace("-", ".") + End If + + ElseIf sender Is txtGuDatum Then + + If txtGuDatum.Text <> "" Then + txtGuDatum.Text = txtGuDatum.Text.Replace("-", ".") + End If End If diff --git a/SDL/frmMain.vb b/SDL/frmMain.vb index d9035f18..30a85ce7 100644 --- a/SDL/frmMain.vb +++ b/SDL/frmMain.vb @@ -1129,7 +1129,7 @@ Public Class frmMain End Sub Private Sub mneFakturierung_Click(sender As Object, e As EventArgs) Handles mneFakturierung.Click - If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG("MDM_Fakturierung", Me) = 0 Then + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG("MDM_Fakturierung", Me) = 0 OrElse VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG("MDM_LIEFERANTENRECHNUNGEN", "SDL") = 0 Then clrPnlMain() Dim usrCntl As New usrcntlFakturierung usrCntl.Dock = System.Windows.Forms.DockStyle.Fill diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb index f8de46a8..4a579447 100644 --- a/SDL/kunden/frmKundenblatt.vb +++ b/SDL/kunden/frmKundenblatt.vb @@ -357,7 +357,7 @@ Public Class frmKundenblatt End Sub Sub initTABFremdrechnungen() - If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG("MDM_Fakturierung", Me) = 0 Then + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG("MDM_Fakturierung", Me) = 0 OrElse VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG("MDM_LIEFERANTENRECHNUNGEN", "SDL") = 0 Then Dim usrcntlTMP As New usrcntlFremdrechnungen usrcntlTMP.Dock = DockStyle.Fill diff --git a/SDL/mdm/usrcntlFremdrechnungen.Designer.vb b/SDL/mdm/usrcntlFremdrechnungen.Designer.vb index f5216b91..9365705b 100644 --- a/SDL/mdm/usrcntlFremdrechnungen.Designer.vb +++ b/SDL/mdm/usrcntlFremdrechnungen.Designer.vb @@ -38,7 +38,6 @@ Partial Class usrcntlFremdrechnungen Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.KundenblattAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Panel1 = New System.Windows.Forms.Panel() - Me.Button2 = New System.Windows.Forms.Button() Me.cbx = New System.Windows.Forms.CheckBox() Me.Label4 = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label() @@ -270,7 +269,6 @@ Partial Class usrcntlFremdrechnungen Me.Panel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.Panel1.BackColor = System.Drawing.SystemColors.ControlLightLight Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.Panel1.Controls.Add(Me.Button2) Me.Panel1.Controls.Add(Me.cbx) Me.Panel1.Controls.Add(Me.Label4) Me.Panel1.Controls.Add(Me.Label2) @@ -290,18 +288,6 @@ Partial Class usrcntlFremdrechnungen Me.Panel1.Size = New System.Drawing.Size(260, 907) Me.Panel1.TabIndex = 23 ' - 'Button2 - ' - Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button2.Location = New System.Drawing.Point(132, 203) - Me.Button2.Name = "Button2" - Me.Button2.Size = New System.Drawing.Size(47, 44) - Me.Button2.TabIndex = 53 - Me.Button2.Text = "Test" - Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button2.UseVisualStyleBackColor = True - ' 'cbx ' Me.cbx.AutoSize = True @@ -571,5 +557,4 @@ Partial Class usrcntlFremdrechnungen Friend WithEvents cbx As CheckBox Friend WithEvents dat_Sum_Bis As DateTimePicker Friend WithEvents dat_Sum_Von As DateTimePicker - Friend WithEvents Button2 As Button End Class diff --git a/SDL/mdm/usrcntlFremdrechnungen.vb b/SDL/mdm/usrcntlFremdrechnungen.vb index 3ffe48ed..b69827bd 100644 --- a/SDL/mdm/usrcntlFremdrechnungen.vb +++ b/SDL/mdm/usrcntlFremdrechnungen.vb @@ -764,7 +764,7 @@ Public Class usrcntlFremdrechnungen SET_SDL(aktSDLNr) End Sub - Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click + Private Sub Button2_Click(sender As Object, e As EventArgs) With dgvLFRechnung diff --git a/SDL/seriendruck/usrCntlFakturierung.Designer.vb b/SDL/seriendruck/usrCntlFakturierung.Designer.vb index 523989ad..e2771f35 100644 --- a/SDL/seriendruck/usrCntlFakturierung.Designer.vb +++ b/SDL/seriendruck/usrCntlFakturierung.Designer.vb @@ -25,6 +25,7 @@ Partial Class usrcntlFakturierung Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrcntlFakturierung)) Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.btnLieferantenrechnungen = New System.Windows.Forms.Button() Me.btnMDMSammelrechnung = New System.Windows.Forms.Button() Me.btnFakturierung = New System.Windows.Forms.Button() Me.btnRechnugnsdaten = New System.Windows.Forms.Button() @@ -85,7 +86,6 @@ Partial Class usrcntlFakturierung Me.Label63 = New System.Windows.Forms.Label() Me.Label45 = New System.Windows.Forms.Label() Me.Button14 = New System.Windows.Forms.Button() - Me.Button4 = New System.Windows.Forms.Button() Me.GroupBox1.SuspendLayout() Me.GBMautberichte.SuspendLayout() CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -102,7 +102,7 @@ Partial Class usrcntlFakturierung ' 'GroupBox1 ' - Me.GroupBox1.Controls.Add(Me.Button4) + Me.GroupBox1.Controls.Add(Me.btnLieferantenrechnungen) Me.GroupBox1.Controls.Add(Me.btnMDMSammelrechnung) Me.GroupBox1.Controls.Add(Me.btnFakturierung) Me.GroupBox1.Controls.Add(Me.btnRechnugnsdaten) @@ -112,6 +112,18 @@ Partial Class usrcntlFakturierung Me.GroupBox1.TabIndex = 0 Me.GroupBox1.TabStop = False ' + 'btnLieferantenrechnungen + ' + Me.btnLieferantenrechnungen.Enabled = False + Me.btnLieferantenrechnungen.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnLieferantenrechnungen.ForeColor = System.Drawing.Color.Black + Me.btnLieferantenrechnungen.Location = New System.Drawing.Point(525, 18) + Me.btnLieferantenrechnungen.Name = "btnLieferantenrechnungen" + Me.btnLieferantenrechnungen.Size = New System.Drawing.Size(139, 44) + Me.btnLieferantenrechnungen.TabIndex = 52 + Me.btnLieferantenrechnungen.Text = "MDM Lieferantenrechnungen" + Me.btnLieferantenrechnungen.UseVisualStyleBackColor = True + ' 'btnMDMSammelrechnung ' Me.btnMDMSammelrechnung.Enabled = False @@ -784,17 +796,6 @@ Partial Class usrcntlFakturierung Me.Button14.Text = "Rechnungspos. berechnen" Me.Button14.UseVisualStyleBackColor = True ' - 'Button4 - ' - Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button4.ForeColor = System.Drawing.Color.Black - Me.Button4.Location = New System.Drawing.Point(525, 18) - Me.Button4.Name = "Button4" - Me.Button4.Size = New System.Drawing.Size(139, 44) - Me.Button4.TabIndex = 52 - Me.Button4.Text = "MDM Lieferantenrechnungen" - Me.Button4.UseVisualStyleBackColor = True - ' 'usrcntlFakturierung ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -887,5 +888,5 @@ Partial Class usrcntlFakturierung Friend WithEvents Label2 As Label Friend WithEvents btnREJdruck As Button Friend WithEvents btnAbfdruck As Button - Friend WithEvents Button4 As Button + Friend WithEvents btnLieferantenrechnungen As Button End Class diff --git a/SDL/seriendruck/usrCntlFakturierung.vb b/SDL/seriendruck/usrCntlFakturierung.vb index 48aea54f..5a24f214 100644 --- a/SDL/seriendruck/usrCntlFakturierung.vb +++ b/SDL/seriendruck/usrCntlFakturierung.vb @@ -59,12 +59,21 @@ Public Class usrcntlFakturierung GBSammelrechnung.Enabled = True btnFakturierung.Enabled = True btnRechnugnsdaten.Enabled = True - + btnLieferantenrechnungen.Enabled = True + GroupBox1.Enabled = True btnAbfdruck.Enabled = True btnREJdruck.Enabled = True End If + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG("MDM_LIEFERANTENRECHNUNGEN", "SDL") = 0 Then + GroupBox1.Enabled = True + btnLieferantenrechnungen.Enabled = True + btnMDMSammelrechnung.Enabled = False + btnFakturierung.Enabled = False + btnRechnugnsdaten.Enabled = False + End If + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMINFUNCTIONS", "SDL") Then Button2.Visible = True Button3.Visible = True @@ -1777,7 +1786,7 @@ Public Class usrcntlFakturierung End Sub - Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click + Private Sub Button4_Click(sender As Object, e As EventArgs) Handles btnLieferantenrechnungen.Click If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG("MDM_Fakturierung", "SDL") = 0 Then diff --git a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb index ccb9f506..7b7edd9c 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb @@ -314,6 +314,11 @@ Public Class cUStVPositionen End Sub + Sub New(UStVAn_ID) + Me.UStVAn_ID = UStVAn_ID + End Sub + + Public Sub LOAD(UStVAn_ID, UStVPo_ID) Try