diff --git a/SDL/kunden/Vorauskasse/frmVorauskasse.Designer.vb b/SDL/kunden/Vorauskasse/frmVorauskasse.Designer.vb index b48c0fa1..a63a812c 100644 --- a/SDL/kunden/Vorauskasse/frmVorauskasse.Designer.vb +++ b/SDL/kunden/Vorauskasse/frmVorauskasse.Designer.vb @@ -80,6 +80,7 @@ Partial Class frmVorauskasse Me.lblErgebnis = New System.Windows.Forms.Label() Me.Label37 = New System.Windows.Forms.Label() Me.txtMaxSrch = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.cbxGeldEingang = New System.Windows.Forms.CheckBox() Me.pnl.SuspendLayout() Me.pnlTop.SuspendLayout() Me.Panel1.SuspendLayout() @@ -92,6 +93,7 @@ Partial Class frmVorauskasse ' Me.pnl.BackColor = System.Drawing.Color.WhiteSmoke Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnl.Controls.Add(Me.cbxGeldEingang) Me.pnl.Controls.Add(Me.cbxLKWAnkunft) Me.pnl.Controls.Add(Me.txtBetrag) Me.pnl.Controls.Add(Me.Label7) @@ -147,10 +149,12 @@ Partial Class frmVorauskasse Me.txtBetrag._DateTimeOnly = False Me.txtBetrag._numbersOnly = False Me.txtBetrag._numbersOnlyKommastellen = "" + Me.txtBetrag._numbersOnlyTrennzeichen = True Me.txtBetrag._Prozent = False Me.txtBetrag._ShortDateNew = False Me.txtBetrag._ShortDateOnly = False Me.txtBetrag._TimeOnly = False + Me.txtBetrag._TimeOnly_Seconds = False Me.txtBetrag._value = Nothing Me.txtBetrag._Waehrung = True Me.txtBetrag._WaehrungZeichen = True @@ -180,10 +184,12 @@ Partial Class frmVorauskasse Me.txtFirma._DateTimeOnly = False Me.txtFirma._numbersOnly = False Me.txtFirma._numbersOnlyKommastellen = "" + Me.txtFirma._numbersOnlyTrennzeichen = True Me.txtFirma._Prozent = False Me.txtFirma._ShortDateNew = False Me.txtFirma._ShortDateOnly = False Me.txtFirma._TimeOnly = False + Me.txtFirma._TimeOnly_Seconds = False Me.txtFirma._value = Nothing Me.txtFirma._Waehrung = False Me.txtFirma._WaehrungZeichen = True @@ -212,10 +218,12 @@ Partial Class frmVorauskasse Me.MyTextBox1._DateTimeOnly = False Me.MyTextBox1._numbersOnly = False Me.MyTextBox1._numbersOnlyKommastellen = "" + Me.MyTextBox1._numbersOnlyTrennzeichen = True Me.MyTextBox1._Prozent = False Me.MyTextBox1._ShortDateNew = False Me.MyTextBox1._ShortDateOnly = False Me.MyTextBox1._TimeOnly = False + Me.MyTextBox1._TimeOnly_Seconds = False Me.MyTextBox1._value = Nothing Me.MyTextBox1._Waehrung = False Me.MyTextBox1._WaehrungZeichen = True @@ -258,10 +266,12 @@ Partial Class frmVorauskasse Me.txtAbfertDat._DateTimeOnly = False Me.txtAbfertDat._numbersOnly = False Me.txtAbfertDat._numbersOnlyKommastellen = "" + Me.txtAbfertDat._numbersOnlyTrennzeichen = True Me.txtAbfertDat._Prozent = False Me.txtAbfertDat._ShortDateNew = True Me.txtAbfertDat._ShortDateOnly = False Me.txtAbfertDat._TimeOnly = False + Me.txtAbfertDat._TimeOnly_Seconds = False Me.txtAbfertDat._value = "" Me.txtAbfertDat._Waehrung = False Me.txtAbfertDat._WaehrungZeichen = True @@ -281,10 +291,12 @@ Partial Class frmVorauskasse Me.txtAbfertDatBis._DateTimeOnly = False Me.txtAbfertDatBis._numbersOnly = False Me.txtAbfertDatBis._numbersOnlyKommastellen = "" + Me.txtAbfertDatBis._numbersOnlyTrennzeichen = True Me.txtAbfertDatBis._Prozent = False Me.txtAbfertDatBis._ShortDateNew = True Me.txtAbfertDatBis._ShortDateOnly = False Me.txtAbfertDatBis._TimeOnly = False + Me.txtAbfertDatBis._TimeOnly_Seconds = False Me.txtAbfertDatBis._value = "" Me.txtAbfertDatBis._Waehrung = False Me.txtAbfertDatBis._WaehrungZeichen = True @@ -331,10 +343,12 @@ Partial Class frmVorauskasse Me.txtAbfertigungsnummer._DateTimeOnly = False Me.txtAbfertigungsnummer._numbersOnly = True Me.txtAbfertigungsnummer._numbersOnlyKommastellen = "" + Me.txtAbfertigungsnummer._numbersOnlyTrennzeichen = True Me.txtAbfertigungsnummer._Prozent = False Me.txtAbfertigungsnummer._ShortDateNew = False Me.txtAbfertigungsnummer._ShortDateOnly = False Me.txtAbfertigungsnummer._TimeOnly = False + Me.txtAbfertigungsnummer._TimeOnly_Seconds = False Me.txtAbfertigungsnummer._value = "" Me.txtAbfertigungsnummer._Waehrung = False Me.txtAbfertigungsnummer._WaehrungZeichen = True @@ -722,10 +736,12 @@ Partial Class frmVorauskasse Me.txtAuswahlAbfNr._DateTimeOnly = False Me.txtAuswahlAbfNr._numbersOnly = False Me.txtAuswahlAbfNr._numbersOnlyKommastellen = "" + Me.txtAuswahlAbfNr._numbersOnlyTrennzeichen = True Me.txtAuswahlAbfNr._Prozent = False Me.txtAuswahlAbfNr._ShortDateNew = False Me.txtAuswahlAbfNr._ShortDateOnly = False Me.txtAuswahlAbfNr._TimeOnly = False + Me.txtAuswahlAbfNr._TimeOnly_Seconds = False Me.txtAuswahlAbfNr._value = Nothing Me.txtAuswahlAbfNr._Waehrung = False Me.txtAuswahlAbfNr._WaehrungZeichen = True @@ -800,10 +816,12 @@ Partial Class frmVorauskasse Me.txtBemerkung._DateTimeOnly = False Me.txtBemerkung._numbersOnly = False Me.txtBemerkung._numbersOnlyKommastellen = "" + Me.txtBemerkung._numbersOnlyTrennzeichen = True Me.txtBemerkung._Prozent = False Me.txtBemerkung._ShortDateNew = False Me.txtBemerkung._ShortDateOnly = False Me.txtBemerkung._TimeOnly = False + Me.txtBemerkung._TimeOnly_Seconds = False Me.txtBemerkung._value = Nothing Me.txtBemerkung._Waehrung = False Me.txtBemerkung._WaehrungZeichen = True @@ -892,10 +910,12 @@ Partial Class frmVorauskasse Me.txtMaxSrch._DateTimeOnly = False Me.txtMaxSrch._numbersOnly = True Me.txtMaxSrch._numbersOnlyKommastellen = "" + Me.txtMaxSrch._numbersOnlyTrennzeichen = True Me.txtMaxSrch._Prozent = False Me.txtMaxSrch._ShortDateNew = False Me.txtMaxSrch._ShortDateOnly = False Me.txtMaxSrch._TimeOnly = False + Me.txtMaxSrch._TimeOnly_Seconds = False Me.txtMaxSrch._value = "" Me.txtMaxSrch._Waehrung = False Me.txtMaxSrch._WaehrungZeichen = True @@ -912,6 +932,19 @@ Partial Class frmVorauskasse Me.txtMaxSrch.Text = "1000" Me.txtMaxSrch.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' + 'cbxGeldEingang + ' + Me.cbxGeldEingang.AutoSize = True + Me.cbxGeldEingang.Checked = True + Me.cbxGeldEingang.CheckState = System.Windows.Forms.CheckState.Indeterminate + Me.cbxGeldEingang.Location = New System.Drawing.Point(787, 131) + Me.cbxGeldEingang.Name = "cbxGeldEingang" + Me.cbxGeldEingang.Size = New System.Drawing.Size(107, 17) + Me.cbxGeldEingang.TabIndex = 72 + Me.cbxGeldEingang.Text = "Geld eingetroffen" + Me.cbxGeldEingang.ThreeState = True + Me.cbxGeldEingang.UseVisualStyleBackColor = True + ' 'frmVorauskasse ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -993,4 +1026,5 @@ Partial Class frmVorauskasse Friend WithEvents Button4 As Button Friend WithEvents btnVK_VERAG_VR As Button Friend WithEvents cbxLKWAnkunft As CheckBox + Friend WithEvents cbxGeldEingang As CheckBox End Class diff --git a/SDL/kunden/Vorauskasse/frmVorauskasse.vb b/SDL/kunden/Vorauskasse/frmVorauskasse.vb index 29f5305d..dc417f9f 100644 --- a/SDL/kunden/Vorauskasse/frmVorauskasse.vb +++ b/SDL/kunden/Vorauskasse/frmVorauskasse.vb @@ -2,6 +2,9 @@ Public Class frmVorauskasse + Public KundenNr As Integer = -1 + Public GeldEingang As Object = Nothing + Dim MONAT As Date = CDate("01." & Now.Month & "." & Now.Year) '.AddMonths(-1) @@ -131,6 +134,21 @@ Public Class frmVorauskasse DateTimePicker1.Value = CDate(DatumVon) End If + If KundenNr > 0 Then + txtFirma.Text = KundenNr + If GeldEingang IsNot Nothing Then + If GeldEingang Then + cbxGeldEingang.CheckState = CheckState.Checked + Else + cbxGeldEingang.CheckState = CheckState.Unchecked + End If + End If + DateTimePicker1.Value = Now.AddYears(-1) + DateTimePicker2.Value = Now + + btnSuche.PerformClick() + End If + End Sub @@ -258,7 +276,12 @@ Public Class frmVorauskasse If cboSachbearbeiterQS._value <> "" Then sqlstr &= " AND [vk_QS_SachbearbeiterId] = @PersonalnummerQS " If cboSachbearbeiterBH._value <> "" Then sqlstr &= " AND [vk_BH_SachbearbeiterId] = @PersonalnummerBH " If MyTextBox1.Text <> "" Then sqlstr &= " AND [vk_LKW] LIKE @LKW " - If txtFirma.Text <> "" Then sqlstr &= " AND [vk_Firma] LIKE @Firma " + If txtFirma.Text <> "" Then sqlstr &= " AND ([vk_Firma] LIKE @Firma or vk_KdNr=@Firma) " + + Select Case cbxGeldEingang.CheckState + Case CheckState.Unchecked : sqlstr &= " AND vk_GeldEingetroffen=0 " + Case CheckState.Checked : sqlstr &= " AND vk_GeldEingetroffen=1 " + End Select If IsNumeric(txtBetrag._value) Then sqlstr &= " AND vk_Betrag = cast(@Betrag as float) " Return sqlstr @@ -573,6 +596,7 @@ Public Class frmVorauskasse Private Sub frmVorauskasse_Shown(sender As Object, e As EventArgs) Handles Me.Shown If FilialenNr IsNot Nothing Or AbfertigungsNr IsNot Nothing Or DatumVon IsNot Nothing Then btnSuche.PerformClick() End Sub + End Class diff --git a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb index 259ddc6f..ade36f02 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb @@ -124,6 +124,8 @@ Partial Class usrCntlKundenuebersicht Me.Label39 = New System.Windows.Forms.Label() Me.Label46 = New System.Windows.Forms.Label() Me.Panel5 = New System.Windows.Forms.Panel() + Me.txtOVK = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label19 = New System.Windows.Forms.Label() Me.Panel6 = New System.Windows.Forms.Panel() Me.txtOPFaellig = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.lblOffenePosten = New System.Windows.Forms.Label() @@ -862,7 +864,7 @@ Partial Class usrCntlKundenuebersicht Me.Panel9.Controls.Add(Me.Label15) Me.Panel9.Controls.Add(Me.txtVerzolltBeiExport) Me.Panel9.Controls.Add(Me.txtVerzolltBei) - Me.Panel9.Location = New System.Drawing.Point(7, 231) + Me.Panel9.Location = New System.Drawing.Point(7, 225) Me.Panel9.Name = "Panel9" Me.Panel9.Size = New System.Drawing.Size(356, 24) Me.Panel9.TabIndex = 46 @@ -1200,7 +1202,7 @@ Partial Class usrCntlKundenuebersicht Me.btnPunkt2Save.FlatAppearance.BorderSize = 0 Me.btnPunkt2Save.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnPunkt2Save.ForeColor = System.Drawing.Color.Black - Me.btnPunkt2Save.Location = New System.Drawing.Point(645, 210) + Me.btnPunkt2Save.Location = New System.Drawing.Point(647, 205) Me.btnPunkt2Save.Name = "btnPunkt2Save" Me.btnPunkt2Save.Size = New System.Drawing.Size(20, 20) Me.btnPunkt2Save.TabIndex = 12 @@ -1400,7 +1402,7 @@ Partial Class usrCntlKundenuebersicht Me.rtbAbf_Besonderheiten.Name = "rtbAbf_Besonderheiten" Me.rtbAbf_Besonderheiten.ReadOnly = True Me.rtbAbf_Besonderheiten.ShowSelectionMargin = True - Me.rtbAbf_Besonderheiten.Size = New System.Drawing.Size(660, 200) + Me.rtbAbf_Besonderheiten.Size = New System.Drawing.Size(660, 193) Me.rtbAbf_Besonderheiten.TabIndex = 7 Me.rtbAbf_Besonderheiten.Text = "" ' @@ -1659,6 +1661,8 @@ Partial Class usrCntlKundenuebersicht ' Me.Panel5.BackColor = System.Drawing.Color.AntiqueWhite Me.Panel5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Panel5.Controls.Add(Me.txtOVK) + Me.Panel5.Controls.Add(Me.Label19) Me.Panel5.Controls.Add(Me.Panel6) Me.Panel5.Controls.Add(Me.txtOPFaellig) Me.Panel5.Controls.Add(Me.lblOffenePosten) @@ -1668,15 +1672,55 @@ Partial Class usrCntlKundenuebersicht Me.Panel5.Controls.Add(Me.Label17) Me.Panel5.Controls.Add(Me.Label18) Me.Panel5.Controls.Add(Me.txtOPNichtFaellig) - Me.Panel5.Location = New System.Drawing.Point(7, 254) + Me.Panel5.Location = New System.Drawing.Point(7, 248) Me.Panel5.Name = "Panel5" - Me.Panel5.Size = New System.Drawing.Size(230, 85) + Me.Panel5.Size = New System.Drawing.Size(230, 89) Me.Panel5.TabIndex = 38 ' + 'txtOVK + ' + Me.txtOVK._DateTimeOnly = False + Me.txtOVK._numbersOnly = False + Me.txtOVK._numbersOnlyKommastellen = "" + Me.txtOVK._numbersOnlyTrennzeichen = True + Me.txtOVK._Prozent = False + Me.txtOVK._ShortDateNew = False + Me.txtOVK._ShortDateOnly = False + Me.txtOVK._TimeOnly = False + Me.txtOVK._TimeOnly_Seconds = False + Me.txtOVK._value = Nothing + Me.txtOVK._Waehrung = False + Me.txtOVK._WaehrungZeichen = True + Me.txtOVK.BackColor = System.Drawing.Color.AntiqueWhite + Me.txtOVK.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtOVK.Cursor = System.Windows.Forms.Cursors.Hand + Me.txtOVK.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtOVK.ForeColor = System.Drawing.Color.Green + Me.txtOVK.Location = New System.Drawing.Point(114, 36) + Me.txtOVK.MaxLineLength = -1 + Me.txtOVK.MaxLines_Warning = "" + Me.txtOVK.MaxLines_Warning_Label = Nothing + Me.txtOVK.Name = "txtOVK" + Me.txtOVK.ReadOnly = True + Me.txtOVK.Size = New System.Drawing.Size(108, 13) + Me.txtOVK.TabIndex = 44 + Me.txtOVK.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'Label19 + ' + Me.Label19.AutoSize = True + Me.Label19.Cursor = System.Windows.Forms.Cursors.Hand + Me.Label19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label19.Location = New System.Drawing.Point(3, 36) + Me.Label19.Name = "Label19" + Me.Label19.Size = New System.Drawing.Size(107, 13) + Me.Label19.TabIndex = 43 + Me.Label19.Text = "offene Vorauskassen" + ' 'Panel6 ' Me.Panel6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.Panel6.Location = New System.Drawing.Point(7, 56) + Me.Panel6.Location = New System.Drawing.Point(7, 67) Me.Panel6.Name = "Panel6" Me.Panel6.Size = New System.Drawing.Size(210, 1) Me.Panel6.TabIndex = 42 @@ -1699,7 +1743,7 @@ Partial Class usrCntlKundenuebersicht Me.txtOPFaellig.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtOPFaellig.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtOPFaellig.ForeColor = System.Drawing.Color.Black - Me.txtOPFaellig.Location = New System.Drawing.Point(114, 3) + Me.txtOPFaellig.Location = New System.Drawing.Point(114, 4) Me.txtOPFaellig.MaxLineLength = -1 Me.txtOPFaellig.MaxLines_Warning = "" Me.txtOPFaellig.MaxLines_Warning_Label = Nothing @@ -1713,7 +1757,7 @@ Partial Class usrCntlKundenuebersicht ' Me.lblOffenePosten.AutoSize = True Me.lblOffenePosten.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblOffenePosten.Location = New System.Drawing.Point(3, 60) + Me.lblOffenePosten.Location = New System.Drawing.Point(3, 70) Me.lblOffenePosten.Name = "lblOffenePosten" Me.lblOffenePosten.Size = New System.Drawing.Size(64, 13) Me.lblOffenePosten.TabIndex = 27 @@ -1737,7 +1781,7 @@ Partial Class usrCntlKundenuebersicht Me.txtOffenePosten.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtOffenePosten.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtOffenePosten.ForeColor = System.Drawing.Color.Black - Me.txtOffenePosten.Location = New System.Drawing.Point(114, 60) + Me.txtOffenePosten.Location = New System.Drawing.Point(114, 69) Me.txtOffenePosten.MaxLineLength = -1 Me.txtOffenePosten.MaxLines_Warning = "" Me.txtOffenePosten.MaxLines_Warning_Label = Nothing @@ -1751,7 +1795,7 @@ Partial Class usrCntlKundenuebersicht ' Me.Label32.AutoSize = True Me.Label32.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label32.Location = New System.Drawing.Point(3, 3) + Me.Label32.Location = New System.Drawing.Point(3, 4) Me.Label32.Name = "Label32" Me.Label32.Size = New System.Drawing.Size(86, 13) Me.Label32.TabIndex = 29 @@ -1775,7 +1819,7 @@ Partial Class usrCntlKundenuebersicht Me.txtOPCredit.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtOPCredit.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtOPCredit.ForeColor = System.Drawing.Color.Green - Me.txtOPCredit.Location = New System.Drawing.Point(114, 41) + Me.txtOPCredit.Location = New System.Drawing.Point(114, 50) Me.txtOPCredit.MaxLineLength = -1 Me.txtOPCredit.MaxLines_Warning = "" Me.txtOPCredit.MaxLines_Warning_Label = Nothing @@ -1789,7 +1833,7 @@ Partial Class usrCntlKundenuebersicht ' Me.Label17.AutoSize = True Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label17.Location = New System.Drawing.Point(3, 22) + Me.Label17.Location = New System.Drawing.Point(3, 20) Me.Label17.Name = "Label17" Me.Label17.Size = New System.Drawing.Size(112, 13) Me.Label17.TabIndex = 38 @@ -1799,7 +1843,7 @@ Partial Class usrCntlKundenuebersicht ' Me.Label18.AutoSize = True Me.Label18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label18.Location = New System.Drawing.Point(3, 41) + Me.Label18.Location = New System.Drawing.Point(3, 50) Me.Label18.Name = "Label18" Me.Label18.Size = New System.Drawing.Size(60, 13) Me.Label18.TabIndex = 40 @@ -1823,7 +1867,7 @@ Partial Class usrCntlKundenuebersicht Me.txtOPNichtFaellig.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtOPNichtFaellig.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtOPNichtFaellig.ForeColor = System.Drawing.Color.Black - Me.txtOPNichtFaellig.Location = New System.Drawing.Point(114, 22) + Me.txtOPNichtFaellig.Location = New System.Drawing.Point(114, 20) Me.txtOPNichtFaellig.MaxLineLength = -1 Me.txtOPNichtFaellig.MaxLines_Warning = "" Me.txtOPNichtFaellig.MaxLines_Warning_Label = Nothing @@ -1848,7 +1892,7 @@ Partial Class usrCntlKundenuebersicht ' Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(11, 4) + Me.Label1.Location = New System.Drawing.Point(11, 8) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(66, 13) Me.Label1.TabIndex = 19 @@ -1872,7 +1916,7 @@ Partial Class usrCntlKundenuebersicht Me.lblKreditlimit.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblKreditlimit.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblKreditlimit.ForeColor = System.Drawing.Color.Black - Me.lblKreditlimit.Location = New System.Drawing.Point(97, 4) + Me.lblKreditlimit.Location = New System.Drawing.Point(97, 7) Me.lblKreditlimit.MaxLineLength = -1 Me.lblKreditlimit.MaxLines_Warning = "" Me.lblKreditlimit.MaxLines_Warning_Label = Nothing @@ -3637,4 +3681,6 @@ Partial Class usrCntlKundenuebersicht Friend WithEvents lblAdressZusatz As TextBox Friend WithEvents picVertrag As PictureBox Friend WithEvents PictureBox6 As PictureBox + Friend WithEvents txtOVK As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label19 As Label End Class diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index f3372492..88a67ecc 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -1303,10 +1303,17 @@ Public Class usrCntlKundenuebersicht Dim sumZZ As Double = 0 Dim sumNOTZZ As Double = 0 Dim sumCredit As Double = 0 + Dim sumVK As Double + If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("KUNDE_VK_OP") Then + sumVK = getOffeneVK(KUNDE.KundenNrZentrale) + + End If + Dim sumGes As Double = 0 If IsNumeric(KUNDE.Zahlungsziel) Then zahlungsziel = KUNDE.Zahlungsziel + Try For Each r As DataGridViewRow In .Rows If DateDiff(DateInterval.Day, CDate(r.Cells("Datum").Value), Now) > zahlungsziel Then @@ -1324,6 +1331,8 @@ Public Class usrCntlKundenuebersicht VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try + sumGes += sumVK + 'Dim OP_tmp As Double = 0 'If cboFirmaFMZOLL._value <> "" Then @@ -1360,7 +1369,12 @@ Public Class usrCntlKundenuebersicht ' txtOPCredit.ForeColor = Color.Black 'End If - + If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("KUNDE_VK_OP") Then + txtOVK.Text = sumVK.ToString("C") + txtOVK.ForeColor = Color.Red + Else + txtOVK.Text = "-" + End If If sumGes <> 0 Then txtOffenePosten.Text = sumGes.ToString("C") @@ -1400,6 +1414,9 @@ Public Class usrCntlKundenuebersicht + Function getOffeneVK(KundenNrZentrale) + Return SQL.getValueTxtBySql("SELECT isnull(sum([vk_Betrag]),0)FROM [tblVorauskassen] where vk_KdNr = '" & KundenNrZentrale & "' and vk_GeldEingetroffen=0 and vk_Datum > DATEADD(year,-1, GETDATE())", "FMZOLL") + End Function Sub initDGVOffenePostenVERAG() @@ -1466,6 +1483,13 @@ Public Class usrCntlKundenuebersicht End If End If + Dim sumVK As Double + If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("KUNDE_VK_OP") Then + sumVK = getOffeneVK(KUNDE.KundenNrZentrale) + OP_tmp += sumVK + End If + + ' If .RowCount > 0 Then If OP_tmp <> 0 Then @@ -1484,6 +1508,7 @@ Public Class usrCntlKundenuebersicht Dim zahlungsziel = 10 Dim sumZZ As Double = 0 Dim sumNOTZZ As Double = 0 + Dim sumCredit As Double = 0 If IsNumeric(KUNDE.Zahlungsziel) Then zahlungsziel = KUNDE.Zahlungsziel Try @@ -1515,6 +1540,14 @@ Public Class usrCntlKundenuebersicht txtOPCredit.Text = sumCredit.ToString("C") txtOPCredit.ForeColor = Color.Green + + If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("KUNDE_VK_OP") Then + txtOVK.Text = sumVK.ToString("C") + txtOVK.ForeColor = Color.Red + Else + txtOVK.Text = "-" + End If + 'If sumCredit < 0 Then ' txtOPCredit.ForeColor = Color.Red 'Else @@ -3102,4 +3135,13 @@ Public Class usrCntlKundenuebersicht End If End Sub + + Private Sub Label19_Click(sender As Object, e As EventArgs) Handles Label19.Click, txtOVK.Click + Dim f As New frmVorauskasse + f.KundenNr = kdNr + f.GeldEingang = False + + f.Show(Me) + + End Sub End Class