diff --git a/SDL/Fakturierung/frmFaktEmail.vb b/SDL/Fakturierung/frmFaktEmail.vb index 5edf46a5..21ec5476 100644 --- a/SDL/Fakturierung/frmFaktEmail.vb +++ b/SDL/Fakturierung/frmFaktEmail.vb @@ -201,7 +201,7 @@ Public Class frmFaktEmail End With Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try End Sub @@ -234,7 +234,7 @@ Public Class frmFaktEmail End If Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Dim TextHTMLADD = "" diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index f7855093..e0e70b64 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -367,7 +367,7 @@ Public Class usrCntlFaktAbrechnung loaded = True allowGetValues = True Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try End Sub @@ -489,7 +489,7 @@ Public Class usrCntlFaktAbrechnung ' dgvOfferteDetailsUebersicht.Rows(dgvOfferteDetailsUebersicht.Rows.Count - 1).Cells("BerechnungsartNr").Value = POS.BerechnungsartNr Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try @@ -796,7 +796,7 @@ Public Class usrCntlFaktAbrechnung ToolTip.SetToolTip(pic, InfoText.Trim) Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try End Sub @@ -869,7 +869,7 @@ Public Class usrCntlFaktAbrechnung txtBesonderheiten.Visible = Not rtbAbf_Besonderheiten.Visible Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try End Sub @@ -1346,7 +1346,7 @@ Public Class usrCntlFaktAbrechnung Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try loaded = loadedtmp End Sub @@ -1438,7 +1438,7 @@ Public Class usrCntlFaktAbrechnung RECHNUNG.POSITIONEN.Add(POS) 'ALLE HINENLADEN! --> Sonst Proglem mit SVS/VP/KA Next Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Dim loadedTmp = loaded @@ -2934,7 +2934,7 @@ Public Class usrCntlFaktAbrechnung If loaded Then przRefreshDGV_Positionen() 'wegen SVS Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try End Sub @@ -3167,7 +3167,7 @@ Nächste_Textzeile_lesen: End If Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return False End Function @@ -3854,7 +3854,7 @@ Nächste_Textzeile_lesen: End If Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try End Sub @@ -3864,40 +3864,46 @@ Nächste_Textzeile_lesen: End Sub Private Sub AbsenderToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AbsenderToolStripMenuItem.Click, EmpfängerToolStripMenuItem.Click, AuftraggeberToolStripMenuItem.Click, AvisiererToolStripMenuItem.Click - If cboRechnungAn._value = "" Then Exit Sub - getValues() - Dim ROLLE = "AUFTRAGGEBER" + Try - Dim FirmaFrm = (RECHNUNG.RechnungsName_1 & " " & If(RECHNUNG.RechnungsName_2, "")).trim - Dim kdnrFrm As Integer = RECHNUNG.RechnungsKundenNr - Select Case sender.text.ToString.Substring(0, 1) 'cboRechnungAn._value - Case "1" - ROLLE = "ABSENDER" - FirmaFrm = (RECHNUNG.AbsenderName_1 & " " & If(RECHNUNG.AbsenderName_2, "")).trim - kdnrFrm = RECHNUNG.AbsenderKundenNr - Case "2" - ROLLE = "EMPFAENGER" - FirmaFrm = (RECHNUNG.EmpfängerName_1 & " " & If(RECHNUNG.EmpfängerName_2, "")).trim - kdnrFrm = RECHNUNG.EmpfängerKundenNr - Case "3" - ROLLE = "AUFTRAGGEBER" - FirmaFrm = (RECHNUNG.VermittlerName_1 & " " & If(RECHNUNG.VermittlerName_2, "")).trim - kdnrFrm = RECHNUNG.VermittlerKundenNr - Case "4" - ROLLE = "AVISIERER" - FirmaFrm = (RECHNUNG.Avisierer) - kdnrFrm = RECHNUNG.AvisiererKundenNr - End Select - If SPEDBUCH IsNot Nothing Then + If cboRechnungAn._value = "" Then Exit Sub + getValues() + Dim ROLLE = "AUFTRAGGEBER" - Dim SENDUNG As New VERAG_PROG_ALLGEMEIN.cSendungen(SPEDBUCH.SendungID) - Dim AVISODAL As New VERAG_PROG_ALLGEMEIN.cAvisoDAL - Dim AVISO = AVISODAL.LesenAviso(SPEDBUCH.AvisoID, "") - SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.Verzollungsunterlagen, kdnrFrm, {kdnrFrm, FirmaFrm, SENDUNG, AVISO, ROLLE, -1, True}) - Else - MsgBox("Speditionsbuch Eintrag nicht gefunden.") - End If + Dim FirmaFrm = (RECHNUNG.RechnungsName_1 & " " & If(RECHNUNG.RechnungsName_2, "")).trim + Dim kdnrFrm As Integer = RECHNUNG.RechnungsKundenNr + + Select Case sender.text.ToString.Substring(0, 1) 'cboRechnungAn._value + Case "1" + ROLLE = "ABSENDER" + FirmaFrm = (RECHNUNG.AbsenderName_1 & " " & If(RECHNUNG.AbsenderName_2, "")).trim + kdnrFrm = RECHNUNG.AbsenderKundenNr + Case "2" + ROLLE = "EMPFAENGER" + FirmaFrm = (RECHNUNG.EmpfängerName_1 & " " & If(RECHNUNG.EmpfängerName_2, "")).trim + kdnrFrm = RECHNUNG.EmpfängerKundenNr + Case "3" + ROLLE = "AUFTRAGGEBER" + FirmaFrm = (RECHNUNG.VermittlerName_1 & " " & If(RECHNUNG.VermittlerName_2, "")).trim + kdnrFrm = RECHNUNG.VermittlerKundenNr + Case "4" + ROLLE = "AVISIERER" + FirmaFrm = (RECHNUNG.Avisierer) + kdnrFrm = RECHNUNG.AvisiererKundenNr + End Select + If SPEDBUCH IsNot Nothing Then + + Dim SENDUNG As New VERAG_PROG_ALLGEMEIN.cSendungen(SPEDBUCH.SendungID) + Dim AVISODAL As New VERAG_PROG_ALLGEMEIN.cAvisoDAL + Dim AVISO = AVISODAL.LesenAviso(SPEDBUCH.AvisoID, "") + SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.Verzollungsunterlagen, kdnrFrm, {kdnrFrm, FirmaFrm, SENDUNG, AVISO, ROLLE, -1, True}) + Else + MsgBox("Speditionsbuch Eintrag nicht gefunden.") + End If + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try End Sub Private Sub SeperateRechnungFürEUSTToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SeperateRechnungFürEUSTToolStripMenuItem.Click diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index 14d46ebb..77dd6326 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -1713,7 +1713,7 @@ Public Class FormularManagerNEU Case "name" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text Case "name_1" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text Case "name_2" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text - Case "address" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text & " " & usrCntl.cbxLandKz.Text & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text + Case "address" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text & " " & usrCntl.cbxLandKz._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text Case "zipcode" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse2.Text Case "country" : odoc.FormFields(fieldName).Range.Text = usrCntl.cbxLandKz._value Case "place" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse3.Text @@ -1843,9 +1843,9 @@ Public Class FormularManagerNEU Case "name" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text Case "name_1" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text Case "name_2" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtFirma.Text - Case "address" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text & " " & usrCntl.cbxLandKz.Text & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text + Case "address" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text & " " & usrCntl.cbxLandKz._value & "-" & usrCntl.txtAdresse2.Text & " " & usrCntl.txtAdresse3.Text Case "zipcode" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse2.Text - Case "country" : odoc.FormFields(fieldName).Range.Text = usrCntl.cbxLandKz.Text + Case "country" : odoc.FormFields(fieldName).Range.Text = usrCntl.cbxLandKz._value Case "place" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse3.Text Case "street" : odoc.FormFields(fieldName).Range.Text = usrCntl.txtAdresse1.Text Case "surname_firstname" : odoc.FormFields(fieldName).Range.Text = IIf(usrCntl.txt_GF_Name.Text <> "", usrCntl.txt_GF_Name.Text, usrCntl.txtHerrFrau.Text) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 8a724051..f985731f 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/Resources/MDM_Schreiben/GOBOX_UMSTELLUNG.dotx b/SDL/Resources/MDM_Schreiben/GOBOX_UMSTELLUNG.dotx new file mode 100644 index 00000000..575fe69c Binary files /dev/null and b/SDL/Resources/MDM_Schreiben/GOBOX_UMSTELLUNG.dotx differ diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 76998881..6165f811 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -4424,6 +4424,9 @@ Always + + Always + Always diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.vb b/SDL/buchhaltung/frmBU_Mahnlauf.vb index 95a7d896..d378642a 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb @@ -434,10 +434,10 @@ Public Class frmBU_Mahnlauf rpt.Label15.ForeColor = Color.DarkRed End If - rpt.Label17.Text = cFakturierung.checkNull(rpt.Fields.Item("Rechnungsbetrag").Value) + rpt.Label17.Text = IIf(IsNumeric(cFakturierung.checkNull(rpt.Fields.Item("Rechnungsbetrag").Value)), CDbl(rpt.Fields.Item("Rechnungsbetrag").Value).ToString("N2", Globalization.CultureInfo.CurrentCulture), "") rpt.TextBox1.Text = cFakturierung.checkNull(rpt.Fields.Item("Bemerkung").Value) - rpt.Label19.Text = cFakturierung.checkNull(rpt.Fields.Item("Zahlung").Value) - rpt.Label20.Text = cFakturierung.checkNull(rpt.Fields.Item("Ausstand").Value) + rpt.Label19.Text = IIf(IsNumeric(cFakturierung.checkNull(rpt.Fields.Item("Zahlung").Value)), CDbl(rpt.Fields.Item("Zahlung").Value).ToString("N2", Globalization.CultureInfo.CurrentCulture), "") + rpt.Label20.Text = IIf(IsNumeric(cFakturierung.checkNull(rpt.Fields.Item("Ausstand").Value)), CDbl(rpt.Fields.Item("Ausstand").Value).ToString("N2", Globalization.CultureInfo.CurrentCulture), "") rpt.Label21.Text = cFakturierung.checkNull(rpt.Fields.Item("Mahnstufe").Value) rpt.Label22.Text = cFakturierung.checkNull(rpt.Fields.Item("Währung").Value) diff --git a/SDL/buchhaltung/usrCntlBH.Designer.vb b/SDL/buchhaltung/usrCntlBH.Designer.vb index 13d11c59..c800a0f2 100644 --- a/SDL/buchhaltung/usrCntlBH.Designer.vb +++ b/SDL/buchhaltung/usrCntlBH.Designer.vb @@ -68,6 +68,7 @@ Partial Class usrCntlBH Me.Button4 = New System.Windows.Forms.Button() Me.Label7 = New System.Windows.Forms.Label() Me.GroupBox3 = New System.Windows.Forms.GroupBox() + Me.cbxBankgarantieInfo = New System.Windows.Forms.CheckBox() Me.cbxNichtVersicherbarAusblenden = New System.Windows.Forms.CheckBox() Me.Panel1 = New System.Windows.Forms.Panel() Me.Label17 = New System.Windows.Forms.Label() @@ -121,7 +122,10 @@ Partial Class usrCntlBH Me.Label30 = New System.Windows.Forms.Label() Me.Label29 = New System.Windows.Forms.Label() Me.Button7 = New System.Windows.Forms.Button() - Me.cbxBankgarantieInfo = New System.Windows.Forms.CheckBox() + Me.Label42 = New System.Windows.Forms.Label() + Me.GroupBox10 = New System.Windows.Forms.GroupBox() + Me.Label43 = New System.Windows.Forms.Label() + Me.Button12 = New System.Windows.Forms.Button() Me.pnl.SuspendLayout() Me.TabPage1.SuspendLayout() Me.GroupBox9.SuspendLayout() @@ -138,6 +142,7 @@ Partial Class usrCntlBH Me.tbcntr.SuspendLayout() Me.TabPage5.SuspendLayout() Me.GroupBox6.SuspendLayout() + Me.GroupBox10.SuspendLayout() Me.SuspendLayout() ' 'Label6 @@ -162,6 +167,8 @@ Partial Class usrCntlBH ' 'TabPage1 ' + Me.TabPage1.Controls.Add(Me.Label42) + Me.TabPage1.Controls.Add(Me.GroupBox10) Me.TabPage1.Controls.Add(Me.Label37) Me.TabPage1.Controls.Add(Me.GroupBox9) Me.TabPage1.Controls.Add(Me.Label34) @@ -181,7 +188,7 @@ Partial Class usrCntlBH Me.TabPage1.Location = New System.Drawing.Point(4, 22) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(956, 1010) + Me.TabPage1.Size = New System.Drawing.Size(956, 1062) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Allgemein" Me.TabPage1.UseVisualStyleBackColor = True @@ -191,7 +198,7 @@ Partial Class usrCntlBH Me.Label37.AutoSize = True Me.Label37.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label37.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label37.Location = New System.Drawing.Point(13, 640) + Me.Label37.Location = New System.Drawing.Point(13, 602) Me.Label37.Name = "Label37" Me.Label37.Size = New System.Drawing.Size(136, 17) Me.Label37.TabIndex = 16 @@ -207,7 +214,7 @@ Partial Class usrCntlBH Me.GroupBox9.Controls.Add(Me.Label39) Me.GroupBox9.Controls.Add(Me.Label38) Me.GroupBox9.Controls.Add(Me.Button9) - Me.GroupBox9.Location = New System.Drawing.Point(14, 660) + Me.GroupBox9.Location = New System.Drawing.Point(14, 622) Me.GroupBox9.Name = "GroupBox9" Me.GroupBox9.Size = New System.Drawing.Size(847, 67) Me.GroupBox9.TabIndex = 17 @@ -325,7 +332,7 @@ Partial Class usrCntlBH ' Me.Label34.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label34.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label34.Location = New System.Drawing.Point(11, 907) + Me.Label34.Location = New System.Drawing.Point(11, 869) Me.Label34.Name = "Label34" Me.Label34.Size = New System.Drawing.Size(298, 18) Me.Label34.TabIndex = 14 @@ -337,7 +344,7 @@ Partial Class usrCntlBH Me.GroupBox8.Controls.Add(Me.cboAbfVerbFirma) Me.GroupBox8.Controls.Add(Me.Button8) Me.GroupBox8.Controls.Add(Me.Label35) - Me.GroupBox8.Location = New System.Drawing.Point(10, 919) + Me.GroupBox8.Location = New System.Drawing.Point(10, 881) Me.GroupBox8.Name = "GroupBox8" Me.GroupBox8.Size = New System.Drawing.Size(847, 69) Me.GroupBox8.TabIndex = 15 @@ -389,7 +396,7 @@ Partial Class usrCntlBH ' Me.Label32.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label32.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label32.Location = New System.Drawing.Point(13, 239) + Me.Label32.Location = New System.Drawing.Point(13, 221) Me.Label32.Name = "Label32" Me.Label32.Size = New System.Drawing.Size(298, 18) Me.Label32.TabIndex = 12 @@ -399,7 +406,7 @@ Partial Class usrCntlBH ' Me.GroupBox7.Controls.Add(Me.Label33) Me.GroupBox7.Controls.Add(Me.Button6) - Me.GroupBox7.Location = New System.Drawing.Point(12, 251) + Me.GroupBox7.Location = New System.Drawing.Point(12, 233) Me.GroupBox7.Name = "GroupBox7" Me.GroupBox7.Size = New System.Drawing.Size(847, 69) Me.GroupBox7.TabIndex = 13 @@ -451,7 +458,7 @@ Partial Class usrCntlBH Me.Label27.AutoSize = True Me.Label27.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label27.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label27.Location = New System.Drawing.Point(11, 816) + Me.Label27.Location = New System.Drawing.Point(11, 778) Me.Label27.Name = "Label27" Me.Label27.Size = New System.Drawing.Size(101, 17) Me.Label27.TabIndex = 11 @@ -461,7 +468,7 @@ Partial Class usrCntlBH ' Me.GroupBox5.Controls.Add(Me.Label26) Me.GroupBox5.Controls.Add(Me.Button5) - Me.GroupBox5.Location = New System.Drawing.Point(10, 828) + Me.GroupBox5.Location = New System.Drawing.Point(10, 790) Me.GroupBox5.Name = "GroupBox5" Me.GroupBox5.Size = New System.Drawing.Size(847, 61) Me.GroupBox5.TabIndex = 10 @@ -579,7 +586,7 @@ Partial Class usrCntlBH Me.Label24.AutoSize = True Me.Label24.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label24.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label24.Location = New System.Drawing.Point(11, 730) + Me.Label24.Location = New System.Drawing.Point(11, 692) Me.Label24.Name = "Label24" Me.Label24.Size = New System.Drawing.Size(150, 17) Me.Label24.TabIndex = 8 @@ -631,7 +638,7 @@ Partial Class usrCntlBH ' Me.GroupBox4.Controls.Add(Me.Label25) Me.GroupBox4.Controls.Add(Me.Button4) - Me.GroupBox4.Location = New System.Drawing.Point(10, 741) + Me.GroupBox4.Location = New System.Drawing.Point(10, 703) Me.GroupBox4.Name = "GroupBox4" Me.GroupBox4.Size = New System.Drawing.Size(847, 61) Me.GroupBox4.TabIndex = 9 @@ -665,7 +672,7 @@ Partial Class usrCntlBH Me.Label7.AutoSize = True Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label7.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label7.Location = New System.Drawing.Point(13, 343) + Me.Label7.Location = New System.Drawing.Point(13, 305) Me.Label7.Name = "Label7" Me.Label7.Size = New System.Drawing.Size(182, 17) Me.Label7.TabIndex = 5 @@ -704,12 +711,23 @@ Partial Class usrCntlBH Me.GroupBox3.Controls.Add(Me.txtOPKdName) Me.GroupBox3.Controls.Add(Me.Label8) Me.GroupBox3.Controls.Add(Me.Button2) - Me.GroupBox3.Location = New System.Drawing.Point(12, 354) + Me.GroupBox3.Location = New System.Drawing.Point(12, 316) Me.GroupBox3.Name = "GroupBox3" Me.GroupBox3.Size = New System.Drawing.Size(847, 283) Me.GroupBox3.TabIndex = 6 Me.GroupBox3.TabStop = False ' + 'cbxBankgarantieInfo + ' + Me.cbxBankgarantieInfo.AutoSize = True + Me.cbxBankgarantieInfo.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxBankgarantieInfo.Location = New System.Drawing.Point(416, 178) + Me.cbxBankgarantieInfo.Name = "cbxBankgarantieInfo" + Me.cbxBankgarantieInfo.Size = New System.Drawing.Size(187, 17) + Me.cbxBankgarantieInfo.TabIndex = 28 + Me.cbxBankgarantieInfo.Text = "Zusatzinfo Bankgarantie anzeigen" + Me.cbxBankgarantieInfo.UseVisualStyleBackColor = True + ' 'cbxNichtVersicherbarAusblenden ' Me.cbxNichtVersicherbarAusblenden.AutoSize = True @@ -1333,7 +1351,7 @@ Partial Class usrCntlBH Me.tbcntr.Location = New System.Drawing.Point(0, 52) Me.tbcntr.Name = "tbcntr" Me.tbcntr.SelectedIndex = 0 - Me.tbcntr.Size = New System.Drawing.Size(964, 1036) + Me.tbcntr.Size = New System.Drawing.Size(964, 1088) Me.tbcntr.TabIndex = 25 ' 'TabPage5 @@ -1411,16 +1429,48 @@ Partial Class usrCntlBH Me.Button7.Text = "Importieren" Me.Button7.UseVisualStyleBackColor = True ' - 'cbxBankgarantieInfo + 'Label42 ' - Me.cbxBankgarantieInfo.AutoSize = True - Me.cbxBankgarantieInfo.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxBankgarantieInfo.Location = New System.Drawing.Point(416, 178) - Me.cbxBankgarantieInfo.Name = "cbxBankgarantieInfo" - Me.cbxBankgarantieInfo.Size = New System.Drawing.Size(187, 17) - Me.cbxBankgarantieInfo.TabIndex = 28 - Me.cbxBankgarantieInfo.Text = "Zusatzinfo Bankgarantie anzeigen" - Me.cbxBankgarantieInfo.UseVisualStyleBackColor = True + Me.Label42.AutoSize = True + Me.Label42.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label42.ForeColor = System.Drawing.SystemColors.ControlDarkDark + Me.Label42.Location = New System.Drawing.Point(9, 963) + Me.Label42.Name = "Label42" + Me.Label42.Size = New System.Drawing.Size(168, 17) + Me.Label42.TabIndex = 19 + Me.Label42.Text = "Sachkontenzuweisung" + ' + 'GroupBox10 + ' + Me.GroupBox10.Controls.Add(Me.Label43) + Me.GroupBox10.Controls.Add(Me.Button12) + Me.GroupBox10.Location = New System.Drawing.Point(8, 975) + Me.GroupBox10.Name = "GroupBox10" + Me.GroupBox10.Size = New System.Drawing.Size(847, 61) + Me.GroupBox10.TabIndex = 18 + Me.GroupBox10.TabStop = False + ' + 'Label43 + ' + Me.Label43.AutoSize = True + Me.Label43.Location = New System.Drawing.Point(141, 28) + Me.Label43.Name = "Label43" + Me.Label43.Size = New System.Drawing.Size(165, 13) + Me.Label43.TabIndex = 2 + Me.Label43.Text = "Sachkontenzuweisung für Syska." + ' + 'Button12 + ' + Me.Button12.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.Button12.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button12.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button12.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button12.Location = New System.Drawing.Point(4, 11) + Me.Button12.Name = "Button12" + Me.Button12.Size = New System.Drawing.Size(121, 44) + Me.Button12.TabIndex = 7 + Me.Button12.Text = "Sachkonten" + Me.Button12.UseVisualStyleBackColor = True ' 'usrCntlBH ' @@ -1430,7 +1480,7 @@ Partial Class usrCntlBH Me.Controls.Add(Me.tbcntr) Me.Controls.Add(Me.pnl) Me.Name = "usrCntlBH" - Me.Size = New System.Drawing.Size(964, 1088) + Me.Size = New System.Drawing.Size(964, 1140) Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() Me.TabPage1.ResumeLayout(False) @@ -1461,6 +1511,8 @@ Partial Class usrCntlBH Me.TabPage5.PerformLayout() Me.GroupBox6.ResumeLayout(False) Me.GroupBox6.PerformLayout() + Me.GroupBox10.ResumeLayout(False) + Me.GroupBox10.PerformLayout() Me.ResumeLayout(False) End Sub @@ -1564,4 +1616,8 @@ Partial Class usrCntlBH Friend WithEvents txtStichtag As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label39 As Label Friend WithEvents cbxBankgarantieInfo As CheckBox + Friend WithEvents Label42 As Label + Friend WithEvents GroupBox10 As GroupBox + Friend WithEvents Label43 As Label + Friend WithEvents Button12 As Button End Class diff --git a/SDL/buchhaltung/usrCntlBH.vb b/SDL/buchhaltung/usrCntlBH.vb index 9b2aca42..a7b31f86 100644 --- a/SDL/buchhaltung/usrCntlBH.vb +++ b/SDL/buchhaltung/usrCntlBH.vb @@ -757,5 +757,8 @@ Public Class usrCntlBH End Sub - + Private Sub Button12_Click(sender As Object, e As EventArgs) Handles Button12.Click + Dim f As New SDL.frmLeistundenFIBUKonten(VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN", "SDL") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Leistungen_FIBU", "SDL")) + f.ShowDialog(Me) + End Sub End Class diff --git a/SDL/frmMain.Designer.vb b/SDL/frmMain.Designer.vb index b2728fd5..e0517446 100644 --- a/SDL/frmMain.Designer.vb +++ b/SDL/frmMain.Designer.vb @@ -67,11 +67,13 @@ Partial Class frmMain Me.VERAGCardParkplatzToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AuswertungenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.pnlHeader = New System.Windows.Forms.Panel() + Me.btnMitarbeiterKonto = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.pnlInfo = New System.Windows.Forms.Panel() Me.txtInfotext = New System.Windows.Forms.Label() Me.Label9 = New System.Windows.Forms.Label() Me.Button9 = New System.Windows.Forms.Button() Me.Button2 = New System.Windows.Forms.Button() + Me.FlatButton1 = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.Button7 = New System.Windows.Forms.Button() Me.Label4 = New System.Windows.Forms.Label() Me.lblTestsystem = New System.Windows.Forms.Label() @@ -84,11 +86,12 @@ Partial Class frmMain Me.NeuesPasswortToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.UpdateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TESTToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuFormular = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() + Me.MailvorlagenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.mnuAdministrator = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() Me.StatistikToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuFormular = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() Me.mnuFunktionen = New System.Windows.Forms.ToolStripMenuItem() Me.SMSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.NeueSMSSendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -100,6 +103,7 @@ Partial Class frmMain Me.Panel2 = New System.Windows.Forms.Panel() Me.pnlJumpKunde = New System.Windows.Forms.Panel() Me.Button3 = New System.Windows.Forms.Button() + Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.Button4 = New System.Windows.Forms.Button() Me.Label3 = New System.Windows.Forms.Label() Me.btnClose = New System.Windows.Forms.Button() @@ -110,10 +114,6 @@ Partial Class frmMain Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.AuswertungenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components) - Me.btnMitarbeiterKonto = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.FlatButton1 = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() - Me.MailvorlagenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.pnlLeft.SuspendLayout() Me.MenuStripSDL.SuspendLayout() Me.Panel1.SuspendLayout() @@ -555,6 +555,24 @@ Partial Class frmMain Me.pnlHeader.Size = New System.Drawing.Size(1284, 73) Me.pnlHeader.TabIndex = 28 ' + 'btnMitarbeiterKonto + ' + Me.btnMitarbeiterKonto.allowBorder = False + Me.btnMitarbeiterKonto.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnMitarbeiterKonto.BackColor = System.Drawing.Color.White + Me.btnMitarbeiterKonto.FlatAppearance.BorderSize = 0 + Me.btnMitarbeiterKonto.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnMitarbeiterKonto.ForeColor = System.Drawing.Color.Black + Me.btnMitarbeiterKonto.Image = CType(resources.GetObject("btnMitarbeiterKonto.Image"), System.Drawing.Image) + Me.btnMitarbeiterKonto.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnMitarbeiterKonto.Location = New System.Drawing.Point(716, 0) + Me.btnMitarbeiterKonto.Name = "btnMitarbeiterKonto" + Me.btnMitarbeiterKonto.Size = New System.Drawing.Size(137, 61) + Me.btnMitarbeiterKonto.TabIndex = 87 + Me.btnMitarbeiterKonto.Text = "Andreas Luxbauer" + Me.btnMitarbeiterKonto.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.btnMitarbeiterKonto.UseVisualStyleBackColor = False + ' 'pnlInfo ' Me.pnlInfo.Anchor = System.Windows.Forms.AnchorStyles.Bottom @@ -622,6 +640,20 @@ Partial Class frmMain Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.Button2.UseVisualStyleBackColor = False ' + 'FlatButton1 + ' + Me.FlatButton1.allowBorder = False + Me.FlatButton1.FlatAppearance.BorderSize = 0 + Me.FlatButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.FlatButton1.ForeColor = System.Drawing.Color.Black + Me.FlatButton1.Location = New System.Drawing.Point(130, 4) + Me.FlatButton1.Name = "FlatButton1" + Me.FlatButton1.Size = New System.Drawing.Size(75, 23) + Me.FlatButton1.TabIndex = 36 + Me.FlatButton1.Text = "FlatButton1" + Me.FlatButton1.UseVisualStyleBackColor = True + Me.FlatButton1.Visible = False + ' 'Button7 ' Me.Button7.BackColor = System.Drawing.Color.WhiteSmoke @@ -700,7 +732,7 @@ Partial Class frmMain ' Me.MenuStrip1.BackColor = System.Drawing.Color.White Me.MenuStrip1.ImageScalingSize = New System.Drawing.Size(24, 24) - Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProgramm, Me.mnuAdministrator, Me.StatistikToolStripMenuItem, Me.mnuFormular, Me.mnuFunktionen, Me.mnuFragezeichen}) + Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProgramm, Me.mnuFormular, Me.mnuAdministrator, Me.StatistikToolStripMenuItem, Me.mnuFunktionen, Me.mnuFragezeichen}) Me.MenuStrip1.Location = New System.Drawing.Point(0, 0) Me.MenuStrip1.Name = "MenuStrip1" Me.MenuStrip1.Size = New System.Drawing.Size(984, 24) @@ -719,49 +751,27 @@ Partial Class frmMain 'ToolStripSeparator4 ' Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(154, 6) + Me.ToolStripSeparator4.Size = New System.Drawing.Size(177, 6) ' 'NeuesPasswortToolStripMenuItem ' Me.NeuesPasswortToolStripMenuItem.Name = "NeuesPasswortToolStripMenuItem" - Me.NeuesPasswortToolStripMenuItem.Size = New System.Drawing.Size(157, 22) + Me.NeuesPasswortToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.NeuesPasswortToolStripMenuItem.Text = "Neues Passwort" ' 'UpdateToolStripMenuItem ' Me.UpdateToolStripMenuItem.Name = "UpdateToolStripMenuItem" - Me.UpdateToolStripMenuItem.Size = New System.Drawing.Size(157, 22) + Me.UpdateToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.UpdateToolStripMenuItem.Text = "Update" ' 'TESTToolStripMenuItem ' Me.TESTToolStripMenuItem.Name = "TESTToolStripMenuItem" - Me.TESTToolStripMenuItem.Size = New System.Drawing.Size(157, 22) + Me.TESTToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.TESTToolStripMenuItem.Text = "TEST" Me.TESTToolStripMenuItem.Visible = False ' - 'mnuAdministrator - ' - Me.mnuAdministrator.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripSeparator3}) - Me.mnuAdministrator.ForeColor = System.Drawing.Color.Black - Me.mnuAdministrator.Name = "mnuAdministrator" - Me.mnuAdministrator.Size = New System.Drawing.Size(92, 20) - Me.mnuAdministrator.Text = "Administrator" - Me.mnuAdministrator.Visible = False - ' - 'ToolStripSeparator3 - ' - Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(177, 6) - ' - 'StatistikToolStripMenuItem - ' - Me.StatistikToolStripMenuItem.ForeColor = System.Drawing.Color.Black - Me.StatistikToolStripMenuItem.Name = "StatistikToolStripMenuItem" - Me.StatistikToolStripMenuItem.Size = New System.Drawing.Size(60, 20) - Me.StatistikToolStripMenuItem.Text = "Statistik" - Me.StatistikToolStripMenuItem.Visible = False - ' 'mnuFormular ' Me.mnuFormular.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem3, Me.MailvorlagenToolStripMenuItem}) @@ -775,9 +785,39 @@ Partial Class frmMain Me.ToolStripMenuItem3.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.ToolStripMenuItem3.Image = Global.SDL.My.Resources.Resources.android_note12 Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3" - Me.ToolStripMenuItem3.Size = New System.Drawing.Size(192, 30) + Me.ToolStripMenuItem3.Size = New System.Drawing.Size(184, 22) Me.ToolStripMenuItem3.Text = "Formular - Manager" ' + 'MailvorlagenToolStripMenuItem + ' + Me.MailvorlagenToolStripMenuItem.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.MailvorlagenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.stift1 + Me.MailvorlagenToolStripMenuItem.Name = "MailvorlagenToolStripMenuItem" + Me.MailvorlagenToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.MailvorlagenToolStripMenuItem.Text = "Mailvorlagen" + ' + 'mnuAdministrator + ' + Me.mnuAdministrator.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripSeparator3}) + Me.mnuAdministrator.ForeColor = System.Drawing.Color.Black + Me.mnuAdministrator.Name = "mnuAdministrator" + Me.mnuAdministrator.Size = New System.Drawing.Size(92, 20) + Me.mnuAdministrator.Text = "Administrator" + Me.mnuAdministrator.Visible = False + ' + 'ToolStripSeparator3 + ' + Me.ToolStripSeparator3.Name = "ToolStripSeparator3" + Me.ToolStripSeparator3.Size = New System.Drawing.Size(57, 6) + ' + 'StatistikToolStripMenuItem + ' + Me.StatistikToolStripMenuItem.ForeColor = System.Drawing.Color.Black + Me.StatistikToolStripMenuItem.Name = "StatistikToolStripMenuItem" + Me.StatistikToolStripMenuItem.Size = New System.Drawing.Size(60, 20) + Me.StatistikToolStripMenuItem.Text = "Statistik" + Me.StatistikToolStripMenuItem.Visible = False + ' 'mnuFunktionen ' Me.mnuFunktionen.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SMSToolStripMenuItem}) @@ -875,6 +915,35 @@ Partial Class frmMain Me.Button3.Text = "< >" Me.Button3.UseVisualStyleBackColor = False ' + 'KdSearchBox1 + ' + Me.KdSearchBox1._AlleFirmenCLUSTER = False + Me.KdSearchBox1._AllowSetValue = False + Me.KdSearchBox1._autoSizeGross = False + Me.KdSearchBox1._display_Name1 = False + Me.KdSearchBox1._displayAVISO_Email = False + Me.KdSearchBox1._displayFullName = False + Me.KdSearchBox1._displayWoelflKd = True + Me.KdSearchBox1._hideIfListEmpty = True + Me.KdSearchBox1._loadKdData = False + Me.KdSearchBox1._searchName1 = True + Me.KdSearchBox1._UseFIRMA = "" + Me.KdSearchBox1._ValueKdAndName = True + Me.KdSearchBox1.dgvpos = "RIGHT" + Me.KdSearchBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.KdSearchBox1.KdName = Nothing + Me.KdSearchBox1.KdNr = "-1" + Me.KdSearchBox1.kdNrField = Nothing + Me.KdSearchBox1.KdNrNullInt = Nothing + Me.KdSearchBox1.Location = New System.Drawing.Point(73, 30) + Me.KdSearchBox1.Name = "KdSearchBox1" + Me.KdSearchBox1.nurAktive = False + Me.KdSearchBox1.searchActive = True + Me.KdSearchBox1.Size = New System.Drawing.Size(215, 26) + Me.KdSearchBox1.TabIndex = 76 + Me.KdSearchBox1.TIMER_SEARCH = True + Me.KdSearchBox1.usrcntl = Nothing + ' 'Button4 ' Me.Button4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -978,75 +1047,6 @@ Partial Class frmMain Me.Timer_REFRESH.Enabled = True Me.Timer_REFRESH.Interval = 5000 ' - 'btnMitarbeiterKonto - ' - Me.btnMitarbeiterKonto.allowBorder = False - Me.btnMitarbeiterKonto.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnMitarbeiterKonto.BackColor = System.Drawing.Color.White - Me.btnMitarbeiterKonto.FlatAppearance.BorderSize = 0 - Me.btnMitarbeiterKonto.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnMitarbeiterKonto.ForeColor = System.Drawing.Color.Black - Me.btnMitarbeiterKonto.Image = CType(resources.GetObject("btnMitarbeiterKonto.Image"), System.Drawing.Image) - Me.btnMitarbeiterKonto.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.btnMitarbeiterKonto.Location = New System.Drawing.Point(716, 0) - Me.btnMitarbeiterKonto.Name = "btnMitarbeiterKonto" - Me.btnMitarbeiterKonto.Size = New System.Drawing.Size(137, 61) - Me.btnMitarbeiterKonto.TabIndex = 87 - Me.btnMitarbeiterKonto.Text = "Andreas Luxbauer" - Me.btnMitarbeiterKonto.TextAlign = System.Drawing.ContentAlignment.BottomCenter - Me.btnMitarbeiterKonto.UseVisualStyleBackColor = False - ' - 'FlatButton1 - ' - Me.FlatButton1.allowBorder = False - Me.FlatButton1.FlatAppearance.BorderSize = 0 - Me.FlatButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.FlatButton1.ForeColor = System.Drawing.Color.Black - Me.FlatButton1.Location = New System.Drawing.Point(130, 4) - Me.FlatButton1.Name = "FlatButton1" - Me.FlatButton1.Size = New System.Drawing.Size(75, 23) - Me.FlatButton1.TabIndex = 36 - Me.FlatButton1.Text = "FlatButton1" - Me.FlatButton1.UseVisualStyleBackColor = True - Me.FlatButton1.Visible = False - ' - 'KdSearchBox1 - ' - Me.KdSearchBox1._AlleFirmenCLUSTER = False - Me.KdSearchBox1._AllowSetValue = False - Me.KdSearchBox1._autoSizeGross = False - Me.KdSearchBox1._display_Name1 = False - Me.KdSearchBox1._displayAVISO_Email = False - Me.KdSearchBox1._displayFullName = False - Me.KdSearchBox1._displayWoelflKd = True - Me.KdSearchBox1._hideIfListEmpty = True - Me.KdSearchBox1._loadKdData = False - Me.KdSearchBox1._searchName1 = True - Me.KdSearchBox1._UseFIRMA = "" - Me.KdSearchBox1._ValueKdAndName = True - Me.KdSearchBox1.dgvpos = "RIGHT" - Me.KdSearchBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.KdSearchBox1.KdName = Nothing - Me.KdSearchBox1.KdNr = "-1" - Me.KdSearchBox1.kdNrField = Nothing - Me.KdSearchBox1.KdNrNullInt = Nothing - Me.KdSearchBox1.Location = New System.Drawing.Point(73, 30) - Me.KdSearchBox1.Name = "KdSearchBox1" - Me.KdSearchBox1.nurAktive = False - Me.KdSearchBox1.searchActive = True - Me.KdSearchBox1.Size = New System.Drawing.Size(215, 26) - Me.KdSearchBox1.TabIndex = 76 - Me.KdSearchBox1.TIMER_SEARCH = True - Me.KdSearchBox1.usrcntl = Nothing - ' - 'MailvorlagenToolStripMenuItem - ' - Me.MailvorlagenToolStripMenuItem.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.MailvorlagenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.stift1 - Me.MailvorlagenToolStripMenuItem.Name = "MailvorlagenToolStripMenuItem" - Me.MailvorlagenToolStripMenuItem.Size = New System.Drawing.Size(192, 30) - Me.MailvorlagenToolStripMenuItem.Text = "Mailvorlagen" - ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) diff --git a/SDL/frmMain.vb b/SDL/frmMain.vb index 50028714..0f22a664 100644 --- a/SDL/frmMain.vb +++ b/SDL/frmMain.vb @@ -1117,6 +1117,8 @@ Public Class frmMain Dim f As New SDL.frmdynMailvorlagen(VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN", "SDL") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MAILVORLAGEN_ALLE", "SDL")) f.ShowDialog(Me) End Sub + + End Class Public Class MyRenderer diff --git a/SDL/frmdynMailvorlage.vb b/SDL/frmdynMailvorlage.vb index 6ae7605b..ad047908 100644 --- a/SDL/frmdynMailvorlage.vb +++ b/SDL/frmdynMailvorlage.vb @@ -55,6 +55,7 @@ Public Class frmdynMailvorlagen cbxTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) cbxTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sendung", "1")) cbxTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Mahnung", "2")) + cbxTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("OP-Liste", "3")) cbxTyp.changeItem("") diff --git a/SDL/kunden/frmGoMautBoxen.Designer.vb b/SDL/kunden/frmGoMautBoxen.Designer.vb index 1ffc3f2c..95ea33b0 100644 --- a/SDL/kunden/frmGoMautBoxen.Designer.vb +++ b/SDL/kunden/frmGoMautBoxen.Designer.vb @@ -26,6 +26,8 @@ Partial Class frmGoMautBoxen Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGoMautBoxen)) Me.pnl = New System.Windows.Forms.Panel() + Me.txtbishAbrp = New System.Windows.Forms.TextBox() + Me.Label4 = New System.Windows.Forms.Label() Me.GroupBoxBriefwaehlen = New System.Windows.Forms.GroupBox() Me.rbAP = New VERAG_PROG_ALLGEMEIN.MyRadioButton(Me.components) Me.rbPostPay = New VERAG_PROG_ALLGEMEIN.MyRadioButton(Me.components) @@ -57,11 +59,10 @@ Partial Class frmGoMautBoxen Me.Label5 = New System.Windows.Forms.Label() Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.btnAbbrechen = New System.Windows.Forms.Button() - Me.btnOK = New System.Windows.Forms.Button() - Me.txtbishAbrp = New System.Windows.Forms.TextBox() - Me.Label4 = New System.Windows.Forms.Label() Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.Button2 = New System.Windows.Forms.Button() + Me.btn = New System.Windows.Forms.Button() Me.pnl.SuspendLayout() Me.GroupBoxBriefwaehlen.SuspendLayout() CType(Me.dgvLKW, System.ComponentModel.ISupportInitialize).BeginInit() @@ -71,6 +72,8 @@ Partial Class frmGoMautBoxen ' Me.pnl.BackColor = System.Drawing.Color.White Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnl.Controls.Add(Me.Button2) + Me.pnl.Controls.Add(Me.btn) Me.pnl.Controls.Add(Me.txtbishAbrp) Me.pnl.Controls.Add(Me.Label4) Me.pnl.Controls.Add(Me.GroupBoxBriefwaehlen) @@ -102,13 +105,32 @@ Partial Class frmGoMautBoxen Me.pnl.Controls.Add(Me.Label5) Me.pnl.Controls.Add(Me.KdSearchBox1) Me.pnl.Controls.Add(Me.btnAbbrechen) - Me.pnl.Controls.Add(Me.btnOK) Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill Me.pnl.Location = New System.Drawing.Point(0, 0) Me.pnl.Name = "pnl" Me.pnl.Size = New System.Drawing.Size(476, 569) Me.pnl.TabIndex = 1 ' + 'txtbishAbrp + ' + Me.txtbishAbrp.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtbishAbrp.Location = New System.Drawing.Point(257, 486) + Me.txtbishAbrp.MaxLength = 40 + Me.txtbishAbrp.Name = "txtbishAbrp" + Me.txtbishAbrp.ReadOnly = True + Me.txtbishAbrp.Size = New System.Drawing.Size(203, 20) + Me.txtbishAbrp.TabIndex = 494 + ' + 'Label4 + ' + Me.Label4.AutoSize = True + Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label4.Location = New System.Drawing.Point(118, 489) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(125, 13) + Me.Label4.TabIndex = 493 + Me.Label4.Text = "bish. Abrechnugspartner:" + ' 'GroupBoxBriefwaehlen ' Me.GroupBoxBriefwaehlen.Controls.Add(Me.rbAP) @@ -473,56 +495,54 @@ Partial Class frmGoMautBoxen ' Me.btnAbbrechen.DialogResult = System.Windows.Forms.DialogResult.Cancel Me.btnAbbrechen.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnAbbrechen.Location = New System.Drawing.Point(167, 522) + Me.btnAbbrechen.Location = New System.Drawing.Point(12, 522) Me.btnAbbrechen.Name = "btnAbbrechen" Me.btnAbbrechen.Size = New System.Drawing.Size(87, 34) Me.btnAbbrechen.TabIndex = 5 Me.btnAbbrechen.Text = "Abbrechen" Me.btnAbbrechen.UseVisualStyleBackColor = True ' - 'btnOK - ' - Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnOK.Location = New System.Drawing.Point(285, 522) - Me.btnOK.Name = "btnOK" - Me.btnOK.Size = New System.Drawing.Size(160, 34) - Me.btnOK.TabIndex = 6 - Me.btnOK.Text = "OK" - Me.btnOK.UseVisualStyleBackColor = True - ' - 'txtbishAbrp - ' - Me.txtbishAbrp.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtbishAbrp.Location = New System.Drawing.Point(257, 486) - Me.txtbishAbrp.MaxLength = 40 - Me.txtbishAbrp.Name = "txtbishAbrp" - Me.txtbishAbrp.ReadOnly = True - Me.txtbishAbrp.Size = New System.Drawing.Size(203, 20) - Me.txtbishAbrp.TabIndex = 494 - ' - 'Label4 - ' - Me.Label4.AutoSize = True - Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label4.Location = New System.Drawing.Point(118, 489) - Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(125, 13) - Me.Label4.TabIndex = 493 - Me.Label4.Text = "bish. Abrechnugspartner:" - ' 'DataGridViewTextBoxColumn4 ' - Me.DataGridViewTextBoxColumn4.HeaderText = "Bez." + Me.DataGridViewTextBoxColumn4.HeaderText = "Kennzeichen" Me.DataGridViewTextBoxColumn4.MaxInputLength = 75 Me.DataGridViewTextBoxColumn4.Name = "DataGridViewTextBoxColumn4" ' 'DataGridViewTextBoxColumn2 ' Me.DataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - Me.DataGridViewTextBoxColumn2.HeaderText = "Kennzeichen" + Me.DataGridViewTextBoxColumn2.HeaderText = "Box Nr." Me.DataGridViewTextBoxColumn2.MaxInputLength = 50 Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" ' + 'Button2 + ' + Me.Button2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button2.BackgroundImage = Global.SDL.My.Resources.Resources.pdf + Me.Button2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button2.Location = New System.Drawing.Point(408, 519) + Me.Button2.Margin = New System.Windows.Forms.Padding(5) + Me.Button2.Name = "Button2" + Me.Button2.Padding = New System.Windows.Forms.Padding(5) + Me.Button2.Size = New System.Drawing.Size(50, 40) + Me.Button2.TabIndex = 496 + Me.Button2.UseVisualStyleBackColor = True + ' + 'btn + ' + Me.btn.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btn.BackgroundImage = Global.SDL.My.Resources.Resources.email_big + Me.btn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btn.Location = New System.Drawing.Point(348, 519) + Me.btn.Margin = New System.Windows.Forms.Padding(5) + Me.btn.Name = "btn" + Me.btn.Padding = New System.Windows.Forms.Padding(5) + Me.btn.Size = New System.Drawing.Size(50, 40) + Me.btn.TabIndex = 495 + Me.btn.UseVisualStyleBackColor = True + ' 'frmGoMautBoxen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -544,7 +564,6 @@ Partial Class frmGoMautBoxen End Sub Friend WithEvents pnl As System.Windows.Forms.Panel Friend WithEvents btnAbbrechen As System.Windows.Forms.Button - Friend WithEvents btnOK As System.Windows.Forms.Button Friend WithEvents Label5 As System.Windows.Forms.Label Friend WithEvents KdSearchBox1 As VERAG_PROG_ALLGEMEIN.KdSearchBox Friend WithEvents cbxLandKz As VERAG_PROG_ALLGEMEIN.MyComboBox @@ -579,4 +598,6 @@ Partial Class frmGoMautBoxen Friend WithEvents Label4 As Label Friend WithEvents DataGridViewTextBoxColumn4 As DataGridViewTextBoxColumn Friend WithEvents DataGridViewTextBoxColumn2 As DataGridViewTextBoxColumn + Friend WithEvents Button2 As Button + Friend WithEvents btn As Button End Class diff --git a/SDL/kunden/frmGoMautBoxen.vb b/SDL/kunden/frmGoMautBoxen.vb index e20a440b..e176f9c0 100644 --- a/SDL/kunden/frmGoMautBoxen.vb +++ b/SDL/kunden/frmGoMautBoxen.vb @@ -1,5 +1,7 @@ Imports System.DirectoryServices.ActiveDirectory +Imports com.sun.org.apache.xerces.internal.xs Imports com.sun.tools.corba.se.idl.constExpr +Imports Microsoft.Office.Interop Imports VERAG_PROG_ALLGEMEIN Public Class frmGoMautBoxen @@ -41,7 +43,7 @@ Public Class frmGoMautBoxen ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. End Sub - Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click + Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click, btn.Click lblWarning.Text = "" @@ -58,6 +60,7 @@ Public Class frmGoMautBoxen If rbAP.Checked And txtbishAbrp.Text = "" Then lblWarning.Text = "Bitte bisherigen Abrechnungspartner eingeben." + Exit Sub End If @@ -73,38 +76,13 @@ Public Class frmGoMautBoxen Exit Sub End If - If rbPostPay.Checked Then - ' "rpt_GO_BOX_Umstellung_Vertragsart" - ElseIf rbAP.Checked Then - ' ' "rpt_GO_BOX_Umstellung_Vertragspartner" - End If + genMausboxenFormular(dgvLKW, sender) - btnOK.DialogResult = DialogResult.OK - - - - - - 'txtKennzeichen.Text = txtKennzeichen.Text.ToUpper.Trim - 'txtNationalitaet.Text = txtNationalitaet.Text.ToUpper - 'Label5.ForeColor = Color.Black - 'lblErfassung.ForeColor = Color.Black - 'If KdSearchBox1.KdNr < 0 Then Label5.ForeColor = Color.Red : Me.DialogResult = Windows.Forms.DialogResult.None : Exit Sub - 'If txtKennzeichen.Text = "" Then lblErfassung.ForeColor = Color.Red : Me.DialogResult = Windows.Forms.DialogResult.None : Exit Sub - - 'If s.updateBinding Then - ' Dim SQL As New SQL - ' If oldkfz <> txtKennzeichen.Text Then - ' VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.REMANE_FOLDER_KDNR(New VERAG_PROG_ALLGEMEIN.cDatenserver_Change_Value("DOKUMENTE", "MDM", kundenNr, oldkfz, Nothing, Nothing), - ' New VERAG_PROG_ALLGEMEIN.cDatenserver_Change_Value("DOKUMENTE", "MDM", kundenNr, txtKennzeichen.Text, Nothing, Nothing)) - ' SQL.doSQL("UPDATE SDL SET KfzKennzeichen= '" & txtKennzeichen.Text & "' WHERE KundenNr='" & kundenNr & "' AND KfzKennzeichen='" & oldkfz & "'", "SDL", True) - ' SQL.doSQL("UPDATE [Kartenpool] SET KfzKennzeichen= '" & txtKennzeichen.Text & "' WHERE KundenNr='" & kundenNr & "' AND KfzKennzeichen='" & oldkfz & "'", "SDL", True) - ' End If - ' Me.Close() - 'End If End Sub + + Sub initdgv() Try @@ -138,49 +116,15 @@ Public Class frmGoMautBoxen End Try - If addnew Then newEntry() 'NEUER EINTRAG! - ready = True End Sub - Public Sub newEntry() - ' s.updateBinding() - Dim row = s.bindingdataTable.NewRow() - row.Item("KundenNr") = kundenNr - row.Item("KfzKennzeichen") = "" - s.bindingdataTable.Rows.Add(row) - s.bindingSource.MoveLast() - 'If save Then updateBinding() - lblAenderung.Text = Now.ToString("dd.MM.yyyy HH:mm") - lblSachbearb.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME - If kundenNr < 0 Then KdSearchBox1.Enabled = True - End Sub - - Sub BindingTableColumnChanged(sender As Object, e As System.Data.DataColumnChangeEventArgs) - If ready Then - lblSachbearb.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME - lblAenderung.Text = Now.ToString("dd.MM.yyyy HH:mm") - changed = True - End If - End Sub Private Sub btnAbbrechen_Click(sender As Object, e As EventArgs) Handles btnAbbrechen.Click ', Me.FormClosing - If changed Then - Select Case MsgBox("Änderungen speichern", vbYesNoCancel) - Case vbYes : Me.DialogResult = Windows.Forms.DialogResult.None : btnOK.PerformClick() - Case vbNo : Me.Close() - Case vbCancel : Me.DialogResult = Windows.Forms.DialogResult.None - End Select - Else - Me.Close() - End If - End Sub - Private Sub frmLKWDetails_KeyDown(sender As Object, e As KeyEventArgs) Handles Me.KeyDown - If e.KeyCode = Keys.Return Then - btnOK.PerformClick() - End If + Me.Close() + End Sub Private Sub frmLKWDetails_Load(sender As Object, e As EventArgs) Handles Me.Load @@ -215,7 +159,7 @@ Public Class frmGoMautBoxen If adresse IsNot Nothing Then - + kundenNr = adresse.AdressenNr txtName.Text = If(adresse.Name_1, "") & If(adresse.Name_2, "") txtStrasse.Text = If(adresse.Straße, "") txtOrt.Text = If(adresse.Ort, "") @@ -239,6 +183,7 @@ Public Class frmGoMautBoxen Dim KD = KdSearchBox1.KdData_KUNDE Dim KDERW = KdSearchBox1.KdData_KUNDE_ERW + kundenNr = AD.AdressenNr txtName.Text = If(AD.Name_1, "") & If(AD.Name_2, "") txtStrasse.Text = If(AD.Straße, "") txtOrt.Text = If(AD.Ort, "") @@ -246,6 +191,8 @@ Public Class frmGoMautBoxen cbxLandKz.changeItem(If(AD.LandKz, "")) txtAnsprechpartnerAnrede.Text = AD.Anrede txtAnsprechpartner.Text = AD.Ansprechpartner + txtFax.Text = (If(AD.Telefax, "")) + txtEmail.Text = (If(AD.E_Mail, "")) initdgv() @@ -280,4 +227,140 @@ Public Class frmGoMautBoxen End If End Sub + + + Public Function genMausboxenFormular(dgv As DataGridView, sender As Object, Optional PrinterName As String = "", Optional ByRef pfadWord As String = "", Optional printReportElsePDF As Boolean = False, Optional openWord As Boolean = False) As Microsoft.Office.Interop.Word.Document + + + Dim odoc As Microsoft.Office.Interop.Word.Document = Nothing + + Try + pfadWord = AppDomain.CurrentDomain.BaseDirectory & "Resources\MDM_Schreiben\GOBOX_UMSTELLUNG.dotx" + + Dim oWord As New Microsoft.Office.Interop.Word.Application + Dim FIRMA As New VERAG_PROG_ALLGEMEIN.cFirmen(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA_ID) + + + Dim cGenWord As New cGenWord + + odoc = cGenWord.openWord(pfadWord, False, oWord) + Dim oTable As Word.Table + + 'odoc.FormFields("Adresse1").Range.Text = kunde.Name_1 & " " & kunde.Name_2 + 'odoc.FormFields("Adresse2").Range.Text = kunde.Straße + 'odoc.FormFields("Adresse3").Range.Text = kunde.LandKz & " " & kunde.PLZ & " " & kunde.Ort + '' odoc.FormFields("KdNrVERAG").Range.Text = KUNDE.KundenNr + '' odoc.FormFields("KdNrMST").Range.Text = PartnerKdNrFromFMZOLL.MSEKundenNr + 'odoc.FormFields("Sachbearbeiter").Range.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME + 'odoc.FormFields("Datum").Range.Text = Now.ToShortDateString + 'odoc.FormFields("KundenNr").Range.Text = kunde.AdressenNr + 'odoc.FormFields("AuftragsNr").Range.Text = AuftragsNr.ToString("000000.##") + + Dim textArt As String = "" + If rbPostPay.Checked Then + textArt = "hiermit beantragen wir die Umstellung unserer Pre-Pay GO-Box(en) auf Post-Pay." & vbNewLine & "Dies betrifft das/die folgende(n) Fahrzeug(e):" + ElseIf rbAP.Checked Then + textArt = "hiermit beantragen wir die Änderung des Abrechnungspartners unserer Post-Pay-GO-Boxen von " & txtbishAbrp.Text & " auf Verag." & vbNewLine & "Dies betrifft die folgenden Fahrzeuge:" + End If + + + Dim txtEnde As String = "" + + If rbPostPay.Checked Then + txtEnde = "Hiermit bestätige Ich, dass:" & vbNewLine & + "• die Änderungen in der Reihenfolge des Eintreffens bei ASFINAG laufend bearbeitet werden." & vbNewLine & + "• die Umstellung genau zu einem Stichtag von ASFINAG nicht zugesichert werden kann." & vbNewLine & + "• die Änderung der Vertragsart von Pre- auf Post-Pay erst nach erfolgter Aktualisierung der in der/den GO-Box(en) gespeicherten Daten an einer GO-Vertriebsstelle wirksam wird." + + ElseIf rbAP.Checked Then + txtEnde = "Weitere Fahrzeuge habe ich in einer zusätzlichen Liste beigefügt." & vbNewLine & + "Ich nehme zur Kenntnis, dass die Änderungen nach Eintreffen bei ASFINAG laufend bearbeitet werden." & vbNewLine & + "Die Umstellung genau zu einem Stichtag ist von ASFINAG nicht zugesichert." + End If + + + Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues) + For Each item In odoc.FormFields + + Dim fieldName = item.Name.ToLower().Trim() + + Select Case fieldName + Case "adresse1" : odoc.FormFields(fieldName).Range.Text = txtName.Text + Case "adresse2" : odoc.FormFields(fieldName).Range.Text = txtAnsprechpartnerAnrede.Text & " " & txtAnsprechpartner.Text + Case "adresse3" : odoc.FormFields(fieldName).Range.Text = txtStrasse.Text + Case "adresse4" : odoc.FormFields(fieldName).Range.Text = cbxLandKz._value & " " & txtPlz.Text & " " & txtOrt.Text + Case "adresse5" : odoc.FormFields(fieldName).Range.Text = txtEmail.Text + Case "adresse6" : odoc.FormFields(fieldName).Range.Text = txtFax.Text + Case "sachbearbeiter" : odoc.FormFields(fieldName).Range.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME + Case "datum" : odoc.FormFields(fieldName).Range.Text = Now.ToShortDateString + Case "kundennr" : odoc.FormFields(fieldName).Range.Text = IIf(kundenNr > 0, kundenNr, KdSearchBox1.KdNr_value) + Case "kartennr" : odoc.FormFields(fieldName).Range.Text = cbxKK.SelectedValue + Case "art" : odoc.FormFields(fieldName).Range.Text = IIf(rbPostPay.Checked, rbPostPay.Text, rbAP.Text) + Case "typ_text" : odoc.FormFields(fieldName).Range.Text = textArt + Case "ende" : odoc.FormFields(fieldName).Range.Text = txtEnde + + End Select + + Next + + If True Then + + + If odoc.Range.Bookmarks.Exists("TabelleKarten") Then + If odoc.Bookmarks("TabelleKarten").Range.Tables.Count > 0 Then + oTable = odoc.Bookmarks("TabelleKarten").Range.Tables(1) + Dim i = 1 + Dim kfzTmp = "" + For Each r As DataGridViewRow In dgvLKW.Rows + If r.Cells(0).Value <> "" And r.Cells(1).Value <> "" Then + oTable.Rows(i + 1).Cells(1).Range.Text = r.Cells(0).Value + oTable.Rows(i + 1).Cells(2).Range.Text = r.Cells(1).Value + + Else + oTable.Rows(i + 1).Cells(1).Range.Text = "" + oTable.Rows(i + 1).Cells(2).Range.Text = "" + End If + + + If i < dgvLKW.Rows.Count Then oTable.Rows.Add() + i += 1 + Next + End If + + + End If + End If + + odoc.Save() : odoc.Activate() + + Dim path = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("GOBOX_UMSTELLUNG_" & kundenNr & ".pdf", ".pdf", True, False) + odoc.SaveAs(path, Word.WdSaveFormat.wdFormatPDF) + + + Try + odoc.Close() + oWord.Quit() + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + + + If sender Is Button2 Then + Process.Start(path) + ElseIf sender Is btn Then + + Dim outl As New Outlook.Application + Dim Mail As Microsoft.Office.Interop.Outlook.MailItem + Mail = outl.CreateItem(0) + Mail.Attachments.Add(path, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "_Formular.pdf") + Mail.Display() + + End If + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + + End Function + End Class \ No newline at end of file diff --git a/SDL/kunden/frmKundenKontakteDetails.Designer.vb b/SDL/kunden/frmKundenKontakteDetails.Designer.vb index 2b2d185f..76796ca8 100644 --- a/SDL/kunden/frmKundenKontakteDetails.Designer.vb +++ b/SDL/kunden/frmKundenKontakteDetails.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmKundenKontakteDetails Inherits System.Windows.Forms.Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,12 +20,20 @@ Partial Class frmKundenKontakteDetails 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmKundenKontakteDetails)) Me.btn = New System.Windows.Forms.Button() + Me.lbl = New System.Windows.Forms.Label() + Me.cboKontaktArt = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.pnlKontakt = New System.Windows.Forms.Panel() + Me.Label2 = New System.Windows.Forms.Label() + Me.Label1 = New System.Windows.Forms.Label() + Me.lblEmailBCC = New System.Windows.Forms.TextBox() + Me.PictureBox7 = New System.Windows.Forms.PictureBox() + Me.lblEmailCC = New System.Windows.Forms.TextBox() + Me.PictureBox6 = New System.Windows.Forms.PictureBox() Me.PictureBox1 = New System.Windows.Forms.PictureBox() - Me.lblAnsprechpartnerNN = New System.Windows.Forms.TextBox() Me.lblMobil = New System.Windows.Forms.TextBox() Me.lblFax = New System.Windows.Forms.TextBox() Me.lblEmail = New System.Windows.Forms.TextBox() @@ -33,80 +41,187 @@ Partial Class frmKundenKontakteDetails Me.PictureBox2 = New System.Windows.Forms.PictureBox() Me.lblTel = New System.Windows.Forms.TextBox() Me.PictureBox3 = New System.Windows.Forms.PictureBox() - Me.PictureBox5 = New System.Windows.Forms.PictureBox() - Me.lbl = New System.Windows.Forms.Label() - Me.lblAnsprechpartnerVN = New System.Windows.Forms.TextBox() - Me.lblEmailCC = New System.Windows.Forms.TextBox() - Me.PictureBox6 = New System.Windows.Forms.PictureBox() - Me.lblEmailBCC = New System.Windows.Forms.TextBox() - Me.PictureBox7 = New System.Windows.Forms.PictureBox() - Me.Label1 = New System.Windows.Forms.Label() - Me.Label2 = New System.Windows.Forms.Label() - Me.txtStrasse = New System.Windows.Forms.TextBox() - Me.txtOrt = New System.Windows.Forms.TextBox() - Me.txtPLZ = New System.Windows.Forms.TextBox() - Me.PictureBox8 = New System.Windows.Forms.PictureBox() - Me.PictureBox9 = New System.Windows.Forms.PictureBox() - Me.PictureBox10 = New System.Windows.Forms.PictureBox() - Me.Label3 = New System.Windows.Forms.Label() + Me.pnlGeschaeftsfuehrer = New System.Windows.Forms.Panel() + Me.picBoxKorr = New System.Windows.Forms.PictureBox() + Me.Label5 = New System.Windows.Forms.Label() + Me.txtPassgueltigbis = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtKorrAdd = New System.Windows.Forms.TextBox() Me.Label4 = New System.Windows.Forms.Label() + Me.Label3 = New System.Windows.Forms.Label() + Me.PictureBox10 = New System.Windows.Forms.PictureBox() + Me.PictureBox9 = New System.Windows.Forms.PictureBox() + Me.PictureBox8 = New System.Windows.Forms.PictureBox() Me.txtGebDatum = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtPLZ = New System.Windows.Forms.TextBox() Me.cbxLand = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.txtOrt = New System.Windows.Forms.TextBox() + Me.txtStrasse = New System.Windows.Forms.TextBox() Me.cboMannFrau = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.cboKontaktArt = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.lblAnsprechpartnerVN = New System.Windows.Forms.TextBox() + Me.lblAnsprechpartnerNN = New System.Windows.Forms.TextBox() + Me.PictureBox5 = New System.Windows.Forms.PictureBox() + Me.pnlMain = New System.Windows.Forms.Panel() + Me.pnlKontakt.SuspendLayout() + CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).BeginInit() + Me.pnlGeschaeftsfuehrer.SuspendLayout() + CType(Me.picBoxKorr, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() + Me.pnlMain.SuspendLayout() Me.SuspendLayout() ' 'btn ' + Me.btn.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btn.Location = New System.Drawing.Point(373, 358) + Me.btn.Location = New System.Drawing.Point(394, 430) Me.btn.Name = "btn" Me.btn.Size = New System.Drawing.Size(136, 39) Me.btn.TabIndex = 9 Me.btn.Text = "OK" Me.btn.UseVisualStyleBackColor = True ' + 'lbl + ' + Me.lbl.AutoSize = True + Me.lbl.Location = New System.Drawing.Point(5, 0) + Me.lbl.Name = "lbl" + Me.lbl.Size = New System.Drawing.Size(59, 13) + Me.lbl.TabIndex = 0 + Me.lbl.Text = "Kontaktart:" + ' + 'cboKontaktArt + ' + Me.cboKontaktArt._allowedValuesFreiText = Nothing + Me.cboKontaktArt._allowFreiText = False + Me.cboKontaktArt._value = "" + Me.cboKontaktArt.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) + Me.cboKontaktArt.FormattingEnabled = True + Me.cboKontaktArt.Location = New System.Drawing.Point(8, 16) + Me.cboKontaktArt.Name = "cboKontaktArt" + Me.cboKontaktArt.Size = New System.Drawing.Size(495, 28) + Me.cboKontaktArt.TabIndex = 1 + ' + 'pnlKontakt + ' + Me.pnlKontakt.AutoSize = True + Me.pnlKontakt.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.pnlKontakt.Controls.Add(Me.picBoxKorr) + Me.pnlKontakt.Controls.Add(Me.Label2) + Me.pnlKontakt.Controls.Add(Me.Label1) + Me.pnlKontakt.Controls.Add(Me.lblEmailBCC) + Me.pnlKontakt.Controls.Add(Me.txtKorrAdd) + Me.pnlKontakt.Controls.Add(Me.PictureBox7) + Me.pnlKontakt.Controls.Add(Me.lblEmailCC) + Me.pnlKontakt.Controls.Add(Me.PictureBox6) + Me.pnlKontakt.Controls.Add(Me.PictureBox1) + Me.pnlKontakt.Controls.Add(Me.lblMobil) + Me.pnlKontakt.Controls.Add(Me.lblFax) + Me.pnlKontakt.Controls.Add(Me.lblEmail) + Me.pnlKontakt.Controls.Add(Me.PictureBox4) + Me.pnlKontakt.Controls.Add(Me.PictureBox2) + Me.pnlKontakt.Controls.Add(Me.lblTel) + Me.pnlKontakt.Controls.Add(Me.PictureBox3) + Me.pnlKontakt.Controls.Add(Me.cboMannFrau) + Me.pnlKontakt.Controls.Add(Me.lblAnsprechpartnerVN) + Me.pnlKontakt.Controls.Add(Me.PictureBox5) + Me.pnlKontakt.Controls.Add(Me.lblAnsprechpartnerNN) + Me.pnlKontakt.Location = New System.Drawing.Point(8, 50) + Me.pnlKontakt.Name = "pnlKontakt" + Me.pnlKontakt.Size = New System.Drawing.Size(500, 238) + Me.pnlKontakt.TabIndex = 10 + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Location = New System.Drawing.Point(40, 152) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(31, 13) + Me.Label2.TabIndex = 235 + Me.Label2.Text = "BCC:" + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(40, 127) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(24, 13) + Me.Label1.TabIndex = 234 + Me.Label1.Text = "CC:" + ' + 'lblEmailBCC + ' + Me.lblEmailBCC.BackColor = System.Drawing.Color.White + Me.lblEmailBCC.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.lblEmailBCC.Cursor = System.Windows.Forms.Cursors.Hand + Me.lblEmailBCC.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblEmailBCC.Location = New System.Drawing.Point(77, 145) + Me.lblEmailBCC.Name = "lblEmailBCC" + Me.lblEmailBCC.Size = New System.Drawing.Size(418, 26) + Me.lblEmailBCC.TabIndex = 232 + Me.lblEmailBCC.Text = "email" + ' + 'PictureBox7 + ' + Me.PictureBox7.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.PictureBox7.Image = Global.SDL.My.Resources.Resources.email + Me.PictureBox7.Location = New System.Drawing.Point(3, 147) + Me.PictureBox7.Name = "PictureBox7" + Me.PictureBox7.Size = New System.Drawing.Size(22, 18) + Me.PictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom + Me.PictureBox7.TabIndex = 233 + Me.PictureBox7.TabStop = False + ' + 'lblEmailCC + ' + Me.lblEmailCC.BackColor = System.Drawing.Color.White + Me.lblEmailCC.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.lblEmailCC.Cursor = System.Windows.Forms.Cursors.Hand + Me.lblEmailCC.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblEmailCC.Location = New System.Drawing.Point(77, 120) + Me.lblEmailCC.Name = "lblEmailCC" + Me.lblEmailCC.Size = New System.Drawing.Size(418, 26) + Me.lblEmailCC.TabIndex = 230 + Me.lblEmailCC.Text = "email" + ' + 'PictureBox6 + ' + Me.PictureBox6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.PictureBox6.Image = Global.SDL.My.Resources.Resources.email + Me.PictureBox6.Location = New System.Drawing.Point(3, 122) + Me.PictureBox6.Name = "PictureBox6" + Me.PictureBox6.Size = New System.Drawing.Size(22, 18) + Me.PictureBox6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom + Me.PictureBox6.TabIndex = 231 + Me.PictureBox6.TabStop = False + ' 'PictureBox1 ' Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None Me.PictureBox1.Image = Global.SDL.My.Resources.Resources.telefon - Me.PictureBox1.Location = New System.Drawing.Point(9, 75) + Me.PictureBox1.Location = New System.Drawing.Point(0, 16) Me.PictureBox1.Name = "PictureBox1" Me.PictureBox1.Size = New System.Drawing.Size(25, 18) Me.PictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom - Me.PictureBox1.TabIndex = 188 + Me.PictureBox1.TabIndex = 227 Me.PictureBox1.TabStop = False ' - 'lblAnsprechpartnerNN - ' - Me.lblAnsprechpartnerNN.BackColor = System.Drawing.Color.White - Me.lblAnsprechpartnerNN.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.lblAnsprechpartnerNN.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAnsprechpartnerNN.Location = New System.Drawing.Point(304, 239) - Me.lblAnsprechpartnerNN.Name = "lblAnsprechpartnerNN" - Me.lblAnsprechpartnerNN.Size = New System.Drawing.Size(200, 26) - Me.lblAnsprechpartnerNN.TabIndex = 8 - Me.lblAnsprechpartnerNN.Text = "ansprechpartner" - ' 'lblMobil ' Me.lblMobil.BackColor = System.Drawing.Color.White Me.lblMobil.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.lblMobil.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblMobil.Location = New System.Drawing.Point(52, 120) + Me.lblMobil.Location = New System.Drawing.Point(43, 61) Me.lblMobil.Name = "lblMobil" Me.lblMobil.Size = New System.Drawing.Size(452, 26) - Me.lblMobil.TabIndex = 4 + Me.lblMobil.TabIndex = 220 Me.lblMobil.Text = "mobil" ' 'lblFax @@ -114,10 +229,10 @@ Partial Class frmKundenKontakteDetails Me.lblFax.BackColor = System.Drawing.Color.White Me.lblFax.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.lblFax.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblFax.Location = New System.Drawing.Point(52, 97) + Me.lblFax.Location = New System.Drawing.Point(43, 38) Me.lblFax.Name = "lblFax" Me.lblFax.Size = New System.Drawing.Size(452, 26) - Me.lblFax.TabIndex = 3 + Me.lblFax.TabIndex = 219 Me.lblFax.Text = "fax" ' 'lblEmail @@ -126,32 +241,32 @@ Partial Class frmKundenKontakteDetails Me.lblEmail.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.lblEmail.Cursor = System.Windows.Forms.Cursors.Hand Me.lblEmail.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblEmail.Location = New System.Drawing.Point(52, 154) + Me.lblEmail.Location = New System.Drawing.Point(43, 95) Me.lblEmail.Name = "lblEmail" Me.lblEmail.Size = New System.Drawing.Size(452, 26) - Me.lblEmail.TabIndex = 5 + Me.lblEmail.TabIndex = 221 Me.lblEmail.Text = "email" ' 'PictureBox4 ' Me.PictureBox4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None Me.PictureBox4.Image = Global.SDL.My.Resources.Resources.email - Me.PictureBox4.Location = New System.Drawing.Point(12, 156) + Me.PictureBox4.Location = New System.Drawing.Point(3, 97) Me.PictureBox4.Name = "PictureBox4" Me.PictureBox4.Size = New System.Drawing.Size(22, 18) Me.PictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom - Me.PictureBox4.TabIndex = 189 + Me.PictureBox4.TabIndex = 228 Me.PictureBox4.TabStop = False ' 'PictureBox2 ' Me.PictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None Me.PictureBox2.Image = Global.SDL.My.Resources.Resources.fax - Me.PictureBox2.Location = New System.Drawing.Point(9, 99) + Me.PictureBox2.Location = New System.Drawing.Point(0, 40) Me.PictureBox2.Name = "PictureBox2" Me.PictureBox2.Size = New System.Drawing.Size(25, 18) Me.PictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom - Me.PictureBox2.TabIndex = 187 + Me.PictureBox2.TabIndex = 226 Me.PictureBox2.TabStop = False ' 'lblTel @@ -159,201 +274,153 @@ Partial Class frmKundenKontakteDetails Me.lblTel.BackColor = System.Drawing.Color.White Me.lblTel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.lblTel.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblTel.Location = New System.Drawing.Point(52, 73) + Me.lblTel.Location = New System.Drawing.Point(43, 14) Me.lblTel.Name = "lblTel" Me.lblTel.Size = New System.Drawing.Size(452, 26) - Me.lblTel.TabIndex = 2 + Me.lblTel.TabIndex = 218 Me.lblTel.Text = "tel" ' 'PictureBox3 ' Me.PictureBox3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None Me.PictureBox3.Image = Global.SDL.My.Resources.Resources.handy - Me.PictureBox3.Location = New System.Drawing.Point(9, 123) + Me.PictureBox3.Location = New System.Drawing.Point(0, 64) Me.PictureBox3.Name = "PictureBox3" Me.PictureBox3.Size = New System.Drawing.Size(25, 18) Me.PictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom - Me.PictureBox3.TabIndex = 186 + Me.PictureBox3.TabIndex = 225 Me.PictureBox3.TabStop = False ' - 'PictureBox5 + 'pnlGeschaeftsfuehrer ' - Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.PictureBox5.Image = Global.SDL.My.Resources.Resources.person - Me.PictureBox5.Location = New System.Drawing.Point(9, 242) - Me.PictureBox5.Name = "PictureBox5" - Me.PictureBox5.Size = New System.Drawing.Size(25, 18) - Me.PictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom - Me.PictureBox5.TabIndex = 191 - Me.PictureBox5.TabStop = False + Me.pnlGeschaeftsfuehrer.AutoSize = True + Me.pnlGeschaeftsfuehrer.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.pnlGeschaeftsfuehrer.Controls.Add(Me.Label5) + Me.pnlGeschaeftsfuehrer.Controls.Add(Me.txtPassgueltigbis) + Me.pnlGeschaeftsfuehrer.Controls.Add(Me.Label4) + Me.pnlGeschaeftsfuehrer.Controls.Add(Me.Label3) + Me.pnlGeschaeftsfuehrer.Controls.Add(Me.PictureBox10) + Me.pnlGeschaeftsfuehrer.Controls.Add(Me.PictureBox9) + Me.pnlGeschaeftsfuehrer.Controls.Add(Me.PictureBox8) + Me.pnlGeschaeftsfuehrer.Controls.Add(Me.txtGebDatum) + Me.pnlGeschaeftsfuehrer.Controls.Add(Me.txtPLZ) + Me.pnlGeschaeftsfuehrer.Controls.Add(Me.cbxLand) + Me.pnlGeschaeftsfuehrer.Controls.Add(Me.txtOrt) + Me.pnlGeschaeftsfuehrer.Controls.Add(Me.txtStrasse) + Me.pnlGeschaeftsfuehrer.Location = New System.Drawing.Point(8, 294) + Me.pnlGeschaeftsfuehrer.Name = "pnlGeschaeftsfuehrer" + Me.pnlGeschaeftsfuehrer.Size = New System.Drawing.Size(500, 102) + Me.pnlGeschaeftsfuehrer.TabIndex = 11 + Me.pnlGeschaeftsfuehrer.Visible = False ' - 'lbl + 'picBoxKorr ' - Me.lbl.AutoSize = True - Me.lbl.Location = New System.Drawing.Point(6, 13) - Me.lbl.Name = "lbl" - Me.lbl.Size = New System.Drawing.Size(59, 13) - Me.lbl.TabIndex = 0 - Me.lbl.Text = "Kontaktart:" + Me.picBoxKorr.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.picBoxKorr.Image = CType(resources.GetObject("picBoxKorr.Image"), System.Drawing.Image) + Me.picBoxKorr.Location = New System.Drawing.Point(0, 217) + Me.picBoxKorr.Name = "picBoxKorr" + Me.picBoxKorr.Size = New System.Drawing.Size(25, 18) + Me.picBoxKorr.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom + Me.picBoxKorr.TabIndex = 267 + Me.picBoxKorr.TabStop = False ' - 'lblAnsprechpartnerVN + 'Label5 ' - Me.lblAnsprechpartnerVN.BackColor = System.Drawing.Color.White - Me.lblAnsprechpartnerVN.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.lblAnsprechpartnerVN.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAnsprechpartnerVN.Location = New System.Drawing.Point(105, 239) - Me.lblAnsprechpartnerVN.Name = "lblAnsprechpartnerVN" - Me.lblAnsprechpartnerVN.Size = New System.Drawing.Size(200, 26) - Me.lblAnsprechpartnerVN.TabIndex = 7 - Me.lblAnsprechpartnerVN.Text = "ansprechpartner" + Me.Label5.AutoSize = True + Me.Label5.Location = New System.Drawing.Point(268, 86) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(80, 13) + Me.Label5.TabIndex = 266 + Me.Label5.Text = "Pass gültig bis.:" ' - 'lblEmailCC + 'txtPassgueltigbis ' - Me.lblEmailCC.BackColor = System.Drawing.Color.White - Me.lblEmailCC.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.lblEmailCC.Cursor = System.Windows.Forms.Cursors.Hand - Me.lblEmailCC.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblEmailCC.Location = New System.Drawing.Point(86, 179) - Me.lblEmailCC.Name = "lblEmailCC" - Me.lblEmailCC.Size = New System.Drawing.Size(418, 26) - Me.lblEmailCC.TabIndex = 192 - Me.lblEmailCC.Text = "email" + Me.txtPassgueltigbis._DateTimeOnly = False + Me.txtPassgueltigbis._numbersOnly = False + Me.txtPassgueltigbis._numbersOnlyKommastellen = "" + Me.txtPassgueltigbis._numbersOnlyTrennzeichen = True + Me.txtPassgueltigbis._Prozent = False + Me.txtPassgueltigbis._ShortDateNew = True + Me.txtPassgueltigbis._ShortDateOnly = False + Me.txtPassgueltigbis._TimeOnly = False + Me.txtPassgueltigbis._TimeOnly_Seconds = False + Me.txtPassgueltigbis._value = "geburtsdatum" + Me.txtPassgueltigbis._Waehrung = False + Me.txtPassgueltigbis._WaehrungZeichen = False + Me.txtPassgueltigbis.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtPassgueltigbis.ForeColor = System.Drawing.Color.Red + Me.txtPassgueltigbis.Location = New System.Drawing.Point(354, 73) + Me.txtPassgueltigbis.MaxLength = 10 + Me.txtPassgueltigbis.MaxLineLength = -1 + Me.txtPassgueltigbis.MaxLines_Warning = "" + Me.txtPassgueltigbis.MaxLines_Warning_Label = Nothing + Me.txtPassgueltigbis.Multiline = True + Me.txtPassgueltigbis.Name = "txtPassgueltigbis" + Me.txtPassgueltigbis.Size = New System.Drawing.Size(141, 26) + Me.txtPassgueltigbis.TabIndex = 265 + Me.txtPassgueltigbis.Text = "passgueltigbis" ' - 'PictureBox6 + 'txtKorrAdd ' - Me.PictureBox6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.PictureBox6.Image = Global.SDL.My.Resources.Resources.email - Me.PictureBox6.Location = New System.Drawing.Point(12, 181) - Me.PictureBox6.Name = "PictureBox6" - Me.PictureBox6.Size = New System.Drawing.Size(22, 18) - Me.PictureBox6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom - Me.PictureBox6.TabIndex = 193 - Me.PictureBox6.TabStop = False + Me.txtKorrAdd.BackColor = System.Drawing.Color.White + Me.txtKorrAdd.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.txtKorrAdd.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtKorrAdd.Location = New System.Drawing.Point(45, 209) + Me.txtKorrAdd.Name = "txtKorrAdd" + Me.txtKorrAdd.Size = New System.Drawing.Size(452, 26) + Me.txtKorrAdd.TabIndex = 264 + Me.txtKorrAdd.Text = "adresse" ' - 'lblEmailBCC + 'Label4 ' - Me.lblEmailBCC.BackColor = System.Drawing.Color.White - Me.lblEmailBCC.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.lblEmailBCC.Cursor = System.Windows.Forms.Cursors.Hand - Me.lblEmailBCC.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblEmailBCC.Location = New System.Drawing.Point(86, 204) - Me.lblEmailBCC.Name = "lblEmailBCC" - Me.lblEmailBCC.Size = New System.Drawing.Size(418, 26) - Me.lblEmailBCC.TabIndex = 194 - Me.lblEmailBCC.Text = "email" + Me.Label4.AutoSize = True + Me.Label4.Location = New System.Drawing.Point(36, 86) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(53, 13) + Me.Label4.TabIndex = 263 + Me.Label4.Text = "Geb-Dat.:" ' - 'PictureBox7 + 'Label3 ' - Me.PictureBox7.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.PictureBox7.Image = Global.SDL.My.Resources.Resources.email - Me.PictureBox7.Location = New System.Drawing.Point(12, 206) - Me.PictureBox7.Name = "PictureBox7" - Me.PictureBox7.Size = New System.Drawing.Size(22, 18) - Me.PictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom - Me.PictureBox7.TabIndex = 195 - Me.PictureBox7.TabStop = False - ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(49, 186) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(24, 13) - Me.Label1.TabIndex = 196 - Me.Label1.Text = "CC:" - ' - 'Label2 - ' - Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(49, 211) - Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(31, 13) - Me.Label2.TabIndex = 197 - Me.Label2.Text = "BCC:" - ' - 'txtStrasse - ' - Me.txtStrasse.BackColor = System.Drawing.Color.White - Me.txtStrasse.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.txtStrasse.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtStrasse.Location = New System.Drawing.Point(52, 271) - Me.txtStrasse.Name = "txtStrasse" - Me.txtStrasse.Size = New System.Drawing.Size(452, 26) - Me.txtStrasse.TabIndex = 198 - Me.txtStrasse.Text = "adresse" - ' - 'txtOrt - ' - Me.txtOrt.BackColor = System.Drawing.Color.White - Me.txtOrt.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.txtOrt.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtOrt.Location = New System.Drawing.Point(272, 303) - Me.txtOrt.Name = "txtOrt" - Me.txtOrt.Size = New System.Drawing.Size(232, 26) - Me.txtOrt.TabIndex = 203 - Me.txtOrt.Text = "ort" - ' - 'txtPLZ - ' - Me.txtPLZ.BackColor = System.Drawing.Color.White - Me.txtPLZ.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.txtPLZ.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtPLZ.Location = New System.Drawing.Point(167, 303) - Me.txtPLZ.Name = "txtPLZ" - Me.txtPLZ.Size = New System.Drawing.Size(99, 26) - Me.txtPLZ.TabIndex = 206 - Me.txtPLZ.Text = "plz" - ' - 'PictureBox8 - ' - Me.PictureBox8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.PictureBox8.Image = CType(resources.GetObject("PictureBox8.Image"), System.Drawing.Image) - Me.PictureBox8.Location = New System.Drawing.Point(9, 271) - Me.PictureBox8.Name = "PictureBox8" - Me.PictureBox8.Size = New System.Drawing.Size(25, 18) - Me.PictureBox8.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom - Me.PictureBox8.TabIndex = 208 - Me.PictureBox8.TabStop = False - ' - 'PictureBox9 - ' - Me.PictureBox9.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.PictureBox9.Image = CType(resources.GetObject("PictureBox9.Image"), System.Drawing.Image) - Me.PictureBox9.Location = New System.Drawing.Point(9, 340) - Me.PictureBox9.Name = "PictureBox9" - Me.PictureBox9.Size = New System.Drawing.Size(25, 18) - Me.PictureBox9.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom - Me.PictureBox9.TabIndex = 209 - Me.PictureBox9.TabStop = False + Me.Label3.AutoSize = True + Me.Label3.Location = New System.Drawing.Point(36, 51) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(78, 13) + Me.Label3.TabIndex = 262 + Me.Label3.Text = "Land/PLZ/Ort:" ' 'PictureBox10 ' Me.PictureBox10.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None Me.PictureBox10.Image = CType(resources.GetObject("PictureBox10.Image"), System.Drawing.Image) - Me.PictureBox10.Location = New System.Drawing.Point(9, 305) + Me.PictureBox10.Location = New System.Drawing.Point(5, 46) Me.PictureBox10.Name = "PictureBox10" Me.PictureBox10.Size = New System.Drawing.Size(25, 18) Me.PictureBox10.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom - Me.PictureBox10.TabIndex = 210 + Me.PictureBox10.TabIndex = 261 Me.PictureBox10.TabStop = False ' - 'Label3 + 'PictureBox9 ' - Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(40, 310) - Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(78, 13) - Me.Label3.TabIndex = 211 - Me.Label3.Text = "Land/PLZ/Ort:" + Me.PictureBox9.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.PictureBox9.Image = CType(resources.GetObject("PictureBox9.Image"), System.Drawing.Image) + Me.PictureBox9.Location = New System.Drawing.Point(5, 81) + Me.PictureBox9.Name = "PictureBox9" + Me.PictureBox9.Size = New System.Drawing.Size(25, 18) + Me.PictureBox9.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom + Me.PictureBox9.TabIndex = 260 + Me.PictureBox9.TabStop = False ' - 'Label4 + 'PictureBox8 ' - Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(40, 345) - Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(53, 13) - Me.Label4.TabIndex = 212 - Me.Label4.Text = "Geb-Dat.:" + Me.PictureBox8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.PictureBox8.Image = CType(resources.GetObject("PictureBox8.Image"), System.Drawing.Image) + Me.PictureBox8.Location = New System.Drawing.Point(5, 12) + Me.PictureBox8.Name = "PictureBox8" + Me.PictureBox8.Size = New System.Drawing.Size(25, 18) + Me.PictureBox8.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom + Me.PictureBox8.TabIndex = 259 + Me.PictureBox8.TabStop = False ' 'txtGebDatum ' @@ -371,7 +438,7 @@ Partial Class frmKundenKontakteDetails Me.txtGebDatum._WaehrungZeichen = False Me.txtGebDatum.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtGebDatum.ForeColor = System.Drawing.Color.Black - Me.txtGebDatum.Location = New System.Drawing.Point(120, 332) + Me.txtGebDatum.Location = New System.Drawing.Point(116, 73) Me.txtGebDatum.MaxLength = 10 Me.txtGebDatum.MaxLineLength = -1 Me.txtGebDatum.MaxLines_Warning = "" @@ -379,9 +446,20 @@ Partial Class frmKundenKontakteDetails Me.txtGebDatum.Multiline = True Me.txtGebDatum.Name = "txtGebDatum" Me.txtGebDatum.Size = New System.Drawing.Size(146, 26) - Me.txtGebDatum.TabIndex = 207 + Me.txtGebDatum.TabIndex = 258 Me.txtGebDatum.Text = "geburtsdatum" ' + 'txtPLZ + ' + Me.txtPLZ.BackColor = System.Drawing.Color.White + Me.txtPLZ.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.txtPLZ.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtPLZ.Location = New System.Drawing.Point(163, 44) + Me.txtPLZ.Name = "txtPLZ" + Me.txtPLZ.Size = New System.Drawing.Size(99, 26) + Me.txtPLZ.TabIndex = 257 + Me.txtPLZ.Text = "plz" + ' 'cbxLand ' Me.cbxLand._allowedValuesFreiText = Nothing @@ -390,10 +468,32 @@ Partial Class frmKundenKontakteDetails Me.cbxLand.DropDownWidth = 150 Me.cbxLand.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.0!) Me.cbxLand.FormattingEnabled = True - Me.cbxLand.Location = New System.Drawing.Point(120, 303) + Me.cbxLand.Location = New System.Drawing.Point(116, 44) Me.cbxLand.Name = "cbxLand" Me.cbxLand.Size = New System.Drawing.Size(41, 26) - Me.cbxLand.TabIndex = 205 + Me.cbxLand.TabIndex = 256 + ' + 'txtOrt + ' + Me.txtOrt.BackColor = System.Drawing.Color.White + Me.txtOrt.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.txtOrt.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtOrt.Location = New System.Drawing.Point(268, 44) + Me.txtOrt.Name = "txtOrt" + Me.txtOrt.Size = New System.Drawing.Size(229, 26) + Me.txtOrt.TabIndex = 255 + Me.txtOrt.Text = "ort" + ' + 'txtStrasse + ' + Me.txtStrasse.BackColor = System.Drawing.Color.White + Me.txtStrasse.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.txtStrasse.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtStrasse.Location = New System.Drawing.Point(48, 12) + Me.txtStrasse.Name = "txtStrasse" + Me.txtStrasse.Size = New System.Drawing.Size(449, 26) + Me.txtStrasse.TabIndex = 254 + Me.txtStrasse.Text = "adresse" ' 'cboMannFrau ' @@ -402,82 +502,100 @@ Partial Class frmKundenKontakteDetails Me.cboMannFrau._value = "" Me.cboMannFrau.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.0!) Me.cboMannFrau.FormattingEnabled = True - Me.cboMannFrau.Location = New System.Drawing.Point(52, 239) + Me.cboMannFrau.Location = New System.Drawing.Point(43, 177) Me.cboMannFrau.Name = "cboMannFrau" Me.cboMannFrau.Size = New System.Drawing.Size(54, 26) - Me.cboMannFrau.TabIndex = 6 + Me.cboMannFrau.TabIndex = 250 ' - 'cboKontaktArt + 'lblAnsprechpartnerVN ' - Me.cboKontaktArt._allowedValuesFreiText = Nothing - Me.cboKontaktArt._allowFreiText = False - Me.cboKontaktArt._value = "" - Me.cboKontaktArt.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) - Me.cboKontaktArt.FormattingEnabled = True - Me.cboKontaktArt.Location = New System.Drawing.Point(9, 29) - Me.cboKontaktArt.Name = "cboKontaktArt" - Me.cboKontaktArt.Size = New System.Drawing.Size(495, 28) - Me.cboKontaktArt.TabIndex = 1 + Me.lblAnsprechpartnerVN.BackColor = System.Drawing.Color.White + Me.lblAnsprechpartnerVN.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.lblAnsprechpartnerVN.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblAnsprechpartnerVN.Location = New System.Drawing.Point(96, 177) + Me.lblAnsprechpartnerVN.Name = "lblAnsprechpartnerVN" + Me.lblAnsprechpartnerVN.Size = New System.Drawing.Size(200, 26) + Me.lblAnsprechpartnerVN.TabIndex = 251 + Me.lblAnsprechpartnerVN.Text = "ansprechpartner" + ' + 'lblAnsprechpartnerNN + ' + Me.lblAnsprechpartnerNN.BackColor = System.Drawing.Color.White + Me.lblAnsprechpartnerNN.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.lblAnsprechpartnerNN.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblAnsprechpartnerNN.Location = New System.Drawing.Point(295, 177) + Me.lblAnsprechpartnerNN.Name = "lblAnsprechpartnerNN" + Me.lblAnsprechpartnerNN.Size = New System.Drawing.Size(200, 26) + Me.lblAnsprechpartnerNN.TabIndex = 252 + Me.lblAnsprechpartnerNN.Text = "ansprechpartner" + ' + 'PictureBox5 + ' + Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.PictureBox5.Image = Global.SDL.My.Resources.Resources.person + Me.PictureBox5.Location = New System.Drawing.Point(0, 180) + Me.PictureBox5.Name = "PictureBox5" + Me.PictureBox5.Size = New System.Drawing.Size(25, 18) + Me.PictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom + Me.PictureBox5.TabIndex = 253 + Me.PictureBox5.TabStop = False + ' + 'pnlMain + ' + Me.pnlMain.Controls.Add(Me.lbl) + Me.pnlMain.Controls.Add(Me.pnlGeschaeftsfuehrer) + Me.pnlMain.Controls.Add(Me.cboKontaktArt) + Me.pnlMain.Controls.Add(Me.pnlKontakt) + Me.pnlMain.Location = New System.Drawing.Point(7, 12) + Me.pnlMain.Name = "pnlMain" + Me.pnlMain.Size = New System.Drawing.Size(513, 405) + Me.pnlMain.TabIndex = 12 ' 'frmKundenKontakteDetails ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(521, 409) - Me.Controls.Add(Me.Label4) - Me.Controls.Add(Me.Label3) - Me.Controls.Add(Me.PictureBox10) - Me.Controls.Add(Me.PictureBox9) - Me.Controls.Add(Me.PictureBox8) - Me.Controls.Add(Me.txtGebDatum) - Me.Controls.Add(Me.txtPLZ) - Me.Controls.Add(Me.cbxLand) - Me.Controls.Add(Me.txtOrt) - Me.Controls.Add(Me.txtStrasse) - Me.Controls.Add(Me.Label2) - Me.Controls.Add(Me.Label1) - Me.Controls.Add(Me.lblEmailBCC) - Me.Controls.Add(Me.PictureBox7) - Me.Controls.Add(Me.lblEmailCC) - Me.Controls.Add(Me.PictureBox6) - Me.Controls.Add(Me.cboMannFrau) - Me.Controls.Add(Me.lblAnsprechpartnerVN) - Me.Controls.Add(Me.cboKontaktArt) - Me.Controls.Add(Me.lbl) - Me.Controls.Add(Me.PictureBox1) - Me.Controls.Add(Me.lblAnsprechpartnerNN) - Me.Controls.Add(Me.lblMobil) - Me.Controls.Add(Me.lblFax) - Me.Controls.Add(Me.lblEmail) - Me.Controls.Add(Me.PictureBox4) - Me.Controls.Add(Me.PictureBox2) - Me.Controls.Add(Me.lblTel) - Me.Controls.Add(Me.PictureBox3) - Me.Controls.Add(Me.PictureBox5) + Me.ClientSize = New System.Drawing.Size(542, 481) + Me.Controls.Add(Me.pnlMain) Me.Controls.Add(Me.btn) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.Name = "frmKundenKontakteDetails" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Kunden Kontakt" + Me.pnlKontakt.ResumeLayout(False) + Me.pnlKontakt.PerformLayout() + CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit() + Me.pnlGeschaeftsfuehrer.ResumeLayout(False) + Me.pnlGeschaeftsfuehrer.PerformLayout() + CType(Me.picBoxKorr, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit() + Me.pnlMain.ResumeLayout(False) + Me.pnlMain.PerformLayout() Me.ResumeLayout(False) - Me.PerformLayout() End Sub Friend WithEvents btn As Button + Friend WithEvents lbl As Label + Friend WithEvents cboKontaktArt As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents pnlKontakt As Panel + Friend WithEvents Label2 As Label + Friend WithEvents Label1 As Label + Friend WithEvents lblEmailBCC As TextBox + Friend WithEvents PictureBox7 As PictureBox + Friend WithEvents lblEmailCC As TextBox + Friend WithEvents PictureBox6 As PictureBox Friend WithEvents PictureBox1 As PictureBox - Friend WithEvents lblAnsprechpartnerNN As TextBox Friend WithEvents lblMobil As TextBox Friend WithEvents lblFax As TextBox Friend WithEvents lblEmail As TextBox @@ -485,25 +603,24 @@ Partial Class frmKundenKontakteDetails Friend WithEvents PictureBox2 As PictureBox Friend WithEvents lblTel As TextBox Friend WithEvents PictureBox3 As PictureBox - Friend WithEvents PictureBox5 As PictureBox - Friend WithEvents lbl As Label - Friend WithEvents cboKontaktArt As VERAG_PROG_ALLGEMEIN.MyComboBox - Friend WithEvents lblAnsprechpartnerVN As TextBox - Friend WithEvents cboMannFrau As VERAG_PROG_ALLGEMEIN.MyComboBox - Friend WithEvents lblEmailCC As TextBox - Friend WithEvents PictureBox6 As PictureBox - Friend WithEvents lblEmailBCC As TextBox - Friend WithEvents PictureBox7 As PictureBox - Friend WithEvents Label1 As Label - Friend WithEvents Label2 As Label - Friend WithEvents txtStrasse As TextBox - Friend WithEvents txtOrt As TextBox - Friend WithEvents cbxLand As VERAG_PROG_ALLGEMEIN.MyComboBox - Friend WithEvents txtPLZ As TextBox - Friend WithEvents txtGebDatum As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents PictureBox8 As PictureBox - Friend WithEvents PictureBox9 As PictureBox - Friend WithEvents PictureBox10 As PictureBox - Friend WithEvents Label3 As Label + Friend WithEvents pnlGeschaeftsfuehrer As Panel + Friend WithEvents picBoxKorr As PictureBox + Friend WithEvents Label5 As Label + Friend WithEvents txtPassgueltigbis As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtKorrAdd As TextBox Friend WithEvents Label4 As Label + Friend WithEvents Label3 As Label + Friend WithEvents PictureBox10 As PictureBox + Friend WithEvents PictureBox9 As PictureBox + Friend WithEvents PictureBox8 As PictureBox + Friend WithEvents txtGebDatum As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtPLZ As TextBox + Friend WithEvents cbxLand As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents txtOrt As TextBox + Friend WithEvents txtStrasse As TextBox + Friend WithEvents cboMannFrau As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents lblAnsprechpartnerVN As TextBox + Friend WithEvents lblAnsprechpartnerNN As TextBox + Friend WithEvents PictureBox5 As PictureBox + Friend WithEvents pnlMain As Panel End Class diff --git a/SDL/kunden/frmKundenKontakteDetails.resx b/SDL/kunden/frmKundenKontakteDetails.resx index c830b5b5..f0e69382 100644 --- a/SDL/kunden/frmKundenKontakteDetails.resx +++ b/SDL/kunden/frmKundenKontakteDetails.resx @@ -118,7 +118,49 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + + iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAYAAABccqhmAAAABGdBTUEAALGPC/xhBQAACHtJREFUeF7t + 3Y1xJDUQBtALhVAIhUwIhVAIhVDg+uoG7EXr/Z0Z9af3qr4qCrDP9mqkVkvr+wYAAAAAAAAAAAAAAAAA + AAAAAAAAAMD7/PI9v37Pbz/z+4f8Mcj237b/vz62PgcwsXpIt4f3z+/563v+fmPq81Xqc9dEsU0OwMG2 + VX172EcP7FHZJoX6WkwIsJNthT/7gb+VrVKor9XWAV7Q5aH/KiYDeFD3h/5atskAuLCt9qMHJy2qAvhp + pQf/MjUR1ImCiYDl1KCvwT96MFZM/SycIhBv5RX/nqgIiOXBvy+ahUSp0rYG9Wiwy/XUz6xuHEJLVcom + HucdnfoZ2hbQSq36o8Esz8W2gDbs9feLSYBpKfmPSVUDtgRMpZpVo8Eq+8SWgGm40HNeTAKcSsl/fmoC + hsN5+OdJbQngEJp9c0ZzkN3VAKuBNhqAcn5MAuymBtZo0MlcMQnwdjWglP19YhLgrTz8/VKTALzMw983 + JgFe4uHvH/cEeIobfjlxY5CHeDtvXkwC3MVxX2aqH+AXj3KTfX9uNAX5UpWJo4EjOdEUZMi+f53YCvCJ + ff9acVOQT+z710u95qD0Xzi2AvwoB0eDQ/LjVGBxuv7igtDCRgNC1oqG4KLc9Zct7gYsRuNPLqMhuBDH + fnIZx4KLcOlHrkUVsAB7f7kWvYAFjF54kYoTgXDO/eVWVAHB3PqTW3E7MJS/wlvuTY0Vwqx+9FcrW/0M + qsStrVClBvqW+vcVR6SOBCONXuj01ENfD/qjx1vVCKuPqY9ddUJwJBhktfK/Htx3qgmhPufoz0rNu3+G + nGiVVWzvQbvSRGAbEGT0Aiel9u5Hnl+vMhHYBgRIL//r+ztL+iRgGxAg9ey/vq8ZVqiqBlJ/xrYBAUYv + bPfUA3dkyX9L6iRQ3xONJZb/s65KNQkkNlv1ARpL26POtvJfSqwE9AEaq+746EXtmg6rUU0Co6+9a/QB + Ghu9oF1zZrf/UUlbL32Apmq1HL2gHdNxFUqqvvQBGkpahWbe91+TtBXQB2goZQWq76OrlNfABNBQyuDr + uPpvUqoAjcCGEo6jOq/+m4SJWCOwodEL2S2dV/9NQhVgAmho9EJ2StKgS7ghmDAZLyPhBCCh/N8k3Mh0 + FNhIwgSQNOAS7mR0uoi1vIQJIElCH8AE0Ej3kjPx2Kl7H8BdgEa6TwBJ+/9N9+NAE0Aj3Qdb4gTQfVI2 + ATRitZmPqozDdJ8AEhtO3RuzJoBGTADzMQFwmO4TgC3AfDEBNNJ9sCVOAN0nZRNAI90ngMR7AKoyDmMC + mI+LQBym+wSQ+PbT0ffZKa4CN5Lw5pOkNwN1PwGomAAaSZgAkkrO7vv/it8H0IjfQjOX+l5G32OnmACa + Gb2I3ZKyDRh9b91CMwmrTsLZc0L5n9iUjdf92KlSA6976Tn6vrrFJaCGuh8Fbuk8+BJW/4o7AA0lnARU + qgro2AtIaMRucQTYUNIA7FgFJGzBtjgBaGr0YnZNpzI04eLPx9BU0irUZSuQsvXaogHYWEojcMvspwJJ + 264tJoDG0lajysxn0kkV1xYNwMYSV6TKbJVAfS2JD39l5oqLO6QOzJoEZlidEqusLTV2aC6tD/AxNQmc + eTqQ1u2/jP1/gOQVaksN1CNL1fqz6s8cfS1Jsf8PUIN19OKmZasG9pwI6nMnV1SXIURqH2CUPSaC1R78 + ivI/SPpe9VpqMqiB/MwFou2hr88x+tzpUf4HqcE8epFXSj3IVQnVhFCph7sGeaX+uVL/fqVq6au8s4Ji + Aga2PBLCrLaHledj/x/INkDujfI/lG2A3Er1SghlGyC3ovsfzDZAbkX5H842QK6lxgbhVr0UJLej/F+A + bYBcC4uwDZDLOPtfyApvEZbH8sz7JWhMFSAfw2I0A2WL5t+CNANli7P/RVXjZzQgZJ1o/i1MFSCaf4vT + DFw3bv7hSHDhaP7xYxugClgz8IMjwfVi9edfmoHrBT5RBayT+sUw8IkqYJ24+MOQi0H5cfGHq1QB+bH6 + 8yVVQG6s/tykCsiN1Z+7qALyYvXnbqqAvFj9eYgqICdWfx6mCsiJ1Z+n+KvE+setP56mCugfeIn3CPSN + 1Z+XVRVQf2X0aIDJ3IG3UAX0i/f78zZVBfitQX1SFRu8ld8d2Cd+0y+7UAXMH7/pl904Fpw/Vn925Yrw + vHHll92pAuZNvTawO8eC88WxH4dxLDhXHPtxOMeC80Tjj1NoCJ4fjT9OoyF4fjT+OJWG4Hnxbj9OpyF4 + TjT+mIaG4PHR+GMqGoLHReOP6WgIHheYkobg/nHjj6lpCO4Xb/VlerYC+0XjjxZsBd4fZ/604W7Ae6P0 + px1bgfdF6U9L/mqx16P0py1bgdfiui/t2Qo8H6U/EWwFHo/Snxi2Ao9F6U8cW4H7o/Qnkq3A7Sj9iWUr + 8HVc+CGercD1KP1Zgq3A/6P0Zxm2Ap+j9Gc5tgL/pX4WsBxvG7bvZ3Er/zJRpT/Lq/K3br6NHpDkuO0H + P1UZPHpIkqP0hw9WOhp05AcXVjkatO+HK1Y4GlT6wxeSjwY9/HCHxH6A0h/ulHY06MgPHpTUD1D6wxMS + +gEefnhB56vC9v3woq79APt+eJOO/QClP7xRp36Ahx920OF+gH0/7KS2AjO/X8C+H3Y2cz9A6Q8HmLEf + 4OGHA83UD/D+fjjYLP0ATT84ydmXhDT94GRnNgXt+2ECZzQFPfwwkSObgpp+MJmjmoKafjCpvZuCmn4w + uT2bgvb90MAeTUEPPzTyzqagph809I5fJ6bpB029ejLg4Yfmnj0ZqI+pjwWae+ZkQNMPgjxyMuDhh0D3 + nAzo+EOwryYBTT8Id+1kwMMPi7g8GXDHHxazTQKO+2BR9eDr+AMAAAAAAAAAAAAAAAAAAAAAAAAAABzj + 27d/ABBabbXEUZDWAAAAAElFTkSuQmCC + + + iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAYAAABccqhmAAAABGdBTUEAALGPC/xhBQAACHtJREFUeF7t 3Y1xJDUQBtALhVAIhUwIhVAIhVDg+uoG7EXr/Z0Z9af3qr4qCrDP9mqkVkvr+wYAAAAAAAAAAAAAAAAA @@ -211,7 +253,7 @@ 5YK/CrjgMXgAAAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAYAAABccqhmAAAABGdBTUEAALGPC/xhBQAACHtJREFUeF7t 3Y1xJDUQBtALhVAIhUwIhVAIhVDg+uoG7EXr/Z0Z9af3qr4qCrDP9mqkVkvr+wYAAAAAAAAAAAAAAAAA diff --git a/SDL/kunden/frmKundenKontakteDetails.vb b/SDL/kunden/frmKundenKontakteDetails.vb index 8e53b751..89e46b96 100644 --- a/SDL/kunden/frmKundenKontakteDetails.vb +++ b/SDL/kunden/frmKundenKontakteDetails.vb @@ -39,7 +39,6 @@ If kkd_id > 0 Then KD_KONTAKT = New VERAG_PROG_ALLGEMEIN.cKundenKontakte(kkd_id) - Else KD_KONTAKT = Nothing End If @@ -64,8 +63,10 @@ txtOrt.Text = If(KD_KONTAKT.kkd_Ort, "") txtStrasse.Text = If(KD_KONTAKT.kkd_Adresse, "") txtPLZ.Text = If(KD_KONTAKT.kkd_PLZ, "") + txtKorrAdd.Text = If(KD_KONTAKT.kkd_Firmenname, "") If Not IsDBNull(KD_KONTAKT.kkd_Land) Then cbxLand.changeItem(KD_KONTAKT.kkd_Land) txtGebDatum.Text = IIf(Not IsDBNull(KD_KONTAKT.kkd_GebDatum) AndAlso IsDate(KD_KONTAKT.kkd_GebDatum), CDate(KD_KONTAKT.kkd_GebDatum), "") + txtPassgueltigbis.Text = IIf(Not IsDBNull(KD_KONTAKT.kkd_Passgueltigbis) AndAlso IsDate(KD_KONTAKT.kkd_Passgueltigbis), CDate(KD_KONTAKT.kkd_Passgueltigbis), "") End Sub @@ -88,6 +89,8 @@ KD_KONTAKT.kkd_Mobil = lblMobil.Text KD_KONTAKT.kkd_GebDatum = IIf(txtGebDatum.Text <> "" AndAlso IsDate(txtGebDatum.Text), txtGebDatum.Text, "") + KD_KONTAKT.kkd_Passgueltigbis = IIf(txtPassgueltigbis.Text <> "" AndAlso IsDate(txtPassgueltigbis.Text), txtPassgueltigbis.Text, "") + KD_KONTAKT.kkd_Firmenname = txtKorrAdd.Text KD_KONTAKT.kkd_Ort = txtOrt.Text KD_KONTAKT.kkd_Land = cbxLand._value KD_KONTAKT.kkd_PLZ = txtPLZ.Text @@ -101,4 +104,24 @@ Me.Close() End Sub + Private Sub cboKontaktArt_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboKontaktArt.SelectedIndexChanged + + + If cboKontaktArt._value = "13" Then + pnlGeschaeftsfuehrer.Visible = True + Else + pnlGeschaeftsfuehrer.Visible = False + End If + + If cboKontaktArt._value = "14" Then + txtKorrAdd.Visible = True + picBoxKorr.Visible = True + Else + txtKorrAdd.Visible = False + picBoxKorr.Visible = False + + End If + End Sub + + End Class diff --git a/SDL/kunden/usrCntlOfferte.vb b/SDL/kunden/usrCntlOfferte.vb index 4ab4df9d..20d974cb 100644 --- a/SDL/kunden/usrCntlOfferte.vb +++ b/SDL/kunden/usrCntlOfferte.vb @@ -36,14 +36,14 @@ Public Class usrCntlOfferte End Sub - Public Sub init(kdNr As Integer, Optional isVerag360 As Boolean = False) + Public Sub init(kdNr As Integer, Optional _isVerag360 As Boolean = False) Me.kdNr = kdNr initDGVOfferte() edit = False handleEditMode(edit) KD_ERW = New VERAG_PROG_ALLGEMEIN.cKundenErweitert(kdNr) cbxAutoFakturierung.Checked = KD_ERW.AutoFakturierung - isVerag360 = isVerag360 + isVerag360 = _isVerag360 End Sub Sub initDGVOfferte() @@ -187,7 +187,7 @@ Public Class usrCntlOfferte Private Sub usrCntlOfferte_Load(sender As Object, e As EventArgs) Handles Me.Load - init(kdNr) + init(kdNr, isVerag360) ' sbLeistungAdd.initSearchBox(Me.FindForm, " [Code] ,[LeistungsNr],[LeistungsBez] FROM [Leistungen]", {"LeistungsNr", "LeistungsBez"}, " ", "LeistungsNr", "LeistungsNr", , "FMZOLL", , 400, 200) cboLeistungenAdd.fillWithSQL("SELECT [LeistungsNr],[LeistungsBez] FROM [Leistungen] ORDER BY LeistungsNr", , "FMZOLL", True) diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb index b0366417..624648e3 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb @@ -22,22 +22,22 @@ Partial Class usrcntlKundeBearbeitenFull 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() - 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() - Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle32 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.tbcntrDetails = New System.Windows.Forms.TabControl() Me.tbAbfertigung = New System.Windows.Forms.TabPage() Me.cbxVerzolltBeiExport = New System.Windows.Forms.CheckBox() @@ -48,11 +48,9 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboFremdspedition = New System.Windows.Forms.ComboBox() Me.cbxVerzolltBei = New System.Windows.Forms.CheckBox() Me.cbxBesonderheitenNEU = New System.Windows.Forms.CheckBox() - Me.UsrCntlKundenBesonderheiten1 = New SDL.usrCntlKundenBesonderheiten() Me.tbcntrAbf = New System.Windows.Forms.TabControl() Me.TabPage4 = New System.Windows.Forms.TabPage() Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel() - Me.UsrCntlKundenAvisoMailBenachrichtigung1 = New SDL.usrCntlKundenAvisoMailBenachrichtigung() Me.rtbLKWFreigabeSenden = New System.Windows.Forms.RichTextBox() Me.Label18 = New System.Windows.Forms.Label() Me.TabPage3 = New System.Windows.Forms.TabPage() @@ -66,7 +64,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboAbfVerb_Abfertigungsverbot = New System.Windows.Forms.CheckBox() Me.txtAbfVerb_AbfertigungsverbotSeit = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.tbAufschub = New System.Windows.Forms.TabPage() - Me.usrCntlAufschubkonten = New SDL.usrCntlAufschubkonten() Me.TabPage1 = New System.Windows.Forms.TabPage() Me.Label78 = New System.Windows.Forms.Label() Me.cbxAbf_ZollVM = New System.Windows.Forms.CheckBox() @@ -91,7 +88,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.rtbAbf_Besonderheiten = New System.Windows.Forms.RichTextBox() Me.Panel1 = New System.Windows.Forms.Panel() Me.tbFiskal = New System.Windows.Forms.TabPage() - Me.UsrCntlKundeFiskaldaten1 = New SDL.usrCntlKundeFiskaldaten() Me.tbVerrechnung = New System.Windows.Forms.TabPage() Me.cbxKapitalWaehrung = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label103 = New System.Windows.Forms.Label() @@ -336,7 +332,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbKontakt = New System.Windows.Forms.TabControl() Me.TabPage10 = New System.Windows.Forms.TabPage() Me.TabPage11 = New System.Windows.Forms.TabPage() - Me.ucKundenKontakte = New SDL.usrCntlKundenKontakte() Me.Label50 = New System.Windows.Forms.Label() Me.Label68 = New System.Windows.Forms.Label() Me.pnlNeukunde = New System.Windows.Forms.Panel() @@ -358,6 +353,11 @@ Partial Class usrcntlKundeBearbeitenFull Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboAuswahl = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.ucKundenKontakte = New SDL.usrCntlKundenKontakte() + Me.UsrCntlKundenBesonderheiten1 = New SDL.usrCntlKundenBesonderheiten() + Me.UsrCntlKundenAvisoMailBenachrichtigung1 = New SDL.usrCntlKundenAvisoMailBenachrichtigung() + Me.usrCntlAufschubkonten = New SDL.usrCntlAufschubkonten() + Me.UsrCntlKundeFiskaldaten1 = New SDL.usrCntlKundeFiskaldaten() Me.tbcntrDetails.SuspendLayout() Me.tbAbfertigung.SuspendLayout() Me.tbcntrAbf.SuspendLayout() @@ -535,16 +535,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.cbxBesonderheitenNEU.Text = "Besonderheiten NEU" Me.cbxBesonderheitenNEU.UseVisualStyleBackColor = True ' - 'UsrCntlKundenBesonderheiten1 - ' - Me.UsrCntlKundenBesonderheiten1.BackColor = System.Drawing.Color.White - Me.UsrCntlKundenBesonderheiten1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.UsrCntlKundenBesonderheiten1.Location = New System.Drawing.Point(6, 25) - Me.UsrCntlKundenBesonderheiten1.Name = "UsrCntlKundenBesonderheiten1" - Me.UsrCntlKundenBesonderheiten1.Size = New System.Drawing.Size(107, 52) - Me.UsrCntlKundenBesonderheiten1.TabIndex = 235 - Me.UsrCntlKundenBesonderheiten1.Visible = False - ' 'tbcntrAbf ' Me.tbcntrAbf.Controls.Add(Me.TabPage4) @@ -579,15 +569,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.FlowLayoutPanel1.Size = New System.Drawing.Size(200, 100) Me.FlowLayoutPanel1.TabIndex = 7 ' - 'UsrCntlKundenAvisoMailBenachrichtigung1 - ' - Me.UsrCntlKundenAvisoMailBenachrichtigung1.AutoScroll = True - Me.UsrCntlKundenAvisoMailBenachrichtigung1.BackColor = System.Drawing.Color.White - Me.UsrCntlKundenAvisoMailBenachrichtigung1.Location = New System.Drawing.Point(0, 6) - Me.UsrCntlKundenAvisoMailBenachrichtigung1.Name = "UsrCntlKundenAvisoMailBenachrichtigung1" - Me.UsrCntlKundenAvisoMailBenachrichtigung1.Size = New System.Drawing.Size(479, 172) - Me.UsrCntlKundenAvisoMailBenachrichtigung1.TabIndex = 6 - ' 'rtbLKWFreigabeSenden ' Me.rtbLKWFreigabeSenden.Location = New System.Drawing.Point(485, 33) @@ -756,14 +737,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbAufschub.Text = "Aufschubkonten" Me.tbAufschub.UseVisualStyleBackColor = True ' - 'usrCntlAufschubkonten - ' - Me.usrCntlAufschubkonten.Dock = System.Windows.Forms.DockStyle.Fill - Me.usrCntlAufschubkonten.Location = New System.Drawing.Point(3, 3) - Me.usrCntlAufschubkonten.Name = "usrCntlAufschubkonten" - Me.usrCntlAufschubkonten.Size = New System.Drawing.Size(652, 172) - Me.usrCntlAufschubkonten.TabIndex = 0 - ' 'TabPage1 ' Me.TabPage1.Controls.Add(Me.Label78) @@ -1069,15 +1042,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbFiskal.Text = "Fiskal" Me.tbFiskal.UseVisualStyleBackColor = True ' - 'UsrCntlKundeFiskaldaten1 - ' - Me.UsrCntlKundeFiskaldaten1.BackColor = System.Drawing.Color.White - Me.UsrCntlKundeFiskaldaten1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlKundeFiskaldaten1.Location = New System.Drawing.Point(0, 0) - Me.UsrCntlKundeFiskaldaten1.Name = "UsrCntlKundeFiskaldaten1" - Me.UsrCntlKundeFiskaldaten1.Size = New System.Drawing.Size(672, 495) - Me.UsrCntlKundeFiskaldaten1.TabIndex = 0 - ' 'tbVerrechnung ' Me.tbVerrechnung.Controls.Add(Me.cbxKapitalWaehrung) @@ -2858,8 +2822,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvUmsatzbericht.AllowUserToDeleteRows = False Me.dgvUmsatzbericht.AllowUserToOrderColumns = True Me.dgvUmsatzbericht.AllowUserToResizeRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUmsatzbericht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17 Me.dgvUmsatzbericht.BackgroundColor = System.Drawing.Color.White Me.dgvUmsatzbericht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvUmsatzbericht.Location = New System.Drawing.Point(6, 25) @@ -2958,8 +2922,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvOffenePosten.AllowUserToDeleteRows = False Me.dgvOffenePosten.AllowUserToOrderColumns = True Me.dgvOffenePosten.AllowUserToResizeRows = False - DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle18 Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvOffenePosten.Location = New System.Drawing.Point(6, 38) @@ -3118,41 +3082,41 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvKreditkarten.AllowUserToDeleteRows = False Me.dgvKreditkarten.AllowUserToOrderColumns = True Me.dgvKreditkarten.AllowUserToResizeRows = False - DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvKreditkarten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle19 Me.dgvKreditkarten.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvKreditkarten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle20 Me.dgvKreditkarten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle5 + DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvKreditkarten.DefaultCellStyle = DataGridViewCellStyle21 Me.dgvKreditkarten.Location = New System.Drawing.Point(9, 20) Me.dgvKreditkarten.MultiSelect = False Me.dgvKreditkarten.Name = "dgvKreditkarten" Me.dgvKreditkarten.ReadOnly = True - DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle6 + DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvKreditkarten.RowHeadersDefaultCellStyle = DataGridViewCellStyle22 Me.dgvKreditkarten.RowHeadersVisible = False - DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle7 + DataGridViewCellStyle23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.dgvKreditkarten.RowsDefaultCellStyle = DataGridViewCellStyle23 Me.dgvKreditkarten.RowTemplate.DefaultCellStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.dgvKreditkarten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvKreditkarten.Size = New System.Drawing.Size(642, 312) @@ -3291,26 +3255,26 @@ Partial Class usrcntlKundeBearbeitenFull ' 'dgvUstv_LaenderUndSteuernummern ' - DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8 + DataGridViewCellStyle24.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUstv_LaenderUndSteuernummern.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle24 Me.dgvUstv_LaenderUndSteuernummern.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle9 + DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle25 Me.dgvUstv_LaenderUndSteuernummern.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvUstv_LaenderUndSteuernummern.DefaultCellStyle = DataGridViewCellStyle10 + DataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle26.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvUstv_LaenderUndSteuernummern.DefaultCellStyle = DataGridViewCellStyle26 Me.dgvUstv_LaenderUndSteuernummern.Location = New System.Drawing.Point(9, 94) Me.dgvUstv_LaenderUndSteuernummern.Name = "dgvUstv_LaenderUndSteuernummern" Me.dgvUstv_LaenderUndSteuernummern.Size = New System.Drawing.Size(657, 321) @@ -3547,26 +3511,26 @@ Partial Class usrcntlKundeBearbeitenFull 'dgvSonst_IDSKunden ' Me.dgvSonst_IDSKunden.AllowUserToResizeRows = False - DataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11 + DataGridViewCellStyle27.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvSonst_IDSKunden.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle27 Me.dgvSonst_IDSKunden.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSonst_IDSKunden.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle12 + DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle28.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSonst_IDSKunden.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle28 Me.dgvSonst_IDSKunden.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvSonst_IDSKunden.DefaultCellStyle = DataGridViewCellStyle13 + DataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle29.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvSonst_IDSKunden.DefaultCellStyle = DataGridViewCellStyle29 Me.dgvSonst_IDSKunden.Location = New System.Drawing.Point(9, 251) Me.dgvSonst_IDSKunden.MultiSelect = False Me.dgvSonst_IDSKunden.Name = "dgvSonst_IDSKunden" @@ -3783,26 +3747,26 @@ Partial Class usrcntlKundeBearbeitenFull 'DataGridView1 ' Me.DataGridView1.AllowUserToResizeRows = False - DataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14 + DataGridViewCellStyle30.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle30 Me.DataGridView1.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.DataGridView1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle15 + DataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle31.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.DataGridView1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle31 Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.DataGridView1.DefaultCellStyle = DataGridViewCellStyle16 + DataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle32.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle32.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.DataGridView1.DefaultCellStyle = DataGridViewCellStyle32 Me.DataGridView1.Enabled = False Me.DataGridView1.Location = New System.Drawing.Point(9, 93) Me.DataGridView1.MultiSelect = False @@ -3954,6 +3918,7 @@ Partial Class usrcntlKundeBearbeitenFull ' 'PictureBox5 ' + Me.PictureBox5.BackgroundImage = Global.SDL.My.Resources.Resources.fragezeichen Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.PictureBox5.Location = New System.Drawing.Point(88, 62) Me.PictureBox5.Name = "PictureBox5" @@ -3986,6 +3951,7 @@ Partial Class usrcntlKundeBearbeitenFull ' 'Button13 ' + Me.Button13.BackgroundImage = Global.SDL.My.Resources.Resources.list Me.Button13.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.Button13.FlatAppearance.BorderSize = 0 Me.Button13.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -3997,6 +3963,7 @@ Partial Class usrcntlKundeBearbeitenFull ' 'btnUIDPruef ' + Me.btnUIDPruef.BackgroundImage = Global.SDL.My.Resources.Resources.wait Me.btnUIDPruef.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.btnUIDPruef.FlatAppearance.BorderSize = 0 Me.btnUIDPruef.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -4621,14 +4588,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.TabPage11.Text = "Spezifisch" Me.TabPage11.UseVisualStyleBackColor = True ' - 'ucKundenKontakte - ' - Me.ucKundenKontakte.Dock = System.Windows.Forms.DockStyle.Fill - Me.ucKundenKontakte.Location = New System.Drawing.Point(3, 3) - Me.ucKundenKontakte.Name = "ucKundenKontakte" - Me.ucKundenKontakte.Size = New System.Drawing.Size(439, 169) - Me.ucKundenKontakte.TabIndex = 0 - ' 'Label50 ' Me.Label50.AutoSize = True @@ -4881,6 +4840,50 @@ Partial Class usrcntlKundeBearbeitenFull Me.DataGridViewTextBoxColumn2.HeaderText = "E-Mail" Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" ' + 'ucKundenKontakte + ' + Me.ucKundenKontakte.Dock = System.Windows.Forms.DockStyle.Fill + Me.ucKundenKontakte.Location = New System.Drawing.Point(3, 3) + Me.ucKundenKontakte.Name = "ucKundenKontakte" + Me.ucKundenKontakte.Size = New System.Drawing.Size(439, 169) + Me.ucKundenKontakte.TabIndex = 0 + ' + 'UsrCntlKundenBesonderheiten1 + ' + Me.UsrCntlKundenBesonderheiten1.BackColor = System.Drawing.Color.White + Me.UsrCntlKundenBesonderheiten1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.UsrCntlKundenBesonderheiten1.Location = New System.Drawing.Point(6, 25) + Me.UsrCntlKundenBesonderheiten1.Name = "UsrCntlKundenBesonderheiten1" + Me.UsrCntlKundenBesonderheiten1.Size = New System.Drawing.Size(107, 52) + Me.UsrCntlKundenBesonderheiten1.TabIndex = 235 + Me.UsrCntlKundenBesonderheiten1.Visible = False + ' + 'UsrCntlKundenAvisoMailBenachrichtigung1 + ' + Me.UsrCntlKundenAvisoMailBenachrichtigung1.AutoScroll = True + Me.UsrCntlKundenAvisoMailBenachrichtigung1.BackColor = System.Drawing.Color.White + Me.UsrCntlKundenAvisoMailBenachrichtigung1.Location = New System.Drawing.Point(0, 6) + Me.UsrCntlKundenAvisoMailBenachrichtigung1.Name = "UsrCntlKundenAvisoMailBenachrichtigung1" + Me.UsrCntlKundenAvisoMailBenachrichtigung1.Size = New System.Drawing.Size(479, 172) + Me.UsrCntlKundenAvisoMailBenachrichtigung1.TabIndex = 6 + ' + 'usrCntlAufschubkonten + ' + Me.usrCntlAufschubkonten.Dock = System.Windows.Forms.DockStyle.Fill + Me.usrCntlAufschubkonten.Location = New System.Drawing.Point(3, 3) + Me.usrCntlAufschubkonten.Name = "usrCntlAufschubkonten" + Me.usrCntlAufschubkonten.Size = New System.Drawing.Size(652, 172) + Me.usrCntlAufschubkonten.TabIndex = 0 + ' + 'UsrCntlKundeFiskaldaten1 + ' + Me.UsrCntlKundeFiskaldaten1.BackColor = System.Drawing.Color.White + Me.UsrCntlKundeFiskaldaten1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlKundeFiskaldaten1.Location = New System.Drawing.Point(0, 0) + Me.UsrCntlKundeFiskaldaten1.Name = "UsrCntlKundeFiskaldaten1" + Me.UsrCntlKundeFiskaldaten1.Size = New System.Drawing.Size(672, 495) + Me.UsrCntlKundeFiskaldaten1.TabIndex = 0 + ' 'usrcntlKundeBearbeitenFull ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index a52300be..3ff2a390 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -11,9 +11,7 @@ Imports VERAG_PROG_ALLGEMEIN Public Class frmMDMDatenverarbetiung Public LIEFERANT = "" - Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - ' Dim ProduktCode_NOT_IN = "SELECT plp_ProductCode FROM [tblPLOSE_Produktbeschreibung] WHERE [plp_einarbeiten]=0 " Dim ProduktCode_NOT_IN = "'9020'" Dim datum As Date = Nothing @@ -22,14 +20,6 @@ Public Class frmMDMDatenverarbetiung Me.Height = My.Computer.Screen.WorkingArea.Height End Sub - Private Sub Button4_Click(sender As Object, e As EventArgs) - - End Sub - - Private Sub pnl_Paint(sender As Object, e As PaintEventArgs) Handles pnl.Paint - - End Sub - Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click Select Case LIEFERANT Case "PLOSE" : genSummenbericht_PLOSE() @@ -563,6 +553,7 @@ Public Class frmMDMDatenverarbetiung Sub initDgv_PLOSE() With MyDatagridview1 + .Columns.Clear() .SET_SQL(" SELECT plose_POLSEKundennummer, count(*) Anzahl,plose_ProduktCode,max(plose_Produktbeschreibung) as plose_Produktbeschreibung, sum(plose_Menge) as plose_Menge,sum(plose_Preis) as plose_Preis,sum(plose_NettobetragWaehrungAbbuchung) as plose_NettobetragWaehrungAbbuchung,sum(plose_MWSTBetragWaehrungAbbuchung) as plose_MWSTBetragWaehrungAbbuchung,sum(plose_BruttobetragWaehrungAbbuchung) as plose_BruttobetragWaehrungAbbuchung FROM tblPLOSE_Details @@ -1535,7 +1526,7 @@ Public Class frmMDMDatenverarbetiung Return True Catch ex As System.Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return False @@ -1663,7 +1654,7 @@ Public Class frmMDMDatenverarbetiung Return True Catch ex As System.Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return False @@ -1767,7 +1758,7 @@ Public Class frmMDMDatenverarbetiung Return True Catch ex As System.Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return False @@ -1856,7 +1847,7 @@ Public Class frmMDMDatenverarbetiung Return True Catch ex As System.Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return False @@ -1902,7 +1893,7 @@ Public Class frmMDMDatenverarbetiung Return True Catch ex As System.Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return False @@ -2047,7 +2038,7 @@ Public Class frmMDMDatenverarbetiung Return tmpPath Catch ex As System.Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return "" @@ -2237,7 +2228,7 @@ Public Class frmMDMDatenverarbetiung Return tmpPath Catch ex As System.Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return "" @@ -2424,7 +2415,7 @@ Public Class frmMDMDatenverarbetiung Return tmpPath Catch ex As System.Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return "" @@ -2591,7 +2582,7 @@ Public Class frmMDMDatenverarbetiung Return tmpPath Catch ex As System.Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return "" @@ -2656,7 +2647,7 @@ Public Class frmMDMDatenverarbetiung Return SPEDBUCH.SAVE Catch ex As System.Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return False @@ -2954,6 +2945,7 @@ Public Class frmMDMDatenverarbetiung Case "ASFINAG" useNettogesamtbetrag = True + sqlstr = "SELECT '135' as LeistungsNr, 'MAUT AT lt. Auslage' as ProductCode, sum([netAmount]) as Netto ,sum([VATamount]) as Vatamount ,sum([totalAmount]) as Brutto FROM Kreditkarten INNER JOIN tblAsfinagMaut ON Kreditkarten.KartenNr = tblAsfinagMaut.cardnumber Where Kreditkarten.AdressenNr= '" & KD.KundenNr & "' and tblAsfinagMaut.VATamount <> 0 group by Kreditkarten.AdressenNr UNION SELECT '153' as LeistungsNr, 'MAUT AT lt. Auslage' as ProductCode, sum([netAmount]) as Netto ,sum([VATamount]) as Vatamount ,sum([totalAmount]) as Brutto FROM Kreditkarten INNER JOIN tblAsfinagMaut ON Kreditkarten.KartenNr = tblAsfinagMaut.cardnumber Where Kreditkarten.AdressenNr= '" & KD.KundenNr & "' and tblAsfinagMaut.VATamount = 0 group by Kreditkarten.AdressenNr" @@ -3081,18 +3073,12 @@ Public Class frmMDMDatenverarbetiung Call usrCntlFaktAbrechnung.przFixeTaxe(RG) ' Fixe Taxe errechnen Call usrCntlFaktAbrechnung.przPP(RG) ' Porto/Papiere errechnen - Call usrCntlFaktAbrechnung.przBS415(RG) ' Bankspesen errechnen - If RG.SAVE Then - - Return True - Else - Return False - End If + Return RG.SAVE Catch ex As System.Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return "" @@ -3144,7 +3130,7 @@ Public Class frmMDMDatenverarbetiung End If Next Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return False End Function @@ -3176,7 +3162,7 @@ Public Class frmMDMDatenverarbetiung Return True Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return False End Function @@ -3221,7 +3207,7 @@ Public Class frmMDMDatenverarbetiung End If Next Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return False End Function @@ -3335,7 +3321,7 @@ Public Class frmMDMDatenverarbetiung Next lblProzPruef.Text = CInt(cnt / MyDatagridview1.Rows.Count() * 100) & " %" '100 Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) pruefData_PLOSE = False End Try End Function @@ -3380,7 +3366,7 @@ Public Class frmMDMDatenverarbetiung cbxASFINAGAbgerechnet.Checked = True End If Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) pruefData_ASFINAG = False End Try End Function @@ -3505,7 +3491,7 @@ Public Class frmMDMDatenverarbetiung End If Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) pruefData_MSE = False End Try End Function @@ -3573,7 +3559,7 @@ Public Class frmMDMDatenverarbetiung Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) pruefData_PLOSE_old = False End Try End Function @@ -3582,7 +3568,7 @@ Public Class frmMDMDatenverarbetiung Private Sub MyDatagridview1_SelectionChanged(sender As Object, e As EventArgs) Handles MyDatagridview1.SelectionChanged If MyDatagridview1.SelectedRows.Count > 0 Then If MyDatagridview1.Columns("VERAGKdNr") IsNot Nothing Then - If MyDatagridview1.SelectedRows(0).Cells("VERAGKdNr").Value <> "" Then + If IsNumeric(MyDatagridview1.SelectedRows(0).Cells("VERAGKdNr").Value) AndAlso MyDatagridview1.SelectedRows(0).Cells("VERAGKdNr").Value > 0 Then btnKunde.Enabled = True Else btnKunde.Enabled = False @@ -3594,7 +3580,7 @@ Public Class frmMDMDatenverarbetiung Private Sub btnKunde_Click(sender As Object, e As EventArgs) Handles btnKunde.Click If MyDatagridview1.SelectedRows.Count > 0 Then If MyDatagridview1.Columns("VERAGKdNr") IsNot Nothing Then - If MyDatagridview1.SelectedRows(0).Cells("VERAGKdNr").Value <> "" Then + If IsNumeric(MyDatagridview1.SelectedRows(0).Cells("VERAGKdNr").Value) AndAlso MyDatagridview1.SelectedRows(0).Cells("VERAGKdNr").Value > 0 Then cProgramFunctions.openKundenblatt(MyDatagridview1.SelectedRows(0).Cells("VERAGKdNr").Value, Me.FindForm) End If End If @@ -3703,7 +3689,7 @@ Public Class frmMDMDatenverarbetiung MsgBox("Ergebnis: " & ergebnis) Catch ex As System.Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try End Sub diff --git a/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb b/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb index 5a6e5ce4..a504ea41 100644 --- a/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb +++ b/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb @@ -1134,6 +1134,8 @@ Public Class cAvisoDAL sql = hSQL End If + If sql = "" Then Return Nothing 'weder ID noch hSQL + Dim daten As cAviso = Nothing Dim conn As SqlConnection = cDatenbankAVISO.GetNewOpenConnection() Using cmd As New SqlCommand(sql, conn) diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cKundenKontakte.vb b/VERAG_PROG_ALLGEMEIN/Classes/cKundenKontakte.vb index 6d39563f..220dbce5 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cKundenKontakte.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cKundenKontakte.vb @@ -101,6 +101,10 @@ Public Class cKundenKontakte Property kkd_Adresse As Object = Nothing Property kkd_GebDatum As Object = Nothing Property kkd_Land As Object = Nothing + Property kkd_Passgueltigbis As Object = Nothing + Property kkd_Firmenname As Object = Nothing + + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL @@ -136,6 +140,8 @@ Public Class cKundenKontakte list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kkd_PLZ", kkd_PLZ)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kkd_GebDatum", kkd_GebDatum)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kkd_Land", kkd_Land)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kkd_Passgueltigbis", kkd_Passgueltigbis)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kkd_Firmenname", kkd_Firmenname)) Return list diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb index 82116e63..fb938243 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb @@ -740,11 +740,13 @@ Public Class cRechnungsausgang 'l.BGebBgl = l.Preis If Not l.Steuerpflichtig Then - l.SteuerpflichtigerBetrag = l.Preis + 'l.SteuerpflichtigerBetrag = l.Preis 'alt + l.SteuerfreierBetrag = l.Preis 'neu l.Preis = l.Preis Else Dim steuersatz = SQL.DLookup("Steuertabelle.[Steuersatz %] ", "[Kunden] inner join Steuertabelle on Steuertabelle.Steuerschlüssel=kunden.Steuerschlüssel", "KundenNr='" & Me.RechnungsKundenNr & "'", "FMZOLL", "0") - l.SteuerfreierBetrag = l.Preis + (l.Preis * steuersatz) + 'l.SteuerfreierBetrag = l.Preis + (l.Preis * steuersatz) 'alt + l.SteuerpflichtigerBetrag = l.Preis + (l.Preis * steuersatz) 'neu l.Preis = l.Preis + (l.Preis * steuersatz) End If diff --git a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb index 9cea8186..b77e8fee 100644 --- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb +++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb @@ -1391,6 +1391,7 @@ Public Class cFormularManager 'End If VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense() + For Each pdfPath In PDFFile Dim doc As New Spire.Pdf.PdfDocument(pdfPath) diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb index 3bf1180c..d7ad3e90 100644 --- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb +++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb @@ -291,7 +291,7 @@ Public Class frmMitarbeitersuche End Sub Private Sub pic_MouseHover(sender As Object, e As EventArgs) Handles pic.MouseHover - Dim point + Dim point As Point pic.PointToClient(point) End Sub @@ -337,7 +337,7 @@ Public Class frmMitarbeitersuche 'postgang ausstempen, dann beginn post, + 1h ende post Dim askPost As MsgBoxResult = MsgBox("Postgang für " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & " eintragen?" & vbNewLine & Now.ToString(), vbYesNo) If askPost = vbYes Then - Dim info + Dim info As String = "" Dim timestp = Now Dim timeEntryExisting As Boolean = False @@ -388,7 +388,7 @@ Public Class frmMitarbeitersuche Dim aktengang As DateTime = Now().AddMinutes(-minutesBeforeStart) Dim askPost As MsgBoxResult = MsgBox("Aktengang für " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & " eintragen?" & vbNewLine & aktengang.ToString(), vbYesNo) If askPost = vbYes Then - Dim info + Dim info As String = "" Dim timestp = aktengang Dim timeEntryExisting As Boolean = False @@ -428,7 +428,7 @@ Public Class frmMitarbeitersuche 'normales kommen/gehen Dim a As MsgBoxResult = MsgBox(IIf(cbxHomeoffice.Checked, "Homeoffice", "Büro") & vbNewLine & sender.text & " für " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & vbNewLine & Now.ToString(), vbYesNo) If a = vbYes Then - Dim info + Dim info As String = "" timas.setTimeEntry(cAllgemein.MITARBEITER, Now, info, art, resultCode) MsgBox(info) Thread.Sleep(2000) 'warten bis Eintrag in Timas-DB diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cDatev_Interface.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cDatev_Interface.vb index 38cf8784..fddb46c6 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cDatev_Interface.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cDatev_Interface.vb @@ -127,7 +127,6 @@ Public Class cDatev_Interface fileKD = My.Computer.FileSystem.OpenTextFileWriter(pathKD & DateinameKD, True, System.Text.Encoding.GetEncoding("iso-8859-15")) Dim month As String = IIf(automatischerExport, Now.AddDays(-1).Month.ToString("d2"), Now.Month.ToString("d2")) - fileKD.WriteLine(genStammdatenHeader(Geschaeftsjahr, month)) fileKD.WriteLine(genStammdatenBeginn()) @@ -387,8 +386,8 @@ Public Class cDatev_Interface headerString &= MandantenNr.ToString & ";" 'Mandantennummer headerString &= Geschäftsjahr.ToString & "0101" & ";" 'WJ-Beginn headerString &= KontenlängePersonKto.ToString & ";" - headerString &= Geschäftsjahr.ToString & aktuellesMonat & "01" & ";" 'DatumVon - headerString &= Geschäftsjahr.ToString & aktuellesMonat & day.GetLastyDayYInxMonth(Now.DayOfWeek, CInt(aktuellesMonat), Geschäftsjahr, True).Day & ";" 'DatumBis + headerString &= Geschäftsjahr.ToString & aktuellesMonat.PadLeft(2, "0") & "01" & ";" 'DatumVon + headerString &= Geschäftsjahr.ToString & aktuellesMonat.PadLeft(2, "0") & day.GetLastyDayYInxMonth(Now.DayOfWeek, CInt(aktuellesMonat), Geschäftsjahr, True).Day & ";" 'DatumBis headerString &= "IMPORT AUS AVISO;" 'Bezeichnung headerString &= Chr(34) & Chr(34) & ";" headerString &= emptyFormatedValueWithoutCommas(12) @@ -407,8 +406,8 @@ Public Class cDatev_Interface headerString &= MandantenNr.ToString & ";" headerString &= Geschäftsjahr.ToString & "0101" & ";" 'WJ-Beginn headerString &= KontenlängeSachKto.ToString & ";" - headerString &= Geschäftsjahr.ToString & aktuellesMonat & "01" & ";" 'DatumVon - headerString &= Geschäftsjahr.ToString & aktuellesMonat & day.GetLastyDayYInxMonth(Now.DayOfWeek, CInt(aktuellesMonat), Geschäftsjahr, True).Day & ";" 'DatumBis + headerString &= Geschäftsjahr.ToString & aktuellesMonat.PadLeft(2, "0") & "01" & ";" 'DatumVon + headerString &= Geschäftsjahr.ToString & aktuellesMonat.PadLeft(2, "0") & day.GetLastyDayYInxMonth(Now.DayOfWeek, CInt(aktuellesMonat), Geschäftsjahr, True).Day & ";" 'DatumBis headerString &= "IMPORT AUS AVISO;" 'Bezeichnung headerString &= Chr(34) & Chr(34) & ";" headerString &= emptyFormatedValueWithoutCommas(12) diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj index 2bb5cc87..247ee832 100644 --- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj +++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj @@ -132,13 +132,13 @@ False F:\PROGRAMMIERUNG\dll\NetSpell.SpellChecker.DLL - + False - ..\..\..\dll\Spire.PDF\2024\Viewer Hotfix\Spire.Pdf.dll + bin\Debug\Spire.Pdf.dll - + False - ..\..\..\dll\Spire.PDF\2024\Viewer Hotfix\Spire.PdfViewer.Forms.dll + bin\Debug\Spire.PdfViewer.Forms.dll @@ -818,7 +818,7 @@ OpenApiCodeGenerator - Always + PreserveNewest diff --git a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb index 2457acaf..361cf5c2 100644 --- a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb +++ b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb @@ -133,16 +133,25 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object( End Function Public Shared Sub spireLoadLicense() - ''Nicht notwendig --> license.elic hat beide drinnen. - 'Spire.License.LicenseProvider.SetLicenseKey("MkctkXG06cMhlK6LAQCVDXFpzaLd8k9flTIXzX2vqnaj15/RjBiXqzJFPI5Ay0WJO+ng6Fwgb1s0Owoicm6acvP5dL8R/rHMlEAIQmWgY231zrrzVcbfujmJLyeYq1bwdbZY8vAtegSo3uhg8MruQ0NwF8OwrmrRTQzW8VkBRePb6jhCAWqMyr4Ho/d06JN3ngF3ulN/aNkFIWTHBvPG+M0CWuhudGhNtyDcnWPHDHm1+qigpwwnh69s8A4romdnSDQpFa2/LG5KAzwVmcjKSfVZs6e497ydRBFpggoe8d4J0FnRW//ROJOraTklVBMcGNZm9plWQvA23wxAhaVQHPINx/ecdTb9NIAeQajYyghx/tA+XVQ5uessceZW4LWZ4cnq6nhsBS4Y6oZ76/pHw1cUSfOHFCVi++X+2JYatsUJcAn2QXM6qpul7MpKCdDtT+yE94umhllKK7oBA8TMVFntgRfSZU+fftgMB+Nrs91UqM52OQsM4f0Q/dQvLGL/gr7NYE7QBQRV8ersUHls2s/7NHJ1VSoXKO9bghFaqzWoMGJ1UM/DvgdMg+URo6F9yanH4dEv8XDpTgx82f4pwncquCZJoPTdlXVhF4mK6/euo5Od3pmO9ZTqY+DxNwpgBIvkWTTvZiqkq4aDhNR5fhoihtAIWDiaHxMhlXxKTeK8z6n3puusWs0ZcXXaXb1jfUi7L9v8tWavr7Kag89coCXv7q5ejJ+mxTH9N6wIA029crL1+xyWSMOIaU6Iav8nrro5Xhdt14abW+458iqjVQRL1l6ZUkZjXaJHjoqy1aKg1OafFAGjULuOp8ozBJwQbRD0y5czx60NFjKlxR01SrfMrHV8uCjJXWm4BquAQPlHq6gfqSdXjmv/ZgKiKnXu+2FelPHK96IRK+y+pSv0hUx9JJ+9zL0JdAdwKmm2rRGk2KTKKfJ8jB+FdTpp61ecYsM2XB+GqZvLgJx6DUFklevpLG8XuKxcJFJGyAEhUzeUYhjUv60gSRKKAs8XlOmP35fBP2Gd2X6H1cUJFEdam62dDnE9ZBRyBlwA2n7iFav3s7+PzSuEACBG8R1nky52Ye9qE6zM8Plw0boPIoOueKYQIO+9wDLZyhHYjwc/6h3snP76tjsra7IS1c0Yx/P2lMx8C9LogL4c7Hyo7DH/bmn7Kx1C3eYH7IMY2uXoRfJ2tEtJ8MxvD1Xm4ZU1rL/BWpiwTi2rHNl/ikBteyZ7D4YlfoiEpB7P4UksR/SLYS1gpmeh3py7dQytQg8tfq7Ylyn+4umppvhi2ZBhJKElo7DdRegYofwM4XZW5eyWV0Qq7WoBs7YGwq0SHcuUEsgq9mW3j4a7g5/kuTkZSXxVXFKmYEHo+CLJvcbyeWrYeSfgdWd914iiNOzCo/mufmYsOxndMUCUEv9DeKS/zIu7OKM0OIE1O62kt7rBfRyJ5tLcoPKhCaU2y2sa4bsw59YAXq09Maj136qUjLiOfyROIvxlQ30zaydZnn/pqoseHtklySmgCnbO2uQ2vl5RHnv0AbOT7UgLFmQv4x3HL2M5ezEW+3POA1OuEW/TlAvMiaE=") - 'Spire.License.LicenseProvider.LoadLicense() - 'Spire.License.LicenseProvider.SetLicenseKey("DqgBAA7OVWqLrl0/vKFRQ3B4fULEZEi+uN7wMgS475TeA6kOemBFjzZEG9fkW/Bgn5JDj2f9fGF9/QZ3jnik3iDgvDkaWO3yrb0V+5OaXxviTkoSVmCxzBNhsfNre2Q9BkETcd3DCYew7psFTdQvVKTtugehhx5bhxitSH6q16Vvdma8/EvVg7dsYajEq+Bjxi5Ibe5Q3po5SnZBnvrbegroXy34zuauqFiKnuaIdSFlmqjuf59veZvss6mIqSZSW9IsyfyKRjLupvFZcsH5yKPOuzmoL00KQ2OqxToVvD45IEUEvjNqdWeUKLPx/JVgaV3RmsxqPWd9Bm6zb7h04OBOKNVRtSSmjX2KnBRXdQgXfSGF1uIDlvLNtpD5AOYxKPOIfJ/AFxi9m8pYKnzqSMbpaxxlOqy9Y03EXkrko3SOzhyg+k6ZyebbqMrzeOzJ7f5cl9TfttlADwnoLa42No35+xkYI3tF/kALsrWWGcVsUWK78cg2w2s79y4ERBbgZlbYqVpdsOyKBO7k1ujA83J2MUYfoSydNivNYM05Ll1UJzbMY0sxb6HGWwVHl3t7aVwioZbmonI90fmrZpfjrpkzlL0MvjY5LxL1JXcv5xJ/oXaLN/q1GxCuFvSDroV3uKRbGhonGmTroQpp7AMFoah8Bg+glLFL2ibSoJ16dlvmxwBuZM0uDMCMfJhsFRSEzUEHbX0gv8MTNC3ROmM81Rrm7klfKrsJD3FrBlf13q6yIpxo+qp0/AgkovpjsBv8y8dxEJs37C0PHcvkCr/kA0HDDTH+Rstx8EelQzOv5dcr6CgW1VWW3+dyPjHjADlRPXd+bo+gquT6NMezbQOUdm3wMNbpCQ/qwcZ5bzEXGmdhWcEs/Z+QmXRJvhBbEf3WQrlLSuzVIooL/nXo5MG8XooWPZHURz1g92vvqA2H6FU+DLJkiNp/OI5Xzp0NNqhOubcSX70noHx7SdgQrnAIGZtE90/MzLBPFZMIv1yjaDyoZsTA3nSatae4w7PvN6cXtacLZl5GnAJIRxlmjR+OvwbfXhAcbVeNYtRYXhExR9B4fxKp8/eXZorvzW7yFH8cSopnqSjmw6ywqx0u2upOuuNeGp5/kMP4QC+SMRruXWQM46Ed168OaU1GJ0PpHr+W2EWZLbqqNhrYct1FpOnVxJjA90DOKsbXFzbLGC83YgZdVo9AAIzMYu8RIhbn6ACJQlC+d9nn0S/wZPtX+PUZK1ACCCDdfm/0jwvUEb8Us2pWn6qA/ZHtkk4a/iII8F9hrDMVOQYJBJQ/IPnyJneHfqjtfB/Hw/1/KdHJYnyWg5KXaZWz+Ut4Vc48ZJCt3B6Izaf2wD68iYaDeemnJAFI3OcsjAzNx54kxs5VBJ4VtsFYPMN3SnovtfEVis3mLlKqzy0EdTOOIm0ZkgxCDHS3KogjOp2SI0kvAxxD1jE1IOKpgLkRo6mfjCzjS6RmZ/vBoBbx1OGqqxUlkD+2TyfQUGggoEX8XtYykiVoMuVUdikUQtHP12gq2aYzS9rKpaIINaEpcqU+vQlIumrlsL2MFIdvcdTEBhfoPtq4j9GZkOY=") - 'Spire.License.LicenseProvider.LoadLicense() - ' Exit Sub - Spire.PdfViewer.License.LicenseProvider.SetLicenseKey("PeQezZrFLTMrIgEAK1BoHk0gh6gdmwDKMvN6ITlC5j6D/r6sSq/TXAl5H/H/P/NvV74UnH1KUt0Cy0ef1LzPpvmqxVTsiTYA2eB3CX21oTggkxa3qP/UOJ42Kk8rwgVqchV9RJj9SlZb/zzhfN3nB4NR9rfoiwRDoE45ECcmsCO948+auxqRrc1ikuFDIM2j2YpwzoFxw3QCtLNAjhWhA8Ly7HUCNbtibu6rOnuePVThtmVNfQeTuagFSCDovxIJzlvFggZaQXI7zh3PEChu65zP7VZoJyxzfagJv5JItQCrX8BP+5YgKe6B7NBzUFGl1RqcucKn+MAQypgXrRXQY4UAWfQ4g9QTN2JTpaHZfgg22sGGV+cccDJmekfUPGfBOzlnzedJelMNWDVNBw7prh8vTdNRsOTJoFYDbh82UwRNkXethAElaJ9apMQaEg2G7cDaQzVdmY9N6oMVZ+dDZ9Vet12GAvrD5akRHviXNhXis0W/WaaifHmbgfIO7zx35qNxRQ5mwouVh/byBw7sXBjtKwpJxulpVy0FNWSeSC4sskGn9+GO+inUrurRxX8EBEDBK0ev/558sYBQ4HloBvmWDX58ni7F0xv/1BdsvW2M+viIP4DATVUVoGh+lskcoBt2Z8g/Fxib/mBpQLmvg1fasZjscdfIyZBFJ57AtcNr9cT4oC2zn+ZodXXHYACD6+AFL3d0P1v/P3Bw5giOZpdeRmnlm9mD+OEXFWOgi+lfwF2S9IYcB+LrdckNiaRhserlEE6crn6HRquPQoqzo7J+nR63anp/HfJ3+n3RWVdSg+cJ13yPyMUhgQebsvcm+/bDCWaXc9+5THRJ6aAVoBE4hZ1eHdl1ukzuXiEJJ7GG2vk2MMcy9adKZyVATxSKuBeK1FYLF/62lZC0aoh4WV70Bth9MVWbLLKmZe3KttBYOtRpXvj1zk36RBubnLuSXp3aW7lJGwrHzMvaMGlYHmq1PUwgTLmL0d2p4FP9qSXHlAtRH8/O0AMsLHrLDe/4sNHkHqy+A8YM09t1adSnxOhoDyOb41zyvjsQ635gWYvOBimN0iEyVg3dEC7g5PZkAhIahBDz1qa4+GkluYvtmrafKZc/55KbYBZ23k+In8Qfabym0v7YWSpZ+/vwE2jNRupmL/6M0YnZUQolyFzBVqCdt40NYnnMD9o9I49XjB/8dWicpD2G60vIN4XvRc9/LG0elTqFiZkD9JLMGw+1fb0EwBb5XdGy68IHPoOFpXMcVFPHeBX45r7gZnaGAB11LhJiflSKnDd8unLrHUJJJvkPHyN5HWLrSAvcmJFS4JaHM7tHQorHF3xRYWHbGLWvGRtjfO43UlGhwklrH5rs4bop5R6m0eT/5eS/rbIoofUYQMEYexzGZwXAgNA6Sal7luN7Iqx7l4ykVrIwUAeLspfvsGT/aFDKBo77VQfPubHg/N7zd+wacmagI/7HznVCGkTApEcTrkade2cpsWGQa0sIrEDqt7s/1ZrwdqIQwgJ3rMnNGZ6ljV/FOT9OdVkkCKHkJrAwDlf2ssBbOvlHqxVz5x30mMkIQPZvSVFxSL2IKfx+FJ1VoQ==") - Spire.Pdf.License.LicenseProvider.SetLicenseKey("cEpc16XxAJrkAQDgjMzjDgDjuYoJMMP7BCUCCs6Z0SNyiAdLS2m1S5RaQhUNStB0GfzvEHaKikcHoHw2I22j0NgXiE3fhmOw0YHFw7FXbuGCUsX/DrJxVBLHGBVaWXzm/Gldmt9h3RVGQEh9V4IZN/+hOOcJXBL/TRvxGoZ3Zp4Ebhv12J/G83QlwqSjA4KqzNjlys4RVQNjIwCw1fIgSOh+GzLaGDm4Ii2+MfF0Ohr/+msHC44eKfUucyW4Vv/iW2muNqHstU5E8ezUNSXFZkS0wp4Hlbg/iorS1uuXNNdfECZL4BOV/qftRxrImsi3E3fdZ7FJw8JjvkoWWt1s4yPUtc1MS+0iXg2+64DiYwhLRTnV/8QUvOMEoQGMkDoOzMV1cabhSEJd6Z1iSFMdOZOdZR2E9nlDIJOoYPUR7HE9FclSxd6ICuBGM+Yb2YJpH9HgEkg0/3MC9kgJ9n6+XrW09oY3BvYRb9fYwdBWZ/3lqvGV9cHgQPP9EH6ApIZ8qoWH5nRQoeRwtiIrmOxRNVEN94TXuiQBuIvZMRu/uJs2ylAlIlbtMGUEK6VFys8OmY2G9fZsiKqUUQd3AyN2eOE/DJKSftJAoCqfaVqEJgbVy1zA0vjyIBsa42HCes8RJQrSdUWQyIsGWUf99mDvfSTxI+jsKGOAXgHmrK8kJ8orUL8L8P8NlyZp4RlRkCzkgP4yju0oeg32tss8iuwqXt44Gr1fk1ti5s1KXsZ1ZaGYAgucY5wEP4bmlPuQimfRIBvbNasSj/vk82RurAo77WDhmB63o9svfnVPExDpx1QxIYKezZGNA2A3J5gksZdhknWbSmcQy/HTP9bZdAfSEQCnXkdRIwnvdEts1rb5uWm4noCSVA3q7EMterUmfrKFpfzlCq96Lfor89p/nb0Cgl1xY0JDn+3k+na1rmGawro0Gz5jcPdVp+C3Z6afh03HBzbs/DSa3l+IMGLKEWP5f5wjy3ozgpP7GLuFHPtbOCy7/v7v/1mxZbUkT7CXPKVs1OEgYjH738igSjiziFJpVnDa/RmvV4WUmFLKcdNntuvpwu7hQFTDMrAU6G0K9weDH81xzJmAEZaVgW6aCu43wlPPKgvDjum5FcP/KHYG1s0CvF4ZVVON8fa0Jlmlg9zCPJ9POrmFa8Ap55BIQAgsXlyPXBXowQ3isZd3dK9R6ooq/6ODB3dnzn/QyVKljwyIxCZdJpMKza7k/hvpO3rlZne118AUE3Ry5QE7U7gDGFcn700R4vD3enxtausV+XiABDKHDBIAgLbT4ZyzXCHHxlgV2pvqL7GYwihN8FXc9UFRxqvMx8RA9gahKPIY6WOQ1q5NEyFTRPMYQRBHDTa9KSLBbfnbjmNaURfI0UeXV4/pPzEa+8in7rVJFltPk3z9XTqJK1hgd+1KfqXjmKKvh7tbM1KXx8yFI9JGTdL3vSqJGw2Qog/lLKez3ZshZVQbYJ54l4G+I6mQCOGUcKdvvOVWwggsxCAV78RuWKm7liUwnncpeSF2iq3AOMnVsTn6Bi7l4OYgZavoSEFTKuVRl+hSqC/Y9/x/ngTeAyudwAg=") - ' Spire.Pdf.License.LicenseProvider.LoadLicense() - Spire.PdfViewer.License.LicenseProvider.LoadLicense() + Try + + + ''Nicht notwendig --> license.elic hat beide drinnen. + 'Spire.License.LicenseProvider.SetLicenseKey("MkctkXG06cMhlK6LAQCVDXFpzaLd8k9flTIXzX2vqnaj15/RjBiXqzJFPI5Ay0WJO+ng6Fwgb1s0Owoicm6acvP5dL8R/rHMlEAIQmWgY231zrrzVcbfujmJLyeYq1bwdbZY8vAtegSo3uhg8MruQ0NwF8OwrmrRTQzW8VkBRePb6jhCAWqMyr4Ho/d06JN3ngF3ulN/aNkFIWTHBvPG+M0CWuhudGhNtyDcnWPHDHm1+qigpwwnh69s8A4romdnSDQpFa2/LG5KAzwVmcjKSfVZs6e497ydRBFpggoe8d4J0FnRW//ROJOraTklVBMcGNZm9plWQvA23wxAhaVQHPINx/ecdTb9NIAeQajYyghx/tA+XVQ5uessceZW4LWZ4cnq6nhsBS4Y6oZ76/pHw1cUSfOHFCVi++X+2JYatsUJcAn2QXM6qpul7MpKCdDtT+yE94umhllKK7oBA8TMVFntgRfSZU+fftgMB+Nrs91UqM52OQsM4f0Q/dQvLGL/gr7NYE7QBQRV8ersUHls2s/7NHJ1VSoXKO9bghFaqzWoMGJ1UM/DvgdMg+URo6F9yanH4dEv8XDpTgx82f4pwncquCZJoPTdlXVhF4mK6/euo5Od3pmO9ZTqY+DxNwpgBIvkWTTvZiqkq4aDhNR5fhoihtAIWDiaHxMhlXxKTeK8z6n3puusWs0ZcXXaXb1jfUi7L9v8tWavr7Kag89coCXv7q5ejJ+mxTH9N6wIA029crL1+xyWSMOIaU6Iav8nrro5Xhdt14abW+458iqjVQRL1l6ZUkZjXaJHjoqy1aKg1OafFAGjULuOp8ozBJwQbRD0y5czx60NFjKlxR01SrfMrHV8uCjJXWm4BquAQPlHq6gfqSdXjmv/ZgKiKnXu+2FelPHK96IRK+y+pSv0hUx9JJ+9zL0JdAdwKmm2rRGk2KTKKfJ8jB+FdTpp61ecYsM2XB+GqZvLgJx6DUFklevpLG8XuKxcJFJGyAEhUzeUYhjUv60gSRKKAs8XlOmP35fBP2Gd2X6H1cUJFEdam62dDnE9ZBRyBlwA2n7iFav3s7+PzSuEACBG8R1nky52Ye9qE6zM8Plw0boPIoOueKYQIO+9wDLZyhHYjwc/6h3snP76tjsra7IS1c0Yx/P2lMx8C9LogL4c7Hyo7DH/bmn7Kx1C3eYH7IMY2uXoRfJ2tEtJ8MxvD1Xm4ZU1rL/BWpiwTi2rHNl/ikBteyZ7D4YlfoiEpB7P4UksR/SLYS1gpmeh3py7dQytQg8tfq7Ylyn+4umppvhi2ZBhJKElo7DdRegYofwM4XZW5eyWV0Qq7WoBs7YGwq0SHcuUEsgq9mW3j4a7g5/kuTkZSXxVXFKmYEHo+CLJvcbyeWrYeSfgdWd914iiNOzCo/mufmYsOxndMUCUEv9DeKS/zIu7OKM0OIE1O62kt7rBfRyJ5tLcoPKhCaU2y2sa4bsw59YAXq09Maj136qUjLiOfyROIvxlQ30zaydZnn/pqoseHtklySmgCnbO2uQ2vl5RHnv0AbOT7UgLFmQv4x3HL2M5ezEW+3POA1OuEW/TlAvMiaE=") + 'Spire.License.LicenseProvider.LoadLicense() + 'Spire.License.LicenseProvider.SetLicenseKey("DqgBAA7OVWqLrl0/vKFRQ3B4fULEZEi+uN7wMgS475TeA6kOemBFjzZEG9fkW/Bgn5JDj2f9fGF9/QZ3jnik3iDgvDkaWO3yrb0V+5OaXxviTkoSVmCxzBNhsfNre2Q9BkETcd3DCYew7psFTdQvVKTtugehhx5bhxitSH6q16Vvdma8/EvVg7dsYajEq+Bjxi5Ibe5Q3po5SnZBnvrbegroXy34zuauqFiKnuaIdSFlmqjuf59veZvss6mIqSZSW9IsyfyKRjLupvFZcsH5yKPOuzmoL00KQ2OqxToVvD45IEUEvjNqdWeUKLPx/JVgaV3RmsxqPWd9Bm6zb7h04OBOKNVRtSSmjX2KnBRXdQgXfSGF1uIDlvLNtpD5AOYxKPOIfJ/AFxi9m8pYKnzqSMbpaxxlOqy9Y03EXkrko3SOzhyg+k6ZyebbqMrzeOzJ7f5cl9TfttlADwnoLa42No35+xkYI3tF/kALsrWWGcVsUWK78cg2w2s79y4ERBbgZlbYqVpdsOyKBO7k1ujA83J2MUYfoSydNivNYM05Ll1UJzbMY0sxb6HGWwVHl3t7aVwioZbmonI90fmrZpfjrpkzlL0MvjY5LxL1JXcv5xJ/oXaLN/q1GxCuFvSDroV3uKRbGhonGmTroQpp7AMFoah8Bg+glLFL2ibSoJ16dlvmxwBuZM0uDMCMfJhsFRSEzUEHbX0gv8MTNC3ROmM81Rrm7klfKrsJD3FrBlf13q6yIpxo+qp0/AgkovpjsBv8y8dxEJs37C0PHcvkCr/kA0HDDTH+Rstx8EelQzOv5dcr6CgW1VWW3+dyPjHjADlRPXd+bo+gquT6NMezbQOUdm3wMNbpCQ/qwcZ5bzEXGmdhWcEs/Z+QmXRJvhBbEf3WQrlLSuzVIooL/nXo5MG8XooWPZHURz1g92vvqA2H6FU+DLJkiNp/OI5Xzp0NNqhOubcSX70noHx7SdgQrnAIGZtE90/MzLBPFZMIv1yjaDyoZsTA3nSatae4w7PvN6cXtacLZl5GnAJIRxlmjR+OvwbfXhAcbVeNYtRYXhExR9B4fxKp8/eXZorvzW7yFH8cSopnqSjmw6ywqx0u2upOuuNeGp5/kMP4QC+SMRruXWQM46Ed168OaU1GJ0PpHr+W2EWZLbqqNhrYct1FpOnVxJjA90DOKsbXFzbLGC83YgZdVo9AAIzMYu8RIhbn6ACJQlC+d9nn0S/wZPtX+PUZK1ACCCDdfm/0jwvUEb8Us2pWn6qA/ZHtkk4a/iII8F9hrDMVOQYJBJQ/IPnyJneHfqjtfB/Hw/1/KdHJYnyWg5KXaZWz+Ut4Vc48ZJCt3B6Izaf2wD68iYaDeemnJAFI3OcsjAzNx54kxs5VBJ4VtsFYPMN3SnovtfEVis3mLlKqzy0EdTOOIm0ZkgxCDHS3KogjOp2SI0kvAxxD1jE1IOKpgLkRo6mfjCzjS6RmZ/vBoBbx1OGqqxUlkD+2TyfQUGggoEX8XtYykiVoMuVUdikUQtHP12gq2aYzS9rKpaIINaEpcqU+vQlIumrlsL2MFIdvcdTEBhfoPtq4j9GZkOY=") + 'Spire.License.LicenseProvider.LoadLicense() + ' Exit Sub + + 'wegen Problemen die extra Aktivierung pro Lizenzkey wieder eingebaut. + Spire.PdfViewer.License.LicenseProvider.SetLicenseKey("PeQezZrFLTMrIgEAK1BoHk0gh6gdmwDKMvN6ITlC5j6D/r6sSq/TXAl5H/H/P/NvV74UnH1KUt0Cy0ef1LzPpvmqxVTsiTYA2eB3CX21oTggkxa3qP/UOJ42Kk8rwgVqchV9RJj9SlZb/zzhfN3nB4NR9rfoiwRDoE45ECcmsCO948+auxqRrc1ikuFDIM2j2YpwzoFxw3QCtLNAjhWhA8Ly7HUCNbtibu6rOnuePVThtmVNfQeTuagFSCDovxIJzlvFggZaQXI7zh3PEChu65zP7VZoJyxzfagJv5JItQCrX8BP+5YgKe6B7NBzUFGl1RqcucKn+MAQypgXrRXQY4UAWfQ4g9QTN2JTpaHZfgg22sGGV+cccDJmekfUPGfBOzlnzedJelMNWDVNBw7prh8vTdNRsOTJoFYDbh82UwRNkXethAElaJ9apMQaEg2G7cDaQzVdmY9N6oMVZ+dDZ9Vet12GAvrD5akRHviXNhXis0W/WaaifHmbgfIO7zx35qNxRQ5mwouVh/byBw7sXBjtKwpJxulpVy0FNWSeSC4sskGn9+GO+inUrurRxX8EBEDBK0ev/558sYBQ4HloBvmWDX58ni7F0xv/1BdsvW2M+viIP4DATVUVoGh+lskcoBt2Z8g/Fxib/mBpQLmvg1fasZjscdfIyZBFJ57AtcNr9cT4oC2zn+ZodXXHYACD6+AFL3d0P1v/P3Bw5giOZpdeRmnlm9mD+OEXFWOgi+lfwF2S9IYcB+LrdckNiaRhserlEE6crn6HRquPQoqzo7J+nR63anp/HfJ3+n3RWVdSg+cJ13yPyMUhgQebsvcm+/bDCWaXc9+5THRJ6aAVoBE4hZ1eHdl1ukzuXiEJJ7GG2vk2MMcy9adKZyVATxSKuBeK1FYLF/62lZC0aoh4WV70Bth9MVWbLLKmZe3KttBYOtRpXvj1zk36RBubnLuSXp3aW7lJGwrHzMvaMGlYHmq1PUwgTLmL0d2p4FP9qSXHlAtRH8/O0AMsLHrLDe/4sNHkHqy+A8YM09t1adSnxOhoDyOb41zyvjsQ635gWYvOBimN0iEyVg3dEC7g5PZkAhIahBDz1qa4+GkluYvtmrafKZc/55KbYBZ23k+In8Qfabym0v7YWSpZ+/vwE2jNRupmL/6M0YnZUQolyFzBVqCdt40NYnnMD9o9I49XjB/8dWicpD2G60vIN4XvRc9/LG0elTqFiZkD9JLMGw+1fb0EwBb5XdGy68IHPoOFpXMcVFPHeBX45r7gZnaGAB11LhJiflSKnDd8unLrHUJJJvkPHyN5HWLrSAvcmJFS4JaHM7tHQorHF3xRYWHbGLWvGRtjfO43UlGhwklrH5rs4bop5R6m0eT/5eS/rbIoofUYQMEYexzGZwXAgNA6Sal7luN7Iqx7l4ykVrIwUAeLspfvsGT/aFDKBo77VQfPubHg/N7zd+wacmagI/7HznVCGkTApEcTrkade2cpsWGQa0sIrEDqt7s/1ZrwdqIQwgJ3rMnNGZ6ljV/FOT9OdVkkCKHkJrAwDlf2ssBbOvlHqxVz5x30mMkIQPZvSVFxSL2IKfx+FJ1VoQ==") + Spire.PdfViewer.License.LicenseProvider.LoadLicense() + Spire.Pdf.License.LicenseProvider.SetLicenseKey("cEpc16XxAJrkAQDgjMzjDgDjuYoJMMP7BCUCCs6Z0SNyiAdLS2m1S5RaQhUNStB0GfzvEHaKikcHoHw2I22j0NgXiE3fhmOw0YHFw7FXbuGCUsX/DrJxVBLHGBVaWXzm/Gldmt9h3RVGQEh9V4IZN/+hOOcJXBL/TRvxGoZ3Zp4Ebhv12J/G83QlwqSjA4KqzNjlys4RVQNjIwCw1fIgSOh+GzLaGDm4Ii2+MfF0Ohr/+msHC44eKfUucyW4Vv/iW2muNqHstU5E8ezUNSXFZkS0wp4Hlbg/iorS1uuXNNdfECZL4BOV/qftRxrImsi3E3fdZ7FJw8JjvkoWWt1s4yPUtc1MS+0iXg2+64DiYwhLRTnV/8QUvOMEoQGMkDoOzMV1cabhSEJd6Z1iSFMdOZOdZR2E9nlDIJOoYPUR7HE9FclSxd6ICuBGM+Yb2YJpH9HgEkg0/3MC9kgJ9n6+XrW09oY3BvYRb9fYwdBWZ/3lqvGV9cHgQPP9EH6ApIZ8qoWH5nRQoeRwtiIrmOxRNVEN94TXuiQBuIvZMRu/uJs2ylAlIlbtMGUEK6VFys8OmY2G9fZsiKqUUQd3AyN2eOE/DJKSftJAoCqfaVqEJgbVy1zA0vjyIBsa42HCes8RJQrSdUWQyIsGWUf99mDvfSTxI+jsKGOAXgHmrK8kJ8orUL8L8P8NlyZp4RlRkCzkgP4yju0oeg32tss8iuwqXt44Gr1fk1ti5s1KXsZ1ZaGYAgucY5wEP4bmlPuQimfRIBvbNasSj/vk82RurAo77WDhmB63o9svfnVPExDpx1QxIYKezZGNA2A3J5gksZdhknWbSmcQy/HTP9bZdAfSEQCnXkdRIwnvdEts1rb5uWm4noCSVA3q7EMterUmfrKFpfzlCq96Lfor89p/nb0Cgl1xY0JDn+3k+na1rmGawro0Gz5jcPdVp+C3Z6afh03HBzbs/DSa3l+IMGLKEWP5f5wjy3ozgpP7GLuFHPtbOCy7/v7v/1mxZbUkT7CXPKVs1OEgYjH738igSjiziFJpVnDa/RmvV4WUmFLKcdNntuvpwu7hQFTDMrAU6G0K9weDH81xzJmAEZaVgW6aCu43wlPPKgvDjum5FcP/KHYG1s0CvF4ZVVON8fa0Jlmlg9zCPJ9POrmFa8Ap55BIQAgsXlyPXBXowQ3isZd3dK9R6ooq/6ODB3dnzn/QyVKljwyIxCZdJpMKza7k/hvpO3rlZne118AUE3Ry5QE7U7gDGFcn700R4vD3enxtausV+XiABDKHDBIAgLbT4ZyzXCHHxlgV2pvqL7GYwihN8FXc9UFRxqvMx8RA9gahKPIY6WOQ1q5NEyFTRPMYQRBHDTa9KSLBbfnbjmNaURfI0UeXV4/pPzEa+8in7rVJFltPk3z9XTqJK1hgd+1KfqXjmKKvh7tbM1KXx8yFI9JGTdL3vSqJGw2Qog/lLKez3ZshZVQbYJ54l4G+I6mQCOGUcKdvvOVWwggsxCAV78RuWKm7liUwnncpeSF2iq3AOMnVsTn6Bi7l4OYgZavoSEFTKuVRl+hSqC/Y9/x/ngTeAyudwAg=") + Spire.Pdf.License.LicenseProvider.LoadLicense() + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try End Sub Public Shared Function genCSVFromDT(dt As DataTable, Optional openCSV As Boolean = False, Optional showColumnName As Boolean = True, Optional optFileName As String = "") As String