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

div. Änderungen

Browse Source
This commit is contained in:
d.breimaier
2024-05-14 10:44:36 +02:00
parent 5e3b74a19f
commit 1c51d948a9
10 changed files with 247 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb
View File

@@ -541,6 +541,8 @@ Public Class cRechnungsausgang
End If
End If
'checkFirmen
Return True
End Function

2
VERAG_PROG_ALLGEMEIN/Classes/cUeberstunden.vb
View File

@@ -21,6 +21,7 @@ Public Class cUeberstunden
Property uest_overwriteValue As Boolean
Property uest_paidout_sum As Object = Nothing
Property uest_isParttime As Boolean
Property uest_ignorePayoutDate As Boolean
Public hasEntry = False
@@ -59,6 +60,7 @@ Public Class cUeberstunden
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uest_overwriteValue", uest_overwriteValue))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uest_paidout_sum", uest_paidout_sum))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uest_isParttime", uest_isParttime))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uest_ignorePayoutDate", uest_ignorePayoutDate))
Return list
End Function

10
VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb
View File

@@ -596,6 +596,7 @@ Public Class frmUeberstundenauszahlen
Dim checkauszahlungsdatum As Boolean = False
Dim meldung As String = ""
Dim stichtag As Integer = 25
Dim ignoreAuszahlungsdatum As Boolean = False
Select Case MA.mit_firma
Case "ATILLA"
meldung = " des Vormonats"
@@ -613,7 +614,13 @@ Public Class frmUeberstundenauszahlen
If Not checkauszahlungsdatum Then
Dim check = InputBox("Die Ü-Std. von " & MonthName(auszahlugsdatum.Month) & " wurden uU schon in die Lohnverrechnung übertragen (Stichtag: " & stichtag & meldung & ")!" & vbNewLine & "Wollten Sie die Ü-Std. trotzdem in Timas austragen, dann bitte GELESEN eingeben!", "Auszahlungsmonat beachten!")
If check <> "GELESEN" Then Exit Sub
If check <> "GELESEN" Then
Exit Sub
Else
ignoreAuszahlungsdatum = True
End If
End If
'65;"01-Lfd Saldo"
@@ -750,6 +757,7 @@ Public Class frmUeberstundenauszahlen
ues.uest_maxUE = CDbl(txtSummeAuszb.Text)
ues.uest_paidout_sum = gesamt
ues.uest_isParttime = cbxTeilzeit.Checked
ues.uest_ignorePayoutDate = ignoreAuszahlungsdatum
If istTeilzeit Then
ues.uest_25 = sum0

26
VERAG_PROG_ALLGEMEIN/Schnittstellen/cDatev_Interface.vb
View File

@@ -79,7 +79,7 @@
End Function
Public Shared Function genDatensatzCSV_Stammdaten(ByRef Firma_ID As Integer, Optional OpenFile As Boolean = False, Optional Geschaeftsjahr As Integer = -1) As Boolean ' Optional OpenFile = False, Optional boolKunden = True, Optional boolBuchungen = True ) As Boolean
Public Shared Function genDatensatzCSV_Stammdaten(ByRef Firma_ID As Integer, Optional OpenFile As Boolean = False, Optional Geschaeftsjahr As Integer = -1, Optional filepath As String = "") As Boolean ' Optional OpenFile = False, Optional boolKunden = True, Optional boolBuchungen = True ) As Boolean
Try
Dim FIRMA As New VERAG_PROG_ALLGEMEIN.cFirmen(Firma_ID)
@@ -147,6 +147,7 @@
End If
updateFibu(filialNr) ' UPDATE FiBuSchnittstelle --> 0
filepath = pathKD & DateinameKD
Return True
End If
@@ -161,8 +162,10 @@
Public Shared Function genDatensatzCSV_ALL(firma As String, Optional OpenFile As Boolean = False, Optional boolKunden As Boolean = True, Optional boolBuchungen As Boolean = True, Optional Geschaeftsjahr As Integer = -1) As Boolean
Public Shared Function genDatensatzCSV_ALL(firma As String, Optional OpenFile As Boolean = False, Optional boolKunden As Boolean = True, Optional boolBuchungen As Boolean = True, Optional Geschaeftsjahr As Integer = -1, Optional PathList As List(Of String) = Nothing) As Boolean
PathList.Clear()
Dim Path = ""
If firma <> "AMBAR" Then
MsgBox("Export für Firma" & firma & " nicht aktiviert")
@@ -171,20 +174,26 @@
Dim CSV_ALL = True
If boolKunden Then
If Not genDatensatzCSV_Stammdaten(24, OpenFile, Geschaeftsjahr) Then
If Not genDatensatzCSV_Stammdaten(24, OpenFile, Geschaeftsjahr, Path) Then
CSV_ALL = False
If Path <> "" Then
PathList.Add(Path)
End If
End If
End If
If boolBuchungen Then
If Not genDatensatzCSV_Buchungen(24, OpenFile, Geschaeftsjahr) Then
If Not genDatensatzCSV_Buchungen(24, OpenFile, Geschaeftsjahr, Path) Then
CSV_ALL = False
If Path <> "" Then
PathList.Add(Path)
End If
End If
End If
Return CSV_ALL
Return True
End Function
Public Shared Function genDatensatzCSV_Buchungen(ByRef Firma_ID As Integer, Optional OpenFile As Boolean = False, Optional Geschaeftsjahr As Integer = -1) As Boolean ' Optional OpenFile = False, Optional boolKunden = True, Optional boolBuchungen = True ) As Boolean
Public Shared Function genDatensatzCSV_Buchungen(ByRef Firma_ID As Integer, Optional OpenFile As Boolean = False, Optional Geschaeftsjahr As Integer = -1, Optional ByRef filepath As String = "") As Boolean ' Optional OpenFile = False, Optional boolKunden = True, Optional boolBuchungen = True ) As Boolean
Try
Dim FIRMA As New VERAG_PROG_ALLGEMEIN.cFirmen(Firma_ID)
@@ -235,7 +244,7 @@
bool_DatenVorhanden = True
'Update Filename TrdIn
SQL.doSQL("update [tblTrdinInvoice] Set TrdinDateiname='" & Now.ToString("ddMMyyyyHHmm") & "' WHERE [Firma_ID] = " & FIRMA.Firma_ID & " AND TrdinDateiname is null ", "FMZOLL")
SQL.doSQL("update [tblTrdinInvoice] Set TrdinDateiname='" & Now.ToString("ddMMyyyyHHmm") & "' WHERE [Firma_ID] = " & FIRMA.Firma_ID & " AND TrdinDateiname is null ", "FMZOLL")
file.Close()
@@ -250,10 +259,11 @@
Else
IO.File.Delete(path & Dateiname)
End If
filepath = path & Dateiname
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
End Try
Return True
End If
Catch ex As Exception