diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index 8e825da..07bd4c2 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -1609,7 +1609,6 @@ - @@ -1661,8 +1660,8 @@ - + Always @@ -1867,7 +1866,9 @@ True - + + + diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 0747092..d6b263e 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/My Project/Resources.resx b/Aviso/My Project/Resources.resx index e10981e..2db26fa 100644 --- a/Aviso/My Project/Resources.resx +++ b/Aviso/My Project/Resources.resx @@ -493,9 +493,6 @@ ..\Resources\fakturiertInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\bin\Debug\Resources\ambar_boarder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\stift1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -691,5 +688,7 @@ ..\Resources\memories5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + + ..\Resources\ambar_boarder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Aviso/Resources/ambar_boarder1.png b/Aviso/Resources/ambar_boarder1.png new file mode 100644 index 0000000..bc0c101 Binary files /dev/null and b/Aviso/Resources/ambar_boarder1.png differ diff --git a/Aviso/bin/Debug/Resources/ambar_boarder.png b/Aviso/bin/Debug/Resources/ambar_boarder.png new file mode 100644 index 0000000..bc0c101 Binary files /dev/null and b/Aviso/bin/Debug/Resources/ambar_boarder.png differ diff --git a/Aviso/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb index c97f0e7..ef80ab7 100644 --- a/Aviso/frmGesamtsicherheitenNEU.vb +++ b/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 diff --git a/Diverses/ambar_boarder.png b/Diverses/ambar_boarder.png new file mode 100644 index 0000000..bc0c101 Binary files /dev/null and b/Diverses/ambar_boarder.png differ