From 9d963d9e92792df7ebbde5fe4d17cf97d983c7ab Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Tue, 5 Sep 2023 21:42:34 +0200 Subject: [PATCH] Atilla 4802 --- SDL/Fakturierung/usrCntlFaktAbrechnung.vb | 2 +- SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb | 104 +++++++++---------- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index f49a665c..8f41c78d 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -1772,7 +1772,7 @@ Public Class usrCntlFaktAbrechnung Sub initFirma() Select Case cboFiliale._value Case "4805" : cboFirma.changeItem(11) : RECHNUNG.Firma_ID = 11 - Case "4801" : cboFirma.changeItem(7) : RECHNUNG.Firma_ID = 7 + Case "4801", "4802" : cboFirma.changeItem(7) : RECHNUNG.Firma_ID = 7 Case "5501" : cboFirma.changeItem(20) : RECHNUNG.Firma_ID = 20 '' Case "4819" : cboFirma.changeItem(4) : RECHNUNG.Firma_ID = 4 diff --git a/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb b/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb index b0a1da93..3cf8ade3 100644 --- a/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb +++ b/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb @@ -64,7 +64,6 @@ Partial Class usrCntlZOLLAuswertungen Me.Label19 = New System.Windows.Forms.Label() Me.cboEZOLLMandant = New System.Windows.Forms.ComboBox() Me.Label29 = New System.Windows.Forms.Label() - Me.cboEZOLLBrg = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboEZOLLStatus = New System.Windows.Forms.ComboBox() Me.Label20 = New System.Windows.Forms.Label() Me.datEZOLLBis = New System.Windows.Forms.DateTimePicker() @@ -142,7 +141,6 @@ Partial Class usrCntlZOLLAuswertungen Me.Label76 = New System.Windows.Forms.Label() Me.GroupBox11 = New System.Windows.Forms.GroupBox() Me.Label94 = New System.Windows.Forms.Label() - Me.cboBRG_Verimex = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Button22 = New System.Windows.Forms.Button() Me.Button19 = New System.Windows.Forms.Button() Me.Button18 = New System.Windows.Forms.Button() @@ -185,7 +183,6 @@ Partial Class usrCntlZOLLAuswertungen Me.Label56 = New System.Windows.Forms.Label() Me.Button12 = New System.Windows.Forms.Button() Me.Label53 = New System.Windows.Forms.Label() - Me.cboBrgEZollTC = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label55 = New System.Windows.Forms.Label() Me.datEZOLL_TC_Bis = New System.Windows.Forms.DateTimePicker() Me.Label57 = New System.Windows.Forms.Label() @@ -247,6 +244,9 @@ 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.cboBRG_Verimex = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboBrgEZollTC = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboEZOLLBrg = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.UsrCntlAuswertungenUIDPruefung1 = New SDL.usrCntlAuswertungenUIDPruefung() Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1 = New SDL.usrCntlAuswertungenKunden_Auftragsrueckgang() Me.UsrCntlAuswertungenEV_Veranlagungen1 = New SDL.usrCntlAuswertungenEV_Veranlagungen() @@ -754,20 +754,6 @@ Partial Class usrCntlZOLLAuswertungen Me.Label29.TabIndex = 19 Me.Label29.Text = "Mandant:" ' - 'cboEZOLLBrg - ' - Me.cboEZOLLBrg._allowedValuesFreiText = Nothing - Me.cboEZOLLBrg._allowFreiText = False - Me.cboEZOLLBrg._value = "" - Me.cboEZOLLBrg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboEZOLLBrg.DropDownWidth = 350 - Me.cboEZOLLBrg.FormattingEnabled = True - Me.cboEZOLLBrg.Items.AddRange(New Object() {"", "05AT510000G000FP7", "16AT520000G000VA6"}) - Me.cboEZOLLBrg.Location = New System.Drawing.Point(223, 69) - Me.cboEZOLLBrg.Name = "cboEZOLLBrg" - Me.cboEZOLLBrg.Size = New System.Drawing.Size(201, 21) - Me.cboEZOLLBrg.TabIndex = 12 - ' 'cboEZOLLStatus ' Me.cboEZOLLStatus.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList @@ -1240,7 +1226,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(643, 1829) + Me.tbcntr.Size = New System.Drawing.Size(609, 1829) Me.tbcntr.TabIndex = 22 ' 'TabPage1 @@ -1283,7 +1269,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(635, 1803) + Me.TabPage1.Size = New System.Drawing.Size(601, 1803) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Bürgschaften" Me.TabPage1.UseVisualStyleBackColor = True @@ -1607,19 +1593,6 @@ Partial Class usrCntlZOLLAuswertungen Me.Label94.TabIndex = 18 Me.Label94.Text = "Bürgschaft (keine Auswahl = alle):" ' - 'cboBRG_Verimex - ' - Me.cboBRG_Verimex._allowedValuesFreiText = Nothing - Me.cboBRG_Verimex._allowFreiText = False - Me.cboBRG_Verimex._value = "" - 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 - ' 'Button22 ' Me.Button22.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -2053,20 +2026,6 @@ Partial Class usrCntlZOLLAuswertungen Me.Label53.TabIndex = 13 Me.Label53.Text = "Bürgschaft (keine Auswahl = alle):" ' - 'cboBrgEZollTC - ' - Me.cboBrgEZollTC._allowedValuesFreiText = Nothing - Me.cboBrgEZollTC._allowFreiText = False - Me.cboBrgEZollTC._value = "" - Me.cboBrgEZollTC.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboBrgEZollTC.DropDownWidth = 350 - Me.cboBrgEZollTC.FormattingEnabled = True - Me.cboBrgEZollTC.Items.AddRange(New Object() {"", "05AT510000G000FP7", "16AT520000G000VA6"}) - Me.cboBrgEZollTC.Location = New System.Drawing.Point(437, 68) - Me.cboBrgEZollTC.Name = "cboBrgEZollTC" - Me.cboBrgEZollTC.Size = New System.Drawing.Size(201, 21) - Me.cboBrgEZollTC.TabIndex = 12 - ' 'Label55 ' Me.Label55.AutoSize = True @@ -2447,7 +2406,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(652, 1803) + Me.TabPage2.Size = New System.Drawing.Size(618, 1803) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Kunden" Me.TabPage2.UseVisualStyleBackColor = True @@ -2460,7 +2419,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(652, 1803) + Me.TabPage3.Size = New System.Drawing.Size(618, 1803) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "Fiskalvertretung / EV-Veranlagung" Me.TabPage3.UseVisualStyleBackColor = True @@ -2471,7 +2430,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(652, 1803) + Me.TabPage4.Size = New System.Drawing.Size(618, 1803) Me.TabPage4.TabIndex = 3 Me.TabPage4.Text = "Aufschubdaten" Me.TabPage4.UseVisualStyleBackColor = True @@ -2484,7 +2443,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(652, 1803) + Me.TabPage5.Size = New System.Drawing.Size(618, 1803) Me.TabPage5.TabIndex = 4 Me.TabPage5.Text = "UNISPED" Me.TabPage5.UseVisualStyleBackColor = True @@ -2692,9 +2651,50 @@ 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(643, 57) + Me.pnl.Size = New System.Drawing.Size(609, 57) Me.pnl.TabIndex = 23 ' + 'cboBRG_Verimex + ' + Me.cboBRG_Verimex._allowedValuesFreiText = Nothing + Me.cboBRG_Verimex._allowFreiText = False + Me.cboBRG_Verimex._value = "" + 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 + ' + 'cboBrgEZollTC + ' + Me.cboBrgEZollTC._allowedValuesFreiText = Nothing + Me.cboBrgEZollTC._allowFreiText = False + Me.cboBrgEZollTC._value = "" + Me.cboBrgEZollTC.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboBrgEZollTC.DropDownWidth = 350 + Me.cboBrgEZollTC.FormattingEnabled = True + Me.cboBrgEZollTC.Items.AddRange(New Object() {"", "05AT510000G000FP7", "16AT520000G000VA6"}) + Me.cboBrgEZollTC.Location = New System.Drawing.Point(437, 68) + Me.cboBrgEZollTC.Name = "cboBrgEZollTC" + Me.cboBrgEZollTC.Size = New System.Drawing.Size(201, 21) + Me.cboBrgEZollTC.TabIndex = 12 + ' + 'cboEZOLLBrg + ' + Me.cboEZOLLBrg._allowedValuesFreiText = Nothing + Me.cboEZOLLBrg._allowFreiText = False + Me.cboEZOLLBrg._value = "" + Me.cboEZOLLBrg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboEZOLLBrg.DropDownWidth = 350 + Me.cboEZOLLBrg.FormattingEnabled = True + Me.cboEZOLLBrg.Items.AddRange(New Object() {"", "05AT510000G000FP7", "16AT520000G000VA6"}) + Me.cboEZOLLBrg.Location = New System.Drawing.Point(223, 69) + Me.cboEZOLLBrg.Name = "cboEZOLLBrg" + Me.cboEZOLLBrg.Size = New System.Drawing.Size(201, 21) + Me.cboEZOLLBrg.TabIndex = 12 + ' 'UsrCntlAuswertungenUIDPruefung1 ' Me.UsrCntlAuswertungenUIDPruefung1.BackColor = System.Drawing.Color.White @@ -2762,7 +2762,7 @@ Partial Class usrCntlZOLLAuswertungen Me.Controls.Add(Me.tbcntr) Me.Controls.Add(Me.pnl) Me.Name = "usrCntlZOLLAuswertungen" - Me.Size = New System.Drawing.Size(643, 1445) + Me.Size = New System.Drawing.Size(609, 1445) Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() Me.GroupBox2.ResumeLayout(False)