diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb
index 697fb142..fc9ef5cf 100644
--- a/SDL/Formulare/KDFormulare/frmFormulare.vb
+++ b/SDL/Formulare/KDFormulare/frmFormulare.vb
@@ -4799,10 +4799,10 @@ Public Class FormularManagerNEU
MailHTMLText &= "
"
MailHTMLText &= "in der Anlage erhalten Sie die Unterlagen zu der Verzollung im Verfahren 4200.
"
MailHTMLText &= "
"
- MailHTMLText &= "Bitte melden Sie den Import in Ihrer Steuererklärung (UVA) als ""innergemeinschaftlichen Erwerb""
"
- MailHTMLText &= "mit unser Sonder - UID-Nr.: " & SonderUID_AT & " an.
"
+ MailHTMLText &= "Bitte melden Sie den Import in Ihrer Steuererklärung (UVA) als ""innergemeinschaftlichen Erwerb""an.
"
MailHTMLText &= "
"
- MailHTMLText &= "Des Weiteren möchten wir Sie darauf hinweisen, dass eine Intrastat Anmeldung zu machen ist!
"
+ MailHTMLText &= "
"
+ MailHTMLText &= "Des Weiteren möchten wir Sie darauf hinweisen, dass eine Intrastat Anmeldung mit unser Sonder - UID-Nr.: " & SonderUID_AT & " zu machen ist!
"
MailHTMLText &= "
"
'MailHTMLText &= "Die österreichische Zollbehörde verlangt in diesem Verfahren die Vorlegung einer gültigen Empfangsbestätigung. Aufgrund dessen ersuchen wir Sie den CMR/Frachtbrief, welchen der Fahrer bei der Abladung abgibt, zu bestätigen.
"
MailHTMLText &= "Die österreichische Zollbehörde verlangt in diesem Verfahren die Vorlegung einer gültigen Empfangsbestätigung.
"
@@ -4840,10 +4840,10 @@ Public Class FormularManagerNEU
MailHTMLText &= "
"
MailHTMLText &= "Please find enclosed the documents regarding the customs clearance (process 4200).
"
MailHTMLText &= "
"
- MailHTMLText &= "Please register the import on your tax decleration ( turnover tax advance return ) as
"
- MailHTMLText &= """intra-community acquisition"" with our special value added tax identification number " & SonderUID_AT & "."
+ MailHTMLText &= "Please register the import on your tax decleration (turnover tax advance return).
"
+
MailHTMLText &= "
"
- MailHTMLText &= "Furthermore, we would like to point out that you must fill out an Intrastat decleration!
"
+ MailHTMLText &= "Furthermore, we would like to point out that you must fill out an Intrastat decleration with our special value added tax identification number " & SonderUID_AT & ".
"
MailHTMLText &= "
"
' MailHTMLText &= "In this procedure, the Austrian customs authority requires the presentation of a valid entry certificate. For this reason, we ask you to confirm the CMR/consignment note which the driver hands out in during unloading.
"
MailHTMLText &= "In this procedure, the Austrian customs authority requires the presentation of a valid entry certificate.
"
diff --git a/SDL/UsrCntlEssensbestellungen.vb b/SDL/UsrCntlEssensbestellungen.vb
index 83ff4097..7681b122 100644
--- a/SDL/UsrCntlEssensbestellungen.vb
+++ b/SDL/UsrCntlEssensbestellungen.vb
@@ -259,8 +259,9 @@ Public Class UsrCntlessensbestellungen
Dim mitarbeiter As New cMitarbeiter(cbxMitarbeiter._value)
- essen = New cEssensbestellung(cbxMenu._value, cbxMitarbeiter._value, cbxGebäude._value, cbxAbteilung._value, cbxMitarbeiter.Text, txtAnmerkung.Text)
+ Dim MenuID As String = SQL.getValueTxtBySql("select MenuID from tblEBMenu where MenuDateVon = '" & cbxMenu.SelectedItem.ToString & "'", "AVISO")
+ essen = New cEssensbestellung(cbxMenu._value, cbxMitarbeiter._value, cbxGebäude._value, cbxAbteilung._value, cbxMitarbeiter.Text, txtAnmerkung.Text)
If cb_montag.Checked Then
If rbMenu_montag.Checked Then
@@ -377,6 +378,7 @@ Public Class UsrCntlessensbestellungen
essen.eb_gesendet_am = DBNull.Value
End If
+ essen.eb_MenuID = MenuID
If essen.SAVE() Then
btnSave.DialogResult = DialogResult.OK
@@ -588,7 +590,12 @@ Public Class UsrCntlessensbestellungen
cbxMitarbeiter.DropDownWidth = 200
- 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()
+ 'cbxMenu.fillWithSQL("SELECT Distinct Top 50 (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' + Convert(varchar, Year(MenuDateVon)), MenuDateVon from tblEBMenu order by MenuDateVon desc", False, "AVISO", True)
+
+ cbxMenu.fillWithSQL("SELECT Distinct Top 50 (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' + Convert(varchar, Year(MenuDateVon)), MenuDateVon from tblEBMenu order by MenuDateVon desc", False, "AVISO", True) '/ where MenuDateVon >= GETDATE()
+
+
+ '/ where MenuDateVon >= GETDATE()
Dim sqlMA = "SELECT [mit_id], ([mit_vname] + ' ' + [mit_nname]) + ' (' + mit_firma +')' as name FROM [tblMitarbeiter] "
sqlMA &= "where [mit_ChatBenutzer] = 1 AND [mit_pseudoUser] = 0 AND [mit_gekuendigt] = 0 AND mit_niederlassung = 'SUB'"
diff --git a/SDL/cProgramFunctions.vb b/SDL/cProgramFunctions.vb
index 32d53862..6f80b16c 100644
--- a/SDL/cProgramFunctions.vb
+++ b/SDL/cProgramFunctions.vb
@@ -10,7 +10,6 @@ Imports System.Text.RegularExpressions
Imports iTextSharp.text.pdf
Imports SDL.eu.europa.ec
-
Public Class cBerechtignungenFunctions
Public Shared Function loadBerechtigungen(mit_id) As List(Of cBerechtigungen)
@@ -1011,7 +1010,7 @@ Public Class cProgramFunctions
Public Sub screenshot()
Dim form As New Form
- form = form.ActiveForm
+ form = Form.ActiveForm
Dim bounds As Rectangle
Dim screenshot As System.Drawing.Bitmap
Dim graph As Graphics
@@ -1124,7 +1123,7 @@ Public Class cProgramFunctions
Return ""
End Function
- Public Shared Function genExcelFromDT_NEW(dt As DataTable, Optional rangeAsWaehrung() As String = Nothing, Optional ShowAutoFilter As Boolean = True, Optional HeaderTxt As String = "", Optional HeaderTxt2 As String = "", Optional waehrungsZeichen As String = "€") As String
+ Public Shared Function genExcelFromDT_NEW(dt As DataTable, Optional rangeAsWaehrung() As String = Nothing, Optional ShowAutoFilter As Boolean = True, Optional HeaderTxt As String = "", Optional HeaderTxt2 As String = "", Optional waehrungsZeichen As String = "€", Optional fitCellsToContent As Boolean = False) As String
Try
Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\SDL\tmp\" ' My.Computer.FileSystem.GetTempFileName
@@ -1160,6 +1159,11 @@ Public Class cProgramFunctions
End If
+ If fitCellsToContent Then
+ wb.Worksheets(0).Columns().AdjustToContents()
+ wb.Worksheets(0).Rows().AdjustToContents()
+ End If
+
Dim filename As String = sPath & "tmp_" & Now.ToString("ddMMyyyyHHmmss") & ".xlsx"
diff --git a/SDL/frmEssensbestellungen.vb b/SDL/frmEssensbestellungen.vb
index b3455dd1..13c255cd 100644
--- a/SDL/frmEssensbestellungen.vb
+++ b/SDL/frmEssensbestellungen.vb
@@ -27,7 +27,7 @@ Public Class frmEssensbestellungen
list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Dürüm", "Dürüm"))
'list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
- 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()
+ cbxMenu.fillWithSQL("SELECT Distinct Top 50 (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' + Convert(varchar, Year(MenuDateVon)), MenuDateVon from tblEBMenu order by MenuDateVon desc", False, "AVISO", True) '/ where MenuDateVon >= GETDATE()
cbxAlt_montag.Items.AddRange(list.ToArray())
cbxAlt_dienstag.Items.AddRange(list.ToArray())
@@ -58,6 +58,8 @@ Public Class frmEssensbestellungen
Exit Sub
End If
+ Dim MenuID As String = SQL.getValueTxtBySql("select MenuID from tblEBMenu where MenuDateVon = '" & cbxMenu.SelectedItem.ToString & "'", "AVISO")
+
essen = New cEssensbestellung(cbxMenu._value, cAllgemein.USRID, cbxGebauede._value, cAllgemein.ABTEILUNG, cAllgemein.MITARBEITER.mit_vname & " " & cAllgemein.MITARBEITER.mit_nname, txtAnmerkung)
If cb_montag.Checked Then
@@ -170,6 +172,7 @@ Public Class frmEssensbestellungen
essen.eb_gebaeude = cbxGebauede._value
essen.eb_anmerkung = txtAnmerkung.Text
essen.eb_firma = cAllgemein.MITARBEITER.getFirma
+ essen.eb_MenuID = MenuID
essen.SAVE()
loadDGVBestellungen()
diff --git a/SDL/frmEssensbestellungenAdministration.Designer.vb b/SDL/frmEssensbestellungenAdministration.Designer.vb
index 614a9208..37b9fcee 100644
--- a/SDL/frmEssensbestellungenAdministration.Designer.vb
+++ b/SDL/frmEssensbestellungenAdministration.Designer.vb
@@ -28,6 +28,7 @@ Partial Class frmEssensbestellungenAdministration
Me.Label4 = New System.Windows.Forms.Label()
Me.Label22 = New System.Windows.Forms.Label()
Me.Panel1 = New System.Windows.Forms.Panel()
+ Me.Label10 = New System.Windows.Forms.Label()
Me.Button3 = New System.Windows.Forms.Button()
Me.txtarchivieren = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.cbxAlleAnzeigen = New System.Windows.Forms.CheckBox()
@@ -84,7 +85,7 @@ Partial Class frmEssensbestellungenAdministration
Me.cbxMailGebäude = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.txtSumme = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.dgvBestellungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
- Me.Label10 = New System.Windows.Forms.Label()
+ Me.cbxMenudrucken = New System.Windows.Forms.CheckBox()
Me.pnlTop.SuspendLayout()
Me.Panel1.SuspendLayout()
Me.ContextMenuStrip1.SuspendLayout()
@@ -167,6 +168,15 @@ Partial Class frmEssensbestellungenAdministration
Me.Panel1.Size = New System.Drawing.Size(1242, 106)
Me.Panel1.TabIndex = 2
'
+ 'Label10
+ '
+ Me.Label10.AutoSize = True
+ Me.Label10.Location = New System.Drawing.Point(40, 82)
+ Me.Label10.Name = "Label10"
+ Me.Label10.Size = New System.Drawing.Size(30, 13)
+ Me.Label10.TabIndex = 76
+ Me.Label10.Text = "Jahr:"
+ '
'Button3
'
Me.Button3.Enabled = False
@@ -760,7 +770,7 @@ Partial Class frmEssensbestellungenAdministration
Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
- Me.Button1.Location = New System.Drawing.Point(228, 734)
+ Me.Button1.Location = New System.Drawing.Point(224, 732)
Me.Button1.Name = "Button1"
Me.Button1.Size = New System.Drawing.Size(113, 29)
Me.Button1.TabIndex = 54
@@ -782,7 +792,7 @@ Partial Class frmEssensbestellungenAdministration
Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button2.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
- Me.Button2.Location = New System.Drawing.Point(361, 734)
+ Me.Button2.Location = New System.Drawing.Point(359, 732)
Me.Button2.Name = "Button2"
Me.Button2.Size = New System.Drawing.Size(113, 29)
Me.Button2.TabIndex = 59
@@ -860,23 +870,27 @@ Partial Class frmEssensbestellungenAdministration
Me.dgvBestellungen.ContextMenuStrip = Me.ContextMenuStrip1
Me.dgvBestellungen.Location = New System.Drawing.Point(0, 161)
Me.dgvBestellungen.Name = "dgvBestellungen"
- Me.dgvBestellungen.Size = New System.Drawing.Size(1242, 560)
+ Me.dgvBestellungen.Size = New System.Drawing.Size(1242, 548)
Me.dgvBestellungen.TabIndex = 43
'
- 'Label10
+ 'cbxMenudrucken
'
- Me.Label10.AutoSize = True
- Me.Label10.Location = New System.Drawing.Point(40, 82)
- Me.Label10.Name = "Label10"
- Me.Label10.Size = New System.Drawing.Size(30, 13)
- Me.Label10.TabIndex = 76
- Me.Label10.Text = "Jahr:"
+ Me.cbxMenudrucken.AutoSize = True
+ Me.cbxMenudrucken.Checked = True
+ Me.cbxMenudrucken.CheckState = System.Windows.Forms.CheckState.Checked
+ Me.cbxMenudrucken.Location = New System.Drawing.Point(359, 715)
+ Me.cbxMenudrucken.Name = "cbxMenudrucken"
+ Me.cbxMenudrucken.Size = New System.Drawing.Size(95, 17)
+ Me.cbxMenudrucken.TabIndex = 77
+ Me.cbxMenudrucken.Text = "Menu drucken"
+ Me.cbxMenudrucken.UseVisualStyleBackColor = True
'
'frmEssensbestellungenAdministration
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(1242, 767)
+ Me.Controls.Add(Me.cbxMenudrucken)
Me.Controls.Add(Me.Label9)
Me.Controls.Add(Me.Button2)
Me.Controls.Add(Me.lblWarning)
@@ -968,4 +982,5 @@ Partial Class frmEssensbestellungenAdministration
Friend WithEvents Button3 As Button
Friend WithEvents txtarchivieren As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents Label10 As Label
+ Friend WithEvents cbxMenudrucken As CheckBox
End Class
diff --git a/SDL/frmEssensbestellungenAdministration.vb b/SDL/frmEssensbestellungenAdministration.vb
index 5cc3dbca..e319dad7 100644
--- a/SDL/frmEssensbestellungenAdministration.vb
+++ b/SDL/frmEssensbestellungenAdministration.vb
@@ -1,7 +1,4 @@
-
-Imports System.Data.SqlTypes
-Imports System.Timers
-Imports Microsoft.Office.Interop
+Imports Microsoft.Office.Interop
Imports VERAG_PROG_ALLGEMEIN
Public Class frmEssensbestellungenAdministration
@@ -47,7 +44,7 @@ Public Class frmEssensbestellungenAdministration
Private Sub loadBestellungen()
- Dim SQLString As String = "SELECT [eb_mitid] , [eb_mitname] ,[eb_firma] , [eb_kw] , [eb_gebaeude],[eb_abteilung],[eb_montag],[eb_dienstag],[eb_mittwoch],
+ Dim SQLString As String = "SELECT [eb_mitid] , [eb_mitname] ,[eb_firma] , [eb_kw] , [eb_gebaeude],[eb_abteilung],[eb_montag],[eb_dienstag],[eb_mittwoch],
[eb_donnerstag] ,[eb_freitag],[eb_datum],[eb_preis], [eb_anmerkung],[eb_storniert],[eb_storniert_am],[eb_abgerechnet],[eb_abgerechnet_am], [eb_gesendet], [eb_gesendet_am]
FROM
[tblEssensbestellungen] WHERE 1=1 "
@@ -622,7 +619,7 @@ Public Class frmEssensbestellungenAdministration
Case "Excel"
- SDL.cProgramFunctions.genExcelFromDT_NEW(generateDTBestellungen(True))
+ SDL.cProgramFunctions.genExcelFromDT_NEW(generateDTBestellungen(True),,,,,, True)
End Select
@@ -642,10 +639,11 @@ Public Class frmEssensbestellungenAdministration
sqlWhere &= " And (eb_firma = 'VERAG' OR eb_firma = 'IMEX' OR eb_firma = 'FRONTOFFICE')"
End If
- Dim SQLStringBEstellungen As String = "SELECT [eb_mitname] as Name ,[eb_mitid] as ID , [eb_kw] as KW , [eb_gebaeude] as Gebaeude ,[eb_abteilung] as Abteilung ,[eb_montag] As Montag ,[eb_dienstag] As Dienstag,[eb_mittwoch] As Mittwoch,
- [eb_donnerstag] As Donnerstag , [eb_freitag] As Freitag, [eb_anmerkung] As Anmerkung , [eb_datum] As Datum , [eb_storniert] as Storniert, [eb_firma] as Firma
- FROM
- [tblEssensbestellungen] WHERE eb_kw = '" & cbxMailKW._value & "' AND eb_gebaeude = '" & cbxMailGebäude._value & "' AND ISNULL(eb_storniert,1)=0 " & sqlWhere & " Order by eb_datum"
+ Dim SQLStringBEstellungen As String = ""
+ SQLStringBEstellungen = "SELECT [eb_mitname] as Name ,[eb_mitid] as ID , [eb_kw] as KW , [eb_gebaeude] as Gebaeude ,[eb_abteilung] as Abteilung ,[eb_montag] As Montag ,[eb_dienstag] As Dienstag,[eb_mittwoch] As Mittwoch,
+ [eb_donnerstag] As Donnerstag , [eb_freitag] As Freitag, [eb_anmerkung] As Anmerkung , [eb_datum] As Datum , [eb_storniert] as Storniert, [eb_firma] as Firma, eb_MenuID
+ FROM [tblEssensbestellungen] left join tblEBMenu on tblEBMenu.MenuID = eb_MenuID
+ WHERE eb_kw = '" & cbxMailKW._value & "' AND eb_gebaeude = '" & cbxMailGebäude._value & "' AND ISNULL(eb_storniert,1)=0 " & sqlWhere & " Order by eb_datum"
dtBestellungen = SQL.loadDgvBySql(SQLStringBEstellungen, "AVISO", 100, True)
@@ -656,6 +654,8 @@ Public Class frmEssensbestellungenAdministration
End If
+
+
Dim uniqueMenusMontag = dtBestellungen.AsEnumerable() _
.GroupBy(Function(row) _
New With
@@ -722,26 +722,47 @@ Public Class frmEssensbestellungenAdministration
resultFreitag &= IIf(el.Key.Freitag <> "", String.Format("{1}x {0}, " & vbNewLine, el.Key.Freitag, el.Count()), "")
Next
+ If exportToExcel AndAlso cbxMenudrucken.Checked Then
+
+ Dim displayView = New DataView(dtBestellungen, "eb_MenuID is not null", "eb_MenuID", DataViewRowState.CurrentRows)
+ Dim distinctDT_CSV As DataTable = displayView.ToTable(True, "eb_MenuID")
+ Dim dtMenu As DataTable
+
+ If distinctDT_CSV.Rows.Count > 0 Then
+
+ Dim SQLMenu As String = "SELECT MenuEssenMo, MenuEssenDi, MenuEssenMi, MenuEssenDo, MenuEssenFr FROM [tblEBMenu] WHERE menuID='" & distinctDT_CSV.Rows(0).Item("eb_MenuID") & "'"
+ dtMenu = SQL.loadDgvBySql(SQLMenu, "AVISO", 100, True)
+
+ If dtMenu.Rows.Count = 1 Then
+
+ Dim menuRow As DataRow = dtBestellungen.NewRow
+ menuRow("ID") = "0"
+ menuRow("KW") = "-"
+ menuRow("Name") = "MENU"
+ menuRow("Gebaeude") = "-"
+ menuRow("Abteilung") = "-"
+ menuRow("Anmerkung") = DBNull.Value
+ menuRow("Datum") = DBNull.Value
+ menuRow("Storniert") = DBNull.Value
+ menuRow("Firma") = DBNull.Value
+ menuRow("Montag") = setLineBreaks(dtMenu.Rows(0).Item("MenuEssenMo"))
+ menuRow("Dienstag") = setLineBreaks(dtMenu.Rows(0).Item("MenuEssenDi"))
+ menuRow("Mittwoch") = setLineBreaks(dtMenu.Rows(0).Item("MenuEssenMi"))
+ menuRow("Donnerstag") = setLineBreaks(dtMenu.Rows(0).Item("MenuEssenDo"))
+ menuRow("Freitag") = setLineBreaks(dtMenu.Rows(0).Item("MenuEssenFr"))
+ menuRow("eb_MenuID") = ""
+ dtBestellungen.Rows.InsertAt(menuRow, 0)
+ End If
+ End If
- 'Dim SQLStringMenues As String = "SELECT TOP (1) [MenuEssenMoDate] as Montag
- ' ,[MenuEssenDiDate] as Dienstag
- ' ,[MenuEssenMiDate] as Mittwoch
- ' ,[MenuEssenDoDate] as Donnerstag
- ' ,[MenuEssenFrDate] as Freitag
- ' FROM
- ' [tblEBMenu] WHERE eb_kw = '" & cbxMailKW._value & "' AND eb_gebaeude = '" & cbxMailGebäude._value & "' AND ISNULL(eb_storniert,1)=0 " & sqlWhere & " Order by eb_datum"
-
- 'Dim dtMenu = SQL.loadDgvBySql(SQLStringMenues, "AVISO", 100, True)
-
-
+ End If
Dim R As DataRow = dtBestellungen.NewRow
R("ID") = "0"
R("KW") = "-"
R("Name") = "SUMME"
R("Gebaeude") = "-"
- R("Name") = DBNull.Value
R("Abteilung") = "-"
R("Anmerkung") = DBNull.Value
R("Datum") = DBNull.Value
@@ -752,17 +773,22 @@ Public Class frmEssensbestellungenAdministration
R("Mittwoch") = String.Join(" ", resultMittwoch)
R("Donnerstag") = String.Join(" ", resultDonnerstag)
R("Freitag") = String.Join(" ", resultFreitag)
+ R("eb_MenuID") = ""
dtBestellungen.Rows.Add(R)
- ' MessageBox.Show(String.Join(Environment.NewLine, result))
+
+
If exportToExcel Then
+
dtBestellungen.Columns.Remove("ID")
dtBestellungen.Columns.Remove("Datum")
dtBestellungen.Columns.Remove("Storniert")
dtBestellungen.Columns.Remove("Gebaeude")
dtBestellungen.Columns.Remove("Abteilung")
+
End If
+ dtBestellungen.Columns.Remove("eb_MenuID")
Return dtBestellungen
@@ -1004,4 +1030,33 @@ Public Class frmEssensbestellungenAdministration
'End Sub
+
+ Private Function setLineBreaks(s As String) As String
+
+ s.Trim()
+ Dim startIndex = 0
+ Dim EndINdex = 19
+ For index As Integer = 20 * (s.Length \ 19) To 0 Step -20
+
+ s = ReplaceFirst(s, " ", vbNewLine, startIndex + 5, 19)
+ startIndex = startIndex + 19
+
+ Next
+
+ Return s
+
+ End Function
+
+ Private Function ReplaceFirst(text As String, search As String, replace As String, startIndex As Integer, EndIndex As Integer) As String
+
+ If startIndex + EndIndex > (text.Length - 1) Then Return text
+
+ Dim pos As Integer = text.IndexOf(search, startIndex, IIf(startIndex + EndIndex > text.Length - 1, text.Length - startIndex - 1, EndIndex))
+ If (pos < 0) Then Return text
+
+ Return text.Substring(0, pos) + replace + text.Substring(pos + search.Length)
+
+ End Function
+
+
End Class
\ No newline at end of file
diff --git a/SDL/kunden/Berichte/rptFiskalkunde.vb b/SDL/kunden/Berichte/rptFiskalkunde.vb
index 6e6f3d81..02e5e04d 100644
--- a/SDL/kunden/Berichte/rptFiskalkunde.vb
+++ b/SDL/kunden/Berichte/rptFiskalkunde.vb
@@ -93,16 +93,11 @@ Public Class rptFiskalkunde
If BR IsNot Nothing Then
- txtBon.Text = "Bonitätsklasse"
- If AD.LandKz = "AT" Or AD.LandKz = "A" Then
- txtBon.Text = "Bonitätsscore: "
- txtBon.Text &= If(BR.ba_CreditSaveBonitaetsScore, "")
- txtBONja.Text = "X"
- Else
- txtBon.Text = "Bonitätsindex: "
- txtBon.Text &= If(BR.ba_CreditSaveBonitaetsIndex, "")
- txtBONja.Text = "X"
- End If
+
+ txtBon.Text = "Bonitätsscore: "
+ txtBon.Text &= If(BR.ba_CreditSaveBonitaetsScore, "") & IIf(BR.ba_CreditSaveBonitaetsScore IsNot Nothing AndAlso BR.ba_CreditSaveRisikoklasse IsNot Nothing, "/", "") & If(BR.ba_CreditSaveRisikoklasse, "")
+ txtBONja.Text = "X"
+
If IsDate(BR.ba_Datum) Then txtBon.Text &= " - " & CDate(BR.ba_Datum).ToShortDateString
Else
diff --git a/SDL/kunden/Vorauskasse/frmVorauskasse.vb b/SDL/kunden/Vorauskasse/frmVorauskasse.vb
index 53d21145..1d533d65 100644
--- a/SDL/kunden/Vorauskasse/frmVorauskasse.vb
+++ b/SDL/kunden/Vorauskasse/frmVorauskasse.vb
@@ -295,7 +295,16 @@ Public Class frmVorauskasse
If cboSachbearbeiterQS._value <> "" Then sqlstr &= " AND [vk_QS_SachbearbeiterId] = @PersonalnummerQS "
If cboSachbearbeiterBH._value <> "" Then sqlstr &= " AND [vk_BH_SachbearbeiterId] = @PersonalnummerBH "
If MyTextBox1.Text <> "" Then sqlstr &= " AND [vk_LKW] LIKE @LKW "
- If txtFirma.Text <> "" Then sqlstr &= " AND ([vk_Firma] LIKE @Firma or vk_KdNr=@Firma) "
+
+ If txtFirma.Text <> "" Then
+ If IsNumeric(txtFirma.Text) Then
+ sqlstr &= " AND vk_KdNr=@Firma "
+ Else
+ sqlstr &= " AND ([vk_Firma] LIKE @Firma ) "
+ End If
+ End If
+
+
Select Case cbxAbgerechnet.CheckState
Case CheckState.Unchecked : sqlstr &= " and (SELECT count(*) FROM Rechnungsausgang RG WHERE RG.FilialenNr = vk_FilialeNr and RG.AbfertigungsNr= vk_AbfertigungsNr and vk_KdNr=rg.RechnungsKundenNr and Trdin=1)= 0 "
diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb
index 9e1e86d6..27b7cd84 100644
--- a/SDL/kunden/frmKundenblatt.Designer.vb
+++ b/SDL/kunden/frmKundenblatt.Designer.vb
@@ -22,7 +22,6 @@ Partial Class frmKundenblatt
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
Private Sub InitializeComponent()
- Me.components = New System.ComponentModel.Container()
Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
@@ -163,21 +162,21 @@ Partial Class frmKundenblatt
Me.scanUSTVVollmachten = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
Me.tbUSTVAntrage = New System.Windows.Forms.TabPage()
Me.UsrCntlUSTV = New SDL.usrCntlUSTV()
- Me.cntxtExcel = New System.Windows.Forms.ContextMenuStrip(Me.components)
+ Me.cntxtExcel = New System.Windows.Forms.ContextMenuStrip()
Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem()
Me.btnAbfVerb = New System.Windows.Forms.Button()
Me.lblAbfVerb = New System.Windows.Forms.Label()
- Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
- Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+ Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip()
+ Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip()
Me.LöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+ Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip()
Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
Me.mne = New System.Windows.Forms.MenuStrip()
Me.AllgemeinToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripMenuItem4 = New System.Windows.Forms.ToolStripMenuItem()
- Me.cntxtCntxtMDM = New System.Windows.Forms.ContextMenuStrip(Me.components)
+ Me.cntxtCntxtMDM = New System.Windows.Forms.ContextMenuStrip()
Me.ToolStripMenuItem8 = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripMenuItem5 = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripMenuItem7 = New System.Windows.Forms.ToolStripMenuItem()
@@ -2094,7 +2093,7 @@ Partial Class frmKundenblatt
'
Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM"
- Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4
+ Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8
Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4)
Me.cntxtCntxtMDM.Text = "cntxtMDM"
'
diff --git a/VERAG_PROG_ALLGEMEIN/Classes/Essensbestellung.vb b/VERAG_PROG_ALLGEMEIN/Classes/Essensbestellung.vb
index 34422e96..603542da 100644
--- a/VERAG_PROG_ALLGEMEIN/Classes/Essensbestellung.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/Essensbestellung.vb
@@ -24,6 +24,7 @@ Public Class cEssensbestellung
Property eb_gesendet_am As Object = Nothing
Property eb_gesendet As Boolean
Property eb_firma As Object = Nothing
+ Property eb_MenuID As Object = Nothing
Property eb_archiviert As Boolean
@@ -41,6 +42,17 @@ Public Class cEssensbestellung
LOAD()
End Sub
+ Sub New(eb_kw, eb_mitid, eb_gebaeude, eb_abteilung, eb_mitname, eb_anmerkung, eb_MenuID)
+ Me.eb_kw = eb_kw
+ Me.eb_mitid = eb_mitid
+ Me.eb_gebaeude = eb_gebaeude
+ Me.eb_abteilung = eb_abteilung
+ Me.eb_mitname = eb_mitname
+ Me.eb_anmerkung = eb_anmerkung
+ Me.eb_MenuID = eb_MenuID
+ LOAD()
+ End Sub
+
Sub New()
@@ -49,6 +61,7 @@ Public Class cEssensbestellung
Sub New(eb_kw, eb_mitid)
Me.eb_kw = eb_kw
Me.eb_mitid = eb_mitid
+ 'Me.eb_MenuID = eb_MenuID
LOAD()
End Sub
@@ -76,6 +89,7 @@ Public Class cEssensbestellung
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eb_gesendet_am", eb_gesendet_am))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eb_firma", eb_firma))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eb_archiviert", eb_archiviert))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eb_MenuID", eb_MenuID))
Return list