merge

Aviso/Aviso.vbproj

@@ -1609,7 +1609,6 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="aviso.ico" />
-    <Content Include="bin\Debug\Resources\ambar_boarder.png" />
     <Content Include="My Project\aktAlt.jpg" />
     <None Include="Resources\ZwAbEinfuegen.png" />
     <None Include="Resources\unisped_aeo_DE.jpg" />
@@ -1661,8 +1660,8 @@
     <None Include="Resources\FO.bmp" />
     <None Include="Resources\atr.png" />
     <None Include="Resources\atr_s.png" />
-    <Content Include="Resources\ambar_boarder.png" />
     <None Include="Resources\birthday_4.jpg" />
+    <None Include="Resources\ambar_boarder.png" />
     <Content Include="Resources\FO.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -1867,7 +1866,9 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </COMReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="bin\Debug\Resources\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PreBuildEvent>

Aviso/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("4.0.3.7")>
-<Assembly: AssemblyFileVersion("4.0.3.7")>
+<Assembly: AssemblyVersion("4.0.3.8")>
+<Assembly: AssemblyFileVersion("4.0.3.8")>

Aviso/My Project/Resources.resx

@@ -493,9 +493,6 @@
   <data name="fakturiertInaktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\fakturiertInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ambar_boarder" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\bin\Debug\Resources\ambar_boarder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="stift1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\stift1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -691,5 +688,7 @@
   <data name="memories5" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\memories5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
- 
+  <data name="ambar_boarder" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ambar_boarder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

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