diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.vb index 68d40d9c..03654ed6 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.vb @@ -100,6 +100,7 @@ cboFirma.changeItem("AMBAR") MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung", "VZ")) MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VZ Gemüse,Arznei,Lebensmittel", "VZ_SPECIAL_1")) + MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung Rückware", "VZ_RW")) MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("T1", "VZ")) MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("nur EUST", "EUST")) Case Else @@ -309,12 +310,31 @@ dgvZusatzleistung.Rows.Add("", "", "Zollbeschau**", CDbl(60).ToString("C2") & "/Std.") dgvZusatzleistung.Rows.Add("", "348", "Fremdgrenze", CDbl(20).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "Neutralisierung / CMR Erstellung", CDbl(15).ToString("C2")) - dgvZusatzleistung.Rows.Add("", "", "Aufschlag Rückwarenverzollung/Aktive Veredelung", CDbl(17).ToString("C2")) + dgvZusatzleistung.Rows.Add("", "", "Aufschlag Rückwarenverzollung/Aktive Veredelung", CDbl(37).ToString("C2")) 'dgvZusatzleistung.Rows.Add("", "", "Aufschlag Arzneiwaren oder Lebensmittel", CDbl(25).ToString("C2")) '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")) + Case "VZ_RW" ' + DataGridView.Rows.Add(cnt, "", "Verzollung (inkl. 1 Tarifnummer)", CDbl(150).ToString("C2")) : cnt += 1 + DataGridView.Rows.Add(cnt, "", "je weitere Tarifnummer", CDbl(6).ToString("C2")) : cnt += 1 + DataGridView.Rows.Add(cnt, "", "Aviso", CDbl(20).ToString("C2")) : cnt += 1 + DataGridView.Rows.Add(cnt, "440", "Fixe Taxe", CDbl(12).ToString("C2")) : cnt += 1 + DataGridView.Rows.Add(cnt, "440", "Papiere Porti", CDbl(10).ToString("C2")) : cnt += 1 + DataGridView.Rows.Add(cnt, "440", "Sonstige Kosten*", CDbl(40).ToString("C2")) : cnt += 1 + DataGridView.Rows.Add(cnt, "260", "SVS", "lt. Tabelle") : cnt += 1 + DataGridView.Rows.Add(cnt, "324", "ATLAS (DE) Zuschlag", CDbl(8).ToString("C2")) : cnt += 1 + DataGridView.Rows.Add(cnt, "700", "1 % Vorlageprovision (von Einfuhrabgaben)", "") : cnt += 1 + DataGridView.Rows.Add(cnt, "750", "2 % Kreditaufwendung (von Einfuhrabgaben)", "") : cnt += 1 + + dgvZusatzleistung.Rows.Add("", "347", "Clearingkosten (EINMALIG nur bei 1. Abfertigung)", CDbl(40).ToString("C2")) + dgvZusatzleistung.Rows.Add("", "", "Korr. Rechnung anfordern", CDbl(25).ToString("C2")) + dgvZusatzleistung.Rows.Add("", "", "Zollbeschau**", CDbl(60).ToString("C2") & "/Std.") + dgvZusatzleistung.Rows.Add("", "348", "Fremdgrenze", CDbl(20).ToString("C2")) + dgvZusatzleistung.Rows.Add("", "", "Neutralisierung / CMR Erstellung", CDbl(15).ToString("C2")) + + Case "T1" DataGridView.Rows.Add(cnt, "", "T1/T2 Abfertigung", CDbl(60).ToString("C2")) : cnt += 1 diff --git a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb index 458b074f..f736fb61 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb @@ -37,6 +37,8 @@ Partial Class frmMDM_USTVAntrag Me.Panel8 = New System.Windows.Forms.Panel() Me.Label3 = New System.Windows.Forms.Label() Me.lblZeitraum = New System.Windows.Forms.Label() + Me.txtVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Panel6 = New System.Windows.Forms.Panel() Me.lblGesamtUSteuer = New System.Windows.Forms.Label() Me.Label12 = New System.Windows.Forms.Label() @@ -59,19 +61,17 @@ Partial Class frmMDM_USTVAntrag Me.btnStorno = New System.Windows.Forms.Button() Me.lblAntragAbgeschlossen = New System.Windows.Forms.Label() Me.Label5 = New System.Windows.Forms.Label() + Me.cboStatus = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lblFirma = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() Me.pnlFilter = New System.Windows.Forms.Panel() + Me.dgvUSTVPositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.pnl = New System.Windows.Forms.Panel() Me.Panel2 = New System.Windows.Forms.Panel() + Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition() Me.Panel4 = New System.Windows.Forms.Panel() Me.Button3 = New System.Windows.Forms.Button() Me.Button2 = New System.Windows.Forms.Button() - Me.dgvUSTVPositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.txtVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.cboStatus = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition() Me.Panel3.SuspendLayout() Me.Panel1.SuspendLayout() Me.Panel9.SuspendLayout() @@ -80,10 +80,10 @@ Partial Class frmMDM_USTVAntrag Me.Panel7.SuspendLayout() Me.FlowLayoutPanel.SuspendLayout() Me.pnlFilter.SuspendLayout() + CType(Me.dgvUSTVPositionen, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnl.SuspendLayout() Me.Panel2.SuspendLayout() Me.Panel4.SuspendLayout() - CType(Me.dgvUSTVPositionen, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'Panel3 @@ -95,7 +95,7 @@ Partial Class frmMDM_USTVAntrag Me.Panel3.Controls.Add(Me.Button1) Me.Panel3.Controls.Add(Me.lblPLOSE_EintrageVerarbetiet) Me.Panel3.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel3.Location = New System.Drawing.Point(0, 713) + Me.Panel3.Location = New System.Drawing.Point(0, 649) Me.Panel3.Name = "Panel3" Me.Panel3.Size = New System.Drawing.Size(1454, 100) Me.Panel3.TabIndex = 3 @@ -249,6 +249,56 @@ Partial Class frmMDM_USTVAntrag Me.lblZeitraum.TabIndex = 7 Me.lblZeitraum.Text = "-" ' + 'txtVon + ' + Me.txtVon._DateTimeOnly = False + Me.txtVon._numbersOnly = False + Me.txtVon._numbersOnlyKommastellen = "" + Me.txtVon._numbersOnlyTrennzeichen = True + Me.txtVon._Prozent = False + Me.txtVon._ShortDateNew = True + Me.txtVon._ShortDateOnly = False + Me.txtVon._TimeOnly = False + Me.txtVon._TimeOnly_Seconds = False + Me.txtVon._value = "" + Me.txtVon._Waehrung = False + Me.txtVon._WaehrungZeichen = True + Me.txtVon.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.txtVon.ForeColor = System.Drawing.Color.Black + Me.txtVon.Location = New System.Drawing.Point(101, 10) + Me.txtVon.MaxLength = 10 + Me.txtVon.MaxLineLength = -1 + Me.txtVon.MaxLines_Warning = "" + Me.txtVon.MaxLines_Warning_Label = Nothing + Me.txtVon.Name = "txtVon" + Me.txtVon.Size = New System.Drawing.Size(100, 23) + Me.txtVon.TabIndex = 6 + ' + 'txtBis + ' + Me.txtBis._DateTimeOnly = False + Me.txtBis._numbersOnly = False + Me.txtBis._numbersOnlyKommastellen = "" + Me.txtBis._numbersOnlyTrennzeichen = True + Me.txtBis._Prozent = False + Me.txtBis._ShortDateNew = True + Me.txtBis._ShortDateOnly = False + Me.txtBis._TimeOnly = False + Me.txtBis._TimeOnly_Seconds = False + Me.txtBis._value = "" + Me.txtBis._Waehrung = False + Me.txtBis._WaehrungZeichen = True + Me.txtBis.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.txtBis.ForeColor = System.Drawing.Color.Black + Me.txtBis.Location = New System.Drawing.Point(227, 10) + Me.txtBis.MaxLength = 10 + Me.txtBis.MaxLineLength = -1 + Me.txtBis.MaxLines_Warning = "" + Me.txtBis.MaxLines_Warning_Label = Nothing + Me.txtBis.Name = "txtBis" + Me.txtBis.Size = New System.Drawing.Size(100, 23) + Me.txtBis.TabIndex = 8 + ' 'Panel6 ' Me.Panel6.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -544,6 +594,19 @@ Partial Class frmMDM_USTVAntrag Me.Label5.TabIndex = 0 Me.Label5.Text = "Status:" ' + 'cboStatus + ' + Me.cboStatus._allowedValuesFreiText = Nothing + Me.cboStatus._allowFreiText = False + Me.cboStatus._value = "" + Me.cboStatus.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer)) + Me.cboStatus.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) + Me.cboStatus.FormattingEnabled = True + Me.cboStatus.Location = New System.Drawing.Point(76, 16) + Me.cboStatus.Name = "cboStatus" + Me.cboStatus.Size = New System.Drawing.Size(394, 28) + Me.cboStatus.TabIndex = 1 + ' 'lblFirma ' Me.lblFirma.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ @@ -578,15 +641,35 @@ Partial Class frmMDM_USTVAntrag Me.pnlFilter.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlFilter.Location = New System.Drawing.Point(0, 177) Me.pnlFilter.Name = "pnlFilter" - Me.pnlFilter.Size = New System.Drawing.Size(1454, 267) + Me.pnlFilter.Size = New System.Drawing.Size(1454, 203) Me.pnlFilter.TabIndex = 1 ' + 'dgvUSTVPositionen + ' + Me.dgvUSTVPositionen.AKTUALISIERUNGS_INTERVALL = 500 + Me.dgvUSTVPositionen.AllowUserToAddRows = False + Me.dgvUSTVPositionen.AllowUserToDeleteRows = False + DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUSTVPositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + Me.dgvUSTVPositionen.BackgroundColor = System.Drawing.Color.White + Me.dgvUSTVPositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvUSTVPositionen.Dock = System.Windows.Forms.DockStyle.Fill + Me.dgvUSTVPositionen.Location = New System.Drawing.Point(0, 0) + Me.dgvUSTVPositionen.MultiSelect = False + Me.dgvUSTVPositionen.Name = "dgvUSTVPositionen" + Me.dgvUSTVPositionen.ReadOnly = True + Me.dgvUSTVPositionen.RowHeadersVisible = False + Me.dgvUSTVPositionen.RowHeadersWidth = 62 + Me.dgvUSTVPositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvUSTVPositionen.Size = New System.Drawing.Size(1452, 201) + Me.dgvUSTVPositionen.TabIndex = 0 + ' 'pnl ' Me.pnl.Controls.Add(Me.Panel2) Me.pnl.Controls.Add(Me.Panel4) Me.pnl.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnl.Location = New System.Drawing.Point(0, 444) + Me.pnl.Location = New System.Drawing.Point(0, 380) Me.pnl.Name = "pnl" Me.pnl.Size = New System.Drawing.Size(1454, 269) Me.pnl.TabIndex = 2 @@ -602,6 +685,14 @@ Partial Class frmMDM_USTVAntrag Me.Panel2.Size = New System.Drawing.Size(1300, 269) Me.Panel2.TabIndex = 1 ' + 'UstCntlUSTV_AntragPosition1 + ' + Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(0, 0) + Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1" + Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1298, 267) + Me.UstCntlUSTV_AntragPosition1.TabIndex = 0 + ' 'Panel4 ' Me.Panel4.BackColor = System.Drawing.Color.WhiteSmoke @@ -644,102 +735,11 @@ Partial Class frmMDM_USTVAntrag Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.Button2.UseVisualStyleBackColor = True ' - 'dgvUSTVPositionen - ' - Me.dgvUSTVPositionen.AKTUALISIERUNGS_INTERVALL = 500 - Me.dgvUSTVPositionen.AllowUserToAddRows = False - Me.dgvUSTVPositionen.AllowUserToDeleteRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUSTVPositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 - Me.dgvUSTVPositionen.BackgroundColor = System.Drawing.Color.White - Me.dgvUSTVPositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvUSTVPositionen.Dock = System.Windows.Forms.DockStyle.Fill - Me.dgvUSTVPositionen.Location = New System.Drawing.Point(0, 0) - Me.dgvUSTVPositionen.MultiSelect = False - Me.dgvUSTVPositionen.Name = "dgvUSTVPositionen" - Me.dgvUSTVPositionen.ReadOnly = True - Me.dgvUSTVPositionen.RowHeadersVisible = False - Me.dgvUSTVPositionen.RowHeadersWidth = 62 - Me.dgvUSTVPositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUSTVPositionen.Size = New System.Drawing.Size(1452, 265) - Me.dgvUSTVPositionen.TabIndex = 0 - ' - 'txtVon - ' - Me.txtVon._DateTimeOnly = False - Me.txtVon._numbersOnly = False - Me.txtVon._numbersOnlyKommastellen = "" - Me.txtVon._numbersOnlyTrennzeichen = True - Me.txtVon._Prozent = False - Me.txtVon._ShortDateNew = True - Me.txtVon._ShortDateOnly = False - Me.txtVon._TimeOnly = False - Me.txtVon._TimeOnly_Seconds = False - Me.txtVon._value = "" - Me.txtVon._Waehrung = False - Me.txtVon._WaehrungZeichen = True - Me.txtVon.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.txtVon.ForeColor = System.Drawing.Color.Black - Me.txtVon.Location = New System.Drawing.Point(101, 10) - Me.txtVon.MaxLength = 10 - Me.txtVon.MaxLineLength = -1 - Me.txtVon.MaxLines_Warning = "" - Me.txtVon.MaxLines_Warning_Label = Nothing - Me.txtVon.Name = "txtVon" - Me.txtVon.Size = New System.Drawing.Size(100, 23) - Me.txtVon.TabIndex = 6 - ' - 'txtBis - ' - Me.txtBis._DateTimeOnly = False - Me.txtBis._numbersOnly = False - Me.txtBis._numbersOnlyKommastellen = "" - Me.txtBis._numbersOnlyTrennzeichen = True - Me.txtBis._Prozent = False - Me.txtBis._ShortDateNew = True - Me.txtBis._ShortDateOnly = False - Me.txtBis._TimeOnly = False - Me.txtBis._TimeOnly_Seconds = False - Me.txtBis._value = "" - Me.txtBis._Waehrung = False - Me.txtBis._WaehrungZeichen = True - Me.txtBis.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.txtBis.ForeColor = System.Drawing.Color.Black - Me.txtBis.Location = New System.Drawing.Point(227, 10) - Me.txtBis.MaxLength = 10 - Me.txtBis.MaxLineLength = -1 - Me.txtBis.MaxLines_Warning = "" - Me.txtBis.MaxLines_Warning_Label = Nothing - Me.txtBis.Name = "txtBis" - Me.txtBis.Size = New System.Drawing.Size(100, 23) - Me.txtBis.TabIndex = 8 - ' - 'cboStatus - ' - Me.cboStatus._allowedValuesFreiText = Nothing - Me.cboStatus._allowFreiText = False - Me.cboStatus._value = "" - Me.cboStatus.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer)) - Me.cboStatus.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) - Me.cboStatus.FormattingEnabled = True - Me.cboStatus.Location = New System.Drawing.Point(76, 16) - Me.cboStatus.Name = "cboStatus" - Me.cboStatus.Size = New System.Drawing.Size(394, 28) - Me.cboStatus.TabIndex = 1 - ' - 'UstCntlUSTV_AntragPosition1 - ' - Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(0, 0) - Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1" - Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1298, 267) - Me.UstCntlUSTV_AntragPosition1.TabIndex = 0 - ' 'frmMDM_USTVAntrag ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1454, 813) + Me.ClientSize = New System.Drawing.Size(1454, 749) Me.Controls.Add(Me.pnlFilter) Me.Controls.Add(Me.pnl) Me.Controls.Add(Me.Panel3) @@ -763,10 +763,10 @@ Partial Class frmMDM_USTVAntrag Me.FlowLayoutPanel.ResumeLayout(False) Me.FlowLayoutPanel.PerformLayout() Me.pnlFilter.ResumeLayout(False) + CType(Me.dgvUSTVPositionen, System.ComponentModel.ISupportInitialize).EndInit() Me.pnl.ResumeLayout(False) Me.Panel2.ResumeLayout(False) Me.Panel4.ResumeLayout(False) - CType(Me.dgvUSTVPositionen, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub