From a5366e75a1eb8d5e3f5b3ed19134f4162cec5883 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 12 Aug 2024 16:43:33 +0200 Subject: [PATCH 1/4] =?UTF-8?q?UID-Pr=C3=BCfung=20(Doppelklick=20vermeiden?= =?UTF-8?q?=20+=20verbesserte=20Fehlermeldung),=20etc.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SDL/kunden/usrCntlKundenuebersicht.vb | 4 + SDL/kunden/usrcntlKundeBearbeitenFull.vb | 5 ++ .../usrCntlSeriendruck.Designer.vb | 90 ++++++++++++++++++- SDL/seriendruck/usrCntlSeriendruck.vb | 14 +-- .../Finanzonline/cFinanzOnlineWebService.vb | 2 +- 5 files changed, 103 insertions(+), 12 deletions(-) diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index 8fa90187..acabb2c0 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -1834,7 +1834,9 @@ Public Class usrCntlKundenuebersicht Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + Button1.Enabled = False checkUIDNr(sender) + Button1.Enabled = True 'If ADRESSE.UstIdNr Is Nothing Then Exit Sub 'If ADRESSE.UstIdKz Is Nothing Then Exit Sub @@ -3082,12 +3084,14 @@ Public Class usrCntlKundenuebersicht ADRESSE.UstIdNr = company.vatNo.Replace(countryKz, "").Replace(" ", "") ADRESSE.SAVE() Dim validUID As Boolean = False + Button1.Enabled = False checkUIDNr(, validUID) If Not validUID Then ADRESSE.UstIdKz = "" ADRESSE.UstIdNr = "" ADRESSE.SAVE() End If + Button1.Enabled = True End If diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index 46b3bbf1..f81b8c5a 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -1432,6 +1432,7 @@ Public Class usrcntlKundeBearbeitenFull If ADRESSE.UstIdNr = "" Then Exit Sub sender.BackgroundImage = My.Resources.wait + btnUIDPruef.Enabled = False Dim FO As New VERAG_PROG_ALLGEMEIN.cFinanzOnlineWebService FO.initValues() @@ -1442,14 +1443,18 @@ Public Class usrcntlKundeBearbeitenFull If UID_TMP.uid_valid Then init(ADRESSE.AdressenNr) sender.BackgroundImage = My.Resources.ok + btnUIDPruef.Enabled = True Else sender.BackgroundImage = My.Resources.del + btnUIDPruef.Enabled = True End If Else sender.BackgroundImage = My.Resources.fragezeichen + btnUIDPruef.Enabled = True End If FO.Call_Web_Service_MethodUID_Logout_NEU2020() + btnUIDPruef.Enabled = True End If diff --git a/SDL/seriendruck/usrCntlSeriendruck.Designer.vb b/SDL/seriendruck/usrCntlSeriendruck.Designer.vb index 92a07db7..073be2fb 100644 --- a/SDL/seriendruck/usrCntlSeriendruck.Designer.vb +++ b/SDL/seriendruck/usrCntlSeriendruck.Designer.vb @@ -36,12 +36,18 @@ Partial Class usrCntlSeriendruck Me.GroupBox2 = New System.Windows.Forms.GroupBox() Me.Button2 = New System.Windows.Forms.Button() Me.Label3 = New System.Windows.Forms.Label() + Me.txtErstattungAbfNrFiliale_neu = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtErstattungAbfNr_neu = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtErstattungAbfUnterNr_neu = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.GroupBox1.SuspendLayout() Me.GroupBox2.SuspendLayout() Me.SuspendLayout() ' 'GroupBox1 ' + Me.GroupBox1.Controls.Add(Me.txtErstattungAbfUnterNr_neu) + Me.GroupBox1.Controls.Add(Me.txtErstattungAbfNr_neu) + Me.GroupBox1.Controls.Add(Me.txtErstattungAbfNrFiliale_neu) Me.GroupBox1.Controls.Add(Me.cbxSofortDruck) Me.GroupBox1.Controls.Add(Me.txtErstattungAbfNrFiliale) Me.GroupBox1.Controls.Add(Me.txtErstattungAbfUnterNr) @@ -72,21 +78,23 @@ Partial Class usrCntlSeriendruck ' 'txtErstattungAbfNrFiliale ' - Me.txtErstattungAbfNrFiliale.Location = New System.Drawing.Point(16, 41) + Me.txtErstattungAbfNrFiliale.Location = New System.Drawing.Point(16, 95) Me.txtErstattungAbfNrFiliale.MaxLength = 4 Me.txtErstattungAbfNrFiliale.Name = "txtErstattungAbfNrFiliale" Me.txtErstattungAbfNrFiliale.Size = New System.Drawing.Size(36, 20) Me.txtErstattungAbfNrFiliale.TabIndex = 0 Me.txtErstattungAbfNrFiliale.Text = "4817" + Me.txtErstattungAbfNrFiliale.Visible = False ' 'txtErstattungAbfUnterNr ' - Me.txtErstattungAbfUnterNr.Location = New System.Drawing.Point(135, 41) + Me.txtErstattungAbfUnterNr.Location = New System.Drawing.Point(149, 95) Me.txtErstattungAbfUnterNr.MaxLength = 2 Me.txtErstattungAbfUnterNr.Name = "txtErstattungAbfUnterNr" Me.txtErstattungAbfUnterNr.Size = New System.Drawing.Size(22, 20) Me.txtErstattungAbfUnterNr.TabIndex = 2 Me.txtErstattungAbfUnterNr.Text = "00" + Me.txtErstattungAbfUnterNr.Visible = False ' 'btnWordPrint ' @@ -101,11 +109,12 @@ Partial Class usrCntlSeriendruck ' 'txtErstattungAbfNr ' - Me.txtErstattungAbfNr.Location = New System.Drawing.Point(51, 41) + Me.txtErstattungAbfNr.Location = New System.Drawing.Point(58, 95) Me.txtErstattungAbfNr.MaxLength = 20 Me.txtErstattungAbfNr.Name = "txtErstattungAbfNr" Me.txtErstattungAbfNr.Size = New System.Drawing.Size(85, 20) Me.txtErstattungAbfNr.TabIndex = 1 + Me.txtErstattungAbfNr.Visible = False ' 'Label2 ' @@ -189,6 +198,77 @@ Partial Class usrCntlSeriendruck Me.Label3.TabIndex = 2 Me.Label3.Text = "Gutschrift - Erstattungsschreiben" ' + 'txtErstattungAbfNrFiliale_neu + ' + Me.txtErstattungAbfNrFiliale_neu._DateTimeOnly = False + Me.txtErstattungAbfNrFiliale_neu._numbersOnly = True + Me.txtErstattungAbfNrFiliale_neu._numbersOnlyKommastellen = "" + Me.txtErstattungAbfNrFiliale_neu._numbersOnlyTrennzeichen = False + Me.txtErstattungAbfNrFiliale_neu._Prozent = False + Me.txtErstattungAbfNrFiliale_neu._ShortDateNew = False + Me.txtErstattungAbfNrFiliale_neu._ShortDateOnly = False + Me.txtErstattungAbfNrFiliale_neu._TimeOnly = False + Me.txtErstattungAbfNrFiliale_neu._TimeOnly_Seconds = False + Me.txtErstattungAbfNrFiliale_neu._value = "" + Me.txtErstattungAbfNrFiliale_neu._Waehrung = False + Me.txtErstattungAbfNrFiliale_neu._WaehrungZeichen = True + Me.txtErstattungAbfNrFiliale_neu.ForeColor = System.Drawing.Color.Black + Me.txtErstattungAbfNrFiliale_neu.Location = New System.Drawing.Point(19, 42) + Me.txtErstattungAbfNrFiliale_neu.MaxLineLength = -1 + Me.txtErstattungAbfNrFiliale_neu.MaxLines_Warning = "" + Me.txtErstattungAbfNrFiliale_neu.MaxLines_Warning_Label = Nothing + Me.txtErstattungAbfNrFiliale_neu.Name = "txtErstattungAbfNrFiliale_neu" + Me.txtErstattungAbfNrFiliale_neu.Size = New System.Drawing.Size(33, 20) + Me.txtErstattungAbfNrFiliale_neu.TabIndex = 8 + Me.txtErstattungAbfNrFiliale_neu.Text = "4817" + ' + 'txtErstattungAbfNr_neu + ' + Me.txtErstattungAbfNr_neu._DateTimeOnly = False + Me.txtErstattungAbfNr_neu._numbersOnly = True + Me.txtErstattungAbfNr_neu._numbersOnlyKommastellen = "" + Me.txtErstattungAbfNr_neu._numbersOnlyTrennzeichen = False + Me.txtErstattungAbfNr_neu._Prozent = False + Me.txtErstattungAbfNr_neu._ShortDateNew = False + Me.txtErstattungAbfNr_neu._ShortDateOnly = False + Me.txtErstattungAbfNr_neu._TimeOnly = False + Me.txtErstattungAbfNr_neu._TimeOnly_Seconds = False + Me.txtErstattungAbfNr_neu._value = "" + Me.txtErstattungAbfNr_neu._Waehrung = False + Me.txtErstattungAbfNr_neu._WaehrungZeichen = True + Me.txtErstattungAbfNr_neu.ForeColor = System.Drawing.Color.Black + Me.txtErstattungAbfNr_neu.Location = New System.Drawing.Point(58, 42) + Me.txtErstattungAbfNr_neu.MaxLineLength = -1 + Me.txtErstattungAbfNr_neu.MaxLines_Warning = "" + Me.txtErstattungAbfNr_neu.MaxLines_Warning_Label = Nothing + Me.txtErstattungAbfNr_neu.Name = "txtErstattungAbfNr_neu" + Me.txtErstattungAbfNr_neu.Size = New System.Drawing.Size(66, 20) + Me.txtErstattungAbfNr_neu.TabIndex = 9 + ' + 'txtErstattungAbfUnterNr_neu + ' + Me.txtErstattungAbfUnterNr_neu._DateTimeOnly = False + Me.txtErstattungAbfUnterNr_neu._numbersOnly = True + Me.txtErstattungAbfUnterNr_neu._numbersOnlyKommastellen = "" + Me.txtErstattungAbfUnterNr_neu._numbersOnlyTrennzeichen = False + Me.txtErstattungAbfUnterNr_neu._Prozent = False + Me.txtErstattungAbfUnterNr_neu._ShortDateNew = False + Me.txtErstattungAbfUnterNr_neu._ShortDateOnly = False + Me.txtErstattungAbfUnterNr_neu._TimeOnly = False + Me.txtErstattungAbfUnterNr_neu._TimeOnly_Seconds = False + Me.txtErstattungAbfUnterNr_neu._value = "" + Me.txtErstattungAbfUnterNr_neu._Waehrung = False + Me.txtErstattungAbfUnterNr_neu._WaehrungZeichen = True + Me.txtErstattungAbfUnterNr_neu.ForeColor = System.Drawing.Color.Black + Me.txtErstattungAbfUnterNr_neu.Location = New System.Drawing.Point(130, 42) + Me.txtErstattungAbfUnterNr_neu.MaxLineLength = -1 + Me.txtErstattungAbfUnterNr_neu.MaxLines_Warning = "" + Me.txtErstattungAbfUnterNr_neu.MaxLines_Warning_Label = Nothing + Me.txtErstattungAbfUnterNr_neu.Name = "txtErstattungAbfUnterNr_neu" + Me.txtErstattungAbfUnterNr_neu.Size = New System.Drawing.Size(32, 20) + Me.txtErstattungAbfUnterNr_neu.TabIndex = 10 + Me.txtErstattungAbfUnterNr_neu.Text = "00" + ' 'usrCntlSeriendruck ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -220,5 +300,7 @@ Partial Class usrCntlSeriendruck Friend WithEvents txtErstattungAbfNrFiliale As System.Windows.Forms.TextBox Friend WithEvents Label3 As System.Windows.Forms.Label Friend WithEvents cbxSofortDruck As System.Windows.Forms.CheckBox - + Friend WithEvents txtErstattungAbfUnterNr_neu As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtErstattungAbfNr_neu As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtErstattungAbfNrFiliale_neu As VERAG_PROG_ALLGEMEIN.MyTextBox End Class diff --git a/SDL/seriendruck/usrCntlSeriendruck.vb b/SDL/seriendruck/usrCntlSeriendruck.vb index cbd8d410..88fe6ce3 100644 --- a/SDL/seriendruck/usrCntlSeriendruck.vb +++ b/SDL/seriendruck/usrCntlSeriendruck.vb @@ -31,7 +31,7 @@ Public Class usrCntlSeriendruck WordDoc.Activate() Dim berichteSQL As New BerichteSQL - Dim bericht As cErstasttungsschreiben = berichteSQL.getErstatung(txtErstattungAbfNrFiliale.Text, txtErstattungAbfNr.Text, txtErstattungAbfUnterNr.Text) + Dim bericht As cErstasttungsschreiben = berichteSQL.getErstatung(txtErstattungAbfNrFiliale_neu.Text, txtErstattungAbfNr_neu.Text, txtErstattungAbfUnterNr_neu.Text) 'Dim ADRESSE = New VERAG_PROG_ALLGEMEIN.cAdressen(bericht.) If bericht.KorrAdresse <> "" Then bericht.KorrAdresse = bericht.KorrAdresse.Replace(Chr(13) & Chr(10), Chr(13)) @@ -82,7 +82,7 @@ Public Class usrCntlSeriendruck If cbxErstSprache.Text = "" Then Exit Sub frmShowData.Show() - frmShowData.DataGridView1.DataSource = FMZOLL_SQL.loadDgvBySqlFMZOLLREAL("exec spSELECTUStVErstattungsschreiben " & txtErstattungAbfNrFiliale.Text & ", " & txtErstattungAbfNr.Text & ", " & txtErstattungAbfUnterNr.Text & " ") + frmShowData.DataGridView1.DataSource = FMZOLL_SQL.loadDgvBySqlFMZOLLREAL("exec spSELECTUStVErstattungsschreiben " & txtErstattungAbfNrFiliale_neu.Text & ", " & txtErstattungAbfNr_neu.Text & ", " & txtErstattungAbfUnterNr_neu.Text & " ") frmShowData.Label2.Text = "Anzahl: " & frmShowData.DataGridView1.RowCount End Sub @@ -138,7 +138,7 @@ Public Class usrCntlSeriendruck WordApp.Visible = True End Sub - Private Sub txtErstattungAbfNr_KeyDown(sender As Object, e As KeyEventArgs) Handles txtErstattungAbfNr.KeyDown, txtErstattungAbfNrFiliale.KeyDown, txtErstattungAbfUnterNr.KeyDown, cbxErstSprache.KeyDown + Private Sub txtErstattungAbfNr_KeyDown(sender As Object, e As KeyEventArgs) Handles txtErstattungAbfNr.KeyDown, txtErstattungAbfNrFiliale.KeyDown, txtErstattungAbfUnterNr.KeyDown, cbxErstSprache.KeyDown, txtErstattungAbfNr_neu.KeyDown, txtErstattungAbfNrFiliale_neu.KeyDown, txtErstattungAbfUnterNr_neu.KeyDown If e.KeyCode = Keys.Enter Then withPrint = cbxSofortDruck.Checked btnWord.PerformClick() @@ -149,10 +149,10 @@ Public Class usrCntlSeriendruck Private Sub txtErstattungAbfNr_LostFocus(sender As Object, e As EventArgs) Handles txtErstattungAbfNr.TextChanged txtErstattungAbfNr.BackColor = Color.White txtErstattungAbfNr.ForeColor = Color.Red - If NurZahlen(txtErstattungAbfNr.Text) And NurZahlen(txtErstattungAbfNrFiliale.Text) And NurZahlen(txtErstattungAbfUnterNr.Text) Then + If NurZahlen(txtErstattungAbfNr_neu.Text) And NurZahlen(txtErstattungAbfNrFiliale_neu.Text) And NurZahlen(txtErstattungAbfUnterNr_neu.Text) Then 'Dim dt As DataTable = FMZOLL_SQL.loadDgvBySqlFMZOLLREAL("SELECT TOP 1 * FROM vwUStVErstattungsschreiben WHERE AbfertigungsNr=" & txtErstattungAbfNr.Text & " and FilialenNr =" & txtErstattungAbfNrFiliale.Text & " and UnterNr =" & txtErstattungAbfUnterNr.Text & " ") - Dim dt As DataTable = FMZOLL_SQL.loadDgvBySqlFMZOLLREAL("exec spSELECTUStVErstattungsschreiben " & txtErstattungAbfNrFiliale.Text & ", " & txtErstattungAbfNr.Text & ", " & txtErstattungAbfUnterNr.Text & " ") + Dim dt As DataTable = FMZOLL_SQL.loadDgvBySqlFMZOLLREAL("exec spSELECTUStVErstattungsschreiben " & txtErstattungAbfNrFiliale_neu.Text & ", " & txtErstattungAbfNr_neu.Text & ", " & txtErstattungAbfUnterNr_neu.Text & " ") If Not dt Is Nothing AndAlso dt.Rows.Count > 0 Then Try @@ -197,8 +197,8 @@ Public Class usrCntlSeriendruck End Function Private Sub txtErstattungAbfUnterNr_LostFocus(sender As Object, e As EventArgs) Handles txtErstattungAbfUnterNr.LostFocus - If NurZahlen(txtErstattungAbfUnterNr.Text) Then - If txtErstattungAbfUnterNr.Text.Length = 1 Then txtErstattungAbfUnterNr.Text = "0" & txtErstattungAbfUnterNr.Text + If NurZahlen(txtErstattungAbfUnterNr_neu.Text) Then + If txtErstattungAbfUnterNr_neu.Text.Length = 1 Then txtErstattungAbfUnterNr_neu.Text = "0" & txtErstattungAbfUnterNr_neu.Text End If End Sub diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Finanzonline/cFinanzOnlineWebService.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Finanzonline/cFinanzOnlineWebService.vb index f7b46615..dcf4681d 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Finanzonline/cFinanzOnlineWebService.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Finanzonline/cFinanzOnlineWebService.vb @@ -135,7 +135,7 @@ Public Class cFinanzOnlineWebService errorCode = returnInt Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, "Fehler im externen Webservice " & System.Reflection.MethodInfo.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, "Fehler im externen Webservice " & System.Reflection.MethodInfo.GetCurrentMethod.Name & vbNewLine & " Daten: TID: " & tid & vbNewLine & " BENID: " & benid & vbNewLine & " SessionID: " & SESSION_ID & vbNewLine & " UID: " & uid & vbNewLine & " COUNTRY-CODE/VAT: " & countryCode & vatNumber & vbNewLine & " Stufe: " & StufeAbf & vbNewLine & " MSG: " & msg & vbNewLine & " Name: " & name & vbNewLine & " Adr1: " & adrz1 & vbNewLine & " Adr2: " & adrz2 & vbNewLine & " Adr3: " & adrz3 & vbNewLine & " Adr4: " & adrz4 & vbNewLine & " Adr5: " & adrz5 & vbNewLine & " Adr6: " & adrz6, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) Exit Function End Try From 311cb70fca1b5ee8829ee106d365d6786444a1bd Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 14 Aug 2024 16:24:46 +0200 Subject: [PATCH 2/4] =?UTF-8?q?Messenger=20Bugfix,=20Mahnungen=20f=C3=BCr?= =?UTF-8?q?=20Verag360,=20etc.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SDL/UsrCntlEssensbestellungen.vb | 30 +- SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb | 35 +- SDL/buchhaltung/frmBU_Mahnlauf.vb | 48 ++- SDL/kunden/frmKundenblatt.Designer.vb | 330 +++++++++--------- .../usrcntlKundeBearbeitenFull.Designer.vb | 40 +++ SDL/kunden/usrcntlKundeBearbeitenFull.resx | 3 - SDL/kunden/usrcntlKundeBearbeitenFull.vb | 2 + VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb | 7 +- VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb | 4 + .../Messenger/frmMessenger.Designer.vb | 13 +- .../Messenger/frmMessenger.vb | 34 +- 11 files changed, 315 insertions(+), 231 deletions(-) diff --git a/SDL/UsrCntlEssensbestellungen.vb b/SDL/UsrCntlEssensbestellungen.vb index 74277ff9..f909094c 100644 --- a/SDL/UsrCntlEssensbestellungen.vb +++ b/SDL/UsrCntlEssensbestellungen.vb @@ -314,9 +314,9 @@ Public Class UsrCntlessensbestellungen If rbMenu_montag.Checked Then essen.eb_montag = menu setWarning(False) - Else - If txtAlt_montag.Text.ToString.Replace(" ", "") <> "" Then - essen.eb_montag = txtAlt_montag.Text.ToString + ElseIf rbMenuAlt_montag.Checked Then + If cbxAlt_montag.Text.ToString.Replace(" ", "") <> "" Then + essen.eb_montag = cbxAlt_montag.Text.ToString 'txtAlt_montag setWarning(False) Else setWarning(True) @@ -334,9 +334,9 @@ Public Class UsrCntlessensbestellungen If rbMenu_dienstag.Checked Then essen.eb_dienstag = menu setWarning(False) - Else - If txtAlt_dienstag.Text.ToString.Replace(" ", "") <> "" Then - essen.eb_dienstag = txtAlt_dienstag.Text.ToString + ElseIf rbMenuAlt_dienstag.Checked Then + If cbxAlt_dienstag.Text.ToString.Replace(" ", "") <> "" Then + essen.eb_dienstag = cbxAlt_dienstag.Text.ToString 'txtAlt_dienstag.Text.ToString setWarning(False) Else setWarning(True) @@ -352,9 +352,9 @@ Public Class UsrCntlessensbestellungen If rbMenu_mittwoch.Checked Then essen.eb_mittwoch = menu setWarning(False) - Else - If txtAlt_mittwoch.Text.ToString.Replace(" ", "") <> "" Then - essen.eb_mittwoch = txtAlt_mittwoch.Text.ToString + ElseIf rbMenuAlt_mittwoch.Checked Then + If cbxAlt_mittwoch.Text.ToString.Replace(" ", "") <> "" Then + essen.eb_mittwoch = cbxAlt_mittwoch.Text.ToString 'txtAlt_mittwoch.Text.ToString setWarning(False) Else setWarning(True) @@ -370,9 +370,9 @@ Public Class UsrCntlessensbestellungen If rbMenu_donnerstag.Checked Then essen.eb_donnerstag = menu setWarning(False) - Else - If txtAlt_donnerstag.Text.ToString.Replace(" ", "") <> "" Then - essen.eb_donnerstag = txtAlt_donnerstag.Text.ToString + ElseIf rbMenuAlt_donnerstag.Checked Then + If cbxAlt_donnerstag.Text.ToString.Replace(" ", "") <> "" Then + essen.eb_donnerstag = cbxAlt_donnerstag.Text.ToString 'txtAlt_donnerstag.Text.ToString setWarning(False) Else setWarning(True) @@ -388,9 +388,9 @@ Public Class UsrCntlessensbestellungen If rbMenu__freitag.Checked Then essen.eb_freitag = menu setWarning(False) - Else - If txtAlt_freitag.Text.ToString.Replace(" ", "") <> "" Then - essen.eb_freitag = txtAlt_freitag.Text.ToString + ElseIf rbMenuAlt_freitag.Checked Then + If cbxAlt_freitag.Text.ToString.Replace(" ", "") <> "" Then + essen.eb_freitag = cbxAlt_freitag.Text.ToString 'txtAlt_freitag.Text.ToString setWarning(False) Else setWarning(True) diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb b/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb index 23e9f3c5..351bce0c 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb @@ -77,7 +77,7 @@ Partial Class frmBU_Mahnlauf Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top Me.Panel1.Location = New System.Drawing.Point(0, 0) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(1107, 127) + Me.Panel1.Size = New System.Drawing.Size(1287, 127) Me.Panel1.TabIndex = 0 ' 'cbxNurFaellig @@ -86,7 +86,7 @@ Partial Class frmBU_Mahnlauf Me.cbxNurFaellig.AutoSize = True Me.cbxNurFaellig.Checked = True Me.cbxNurFaellig.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxNurFaellig.Location = New System.Drawing.Point(565, 63) + Me.cbxNurFaellig.Location = New System.Drawing.Point(568, 63) Me.cbxNurFaellig.Name = "cbxNurFaellig" Me.cbxNurFaellig.Size = New System.Drawing.Size(94, 17) Me.cbxNurFaellig.TabIndex = 38 @@ -124,6 +124,7 @@ Partial Class frmBU_Mahnlauf Me.KdSearchBox1._displayWoelflKd = False Me.KdSearchBox1._hideIfListEmpty = True Me.KdSearchBox1._loadKdData = False + Me.KdSearchBox1._searchName1 = True Me.KdSearchBox1._UseFIRMA = "" Me.KdSearchBox1._ValueKdAndName = True Me.KdSearchBox1.dgvpos = "LEFT" @@ -156,7 +157,7 @@ Partial Class frmBU_Mahnlauf Me.btnSuche.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnSuche.Image = Global.SDL.My.Resources.Resources.search Me.btnSuche.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnSuche.Location = New System.Drawing.Point(912, 56) + Me.btnSuche.Location = New System.Drawing.Point(1092, 56) Me.btnSuche.Name = "btnSuche" Me.btnSuche.Size = New System.Drawing.Size(162, 52) Me.btnSuche.TabIndex = 29 @@ -188,6 +189,7 @@ Partial Class frmBU_Mahnlauf Me.MyTextBox1._DateTimeOnly = False Me.MyTextBox1._numbersOnly = False Me.MyTextBox1._numbersOnlyKommastellen = "" + Me.MyTextBox1._numbersOnlyTrennzeichen = True Me.MyTextBox1._Prozent = False Me.MyTextBox1._ShortDateNew = False Me.MyTextBox1._ShortDateOnly = False @@ -223,7 +225,7 @@ Partial Class frmBU_Mahnlauf Me.pnlTop.Dock = System.Windows.Forms.DockStyle.Top Me.pnlTop.Location = New System.Drawing.Point(0, 0) Me.pnlTop.Name = "pnlTop" - Me.pnlTop.Size = New System.Drawing.Size(1107, 48) + Me.pnlTop.Size = New System.Drawing.Size(1287, 48) Me.pnlTop.TabIndex = 4 ' 'Label4 @@ -243,7 +245,7 @@ Partial Class frmBU_Mahnlauf Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel2.Location = New System.Drawing.Point(0, 127) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(1107, 572) + Me.Panel2.Size = New System.Drawing.Size(1287, 572) Me.Panel2.TabIndex = 1 ' 'MyDatagridview1 @@ -259,7 +261,7 @@ Partial Class frmBU_Mahnlauf Me.MyDatagridview1.ReadOnly = True Me.MyDatagridview1.RowHeadersVisible = False Me.MyDatagridview1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.MyDatagridview1.Size = New System.Drawing.Size(1107, 572) + Me.MyDatagridview1.Size = New System.Drawing.Size(1287, 572) Me.MyDatagridview1.TabIndex = 0 ' 'Panel3 @@ -281,7 +283,7 @@ Partial Class frmBU_Mahnlauf Me.Panel3.Dock = System.Windows.Forms.DockStyle.Bottom Me.Panel3.Location = New System.Drawing.Point(0, 699) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(1107, 147) + Me.Panel3.Size = New System.Drawing.Size(1287, 147) Me.Panel3.TabIndex = 1 ' 'cbxMahnstufeErh @@ -290,7 +292,7 @@ Partial Class frmBU_Mahnlauf Me.cbxMahnstufeErh.AutoSize = True Me.cbxMahnstufeErh.Checked = True Me.cbxMahnstufeErh.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxMahnstufeErh.Location = New System.Drawing.Point(900, 11) + Me.cbxMahnstufeErh.Location = New System.Drawing.Point(1080, 11) Me.cbxMahnstufeErh.Name = "cbxMahnstufeErh" Me.cbxMahnstufeErh.Size = New System.Drawing.Size(118, 17) Me.cbxMahnstufeErh.TabIndex = 44 @@ -301,7 +303,7 @@ Partial Class frmBU_Mahnlauf ' Me.Label8.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label8.AutoSize = True - Me.Label8.Location = New System.Drawing.Point(789, 121) + Me.Label8.Location = New System.Drawing.Point(969, 121) Me.Label8.Name = "Label8" Me.Label8.Size = New System.Drawing.Size(81, 13) Me.Label8.TabIndex = 42 @@ -313,7 +315,7 @@ Partial Class frmBU_Mahnlauf Me.Button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button6.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Button6.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button6.Location = New System.Drawing.Point(792, 81) + Me.Button6.Location = New System.Drawing.Point(972, 81) Me.Button6.Name = "Button6" Me.Button6.Size = New System.Drawing.Size(222, 38) Me.Button6.TabIndex = 40 @@ -326,7 +328,7 @@ Partial Class frmBU_Mahnlauf Me.btnExcel.BackgroundImage = Global.SDL.My.Resources.Resources.Excel_logo Me.btnExcel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center Me.btnExcel.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnExcel.Location = New System.Drawing.Point(1033, 30) + Me.btnExcel.Location = New System.Drawing.Point(1213, 30) Me.btnExcel.Name = "btnExcel" Me.btnExcel.Size = New System.Drawing.Size(41, 34) Me.btnExcel.TabIndex = 39 @@ -385,7 +387,7 @@ Partial Class frmBU_Mahnlauf ' Me.CheckBox1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.CheckBox1.AutoSize = True - Me.CheckBox1.Location = New System.Drawing.Point(565, 119) + Me.CheckBox1.Location = New System.Drawing.Point(745, 119) Me.CheckBox1.Name = "CheckBox1" Me.CheckBox1.Size = New System.Drawing.Size(147, 17) Me.CheckBox1.TabIndex = 33 @@ -398,7 +400,7 @@ Partial Class frmBU_Mahnlauf Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label3.AutoSize = True Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label3.Location = New System.Drawing.Point(789, 14) + Me.Label3.Location = New System.Drawing.Point(969, 14) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(101, 13) Me.Label3.TabIndex = 30 @@ -423,7 +425,7 @@ Partial Class frmBU_Mahnlauf Me.Button2.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Button2.Image = Global.SDL.My.Resources.Resources.mahn Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button2.Location = New System.Drawing.Point(792, 30) + Me.Button2.Location = New System.Drawing.Point(972, 30) Me.Button2.Name = "Button2" Me.Button2.Size = New System.Drawing.Size(222, 45) Me.Button2.TabIndex = 31 @@ -448,6 +450,7 @@ Partial Class frmBU_Mahnlauf Me.MyTextBox2._DateTimeOnly = False Me.MyTextBox2._numbersOnly = False Me.MyTextBox2._numbersOnlyKommastellen = "" + Me.MyTextBox2._numbersOnlyTrennzeichen = True Me.MyTextBox2._Prozent = False Me.MyTextBox2._ShortDateNew = True Me.MyTextBox2._ShortDateOnly = False @@ -458,7 +461,7 @@ Partial Class frmBU_Mahnlauf Me.MyTextBox2._WaehrungZeichen = False Me.MyTextBox2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.MyTextBox2.ForeColor = System.Drawing.Color.Black - Me.MyTextBox2.Location = New System.Drawing.Point(876, 118) + Me.MyTextBox2.Location = New System.Drawing.Point(1056, 118) Me.MyTextBox2.MaxLength = 10 Me.MyTextBox2.MaxLineLength = -1 Me.MyTextBox2.MaxLines_Warning = "" @@ -473,7 +476,7 @@ Partial Class frmBU_Mahnlauf Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(1107, 846) + Me.ClientSize = New System.Drawing.Size(1287, 846) Me.Controls.Add(Me.Panel2) Me.Controls.Add(Me.Panel3) Me.Controls.Add(Me.Panel1) diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.vb b/SDL/buchhaltung/frmBU_Mahnlauf.vb index 60897c5a..28d3de76 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb @@ -26,10 +26,10 @@ Public Class frmBU_Mahnlauf 'Dim sqlStr = "SELECT i_personenkonto Konto,KTO.c_name, KTO.c_landid Land,KTO.c_plz + ' ' + KTO.c_ort Ort,isnull(KTO.c_email,'') Email, count(*) Anzahl, sum(eur_bruttobetrag+eur_zahlung) Ausstand ,min(op.d_netto) Faelligkeit,max(si_mahnstufe) Mahnstufe, cast(MAX(d_mahnung)as date) Mahndatum - Dim sqlStr = "SELECT i_personenkonto Konto,KTO.c_name, KTO.c_landid Land,KTO.c_plz + ' ' + KTO.c_ort Ort,/*isnull(KTO.c_email,'') Email, */ - isnull(( SELECT TOP 1 [kkd_Email] FROM [FMZOLL\SQLFMZOLL].[VERAG].[dbo].[tblKundenKontakt] where kkd_kkaId=10 and kkd_KundenNr=i_personenkonto ) ,'') Email, - count(*) Anzahl, sum(eur_bruttobetrag+eur_zahlung) Ausstand ,min(op.d_netto) Faelligkeit,max(si_mahnstufe) Mahnstufe, cast(MAX(d_mahnung)as date) Mahndatum - " & If(cbxNurFaellig.Checked, "", ",SUM(CASE WHEN op.d_netto'" & MyTextBox1._value & "' " & If(MyComboBox1._value > 0, " and max(si_mahnstufe)>='" & MyComboBox1._value & "'", "") & " ORDER BY KTO.c_name" + + Dim sqlStringVerag360 = "SELECT i_personenkonto Konto,KTO.c_name, KTO.c_landid Land,/*KTO.c_plz + ' ' + KTO.c_ort Ort,isnull(KTO.c_email,'') Email, */ " & + "isnull(( SELECT TOP 1 [Zahlungsinformationen] FROM [FMZOLL\SQLFMZOLL].[VERAG].[dbo].Kunden where KundenNr=i_personenkonto ) ,'') Zahlungsinfo, cast(min (OWNFIELD_Belegdatum)as date) as 'ältesteRg'," & + "count(*) Anzahl, sum(eur_bruttobetrag+eur_zahlung) Ausstand ,min(op.d_netto) Faelligkeit,max(si_mahnstufe) Mahnstufe, cast(MAX(d_mahnung)as date) Mahndatum, max(replace(KTO.c_zahlziel,'0/0/','')) ZZ, + + case + when max(si_mahnstufe) = 1 and max((replace(KTO.c_zahlziel,'0/0/',''))) = 20 Then 'telefonisch' + when max(si_mahnstufe) = 1 and max((replace(KTO.c_zahlziel,'0/0/',''))) = 30 Then 'ZZ 30 Tage' + when max(si_mahnstufe) = 1 and cast(MAX(d_mahnung)as date) < (GETDATE()- 60) Then 'Sperre Donnerstag' + when max(si_mahnstufe) = 2 and max((replace(KTO.c_zahlziel,'0/0/',''))) = 20 Then 'Sperre Freitag' + when max(si_mahnstufe) = 2 and max((replace(KTO.c_zahlziel,'0/0/',''))) = 30 Then 'ZZ 30 Tage' + when max(si_mahnstufe) >= 3 Then 'Sperre Donnerstag' + else '-' + End as sperre" & If(cbxNurFaellig.Checked, "", ",SUM(CASE WHEN op.d_netto(1) ", "") & " + " & If(KdNr > 0, " AND i_personenkonto ='" & KdNr & "'", "") & " + " & If(KdTxt <> "", " AND KTO.c_name LIKE '" & KdTxt.Replace("*", "%") & "'", "") & " + group by i_personenkonto ,KTO.c_name,KTO.c_landid,KTO.c_ort,KTO.c_plz,KTO.c_email + HAVING sum(eur_bruttobetrag+eur_zahlung)>'" & MyTextBox1._value & "' + " & If(MyComboBox1._value > 0, " and max(si_mahnstufe)>='" & MyComboBox1._value & "'", "") & " + ORDER BY KTO.c_name" + 'MsgBox(sqlStr) - Dim dt_OP As DataTable = SQL.loadDgvBySql(sqlStr, "FIBU") + Dim dt_OP As DataTable = SQL.loadDgvBySql(If(Firma_ID = 19, sqlStringVerag360, sqlStr), "FIBU") .DataSource = dt_OP If .Columns.Count = 0 Then Exit Sub @@ -50,9 +75,18 @@ Public Class frmBU_Mahnlauf .Columns("c_name").AutoSizeMode = DataGridViewAutoSizeColumnsMode.Fill .Columns("Land").Width = 40 - .Columns("Ort").Width = 150 + .Columns("Anzahl").Width = 40 - .Columns("Email").Width = 150 + + If Firma_ID = 19 Then + .Columns("Zahlungsinfo").Width = 300 + .Columns("ältesteRg").Width = 75 + Else + .Columns("Email").Width = 150 + .Columns("Ort").Width = 150 + + End If + .Columns("Faelligkeit").Width = 75 .Columns("Faelligkeit").HeaderText = "Fälligkeit" diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index a49a77d7..2f8c0818 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -23,6 +23,7 @@ Partial Class frmKundenblatt Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() @@ -37,14 +38,21 @@ Partial Class frmKundenblatt 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 DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmKundenblatt)) Me.pnlInfo = New System.Windows.Forms.Panel() Me.txtInfotext = New System.Windows.Forms.Label() Me.tbFirmendaten = New System.Windows.Forms.TabPage() Me.Panel4 = New System.Windows.Forms.Panel() + Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull() Me.tbcntrMain = New System.Windows.Forms.TabControl() Me.tbAllgemein = New System.Windows.Forms.TabPage() + Me.btnReloadOP = New System.Windows.Forms.Button() + Me.Label11 = New System.Windows.Forms.Label() + Me.cboFirmaFMZOLL = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Label10 = New System.Windows.Forms.Label() + Me.Label9 = New System.Windows.Forms.Label() + Me.dgvOffenePosten = New System.Windows.Forms.DataGridView() + Me.btnOP = New System.Windows.Forms.Button() Me.Label17 = New System.Windows.Forms.Label() Me.dgvOfferte = New System.Windows.Forms.DataGridView() Me.picLogo = New System.Windows.Forms.PictureBox() @@ -117,8 +125,10 @@ Partial Class frmKundenblatt Me.lblLetzterSA_SDL = New System.Windows.Forms.Label() Me.rtbVermerke = New System.Windows.Forms.RichTextBox() Me.tbSDLKarten = New System.Windows.Forms.TabPage() + Me.usrcntlKarten = New SDL.usrCntlKartenDaten() Me.tbLKW = New System.Windows.Forms.TabPage() Me.pnlLKWRight = New System.Windows.Forms.Panel() + Me.UsrCntlLKW1 = New SDL.usrCntlLKW() Me.pnlLKW = New System.Windows.Forms.Panel() Me.dgvLKW = New System.Windows.Forms.DataGridView() Me.pnlLKWBottom = New System.Windows.Forms.Panel() @@ -149,6 +159,7 @@ Partial Class frmKundenblatt Me.scanVertragVeragKd = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() Me.tbBesuchsberichte = New System.Windows.Forms.TabPage() Me.tbOfferte = New System.Windows.Forms.TabPage() + Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() Me.tbUSTV = New System.Windows.Forms.TabPage() Me.tbcntrUSTV = New System.Windows.Forms.TabControl() Me.tbUSTVDokumente = New System.Windows.Forms.TabPage() @@ -159,6 +170,7 @@ Partial Class frmKundenblatt Me.scanUSTVFABest = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.scanUSTVVollmachten = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.tbUSTVAntrage = New System.Windows.Forms.TabPage() + Me.UsrCntlUSTV = New SDL.usrCntlUSTV() Me.cntxtExcel = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem() @@ -184,23 +196,12 @@ Partial Class frmKundenblatt Me.tbiKartenverwaltung = New System.Windows.Forms.ToolStripMenuItem() Me.tbiLKW = New System.Windows.Forms.ToolStripMenuItem() Me.tbiVERAGCard = New System.Windows.Forms.ToolStripMenuItem() - Me.btnOP = New System.Windows.Forms.Button() - Me.dgvOffenePosten = New System.Windows.Forms.DataGridView() - Me.Label9 = New System.Windows.Forms.Label() - Me.Label10 = New System.Windows.Forms.Label() - Me.btnReloadOP = New System.Windows.Forms.Button() - Me.Label11 = New System.Windows.Forms.Label() - Me.cboFirmaFMZOLL = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull() - Me.usrcntlKarten = New SDL.usrCntlKartenDaten() - Me.UsrCntlLKW1 = New SDL.usrCntlLKW() - Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() - Me.UsrCntlUSTV = New SDL.usrCntlUSTV() Me.pnlInfo.SuspendLayout() Me.tbFirmendaten.SuspendLayout() Me.Panel4.SuspendLayout() Me.tbcntrMain.SuspendLayout() Me.tbAllgemein.SuspendLayout() + CType(Me.dgvOffenePosten, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvOfferte, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.picLogo, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).BeginInit() @@ -241,7 +242,6 @@ Partial Class frmKundenblatt Me.ContextMenuStrip3.SuspendLayout() Me.mne.SuspendLayout() Me.pnl.SuspendLayout() - CType(Me.dgvOffenePosten, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'pnlInfo @@ -285,6 +285,16 @@ Partial Class frmKundenblatt Me.Panel4.Size = New System.Drawing.Size(1624, 874) Me.Panel4.TabIndex = 0 ' + 'UsrcntlKundeBearbeitenFull1 + ' + Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White + Me.UsrcntlKundeBearbeitenFull1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0) + Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1" + Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1624, 874) + Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 + ' 'tbcntrMain ' Me.tbcntrMain.Appearance = System.Windows.Forms.TabAppearance.FlatButtons @@ -344,6 +354,93 @@ Partial Class frmKundenblatt Me.tbAllgemein.TabIndex = 0 Me.tbAllgemein.Text = "Allgemein" ' + 'btnReloadOP + ' + Me.btnReloadOP.BackgroundImage = Global.SDL.My.Resources.Resources.reloadFinance + Me.btnReloadOP.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnReloadOP.Cursor = System.Windows.Forms.Cursors.Hand + Me.btnReloadOP.FlatAppearance.BorderSize = 0 + Me.btnReloadOP.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnReloadOP.Location = New System.Drawing.Point(240, 563) + Me.btnReloadOP.Name = "btnReloadOP" + Me.btnReloadOP.Size = New System.Drawing.Size(25, 25) + Me.btnReloadOP.TabIndex = 180 + Me.btnReloadOP.UseVisualStyleBackColor = True + Me.btnReloadOP.Visible = False + ' + 'Label11 + ' + Me.Label11.AutoSize = True + Me.Label11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label11.Location = New System.Drawing.Point(271, 570) + Me.Label11.Name = "Label11" + Me.Label11.Size = New System.Drawing.Size(82, 13) + Me.Label11.TabIndex = 178 + Me.Label11.Text = "Daten für Firma:" + ' + 'cboFirmaFMZOLL + ' + Me.cboFirmaFMZOLL._allowedValuesFreiText = Nothing + Me.cboFirmaFMZOLL._allowFreiText = False + Me.cboFirmaFMZOLL._value = "" + Me.cboFirmaFMZOLL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboFirmaFMZOLL.FormattingEnabled = True + Me.cboFirmaFMZOLL.Location = New System.Drawing.Point(354, 567) + Me.cboFirmaFMZOLL.Name = "cboFirmaFMZOLL" + Me.cboFirmaFMZOLL.Size = New System.Drawing.Size(184, 21) + Me.cboFirmaFMZOLL.TabIndex = 179 + ' + 'Label10 + ' + Me.Label10.AutoSize = True + Me.Label10.Location = New System.Drawing.Point(544, 570) + Me.Label10.Name = "Label10" + Me.Label10.Size = New System.Drawing.Size(149, 13) + Me.Label10.TabIndex = 177 + Me.Label10.Text = "Zahlungserinnerung/OP-Liste:" + ' + 'Label9 + ' + Me.Label9.AutoSize = True + Me.Label9.Location = New System.Drawing.Point(9, 575) + Me.Label9.Name = "Label9" + Me.Label9.Size = New System.Drawing.Size(78, 13) + Me.Label9.TabIndex = 176 + Me.Label9.Text = "Offene Posten:" + ' + 'dgvOffenePosten + ' + Me.dgvOffenePosten.AllowUserToAddRows = False + Me.dgvOffenePosten.AllowUserToDeleteRows = False + Me.dgvOffenePosten.AllowUserToResizeRows = False + DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + Me.dgvOffenePosten.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White + Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvOffenePosten.Location = New System.Drawing.Point(12, 591) + Me.dgvOffenePosten.MultiSelect = False + Me.dgvOffenePosten.Name = "dgvOffenePosten" + Me.dgvOffenePosten.ReadOnly = True + Me.dgvOffenePosten.RowHeadersVisible = False + Me.dgvOffenePosten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvOffenePosten.Size = New System.Drawing.Size(714, 281) + Me.dgvOffenePosten.TabIndex = 175 + ' + 'btnOP + ' + Me.btnOP.BackgroundImage = Global.SDL.My.Resources.Resources.mahn + Me.btnOP.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnOP.Cursor = System.Windows.Forms.Cursors.Hand + Me.btnOP.FlatAppearance.BorderSize = 0 + Me.btnOP.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnOP.Location = New System.Drawing.Point(702, 564) + Me.btnOP.Name = "btnOP" + Me.btnOP.Size = New System.Drawing.Size(24, 24) + Me.btnOP.TabIndex = 174 + Me.btnOP.UseVisualStyleBackColor = True + ' 'Label17 ' Me.Label17.AutoSize = True @@ -1309,11 +1406,21 @@ Partial Class frmKundenblatt Me.tbSDLKarten.Location = New System.Drawing.Point(4, 22) Me.tbSDLKarten.Name = "tbSDLKarten" Me.tbSDLKarten.Padding = New System.Windows.Forms.Padding(3) - Me.tbSDLKarten.Size = New System.Drawing.Size(1616, 848) + Me.tbSDLKarten.Size = New System.Drawing.Size(178, 39) Me.tbSDLKarten.TabIndex = 7 Me.tbSDLKarten.Text = "SDL-Kartenverwaltung" Me.tbSDLKarten.UseVisualStyleBackColor = True ' + 'usrcntlKarten + ' + Me.usrcntlKarten.Cursor = System.Windows.Forms.Cursors.Default + Me.usrcntlKarten.Dock = System.Windows.Forms.DockStyle.Fill + Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3) + Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.usrcntlKarten.Name = "usrcntlKarten" + Me.usrcntlKarten.Size = New System.Drawing.Size(172, 33) + Me.usrcntlKarten.TabIndex = 0 + ' 'tbLKW ' Me.tbLKW.Controls.Add(Me.pnlLKWRight) @@ -1321,7 +1428,7 @@ Partial Class frmKundenblatt Me.tbLKW.Location = New System.Drawing.Point(4, 22) Me.tbLKW.Name = "tbLKW" Me.tbLKW.Padding = New System.Windows.Forms.Padding(3) - Me.tbLKW.Size = New System.Drawing.Size(1616, 848) + Me.tbLKW.Size = New System.Drawing.Size(178, 39) Me.tbLKW.TabIndex = 4 Me.tbLKW.Text = "LKWs" Me.tbLKW.UseVisualStyleBackColor = True @@ -1333,9 +1440,22 @@ Partial Class frmKundenblatt Me.pnlLKWRight.Location = New System.Drawing.Point(309, 3) Me.pnlLKWRight.Name = "pnlLKWRight" Me.pnlLKWRight.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0) - Me.pnlLKWRight.Size = New System.Drawing.Size(1304, 842) + Me.pnlLKWRight.Size = New System.Drawing.Size(0, 33) Me.pnlLKWRight.TabIndex = 2 ' + 'UsrCntlLKW1 + ' + Me.UsrCntlLKW1.BackColor = System.Drawing.Color.White + Me.UsrCntlLKW1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.UsrCntlLKW1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.UsrCntlLKW1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlLKW1.Location = New System.Drawing.Point(10, 0) + Me.UsrCntlLKW1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrCntlLKW1.MaximumSize = New System.Drawing.Size(1200, 1000) + Me.UsrCntlLKW1.Name = "UsrCntlLKW1" + Me.UsrCntlLKW1.Size = New System.Drawing.Size(0, 33) + Me.UsrCntlLKW1.TabIndex = 0 + ' 'pnlLKW ' Me.pnlLKW.Controls.Add(Me.dgvLKW) @@ -1344,7 +1464,7 @@ Partial Class frmKundenblatt Me.pnlLKW.Dock = System.Windows.Forms.DockStyle.Left Me.pnlLKW.Location = New System.Drawing.Point(3, 3) Me.pnlLKW.Name = "pnlLKW" - Me.pnlLKW.Size = New System.Drawing.Size(306, 842) + Me.pnlLKW.Size = New System.Drawing.Size(306, 33) Me.pnlLKW.TabIndex = 3 ' 'dgvLKW @@ -1385,7 +1505,7 @@ Partial Class frmKundenblatt Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle15 Me.dgvLKW.RowHeadersVisible = False Me.dgvLKW.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvLKW.Size = New System.Drawing.Size(306, 668) + Me.dgvLKW.Size = New System.Drawing.Size(306, 0) Me.dgvLKW.TabIndex = 2 ' 'pnlLKWBottom @@ -1397,7 +1517,7 @@ Partial Class frmKundenblatt Me.pnlLKWBottom.Controls.Add(Me.Button13) Me.pnlLKWBottom.Controls.Add(Me.lblErgebnisse) Me.pnlLKWBottom.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlLKWBottom.Location = New System.Drawing.Point(0, 730) + Me.pnlLKWBottom.Location = New System.Drawing.Point(0, -79) Me.pnlLKWBottom.Name = "pnlLKWBottom" Me.pnlLKWBottom.Size = New System.Drawing.Size(306, 112) Me.pnlLKWBottom.TabIndex = 3 @@ -1538,7 +1658,7 @@ Partial Class frmKundenblatt Me.tbVERAGCard.Location = New System.Drawing.Point(4, 22) Me.tbVERAGCard.Name = "tbVERAGCard" Me.tbVERAGCard.Padding = New System.Windows.Forms.Padding(3) - Me.tbVERAGCard.Size = New System.Drawing.Size(1616, 848) + Me.tbVERAGCard.Size = New System.Drawing.Size(178, 39) Me.tbVERAGCard.TabIndex = 6 Me.tbVERAGCard.Text = "VERAG Card" Me.tbVERAGCard.UseVisualStyleBackColor = True @@ -1550,7 +1670,7 @@ Partial Class frmKundenblatt Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel3.Location = New System.Drawing.Point(3, 3) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(1610, 842) + Me.Panel3.Size = New System.Drawing.Size(172, 33) Me.Panel3.TabIndex = 0 ' 'tbDokumente @@ -1568,7 +1688,7 @@ Partial Class frmKundenblatt Me.tbDokumente.Controls.Add(Me.scanVertragVeragKd) Me.tbDokumente.Location = New System.Drawing.Point(4, 22) Me.tbDokumente.Name = "tbDokumente" - Me.tbDokumente.Size = New System.Drawing.Size(1616, 848) + Me.tbDokumente.Size = New System.Drawing.Size(178, 39) Me.tbDokumente.TabIndex = 8 Me.tbDokumente.Text = "Dokumente" Me.tbDokumente.UseVisualStyleBackColor = True @@ -1766,7 +1886,7 @@ Partial Class frmKundenblatt Me.tbBesuchsberichte.Location = New System.Drawing.Point(4, 22) Me.tbBesuchsberichte.Name = "tbBesuchsberichte" Me.tbBesuchsberichte.Padding = New System.Windows.Forms.Padding(3) - Me.tbBesuchsberichte.Size = New System.Drawing.Size(1616, 848) + Me.tbBesuchsberichte.Size = New System.Drawing.Size(178, 39) Me.tbBesuchsberichte.TabIndex = 9 Me.tbBesuchsberichte.Text = "Besuchsberichte" Me.tbBesuchsberichte.UseVisualStyleBackColor = True @@ -1782,6 +1902,16 @@ Partial Class frmKundenblatt Me.tbOfferte.Text = "Offerte" Me.tbOfferte.UseVisualStyleBackColor = True ' + 'UsrCntlOfferte1 + ' + Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White + Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0) + Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1) + Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" + Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1630, 880) + Me.UsrCntlOfferte1.TabIndex = 0 + ' 'tbUSTV ' Me.tbUSTV.Controls.Add(Me.tbcntrUSTV) @@ -1912,11 +2042,19 @@ Partial Class frmKundenblatt Me.tbUSTVAntrage.Location = New System.Drawing.Point(4, 22) Me.tbUSTVAntrage.Name = "tbUSTVAntrage" Me.tbUSTVAntrage.Padding = New System.Windows.Forms.Padding(3) - Me.tbUSTVAntrage.Size = New System.Drawing.Size(1622, 854) + Me.tbUSTVAntrage.Size = New System.Drawing.Size(184, 45) Me.tbUSTVAntrage.TabIndex = 9 Me.tbUSTVAntrage.Text = "USTV-Anträge" Me.tbUSTVAntrage.UseVisualStyleBackColor = True ' + 'UsrCntlUSTV + ' + Me.UsrCntlUSTV.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlUSTV.Location = New System.Drawing.Point(3, 3) + Me.UsrCntlUSTV.Name = "UsrCntlUSTV" + Me.UsrCntlUSTV.Size = New System.Drawing.Size(178, 39) + Me.UsrCntlUSTV.TabIndex = 0 + ' 'cntxtExcel ' Me.cntxtExcel.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -2059,7 +2197,7 @@ Partial Class frmKundenblatt ' Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM" - Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8 + Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4 Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4) Me.cntxtCntxtMDM.Text = "cntxtMDM" ' @@ -2193,144 +2331,6 @@ Partial Class frmKundenblatt Me.tbiVERAGCard.Size = New System.Drawing.Size(186, 22) Me.tbiVERAGCard.Text = "VERAG Card" ' - 'btnOP - ' - Me.btnOP.BackgroundImage = Global.SDL.My.Resources.Resources.mahn - Me.btnOP.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.btnOP.Cursor = System.Windows.Forms.Cursors.Hand - Me.btnOP.FlatAppearance.BorderSize = 0 - Me.btnOP.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnOP.Location = New System.Drawing.Point(702, 564) - Me.btnOP.Name = "btnOP" - Me.btnOP.Size = New System.Drawing.Size(24, 24) - Me.btnOP.TabIndex = 174 - Me.btnOP.UseVisualStyleBackColor = True - ' - 'dgvOffenePosten - ' - Me.dgvOffenePosten.AllowUserToAddRows = False - Me.dgvOffenePosten.AllowUserToDeleteRows = False - Me.dgvOffenePosten.AllowUserToResizeRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 - Me.dgvOffenePosten.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White - Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvOffenePosten.Location = New System.Drawing.Point(12, 591) - Me.dgvOffenePosten.MultiSelect = False - Me.dgvOffenePosten.Name = "dgvOffenePosten" - Me.dgvOffenePosten.ReadOnly = True - Me.dgvOffenePosten.RowHeadersVisible = False - Me.dgvOffenePosten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvOffenePosten.Size = New System.Drawing.Size(714, 281) - Me.dgvOffenePosten.TabIndex = 175 - ' - 'Label9 - ' - Me.Label9.AutoSize = True - Me.Label9.Location = New System.Drawing.Point(9, 575) - Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(78, 13) - Me.Label9.TabIndex = 176 - Me.Label9.Text = "Offene Posten:" - ' - 'Label10 - ' - Me.Label10.AutoSize = True - Me.Label10.Location = New System.Drawing.Point(544, 570) - Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(149, 13) - Me.Label10.TabIndex = 177 - Me.Label10.Text = "Zahlungserinnerung/OP-Liste:" - ' - 'btnReloadOP - ' - Me.btnReloadOP.BackgroundImage = Global.SDL.My.Resources.Resources.reloadFinance - Me.btnReloadOP.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.btnReloadOP.Cursor = System.Windows.Forms.Cursors.Hand - Me.btnReloadOP.FlatAppearance.BorderSize = 0 - Me.btnReloadOP.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnReloadOP.Location = New System.Drawing.Point(240, 563) - Me.btnReloadOP.Name = "btnReloadOP" - Me.btnReloadOP.Size = New System.Drawing.Size(25, 25) - Me.btnReloadOP.TabIndex = 180 - Me.btnReloadOP.UseVisualStyleBackColor = True - Me.btnReloadOP.Visible = False - ' - 'Label11 - ' - Me.Label11.AutoSize = True - Me.Label11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label11.Location = New System.Drawing.Point(271, 570) - Me.Label11.Name = "Label11" - Me.Label11.Size = New System.Drawing.Size(82, 13) - Me.Label11.TabIndex = 178 - Me.Label11.Text = "Daten für Firma:" - ' - 'cboFirmaFMZOLL - ' - Me.cboFirmaFMZOLL._allowedValuesFreiText = Nothing - Me.cboFirmaFMZOLL._allowFreiText = False - Me.cboFirmaFMZOLL._value = "" - Me.cboFirmaFMZOLL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboFirmaFMZOLL.FormattingEnabled = True - Me.cboFirmaFMZOLL.Location = New System.Drawing.Point(354, 567) - Me.cboFirmaFMZOLL.Name = "cboFirmaFMZOLL" - Me.cboFirmaFMZOLL.Size = New System.Drawing.Size(184, 21) - Me.cboFirmaFMZOLL.TabIndex = 179 - ' - 'UsrcntlKundeBearbeitenFull1 - ' - Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White - Me.UsrcntlKundeBearbeitenFull1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0) - Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1" - Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1624, 874) - Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 - ' - 'usrcntlKarten - ' - Me.usrcntlKarten.Cursor = System.Windows.Forms.Cursors.Default - Me.usrcntlKarten.Dock = System.Windows.Forms.DockStyle.Fill - Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3) - Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.usrcntlKarten.Name = "usrcntlKarten" - Me.usrcntlKarten.Size = New System.Drawing.Size(1610, 842) - Me.usrcntlKarten.TabIndex = 0 - ' - 'UsrCntlLKW1 - ' - Me.UsrCntlLKW1.BackColor = System.Drawing.Color.White - Me.UsrCntlLKW1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.UsrCntlLKW1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.UsrCntlLKW1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlLKW1.Location = New System.Drawing.Point(10, 0) - Me.UsrCntlLKW1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrCntlLKW1.MaximumSize = New System.Drawing.Size(1200, 1000) - Me.UsrCntlLKW1.Name = "UsrCntlLKW1" - Me.UsrCntlLKW1.Size = New System.Drawing.Size(1200, 842) - Me.UsrCntlLKW1.TabIndex = 0 - ' - 'UsrCntlOfferte1 - ' - Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White - Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0) - Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1) - Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" - Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1630, 880) - Me.UsrCntlOfferte1.TabIndex = 0 - ' - 'UsrCntlUSTV - ' - Me.UsrCntlUSTV.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlUSTV.Location = New System.Drawing.Point(3, 3) - Me.UsrCntlUSTV.Name = "UsrCntlUSTV" - Me.UsrCntlUSTV.Size = New System.Drawing.Size(1616, 848) - Me.UsrCntlUSTV.TabIndex = 0 - ' 'frmKundenblatt ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -2357,6 +2357,7 @@ Partial Class frmKundenblatt Me.tbcntrMain.ResumeLayout(False) Me.tbAllgemein.ResumeLayout(False) Me.tbAllgemein.PerformLayout() + CType(Me.dgvOffenePosten, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.dgvOfferte, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.picLogo, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).EndInit() @@ -2409,7 +2410,6 @@ Partial Class frmKundenblatt Me.mne.PerformLayout() Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() - CType(Me.dgvOffenePosten, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb index c1f4433b..8e4ab1d7 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb @@ -339,6 +339,9 @@ 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.tbZahlungsinfo = New System.Windows.Forms.TabPage() + Me.rtb_Zahlungsinfo = New System.Windows.Forms.RichTextBox() + Me.Label102 = New System.Windows.Forms.Label() Me.tbcntrDetails.SuspendLayout() Me.tbAbfertigung.SuspendLayout() Me.tbcntrAbf.SuspendLayout() @@ -371,6 +374,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.TabPage10.SuspendLayout() Me.TabPage11.SuspendLayout() Me.pnlNeukunde.SuspendLayout() + Me.tbZahlungsinfo.SuspendLayout() Me.SuspendLayout() ' 'tbcntrDetails @@ -385,6 +389,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbcntrDetails.Controls.Add(Me.tbUmsatzsteuer) Me.tbcntrDetails.Controls.Add(Me.tbSonstiges) Me.tbcntrDetails.Controls.Add(Me.tbSchnittstellen) + Me.tbcntrDetails.Controls.Add(Me.tbZahlungsinfo) Me.tbcntrDetails.Location = New System.Drawing.Point(462, 3) Me.tbcntrDetails.Name = "tbcntrDetails" Me.tbcntrDetails.SelectedIndex = 0 @@ -560,6 +565,7 @@ Partial Class usrcntlKundeBearbeitenFull ' '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" @@ -4557,6 +4563,35 @@ Partial Class usrcntlKundeBearbeitenFull Me.DataGridViewTextBoxColumn2.HeaderText = "E-Mail" Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" ' + 'tbZahlungsinfo + ' + Me.tbZahlungsinfo.Controls.Add(Me.Label102) + Me.tbZahlungsinfo.Controls.Add(Me.rtb_Zahlungsinfo) + Me.tbZahlungsinfo.Location = New System.Drawing.Point(4, 22) + Me.tbZahlungsinfo.Name = "tbZahlungsinfo" + Me.tbZahlungsinfo.Size = New System.Drawing.Size(672, 458) + Me.tbZahlungsinfo.TabIndex = 11 + Me.tbZahlungsinfo.Text = "Zahlungsinfo" + Me.tbZahlungsinfo.UseVisualStyleBackColor = True + ' + 'rtb_Zahlungsinfo + ' + Me.rtb_Zahlungsinfo.Location = New System.Drawing.Point(6, 35) + Me.rtb_Zahlungsinfo.Name = "rtb_Zahlungsinfo" + Me.rtb_Zahlungsinfo.Size = New System.Drawing.Size(660, 412) + Me.rtb_Zahlungsinfo.TabIndex = 40 + Me.rtb_Zahlungsinfo.Text = "" + ' + 'Label102 + ' + Me.Label102.AutoSize = True + Me.Label102.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label102.Location = New System.Drawing.Point(3, 18) + Me.Label102.Name = "Label102" + Me.Label102.Size = New System.Drawing.Size(66, 13) + Me.Label102.TabIndex = 132 + Me.Label102.Text = "Zahlunginfo:" + ' 'usrcntlKundeBearbeitenFull ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -4642,6 +4677,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.TabPage11.ResumeLayout(False) Me.pnlNeukunde.ResumeLayout(False) Me.pnlNeukunde.PerformLayout() + Me.tbZahlungsinfo.ResumeLayout(False) + Me.tbZahlungsinfo.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -4947,4 +4984,7 @@ Partial Class usrcntlKundeBearbeitenFull Friend WithEvents PictureBox5 As PictureBox Friend WithEvents Label101 As Label Friend WithEvents txtAbwZZVL As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents tbZahlungsinfo As TabPage + Friend WithEvents Label102 As Label + Friend WithEvents rtb_Zahlungsinfo As RichTextBox End Class diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.resx b/SDL/kunden/usrcntlKundeBearbeitenFull.resx index 279a4474..1af7de15 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.resx +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.resx @@ -117,7 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - \ No newline at end of file diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index f81b8c5a..193e1acc 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -287,6 +287,7 @@ Public Class usrcntlKundeBearbeitenFull txtVers_Bankgarantiebetrag._value = loadValue(KUNDE.BankgarantieBetrag, "") txtVers_BankgarantiebetragGueltigBis._value = loadValue(KUNDE.BankgarantieGültigBis, "") txtVers_Information.Text = loadValue(KUNDE.Info, "") + rtb_Zahlungsinfo.Text = loadValue(KUNDE.Zahlungsinformationen, "") txtVers_Saldo._value = loadValue(KUNDE.LfdSaldo, "") cbxDeckungsstopp.Checked = KUNDE_ERW.kde_Versicherung_Deckungsstopp txtDeckungsstoppDatum._value = loadValue(KUNDE_ERW.kde_Versicherung_DeckungsstoppDatum, "") @@ -578,6 +579,7 @@ Public Class usrcntlKundeBearbeitenFull KUNDE.BankgarantieBetrag = isLeerNothingDbl(txtVers_Bankgarantiebetrag._value) KUNDE.BankgarantieGültigBis = isLeerNothing(txtVers_BankgarantiebetragGueltigBis._value) KUNDE.Info = isLeerNothing(txtVers_Information.Text) + KUNDE.Zahlungsinformationen = isLeerNothing(rtb_Zahlungsinfo.Text) KUNDE.LfdSaldo = isLeerNothingDbl(txtVers_Saldo._value) KUNDE_ERW.kde_Versicherung_Deckungsstopp = cbxDeckungsstopp.Checked KUNDE_ERW.kde_Versicherung_DeckungsstoppDatum = isLeerNothing(txtDeckungsstoppDatum._value) diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb index a19af3c3..6e9a1c2f 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb @@ -43,11 +43,11 @@ Public Class cMessenger Public Shared Function GET_NewMSG_COUNT(Optional maId = -1) As Integer If maId < 0 Then maId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID - Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & " AND chatMgSt_gelesen=0 ", "ADMIN",,, 0) + Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & " AND chatMgSt_gelesen=0 and chatMg_chatId in (SELECT [chatMb_chatId] FROM [tblMessenger_ChatMembers] where [chatMb_maId] = " & maId & ")", "ADMIN",,, 0) End Function Public Shared Function GET_NewMSG_COUNT_CHATID(maId, chat_Id) As Integer If maId < 0 Then maId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID - Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & " AND chatMgSt_gelesen=0 AND chatMg_chatId='" & chat_Id & "'", "ADMIN",,, 0) + Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & " AND chatMgSt_gelesen=0 AND chatMg_chatId='" & chat_Id & "' AND (SELECT COUNT(*) FROM tblMessenger_ChatMembers WHERE chatMB_chatId='" & chat_Id & "'AND chatMB_maId=" & maId & ")>0", "ADMIN",,, 0) End Function Public Shared Function SET_LKWCHAT_INAKTIV(AvisoId) As Integer @@ -56,7 +56,8 @@ Public Class cMessenger Public Shared Function GET_NewMSG_COUNT_ART(maId, chat_art) As Integer If maId < 0 Then maId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID - Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_Chat on chat_id=chatMg_chatId INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & " AND chatMgSt_gelesen=0 AND chat_art='" & chat_art & "' AND (SELECT COUNT(*) FROM tblMessenger_ChatMembers WHERE chatMB_chatId=chat_id AND chatMB_maId=" & maId & ")>0", "ADMIN",,, 0) + 'Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_Chat on chat_id=chatMg_chatId INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & " AND chatMgSt_gelesen=0 AND chat_art='" & chat_art & "' AND (SELECT COUNT(*) FROM tblMessenger_ChatMembers WHERE chatMB_chatId=chat_id AND chatMB_maId=" & maId & ")>0", "ADMIN",,, 0) + Return SQL.getValueTxtBySql("SELECT isnull(COUNT(*),0) FROM tblMessenger_ChatMessages INNER JOIN tblMessenger_Chat on chat_id=chatMg_chatId INNER JOIN tblMessenger_ChatMessageStatus ON chatMgSt_chatMsgId=chatMg_id WHERE chatMgSt_MaId=" & maId & " AND chatMgSt_gelesen=0 AND chat_art='" & chat_art & "' AND chatMg_chatId in (SELECT [chatMb_chatId] FROM [tblMessenger_ChatMembers] where [chatMb_maId] = " & maId & " and chatMB_chatId=chat_id)", "ADMIN",,, 0) End Function Public Shared Function GET_NewMSG_COUNT_ART_INAKTIV(maId, chat_art) As Integer If maId < 0 Then maId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb index 8ce9ed19..115ddd7b 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb @@ -65,6 +65,8 @@ Public Class cMitarbeiter Property mit_FirmaHaupt As Object = Nothing Property mit_ChatEasteregg As Boolean = False + Property mit_ChatEasteregg2 As Boolean = False + Property mit_MAVerzeichnis_SettingsTstmp As Object = Nothing @@ -181,6 +183,7 @@ Public Class cMitarbeiter list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_ChatBenutzer", mit_ChatBenutzer)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_FirmaHaupt", mit_FirmaHaupt)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_ChatEasteregg", mit_ChatEasteregg)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_ChatEasteregg2", mit_ChatEasteregg2)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_MAVerzeichnis_SettingsTstmp", mit_MAVerzeichnis_SettingsTstmp)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_MAVerzeichnis_allowGebDat", mit_MAVerzeichnis_allowGebDat)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_MAVerzeichnis_allowWohnadresse", mit_MAVerzeichnis_allowWohnadresse)) @@ -377,6 +380,7 @@ Public Class cMitarbeiter Me.mit_ChatBenutzer = dr.Item("mit_ChatBenutzer") Me.mit_ChatEasteregg = dr.Item("mit_ChatEasteregg") + Me.mit_ChatEasteregg2 = dr.Item("mit_ChatEasteregg2") If Not dr.Item("mit_FirmaHaupt") Is DBNull.Value Then Me.mit_FirmaHaupt = dr.Item("mit_FirmaHaupt") diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb index 5054035b..5f430869 100644 --- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb @@ -24,6 +24,7 @@ Partial Class frmMessenger 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() @@ -38,12 +39,12 @@ Partial Class frmMessenger Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMessenger)) Me.SplitContainer = New System.Windows.Forms.SplitContainer() Me.SplitContainer2 = New System.Windows.Forms.SplitContainer() - Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview() + Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel6 = New System.Windows.Forms.Panel() Me.Label3 = New System.Windows.Forms.Label() Me.lblLKWChat_MsgCntInaktiv = New System.Windows.Forms.Label() Me.cbxInaktiveChats = New System.Windows.Forms.CheckBox() - Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview() + Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel5 = New System.Windows.Forms.Panel() Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.PictureBox2 = New System.Windows.Forms.PictureBox() @@ -64,7 +65,7 @@ Partial Class frmMessenger Me.btnNeu = New System.Windows.Forms.Button() Me.Button1 = New System.Windows.Forms.Button() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() - Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel() + Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel(Me.components) Me.UsrCntlMessenger_ChatElement1 = New VERAG_PROG_ALLGEMEIN.usrCntlMessenger_ChatElement() Me.Panel3 = New System.Windows.Forms.Panel() Me.btnTeilnehmer = New System.Windows.Forms.Button() @@ -92,9 +93,9 @@ Partial Class frmMessenger Me.btnSendAtt = New System.Windows.Forms.Button() Me.btnSenden = New System.Windows.Forms.Button() Me.rtbChatMessage = New System.Windows.Forms.RichTextBox() - Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer() - Me.Timer_REFRESH = New System.Windows.Forms.Timer() - Me.cntxt = New System.Windows.Forms.ContextMenuStrip() + Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer(Me.components) + Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components) + Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ChatDeaktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.toolChatReminder = New System.Windows.Forms.ToolStripMenuItem() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb index c7b40745..36a06010 100644 --- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb +++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb @@ -5,7 +5,6 @@ Imports System.Security.Policy Imports System.Threading Imports System.Web.UI.WebControls.WebParts Imports System.Windows.Forms -Imports Util Imports VERAG_PROG_ALLGEMEIN.cMessenger Public Class frmMessenger @@ -21,6 +20,7 @@ Public Class frmMessenger Public SendungID As Integer = -1 Dim alloweasteregg = False + Dim hiddemEmojis = False Dim toggle_CHAT_ART = "CHAT" Public Sub New() @@ -123,6 +123,7 @@ Public Class frmMessenger MyFlowLayoutPanel1.Controls.Clear() 'loaded = True alloweasteregg = cAllgemein.MITARBEITER.mit_ChatEasteregg + hiddemEmojis = cAllgemein.MITARBEITER.mit_ChatEasteregg2 initEmojis() VERAG_PROG_ALLGEMEIN.cAllgemein._TRANSLATE(Me) End Sub @@ -131,8 +132,6 @@ Public Class frmMessenger FlowLayoutPanel.Controls.Clear() If alloweasteregg Then pic.Visible = False - - ' If IO.Directory.Exists(My.Application.roo "") Then Dim spezialEmoji = False @@ -140,24 +139,27 @@ Public Class frmMessenger If IO.Directory.Exists(EMOJI_PATH) Then For Each aa In IO.Directory.GetFiles(EMOJI_PATH) '.OrderBy(Function(f) f) - If alloweasteregg Or Not aa.Contains("easteregg") Then + If (alloweasteregg Or Not aa.Contains("easteregg")) Then If IO.File.Exists(aa) And aa.Contains(".png") And (aa.Contains("emoji_") Or spezialEmoji) Then + If hiddemEmojis Or Not aa.Contains("_hidden") Then + Dim p As New PictureBox + p.Size = New Size(40, 40) + p.BackgroundImage = Image.FromFile(aa) + p.BackgroundImageLayout = ImageLayout.Zoom + p.Cursor = Cursors.Hand + AddHandler p.Click, Sub() + If Not CHAT.chat_aktiv Then MsgBox("Chat inaktiv!") : Exit Sub + If CHAT IsNot Nothing Then + saveEmoji(aa) + End If + End Sub - Dim p As New PictureBox - p.Size = New Size(40, 40) - p.BackgroundImage = Image.FromFile(aa) - p.BackgroundImageLayout = ImageLayout.Zoom - p.Cursor = Cursors.Hand - AddHandler p.Click, Sub() - If Not CHAT.chat_aktiv Then MsgBox("Chat inaktiv!") : Exit Sub - If CHAT IsNot Nothing Then - saveEmoji(aa) - End If - End Sub + FlowLayoutPanel.Controls.Add(p) + End If - FlowLayoutPanel.Controls.Add(p) End If End If + 'MsgBox(a) Next End If From 68d609a3ce7f6f2d1c7c170206b46fe13e9077e4 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 16 Aug 2024 11:43:32 +0200 Subject: [PATCH 3/4] APIs --- SDL/mdm/frmMDMDatenverarbetiung.vb | 2 +- .../My Project/Resources.Designer.vb | 10 ++++++ .../My Project/Resources.resx | 5 ++- .../Resources/fragezeichen.png | Bin 0 -> 32173 bytes .../ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb | 12 +++++-- .../Creditsafe/cCreditSafeAPI.vb | 12 +++++-- .../Schnittstellen/MSE/cMSEAPI.vb | 30 +++++++++++------- .../Schnittstellen/TIMAS/cTimasAPI.vb | 8 ++++- .../VERAG_PROG_ALLGEMEIN.vbproj | 3 ++ 9 files changed, 64 insertions(+), 18 deletions(-) create mode 100644 VERAG_PROG_ALLGEMEIN/Resources/fragezeichen.png diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index b6eb0d2e..3ca05232 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -722,7 +722,7 @@ Public Class frmMDMDatenverarbetiung '.Columns("AdressenNr").HeaderText = "KdNr" '.Columns("Name 1").HeaderText = "Kunde" '.Columns("LandKz").HeaderText = "Land" - '.Columns("Name 1").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("Name").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill '.Columns("VERAGLeistungsNr").ReadOnly = False '.Columns("VERAGKdNr").ReadOnly = False diff --git a/VERAG_PROG_ALLGEMEIN/My Project/Resources.Designer.vb b/VERAG_PROG_ALLGEMEIN/My Project/Resources.Designer.vb index ede5ecef..2d492ff7 100644 --- a/VERAG_PROG_ALLGEMEIN/My Project/Resources.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/My Project/Resources.Designer.vb @@ -170,6 +170,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property fragezeichen() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("fragezeichen", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/VERAG_PROG_ALLGEMEIN/My Project/Resources.resx b/VERAG_PROG_ALLGEMEIN/My Project/Resources.resx index 87545d7c..5302e48c 100644 --- a/VERAG_PROG_ALLGEMEIN/My Project/Resources.resx +++ b/VERAG_PROG_ALLGEMEIN/My Project/Resources.resx @@ -845,7 +845,7 @@ XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ - 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDwAACw8BkvkDpQAA9UFJREFUeF7s/QmYZNld + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDgAACw4BQL7hQQAA9UFJREFUeF7s/QmYZNld nomHultbSy01EpbagISaEmJraGQQi5DYbBpJ7HiMwTPGbmMe/DfGM5jHeDyMZzDW2EaAV+FhbIyFWYVY 1GAQFkJIIEtdudSelVWZWZVZuVXua+VSXV0d/++7HbcUGX0yKzMj4t5zbrzv87xPRp6M5d577jn392VE 3Fur1+uIiIiIiIiIxzbYiIiIiIiIiHhYg42IiIiIiIiIhzXYiIiIiIiIiHhYg42IiIiIiIiIhzXYiIiI @@ -2066,4 +2066,7 @@ ..\Resources\file_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\fragezeichen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/VERAG_PROG_ALLGEMEIN/Resources/fragezeichen.png b/VERAG_PROG_ALLGEMEIN/Resources/fragezeichen.png new file mode 100644 index 0000000000000000000000000000000000000000..db109278c8528abc75c09b0b46ed10a8c3dd688c GIT binary patch literal 32173 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ℑg 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 literal 0 HcmV?d00001 diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb index 66c6ca03..896b5df2 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb @@ -617,6 +617,7 @@ Public Class cATEZ_NCTS_IN Public dataTable As New DataTable() Shared jsonData As New Chilkat.JsonObject Public Shared sessionID As Integer = -1 + Shared rest As New Chilkat.Rest Dim SQl As New SQL Shared apiSettingsloaded As Boolean = False @@ -627,6 +628,14 @@ Public Class cATEZ_NCTS_IN Else apiSettingsloaded = True API_STRING = API.Rows(0).Item("api_url") + + If Not IsDBNull(API.Rows(0).Item("api_debugpath")) AndAlso API.Rows(0).Item("api_debugpath") <> "" Then + Rest.VerboseLogging = True + Rest.DebugLogFilePath = API.Rows(0).Item("api_debugpath") & program & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "_Test", "") & ".txt" + Else + Rest.VerboseLogging = False + End If + End If API_STRING = API.Rows(0).Item("api_url") End Sub @@ -647,7 +656,7 @@ Public Class cATEZ_NCTS_IN VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat() - Dim rest As New Chilkat.Rest + Dim success As Boolean @@ -745,7 +754,6 @@ Public Class cATEZ_NCTS_IN 'rest.PercentDoneOnSend = True rest.IdleTimeoutMs = 5000 * 31 - rest.VerboseLogging = True success = rest.SendReqSb("POST", "/api/integrations/verag", sbRequestBody) diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb index bba3cb3a..86a114de 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb @@ -13,6 +13,7 @@ Public Class cCreditSafeAPI Public dataTablecs As New DataTable() Shared SQL As New SQL Shared apiSettingsloaded As Boolean = False + Shared rest As New Chilkat.Rest Sub New(program As String) @@ -23,6 +24,14 @@ Public Class cCreditSafeAPI Else apiSettingsloaded = True API_STRING = API.Rows(0).Item("api_url") + + If Not IsDBNull(API.Rows(0).Item("api_debugpath")) AndAlso API.Rows(0).Item("api_debugpath") <> "" Then + Rest.VerboseLogging = True + Rest.DebugLogFilePath = API.Rows(0).Item("api_debugpath") & program & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "_Test", "") & ".txt" + Else + Rest.VerboseLogging = False + End If + End If End Sub @@ -33,7 +42,7 @@ Public Class cCreditSafeAPI If apiSettingsloaded = False Then Return "400" - Dim rest As New Chilkat.Rest + Dim success As Boolean @@ -91,7 +100,6 @@ Public Class cCreditSafeAPI VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat() - Dim rest As New Chilkat.Rest Dim success As Boolean diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb index 620a9003..4a992b2b 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb @@ -7,9 +7,11 @@ Public Class cMSEAPI Public API_STRING Dim API As New DataTable Dim rest As New Chilkat.Rest + Dim defaultDebugLogFilePath = "" Dim SQL As New SQL Dim apiSettingsloaded As Boolean = False Dim test As Boolean = False + Public PDFRECHNUNGENPFAD As String Sub New(program As String) @@ -20,11 +22,26 @@ Public Class cMSEAPI Else apiSettingsloaded = True API_STRING = API.Rows(0).Item("api_url") + If Not IsDBNull(API.Rows(0).Item("api_debugpath")) AndAlso API.Rows(0).Item("api_debugpath") <> "" Then + rest.VerboseLogging = True + rest.DebugLogFilePath = API.Rows(0).Item("api_debugpath") & program & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "_Test", "") & ".txt" + Else + rest.VerboseLogging = False + End If + + PDFRECHNUNGENPFAD = Me.GET_PARAM_ByName("PDFRECHNUNGEN-PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM) + End If End Sub + Shared Function GET_PARAM_ByName(tcParam_name, TESTSYSTEM) As String + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + Return SQL.getValueTxtBySql("SELECT TOP 1 [Param_value] FROM [tblPartnersystem_Paramter] WHERE Param_system='MSE' AND [Param_name]='" & tcParam_name & "'", , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(TESTSYSTEM)) + End Function + + Public Function createJWT(ByRef failureText As String) As String Try @@ -65,7 +82,6 @@ Public Class cMSEAPI rest.DebugMode = test - rest.VerboseLogging = True Dim bTls As Boolean = True Dim port As Integer = 443 Dim bAutoReconnect As Boolean = True @@ -152,7 +168,6 @@ Public Class cMSEAPI rest.DebugMode = test - rest.VerboseLogging = True Dim bTls As Boolean = True Dim port As Integer = 443 Dim bAutoReconnect As Boolean = True @@ -225,7 +240,6 @@ Public Class cMSEAPI rest.DebugMode = test - rest.VerboseLogging = True Dim bTls As Boolean = True Dim port As Integer = 443 Dim bAutoReconnect As Boolean = True @@ -315,7 +329,6 @@ Public Class cMSEAPI rest.DebugMode = test - rest.VerboseLogging = True Dim bTls As Boolean = True Dim port As Integer = 443 Dim bAutoReconnect As Boolean = True @@ -417,10 +430,8 @@ Public Class cMSEAPI Dim success As Boolean - rest.DebugMode = test - rest.VerboseLogging = True Dim bTls As Boolean = True Dim port As Integer = 443 Dim bAutoReconnect As Boolean = True @@ -511,7 +522,6 @@ Public Class cMSEAPI rest.DebugMode = test - rest.VerboseLogging = True Dim bTls As Boolean = True Dim port As Integer = 443 Dim bAutoReconnect As Boolean = True @@ -606,7 +616,6 @@ Public Class cMSEAPI rest.DebugMode = test - rest.VerboseLogging = True Dim bTls As Boolean = True Dim port As Integer = 443 Dim bAutoReconnect As Boolean = True @@ -749,7 +758,6 @@ Public Class cMSEAPI rest.DebugMode = test - rest.VerboseLogging = True Dim bTls As Boolean = True Dim port As Integer = 443 Dim bAutoReconnect As Boolean = True @@ -894,7 +902,7 @@ Public Class cMSEAPI '\\datenarchiv\Datenarchiv\MDM_SCHNITTSTELLEN\ECHTSYSTEM\Nachrichtendaten_ZIEL\MSE If r("url") <> "" AndAlso r("name") <> "" AndAlso r("name").contains("VAT") Then 'only VAT-Invoices - VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURLStream(r("url"), r("name"), "\\fmzoll\f\FMZoll\MSE\TESTRECHNUNGEN", False) + VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURLStream(r("url"), r("name"), PDFRECHNUNGENPFAD, False) End If Next @@ -1765,4 +1773,4 @@ Public Class cMSECustomers End Try Return "" End Function -End Class \ No newline at end of file +End Class diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb index eaee2292..1705e627 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb @@ -19,6 +19,13 @@ Public Class cTimasAPI Else apiSettingsloaded = True API_STRING = API.Rows(0).Item("api_url") + + If Not IsDBNull(API.Rows(0).Item("api_debugpath")) AndAlso API.Rows(0).Item("api_debugpath") <> "" Then + rest.VerboseLogging = True + rest.DebugLogFilePath = API.Rows(0).Item("api_debugpath") & program & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "_Test", "") & ".txt" + Else + rest.VerboseLogging = False + End If End If End Sub @@ -29,7 +36,6 @@ Public Class cTimasAPI Dim success As Boolean If apiSettingsloaded = False Then Return False - rest.VerboseLogging = True Dim bTls As Boolean = True Dim port As Integer = 443 Dim bAutoReconnect As Boolean = True diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj index 28bd12e4..16a10d93 100644 --- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj +++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj @@ -1411,6 +1411,9 @@ + + +