diff --git a/SDL/frmEssensbestellungen.Designer.vb b/SDL/frmEssensbestellungen.Designer.vb index e9716385..796d254c 100644 --- a/SDL/frmEssensbestellungen.Designer.vb +++ b/SDL/frmEssensbestellungen.Designer.vb @@ -97,6 +97,7 @@ Partial Class frmEssensbestellungen Me.Label4 = New System.Windows.Forms.Label() Me.Label5 = New System.Windows.Forms.Label() Me.txtAnmerkung = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.lbloffenerBetrag = New System.Windows.Forms.Label() Me.MyPanel1.SuspendLayout() Me.GroupBoxDienstag.SuspendLayout() CType(Me.pb_dienstag, System.ComponentModel.ISupportInitialize).BeginInit() @@ -125,7 +126,7 @@ Partial Class frmEssensbestellungen 'btnSave ' Me.btnSave.Anchor = System.Windows.Forms.AnchorStyles.Bottom - Me.btnSave.Location = New System.Drawing.Point(318, 616) + Me.btnSave.Location = New System.Drawing.Point(347, 650) Me.btnSave.Name = "btnSave" Me.btnSave.Size = New System.Drawing.Size(75, 23) Me.btnSave.TabIndex = 10 @@ -160,7 +161,7 @@ Partial Class frmEssensbestellungen 'lblAbteilung ' Me.lblAbteilung.AutoSize = True - Me.lblAbteilung.Location = New System.Drawing.Point(507, 74) + Me.lblAbteilung.Location = New System.Drawing.Point(591, 68) Me.lblAbteilung.Name = "lblAbteilung" Me.lblAbteilung.Size = New System.Drawing.Size(54, 13) Me.lblAbteilung.TabIndex = 18 @@ -169,7 +170,7 @@ Partial Class frmEssensbestellungen 'lblGebaeude ' Me.lblGebaeude.AutoSize = True - Me.lblGebaeude.Location = New System.Drawing.Point(507, 92) + Me.lblGebaeude.Location = New System.Drawing.Point(591, 86) Me.lblGebaeude.Name = "lblGebaeude" Me.lblGebaeude.Size = New System.Drawing.Size(54, 13) Me.lblGebaeude.TabIndex = 19 @@ -178,7 +179,7 @@ Partial Class frmEssensbestellungen 'lblBestellungen ' Me.lblBestellungen.AutoSize = True - Me.lblBestellungen.Location = New System.Drawing.Point(12, 399) + Me.lblBestellungen.Location = New System.Drawing.Point(12, 421) Me.lblBestellungen.Name = "lblBestellungen" Me.lblBestellungen.Size = New System.Drawing.Size(100, 13) Me.lblBestellungen.TabIndex = 20 @@ -200,7 +201,7 @@ Partial Class frmEssensbestellungen Me.cbxGebauede._value = "" Me.cbxGebauede.DropDownWidth = 120 Me.cbxGebauede.FormattingEnabled = True - Me.cbxGebauede.Location = New System.Drawing.Point(580, 89) + Me.cbxGebauede.Location = New System.Drawing.Point(664, 83) Me.cbxGebauede.Name = "cbxGebauede" Me.cbxGebauede.Size = New System.Drawing.Size(95, 21) Me.cbxGebauede.TabIndex = 21 @@ -222,14 +223,14 @@ Partial Class frmEssensbestellungen Me.MyPanel1.Controls.Add(Me.txtAnzahlMenu) Me.MyPanel1.Location = New System.Drawing.Point(12, 130) Me.MyPanel1.Name = "MyPanel1" - Me.MyPanel1.Size = New System.Drawing.Size(667, 266) + Me.MyPanel1.Size = New System.Drawing.Size(755, 285) Me.MyPanel1.TabIndex = 18 ' 'lblWarning ' Me.lblWarning.AutoSize = True Me.lblWarning.ForeColor = System.Drawing.Color.Red - Me.lblWarning.Location = New System.Drawing.Point(465, 217) + Me.lblWarning.Location = New System.Drawing.Point(552, 219) Me.lblWarning.Name = "lblWarning" Me.lblWarning.Size = New System.Drawing.Size(0, 13) Me.lblWarning.TabIndex = 31 @@ -237,7 +238,7 @@ Partial Class frmEssensbestellungen 'txtPreis ' Me.txtPreis.AutoSize = True - Me.txtPreis.Location = New System.Drawing.Point(553, 188) + Me.txtPreis.Location = New System.Drawing.Point(640, 238) Me.txtPreis.Name = "txtPreis" Me.txtPreis.Size = New System.Drawing.Size(13, 13) Me.txtPreis.TabIndex = 19 @@ -246,7 +247,7 @@ Partial Class frmEssensbestellungen 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(463, 188) + Me.Label2.Location = New System.Drawing.Point(550, 238) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(68, 13) Me.Label2.TabIndex = 18 @@ -260,9 +261,9 @@ Partial Class frmEssensbestellungen Me.GroupBoxDienstag.Controls.Add(Me.txtAlt_dienstag) Me.GroupBoxDienstag.Controls.Add(Me.rbMenuAlt_dienstag) Me.GroupBoxDienstag.Controls.Add(Me.rbMenu_dienstag) - Me.GroupBoxDienstag.Location = New System.Drawing.Point(225, 8) + Me.GroupBoxDienstag.Location = New System.Drawing.Point(264, 8) Me.GroupBoxDienstag.Name = "GroupBoxDienstag" - Me.GroupBoxDienstag.Size = New System.Drawing.Size(200, 121) + Me.GroupBoxDienstag.Size = New System.Drawing.Size(242, 132) Me.GroupBoxDienstag.TabIndex = 13 Me.GroupBoxDienstag.TabStop = False Me.GroupBoxDienstag.Text = "Dienstag" @@ -271,7 +272,7 @@ Partial Class frmEssensbestellungen ' Me.txtMenu_dienstag.Location = New System.Drawing.Point(3, 39) Me.txtMenu_dienstag.Name = "txtMenu_dienstag" - Me.txtMenu_dienstag.Size = New System.Drawing.Size(188, 32) + Me.txtMenu_dienstag.Size = New System.Drawing.Size(236, 46) Me.txtMenu_dienstag.TabIndex = 30 Me.txtMenu_dienstag.Text = "Menutext" ' @@ -311,12 +312,12 @@ Partial Class frmEssensbestellungen Me.txtAlt_dienstag._Waehrung = False Me.txtAlt_dienstag._WaehrungZeichen = True Me.txtAlt_dienstag.ForeColor = System.Drawing.Color.Black - Me.txtAlt_dienstag.Location = New System.Drawing.Point(3, 93) + Me.txtAlt_dienstag.Location = New System.Drawing.Point(3, 107) Me.txtAlt_dienstag.MaxLineLength = -1 Me.txtAlt_dienstag.MaxLines_Warning = "" Me.txtAlt_dienstag.MaxLines_Warning_Label = Nothing Me.txtAlt_dienstag.Name = "txtAlt_dienstag" - Me.txtAlt_dienstag.Size = New System.Drawing.Size(177, 20) + Me.txtAlt_dienstag.Size = New System.Drawing.Size(233, 20) Me.txtAlt_dienstag.TabIndex = 2 Me.txtAlt_dienstag.Visible = False ' @@ -324,7 +325,7 @@ Partial Class frmEssensbestellungen ' Me.rbMenuAlt_dienstag.AutoSize = True Me.rbMenuAlt_dienstag.GroupName = "Dienstag" - Me.rbMenuAlt_dienstag.Location = New System.Drawing.Point(3, 74) + Me.rbMenuAlt_dienstag.Location = New System.Drawing.Point(3, 88) Me.rbMenuAlt_dienstag.Name = "rbMenuAlt_dienstag" Me.rbMenuAlt_dienstag.Size = New System.Drawing.Size(70, 17) Me.rbMenuAlt_dienstag.TabIndex = 1 @@ -347,7 +348,7 @@ Partial Class frmEssensbestellungen 'lbl1 ' Me.lbl1.AutoSize = True - Me.lbl1.Location = New System.Drawing.Point(463, 135) + Me.lbl1.Location = New System.Drawing.Point(550, 185) Me.lbl1.Name = "lbl1" Me.lbl1.Size = New System.Drawing.Size(72, 13) Me.lbl1.TabIndex = 14 @@ -356,7 +357,7 @@ Partial Class frmEssensbestellungen 'Button1 ' Me.Button1.Image = Global.SDL.My.Resources.Resources.pdf - Me.Button1.Location = New System.Drawing.Point(599, 140) + Me.Button1.Location = New System.Drawing.Point(686, 190) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(54, 57) Me.Button1.TabIndex = 20 @@ -373,7 +374,7 @@ Partial Class frmEssensbestellungen Me.GroupBoxMontag.Controls.Add(Me.rbMenu_montag) Me.GroupBoxMontag.Location = New System.Drawing.Point(6, 8) Me.GroupBoxMontag.Name = "GroupBoxMontag" - Me.GroupBoxMontag.Size = New System.Drawing.Size(200, 121) + Me.GroupBoxMontag.Size = New System.Drawing.Size(242, 132) Me.GroupBoxMontag.TabIndex = 12 Me.GroupBoxMontag.TabStop = False Me.GroupBoxMontag.Text = "Montag" @@ -382,7 +383,7 @@ Partial Class frmEssensbestellungen ' Me.txtMenu_montag.Location = New System.Drawing.Point(3, 39) Me.txtMenu_montag.Name = "txtMenu_montag" - Me.txtMenu_montag.Size = New System.Drawing.Size(188, 32) + Me.txtMenu_montag.Size = New System.Drawing.Size(236, 46) Me.txtMenu_montag.TabIndex = 29 Me.txtMenu_montag.Text = "Menutext" ' @@ -422,12 +423,12 @@ Partial Class frmEssensbestellungen Me.txtAlt_montag._Waehrung = False Me.txtAlt_montag._WaehrungZeichen = True Me.txtAlt_montag.ForeColor = System.Drawing.Color.Black - Me.txtAlt_montag.Location = New System.Drawing.Point(3, 92) + Me.txtAlt_montag.Location = New System.Drawing.Point(3, 106) Me.txtAlt_montag.MaxLineLength = -1 Me.txtAlt_montag.MaxLines_Warning = "" Me.txtAlt_montag.MaxLines_Warning_Label = Nothing Me.txtAlt_montag.Name = "txtAlt_montag" - Me.txtAlt_montag.Size = New System.Drawing.Size(177, 20) + Me.txtAlt_montag.Size = New System.Drawing.Size(236, 20) Me.txtAlt_montag.TabIndex = 2 Me.txtAlt_montag.Visible = False ' @@ -435,7 +436,7 @@ Partial Class frmEssensbestellungen ' Me.rbMenuAlt_montag.AutoSize = True Me.rbMenuAlt_montag.GroupName = "GroupBox1" - Me.rbMenuAlt_montag.Location = New System.Drawing.Point(3, 74) + Me.rbMenuAlt_montag.Location = New System.Drawing.Point(3, 88) Me.rbMenuAlt_montag.Name = "rbMenuAlt_montag" Me.rbMenuAlt_montag.Size = New System.Drawing.Size(70, 17) Me.rbMenuAlt_montag.TabIndex = 1 @@ -463,9 +464,9 @@ Partial Class frmEssensbestellungen Me.GroupBoxFreitag.Controls.Add(Me.txtAlt_freitag) Me.GroupBoxFreitag.Controls.Add(Me.rbMenuAlt_freitag) Me.GroupBoxFreitag.Controls.Add(Me.rbMenu__freitag) - Me.GroupBoxFreitag.Location = New System.Drawing.Point(219, 135) + Me.GroupBoxFreitag.Location = New System.Drawing.Point(264, 149) Me.GroupBoxFreitag.Name = "GroupBoxFreitag" - Me.GroupBoxFreitag.Size = New System.Drawing.Size(200, 121) + Me.GroupBoxFreitag.Size = New System.Drawing.Size(242, 136) Me.GroupBoxFreitag.TabIndex = 13 Me.GroupBoxFreitag.TabStop = False Me.GroupBoxFreitag.Text = "Freitag" @@ -474,7 +475,7 @@ Partial Class frmEssensbestellungen ' Me.txtMenu_freitag.Location = New System.Drawing.Point(3, 39) Me.txtMenu_freitag.Name = "txtMenu_freitag" - Me.txtMenu_freitag.Size = New System.Drawing.Size(188, 32) + Me.txtMenu_freitag.Size = New System.Drawing.Size(236, 51) Me.txtMenu_freitag.TabIndex = 32 Me.txtMenu_freitag.Text = "Menutext" ' @@ -514,12 +515,12 @@ Partial Class frmEssensbestellungen Me.txtAlt_freitag._Waehrung = False Me.txtAlt_freitag._WaehrungZeichen = True Me.txtAlt_freitag.ForeColor = System.Drawing.Color.Black - Me.txtAlt_freitag.Location = New System.Drawing.Point(3, 97) + Me.txtAlt_freitag.Location = New System.Drawing.Point(3, 112) Me.txtAlt_freitag.MaxLineLength = -1 Me.txtAlt_freitag.MaxLines_Warning = "" Me.txtAlt_freitag.MaxLines_Warning_Label = Nothing Me.txtAlt_freitag.Name = "txtAlt_freitag" - Me.txtAlt_freitag.Size = New System.Drawing.Size(177, 20) + Me.txtAlt_freitag.Size = New System.Drawing.Size(233, 20) Me.txtAlt_freitag.TabIndex = 2 Me.txtAlt_freitag.Visible = False ' @@ -527,7 +528,7 @@ Partial Class frmEssensbestellungen ' Me.rbMenuAlt_freitag.AutoSize = True Me.rbMenuAlt_freitag.GroupName = "Freitag" - Me.rbMenuAlt_freitag.Location = New System.Drawing.Point(3, 78) + Me.rbMenuAlt_freitag.Location = New System.Drawing.Point(3, 93) Me.rbMenuAlt_freitag.Name = "rbMenuAlt_freitag" Me.rbMenuAlt_freitag.Size = New System.Drawing.Size(70, 17) Me.rbMenuAlt_freitag.TabIndex = 1 @@ -550,7 +551,7 @@ Partial Class frmEssensbestellungen 'txtAnzahlLaCart ' Me.txtAnzahlLaCart.AutoSize = True - Me.txtAnzahlLaCart.Location = New System.Drawing.Point(553, 162) + Me.txtAnzahlLaCart.Location = New System.Drawing.Point(640, 212) Me.txtAnzahlLaCart.Name = "txtAnzahlLaCart" Me.txtAnzahlLaCart.Size = New System.Drawing.Size(13, 13) Me.txtAnzahlLaCart.TabIndex = 17 @@ -559,7 +560,7 @@ Partial Class frmEssensbestellungen 'lbl2 ' Me.lbl2.AutoSize = True - Me.lbl2.Location = New System.Drawing.Point(463, 162) + Me.lbl2.Location = New System.Drawing.Point(550, 212) Me.lbl2.Name = "lbl2" Me.lbl2.Size = New System.Drawing.Size(90, 13) Me.lbl2.TabIndex = 15 @@ -573,9 +574,9 @@ Partial Class frmEssensbestellungen Me.Mittwoch.Controls.Add(Me.txtAlt_mittwoch) Me.Mittwoch.Controls.Add(Me.rbMenuAlt_mittwoch) Me.Mittwoch.Controls.Add(Me.rbMenu_mittwoch) - Me.Mittwoch.Location = New System.Drawing.Point(431, 8) + Me.Mittwoch.Location = New System.Drawing.Point(513, 8) Me.Mittwoch.Name = "Mittwoch" - Me.Mittwoch.Size = New System.Drawing.Size(200, 121) + Me.Mittwoch.Size = New System.Drawing.Size(242, 132) Me.Mittwoch.TabIndex = 13 Me.Mittwoch.TabStop = False Me.Mittwoch.Text = "Mittwoch" @@ -584,7 +585,7 @@ Partial Class frmEssensbestellungen ' Me.txtMenu_mittwoch.Location = New System.Drawing.Point(3, 39) Me.txtMenu_mittwoch.Name = "txtMenu_mittwoch" - Me.txtMenu_mittwoch.Size = New System.Drawing.Size(188, 32) + Me.txtMenu_mittwoch.Size = New System.Drawing.Size(236, 46) Me.txtMenu_mittwoch.TabIndex = 31 Me.txtMenu_mittwoch.Text = "Menutext" ' @@ -624,12 +625,12 @@ Partial Class frmEssensbestellungen Me.txtAlt_mittwoch._Waehrung = False Me.txtAlt_mittwoch._WaehrungZeichen = True Me.txtAlt_mittwoch.ForeColor = System.Drawing.Color.Black - Me.txtAlt_mittwoch.Location = New System.Drawing.Point(3, 93) + Me.txtAlt_mittwoch.Location = New System.Drawing.Point(3, 107) Me.txtAlt_mittwoch.MaxLineLength = -1 Me.txtAlt_mittwoch.MaxLines_Warning = "" Me.txtAlt_mittwoch.MaxLines_Warning_Label = Nothing Me.txtAlt_mittwoch.Name = "txtAlt_mittwoch" - Me.txtAlt_mittwoch.Size = New System.Drawing.Size(177, 20) + Me.txtAlt_mittwoch.Size = New System.Drawing.Size(236, 20) Me.txtAlt_mittwoch.TabIndex = 2 Me.txtAlt_mittwoch.Visible = False ' @@ -637,7 +638,7 @@ Partial Class frmEssensbestellungen ' Me.rbMenuAlt_mittwoch.AutoSize = True Me.rbMenuAlt_mittwoch.GroupName = "Mittwoch" - Me.rbMenuAlt_mittwoch.Location = New System.Drawing.Point(3, 74) + Me.rbMenuAlt_mittwoch.Location = New System.Drawing.Point(3, 88) Me.rbMenuAlt_mittwoch.Name = "rbMenuAlt_mittwoch" Me.rbMenuAlt_mittwoch.Size = New System.Drawing.Size(70, 17) Me.rbMenuAlt_mittwoch.TabIndex = 1 @@ -665,9 +666,9 @@ Partial Class frmEssensbestellungen Me.GroupBoxDonnerstag.Controls.Add(Me.txtAlt_donnerstag) Me.GroupBoxDonnerstag.Controls.Add(Me.rbMenuAlt_donnerstag) Me.GroupBoxDonnerstag.Controls.Add(Me.rbMenu_donnerstag) - Me.GroupBoxDonnerstag.Location = New System.Drawing.Point(3, 135) + Me.GroupBoxDonnerstag.Location = New System.Drawing.Point(3, 146) Me.GroupBoxDonnerstag.Name = "GroupBoxDonnerstag" - Me.GroupBoxDonnerstag.Size = New System.Drawing.Size(200, 121) + Me.GroupBoxDonnerstag.Size = New System.Drawing.Size(245, 136) Me.GroupBoxDonnerstag.TabIndex = 13 Me.GroupBoxDonnerstag.TabStop = False Me.GroupBoxDonnerstag.Text = "Donnerstag" @@ -676,7 +677,7 @@ Partial Class frmEssensbestellungen ' Me.txtMenu_donnerstag.Location = New System.Drawing.Point(3, 39) Me.txtMenu_donnerstag.Name = "txtMenu_donnerstag" - Me.txtMenu_donnerstag.Size = New System.Drawing.Size(188, 32) + Me.txtMenu_donnerstag.Size = New System.Drawing.Size(239, 51) Me.txtMenu_donnerstag.TabIndex = 33 Me.txtMenu_donnerstag.Text = "Menutext" ' @@ -716,12 +717,12 @@ Partial Class frmEssensbestellungen Me.txtAlt_donnerstag._Waehrung = False Me.txtAlt_donnerstag._WaehrungZeichen = True Me.txtAlt_donnerstag.ForeColor = System.Drawing.Color.Black - Me.txtAlt_donnerstag.Location = New System.Drawing.Point(3, 97) + Me.txtAlt_donnerstag.Location = New System.Drawing.Point(3, 112) Me.txtAlt_donnerstag.MaxLineLength = -1 Me.txtAlt_donnerstag.MaxLines_Warning = "" Me.txtAlt_donnerstag.MaxLines_Warning_Label = Nothing Me.txtAlt_donnerstag.Name = "txtAlt_donnerstag" - Me.txtAlt_donnerstag.Size = New System.Drawing.Size(177, 20) + Me.txtAlt_donnerstag.Size = New System.Drawing.Size(239, 20) Me.txtAlt_donnerstag.TabIndex = 2 Me.txtAlt_donnerstag.Visible = False ' @@ -729,7 +730,7 @@ Partial Class frmEssensbestellungen ' Me.rbMenuAlt_donnerstag.AutoSize = True Me.rbMenuAlt_donnerstag.GroupName = "Donnerstag" - Me.rbMenuAlt_donnerstag.Location = New System.Drawing.Point(3, 78) + Me.rbMenuAlt_donnerstag.Location = New System.Drawing.Point(3, 93) Me.rbMenuAlt_donnerstag.Name = "rbMenuAlt_donnerstag" Me.rbMenuAlt_donnerstag.Size = New System.Drawing.Size(70, 17) Me.rbMenuAlt_donnerstag.TabIndex = 1 @@ -752,7 +753,7 @@ Partial Class frmEssensbestellungen 'txtAnzahlMenu ' Me.txtAnzahlMenu.AutoSize = True - Me.txtAnzahlMenu.Location = New System.Drawing.Point(553, 137) + Me.txtAnzahlMenu.Location = New System.Drawing.Point(640, 187) Me.txtAnzahlMenu.Name = "txtAnzahlMenu" Me.txtAnzahlMenu.Size = New System.Drawing.Size(13, 13) Me.txtAnzahlMenu.TabIndex = 16 @@ -784,7 +785,7 @@ Partial Class frmEssensbestellungen DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] Me.dgvBestellungen.DefaultCellStyle = DataGridViewCellStyle2 - Me.dgvBestellungen.Location = New System.Drawing.Point(0, 434) + Me.dgvBestellungen.Location = New System.Drawing.Point(0, 468) Me.dgvBestellungen.Name = "dgvBestellungen" Me.dgvBestellungen.ReadOnly = True DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft @@ -797,7 +798,7 @@ Partial Class frmEssensbestellungen Me.dgvBestellungen.RowHeadersDefaultCellStyle = DataGridViewCellStyle3 Me.dgvBestellungen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvBestellungen.ShowEditingIcon = False - Me.dgvBestellungen.Size = New System.Drawing.Size(712, 165) + Me.dgvBestellungen.Size = New System.Drawing.Size(767, 165) Me.dgvBestellungen.TabIndex = 2 ' 'cbxMenu @@ -816,7 +817,7 @@ Partial Class frmEssensbestellungen 'txtAbteilung ' Me.txtAbteilung.AutoSize = True - Me.txtAbteilung.Location = New System.Drawing.Point(577, 74) + Me.txtAbteilung.Location = New System.Drawing.Point(661, 68) Me.txtAbteilung.Name = "txtAbteilung" Me.txtAbteilung.Size = New System.Drawing.Size(29, 13) Me.txtAbteilung.TabIndex = 23 @@ -824,9 +825,9 @@ Partial Class frmEssensbestellungen ' 'Button2 ' - Me.Button2.Location = New System.Drawing.Point(499, 399) + Me.Button2.Location = New System.Drawing.Point(637, 421) Me.Button2.Name = "Button2" - Me.Button2.Size = New System.Drawing.Size(180, 21) + Me.Button2.Size = New System.Drawing.Size(130, 21) Me.Button2.TabIndex = 25 Me.Button2.Text = "meine Bestellungen anzeigen" Me.Button2.UseVisualStyleBackColor = True @@ -834,7 +835,7 @@ Partial Class frmEssensbestellungen 'txtMA ' Me.txtMA.AutoSize = True - Me.txtMA.Location = New System.Drawing.Point(581, 55) + Me.txtMA.Location = New System.Drawing.Point(665, 52) Me.txtMA.Name = "txtMA" Me.txtMA.Size = New System.Drawing.Size(0, 13) Me.txtMA.TabIndex = 27 @@ -842,7 +843,7 @@ Partial Class frmEssensbestellungen 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(507, 55) + Me.Label3.Location = New System.Drawing.Point(591, 51) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(59, 13) Me.Label3.TabIndex = 26 @@ -851,7 +852,7 @@ Partial Class frmEssensbestellungen 'PictureBox1 ' Me.PictureBox1.Image = Global.SDL.My.Resources.Resources.documents - Me.PictureBox1.Location = New System.Drawing.Point(442, 73) + Me.PictureBox1.Location = New System.Drawing.Point(526, 67) Me.PictureBox1.Name = "PictureBox1" Me.PictureBox1.Size = New System.Drawing.Size(42, 37) Me.PictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage @@ -861,7 +862,7 @@ Partial Class frmEssensbestellungen 'Label1 ' Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(446, 57) + Me.Label1.Location = New System.Drawing.Point(530, 51) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(34, 13) Me.Label1.TabIndex = 28 @@ -883,7 +884,7 @@ Partial Class frmEssensbestellungen Me.pnlTop.Dock = System.Windows.Forms.DockStyle.Top Me.pnlTop.Location = New System.Drawing.Point(0, 0) Me.pnlTop.Name = "pnlTop" - Me.pnlTop.Size = New System.Drawing.Size(712, 48) + Me.pnlTop.Size = New System.Drawing.Size(771, 48) Me.pnlTop.TabIndex = 30 ' 'Label4 @@ -900,7 +901,7 @@ Partial Class frmEssensbestellungen 'Label5 ' Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(443, 114) + Me.Label5.Location = New System.Drawing.Point(527, 108) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(64, 13) Me.Label5.TabIndex = 31 @@ -921,7 +922,7 @@ Partial Class frmEssensbestellungen Me.txtAnmerkung._Waehrung = False Me.txtAnmerkung._WaehrungZeichen = True Me.txtAnmerkung.ForeColor = System.Drawing.Color.Black - Me.txtAnmerkung.Location = New System.Drawing.Point(510, 111) + Me.txtAnmerkung.Location = New System.Drawing.Point(594, 105) Me.txtAnmerkung.MaxLineLength = -1 Me.txtAnmerkung.MaxLines_Warning = "" Me.txtAnmerkung.MaxLines_Warning_Label = Nothing @@ -929,11 +930,21 @@ Partial Class frmEssensbestellungen Me.txtAnmerkung.Size = New System.Drawing.Size(169, 20) Me.txtAnmerkung.TabIndex = 33 ' + 'lbloffenerBetrag + ' + Me.lbloffenerBetrag.AutoSize = True + Me.lbloffenerBetrag.Location = New System.Drawing.Point(634, 445) + Me.lbloffenerBetrag.Name = "lbloffenerBetrag" + Me.lbloffenerBetrag.Size = New System.Drawing.Size(80, 13) + Me.lbloffenerBetrag.TabIndex = 34 + Me.lbloffenerBetrag.Text = "offener Betrag: " + ' 'frmEssensbestellungen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(712, 643) + Me.ClientSize = New System.Drawing.Size(771, 677) + Me.Controls.Add(Me.lbloffenerBetrag) Me.Controls.Add(Me.txtAnmerkung) Me.Controls.Add(Me.Label5) Me.Controls.Add(Me.pnlTop) @@ -1055,4 +1066,5 @@ Partial Class frmEssensbestellungen Friend WithEvents lblWarning As Label Friend WithEvents Label5 As Label Friend WithEvents txtAnmerkung As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents lbloffenerBetrag As Label End Class diff --git a/SDL/frmEssensbestellungen.vb b/SDL/frmEssensbestellungen.vb index 6716c437..4652b9b7 100644 --- a/SDL/frmEssensbestellungen.vb +++ b/SDL/frmEssensbestellungen.vb @@ -7,18 +7,15 @@ Public Class frmEssensbestellungen Dim essen As New cEssensbestellung() Dim dt As New DataTable Dim ttMontag, ttDienstag, ttMittwoch, ttDonnerstag, ttFreitag As New ToolTip() - 'Dim arrayWeekdays() As String = {"montag", "dienstag", "mittwoch", "donerstag", "freitag"} Private ToolTipFont As New Font("Courier New", 12) Dim preisProMahlzeit As Double = 3 Dim menu As String = "Menü" Dim alacarte As String = "A la carte" - + Dim outdated As Boolean = False Private Sub frmEssensbestellungen_Load(sender As Object, e As EventArgs) Handles MyBase.Load - - cbxMenu.fillWithSQL("SELECT Distinct Top 50 (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' + Convert(varchar, Year(MenuDateVon)), MenuDateVon from tblEBMenu order by MenuDateVon desc", True, "AVISO", True) '/ where MenuDateVon >= GETDATE() txtMA.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME @@ -32,6 +29,7 @@ Public Class frmEssensbestellungen cbxGebauede.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) cbxGebauede.changeItem("") btnSave.Enabled = False + calcOffeneSumme() End Sub @@ -365,12 +363,12 @@ Public Class frmEssensbestellungen If TypeOf gb Is GroupBox Then For Each c As Control In gb.Controls - If c.Text.ToLower.StartsWith(menu.ToLower) AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton AndAlso c.Enabled = True Then + If c.Text.ToLower.StartsWith(menu.ToLower) AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton AndAlso (c.Enabled = True Or outdated = True And MyPanel1.Enabled = False) Then Dim rb As VERAG_PROG_ALLGEMEIN.MyRadioButton = c If rb.Checked Then countMenus = countMenus + 1 End If - If c.Text.ToLower.StartsWith(alacarte.ToLower) AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton AndAlso c.Enabled = True Then + If c.Text.ToLower.StartsWith(alacarte.ToLower) AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton AndAlso (c.Enabled = True Or outdated = True And MyPanel1.Enabled = False) Then Dim rb As VERAG_PROG_ALLGEMEIN.MyRadioButton = c If rb.Checked Then countlaCarte = countlaCarte + 1 End If @@ -541,7 +539,10 @@ Public Class frmEssensbestellungen Private Function checkIfOrderIsPossible() As Boolean - If dt.Rows.Count = 0 Then Return False + If dt.Rows.Count = 0 Then + outdated = True + Return False + End If Try Dim startMenu = Date.Parse(dt.Rows(0).Item("MenuDateVon")) @@ -560,9 +561,11 @@ Public Class frmEssensbestellungen If Now >= timeToOrderLimit Then lblBestellungBis.ForeColor = Color.Red + outdated = True Return False Else lblBestellungBis.ForeColor = Color.Black + outdated = False Return True End If Catch ex As Exception @@ -614,4 +617,13 @@ Public Class frmEssensbestellungen End Sub + Private Sub calcOffeneSumme() + + Dim sum As Double + sum = SQL.DLookup("SUM(eb_preis)", "[tblEssensbestellungen]", "eb_mitid ='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "' AND ISNULL([eb_abgerechnet],0)=0", "AVISO", "0") + + lbloffenerBetrag.Text &= sum.ToString("C2") + + End Sub + End Class \ No newline at end of file diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cDatev_Interface.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cDatev_Interface.vb index cc7be50c..ecbc116a 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cDatev_Interface.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cDatev_Interface.vb @@ -311,7 +311,7 @@ headerString &= datevVersion.ToString & ";" 'Versionnummer Datev headerString &= StapelbuchungsNr.ToString & ";" 'Stapelbuchungen headerString &= Chr(34) & "Buchungsstapel" & Chr(34) & ";" 'Buchungsstapel - headerString &= "11;" 'Buchungsstapel + headerString &= "11;" 'Buchungsstapel -> 12 nicht möglich, steht aber in Schnittsetllenbeschreibung, 11 laut Testdaten??? headerString &= ";;;;;" headerString &= BeraterNr.ToString & ";" headerString &= MandantenNr.ToString & ";" @@ -342,26 +342,28 @@ ' If steuerbetragLokal < 0 Then steuerbetragLokal = steuerbetragLokal * -1 --> SONST PROBLKEM BEI UNISPED; DA STEUER vom NETTO abgezogen wird! genBuchungsZeile &= getDbltr(getDbl(row("SteuerpflichtigerBetragLokal")) + getDbl(row("SteuerfreierBetragLokal")) + getDbl(row("SteuerpflichtigerBetragFremd")) + getDbl(row("SteuerfreierBetragFremd")) + If(steuerbetragLokal <> 0, getDbltr(steuerbetragLokal), "0")) & ";" 'betrag + steuer (brutto) 'Soll oder Haben - genBuchungsZeile &= IIf(row("BelegartenNr") = "70", FormatStringDVO(Chr(83)), FormatStringDVO(Chr(72))) & ";" + genBuchungsZeile &= IIf(row("BelegartenNr") = "70", FormatStringDVO(Chr(72)), FormatStringDVO(Chr(83))) & ";" 'Fremdwährungen -> nicht benötigt genBuchungsZeile &= emptyFormatedValue() genBuchungsZeile &= emptyFormatedValueWithoutCommas(2) genBuchungsZeile &= emptyFormatedValue() - 'Debitorenkonto - genBuchungsZeile &= (initKDNr2(row("KundenNrZentrale"))) & ";" 'Erlöskonto genBuchungsZeile &= fill0Stellen(row("Sachkonto"), 4) & ";" + 'Debitorenkonto + genBuchungsZeile &= (initKDNr2(row("KundenNrZentrale"))) & ";" + 'BU-Schlüssel -> nicht benötigt - 'genBuchungsZeile &= emptyFormatedValue() - genBuchungsZeile &= getSteuercode(row, FIRMA) & ";" - If CBool(row("Steuerpflichtig")) Then - genBuchungsZeile &= (getDbl2(row("Steuersatz")) * 100) & ";" 'buchcode === 1 oder 2?? - Else - genBuchungsZeile &= "0;" 'buchcode === 1 oder 2?? - End If + genBuchungsZeile &= emptyFormatedValue() + 'genBuchungsZeile &= getSteuercode(row, FIRMA) & ";" + 'If CBool(row("Steuerpflichtig")) Then + ' genBuchungsZeile &= (getDbl2(row("Steuersatz")) * 100) & ";" 'buchcode === 1 oder 2?? + 'Else + ' genBuchungsZeile &= "0;" 'buchcode === 1 oder 2?? + 'End If + 'Belegdatum genBuchungsZeile &= "" & CDate(row("Rechnungsdatum")).ToString("ddMM") & ";" @@ -372,10 +374,44 @@ ' Skontoangabe -> Kontrollieren genBuchungsZeile &= emptyFormatedValue() 'Buchungstext - genBuchungsZeile &= FormatStringDVO(row("Buchungstext"),, Chr(34) & Chr(34)) & ";" - - - + 'genBuchungsZeile &= FormatStringDVO(row("Buchungstext"),, Chr(34) & Chr(34)) & ";" + genBuchungsZeile &= FormatStringDVO(SQL.DLookup("[Ordnungsbegriff]", "Adressen", " AdressenNr= " & row("KundenNrZentrale"), "FMZOLL", "")) & ";" + 'Leerzeilen + genBuchungsZeile &= emptyFormatedValue(25) + 'UID-Nr + genBuchungsZeile &= FormatStringDVO(row("RechnungsUstIdKz")).Substring(0, 3) & FormatStringDVO(row("RechnungsUstIdNr")).Substring(1) & ";" + 'Leerzeilen + genBuchungsZeile &= emptyFormatedValue(7) + 'Zusatzinformation Art1 + genBuchungsZeile &= FormatStringDVO("D-Rechnung.") & ";" + 'Zusatzinformation Inhalt1 + genBuchungsZeile &= FormatStringDVO("Datum " & CDate(row("Rechnungsdatum")).ToString("ddMMyyyy")) + genBuchungsZeile &= FormatStringDVO("Art RE" & " Re.Nr.") + genBuchungsZeile &= FormatStringDVO(row("Rechnungsnummer")).Substring(0, 2) & "-" & FormatStringDVO(row("Rechnungsnummer")).Substring(2) & ";" + 'Zusatzinformation Art2 + genBuchungsZeile &= FormatStringDVO("D-RechPositionen.") & ";" + 'Zusatzinformation Inhalt2 + genBuchungsZeile &= FormatStringDVO(row("Leistungsbezeichnung"), 20) & ";" + 'Leerzeilen + genBuchungsZeile &= emptyFormatedValue(45) + 'USt-Schlüssel (Anzahlungen) + genBuchungsZeile &= FormatStringDVO("0") & ";" + 'Leerzeilen + genBuchungsZeile &= emptyFormatedValue(8) + 'keine Skontosperre - 0 + genBuchungsZeile &= FormatStringDVO("0") & ";" + 'Leerzeilen + genBuchungsZeile &= emptyFormatedValue(7) + 'keine Festschreibung - 0 + genBuchungsZeile &= FormatStringDVO("0") & ";" + 'Leistungsdatum + genBuchungsZeile &= CDate(row("Abfertigungsdatum")).ToString("ddMMyyyy") & ";" + 'Leerzeilen + genBuchungsZeile &= emptyFormatedValue(2) + 'keine Generallumkehr - 0 + genBuchungsZeile &= FormatStringDVO("0") & ";" + 'Leerzeilen + genBuchungsZeile &= emptyFormatedValue(3) 'genBuchungsZeile &= FormatStringDVO(SQL.DLookup("[Ordnungsbegriff]", "Adressen", " AdressenNr= " & row("KundenNrZentrale"), "FMZOLL", "")) & ";" 'Dim KdAtrNr = SQL.DLookup("KdAuftragsNr", "Rechnungsausgang", "rechnungsnr='" & RgNrOld & "' And Buchungsjahr='" & Geschäftsjahr & "' and Firma_ID='" & FIRMA.Firma_ID & "'", "FMZOLL", "") @@ -402,7 +438,6 @@ ''... aus ... 'SummeBuchungen += getDbl(getDbl(row("SteuerpflichtigerBetragLokal")) + getDbl(row("SteuerfreierBetragLokal"))) - genBuchungsZeile &= emptyFormatedValue(107) End Function