merge

Aviso/frmGesamtsicherheitenMenuNEU.vb

@@ -30,6 +30,7 @@ Public Class frmGesamtsicherheitenMenuNEU
             Case "Verag CS" : firmaId = 11 : chkOffen.Checked = False
             Case "Unisped GmbH" : firmaId = 21 : chkOffen.Checked = False
             Case "AMBAR GmbH" : firmaId = 24 : chkOffen.Checked = False
+            Case "Atilla GmbH" : firmaId = 7 : chkOffen.Checked = False
         End Select
 
 
@@ -155,7 +156,7 @@ Public Class frmGesamtsicherheitenMenuNEU
                                 GROUP BY
                                     gs.gs_gsnr " & sqlSicherheitssaldo &
                                 "ORDER BY
-                                    gs.gs_gsnr;"
+                                    gs.gs_gsnr desc;"
 
         dgvListe.SET_SQL(sqlstring, "AVISO")
         dgvListe.LOAD()

Aviso/frmHauptfenster.Designer.vb

@@ -22,7 +22,6 @@ Partial Class frmHauptfenster
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmHauptfenster))
         Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
@@ -35,7 +34,7 @@ Partial Class frmHauptfenster
         Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.mnuInfo = New System.Windows.Forms.ToolStripMenuItem()
         Me.conÜbernehmen = New System.Windows.Forms.ToolStripMenuItem()
-        Me.conMenuAviso = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.conMenuAviso = New System.Windows.Forms.ContextMenuStrip()
         Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator()
         Me.conFertig = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
@@ -128,6 +127,7 @@ Partial Class frmHauptfenster
         Me.DEVeragGmbHToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ATUnispedGmbHToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.DEAmbarToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ATAtillaToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem10 = New System.Windows.Forms.ToolStripMenuItem()
         Me.TICKETWaidhausToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator10 = New System.Windows.Forms.ToolStripSeparator()
@@ -272,7 +272,7 @@ Partial Class frmHauptfenster
         Me.Label2 = New System.Windows.Forms.Label()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.Label3 = New System.Windows.Forms.Label()
-        Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
+        Me.Timer1 = New System.Windows.Forms.Timer()
         Me.btnWichtige = New System.Windows.Forms.Button()
         Me.btnWichtigeStandort = New System.Windows.Forms.Button()
         Me.btnMinimieren = New System.Windows.Forms.Button()
@@ -289,7 +289,7 @@ Partial Class frmHauptfenster
         Me.Label22 = New System.Windows.Forms.Label()
         Me.btnE_Aviso = New System.Windows.Forms.Button()
         Me.btnNeu = New System.Windows.Forms.Button()
-        Me.cntxtAtilla = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.cntxtAtilla = New System.Windows.Forms.ContextMenuStrip()
         Me.ToolStripMenuItem17 = New System.Windows.Forms.ToolStripMenuItem()
         Me.Button7 = New System.Windows.Forms.Button()
         Me.picAVISOMessenger = New System.Windows.Forms.PictureBox()
@@ -298,7 +298,7 @@ Partial Class frmHauptfenster
         Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen()
         Me.pnl = New System.Windows.Forms.Panel()
         Me.Button10 = New System.Windows.Forms.Button()
-        Me.gridMyAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.gridMyAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
         Me.Panel6 = New System.Windows.Forms.Panel()
         Me.cbx_My_Brexit = New System.Windows.Forms.CheckBox()
         Me.btnColor = New System.Windows.Forms.Button()
@@ -312,7 +312,7 @@ Partial Class frmHauptfenster
         Me.lblMySND_Anzeige = New System.Windows.Forms.Label()
         Me.lblAkte = New System.Windows.Forms.Label()
         Me.btnClose = New System.Windows.Forms.Button()
-        Me.TimerAkte = New System.Windows.Forms.Timer(Me.components)
+        Me.TimerAkte = New System.Windows.Forms.Timer()
         Me.tabVorgeschrieben = New System.Windows.Forms.TabPage()
         Me.tabFreigegeben = New System.Windows.Forms.TabPage()
         Me.tabNichtEingetroffen = New System.Windows.Forms.TabPage()
@@ -329,7 +329,7 @@ Partial Class frmHauptfenster
         Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
         Me.pnlDetailsLinks = New System.Windows.Forms.Panel()
         Me.splitMain = New System.Windows.Forms.SplitContainer()
-        Me.gridAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.gridAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
         Me.Panel1 = New System.Windows.Forms.Panel()
         Me.CheckBox1 = New System.Windows.Forms.CheckBox()
         Me.tbcntrAvisoSND = New System.Windows.Forms.TabControl()
@@ -376,17 +376,17 @@ Partial Class frmHauptfenster
         Me.lblErwAuftraggeber = New System.Windows.Forms.Label()
         Me.cbxAlle = New System.Windows.Forms.CheckBox()
         Me.btnSmall = New System.Windows.Forms.Button()
-        Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
+        Me.ToolTip1 = New System.Windows.Forms.ToolTip()
         Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker()
-        Me.timerStandzeit = New System.Windows.Forms.Timer(Me.components)
+        Me.timerStandzeit = New System.Windows.Forms.Timer()
         Me.Label9 = New System.Windows.Forms.Label()
-        Me.TimerUPDATE = New System.Windows.Forms.Timer(Me.components)
+        Me.TimerUPDATE = New System.Windows.Forms.Timer()
         Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
         Me.pnlOptionen = New System.Windows.Forms.Panel()
         Me.btnKasse_User = New System.Windows.Forms.Button()
         Me.btnKasse_LG = New System.Windows.Forms.Button()
         Me.btnTV = New System.Windows.Forms.Button()
-        Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.cntxt = New System.Windows.Forms.ContextMenuStrip()
         Me.BundesanzeigerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.EUTaricToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ZugelassenerAusführerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -395,16 +395,16 @@ Partial Class frmHauptfenster
         Me.BrexitToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
         Me.EmbargosLänderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.GüterlisteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components)
+        Me.Timer_REFRESH = New System.Windows.Forms.Timer()
         Me.ColorDialog = New System.Windows.Forms.ColorDialog()
-        Me.ctxtFarben = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.ctxtFarben = New System.Windows.Forms.ContextMenuStrip()
         Me.ALLEToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem19 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem20 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem21 = New System.Windows.Forms.ToolStripMenuItem()
         Me.Panel3 = New System.Windows.Forms.Panel()
         Me.Panel4 = New System.Windows.Forms.Panel()
-        Me.cntVerag = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.cntVerag = New System.Windows.Forms.ContextMenuStrip()
         Me.ZertifikateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.HomepageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.pnlLeft = New System.Windows.Forms.Panel()
@@ -1014,7 +1014,7 @@ Partial Class frmHauptfenster
         '
         'GesamtsicherheitenToolStripMenuItem
         '
-        Me.GesamtsicherheitenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ATVeragAGToolStripMenuItem, Me.ATImexCSToolStripMenuItem, Me.ATVeragCSToolStripMenuItem, Me.DEVeragGmbHToolStripMenuItem, Me.ATUnispedGmbHToolStripMenuItem, Me.DEAmbarToolStripMenuItem})
+        Me.GesamtsicherheitenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ATVeragAGToolStripMenuItem, Me.ATImexCSToolStripMenuItem, Me.ATVeragCSToolStripMenuItem, Me.DEVeragGmbHToolStripMenuItem, Me.ATUnispedGmbHToolStripMenuItem, Me.DEAmbarToolStripMenuItem, Me.ATAtillaToolStripMenuItem})
         Me.GesamtsicherheitenToolStripMenuItem.Name = "GesamtsicherheitenToolStripMenuItem"
         Me.GesamtsicherheitenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.GesamtsicherheitenToolStripMenuItem.Text = "Gesamtsicherheiten"
@@ -1057,6 +1057,12 @@ Partial Class frmHauptfenster
         Me.DEAmbarToolStripMenuItem.Text = "DE | Ambar GmbH"
         Me.DEAmbarToolStripMenuItem.Visible = False
         '
+        'ATAtillaToolStripMenuItem
+        '
+        Me.ATAtillaToolStripMenuItem.Name = "ATAtillaToolStripMenuItem"
+        Me.ATAtillaToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ATAtillaToolStripMenuItem.Text = "AT | Atilla GmbH"
+        '
         'ToolStripMenuItem10
         '
         Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10"
@@ -4409,4 +4415,5 @@ Partial Class frmHauptfenster
     Friend WithEvents CheckBox1 As CheckBox
     Friend WithEvents TVEditorNewToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents ATILLASENDUNGToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents ATAtillaToolStripMenuItem As ToolStripMenuItem
 End Class

Aviso/frmHauptfenster.vb

@@ -3132,6 +3132,7 @@ ELSE_ATILLA:
         ATImexCSToolStripMenuItem.Visible = False
         DEAmbarToolStripMenuItem.Visible = False
         ATUnispedGmbHToolStripMenuItem.Visible = False
+        ATAtillaToolStripMenuItem.Visible = False
 
 
         If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then
@@ -3139,6 +3140,7 @@ ELSE_ATILLA:
             DEVeragGmbHToolStripMenuItem.Visible = True
             ATVeragAGToolStripMenuItem.Visible = True
             ATUnispedGmbHToolStripMenuItem.Visible = True
+            ATAtillaToolStripMenuItem.Visible = True
         ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then
             'nix
         ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then
@@ -4821,7 +4823,7 @@ ELSE_ATILLA:
         Process.Start("https://www.ros.ie/customs-roro-control-web/ros/pbn/create")
     End Sub
 
-    Private Sub ATGesamtsicherheitVeragAGToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATVeragAGToolStripMenuItem.Click, DEVeragGmbHToolStripMenuItem.Click, ATImexCSToolStripMenuItem.Click, ATVeragCSToolStripMenuItem.Click, ATUnispedGmbHToolStripMenuItem.Click, DEAmbarToolStripMenuItem.Click
+    Private Sub ATGesamtsicherheitVeragAGToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATVeragAGToolStripMenuItem.Click, DEVeragGmbHToolStripMenuItem.Click, ATImexCSToolStripMenuItem.Click, ATVeragCSToolStripMenuItem.Click, ATUnispedGmbHToolStripMenuItem.Click, DEAmbarToolStripMenuItem.Click, ATAtillaToolStripMenuItem.Click
 
         Dim frm As New frmGesamtsicherheitenMenuNEU()
         Select Case sender.name
@@ -4831,6 +4833,7 @@ ELSE_ATILLA:
             Case "ATVeragCSToolStripMenuItem" : frm.Standort = "Verag CS"
             Case "ATUnispedGmbHToolStripMenuItem" : frm.Standort = "Unisped GmbH"
             Case "DEAmbarToolStripMenuItem" : frm.Standort = "AMBAR GmbH"
+            Case "ATAtillaToolStripMenuItem" : frm.Standort = "Atilla GmbH"
         End Select
 
         frm.Show()
@@ -5319,4 +5322,5 @@ ELSE_ATILLA:
         detailForm.Show()
     End Sub
 
+
 End Class