Mergekonflik aufgelöst

This commit is contained in:
2023-02-13 16:35:06 +01:00
parent 5949592584
commit 69599f989d
3 changed files with 186 additions and 134 deletions

View File

@@ -3281,7 +3281,7 @@ Public Class frmStartOptions
Me.Cursor = Cursors.Default
End Sub
Private Sub LinkLabel40_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel40.LinkClicked
Private Sub LinkLabel40_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) 'Handles LinkLabel40.LinkClicked
Me.Visible = False
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
Dim f As New frmTRNCTS_NachrichtenVerarbeitung_ATEZ
@@ -3289,7 +3289,7 @@ Public Class frmStartOptions
Me.Visible = True
End Sub
Private Sub LinkLabel39_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel39.LinkClicked
Private Sub LinkLabel39_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) 'Handles LinkLabel39.LinkClicked
Me.Visible = False
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
Dim f As New frmTRNCTS_NachrichtenVerarbeitung_ATEZ
@@ -3297,9 +3297,9 @@ Public Class frmStartOptions
Me.Visible = True
End Sub
'Private Sub Button17_Click(sender As Object, e As EventArgs) Handles Button17.Click
' VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxDatevTestsystem.Checked
' VERAG_PROG_ALLGEMEIN.cDatev_Interface.genDatensatzCSV_ALL(cbxDatevOpen.Checked, cbxDatevDebitoren.Checked, cbxDatenBuchungen.Checked)
'End Sub
Private Sub btnDatev_Click(sender As Object, e As EventArgs) Handles btnDatev.Click
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxDatevTest.Checked
VERAG_PROG_ALLGEMEIN.cDatev_Interface.genDatensatzCSV_ALL(cbxDatevOpen.Checked, cbxDatevDebitoren.Checked, cbxDatevBuchungen.Checked)
End Sub
End Class