diff --git a/SDL/kunden/Vorauskasse/frmVorauskasse.Designer.vb b/SDL/kunden/Vorauskasse/frmVorauskasse.Designer.vb index a63a812c..f82af99e 100644 --- a/SDL/kunden/Vorauskasse/frmVorauskasse.Designer.vb +++ b/SDL/kunden/Vorauskasse/frmVorauskasse.Designer.vb @@ -25,6 +25,7 @@ Partial Class frmVorauskasse Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmVorauskasse)) Me.pnl = New System.Windows.Forms.Panel() + Me.cbxGeldEingang = New System.Windows.Forms.CheckBox() Me.cbxLKWAnkunft = New System.Windows.Forms.CheckBox() Me.txtBetrag = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label7 = New System.Windows.Forms.Label() @@ -80,7 +81,8 @@ 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.cbxStorno = New System.Windows.Forms.CheckBox() + Me.cbxAbgerechnet = New System.Windows.Forms.CheckBox() Me.pnl.SuspendLayout() Me.pnlTop.SuspendLayout() Me.Panel1.SuspendLayout() @@ -93,6 +95,8 @@ Partial Class frmVorauskasse ' Me.pnl.BackColor = System.Drawing.Color.WhiteSmoke Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnl.Controls.Add(Me.cbxAbgerechnet) + Me.pnl.Controls.Add(Me.cbxStorno) Me.pnl.Controls.Add(Me.cbxGeldEingang) Me.pnl.Controls.Add(Me.cbxLKWAnkunft) Me.pnl.Controls.Add(Me.txtBetrag) @@ -134,6 +138,19 @@ Partial Class frmVorauskasse Me.pnl.Size = New System.Drawing.Size(1199, 162) Me.pnl.TabIndex = 0 ' + '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 + ' 'cbxLKWAnkunft ' Me.cbxLKWAnkunft.AutoSize = True @@ -932,18 +949,31 @@ Partial Class frmVorauskasse Me.txtMaxSrch.Text = "1000" Me.txtMaxSrch.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' - 'cbxGeldEingang + 'cbxStorno ' - 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 + Me.cbxStorno.AutoSize = True + Me.cbxStorno.Checked = True + Me.cbxStorno.CheckState = System.Windows.Forms.CheckState.Indeterminate + Me.cbxStorno.Location = New System.Drawing.Point(41, 138) + Me.cbxStorno.Name = "cbxStorno" + Me.cbxStorno.Size = New System.Drawing.Size(57, 17) + Me.cbxStorno.TabIndex = 73 + Me.cbxStorno.Text = "Storno" + Me.cbxStorno.ThreeState = True + Me.cbxStorno.UseVisualStyleBackColor = True + ' + 'cbxAbgerechnet + ' + Me.cbxAbgerechnet.AutoSize = True + Me.cbxAbgerechnet.Checked = True + Me.cbxAbgerechnet.CheckState = System.Windows.Forms.CheckState.Indeterminate + Me.cbxAbgerechnet.Location = New System.Drawing.Point(162, 138) + Me.cbxAbgerechnet.Name = "cbxAbgerechnet" + Me.cbxAbgerechnet.Size = New System.Drawing.Size(158, 17) + Me.cbxAbgerechnet.TabIndex = 74 + Me.cbxAbgerechnet.Text = "Abgerechnet/BU übermittelt" + Me.cbxAbgerechnet.ThreeState = True + Me.cbxAbgerechnet.UseVisualStyleBackColor = True ' 'frmVorauskasse ' @@ -1027,4 +1057,6 @@ Partial Class frmVorauskasse Friend WithEvents btnVK_VERAG_VR As Button Friend WithEvents cbxLKWAnkunft As CheckBox Friend WithEvents cbxGeldEingang As CheckBox + Friend WithEvents cbxAbgerechnet As CheckBox + Friend WithEvents cbxStorno As CheckBox End Class diff --git a/SDL/kunden/Vorauskasse/frmVorauskasse.vb b/SDL/kunden/Vorauskasse/frmVorauskasse.vb index dc417f9f..53d21145 100644 --- a/SDL/kunden/Vorauskasse/frmVorauskasse.vb +++ b/SDL/kunden/Vorauskasse/frmVorauskasse.vb @@ -4,6 +4,8 @@ Public Class frmVorauskasse Public KundenNr As Integer = -1 Public GeldEingang As Object = Nothing + Public Abgerechnet As Object = Nothing + Public Storno As Object = Nothing @@ -134,21 +136,38 @@ Public Class frmVorauskasse DateTimePicker1.Value = CDate(DatumVon) End If + '------------------ + If GeldEingang IsNot Nothing Then + If GeldEingang Then + cbxGeldEingang.CheckState = CheckState.Checked + Else + cbxGeldEingang.CheckState = CheckState.Unchecked + End If + End If + If Abgerechnet IsNot Nothing Then + If Abgerechnet Then + cbxAbgerechnet.CheckState = CheckState.Checked + Else + cbxAbgerechnet.CheckState = CheckState.Unchecked + End If + End If + If Storno IsNot Nothing Then + If Storno Then + cbxStorno.CheckState = CheckState.Checked + Else + cbxStorno.CheckState = CheckState.Unchecked + End If + 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 @@ -278,10 +297,20 @@ Public Class frmVorauskasse If MyTextBox1.Text <> "" Then sqlstr &= " AND [vk_LKW] LIKE @LKW " If txtFirma.Text <> "" Then sqlstr &= " AND ([vk_Firma] LIKE @Firma or vk_KdNr=@Firma) " + Select Case cbxAbgerechnet.CheckState + Case CheckState.Unchecked : sqlstr &= " and (SELECT count(*) FROM Rechnungsausgang RG WHERE RG.FilialenNr = vk_FilialeNr and RG.AbfertigungsNr= vk_AbfertigungsNr and vk_KdNr=rg.RechnungsKundenNr and Trdin=1)= 0 " + Case CheckState.Checked : sqlstr &= " and (SELECT count(*) FROM Rechnungsausgang RG WHERE RG.FilialenNr = vk_FilialeNr and RG.AbfertigungsNr= vk_AbfertigungsNr and vk_KdNr=rg.RechnungsKundenNr and Trdin=1) > 0 " + End Select + Select Case cbxGeldEingang.CheckState Case CheckState.Unchecked : sqlstr &= " AND vk_GeldEingetroffen=0 " Case CheckState.Checked : sqlstr &= " AND vk_GeldEingetroffen=1 " End Select + + Select Case cbxStorno.CheckState + Case CheckState.Unchecked : sqlstr &= " AND vk_Storno=0 " + Case CheckState.Checked : sqlstr &= " AND vk_Storno=1 " + End Select If IsNumeric(txtBetrag._value) Then sqlstr &= " AND vk_Betrag = cast(@Betrag as float) " Return sqlstr diff --git a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb index ade36f02..979eed1c 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.Designer.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.Designer.vb @@ -99,7 +99,6 @@ Partial Class usrCntlKundenuebersicht Me.Button7 = New System.Windows.Forms.Button() Me.Button6 = New System.Windows.Forms.Button() Me.LinkLabel1 = New System.Windows.Forms.LinkLabel() - Me.txtZahlungsziel = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label33 = New System.Windows.Forms.Label() Me.txtUmsatzJahr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label29 = New System.Windows.Forms.Label() @@ -124,8 +123,6 @@ 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() @@ -136,9 +133,12 @@ Partial Class usrCntlKundenuebersicht Me.Label18 = New System.Windows.Forms.Label() Me.txtOPNichtFaellig = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Panel7 = New System.Windows.Forms.Panel() + Me.txtOVK = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label19 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() Me.lblKreditlimit = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.lblVorkasse = New System.Windows.Forms.Label() + Me.txtZahlungsziel = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.grpAdresse = New System.Windows.Forms.GroupBox() Me.tbKontakt = New System.Windows.Forms.TabControl() Me.tbKontaktKontakt = New System.Windows.Forms.TabPage() @@ -834,7 +834,6 @@ Partial Class usrCntlKundenuebersicht Me.grpAbfertigung.Controls.Add(Me.Button7) Me.grpAbfertigung.Controls.Add(Me.Button6) Me.grpAbfertigung.Controls.Add(Me.LinkLabel1) - Me.grpAbfertigung.Controls.Add(Me.txtZahlungsziel) Me.grpAbfertigung.Controls.Add(Me.Label33) Me.grpAbfertigung.Controls.Add(Me.txtUmsatzJahr) Me.grpAbfertigung.Controls.Add(Me.Label29) @@ -848,6 +847,7 @@ Partial Class usrCntlKundenuebersicht Me.grpAbfertigung.Controls.Add(Me.Panel5) Me.grpAbfertigung.Controls.Add(Me.Panel7) Me.grpAbfertigung.Controls.Add(Me.lblVorkasse) + Me.grpAbfertigung.Controls.Add(Me.txtZahlungsziel) Me.grpAbfertigung.Cursor = System.Windows.Forms.Cursors.Default Me.grpAbfertigung.Location = New System.Drawing.Point(509, 3) Me.grpAbfertigung.Name = "grpAbfertigung" @@ -931,7 +931,7 @@ Partial Class usrCntlKundenuebersicht Me.txtNeutralisierung.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtNeutralisierung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtNeutralisierung.ForeColor = System.Drawing.Color.Black - Me.txtNeutralisierung.Location = New System.Drawing.Point(326, 257) + Me.txtNeutralisierung.Location = New System.Drawing.Point(444, 255) Me.txtNeutralisierung.Name = "txtNeutralisierung" Me.txtNeutralisierung.ReadOnly = True Me.txtNeutralisierung.Size = New System.Drawing.Size(35, 13) @@ -940,7 +940,7 @@ Partial Class usrCntlKundenuebersicht ' 'lblNeutralisierung ' - Me.lblNeutralisierung.Location = New System.Drawing.Point(248, 257) + Me.lblNeutralisierung.Location = New System.Drawing.Point(366, 255) Me.lblNeutralisierung.Name = "lblNeutralisierung" Me.lblNeutralisierung.Size = New System.Drawing.Size(115, 13) Me.lblNeutralisierung.TabIndex = 21 @@ -951,7 +951,7 @@ Partial Class usrCntlKundenuebersicht Me.lklGanzerText.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lklGanzerText.AutoSize = True Me.lklGanzerText.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(50, Byte), Integer), CType(CType(200, Byte), Integer)) - Me.lklGanzerText.Location = New System.Drawing.Point(542, 235) + Me.lklGanzerText.Location = New System.Drawing.Point(470, 6) Me.lklGanzerText.Name = "lklGanzerText" Me.lklGanzerText.Size = New System.Drawing.Size(121, 13) Me.lklGanzerText.TabIndex = 17 @@ -963,7 +963,7 @@ Partial Class usrCntlKundenuebersicht Me.lblNoGespr.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblNoGespr.AutoSize = True Me.lblNoGespr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblNoGespr.Location = New System.Drawing.Point(567, 235) + Me.lblNoGespr.Location = New System.Drawing.Point(493, 6) Me.lblNoGespr.Name = "lblNoGespr" Me.lblNoGespr.Size = New System.Drawing.Size(98, 13) Me.lblNoGespr.TabIndex = 18 @@ -975,7 +975,7 @@ Partial Class usrCntlKundenuebersicht Me.txtVorauskasse.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtVorauskasse.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtVorauskasse.ForeColor = System.Drawing.Color.Black - Me.txtVorauskasse.Location = New System.Drawing.Point(441, 257) + Me.txtVorauskasse.Location = New System.Drawing.Point(444, 230) Me.txtVorauskasse.Name = "txtVorauskasse" Me.txtVorauskasse.ReadOnly = True Me.txtVorauskasse.Size = New System.Drawing.Size(35, 13) @@ -1045,7 +1045,7 @@ Partial Class usrCntlKundenuebersicht Me.txtSammelrechnung.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtSammelrechnung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtSammelrechnung.ForeColor = System.Drawing.Color.Black - Me.txtSammelrechnung.Location = New System.Drawing.Point(441, 237) + Me.txtSammelrechnung.Location = New System.Drawing.Point(557, 230) Me.txtSammelrechnung.Name = "txtSammelrechnung" Me.txtSammelrechnung.ReadOnly = True Me.txtSammelrechnung.Size = New System.Drawing.Size(95, 13) @@ -1054,7 +1054,7 @@ Partial Class usrCntlKundenuebersicht 'Label12 ' Me.Label12.AutoSize = True - Me.Label12.Location = New System.Drawing.Point(363, 237) + Me.Label12.Location = New System.Drawing.Point(492, 230) Me.Label12.Name = "Label12" Me.Label12.Size = New System.Drawing.Size(59, 13) Me.Label12.TabIndex = 23 @@ -1240,46 +1240,18 @@ Partial Class usrCntlKundenuebersicht Me.LinkLabel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.LinkLabel1.AutoSize = True Me.LinkLabel1.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(50, Byte), Integer), CType(CType(200, Byte), Integer)) - Me.LinkLabel1.Location = New System.Drawing.Point(519, 16) + Me.LinkLabel1.Location = New System.Drawing.Point(519, 18) Me.LinkLabel1.Name = "LinkLabel1" Me.LinkLabel1.Size = New System.Drawing.Size(71, 13) Me.LinkLabel1.TabIndex = 3 Me.LinkLabel1.TabStop = True Me.LinkLabel1.Text = "Trennung ""/""" ' - 'txtZahlungsziel - ' - Me.txtZahlungsziel._DateTimeOnly = False - Me.txtZahlungsziel._numbersOnly = False - Me.txtZahlungsziel._numbersOnlyKommastellen = "" - Me.txtZahlungsziel._numbersOnlyTrennzeichen = True - Me.txtZahlungsziel._Prozent = False - Me.txtZahlungsziel._ShortDateNew = False - Me.txtZahlungsziel._ShortDateOnly = False - Me.txtZahlungsziel._TimeOnly = False - Me.txtZahlungsziel._TimeOnly_Seconds = False - Me.txtZahlungsziel._value = Nothing - Me.txtZahlungsziel._Waehrung = False - Me.txtZahlungsziel._WaehrungZeichen = True - Me.txtZahlungsziel.BackColor = System.Drawing.Color.White - Me.txtZahlungsziel.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.txtZahlungsziel.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtZahlungsziel.ForeColor = System.Drawing.Color.Black - Me.txtZahlungsziel.Location = New System.Drawing.Point(362, 276) - Me.txtZahlungsziel.MaxLineLength = -1 - Me.txtZahlungsziel.MaxLines_Warning = "" - Me.txtZahlungsziel.MaxLines_Warning_Label = Nothing - Me.txtZahlungsziel.Name = "txtZahlungsziel" - Me.txtZahlungsziel.ReadOnly = True - Me.txtZahlungsziel.Size = New System.Drawing.Size(80, 13) - Me.txtZahlungsziel.TabIndex = 34 - Me.txtZahlungsziel.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' 'Label33 ' Me.Label33.AutoSize = True Me.Label33.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label33.Location = New System.Drawing.Point(248, 276) + Me.Label33.Location = New System.Drawing.Point(248, 255) Me.Label33.Name = "Label33" Me.Label33.Size = New System.Drawing.Size(69, 13) Me.Label33.TabIndex = 33 @@ -1303,7 +1275,7 @@ Partial Class usrCntlKundenuebersicht Me.txtUmsatzJahr.BorderStyle = System.Windows.Forms.BorderStyle.None Me.txtUmsatzJahr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtUmsatzJahr.ForeColor = System.Drawing.Color.Black - Me.txtUmsatzJahr.Location = New System.Drawing.Point(346, 295) + Me.txtUmsatzJahr.Location = New System.Drawing.Point(383, 274) Me.txtUmsatzJahr.MaxLineLength = -1 Me.txtUmsatzJahr.MaxLines_Warning = "" Me.txtUmsatzJahr.MaxLines_Warning_Label = Nothing @@ -1317,7 +1289,7 @@ Partial Class usrCntlKundenuebersicht ' Me.Label29.AutoSize = True Me.Label29.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label29.Location = New System.Drawing.Point(248, 295) + Me.Label29.Location = New System.Drawing.Point(248, 274) Me.Label29.Name = "Label29" Me.Label29.Size = New System.Drawing.Size(68, 13) Me.Label29.TabIndex = 31 @@ -1661,8 +1633,6 @@ 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) @@ -1677,50 +1647,10 @@ Partial Class usrCntlKundenuebersicht 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, 67) + Me.Panel6.Location = New System.Drawing.Point(7, 64) Me.Panel6.Name = "Panel6" Me.Panel6.Size = New System.Drawing.Size(210, 1) Me.Panel6.TabIndex = 42 @@ -1743,7 +1673,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, 4) + Me.txtOPFaellig.Location = New System.Drawing.Point(114, 6) Me.txtOPFaellig.MaxLineLength = -1 Me.txtOPFaellig.MaxLines_Warning = "" Me.txtOPFaellig.MaxLines_Warning_Label = Nothing @@ -1757,7 +1687,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, 70) + Me.lblOffenePosten.Location = New System.Drawing.Point(3, 67) Me.lblOffenePosten.Name = "lblOffenePosten" Me.lblOffenePosten.Size = New System.Drawing.Size(64, 13) Me.lblOffenePosten.TabIndex = 27 @@ -1781,7 +1711,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, 69) + Me.txtOffenePosten.Location = New System.Drawing.Point(114, 66) Me.txtOffenePosten.MaxLineLength = -1 Me.txtOffenePosten.MaxLines_Warning = "" Me.txtOffenePosten.MaxLines_Warning_Label = Nothing @@ -1795,7 +1725,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, 4) + Me.Label32.Location = New System.Drawing.Point(3, 6) Me.Label32.Name = "Label32" Me.Label32.Size = New System.Drawing.Size(86, 13) Me.Label32.TabIndex = 29 @@ -1819,7 +1749,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, 50) + Me.txtOPCredit.Location = New System.Drawing.Point(114, 46) Me.txtOPCredit.MaxLineLength = -1 Me.txtOPCredit.MaxLines_Warning = "" Me.txtOPCredit.MaxLines_Warning_Label = Nothing @@ -1833,7 +1763,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, 20) + Me.Label17.Location = New System.Drawing.Point(3, 25) Me.Label17.Name = "Label17" Me.Label17.Size = New System.Drawing.Size(112, 13) Me.Label17.TabIndex = 38 @@ -1843,7 +1773,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, 50) + Me.Label18.Location = New System.Drawing.Point(3, 46) Me.Label18.Name = "Label18" Me.Label18.Size = New System.Drawing.Size(60, 13) Me.Label18.TabIndex = 40 @@ -1867,7 +1797,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, 20) + Me.txtOPNichtFaellig.Location = New System.Drawing.Point(114, 25) Me.txtOPNichtFaellig.MaxLineLength = -1 Me.txtOPNichtFaellig.MaxLines_Warning = "" Me.txtOPNichtFaellig.MaxLines_Warning_Label = Nothing @@ -1881,18 +1811,60 @@ Partial Class usrCntlKundenuebersicht ' Me.Panel7.BackColor = System.Drawing.Color.AntiqueWhite Me.Panel7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Panel7.Controls.Add(Me.txtOVK) + Me.Panel7.Controls.Add(Me.Label19) Me.Panel7.Controls.Add(Me.Label1) Me.Panel7.Controls.Add(Me.lblKreditlimit) - Me.Panel7.Location = New System.Drawing.Point(236, 310) + Me.Panel7.Location = New System.Drawing.Point(236, 290) Me.Panel7.Name = "Panel7" - Me.Panel7.Size = New System.Drawing.Size(253, 26) + Me.Panel7.Size = New System.Drawing.Size(253, 46) Me.Panel7.TabIndex = 43 ' + '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(134, 4) + 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(11, 4) + Me.Label19.Name = "Label19" + Me.Label19.Size = New System.Drawing.Size(107, 13) + Me.Label19.TabIndex = 43 + Me.Label19.Text = "offene Vorauskassen" + ' 'Label1 ' 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, 8) + Me.Label1.Location = New System.Drawing.Point(11, 25) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(66, 13) Me.Label1.TabIndex = 19 @@ -1916,7 +1888,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, 7) + Me.lblKreditlimit.Location = New System.Drawing.Point(134, 24) Me.lblKreditlimit.MaxLineLength = -1 Me.lblKreditlimit.MaxLines_Warning = "" Me.lblKreditlimit.MaxLines_Warning_Label = Nothing @@ -1928,13 +1900,41 @@ Partial Class usrCntlKundenuebersicht ' 'lblVorkasse ' - Me.lblVorkasse.Location = New System.Drawing.Point(363, 257) + Me.lblVorkasse.Location = New System.Drawing.Point(366, 230) Me.lblVorkasse.Name = "lblVorkasse" Me.lblVorkasse.Size = New System.Drawing.Size(119, 13) Me.lblVorkasse.TabIndex = 25 Me.lblVorkasse.Text = "Vorauskasse:" Me.lblVorkasse.Visible = False ' + 'txtZahlungsziel + ' + Me.txtZahlungsziel._DateTimeOnly = False + Me.txtZahlungsziel._numbersOnly = False + Me.txtZahlungsziel._numbersOnlyKommastellen = "" + Me.txtZahlungsziel._numbersOnlyTrennzeichen = True + Me.txtZahlungsziel._Prozent = False + Me.txtZahlungsziel._ShortDateNew = False + Me.txtZahlungsziel._ShortDateOnly = False + Me.txtZahlungsziel._TimeOnly = False + Me.txtZahlungsziel._TimeOnly_Seconds = False + Me.txtZahlungsziel._value = Nothing + Me.txtZahlungsziel._Waehrung = False + Me.txtZahlungsziel._WaehrungZeichen = True + Me.txtZahlungsziel.BackColor = System.Drawing.Color.White + Me.txtZahlungsziel.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtZahlungsziel.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtZahlungsziel.ForeColor = System.Drawing.Color.Black + Me.txtZahlungsziel.Location = New System.Drawing.Point(310, 255) + Me.txtZahlungsziel.MaxLineLength = -1 + Me.txtZahlungsziel.MaxLines_Warning = "" + Me.txtZahlungsziel.MaxLines_Warning_Label = Nothing + Me.txtZahlungsziel.Name = "txtZahlungsziel" + Me.txtZahlungsziel.ReadOnly = True + Me.txtZahlungsziel.Size = New System.Drawing.Size(56, 13) + Me.txtZahlungsziel.TabIndex = 34 + Me.txtZahlungsziel.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'grpAdresse ' Me.grpAdresse.BackColor = System.Drawing.Color.White diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index 88a67ecc..788a86bc 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -748,13 +748,12 @@ Public Class usrCntlKundenuebersicht 'Alles andere gesperrt - - Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(KUNDE.FilialenNr) - Case "VERAG" - where &= " AND Firma_ID <> 7" - Case "ATILLA" - where &= " AND Firma_ID = 7" - End Select + 'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(KUNDE.FilialenNr) + ' Case "VERAG" + ' where &= " AND Firma_ID <> 7" + ' Case "ATILLA" + ' where &= " AND Firma_ID = 7" + 'End Select .DataSource = SQL.loadDgvBySql("SELECT [KundenNr],[Jahr],[steuerpflichtig],[steuerfrei],[Nettoumsatz],[MwSt],[Bruttoumsatz],[Währung],[Rechnungen],[Gutschriften],[Datum],[Nummer]" & " FROM [tblKundenumsatz] " & " WHERE [KundenNr]='" & kdNr & "' " & where & " ORDER BY Jahr DESC", "FMZOLL") @@ -826,10 +825,6 @@ Public Class usrCntlKundenuebersicht 'End Select - - - - .DataSource = SQL.loadDgvBySql("SELECT * FROM (SELECT abf.kdvm_Id, art.kdvma_Id, art.kdvma_Bezeichnung, abf.[kdvm_KundenNr], abf.[kdvm_erhalten],abf.[kdvm_erhalten_Datum], abf.[kdvm_gueltig_bis], abf.kdvm_datenarchivId, abf.kdvm_Info, abf.[kdvm_vermerk], abf.[kdvm_archiviert],ROW_NUMBER() OVER(PARTITION BY art.kdvma_Id ORDER BY kdvm_archiviert asc, abf.kdvm_gueltig_bis asc, abf.kdvm_erhalten_Datum desc) RowNumber" & " FROM [tblKundenVollmachtenArt] as art LEFT JOIN (select * from [tblKundenVollmachten] where [kdvm_KundenNr]='" & kdNr & "' ) as abf on art.[kdvma_Id]=abf.[kdvm_kdvmaId] WHERE art.kdvma_visible=1 AND abf.kdvm_erhalten = 1 AND ISNULL(abf.[kdvm_geloescht],0) != 1 " & where & " ) A WHERE RowNumber = 1", "FMZOLL") @@ -1331,7 +1326,7 @@ Public Class usrCntlKundenuebersicht VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try - sumGes += sumVK + ' sumGes += sumVK 'Dim OP_tmp As Double = 0 @@ -1415,7 +1410,8 @@ 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") + 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()) + and vk_storno=0 and (SELECT count(*) FROM Rechnungsausgang RG WHERE RG.FilialenNr = vk_FilialeNr and RG.AbfertigungsNr= vk_AbfertigungsNr and vk_KdNr=rg.RechnungsKundenNr) =0", "FMZOLL") End Function Sub initDGVOffenePostenVERAG() @@ -1486,7 +1482,7 @@ Public Class usrCntlKundenuebersicht 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 + ' OP_tmp += sumVK End If @@ -2693,17 +2689,7 @@ Public Class usrCntlKundenuebersicht End Try End Sub - Private Sub Label17_Click(sender As Object, e As EventArgs) Handles Label17.Click - End Sub - - Private Sub grpAbfertigung_Enter(sender As Object, e As EventArgs) Handles grpAbfertigung.Enter - - End Sub - - Private Sub Panel5_Paint(sender As Object, e As PaintEventArgs) Handles Panel5.Paint - - End Sub Private Sub Button15_Click_1(sender As Object, e As EventArgs) Handles btnVMhinzufuegen.Click Dim where = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA @@ -3140,8 +3126,12 @@ Public Class usrCntlKundenuebersicht Dim f As New frmVorauskasse f.KundenNr = kdNr f.GeldEingang = False + f.Storno = False + f.Abgerechnet = False f.Show(Me) End Sub + + End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/Berechtigungen/cBerechtigungsObjekte.vb b/VERAG_PROG_ALLGEMEIN/Classes/Berechtigungen/cBerechtigungsObjekte.vb index f3ad3563..9ea0de65 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/Berechtigungen/cBerechtigungsObjekte.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/Berechtigungen/cBerechtigungsObjekte.vb @@ -142,6 +142,7 @@ Public Class cBerechtigungsObjekte ' MsgBox(Me.bero_id) Using cmd As New SqlCommand(" SELECT *, (CASE beroz_art " & " WHEN 'G' THEN (SELECT [bergr_bezeichnung] FROM [ADMIN].[dbo].[tblBerechtigungenGruppen] WHERE beroz_bergrId=bergr_id ) " & + " WHEN 'F' THEN (SELECT [bergr_bezeichnung] FROM [ADMIN].[dbo].[tblBerechtigungenGruppen] WHERE beroz_bergrId=bergr_id ) " & " WHEN 'B' THEN (SELECT [mit_username] FROM [ADMIN].[dbo].tblMitarbeiter WHERE beroz_bergrId=mit_id ) " & " WHEN 'A' THEN (SELECT [abt_kuerzel] FROM [ADMIN].[dbo].tblAbteilungen WHERE beroz_bergrId=abt_id ) " & " WHEN 'N' THEN (SELECT [nl_kuerzel] FROM [ADMIN].[dbo].tblNiederlassungen WHERE beroz_bergrId=nl_id ) " &