Timas, Fakt -> Leihgeldkasse, etc.

SDL/Classes/cRKSV.vb

@@ -2517,22 +2517,19 @@ Public Class cRKSV
     End Function
 
 
-    Public Shared Property DefaultMandant As Integer = 9
+    Public Shared Property DefaultMandant As Integer = IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, 9, 7)
     Public Shared Property DefaultKassenkonto As Integer = 2700
 
     Public Shared Function CreateSyskaBuchung(RKSV_id As Integer, beleg As EABeleg, KBEntry_list As List(Of cKassenbuch), KBEntryGB_list As List(Of cKassenbuch), KBEntryST_list As List(Of cKassenbuch), typ As String) As Boolean
 
 
-
-
         If beleg Is Nothing Then Throw New ArgumentNullException(NameOf(beleg))
         If Not (beleg.Beleg_TYP = "L" Or beleg.Beleg_TYP = "K") Then
             Return False
         End If
 
-
         If DefaultMandant = 9 Then
-            MsgBox("ACHTUNG, Daten werden in Mandant " & DefaultMandant & " eingespielt -> TESTMANDANT!")
+            MsgBox("ACHTUNG, Daten werden in Mandant " & DefaultMandant & " eingespielt -> " & IIf(DefaultMandant = 9, "TESTMANDANT!", "PRODUKTIVMANDANT!"))
         End If
 
         Dim sql As New VERAG_PROG_ALLGEMEIN.SQL()
@@ -2589,7 +2586,7 @@ Public Class cRKSV
 
         Dim FIBU_YEAR = jahr
         Dim BelegNrUID As String = "BR"
-        If periode = 1 Then FIBU_YEAR = FIBU_YEAR - 1
+        'If periode = 1 Then FIBU_YEAR = FIBU_YEAR - 1
         BelegNrUID &= FIBU_YEAR.ToString.Substring(2, 2)
         BelegNrUID &= i_beleg_refid.ToString("D5")
 
@@ -2858,9 +2855,9 @@ Public Class cRKSV
         Dim gebucht = checkifgebucht_new(mandant, SafeString(BelegNrUID), buchungstext)
         If gebucht Then
             ' logging instead of MsgBox in production
-            ' MsgBox("GEBUCHT!")
+            MsgBox("GEBUCHT!")
         Else
-            ' MsgBox("NICHT GEBUCHT!")
+            MsgBox("NICHT GEBUCHT!")
         End If
 
         Return gebucht
@@ -2915,7 +2912,7 @@ Public Class cRKSV
 
     Private Shared Function GetStapelRefId(sql As VERAG_PROG_ALLGEMEIN.SQL, mandant As Integer) As String
         Dim v = sql.getValueTxtBySqlVarList("SELECT i_stapel_refid FROM [FIBU2].dbo.fibu_stapelart WHERE c_stapelname Like 'Auszahlungskasse 1' AND i_firm_refid = " & SafeIntToSql(mandant), "FIBU",, "")
-                Return If(String.IsNullOrWhiteSpace(v), "0000", v)
+        Return If(String.IsNullOrWhiteSpace(v), "0000", v)
     End Function
 
     Private Shared Function GetNextStapelLfdNr(sql As VERAG_PROG_ALLGEMEIN.SQL, stapelRefId As String, mandant As Integer) As Integer