Merge branch 'newMaster2024' of https://dev.azure.com/VeragAG/_git/SDL into newMaster2024

This commit is contained in:
2025-08-13 15:36:08 +02:00
2 changed files with 9 additions and 13 deletions

View File

@@ -3298,9 +3298,7 @@
<Compile Include="zoll\usrCntlZOLLAuswertungen.Designer.vb"> <Compile Include="zoll\usrCntlZOLLAuswertungen.Designer.vb">
<DependentUpon>usrCntlZOLLAuswertungen.vb</DependentUpon> <DependentUpon>usrCntlZOLLAuswertungen.vb</DependentUpon>
</Compile> </Compile>
<Compile Include="zoll\usrCntlZOLLAuswertungen.vb"> <Compile Include="zoll\usrCntlZOLLAuswertungen.vb" />
<SubType>UserControl</SubType>
</Compile>
<Compile Include="zoll\usrCntlZollHauptmenue.Designer.vb"> <Compile Include="zoll\usrCntlZollHauptmenue.Designer.vb">
<DependentUpon>usrCntlZollHauptmenue.vb</DependentUpon> <DependentUpon>usrCntlZollHauptmenue.vb</DependentUpon>
</Compile> </Compile>

View File

@@ -1302,7 +1302,7 @@ Partial Class usrCntlZOLLAuswertungen
Me.tbcntr.Location = New System.Drawing.Point(0, 57) Me.tbcntr.Location = New System.Drawing.Point(0, 57)
Me.tbcntr.Name = "tbcntr" Me.tbcntr.Name = "tbcntr"
Me.tbcntr.SelectedIndex = 0 Me.tbcntr.SelectedIndex = 0
Me.tbcntr.Size = New System.Drawing.Size(1228, 1829) Me.tbcntr.Size = New System.Drawing.Size(1211, 1829)
Me.tbcntr.TabIndex = 22 Me.tbcntr.TabIndex = 22
' '
'TabPage1 'TabPage1
@@ -1345,7 +1345,7 @@ Partial Class usrCntlZOLLAuswertungen
Me.TabPage1.Location = New System.Drawing.Point(4, 22) Me.TabPage1.Location = New System.Drawing.Point(4, 22)
Me.TabPage1.Name = "TabPage1" Me.TabPage1.Name = "TabPage1"
Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
Me.TabPage1.Size = New System.Drawing.Size(1220, 1803) Me.TabPage1.Size = New System.Drawing.Size(1203, 1803)
Me.TabPage1.TabIndex = 0 Me.TabPage1.TabIndex = 0
Me.TabPage1.Text = "Bürgschaften" Me.TabPage1.Text = "Bürgschaften"
Me.TabPage1.UseVisualStyleBackColor = True Me.TabPage1.UseVisualStyleBackColor = True
@@ -2542,7 +2542,7 @@ Partial Class usrCntlZOLLAuswertungen
Me.TabPage2.Location = New System.Drawing.Point(4, 22) Me.TabPage2.Location = New System.Drawing.Point(4, 22)
Me.TabPage2.Name = "TabPage2" Me.TabPage2.Name = "TabPage2"
Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
Me.TabPage2.Size = New System.Drawing.Size(1237, 1803) Me.TabPage2.Size = New System.Drawing.Size(1203, 1803)
Me.TabPage2.TabIndex = 1 Me.TabPage2.TabIndex = 1
Me.TabPage2.Text = "Kunden" Me.TabPage2.Text = "Kunden"
Me.TabPage2.UseVisualStyleBackColor = True Me.TabPage2.UseVisualStyleBackColor = True
@@ -2557,12 +2557,10 @@ Partial Class usrCntlZOLLAuswertungen
' '
'UsrCntlAuswertungenKunden_Auftragsrueckgang1 'UsrCntlAuswertungenKunden_Auftragsrueckgang1
' '
Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.BackColor = System.Drawing.Color.White Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.BackColor = System.Drawing.Color.White
Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Location = New System.Drawing.Point(6, 18) Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Location = New System.Drawing.Point(6, 18)
Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Name = "UsrCntlAuswertungenKunden_Auftragsrueckgang1" Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Name = "UsrCntlAuswertungenKunden_Auftragsrueckgang1"
Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Size = New System.Drawing.Size(0, 235) Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Size = New System.Drawing.Size(708, 235)
Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.TabIndex = 0 Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.TabIndex = 0
' '
'TabPage3 'TabPage3
@@ -2608,7 +2606,7 @@ Partial Class usrCntlZOLLAuswertungen
Me.TabPage4.Controls.Add(Me.UsrCntlAuswertungenAufschub_Abgabenliste1) Me.TabPage4.Controls.Add(Me.UsrCntlAuswertungenAufschub_Abgabenliste1)
Me.TabPage4.Location = New System.Drawing.Point(4, 22) Me.TabPage4.Location = New System.Drawing.Point(4, 22)
Me.TabPage4.Name = "TabPage4" Me.TabPage4.Name = "TabPage4"
Me.TabPage4.Size = New System.Drawing.Size(1237, 1803) Me.TabPage4.Size = New System.Drawing.Size(1220, 1803)
Me.TabPage4.TabIndex = 3 Me.TabPage4.TabIndex = 3
Me.TabPage4.Text = "Aufschubdaten" Me.TabPage4.Text = "Aufschubdaten"
Me.TabPage4.UseVisualStyleBackColor = True Me.TabPage4.UseVisualStyleBackColor = True
@@ -2637,7 +2635,7 @@ Partial Class usrCntlZOLLAuswertungen
Me.TabPage5.Location = New System.Drawing.Point(4, 22) Me.TabPage5.Location = New System.Drawing.Point(4, 22)
Me.TabPage5.Name = "TabPage5" Me.TabPage5.Name = "TabPage5"
Me.TabPage5.Padding = New System.Windows.Forms.Padding(3) Me.TabPage5.Padding = New System.Windows.Forms.Padding(3)
Me.TabPage5.Size = New System.Drawing.Size(1237, 1803) Me.TabPage5.Size = New System.Drawing.Size(1220, 1803)
Me.TabPage5.TabIndex = 4 Me.TabPage5.TabIndex = 4
Me.TabPage5.Text = "UNISPED" Me.TabPage5.Text = "UNISPED"
Me.TabPage5.UseVisualStyleBackColor = True Me.TabPage5.UseVisualStyleBackColor = True
@@ -2845,7 +2843,7 @@ Partial Class usrCntlZOLLAuswertungen
Me.pnl.Dock = System.Windows.Forms.DockStyle.Top Me.pnl.Dock = System.Windows.Forms.DockStyle.Top
Me.pnl.Location = New System.Drawing.Point(0, 0) Me.pnl.Location = New System.Drawing.Point(0, 0)
Me.pnl.Name = "pnl" Me.pnl.Name = "pnl"
Me.pnl.Size = New System.Drawing.Size(1228, 57) Me.pnl.Size = New System.Drawing.Size(1211, 57)
Me.pnl.TabIndex = 23 Me.pnl.TabIndex = 23
' '
'usrCntlZOLLAuswertungen 'usrCntlZOLLAuswertungen
@@ -2857,7 +2855,7 @@ Partial Class usrCntlZOLLAuswertungen
Me.Controls.Add(Me.tbcntr) Me.Controls.Add(Me.tbcntr)
Me.Controls.Add(Me.pnl) Me.Controls.Add(Me.pnl)
Me.Name = "usrCntlZOLLAuswertungen" Me.Name = "usrCntlZOLLAuswertungen"
Me.Size = New System.Drawing.Size(1228, 1174) Me.Size = New System.Drawing.Size(1211, 1174)
Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.ResumeLayout(False)
Me.GroupBox1.PerformLayout() Me.GroupBox1.PerformLayout()
Me.grpDurmaz.ResumeLayout(False) Me.grpDurmaz.ResumeLayout(False)