This commit is contained in:
2020-03-12 14:49:31 +01:00
parent f4c1a74870
commit cc28d5a6cf
197 changed files with 37402 additions and 4503 deletions

View File

@@ -4,6 +4,7 @@ Public Class frmKassenbuch
Dim SQL As New SQL
Public GESCHAEFTSJAHR As Integer = cRKSV.getGJ(Now) 'IIf(Now.Month = 1, Now.Year - 1, Now.Year)
Dim PERSONAL As cPersonal
Dim RKSV As cRKSV_Kasse
Dim PERSONAL_LG As cPersonal = Nothing
' Dim PERSONAL_TMP_MASTER_KASSSE As cPersonal
Dim KennwortTime As DateTime = CDate("01.01.1990")
@@ -53,7 +54,8 @@ Public Class frmKassenbuch
End Function
Private Sub frmKassenbuch_Load(sender As Object, e As EventArgs) Handles Me.Load
GESCHAEFTSJAHR = cRKSV.getGJ(Now)
RKSV = New cRKSV_Kasse(PERSONAL.cRKSV_KasseID)
GESCHAEFTSJAHR = cRKSV.getGJ(Now, RKSV.rksv_firma)
If PERSONAL.ID = 274 Then master_Kasse = True
@@ -83,7 +85,7 @@ Public Class frmKassenbuch
btnBelegEingang.Enabled = False
btnBelegGSKunde.Enabled = False
btnBelegLeihgeld.Enabled = False
Label15.Visible = True
Label15.Text = "MASTER-KASSE"
btnBelegKunde.Enabled = False
btnBelegAusgang.Enabled = False
pnl.Visible = True
@@ -107,7 +109,7 @@ Public Class frmKassenbuch
btnBelegEingang.Enabled = True
btnBelegGSKunde.Enabled = True
btnBelegLeihgeld.Enabled = True
Label15.Visible = False
Label15.Text = PERSONAL.KassenbuchNr
btnBelegKunde.Enabled = True
btnBelegAusgang.Enabled = True
pnl.Visible = False
@@ -389,7 +391,7 @@ Public Class frmKassenbuch
Case Else
End Select
Dim GESCHAEFTSJAHR = cRKSV.getGJ(von) ' iif (von.Month = 1, von.Year - 1, von.Year)
Dim GESCHAEFTSJAHR = cRKSV.getGJ(von, RKSV.rksv_firma) ' iif (von.Month = 1, von.Year - 1, von.Year)
Dim sum = 0
rpt.lblUeberschrift.Text = "Kassenbuch " & von.ToShortDateString & " bis " & bis.ToShortDateString
rpt.lblGeschaeftsjahr.Text = GESCHAEFTSJAHR
@@ -413,7 +415,7 @@ Public Class frmKassenbuch
rpt.lblJournalNr.Text = rpt.Fields.Item("JournalNr").Value()
Dim BuDat As Date = CDate(rpt.Fields.Item("Buchungsdatum").Value()).ToShortDateString
rpt.lblBelegDat.Text = BuDat
Dim GESCHAEFTSJAHR_TMP = cRKSV.getGJ(BuDat) ''IIf(BuDat.Month = 1, BuDat.Year - 1, BuDat.Year)
Dim GESCHAEFTSJAHR_TMP = cRKSV.getGJ(BuDat, RKSV.rksv_firma) ''IIf(BuDat.Month = 1, BuDat.Year - 1, BuDat.Year)
rpt.lblBelegNr.Text = IIf(rpt.Fields.Item("rksv_BelegId").Value Is DBNull.Value, "(" & rpt.Fields.Item("BelegNr").Value & ")", rpt.Fields.Item("rksv_BelegId").Value())
rpt.lblBuchungstext.Text = rpt.Fields.Item("Buchungstext").Value()
' rpt.lblKonto.Text = SQL.getValueTxtBySql("SELECT CASE WHEN COUNT(distinct(konto))>1 THEN 'div.' ELSE CONVERT(VARCHAR(4),MAX(konto)) END as Konto, SUM(soll)as Soll, SUM(haben) as Haben FROM [tblKassenbuch] " &
@@ -475,7 +477,7 @@ Public Class frmKassenbuch
End If
Dim von As Date = frmVonBis.datVon.Value.ToShortDateString
Dim bis As Date = frmVonBis.datBis.Value.ToShortDateString
Dim GESCHAEFTSJAHR = cRKSV.getGJ(Now) ' IIf(von.Month = 1, von.Year - 1, von.Year)
Dim GESCHAEFTSJAHR = cRKSV.getGJ(Now, RKSV.rksv_firma) ' IIf(von.Month = 1, von.Year - 1, von.Year)
' rpt.DataSource = SQL.loadDgvBySql("SELECT MIN(JournalNr)as JournalNr, MAX(BelegDat)as BelegDat,MAX(Buchungsdatum)as Buchungsdatum,MAX(belegNr) as BelegNr, (SELECT top 1 t.Buchungstext FROM [tblKassenbuch] as t WHERE journalnr=t.journalnr) as Buchungstext,(SELECT top 1 t.konto FROM [tblKassenbuch] as t WHERE journalnr=t.journalnr) as Konto, SUM(Soll) as Soll,SUM(haben) as Haben " &
' "FROM [tblKassenbuch] WHERE CAST(Buchungsdatum as date) BETWEEN '" & von.ToShortDateString & "' AND '" & bis.ToShortDateString & "' And Benutzer=" & PERSONAL.ID & " group by BelegNr", "FMZOLL") 'cProgramFunctions.dgridViewTods(dgvBelegPos)
@@ -544,7 +546,7 @@ Public Class frmKassenbuch
rpt.lblJournalNr.Text = rpt.Fields.Item("JournalNr").Value()
Dim BuDat As Date = CDate(rpt.Fields.Item("Buchungsdatum").Value()).ToShortDateString
rpt.lblBelegDat.Text = BuDat
Dim GESCHAEFTSJAHR_TMP = cRKSV.getGJ(BuDat) 'IIf(BuDat.Month = 1, BuDat.Year - 1, BuDat.Year)
Dim GESCHAEFTSJAHR_TMP = cRKSV.getGJ(BuDat, RKSV.rksv_firma) 'IIf(BuDat.Month = 1, BuDat.Year - 1, BuDat.Year)
rpt.lblBelegNr.Text = IIf(rpt.Fields.Item("rksv_BelegId").Value Is DBNull.Value, "(" & rpt.Fields.Item("BelegNr").Value & ")", rpt.Fields.Item("rksv_BelegId").Value())
rpt.lblBuchungstext.Text = rpt.Fields.Item("Buchungstext").Value()
rpt.lblKonto.Text = rpt.Fields.Item("Konto").Value()
@@ -616,7 +618,7 @@ Public Class frmKassenbuch
End If
Dim von As Date = frmVonBis.datVon.Value.ToShortDateString
Dim bis As Date = frmVonBis.datBis.Value.ToShortDateString
Dim GESCHAEFTSJAHR = cRKSV.getGJ(von) ' IIf(von.Month = 1, von.Year - 1, von.Year)
Dim GESCHAEFTSJAHR = cRKSV.getGJ(von, RKSV.rksv_firma) ' IIf(von.Month = 1, von.Year - 1, von.Year)
Dim where = ""
Dim benutzerTMP = ""
@@ -850,7 +852,11 @@ Public Class frmKassenbuch
End If
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then
If Not PERSONAL.isLeihgeldkasse Then btnBelegLeihgeld.Visible = False
btnBelegGSKunde.Visible = False
btnBelegGSKunde.Visible = False 'VERAG-MDM KAsse bei IMEX
If PERSONAL.cRKSV_Kasse.rksv_id = 1 Then
btnBelegGSKunde.Visible = True
btnBelegKunde.Enabled = False
End If
End If
If PERSONAL.cRKSV_Kasse Is Nothing Then