diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb b/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb index 0f250c3d..1e6a13d8 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb @@ -22,9 +22,9 @@ Partial Class frmBU_Mahnlauf 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmBU_Mahnlauf)) Me.Panel1 = New System.Windows.Forms.Panel() + Me.cbxNewDGV = New System.Windows.Forms.CheckBox() Me.lblBetreuer = New System.Windows.Forms.Label() Me.cboBetreuer = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cbxKontotyp = New VERAG_PROG_ALLGEMEIN.MyComboBox() @@ -43,7 +43,7 @@ Partial Class frmBU_Mahnlauf Me.pnlTop = New System.Windows.Forms.Panel() Me.Label4 = New System.Windows.Forms.Label() Me.Panel2 = New System.Windows.Forms.Panel() - Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview() Me.Panel3 = New System.Windows.Forms.Panel() Me.Label9 = New System.Windows.Forms.Label() Me.cbxMahnsperre = New System.Windows.Forms.CheckBox() @@ -64,7 +64,8 @@ Partial Class frmBU_Mahnlauf Me.Button2 = New System.Windows.Forms.Button() Me.Button1 = New System.Windows.Forms.Button() Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.cbxNewDGV = New System.Windows.Forms.CheckBox() + Me.Label10 = New System.Windows.Forms.Label() + Me.cboFilterOP = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Panel1.SuspendLayout() Me.pnlTop.SuspendLayout() Me.Panel2.SuspendLayout() @@ -97,6 +98,19 @@ Partial Class frmBU_Mahnlauf Me.Panel1.Size = New System.Drawing.Size(1514, 132) Me.Panel1.TabIndex = 0 ' + 'cbxNewDGV + ' + Me.cbxNewDGV.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.cbxNewDGV.AutoSize = True + Me.cbxNewDGV.Checked = True + Me.cbxNewDGV.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbxNewDGV.Location = New System.Drawing.Point(1225, 54) + Me.cbxNewDGV.Name = "cbxNewDGV" + Me.cbxNewDGV.Size = New System.Drawing.Size(88, 17) + Me.cbxNewDGV.TabIndex = 51 + Me.cbxNewDGV.Text = "neue Ansicht" + Me.cbxNewDGV.UseVisualStyleBackColor = True + ' 'lblBetreuer ' Me.lblBetreuer.AutoSize = True @@ -356,8 +370,10 @@ Partial Class frmBU_Mahnlauf ' 'Panel3 ' + Me.Panel3.Controls.Add(Me.cboFilterOP) Me.Panel3.Controls.Add(Me.Label9) Me.Panel3.Controls.Add(Me.cbxMahnsperre) + Me.Panel3.Controls.Add(Me.Label10) Me.Panel3.Controls.Add(Me.btnMail_Intern) Me.Panel3.Controls.Add(Me.Button7) Me.Panel3.Controls.Add(Me.btnKunde) @@ -626,18 +642,25 @@ Partial Class frmBU_Mahnlauf Me.MyTextBox2.TabIndex = 39 Me.MyTextBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' - 'cbxNewDGV + 'Label10 ' - Me.cbxNewDGV.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.cbxNewDGV.AutoSize = True - Me.cbxNewDGV.Checked = True - Me.cbxNewDGV.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxNewDGV.Location = New System.Drawing.Point(1118, 54) - Me.cbxNewDGV.Name = "cbxNewDGV" - Me.cbxNewDGV.Size = New System.Drawing.Size(88, 17) - Me.cbxNewDGV.TabIndex = 51 - Me.cbxNewDGV.Text = "neue Ansicht" - Me.cbxNewDGV.UseVisualStyleBackColor = True + Me.Label10.AutoSize = True + Me.Label10.Location = New System.Drawing.Point(391, 33) + Me.Label10.Name = "Label10" + Me.Label10.Size = New System.Drawing.Size(89, 13) + Me.Label10.TabIndex = 52 + Me.Label10.Text = "Filter Bemerkung:" + ' + 'cboFilterOP + ' + Me.cboFilterOP._allowedValuesFreiText = Nothing + Me.cboFilterOP._allowFreiText = True + Me.cboFilterOP._value = "" + Me.cboFilterOP.FormattingEnabled = True + Me.cboFilterOP.Location = New System.Drawing.Point(394, 50) + Me.cboFilterOP.Name = "cboFilterOP" + Me.cboFilterOP.Size = New System.Drawing.Size(140, 21) + Me.cboFilterOP.TabIndex = 53 ' 'frmBU_Mahnlauf ' @@ -704,5 +727,7 @@ Partial Class frmBU_Mahnlauf Friend WithEvents Label9 As Label Friend WithEvents lblBetreuer As Label Friend WithEvents cboBetreuer As VERAG_PROG_ALLGEMEIN.MyComboBox - Public Shared WithEvents cbxNewDGV As CheckBox + Friend WithEvents Label10 As Label + Public WithEvents cbxNewDGV As CheckBox + Friend WithEvents cboFilterOP As VERAG_PROG_ALLGEMEIN.MyComboBox End Class diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.vb b/SDL/buchhaltung/frmBU_Mahnlauf.vb index 678396b4..2ffd9650 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb @@ -280,6 +280,14 @@ Public Class frmBU_Mahnlauf 'cbxKontotyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sachkonten", "KO")) cbxKontotyp.changeItem("Alle") + + cboFilterOP.Items.Clear() + cboFilterOP.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) + cboFilterOP.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA-LEIHGELD (4813)", "*LG_4813*")) + cboFilterOP.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA-LEIHGELD (4806/4813)", "*LG_4806_4813*")) + cboFilterOP.changeItem("") + + cboBetreuer.Items.Clear() cboBetreuer.fillWithSQL("select mit_id, mit_nname FROM [ADMIN].[dbo].[tblMitarbeiter] where tblMitarbeiter.mit_Funktion = 'VK' and mit_gekuendigt = 0 and mit_abteilung = 'MDM'", False, "ADMIN", True) @@ -362,15 +370,31 @@ Public Class frmBU_Mahnlauf and (si_mahnstufe >0 AND si_mahnstufe is not NULL) " & IIf(MahnsperreBeruecksichtigen, "", "AND isnull(si_mahnflags,0) <>(1)") & " and d_mahnung>='" & Mahn_Datum.ToShortDateString & "' and d_netto<=getdate()" Return SQL.getValueTxtBySql(sqlStr, "FIBU",,, 0) End Function - Public Shared Function doMahnung(Mahndruckart As Integer, KdNr As Integer, Firma_ID As Integer, art As String, Optional ByRef Path As String = "", Optional ByRef PrinterName As String = "", Optional ByRef forceMahnstufe As String = "", Optional showErr As Boolean = True, Optional hideMahnstopp As Boolean = True) As Boolean + Public Shared Function doMahnung(Mahndruckart As Integer, KdNr As Integer, Firma_ID As Integer, art As String, Optional ByRef Path As String = "", Optional ByRef PrinterName As String = "", Optional ByRef forceMahnstufe As String = "", Optional showErr As Boolean = True, Optional hideMahnstopp As Boolean = True, Optional bemerkungSrch() As String = Nothing) As Boolean + Dim bemerkungFilter As String = "" + + If bemerkungSrch IsNot Nothing AndAlso bemerkungSrch.Length > 0 Then + bemerkungFilter = " AND (" & + String.Join(" OR ", + bemerkungSrch. + Where(Function(x) Not String.IsNullOrWhiteSpace(x)). + Select(Function(x) + Dim val = x.Replace("*", "%").Replace("'", "''") + Return "c_bemerkung LIKE '" & val & "'" + End Function) + ) & + ") " + End If Dim sqlStr = "SELECT c_urbelegid OP_Typ,d_rechnung Rechnungsdatum,d_netto Faelligkeit,dec_fremdbrutto Rechnungsbetrag,c_bemerkung Bemerkung,dec_fremdzahlung Zahlung,dec_fremdbrutto+dec_fremdzahlung Ausstand,c_waehrung Währung,si_mahnstufe Mahnstufe FROM op_debitor OP WHERE (OP.i_firm_refid = '" & Firma_ID & "') AND (dt_geloescht IS NULL) and i_personenkonto='" & KdNr & "' " & If(hideMahnstopp, " and isnull(si_mahnflags,0) <>(1) ", "") & " + " & bemerkungFilter & " order by d_rechnung" Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim dtDataSource = SQL.loadDgvBySql(sqlStr, "FIBU") + If dtDataSource Is Nothing Then If showErr Then MsgBox("Keine Daten vorhanden!") Return False @@ -1339,15 +1363,23 @@ Public Class frmBU_Mahnlauf i += 1 Next - - If sender Is Button5 Then doZahlungserinnerung(Me, "OP", KontoList, cboFirma._value, MyComboBox2._value) - If sender Is Button4 Then doZahlungserinnerung(Me, "ZE", KontoList, cboFirma._value, MyComboBox2._value) + Dim bemerkungSrch = Nothing + If cboFilterOP._value <> "" Then + Select Case cboFilterOP._value + Case "*LG_4813*" : bemerkungSrch = {"%4813/%"} + Case "*LG_4806_4813*" : bemerkungSrch = {"%4806/%", "%4813/%"} + Case Else + bemerkungSrch = {"'" & cboFilterOP._value.Replace("*", "%") & "%'"} + End Select + End If + If sender Is Button5 Then doZahlungserinnerung(Me, "OP", KontoList, cboFirma._value, MyComboBox2._value, bemerkungSrch) + If sender Is Button4 Then doZahlungserinnerung(Me, "ZE", KontoList, cboFirma._value, MyComboBox2._value, bemerkungSrch) End If Me.Cursor = Cursors.Default End Sub - Shared Sub doZahlungserinnerung(MainForm As Control, art As String, KontoList As List(Of String), Firma As String, Mahnstufe As String) + Shared Sub doZahlungserinnerung(MainForm As Control, art As String, KontoList As List(Of String), Firma As String, Mahnstufe As String, bemerkungSrch() As String) Dim fProgBar As New frmBU_Mahnlauf_Ausgabe_Ladebalken Try @@ -1355,6 +1387,7 @@ Public Class frmBU_Mahnlauf Dim srchPrinter = oPS.PrinterName + Dim forceMahnstufe As String = -2 Dim hideMahnstopp As String = True Dim gesAnz As Integer = KontoList.Count @@ -1367,7 +1400,7 @@ Public Class frmBU_Mahnlauf Select Case getAusgabe(MainForm, False) Case "PDF" If KontoList.Count = 1 Then - doMahnung(3, KontoList(0), Firma, art,, srchPrinter, forceMahnstufe,, hideMahnstopp) + doMahnung(3, KontoList(0), Firma, art,, srchPrinter, forceMahnstufe,, hideMahnstopp, bemerkungSrch) Else Dim PDF_LIST As New List(Of String) fProgBar.Show(MainForm) @@ -1375,7 +1408,7 @@ Public Class frmBU_Mahnlauf For Each konto In KontoList ' As DataGridViewRow In MyDatagridview1.SelectedRows Dim Path = "" - If doMahnung(4, konto, Firma, art, Path, srchPrinter, forceMahnstufe, False, hideMahnstopp) Then + If doMahnung(4, konto, Firma, art, Path, srchPrinter, forceMahnstufe, False, hideMahnstopp, bemerkungSrch) Then PDF_LIST.Add(Path) End If cnt += 1 @@ -1399,7 +1432,7 @@ Public Class frmBU_Mahnlauf fProgBar.Refresh() For Each konto In KontoList ' As DataGridViewRow In MyDatagridview1.SelectedRows Dim Path = "" - doMahnung(2, konto, Firma, art, Path, srchPrinter, forceMahnstufe, False, hideMahnstopp) + doMahnung(2, konto, Firma, art, Path, srchPrinter, forceMahnstufe, False, hideMahnstopp, bemerkungSrch) cnt += 1 fProgBar.progBar.Value = cnt / gesAnz * 100 fProgBar.lblAnzahl.Text = cnt & "/" & gesAnz @@ -1409,7 +1442,7 @@ Public Class frmBU_Mahnlauf fProgBar.Show(MainForm) fProgBar.Refresh() For Each konto In KontoList ' As DataGridViewRow In MyDatagridview1.SelectedRows - doMahnung(0, konto, Firma, art, , srchPrinter, forceMahnstufe,, hideMahnstopp) + doMahnung(0, konto, Firma, art, , srchPrinter, forceMahnstufe,, hideMahnstopp, bemerkungSrch) cnt += 1 fProgBar.progBar.Value = cnt / gesAnz * 100 fProgBar.lblAnzahl.Text = cnt & "/" & gesAnz diff --git a/SDL/buchhaltung/rptMahnung.Designer.vb b/SDL/buchhaltung/rptMahnung.Designer.vb index 4b05c4d9..cffe3d10 100644 --- a/SDL/buchhaltung/rptMahnung.Designer.vb +++ b/SDL/buchhaltung/rptMahnung.Designer.vb @@ -198,7 +198,7 @@ Partial Public Class rptMahnung "ar-set: 1" Me.txtLeistung.Text = "2188888888" Me.txtLeistung.Top = 0! - Me.txtLeistung.Width = 0.7429134! + Me.txtLeistung.Width = 0.7874016! ' 'Line10 ' @@ -232,7 +232,7 @@ Partial Public Class rptMahnung ' Me.Label15.Height = 0.1570866! Me.Label15.HyperLink = Nothing - Me.Label15.Left = 1.165748! + Me.Label15.Left = 1.212599! Me.Label15.Name = "Label15" Me.Label15.Style = "font-size: 9pt; font-weight: normal; text-align: center; text-justify: auto; ddo-" & "char-set: 1" @@ -244,7 +244,7 @@ Partial Public Class rptMahnung ' Me.Label16.Height = 0.1570866! Me.Label16.HyperLink = Nothing - Me.Label16.Left = 1.855906! + Me.Label16.Left = 1.883071! Me.Label16.Name = "Label16" Me.Label16.Style = "color: DarkRed; font-size: 9pt; font-weight: normal; text-align: center; text-jus" & "tify: auto; ddo-char-set: 1" @@ -1165,24 +1165,24 @@ Partial Public Class rptMahnung ' Me.lblRgDat.Height = 0.1811024! Me.lblRgDat.HyperLink = Nothing - Me.lblRgDat.Left = 1.165748! + Me.lblRgDat.Left = 1.212599! Me.lblRgDat.Name = "lblRgDat" Me.lblRgDat.Style = "font-size: 9pt; font-weight: bold; text-align: center; text-justify: auto; ddo-ch" & "ar-set: 1" Me.lblRgDat.Text = "Rg.datum" - Me.lblRgDat.Top = 0.791! + Me.lblRgDat.Top = 0.7909449! Me.lblRgDat.Width = 0.6614173! ' 'lblFaelligkeit ' Me.lblFaelligkeit.Height = 0.1811024! Me.lblFaelligkeit.HyperLink = Nothing - Me.lblFaelligkeit.Left = 1.855993! + Me.lblFaelligkeit.Left = 1.883158! Me.lblFaelligkeit.Name = "lblFaelligkeit" Me.lblFaelligkeit.Style = "font-size: 9pt; font-weight: bold; text-align: center; text-justify: auto; ddo-ch" & "ar-set: 1" Me.lblFaelligkeit.Text = "Fälligkeit" - Me.lblFaelligkeit.Top = 0.791! + Me.lblFaelligkeit.Top = 0.7909449! Me.lblFaelligkeit.Width = 0.6614173! ' 'lblReBetrag diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb index 82456ca0..8248f658 100644 --- a/SDL/kunden/frmKundenblatt.vb +++ b/SDL/kunden/frmKundenblatt.vb @@ -2028,7 +2028,7 @@ Public Class frmKundenblatt Else Dim KontoList As New List(Of String) KontoList.Add(KUNDE.KundenNrZentrale) - frmBU_Mahnlauf.doZahlungserinnerung(Me.FindForm, "OP", KontoList, cboFirmaFMZOLL._value, "") + frmBU_Mahnlauf.doZahlungserinnerung(Me.FindForm, "OP", KontoList, cboFirmaFMZOLL._value, "", {""}) End If End Sub diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index 1659f777..ad3f1deb 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -3525,7 +3525,7 @@ Public Class usrCntlKundenuebersicht Else Dim KontoList As New List(Of String) KontoList.Add(KUNDE.KundenNrZentrale) - frmBU_Mahnlauf.doZahlungserinnerung(Me.FindForm, "OP", KontoList, cboFirmaFMZOLL._value, "") + frmBU_Mahnlauf.doZahlungserinnerung(Me.FindForm, "OP", KontoList, cboFirmaFMZOLL._value, "", {""}) End If End Sub