merge

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"

Aviso/frmGesamtsicherheitenNEU.vb

@@ -83,8 +83,17 @@ Public Class frmGesamtsicherheitenNEU
 
             txtlkwIdSearch.initSearchBox(Me.FindForm, "  LKW_Nr, AvisoID, CAST(Datum as Date) as Datum FROM [Aviso]", {"LKW_Nr", "AvisoID", "Datum"}, "", "Datum desc", "LKW_Nr", "AvisoID", "AVISO",, 250, 200)
 
+            If Standort = "AMBAR GmbH" Then
+                If cboFiliale.Items.Count > 0 Then
+                    cboFiliale.SelectedIndex = 0
+                End If
+                If cboWarenort.Items.Count > 0 Then
+                    cboWarenort.changeItem("5701")
+                End If
+            End If
+
         Else
-            LoadDGVSicherheiten(True)
+                LoadDGVSicherheiten(True)
         End If
         LoadStandort()
         cboSicherheitATR.Enabled = currentGesSichRef.brgakto_gs_ATR

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

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_docId").Visible = False
-                    .Columns("anh_markiert").Visible = False     'AvisoID nicht anzeigen
+                    .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"

Gemeinsames/Gemeinsames.vbproj

@@ -35,7 +35,7 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <DefineDebug>true</DefineDebug>