From 9ea2d32d2c4c8c188b75b7435561b1d9437c4b92 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 8 May 2023 14:20:29 +0200 Subject: [PATCH] Datev Anbindung --- Aviso/My Project/AssemblyInfo.vb | 4 +- Aviso/frmHauptfenster.Designer.vb | 149 +++++++++++++++------------- Aviso/frmHauptfenster.resx | 3 + Aviso/frmHauptfenster.vb | 24 ++++- Aviso/usrcntlAktDetails.Designer.vb | 2 +- Aviso/usrcntlAktDetails.vb | 91 ++--------------- 6 files changed, 114 insertions(+), 159 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 9b9e17d..7a5853f 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb index 18e4e43..ac4e116 100644 --- a/Aviso/frmHauptfenster.Designer.vb +++ b/Aviso/frmHauptfenster.Designer.vb @@ -24,15 +24,15 @@ Partial Class frmHauptfenster Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmHauptfenster)) - 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() - Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle6 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 DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle12 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() Me.mnuInfo = New System.Windows.Forms.ToolStripMenuItem() Me.conÜbernehmen = New System.Windows.Forms.ToolStripMenuItem() Me.conMenuAviso = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -174,6 +174,7 @@ Partial Class frmHauptfenster Me.CMRToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Einheitspapier0735VersandverfahrenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.CarnetTIRToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.CarnetTIRALTToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.BREXITToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GVMSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GVMSUKIMportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -376,7 +377,7 @@ Partial Class frmHauptfenster Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem() Me.Panel3 = New System.Windows.Forms.Panel() Me.Panel4 = New System.Windows.Forms.Panel() - Me.CarnetTIRALTToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.DatevBuchungsexportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.conMenuAviso.SuspendLayout() Me.MenuStrip1.SuspendLayout() Me.pnlDetailsRechts.SuspendLayout() @@ -843,7 +844,7 @@ Partial Class frmHauptfenster ' 'FunktionenToolStripMenuItem ' - Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GenerelleGestellungenDurchsuchenToolStripMenuItem, Me.KundenVonFremdenSpeditionenToolStripMenuItem, Me.KundenverwaltungToolStripMenuItem, Me.MDMParkplatzkartenToolStripMenuItem, Me.SMSSendenToolStripMenuItem, Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem, Me.MRNBarcodedruckToolStripMenuItem, Me.ToolStripSeparator12, Me.tool_BRGXLS, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.BürgschaftenExcelToolStripMenuItem, Me.ToolStripMenuItem6, Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem, Me.ATGesamtsicherheitVeragAGToolStripMenuItem, Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem, Me.ATGesamtsicherheitVeragCSToolStripMenuItem, Me.ToolStripMenuItem10, Me.TICKETWaidhausToolStripMenuItem, Me.ToolStripSeparator10, Me.DAKOSYToolStripMenuItem, Me.ToolStripSeparator11, Me.SDLAbholaufträgeToolStripMenuItem, Me.ToolStripMenuItem13, Me.VorauskassenToolStripMenuItem, Me.EssensbestellungenToolStripMenuItem, Me.AdministrationEssensbestellungenToolStripMenuItem, Me.WarenorteToolStripMenuItem}) + Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GenerelleGestellungenDurchsuchenToolStripMenuItem, Me.KundenVonFremdenSpeditionenToolStripMenuItem, Me.KundenverwaltungToolStripMenuItem, Me.MDMParkplatzkartenToolStripMenuItem, Me.SMSSendenToolStripMenuItem, Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem, Me.MRNBarcodedruckToolStripMenuItem, Me.ToolStripSeparator12, Me.tool_BRGXLS, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.BürgschaftenExcelToolStripMenuItem, Me.ToolStripMenuItem6, Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem, Me.ATGesamtsicherheitVeragAGToolStripMenuItem, Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem, Me.ATGesamtsicherheitVeragCSToolStripMenuItem, Me.ToolStripMenuItem10, Me.TICKETWaidhausToolStripMenuItem, Me.ToolStripSeparator10, Me.DAKOSYToolStripMenuItem, Me.ToolStripSeparator11, Me.SDLAbholaufträgeToolStripMenuItem, Me.ToolStripMenuItem13, Me.VorauskassenToolStripMenuItem, Me.EssensbestellungenToolStripMenuItem, Me.AdministrationEssensbestellungenToolStripMenuItem, Me.WarenorteToolStripMenuItem, Me.DatevBuchungsexportToolStripMenuItem}) Me.FunktionenToolStripMenuItem.Name = "FunktionenToolStripMenuItem" Me.FunktionenToolStripMenuItem.Size = New System.Drawing.Size(79, 21) Me.FunktionenToolStripMenuItem.Text = "Funktionen" @@ -1304,6 +1305,12 @@ Partial Class frmHauptfenster Me.CarnetTIRToolStripMenuItem.Size = New System.Drawing.Size(277, 22) Me.CarnetTIRToolStripMenuItem.Text = "Carnet TIR" ' + 'CarnetTIRALTToolStripMenuItem + ' + Me.CarnetTIRALTToolStripMenuItem.Name = "CarnetTIRALTToolStripMenuItem" + Me.CarnetTIRALTToolStripMenuItem.Size = New System.Drawing.Size(277, 22) + Me.CarnetTIRALTToolStripMenuItem.Text = "Carnet TIR (ALT)" + ' 'BREXITToolStripMenuItem ' Me.BREXITToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GVMSToolStripMenuItem, Me.GVMSUKIMportToolStripMenuItem, Me.GVMSBeschreibungToolStripMenuItem, Me.ToolStripSeparator14, Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem, Me.TicketIBFBeschreibungToolStripMenuItem, Me.IBFStatusToolStripMenuItem, Me.ToolStripSeparator15, Me.FREnveloppeSmartBorderToolStripMenuItem, Me.ToolStripSeparator16, Me.PBNIrelandFähreToolStripMenuItem, Me.ToolStripSeparator20, Me.WARENORTToolStripMenuItem, Me.ToolStripMenuItem14, Me.ToolStripSeparator18, Me.EORIUKGeneriertenToolStripMenuItem, Me.KAPKentAccessPermitToolStripMenuItem}) @@ -2388,38 +2395,38 @@ Partial Class frmHauptfenster Me.gridMyAviso.AllowUserToDeleteRows = False Me.gridMyAviso.AllowUserToOrderColumns = True Me.gridMyAviso.AllowUserToResizeRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure - Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle10.BackColor = System.Drawing.Color.Azure + Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10 Me.gridMyAviso.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle11 Me.gridMyAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle12 Me.gridMyAviso.Dock = System.Windows.Forms.DockStyle.Fill Me.gridMyAviso.Location = New System.Drawing.Point(0, 21) Me.gridMyAviso.Name = "gridMyAviso" Me.gridMyAviso.ReadOnly = True - DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, 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.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle13 Me.gridMyAviso.RowHeadersVisible = False Me.gridMyAviso.RowHeadersWidth = 62 Me.gridMyAviso.Size = New System.Drawing.Size(488, 279) @@ -2832,47 +2839,47 @@ Partial Class frmHauptfenster Me.gridAviso.AllowUserToAddRows = False Me.gridAviso.AllowUserToDeleteRows = False Me.gridAviso.AllowUserToResizeRows = False - DataGridViewCellStyle5.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5 + DataGridViewCellStyle14.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14 Me.gridAviso.BackgroundColor = System.Drawing.Color.DarkGray Me.gridAviso.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable - DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle6.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle6.Font = New System.Drawing.Font("Tahoma", 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.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle6 + DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle15.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle15.Font = New System.Drawing.Font("Tahoma", 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.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle15 Me.gridAviso.ColumnHeadersHeight = 25 Me.gridAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle7 + DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle16 Me.gridAviso.Dock = System.Windows.Forms.DockStyle.Fill Me.gridAviso.Location = New System.Drawing.Point(0, 220) Me.gridAviso.MultiSelect = False Me.gridAviso.Name = "gridAviso" Me.gridAviso.ReadOnly = True - DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle8 + DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle17 Me.gridAviso.RowHeadersVisible = False Me.gridAviso.RowHeadersWidth = 62 Me.gridAviso.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle9 + DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle18 Me.gridAviso.RowTemplate.ReadOnly = True Me.gridAviso.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] Me.gridAviso.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect @@ -3604,11 +3611,12 @@ Partial Class frmHauptfenster Me.Panel4.Size = New System.Drawing.Size(170, 25) Me.Panel4.TabIndex = 4 ' - 'CarnetTIRALTToolStripMenuItem + 'DatevBuchungsexportToolStripMenuItem ' - Me.CarnetTIRALTToolStripMenuItem.Name = "CarnetTIRALTToolStripMenuItem" - Me.CarnetTIRALTToolStripMenuItem.Size = New System.Drawing.Size(277, 22) - Me.CarnetTIRALTToolStripMenuItem.Text = "Carnet TIR (ALT)" + Me.DatevBuchungsexportToolStripMenuItem.Name = "DatevBuchungsexportToolStripMenuItem" + Me.DatevBuchungsexportToolStripMenuItem.Size = New System.Drawing.Size(383, 22) + Me.DatevBuchungsexportToolStripMenuItem.Text = "Datev Buchungsexport" + Me.DatevBuchungsexportToolStripMenuItem.Visible = False ' 'frmHauptfenster ' @@ -4026,4 +4034,5 @@ Partial Class frmHauptfenster Friend WithEvents Panel3 As Panel Friend WithEvents Panel4 As Panel Friend WithEvents CarnetTIRALTToolStripMenuItem As ToolStripMenuItem + Friend WithEvents DatevBuchungsexportToolStripMenuItem As ToolStripMenuItem End Class diff --git a/Aviso/frmHauptfenster.resx b/Aviso/frmHauptfenster.resx index 1b1c7ab..0a40422 100644 --- a/Aviso/frmHauptfenster.resx +++ b/Aviso/frmHauptfenster.resx @@ -228,6 +228,9 @@ pOTzPwAAAABJRU5ErkJggg== + + 598, 17 + 697, 17 diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index b0ce1c5..8c59016 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -569,6 +569,10 @@ Public Class frmHauptfenster AdministrationEssensbestellungenToolStripMenuItem.Visible = True End If + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("DATEV_EXPORT", "SDL") And VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then + DatevBuchungsexportToolStripMenuItem.Visible = True + End If + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("WARENORTE", "AVISO") Then WarenorteToolStripMenuItem.Visible = True End If @@ -2252,6 +2256,8 @@ Public Class frmHauptfenster End Sub Private Sub btnPaketdienst_Click(sender As System.Object, e As System.EventArgs) Handles btnKunden.Click + + Me.Cursor = Cursors.WaitCursor 'For Each frm As Form In Application.OpenForms.Item("frmKundenUebersichtZOLL") Is Nothing If Not Application.OpenForms.Item("frmKundenUebersichtZOLL") Is Nothing Then @@ -2259,9 +2265,13 @@ Public Class frmHauptfenster Me.Cursor = Cursors.Default : Exit Sub End If ' Next - Dim zoll As New SDL.frmKundenUebersichtZOLL - zoll.Show() - Me.Cursor = Cursors.Default + Try + Dim zoll As New SDL.frmKundenUebersichtZOLL + zoll.Show() + Me.Cursor = Cursors.Default + Catch ex As Exception + MsgBox(ex.Message) + End Try End Sub Private Sub Button2_Click(sender As Object, e As EventArgs) Handles btnSpedBuch.Click @@ -4452,7 +4462,13 @@ Public Class frmHauptfenster Me.Cursor = Cursors.Default End Sub - + Private Sub DatevBuchungsexportToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DatevBuchungsexportToolStripMenuItem.Click + If VERAG_PROG_ALLGEMEIN.cDatev_Interface.genDatensatzCSV_ALL(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, False, True, True) Then + MsgBox("Buchungen wurden erfolgreich exportiert!") + Else + MsgBox("Es wurden keine Buchungen exportiert!") + End If + End Sub End Class Public Class AvisoStatusFunctions diff --git a/Aviso/usrcntlAktDetails.Designer.vb b/Aviso/usrcntlAktDetails.Designer.vb index 111bed0..87f1c34 100644 --- a/Aviso/usrcntlAktDetails.Designer.vb +++ b/Aviso/usrcntlAktDetails.Designer.vb @@ -1981,7 +1981,7 @@ Partial Class usrcntlAktDetails Me.conMenuVermerke.ImageScalingSize = New System.Drawing.Size(24, 24) Me.conMenuVermerke.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.conVermerkEntgLöschen, Me.HervorhebenToolStripMenuItem, Me.ToolUeberweisungsBeleg, Me.toolVkReminder, Me.MitarbeiterAnzeigenToolStripMenuItem, Me.conVermerkLöschenNew}) Me.conMenuVermerke.Name = "conMenuVermerke" - Me.conMenuVermerke.Size = New System.Drawing.Size(252, 206) + Me.conMenuVermerke.Size = New System.Drawing.Size(252, 184) ' 'conVermerkEntgLöschen ' diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index 9e23536..4ae44fb 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -177,7 +177,7 @@ Public Class usrcntlAktDetails 'Private Sub Me_shown(sender As Object, e As EventArgs) Handles Me.Shown ' MsgBox("shown") ' End Sub - Private Sub usrcntlAktDetails_Load(sender As Object, e As EventArgs) Handles Me.Load + Private Sub usrcntlAktDetails_Load(sender As Object, e As EventArgs) Handles MyBase.Load timerAktUebernommen.Interval = 1500 timer.Interval = 100 reload(AvisoID) @@ -1498,7 +1498,7 @@ Public Class usrcntlAktDetails - Private Sub conMenu_Click(sender As Object, e As System.EventArgs) Handles conVermerkEntgLöschen.Click, conVermerkLöschenNew.Click + Private Sub conMenu_Click(sender As Object, e As System.EventArgs) Handles conVermerkLöschenNew.Click, conVermerkEntgLöschen.Click If gridVermerke.SelectedRows.Count = 0 Then Exit Sub @@ -1564,7 +1564,7 @@ Public Class usrcntlAktDetails - Private Sub grid_CellMouseClick(sender As Object, e As System.Windows.Forms.DataGridViewCellMouseEventArgs) Handles gridVermerke.CellMouseClick + Private Sub grid_CellMouseClick(sender As Object, e As System.Windows.Forms.DataGridViewCellMouseEventArgs) Handles gridVermerke.CellMouseClick, dgvSendungen.CellMouseClick If e.RowIndex < 0 Then Exit Sub 'Es wurde außerhalb einer gültigen Datenzeile geklickt 'If gridVermerke.SelectedRows.Count = 0 Then Exit Sub 'Es wurde außerhalb einer gültigen Datenzeile geklickt 'gridMyAviso.ClearSelection() 'WARUM? @@ -1850,7 +1850,7 @@ Public Class usrcntlAktDetails End Try End Sub - Private Sub dgvSendungen_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvSendungen.CellClick 'dgvSendungen.CellContentClick + Private Sub dgvSendungen_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvSendungen.CellClick 'dgvSendungen.CellContentClick If e.RowIndex < 0 Then Exit Sub Dim SendungsId = dgvSendungen.Rows(e.RowIndex).Cells("tblSnd_SendungID").Value VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID = SendungsId @@ -2211,81 +2211,8 @@ Public Class usrcntlAktDetails End Sub - Private Sub dgvSendungen_CellMouseClick(sender As Object, e As DataGridViewCellMouseEventArgs) Handles dgvSendungen.CellMouseClick - If e.Button = MouseButtons.Right Then - If dgvSendungen.Columns.Count > 0 Then - If dgvSendungen.Columns(e.ColumnIndex).Name = "SenungUebernehmen" Then - Exit Sub + Private Sub dgvSendungen_CellMouseClick(sender As Object, e As DataGridViewCellMouseEventArgs) - 'Dim LIST_FIRMEN() As String = {"VERAG", "UNISPED", "IMEX", "FRONTOFFICE"} - - 'Dim C As New ContextMenuStrip - - 'For Each FirmaTMP In LIST_FIRMEN - - ' Dim item_Firma As New ToolStripMenuItem - ' item_Firma.Text = FirmaTMP - - ' Dim sql As New VERAG_PROG_ALLGEMEIN.SQL - ' Dim dt = sql.loadDgvBySql("SELECT TOP (1000) [mit_id],[mit_nname] + ' ' + [mit_vname] + ' (' + mit_niederlassung + ')' as MAname FROM [ADMIN].[dbo].[tblMitarbeiter] - ' where mit_firma IN ('" & FirmaTMP & "','BEIDE','ALLE','ALL') and mit_gekuendigt=0 - ' and mit_abteilung IN ('QS','ZOLL','DISPO') and [mit_TESTonly]=0 AND [mit_pseudoUser]=0 - ' order by mit_nname,mit_vname ", "AVISO") - - ' For Each r In dt.Rows - ' Dim item As New ToolStripMenuItem - ' item.Tag = r("mit_id") - ' item.Text = r("MAname") - ' AddHandler item.Click, Sub() - ' FUNC.SendungUebernehmen(dgvSendungen.Rows(e.RowIndex).Cells("tblSnd_SendungID").Value, AvisoID, item.Tag, True) - ' reload(AvisoID) - ' End Sub - - - ' item_Firma.DropDownItems.Add(item) - ' Next - ' C.Items.Add(item_Firma) - 'Next - 'C.Show(System.Cursor.Position) - Else - - If AVISO.Abgeschlossen Then Exit Sub - - loaded = False - ' If dgvSendungen.SelectedRows.Count <= 0 Then Exit Sub - - ' dgvSendungen.ClearSelection() - dgvSendungen.Rows(e.RowIndex).Selected = True - VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_SendungsID = dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value - - ' frmGrayOut.Opacity = 0.5 - ' frmGrayOut.WindowState = FormWindowState.Maximized - Dim tmpIndex = dgvSendungen.SelectedRows(0).Index - Dim tmpscroll = dgvSendungen.FirstDisplayedScrollingRowIndex - - Dim frmGrayOut = grayoutForm() - Dim sv As New frmAddSendungsvermerkShort(AvisoID, dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value) - sv.Location = Me.PointToClient(Cursor.Position) - sv.ShowDialog(frmGrayOut) - frmGrayOut.Close() - If tbcntlVermerke.SelectedIndex <> 2 Then tbcntlVermerke.SelectedIndex = 2 - - - initDgvSendungen() ' wg. Anzahl Vermerke - sv.Close() - - - If dgvSendungen.RowCount > tmpIndex Then - 'dgvSendungen.ClearSelection() - 'dgvSendungen.Rows(tmpIndex).Selected = True - dgvSendungen.FirstDisplayedScrollingRowIndex = tmpscroll - End If - loaded = True - Vermerke_anzeigen() - - End If - End If - End If End Sub Private Sub lblHinweis_Click(sender As Object, e As EventArgs) @@ -2763,7 +2690,7 @@ Public Class usrcntlAktDetails Label21.Text = initSndAnzahl End Function - Private Sub txtSndFiskalDE_TextChanged(sender As Object, e As EventArgs) Handles txtSndFiskalDE.TextChanged, txtSendungen.TextChanged, txtSndFiskalAT.TextChanged + Private Sub txtSndFiskalDE_TextChanged(sender As Object, e As EventArgs) Handles txtSndFiskalDE.TextChanged, txtSndFiskalAT.TextChanged, txtSendungen.TextChanged initSndAnzahl() End Sub @@ -2960,7 +2887,7 @@ Public Class usrcntlAktDetails End If End Sub - Private Sub Button10_Click(sender As Object, e As EventArgs) Handles btnLZDruck.Click, btnLZDruckDIGITAL.Click + Private Sub Button10_Click(sender As Object, e As EventArgs) Handles btnLZDruckDIGITAL.Click, btnLZDruck.Click Dim f As New frmLaufzettel(AVISO, Nothing, (sender Is btnLZDruckDIGITAL), cbxLZT1.Checked, cbxLZRg.Checked, cbxVPSplit.Checked) f.ShowDialog() Panel4.Visible = False @@ -3516,7 +3443,7 @@ Public Class usrcntlAktDetails - Private Sub ToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles ToolUeberweisungsBeleg.Click, toolVkReminder.Click + Private Sub ToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles toolVkReminder.Click, ToolUeberweisungsBeleg.Click If gridVermerke.SelectedRows.Count = 0 Then Exit Sub Dim index As Integer = -1 If (dgvSendungen.SelectedRows.Count > 0) Then index = dgvSendungen.SelectedRows(0).Index @@ -3539,7 +3466,7 @@ Public Class usrcntlAktDetails ArrowDown_ShowHide() End Sub - Private Sub txtMAinfo_VorbereitetQs_TextChanged(sender As Object, e As EventArgs) Handles txtMAinfo_VorbereitetQs.Click, txtMAinfo_Vorgeschrieben.Click, txtMAinfo_AbklaerungTR.Click, txtMAinfo_TRVorgeschrieben.Click + Private Sub txtMAinfo_VorbereitetQs_TextChanged(sender As Object, e As EventArgs) Handles txtMAinfo_Vorgeschrieben.Click, txtMAinfo_VorbereitetQs.Click, txtMAinfo_TRVorgeschrieben.Click, txtMAinfo_AbklaerungTR.Click If sender.tag IsNot DBNull.Value AndAlso sender.tag IsNot Nothing Then If IsNumeric(sender.tag) Then Dim f As New VERAG_PROG_ALLGEMEIN.frmMitarbeitersuche(sender.tag)