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/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.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 46b3bbf1..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) @@ -1432,6 +1434,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 +1445,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/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/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/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/Classes/cRMC.vb b/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb index a2c002b9..426cab2f 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb @@ -223,6 +223,7 @@ Public Class cRMC Public ERROR_PFAD Public ZIEL_PFAD Public FTP_PFAD + Public PDFRECHNUNGEN Public API_STRING As String Public API As New DataTable @@ -235,6 +236,7 @@ Public Class cRMC ARCHIV_PFAD = cRMC.Paramter.GET_PARAM_ByName("ARCHIV_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM) VERARBEITUNG_PFAD = cRMC.Paramter.GET_PARAM_ByName("VERARBEITUNG_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM) ZIEL_PFAD = cRMC.Paramter.GET_PARAM_ByName("ZIEL_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM) + PDFRECHNUNGEN = cRMC.Paramter.GET_PARAM_ByName("PDFRECHNUNGEN", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM) If Not IO.Directory.Exists(VERARBEITUNG_PFAD) Then IO.Directory.CreateDirectory(VERARBEITUNG_PFAD) Return Paramter.getFTPConenction(API_STRING, API, programName) 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 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 00000000..db109278 Binary files /dev/null and b/VERAG_PROG_ALLGEMEIN/Resources/fragezeichen.png differ 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/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 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 @@ + + +