diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb index 883ab076..12fb69e3 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb @@ -163,6 +163,8 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Label3 = New System.Windows.Forms.Label() Me.Label12 = New System.Windows.Forms.Label() Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker() + Me.txtVermerk = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label48 = New System.Windows.Forms.Label() Me.txtZollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox() Me.cbxEIDR = New System.Windows.Forms.CheckBox() Me.cbxCMR = New System.Windows.Forms.CheckBox() @@ -195,8 +197,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Label45 = New System.Windows.Forms.Label() Me.cboFilialeHandling = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.SplitContainer = New System.Windows.Forms.SplitContainer() - Me.Label48 = New System.Windows.Forms.Label() - Me.txtVermerk = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.VerbringungsnachweisSetzenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cntxtCntxtSpeditionsbuch.SuspendLayout() Me.pnlRechts.SuspendLayout() CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit() @@ -234,15 +235,15 @@ Partial Class usrCntlSpeditionsBuchSuche 'cntxtCntxtSpeditionsbuch ' Me.cntxtCntxtSpeditionsbuch.ImageScalingSize = New System.Drawing.Size(24, 24) - Me.cntxtCntxtSpeditionsbuch.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.EintragLöschenToolStripMenuItem}) + Me.cntxtCntxtSpeditionsbuch.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.EintragLöschenToolStripMenuItem, Me.VerbringungsnachweisSetzenToolStripMenuItem}) Me.cntxtCntxtSpeditionsbuch.Name = "cntxtCntxtSpeditionsbuch" - Me.cntxtCntxtSpeditionsbuch.Size = New System.Drawing.Size(156, 26) + Me.cntxtCntxtSpeditionsbuch.Size = New System.Drawing.Size(230, 70) Me.cntxtCntxtSpeditionsbuch.Text = "cntxtSpeditionsbuch" ' 'EintragLöschenToolStripMenuItem ' Me.EintragLöschenToolStripMenuItem.Name = "EintragLöschenToolStripMenuItem" - Me.EintragLöschenToolStripMenuItem.Size = New System.Drawing.Size(155, 22) + Me.EintragLöschenToolStripMenuItem.Size = New System.Drawing.Size(229, 22) Me.EintragLöschenToolStripMenuItem.Text = "Eintrag löschen" ' 'txtAvisoId @@ -2200,6 +2201,39 @@ Partial Class usrCntlSpeditionsBuchSuche Me.DateTimePicker1.Size = New System.Drawing.Size(115, 20) Me.DateTimePicker1.TabIndex = 2 ' + 'txtVermerk + ' + Me.txtVermerk._DateTimeOnly = False + Me.txtVermerk._numbersOnly = False + Me.txtVermerk._numbersOnlyKommastellen = "" + Me.txtVermerk._numbersOnlyTrennzeichen = True + Me.txtVermerk._Prozent = False + Me.txtVermerk._ShortDateNew = False + Me.txtVermerk._ShortDateOnly = False + Me.txtVermerk._TimeOnly = False + Me.txtVermerk._TimeOnly_Seconds = False + Me.txtVermerk._value = Nothing + Me.txtVermerk._Waehrung = False + Me.txtVermerk._WaehrungZeichen = True + Me.txtVermerk.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtVermerk.ForeColor = System.Drawing.Color.Black + Me.txtVermerk.Location = New System.Drawing.Point(563, 109) + Me.txtVermerk.MaxLineLength = -1 + Me.txtVermerk.MaxLines_Warning = "" + Me.txtVermerk.MaxLines_Warning_Label = Nothing + Me.txtVermerk.Name = "txtVermerk" + Me.txtVermerk.Size = New System.Drawing.Size(64, 20) + Me.txtVermerk.TabIndex = 57 + ' + 'Label48 + ' + Me.Label48.AutoSize = True + Me.Label48.Location = New System.Drawing.Point(563, 93) + Me.Label48.Name = "Label48" + Me.Label48.Size = New System.Drawing.Size(49, 13) + Me.Label48.TabIndex = 56 + Me.Label48.Text = "Vermerk:" + ' 'txtZollstelle ' Me.txtZollstelle._allowFreitext = False @@ -2726,38 +2760,11 @@ Partial Class usrCntlSpeditionsBuchSuche Me.SplitContainer.SplitterWidth = 2 Me.SplitContainer.TabIndex = 3 ' - 'Label48 + 'VerbringungsnachweisSetzenToolStripMenuItem ' - Me.Label48.AutoSize = True - Me.Label48.Location = New System.Drawing.Point(563, 93) - Me.Label48.Name = "Label48" - Me.Label48.Size = New System.Drawing.Size(49, 13) - Me.Label48.TabIndex = 56 - Me.Label48.Text = "Vermerk:" - ' - 'txtVermerk - ' - Me.txtVermerk._DateTimeOnly = False - Me.txtVermerk._numbersOnly = False - Me.txtVermerk._numbersOnlyKommastellen = "" - Me.txtVermerk._numbersOnlyTrennzeichen = True - Me.txtVermerk._Prozent = False - Me.txtVermerk._ShortDateNew = False - Me.txtVermerk._ShortDateOnly = False - Me.txtVermerk._TimeOnly = False - Me.txtVermerk._TimeOnly_Seconds = False - Me.txtVermerk._value = Nothing - Me.txtVermerk._Waehrung = False - Me.txtVermerk._WaehrungZeichen = True - Me.txtVermerk.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtVermerk.ForeColor = System.Drawing.Color.Black - Me.txtVermerk.Location = New System.Drawing.Point(563, 109) - Me.txtVermerk.MaxLineLength = -1 - Me.txtVermerk.MaxLines_Warning = "" - Me.txtVermerk.MaxLines_Warning_Label = Nothing - Me.txtVermerk.Name = "txtVermerk" - Me.txtVermerk.Size = New System.Drawing.Size(64, 20) - Me.txtVermerk.TabIndex = 57 + Me.VerbringungsnachweisSetzenToolStripMenuItem.Name = "VerbringungsnachweisSetzenToolStripMenuItem" + Me.VerbringungsnachweisSetzenToolStripMenuItem.Size = New System.Drawing.Size(229, 22) + Me.VerbringungsnachweisSetzenToolStripMenuItem.Text = "Verbringungsnachweis setzen" ' 'usrCntlSpeditionsBuchSuche ' @@ -2970,4 +2977,5 @@ Partial Class usrCntlSpeditionsBuchSuche Friend WithEvents FlenderBocholtZeitraumAuswählenToolStripMenuItem As ToolStripMenuItem Friend WithEvents txtVermerk As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label48 As Label + Friend WithEvents VerbringungsnachweisSetzenToolStripMenuItem As ToolStripMenuItem End Class diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb index cf00e948..f1e6d283 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb @@ -1,5 +1,6 @@ Imports System.Data.SqlClient Imports System.Globalization +Imports VERAG_PROG_ALLGEMEIN Public Class usrCntlSpeditionsBuchSuche @@ -340,7 +341,7 @@ Public Class usrCntlSpeditionsBuchSuche End Function - Private Sub frmSpeditionsbuchSuche_Load(sender As Object, e As EventArgs) Handles Me.Load + Private Sub frmSpeditionsbuchSuche_Load(sender As Object, e As EventArgs) Handles MyBase.Load If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then AVISOSERVER = "[DEVELOPER\DEVSQL].AVISO_new.dbo.AVISO" End If @@ -682,12 +683,7 @@ Public Class usrCntlSpeditionsBuchSuche txtAbfertigungsnummerBis.Enabled = sender.text <> "" End Sub - Private Sub DataGridView_CellMouseClick(sender As Object, e As DataGridViewCellMouseEventArgs) Handles DataGridView.CellMouseClick - If e.Button = Windows.Forms.MouseButtons.Right Then - DataGridView.ClearSelection() - DataGridView.Rows(e.RowIndex).Selected = True - End If - End Sub + Private Sub DataGridView_CellContentClick(sender As Object, e As EventArgs) Handles DataGridView.DoubleClick, DataGridView.CellContentDoubleClick If DataGridView.SelectedRows.Count = 0 Then Exit Sub @@ -1883,7 +1879,7 @@ Public Class usrCntlSpeditionsBuchSuche End Select End Sub - Private Sub ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Click, ZFThyrnauZeitraumAuswählenToolStripMenuItem.Click + Private Sub ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ZFThyrnauZeitraumAuswählenToolStripMenuItem.Click, ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Click lblKdAusFortschritt.Text = "lädt..." Me.Cursor = Cursors.WaitCursor Try @@ -2377,4 +2373,19 @@ Public Class usrCntlSpeditionsBuchSuche Return text End Function + + Private Sub VerbringungsnachweisSetzenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VerbringungsnachweisSetzenToolStripMenuItem.Click + + + 'cbxCMR.Checked = SPEDITIONSBUCH.SB_CMR + 'txtCMRDatum.Text = If(SPEDITIONSBUCH.SB_CMRDatum, "") + 'txtCMRNr.Text = If(SPEDITIONSBUCH.SB_CMRNr, "") + 'If pnlFiskal.Visible Then + ' SPEDITIONSBUCH.SB_CMR = cbxCMR.Checked + ' If txtCMRDatum.Text <> "" Then SPEDITIONSBUCH.SB_CMRDatum = txtCMRDatum.Text + ' SPEDITIONSBUCH.SB_CMRNr = txtCMRNr.Text + + 'End If + + End Sub End Class diff --git a/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb b/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb index 168abb4c..0c3addfa 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb @@ -41,6 +41,7 @@ Partial Class frmMDMDatenverarbetiung Me.Label1 = New System.Windows.Forms.Label() Me.lbl = New System.Windows.Forms.Label() Me.Panel1 = New System.Windows.Forms.Panel() + Me.lblTTRSum = New System.Windows.Forms.Label() Me.lblProzPruef = New System.Windows.Forms.Label() Me.PictureBox1 = New System.Windows.Forms.PictureBox() Me.pic = New System.Windows.Forms.PictureBox() @@ -53,7 +54,6 @@ Partial Class frmMDMDatenverarbetiung Me.Button1 = New System.Windows.Forms.Button() Me.btnKunde = New System.Windows.Forms.Button() Me.Label4 = New System.Windows.Forms.Label() - Me.txtPruefsummeBrutto = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.cbx = New System.Windows.Forms.CheckBox() Me.Panel2 = New System.Windows.Forms.Panel() Me.Label43 = New System.Windows.Forms.Label() @@ -64,14 +64,15 @@ Partial Class frmMDMDatenverarbetiung Me.pbPloseAnh_Proz = New System.Windows.Forms.ProgressBar() Me.lblPloseAnh_Proz = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label() - Me.txtPruefsummeNetto = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label2 = New System.Windows.Forms.Label() - Me.txtAnzahl = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Button3 = New System.Windows.Forms.Button() Me.Button2 = New System.Windows.Forms.Button() Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.lblTTRSum = New System.Windows.Forms.Label() Me.txtTTRSum = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtPruefsummeBrutto = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtPruefsummeNetto = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtAnzahl = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.PictureBox5 = New System.Windows.Forms.PictureBox() Me.pnl.SuspendLayout() Me.Panel4.SuspendLayout() Me.FlowLayoutPanel.SuspendLayout() @@ -82,10 +83,12 @@ Partial Class frmMDMDatenverarbetiung Me.Panel3.SuspendLayout() Me.Panel2.SuspendLayout() CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'pnl ' + Me.pnl.Controls.Add(Me.PictureBox5) Me.pnl.Controls.Add(Me.cbxBelegeerstellt) Me.pnl.Controls.Add(Me.cbxASFINAGAbgerechnet) Me.pnl.Controls.Add(Me.cbxTestdaten) @@ -288,6 +291,17 @@ Partial Class frmMDMDatenverarbetiung Me.Panel1.Size = New System.Drawing.Size(1163, 114) Me.Panel1.TabIndex = 2 ' + 'lblTTRSum + ' + Me.lblTTRSum.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblTTRSum.AutoSize = True + Me.lblTTRSum.Location = New System.Drawing.Point(953, 95) + Me.lblTTRSum.Name = "lblTTRSum" + Me.lblTTRSum.Size = New System.Drawing.Size(87, 13) + Me.lblTTRSum.TabIndex = 52 + Me.lblTTRSum.Text = "Prüfsumme TTR:" + Me.lblTTRSum.Visible = False + ' 'lblProzPruef ' Me.lblProzPruef.Location = New System.Drawing.Point(63, 92) @@ -413,31 +427,6 @@ Partial Class frmMDMDatenverarbetiung Me.Label4.TabIndex = 44 Me.Label4.Text = "Prüfsumme brutto:" ' - 'txtPruefsummeBrutto - ' - Me.txtPruefsummeBrutto._DateTimeOnly = False - Me.txtPruefsummeBrutto._numbersOnly = False - Me.txtPruefsummeBrutto._numbersOnlyKommastellen = "" - Me.txtPruefsummeBrutto._numbersOnlyTrennzeichen = True - Me.txtPruefsummeBrutto._Prozent = False - Me.txtPruefsummeBrutto._ShortDateNew = False - Me.txtPruefsummeBrutto._ShortDateOnly = False - Me.txtPruefsummeBrutto._TimeOnly = False - Me.txtPruefsummeBrutto._TimeOnly_Seconds = False - Me.txtPruefsummeBrutto._value = "" - Me.txtPruefsummeBrutto._Waehrung = False - Me.txtPruefsummeBrutto._WaehrungZeichen = True - Me.txtPruefsummeBrutto.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.txtPruefsummeBrutto.ForeColor = System.Drawing.Color.Black - Me.txtPruefsummeBrutto.Location = New System.Drawing.Point(1051, 69) - Me.txtPruefsummeBrutto.MaxLineLength = -1 - Me.txtPruefsummeBrutto.MaxLines_Warning = "" - Me.txtPruefsummeBrutto.MaxLines_Warning_Label = Nothing - Me.txtPruefsummeBrutto.Name = "txtPruefsummeBrutto" - Me.txtPruefsummeBrutto.Size = New System.Drawing.Size(100, 20) - Me.txtPruefsummeBrutto.TabIndex = 43 - Me.txtPruefsummeBrutto.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' 'cbx ' Me.cbx.AutoSize = True @@ -534,31 +523,6 @@ Partial Class frmMDMDatenverarbetiung Me.Label3.TabIndex = 38 Me.Label3.Text = "Prüfsumme netto:" ' - 'txtPruefsummeNetto - ' - Me.txtPruefsummeNetto._DateTimeOnly = False - Me.txtPruefsummeNetto._numbersOnly = False - Me.txtPruefsummeNetto._numbersOnlyKommastellen = "" - Me.txtPruefsummeNetto._numbersOnlyTrennzeichen = True - Me.txtPruefsummeNetto._Prozent = False - Me.txtPruefsummeNetto._ShortDateNew = False - Me.txtPruefsummeNetto._ShortDateOnly = False - Me.txtPruefsummeNetto._TimeOnly = False - Me.txtPruefsummeNetto._TimeOnly_Seconds = False - Me.txtPruefsummeNetto._value = "" - Me.txtPruefsummeNetto._Waehrung = False - Me.txtPruefsummeNetto._WaehrungZeichen = True - Me.txtPruefsummeNetto.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.txtPruefsummeNetto.ForeColor = System.Drawing.Color.Black - Me.txtPruefsummeNetto.Location = New System.Drawing.Point(1051, 43) - Me.txtPruefsummeNetto.MaxLineLength = -1 - Me.txtPruefsummeNetto.MaxLines_Warning = "" - Me.txtPruefsummeNetto.MaxLines_Warning_Label = Nothing - Me.txtPruefsummeNetto.Name = "txtPruefsummeNetto" - Me.txtPruefsummeNetto.Size = New System.Drawing.Size(100, 20) - Me.txtPruefsummeNetto.TabIndex = 37 - Me.txtPruefsummeNetto.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' 'Label2 ' Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -569,31 +533,6 @@ Partial Class frmMDMDatenverarbetiung Me.Label2.TabIndex = 36 Me.Label2.Text = "Anzahl:" ' - 'txtAnzahl - ' - Me.txtAnzahl._DateTimeOnly = False - Me.txtAnzahl._numbersOnly = False - Me.txtAnzahl._numbersOnlyKommastellen = "" - Me.txtAnzahl._numbersOnlyTrennzeichen = True - Me.txtAnzahl._Prozent = False - Me.txtAnzahl._ShortDateNew = False - Me.txtAnzahl._ShortDateOnly = False - Me.txtAnzahl._TimeOnly = False - Me.txtAnzahl._TimeOnly_Seconds = False - Me.txtAnzahl._value = "" - Me.txtAnzahl._Waehrung = False - Me.txtAnzahl._WaehrungZeichen = True - Me.txtAnzahl.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.txtAnzahl.ForeColor = System.Drawing.Color.Black - Me.txtAnzahl.Location = New System.Drawing.Point(1051, 16) - Me.txtAnzahl.MaxLineLength = -1 - Me.txtAnzahl.MaxLines_Warning = "" - Me.txtAnzahl.MaxLines_Warning_Label = Nothing - Me.txtAnzahl.Name = "txtAnzahl" - Me.txtAnzahl.Size = New System.Drawing.Size(100, 20) - Me.txtAnzahl.TabIndex = 35 - Me.txtAnzahl.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' 'Button3 ' Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -631,17 +570,6 @@ Partial Class frmMDMDatenverarbetiung Me.MyDatagridview1.Size = New System.Drawing.Size(1163, 577) Me.MyDatagridview1.TabIndex = 0 ' - 'lblTTRSum - ' - Me.lblTTRSum.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.lblTTRSum.AutoSize = True - Me.lblTTRSum.Location = New System.Drawing.Point(953, 95) - Me.lblTTRSum.Name = "lblTTRSum" - Me.lblTTRSum.Size = New System.Drawing.Size(87, 13) - Me.lblTTRSum.TabIndex = 52 - Me.lblTTRSum.Text = "Prüfsumme TTR:" - Me.lblTTRSum.Visible = False - ' 'txtTTRSum ' Me.txtTTRSum._DateTimeOnly = False @@ -668,6 +596,91 @@ Partial Class frmMDMDatenverarbetiung Me.txtTTRSum.TextAlign = System.Windows.Forms.HorizontalAlignment.Right Me.txtTTRSum.Visible = False ' + 'txtPruefsummeBrutto + ' + Me.txtPruefsummeBrutto._DateTimeOnly = False + Me.txtPruefsummeBrutto._numbersOnly = False + Me.txtPruefsummeBrutto._numbersOnlyKommastellen = "" + Me.txtPruefsummeBrutto._numbersOnlyTrennzeichen = True + Me.txtPruefsummeBrutto._Prozent = False + Me.txtPruefsummeBrutto._ShortDateNew = False + Me.txtPruefsummeBrutto._ShortDateOnly = False + Me.txtPruefsummeBrutto._TimeOnly = False + Me.txtPruefsummeBrutto._TimeOnly_Seconds = False + Me.txtPruefsummeBrutto._value = "" + Me.txtPruefsummeBrutto._Waehrung = False + Me.txtPruefsummeBrutto._WaehrungZeichen = True + Me.txtPruefsummeBrutto.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtPruefsummeBrutto.ForeColor = System.Drawing.Color.Black + Me.txtPruefsummeBrutto.Location = New System.Drawing.Point(1051, 69) + Me.txtPruefsummeBrutto.MaxLineLength = -1 + Me.txtPruefsummeBrutto.MaxLines_Warning = "" + Me.txtPruefsummeBrutto.MaxLines_Warning_Label = Nothing + Me.txtPruefsummeBrutto.Name = "txtPruefsummeBrutto" + Me.txtPruefsummeBrutto.Size = New System.Drawing.Size(100, 20) + Me.txtPruefsummeBrutto.TabIndex = 43 + Me.txtPruefsummeBrutto.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'txtPruefsummeNetto + ' + Me.txtPruefsummeNetto._DateTimeOnly = False + Me.txtPruefsummeNetto._numbersOnly = False + Me.txtPruefsummeNetto._numbersOnlyKommastellen = "" + Me.txtPruefsummeNetto._numbersOnlyTrennzeichen = True + Me.txtPruefsummeNetto._Prozent = False + Me.txtPruefsummeNetto._ShortDateNew = False + Me.txtPruefsummeNetto._ShortDateOnly = False + Me.txtPruefsummeNetto._TimeOnly = False + Me.txtPruefsummeNetto._TimeOnly_Seconds = False + Me.txtPruefsummeNetto._value = "" + Me.txtPruefsummeNetto._Waehrung = False + Me.txtPruefsummeNetto._WaehrungZeichen = True + Me.txtPruefsummeNetto.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtPruefsummeNetto.ForeColor = System.Drawing.Color.Black + Me.txtPruefsummeNetto.Location = New System.Drawing.Point(1051, 43) + Me.txtPruefsummeNetto.MaxLineLength = -1 + Me.txtPruefsummeNetto.MaxLines_Warning = "" + Me.txtPruefsummeNetto.MaxLines_Warning_Label = Nothing + Me.txtPruefsummeNetto.Name = "txtPruefsummeNetto" + Me.txtPruefsummeNetto.Size = New System.Drawing.Size(100, 20) + Me.txtPruefsummeNetto.TabIndex = 37 + Me.txtPruefsummeNetto.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'txtAnzahl + ' + Me.txtAnzahl._DateTimeOnly = False + Me.txtAnzahl._numbersOnly = False + Me.txtAnzahl._numbersOnlyKommastellen = "" + Me.txtAnzahl._numbersOnlyTrennzeichen = True + Me.txtAnzahl._Prozent = False + Me.txtAnzahl._ShortDateNew = False + Me.txtAnzahl._ShortDateOnly = False + Me.txtAnzahl._TimeOnly = False + Me.txtAnzahl._TimeOnly_Seconds = False + Me.txtAnzahl._value = "" + Me.txtAnzahl._Waehrung = False + Me.txtAnzahl._WaehrungZeichen = True + Me.txtAnzahl.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtAnzahl.ForeColor = System.Drawing.Color.Black + Me.txtAnzahl.Location = New System.Drawing.Point(1051, 16) + Me.txtAnzahl.MaxLineLength = -1 + Me.txtAnzahl.MaxLines_Warning = "" + Me.txtAnzahl.MaxLines_Warning_Label = Nothing + Me.txtAnzahl.Name = "txtAnzahl" + Me.txtAnzahl.Size = New System.Drawing.Size(100, 20) + Me.txtAnzahl.TabIndex = 35 + Me.txtAnzahl.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'PictureBox5 + ' + Me.PictureBox5.BackgroundImage = Global.SDL.My.Resources.Resources.fragezeichen + Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox5.Location = New System.Drawing.Point(202, 11) + Me.PictureBox5.Name = "PictureBox5" + Me.PictureBox5.Size = New System.Drawing.Size(18, 19) + Me.PictureBox5.TabIndex = 130 + Me.PictureBox5.TabStop = False + ' 'frmMDMDatenverarbetiung ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -695,6 +708,7 @@ Partial Class frmMDMDatenverarbetiung Me.Panel2.ResumeLayout(False) Me.Panel2.PerformLayout() CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -747,4 +761,5 @@ Partial Class frmMDMDatenverarbetiung Friend WithEvents cbxBelegeerstellt As CheckBox Friend WithEvents lblTTRSum As Label Friend WithEvents txtTTRSum As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents PictureBox5 As PictureBox End Class diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index 5c23374b..1c72a2da 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -593,7 +593,10 @@ Public Class frmMDMDatenverarbetiung Case "ASFINAG" cbxASFINAGAbgerechnet.Visible = True cbxBelegeerstellt.Visible = True - cbxTestdaten.Visible = True + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN", Me.FindForm) Then + 'cbxTestdaten.Visible = True + End If + Panel4.Visible = False pnlAsfinag.Visible = True Exit Sub @@ -2881,17 +2884,25 @@ Public Class frmMDMDatenverarbetiung End Sub Private Sub cbxBelegeerstellt_CheckedChanged(sender As Object, e As EventArgs) Handles cbxBelegeerstellt.CheckedChanged + If Me.LIEFERANT = "ASFINAG" Then + + + If cbxBelegeerstellt.Checked Then + Panel2.Enabled = False + bntDatumsetzen.Enabled = False + bntDatumzuruecksetzen.Enabled = False + Else + Panel2.Enabled = True + bntDatumsetzen.Enabled = True + bntDatumzuruecksetzen.Enabled = True + End If - If cbxBelegeerstellt.Checked Then - btnREerstellen.Enabled = False - bntDatumsetzen.Enabled = False - bntDatumzuruecksetzen.Enabled = False - Else - btnREerstellen.Enabled = True - bntDatumsetzen.Enabled = True - bntDatumzuruecksetzen.Enabled = True End If - - End Sub + + Private Sub PictureBox5_Click(sender As Object, e As EventArgs) Handles PictureBox5.Click + Dim webAddress As String = "https://wiki.verag.ag/de/software/sdl/funktionen" + Process.Start(webAddress) + End Sub + End Class diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cDatev_Interface.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cDatev_Interface.vb index 9c8b1a84..b06d211e 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cDatev_Interface.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cDatev_Interface.vb @@ -99,12 +99,13 @@ 'DATEIPFAD für Stammdaten '------------------------------------------------------------------------------------------- - Dim pathArchivKD = "\\datenarchiv.verag.ost.dmn\DATENARCHIV\DATENARCHIV_TESTSYSTEM\DATEV\ARCHIV\STAMMDATEN\" & FIRMA.Firma_Bez & "\" - Dim pathKD = "\\datenarchiv.verag.ost.dmn\DATENARCHIV\DATENARCHIV_TESTSYSTEM\DATEV\STAMMDATEN\ " & FIRMA.Firma_Bez & "\" & Geschaeftsjahr & "\" + Dim pathArchivKD = "\\datenarchiv.verag.ost.dmn\DATENARCHIV\DATEV\ARCHIV\STAMMDATEN\" & FIRMA.Firma_Bez & "\" + Dim pathKD = "\\datenarchiv.verag.ost.dmn\DATENARCHIV\DATEV\STAMMDATEN\ " & FIRMA.Firma_Bez & "\" & Geschaeftsjahr & "\" 'pathKD = pathArchivKD 'TEST If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then - 'path = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir + pathArchivKD = "\\datenarchiv.verag.ost.dmn\DATENARCHIV\DATENARCHIV_TESTSYSTEM\DATEV\ARCHIV\STAMMDATEN\" & FIRMA.Firma_Bez & "\" + pathKD = "\\datenarchiv.verag.ost.dmn\DATENARCHIV\DATENARCHIV_TESTSYSTEM\DATEV\STAMMDATEN\ " & FIRMA.Firma_Bez & "\" & Geschaeftsjahr & "\" 'pathArchivKD = "" End If If Not IO.Directory.Exists(pathKD) Then IO.Directory.CreateDirectory(pathKD) @@ -194,8 +195,8 @@ 'DATEIPFAD für Buchungsdaten '------------------------------------------------------------------------------------------- - Dim pathArchiv = "\\datenarchiv.verag.ost.dmn\DATENARCHIV\DATENARCHIV\DATEV\ARCHIV\AR-DATEN\" & FIRMA.Firma_Bez & "\" - Dim path = "\\datenarchiv.verag.ost.dmn\DATENARCHIV\DATENARCHIV\DATEV\AR-DATEN\" & FIRMA.Firma_Bez & "\" & Geschaeftsjahr & "\" + Dim pathArchiv = "\\datenarchiv.verag.ost.dmn\DATENARCHIV\DATEV\ARCHIV\AR-DATEN\" & FIRMA.Firma_Bez & "\" + Dim path = "\\datenarchiv.verag.ost.dmn\DATENARCHIV\DATEV\AR-DATEN\" & FIRMA.Firma_Bez & "\" & Geschaeftsjahr & "\" ' path = pathArchiv 'TEST If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then pathArchiv = " \\datenarchiv.verag.ost.dmn\DATENARCHIV\DATENARCHIV_TESTSYSTEM\DATEV\ARCHIV\AR-DATEN\" & FIRMA.Firma_Bez & "\"