diff --git a/SDL/Fakturierung/frmFaktEmail.vb b/SDL/Fakturierung/frmFaktEmail.vb index 597dbbe2..f8583731 100644 --- a/SDL/Fakturierung/frmFaktEmail.vb +++ b/SDL/Fakturierung/frmFaktEmail.vb @@ -1,6 +1,4 @@ -Imports System.Web.UI.HtmlControls -Imports System.Web.UI.WebControls.Expressions -Imports GrapeCity.DataVisualization.TypeScript +Imports GrapeCity.DataVisualization.TypeScript Imports Microsoft.Office.Interop Imports VERAG_PROG_ALLGEMEIN diff --git a/SDL/Fakturierung/frmRechnungenSuche.vb b/SDL/Fakturierung/frmRechnungenSuche.vb index cfab5175..9acda1aa 100644 --- a/SDL/Fakturierung/frmRechnungenSuche.vb +++ b/SDL/Fakturierung/frmRechnungenSuche.vb @@ -826,42 +826,53 @@ Public Class frmRechnungenSuche End Sub Private Sub ToolStripMenuItem3_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem3.Click, NachRechnungslandToolStripMenuItem.Click, NachLeistungsnummerToolStripMenuItem.Click, NachLeistungsnummerToolStripMenuItem.Click, NachZollabfertigungspreisenToolStripMenuItem.Click - If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZOLL_Auswertungen", Me) Then + If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZOLL_Auswertungen", Me) Then + MsgBox("Keine Berechtigung!") + Exit Sub + End If - Dim sqlstr As String = "" - If sender Is ToolStripMenuItem3 Then - sqlstr &= " SELECT COUNT(*) as Anzahl,RechnungsKundenNr,[RechnungsName 1] as RechnungAn,isnull(max(RechnungsLandKz),'') as RechnungsLandKz,isnull(max(RechnungsOrt),'') as RechnungsOrt,isnull(max(RechnungsStraße),'') as RechnungsStraße" - sqlstr &= " FROM [Rechnungsausgang] INNER JOIN Speditionsbuch on Speditionsbuch.FilialenNr=Rechnungsausgang.FilialenNr and Speditionsbuch.AbfertigungsNr=Rechnungsausgang.AbfertigungsNr and Speditionsbuch.UnterNr=Rechnungsausgang.UnterNr" - sqlstr &= " WHERE 1=1" - sqlstr &= getRechnungsAusgangWhere().Replace("Rechnungsausgang.[Avisierer", "Speditionsbuch.[Avisierer") - If cboBerichtRgAbfArt._value <> "" Then sqlstr &= " AND Speditionsbuch.Abfertigungsart=" & cboBerichtRgAbfArt._value - sqlstr &= " group by RechnungsKundenNr, [RechnungsName 1]" - sqlstr &= " order by COUNT(*) desc,[RechnungsName 1]" - ElseIf sender Is NachRechnungslandToolStripMenuItem Then + Dim sqlstr As String = "" - sqlstr &= " SELECT COUNT(*) as Anzahl,isnull(max(RechnungsLandKz),'') as RechnungsLandKz,sum(SteuerfreierGesamtbetrag) as Steuerfrei ,sum(SteuerpflichtigerGesamtbetrag) as Steuerpflichtig, sum(SteuerpflichtigerGesamtbetrag + SteuerfreierGesamtbetrag) as Gesamt" - sqlstr &= " FROM [Rechnungsausgang] INNER JOIN Speditionsbuch on Speditionsbuch.FilialenNr=Rechnungsausgang.FilialenNr and Speditionsbuch.AbfertigungsNr=Rechnungsausgang.AbfertigungsNr and Speditionsbuch.UnterNr=Rechnungsausgang.UnterNr" - sqlstr &= " WHERE 1=1" - sqlstr &= getRechnungsAusgangWhere().Replace("Rechnungsausgang.[Avisierer", "Speditionsbuch.[Avisierer") - If cboBerichtRgAbfArt._value <> "" Then sqlstr &= " AND Speditionsbuch.Abfertigungsart=" & cboBerichtRgAbfArt._value - sqlstr &= " group by isnull((RechnungsLandKz),'')" - sqlstr &= " order by Anzahl desc" + If sender Is ToolStripMenuItem3 Then + sqlstr &= " SELECT COUNT(*) as Anzahl,RechnungsKundenNr,[RechnungsName 1] as RechnungAn,isnull(max(RechnungsLandKz),'') as RechnungsLandKz,isnull(max(RechnungsOrt),'') as RechnungsOrt,isnull(max(RechnungsStraße),'') as RechnungsStraße" + sqlstr &= " FROM [Rechnungsausgang] INNER JOIN Speditionsbuch on Speditionsbuch.FilialenNr=Rechnungsausgang.FilialenNr and Speditionsbuch.AbfertigungsNr=Rechnungsausgang.AbfertigungsNr and Speditionsbuch.UnterNr=Rechnungsausgang.UnterNr" + sqlstr &= " WHERE 1=1" + sqlstr &= getRechnungsAusgangWhere().Replace("Rechnungsausgang.[Avisierer", "Speditionsbuch.[Avisierer") + If cboBerichtRgAbfArt._value <> "" Then sqlstr &= " AND Speditionsbuch.Abfertigungsart=" & cboBerichtRgAbfArt._value + sqlstr &= " group by RechnungsKundenNr, [RechnungsName 1]" + sqlstr &= " order by COUNT(*) desc,[RechnungsName 1]" - ElseIf sender Is NachLeistungsnummerToolStripMenuItem Then + ElseIf sender Is NachRechnungslandToolStripMenuItem Then - 'Verag360 katt noch nicht alle Datensatze als Buchungen verfügbar, daher über die Rechnungen/Rechnungspositionen - '------------------------------------------------------------------- - ' Select Case* FROM( SELECT Leistungsnummer, LeistungsBez, Year(Abfertigungsdatum) [Year] , ([tblTrdinProduct].[SteuerpflichtigerBetragLokal] + [tblTrdinProduct].[SteuerfreierBetragLokal]) AS [Der Wert] FROM tblTrdinInvoice - ' INNER Join(tblTrdinProduct LEFT JOIN Leistungen On Leistungsnummer = LeistungsNr) ON (tblTrdinInvoice.Rechnungsnummer = tblTrdinProduct.Rechnungsnummer) - 'And (tblTrdinInvoice.Rechnungsdatum = tblTrdinProduct.Rechnungsdatum) WHERE 1 = 1 And - '(tblTrdinInvoice.[RechnungsDatum] BETWEEN @Datum_von And @Datum_bis ) - 'And tblTrdinInvoice.[Firma_ID] = @Firma_ID And Firma_ID IN (19) ) AS - 'rg PIVOT(sum([Der Wert]) For [Year] In ([2025],[2024],[2023],[2022],[2021],[2020],[2019],[2018],[2017],[2016],[2015],[2014],[2013],[2012],[2011],[2010])) AS MNamePivot order by Leistungsnummer - '------------------------------------------------------------------- + sqlstr &= " SELECT COUNT(*) as Anzahl,isnull(max(RechnungsLandKz),'') as RechnungsLandKz,sum(SteuerfreierGesamtbetrag) as Steuerfrei ,sum(SteuerpflichtigerGesamtbetrag) as Steuerpflichtig, sum(SteuerpflichtigerGesamtbetrag + SteuerfreierGesamtbetrag) as Gesamt" + sqlstr &= " FROM [Rechnungsausgang] INNER JOIN Speditionsbuch on Speditionsbuch.FilialenNr=Rechnungsausgang.FilialenNr and Speditionsbuch.AbfertigungsNr=Rechnungsausgang.AbfertigungsNr and Speditionsbuch.UnterNr=Rechnungsausgang.UnterNr" + sqlstr &= " WHERE 1=1" + sqlstr &= getRechnungsAusgangWhere().Replace("Rechnungsausgang.[Avisierer", "Speditionsbuch.[Avisierer") + If cboBerichtRgAbfArt._value <> "" Then sqlstr &= " AND Speditionsbuch.Abfertigungsart=" & cboBerichtRgAbfArt._value + sqlstr &= " group by isnull((RechnungsLandKz),'')" + sqlstr &= " order by Anzahl desc" - sqlstr &= " SELECT * FROM ( SELECT Leistungen.LeistungsNr, Leistungen.LeistungsBez,YEAR(Abfertigungsdatum ) [Year] , (RechnungsausgangPositionen.SteuerpflichtigerBetrag+RechnungsausgangPositionen.SteuerfreierBetrag ) AS " + ElseIf sender Is NachLeistungsnummerToolStripMenuItem Then + + If cboFirma._value = "" Then + MsgBox("Firma auswählen!") + cboFirma.Focus() + Exit Sub + End If + + 'Verag360 katt noch nicht alle Datensatze als Buchungen verfügbar, daher über die Rechnungen/Rechnungspositionen + '------------------------------------------------------------------- + ' Select Case* FROM( SELECT Leistungsnummer, LeistungsBez, Year(Abfertigungsdatum) [Year] , ([tblTrdinProduct].[SteuerpflichtigerBetragLokal] + [tblTrdinProduct].[SteuerfreierBetragLokal]) AS [Der Wert] FROM tblTrdinInvoice + ' INNER Join(tblTrdinProduct LEFT JOIN Leistungen On Leistungsnummer = LeistungsNr) ON (tblTrdinInvoice.Rechnungsnummer = tblTrdinProduct.Rechnungsnummer) + 'And (tblTrdinInvoice.Rechnungsdatum = tblTrdinProduct.Rechnungsdatum) WHERE 1 = 1 And + '(tblTrdinInvoice.[RechnungsDatum] BETWEEN @Datum_von And @Datum_bis ) + 'And tblTrdinInvoice.[Firma_ID] = @Firma_ID And Firma_ID IN (19) ) AS + 'rg PIVOT(sum([Der Wert]) For [Year] In ([2025],[2024],[2023],[2022],[2021],[2020],[2019],[2018],[2017],[2016],[2015],[2014],[2013],[2012],[2011],[2010])) AS MNamePivot order by Leistungsnummer + '------------------------------------------------------------------- + + sqlstr &= " SELECT * FROM ( SELECT Leistungen.LeistungsNr, Leistungen.LeistungsBez,YEAR(Abfertigungsdatum ) [Year] , (RechnungsausgangPositionen.SteuerpflichtigerBetrag+RechnungsausgangPositionen.SteuerfreierBetrag ) AS " sqlstr &= " [Der Wert] FROM Rechnungsausgang INNER JOIN (RechnungsausgangPositionen LEFT JOIN Leistungen ON RechnungsausgangPositionen.LeistungsNr = Leistungen.LeistungsNr) ON (Rechnungsausgang.RK_ID = RechnungsausgangPositionen.RK_ID) " sqlstr &= " WHERE 1 = 1 " sqlstr &= getRechnungsAusgangWhere() @@ -969,7 +980,7 @@ Public Class frmRechnungenSuche print.Viewer.LoadDocument(rpt) print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous print.Show() - End If + End Sub diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 4624f1c5..8f0d417e 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -3726,6 +3726,7 @@ rptRechnungDruck.vb + Designer rptFaktRechnungAn.vb diff --git a/SDL/kunden/frmBonitaet.vb b/SDL/kunden/frmBonitaet.vb index d7b3b33f..c1fb80e8 100644 --- a/SDL/kunden/frmBonitaet.vb +++ b/SDL/kunden/frmBonitaet.vb @@ -104,6 +104,7 @@ Public Class frmBonitaet cboTool.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CreditSafe AT", "creditsafe AT")) cboTool.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CreditSafe", "creditsafe")) cboTool.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Creditreform", "creditreform")) + cboTool.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Boniteti.rs", "boniteti")) Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA @@ -112,16 +113,26 @@ Public Class frmBonitaet Case "UNISPED" : cboTool.changeItem("Creditreform") + Case Else : If Now.ToShortDateString >= DateTime.Parse("01/12/2022") Then - If ADRESSE.LandKz = "A" Or ADRESSE.LandKz = "AT" Then - cboTool.changeItem("CreditSafe AT") - lblBonitätsindex.Text = "Boni-Score" - Label2.Visible = False + + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA_ID = 19 Then + cboTool.changeItem("Boniteti.rs") + Else - cboTool.changeItem("CreditSafe") - lblBonitätsindex.Text = "Bonitätsindex:" - Label2.Visible = False + + If ADRESSE.LandKz = "A" Or ADRESSE.LandKz = "AT" Then + cboTool.changeItem("CreditSafe AT") + lblBonitätsindex.Text = "Boni-Score" + Label2.Visible = False + Else + cboTool.changeItem("CreditSafe") + lblBonitätsindex.Text = "Bonitätsindex:" + Label2.Visible = False + End If + End If + Else cboTool.changeItem("Creditreform") lblBonitätsindex.Text = "Bonitätsindex:" diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index 37ac8c9e..e34e30f5 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -31,10 +31,6 @@ Partial Class frmKundenblatt Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() @@ -44,6 +40,14 @@ Partial Class frmKundenblatt Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmKundenblatt)) Me.pnlInfo = New System.Windows.Forms.Panel() Me.txtInfotext = New System.Windows.Forms.Label() @@ -205,6 +209,12 @@ Partial Class frmKundenblatt Me.tbiKartenverwaltung = New System.Windows.Forms.ToolStripMenuItem() Me.tbiLKW = New System.Windows.Forms.ToolStripMenuItem() Me.tbiVERAGCard = New System.Windows.Forms.ToolStripMenuItem() + Me.TabPage3 = New System.Windows.Forms.TabPage() + Me.dgvUmsatzNachLeistngsNr = New System.Windows.Forms.DataGridView() + Me.btnBonitaetBearbeiten = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.FlatButton6 = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.lblBonitaet = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label39 = New System.Windows.Forms.Label() Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull() Me.usrcntlKarten = New SDL.usrCntlKartenDaten() Me.UsrCntlLKW1 = New SDL.usrCntlLKW() @@ -260,6 +270,8 @@ Partial Class frmKundenblatt Me.ContextMenuStrip3.SuspendLayout() Me.mne.SuspendLayout() Me.pnl.SuspendLayout() + Me.TabPage3.SuspendLayout() + CType(Me.dgvUmsatzNachLeistngsNr, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'pnlInfo @@ -324,6 +336,10 @@ Partial Class frmKundenblatt 'tbAllgemein ' Me.tbAllgemein.BackColor = System.Drawing.Color.White + Me.tbAllgemein.Controls.Add(Me.FlatButton6) + Me.tbAllgemein.Controls.Add(Me.lblBonitaet) + Me.tbAllgemein.Controls.Add(Me.Label39) + Me.tbAllgemein.Controls.Add(Me.btnBonitaetBearbeiten) Me.tbAllgemein.Controls.Add(Me.TabControl1) Me.tbAllgemein.Controls.Add(Me.lblAdressenzusatz) Me.tbAllgemein.Controls.Add(Me.Label11) @@ -363,6 +379,7 @@ Partial Class frmKundenblatt ' Me.TabControl1.Controls.Add(Me.TabPage1) Me.TabControl1.Controls.Add(Me.TabPage2) + Me.TabControl1.Controls.Add(Me.TabPage3) Me.TabControl1.Location = New System.Drawing.Point(8, 582) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 @@ -602,34 +619,34 @@ Partial Class frmKundenblatt 'dgvOfferte ' Me.dgvOfferte.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvOfferte.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle9 + DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvOfferte.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle13 Me.dgvOfferte.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvOfferte.DefaultCellStyle = DataGridViewCellStyle10 + DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvOfferte.DefaultCellStyle = DataGridViewCellStyle14 Me.dgvOfferte.Location = New System.Drawing.Point(433, 37) Me.dgvOfferte.Name = "dgvOfferte" Me.dgvOfferte.ReadOnly = True - DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvOfferte.RowHeadersDefaultCellStyle = DataGridViewCellStyle11 + DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvOfferte.RowHeadersDefaultCellStyle = DataGridViewCellStyle15 Me.dgvOfferte.Size = New System.Drawing.Size(293, 320) Me.dgvOfferte.TabIndex = 12 ' @@ -893,27 +910,27 @@ Partial Class frmKundenblatt Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.dgvSperrliste.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSperrliste.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle12 + DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSperrliste.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle16 Me.dgvSperrliste.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle13.ForeColor = System.Drawing.Color.Black - DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvSperrliste.DefaultCellStyle = DataGridViewCellStyle13 + DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle17.ForeColor = System.Drawing.Color.Black + DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvSperrliste.DefaultCellStyle = DataGridViewCellStyle17 Me.dgvSperrliste.Location = New System.Drawing.Point(732, 36) Me.dgvSperrliste.Name = "dgvSperrliste" Me.dgvSperrliste.ReadOnly = True - Me.dgvSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle11 + Me.dgvSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle15 Me.dgvSperrliste.Size = New System.Drawing.Size(446, 1126) Me.dgvSperrliste.TabIndex = 23 ' @@ -1039,38 +1056,38 @@ Partial Class frmKundenblatt ' Me.dgvSDLLeistungenFull.AllowUserToAddRows = False Me.dgvSDLLeistungenFull.AllowUserToResizeRows = False - DataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvSDLLeistungenFull.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14 + DataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvSDLLeistungenFull.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle18 Me.dgvSDLLeistungenFull.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSDLLeistungenFull.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle15 + DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSDLLeistungenFull.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle19 Me.dgvSDLLeistungenFull.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvSDLLeistungenFull.DefaultCellStyle = DataGridViewCellStyle16 + DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvSDLLeistungenFull.DefaultCellStyle = DataGridViewCellStyle20 Me.dgvSDLLeistungenFull.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvSDLLeistungenFull.Location = New System.Drawing.Point(3, 50) Me.dgvSDLLeistungenFull.Name = "dgvSDLLeistungenFull" Me.dgvSDLLeistungenFull.ReadOnly = True - DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle17 + DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle21 Me.dgvSDLLeistungenFull.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1624, 941) Me.dgvSDLLeistungenFull.TabIndex = 5 @@ -1603,38 +1620,38 @@ Partial Class frmKundenblatt ' Me.dgvLKW.AllowUserToAddRows = False Me.dgvLKW.AllowUserToDeleteRows = False - DataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvLKW.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle18 + DataGridViewCellStyle22.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvLKW.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle22 Me.dgvLKW.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvLKW.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle19 + DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvLKW.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle23 Me.dgvLKW.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvLKW.DefaultCellStyle = DataGridViewCellStyle20 + DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvLKW.DefaultCellStyle = DataGridViewCellStyle24 Me.dgvLKW.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvLKW.Location = New System.Drawing.Point(0, 62) Me.dgvLKW.Name = "dgvLKW" Me.dgvLKW.ReadOnly = True - DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle21 + DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle25 Me.dgvLKW.RowHeadersVisible = False Me.dgvLKW.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvLKW.Size = New System.Drawing.Size(306, 957) @@ -2325,7 +2342,7 @@ Partial Class frmKundenblatt ' Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM" - Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4 + Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8 Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4) Me.cntxtCntxtMDM.Text = "cntxtMDM" ' @@ -2459,6 +2476,126 @@ Partial Class frmKundenblatt Me.tbiVERAGCard.Size = New System.Drawing.Size(186, 22) Me.tbiVERAGCard.Text = "VERAG Card" ' + 'TabPage3 + ' + Me.TabPage3.Controls.Add(Me.dgvUmsatzNachLeistngsNr) + Me.TabPage3.Location = New System.Drawing.Point(4, 22) + Me.TabPage3.Name = "TabPage3" + Me.TabPage3.Size = New System.Drawing.Size(710, 524) + Me.TabPage3.TabIndex = 2 + Me.TabPage3.Text = "Umsatz nach LeistungsNr" + Me.TabPage3.UseVisualStyleBackColor = True + ' + 'dgvUmsatzNachLeistngsNr + ' + Me.dgvUmsatzNachLeistngsNr.AllowUserToAddRows = False + Me.dgvUmsatzNachLeistngsNr.AllowUserToDeleteRows = False + Me.dgvUmsatzNachLeistngsNr.AllowUserToResizeRows = False + DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUmsatzNachLeistngsNr.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9 + Me.dgvUmsatzNachLeistngsNr.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.dgvUmsatzNachLeistngsNr.BackgroundColor = System.Drawing.Color.White + DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvUmsatzNachLeistngsNr.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle10 + Me.dgvUmsatzNachLeistngsNr.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvUmsatzNachLeistngsNr.DefaultCellStyle = DataGridViewCellStyle11 + Me.dgvUmsatzNachLeistngsNr.Location = New System.Drawing.Point(2, 20) + Me.dgvUmsatzNachLeistngsNr.Name = "dgvUmsatzNachLeistngsNr" + Me.dgvUmsatzNachLeistngsNr.ReadOnly = True + DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvUmsatzNachLeistngsNr.RowHeadersDefaultCellStyle = DataGridViewCellStyle12 + Me.dgvUmsatzNachLeistngsNr.RowHeadersVisible = False + Me.dgvUmsatzNachLeistngsNr.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvUmsatzNachLeistngsNr.Size = New System.Drawing.Size(707, 484) + Me.dgvUmsatzNachLeistngsNr.TabIndex = 183 + ' + 'btnBonitaetBearbeiten + ' + Me.btnBonitaetBearbeiten.allowBorder = False + Me.btnBonitaetBearbeiten.BackgroundImage = Global.SDL.My.Resources.Resources.plus + Me.btnBonitaetBearbeiten.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnBonitaetBearbeiten.FlatAppearance.BorderSize = 0 + Me.btnBonitaetBearbeiten.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnBonitaetBearbeiten.ForeColor = System.Drawing.Color.Black + Me.btnBonitaetBearbeiten.Location = New System.Drawing.Point(568, 546) + Me.btnBonitaetBearbeiten.Name = "btnBonitaetBearbeiten" + Me.btnBonitaetBearbeiten.Size = New System.Drawing.Size(15, 12) + Me.btnBonitaetBearbeiten.TabIndex = 187 + Me.btnBonitaetBearbeiten.UseVisualStyleBackColor = True + Me.btnBonitaetBearbeiten.Visible = False + ' + 'FlatButton6 + ' + Me.FlatButton6.allowBorder = False + Me.FlatButton6.BackgroundImage = Global.SDL.My.Resources.Resources.list + Me.FlatButton6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.FlatButton6.FlatAppearance.BorderSize = 0 + Me.FlatButton6.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.FlatButton6.ForeColor = System.Drawing.Color.Black + Me.FlatButton6.Location = New System.Drawing.Point(708, 547) + Me.FlatButton6.Name = "FlatButton6" + Me.FlatButton6.Size = New System.Drawing.Size(15, 12) + Me.FlatButton6.TabIndex = 191 + Me.FlatButton6.UseVisualStyleBackColor = True + ' + 'lblBonitaet + ' + Me.lblBonitaet._DateTimeOnly = False + Me.lblBonitaet._numbersOnly = False + Me.lblBonitaet._numbersOnlyKommastellen = "" + Me.lblBonitaet._numbersOnlyTrennzeichen = True + Me.lblBonitaet._Prozent = False + Me.lblBonitaet._ShortDateNew = False + Me.lblBonitaet._ShortDateOnly = False + Me.lblBonitaet._TimeOnly = False + Me.lblBonitaet._TimeOnly_Seconds = False + Me.lblBonitaet._value = Nothing + Me.lblBonitaet._Waehrung = False + Me.lblBonitaet._WaehrungZeichen = True + Me.lblBonitaet.BackColor = System.Drawing.Color.WhiteSmoke + Me.lblBonitaet.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.lblBonitaet.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblBonitaet.ForeColor = System.Drawing.Color.Black + Me.lblBonitaet.Location = New System.Drawing.Point(648, 546) + Me.lblBonitaet.MaxLineLength = -1 + Me.lblBonitaet.MaxLines_Warning = "" + Me.lblBonitaet.MaxLines_Warning_Label = Nothing + Me.lblBonitaet.Name = "lblBonitaet" + Me.lblBonitaet.ReadOnly = True + Me.lblBonitaet.Size = New System.Drawing.Size(54, 13) + Me.lblBonitaet.TabIndex = 189 + Me.lblBonitaet.TextAlign = System.Windows.Forms.HorizontalAlignment.Center + ' + 'Label39 + ' + Me.Label39.AutoSize = True + Me.Label39.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label39.Location = New System.Drawing.Point(591, 546) + Me.Label39.Name = "Label39" + Me.Label39.Size = New System.Drawing.Size(43, 13) + Me.Label39.TabIndex = 188 + Me.Label39.Text = "Bonität:" + ' 'UsrcntlKundeBearbeitenFull1 ' Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White @@ -2595,6 +2732,8 @@ Partial Class frmKundenblatt Me.mne.PerformLayout() Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() + Me.TabPage3.ResumeLayout(False) + CType(Me.dgvUmsatzNachLeistngsNr, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -2764,4 +2903,10 @@ Partial Class frmKundenblatt Friend WithEvents TabPage1 As TabPage Friend WithEvents TabPage2 As TabPage Friend WithEvents Label13 As Label + Friend WithEvents TabPage3 As TabPage + Friend WithEvents dgvUmsatzNachLeistngsNr As DataGridView + Friend WithEvents btnBonitaetBearbeiten As VERAG_PROG_ALLGEMEIN.FlatButton + Friend WithEvents FlatButton6 As VERAG_PROG_ALLGEMEIN.FlatButton + Friend WithEvents lblBonitaet As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label39 As Label End Class diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb index e8322c85..5ab5a865 100644 --- a/SDL/kunden/frmKundenblatt.vb +++ b/SDL/kunden/frmKundenblatt.vb @@ -116,6 +116,10 @@ Public Class frmKundenblatt If FilialeNr > 0 Then UsrcntlKundeBearbeitenFull1.Filiale = FilialeNr End If + + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("KUNDEN_Bonität_Bearbeiten", "SDL") Then + btnBonitaetBearbeiten.Visible = True + End If 'UsrcntlKundeBearbeitenFull1.BERECHTIGUNEN = BERECHTIGUNEN Me.KeyPreview = True pnlInfo.Height = 0 @@ -239,6 +243,7 @@ Public Class frmKundenblatt End If + lblBonitaet.Text = If(KUNDE.Bonität, "") Else UsrcntlKundeBearbeitenFull1.Enabled = False @@ -2033,6 +2038,7 @@ Public Class frmKundenblatt If loaded Then initDGVOffenePosten() initDGVUmsatz() + initDGVUmsatzNachLeistungsNr() End If End Sub @@ -2102,5 +2108,72 @@ Public Class frmKundenblatt End Sub + + Sub initDGVUmsatzNachLeistungsNr() + With dgvUmsatzNachLeistngsNr + If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_FirmenDatenAnzeige Is Nothing Then Exit Sub + If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_FirmenDatenAnzeige = "" Then Exit Sub + Dim where = "" + If cboFirmaFMZOLL._value <> "" Then + where = " AND [VermittlerKundenNr] = " & kdNr & " AND Firma_ID=" & cboFirmaFMZOLL._value + Else + where = If(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_FirmenDatenAnzeige.contains("A"), "", " AND Firma_ID IN(" & VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_FirmenDatenAnzeige & ")") + where &= " AND [VermittlerKundenNr] = " & kdNr + End If + + Dim sqlstr = "" + sqlstr &= " SELECT * FROM ( SELECT Leistungen.LeistungsNr, Leistungen.LeistungsBez,YEAR(Abfertigungsdatum ) [Year] , (RechnungsausgangPositionen.SteuerpflichtigerBetrag+RechnungsausgangPositionen.SteuerfreierBetrag ) AS " + sqlstr &= " [Der Wert] FROM Rechnungsausgang INNER JOIN (RechnungsausgangPositionen LEFT JOIN Leistungen ON RechnungsausgangPositionen.LeistungsNr = Leistungen.LeistungsNr) ON (Rechnungsausgang.RK_ID = RechnungsausgangPositionen.RK_ID) " + sqlstr &= " WHERE 1 = 1 " + sqlstr &= where + sqlstr &= " ) AS Rg" + sqlstr &= " PIVOT( SUM([Der Wert]) FOR [Year] IN (" & getJahrString() & ")) AS MNamePivot" + sqlstr &= " order by LeistungsNr" + .DataSource = SQL.loadDgvBySql(sqlstr, "FMZOLL") + If .DataSource Is Nothing Then Exit Sub + If .Columns.Count = 0 Then Exit Sub + + For i = 0 To dgvUmsatzNachLeistngsNr.ColumnCount - 1 + + If i = 0 Then + .Columns(i).Width = 50 + End If + + If i > 1 Then + .Columns(i).Width = 75 + .Columns(i).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter + End If + + Next + + End With + + End Sub + + Function getJahrString() As String + getJahrString = "" + For j = Now.Year To 2010 Step -1 + getJahrString &= "[" & j & "]," + Next + getJahrString = getJahrString.Substring(0, getJahrString.Length - 1) + End Function + + Private Sub btnBonitaetBearbeiten_Click(sender As Object, e As EventArgs) Handles btnBonitaetBearbeiten.Click + + Dim f1 As New frmBonitaet(kdNr) + f1.ShowDialog(Me) + KdSearchBox1.KdNr = kdNr 'aktualisieren + + End Sub + + Private Sub FlatButton6_Click(sender As Object, e As EventArgs) Handles FlatButton6.Click + + Dim f As New frmBonitätsverlauf(kdNr) + f.Show() + AddHandler f.FormClosed, Sub() + KdSearchBox1.KdNr = kdNr + End Sub + + End Sub End Class diff --git a/SDL/kunden/usrCntlKundenuebersicht.resx b/SDL/kunden/usrCntlKundenuebersicht.resx index 99bb42bd..411f6c1c 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.resx +++ b/SDL/kunden/usrCntlKundenuebersicht.resx @@ -123,90 +123,90 @@ - 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 + ZKu8wIj8cOK/xAMdlNTj9YkAAAAASUVORK5CYII= - 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 + ZKu8wIj8cOK/xAMdlNTj9YkAAAAASUVORK5CYII= diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index aedf058f..42eef5d6 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -3256,4 +3256,16 @@ Public Class usrCntlKundenuebersicht End If End If End Sub + + Private Sub lblBonitaet_TextChanged(sender As Object, e As EventArgs) Handles lblBonitaet.TextChanged + + End Sub + + Private Sub lblBonitaetRisikostufe_TextChanged(sender As Object, e As EventArgs) Handles lblBonitaetRisikostufe.TextChanged + + End Sub + + Private Sub Label39_Click(sender As Object, e As EventArgs) Handles Label39.Click + + End Sub End Class diff --git a/SDL/seriendruck/usrCntlFakturierung.vb b/SDL/seriendruck/usrCntlFakturierung.vb index 8ce31751..ec4a434c 100644 --- a/SDL/seriendruck/usrCntlFakturierung.vb +++ b/SDL/seriendruck/usrCntlFakturierung.vb @@ -78,7 +78,7 @@ Public Class usrcntlFakturierung btnLieferantenrechnungen.Enabled = True btnMDMSammelrechnung.Enabled = False btnFakturierung.Enabled = False - btnRechnugnsdaten.Enabled = False + btnRechnugnsdaten.Enabled = True End If If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMINFUNCTIONS", "SDL") Then diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb b/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb index b0e94bc7..b557a9e2 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb @@ -2,6 +2,7 @@ Imports System.Data.SqlClient Imports System.Reflection Imports System.Threading +Imports com.sun.org.apache.xalan.internal.xsltc.compiler.util Imports VERAG_PROG_ALLGEMEIN.UIDPruefung 'Imports SDL.eu.europa.ec @@ -147,7 +148,7 @@ Public Class cUIDPruefung End Function - Public Shared Function doUIDPruefungALL(Optional datum As Object = Nothing, Optional SaveErgInAdressen As Boolean = True, Optional Sciherheitsabfrage As Boolean = True, Optional MaxEintraege As Integer = -1, Optional showErr As Boolean = True) As DataTable + Public Shared Function doUIDPruefungALL(Optional datum As Object = Nothing, Optional SaveErgInAdressen As Boolean = True, Optional Sciherheitsabfrage As Boolean = True, Optional MaxEintraege As Integer = -1, Optional showErr As Boolean = True, Optional finanzOnline As Boolean = True) As DataTable Dim dt As DataTable = Nothing If datum = Nothing Then datum = CDate("15." & Now.ToString("MM.yyyy")).AddMonths(-1) @@ -191,7 +192,7 @@ Public Class cUIDPruefung '------------------------------------------------ 'ENTWEDER ÜBER EU-KOMISSION ODER FINANZONLINE:::: - Dim ART = "FINANZONLINE" + Dim ART = IIf(finanzOnline, "FINANZONLINE", "EUROPE") '------------------------------------------------ Select Case ART Case "EUROPE" @@ -201,6 +202,11 @@ Public Class cUIDPruefung If UID_TMP IsNot Nothing Then If UID_TMP.uid_valid Then r("Ergebnis") = "OK" + + For Each row As DataRow In dt.Select("UstIdnr = '" & r("UstIdnr") & "' AND UstIdKz ='" & r("UstIdKz") & "'") + row("Ergebnis") = r("Ergebnis") + Next + Else r("Ergebnis") = "UNGÜLTIG" End If @@ -225,7 +231,7 @@ Public Class cUIDPruefung counter += 1 Dim errorCode = -99 Dim errormsg = "" - Dim UID_TMP = FO.Call_Web_Service_MethodUID_Abfrage_NEU2020(r("KdNr"),, SaveErgInAdressen, showErr,, errorCode, errorMsg) + Dim UID_TMP = FO.Call_Web_Service_MethodUID_Abfrage_NEU2020(r("KdNr"),, SaveErgInAdressen, showErr,, errorCode, errormsg) If UID_TMP IsNot Nothing Then If UID_TMP.uid_valid Then r("Ergebnis") = "OK"