diff --git a/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb b/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb index 3055b1ce..0ec317c1 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb @@ -25,6 +25,9 @@ Partial Class frmMDMDatenverarbetiung Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMDMDatenverarbetiung)) Me.pnl = New System.Windows.Forms.Panel() + Me.Panel5 = New System.Windows.Forms.Panel() + Me.Label5 = New System.Windows.Forms.Label() + Me.DateTimePicker2 = New System.Windows.Forms.DateTimePicker() Me.PictureBox5 = New System.Windows.Forms.PictureBox() Me.cbxBelegeerstellt = New System.Windows.Forms.CheckBox() Me.cbxASFINAGAbgerechnet = New System.Windows.Forms.CheckBox() @@ -75,10 +78,8 @@ Partial Class frmMDMDatenverarbetiung Me.txtPruefsummeBrutto = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtPruefsummeNetto = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtAnzahl = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Panel5 = New System.Windows.Forms.Panel() - Me.Label5 = New System.Windows.Forms.Label() - Me.DateTimePicker2 = New System.Windows.Forms.DateTimePicker() Me.pnl.SuspendLayout() + Me.Panel5.SuspendLayout() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel4.SuspendLayout() Me.FlowLayoutPanel.SuspendLayout() @@ -89,7 +90,6 @@ Partial Class frmMDMDatenverarbetiung Me.Panel3.SuspendLayout() Me.Panel2.SuspendLayout() CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.Panel5.SuspendLayout() Me.SuspendLayout() ' 'pnl @@ -111,6 +111,33 @@ Partial Class frmMDMDatenverarbetiung Me.pnl.Size = New System.Drawing.Size(1163, 100) Me.pnl.TabIndex = 1 ' + 'Panel5 + ' + Me.Panel5.Controls.Add(Me.Label5) + Me.Panel5.Controls.Add(Me.DateTimePicker2) + Me.Panel5.Location = New System.Drawing.Point(3, 67) + Me.Panel5.Name = "Panel5" + Me.Panel5.Size = New System.Drawing.Size(264, 33) + Me.Panel5.TabIndex = 29 + Me.Panel5.Visible = False + ' + 'Label5 + ' + Me.Label5.AutoSize = True + Me.Label5.Location = New System.Drawing.Point(11, 12) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(113, 13) + Me.Label5.TabIndex = 23 + Me.Label5.Text = "Rechnungsdaten von:" + ' + 'DateTimePicker2 + ' + Me.DateTimePicker2.Format = System.Windows.Forms.DateTimePickerFormat.[Short] + Me.DateTimePicker2.Location = New System.Drawing.Point(143, 6) + Me.DateTimePicker2.Name = "DateTimePicker2" + Me.DateTimePicker2.Size = New System.Drawing.Size(103, 20) + Me.DateTimePicker2.TabIndex = 22 + ' 'PictureBox5 ' Me.PictureBox5.BackgroundImage = Global.SDL.My.Resources.Resources.fragezeichen @@ -712,33 +739,6 @@ Partial Class frmMDMDatenverarbetiung Me.txtAnzahl.TabIndex = 35 Me.txtAnzahl.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' - 'Panel5 - ' - Me.Panel5.Controls.Add(Me.Label5) - Me.Panel5.Controls.Add(Me.DateTimePicker2) - Me.Panel5.Location = New System.Drawing.Point(3, 67) - Me.Panel5.Name = "Panel5" - Me.Panel5.Size = New System.Drawing.Size(264, 33) - Me.Panel5.TabIndex = 29 - Me.Panel5.Visible = False - ' - 'Label5 - ' - Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(11, 12) - Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(113, 13) - Me.Label5.TabIndex = 23 - Me.Label5.Text = "Rechnungsdaten von:" - ' - 'DateTimePicker2 - ' - Me.DateTimePicker2.Format = System.Windows.Forms.DateTimePickerFormat.[Short] - Me.DateTimePicker2.Location = New System.Drawing.Point(143, 6) - Me.DateTimePicker2.Name = "DateTimePicker2" - Me.DateTimePicker2.Size = New System.Drawing.Size(103, 20) - Me.DateTimePicker2.TabIndex = 22 - ' 'frmMDMDatenverarbetiung ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -754,6 +754,8 @@ Partial Class frmMDMDatenverarbetiung Me.Text = "Datenverarbeitung" Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() + Me.Panel5.ResumeLayout(False) + Me.Panel5.PerformLayout() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel4.ResumeLayout(False) Me.Panel4.PerformLayout() @@ -767,8 +769,6 @@ Partial Class frmMDMDatenverarbetiung Me.Panel2.ResumeLayout(False) Me.Panel2.PerformLayout() CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).EndInit() - Me.Panel5.ResumeLayout(False) - Me.Panel5.PerformLayout() Me.ResumeLayout(False) End Sub diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index cd07104d..cd9bed18 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -84,7 +84,9 @@ Public Class frmMDMDatenverarbetiung End Sub Private Sub btnREerstellen_Click_1(sender As Object, e As EventArgs) Handles btnREerstellen.Click + Dim errorTmp = False + If test Then If Not vbYes = MsgBox("Aktuell ist der Testlauf aktiviert, wirklich fortfahren?", vbYesNoCancel) Then Exit Sub @@ -3632,6 +3634,11 @@ Public Class frmMDMDatenverarbetiung End Sub Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + + If test Then + If Not vbYes = MsgBox("Aktuell ist der Testlauf aktiviert, wirklich fortfahren?", vbYesNoCancel) Then Exit Sub + End If + If vbYes = MsgBox("Möchten Sie den Vorgang wirklich manuell ausgeführen (wird bei Rechnungserstellung automatisch ausgeführt)", vbYesNoCancel) Then MautD_Befuellen() End If @@ -3677,6 +3684,11 @@ Public Class frmMDMDatenverarbetiung End Sub Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click + + If test Then + If Not vbYes = MsgBox("Aktuell ist der Testlauf aktiviert, wirklich fortfahren?", vbYesNoCancel) Then Exit Sub + End If + If vbYes = MsgBox("Möchten Sie den Vorgang wirklich manuell ausgeführen (wird bei Rechnungserstellung automatisch ausgeführt)", vbYesNoCancel) Then Select Case LIEFERANT Case "PLOSE" : setFakturiert(LIEFERANT) @@ -3896,5 +3908,7 @@ Public Class frmMDMDatenverarbetiung Process.Start(webAddress) End Sub - + Private Sub cbxTestdaten_CheckedChanged(sender As Object, e As EventArgs) Handles cbxTestdaten.CheckedChanged + test = cbxTestdaten.Checked + End Sub End Class