Mergekonflik aufgelöst

2023-02-13 16:35:06 +01:00
parent 5949592584
commit 69599f989d
3 changed files with 186 additions and 134 deletions
--- a/initATLASAufschubkonten/frmStartOptions.Designer.vb
+++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb
@@ -162,8 +162,12 @@ Partial Class frmStartOptions
        Me.lklAufschubkontenATLASEZOLL = New System.Windows.Forms.LinkLabel()
        Me.lblRoutineManager = New System.Windows.Forms.Label()
        Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.LinkLabel38 = New System.Windows.Forms.LinkLabel()
-        Me.PictureBox17 = New System.Windows.Forms.PictureBox()
+        Me.cbxDatevOpen = New System.Windows.Forms.CheckBox()
+        Me.cbxDatevBuchungen = New System.Windows.Forms.CheckBox()
+        Me.cbxDatevDebitoren = New System.Windows.Forms.CheckBox()
+        Me.btnDatev = New System.Windows.Forms.Button()
+        Me.lblDatev = New System.Windows.Forms.Label()
+        Me.cbxDatevTest = New System.Windows.Forms.CheckBox()
        Me.pnl.SuspendLayout()
        CType(Me.piceZollAnh, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.tbcntr.SuspendLayout()
@@ -195,12 +199,12 @@ Partial Class frmStartOptions
        '
        Me.pnl.BackColor = System.Drawing.Color.White
        Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.pnl.Controls.Add(Me.cbxTestDatev)
-        Me.pnl.Controls.Add(Me.cbxOpenDatev)
-        Me.pnl.Controls.Add(Me.cbxBuchungenDatev)
-        Me.pnl.Controls.Add(Me.cbxKundenDatev)
-        Me.pnl.Controls.Add(Me.Button17)
-        Me.pnl.Controls.Add(Me.Label22)
+        Me.pnl.Controls.Add(Me.cbxDatevTest)
+        Me.pnl.Controls.Add(Me.cbxDatevOpen)
+        Me.pnl.Controls.Add(Me.cbxDatevBuchungen)
+        Me.pnl.Controls.Add(Me.cbxDatevDebitoren)
+        Me.pnl.Controls.Add(Me.btnDatev)
+        Me.pnl.Controls.Add(Me.lblDatev)
        Me.pnl.Controls.Add(Me.Label21)
        Me.pnl.Controls.Add(Me.Button16)
        Me.pnl.Controls.Add(Me.Button14)
@@ -1583,9 +1587,6 @@ Partial Class frmStartOptions
        '
        'TabPage3
        '
-        Me.TabPage3.Controls.Add(Me.LinkLabel39)
-        Me.TabPage3.Controls.Add(Me.LinkLabel40)
-        Me.TabPage3.Controls.Add(Me.Label22)
        Me.TabPage3.Controls.Add(Me.LinkLabel34)
        Me.TabPage3.Controls.Add(Me.LinkLabel35)
        Me.TabPage3.Controls.Add(Me.Label17)
@@ -1979,27 +1980,75 @@ Partial Class frmStartOptions
        Me.txtGJ_UNISPED.Size = New System.Drawing.Size(53, 20)
        Me.txtGJ_UNISPED.TabIndex = 68
        '
-        'LinkLabel38
+        'cbxDatevOpen
        '
-        Me.LinkLabel38.AutoSize = True
-        Me.LinkLabel38.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.LinkLabel38.Location = New System.Drawing.Point(475, 125)
-        Me.LinkLabel38.Name = "LinkLabel38"
-        Me.LinkLabel38.Size = New System.Drawing.Size(141, 13)
-        Me.LinkLabel38.TabIndex = 59
-        Me.LinkLabel38.TabStop = True
-        Me.LinkLabel38.Text = "I0610 - Zust. Zollstelle (AES)"
+        Me.cbxDatevOpen.AutoSize = True
+        Me.cbxDatevOpen.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cbxDatevOpen.Location = New System.Drawing.Point(170, 345)
+        Me.cbxDatevOpen.Name = "cbxDatevOpen"
+        Me.cbxDatevOpen.Size = New System.Drawing.Size(56, 17)
+        Me.cbxDatevOpen.TabIndex = 74
+        Me.cbxDatevOpen.Text = "öffnen"
+        Me.cbxDatevOpen.UseVisualStyleBackColor = True
        '
-        'PictureBox17
+        'cbxDatevBuchungen
        '
-        Me.PictureBox17.BackgroundImage = CType(resources.GetObject("PictureBox17.BackgroundImage"), System.Drawing.Image)
-        Me.PictureBox17.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.PictureBox17.Location = New System.Drawing.Point(630, 120)
-        Me.PictureBox17.Name = "PictureBox17"
-        Me.PictureBox17.Size = New System.Drawing.Size(18, 18)
-        Me.PictureBox17.TabIndex = 60
-        Me.PictureBox17.TabStop = False
-        Me.PictureBox17.Visible = False
+        Me.cbxDatevBuchungen.AutoSize = True
+        Me.cbxDatevBuchungen.Checked = True
+        Me.cbxDatevBuchungen.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxDatevBuchungen.Location = New System.Drawing.Point(84, 345)
+        Me.cbxDatevBuchungen.Name = "cbxDatevBuchungen"
+        Me.cbxDatevBuchungen.Size = New System.Drawing.Size(81, 17)
+        Me.cbxDatevBuchungen.TabIndex = 73
+        Me.cbxDatevBuchungen.Text = "Buchungen"
+        Me.cbxDatevBuchungen.UseVisualStyleBackColor = True
+        '
+        'cbxDatevDebitoren
+        '
+        Me.cbxDatevDebitoren.AutoSize = True
+        Me.cbxDatevDebitoren.Checked = True
+        Me.cbxDatevDebitoren.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxDatevDebitoren.Location = New System.Drawing.Point(15, 345)
+        Me.cbxDatevDebitoren.Name = "cbxDatevDebitoren"
+        Me.cbxDatevDebitoren.Size = New System.Drawing.Size(63, 17)
+        Me.cbxDatevDebitoren.TabIndex = 72
+        Me.cbxDatevDebitoren.Text = "Kunden"
+        Me.cbxDatevDebitoren.UseVisualStyleBackColor = True
+        '
+        'btnDatev
+        '
+        Me.btnDatev.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnDatev.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.btnDatev.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnDatev.Location = New System.Drawing.Point(15, 318)
+        Me.btnDatev.Name = "btnDatev"
+        Me.btnDatev.Size = New System.Drawing.Size(211, 24)
+        Me.btnDatev.TabIndex = 71
+        Me.btnDatev.Text = "Kunden / Buchungen --> Datev"
+        Me.btnDatev.UseVisualStyleBackColor = True
+        '
+        'lblDatev
+        '
+        Me.lblDatev.AutoSize = True
+        Me.lblDatev.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblDatev.Location = New System.Drawing.Point(12, 302)
+        Me.lblDatev.Name = "lblDatev"
+        Me.lblDatev.Size = New System.Drawing.Size(142, 13)
+        Me.lblDatev.TabIndex = 70
+        Me.lblDatev.Text = "Routine Manager Datev"
+        '
+        'cbxDatevTest
+        '
+        Me.cbxDatevTest.AutoSize = True
+        Me.cbxDatevTest.Checked = True
+        Me.cbxDatevTest.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxDatevTest.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cbxDatevTest.Location = New System.Drawing.Point(15, 368)
+        Me.cbxDatevTest.Name = "cbxDatevTest"
+        Me.cbxDatevTest.Size = New System.Drawing.Size(79, 17)
+        Me.cbxDatevTest.TabIndex = 75
+        Me.cbxDatevTest.Text = "Testsystem"
+        Me.cbxDatevTest.UseVisualStyleBackColor = True
        '
        'frmStartOptions
        '
@@ -2184,4 +2233,10 @@ Partial Class frmStartOptions
    Friend WithEvents txtGJ_UNISPED As VERAG_PROG_ALLGEMEIN.MyTextBox
    Friend WithEvents LinkLabel38 As LinkLabel
    Friend WithEvents PictureBox17 As PictureBox
+    Friend WithEvents cbxDatevTest As CheckBox
+    Friend WithEvents cbxDatevOpen As CheckBox
+    Friend WithEvents cbxDatevBuchungen As CheckBox
+    Friend WithEvents cbxDatevDebitoren As CheckBox
+    Friend WithEvents btnDatev As Button
+    Friend WithEvents lblDatev As Label
 End Class