diff --git a/SDL/Reports/Zoll/rptKontrolleLKW_NCTSTR.vb b/SDL/Reports/Zoll/rptKontrolleLKW_NCTSTR.vb index e62250e8..7d26150c 100644 --- a/SDL/Reports/Zoll/rptKontrolleLKW_NCTSTR.vb +++ b/SDL/Reports/Zoll/rptKontrolleLKW_NCTSTR.vb @@ -11,7 +11,7 @@ Public Class rptKontrolleLKW_NCTSTR Dim kundenSQL As New kundenSQL Dim SUB_DATA As DataTable = Nothing Dim LIST_NCTSABR As VERAG_PROG_ALLGEMEIN.cAbrechnung_NCTSBrg_LIST = Nothing - 'Public brg As String = "05DE0000000009345," 'default brg + Public GRN As String = "" '"05DE0000000009345," 'default brg Public erstelltVon As String = "" Dim groupKz = True 'Es kann nach Kennzeichen groupiert werden @@ -87,7 +87,11 @@ Public Class rptKontrolleLKW_NCTSTR Dim sqlStr As String = " SELECT " & If(Not groupKz, " ncts_id, ", "") & " isnull(ncts_Befoerderungsmittel_KennzeichenAbgang,'') as Kennzeichen, cast(ncts_Eroeffnung as date) as AnmeldungsDatum,COUNT(*) ,isnull(SUM(nctsSA_AbgabenBetrag),0) as GarantieWert,isnull(SUM(ncts_VERAG_WeiterverrechungSatz),0) ncts_VERAG_WeiterverrechungSatz FROM tblNCTS_TR_Sicherheitsangaben inner join tblNCTS_TR on ncts_Id = nctsSA_NctsId " sqlStr &= " WHERE cast (ncts_Eroeffnung as date) BETWEEN '" & datVon.ToShortDateString & "' AND '" & datBis.ToShortDateString & "'" - sqlStr &= " AND nctsSA_GRN IN ( '" & brg_AT & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "' ) " + If GRN <> "" Then + sqlStr &= " AND nctsSA_GRN IN ( '" & GRN & "' ) " + Else + sqlStr &= " AND nctsSA_GRN IN ( '" & brg_AT & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "' ) " + End If sqlStr &= " AND ncts_status BETWEEN 50 AND 60 " 'sqlStr &= " AND ncts_status BETWEEN 50 AND 80 " sqlStr &= firmaStr @@ -100,7 +104,11 @@ Public Class rptKontrolleLKW_NCTSTR Dim sqlStrSUB As String = " SELECT *, isnull(nctsSA_AbgabenBetrag,0) as GarantieWert,isnull(ncts_Befoerderungsmittel_KennzeichenAbgang,'') as Kennzeichen,cast(ncts_Eroeffnung as date) as AnmeldungsDatum,cast(ncts_Ankunft as date) as ncts_Ankunft,cast(ncts_Erledigung as date) as ncts_Erledigung,ncts_VERAG_WeiterverrechungSatz FROM tblNCTS_TR_Sicherheitsangaben inner join tblNCTS_TR on ncts_Id = nctsSA_NctsId " sqlStrSUB &= " WHERE cast(ncts_Eroeffnung as date) BETWEEN '" & datVon.ToShortDateString & "' AND '" & datBis.ToShortDateString & "'" - sqlStrSUB &= " AND nctsSA_GRN IN ( '" & brg_AT & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "' ) " + If GRN <> "" Then + sqlStr &= " AND nctsSA_GRN IN ( '" & GRN & "' ) " + Else + sqlStr &= " AND nctsSA_GRN IN ( '" & brg_AT & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "' ) " + End If sqlStrSUB &= " AND ncts_status BETWEEN 50 AND 60 " 'sqlStrSUB &= " AND ncts_status BETWEEN 50 AND 80 " sqlStrSUB &= firmaStr diff --git a/SDL/Reports/frmPrintLayout.vb b/SDL/Reports/frmPrintLayout.vb index 47244f7b..d72460db 100644 --- a/SDL/Reports/frmPrintLayout.vb +++ b/SDL/Reports/frmPrintLayout.vb @@ -156,12 +156,13 @@ Public Class frmPrintLayout Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous End Sub - Public Sub AuswertungKontrolleLKW_NCTSTR(datvon, datbis, FIRMA) + Public Sub AuswertungKontrolleLKW_NCTSTR(datvon, datbis, FIRMA, GRN) Me.Text = "Auswertung LKWs" Dim report As rptKontrolleLKW_NCTSTR = New rptKontrolleLKW_NCTSTR report.datVon = datvon report.datBis = datbis report.FIRMA = FIRMA + report.GRN = GRN report.erstelltVon = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME Viewer.LoadDocument(report) Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous diff --git a/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb b/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb index 2c2a5687..acca2965 100644 --- a/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb +++ b/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb @@ -130,9 +130,7 @@ Partial Class frmKundenUebersichtZOLL Me.AnDakosyÜbertragenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AufschubEORIBearbeitenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SYSKAÜbertragToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.mneBearbeiten = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripMenuItem11 = New System.Windows.Forms.ToolStripMenuItem() Me.pnlTop = New System.Windows.Forms.Panel() Me.cbx = New System.Windows.Forms.CheckBox() Me.lblAbfertigungsverbot = New System.Windows.Forms.Label() @@ -149,6 +147,7 @@ Partial Class frmKundenUebersichtZOLL Me.PDFLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.mneBearbeiten = New System.Windows.Forms.ToolStripMenuItem() Me.ContextMenuStrip1.SuspendLayout() Me.tabZolltarife.SuspendLayout() Me.tabKundendaten.SuspendLayout() @@ -1006,7 +1005,7 @@ Partial Class frmKundenUebersichtZOLL Me.MenuStripKunden.Dock = System.Windows.Forms.DockStyle.Left Me.MenuStripKunden.ImageScalingSize = New System.Drawing.Size(24, 24) Me.MenuStripKunden.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.MenuStripKunden.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnueKunden, Me.mnueZoll, Me.mnueOfferte, Me.mnueRechnungen, Me.mnueSpeditionsbuch, Me.mnueStatistik, Me.mneFormulare, Me.mnueFiskaluebersicht, Me.mnueFiskal, Me.toolNeuerKunde, Me.toolOptionen, Me.mneBearbeiten, Me.ToolStripMenuItem1, Me.ToolStripMenuItem11}) + Me.MenuStripKunden.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnueKunden, Me.mnueZoll, Me.mnueOfferte, Me.mnueRechnungen, Me.mnueSpeditionsbuch, Me.mnueStatistik, Me.mneFormulare, Me.mnueFiskaluebersicht, Me.mnueFiskal, Me.toolNeuerKunde, Me.toolOptionen, Me.mneBearbeiten, Me.ToolStripMenuItem1}) Me.MenuStripKunden.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow Me.MenuStripKunden.Location = New System.Drawing.Point(0, 0) Me.MenuStripKunden.Name = "MenuStripKunden" @@ -1022,7 +1021,6 @@ Partial Class frmKundenUebersichtZOLL Me.mnueKunden.Image = Global.SDL.My.Resources.Resources.kunden Me.mnueKunden.ImageAlign = System.Drawing.ContentAlignment.TopCenter Me.mnueKunden.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None - Me.mnueKunden.Margin = New System.Windows.Forms.Padding(0, 15, 0, 0) Me.mnueKunden.Name = "mnueKunden" Me.mnueKunden.Padding = New System.Windows.Forms.Padding(4, 0, 4, 5) Me.mnueKunden.Size = New System.Drawing.Size(107, 69) @@ -1038,7 +1036,7 @@ Partial Class frmKundenUebersichtZOLL Me.mnueZoll.Image = Global.SDL.My.Resources.Resources.zoll Me.mnueZoll.ImageAlign = System.Drawing.ContentAlignment.TopCenter Me.mnueZoll.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None - Me.mnueZoll.Margin = New System.Windows.Forms.Padding(0, 15, 0, 0) + Me.mnueZoll.Margin = New System.Windows.Forms.Padding(0, 5, 0, 0) Me.mnueZoll.Name = "mnueZoll" Me.mnueZoll.Padding = New System.Windows.Forms.Padding(0, 0, 0, 5) Me.mnueZoll.Size = New System.Drawing.Size(107, 64) @@ -1053,7 +1051,7 @@ Partial Class frmKundenUebersichtZOLL Me.mnueOfferte.Image = Global.SDL.My.Resources.Resources.checklist Me.mnueOfferte.ImageAlign = System.Drawing.ContentAlignment.TopCenter Me.mnueOfferte.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None - Me.mnueOfferte.Margin = New System.Windows.Forms.Padding(0, 15, 0, 0) + Me.mnueOfferte.Margin = New System.Windows.Forms.Padding(0, 5, 0, 0) Me.mnueOfferte.Name = "mnueOfferte" Me.mnueOfferte.Padding = New System.Windows.Forms.Padding(4, 0, 4, 15) Me.mnueOfferte.Size = New System.Drawing.Size(107, 64) @@ -1068,7 +1066,7 @@ Partial Class frmKundenUebersichtZOLL Me.mnueRechnungen.ForeColor = System.Drawing.Color.White Me.mnueRechnungen.Image = Global.SDL.My.Resources.Resources.rechnung1 Me.mnueRechnungen.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None - Me.mnueRechnungen.Margin = New System.Windows.Forms.Padding(0, 0, 0, 5) + Me.mnueRechnungen.Margin = New System.Windows.Forms.Padding(0, 0, 0, 2) Me.mnueRechnungen.Name = "mnueRechnungen" Me.mnueRechnungen.Padding = New System.Windows.Forms.Padding(4, 0, 4, 10) Me.mnueRechnungen.Size = New System.Drawing.Size(107, 61) @@ -1082,7 +1080,6 @@ Partial Class frmKundenUebersichtZOLL Me.mnueSpeditionsbuch.ForeColor = System.Drawing.Color.White Me.mnueSpeditionsbuch.Image = Global.SDL.My.Resources.Resources.spedbuch1 Me.mnueSpeditionsbuch.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None - Me.mnueSpeditionsbuch.Margin = New System.Windows.Forms.Padding(0, 0, 0, 5) Me.mnueSpeditionsbuch.Name = "mnueSpeditionsbuch" Me.mnueSpeditionsbuch.Padding = New System.Windows.Forms.Padding(4, 10, 4, 10) Me.mnueSpeditionsbuch.Size = New System.Drawing.Size(107, 79) @@ -1114,7 +1111,7 @@ Partial Class frmKundenUebersichtZOLL Me.mneFormulare.Image = Global.SDL.My.Resources.Resources.report Me.mneFormulare.ImageAlign = System.Drawing.ContentAlignment.TopCenter Me.mneFormulare.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None - Me.mneFormulare.Margin = New System.Windows.Forms.Padding(0, 10, 0, 0) + Me.mneFormulare.Margin = New System.Windows.Forms.Padding(0, 5, 0, 0) Me.mneFormulare.Name = "mneFormulare" Me.mneFormulare.Size = New System.Drawing.Size(107, 64) Me.mneFormulare.Text = "Formulare" @@ -1226,7 +1223,6 @@ Partial Class frmKundenUebersichtZOLL Me.mnueFiskaluebersicht.Image = Global.SDL.My.Resources.Resources.bh Me.mnueFiskaluebersicht.ImageAlign = System.Drawing.ContentAlignment.TopCenter Me.mnueFiskaluebersicht.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None - Me.mnueFiskaluebersicht.Margin = New System.Windows.Forms.Padding(0, 10, 0, 0) Me.mnueFiskaluebersicht.Name = "mnueFiskaluebersicht" Me.mnueFiskaluebersicht.Size = New System.Drawing.Size(107, 64) Me.mnueFiskaluebersicht.Text = "Fiskal-Analyse" @@ -1238,7 +1234,7 @@ Partial Class frmKundenUebersichtZOLL ' Me.mnueFiskal.Enabled = False Me.mnueFiskal.ForeColor = System.Drawing.Color.White - Me.mnueFiskal.Margin = New System.Windows.Forms.Padding(0, 20, 0, 0) + Me.mnueFiskal.Margin = New System.Windows.Forms.Padding(0, 10, 0, 0) Me.mnueFiskal.Name = "mnueFiskal" Me.mnueFiskal.Size = New System.Drawing.Size(107, 19) Me.mnueFiskal.Text = "Fiskal" @@ -1250,7 +1246,7 @@ Partial Class frmKundenUebersichtZOLL Me.toolNeuerKunde.Image = Global.SDL.My.Resources.Resources.plus Me.toolNeuerKunde.ImageAlign = System.Drawing.ContentAlignment.TopCenter Me.toolNeuerKunde.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None - Me.toolNeuerKunde.Margin = New System.Windows.Forms.Padding(0, 20, 0, 0) + Me.toolNeuerKunde.Margin = New System.Windows.Forms.Padding(0, 15, 0, 0) Me.toolNeuerKunde.Name = "toolNeuerKunde" Me.toolNeuerKunde.Size = New System.Drawing.Size(107, 47) Me.toolNeuerKunde.Text = "Neuer Kunde" @@ -1291,39 +1287,11 @@ Partial Class frmKundenUebersichtZOLL Me.SYSKAÜbertragToolStripMenuItem.Size = New System.Drawing.Size(217, 22) Me.SYSKAÜbertragToolStripMenuItem.Text = "SYSKA übertragen" ' - 'mneBearbeiten - ' - Me.mneBearbeiten.Enabled = False - Me.mneBearbeiten.ForeColor = System.Drawing.Color.White - Me.mneBearbeiten.Image = Global.SDL.My.Resources.Resources.stift1 - Me.mneBearbeiten.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.mneBearbeiten.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None - Me.mneBearbeiten.Margin = New System.Windows.Forms.Padding(0, 20, 0, 0) - Me.mneBearbeiten.Name = "mneBearbeiten" - Me.mneBearbeiten.Size = New System.Drawing.Size(107, 44) - Me.mneBearbeiten.Text = "Bearbeiten" - Me.mneBearbeiten.TextAlign = System.Drawing.ContentAlignment.BottomCenter - Me.mneBearbeiten.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText - ' 'ToolStripMenuItem1 ' Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1" Me.ToolStripMenuItem1.Size = New System.Drawing.Size(107, 4) ' - 'ToolStripMenuItem11 - ' - Me.ToolStripMenuItem11.Enabled = False - Me.ToolStripMenuItem11.ForeColor = System.Drawing.Color.White - Me.ToolStripMenuItem11.Image = Global.SDL.My.Resources.Resources.stift1 - Me.ToolStripMenuItem11.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.ToolStripMenuItem11.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None - Me.ToolStripMenuItem11.Margin = New System.Windows.Forms.Padding(0, 60, 0, 0) - Me.ToolStripMenuItem11.Name = "ToolStripMenuItem11" - Me.ToolStripMenuItem11.Size = New System.Drawing.Size(107, 44) - Me.ToolStripMenuItem11.Text = "Bearbeiten" - Me.ToolStripMenuItem11.TextAlign = System.Drawing.ContentAlignment.BottomCenter - Me.ToolStripMenuItem11.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText - ' 'pnlTop ' Me.pnlTop.Controls.Add(Me.cbx) @@ -1486,6 +1454,20 @@ Partial Class frmKundenUebersichtZOLL Me.DataGridViewTextBoxColumn2.HeaderText = "KundenNr" Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" ' + 'mneBearbeiten + ' + Me.mneBearbeiten.Enabled = False + Me.mneBearbeiten.ForeColor = System.Drawing.Color.White + Me.mneBearbeiten.Image = Global.SDL.My.Resources.Resources.stift1 + Me.mneBearbeiten.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.mneBearbeiten.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None + Me.mneBearbeiten.Margin = New System.Windows.Forms.Padding(0, 5, 0, 0) + Me.mneBearbeiten.Name = "mneBearbeiten" + Me.mneBearbeiten.Size = New System.Drawing.Size(107, 44) + Me.mneBearbeiten.Text = "Bearbeiten" + Me.mneBearbeiten.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.mneBearbeiten.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText + ' 'frmKundenUebersichtZOLL ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1635,7 +1617,6 @@ Partial Class frmKundenUebersichtZOLL Friend WithEvents UsrCntlOfferte1 As usrCntlOfferte Friend WithEvents ContextMenuStrip3 As ContextMenuStrip Friend WithEvents ToolStripMenuItem3 As ToolStripMenuItem - Friend WithEvents mneBearbeiten As ToolStripMenuItem Friend WithEvents HochladenToolStripMenuItem As ToolStripMenuItem Friend WithEvents ScannenToolStripMenuItem As ToolStripMenuItem Friend WithEvents ÄndernToolStripMenuItem As ToolStripMenuItem @@ -1646,7 +1627,6 @@ Partial Class frmKundenUebersichtZOLL Friend WithEvents Button1 As Button Friend WithEvents cbx As CheckBox Friend WithEvents toolNeuerKunde As ToolStripMenuItem - Friend WithEvents ToolStripMenuItem11 As ToolStripMenuItem Friend WithEvents cboKundenblattFirma As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents SYSKAÜbertragToolStripMenuItem As ToolStripMenuItem Friend WithEvents btnRgPdf As Button @@ -1655,4 +1635,5 @@ Partial Class frmKundenUebersichtZOLL Friend WithEvents mnueFiskaluebersicht As ToolStripMenuItem Friend WithEvents tbFiskaluebersicht As TabPage Friend WithEvents UsrcntlFiskaluebersicht1 As usrcntlFiskaluebersicht + Friend WithEvents mneBearbeiten As ToolStripMenuItem End Class diff --git a/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb b/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb index bdd104e5..5631f967 100644 --- a/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb +++ b/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb @@ -141,6 +141,7 @@ Partial Class usrCntlZOLLAuswertungen Me.Label87 = New System.Windows.Forms.Label() Me.Label76 = New System.Windows.Forms.Label() Me.GroupBox11 = New System.Windows.Forms.GroupBox() + Me.Button22 = New System.Windows.Forms.Button() Me.Button19 = New System.Windows.Forms.Button() Me.Button18 = New System.Windows.Forms.Button() Me.PictureBox10 = New System.Windows.Forms.PictureBox() @@ -251,7 +252,8 @@ Partial Class usrCntlZOLLAuswertungen Me.Button14 = New System.Windows.Forms.Button() Me.PictureBox8 = New System.Windows.Forms.PictureBox() Me.pnl = New System.Windows.Forms.Panel() - Me.Button22 = New System.Windows.Forms.Button() + Me.Label94 = New System.Windows.Forms.Label() + Me.cboBRG_Verimex = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.GroupBox1.SuspendLayout() Me.GroupBox2.SuspendLayout() CType(Me.picDurmaz, System.ComponentModel.ISupportInitialize).BeginInit() @@ -1238,7 +1240,7 @@ Partial Class usrCntlZOLLAuswertungen Me.tbcntr.Location = New System.Drawing.Point(0, 57) Me.tbcntr.Name = "tbcntr" Me.tbcntr.SelectedIndex = 0 - Me.tbcntr.Size = New System.Drawing.Size(711, 1829) + Me.tbcntr.Size = New System.Drawing.Size(694, 1829) Me.tbcntr.TabIndex = 22 ' 'TabPage1 @@ -1281,7 +1283,7 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage1.Location = New System.Drawing.Point(4, 22) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(703, 1803) + Me.TabPage1.Size = New System.Drawing.Size(686, 1803) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Bürgschaften" Me.TabPage1.UseVisualStyleBackColor = True @@ -1575,6 +1577,8 @@ Partial Class usrCntlZOLLAuswertungen ' 'GroupBox11 ' + Me.GroupBox11.Controls.Add(Me.Label94) + Me.GroupBox11.Controls.Add(Me.cboBRG_Verimex) Me.GroupBox11.Controls.Add(Me.Button22) Me.GroupBox11.Controls.Add(Me.Button19) Me.GroupBox11.Controls.Add(Me.Button18) @@ -1594,6 +1598,17 @@ Partial Class usrCntlZOLLAuswertungen Me.GroupBox11.TabIndex = 32 Me.GroupBox11.TabStop = False ' + 'Button22 + ' + Me.Button22.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button22.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button22.Location = New System.Drawing.Point(6, 95) + Me.Button22.Name = "Button22" + Me.Button22.Size = New System.Drawing.Size(121, 37) + Me.Button22.TabIndex = 16 + Me.Button22.Text = "Auswertung starten" & Global.Microsoft.VisualBasic.ChrW(10) & "(ATEZ)" + Me.Button22.UseVisualStyleBackColor = True + ' 'Button19 ' Me.Button19.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -2410,7 +2425,7 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage2.Location = New System.Drawing.Point(4, 22) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(720, 1803) + Me.TabPage2.Size = New System.Drawing.Size(703, 1803) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Kunden" Me.TabPage2.UseVisualStyleBackColor = True @@ -2441,7 +2456,7 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage3.Location = New System.Drawing.Point(4, 22) Me.TabPage3.Name = "TabPage3" Me.TabPage3.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage3.Size = New System.Drawing.Size(720, 1803) + Me.TabPage3.Size = New System.Drawing.Size(703, 1803) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "Fiskalvertretung / EV-Veranlagung" Me.TabPage3.UseVisualStyleBackColor = True @@ -2476,7 +2491,7 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage4.Controls.Add(Me.UsrCntlAuswertungenAufschub_Abgabenliste1) Me.TabPage4.Location = New System.Drawing.Point(4, 22) Me.TabPage4.Name = "TabPage4" - Me.TabPage4.Size = New System.Drawing.Size(720, 1803) + Me.TabPage4.Size = New System.Drawing.Size(703, 1803) Me.TabPage4.TabIndex = 3 Me.TabPage4.Text = "Aufschubdaten" Me.TabPage4.UseVisualStyleBackColor = True @@ -2505,7 +2520,7 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage5.Location = New System.Drawing.Point(4, 22) Me.TabPage5.Name = "TabPage5" Me.TabPage5.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage5.Size = New System.Drawing.Size(720, 1803) + Me.TabPage5.Size = New System.Drawing.Size(703, 1803) Me.TabPage5.TabIndex = 4 Me.TabPage5.Text = "UNISPED" Me.TabPage5.UseVisualStyleBackColor = True @@ -2713,19 +2728,27 @@ Partial Class usrCntlZOLLAuswertungen Me.pnl.Dock = System.Windows.Forms.DockStyle.Top Me.pnl.Location = New System.Drawing.Point(0, 0) Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(711, 57) + Me.pnl.Size = New System.Drawing.Size(694, 57) Me.pnl.TabIndex = 23 ' - 'Button22 + 'Label94 ' - Me.Button22.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button22.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button22.Location = New System.Drawing.Point(6, 95) - Me.Button22.Name = "Button22" - Me.Button22.Size = New System.Drawing.Size(121, 37) - Me.Button22.TabIndex = 16 - Me.Button22.Text = "Auswertung starten" & Global.Microsoft.VisualBasic.ChrW(10) & "(ATEZ)" - Me.Button22.UseVisualStyleBackColor = True + Me.Label94.AutoSize = True + Me.Label94.Location = New System.Drawing.Point(181, 106) + Me.Label94.Name = "Label94" + Me.Label94.Size = New System.Drawing.Size(167, 13) + Me.Label94.TabIndex = 18 + Me.Label94.Text = "Bürgschaft (keine Auswahl = alle):" + ' + 'cboBRG_Verimex + ' + Me.cboBRG_Verimex.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboBRG_Verimex.DropDownWidth = 350 + Me.cboBRG_Verimex.FormattingEnabled = True + Me.cboBRG_Verimex.Location = New System.Drawing.Point(184, 120) + Me.cboBRG_Verimex.Name = "cboBRG_Verimex" + Me.cboBRG_Verimex.Size = New System.Drawing.Size(221, 21) + Me.cboBRG_Verimex.TabIndex = 17 ' 'usrCntlZOLLAuswertungen ' @@ -2736,7 +2759,7 @@ Partial Class usrCntlZOLLAuswertungen Me.Controls.Add(Me.tbcntr) Me.Controls.Add(Me.pnl) Me.Name = "usrCntlZOLLAuswertungen" - Me.Size = New System.Drawing.Size(711, 1445) + Me.Size = New System.Drawing.Size(694, 1445) Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() Me.GroupBox2.ResumeLayout(False) @@ -3028,4 +3051,6 @@ Partial Class usrCntlZOLLAuswertungen Friend WithEvents datAuswertVon_NCTSTR_UNISPED As DateTimePicker Friend WithEvents Label87 As Label Friend WithEvents Button22 As Button + Friend WithEvents Label94 As Label + Friend WithEvents cboBRG_Verimex As VERAG_PROG_ALLGEMEIN.MyComboBox End Class diff --git a/SDL/zoll/usrCntlZOLLAuswertungen.vb b/SDL/zoll/usrCntlZOLLAuswertungen.vb index 8a26c7a5..fed34155 100644 --- a/SDL/zoll/usrCntlZOLLAuswertungen.vb +++ b/SDL/zoll/usrCntlZOLLAuswertungen.vb @@ -124,6 +124,16 @@ Public Class usrCntlZOLLAuswertungen cboEZOLLBrg.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("20AT520000G000092 - AT Brg ATILLA", "20AT520000G000092")) cboEZOLLBrg.SelectedIndex = 1 + + cboBRG_Verimex.Items.Clear() + cboBRG_Verimex.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", "")) + cboBRG_Verimex.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("17DE0000000071678 - DE Brg (NEU)", "17DE0000000071678")) + cboBRG_Verimex.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("05DE0000000009345 - DE Brg", "05DE0000000009345")) + cboBRG_Verimex.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("05AT510000G000FP7 - AT Brg", "05AT510000G000FP7")) + cboBRG_Verimex.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("16AT520000G000VA6 - AT Brg IMEX", "16AT520000G000VA6")) + cboBRG_Verimex.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("20AT520000G000092 - AT Brg ATILLA", "20AT520000G000092")) + cboBRG_Verimex.SelectedIndex = 1 + cboUnispedBrgDy.Items.Clear() cboUnispedBrgDy.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", "")) cboUnispedBrgDy.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("05AT500000G000EU9 - AT Brg UNISPED", "05AT500000G000EU9 ")) @@ -716,13 +726,13 @@ Public Class usrCntlZOLLAuswertungen Private Sub Button18_Click(sender As Object, e As EventArgs) Handles Button18.Click Dim frmPrintLayout As New frmPrintLayout() - frmPrintLayout.AuswertungKontrolleLKW_NCTSTR(datAuswertVon_NCTSTR.Text, datAuswertBis_NCTSTR.Text, "VERIMEX_OREGON") + frmPrintLayout.AuswertungKontrolleLKW_NCTSTR(datAuswertVon_NCTSTR.Text, datAuswertBis_NCTSTR.Text, "VERIMEX_OREGON", cboBRG_Verimex._value) frmPrintLayout.Show() End Sub Private Sub Button19_Click(sender As Object, e As EventArgs) Handles Button19.Click Dim frmPrintLayout As New frmPrintLayout() - frmPrintLayout.AuswertungKontrolleLKW_NCTSTR(datAuswertVon_NCTSTR.Text, datAuswertBis_NCTSTR.Text, "VERIMEX_MAVI") + frmPrintLayout.AuswertungKontrolleLKW_NCTSTR(datAuswertVon_NCTSTR.Text, datAuswertBis_NCTSTR.Text, "VERIMEX_MAVI", cboBRG_Verimex._value) frmPrintLayout.Show() End Sub @@ -755,19 +765,19 @@ Public Class usrCntlZOLLAuswertungen Private Sub Button25_Click(sender As Object, e As EventArgs) Handles Button25.Click Dim frmPrintLayout As New frmPrintLayout() - frmPrintLayout.AuswertungKontrolleLKW_NCTSTR(datAuswertVon_NCTSTR_AWOR.Text, datAuswertBis_NCTSTR_AWOR.Text, "MIC_AWOR") + frmPrintLayout.AuswertungKontrolleLKW_NCTSTR(datAuswertVon_NCTSTR_AWOR.Text, datAuswertBis_NCTSTR_AWOR.Text, "MIC_AWOR", cboBRG_Verimex._value) frmPrintLayout.Show() End Sub Private Sub Button23_Click(sender As Object, e As EventArgs) Handles Button23.Click Dim frmPrintLayout As New frmPrintLayout() - frmPrintLayout.AuswertungKontrolleLKW_NCTSTR(datAuswertVon_NCTSTR_UNISPED.Text, datAuswertBis_NCTSTR_UNISPED.Text, "MIC_UNISPED") + frmPrintLayout.AuswertungKontrolleLKW_NCTSTR(datAuswertVon_NCTSTR_UNISPED.Text, datAuswertBis_NCTSTR_UNISPED.Text, "MIC_UNISPED", cboBRG_Verimex._value) frmPrintLayout.Show() End Sub Private Sub Button22_Click(sender As Object, e As EventArgs) Handles Button22.Click Dim frmPrintLayout As New frmPrintLayout() - frmPrintLayout.AuswertungKontrolleLKW_NCTSTR(datAuswertVon_NCTSTR.Text, datAuswertBis_NCTSTR.Text, "VERIMEX_ATEZ") + frmPrintLayout.AuswertungKontrolleLKW_NCTSTR(datAuswertVon_NCTSTR.Text, datAuswertBis_NCTSTR.Text, "VERIMEX_ATEZ", cboBRG_Verimex._value) frmPrintLayout.Show() End Sub End Class