diff --git a/SDL/Fakturierung/frmAbrechnungsMaske.Designer.vb b/SDL/Fakturierung/frmAbrechnungsMaske.Designer.vb index 800aa1d6..39e431b4 100644 --- a/SDL/Fakturierung/frmAbrechnungsMaske.Designer.vb +++ b/SDL/Fakturierung/frmAbrechnungsMaske.Designer.vb @@ -51,14 +51,16 @@ Partial Class frmAbrechnungsMaske Me.Label2 = New System.Windows.Forms.Label() Me.Label10 = New System.Windows.Forms.Label() Me.Panel1 = New System.Windows.Forms.Panel() + Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() + Me.lblKunde = New System.Windows.Forms.Label() Me.PictureBox5 = New System.Windows.Forms.PictureBox() Me.cbxGutschriftenAnVerag = New System.Windows.Forms.CheckBox() - Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboRechnungsdruck = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label14 = New System.Windows.Forms.Label() Me.cbx = New System.Windows.Forms.CheckBox() - Me.MyComboBox3 = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboER_SR = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label5 = New System.Windows.Forms.Label() - Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboSachbearbeiter = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label1 = New System.Windows.Forms.Label() Me.lblSachbearbeiter = New System.Windows.Forms.Label() Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() @@ -86,8 +88,6 @@ Partial Class frmAbrechnungsMaske Me.btnVonJahr = New System.Windows.Forms.Button() Me.UsrCntlFaktAbrechnung1 = New SDL.usrCntlFaktAbrechnung() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.lblKunde = New System.Windows.Forms.Label() - Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.pnl.SuspendLayout() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer.Panel1.SuspendLayout() @@ -446,12 +446,12 @@ Partial Class frmAbrechnungsMaske Me.Panel1.Controls.Add(Me.lblKunde) Me.Panel1.Controls.Add(Me.PictureBox5) Me.Panel1.Controls.Add(Me.cbxGutschriftenAnVerag) - Me.Panel1.Controls.Add(Me.MyComboBox1) + Me.Panel1.Controls.Add(Me.cboRechnungsdruck) Me.Panel1.Controls.Add(Me.Label14) Me.Panel1.Controls.Add(Me.cbx) - Me.Panel1.Controls.Add(Me.MyComboBox3) + Me.Panel1.Controls.Add(Me.cboER_SR) Me.Panel1.Controls.Add(Me.Label5) - Me.Panel1.Controls.Add(Me.MyComboBox2) + Me.Panel1.Controls.Add(Me.cboSachbearbeiter) Me.Panel1.Controls.Add(Me.Label1) Me.Panel1.Controls.Add(Me.lblSachbearbeiter) Me.Panel1.Controls.Add(Me.cboFirma) @@ -463,6 +463,43 @@ Partial Class frmAbrechnungsMaske Me.Panel1.Size = New System.Drawing.Size(575, 170) Me.Panel1.TabIndex = 0 ' + 'KdSearchBox1 + ' + Me.KdSearchBox1._AlleFirmenCLUSTER = False + Me.KdSearchBox1._AllowSetValue = False + Me.KdSearchBox1._autoSizeGross = False + Me.KdSearchBox1._display_Name1 = False + Me.KdSearchBox1._displayAVISO_Email = False + Me.KdSearchBox1._displayFullName = False + Me.KdSearchBox1._displayWoelflKd = False + Me.KdSearchBox1._hideIfListEmpty = True + Me.KdSearchBox1._loadKdData = False + Me.KdSearchBox1._searchName1 = True + Me.KdSearchBox1._UseFIRMA = "" + Me.KdSearchBox1._ValueKdAndName = True + Me.KdSearchBox1.dgvpos = "LEFT" + Me.KdSearchBox1.KdName = Nothing + Me.KdSearchBox1.KdNr = "-1" + Me.KdSearchBox1.kdNrField = Nothing + Me.KdSearchBox1.KdNrNullInt = Nothing + Me.KdSearchBox1.Location = New System.Drawing.Point(99, 58) + Me.KdSearchBox1.Name = "KdSearchBox1" + Me.KdSearchBox1.nurAktive = True + Me.KdSearchBox1.searchActive = True + Me.KdSearchBox1.Size = New System.Drawing.Size(154, 20) + Me.KdSearchBox1.TabIndex = 135 + Me.KdSearchBox1.TIMER_SEARCH = True + Me.KdSearchBox1.usrcntl = Nothing + ' + 'lblKunde + ' + Me.lblKunde.AutoSize = True + Me.lblKunde.Location = New System.Drawing.Point(12, 61) + Me.lblKunde.Name = "lblKunde" + Me.lblKunde.Size = New System.Drawing.Size(41, 13) + Me.lblKunde.TabIndex = 134 + Me.lblKunde.Text = "Kunde:" + ' 'PictureBox5 ' Me.PictureBox5.BackgroundImage = Global.SDL.My.Resources.Resources.fragezeichen @@ -483,17 +520,17 @@ Partial Class frmAbrechnungsMaske Me.cbxGutschriftenAnVerag.Text = "nicht an Verag abger." Me.cbxGutschriftenAnVerag.UseVisualStyleBackColor = True ' - 'MyComboBox1 + 'cboRechnungsdruck ' - Me.MyComboBox1._allowedValuesFreiText = Nothing - Me.MyComboBox1._allowFreiText = False - Me.MyComboBox1._value = "" - Me.MyComboBox1.FormattingEnabled = True - Me.MyComboBox1.Location = New System.Drawing.Point(453, 23) - Me.MyComboBox1.Margin = New System.Windows.Forms.Padding(2) - Me.MyComboBox1.Name = "MyComboBox1" - Me.MyComboBox1.Size = New System.Drawing.Size(83, 21) - Me.MyComboBox1.TabIndex = 53 + Me.cboRechnungsdruck._allowedValuesFreiText = Nothing + Me.cboRechnungsdruck._allowFreiText = False + Me.cboRechnungsdruck._value = "" + Me.cboRechnungsdruck.FormattingEnabled = True + Me.cboRechnungsdruck.Location = New System.Drawing.Point(453, 23) + Me.cboRechnungsdruck.Margin = New System.Windows.Forms.Padding(2) + Me.cboRechnungsdruck.Name = "cboRechnungsdruck" + Me.cboRechnungsdruck.Size = New System.Drawing.Size(83, 21) + Me.cboRechnungsdruck.TabIndex = 53 ' 'Label14 ' @@ -516,17 +553,17 @@ Partial Class frmAbrechnungsMaske Me.cbx.Text = "Gedruckte Rechnugen anzeigen" Me.cbx.UseVisualStyleBackColor = True ' - 'MyComboBox3 + 'cboER_SR ' - Me.MyComboBox3._allowedValuesFreiText = Nothing - Me.MyComboBox3._allowFreiText = False - Me.MyComboBox3._value = "" - Me.MyComboBox3.FormattingEnabled = True - Me.MyComboBox3.Location = New System.Drawing.Point(453, 3) - Me.MyComboBox3.Margin = New System.Windows.Forms.Padding(2) - Me.MyComboBox3.Name = "MyComboBox3" - Me.MyComboBox3.Size = New System.Drawing.Size(83, 21) - Me.MyComboBox3.TabIndex = 33 + Me.cboER_SR._allowedValuesFreiText = Nothing + Me.cboER_SR._allowFreiText = False + Me.cboER_SR._value = "" + Me.cboER_SR.FormattingEnabled = True + Me.cboER_SR.Location = New System.Drawing.Point(453, 3) + Me.cboER_SR.Margin = New System.Windows.Forms.Padding(2) + Me.cboER_SR.Name = "cboER_SR" + Me.cboER_SR.Size = New System.Drawing.Size(83, 21) + Me.cboER_SR.TabIndex = 33 ' 'Label5 ' @@ -537,17 +574,17 @@ Partial Class frmAbrechnungsMaske Me.Label5.TabIndex = 32 Me.Label5.Text = "Sammel-/Einzel-Rg.:" ' - 'MyComboBox2 + 'cboSachbearbeiter ' - Me.MyComboBox2._allowedValuesFreiText = Nothing - Me.MyComboBox2._allowFreiText = False - Me.MyComboBox2._value = "" - Me.MyComboBox2.FormattingEnabled = True - Me.MyComboBox2.Location = New System.Drawing.Point(99, 33) - Me.MyComboBox2.Margin = New System.Windows.Forms.Padding(2) - Me.MyComboBox2.Name = "MyComboBox2" - Me.MyComboBox2.Size = New System.Drawing.Size(154, 21) - Me.MyComboBox2.TabIndex = 31 + Me.cboSachbearbeiter._allowedValuesFreiText = Nothing + Me.cboSachbearbeiter._allowFreiText = False + Me.cboSachbearbeiter._value = "" + Me.cboSachbearbeiter.FormattingEnabled = True + Me.cboSachbearbeiter.Location = New System.Drawing.Point(99, 33) + Me.cboSachbearbeiter.Margin = New System.Windows.Forms.Padding(2) + Me.cboSachbearbeiter.Name = "cboSachbearbeiter" + Me.cboSachbearbeiter.Size = New System.Drawing.Size(154, 21) + Me.cboSachbearbeiter.TabIndex = 31 ' 'Label1 ' @@ -937,43 +974,6 @@ Partial Class frmAbrechnungsMaske Me.ContextMenuStrip1.Name = "ContextMenuStrip1" Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4) ' - 'lblKunde - ' - Me.lblKunde.AutoSize = True - Me.lblKunde.Location = New System.Drawing.Point(12, 61) - Me.lblKunde.Name = "lblKunde" - Me.lblKunde.Size = New System.Drawing.Size(41, 13) - Me.lblKunde.TabIndex = 134 - Me.lblKunde.Text = "Kunde:" - ' - 'KdSearchBox1 - ' - Me.KdSearchBox1._AlleFirmenCLUSTER = False - Me.KdSearchBox1._AllowSetValue = False - Me.KdSearchBox1._autoSizeGross = False - Me.KdSearchBox1._display_Name1 = False - Me.KdSearchBox1._displayAVISO_Email = False - Me.KdSearchBox1._displayFullName = False - Me.KdSearchBox1._displayWoelflKd = False - Me.KdSearchBox1._hideIfListEmpty = True - Me.KdSearchBox1._loadKdData = False - Me.KdSearchBox1._searchName1 = True - Me.KdSearchBox1._UseFIRMA = "" - Me.KdSearchBox1._ValueKdAndName = True - Me.KdSearchBox1.dgvpos = "LEFT" - Me.KdSearchBox1.KdName = Nothing - Me.KdSearchBox1.KdNr = "-1" - Me.KdSearchBox1.kdNrField = Nothing - Me.KdSearchBox1.KdNrNullInt = Nothing - Me.KdSearchBox1.Location = New System.Drawing.Point(99, 58) - Me.KdSearchBox1.Name = "KdSearchBox1" - Me.KdSearchBox1.nurAktive = True - Me.KdSearchBox1.searchActive = True - Me.KdSearchBox1.Size = New System.Drawing.Size(154, 20) - Me.KdSearchBox1.TabIndex = 135 - Me.KdSearchBox1.TIMER_SEARCH = True - Me.KdSearchBox1.usrcntl = Nothing - ' 'frmAbrechnungsMaske ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1011,14 +1011,14 @@ Partial Class frmAbrechnungsMaske Friend WithEvents dgvRechnungen As VERAG_PROG_ALLGEMEIN.MyDatagridview Friend WithEvents cboFirma As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents lblSachbearbeiter As System.Windows.Forms.Label - Friend WithEvents MyComboBox2 As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents cboSachbearbeiter As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents Label1 As System.Windows.Forms.Label Friend WithEvents btn As System.Windows.Forms.Button Friend WithEvents Label2 As Label Friend WithEvents Button1 As Button Friend WithEvents Button3 As Button Friend WithEvents Label3 As Label - Friend WithEvents MyComboBox3 As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents cboER_SR As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents Label5 As Label Friend WithEvents Label6 As Label Friend WithEvents tbcntr As TabControl @@ -1057,7 +1057,7 @@ Partial Class frmAbrechnungsMaske Friend WithEvents Label4 As Label Friend WithEvents Button4 As Button Friend WithEvents Label12 As Label - Friend WithEvents MyComboBox1 As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents cboRechnungsdruck As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents Label14 As Label Public WithEvents cboSort As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents cbxOriginalDrucken As CheckBox diff --git a/SDL/Fakturierung/frmAbrechnungsMaske.vb b/SDL/Fakturierung/frmAbrechnungsMaske.vb index 6db950d6..a2a1100a 100644 --- a/SDL/Fakturierung/frmAbrechnungsMaske.vb +++ b/SDL/Fakturierung/frmAbrechnungsMaske.vb @@ -26,19 +26,19 @@ Public Class frmAbrechnungsMaske btnJahr.Text = JAHR.Year cbx.Checked = False - MyComboBox3.Items.Clear() - MyComboBox3.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Alle", "")) - MyComboBox3.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ER", "ER")) - MyComboBox3.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SR", "SR")) - MyComboBox3.changeItem("") + cboER_SR.Items.Clear() + cboER_SR.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Alle", "")) + cboER_SR.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ER", "ER")) + cboER_SR.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SR", "SR")) + cboER_SR.changeItem("") - MyComboBox1.Items.Clear() - MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) - MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("POST", "0")) - MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FAX", "1")) - MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("E-MAIL", "2")) - MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MAIL+KOPIE", "5")) - MyComboBox1.changeItem("") + cboRechnungsdruck.Items.Clear() + cboRechnungsdruck.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) + cboRechnungsdruck.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("POST", "0")) + cboRechnungsdruck.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FAX", "1")) + cboRechnungsdruck.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("E-MAIL", "2")) + cboRechnungsdruck.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MAIL+KOPIE", "5")) + cboRechnungsdruck.changeItem("") cboSort.Items.Clear() cboSort.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Eingabezeitpunkt", "EZ")) @@ -62,7 +62,7 @@ Public Class frmAbrechnungsMaske 'FirmaTmp = "AMBAR" 'End If - MyComboBox2.Items.Clear() + cboSachbearbeiter.Items.Clear() Select Case FirmaTmp @@ -73,12 +73,12 @@ Public Class frmAbrechnungsMaske If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_VERAGAG_DE", "SDL") Then whereFirma = " AND FIRMENGRUPPE In ('VERAG360','VERAGAG_DE') " End If - MyComboBox3.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MSR", "MSR")) + cboER_SR.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MSR", "MSR")) cboFirma.fillWithSQL("Select [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE 1=1 " & whereFirma, False, "FMZOLL") cboFirma.changeItem("1") - MyComboBox2.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where mit_firma IN ('VERAG'" & If(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN", ",'ALL'", "") & ") and mit_gekuendigt=0 AND (mit_abteilung IN ('VRR','BH') OR [mit_id] IN (SELECT [beroz_bergrId] FROM [tblBerechtigungsObjekteZuordnung] where [beroz_beroId]=90 AND beroz_art='B')) order by mit_username", False, "ADMIN", True) - MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("*BAUBÖCK", "BAUBOECK")) - If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DANIEL", "DANIEL")) + cboSachbearbeiter.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where mit_firma IN ('VERAG'" & If(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN", ",'ALL'", "") & ") and mit_gekuendigt=0 AND (mit_abteilung IN ('VRR','BH') OR [mit_id] IN (SELECT [beroz_bergrId] FROM [tblBerechtigungsObjekteZuordnung] where [beroz_beroId]=90 AND beroz_art='B')) order by mit_username", False, "ADMIN", True) + cboSachbearbeiter.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("*BAUBÖCK", "BAUBOECK")) + If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then cboSachbearbeiter.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DANIEL", "DANIEL")) Else Dim whereFirma = " AND FIRMENGRUPPE IN ('VERAG','VERAGUNISPED','FRONTOFFICE','ATILLA') " @@ -89,20 +89,20 @@ Public Class frmAbrechnungsMaske cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE 1=1 " & whereFirma, False, "FMZOLL") cboFirma.changeItem("1") - MyComboBox2.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where mit_firma IN ('VERAG'" & If(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN", ",'ALL'", "") & ") and mit_gekuendigt=0 AND (mit_abteilung IN ('VRR','BH') OR [mit_id] IN (SELECT [beroz_bergrId] FROM [tblBerechtigungsObjekteZuordnung] where [beroz_beroId]=90 AND beroz_art='B')) order by mit_username", False, "ADMIN", True) + cboSachbearbeiter.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where mit_firma IN ('VERAG'" & If(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN", ",'ALL'", "") & ") and mit_gekuendigt=0 AND (mit_abteilung IN ('VRR','BH') OR [mit_id] IN (SELECT [beroz_bergrId] FROM [tblBerechtigungsObjekteZuordnung] where [beroz_beroId]=90 AND beroz_art='B')) order by mit_username", False, "ADMIN", True) End If Case "IMEX" cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE FIRMENGRUPPE IN ('IMEX') ", False, "FMZOLL") cboFirma.changeItem("20") - MyComboBox2.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where mit_firma='IMEX' and mit_gekuendigt=0 AND (mit_abteilung IN ('VRR','BH') OR (SELECT COUNT(*) FROM [tblBerechtigungsObjekteZuordnung] where [beroz_beroId]=90 AND [beroz_bergrId]=[mit_id] AND beroz_art='B')>0) order by mit_username", False, "ADMIN", True) + cboSachbearbeiter.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where mit_firma='IMEX' and mit_gekuendigt=0 AND (mit_abteilung IN ('VRR','BH') OR (SELECT COUNT(*) FROM [tblBerechtigungsObjekteZuordnung] where [beroz_beroId]=90 AND [beroz_bergrId]=[mit_id] AND beroz_art='B')>0) order by mit_username", False, "ADMIN", True) Case "UNISPED" cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE FIRMENGRUPPE IN ('UNISPED') ", False, "FMZOLL") cboFirma.changeItem("21") - MyComboBox2.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where mit_firma='UNISPED' and mit_gekuendigt=0 AND (mit_abteilung IN ('VRR','BH') OR (SELECT COUNT(*) FROM [tblBerechtigungsObjekteZuordnung] where [beroz_beroId]=90 AND [beroz_bergrId]=[mit_id] AND beroz_art='B')>0) order by mit_username", False, "ADMIN", True) + cboSachbearbeiter.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where mit_firma='UNISPED' and mit_gekuendigt=0 AND (mit_abteilung IN ('VRR','BH') OR (SELECT COUNT(*) FROM [tblBerechtigungsObjekteZuordnung] where [beroz_beroId]=90 AND [beroz_bergrId]=[mit_id] AND beroz_art='B')>0) order by mit_username", False, "ADMIN", True) Case "AMBAR" cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE FIRMENGRUPPE IN ('AMBAR') ", False, "FMZOLL") cboFirma.changeItem("24") - MyComboBox2.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where mit_firma='AMBAR' and mit_gekuendigt=0 AND (mit_abteilung IN ('VRR','BH') OR (SELECT COUNT(*) FROM [tblBerechtigungsObjekteZuordnung] where [beroz_beroId]=90 AND [beroz_bergrId]=[mit_id] AND beroz_art='B')>0) order by mit_username", False, "ADMIN", True) + cboSachbearbeiter.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where mit_firma='AMBAR' and mit_gekuendigt=0 AND (mit_abteilung IN ('VRR','BH') OR (SELECT COUNT(*) FROM [tblBerechtigungsObjekteZuordnung] where [beroz_beroId]=90 AND [beroz_bergrId]=[mit_id] AND beroz_art='B')>0) order by mit_username", False, "ADMIN", True) 'Case "VERAG360" ' cboFirma.fillWithSQL("SELECT [Firma_ID],[Firma_Bez] FROM [tblFirma] WHERE Firma_ID=19", False, "FMZOLL") @@ -119,18 +119,18 @@ Public Class frmAbrechnungsMaske Case "VERAG" : cboFirma.changeItem("1") Case "IMEX" : cboFirma.changeItem("20") End Select - MyComboBox2.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where mit_firma IN ('IMEX','VERAG'" & If(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN", ",'ALL'", "") & ") AND mit_gekuendigt=0 AND (mit_abteilung IN ('VRR','BH') OR (SELECT COUNT(*) FROM [tblBerechtigungsObjekteZuordnung] where [beroz_beroId]=90 AND [beroz_bergrId]=[mit_id] AND beroz_art='B')>0) order by mit_username", False, "ADMIN", True) - MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("*BAUBÖCK", "BAUBOECK")) + cboSachbearbeiter.fillWithSQL("SELECT [mit_username] FROM [tblMitarbeiter] where mit_firma IN ('IMEX','VERAG'" & If(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN", ",'ALL'", "") & ") AND mit_gekuendigt=0 AND (mit_abteilung IN ('VRR','BH') OR (SELECT COUNT(*) FROM [tblBerechtigungsObjekteZuordnung] where [beroz_beroId]=90 AND [beroz_bergrId]=[mit_id] AND beroz_art='B')>0) order by mit_username", False, "ADMIN", True) + cboSachbearbeiter.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("*BAUBÖCK", "BAUBOECK")) End Select ' MyComboBox2.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.USRID) 'Benutzerwechsel 'If MyComboBox2.Items.Count > 0 Then MyComboBox2.SelectedIndex = 0 - MyComboBox2.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME) - If MyComboBox2._value = "" Then MsgBox("Keine Benutzerberechtigung gefunden!") : Exit Sub + cboSachbearbeiter.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME) + If cboSachbearbeiter._value = "" Then MsgBox("Keine Benutzerberechtigung gefunden!") : Exit Sub If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG_AlleBenutzer", Me) Then - MyComboBox2.Enabled = False + cboSachbearbeiter.Enabled = False End If KdSearchBox1.initKdBox(Me) @@ -189,7 +189,7 @@ Public Class frmAbrechnungsMaske If cbxGutschriftenAnVerag.Checked AndAlso cboFirma._value <> "" AndAlso cboFirma._value = "24" Then sqlstr &= " SELECT R1.FilialenNr, R1.AbfertigungsNr, cast(R1.FilialenNr as varchar) + ' ' + cast(R1.AbfertigungsNr as varchar) as PosNr, R1.UnterNr, Firma_ID,R1.Sammelrechnung as Art, [RechnungsName 1] as Rechnungsempfänger, (isnull(SteuerpflichtigerGesamtbetrag,0) + isnull(SteuerfreierGesamtbetrag,0)) as Betrag, RK_ID,RechnungsLandKz,RechnungsKundenNr FROM Rechnungsausgang as R1 INNER JOIN Adressen ON AdressenNr=R1.RechnungsKundenNr inner Join Speditionsbuch on Speditionsbuch.FilialenNr = R1.FilialenNr And Speditionsbuch.AbfertigungsNr = R1.AbfertigungsNr and Speditionsbuch.UnterNr = R1.SpeditionsbuchUnterNr " sqlstr &= " WHERE 1=1 AND R1.Firma_ID=24 " - sqlstr &= getRGWhere(MyComboBox3._value) + sqlstr &= getRGWhere(cboER_SR._value) sqlstr &= " and (SELECT COUNT(*) FROM Rechnungsausgang as R2 where" sqlstr &= " R1.FilialenNr=R2.FilialenNr and R1.AbfertigungsNr=R2.AbfertigungsNr and R1.SpeditionsbuchUnterNr=R2.SpeditionsbuchUnterNr AND (RechnungsKundenNr=3013401 OR RechnungsKundenNr = 3017683) and R2.[BelegartenNr]=71)=0" sqlstr &= " and Speditionsbuch.Abfertigungsart IN (1)" @@ -203,7 +203,7 @@ Public Class frmAbrechnungsMaske sqlstr &= " FROM Rechnungsausgang INNER JOIN Adressen ON AdressenNr=Rechnungsausgang.RechnungsKundenNr" sqlstr &= " WHERE 1=1 " - sqlstr &= getRGWhere(MyComboBox3._value) + sqlstr &= getRGWhere(cboER_SR._value) ' sqlstr &= " AND (SteuerpflichtigerGesamtbetrag<>0 OR SteuerfreierGesamtbetrag<>0)" sqlstr &= " ORDER BY FilialenNr, AbfertigungsNr, UnterNr " End If @@ -241,7 +241,7 @@ Public Class frmAbrechnungsMaske Function getRGWhere(filterSR) Dim sqlstr = "" Dim srchSB = "" ' "NÖBAUER ANJA" 'VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME - srchSB = MyComboBox2._value + srchSB = cboSachbearbeiter._value If cbxGutschriftenAnVerag.Checked AndAlso cboFirma._value <> "" AndAlso cboFirma._value = 24 Then Return sqlstr @@ -270,8 +270,8 @@ Public Class frmAbrechnungsMaske sqlstr &= IIf(filterSR = "MSR", " And ((Status = 0 or Status = 2) or DruckDatumZeit is null)", " And (Status = 0 or DruckDatumZeit is null) ") End If - If MyComboBox1._value <> "" Then - sqlstr &= " And Rechnungsdruck='" & MyComboBox1._value & "' " + If cboRechnungsdruck._value <> "" Then + sqlstr &= " And Rechnungsdruck='" & cboRechnungsdruck._value & "' " End If If srchSB <> "" Then sqlstr &= " And Rechnungsausgang.Sachbearbeiter='" & srchSB & "' " If cboFirma._value <> "" Then sqlstr &= " AND Rechnungsausgang.Firma_ID=" & cboFirma._value & " " @@ -283,7 +283,7 @@ Public Class frmAbrechnungsMaske ' sqlstr &= " AND (SteuerpflichtigerGesamtbetrag<>0 OR SteuerfreierGesamtbetrag<>0)" Return sqlstr End Function - Private Sub MyComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboFirma.SelectedIndexChanged, MyComboBox2.SelectedIndexChanged, MyComboBox3.SelectedIndexChanged, MyComboBox1.SelectedIndexChanged + Private Sub MyComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboFirma.SelectedIndexChanged, cboSachbearbeiter.SelectedIndexChanged, cboER_SR.SelectedIndexChanged, cboRechnungsdruck.SelectedIndexChanged If cboFirma._value = "24" Then @@ -293,12 +293,12 @@ Public Class frmAbrechnungsMaske cbxGutschriftenAnVerag.Checked = False End If - If sender Is MyComboBox3 Then + If sender Is cboER_SR Then - lblKunde.Visible = MyComboBox3._value = "MSR" - KdSearchBox1.Visible = MyComboBox3._value = "MSR" + lblKunde.Visible = cboER_SR._value = "MSR" + KdSearchBox1.Visible = cboER_SR._value = "MSR" - If KdSearchBox1.KdNr_value > 0 AndAlso MyComboBox3._value <> "MSR" Then + If KdSearchBox1.KdNr_value > 0 AndAlso cboER_SR._value <> "MSR" Then KdSearchBox1.KdNr_value = -1 End If diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.vb index f2e6a9d0..f9581656 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.vb @@ -178,10 +178,10 @@ dgvZusatzleistung.Rows.Add("", "", "Request corrected invoice", CDbl(25).ToString("C2")) dgvZusatzleistung.Rows.Add("", "380", "Invoice translation", CDbl(1.5).ToString("C2") & "/min") dgvZusatzleistung.Rows.Add("", "", "Neutralization / CMR Creation", CDbl(20).ToString("C2")) - dgvZusatzleistung.Rows.Add("", "348", "Additional costs foreign border", CDbl(20).ToString("C2")) + dgvZusatzleistung.Rows.Add("", "348", "Additional costs foreign border", CDbl(25).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "Customs inspection costs per 30 min.", CDbl(40).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "Additional costs vegetables, pharmaceuticals, food", "upon request") - dgvZusatzleistung.Rows.Add("", "348", "Notification costs (prepayment)", CDbl(24).ToString("C2")) + dgvZusatzleistung.Rows.Add("", "348", "Notification costs (prepayment)", CDbl(30).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "Cancellation costs", "50%") dgvZusatzleistung.Rows.Add("", "", "Surcharge return goods clearance/active processing", CDbl(20).ToString("C2")) @@ -201,11 +201,11 @@ dgvZusatzleistung.Rows.Add("", "380", "Invoice translation", CDbl(1.5).ToString("C2") & "/min") dgvZusatzleistung.Rows.Add("", "", "Transit T1", CDbl(15).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "Neutralization / CMR Creation", CDbl(15).ToString("C2")) - dgvZusatzleistung.Rows.Add("", "348", "Additional costs for foreign border", CDbl(20).ToString("C2")) + dgvZusatzleistung.Rows.Add("", "348", "Additional costs for foreign border", CDbl(25).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "Goods location clearance", CDbl(60).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "Customs inspection costs per 30 min.", CDbl(40).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "Additional costs for vegetables, pharmaceuticals, food", "upon request") - dgvZusatzleistung.Rows.Add("", "348", "Notification costs (prepayment)", CDbl(24).ToString("C2")) + dgvZusatzleistung.Rows.Add("", "348", "Notification costs (prepayment)", CDbl(30).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "Cancellation costs", "50%") Case "VZ_FISKAL" @@ -578,10 +578,10 @@ dgvZusatzleistung.Rows.Add("", "", "Korr. Rechnung anfordern", CDbl(25).ToString("C2")) dgvZusatzleistung.Rows.Add("", "380", "Übersetzung Rechnung", CDbl(1.5).ToString("C2") & "/min") dgvZusatzleistung.Rows.Add("", "", "Neutralisierung / CMR Erstellung", CDbl(20).ToString("C2")) - dgvZusatzleistung.Rows.Add("", "348", "Zusatzkosten fremde Grenze", CDbl(20).ToString("C2")) + dgvZusatzleistung.Rows.Add("", "348", "Zusatzkosten fremde Grenze", CDbl(25).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "Zollbeschaukosten je 30 min.", CDbl(40).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "Zusatzkosten Gemüse,Arznei,Lebensmittel", "nach Anfrage") - dgvZusatzleistung.Rows.Add("", "348", "Avisokosten (Vorkasse)", CDbl(24).ToString("C2")) + dgvZusatzleistung.Rows.Add("", "348", "Avisokosten (Vorkasse)", CDbl(30).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "Stornokosten", "50 %") dgvZusatzleistung.Rows.Add("", "", "Aufschlag Rückwarenverzollung/Aktive Veredelung", CDbl(100).ToString("C2")) @@ -606,11 +606,11 @@ ' dgvZusatzleistung.Rows.Add("", "", "CMR-Versendungsbeleg", CDbl(25).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "Ü-T1", CDbl(15).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "Neutralisierung / CMR Erstellung", CDbl(15).ToString("C2")) - dgvZusatzleistung.Rows.Add("", "348", "Zusatzkosten fremde Grenze", CDbl(20).ToString("C2")) + dgvZusatzleistung.Rows.Add("", "348", "Zusatzkosten fremde Grenze", CDbl(25).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "Warenort-Abfertigung", CDbl(60).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "Zollbeschaukosten je 30 min.", CDbl(40).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "Zusatzkosten Gemüse,Arznei,Lebensmittel", "nach Anfrage") - dgvZusatzleistung.Rows.Add("", "348", "Avisokosten (Vorkasse)", CDbl(24).ToString("C2")) + dgvZusatzleistung.Rows.Add("", "348", "Avisokosten (Vorkasse)", CDbl(30).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "Stornokosten", "50 %") 'dgvZusatzleistung.Rows.Add("", "", "Aufschlag Arzneiwaren oder Lebensmittel", CDbl(25).ToString("C2")) @@ -629,11 +629,11 @@ dgvZusatzleistung.Rows.Add("", "", "Korr. Rechnung anfordern", CDbl(25).ToString("C2")) dgvZusatzleistung.Rows.Add("", "380", "Übersetzung Rechnung", CDbl(1.5).ToString("C2") & "/min") dgvZusatzleistung.Rows.Add("", "", "Neutralisierung / CMR Erstellung", CDbl(15).ToString("C2")) - dgvZusatzleistung.Rows.Add("", "348", "Zusatzkosten fremde Grenze", CDbl(20).ToString("C2")) + dgvZusatzleistung.Rows.Add("", "348", "Zusatzkosten fremde Grenze", CDbl(25).ToString("C2")) ' dgvZusatzleistung.Rows.Add("", "", "Ü-T1", CDbl(15).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "Warenort-Abfertigung", CDbl(60).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "Zollbeschaukosten je 30 min.", CDbl(40).ToString("C2")) - dgvZusatzleistung.Rows.Add("", "348", "Avisokosten (Vorkasse)", CDbl(24).ToString("C2")) + dgvZusatzleistung.Rows.Add("", "348", "Avisokosten (Vorkasse)", CDbl(30).ToString("C2")) Case "VZ_FISKAL" @@ -651,11 +651,11 @@ dgvZusatzleistung.Rows.Add("", "", "Korr. Rechnung anfordern", CDbl(25).ToString("C2")) dgvZusatzleistung.Rows.Add("", "380", "Übersetzung Rechnung", CDbl(1.5).ToString("C2") & "/min") dgvZusatzleistung.Rows.Add("", "", "Ü-T1", CDbl(15).ToString("C2")) - dgvZusatzleistung.Rows.Add("", "348", "Zusatzkosten fremde Grenze", CDbl(20).ToString("C2")) + dgvZusatzleistung.Rows.Add("", "348", "Zusatzkosten fremde Grenze", CDbl(25).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "VERAG Warenort", CDbl(60).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "Zollbeschaukosten je 30 min.", CDbl(40).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "Neutralisierung / CMR Erstellung", CDbl(15).ToString("C2")) - dgvZusatzleistung.Rows.Add("", "348", "Avisokosten (Vorkasse)", CDbl(24).ToString("C2")) + dgvZusatzleistung.Rows.Add("", "348", "Avisokosten (Vorkasse)", CDbl(30).ToString("C2")) 'dgvZusatzleistung.Rows.Add("", "", "Aufschlag Arzneiwaren oder Lebensmittel", CDbl(25).ToString("C2")) ' cboFirma.changeItem("CS") @@ -678,10 +678,10 @@ ' dgvZusatzleistung.Rows.Add("", "", "CMR-Versendungsbeleg", CDbl(25).ToString("C2")) ' dgvZusatzleistung.Rows.Add("", "", "Ü-T1", CDbl(15).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "VERAG Warenort", CDbl(60).ToString("C2")) - dgvZusatzleistung.Rows.Add("", "348", "Zusatzkosten fremde Grenze", CDbl(20).ToString("C2")) + dgvZusatzleistung.Rows.Add("", "348", "Zusatzkosten fremde Grenze", CDbl(25).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "Neutralisierung / CMR Erstellung", CDbl(15).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "Zollbeschaukosten je 30 min.", CDbl(40).ToString("C2")) - dgvZusatzleistung.Rows.Add("", "348", "Avisokosten (Vorkasse)", CDbl(24).ToString("C2")) + dgvZusatzleistung.Rows.Add("", "348", "Avisokosten (Vorkasse)", CDbl(30).ToString("C2")) 'dgvZusatzleistung.Rows.Add("", "", "Aufschlag Arzneiwaren oder Lebensmittel", CDbl(25).ToString("C2")) ' cboFirma.changeItem("AG") @@ -702,7 +702,7 @@ dgvZusatzleistung.Rows.Add("", "", "Aufschlag Rückwarenverzollung/Aktive Veredelung", CDbl(100).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "Neutralisierung", CDbl(15).ToString("C2")) - dgvZusatzleistung.Rows.Add("", "348", "Avisokosten (Vorkasse)", CDbl(24).ToString("C2")) + dgvZusatzleistung.Rows.Add("", "348", "Avisokosten (Vorkasse)", CDbl(30).ToString("C2")) Case "VZ_SPECIAL_2" '"VZ Backwaren" DataGridView.Rows.Add(cnt, "", "Verzollung Lebensmittel Backwaren (inkl. 1 Tarifnummer)", CDbl(298).ToString("C2")) : cnt += 1 @@ -720,7 +720,7 @@ dgvZusatzleistung.Rows.Add("", "", "Aufschlag Rückwarenverzollung/Aktive Veredelung", CDbl(100).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "Neutralisierung", CDbl(15).ToString("C2")) - dgvZusatzleistung.Rows.Add("", "348", "Avisokosten (Vorkasse)", CDbl(24).ToString("C2")) + dgvZusatzleistung.Rows.Add("", "348", "Avisokosten (Vorkasse)", CDbl(30).ToString("C2")) Case "EUST" diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index 1b7e304f..ed894625 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -1161,12 +1161,9 @@ Public Class frmFormulare Dim Mail As Microsoft.Office.Interop.Outlook.MailItem Mail = outl.CreateItem(0) - MsgBox(VERAG_PROG_ALLGEMEIN.cProgramFunctions.printdefaultOutlookAccount(outl)) - + 'MsgBox(VERAG_PROG_ALLGEMEIN.cProgramFunctions.printdefaultOutlookAccount(outl)) 'Dim StandAcc = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getdefaultOutlookAccount(outl) - - Mail.SendUsingAccount = outl.Session.DefaultAccount - + 'Mail.SendUsingAccount = outl.Session.DefaultAccount If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then diff --git a/SDL/mdm/usrcntlFremdrechnungen.vb b/SDL/mdm/usrcntlFremdrechnungen.vb index b69827bd..e52f2d13 100644 --- a/SDL/mdm/usrcntlFremdrechnungen.vb +++ b/SDL/mdm/usrcntlFremdrechnungen.vb @@ -231,39 +231,39 @@ Public Class usrcntlFremdrechnungen Case 999 : SQL_STR = "SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahlTop, "") & "[rmc_reDatum] as Rechnungsdatum,[rmc_reNr] as Rechnungsnummer,rmc_kdNr as Kundennummer,[rmc_betragNetto] as Nettobetrag,[rmc_betragBrutto] as Bruttobetrag,[rmc_waehrung] as Währung ,[rmc_euroBrutto] as Brutto_EUR,[rmc_daId] as daId,[rmc_betragMWST] as MWST,rmc_landKZ as Land, cast(case when [rmc_daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM [VERAG].[dbo].[tblRMCImport] inner join Adressen on Adressen.WölflKundenNr = rmc_kdNr where 1 = 1 " & IIf(kdNr > 0, " AND AdressenNr=" & kdNr, "") & " and [rmc_reDatum] " & setSQLWhere(SDLNrTmp, "rmc_landKZ") & " order by rmc_reDatum desc, rmc_reNr" - Case -1 : Dim anzahl As Integer = anzahlTop / 6 : SQL_STR = "SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & + Case -1 : Dim anzahl As Integer = anzahlTop / 6 : SQL_STR = " select * from (SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " --IDS - 'IDS' as Lieferant, [YearMonthDay] as Rechnungsdatum,[Invoicenumber] as Rechnungsnummer,CustomerCode as Kundennummer,[AmminclVAT] as Bruttobetrag,[TotalNetAmount] as Nettobetrag,[VATAmount] as MWSt,'' as Land, 'RE' as Art,[daId], cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblIDSInvoicesNew WHERE [CustomerCode] = (SELECT TOP 1 [CustomerCode] FROM [VERAG].[dbo].[tbl_IDS_Kunden] WHERE 1 = 1 " & IIf(kdNr > 0, " AND [KdNrVERAG]=" & kdNr, "") & " ORDER BY Zeitstempel DESC) and [YearMonthDay] " & setSQLWhere(SDLNrTmp, "") & " --order by [YearMonthDay], [Invoicenumber] + 'IDS' as Lieferant, [YearMonthDay] as Rechnungsdatum,[Invoicenumber] as Rechnungsnummer,CustomerCode as Kundennummer,[AmminclVAT] as Bruttobetrag,[TotalNetAmount] as Nettobetrag,[VATAmount] as MWSt,'' as Land, 'RE' as Art,[daId], cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblIDSInvoicesNew WHERE [CustomerCode] = (SELECT TOP 1 [CustomerCode] FROM [VERAG].[dbo].[tbl_IDS_Kunden] WHERE 1 = 1 " & IIf(kdNr > 0, " AND [KdNrVERAG]=" & kdNr, "") & " ORDER BY Zeitstempel DESC) and [YearMonthDay] " & setSQLWhere(SDLNrTmp, "") & " order by [YearMonthDay], [Invoicenumber] UNION ALL --MSE - SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'MSE' as Lieferant, [invoice_date] as Rechnungsdatum, cast([invoice_id] as nvarchar) as Rechnungsnummer,[customer_number] as Kundennummer, [total_amount_euro] as Bruttobetrag ,(total_amount_euro - [total_vat_amount_euro]) as Nettobetrag ,[total_vat_amount_euro] as MWST,[country] as Land,'RE' as Art,daId, cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblMSEInvoices where customer_number = (select top 1 customer_id from tblMSECustomers where 1 = 1 " & IIf(kdNr > 0, " AND [partner_customer_number]=" & kdNr, "") & " and [invoice_date] " & setSQLWhere(SDLNrTmp, "country") & " ) --order by invoice_date, invoice_id + SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'MSE' as Lieferant, [invoice_date] as Rechnungsdatum, cast([invoice_id] as nvarchar) as Rechnungsnummer,[customer_number] as Kundennummer, [total_amount_euro] as Bruttobetrag ,(total_amount_euro - [total_vat_amount_euro]) as Nettobetrag ,[total_vat_amount_euro] as MWST,[country] as Land,'RE' as Art,daId, cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblMSEInvoices where customer_number = (select top 1 customer_id from tblMSECustomers where 1 = 1 " & IIf(kdNr > 0, " AND [partner_customer_number]=" & kdNr, "") & " and [invoice_date] " & setSQLWhere(SDLNrTmp, "country") & " ) order by invoice_date, invoice_id UNION ALL --UTA - SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'UTA' as Lieferant, [Rechnungsdatum],STR([Rechnungsnummer_pro_Lieferland]) as Rechnungsnummer,Kundennummer,SUM(Gesamtbetrag_Brutto_in_Darstellwährung) as Bruttobetrag,SUM(Gesamtbetrag_Netto_in_Darstellwährung) as Nettobetrag, SUM(Gesamtbetrag_Umsatzsteuer_in_Darstellwährung) as MWSt,[Lieferland_ISO2] as Land, 'RE' as Art,[daId], cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM [VERAG].[dbo].[tblUTAImportNew] inner join adressen on Kundennummer = UTAKundenNr where 1 = 1 " & IIf(kdNr > 0, " AND [AdressenNr]=" & kdNr, "") & " and [Rechnungsdatum] " & setSQLWhere(SDLNrTmp, "Lieferland_ISO2") & " group by [Rechnungsnummer_pro_Lieferland],[Rechnungsdatum],Kundennummer,[daId],[Lieferland_ISO2] UNION ALL SELECT 'UTA', [Datum], cast([RechnungsNr] as nvarchar) ,[KundenNr],0,0,0,'',[DocumentTyp],[daId], cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM [VERAG].[dbo].[tblUTADocuments] inner join adressen on KundenNr = UTAKundenNr where AdressenNr = " & kdNr & " AND Datum " & setSQLWhere(SDLNrTmp, "") & " + SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'UTA' as Lieferant, [Rechnungsdatum],STR([Rechnungsnummer_pro_Lieferland]) as Rechnungsnummer,Kundennummer,SUM(Gesamtbetrag_Brutto_in_Darstellwährung) as Bruttobetrag,SUM(Gesamtbetrag_Netto_in_Darstellwährung) as Nettobetrag, SUM(Gesamtbetrag_Umsatzsteuer_in_Darstellwährung) as MWSt,[Lieferland_ISO2] as Land, 'RE' as Art,[daId], cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM [VERAG].[dbo].[tblUTAImportNew] inner join adressen on Kundennummer = UTAKundenNr where 1 = 1 " & IIf(kdNr > 0, " AND [AdressenNr]=" & kdNr, "") & " and [Rechnungsdatum] " & setSQLWhere(SDLNrTmp, "Lieferland_ISO2") & " group by [Rechnungsnummer_pro_Lieferland],[Rechnungsdatum],Kundennummer,[daId],[Lieferland_ISO2] UNION ALL SELECT 'UTA', [Datum], cast([RechnungsNr] as nvarchar) ,[KundenNr],0,0,0,'',[DocumentTyp],[daId], cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM [VERAG].[dbo].[tblUTADocuments] inner join adressen on KundenNr = UTAKundenNr where AdressenNr = " & kdNr & " AND Datum " & setSQLWhere(SDLNrTmp, "") & " --order by Rechnungsnummer desc UNION ALL --VERAG - SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'VERAG' as Lieferant, tblTrdinInvoice.Rechnungsdatum, cast(tblTrdinInvoice.Rechnungsnummer as nvarchar) as Rechnungsnummer ,tblTrdinInvoice.KundenNrZentrale as Kundennummer, tblTrdinInvoice.SteuerpflichtigerBetragLokal + tblTrdinInvoice.SteuerfreierBetragLokal as Bruttobetrag ,tblTrdinInvoice.SteuerpflichtigerBetragLokal + tblTrdinInvoice.SteuerfreierBetragLokal - tblTrdinInvoice.SteuerbetragLokal as Nettobetrag ,tblTrdinInvoice.SteuerbetragLokal as MWST, 'AT' as Land, 'RE' as Art, 1 as daId, cast(1 as bit) PDFvorhanden FROM tblTrdinInvoice WHERE 1 = 1 " & IIf(kdNr > 0, " AND tblTrdinInvoice.RechnungsKundenNr=" & kdNr, "") & " and tblTrdinInvoice.Rechnungsdatum " & setSQLWhere(SDLNrTmp, "'AT'") & " AND tblTrdinInvoice.FilialenNr = 4814 -- ORDER BY tblTrdinInvoice.Rechnungsdatum, tblTrdinInvoice.Rechnungsnummer + SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'VERAG' as Lieferant, tblTrdinInvoice.Rechnungsdatum, cast(tblTrdinInvoice.Rechnungsnummer as nvarchar) as Rechnungsnummer ,tblTrdinInvoice.KundenNrZentrale as Kundennummer, tblTrdinInvoice.SteuerpflichtigerBetragLokal + tblTrdinInvoice.SteuerfreierBetragLokal as Bruttobetrag ,tblTrdinInvoice.SteuerpflichtigerBetragLokal + tblTrdinInvoice.SteuerfreierBetragLokal - tblTrdinInvoice.SteuerbetragLokal as Nettobetrag ,tblTrdinInvoice.SteuerbetragLokal as MWST, 'AT' as Land, 'RE' as Art, 1 as daId, cast(1 as bit) PDFvorhanden FROM tblTrdinInvoice WHERE 1 = 1 " & IIf(kdNr > 0, " AND tblTrdinInvoice.RechnungsKundenNr=" & kdNr, "") & " and tblTrdinInvoice.Rechnungsdatum " & setSQLWhere(SDLNrTmp, "'AT'") & " AND tblTrdinInvoice.FilialenNr = 4814 ORDER BY tblTrdinInvoice.Rechnungsdatum, tblTrdinInvoice.Rechnungsnummer UNION ALL --PLOSE - SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'PLOSE' as Lieferant, [plInv_SupplierRechnungsDatum] as Rechnungsdatum, cast([plInv_SupplierRechnungsNr] as nvarchar) as Rechnungsnummer,[plInv_PLOSEKundennummer] as Kundennummer,[plInv_Bruttobetrag] as Bruttobetrag,[plInv_Nettobetrag] as Nettobetrag,[plInv_MWSTBetrag] as MWST, [plInv_SupplierCountry] as Land, 'RE' as Art,[plInv_daId] as daId, cast(case when [plInv_daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblPLOSE_Inv_Data inner join Adressen on Adressen.PLOSEKundenNr = plInv_PLOSEKundennummer where 1 = 1 " & IIf(kdNr > 0, " AND Adressen.AdressenNr=" & kdNr, "") & " and [plInv_SupplierRechnungsDatum] " & setSQLWhere(SDLNrTmp, "plInv_SupplierCountry") & " + SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'PLOSE' as Lieferant, [plInv_SupplierRechnungsDatum] as Rechnungsdatum, cast([plInv_SupplierRechnungsNr] as nvarchar) as Rechnungsnummer,[plInv_PLOSEKundennummer] as Kundennummer,[plInv_Bruttobetrag] as Bruttobetrag,[plInv_Nettobetrag] as Nettobetrag,[plInv_MWSTBetrag] as MWST, [plInv_SupplierCountry] as Land, 'RE' as Art,[plInv_daId] as daId, cast(case when [plInv_daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblPLOSE_Inv_Data inner join Adressen on Adressen.PLOSEKundenNr = plInv_PLOSEKundennummer where 1 = 1 " & IIf(kdNr > 0, " AND Adressen.AdressenNr=" & kdNr, "") & " and [plInv_SupplierRechnungsDatum] " & setSQLWhere(SDLNrTmp, "plInv_SupplierCountry") & " Order by plInv_SupplierRechnungsDatum desc, [plInv_SupplierRechnungsNr] UNION ALL --RMC - SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'RMC' as Lieferant, [rmc_reDatum] as Rechnungsdatum,cast([rmc_reNr] as nvarchar) as Rechnungsnummer,rmc_kdNr as Kundennummer ,[rmc_betragBrutto] as Bruttobetrag,[rmc_betragNetto] as Nettobetrag,[rmc_betragMWST] as MWST, rmc_landKZ as Land, 'RE' as Art, [rmc_daId] as daId, cast(case when [rmc_daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM [VERAG].[dbo].[tblRMCImport] inner join Adressen on Adressen.WölflKundenNr = rmc_kdNr where 1 = 1 " & IIf(kdNr > 0, " AND AdressenNr=" & kdNr, "") & " and [rmc_reDatum] " & setSQLWhere(SDLNrTmp, "rmc_landKZ") & " --order by rmc_reDatum, rmc_reNr + SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'RMC' as Lieferant, [rmc_reDatum] as Rechnungsdatum,cast([rmc_reNr] as nvarchar) as Rechnungsnummer,rmc_kdNr as Kundennummer ,[rmc_betragBrutto] as Bruttobetrag,[rmc_betragNetto] as Nettobetrag,[rmc_betragMWST] as MWST, rmc_landKZ as Land, 'RE' as Art, [rmc_daId] as daId, cast(case when [rmc_daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM [VERAG].[dbo].[tblRMCImport] inner join Adressen on Adressen.WölflKundenNr = rmc_kdNr where 1 = 1 " & IIf(kdNr > 0, " AND AdressenNr=" & kdNr, "") & " and [rmc_reDatum] " & setSQLWhere(SDLNrTmp, "rmc_landKZ") & " order by rmc_reDatum, rmc_reNr - order by Rechnungsdatum desc" + ) as temp order by Rechnungsdatum desc" diff --git a/SDL/seriendruck/usrCntlFakturierung.vb b/SDL/seriendruck/usrCntlFakturierung.vb index c77f3d7f..4260b852 100644 --- a/SDL/seriendruck/usrCntlFakturierung.vb +++ b/SDL/seriendruck/usrCntlFakturierung.vb @@ -114,7 +114,7 @@ Public Class usrcntlFakturierung If rechnungenMitGesamtmautanhant <> "" Then - If vbYes = MsgBox("Möchten Sie die " & rechnungenMitGesamtmautanhant & " Gesamtmautberichte (PDF und CSV) aus den Rechnungen vom entfernen?" & vbNewLine & "Die Mautberichte können erneut über 'Durchfüren' and die Rechnung gehängt werden." & vbNewLine & "Nur bei Rechnungen mit Status 0 möglich!", vbYesNoCancel) Then + If vbYes = MsgBox("Möchten Sie die " & rechnungenMitGesamtmautanhant & " Gesamtmautberichte (PDF und CSV) aus den Rechnungen vom entfernen?" & vbNewLine & "Die Mautberichte können erneut über 'Durchführen' and die Rechnung gehängt werden." & vbNewLine & "Nur bei Rechnungen mit Status 0 möglich!", vbYesNoCancel) Then deleted = (New SQL).doSQL("delete from RechnungsausgangAnhaenge where RechnungsausgangAnhaenge.RK_ID IN (SELECT Rechnungsausgang.RK_ID FROM Rechnungsausgang