diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj
index 0203198b..a220de2d 100644
--- a/SDL/SDL.vbproj
+++ b/SDL/SDL.vbproj
@@ -90,7 +90,7 @@
false
- Test.pfx
+ SDL_TemporaryKey.pfx
diff --git a/SDL/mdm/frmNewData.Designer.vb b/SDL/mdm/frmNewData.Designer.vb
index 9d703fc4..817a6ff6 100644
--- a/SDL/mdm/frmNewData.Designer.vb
+++ b/SDL/mdm/frmNewData.Designer.vb
@@ -26,7 +26,9 @@ Partial Class frmNewData
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmNewData))
Me.pnlMain = New System.Windows.Forms.Panel()
Me.Panel1 = New System.Windows.Forms.Panel()
+ Me.FlatButton1 = New VERAG_PROG_ALLGEMEIN.FlatButton()
Me.Panel2 = New System.Windows.Forms.Panel()
+ Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel(Me.components)
Me.Label2 = New System.Windows.Forms.Label()
Me.FlowLayoutPanel = New System.Windows.Forms.FlowLayoutPanel()
Me.btnSDL_IDS = New System.Windows.Forms.Button()
@@ -55,10 +57,8 @@ Partial Class frmNewData
Me.Label4 = New System.Windows.Forms.Label()
Me.Label1 = New System.Windows.Forms.Label()
Me.txtKundenNr = New System.Windows.Forms.TextBox()
- Me.btnAddLeistungVordefiniert = New System.Windows.Forms.Button()
- Me.FlatButton1 = New VERAG_PROG_ALLGEMEIN.FlatButton()
- Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel(Me.components)
Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
+ Me.btnAddLeistungVordefiniert = New System.Windows.Forms.Button()
Me.pnlMain.SuspendLayout()
Me.Panel1.SuspendLayout()
Me.Panel2.SuspendLayout()
@@ -88,6 +88,22 @@ Partial Class frmNewData
Me.Panel1.Size = New System.Drawing.Size(753, 333)
Me.Panel1.TabIndex = 0
'
+ 'FlatButton1
+ '
+ Me.FlatButton1.allowBorder = False
+ Me.FlatButton1.BackColor = System.Drawing.Color.Red
+ Me.FlatButton1.FlatAppearance.BorderSize = 0
+ Me.FlatButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.FlatButton1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.FlatButton1.ForeColor = System.Drawing.Color.White
+ Me.FlatButton1.Location = New System.Drawing.Point(689, -1)
+ Me.FlatButton1.Margin = New System.Windows.Forms.Padding(0)
+ Me.FlatButton1.Name = "FlatButton1"
+ Me.FlatButton1.Size = New System.Drawing.Size(63, 23)
+ Me.FlatButton1.TabIndex = 0
+ Me.FlatButton1.Text = "X"
+ Me.FlatButton1.UseVisualStyleBackColor = False
+ '
'Panel2
'
Me.Panel2.AutoSize = True
@@ -106,6 +122,20 @@ Partial Class frmNewData
Me.Panel2.Size = New System.Drawing.Size(751, 331)
Me.Panel2.TabIndex = 13
'
+ 'MyFlowLayoutPanel1
+ '
+ Me.MyFlowLayoutPanel1.AutoScroll = True
+ Me.MyFlowLayoutPanel1.AutoSize = True
+ Me.MyFlowLayoutPanel1.BackColor = System.Drawing.Color.White
+ Me.MyFlowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.TopDown
+ Me.MyFlowLayoutPanel1.Location = New System.Drawing.Point(0, 70)
+ Me.MyFlowLayoutPanel1.Margin = New System.Windows.Forms.Padding(0)
+ Me.MyFlowLayoutPanel1.MaximumSize = New System.Drawing.Size(657, 5000)
+ Me.MyFlowLayoutPanel1.Name = "MyFlowLayoutPanel1"
+ Me.MyFlowLayoutPanel1.Padding = New System.Windows.Forms.Padding(0, 0, 10, 0)
+ Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(657, 46)
+ Me.MyFlowLayoutPanel1.TabIndex = 57
+ '
'Label2
'
Me.Label2.ForeColor = System.Drawing.Color.Black
@@ -584,6 +614,7 @@ Partial Class frmNewData
Me.btnVeragParkplatz.Text = "Parkp. ALT"
Me.btnVeragParkplatz.TextAlign = System.Drawing.ContentAlignment.BottomCenter
Me.btnVeragParkplatz.UseVisualStyleBackColor = True
+ Me.btnVeragParkplatz.Visible = False
'
'btnVeragParkplatzNEU
'
@@ -637,56 +668,6 @@ Partial Class frmNewData
Me.txtKundenNr.Size = New System.Drawing.Size(122, 23)
Me.txtKundenNr.TabIndex = 2
'
- 'btnAddLeistungVordefiniert
- '
- Me.btnAddLeistungVordefiniert.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
- Me.btnAddLeistungVordefiniert.Cursor = System.Windows.Forms.Cursors.Arrow
- Me.btnAddLeistungVordefiniert.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Silver
- Me.btnAddLeistungVordefiniert.FlatStyle = System.Windows.Forms.FlatStyle.Flat
- Me.btnAddLeistungVordefiniert.ForeColor = System.Drawing.Color.Black
- Me.btnAddLeistungVordefiniert.Image = Global.SDL.My.Resources.Resources.ids
- Me.btnAddLeistungVordefiniert.ImageAlign = System.Drawing.ContentAlignment.TopCenter
- Me.btnAddLeistungVordefiniert.Location = New System.Drawing.Point(661, 33)
- Me.btnAddLeistungVordefiniert.Margin = New System.Windows.Forms.Padding(2)
- Me.btnAddLeistungVordefiniert.Name = "btnAddLeistungVordefiniert"
- Me.btnAddLeistungVordefiniert.Size = New System.Drawing.Size(78, 81)
- Me.btnAddLeistungVordefiniert.TabIndex = 56
- Me.btnAddLeistungVordefiniert.Tag = "100"
- Me.btnAddLeistungVordefiniert.Text = "IDS" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "hinzufügen"
- Me.btnAddLeistungVordefiniert.TextAlign = System.Drawing.ContentAlignment.BottomCenter
- Me.btnAddLeistungVordefiniert.UseVisualStyleBackColor = True
- Me.btnAddLeistungVordefiniert.Visible = False
- '
- 'FlatButton1
- '
- Me.FlatButton1.allowBorder = False
- Me.FlatButton1.BackColor = System.Drawing.Color.Red
- Me.FlatButton1.FlatAppearance.BorderSize = 0
- Me.FlatButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
- Me.FlatButton1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.FlatButton1.ForeColor = System.Drawing.Color.White
- Me.FlatButton1.Location = New System.Drawing.Point(689, -1)
- Me.FlatButton1.Margin = New System.Windows.Forms.Padding(0)
- Me.FlatButton1.Name = "FlatButton1"
- Me.FlatButton1.Size = New System.Drawing.Size(63, 23)
- Me.FlatButton1.TabIndex = 0
- Me.FlatButton1.Text = "X"
- Me.FlatButton1.UseVisualStyleBackColor = False
- '
- 'MyFlowLayoutPanel1
- '
- Me.MyFlowLayoutPanel1.AutoScroll = True
- Me.MyFlowLayoutPanel1.AutoSize = True
- Me.MyFlowLayoutPanel1.BackColor = System.Drawing.Color.White
- Me.MyFlowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.TopDown
- Me.MyFlowLayoutPanel1.Location = New System.Drawing.Point(0, 70)
- Me.MyFlowLayoutPanel1.Margin = New System.Windows.Forms.Padding(0)
- Me.MyFlowLayoutPanel1.MaximumSize = New System.Drawing.Size(657, 5000)
- Me.MyFlowLayoutPanel1.Name = "MyFlowLayoutPanel1"
- Me.MyFlowLayoutPanel1.Padding = New System.Windows.Forms.Padding(0, 0, 10, 0)
- Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(657, 46)
- Me.MyFlowLayoutPanel1.TabIndex = 57
- '
'KdSearchBox1
'
Me.KdSearchBox1._AlleFirmenCLUSTER = False
@@ -716,6 +697,26 @@ Partial Class frmNewData
Me.KdSearchBox1.TIMER_SEARCH = True
Me.KdSearchBox1.usrcntl = Nothing
'
+ 'btnAddLeistungVordefiniert
+ '
+ Me.btnAddLeistungVordefiniert.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+ Me.btnAddLeistungVordefiniert.Cursor = System.Windows.Forms.Cursors.Arrow
+ Me.btnAddLeistungVordefiniert.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Silver
+ Me.btnAddLeistungVordefiniert.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btnAddLeistungVordefiniert.ForeColor = System.Drawing.Color.Black
+ Me.btnAddLeistungVordefiniert.Image = Global.SDL.My.Resources.Resources.ids
+ Me.btnAddLeistungVordefiniert.ImageAlign = System.Drawing.ContentAlignment.TopCenter
+ Me.btnAddLeistungVordefiniert.Location = New System.Drawing.Point(661, 33)
+ Me.btnAddLeistungVordefiniert.Margin = New System.Windows.Forms.Padding(2)
+ Me.btnAddLeistungVordefiniert.Name = "btnAddLeistungVordefiniert"
+ Me.btnAddLeistungVordefiniert.Size = New System.Drawing.Size(78, 81)
+ Me.btnAddLeistungVordefiniert.TabIndex = 56
+ Me.btnAddLeistungVordefiniert.Tag = "100"
+ Me.btnAddLeistungVordefiniert.Text = "IDS" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "hinzufügen"
+ Me.btnAddLeistungVordefiniert.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+ Me.btnAddLeistungVordefiniert.UseVisualStyleBackColor = True
+ Me.btnAddLeistungVordefiniert.Visible = False
+ '
'frmNewData
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
diff --git a/SDL/mdm/usrCntlKartenDaten.Designer.vb b/SDL/mdm/usrCntlKartenDaten.Designer.vb
index 3d5d2889..7bb7ca1e 100644
--- a/SDL/mdm/usrCntlKartenDaten.Designer.vb
+++ b/SDL/mdm/usrCntlKartenDaten.Designer.vb
@@ -45,6 +45,7 @@ Partial Class usrCntlKartenDaten
Me.btnSDL_Woelfl = New System.Windows.Forms.Button()
Me.btnMANAbgasplakette = New System.Windows.Forms.Button()
Me.btnVERAGParkplatz = New System.Windows.Forms.Button()
+ Me.btnVERAGCardNew = New System.Windows.Forms.Button()
Me.btnSDL_PLOSE = New System.Windows.Forms.Button()
Me.btnSDL_PLOSE_IT = New System.Windows.Forms.Button()
Me.btnSDL_PLOSE_CZ = New System.Windows.Forms.Button()
@@ -82,7 +83,6 @@ Partial Class usrCntlKartenDaten
Me.cntxtExcel = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem()
- Me.btnVERAGCardNew = New System.Windows.Forms.Button()
Me.FlowLayoutPanel.SuspendLayout()
Me.ContextMenuStrip1.SuspendLayout()
Me.Panel1.SuspendLayout()
@@ -472,6 +472,24 @@ Partial Class usrCntlKartenDaten
Me.btnVERAGParkplatz.Text = "Parkp. ALT"
Me.btnVERAGParkplatz.TextAlign = System.Drawing.ContentAlignment.BottomCenter
Me.btnVERAGParkplatz.UseVisualStyleBackColor = True
+ Me.btnVERAGParkplatz.Visible = False
+ '
+ 'btnVERAGCardNew
+ '
+ Me.btnVERAGCardNew.Cursor = System.Windows.Forms.Cursors.Default
+ Me.btnVERAGCardNew.FlatAppearance.BorderSize = 0
+ Me.btnVERAGCardNew.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btnVERAGCardNew.ForeColor = System.Drawing.Color.Black
+ Me.btnVERAGCardNew.Image = Global.SDL.My.Resources.Resources.verag_Card1
+ Me.btnVERAGCardNew.ImageAlign = System.Drawing.ContentAlignment.TopCenter
+ Me.btnVERAGCardNew.Location = New System.Drawing.Point(156, 64)
+ Me.btnVERAGCardNew.Margin = New System.Windows.Forms.Padding(0)
+ Me.btnVERAGCardNew.Name = "btnVERAGCardNew"
+ Me.btnVERAGCardNew.Size = New System.Drawing.Size(78, 64)
+ Me.btnVERAGCardNew.TabIndex = 45
+ Me.btnVERAGCardNew.Text = "Parkplatz"
+ Me.btnVERAGCardNew.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+ Me.btnVERAGCardNew.UseVisualStyleBackColor = True
'
'btnSDL_PLOSE
'
@@ -945,23 +963,6 @@ Partial Class usrCntlKartenDaten
Me.ToolStripMenuItem6.Size = New System.Drawing.Size(210, 22)
Me.ToolStripMenuItem6.Text = "Formatiert (dauert länger)"
'
- 'btnVERAGCardNew
- '
- Me.btnVERAGCardNew.Cursor = System.Windows.Forms.Cursors.Default
- Me.btnVERAGCardNew.FlatAppearance.BorderSize = 0
- Me.btnVERAGCardNew.FlatStyle = System.Windows.Forms.FlatStyle.Flat
- Me.btnVERAGCardNew.ForeColor = System.Drawing.Color.Black
- Me.btnVERAGCardNew.Image = Global.SDL.My.Resources.Resources.verag_Card1
- Me.btnVERAGCardNew.ImageAlign = System.Drawing.ContentAlignment.TopCenter
- Me.btnVERAGCardNew.Location = New System.Drawing.Point(156, 64)
- Me.btnVERAGCardNew.Margin = New System.Windows.Forms.Padding(0)
- Me.btnVERAGCardNew.Name = "btnVERAGCardNew"
- Me.btnVERAGCardNew.Size = New System.Drawing.Size(78, 64)
- Me.btnVERAGCardNew.TabIndex = 45
- Me.btnVERAGCardNew.Text = "Parkplatz"
- Me.btnVERAGCardNew.TextAlign = System.Drawing.ContentAlignment.BottomCenter
- Me.btnVERAGCardNew.UseVisualStyleBackColor = True
- '
'usrCntlKartenDaten
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
diff --git a/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb b/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb
index f612fc07..46ba4dbd 100644
--- a/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb
+++ b/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb
@@ -2163,6 +2163,10 @@ Public Class cVermerkeDAL
Using cmd As New SqlCommand(sql, conn)
Try
cmd.ExecuteNonQuery()
+
+ 'Vermerkzuweisung aufheben, falls vorhanden
+ Dim VERAG_SQL As New VERAG_PROG_ALLGEMEIN.SQL
+ VERAG_SQL.doSQL("UPDATE [Vermerke] SET VermerkIDAufgehoben = null where VermerkIDAufgehoben = '" & hID & "'", "AVISO")
Catch ex As SqlException
MsgBox("Gelöscht kann nicht gesetzt werden!" & vbCrLf & vbCrLf & ex.Message, vbExclamation, "Fehler beim Löschen")
End Try
@@ -2246,11 +2250,16 @@ Public Class cVermerkeDAL
Using cmd As New SqlCommand(sql, conn)
Try
cmd.ExecuteNonQuery()
+
+ 'Vermerkzuweisung aufheben, falls vorhanden
+ Dim VERAG_SQL As New VERAG_PROG_ALLGEMEIN.SQL
+ VERAG_SQL.doSQL("UPDATE [Vermerke] SET VermerkIDAufgehoben = null where VermerkIDAufgehoben = '" & hID & "'", "AVISO")
Catch ex As SqlException
MsgBox("Vermerk kann nicht gelöscht werden!" & vbCrLf & vbCrLf & ex.Message, vbExclamation, "Fehler beim Löschen")
End Try
End Using
conn.Close()
+
End Sub
diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cBMD_Interface.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cBMD_Interface.vb
index a1d5999f..e857511c 100644
--- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cBMD_Interface.vb
+++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cBMD_Interface.vb
@@ -55,7 +55,7 @@
'DATEIPFAD für Stammdaten
'-------------------------------------------------------------------------------------------
- Dim pathArchivKD = "\\srv07.unisu.at\Unisped Daten\VERAG AR-Daten\" '"\\192.168.1.20\Daten\DVO - DATENORDNER MIT IMPORTDATEIEN\"
+ Dim pathArchivKD = "\\UNIDC01.unisu.at\Unisped Daten\VERAG AR-Daten\" '"\\192.168.1.20\Daten\DVO - DATENORDNER MIT IMPORTDATEIEN\"
Dim pathKD = "\\share01\Datenarchiv\UNISPED\BMD\STAMMDATEN\" & Geschaeftsjahr & "\" ' "\\192.168.1.20\Daten\DVO - DATENORDNER MIT IMPORTDATEIEN\Archiv\"
'pathKD = pathArchivKD 'TEST
@@ -140,7 +140,7 @@
'DATEIPFAD für Buchungsdaten
'-------------------------------------------------------------------------------------------
- Dim pathArchiv = "\\srv07.unisu.at\Unisped Daten\VERAG AR-Daten\" '"\\192.168.1.20\Daten\DVO - DATENORDNER MIT IMPORTDATEIEN\"
+ Dim pathArchiv = "\\UNIDC01.unisu.at\Unisped Daten\VERAG AR-Daten\" '"\\192.168.1.20\Daten\DVO - DATENORDNER MIT IMPORTDATEIEN\"
Dim path = "\\share01\Datenarchiv\UNISPED\BMD\BUCHUNGEN\" & Geschaeftsjahr & "\" ' "\\192.168.1.20\Daten\DVO - DATENORDNER MIT IMPORTDATEIEN\Archiv\"
' path = pathArchiv 'TEST
If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cLDV_Interface.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cLDV_Interface.vb
index a57909b5..1c13d413 100644
--- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cLDV_Interface.vb
+++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cLDV_Interface.vb
@@ -8,9 +8,9 @@ Public Class cLDV_Interface
Dim LDV_PFAD = "\\ftps.verag.ag\FTP\LDV\IN\BMD\"
- Dim pathArchivKD = "\\srv07.unisu.at\Unisped Daten\AWOR AR-Daten\" '"\\192.168.1.20\Daten\DVO - DATENORDNER MIT IMPORTDATEIEN\"
+ Dim pathArchivKD = "\\UNIDC01.unisu.at\Unisped Daten\AWOR AR-Daten\" '"\\192.168.1.20\Daten\DVO - DATENORDNER MIT IMPORTDATEIEN\"
Dim pathKD = "\\share01\Datenarchiv\AWOR\BMD\STAMMDATEN\" & Geschaeftsjahr & "\" ' "\\192.168.1.20\Daten\DVO - DATENORDNER MIT IMPORTDATEIEN\Archiv\"
- Dim pathArchiv = "\\srv07.unisu.at\Unisped Daten\AWOR AR-Daten\" '"\\192.168.1.20\Daten\DVO - DATENORDNER MIT IMPORTDATEIEN\"
+ Dim pathArchiv = "\\UNIDC01.unisu.at\Unisped Daten\AWOR AR-Daten\" '"\\192.168.1.20\Daten\DVO - DATENORDNER MIT IMPORTDATEIEN\"
Dim path = "\\share01\Datenarchiv\AWOR\BMD\BUCHUNGEN\" & Geschaeftsjahr & "\" ' "\\192.168.1.20\Daten\DVO - DATENORDNER MIT IMPORTDATEIEN\Archiv\"
Dim Dateiname = ""
diff --git a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb
index b690a288..08472421 100644
--- a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb
+++ b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb
@@ -1,6 +1,7 @@
Imports System.IO
Imports System.Net.Mail
Imports System.Text
+Imports System.Windows.Forms
Imports ClosedXML.Excel
Public Class cProgramFunctions
@@ -193,7 +194,7 @@ Public Class cProgramFunctions
End Function
- Public Shared Function genExcelFromDT_NEW(dt As DataTable, Optional rangeAsWaehrung() As String = Nothing, Optional ShowAutoFilter As Boolean = True, Optional HeaderTxt As String = "", Optional HeaderTxt2 As String = "", Optional openPDF As Boolean = True, Optional optFileName As String = "", Optional endung As String = ".xlsx") As String
+ Public Shared Function genExcelFromDT_NEW(dt As DataTable, Optional rangeAsWaehrung() As String = Nothing, Optional ShowAutoFilter As Boolean = True, Optional HeaderTxt As String = "", Optional HeaderTxt2 As String = "", Optional openPDF As Boolean = True, Optional optFileName As String = "", Optional endung As String = ".xlsx", Optional autoAdjust As Boolean = True) As String
Try
Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\SDL\tmp\" ' My.Computer.FileSystem.GetTempFileName
@@ -229,6 +230,13 @@ Public Class cProgramFunctions
End If
+ If autoAdjust Then
+
+ 'Spaltenbreite auto:
+ wb.Worksheets(0).Columns().AdjustToContents()
+
+ End If
+
Dim filename As String = ""
If optFileName <> "" Then
filename = sPath & optFileName & endung '".xlsx"