diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb
index 9fb961d5..24e9c01d 100644
--- a/SDL/USTV/frmMDM_USTVAntrag.vb
+++ b/SDL/USTV/frmMDM_USTVAntrag.vb
@@ -1,4 +1,7 @@
Imports System.Reflection
+Imports DocumentFormat.OpenXml.Drawing.Charts
+Imports Microsoft.Office.Interop
+Imports VERAG_PROG_ALLGEMEIN.TESTJSON
Public Class frmMDM_USTVAntrag
@@ -28,8 +31,9 @@ Public Class frmMDM_USTVAntrag
If UStVAn_ID <= 0 Then Exit Sub
- .SET_SQL("SELECT [UStVAn_ID] ,[UStVPo_ID] ,[UStVPo_ReDat],[UStVPo_ReNr],[UStVPo_Leistungsbezeichnung],[UStVPo_Leistender],[UStVPo_USteuerbetrag],[UStVPo_Schnittstelle],[UStVPo_SchnittstellenNr],[UStVPo_Umrechnungskurs],[UStVPo_USteuerbetragEUR],[UStVPo_Sachbearbeiter]
- FROM [tblUStVPositionen]
+ .SET_SQL("SELECT [UStVAn_ID] ,[UStVPo_ID] ,[UStVPo_ReDat],[UStVPo_ReNr],[UStVPo_Leistungsbezeichnung],[UStVPo_Leistender],leist.[UstV_Leistender_Strasse] + ' ' + leist.[UstV_Leistender_StrasseNr] as [UstV_Leistender_Strasse],leist.[UstV_Leistender_PLZ],leist.[UstV_Leistender_Stadt],leist.[UstV_Leistender_Land],leist.[UstV_Leistender_UstNr],[UStVPo_USteuerbetrag],[UStVPo_Schnittstelle],[UStVPo_SchnittstellenNr],[UStVPo_Umrechnungskurs],[UStVPo_USteuerbetragEUR],[UStVPo_Sachbearbeiter]
+ FROM [tblUStVPositionen]
+ inner join [tblUStVLeistender] as leist on leist.UStV_Leistender = [tblUStVPositionen].[UStVPo_Leistender]
where UStVAn_ID='" & UStVAn_ID & "' ORDER BY UStVPo_ID", "FMZOLL")
.LOAD()
.RowTemplate.Height = 20
@@ -56,12 +60,26 @@ Public Class frmMDM_USTVAntrag
.Columns("UStVPo_Leistungsbezeichnung").HeaderText = "Leistungsbezeichnung"
- .Columns("UStVPo_Leistungsbezeichnung").Width = 200
-
+ .Columns("UStVPo_Leistungsbezeichnung").Width = 150
.Columns("UStVPo_Leistender").HeaderText = "Leistender"
- .Columns("UStVPo_Leistender").Width = 220
+ .Columns("UStVPo_Leistender").Width = 100
+ .Columns("UstV_Leistender_Strasse").HeaderText = "Strasse"
+ .Columns("UstV_Leistender_Strasse").Width = 50
+
+ .Columns("UstV_Leistender_PLZ").HeaderText = "PLZ"
+ .Columns("UstV_Leistender_PLZ").Width = 50
+
+ .Columns("UstV_Leistender_Land").HeaderText = "Land"
+ .Columns("UstV_Leistender_Land").Width = 50
+
+ .Columns("UstV_Leistender_Stadt").HeaderText = "Stadt"
+ .Columns("UstV_Leistender_Stadt").Width = 100
+
+
+ .Columns("UstV_Leistender_UstNr").HeaderText = "UID-Nr"
+ .Columns("UstV_Leistender_UstNr").Width = 150
.Columns("UStVPo_Schnittstelle").HeaderText = "API"
.Columns("UStVPo_Schnittstelle").Width = 30
@@ -81,7 +99,7 @@ Public Class frmMDM_USTVAntrag
.Columns("UStVPo_USteuerbetragEUR").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
.Columns("UStVPo_Sachbearbeiter").HeaderText = "Sachbearbeiter"
- .Columns("UStVPo_Sachbearbeiter").MinimumWidth = 150
+ .Columns("UStVPo_Sachbearbeiter").MinimumWidth = 100
.Columns("UStVPo_Sachbearbeiter").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
End If
@@ -267,8 +285,9 @@ Public Class frmMDM_USTVAntrag
Sub initPosition(UStVPo_ID)
If UStVPo_ID > 0 Then
Dim ANTR_POS As New VERAG_PROG_ALLGEMEIN.cUStVPositionen(USTV_ANTRAG.UStVAn_ID, UStVPo_ID)
+ Dim ANTR_Leistender As New VERAG_PROG_ALLGEMEIN.cUStVLeistender(ANTR_POS.UStVPo_Leistender)
UstCntlUSTV_AntragPosition1.Enabled = True
- UstCntlUSTV_AntragPosition1.setValues(USTV_ANTRAG.UStVAn_KuNr, ANTR_POS, Antrag_LandKz)
+ UstCntlUSTV_AntragPosition1.setValues(USTV_ANTRAG.UStVAn_KuNr, ANTR_POS, Antrag_LandKz, ANTR_Leistender)
Else
UstCntlUSTV_AntragPosition1.reset()
UstCntlUSTV_AntragPosition1.Enabled = False
@@ -446,6 +465,107 @@ Public Class frmMDM_USTVAntrag
End Sub
+ Private Sub btnMail_Click(sender As Object, e As EventArgs) Handles btnMail.Click
+
+ If Not ContextMenuStrip1.Items.ContainsKey("excel") Then
+ Dim uploadPictures = New ToolStripMenuItem() With {.Text = "Excelauswertung starten", .Name = "excel", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
+ ContextMenuStrip1.Items.Add(uploadPictures)
+ AddHandler uploadPictures.Click, AddressOf mnuItem_Clicked
+ End If
+
+
+ If Not ContextMenuStrip1.Items.ContainsKey("mail") Then
+ Dim copyToClipboard = New ToolStripMenuItem() With {.Text = "Email generieren", .Name = "mail", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
+ AddHandler copyToClipboard.Click, AddressOf mnuItem_Clicked
+ ContextMenuStrip1.Items.Add(copyToClipboard)
+ End If
+
+
+
+ ContextMenuStrip1.Show(Cursor.Position)
+
+
+ End Sub
+
+ Private Sub mnuItem_Clicked(sender As Object, e As EventArgs)
+ ContextMenuStrip1.Hide()
+ Dim item As ToolStripMenuItem = TryCast(sender, ToolStripMenuItem)
+
+ If item IsNot Nothing Then
+ If item.Name = "excel" Then
+ excelAuswertung()
+
+ ElseIf item.Name = "mail" Then
+ mailmitExcelauswertung()
+ Else
+ MsgBox("Funktion nicht implementiert!")
+ End If
+
+ End If
+
+ End Sub
+
+
+ Private Function excelAuswertung(ByRef Optional filepath As String = "", Optional feedback As Boolean = False, Optional openExcel As Boolean = True) As Boolean
+
+ Dim sqlStr = "SELECT [UStVPo_ReDat] as InvoiceDate , [UStVPo_ReNr] As InvoiceNumber, 'Verag 360 GmbH' as Company, 'FR' as CountryOfRefund ,'EUR' as Currency ,[UStVPo_Leistender] as SupplierName, leist.[UstV_Leistender_Strasse] AS SupplierStreet, leist.[UstV_Leistender_StrasseNr] as SupplierStreetNumber, leist.[UstV_Leistender_PLZ] as SupplierPostalCode, leist.[UstV_Leistender_Stadt] as SupplierCity, leist.[UstV_Leistender_Land] as SupplierCountry, leist.[UstV_Leistender_UstNr] as SupplierVAT_TaxNumber, [UStVPo_Leistungsbezeichnung] as ExpenseCategory ,Round((1119/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseGrossAmount, [UStVPo_USteuerbetragEUR] as ExpenseVATAmount,Round((100/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseNetAmount
+ FROM [tblUStVPositionen]
+ inner Join [tblUStVLeistender] as leist on leist.UStV_Leistender = [tblUStVPositionen].[UStVPo_Leistender]
+ where UStVAn_ID ='" & UStVAn_ID & "' ORDER BY UStVPo_ID"
+
+ Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL")
+
+ If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
+ filepath = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt, {"N1:N" & (dt.Rows.Count + 1), "O1:O" & (dt.Rows.Count + 1), "P1:P" & (dt.Rows.Count + 1)},,,, openExcel)
+ Return True
+ Else
+ If feedback Then MsgBox("keine Daten vorhanden!")
+ Return False
+ End If
+
+ End Function
+
+ Private Sub mailmitExcelauswertung()
+
+ Try
+ Dim outl As New Outlook.Application
+ Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
+ Mail = outl.CreateItem(0)
+
+
+ Dim filepath = ""
+ If excelAuswertung(filepath, False, False) Then
+
+ Mail.Attachments.Add(filepath, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
+
+ End If
+
+
+ Mail.Subject = USTV_ANTRAG.UStVAn_Name & "_" & USTV_ANTRAG.UStVAn_LandKz & "_" & USTV_ANTRAG.UStVAn_ReDatVon & "-" & USTV_ANTRAG.UStVAn_ReDatBis
+
+ Dim TextHTML = ""
+ TextHTML &= "Ladies and Gentlemen,
"
+ TextHTML &= "
"
+ TextHTML &= "In the attachment we will send you the Excel list and the corresponding invoices for the VAT refund.
"
+ TextHTML &= "Please submit these invoices to the tax office.
"
+ TextHTML &= "We are always available to answer more questions.
"
+
+ TextHTML &= "Mit freundlichen Grüßen
"
+ TextHTML &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "
"
+ TextHTML &= "
"
+ Mail.HTMLBody = "" & TextHTML & SDL.cFakturierung.getSignature("DE") & "
"
+
+ Mail.Display()
+
+ Catch ex As Exception
+ VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Fehler beim Öffnen der Mail!")
+ End Try
+
+
+
+ End Sub
+
+
' Private Sub cmdITMautÜbernehmen_Click()
' Dim wrk As DAO.Workspace
diff --git a/SDL/USTV/usrCntlUSTV.Designer.vb b/SDL/USTV/usrCntlUSTV.Designer.vb
index 0166da30..df4d4501 100644
--- a/SDL/USTV/usrCntlUSTV.Designer.vb
+++ b/SDL/USTV/usrCntlUSTV.Designer.vb
@@ -23,7 +23,7 @@ Partial Class usrCntlUSTV
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
- Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Me.pnlFilter = New System.Windows.Forms.Panel()
Me.dgvUSTV = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.Label1 = New System.Windows.Forms.Label()
@@ -38,9 +38,11 @@ Partial Class usrCntlUSTV
Me.FlatButton2 = New System.Windows.Forms.Button()
Me.Panel2 = New System.Windows.Forms.Panel()
Me.Panel3 = New System.Windows.Forms.Panel()
+ Me.btnMail = New System.Windows.Forms.Button()
Me.btnPLOSEAlle = New System.Windows.Forms.Button()
Me.Button5 = New System.Windows.Forms.Button()
Me.Button8 = New System.Windows.Forms.Button()
+ Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
CType(Me.dgvUSTV, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel1.SuspendLayout()
Me.Panel2.SuspendLayout()
@@ -62,8 +64,8 @@ Partial Class usrCntlUSTV
Me.dgvUSTV.AKTUALISIERUNGS_INTERVALL = -1
Me.dgvUSTV.AllowUserToAddRows = False
Me.dgvUSTV.AllowUserToDeleteRows = False
- DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
- Me.dgvUSTV.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
+ DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+ Me.dgvUSTV.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
Me.dgvUSTV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvUSTV.Dock = System.Windows.Forms.DockStyle.Fill
Me.dgvUSTV.Location = New System.Drawing.Point(0, 84)
@@ -138,7 +140,7 @@ Partial Class usrCntlUSTV
Me.KdSearchBox1._display_Name1 = False
Me.KdSearchBox1._displayAVISO_Email = False
Me.KdSearchBox1._displayFullName = False
- Me.KdSearchBox1._displayWoelflKd = False
+ Me.KdSearchBox1._displayWoelflKd = True
Me.KdSearchBox1._hideIfListEmpty = True
Me.KdSearchBox1._loadKdData = False
Me.KdSearchBox1._searchName1 = True
@@ -228,6 +230,7 @@ Partial Class usrCntlUSTV
'Panel3
'
Me.Panel3.AutoSize = True
+ Me.Panel3.Controls.Add(Me.btnMail)
Me.Panel3.Controls.Add(Me.btnPLOSEAlle)
Me.Panel3.Controls.Add(Me.Button5)
Me.Panel3.Controls.Add(Me.Button8)
@@ -240,6 +243,18 @@ Partial Class usrCntlUSTV
Me.Panel3.Size = New System.Drawing.Size(1072, 66)
Me.Panel3.TabIndex = 0
'
+ 'btnMail
+ '
+ Me.btnMail.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btnMail.ForeColor = System.Drawing.Color.Black
+ Me.btnMail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+ Me.btnMail.Location = New System.Drawing.Point(545, 10)
+ Me.btnMail.Name = "btnMail"
+ Me.btnMail.Size = New System.Drawing.Size(75, 39)
+ Me.btnMail.TabIndex = 25
+ Me.btnMail.Text = "Anträge"
+ Me.btnMail.UseVisualStyleBackColor = True
+ '
'btnPLOSEAlle
'
Me.btnPLOSEAlle.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -283,6 +298,11 @@ Partial Class usrCntlUSTV
Me.Button8.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.Button8.UseVisualStyleBackColor = True
'
+ 'ContextMenuStrip1
+ '
+ Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
+ Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
+ '
'usrCntlUSTV
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -318,4 +338,6 @@ Partial Class usrCntlUSTV
Friend WithEvents cboJahrBis As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents Button5 As Button
Friend WithEvents btnPLOSEAlle As Button
+ Friend WithEvents btnMail As Button
+ Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
End Class
diff --git a/SDL/USTV/usrCntlUSTV.resx b/SDL/USTV/usrCntlUSTV.resx
index 1af7de15..279a4474 100644
--- a/SDL/USTV/usrCntlUSTV.resx
+++ b/SDL/USTV/usrCntlUSTV.resx
@@ -117,4 +117,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 17, 17
+
\ No newline at end of file
diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb
index 136c1037..bdf0eccf 100644
--- a/SDL/USTV/usrCntlUSTV.vb
+++ b/SDL/USTV/usrCntlUSTV.vb
@@ -1,6 +1,8 @@
Imports System.ComponentModel
Imports System.Data.SqlClient
+Imports Microsoft.Office.Interop
Imports VERAG_PROG_ALLGEMEIN
+Imports VERAG_PROG_ALLGEMEIN.CBAM_QReport_17
Public Class usrCntlUSTV
@@ -27,7 +29,6 @@ Public Class usrCntlUSTV
.ClearSelection()
-
.SET_SQL("SELECT TOP (200) [UStVAn_ID],[UStVAn_KuNr],[UStVAn_Name],LandKz,[UStVAn_ReDatVon],[UStVAn_ReDatBis] ,UStVAn_AntragEingereichtAm,[UStVAn_3470] ,[UStVAn_Währungscode],[UStVAn_USteuerbetrag],[UStVAn_Erstattungsbetrag],[UStVAn_USteuerbetragEUR],[UStVAn_ErstattungsbetragEUR],[UStVAn_Sachbearbeiter]
FROM [tblUStVAntrag] inner join [Länderverzeichnis für die Außenhandelsstatistik] on UStVAn_LandNr=Landnr
where 1=1 " & getWhere() & "
@@ -198,12 +199,12 @@ Public Class usrCntlUSTV
Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click
' If Not kdNr_filter Then
If dgvUSTV.SelectedCells.Count > 0 Then
- If IsNumeric(dgvUSTV.CurrentRow.Cells("UStVAn_KuNr").Value) Then
- cProgramFunctions.openKundenblatt(dgvUSTV.CurrentRow.Cells("UStVAn_KuNr").Value, Me.FindForm, True)
- 'Dim pf As New cProgramFunctions
- 'pf.openKundenblatt(dgvSDL.CurrentRow.Cells("KundenNr").Value)
- End If
+ If IsNumeric(dgvUSTV.CurrentRow.Cells("UStVAn_KuNr").Value) Then
+ cProgramFunctions.openKundenblatt(dgvUSTV.CurrentRow.Cells("UStVAn_KuNr").Value, Me.FindForm, True)
+ 'Dim pf As New cProgramFunctions
+ 'pf.openKundenblatt(dgvSDL.CurrentRow.Cells("KundenNr").Value)
End If
+ End If
' End If
End Sub
@@ -232,4 +233,104 @@ Public Class usrCntlUSTV
End Try
Me.Cursor = Cursors.Default
End Sub
+
+ Private Sub btnMail_Click(sender As Object, e As EventArgs) Handles btnMail.Click
+
+ If Not ContextMenuStrip1.Items.ContainsKey("excel") Then
+ Dim excel = New ToolStripMenuItem() With {.Text = "Excelauswertung starten", .Name = "excel", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
+ ContextMenuStrip1.Items.Add(excel)
+ AddHandler excel.Click, AddressOf mnuItem_Clicked
+ End If
+
+
+ If Not ContextMenuStrip1.Items.ContainsKey("mail") Then
+ Dim mail = New ToolStripMenuItem() With {.Text = "Email generieren", .Name = "mail", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
+ AddHandler mail.Click, AddressOf mnuItem_Clicked
+ ContextMenuStrip1.Items.Add(mail)
+ End If
+
+ ContextMenuStrip1.Show(Cursor.Position)
+
+
+ End Sub
+
+ Private Sub mnuItem_Clicked(sender As Object, e As EventArgs)
+
+ If dgvUSTV.SelectedRows.Count > 0 Then
+
+ ContextMenuStrip1.Hide()
+ Dim item As ToolStripMenuItem = TryCast(sender, ToolStripMenuItem)
+
+ If item IsNot Nothing Then
+ If item.Name = "excel" Then
+ excelAuswertung()
+
+ ElseIf item.Name = "mail" Then
+ mailmitExcelauswertung()
+ Else
+ MsgBox("Funktion nicht implementiert!")
+ End If
+
+ End If
+ End If
+
+ End Sub
+
+
+ Private Function excelAuswertung(Optional filepath As String = "", Optional feedback As Boolean = False, Optional openExcel As Boolean = True) As Boolean
+
+ Dim sqlStr = "SELECT [UStVPo_ReDat] as InvoiceDate , [UStVPo_ReNr] As InvoiceNumber, 'Verag 360 GmbH' as Company, 'FR' as CountryOfRefund ,'EUR' as Currency ,[UStVPo_Leistender] as SupplierName, leist.[UstV_Leistender_Strasse] AS SupplierStreet, leist.[UstV_Leistender_StrasseNr] as SupplierStreetNumber, leist.[UstV_Leistender_PLZ] as SupplierPostalCode, leist.[UstV_Leistender_Stadt] as SupplierCity, leist.[UstV_Leistender_Land] as SupplierCountry, leist.[UstV_Leistender_UstNr] as SupplierVAT_TaxNumber, [UStVPo_Leistungsbezeichnung] as ExpenseCategory ,Round((1119/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseGrossAmount, [UStVPo_USteuerbetragEUR] as ExpenseVATAmount,Round((100/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseNetAmount
+ FROM [tblUStVPositionen]
+ inner Join [tblUStVLeistender] as leist on leist.UStV_Leistender = [tblUStVPositionen].[UStVPo_Leistender]
+ where UStVAn_ID ='" & dgvUSTV.SelectedRows(0).Cells("UStVAn_ID").Value & "' ORDER BY UStVPo_ID"
+
+ Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL")
+ filepath = ""
+ If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
+ filepath = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt, {"N1:N" & (dt.Rows.Count + 1), "O1:O" & (dt.Rows.Count + 1), "P1:P" & (dt.Rows.Count + 1)},,,, openExcel)
+ Else
+ MsgBox("Keine Daten!")
+ End If
+
+ End Function
+
+ Private Sub mailmitExcelauswertung()
+
+ Try
+ Dim outl As New Outlook.Application
+ Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
+ Mail = outl.CreateItem(0)
+
+
+ Dim filepath = ""
+ If excelAuswertung(filepath, False, False) Then
+
+ Mail.Attachments.Add(filepath, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
+
+ End If
+
+ If dgvUSTV.Columns.Count > 0 Then Mail.Subject = dgvUSTV.CurrentRow.Cells("UStVAn_Name").Value & "_" & dgvUSTV.CurrentRow.Cells("UStVAn_LandKz").Value & "_" & dgvUSTV.CurrentRow.Cells("UStVAn_ReDatVon").Value & "-" & dgvUSTV.CurrentRow.Cells("UStVAn_ReDatBis").Value
+
+ Dim TextHTML = ""
+ TextHTML &= "Ladies and Gentlemen,
"
+ TextHTML &= "
"
+ TextHTML &= "In the attachment we will send you the Excel list and the corresponding invoices for the VAT refund.
"
+ TextHTML &= "Please submit these invoices to the tax office.
"
+ TextHTML &= "We are always available to answer more questions.
"
+
+ TextHTML &= "Mit freundlichen Grüßen
"
+ TextHTML &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "
"
+ TextHTML &= "
"
+ Mail.HTMLBody = "" & TextHTML & SDL.cFakturierung.getSignature("DE") & "
"
+
+ Mail.Display()
+
+ Catch ex As Exception
+ VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Fehler beim Öffnen der Mail!")
+ End Try
+
+
+
+ End Sub
+
End Class
diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb
index e8924b94..5e9fcf0c 100644
--- a/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb
+++ b/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb
@@ -59,12 +59,24 @@ Partial Class ustCntlUSTV_AntragPosition
Me.lblSachbearbeiter = New System.Windows.Forms.Label()
Me.cboSchnittstellennr = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.pnl = New System.Windows.Forms.Panel()
+ Me.txtUIDNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+ Me.Label17 = New System.Windows.Forms.Label()
+ Me.txtLand = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+ Me.txtStrassenNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+ Me.txtOrt = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+ Me.Label16 = New System.Windows.Forms.Label()
+ Me.txtPLZ = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+ Me.Label15 = New System.Windows.Forms.Label()
+ Me.txtStrasse = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+ Me.Label14 = New System.Windows.Forms.Label()
Me.Panel1 = New System.Windows.Forms.Panel()
Me.Panel3 = New System.Windows.Forms.Panel()
Me.Panel4 = New System.Windows.Forms.Panel()
Me.TabControl1 = New System.Windows.Forms.TabControl()
Me.TabPage1 = New System.Windows.Forms.TabPage()
Me.UsrcntlPDFScanList1 = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
+ Me.pnlAdresse = New System.Windows.Forms.Panel()
+ Me.picSave = New System.Windows.Forms.PictureBox()
Me.tabDok.SuspendLayout()
Me.tbcntr.SuspendLayout()
Me.tabVollmachten.SuspendLayout()
@@ -76,6 +88,8 @@ Partial Class ustCntlUSTV_AntragPosition
Me.Panel4.SuspendLayout()
Me.TabControl1.SuspendLayout()
Me.TabPage1.SuspendLayout()
+ Me.pnlAdresse.SuspendLayout()
+ CType(Me.picSave, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'scanLieferschein
@@ -209,7 +223,7 @@ Partial Class ustCntlUSTV_AntragPosition
Me.cbxAPI._value = ""
Me.cbxAPI.AutoSize = True
Me.cbxAPI.Enabled = False
- Me.cbxAPI.Location = New System.Drawing.Point(634, 132)
+ Me.cbxAPI.Location = New System.Drawing.Point(634, 193)
Me.cbxAPI.Name = "cbxAPI"
Me.cbxAPI.Size = New System.Drawing.Size(83, 17)
Me.cbxAPI.TabIndex = 17
@@ -564,7 +578,7 @@ Partial Class ustCntlUSTV_AntragPosition
Me.cboSchnittstellennr._value = ""
Me.cboSchnittstellennr.Enabled = False
Me.cboSchnittstellennr.FormattingEnabled = True
- Me.cboSchnittstellennr.Location = New System.Drawing.Point(723, 130)
+ Me.cboSchnittstellennr.Location = New System.Drawing.Point(723, 191)
Me.cboSchnittstellennr.Name = "cboSchnittstellennr"
Me.cboSchnittstellennr.Size = New System.Drawing.Size(190, 21)
Me.cboSchnittstellennr.TabIndex = 18
@@ -572,6 +586,8 @@ Partial Class ustCntlUSTV_AntragPosition
'pnl
'
Me.pnl.BackColor = System.Drawing.Color.White
+ Me.pnl.Controls.Add(Me.picSave)
+ Me.pnl.Controls.Add(Me.pnlAdresse)
Me.pnl.Controls.Add(Me.Label6)
Me.pnl.Controls.Add(Me.cboSchnittstellennr)
Me.pnl.Controls.Add(Me.Label9)
@@ -601,6 +617,190 @@ Partial Class ustCntlUSTV_AntragPosition
Me.pnl.Size = New System.Drawing.Size(1300, 239)
Me.pnl.TabIndex = 1
'
+ 'txtUIDNr
+ '
+ Me.txtUIDNr._DateTimeOnly = False
+ Me.txtUIDNr._numbersOnly = False
+ Me.txtUIDNr._numbersOnlyKommastellen = ""
+ Me.txtUIDNr._numbersOnlyTrennzeichen = True
+ Me.txtUIDNr._Prozent = False
+ Me.txtUIDNr._ShortDateNew = False
+ Me.txtUIDNr._ShortDateOnly = False
+ Me.txtUIDNr._TimeOnly = False
+ Me.txtUIDNr._TimeOnly_Seconds = False
+ Me.txtUIDNr._value = ""
+ Me.txtUIDNr._Waehrung = False
+ Me.txtUIDNr._WaehrungZeichen = True
+ Me.txtUIDNr.ForeColor = System.Drawing.Color.Red
+ Me.txtUIDNr.Location = New System.Drawing.Point(180, 60)
+ Me.txtUIDNr.MaxLength = 50
+ Me.txtUIDNr.MaxLineLength = -1
+ Me.txtUIDNr.MaxLines_Warning = ""
+ Me.txtUIDNr.MaxLines_Warning_Label = Nothing
+ Me.txtUIDNr.Name = "txtUIDNr"
+ Me.txtUIDNr.Size = New System.Drawing.Size(106, 20)
+ Me.txtUIDNr.TabIndex = 32
+ '
+ 'Label17
+ '
+ Me.Label17.AutoSize = True
+ Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!)
+ Me.Label17.Location = New System.Drawing.Point(129, 63)
+ Me.Label17.Name = "Label17"
+ Me.Label17.Size = New System.Drawing.Size(45, 15)
+ Me.Label17.TabIndex = 31
+ Me.Label17.Text = "UID-Nr"
+ '
+ 'txtLand
+ '
+ Me.txtLand._DateTimeOnly = False
+ Me.txtLand._numbersOnly = False
+ Me.txtLand._numbersOnlyKommastellen = ""
+ Me.txtLand._numbersOnlyTrennzeichen = True
+ Me.txtLand._Prozent = False
+ Me.txtLand._ShortDateNew = False
+ Me.txtLand._ShortDateOnly = False
+ Me.txtLand._TimeOnly = False
+ Me.txtLand._TimeOnly_Seconds = False
+ Me.txtLand._value = ""
+ Me.txtLand._Waehrung = False
+ Me.txtLand._WaehrungZeichen = True
+ Me.txtLand.ForeColor = System.Drawing.Color.Red
+ Me.txtLand.Location = New System.Drawing.Point(66, 58)
+ Me.txtLand.MaxLength = 2
+ Me.txtLand.MaxLineLength = -1
+ Me.txtLand.MaxLines_Warning = ""
+ Me.txtLand.MaxLines_Warning_Label = Nothing
+ Me.txtLand.Name = "txtLand"
+ Me.txtLand.Size = New System.Drawing.Size(38, 20)
+ Me.txtLand.TabIndex = 30
+ '
+ 'txtStrassenNr
+ '
+ Me.txtStrassenNr._DateTimeOnly = False
+ Me.txtStrassenNr._numbersOnly = False
+ Me.txtStrassenNr._numbersOnlyKommastellen = ""
+ Me.txtStrassenNr._numbersOnlyTrennzeichen = True
+ Me.txtStrassenNr._Prozent = False
+ Me.txtStrassenNr._ShortDateNew = False
+ Me.txtStrassenNr._ShortDateOnly = False
+ Me.txtStrassenNr._TimeOnly = False
+ Me.txtStrassenNr._TimeOnly_Seconds = False
+ Me.txtStrassenNr._value = ""
+ Me.txtStrassenNr._Waehrung = False
+ Me.txtStrassenNr._WaehrungZeichen = True
+ Me.txtStrassenNr.ForeColor = System.Drawing.Color.Red
+ Me.txtStrassenNr.Location = New System.Drawing.Point(241, 2)
+ Me.txtStrassenNr.MaxLength = 10
+ Me.txtStrassenNr.MaxLineLength = -1
+ Me.txtStrassenNr.MaxLines_Warning = ""
+ Me.txtStrassenNr.MaxLines_Warning_Label = Nothing
+ Me.txtStrassenNr.Name = "txtStrassenNr"
+ Me.txtStrassenNr.Size = New System.Drawing.Size(45, 20)
+ Me.txtStrassenNr.TabIndex = 29
+ '
+ 'txtOrt
+ '
+ Me.txtOrt._DateTimeOnly = False
+ Me.txtOrt._numbersOnly = False
+ Me.txtOrt._numbersOnlyKommastellen = ""
+ Me.txtOrt._numbersOnlyTrennzeichen = True
+ Me.txtOrt._Prozent = False
+ Me.txtOrt._ShortDateNew = False
+ Me.txtOrt._ShortDateOnly = False
+ Me.txtOrt._TimeOnly = False
+ Me.txtOrt._TimeOnly_Seconds = False
+ Me.txtOrt._value = ""
+ Me.txtOrt._Waehrung = False
+ Me.txtOrt._WaehrungZeichen = True
+ Me.txtOrt.ForeColor = System.Drawing.Color.Red
+ Me.txtOrt.Location = New System.Drawing.Point(132, 29)
+ Me.txtOrt.MaxLength = 50
+ Me.txtOrt.MaxLineLength = -1
+ Me.txtOrt.MaxLines_Warning = ""
+ Me.txtOrt.MaxLines_Warning_Label = Nothing
+ Me.txtOrt.Name = "txtOrt"
+ Me.txtOrt.Size = New System.Drawing.Size(154, 20)
+ Me.txtOrt.TabIndex = 28
+ '
+ 'Label16
+ '
+ Me.Label16.AutoSize = True
+ Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!)
+ Me.Label16.Location = New System.Drawing.Point(8, 58)
+ Me.Label16.Name = "Label16"
+ Me.Label16.Size = New System.Drawing.Size(35, 15)
+ Me.Label16.TabIndex = 27
+ Me.Label16.Text = "Land"
+ '
+ 'txtPLZ
+ '
+ Me.txtPLZ._DateTimeOnly = False
+ Me.txtPLZ._numbersOnly = False
+ Me.txtPLZ._numbersOnlyKommastellen = ""
+ Me.txtPLZ._numbersOnlyTrennzeichen = True
+ Me.txtPLZ._Prozent = False
+ Me.txtPLZ._ShortDateNew = False
+ Me.txtPLZ._ShortDateOnly = False
+ Me.txtPLZ._TimeOnly = False
+ Me.txtPLZ._TimeOnly_Seconds = False
+ Me.txtPLZ._value = ""
+ Me.txtPLZ._Waehrung = False
+ Me.txtPLZ._WaehrungZeichen = True
+ Me.txtPLZ.ForeColor = System.Drawing.Color.Red
+ Me.txtPLZ.Location = New System.Drawing.Point(66, 29)
+ Me.txtPLZ.MaxLength = 10
+ Me.txtPLZ.MaxLineLength = -1
+ Me.txtPLZ.MaxLines_Warning = ""
+ Me.txtPLZ.MaxLines_Warning_Label = Nothing
+ Me.txtPLZ.Name = "txtPLZ"
+ Me.txtPLZ.Size = New System.Drawing.Size(59, 20)
+ Me.txtPLZ.TabIndex = 26
+ '
+ 'Label15
+ '
+ Me.Label15.AutoSize = True
+ Me.Label15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!)
+ Me.Label15.Location = New System.Drawing.Point(8, 32)
+ Me.Label15.Name = "Label15"
+ Me.Label15.Size = New System.Drawing.Size(48, 15)
+ Me.Label15.TabIndex = 25
+ Me.Label15.Text = "PLZ/Ort"
+ '
+ 'txtStrasse
+ '
+ Me.txtStrasse._DateTimeOnly = False
+ Me.txtStrasse._numbersOnly = False
+ Me.txtStrasse._numbersOnlyKommastellen = ""
+ Me.txtStrasse._numbersOnlyTrennzeichen = True
+ Me.txtStrasse._Prozent = False
+ Me.txtStrasse._ShortDateNew = False
+ Me.txtStrasse._ShortDateOnly = False
+ Me.txtStrasse._TimeOnly = False
+ Me.txtStrasse._TimeOnly_Seconds = False
+ Me.txtStrasse._value = ""
+ Me.txtStrasse._Waehrung = False
+ Me.txtStrasse._WaehrungZeichen = True
+ Me.txtStrasse.ForeColor = System.Drawing.Color.Red
+ Me.txtStrasse.Location = New System.Drawing.Point(66, 3)
+ Me.txtStrasse.MaxLength = 50
+ Me.txtStrasse.MaxLineLength = -1
+ Me.txtStrasse.MaxLines_Warning = ""
+ Me.txtStrasse.MaxLines_Warning_Label = Nothing
+ Me.txtStrasse.Name = "txtStrasse"
+ Me.txtStrasse.Size = New System.Drawing.Size(169, 20)
+ Me.txtStrasse.TabIndex = 24
+ '
+ 'Label14
+ '
+ Me.Label14.AutoSize = True
+ Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!)
+ Me.Label14.Location = New System.Drawing.Point(4, 5)
+ Me.Label14.Name = "Label14"
+ Me.Label14.Size = New System.Drawing.Size(64, 15)
+ Me.Label14.TabIndex = 23
+ Me.Label14.Text = "Strasse/Nr"
+ '
'Panel1
'
Me.Panel1.Controls.Add(Me.btnBildAuf)
@@ -671,6 +871,35 @@ Partial Class ustCntlUSTV_AntragPosition
Me.UsrcntlPDFScanList1.Size = New System.Drawing.Size(264, 207)
Me.UsrcntlPDFScanList1.TabIndex = 0
'
+ 'pnlAdresse
+ '
+ Me.pnlAdresse.AccessibleRole = System.Windows.Forms.AccessibleRole.WhiteSpace
+ Me.pnlAdresse.Controls.Add(Me.txtStrasse)
+ Me.pnlAdresse.Controls.Add(Me.txtUIDNr)
+ Me.pnlAdresse.Controls.Add(Me.Label14)
+ Me.pnlAdresse.Controls.Add(Me.Label17)
+ Me.pnlAdresse.Controls.Add(Me.Label15)
+ Me.pnlAdresse.Controls.Add(Me.txtLand)
+ Me.pnlAdresse.Controls.Add(Me.txtPLZ)
+ Me.pnlAdresse.Controls.Add(Me.txtStrassenNr)
+ Me.pnlAdresse.Controls.Add(Me.Label16)
+ Me.pnlAdresse.Controls.Add(Me.txtOrt)
+ Me.pnlAdresse.Location = New System.Drawing.Point(626, 76)
+ Me.pnlAdresse.Name = "pnlAdresse"
+ Me.pnlAdresse.Size = New System.Drawing.Size(287, 82)
+ Me.pnlAdresse.TabIndex = 33
+ '
+ 'picSave
+ '
+ Me.picSave.BackgroundImage = Global.SDL.My.Resources.Resources.save
+ Me.picSave.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+ Me.picSave.Location = New System.Drawing.Point(886, 164)
+ Me.picSave.Name = "picSave"
+ Me.picSave.Size = New System.Drawing.Size(26, 22)
+ Me.picSave.TabIndex = 34
+ Me.picSave.TabStop = False
+ Me.picSave.Visible = False
+ '
'ustCntlUSTV_AntragPosition
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -694,6 +923,9 @@ Partial Class ustCntlUSTV_AntragPosition
Me.Panel4.ResumeLayout(False)
Me.TabControl1.ResumeLayout(False)
Me.TabPage1.ResumeLayout(False)
+ Me.pnlAdresse.ResumeLayout(False)
+ Me.pnlAdresse.PerformLayout()
+ CType(Me.picSave, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
End Sub
@@ -739,4 +971,16 @@ Partial Class ustCntlUSTV_AntragPosition
Friend WithEvents tabFABest As TabPage
Friend WithEvents scanUSTVVollmachten As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList
Friend WithEvents scanUSTVFABest As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList
+ Friend WithEvents txtStrassenNr As VERAG_PROG_ALLGEMEIN.MyTextBox
+ Friend WithEvents txtOrt As VERAG_PROG_ALLGEMEIN.MyTextBox
+ Friend WithEvents Label16 As Label
+ Friend WithEvents txtPLZ As VERAG_PROG_ALLGEMEIN.MyTextBox
+ Friend WithEvents Label15 As Label
+ Friend WithEvents txtStrasse As VERAG_PROG_ALLGEMEIN.MyTextBox
+ Friend WithEvents Label14 As Label
+ Friend WithEvents txtUIDNr As VERAG_PROG_ALLGEMEIN.MyTextBox
+ Friend WithEvents Label17 As Label
+ Friend WithEvents txtLand As VERAG_PROG_ALLGEMEIN.MyTextBox
+ Friend WithEvents pnlAdresse As Panel
+ Friend WithEvents picSave As PictureBox
End Class
diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.vb
index 10b1897f..f0fd00a7 100644
--- a/SDL/USTV/ustCntlUSTV_AntragPosition.vb
+++ b/SDL/USTV/ustCntlUSTV_AntragPosition.vb
@@ -1,5 +1,8 @@
-Public Class ustCntlUSTV_AntragPosition
+Imports java.awt.print
+
+Public Class ustCntlUSTV_AntragPosition
Public UStV_POS As VERAG_PROG_ALLGEMEIN.cUStVPositionen = Nothing
+ Public UStV_Leist As VERAG_PROG_ALLGEMEIN.cUStVLeistender = Nothing
Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
Dim Antrag_LandKz = ""
Dim kdnr = ""
@@ -19,10 +22,12 @@
Sub reset()
txtRgDatum._value = ""
txtRgNr._value = ""
+ picSave.Visible = False
End Sub
- Sub setValues(kdnr As Integer, UStV_POS As VERAG_PROG_ALLGEMEIN.cUStVPositionen, Antrag_LandKz As String)
+ Sub setValues(kdnr As Integer, UStV_POS As VERAG_PROG_ALLGEMEIN.cUStVPositionen, Antrag_LandKz As String, UStV_Leitender As VERAG_PROG_ALLGEMEIN.cUStVLeistender)
gridAktiv = False
+ picSave.Visible = False
Me.Antrag_LandKz = Antrag_LandKz
Me.UStV_POS = UStV_POS
Me.kdnr = kdnr
@@ -38,6 +43,11 @@
txtUmrechnungskurs.Text = If(UStV_POS.UStVPo_Umrechnungskurs, "")
txtUSTBetragEUR.Text = If(UStV_POS.UStVPo_USteuerbetragEUR, "")
+ If UStV_Leitender IsNot Nothing Then
+ UStV_Leist = UStV_Leitender
+ loadChangedDSToPanel(Not UStV_Leitender.UstV_Leistender_Adresse, UStV_Leitender)
+ End If
+
Dim da_id = -1
Select Case If(UStV_POS.UStVPo_SchnittstellenNr, -1)
Case 6, 0 : da_id = sql.getValueTxtBySql("SELECT TOP(1) [plInv_daId] FROM [tblPLOSE_Inv_Data] where plInv_SupplierRechnungsDatum='" & UStV_POS.UStVPo_ReDat & "' and plInv_SupplierRechnungsNr='" & UStV_POS.UStVPo_ReNr & "' and plInv_SupplierCountry='" & Antrag_LandKz & "' AND [plInv_daId] is not null", "FMZOLL",,, -1)
@@ -94,6 +104,11 @@
'If sender Is txtLieferung Then
' If Not PROG.checkSDLNrPartnerKdNr(kdNr, SDLNr) Then MsgBox("Bitte geben Sie die Partner-Kundennummer im Kundenblatt oder im FM-ZOLL ein!")
'End If
+
+ If sender Is cboLeistungsgeber Then
+ UStV_POS.UStVPo_Leistender = cboLeistungsgeber.Text
+
+ End If
values_changed()
End If
End Sub
@@ -105,5 +120,47 @@
End Sub
+ Private Sub loadChangedDSToPanel(enablePanel As Boolean, UStV_Leitender As VERAG_PROG_ALLGEMEIN.cUStVLeistender)
+ pnlAdresse.Enabled = True 'enablePanel 'immer änderbar!
+ txtStrasse.Text = If(UStV_Leitender.UstV_Leistender_Strasse, "")
+ txtStrassenNr.Text = If(UStV_Leitender.UstV_Leistender_StrasseNr, "")
+ txtPLZ.Text = If(UStV_Leitender.UstV_Leistender_PLZ, "")
+ txtOrt.Text = If(UStV_Leitender.UstV_Leistender_Stadt, "")
+ txtLand.Text = If(UStV_Leitender.UstV_Leistender_Land, "")
+ txtUIDNr.Text = If(UStV_Leitender.UstV_Leistender_UstNr, "")
+ 'Listener für Änderungen im Detail-Panel
+ For Each c As Control In pnlAdresse.Controls
+ If TypeOf (c) Is TextBox Then
+ AddHandler CType(c, TextBox).TextChanged, AddressOf SomethingChanged
+ End If
+ Next
+ End Sub
+
+
+ Private Sub SomethingChanged(sender As Object, e As EventArgs)
+ picSave.Visible = True
+ End Sub
+
+ Private Sub picSave_Click(sender As Object, e As EventArgs) Handles picSave.Click
+ If UStV_Leist Is Nothing Then Exit Sub
+
+ If UStV_Leist.UstV_Leistender_Adresse Then
+ If Not vbYes = MsgBox("Bei diesem Leistendem ist bereits eine Adresse hinterlegt, soll diese Adresse wirklich geändert werden?", vbYesNo) Then
+ Exit Sub
+ End If
+ End If
+
+ UStV_Leist.UstV_Leistender_Strasse = If(txtStrasse.Text, "")
+ UStV_Leist.UstV_Leistender_StrasseNr = If(txtStrassenNr.Text, "")
+ UStV_Leist.UstV_Leistender_PLZ = If(txtPLZ.Text, "")
+ UStV_Leist.UstV_Leistender_Stadt = If(txtOrt.Text, "")
+ UStV_Leist.UstV_Leistender_Land = If(txtLand.Text, "")
+ UStV_Leist.UstV_Leistender_UstNr = If(txtUIDNr.Text, "")
+ UStV_Leist.UstV_Leistender_Adresse = True
+ If UStV_Leist.SAVE() Then
+ picSave.Visible = False
+ End If
+
+ End Sub
End Class
diff --git a/SDL/UsrCntlEssensbestellungen.vb b/SDL/UsrCntlEssensbestellungen.vb
index 052c9b99..83ff4097 100644
--- a/SDL/UsrCntlEssensbestellungen.vb
+++ b/SDL/UsrCntlEssensbestellungen.vb
@@ -1,4 +1,5 @@
+Imports System.Data.SqlTypes
Imports VERAG_PROG_ALLGEMEIN
Public Class UsrCntlessensbestellungen
@@ -588,7 +589,19 @@ 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()
- cbxMitarbeiter.fillWithSQL("SELECT [mit_id], ([mit_vname] + ' ' + [mit_nname]) + ' (' + mit_firma +')' as name FROM [tblMitarbeiter] where [mit_ChatBenutzer] = 1 AND [mit_pseudoUser] = 0 AND [mit_gekuendigt] = 0 AND mit_niederlassung = 'SUB' AND ((CAse when mit_firma = 'ALL' Then mit_FirmaHaupt else mit_firma END ) = 'VERAG' Or mit_firma = 'UNISPED' OR mit_firma = 'IMEX' OR mit_firma = 'FRONTOFFICE') Or mit_id = 144 order by name ", False, "ADMIN", True)
+
+ 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'"
+ If cAllgemein.MITARBEITER.getFirma = "UNISPED" Then
+ sqlMA &= " And mit_firma = '" & cAllgemein.MITARBEITER.getFirma & "' "
+ Else
+ sqlMA &= " And ((Case When mit_firma = 'ALL' Then mit_FirmaHaupt else mit_firma END ) = 'VERAG' OR mit_firma = 'IMEX' OR mit_firma = 'FRONTOFFICE') Or mit_id = 144 "
+ End If
+
+ sqlMA &= "order by name"
+
+
+ cbxMitarbeiter.fillWithSQL(sqlMA, False, "ADMIN", True)
cbxAbteilung.fillWithSQL("SELECT [abt_kuerzel], [abt_bezeichnung] from [tblAbteilungen] ", False, "ADMIN", True,, "")
cbxGebäude.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Frontoffice", "Frontoffice"))
diff --git a/SDL/frmEssensbestellungenAdministration.Designer.vb b/SDL/frmEssensbestellungenAdministration.Designer.vb
index a3ae38dd..df5c6e87 100644
--- a/SDL/frmEssensbestellungenAdministration.Designer.vb
+++ b/SDL/frmEssensbestellungenAdministration.Designer.vb
@@ -82,6 +82,7 @@ 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.cbxCurrenyear = New System.Windows.Forms.CheckBox()
Me.pnlTop.SuspendLayout()
Me.Panel1.SuspendLayout()
Me.ContextMenuStrip1.SuspendLayout()
@@ -122,6 +123,7 @@ Partial Class frmEssensbestellungenAdministration
'
'Panel1
'
+ Me.Panel1.Controls.Add(Me.cbxCurrenyear)
Me.Panel1.Controls.Add(Me.cbxAlleAnzeigen)
Me.Panel1.Controls.Add(Me.lblBestellungBis)
Me.Panel1.Controls.Add(Me.btnBestelllimit)
@@ -823,6 +825,17 @@ Partial Class frmEssensbestellungenAdministration
Me.Label9.Text = "Gesamtbetrag"
Me.Label9.TextAlign = System.Drawing.ContentAlignment.TopRight
'
+ 'cbxCurrenyear
+ '
+ Me.cbxCurrenyear.AutoSize = True
+ Me.cbxCurrenyear.Checked = True
+ Me.cbxCurrenyear.CheckState = System.Windows.Forms.CheckState.Checked
+ Me.cbxCurrenyear.Location = New System.Drawing.Point(296, 12)
+ Me.cbxCurrenyear.Name = "cbxCurrenyear"
+ Me.cbxCurrenyear.Size = New System.Drawing.Size(15, 14)
+ Me.cbxCurrenyear.TabIndex = 73
+ Me.cbxCurrenyear.UseVisualStyleBackColor = True
+ '
'frmEssensbestellungenAdministration
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -916,4 +929,5 @@ Partial Class frmEssensbestellungenAdministration
Friend WithEvents cbxAlleAnzeigen As CheckBox
Friend WithEvents ExportToolStripMenuItem As ToolStripMenuItem
Friend WithEvents ExcelToolStripMenuItem As ToolStripMenuItem
+ Friend WithEvents cbxCurrenyear As CheckBox
End Class
diff --git a/SDL/frmEssensbestellungenAdministration.vb b/SDL/frmEssensbestellungenAdministration.vb
index a7cb7f68..04e33efb 100644
--- a/SDL/frmEssensbestellungenAdministration.vb
+++ b/SDL/frmEssensbestellungenAdministration.vb
@@ -1,4 +1,5 @@
+Imports System.Data.SqlTypes
Imports System.Timers
Imports Microsoft.Office.Interop
Imports VERAG_PROG_ALLGEMEIN
@@ -26,7 +27,9 @@ Public Class frmEssensbestellungenAdministration
cboAbteilung.fillWithSQL("SELECT DISTINCT(eb_abteilung) FROM [tblEssensbestellungen]", False, "AVISO", True)
- cbKW.fillWithSQL("SELECT DISTINCT(eb_kw) FROM [tblEssensbestellungen] UNION SELECT (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' + Convert(varchar, Year(MenuDateVon)) as kwDateNew FROM [tblEBMenu] where MenuDateVon > GETDATE()ORDER BY eb_kw desc", False, "AVISO", True)
+ 'changeYear()
+
+ cbKW.fillWithSQL("SELECT DISTINCT(eb_kw) FROM [tblEssensbestellungen] UNION SELECT (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' + Convert(varchar, Year(MenuDateVon)) as kwDateNew FROM [tblEBMenu] where MenuDateVon > GETDATE() ORDER BY eb_kw desc", False, "AVISO", True)
cbxMailKW.fillWithSQL("SELECT DISTINCT(eb_kw) FROM [tblEssensbestellungen] ORDER BY eb_kw desc", False, "AVISO", True)
cbxMailKW.changeItem("")
@@ -49,14 +52,14 @@ Public Class frmEssensbestellungenAdministration
FROM
[tblEssensbestellungen] WHERE 1=1"
- IIf(cAllgemein.MITARBEITER.getFirma = SQLString & "UNISPED", "And essen.eb_firma = " & cAllgemein.MITARBEITER.getFirma, "") 'UNISPED-Bestellungen!
+ SQLString &= IIf(cAllgemein.MITARBEITER.getFirma = "UNISPED", " And eb_firma = '" & cAllgemein.MITARBEITER.getFirma & "'", "") 'UNISPED-Bestellungen!
dgvBestellungen.SET_SQL(SQLString & bestellungenWhereClause() & " Order by eb_datum, eb_mitid", "AVISO", ,)
dgvBestellungen.LOAD()
With dgvBestellungen
- 'If .RowCount = 0 Then Me.Cursor = Cursors.Default : Exit Sub
+ If .RowCount = 0 Then Me.Cursor = Cursors.Default : Exit Sub
.RowHeadersVisible = False
.ReadOnly = True
.SelectionMode = DataGridViewSelectionMode.FullRowSelect
@@ -628,12 +631,18 @@ Public Class frmEssensbestellungenAdministration
Dim dtBestellungen As DataTable
- ''LEFT([eb_kw],5)
+ Dim sqlWhere = ""
+
+ If cAllgemein.MITARBEITER.getFirma = "UNISPED" Then
+ sqlWhere &= " And eb_firma = '" & cAllgemein.MITARBEITER.getFirma & "' "
+ Else
+ 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 Order by eb_datum"
+ [tblEssensbestellungen] 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)
@@ -913,6 +922,7 @@ Public Class frmEssensbestellungenAdministration
cbxMailGebäude.Enabled = False
Else
+
cboAbteilung.changeItem("")
cboAbteilung.Enabled = True
@@ -923,4 +933,22 @@ Public Class frmEssensbestellungenAdministration
End Sub
+
+ 'Private Sub cbxCurrenyear_CheckedChanged(sender As Object, e As EventArgs) Handles cbxCurrenyear.CheckedChanged
+ ' changeYear()
+ 'End Sub
+
+ 'Private Sub changeYear()
+
+ ' Dim sqlwhere = "WHERE "
+ ' sqlwhere &= IIf(cbxCurrenyear.Checked, "Year(MenuDateVon) = Year(getdate()) and MenuDateVon > GETDATE()", "MenuDateVon > GETDATE()")
+ ' cbKW.fillWithSQL("SELECT DISTINCT(eb_kw) FROM [tblEssensbestellungen] UNION SELECT (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' + Convert(varchar, Year(MenuDateVon)) as kwDateNew FROM [tblEBMenu] " & sqlwhere & " ORDER BY eb_kw desc", False, "AVISO", True)
+
+
+ ' Dim sqlwhere2 = "WHERE "
+ ' sqlwhere2 &= IIf(cbxCurrenyear.Checked, "Year([eb_datum]) = Year(getdate()) and [eb_datum] <= GETDATE()", "[eb_datum] <= GETDATE()")
+ ' cbxMailKW.fillWithSQL("SELECT DISTINCT(eb_kw) FROM [tblEssensbestellungen] " & sqlwhere2 & " ORDER BY eb_kw desc", False, "AVISO", True)
+
+
+ 'End Sub
End Class
\ No newline at end of file
diff --git a/SDL/kunden/usrcntlFiskaluebersicht.vb b/SDL/kunden/usrcntlFiskaluebersicht.vb
index 12cbe8a0..9babe308 100644
--- a/SDL/kunden/usrcntlFiskaluebersicht.vb
+++ b/SDL/kunden/usrcntlFiskaluebersicht.vb
@@ -142,7 +142,7 @@ Public Class usrcntlFiskaluebersicht
Sub initDGVUnterlagen()
With dgvUnterlagen
- .DataSource = SQL.loadDgvBySql("SELECT [fka_id],[fka_KdNr],[fka_Name],[fka_Datum] , [fka_Art], [fka_docId] FROM [tblFiskalkundenAnhaenge] " &
+ .DataSource = SQL.loadDgvBySql("SELECT [fka_id],[fka_KdNr],[fka_Name],[fka_Datum] , CASE WHEN [fka_Art] like '%SONSTIGES%' THEN 'SONSTIGES' end as [fka_Art], [fka_docId] FROM [tblFiskalkundenAnhaenge] " &
" WHERE [fka_KdNr]='" & fk.FK_Kdnr & "' AND fka_fkId='" & fk.FK_Id & "' ORDER BY fka_Datum desc ", "AVISO")
.Columns("fka_id").Visible = False
.Columns("fka_KdNr").Visible = False
@@ -362,19 +362,26 @@ Public Class usrcntlFiskaluebersicht
Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click
If vbYes = MsgBox("Möchten Sie den Fiskalakt vom " & dgvFiskaluebersicht.SelectedRows(0).Cells("FK_Datum").Value & " abschließen?" & vbNewLine & "Er kann anschließend nicht mehr verändert werden", vbYesNo) Then
- getFields()
- If checkEntries() Then
- fk.FK_locked = True
- fk.FK_Abschlussdatum = Now()
- fk.FK_MaId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
- fk.SAVE()
- initDGVFiskaluebersicht()
- btnOK.Enabled = False
- btnSave.Enabled = False
+ If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_id = 170 Then
+ If Not vbYes = MsgBox("Kerstin...... WIRKLICH?", vbYesNo) Then
+ Exit Sub
+ End If
End If
- End If
+ getFields()
+
+ If checkEntries() Then
+ fk.FK_locked = True
+ fk.FK_Abschlussdatum = Now()
+ fk.FK_MaId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
+ fk.SAVE()
+ initDGVFiskaluebersicht()
+ btnOK.Enabled = False
+ btnSave.Enabled = False
+ End If
+
+ End If
End Sub
Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click
@@ -1000,6 +1007,10 @@ Public Class usrcntlFiskaluebersicht
If cbxAttachmentArt._value = "" Then Exit Sub
Dim ArtId As String = cbxAttachmentArt._value
+ If ArtId = "SONSTIGES" Then
+ ArtId &= "_" & Now.ToString("ddMMyyHmm")
+ End If
+
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "FISKALKUNDENANHAENGE", fk.FK_Datum, "", "", ArtId, kdNr)
If DS.uploadDataToDATENSERVERFileDialog(, ".pdf", , "PDF") Then
diff --git a/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb b/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb
index d03e3795..d1774041 100644
--- a/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb
+++ b/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb
@@ -5,6 +5,7 @@ Imports VERAG_PROG_ALLGEMEIN.cGlobal
Imports System.Data.SqlClient
Imports System.Globalization
Imports System.Reflection
+Imports System.Web.UI.WebControls.WebParts
Public Class cSqlDb
@@ -1858,6 +1859,9 @@ Public Class cAvisoDAL
Dim tmpid = AvisoDAL.SpeichernAviso(av)
AvisoDAL.addAenderung(tmpid, "automatisch auf 'LKW nicht eingetroffen' gestellt", "automatisch auf 'LKW nicht eingetroffen' gestellt am " & Format(Now, "dd.MM.yyyy HH:mm") & ", da bereits länger als 10 Tage offen")
+ 'TODO - Benachrichtigung für zuständigen Mitarbeiter einbauen
+ VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.INSERT_BENACHRICHTIGUNG(av.AvisoID, -1, 3, "B", av.LetzterMitarbeiterId, "automatisch auf 'LKW nicht eingetroffen gesetzt", 0,, "automatisch auf 'LKW nicht eingetroffen' gestellt am " & Format(Now, "dd.MM.yyyy HH:mm") & ", da bereits länger als 10 Tage offen")
+
Check_Nicht_eingetroffen += 1
End While
dr.Close()
diff --git a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUStVLeistender.vb b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUStVLeistender.vb
new file mode 100644
index 00000000..a4249727
--- /dev/null
+++ b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUStVLeistender.vb
@@ -0,0 +1,122 @@
+Imports System.Data.SqlClient
+Imports System.Reflection
+
+
+Public Class cUStVLeistender
+ Property UStV_Leistender As String
+ Property UstV_Leistender_PLZ As Object = Nothing
+ Property UstV_Leistender_Strasse As Object = Nothing
+ Property UstV_Leistender_Stadt As Object = Nothing
+ Property UstV_Leistender_StrasseNr As Object = Nothing
+ Property UstV_Leistender_Land As Object = Nothing
+ Property UstV_Leistender_UstNr As Object = Nothing
+ Property UstV_Leistender_Adresse As Boolean
+
+
+ Public hasEntry = False
+
+ Dim SQL As New SQL
+
+ Sub New(UStV_Leistender)
+ Me.UStV_Leistender = UStV_Leistender
+ LOAD()
+ End Sub
+ Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
+ Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStV_Leistender", UStV_Leistender,, True))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UstV_Leistender_PLZ", UstV_Leistender_PLZ))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UstV_Leistender_Strasse", UstV_Leistender_Strasse))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UstV_Leistender_Stadt", UstV_Leistender_Stadt))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UstV_Leistender_StrasseNr", UstV_Leistender_StrasseNr))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UstV_Leistender_Land", UstV_Leistender_Land))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UstV_Leistender_UstNr", UstV_Leistender_UstNr))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UstV_Leistender_Adresse", UstV_Leistender_Adresse))
+ Return list
+ End Function
+
+
+
+ Public Function SAVE() As Boolean
+ Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+
+ Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblUStVLeistender WHERE UStV_Leistender=@UStV_Leistender) " &
+ " BEGIN " & getUpdateCmd() & " END " & " commit tran "
+ '" Else " &
+ '" BEGIN " & getInsertCmd() & " END " &
+ '" commit tran "
+
+ Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list)
+ End Function
+
+ Public Sub LOAD()
+ Try
+ hasEntry = False
+ Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
+ Using cmd As New SqlCommand("SELECT * FROM tblUStVLeistender WHERE UStV_Leistender=@UStV_Leistender ", conn)
+ cmd.Parameters.AddWithValue("@UStV_Leistender", UStV_Leistender)
+ Dim dr = cmd.ExecuteReader()
+ If dr.Read Then
+ For Each li In getParameterList()
+ Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable)
+
+ If dr.Item(li.Text) Is DBNull.Value Then
+ propInfo.SetValue(Me, Nothing)
+ Else
+ propInfo.SetValue(Me, dr.Item(li.Text))
+ End If
+
+ Next
+ hasEntry = True
+ End If
+ dr.Close()
+ End Using
+ End Using
+ Catch ex As Exception
+ VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+ End Try
+ End Sub
+
+
+
+ Public Function getUpdateCmd() As String
+ Try
+ Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+
+ Dim str As String = ""
+ For Each i In list
+ If Not i.isPrimaryParam Then
+ str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
+ End If
+ Next
+ str = str.Substring(0, str.Length - 1) 'wg. ','
+ Return (" UPDATE [tblUStVLeistender] SET " & str & " WHERE UStV_Leistender=@UStV_Leistender ")
+
+ Catch ex As Exception
+ VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+ End Try
+ Return ""
+ End Function
+
+
+ Public Function getInsertCmd() As String
+ Try
+ Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+ Dim str As String = ""
+ Dim values As String = ""
+ For Each i In list
+ If Not i.isPrimaryParam Then
+ str &= "[" & i.Text & "],"
+ values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
+ End If
+ Next
+ str = str.Substring(0, str.Length - 1) 'wg. ','
+ values = values.Substring(0, values.Length - 1) 'wg. ','
+ Return (" INSERT INTO tblUStVLeistender (" & str & ") VALUES(" & values & ") ")
+ Catch ex As Exception
+ VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+ End Try
+ Return ""
+ End Function
+
+ End Class
+
diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cAvisoAnhangsarten.vb b/VERAG_PROG_ALLGEMEIN/Classes/cAvisoAnhangsarten.vb
index e3a20de6..5a75d3df 100644
--- a/VERAG_PROG_ALLGEMEIN/Classes/cAvisoAnhangsarten.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cAvisoAnhangsarten.vb
@@ -5,38 +5,28 @@ Imports System.Reflection
Public Class cAvisoAnhangsarten_LIST
Public LIST As New List(Of cAvisoAnhangsarten)
+ Dim SQL As New SQL
- Sub New()
- LOAD_LIST()
+
+ Sub New(aktiv As Boolean, firma As String, filiale As String)
+ LOAD_LIST(aktiv, firma, filiale)
End Sub
- Public Sub LOAD_LIST()
+
+ Public Sub LOAD_LIST(aktiv As Boolean, Firma As String, Filiale As String)
Try
+
LIST.Clear()
- Using conn As SqlConnection = SQL.GetNewOpenConnectionAVISO()
- Using cmd As New SqlCommand("SELECT * FROM [tblAvisoAnhangsArten] ", conn)
- ' cmd.Parameters.AddWithValue("@OffertenNr", OffertenNr)
- Dim dr = cmd.ExecuteReader()
- While dr.Read
- Dim l As New cAvisoAnhangsarten
- For Each i In l.getParameterList()
- Dim propInfo As PropertyInfo = l.GetType.GetProperty(i.Scalarvariable)
- If dr.Item(i.Text) Is DBNull.Value Then
- propInfo.SetValue(l, Nothing)
- Else
- propInfo.SetValue(l, dr.Item(i.Text))
- End If
- Next
- LIST.Add(l)
+ For Each r In SQL.loadDgvBySql("Select aa_id FROM [tblAvisoAnhangsArten] WHERE aa_aktiv=" & IIf(aktiv, "1", "0") & " And ((aa_firma Is null And aa_filiale Is null) " & IIf(Firma <> "", " Or aa_firma = '" & Firma & "'", "") & IIf(Filiale <> "", " OR aa_filiale = '" & Filiale & "'", "") & ")", "AVISO").Rows
+ LIST.Add(New VERAG_PROG_ALLGEMEIN.cAvisoAnhangsarten(r("aa_id")))
+ Next
- End While
- dr.Close()
- End Using
- End Using
Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
End Try
End Sub
+
+
End Class
@@ -49,6 +39,7 @@ Public Class cAvisoAnhangsarten
Property aa_aktiv As Object = Nothing
Property aa_bezeichnung As Object = Nothing
Property aa_firma As Object = Nothing
+ Property aa_filiale As Object = Nothing
Public hasEntry = False
@@ -72,6 +63,7 @@ Public Class cAvisoAnhangsarten
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("aa_aktiv", aa_aktiv))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("aa_bezeichnung", aa_bezeichnung))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("aa_firma", aa_firma))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("aa_filiale", aa_filiale))
Return list
End Function
diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cNCTSGestellungsadressen.vb b/VERAG_PROG_ALLGEMEIN/Classes/cNCTSGestellungsadressen.vb
index 3fe12164..826b029b 100644
--- a/VERAG_PROG_ALLGEMEIN/Classes/cNCTSGestellungsadressen.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cNCTSGestellungsadressen.vb
@@ -14,6 +14,7 @@ Public Class cNCTSGestellungsadressen
Property nga_Ansprechpartner As Object = Nothing
Property nga_bestZollst As Object = Nothing
Property nga_SB As Object = Nothing
+ Property nga_ATANr As Object = Nothing
Property nga_firma As Object = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Property nga_Aenderungsdatum As Date = Now
Property nga_gestellungsMail As Object = Nothing
@@ -46,6 +47,7 @@ Public Class cNCTSGestellungsadressen
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nga_EORI", nga_EORI))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nga_EORI_NL", nga_EORI_NL))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nga_ATANr", nga_ATANr))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nga_Ansprechpartner", nga_Ansprechpartner))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nga_bestZollst", nga_bestZollst))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nga_SB", nga_SB))
diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb b/VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb
index 70ce1c9e..168fa7b0 100644
--- a/VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb
@@ -809,6 +809,14 @@ Public Class cSendungen
Return adresse.Trim
End Function
+ Public Function getNCTSATANr(Optional htmlOptimized As Boolean = False) As String
+ Dim ataNr = ""
+ ataNr &= If(Me.tblSnd_ATANr, "") & vbNewLine
+
+ If htmlOptimized Then ataNr = ataNr.Trim.Replace(vbNewLine, "
")
+ Return ataNr.Trim
+ End Function
+
Public Function getEmpfaengerAdress(Optional htmlOptimized As Boolean = False, Optional ansprechpartner As Boolean = False) As String
If tblSnd_EmpfaengerKdNr > 0 Then
diff --git a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb
index da018275..64373309 100644
--- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb
+++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb
@@ -61,12 +61,12 @@ Public Class cDATENSERVER
Me.rootDir = DATENVERVER_OPTIONS.initRootDir()
Me.da_KundenNr = da_KundenNr
Me.da_vorlage = 0 '(da_KundenNr <= 0)
- Me.da_kategorie = da_kategorie
- Me.da_ordner = da_ordner
- Me.da_uOrdner1 = replaceInvalidCahr(If(da_uOrdner1, ""))
- Me.da_uOrdner2 = replaceInvalidCahr(If(da_uOrdner2, ""))
- Me.da_uOrdner3 = replaceInvalidCahr(If(da_uOrdner3, ""))
- Me.da_name = da_name
+ Me.da_kategorie = IIf(Not IsDBNull(da_kategorie), da_kategorie, "")
+ Me.da_ordner = IIf(Not IsDBNull(da_ordner), da_ordner, "")
+ Me.da_uOrdner1 = replaceInvalidCahr(IIf(Not IsDBNull(da_uOrdner1), da_uOrdner1, ""))
+ Me.da_uOrdner2 = replaceInvalidCahr(IIf(Not IsDBNull(da_uOrdner2), da_uOrdner2, ""))
+ Me.da_uOrdner3 = replaceInvalidCahr(IIf(Not IsDBNull(da_uOrdner3), da_uOrdner3, ""))
+ Me.da_name = IIf(Not IsDBNull(da_name), da_name, "")
LOAD()
End Sub
diff --git a/VERAG_PROG_ALLGEMEIN/DATENSERVER/frmVorlagenUpload.Designer.vb b/VERAG_PROG_ALLGEMEIN/DATENSERVER/frmVorlagenUpload.Designer.vb
index bd1f8f51..d1fff750 100644
--- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/frmVorlagenUpload.Designer.vb
+++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/frmVorlagenUpload.Designer.vb
@@ -34,6 +34,7 @@ Partial Class frmVorlagenUpload
Me.txtUnterordner1 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.txtUnterordner2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label4 = New System.Windows.Forms.Label()
+ Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.SuspendLayout()
'
'txtOrdner
@@ -119,9 +120,9 @@ Partial Class frmVorlagenUpload
Me.Label3.AutoSize = True
Me.Label3.Location = New System.Drawing.Point(8, 135)
Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(38, 13)
+ Me.Label3.Size = New System.Drawing.Size(42, 13)
Me.Label3.TabIndex = 6
- Me.Label3.Text = "Name:"
+ Me.Label3.Text = "Name*:"
'
'txtName
'
@@ -149,9 +150,9 @@ Partial Class frmVorlagenUpload
'btnUpload
'
Me.btnUpload.FlatStyle = System.Windows.Forms.FlatStyle.Flat
- Me.btnUpload.Location = New System.Drawing.Point(221, 158)
+ Me.btnUpload.Location = New System.Drawing.Point(282, 158)
Me.btnUpload.Name = "btnUpload"
- Me.btnUpload.Size = New System.Drawing.Size(225, 44)
+ Me.btnUpload.Size = New System.Drawing.Size(164, 44)
Me.btnUpload.TabIndex = 6
Me.btnUpload.Text = "Datei Auswählen + Upload"
Me.btnUpload.UseVisualStyleBackColor = True
@@ -187,12 +188,39 @@ Partial Class frmVorlagenUpload
Me.Label4.TabIndex = 9
Me.Label4.Text = "Unterordner 2:"
'
+ 'MyTextBox1
+ '
+ Me.MyTextBox1._DateTimeOnly = False
+ Me.MyTextBox1._numbersOnly = False
+ Me.MyTextBox1._numbersOnlyKommastellen = ""
+ Me.MyTextBox1._numbersOnlyTrennzeichen = True
+ Me.MyTextBox1._Prozent = False
+ Me.MyTextBox1._ShortDateNew = False
+ Me.MyTextBox1._ShortDateOnly = False
+ Me.MyTextBox1._TimeOnly = False
+ Me.MyTextBox1._TimeOnly_Seconds = False
+ Me.MyTextBox1._value = "* wenn leer, wird Dateiname + Endung aus Uploaddatei übernommen"
+ Me.MyTextBox1._Waehrung = False
+ Me.MyTextBox1._WaehrungZeichen = True
+ Me.MyTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None
+ Me.MyTextBox1.ForeColor = System.Drawing.Color.Red
+ Me.MyTextBox1.Location = New System.Drawing.Point(11, 158)
+ Me.MyTextBox1.MaxLineLength = -1
+ Me.MyTextBox1.MaxLines_Warning = ""
+ Me.MyTextBox1.MaxLines_Warning_Label = Nothing
+ Me.MyTextBox1.Multiline = True
+ Me.MyTextBox1.Name = "MyTextBox1"
+ Me.MyTextBox1.Size = New System.Drawing.Size(184, 32)
+ Me.MyTextBox1.TabIndex = 11
+ Me.MyTextBox1.Text = "* wenn leer, wird Dateiname + Endung aus Uploaddatei übernommen"
+ '
'frmVorlagenUpload
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.BackColor = System.Drawing.Color.White
Me.ClientSize = New System.Drawing.Size(462, 213)
+ Me.Controls.Add(Me.MyTextBox1)
Me.Controls.Add(Me.txtUnterordner2)
Me.Controls.Add(Me.Label4)
Me.Controls.Add(Me.txtUnterordner1)
@@ -223,4 +251,5 @@ Partial Class frmVorlagenUpload
Friend WithEvents txtUnterordner1 As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents txtUnterordner2 As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents Label4 As System.Windows.Forms.Label
+ Friend WithEvents MyTextBox1 As MyTextBox
End Class
diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb
index 851902a2..94ac3de5 100644
--- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb
+++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb
@@ -24,7 +24,6 @@ Partial Class frmMessenger
'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()
@@ -39,12 +38,12 @@ Partial Class frmMessenger
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMessenger))
Me.SplitContainer = New System.Windows.Forms.SplitContainer()
Me.SplitContainer2 = New System.Windows.Forms.SplitContainer()
- Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+ Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
Me.Panel6 = New System.Windows.Forms.Panel()
Me.Label3 = New System.Windows.Forms.Label()
Me.lblLKWChat_MsgCntInaktiv = New System.Windows.Forms.Label()
Me.cbxInaktiveChats = New System.Windows.Forms.CheckBox()
- Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+ Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
Me.Panel5 = New System.Windows.Forms.Panel()
Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.PictureBox2 = New System.Windows.Forms.PictureBox()
@@ -65,7 +64,7 @@ Partial Class frmMessenger
Me.btnNeu = New System.Windows.Forms.Button()
Me.Button1 = New System.Windows.Forms.Button()
Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
- Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel(Me.components)
+ Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel()
Me.UsrCntlMessenger_ChatElement1 = New VERAG_PROG_ALLGEMEIN.usrCntlMessenger_ChatElement()
Me.Panel3 = New System.Windows.Forms.Panel()
Me.btnTeilnehmer = New System.Windows.Forms.Button()
@@ -93,9 +92,9 @@ Partial Class frmMessenger
Me.btnSendAtt = New System.Windows.Forms.Button()
Me.btnSenden = New System.Windows.Forms.Button()
Me.rtbChatMessage = New System.Windows.Forms.RichTextBox()
- Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer(Me.components)
- Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components)
- Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components)
+ Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer()
+ Me.Timer_REFRESH = New System.Windows.Forms.Timer()
+ Me.cntxt = New System.Windows.Forms.ContextMenuStrip()
Me.ChatDeaktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.toolChatReminder = New System.Windows.Forms.ToolStripMenuItem()
Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb
index 1b8a2c25..09eb2345 100644
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb
@@ -43,7 +43,6 @@ Public Class frmMitarbeitersuche
End If
If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_MAVerzeichnis_SettingsTstmp Is Nothing And Not VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pseudoUser Then
- MsgBox("Sie müssen Ihren Benutzer erstmal konfigurieren, um das Verzeichnis einsehen zu können. Sie können die Einstellungen jederzeit ändern.")
Dim f As New frmMitarbeitersucheBearbeiten(VERAG_PROG_ALLGEMEIN.cAllgemein.USRID)
If f.ShowDialog(Me) = Windows.Forms.DialogResult.OK Then
diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersucheBearbeiten.Designer.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersucheBearbeiten.Designer.vb
index fe61e8e0..247087fc 100644
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersucheBearbeiten.Designer.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersucheBearbeiten.Designer.vb
@@ -26,9 +26,6 @@ Partial Class frmMitarbeitersucheBearbeiten
Me.pnlSrch = New System.Windows.Forms.Panel()
Me.btnClose = New System.Windows.Forms.Button()
Me.pnlMain = New System.Windows.Forms.Panel()
- Me.Label1 = New System.Windows.Forms.Label()
- Me.PictureBox2 = New System.Windows.Forms.PictureBox()
- Me.PictureBox1 = New System.Windows.Forms.PictureBox()
Me.cbxAllowFoto = New System.Windows.Forms.CheckBox()
Me.btn = New System.Windows.Forms.Button()
Me.txtMotto = New System.Windows.Forms.TextBox()
@@ -45,12 +42,16 @@ Partial Class frmMitarbeitersucheBearbeiten
Me.lblName = New System.Windows.Forms.Label()
Me.pic = New System.Windows.Forms.PictureBox()
Me.pnlHoverPic = New System.Windows.Forms.Panel()
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.PictureBox2 = New System.Windows.Forms.PictureBox()
+ Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+ Me.txtKonfigHinweis = New System.Windows.Forms.TextBox()
Me.pnlSrch.SuspendLayout()
Me.pnlMain.SuspendLayout()
- CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
- CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
Me.pnlHoverPic.SuspendLayout()
+ CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'pnlSrch
@@ -84,6 +85,7 @@ Partial Class frmMitarbeitersucheBearbeiten
'pnlMain
'
Me.pnlMain.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+ Me.pnlMain.Controls.Add(Me.pnlHoverPic)
Me.pnlMain.Controls.Add(Me.cbxAllowFoto)
Me.pnlMain.Controls.Add(Me.btn)
Me.pnlMain.Controls.Add(Me.txtMotto)
@@ -99,45 +101,12 @@ Partial Class frmMitarbeitersucheBearbeiten
Me.pnlMain.Controls.Add(Me.lblWohnadresse)
Me.pnlMain.Controls.Add(Me.lblName)
Me.pnlMain.Controls.Add(Me.pic)
- Me.pnlMain.Controls.Add(Me.pnlHoverPic)
Me.pnlMain.Dock = System.Windows.Forms.DockStyle.Fill
- Me.pnlMain.Location = New System.Drawing.Point(0, 29)
+ Me.pnlMain.Location = New System.Drawing.Point(0, 0)
Me.pnlMain.Name = "pnlMain"
- Me.pnlMain.Size = New System.Drawing.Size(703, 335)
+ Me.pnlMain.Size = New System.Drawing.Size(703, 364)
Me.pnlMain.TabIndex = 1
'
- 'Label1
- '
- Me.Label1.AutoSize = True
- Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!)
- Me.Label1.Location = New System.Drawing.Point(4, 1)
- Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(98, 24)
- Me.Label1.TabIndex = 36
- Me.Label1.Text = "Hover-Pic:"
- '
- 'PictureBox2
- '
- Me.PictureBox2.BackgroundImage = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.personGray_m
- Me.PictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
- Me.PictureBox2.Cursor = System.Windows.Forms.Cursors.Hand
- Me.PictureBox2.Location = New System.Drawing.Point(77, 29)
- Me.PictureBox2.Name = "PictureBox2"
- Me.PictureBox2.Size = New System.Drawing.Size(63, 59)
- Me.PictureBox2.TabIndex = 35
- Me.PictureBox2.TabStop = False
- '
- 'PictureBox1
- '
- Me.PictureBox1.BackgroundImage = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.personGray_m
- Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
- Me.PictureBox1.Cursor = System.Windows.Forms.Cursors.Hand
- Me.PictureBox1.Location = New System.Drawing.Point(8, 29)
- Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New System.Drawing.Size(63, 59)
- Me.PictureBox1.TabIndex = 34
- Me.PictureBox1.TabStop = False
- '
'cbxAllowFoto
'
Me.cbxAllowFoto.AutoSize = True
@@ -294,14 +263,59 @@ Partial Class frmMitarbeitersucheBearbeiten
'
'pnlHoverPic
'
- Me.pnlHoverPic.Controls.Add(Me.Label1)
- Me.pnlHoverPic.Controls.Add(Me.PictureBox2)
Me.pnlHoverPic.Controls.Add(Me.PictureBox1)
+ Me.pnlHoverPic.Controls.Add(Me.PictureBox2)
+ Me.pnlHoverPic.Controls.Add(Me.txtKonfigHinweis)
+ Me.pnlHoverPic.Controls.Add(Me.Label1)
Me.pnlHoverPic.Location = New System.Drawing.Point(-1, 232)
Me.pnlHoverPic.Name = "pnlHoverPic"
Me.pnlHoverPic.Size = New System.Drawing.Size(181, 100)
Me.pnlHoverPic.TabIndex = 37
Me.pnlHoverPic.Visible = False
+ '
+ 'Label1
+ '
+ Me.Label1.AutoSize = True
+ Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!)
+ Me.Label1.Location = New System.Drawing.Point(4, 1)
+ Me.Label1.Name = "Label1"
+ Me.Label1.Size = New System.Drawing.Size(98, 24)
+ Me.Label1.TabIndex = 36
+ Me.Label1.Text = "Hover-Pic:"
+ '
+ 'PictureBox2
+ '
+ Me.PictureBox2.BackgroundImage = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.personGray_m
+ Me.PictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+ Me.PictureBox2.Cursor = System.Windows.Forms.Cursors.Hand
+ Me.PictureBox2.Location = New System.Drawing.Point(77, 29)
+ Me.PictureBox2.Name = "PictureBox2"
+ Me.PictureBox2.Size = New System.Drawing.Size(63, 59)
+ Me.PictureBox2.TabIndex = 35
+ Me.PictureBox2.TabStop = False
+ '
+ 'PictureBox1
+ '
+ Me.PictureBox1.BackgroundImage = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.personGray_m
+ Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+ Me.PictureBox1.Cursor = System.Windows.Forms.Cursors.Hand
+ Me.PictureBox1.Location = New System.Drawing.Point(8, 29)
+ Me.PictureBox1.Name = "PictureBox1"
+ Me.PictureBox1.Size = New System.Drawing.Size(63, 59)
+ Me.PictureBox1.TabIndex = 34
+ Me.PictureBox1.TabStop = False
+ '
+ 'txtKonfigHinweis
+ '
+ Me.txtKonfigHinweis.BackColor = System.Drawing.Color.White
+ Me.txtKonfigHinweis.BorderStyle = System.Windows.Forms.BorderStyle.None
+ Me.txtKonfigHinweis.Location = New System.Drawing.Point(8, 9)
+ Me.txtKonfigHinweis.Multiline = True
+ Me.txtKonfigHinweis.Name = "txtKonfigHinweis"
+ Me.txtKonfigHinweis.Size = New System.Drawing.Size(321, 66)
+ Me.txtKonfigHinweis.TabIndex = 38
+ Me.txtKonfigHinweis.Text = "Sie müssen Ihren Benutzer erstmal konfigurieren, um das Verzeichnis einsehen zu k" &
+ "önnen. Sie können die Einstellungen jederzeit ändern."
'
'frmMitarbeitersucheBearbeiten
'
@@ -309,8 +323,8 @@ Partial Class frmMitarbeitersucheBearbeiten
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.BackColor = System.Drawing.Color.White
Me.ClientSize = New System.Drawing.Size(703, 364)
- Me.Controls.Add(Me.pnlMain)
Me.Controls.Add(Me.pnlSrch)
+ Me.Controls.Add(Me.pnlMain)
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
Me.Name = "frmMitarbeitersucheBearbeiten"
@@ -319,11 +333,11 @@ Partial Class frmMitarbeitersucheBearbeiten
Me.pnlSrch.ResumeLayout(False)
Me.pnlMain.ResumeLayout(False)
Me.pnlMain.PerformLayout()
- CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit()
- CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit()
Me.pnlHoverPic.ResumeLayout(False)
Me.pnlHoverPic.PerformLayout()
+ CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
End Sub
@@ -350,4 +364,5 @@ Partial Class frmMitarbeitersucheBearbeiten
Friend WithEvents PictureBox2 As Windows.Forms.PictureBox
Friend WithEvents PictureBox1 As Windows.Forms.PictureBox
Friend WithEvents pnlHoverPic As Windows.Forms.Panel
+ Friend WithEvents txtKonfigHinweis As Windows.Forms.TextBox
End Class
diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersucheBearbeiten.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersucheBearbeiten.vb
index df11b47f..df5570a3 100644
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersucheBearbeiten.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersucheBearbeiten.vb
@@ -18,12 +18,14 @@ Public Class frmMitarbeitersucheBearbeiten
Private Sub frmMitarbeitersuche_Load(sender As Object, e As EventArgs) Handles Me.Load
If MA Is Nothing Then Me.Close()
+ txtKonfigHinweis.Visible = False
initMA()
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN", "SDL") Then
pnlHoverPic.Visible = True
End If
+
End Sub
@@ -87,6 +89,10 @@ Public Class frmMitarbeitersucheBearbeiten
Else
PictureBox2.BackgroundImage = My.Resources.personGray_m
End If
+
+
+ If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_MAVerzeichnis_SettingsTstmp Is Nothing And Not VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pseudoUser Then txtKonfigHinweis.Visible = True
+
End Sub
Private Sub btnClose_Click(sender As Object, e As EventArgs) Handles btnClose.Click
diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb
index 8d2d5eac..ea81150f 100644
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb
@@ -1,7 +1,6 @@
Imports System.Text
Imports System.Threading
-Imports System.Web.UI.WebControls
Imports System.Windows.Forms
Public Class frmUeberstundenauszahlen
@@ -679,7 +678,7 @@ Public Class frmUeberstundenauszahlen
txtlfdSaldo.Text = timas.getTimeSaldo(MA.mit_timasId, "", "overallBalance")
stunden100auszbere = RoundOfDigits(stunden100ausz * 2, 2)
- stunden50auszbere = RoundOfDigits(stunden50ausz * 100 / faktorSamstagsarbeit, 2)
+ stunden50auszbere = RoundOfDigits(stunden50ausz * faktorSamstagsarbeit / 100, 2)
txt100x2.Text = stunden100auszbere
txt50x15.Text = stunden50auszbere
diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
index 55eec870..0ce2578c 100644
--- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
+++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
@@ -81,6 +81,10 @@
False
F:\PROGRAMMIERUNG\dll\closedxml\95\ClosedXML.dll