diff --git a/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb b/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb index 21d22602..5f988f67 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb +++ b/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb @@ -127,6 +127,13 @@ Partial Class usrCntlMDMAuswertungen Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label36 = New System.Windows.Forms.Label() Me.TabPage3 = New System.Windows.Forms.TabPage() + Me.Label72 = New System.Windows.Forms.Label() + Me.GroupBox21 = New System.Windows.Forms.GroupBox() + Me.txtJahr_rechnungen = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.PictureBox8 = New System.Windows.Forms.PictureBox() + Me.Label70 = New System.Windows.Forms.Label() + Me.Label71 = New System.Windows.Forms.Label() + Me.Button21 = New System.Windows.Forms.Button() Me.Label66 = New System.Windows.Forms.Label() Me.GroupBox20 = New System.Windows.Forms.GroupBox() Me.cbxNurUnter50EUR = New System.Windows.Forms.CheckBox() @@ -202,13 +209,7 @@ Partial Class usrCntlMDMAuswertungen Me.btnContractdaten = New System.Windows.Forms.Button() Me.Button15 = New System.Windows.Forms.Button() Me.pnl = New System.Windows.Forms.Panel() - Me.GroupBox21 = New System.Windows.Forms.GroupBox() - Me.txtJahr_rechnungen = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.PictureBox8 = New System.Windows.Forms.PictureBox() - Me.Label70 = New System.Windows.Forms.Label() - Me.Label71 = New System.Windows.Forms.Label() - Me.Button21 = New System.Windows.Forms.Button() - Me.Label72 = New System.Windows.Forms.Label() + Me.cbxRechnungsdetails = New System.Windows.Forms.CheckBox() Me.GroupBox1.SuspendLayout() Me.GroupBox2.SuspendLayout() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() @@ -229,6 +230,8 @@ Partial Class usrCntlMDMAuswertungen Me.GroupBox9.SuspendLayout() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabPage3.SuspendLayout() + Me.GroupBox21.SuspendLayout() + CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox20.SuspendLayout() CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbIDS.SuspendLayout() @@ -246,8 +249,6 @@ Partial Class usrCntlMDMAuswertungen Me.GroupBox15.SuspendLayout() Me.GroupBox14.SuspendLayout() Me.pnl.SuspendLayout() - Me.GroupBox21.SuspendLayout() - CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'GroupBox1 @@ -1440,9 +1441,96 @@ Partial Class usrCntlMDMAuswertungen Me.TabPage3.Name = "TabPage3" Me.TabPage3.Size = New System.Drawing.Size(1049, 990) Me.TabPage3.TabIndex = 2 - Me.TabPage3.Text = "WÖLFL" + Me.TabPage3.Text = "RMC" Me.TabPage3.UseVisualStyleBackColor = True ' + 'Label72 + ' + Me.Label72.AutoSize = True + Me.Label72.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label72.ForeColor = System.Drawing.SystemColors.ControlDarkDark + Me.Label72.Location = New System.Drawing.Point(9, 267) + Me.Label72.Name = "Label72" + Me.Label72.Size = New System.Drawing.Size(238, 17) + Me.Label72.TabIndex = 19 + Me.Label72.Text = "RMC Rechnungen ohne Kunden" + ' + 'GroupBox21 + ' + Me.GroupBox21.Controls.Add(Me.cbxRechnungsdetails) + Me.GroupBox21.Controls.Add(Me.txtJahr_rechnungen) + Me.GroupBox21.Controls.Add(Me.PictureBox8) + Me.GroupBox21.Controls.Add(Me.Label70) + Me.GroupBox21.Controls.Add(Me.Label71) + Me.GroupBox21.Controls.Add(Me.Button21) + Me.GroupBox21.Location = New System.Drawing.Point(6, 283) + Me.GroupBox21.Name = "GroupBox21" + Me.GroupBox21.Size = New System.Drawing.Size(697, 111) + Me.GroupBox21.TabIndex = 18 + Me.GroupBox21.TabStop = False + ' + 'txtJahr_rechnungen + ' + Me.txtJahr_rechnungen._DateTimeOnly = False + Me.txtJahr_rechnungen._numbersOnly = False + Me.txtJahr_rechnungen._numbersOnlyKommastellen = "" + Me.txtJahr_rechnungen._numbersOnlyTrennzeichen = True + Me.txtJahr_rechnungen._Prozent = False + Me.txtJahr_rechnungen._ShortDateNew = False + Me.txtJahr_rechnungen._ShortDateOnly = False + Me.txtJahr_rechnungen._TimeOnly = False + Me.txtJahr_rechnungen._TimeOnly_Seconds = False + Me.txtJahr_rechnungen._value = "" + Me.txtJahr_rechnungen._Waehrung = False + Me.txtJahr_rechnungen._WaehrungZeichen = True + Me.txtJahr_rechnungen.ForeColor = System.Drawing.Color.Black + Me.txtJahr_rechnungen.Location = New System.Drawing.Point(185, 47) + Me.txtJahr_rechnungen.MaxLineLength = -1 + Me.txtJahr_rechnungen.MaxLines_Warning = "" + Me.txtJahr_rechnungen.MaxLines_Warning_Label = Nothing + Me.txtJahr_rechnungen.Name = "txtJahr_rechnungen" + Me.txtJahr_rechnungen.Size = New System.Drawing.Size(53, 20) + Me.txtJahr_rechnungen.TabIndex = 13 + ' + 'PictureBox8 + ' + Me.PictureBox8.Image = Global.SDL.My.Resources.Resources.woelfl + Me.PictureBox8.Location = New System.Drawing.Point(640, 8) + Me.PictureBox8.Name = "PictureBox8" + Me.PictureBox8.Size = New System.Drawing.Size(51, 37) + Me.PictureBox8.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom + Me.PictureBox8.TabIndex = 11 + Me.PictureBox8.TabStop = False + ' + 'Label70 + ' + Me.Label70.AutoSize = True + Me.Label70.Location = New System.Drawing.Point(145, 50) + Me.Label70.Name = "Label70" + Me.Label70.Size = New System.Drawing.Size(27, 13) + Me.Label70.TabIndex = 8 + Me.Label70.Text = "Jahr" + ' + 'Label71 + ' + Me.Label71.AutoSize = True + Me.Label71.Location = New System.Drawing.Point(145, 19) + Me.Label71.Name = "Label71" + Me.Label71.Size = New System.Drawing.Size(277, 13) + Me.Label71.TabIndex = 5 + Me.Label71.Text = "RMC-Rechnungen ohne zugehörigen Kunden im System." + ' + 'Button21 + ' + Me.Button21.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button21.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button21.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.Button21.Location = New System.Drawing.Point(6, 19) + Me.Button21.Name = "Button21" + Me.Button21.Size = New System.Drawing.Size(121, 49) + Me.Button21.TabIndex = 4 + Me.Button21.UseVisualStyleBackColor = True + ' 'Label66 ' Me.Label66.AutoSize = True @@ -2265,91 +2353,17 @@ Partial Class usrCntlMDMAuswertungen Me.pnl.Size = New System.Drawing.Size(1057, 54) Me.pnl.TabIndex = 26 ' - 'GroupBox21 + 'cbxRechnungsdetails ' - Me.GroupBox21.Controls.Add(Me.txtJahr_rechnungen) - Me.GroupBox21.Controls.Add(Me.PictureBox8) - Me.GroupBox21.Controls.Add(Me.Label70) - Me.GroupBox21.Controls.Add(Me.Label71) - Me.GroupBox21.Controls.Add(Me.Button21) - Me.GroupBox21.Location = New System.Drawing.Point(6, 283) - Me.GroupBox21.Name = "GroupBox21" - Me.GroupBox21.Size = New System.Drawing.Size(697, 111) - Me.GroupBox21.TabIndex = 18 - Me.GroupBox21.TabStop = False - ' - 'txtJahr_rechnungen - ' - Me.txtJahr_rechnungen._DateTimeOnly = False - Me.txtJahr_rechnungen._numbersOnly = False - Me.txtJahr_rechnungen._numbersOnlyKommastellen = "" - Me.txtJahr_rechnungen._numbersOnlyTrennzeichen = True - Me.txtJahr_rechnungen._Prozent = False - Me.txtJahr_rechnungen._ShortDateNew = False - Me.txtJahr_rechnungen._ShortDateOnly = False - Me.txtJahr_rechnungen._TimeOnly = False - Me.txtJahr_rechnungen._TimeOnly_Seconds = False - Me.txtJahr_rechnungen._value = "" - Me.txtJahr_rechnungen._Waehrung = False - Me.txtJahr_rechnungen._WaehrungZeichen = True - Me.txtJahr_rechnungen.ForeColor = System.Drawing.Color.Black - Me.txtJahr_rechnungen.Location = New System.Drawing.Point(185, 47) - Me.txtJahr_rechnungen.MaxLineLength = -1 - Me.txtJahr_rechnungen.MaxLines_Warning = "" - Me.txtJahr_rechnungen.MaxLines_Warning_Label = Nothing - Me.txtJahr_rechnungen.Name = "txtJahr_rechnungen" - Me.txtJahr_rechnungen.Size = New System.Drawing.Size(53, 20) - Me.txtJahr_rechnungen.TabIndex = 13 - ' - 'PictureBox8 - ' - Me.PictureBox8.Image = Global.SDL.My.Resources.Resources.woelfl - Me.PictureBox8.Location = New System.Drawing.Point(640, 8) - Me.PictureBox8.Name = "PictureBox8" - Me.PictureBox8.Size = New System.Drawing.Size(51, 37) - Me.PictureBox8.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom - Me.PictureBox8.TabIndex = 11 - Me.PictureBox8.TabStop = False - ' - 'Label70 - ' - Me.Label70.AutoSize = True - Me.Label70.Location = New System.Drawing.Point(145, 50) - Me.Label70.Name = "Label70" - Me.Label70.Size = New System.Drawing.Size(27, 13) - Me.Label70.TabIndex = 8 - Me.Label70.Text = "Jahr" - ' - 'Label71 - ' - Me.Label71.AutoSize = True - Me.Label71.Location = New System.Drawing.Point(145, 19) - Me.Label71.Name = "Label71" - Me.Label71.Size = New System.Drawing.Size(277, 13) - Me.Label71.TabIndex = 5 - Me.Label71.Text = "RMC-Rechnungen ohne zugehörigen Kunden im System." - ' - 'Button21 - ' - Me.Button21.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button21.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button21.Image = Global.SDL.My.Resources.Resources.Excel_logo - Me.Button21.Location = New System.Drawing.Point(6, 19) - Me.Button21.Name = "Button21" - Me.Button21.Size = New System.Drawing.Size(121, 49) - Me.Button21.TabIndex = 4 - Me.Button21.UseVisualStyleBackColor = True - ' - 'Label72 - ' - Me.Label72.AutoSize = True - Me.Label72.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label72.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label72.Location = New System.Drawing.Point(9, 267) - Me.Label72.Name = "Label72" - Me.Label72.Size = New System.Drawing.Size(238, 17) - Me.Label72.TabIndex = 19 - Me.Label72.Text = "RMC Rechnungen ohne Kunden" + Me.cbxRechnungsdetails.AutoSize = True + Me.cbxRechnungsdetails.Checked = True + Me.cbxRechnungsdetails.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbxRechnungsdetails.Location = New System.Drawing.Point(273, 49) + Me.cbxRechnungsdetails.Name = "cbxRechnungsdetails" + Me.cbxRechnungsdetails.Size = New System.Drawing.Size(152, 17) + Me.cbxRechnungsdetails.TabIndex = 18 + Me.cbxRechnungsdetails.Text = "Rechnungsdetail anzeigen" + Me.cbxRechnungsdetails.UseVisualStyleBackColor = True ' 'usrCntlMDMAuswertungen ' @@ -2392,6 +2406,9 @@ Partial Class usrCntlMDMAuswertungen CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit() Me.TabPage3.ResumeLayout(False) Me.TabPage3.PerformLayout() + Me.GroupBox21.ResumeLayout(False) + Me.GroupBox21.PerformLayout() + CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).EndInit() Me.GroupBox20.ResumeLayout(False) Me.GroupBox20.PerformLayout() CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit() @@ -2423,9 +2440,6 @@ Partial Class usrCntlMDMAuswertungen Me.GroupBox14.PerformLayout() Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() - Me.GroupBox21.ResumeLayout(False) - Me.GroupBox21.PerformLayout() - CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -2615,4 +2629,5 @@ Partial Class usrCntlMDMAuswertungen Friend WithEvents Label70 As Label Friend WithEvents Label71 As Label Friend WithEvents Button21 As Button + Friend WithEvents cbxRechnungsdetails As CheckBox End Class diff --git a/SDL/mdm/usrCntlMDMAuswertungen.vb b/SDL/mdm/usrCntlMDMAuswertungen.vb index a82479c9..baa97905 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.vb +++ b/SDL/mdm/usrCntlMDMAuswertungen.vb @@ -1559,14 +1559,14 @@ Public Class usrCntlMDMAuswertungen Dim Jahr As Integer = Now().Year If txtJahr_rechnungen.Text <> "" AndAlso IsNumeric(txtJahr_rechnungen.Text) AndAlso txtJahr_rechnungen.Text.Length = 4 Then - Jahr = txtJahr.Text + Jahr = txtJahr_rechnungen.Text End If Dim rmc As cRMC - Dim dt = rmc.getRMCBelegeOhneRechnungen(New VERAG_PROG_ALLGEMEIN.SQL, Jahr) + Dim dt = rmc.getRMCREchnungenOhneAdressen(New VERAG_PROG_ALLGEMEIN.SQL, Jahr, cbxRechnungsdetails.Checked) If dt.Rows.Count > 0 Then - cProgramFunctions.genExcelFromDT_NEW(dt) + cProgramFunctions.genExcelFromDT_NEW(dt,,,,,, True) Else MsgBox("keine Daten für ausgewählten Zeitraum") End If diff --git a/VERAG_PROG_ALLGEMEIN/AVISO/cMeineFunktionenAVISO.vb b/VERAG_PROG_ALLGEMEIN/AVISO/cMeineFunktionenAVISO.vb index 99d64373..06cf0b9e 100644 --- a/VERAG_PROG_ALLGEMEIN/AVISO/cMeineFunktionenAVISO.vb +++ b/VERAG_PROG_ALLGEMEIN/AVISO/cMeineFunktionenAVISO.vb @@ -187,7 +187,7 @@ Public Class cMeineFunktionenAVISO Dim AvisoDAL As New VERAG_PROG_ALLGEMEIN.cAvisoDAL Dim VermerkeDAL As New VERAG_PROG_ALLGEMEIN.cVermerkeDAL If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then - MsgBox("Keine Berechtigung!") + MsgBox("Keine Berechtigung! - VERIMEX") Return False End If diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb b/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb index 090b3f6b..6f4165cb 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb @@ -336,36 +336,28 @@ Public Class cRMC - Public Shared Function getRMCBelegeOhneRechnungen(SQL As SQL, jahr As Integer) As DataTable + Public Shared Function getRMCREchnungenOhneAdressen(SQL As SQL, jahr As Integer, Optional getInvoiceData As Boolean = False) As DataTable + Dim SQLFirst As String = "" + If getInvoiceData Then + SQLFirst = "SELECT [rmc_kdNr], [rmc_kdName], [rmc_landKZ], [rmc_reDatum], [rmc_reNr], [rmc_waehrung], case WHEN rmc_daid IS NULL THEN 0 else 1 end as PDF_Rechnung, case WHEN rmc_daId_InvAtt IS NULL THEN 0 else 1 end as PDF_Anhang " + Else + SQLFirst = "SELECT DISTINCT r.rmc_kdNr,r.rmc_kdName " + End If - Dim SQLstr = "select Temp.KundenNr, Temp.Kundenname,Temp.LandKZ, Temp.Jahr, Temp.Quartal, sum(Temp.Betrag) as 'verrechneter Bearbeitungsbetrag' from (SELECT - USTVA.UStVAn_KuNr as KundenNr, - USTVA.UStVAn_Name as Kundenname, - [Länderverzeichnis für die Außenhandelsstatistik].LandKz as LandKZ, - YEAR(R.Abfertigungsdatum) AS Jahr, - DATEPART(QUARTER, R.Abfertigungsdatum) AS Quartal, - POS.LeistungsNr, - SUM(POS.SteuerfreierBetrag + POS.SteuerpflichtigerBetrag) AS Betrag - FROM tblUStVAntrag AS USTVA - INNER JOIN Rechnungsausgang AS R ON R.FilialenNr = USTVA.FilialenNr AND R.AbfertigungsNr = USTVA.AbfertigungsNr - INNER JOIN RechnungsausgangPositionen AS POS ON R.RK_ID = POS.RK_ID - INNER JOIN [Länderverzeichnis für die Außenhandelsstatistik] on UStVAn_LandNr=Landnr - - GROUP BY - USTVA.UStVAn_KuNr, - USTVA.UStVAn_Name, - [Länderverzeichnis für die Außenhandelsstatistik].LandKz, - YEAR(R.Abfertigungsdatum), - DATEPART(QUARTER, R.Abfertigungsdatum), - POS.LeistungsNr - ) as Temp - WHERE 1 = 1 " & IIf(jahr > 0, " AND temp.Quartal = " & jahr, "") & " - Group by Temp.KundenNr, Temp.Kundenname,Temp.LandKZ, Temp.Jahr, Temp.Quartal" + Dim SQLstr = "FROM tblRMCImport r + WHERE + r.rmc_reDatum >= '" & jahr & "-01-01' + AND r.rmc_reDatum < '" & jahr + 1 & "-01-01' + AND NOT EXISTS ( + SELECT 1 FROM Adressen a WHERE a.WölflKundenNr = r.rmc_kdNr + ) + AND NOT EXISTS ( + SELECT 1 FROM Adressen a WHERE a.weitereWölflKundenNr = r.rmc_kdNr)" - Dim dt = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLstr, "FMZOLL") + Dim dt = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(SQLFirst & SQLstr, "FMZOLL") Return dt