diff --git a/AVISOUPDATER/UPDATERfrm.vb b/AVISOUPDATER/UPDATERfrm.vb index e9cf396..276081f 100644 --- a/AVISOUPDATER/UPDATERfrm.vb +++ b/AVISOUPDATER/UPDATERfrm.vb @@ -35,6 +35,10 @@ Public Class UPDATERfrm CopyIncremental = False End If + If System.AppDomain.CurrentDomain.BaseDirectory = "\\share01\Programme\AVISO\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "\\share01\f\Programme\AVISO\" OrElse System.AppDomain.CurrentDomain.BaseDirectory = "\\install\Programme\AVISO\" Then + MsgBox("Programm kann nicht im Quellpfad " & System.AppDomain.CurrentDomain.BaseDirectory & " geupdated werden!" & vbNewLine & "Vorgang wird abgebrochen!", MsgBoxStyle.Critical) + Exit Sub + End If Dim FIRMA = "VERAG" Dim pfadDatei As String = System.AppDomain.CurrentDomain.BaseDirectory & "\Standort.txt" diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index a962301..0747092 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/frmLogin.vb b/Aviso/frmLogin.vb index d7d5f64..3eae677 100644 --- a/Aviso/frmLogin.vb +++ b/Aviso/frmLogin.vb @@ -87,6 +87,8 @@ Public Class frmLogin If firma = "NKD" Then firma = "VERAG" If firma = "NEU" Then firma = "VERAG" If firma = "SUB" Then firma = "VERAG" + strmReader.Close() + Else ' FIRMA VON AD HOLEN, wenn keine StandortTxt diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index dd6bb1a..fc38aa8 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -839,9 +839,13 @@ Public Class usrcntlAktDetails .RowTemplate.MinimumHeight = 20 .AutoSizeRowsMode = DataGridViewAutoSizeRowsMode.AllCells + .Columns("anh_id").Visible = False 'VermerkID nicht anzeigen - .Columns("anh_docId").Visible = False 'AvisoID nicht anzeigen - .Columns("anh_markiert").Visible = False 'AvisoID nicht anzeigen + .Columns("anh_docId").Visible = False + .Columns("anh_markiert").Visible = False + .Columns("anh_LaufzettelDruck").Visible = False + .Columns("anh_GestellungslisteAnfuegen").Visible = False + .Columns("anh_cmrId").Visible = False .Columns("anh_Name").MinimumWidth = 150 .Columns("anh_Name").HeaderText = "Name" diff --git a/Gemeinsames/Gemeinsames.vbproj b/Gemeinsames/Gemeinsames.vbproj index beb46fd..a26772e 100644 --- a/Gemeinsames/Gemeinsames.vbproj +++ b/Gemeinsames/Gemeinsames.vbproj @@ -35,7 +35,7 @@ true - x64 + AnyCPU true full true