diff --git a/SDL/Fakturierung/frmRechnungenSuche.Designer.vb b/SDL/Fakturierung/frmRechnungenSuche.Designer.vb index 17164609..4fde06b7 100644 --- a/SDL/Fakturierung/frmRechnungenSuche.Designer.vb +++ b/SDL/Fakturierung/frmRechnungenSuche.Designer.vb @@ -76,7 +76,6 @@ Partial Class frmRechnungenSuche Me.txtAvisiererKdNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.pnlRechts = New System.Windows.Forms.Panel() Me.Label14 = New System.Windows.Forms.Label() - Me.Button2 = New System.Windows.Forms.Button() Me.MyListBox1 = New VERAG_PROG_ALLGEMEIN.MyListBox() Me.Label6 = New System.Windows.Forms.Label() Me.Label20 = New System.Windows.Forms.Label() @@ -101,6 +100,8 @@ Partial Class frmRechnungenSuche Me.cntxtCntxtSpeditionsbuch = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.EintragLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.pnlOpt = New System.Windows.Forms.Panel() + Me.Label17 = New System.Windows.Forms.Label() + Me.txtMaxSrch = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.pnlBerichte = New System.Windows.Forms.Panel() Me.Button1 = New System.Windows.Forms.Button() Me.Label10 = New System.Windows.Forms.Label() @@ -115,8 +116,8 @@ Partial Class frmRechnungenSuche Me.Label22 = New System.Windows.Forms.Label() Me.Label4 = New System.Windows.Forms.Label() Me.pnlTop = New System.Windows.Forms.Panel() - Me.Label17 = New System.Windows.Forms.Label() - Me.txtMaxSrch = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Button2 = New System.Windows.Forms.Button() + Me.Button13 = New System.Windows.Forms.Button() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer.Panel1.SuspendLayout() Me.SplitContainer.Panel2.SuspendLayout() @@ -757,6 +758,7 @@ Partial Class frmRechnungenSuche ' 'KdFrachtfuehrer ' + Me.KdFrachtfuehrer._AlleFirmenCLUSTER = False Me.KdFrachtfuehrer._AllowSetValue = True Me.KdFrachtfuehrer._autoSizeGross = False Me.KdFrachtfuehrer._display_Name1 = False @@ -765,6 +767,7 @@ Partial Class frmRechnungenSuche Me.KdFrachtfuehrer._displayWoelflKd = False Me.KdFrachtfuehrer._hideIfListEmpty = True Me.KdFrachtfuehrer._loadKdData = False + Me.KdFrachtfuehrer._UseFIRMA = "" Me.KdFrachtfuehrer._ValueKdAndName = True Me.KdFrachtfuehrer.dgvpos = "LEFT" Me.KdFrachtfuehrer.KdName = "" @@ -777,6 +780,7 @@ Partial Class frmRechnungenSuche Me.KdFrachtfuehrer.searchActive = True Me.KdFrachtfuehrer.Size = New System.Drawing.Size(261, 20) Me.KdFrachtfuehrer.TabIndex = 46 + Me.KdFrachtfuehrer.TIMER_SEARCH = True Me.KdFrachtfuehrer.usrcntl = Nothing ' 'KdFrachtfuehrerKdnr @@ -836,6 +840,7 @@ Partial Class frmRechnungenSuche ' 'kdtxtRechnungAn ' + Me.kdtxtRechnungAn._AlleFirmenCLUSTER = False Me.kdtxtRechnungAn._AllowSetValue = True Me.kdtxtRechnungAn._autoSizeGross = False Me.kdtxtRechnungAn._display_Name1 = False @@ -844,6 +849,7 @@ Partial Class frmRechnungenSuche Me.kdtxtRechnungAn._displayWoelflKd = False Me.kdtxtRechnungAn._hideIfListEmpty = True Me.kdtxtRechnungAn._loadKdData = False + Me.kdtxtRechnungAn._UseFIRMA = "" Me.kdtxtRechnungAn._ValueKdAndName = True Me.kdtxtRechnungAn.dgvpos = "LEFT" Me.kdtxtRechnungAn.KdName = "" @@ -856,6 +862,7 @@ Partial Class frmRechnungenSuche Me.kdtxtRechnungAn.searchActive = True Me.kdtxtRechnungAn.Size = New System.Drawing.Size(261, 20) Me.kdtxtRechnungAn.TabIndex = 42 + Me.kdtxtRechnungAn.TIMER_SEARCH = True Me.kdtxtRechnungAn.usrcntl = Nothing ' 'txtRechnungAnKdNr @@ -926,6 +933,7 @@ Partial Class frmRechnungenSuche ' 'kdtxtAvisierer ' + Me.kdtxtAvisierer._AlleFirmenCLUSTER = False Me.kdtxtAvisierer._AllowSetValue = True Me.kdtxtAvisierer._autoSizeGross = False Me.kdtxtAvisierer._display_Name1 = False @@ -934,6 +942,7 @@ Partial Class frmRechnungenSuche Me.kdtxtAvisierer._displayWoelflKd = False Me.kdtxtAvisierer._hideIfListEmpty = True Me.kdtxtAvisierer._loadKdData = False + Me.kdtxtAvisierer._UseFIRMA = "" Me.kdtxtAvisierer._ValueKdAndName = True Me.kdtxtAvisierer.dgvpos = "LEFT" Me.kdtxtAvisierer.KdName = "" @@ -946,6 +955,7 @@ Partial Class frmRechnungenSuche Me.kdtxtAvisierer.searchActive = True Me.kdtxtAvisierer.Size = New System.Drawing.Size(261, 20) Me.kdtxtAvisierer.TabIndex = 37 + Me.kdtxtAvisierer.TIMER_SEARCH = True Me.kdtxtAvisierer.usrcntl = Nothing ' 'txtAvisiererKdNr @@ -975,15 +985,15 @@ Partial Class frmRechnungenSuche 'pnlRechts ' Me.pnlRechts.AutoSize = True - Me.pnlRechts.Controls.Add(Me.Label14) Me.pnlRechts.Controls.Add(Me.Button2) + Me.pnlRechts.Controls.Add(Me.Button13) + Me.pnlRechts.Controls.Add(Me.Label14) Me.pnlRechts.Controls.Add(Me.MyListBox1) Me.pnlRechts.Dock = System.Windows.Forms.DockStyle.Right Me.pnlRechts.Location = New System.Drawing.Point(972, 0) Me.pnlRechts.Name = "pnlRechts" Me.pnlRechts.Size = New System.Drawing.Size(239, 192) Me.pnlRechts.TabIndex = 35 - Me.pnlRechts.Visible = False ' 'Label14 ' @@ -994,19 +1004,6 @@ Partial Class frmRechnungenSuche Me.Label14.TabIndex = 0 Me.Label14.Text = "Abfertigungsarten:" ' - 'Button2 - ' - Me.Button2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button2.Location = New System.Drawing.Point(4, 162) - Me.Button2.Margin = New System.Windows.Forms.Padding(0) - Me.Button2.Name = "Button2" - Me.Button2.Size = New System.Drawing.Size(230, 26) - Me.Button2.TabIndex = 2 - Me.Button2.Text = "Auswahl aufheben" - Me.Button2.UseVisualStyleBackColor = True - ' 'MyListBox1 ' Me.MyListBox1._value = "" @@ -1017,7 +1014,7 @@ Partial Class frmRechnungenSuche Me.MyListBox1.Location = New System.Drawing.Point(4, 19) Me.MyListBox1.Name = "MyListBox1" Me.MyListBox1.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple - Me.MyListBox1.Size = New System.Drawing.Size(230, 108) + Me.MyListBox1.Size = New System.Drawing.Size(230, 134) Me.MyListBox1.TabIndex = 1 ' 'Label6 @@ -1098,6 +1095,7 @@ Partial Class frmRechnungenSuche ' 'kdtxtEmpfaenger ' + Me.kdtxtEmpfaenger._AlleFirmenCLUSTER = False Me.kdtxtEmpfaenger._AllowSetValue = True Me.kdtxtEmpfaenger._autoSizeGross = False Me.kdtxtEmpfaenger._display_Name1 = False @@ -1106,6 +1104,7 @@ Partial Class frmRechnungenSuche Me.kdtxtEmpfaenger._displayWoelflKd = False Me.kdtxtEmpfaenger._hideIfListEmpty = True Me.kdtxtEmpfaenger._loadKdData = False + Me.kdtxtEmpfaenger._UseFIRMA = "" Me.kdtxtEmpfaenger._ValueKdAndName = True Me.kdtxtEmpfaenger.dgvpos = "LEFT" Me.kdtxtEmpfaenger.KdName = "" @@ -1118,6 +1117,7 @@ Partial Class frmRechnungenSuche Me.kdtxtEmpfaenger.searchActive = True Me.kdtxtEmpfaenger.Size = New System.Drawing.Size(261, 20) Me.kdtxtEmpfaenger.TabIndex = 10 + Me.kdtxtEmpfaenger.TIMER_SEARCH = True Me.kdtxtEmpfaenger.usrcntl = Nothing ' 'cbxLastschrift @@ -1193,6 +1193,7 @@ Partial Class frmRechnungenSuche ' 'kdtxtAuftraggeber ' + Me.kdtxtAuftraggeber._AlleFirmenCLUSTER = False Me.kdtxtAuftraggeber._AllowSetValue = True Me.kdtxtAuftraggeber._autoSizeGross = False Me.kdtxtAuftraggeber._display_Name1 = False @@ -1201,6 +1202,7 @@ Partial Class frmRechnungenSuche Me.kdtxtAuftraggeber._displayWoelflKd = False Me.kdtxtAuftraggeber._hideIfListEmpty = True Me.kdtxtAuftraggeber._loadKdData = False + Me.kdtxtAuftraggeber._UseFIRMA = "" Me.kdtxtAuftraggeber._ValueKdAndName = True Me.kdtxtAuftraggeber.dgvpos = "LEFT" Me.kdtxtAuftraggeber.KdName = "" @@ -1213,6 +1215,7 @@ Partial Class frmRechnungenSuche Me.kdtxtAuftraggeber.searchActive = True Me.kdtxtAuftraggeber.Size = New System.Drawing.Size(261, 20) Me.kdtxtAuftraggeber.TabIndex = 17 + Me.kdtxtAuftraggeber.TIMER_SEARCH = True Me.kdtxtAuftraggeber.usrcntl = Nothing ' 'txtAuftraggeberKdnr @@ -1241,6 +1244,7 @@ Partial Class frmRechnungenSuche ' 'kdtxtAbsender ' + Me.kdtxtAbsender._AlleFirmenCLUSTER = False Me.kdtxtAbsender._AllowSetValue = True Me.kdtxtAbsender._autoSizeGross = False Me.kdtxtAbsender._display_Name1 = False @@ -1249,6 +1253,7 @@ Partial Class frmRechnungenSuche Me.kdtxtAbsender._displayWoelflKd = False Me.kdtxtAbsender._hideIfListEmpty = True Me.kdtxtAbsender._loadKdData = False + Me.kdtxtAbsender._UseFIRMA = "" Me.kdtxtAbsender._ValueKdAndName = True Me.kdtxtAbsender.dgvpos = "LEFT" Me.kdtxtAbsender.KdName = "" @@ -1261,6 +1266,7 @@ Partial Class frmRechnungenSuche Me.kdtxtAbsender.searchActive = True Me.kdtxtAbsender.Size = New System.Drawing.Size(261, 20) Me.kdtxtAbsender.TabIndex = 6 + Me.kdtxtAbsender.TIMER_SEARCH = True Me.kdtxtAbsender.usrcntl = Nothing ' 'MyTextBox15 @@ -1373,6 +1379,39 @@ Partial Class frmRechnungenSuche Me.pnlOpt.Size = New System.Drawing.Size(1211, 70) Me.pnlOpt.TabIndex = 1 ' + 'Label17 + ' + Me.Label17.AutoSize = True + Me.Label17.Location = New System.Drawing.Point(974, 5) + Me.Label17.Name = "Label17" + Me.Label17.Size = New System.Drawing.Size(30, 13) + Me.Label17.TabIndex = 43 + Me.Label17.Text = "Max:" + ' + 'txtMaxSrch + ' + Me.txtMaxSrch._DateTimeOnly = False + Me.txtMaxSrch._numbersOnly = True + Me.txtMaxSrch._numbersOnlyKommastellen = "" + Me.txtMaxSrch._Prozent = False + Me.txtMaxSrch._ShortDateNew = False + Me.txtMaxSrch._ShortDateOnly = False + Me.txtMaxSrch._TimeOnly = False + Me.txtMaxSrch._value = "" + Me.txtMaxSrch._Waehrung = False + Me.txtMaxSrch._WaehrungZeichen = True + Me.txtMaxSrch.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtMaxSrch.ForeColor = System.Drawing.Color.Black + Me.txtMaxSrch.Location = New System.Drawing.Point(1010, 2) + Me.txtMaxSrch.MaxLineLength = -1 + Me.txtMaxSrch.MaxLines_Warning = "" + Me.txtMaxSrch.MaxLines_Warning_Label = Nothing + Me.txtMaxSrch.Name = "txtMaxSrch" + Me.txtMaxSrch.Size = New System.Drawing.Size(41, 20) + Me.txtMaxSrch.TabIndex = 44 + Me.txtMaxSrch.Text = "1000" + Me.txtMaxSrch.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'pnlBerichte ' Me.pnlBerichte.Controls.Add(Me.Button1) @@ -1540,38 +1579,27 @@ Partial Class frmRechnungenSuche Me.pnlTop.Size = New System.Drawing.Size(1211, 48) Me.pnlTop.TabIndex = 0 ' - 'Label17 + 'Button2 ' - Me.Label17.AutoSize = True - Me.Label17.Location = New System.Drawing.Point(974, 5) - Me.Label17.Name = "Label17" - Me.Label17.Size = New System.Drawing.Size(30, 13) - Me.Label17.TabIndex = 43 - Me.Label17.Text = "Max:" + Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button2.Location = New System.Drawing.Point(6, 156) + Me.Button2.Margin = New System.Windows.Forms.Padding(0) + Me.Button2.Name = "Button2" + Me.Button2.Size = New System.Drawing.Size(112, 26) + Me.Button2.TabIndex = 43 + Me.Button2.Text = "Alle" + Me.Button2.UseVisualStyleBackColor = True ' - 'txtMaxSrch + 'Button13 ' - Me.txtMaxSrch._DateTimeOnly = False - Me.txtMaxSrch._numbersOnly = True - Me.txtMaxSrch._numbersOnlyKommastellen = "" - Me.txtMaxSrch._Prozent = False - Me.txtMaxSrch._ShortDateNew = False - Me.txtMaxSrch._ShortDateOnly = False - Me.txtMaxSrch._TimeOnly = False - Me.txtMaxSrch._value = "" - Me.txtMaxSrch._Waehrung = False - Me.txtMaxSrch._WaehrungZeichen = True - Me.txtMaxSrch.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtMaxSrch.ForeColor = System.Drawing.Color.Black - Me.txtMaxSrch.Location = New System.Drawing.Point(1010, 2) - Me.txtMaxSrch.MaxLineLength = -1 - Me.txtMaxSrch.MaxLines_Warning = "" - Me.txtMaxSrch.MaxLines_Warning_Label = Nothing - Me.txtMaxSrch.Name = "txtMaxSrch" - Me.txtMaxSrch.Size = New System.Drawing.Size(41, 20) - Me.txtMaxSrch.TabIndex = 44 - Me.txtMaxSrch.Text = "1000" - Me.txtMaxSrch.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + Me.Button13.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button13.Location = New System.Drawing.Point(121, 156) + Me.Button13.Margin = New System.Windows.Forms.Padding(0) + Me.Button13.Name = "Button13" + Me.Button13.Size = New System.Drawing.Size(110, 26) + Me.Button13.TabIndex = 42 + Me.Button13.Text = "Keine" + Me.Button13.UseVisualStyleBackColor = True ' 'frmRechnungenSuche ' @@ -1584,7 +1612,7 @@ Partial Class frmRechnungenSuche Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.Name = "frmRechnungenSuche" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Speditionsbuch" + Me.Text = "Rechnungsdaten" Me.SplitContainer.Panel1.ResumeLayout(False) Me.SplitContainer.Panel2.ResumeLayout(False) CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).EndInit() @@ -1650,7 +1678,6 @@ Partial Class frmRechnungenSuche Friend WithEvents DateTimePicker1 As System.Windows.Forms.DateTimePicker Friend WithEvents pnlRechts As System.Windows.Forms.Panel Friend WithEvents Label14 As System.Windows.Forms.Label - Friend WithEvents Button2 As System.Windows.Forms.Button Friend WithEvents MyListBox1 As VERAG_PROG_ALLGEMEIN.MyListBox Friend WithEvents Label6 As System.Windows.Forms.Label Friend WithEvents Label20 As System.Windows.Forms.Label @@ -1705,4 +1732,6 @@ Partial Class frmRechnungenSuche Friend WithEvents Label15 As System.Windows.Forms.Label Friend WithEvents Label17 As Label Friend WithEvents txtMaxSrch As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Button2 As Button + Friend WithEvents Button13 As Button End Class diff --git a/SDL/Fakturierung/frmRechnungenSuche.vb b/SDL/Fakturierung/frmRechnungenSuche.vb index 15bad972..a8eb2f60 100644 --- a/SDL/Fakturierung/frmRechnungenSuche.vb +++ b/SDL/Fakturierung/frmRechnungenSuche.vb @@ -8,12 +8,10 @@ Public Class frmRechnungenSuche Dim sqlstr As String = "" Dim TopMax = If(IsNumeric(txtMaxSrch.Text), " TOP " & txtMaxSrch.Text, "") - sqlstr &= "SELECT " & TopMax & " RK_ID,[RechnungsNr],[RechnungsDatum], Sammelrechnung, [FilialenNr],[AbfertigungsNr],[UnterNr],[Abfertigungsdatum], isnull(cast(RechnungsKundenNr as nvarchar(10)) + ' ','') + [RechnungsName 1] as [RechnungAn], " & - " /* isnull(cast([AbsenderKundenNr] as nvarchar(10)) + ' ','') + [AbsenderName 1] as Absender,isnull(cast([EmpfängerKundenNr] as nvarchar(10)) + ' ','') + [EmpfängerName 1] as Empfänger,*/ isnull(cast([VermittlerKundenNr] as nvarchar(10)) + ' ','') + [VermittlerName 1] as Vermittler, [LKW Kennzeichen],Sachbearbeiter " & + sqlstr &= "SELECT " & TopMax & " RK_ID,[RechnungsNr],cast([RechnungsDatum] as date) RechnungsDatum, Sammelrechnung, [FilialenNr],[AbfertigungsNr],[UnterNr],cast(Abfertigungsdatum as date) Abfertigungsdatum, isnull(cast(RechnungsKundenNr as nvarchar(10)) + ' ','') + [RechnungsName 1] as [RechnungAn], " & + " /* isnull(cast([AbsenderKundenNr] as nvarchar(10)) + ' ','') + [AbsenderName 1] as Absender,isnull(cast([EmpfängerKundenNr] as nvarchar(10)) + ' ','') + [EmpfängerName 1] as Empfänger,*/ isnull(cast([VermittlerKundenNr] as nvarchar(10)) + ' ','') + [VermittlerName 1] as Vermittler, [LKW Kennzeichen],Sachbearbeiter,[SteuerpflichtigerGesamtbetrag],[SteuerfreierGesamtbetrag] " & " FROM [Rechnungsausgang] WHERE 1=1 " - - With DataGridView ' .DataSource = myTable .SET_SQL(sqlstr & getRechnungsAusgangWhere() & " ORDER BY Rechnungsdatum, RK_ID", "FMZOLL", getSpedbuchList) @@ -78,6 +76,13 @@ Public Class frmRechnungenSuche .Columns("Sachbearbeiter").MinimumWidth = 100 .Columns("Sachbearbeiter").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("SteuerpflichtigerGesamtbetrag").Width = 120 + .Columns("SteuerpflichtigerGesamtbetrag").HeaderText = "Betrag (stpfl.)" + .Columns("SteuerpflichtigerGesamtbetrag").DefaultCellStyle.Format = "N2" + .Columns("SteuerfreierGesamtbetrag").Width = 120 + .Columns("SteuerfreierGesamtbetrag").HeaderText = "Betrag (stfr.)" + .Columns("SteuerfreierGesamtbetrag").DefaultCellStyle.Format = "N2" + lblErgebnis.Text = "Ergebnisse: " & .RowCount End With @@ -148,6 +153,13 @@ Public Class frmRechnungenSuche If MyTextBox14.Text <> "" Then sqlstr &= " AND Rechnungsausgang.[LKW Kennzeichen] LIKE @LKW " If txtSachbearbeiter.Text <> "" Then sqlstr &= " AND Rechnungsausgang.[Sachbearbeiter] = @Sachbearbeiter " + + + Dim abfertigungsarten = getValues() + If abfertigungsarten <> "" Then sqlstr &= " AND (SELECT TOP 1 Abfertigungsart FROM Speditionsbuch WHERE Speditionsbuch.AbfertigungsNr=Rechnungsausgang.AbfertigungsNr AND Speditionsbuch.FilialenNr=Rechnungsausgang.FilialenNr AND Speditionsbuch.UnterNr=Rechnungsausgang.SpeditionsbuchUnterNr ) IN (" & abfertigungsarten & ") " + + + Return sqlstr End Function @@ -272,7 +284,7 @@ Public Class frmRechnungenSuche ' Next 'End Sub ' - Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click + Private Sub Button2_Click(sender As Object, e As EventArgs) For i = 0 To MyListBox1.Items.Count - 1 MyListBox1.SetSelected(i, False) Next @@ -325,11 +337,16 @@ Public Class frmRechnungenSuche ' End Sub - Private Sub txtAbfertDat_TextChanged(sender As Object, e As EventArgs) Handles txtAbfertDat.Leave, txtAbfertDatBis.Leave + Private Sub txtAbfertDat_TextChanged(sender As Object, e As EventArgs) Handles txtAbfertDat.Leave If sender.Text <> "" AndAlso IsDate(sender.Text) Then DateTimePicker1.Value = CDate(sender.text) End If End Sub + Private Sub txtAbfertDatBis_TextChanged(sender As Object, e As EventArgs) Handles txtAbfertDatBis.Leave + If sender.Text <> "" AndAlso IsDate(sender.Text) Then + DateTimePicker2.Value = CDate(sender.text) + End If + End Sub Private Sub MyTextBox1_TextChanged(sender As Object, e As EventArgs) Handles txtAbfertigungsnummer.TextChanged txtAbfertigungsnummerBis.Enabled = sender.text <> "" @@ -497,7 +514,8 @@ Public Class frmRechnungenSuche Private Sub btnExcel_Click(sender As Object, e As EventArgs) Handles btnExcel.Click Me.Cursor = Cursors.WaitCursor - cProgramFunctions.genExcelFromDGV_NEW(DataGridView, False) + 'cProgramFunctions.genExcelFromDGV_NEW(DataGridView, False) + cProgramFunctions.genExcelFromDT_NEW(DataGridView.DataSource, {"M1:N" & (DataGridView.DataSource.Rows.Count + 2)}) Me.Cursor = Cursors.Default End Sub @@ -545,7 +563,7 @@ Public Class frmRechnungenSuche For Each r In dt.Rows If r("Anzahl") Then sumAnz += r("Anzahl") Next - rpt.lblGesAnzahl.text = sumAnz + rpt.lblGesAnzahl.Text = sumAnz AddHandler rpt.Detail.Format, Sub() rpt.lblAnzahl.Text = rpt.Fields.Item("Anzahl").Value rpt.lblKdNr.Text = rpt.Fields.Item("RechnungsKundenNr").Value @@ -606,7 +624,16 @@ Public Class frmRechnungenSuche txtRechungsNr_bis.Enabled = (txtRechungsNr_von.Text <> "") End Sub - Private Sub txtAbfertDatBis_TextChanged(sender As Object, e As EventArgs) Handles txtAbfertDatBis.TextChanged + Private Sub Button2_Click_1(sender As Object, e As EventArgs) Handles Button2.Click + For i = 0 To MyListBox1.Items.Count - 1 + MyListBox1.SetSelected(i, True) + Next + End Sub + + Private Sub Button13_Click(sender As Object, e As EventArgs) Handles Button13.Click + For i = 0 To MyListBox1.Items.Count - 1 + MyListBox1.SetSelected(i, False) + Next End Sub End Class \ No newline at end of file diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index d598f99f..b38aff3f 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -137,7 +137,10 @@ Public Class usrCntlFaktAbrechnung RECHNUNG.Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME Else txtAbfertigungsnummer.Text = RECHNUNG.AbfertigungsNr + Dim FirmaTMP = RECHNUNG.Firma_ID cboFiliale.changeItem(RECHNUNG.FilialenNr) + RECHNUNG.Firma_ID = FirmaTMP + cboFirma.changeItem(RECHNUNG.Firma_ID) 'sonst durch filiale Überschrieben txtUnterNr.Text = RECHNUNG.UnterNr cboSpedBuchUnterNr.changeItem(RECHNUNG.SpeditionsbuchUnterNr) @@ -1468,6 +1471,8 @@ Public Class usrCntlFaktAbrechnung pnlTop.BackColor = Color.FromArgb(192, 0, 0) : errCOlor = Color.DarkRed Case 22 : pic.BackgroundImage = My.Resources.ambar_simple pnlTop.BackColor = Color.FromArgb(0, 120, 120) : errCOlor = Color.DarkRed + Case 23 : pic.BackgroundImage = My.Resources.FrontOfficeSUB_Horizontal + pnlTop.BackColor = Color.FromArgb(0, 120, 120) : errCOlor = Color.DarkRed Case 17 : pic.BackgroundImage = My.Resources.FrontOfficeSUB_Horizontal pnlTop.BackColor = Color.FromArgb(192, 0, 0) : errCOlor = Color.DarkRed diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.Designer.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.Designer.vb new file mode 100644 index 00000000..35b97d8c --- /dev/null +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.Designer.vb @@ -0,0 +1,140 @@ + +Partial Class usrcntlEORI_Antrag + Inherits System.Windows.Forms.UserControl + + 'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + + Private Sub InitializeComponent() + Me.lblText = New System.Windows.Forms.Label() + Me.pic = New System.Windows.Forms.PictureBox() + Me.btnDown = New System.Windows.Forms.Button() + Me.btnUp = New System.Windows.Forms.Button() + Me.btnDel = New System.Windows.Forms.Button() + Me.Label12 = New System.Windows.Forms.Label() + Me.cboSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox() + CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'lblText + ' + Me.lblText.AutoSize = True + Me.lblText.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblText.Location = New System.Drawing.Point(43, 12) + Me.lblText.Name = "lblText" + Me.lblText.Size = New System.Drawing.Size(105, 20) + Me.lblText.TabIndex = 1 + Me.lblText.Text = "XXXXXXXX" + ' + 'pic + ' + Me.pic.BackgroundImage = Global.SDL.My.Resources.pdf + Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch + Me.pic.Cursor = System.Windows.Forms.Cursors.Hand + Me.pic.Location = New System.Drawing.Point(5, 5) + Me.pic.Name = "pic" + Me.pic.Size = New System.Drawing.Size(32, 32) + Me.pic.TabIndex = 33 + Me.pic.TabStop = False + ' + 'btnDown + ' + Me.btnDown.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnDown.BackgroundImage = Global.SDL.My.Resources.pfeil_unten + Me.btnDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnDown.Location = New System.Drawing.Point(976, 43) + Me.btnDown.Name = "btnDown" + Me.btnDown.Size = New System.Drawing.Size(25, 21) + Me.btnDown.TabIndex = 3 + Me.btnDown.UseVisualStyleBackColor = True + ' + 'btnUp + ' + Me.btnUp.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnUp.BackgroundImage = Global.SDL.My.Resources.pfeil_oben + Me.btnUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnUp.Location = New System.Drawing.Point(976, 23) + Me.btnUp.Name = "btnUp" + Me.btnUp.Size = New System.Drawing.Size(25, 21) + Me.btnUp.TabIndex = 2 + Me.btnUp.UseVisualStyleBackColor = True + ' + 'btnDel + ' + Me.btnDel.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnDel.BackgroundImage = Global.SDL.My.Resources.del + Me.btnDel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnDel.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnDel.Location = New System.Drawing.Point(976, 0) + Me.btnDel.Name = "btnDel" + Me.btnDel.Size = New System.Drawing.Size(25, 21) + Me.btnDel.TabIndex = 0 + Me.btnDel.UseVisualStyleBackColor = True + ' + 'Label12 + ' + Me.Label12.AutoSize = True + Me.Label12.Location = New System.Drawing.Point(44, 40) + Me.Label12.Name = "Label12" + Me.Label12.Size = New System.Drawing.Size(50, 13) + Me.Label12.TabIndex = 36 + Me.Label12.Text = "Sprache:" + ' + 'cboSprache + ' + Me.cboSprache._allowedValuesFreiText = Nothing + Me.cboSprache._allowFreiText = False + Me.cboSprache._value = "" + Me.cboSprache.FormattingEnabled = True + Me.cboSprache.Location = New System.Drawing.Point(100, 37) + Me.cboSprache.Name = "cboSprache" + Me.cboSprache.Size = New System.Drawing.Size(100, 21) + Me.cboSprache.TabIndex = 37 + ' + 'usrcntlFiskalInfoschreiben + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.BackColor = System.Drawing.Color.WhiteSmoke + Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Controls.Add(Me.Label12) + Me.Controls.Add(Me.cboSprache) + Me.Controls.Add(Me.btnDown) + Me.Controls.Add(Me.btnUp) + Me.Controls.Add(Me.btnDel) + Me.Controls.Add(Me.pic) + Me.Controls.Add(Me.lblText) + Me.Name = "usrcntlFiskalInfoschreiben" + Me.Size = New System.Drawing.Size(1000, 64) + CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + Friend WithEvents lblText As System.Windows.Forms.Label + Friend WithEvents pic As System.Windows.Forms.PictureBox + Friend WithEvents btnDown As System.Windows.Forms.Button + Friend WithEvents btnUp As System.Windows.Forms.Button + Friend WithEvents btnDel As System.Windows.Forms.Button + Friend WithEvents Label12 As System.Windows.Forms.Label + Friend WithEvents cboSprache As VERAG_PROG_ALLGEMEIN.MyComboBox + +End Class diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.resx b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.vb new file mode 100644 index 00000000..46e4fc27 --- /dev/null +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.vb @@ -0,0 +1,64 @@ +Public Class usrcntlEORI_Antrag + Implements FormualrInterface + + Property BEZEICHNUNG = "" + ' Property DS_ORDNER = "" + + Public Event DELETE(c As Control) + Public Event MOVE_UP(c As Control) + Public Event MOVE_DOWN(c As Control) + + + Public KdNR As Integer = -1 + Public Sub ChangeKDNr(kdnr As Integer) _ + Implements FormualrInterface.ChangeKDNr + 'nix... + End Sub + + Sub New(BEZEICHNUNG As String, DS_ORDNER As String, Optional displayName As String = "") + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + Me.BEZEICHNUNG = BEZEICHNUNG + ' Me.DS_ORDNER = DS_ORDNER + Me.lblText.Text = If(displayName <> "", displayName, BEZEICHNUNG) + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + + End Sub + + Private Sub btnDel_Click(sender As Object, e As EventArgs) Handles btnDel.Click + RaiseEvent DELETE(Me) + End Sub + + Private Sub btnup_Click(sender As Object, e As EventArgs) Handles btnUp.Click + RaiseEvent MOVE_UP(Me) + End Sub + + Private Sub btnDown_Click(sender As Object, e As EventArgs) Handles btnDown.Click + RaiseEvent MOVE_DOWN(Me) + End Sub + + Private Sub pic_Click(sender As Object, e As EventArgs) Handles pic.Click + FormularManagerNEU.genPDF(Me, True) + End Sub + + Private Sub usrcntlFormOhneFelder_Load(sender As Object, e As EventArgs) Handles Me.Load + + Select Case BEZEICHNUNG + Case FormularManagerArten.AT_InformationsblattFiskalverzollung + cboSprache.Items.Clear() + cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Deutsch", "DE")) + cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Englisch", "EN")) + cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Französisch", "FR")) + Case FormularManagerArten.DE_InformationsblattFiskalverzollung + cboSprache.Items.Clear() + cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Deutsch", "DE")) + cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Englisch", "EN")) + cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Französisch", "FR")) + cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Niederländisch", "NL")) + End Select + + If KdNR > 0 Then + ' initKdNR(KdNR) + End If + End Sub +End Class diff --git a/SDL/Formulare/KDFormulare/frmFormulare.Designer.vb b/SDL/Formulare/KDFormulare/frmFormulare.Designer.vb index afe3ef7f..e69ef844 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.Designer.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.Designer.vb @@ -71,7 +71,7 @@ Partial Class frmFormulare 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(1326, 100) + Me.pnl.Size = New System.Drawing.Size(1326, 125) Me.pnl.TabIndex = 0 ' 'Label4 @@ -127,16 +127,16 @@ Partial Class frmFormulare Me.MyListBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.MyListBox2.FormattingEnabled = True Me.MyListBox2.ItemHeight = 16 - Me.MyListBox2.Location = New System.Drawing.Point(810, 26) + Me.MyListBox2.Location = New System.Drawing.Point(810, 23) Me.MyListBox2.Name = "MyListBox2" - Me.MyListBox2.Size = New System.Drawing.Size(429, 68) + Me.MyListBox2.Size = New System.Drawing.Size(429, 100) Me.MyListBox2.TabIndex = 7 ' 'Label2 ' Me.Label2.AutoSize = True Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label2.Location = New System.Drawing.Point(807, 10) + Me.Label2.Location = New System.Drawing.Point(807, 7) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(151, 13) Me.Label2.TabIndex = 2 @@ -147,7 +147,7 @@ Partial Class frmFormulare Me.cbxAnderungGliecherFelderBeiAllenFormularenBerucksichtigen.AutoSize = True Me.cbxAnderungGliecherFelderBeiAllenFormularenBerucksichtigen.Checked = True Me.cbxAnderungGliecherFelderBeiAllenFormularenBerucksichtigen.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxAnderungGliecherFelderBeiAllenFormularenBerucksichtigen.Location = New System.Drawing.Point(15, 78) + Me.cbxAnderungGliecherFelderBeiAllenFormularenBerucksichtigen.Location = New System.Drawing.Point(15, 103) Me.cbxAnderungGliecherFelderBeiAllenFormularenBerucksichtigen.Name = "cbxAnderungGliecherFelderBeiAllenFormularenBerucksichtigen" Me.cbxAnderungGliecherFelderBeiAllenFormularenBerucksichtigen.Size = New System.Drawing.Size(322, 17) Me.cbxAnderungGliecherFelderBeiAllenFormularenBerucksichtigen.TabIndex = 9 @@ -160,16 +160,16 @@ Partial Class frmFormulare Me.MyListBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.MyListBox1.FormattingEnabled = True Me.MyListBox1.ItemHeight = 16 - Me.MyListBox1.Location = New System.Drawing.Point(343, 26) + Me.MyListBox1.Location = New System.Drawing.Point(343, 23) Me.MyListBox1.Name = "MyListBox1" - Me.MyListBox1.Size = New System.Drawing.Size(461, 68) + Me.MyListBox1.Size = New System.Drawing.Size(461, 100) Me.MyListBox1.TabIndex = 6 ' 'Label1 ' Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(340, 10) + Me.Label1.Location = New System.Drawing.Point(340, 7) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(111, 13) Me.Label1.TabIndex = 1 @@ -179,7 +179,7 @@ Partial Class frmFormulare ' Me.lblFormularManager.AutoSize = True Me.lblFormularManager.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblFormularManager.Location = New System.Drawing.Point(12, 10) + Me.lblFormularManager.Location = New System.Drawing.Point(12, 8) Me.lblFormularManager.Name = "lblFormularManager" Me.lblFormularManager.Size = New System.Drawing.Size(140, 17) Me.lblFormularManager.TabIndex = 0 @@ -192,9 +192,9 @@ Partial Class frmFormulare Me.pnlBody.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.pnlBody.Controls.Add(Me.MyFlowLayoutPanel1) Me.pnlBody.Dock = System.Windows.Forms.DockStyle.Fill - Me.pnlBody.Location = New System.Drawing.Point(0, 100) + Me.pnlBody.Location = New System.Drawing.Point(0, 125) Me.pnlBody.Name = "pnlBody" - Me.pnlBody.Size = New System.Drawing.Size(1326, 636) + Me.pnlBody.Size = New System.Drawing.Size(1326, 611) Me.pnlBody.TabIndex = 1 ' 'MyFlowLayoutPanel1 @@ -207,7 +207,7 @@ Partial Class frmFormulare Me.MyFlowLayoutPanel1.Location = New System.Drawing.Point(0, 0) Me.MyFlowLayoutPanel1.MinimumSize = New System.Drawing.Size(1000, 100) Me.MyFlowLayoutPanel1.Name = "MyFlowLayoutPanel1" - Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(1324, 634) + Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(1324, 609) Me.MyFlowLayoutPanel1.TabIndex = 0 ' 'pnlBottom diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index 59aa3771..f96407f8 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -208,6 +208,7 @@ Public Class frmFormulare MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AT Informationsblatt Fiskalverzollung", FormularManagerArten.AT_InformationsblattFiskalverzollung)) MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DE Informationsblatt Fiskalverzollung", FormularManagerArten.DE_InformationsblattFiskalverzollung)) + MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EORI-Antrag", FormularManagerArten.EORI_Antrag)) MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verbundenheit Käufer/Verkäufer", FormularManagerArten.Verbundenheit)) @@ -249,6 +250,7 @@ Public Class frmFormulare MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AT Informationsblatt Fiskalverzollung", FormularManagerArten.AT_InformationsblattFiskalverzollung)) MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DE Informationsblatt Fiskalverzollung", FormularManagerArten.DE_InformationsblattFiskalverzollung)) + MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EORI-Antrag", FormularManagerArten.EORI_Antrag)) MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verbundenheit Käufer/Verkäufer", FormularManagerArten.Verbundenheit)) MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Auftrag Überwachungsdokument", FormularManagerArten.QS_UeDok)) @@ -625,6 +627,17 @@ Public Class frmFormulare AddHandler c.MOVE_UP, AddressOf ControlMoveUp AddHandler c.MOVE_DOWN, AddressOf ControlMoveDown MyFlowLayoutPanel1.Controls.Add(c) + Case FormularManagerArten.EORI_Antrag + Dim displayName = "" + ' If param Is Nothing Then Exit Sub + If valueTMP = FormularManagerArten.EORI_Antrag Then displayName = "EORI-Antrag" + Dim c As New usrcntlEORI_Antrag(valueTMP, displayName) + c.Width = MyFlowLayoutPanel1.Width - 6 + c.KdNR = KdNr + AddHandler c.DELETE, AddressOf ControlDELETE + AddHandler c.MOVE_UP, AddressOf ControlMoveUp + AddHandler c.MOVE_DOWN, AddressOf ControlMoveDown + MyFlowLayoutPanel1.Controls.Add(c) Case FormularManagerArten.VUB_AG, FormularManagerArten.VUB_CS, FormularManagerArten.VUB_IMEX Dim displayName = "" If valueTMP = FormularManagerArten.VUB_AG Then displayName = "VUB - VERAG Spedition AG" @@ -1074,8 +1087,8 @@ Public Class frmFormulare Select Case cboVorlage._value Case FormularVorlagenGruppe.NeukundeAT MyFlowLayoutPanel1.Controls.Clear() - addForm(FormularManagerArten.AT_Vollmacht) - addForm(FormularManagerArten.Verzollungspreise) + addForm(FormularManagerArten.AT_Vollmacht_EV) + addForm(FormularManagerArten.Verzollungspreise, {"VZ_EV"}) addForm(FormularManagerArten.VUB_CS) Case FormularVorlagenGruppe.NeukundeATFiskal MyFlowLayoutPanel1.Controls.Clear() @@ -1100,8 +1113,8 @@ Public Class frmFormulare Case FormularVorlagenGruppe.NeukundeAT_IMEX MyFlowLayoutPanel1.Controls.Clear() - addForm(FormularManagerArten.AT_Vollmacht) - addForm(FormularManagerArten.Verzollungspreise) + addForm(FormularManagerArten.AT_Vollmacht_EV) + addForm(FormularManagerArten.Verzollungspreise, {"VZ_EV"}) addForm(FormularManagerArten.VUB_IMEX) Case FormularVorlagenGruppe.NeukundeATFiskal_IMEX MyFlowLayoutPanel1.Controls.Clear() @@ -1183,6 +1196,8 @@ Public Class FormularManagerNEU striList = FormularManagerNEU.VerpflichtungserklärungFahrerRpt(c, printReportElsePdf, printerName) Case GetType(usrcntlFiskalInfoschreiben).ToString retStr = FormularManagerNEU.FiskalInfoschreiben(c) + Case GetType(usrcntlEORI_Antrag).ToString + retStr = FormularManagerNEU.EORI_Antrag(c) Case GetType(usrcntlVerzollungsunterlagen).ToString striList = FormularManagerNEU.Verzollungsunterlagen(c, printReportElsePdf, printerName, openWord) Case GetType(usrcntlVerzollungsunterlagen_BAR).ToString @@ -3131,6 +3146,14 @@ Public Class FormularManagerNEU End Function + Shared Function EORI_Antrag(usrCntl As usrcntlEORI_Antrag) As String + + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "EORI_Antrag") + Return DS.GET_TOP1_PATH(False) + + End Function + + Shared Function Verzollungsunterlagen(usrCntl As usrcntlVerzollungsunterlagen, Optional printReportElsePDF As Boolean = False, Optional printername As String = "", Optional openWord As Boolean = False) As List(Of String) Dim odoc As Microsoft.Office.Interop.Word.Document = Nothing Dim oWord As New Microsoft.Office.Interop.Word.Application @@ -4228,6 +4251,8 @@ Public Class FormularManagerArten Shared Property VerpflichtungserklärungFahrer = "VerpflichtungserklärungFahrer" Shared Property DE_InformationsblattFiskalverzollung = "DE_InformationsblattFiskalverzollung" Shared Property AT_InformationsblattFiskalverzollung = "AT_InformationsblattFiskalverzollung" + Shared Property EORI_Antrag = "EORI_Antrag" + Shared Property Verzollungsunterlagen = "Verzollungsunterlagen" Shared Property VerzollungsunterlagenBAR = "VerzollungsunterlagenBAR" Shared Property Gelangensbestaetigung = "Gelangensbestaetigung" diff --git a/SDL/My Project/Resources.Designer.vb b/SDL/My Project/Resources.Designer.vb index 88eaf822..cd1e9ee9 100644 --- a/SDL/My Project/Resources.Designer.vb +++ b/SDL/My Project/Resources.Designer.vb @@ -190,15 +190,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Sucht eine lokalisierte Zeichenfolge, die ähnelt. - ''' - Friend ReadOnly Property asdasdasdasfdgh56dfbnnmmmm() As String - Get - Return ResourceManager.GetString("asdasdasdasfdgh56dfbnnmmmm", resourceCulture) - End Get - End Property - ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -2081,7 +2072,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 1.1.5.3 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 1.1.5.4 ähnelt. ''' Friend ReadOnly Property Version() As String Get diff --git a/SDL/My Project/Resources.resx b/SDL/My Project/Resources.resx index 05ed401f..72dae620 100644 --- a/SDL/My Project/Resources.resx +++ b/SDL/My Project/Resources.resx @@ -623,7 +623,7 @@ ..\Resources\email.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - 1.1.5.3 + 1.1.5.4 ..\Resources\axxes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -760,7 +760,4 @@ ..\Resources\aviso_messenger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - \ No newline at end of file diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 93e2dd9e..eeae7966 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -352,6 +352,12 @@ Component + + usrcntlEORI_Antrag.vb + + + UserControl + usrCntlATLAS_AES.vb @@ -2368,6 +2374,9 @@ subRptVM.vb + + usrcntlEORI_Antrag.vb + usrCntlATLAS_AES.vb diff --git a/SDL/kunden/Vorauskasse/frmVorauskasse.vb b/SDL/kunden/Vorauskasse/frmVorauskasse.vb index 47d2747e..83629280 100644 --- a/SDL/kunden/Vorauskasse/frmVorauskasse.vb +++ b/SDL/kunden/Vorauskasse/frmVorauskasse.vb @@ -493,11 +493,18 @@ If WebBrowser.ReadyState = WebBrowserReadyState.Complete Then Try + Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Case "VERAG" + WebBrowser.Document.GetElementById("txtBenutzerkennung").SetAttribute("value", "260896385") + WebBrowser.Document.GetElementById("pwdPin").SetAttribute("value", "Frjuverag361224!") - WebBrowser.Document.GetElementById("txtBenutzerkennung").SetAttribute("value", "261016389") - WebBrowser.Document.GetElementById("pwdPin").SetAttribute("value", "Frontoffice2020") + WebBrowser.Document.GetElementById("xview-anmelden").InvokeMember("click") + Case "FRONTOFFICE" + WebBrowser.Document.GetElementById("txtBenutzerkennung").SetAttribute("value", "261016389") + WebBrowser.Document.GetElementById("pwdPin").SetAttribute("value", "Frontoffice2020") - WebBrowser.Document.GetElementById("xview-anmelden").InvokeMember("click") + WebBrowser.Document.GetElementById("xview-anmelden").InvokeMember("click") + End Select Catch ex As Exception diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index 982f6c40..afe4bbfa 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -1366,7 +1366,7 @@ Public Class usrCntlKundenuebersicht Dim tmprowindex As Integer = e.RowIndex Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA - Case "VERAG" + Case "VERAG", "FRONTOFFICE" If tmprowindex >= 0 Then If dgvVollmachten.Columns(e.ColumnIndex).Name = "clmnTherefore" Then If dgvVollmachten.Rows(e.RowIndex).Cells("kdvma_Id").Value Is DBNull.Value Then Exit Sub @@ -1699,6 +1699,7 @@ Public Class usrCntlKundenuebersicht Dim f As New frmInfo f.Controls.Clear() Dim WebBrowser As New VERAG_PROG_ALLGEMEIN.Kleinma.Controls.WebBrowserEx + WebBrowser.ScriptErrorsSuppressed = True f.Controls.Add(WebBrowser) f.Visible = False f.WindowState = FormWindowState.Minimized @@ -1726,6 +1727,7 @@ Public Class usrCntlKundenuebersicht Sub printURL(url) Dim WebBrowser As New VERAG_PROG_ALLGEMEIN.Kleinma.Controls.WebBrowserEx + WebBrowser.ScriptErrorsSuppressed = True WebBrowser.Navigate(New Uri(url)) WebBrowser.AllowNavigation = True 'WebBrowser.Print() diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index ba31f8d0..793c8f5d 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -794,6 +794,7 @@ Public Class frmMDMDatenverarbetiung sqlstr &= " WHERE 1=1 " sqlstr &= " AND plose_Fakturiert=0 " sqlstr &= " AND plose_POLSEKundennummer = '" & PLOSEKundenNr & "' " + sqlstr &= " AND plp_LeistungsNr is not null " sqlstr &= " AND plose_DatumTransaktion between '" & von.ToShortDateString & "' and '" & bis.ToShortDateString & "' " sqlstr &= " group by [plp_LeistungsNr]" diff --git a/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb b/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb index c44ca420..9284d2fd 100644 --- a/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb +++ b/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb @@ -911,6 +911,22 @@ Public Class cAviso End Function + Shared Function getAVISO_List(Optional Standort = "SUB", Optional FIRMA = "VERAG") As DataTable + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + + Select Case FIRMA + Case "VERAG" : FIRMA = " AND ( FIRMA='VERAG' OR CLUSTER='FRONTOFFICE' )" + Case Else : FIRMA = " AND ( FIRMA='" & FIRMA & "') " + End Select + + Standort = " AND Grenzstelle = '" & Standort & "' " + + Dim dt = SQL.loadDgvBySql("SELECT TOP 1000 AvisoID, Status, LKW_Nr, Auftraggeber, Frächter,VoraussichtlichesEintreffen, AvisoEingang, Ankunft, Dauer, Grenzstelle,letzterMitarbeiter, CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig], Datum, Vorbereitet, Vorgeschrieben, Freigabe, Telefonisch, Info,Handling,AvisoTVHinweis,DATEDIFF(DAY,getdate(),[VoraussichtlichesEintreffen]) TageBisEintreffen + FROM Aviso + WHERE 1=1 " & FIRMA & Standort & " AND Status = 3 ORDER BY Ankunft ASC, AvisoEingang ASC, Datum ASC", "AVISO") + Return dt + End Function + Sub UPDATE_FahrerHandy(FahrerHandy As String) If AvisoID <= 0 Then Exit Sub If If(FahrerHandy, "") = "" Then Exit Sub