Timas Bugfix, EMail Function für AMBAR korrigiert, Essensbestellungen für Verag360

2023-11-09 09:39:28 +01:00
parent 1c0b1dc0cf
commit 62288ce4b2
10 changed files with 93 additions and 112 deletions
--- a/SDL/frmEssensbestellungenAdministration.Designer.vb
+++ b/SDL/frmEssensbestellungenAdministration.Designer.vb
@@ -67,6 +67,8 @@ Partial Class frmEssensbestellungenAdministration
        Me.AbgerechnetToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.BearbeitenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.AnHigway118SchickenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ExportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ExcelToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.txtAnzahlDS = New System.Windows.Forms.TextBox()
        Me.Label27 = New System.Windows.Forms.Label()
        Me.Label5 = New System.Windows.Forms.Label()
@@ -80,8 +82,6 @@ Partial Class frmEssensbestellungenAdministration
        Me.lblWarning = New System.Windows.Forms.Label()
        Me.Button2 = New System.Windows.Forms.Button()
        Me.Label9 = New System.Windows.Forms.Label()
-        Me.ExportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ExcelToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.pnlTop.SuspendLayout()
        Me.Panel1.SuspendLayout()
        Me.ContextMenuStrip1.SuspendLayout()
@@ -262,11 +262,11 @@ Partial Class frmEssensbestellungenAdministration
        'btnNew
        '
        Me.btnNew.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        'Me.btnNew.BackgroundImage = Global.AVISO.My.Resources.Resources.plus
+        Me.btnNew.BackgroundImage = Global.SDL.My.Resources.Resources.plus
        Me.btnNew.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
        Me.btnNew.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnNew.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnNew.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnNew.ForeColor = System.Drawing.Color.Black
        Me.btnNew.Location = New System.Drawing.Point(1180, 46)
        Me.btnNew.Name = "btnNew"
        Me.btnNew.Size = New System.Drawing.Size(50, 29)
@@ -329,11 +329,11 @@ Partial Class frmEssensbestellungenAdministration
        'FlatButton7
        '
        Me.FlatButton7.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.FlatButton7.BackgroundImage = Global.SDL.My.Resources.Resources.refresh
        Me.FlatButton7.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
        Me.FlatButton7.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.FlatButton7.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.FlatButton7.ForeColor = System.Drawing.Color.Black
-        'Me.FlatButton7.Image = Global.AVISO.My.Resources.Resources.refresh
        Me.FlatButton7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.FlatButton7.Location = New System.Drawing.Point(1035, 7)
        Me.FlatButton7.Name = "FlatButton7"
@@ -626,7 +626,7 @@ Partial Class frmEssensbestellungenAdministration
        '
        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StornierenToolStripMenuItem, Me.AbgerechnetToolStripMenuItem, Me.BearbeitenToolStripMenuItem, Me.AnHigway118SchickenToolStripMenuItem, Me.ExportToolStripMenuItem})
        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
-        Me.ContextMenuStrip1.Size = New System.Drawing.Size(283, 136)
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(283, 114)
        '
        'StornierenToolStripMenuItem
        '
@@ -652,6 +652,19 @@ Partial Class frmEssensbestellungenAdministration
        Me.AnHigway118SchickenToolStripMenuItem.Size = New System.Drawing.Size(282, 22)
        Me.AnHigway118SchickenToolStripMenuItem.Text = "markierte Bestellungen per Mail senden"
        '
+        'ExportToolStripMenuItem
+        '
+        Me.ExportToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExcelToolStripMenuItem})
+        Me.ExportToolStripMenuItem.Name = "ExportToolStripMenuItem"
+        Me.ExportToolStripMenuItem.Size = New System.Drawing.Size(282, 22)
+        Me.ExportToolStripMenuItem.Text = "Export"
+        '
+        'ExcelToolStripMenuItem
+        '
+        Me.ExcelToolStripMenuItem.Name = "ExcelToolStripMenuItem"
+        Me.ExcelToolStripMenuItem.Size = New System.Drawing.Size(101, 22)
+        Me.ExcelToolStripMenuItem.Text = "Excel"
+        '
        'txtAnzahlDS
        '
        Me.txtAnzahlDS.Location = New System.Drawing.Point(1032, 745)
@@ -810,19 +823,6 @@ Partial Class frmEssensbestellungenAdministration
        Me.Label9.Text = "Gesamtbetrag"
        Me.Label9.TextAlign = System.Drawing.ContentAlignment.TopRight
        '
-        'ExportToolStripMenuItem
-        '
-        Me.ExportToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExcelToolStripMenuItem})
-        Me.ExportToolStripMenuItem.Name = "ExportToolStripMenuItem"
-        Me.ExportToolStripMenuItem.Size = New System.Drawing.Size(282, 22)
-        Me.ExportToolStripMenuItem.Text = "Export"
-        '
-        'ExcelToolStripMenuItem
-        '
-        Me.ExcelToolStripMenuItem.Name = "ExcelToolStripMenuItem"
-        Me.ExcelToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
-        Me.ExcelToolStripMenuItem.Text = "Excel"
-        '
        'frmEssensbestellungenAdministration
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
--- a/SDL/frmMain.Designer.vb
+++ b/SDL/frmMain.Designer.vb
@@ -111,9 +111,6 @@ Partial Class frmMain
        Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
        Me.AuswertungenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
        Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components)
-        Me.cntxEssen = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.AdministrationToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.EssensbestellungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.pnlLeft.SuspendLayout()
        Me.MenuStripSDL.SuspendLayout()
        Me.Panel1.SuspendLayout()
@@ -127,7 +124,6 @@ Partial Class frmMain
        Me.Panel2.SuspendLayout()
        Me.pnlJumpKunde.SuspendLayout()
        Me.cntxtZOLL.SuspendLayout()
-        Me.cntxEssen.SuspendLayout()
        Me.SuspendLayout()
        '
        'pnlLeft
@@ -1024,24 +1020,6 @@ Partial Class frmMain
        Me.Timer_REFRESH.Enabled = True
        Me.Timer_REFRESH.Interval = 5000
        '
-        'cntxEssen
-        '
-        Me.cntxEssen.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AdministrationToolStripMenuItem, Me.EssensbestellungToolStripMenuItem})
-        Me.cntxEssen.Name = "cntxEssen"
-        Me.cntxEssen.Size = New System.Drawing.Size(164, 48)
-        '
-        'AdministrationToolStripMenuItem
-        '
-        Me.AdministrationToolStripMenuItem.Name = "AdministrationToolStripMenuItem"
-        Me.AdministrationToolStripMenuItem.Size = New System.Drawing.Size(163, 22)
-        Me.AdministrationToolStripMenuItem.Text = "Administration"
-        '
-        'EssensbestellungToolStripMenuItem
-        '
-        Me.EssensbestellungToolStripMenuItem.Name = "EssensbestellungToolStripMenuItem"
-        Me.EssensbestellungToolStripMenuItem.Size = New System.Drawing.Size(163, 22)
-        Me.EssensbestellungToolStripMenuItem.Text = "Essensbestellung"
-        '
        'frmMain
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)
@@ -1074,7 +1052,6 @@ Partial Class frmMain
        Me.pnlJumpKunde.ResumeLayout(False)
        Me.pnlJumpKunde.PerformLayout()
        Me.cntxtZOLL.ResumeLayout(False)
-        Me.cntxEssen.ResumeLayout(False)
        Me.ResumeLayout(False)

    End Sub
@@ -1163,9 +1140,6 @@ Partial Class frmMain
    Friend WithEvents mneFakturierung As ToolStripMenuItem
    Friend WithEvents FakturierungToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents RechnungsdatenToolStripMenuItem As ToolStripMenuItem
-    Friend WithEvents cntxEssen As ContextMenuStrip
-    Friend WithEvents AdministrationToolStripMenuItem As ToolStripMenuItem
-    Friend WithEvents EssensbestellungToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents AdministrationToolStripMenuItem1 As ToolStripMenuItem
    Friend WithEvents EssensbestellungToolStripMenuItem1 As ToolStripMenuItem
 End Class
--- a/SDL/frmMain.resx
+++ b/SDL/frmMain.resx
@@ -164,9 +164,6 @@
  <metadata name="Timer_REFRESH.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>1557, 17</value>
  </metadata>
-  <metadata name="cntxEssen.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>514, 14</value>
-  </metadata>
  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAABAAEAgIAAAAEAGAAoyAAAFgAAACgAAACAAAAAAAEAAAEAGAAAAAAAAMgAAMQOAADEDgAAAAAAAAAA