Admin

2026-07-28 09:14:56 +02:00
parent ac2e14ff6e
commit a566e3461f
3 changed files with 204 additions and 140 deletions
--- a/VERAG_PROG_ALLGEMEIN/AuditFlow/frmFirmenuebersicht.Designer.vb
+++ b/VERAG_PROG_ALLGEMEIN/AuditFlow/frmFirmenuebersicht.Designer.vb
@@ -25,14 +25,8 @@ Partial Class frmFirmenuebersicht
        Me.components = New System.ComponentModel.Container()
        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFirmenuebersicht))
-        Me.AbgeholtToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.cntxtOptionen = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.StornoToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.Panel1 = New System.Windows.Forms.Panel()
-        Me.dgvFirmen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.pnloptions = New System.Windows.Forms.Panel()
-        Me.Label9 = New System.Windows.Forms.Label()
-        Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.Button2 = New System.Windows.Forms.Button()
        Me.Panel2 = New System.Windows.Forms.Panel()
        Me.PictureBox2 = New System.Windows.Forms.PictureBox()
@@ -45,9 +39,18 @@ Partial Class frmFirmenuebersicht
        Me.pnlTop = New System.Windows.Forms.Panel()
        Me.Label4 = New System.Windows.Forms.Label()
        Me.lblFirma = New System.Windows.Forms.Label()
-        Me.cntxtOptionen.SuspendLayout()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.Label6 = New System.Windows.Forms.Label()
+        Me.lblBank1 = New System.Windows.Forms.Label()
+        Me.lblIban1 = New System.Windows.Forms.Label()
+        Me.lblBic1 = New System.Windows.Forms.Label()
+        Me.lblBic2 = New System.Windows.Forms.Label()
+        Me.lblIban2 = New System.Windows.Forms.Label()
+        Me.lblBank2 = New System.Windows.Forms.Label()
+        Me.lblMail1 = New System.Windows.Forms.Label()
+        Me.lblMail2 = New System.Windows.Forms.Label()
+        Me.dgvFirmen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.Panel1.SuspendLayout()
-        CType(Me.dgvFirmen, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.pnloptions.SuspendLayout()
        Me.Panel2.SuspendLayout()
        CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -55,28 +58,9 @@ Partial Class frmFirmenuebersicht
        CType(Me.pbLogoMail, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.pbLogo, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.pnlTop.SuspendLayout()
+        CType(Me.dgvFirmen, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
-        'AbgeholtToolStripMenuItem
-        '
-        Me.AbgeholtToolStripMenuItem.Name = "AbgeholtToolStripMenuItem"
-        Me.AbgeholtToolStripMenuItem.Size = New System.Drawing.Size(123, 22)
-        Me.AbgeholtToolStripMenuItem.Text = "Abgeholt"
-        '
-        'cntxtOptionen
-        '
-        Me.cntxtOptionen.ImageScalingSize = New System.Drawing.Size(24, 24)
-        Me.cntxtOptionen.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AbgeholtToolStripMenuItem, Me.StornoToolStripMenuItem})
-        Me.cntxtOptionen.Name = "cntxtOptionen"
-        Me.cntxtOptionen.Size = New System.Drawing.Size(124, 48)
-        Me.cntxtOptionen.Text = "Optionen"
-        '
-        'StornoToolStripMenuItem
-        '
-        Me.StornoToolStripMenuItem.Name = "StornoToolStripMenuItem"
-        Me.StornoToolStripMenuItem.Size = New System.Drawing.Size(123, 22)
-        Me.StornoToolStripMenuItem.Text = "Storno"
-        '
        'Panel1
        '
        Me.Panel1.Controls.Add(Me.dgvFirmen)
@@ -88,34 +72,9 @@ Partial Class frmFirmenuebersicht
        Me.Panel1.Size = New System.Drawing.Size(1429, 779)
        Me.Panel1.TabIndex = 4
        '
-        'dgvFirmen
-        '
-        Me.dgvFirmen.AKTUALISIERUNGS_INTERVALL = -1
-        Me.dgvFirmen.AllowUserToAddRows = False
-        Me.dgvFirmen.AllowUserToDeleteRows = False
-        Me.dgvFirmen.AllowUserToOrderColumns = True
-        Me.dgvFirmen.AllowUserToResizeRows = False
-        Me.dgvFirmen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.GradientInactiveCaption
-        DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvFirmen.DefaultCellStyle = DataGridViewCellStyle1
-        Me.dgvFirmen.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.dgvFirmen.Location = New System.Drawing.Point(0, 109)
-        Me.dgvFirmen.Name = "dgvFirmen"
-        Me.dgvFirmen.RowHeadersVisible = False
-        Me.dgvFirmen.Size = New System.Drawing.Size(1429, 610)
-        Me.dgvFirmen.TabIndex = 10
-        '
        'pnloptions
        '
        Me.pnloptions.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.pnloptions.Controls.Add(Me.Label9)
-        Me.pnloptions.Controls.Add(Me.MyTextBox2)
        Me.pnloptions.Controls.Add(Me.Button2)
        Me.pnloptions.Dock = System.Windows.Forms.DockStyle.Bottom
        Me.pnloptions.Location = New System.Drawing.Point(0, 719)
@@ -123,43 +82,6 @@ Partial Class frmFirmenuebersicht
        Me.pnloptions.Size = New System.Drawing.Size(1429, 60)
        Me.pnloptions.TabIndex = 12
        '
-        'Label9
-        '
-        Me.Label9.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Label9.AutoSize = True
-        Me.Label9.Location = New System.Drawing.Point(1337, 16)
-        Me.Label9.Name = "Label9"
-        Me.Label9.Size = New System.Drawing.Size(30, 13)
-        Me.Label9.TabIndex = 7
-        Me.Label9.Text = "Max:"
-        '
-        'MyTextBox2
-        '
-        Me.MyTextBox2._DateTimeOnly = False
-        Me.MyTextBox2._numbersOnly = True
-        Me.MyTextBox2._numbersOnlyKommastellen = ""
-        Me.MyTextBox2._numbersOnlyTrennzeichen = True
-        Me.MyTextBox2._Prozent = False
-        Me.MyTextBox2._ShortDateNew = False
-        Me.MyTextBox2._ShortDateOnly = False
-        Me.MyTextBox2._TimeOnly = False
-        Me.MyTextBox2._TimeOnly_Seconds = False
-        Me.MyTextBox2._value = ""
-        Me.MyTextBox2._Waehrung = False
-        Me.MyTextBox2._WaehrungZeichen = True
-        Me.MyTextBox2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.MyTextBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.MyTextBox2.ForeColor = System.Drawing.Color.Black
-        Me.MyTextBox2.Location = New System.Drawing.Point(1369, 13)
-        Me.MyTextBox2.MaxLineLength = -1
-        Me.MyTextBox2.MaxLines_Warning = ""
-        Me.MyTextBox2.MaxLines_Warning_Label = Nothing
-        Me.MyTextBox2.Name = "MyTextBox2"
-        Me.MyTextBox2.Size = New System.Drawing.Size(48, 20)
-        Me.MyTextBox2.TabIndex = 8
-        Me.MyTextBox2.Text = "1000"
-        Me.MyTextBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
-        '
        'Button2
        '
        Me.Button2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
@@ -180,6 +102,16 @@ Partial Class frmFirmenuebersicht
        '
        Me.Panel2.BackColor = System.Drawing.Color.WhiteSmoke
        Me.Panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Panel2.Controls.Add(Me.lblMail2)
+        Me.Panel2.Controls.Add(Me.lblMail1)
+        Me.Panel2.Controls.Add(Me.lblBic2)
+        Me.Panel2.Controls.Add(Me.lblIban2)
+        Me.Panel2.Controls.Add(Me.lblBank2)
+        Me.Panel2.Controls.Add(Me.lblBic1)
+        Me.Panel2.Controls.Add(Me.lblIban1)
+        Me.Panel2.Controls.Add(Me.lblBank1)
+        Me.Panel2.Controls.Add(Me.Label6)
+        Me.Panel2.Controls.Add(Me.Label3)
        Me.Panel2.Controls.Add(Me.lblFirma)
        Me.Panel2.Controls.Add(Me.PictureBox2)
        Me.Panel2.Controls.Add(Me.PictureBox1)
@@ -191,14 +123,14 @@ Partial Class frmFirmenuebersicht
        Me.Panel2.Dock = System.Windows.Forms.DockStyle.Top
        Me.Panel2.Location = New System.Drawing.Point(0, 0)
        Me.Panel2.Name = "Panel2"
-        Me.Panel2.Size = New System.Drawing.Size(1429, 109)
+        Me.Panel2.Size = New System.Drawing.Size(1429, 118)
        Me.Panel2.TabIndex = 11
        '
        'PictureBox2
        '
        Me.PictureBox2.BackgroundImage = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.stift
        Me.PictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.PictureBox2.Location = New System.Drawing.Point(1209, 49)
+        Me.PictureBox2.Location = New System.Drawing.Point(1235, 49)
        Me.PictureBox2.Name = "PictureBox2"
        Me.PictureBox2.Size = New System.Drawing.Size(23, 17)
        Me.PictureBox2.TabIndex = 29
@@ -208,7 +140,7 @@ Partial Class frmFirmenuebersicht
        '
        Me.PictureBox1.BackgroundImage = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.stift
        Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.PictureBox1.Location = New System.Drawing.Point(908, 49)
+        Me.PictureBox1.Location = New System.Drawing.Point(973, 49)
        Me.PictureBox1.Name = "PictureBox1"
        Me.PictureBox1.Size = New System.Drawing.Size(23, 17)
        Me.PictureBox1.TabIndex = 28
@@ -216,7 +148,7 @@ Partial Class frmFirmenuebersicht
        '
        'pbLogoMail
        '
-        Me.pbLogoMail.Location = New System.Drawing.Point(1248, 46)
+        Me.pbLogoMail.Location = New System.Drawing.Point(1274, 46)
        Me.pbLogoMail.Name = "pbLogoMail"
        Me.pbLogoMail.Size = New System.Drawing.Size(135, 56)
        Me.pbLogoMail.TabIndex = 27
@@ -224,7 +156,7 @@ Partial Class frmFirmenuebersicht
        '
        'pbLogo
        '
-        Me.pbLogo.Location = New System.Drawing.Point(937, 46)
+        Me.pbLogo.Location = New System.Drawing.Point(1002, 46)
        Me.pbLogo.Name = "pbLogo"
        Me.pbLogo.Size = New System.Drawing.Size(135, 56)
        Me.pbLogo.TabIndex = 26
@@ -234,7 +166,7 @@ Partial Class frmFirmenuebersicht
        '
        Me.Label2.AutoSize = True
        Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label2.Location = New System.Drawing.Point(1125, 53)
+        Me.Label2.Location = New System.Drawing.Point(1151, 53)
        Me.Label2.Name = "Label2"
        Me.Label2.Size = New System.Drawing.Size(78, 13)
        Me.Label2.TabIndex = 25
@@ -244,7 +176,7 @@ Partial Class frmFirmenuebersicht
        '
        Me.Label1.AutoSize = True
        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label1.Location = New System.Drawing.Point(867, 53)
+        Me.Label1.Location = New System.Drawing.Point(932, 53)
        Me.Label1.Name = "Label1"
        Me.Label1.Size = New System.Drawing.Size(45, 13)
        Me.Label1.TabIndex = 24
@@ -291,6 +223,129 @@ Partial Class frmFirmenuebersicht
        Me.lblFirma.TabIndex = 30
        Me.lblFirma.Text = "-"
        '
+        'Label3
+        '
+        Me.Label3.AutoSize = True
+        Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label3.Location = New System.Drawing.Point(283, 53)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(117, 13)
+        Me.Label3.TabIndex = 31
+        Me.Label3.Text = "Bankverbindungen:"
+        '
+        'Label6
+        '
+        Me.Label6.AutoSize = True
+        Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label6.Location = New System.Drawing.Point(724, 53)
+        Me.Label6.Name = "Label6"
+        Me.Label6.Size = New System.Drawing.Size(47, 13)
+        Me.Label6.TabIndex = 32
+        Me.Label6.Text = "Emails:"
+        '
+        'lblBank1
+        '
+        Me.lblBank1.AutoSize = True
+        Me.lblBank1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblBank1.Location = New System.Drawing.Point(283, 66)
+        Me.lblBank1.Name = "lblBank1"
+        Me.lblBank1.Size = New System.Drawing.Size(10, 13)
+        Me.lblBank1.TabIndex = 33
+        Me.lblBank1.Text = "-"
+        '
+        'lblIban1
+        '
+        Me.lblIban1.AutoSize = True
+        Me.lblIban1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblIban1.Location = New System.Drawing.Point(283, 79)
+        Me.lblIban1.Name = "lblIban1"
+        Me.lblIban1.Size = New System.Drawing.Size(10, 13)
+        Me.lblIban1.TabIndex = 34
+        Me.lblIban1.Text = "-"
+        '
+        'lblBic1
+        '
+        Me.lblBic1.AutoSize = True
+        Me.lblBic1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblBic1.Location = New System.Drawing.Point(283, 95)
+        Me.lblBic1.Name = "lblBic1"
+        Me.lblBic1.Size = New System.Drawing.Size(10, 13)
+        Me.lblBic1.TabIndex = 35
+        Me.lblBic1.Text = "-"
+        '
+        'lblBic2
+        '
+        Me.lblBic2.AutoSize = True
+        Me.lblBic2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblBic2.Location = New System.Drawing.Point(523, 95)
+        Me.lblBic2.Name = "lblBic2"
+        Me.lblBic2.Size = New System.Drawing.Size(10, 13)
+        Me.lblBic2.TabIndex = 38
+        Me.lblBic2.Text = "-"
+        '
+        'lblIban2
+        '
+        Me.lblIban2.AutoSize = True
+        Me.lblIban2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblIban2.Location = New System.Drawing.Point(523, 79)
+        Me.lblIban2.Name = "lblIban2"
+        Me.lblIban2.Size = New System.Drawing.Size(10, 13)
+        Me.lblIban2.TabIndex = 37
+        Me.lblIban2.Text = "-"
+        '
+        'lblBank2
+        '
+        Me.lblBank2.AutoSize = True
+        Me.lblBank2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblBank2.Location = New System.Drawing.Point(523, 66)
+        Me.lblBank2.Name = "lblBank2"
+        Me.lblBank2.Size = New System.Drawing.Size(10, 13)
+        Me.lblBank2.TabIndex = 36
+        Me.lblBank2.Text = "-"
+        '
+        'lblMail1
+        '
+        Me.lblMail1.AutoSize = True
+        Me.lblMail1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblMail1.Location = New System.Drawing.Point(724, 77)
+        Me.lblMail1.Name = "lblMail1"
+        Me.lblMail1.Size = New System.Drawing.Size(10, 13)
+        Me.lblMail1.TabIndex = 39
+        Me.lblMail1.Text = "-"
+        '
+        'lblMail2
+        '
+        Me.lblMail2.AutoSize = True
+        Me.lblMail2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblMail2.Location = New System.Drawing.Point(724, 95)
+        Me.lblMail2.Name = "lblMail2"
+        Me.lblMail2.Size = New System.Drawing.Size(10, 13)
+        Me.lblMail2.TabIndex = 40
+        Me.lblMail2.Text = "-"
+        '
+        'dgvFirmen
+        '
+        Me.dgvFirmen.AKTUALISIERUNGS_INTERVALL = -1
+        Me.dgvFirmen.AllowUserToAddRows = False
+        Me.dgvFirmen.AllowUserToDeleteRows = False
+        Me.dgvFirmen.AllowUserToOrderColumns = True
+        Me.dgvFirmen.AllowUserToResizeRows = False
+        Me.dgvFirmen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.GradientInactiveCaption
+        DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvFirmen.DefaultCellStyle = DataGridViewCellStyle1
+        Me.dgvFirmen.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.dgvFirmen.Location = New System.Drawing.Point(0, 118)
+        Me.dgvFirmen.Name = "dgvFirmen"
+        Me.dgvFirmen.RowHeadersVisible = False
+        Me.dgvFirmen.Size = New System.Drawing.Size(1429, 601)
+        Me.dgvFirmen.TabIndex = 10
+        '
        'frmFirmenuebersicht
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -302,12 +357,9 @@ Partial Class frmFirmenuebersicht
        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
        Me.Name = "frmFirmenuebersicht"
        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
-        Me.Text = "interne E-Mail Benachrichtigungen"
-        Me.cntxtOptionen.ResumeLayout(False)
+        Me.Text = "Firmenübersicht"
        Me.Panel1.ResumeLayout(False)
-        CType(Me.dgvFirmen, System.ComponentModel.ISupportInitialize).EndInit()
        Me.pnloptions.ResumeLayout(False)
-        Me.pnloptions.PerformLayout()
        Me.Panel2.ResumeLayout(False)
        Me.Panel2.PerformLayout()
        CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit()
@@ -316,20 +368,15 @@ Partial Class frmFirmenuebersicht
        CType(Me.pbLogo, System.ComponentModel.ISupportInitialize).EndInit()
        Me.pnlTop.ResumeLayout(False)
        Me.pnlTop.PerformLayout()
+        CType(Me.dgvFirmen, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)

    End Sub
-
-    Friend WithEvents AbgeholtToolStripMenuItem As Windows.Forms.ToolStripMenuItem
-    Friend WithEvents cntxtOptionen As Windows.Forms.ContextMenuStrip
-    Friend WithEvents StornoToolStripMenuItem As Windows.Forms.ToolStripMenuItem
    Friend WithEvents pnlTop As Windows.Forms.Panel
    Friend WithEvents Label4 As Windows.Forms.Label
    Friend WithEvents Panel1 As Windows.Forms.Panel
    Friend WithEvents dgvFirmen As MyDatagridview
    Friend WithEvents pnloptions As Windows.Forms.Panel
-    Friend WithEvents Label9 As Windows.Forms.Label
-    Friend WithEvents MyTextBox2 As MyTextBox
    Friend WithEvents Button2 As Windows.Forms.Button
    Friend WithEvents Panel2 As Windows.Forms.Panel
    Friend WithEvents pbLogoMail As Windows.Forms.PictureBox
@@ -340,4 +387,14 @@ Partial Class frmFirmenuebersicht
    Friend WithEvents PictureBox1 As Windows.Forms.PictureBox
    Friend WithEvents PictureBox2 As Windows.Forms.PictureBox
    Friend WithEvents lblFirma As Windows.Forms.Label
+    Friend WithEvents lblBank1 As Windows.Forms.Label
+    Friend WithEvents Label6 As Windows.Forms.Label
+    Friend WithEvents Label3 As Windows.Forms.Label
+    Friend WithEvents lblMail2 As Windows.Forms.Label
+    Friend WithEvents lblMail1 As Windows.Forms.Label
+    Friend WithEvents lblBic2 As Windows.Forms.Label
+    Friend WithEvents lblIban2 As Windows.Forms.Label
+    Friend WithEvents lblBank2 As Windows.Forms.Label
+    Friend WithEvents lblBic1 As Windows.Forms.Label
+    Friend WithEvents lblIban1 As Windows.Forms.Label
 End Class
--- a/VERAG_PROG_ALLGEMEIN/AuditFlow/frmFirmenuebersicht.resx
+++ b/VERAG_PROG_ALLGEMEIN/AuditFlow/frmFirmenuebersicht.resx
@@ -117,9 +117,6 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <metadata name="cntxtOptionen.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
--- a/VERAG_PROG_ALLGEMEIN/AuditFlow/frmFirmenuebersicht.vb
+++ b/VERAG_PROG_ALLGEMEIN/AuditFlow/frmFirmenuebersicht.vb
@@ -10,7 +10,7 @@ Public Class frmFirmenuebersicht

    Private Sub frminterneEmailBenachrichtigungen_Load(sender As Object, e As EventArgs) Handles Me.Load

-        VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
+        VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False

        loadDGVMailbenachrichtigungen()

@@ -22,12 +22,12 @@ Public Class frmFirmenuebersicht

            Me.Cursor = Cursors.WaitCursor

-            Dim TopMax = If(IsNumeric(MyTextBox2.Text), " TOP " & MyTextBox2.Text, "")
            Dim sqlstr As String = ""


-            sqlstr &= " Select [Firma_ID] ,[Firma_Bez],Replace([Firma_Firmenbuch],'Firmenbuch: ', '') as Firma_Firmenbuch,Replace([Firma_UID],'UID: ', '') as Firma_UID ,Replace([Firma_EORI],'EORI: ', '') as Firma_EORI,[Firma_Bankverbindung1],[Firma_BLZ1],[Firma_KTO1],Replace([Firma_IBAN1],'IBAN: ', '') as Firma_IBAN1, Replace([Firma_BIC1],'BIC: ', '') as Firma_BIC1,[Firma_Bankverbindung2],[Firma_BLZ2],[Firma_KTO2],[Firma_IBAN2],[Firma_BIC2],[Firma_Ort],[Firma_Straße],[Firma_Telefon],[Firma_Telefax],[Firma_E-Mail],[Firma_Webadresse]
-      ,[Firma_LandKz],[Firmengruppe],[Firma_Warenort],[Firma_E_Mail_Mahnungen],[Firma_Steuernummer] ,[Firma_PLZ],[Firma_Logo],[Firma_Logo_Erweitert] from tblFirma "
+            sqlstr &= " Select [Firma_ID] ,[Firma_Bez],[Firma_Straße],[Firma_PLZ],[Firma_Ort],[Firma_LandKz] as Land,[Firma_Telefon],[Firma_Telefax],Replace([Firma_UID],'UID: ', '') as Firma_UID ,Replace([Firma_EORI],'EORI: ', '') as Firma_EORI,
+            [Firma_Bankverbindung1],Replace([Firma_IBAN1],'IBAN: ', '') as Firma_IBAN1, Replace([Firma_BIC1],'BIC: ', '') as Firma_BIC1,[Firma_Bankverbindung2],[Firma_IBAN2],[Firma_BIC2],[Firma_E-Mail],
+            [Firma_Webadresse],[Firmengruppe],[Firma_Warenort],[Firma_E_Mail_Mahnungen],[Firma_Steuernummer] ,Replace([Firma_Firmenbuch],'Firmenbuch: ', '') as Firma_Firmenbuch,[Firma_Logo],[Firma_Logo_Erweitert] from tblFirma "

            With dgvFirmen

@@ -51,34 +51,24 @@ Public Class frmFirmenuebersicht
            .SelectionMode = DataGridViewSelectionMode.FullRowSelect
            .MultiSelect = False

+
+
            .Columns("Firma_Logo").Visible = False
            .Columns("Firma_Logo_Erweitert").Visible = False
-            '.Columns("inaktivMA").Visible = False
-
-            .Columns("Firma_ID").Width = 40
-            '.Columns("mb_object").HeaderText = "Benachrichtigung"
-
-
-            '.Columns("Mitarbeiter").MinimumWidth = 100
-            '.Columns("Mitarbeiter").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
-
-            '.Columns("mb_beschreibung").MinimumWidth = 100
-            '.Columns("mb_beschreibung").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
-            '.Columns("mb_beschreibung").HeaderText = "Info"
-
-            '.Columns("Emails").MinimumWidth = 100
-            '.Columns("Emails").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
-            '.Columns("Emails").HeaderText = "EMail an"
-
-            '.Columns("Anzahl").Width = 50
-            '.Columns("Anzahl").HeaderText = "# Empf."
-
-            '.Columns("Firma_Bez").Width = 150
-            '.Columns("Firma_Bez").HeaderText = "Firma"
-
-            '.Columns("mb_aktiv").Width = 40
-            '.Columns("mb_aktiv").HeaderText = "Aktiv"
+            .Columns("Firma_Bankverbindung1").Visible = False
+            .Columns("Firma_IBAN1").Visible = False
+            .Columns("Firma_BIC1").Visible = False
+            .Columns("Firma_Bankverbindung2").Visible = False
+            .Columns("Firma_BIC2").Visible = False
+            .Columns("Firma_IBAN2").Visible = False
+            .Columns("Firma_E-Mail").Visible = False
+            .Columns("Firma_E_Mail_Mahnungen").Visible = False

+            .Columns("Firma_ID").Width = 30
+            .Columns("Firma_Warenort").Width = 60
+            .Columns("Firma_PLZ").Width = 60
+            .Columns("Land").Width = 40
+            .Columns("Firma_Bez").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill

            For Each col As DataGridViewColumn In dgvFirmen.Columns

@@ -101,6 +91,23 @@ Public Class frmFirmenuebersicht

            lblFirma.Text = dgvFirmen.SelectedRows(0).Cells("Firma_Bez").Value

+            lblBank1.Text = If(IsDBNull(dgvFirmen.SelectedRows(0).Cells("Firma_Bankverbindung1").Value) OrElse dgvFirmen.SelectedRows(0).Cells("Firma_Bankverbindung1").Value Is Nothing, "", dgvFirmen.SelectedRows(0).Cells("Firma_Bankverbindung1").Value.ToString())
+
+            lblIban1.Text = If(IsDBNull(dgvFirmen.SelectedRows(0).Cells("Firma_IBAN1").Value) OrElse dgvFirmen.SelectedRows(0).Cells("Firma_IBAN1").Value Is Nothing, "", dgvFirmen.SelectedRows(0).Cells("Firma_IBAN1").Value.ToString())
+
+            lblBic1.Text = If(IsDBNull(dgvFirmen.SelectedRows(0).Cells("Firma_BIC1").Value) OrElse dgvFirmen.SelectedRows(0).Cells("Firma_BIC1").Value Is Nothing, "", dgvFirmen.SelectedRows(0).Cells("Firma_BIC1").Value.ToString())
+
+            lblBank2.Text = If(IsDBNull(dgvFirmen.SelectedRows(0).Cells("Firma_Bankverbindung2").Value) OrElse dgvFirmen.SelectedRows(0).Cells("Firma_Bankverbindung2").Value Is Nothing, "", dgvFirmen.SelectedRows(0).Cells("Firma_Bankverbindung2").Value.ToString())
+
+            lblIban2.Text = If(IsDBNull(dgvFirmen.SelectedRows(0).Cells("Firma_IBAN2").Value) OrElse dgvFirmen.SelectedRows(0).Cells("Firma_IBAN2").Value Is Nothing, "", dgvFirmen.SelectedRows(0).Cells("Firma_IBAN2").Value.ToString())
+
+            lblBic2.Text = If(IsDBNull(dgvFirmen.SelectedRows(0).Cells("Firma_BIC2").Value) OrElse dgvFirmen.SelectedRows(0).Cells("Firma_BIC2").Value Is Nothing, "", dgvFirmen.SelectedRows(0).Cells("Firma_BIC2").Value.ToString())
+
+            lblMail1.Text = If(IsDBNull(dgvFirmen.SelectedRows(0).Cells("Firma_E-Mail").Value) OrElse dgvFirmen.SelectedRows(0).Cells("Firma_E-Mail").Value Is Nothing, "-", dgvFirmen.SelectedRows(0).Cells("Firma_E-Mail").Value.ToString())
+
+            lblMail2.Text = If(IsDBNull(dgvFirmen.SelectedRows(0).Cells("Firma_E_Mail_Mahnungen").Value) OrElse dgvFirmen.SelectedRows(0).Cells("Firma_E_Mail_Mahnungen").Value Is Nothing, "-", dgvFirmen.SelectedRows(0).Cells("Firma_E_Mail_Mahnungen").Value.ToString()) & " (Mahnungen)"
+
+
        End If

    End Sub
@@ -188,6 +195,8 @@ Public Class frmFirmenuebersicht

        MessageBox.Show("Logo wurde gespeichert.", "Erfolgreich", MessageBoxButtons.OK, MessageBoxIcon.Information)

+        loadDGVMailbenachrichtigungen()
+
    End Sub


@@ -207,6 +216,7 @@ Public Class frmFirmenuebersicht
        Return Nothing
    End Function

+    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click

-
+    End Sub
 End Class