edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

20200108

Browse Source
This commit is contained in:
Andreas Luxbauer
2020-01-08 14:52:43 +01:00
parent bea8632eb5
commit f4c1a74870
136 changed files with 11561 additions and 1072 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SDL/kassenbuch/KassenbuchSuche/frmKassenbuchSuche.vb
View File

@@ -843,7 +843,7 @@ Public Class frmKassenbuchSuche
Dim sqlStr = ""
sqlStr &= " SELECT Benutzer,Name, Konto, Sum(tblKassenbuch.Soll) AS Soll, Sum(tblKassenbuch.Haben) AS Haben, (Sum(tblKassenbuch.Soll)-Sum(tblKassenbuch.Haben)) AS Saldo "
sqlStr &= " FROM Personal INNER JOIN tblKassenbuch ON Personal.ID = tblKassenbuch.Benutzer "
sqlStr &= " WHERE tblKassenbuch.Geschäftsjahr='" & If(Now.Month = 1, Now.Year - 1, Now.Year) & "' and konto=KassenbuchNr "
sqlStr &= " WHERE tblKassenbuch.Geschäftsjahr='" & cRKSV.getGJ(Now) & "' and konto=KassenbuchNr "
If MyComboBox1._value <> "" Then sqlStr &= " AND rksv_id=" & MyComboBox1._value & " "
If MyComboBox2._value <> "" Then sqlStr &= " AND tblKassenbuch.Niederlassung ='" & MyComboBox2._value & "'"
sqlStr &= " group by Benutzer,Name, Konto order by Name"

1
SDL/kassenbuch/frmBelegNeu.vb
View File

@@ -325,6 +325,7 @@ Public Class frmBelegNeu
If PERSONAL.Niederlassung = "WAI" Then where = "Preislisten_visibleWAI = 1"
If PERSONAL.Niederlassung = "NKD" Then where = "Preislisten_visibleNKD = 1"
If PERSONAL.Niederlassung = "IME" Then where = "Preislisten_visibleIMEX = 1"
If PERSONAL.Mandant = "FO" Then where = "Preislisten_visibleFRONTOFFICE = 1"
If PERSONAL.isLeihgeldkasse Then

20
SDL/kassenbuch/frmKassenbuch.vb
View File

@@ -2,7 +2,7 @@
Public Class frmKassenbuch
Dim SQL As New SQL
Public GESCHAEFTSJAHR As Integer = IIf(Now.Month = 1, Now.Year - 1, Now.Year)
Public GESCHAEFTSJAHR As Integer = cRKSV.getGJ(Now) 'IIf(Now.Month = 1, Now.Year - 1, Now.Year)
Dim PERSONAL As cPersonal
Dim PERSONAL_LG As cPersonal = Nothing
' Dim PERSONAL_TMP_MASTER_KASSSE As cPersonal
@@ -52,6 +52,10 @@ Public Class frmKassenbuch
End If
End Function
Private Sub frmKassenbuch_Load(sender As Object, e As EventArgs) Handles Me.Load
GESCHAEFTSJAHR = cRKSV.getGJ(Now)
If PERSONAL.ID = 274 Then master_Kasse = True
If VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN" Or VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "SIENER" Then
Button6.Visible = True
@@ -385,7 +389,7 @@ Public Class frmKassenbuch
Case Else
End Select
Dim GESCHAEFTSJAHR = IIf(von.Month = 1, von.Year - 1, von.Year)
Dim GESCHAEFTSJAHR = cRKSV.getGJ(von) ' 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
@@ -409,7 +413,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 = IIf(BuDat.Month = 1, BuDat.Year - 1, BuDat.Year)
Dim GESCHAEFTSJAHR_TMP = cRKSV.getGJ(BuDat) ''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] " &
@@ -471,7 +475,7 @@ Public Class frmKassenbuch
End If
Dim von As Date = frmVonBis.datVon.Value.ToShortDateString
Dim bis As Date = frmVonBis.datBis.Value.ToShortDateString
Dim GESCHAEFTSJAHR = IIf(von.Month = 1, von.Year - 1, von.Year)
Dim GESCHAEFTSJAHR = cRKSV.getGJ(Now) ' 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)
@@ -540,7 +544,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 = IIf(BuDat.Month = 1, BuDat.Year - 1, BuDat.Year)
Dim GESCHAEFTSJAHR_TMP = cRKSV.getGJ(BuDat) '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()
@@ -612,7 +616,7 @@ Public Class frmKassenbuch
End If
Dim von As Date = frmVonBis.datVon.Value.ToShortDateString
Dim bis As Date = frmVonBis.datBis.Value.ToShortDateString
Dim GESCHAEFTSJAHR = IIf(von.Month = 1, von.Year - 1, von.Year)
Dim GESCHAEFTSJAHR = cRKSV.getGJ(von) ' IIf(von.Month = 1, von.Year - 1, von.Year)
Dim where = ""
Dim benutzerTMP = ""
@@ -1138,7 +1142,7 @@ Public Class frmKassenbuch
Case Else
End Select
Dim GESCHAEFTSJAHR = IIf(von.Month = 1, von.Year - 1, von.Year)
Dim GESCHAEFTSJAHR = cRKSV.getGJ(von) ' 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
@@ -1164,7 +1168,7 @@ Public Class frmKassenbuch
Dim BuDat As Date = CDate(rpt.Fields.Item("Buchungsdatum").Value()).ToShortDateString
rpt.lblBelegDat.Text = BuDat
Dim GESCHAEFTSJAHR_TMP = IIf(BuDat.Month = 1, BuDat.Year - 1, BuDat.Year)
Dim GESCHAEFTSJAHR_TMP = cRKSV.getGJ(BuDat) '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.lblBuText.Text = rpt.Fields.Item("Buchungstext").Value()

2
SDL/kassenbuch/frmNacherfassungLeihgeld.vb
View File

@@ -565,7 +565,7 @@ Public Class frmNacherfassungLeihgeld
If barcodeLKW IsNot Nothing Then VALUES.barcodeLKW = barcodeLKW
If barcode IsNot Nothing Then VALUES.barcodeSendung = barcode
Dim rpt As New Gemeinsames.rptSendungen(VALUES, imgpath, Nothing)
Dim rpt As New Gemeinsames.rptSendungen(VALUES, imgpath, Nothing, Nothing)
' rpt.Document.CacheToDisk = True
'rpt.Document.CacheToDiskLocation = "C:\\Temp"
' rpt.Run()

3
SDL/kassenbuch/frmSecureLoginKassenbuch.vb
View File

@@ -95,6 +95,7 @@ Public Class frmSecureLoginKassenbuch
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Case "ATILLA" : where = " AND Niederlassung = 'SUA' "
Case "IMEX" : where = " AND Mandant = 'IMEX' "
Case "FRONTOFFICE" : where = " AND Mandant = 'FO' "
Case Else
If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("KASSE_BH_LOGIN", Me) Then
where = " AND Niederlassung <> 'SUA' "
@@ -146,7 +147,7 @@ Public Class frmSecureLoginKassenbuch
Dim sqlstr = "SELECT Sum(tblKassenbuch.Soll) AS Soll, Sum(tblKassenbuch.Haben) AS Haben, (Sum(tblKassenbuch.Soll)-Sum(tblKassenbuch.Haben)) AS Saldo " &
" FROM Personal INNER JOIN tblKassenbuch ON Personal.ID = tblKassenbuch.Benutzer " &
" WHERE tblKassenbuch.Mandant='" & PERSONAL_tmp.Mandant & "' AND tblKassenbuch.Niederlassung='" & PERSONAL_tmp.Niederlassung & "' " &
" And tblKassenbuch.Benutzer=" & PERSONAL_tmp.ID & " AND tblKassenbuch.Geschäftsjahr=" & IIf(Now.Month = 1, Now.Year - 1, Now.Year) & " AND tblKassenbuch.Konto=" & PERSONAL_tmp.KassenbuchNr & ""
" And tblKassenbuch.Benutzer=" & PERSONAL_tmp.ID & " AND tblKassenbuch.Geschäftsjahr=" & cRKSV.getGJ(Now) & " AND tblKassenbuch.Konto=" & PERSONAL_tmp.KassenbuchNr & ""
Dim dt As DataTable = SQL.loadDgvBySql(sqlstr, "FMZOLL")
Label6.Text = CDbl(If(dt.Rows.Count > 0, cSqlDb.checkNullReturnValue(dt.Rows(0)("Saldo"), 0), 0)).ToString("C")