Bugfix essensbestellungen
This commit is contained in:
@@ -277,6 +277,7 @@ Public Class frmEssensbestellungen
|
|||||||
If Not txtMenu_montag.Text.ToLower.StartsWith(urlaub) AndAlso Not txtMenu_montag.Text.ToLower.StartsWith(feiertag) Then
|
If Not txtMenu_montag.Text.ToLower.StartsWith(urlaub) AndAlso Not txtMenu_montag.Text.ToLower.StartsWith(feiertag) Then
|
||||||
rbMenuAlt_montag.Enabled = True
|
rbMenuAlt_montag.Enabled = True
|
||||||
rbMenu_montag.Enabled = True
|
rbMenu_montag.Enabled = True
|
||||||
|
cbxAlt_montag.Enabled = True
|
||||||
If checkIfGroupBoxIsSetFirstTime(GroupBoxMontag) Then
|
If checkIfGroupBoxIsSetFirstTime(GroupBoxMontag) Then
|
||||||
rbMenu_montag.Checked = True
|
rbMenu_montag.Checked = True
|
||||||
End If
|
End If
|
||||||
@@ -285,6 +286,7 @@ Public Class frmEssensbestellungen
|
|||||||
Else
|
Else
|
||||||
rbMenuAlt_montag.Enabled = False
|
rbMenuAlt_montag.Enabled = False
|
||||||
rbMenu_montag.Enabled = False
|
rbMenu_montag.Enabled = False
|
||||||
|
cbxAlt_montag.Enabled = False
|
||||||
txtAlt_montag.Text = ""
|
txtAlt_montag.Text = ""
|
||||||
End If
|
End If
|
||||||
|
|
||||||
@@ -293,6 +295,7 @@ Public Class frmEssensbestellungen
|
|||||||
If Not txtMenu_dienstag.Text.ToLower.StartsWith(urlaub) AndAlso Not txtMenu_dienstag.Text.ToLower.StartsWith(feiertag) Then
|
If Not txtMenu_dienstag.Text.ToLower.StartsWith(urlaub) AndAlso Not txtMenu_dienstag.Text.ToLower.StartsWith(feiertag) Then
|
||||||
rbMenuAlt_dienstag.Enabled = True
|
rbMenuAlt_dienstag.Enabled = True
|
||||||
rbMenu_dienstag.Enabled = True
|
rbMenu_dienstag.Enabled = True
|
||||||
|
cbxAlt_dienstag.Enabled = True
|
||||||
If checkIfGroupBoxIsSetFirstTime(GroupBoxDienstag) Then
|
If checkIfGroupBoxIsSetFirstTime(GroupBoxDienstag) Then
|
||||||
rbMenu_dienstag.Checked = True
|
rbMenu_dienstag.Checked = True
|
||||||
End If
|
End If
|
||||||
@@ -301,12 +304,14 @@ Public Class frmEssensbestellungen
|
|||||||
Else
|
Else
|
||||||
rbMenu_dienstag.Enabled = False
|
rbMenu_dienstag.Enabled = False
|
||||||
rbMenuAlt_dienstag.Enabled = False
|
rbMenuAlt_dienstag.Enabled = False
|
||||||
|
cbxAlt_dienstag.Enabled = False
|
||||||
txtAlt_dienstag.Text = ""
|
txtAlt_dienstag.Text = ""
|
||||||
End If
|
End If
|
||||||
|
|
||||||
If cb_mittwoch.Checked Then
|
If cb_mittwoch.Checked Then
|
||||||
If Not txtMenu_mittwoch.Text.ToLower.StartsWith(urlaub) AndAlso Not txtMenu_mittwoch.Text.ToLower.StartsWith(feiertag) Then
|
If Not txtMenu_mittwoch.Text.ToLower.StartsWith(urlaub) AndAlso Not txtMenu_mittwoch.Text.ToLower.StartsWith(feiertag) Then
|
||||||
rbMenuAlt_mittwoch.Enabled = True
|
rbMenuAlt_mittwoch.Enabled = True
|
||||||
|
cbxAlt_mittwoch.Enabled = True
|
||||||
rbMenu_mittwoch.Enabled = True
|
rbMenu_mittwoch.Enabled = True
|
||||||
If checkIfGroupBoxIsSetFirstTime(Mittwoch) Then
|
If checkIfGroupBoxIsSetFirstTime(Mittwoch) Then
|
||||||
rbMenu_mittwoch.Checked = True
|
rbMenu_mittwoch.Checked = True
|
||||||
@@ -316,6 +321,7 @@ Public Class frmEssensbestellungen
|
|||||||
Else
|
Else
|
||||||
rbMenu_mittwoch.Enabled = False
|
rbMenu_mittwoch.Enabled = False
|
||||||
rbMenuAlt_mittwoch.Enabled = False
|
rbMenuAlt_mittwoch.Enabled = False
|
||||||
|
cbxAlt_mittwoch.Enabled = False
|
||||||
txtAlt_mittwoch.Text = ""
|
txtAlt_mittwoch.Text = ""
|
||||||
End If
|
End If
|
||||||
|
|
||||||
@@ -323,6 +329,7 @@ Public Class frmEssensbestellungen
|
|||||||
If cbdonnerstag.Checked Then
|
If cbdonnerstag.Checked Then
|
||||||
If Not txtMenu_donnerstag.Text.ToLower.StartsWith(urlaub) AndAlso Not txtMenu_donnerstag.Text.ToLower.StartsWith(feiertag) Then
|
If Not txtMenu_donnerstag.Text.ToLower.StartsWith(urlaub) AndAlso Not txtMenu_donnerstag.Text.ToLower.StartsWith(feiertag) Then
|
||||||
rbMenuAlt_donnerstag.Enabled = True
|
rbMenuAlt_donnerstag.Enabled = True
|
||||||
|
cbxAlt_donnerstag.Enabled = True
|
||||||
rbMenu_donnerstag.Enabled = True
|
rbMenu_donnerstag.Enabled = True
|
||||||
If checkIfGroupBoxIsSetFirstTime(GroupBoxDonnerstag) Then
|
If checkIfGroupBoxIsSetFirstTime(GroupBoxDonnerstag) Then
|
||||||
rbMenu_donnerstag.Checked = True
|
rbMenu_donnerstag.Checked = True
|
||||||
@@ -332,6 +339,7 @@ Public Class frmEssensbestellungen
|
|||||||
Else
|
Else
|
||||||
rbMenu_donnerstag.Enabled = False
|
rbMenu_donnerstag.Enabled = False
|
||||||
rbMenuAlt_donnerstag.Enabled = False
|
rbMenuAlt_donnerstag.Enabled = False
|
||||||
|
cbxAlt_donnerstag.Enabled = False
|
||||||
txtAlt_donnerstag.Text = ""
|
txtAlt_donnerstag.Text = ""
|
||||||
End If
|
End If
|
||||||
|
|
||||||
@@ -339,6 +347,7 @@ Public Class frmEssensbestellungen
|
|||||||
If Not txtMenu_freitag.Text.ToLower.StartsWith(urlaub) AndAlso Not txtMenu_freitag.Text.ToLower.StartsWith(feiertag) Then
|
If Not txtMenu_freitag.Text.ToLower.StartsWith(urlaub) AndAlso Not txtMenu_freitag.Text.ToLower.StartsWith(feiertag) Then
|
||||||
rbMenuAlt_freitag.Enabled = True
|
rbMenuAlt_freitag.Enabled = True
|
||||||
rbMenu__freitag.Enabled = True
|
rbMenu__freitag.Enabled = True
|
||||||
|
cbxAlt_freitag.Enabled = True
|
||||||
If checkIfGroupBoxIsSetFirstTime(GroupBoxFreitag) Then
|
If checkIfGroupBoxIsSetFirstTime(GroupBoxFreitag) Then
|
||||||
rbMenu__freitag.Checked = True
|
rbMenu__freitag.Checked = True
|
||||||
End If
|
End If
|
||||||
@@ -347,6 +356,7 @@ Public Class frmEssensbestellungen
|
|||||||
Else
|
Else
|
||||||
rbMenu__freitag.Enabled = False
|
rbMenu__freitag.Enabled = False
|
||||||
rbMenuAlt_freitag.Enabled = False
|
rbMenuAlt_freitag.Enabled = False
|
||||||
|
cbxAlt_freitag.Enabled = False
|
||||||
txtAlt_freitag.Text = ""
|
txtAlt_freitag.Text = ""
|
||||||
End If
|
End If
|
||||||
countChecks()
|
countChecks()
|
||||||
@@ -460,12 +470,15 @@ Public Class frmEssensbestellungen
|
|||||||
|
|
||||||
If TypeOf c Is VERAG_PROG_ALLGEMEIN.MyComboBox AndAlso (c.Enabled = True Or outdated = True And MyPanel1.Enabled = False) Then
|
If TypeOf c Is VERAG_PROG_ALLGEMEIN.MyComboBox AndAlso (c.Enabled = True Or outdated = True And MyPanel1.Enabled = False) Then
|
||||||
Dim cbx As VERAG_PROG_ALLGEMEIN.MyComboBox = c
|
Dim cbx As VERAG_PROG_ALLGEMEIN.MyComboBox = c
|
||||||
If cbx.Visible = True AndAlso cbx.SelectedItem IsNot Nothing Then
|
|
||||||
|
|
||||||
|
If cbx.Visible = True AndAlso cbx.SelectedItem IsNot Nothing Then
|
||||||
|
'If gb.Enabled Then
|
||||||
countKebab = countKebab + 1
|
countKebab = countKebab + 1
|
||||||
countlaCarte = countlaCarte - 1
|
countlaCarte = countlaCarte - 1
|
||||||
End If
|
End If
|
||||||
|
'End If
|
||||||
End If
|
End If
|
||||||
|
|
||||||
Next
|
Next
|
||||||
End If
|
End If
|
||||||
Next
|
Next
|
||||||
|
|||||||
@@ -223,7 +223,7 @@ Public Class cMDMFunctionsAllgemein
|
|||||||
If sumChangedPLOSE Then
|
If sumChangedPLOSE Then
|
||||||
If IsDBNull(r.Item("UStV_SummeVorschaubetragEUR_PLOSE")) Then
|
If IsDBNull(r.Item("UStV_SummeVorschaubetragEUR_PLOSE")) Then
|
||||||
Dim kndErw As New cKundenErweitert(r.Item("KundenNr"))
|
Dim kndErw As New cKundenErweitert(r.Item("KundenNr"))
|
||||||
kndErw.kde_UStV_SummeVorschaubetragEUR_PLOSE = curUStV_SummeVorschaubetragEUR_PLOSE.ToString.Replace(",", ".")
|
kndErw.kde_UStV_SummeVorschaubetragEUR_PLOSE = curUStV_SummeVorschaubetragEUR_PLOSE
|
||||||
sumChangedPLOSEOK = kndErw.SAVE
|
sumChangedPLOSEOK = kndErw.SAVE
|
||||||
Else
|
Else
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user