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

diverse Baustellen

Browse Source
This commit is contained in:
Andreas Luxbauer
2025-01-02 15:52:10 +01:00
parent 644f8ce128
commit e2d88b47e1
13 changed files with 176 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
SDL/Administration/frmKasseAbschliessen.Designer.vb generated
View File

@@ -27,8 +27,8 @@ Partial Class frmKasseAbschliessen
Me.lblKasseWahlen = New System.Windows.Forms.Label()
Me.Label1 = New System.Windows.Forms.Label()
Me.Label2 = New System.Windows.Forms.Label()
Me.NumericUpDown = New System.Windows.Forms.NumericUpDown()
Me.NumericUpDown1 = New System.Windows.Forms.NumericUpDown()
Me.numAltesGJ = New System.Windows.Forms.NumericUpDown()
Me.numNeuesGJ = New System.Windows.Forms.NumericUpDown()
Me.btnKassensaldoUbertragen = New System.Windows.Forms.Button()
Me.Label3 = New System.Windows.Forms.Label()
Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -42,8 +42,8 @@ Partial Class frmKasseAbschliessen
Me.txtxAbwBetragALT = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txtxAbwBetragNEU = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Label7 = New System.Windows.Forms.Label()
CType(Me.NumericUpDown, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.NumericUpDown1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.numAltesGJ, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.numNeuesGJ, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'MyComboBox2
@@ -84,27 +84,27 @@ Partial Class frmKasseAbschliessen
Me.Label2.TabIndex = 17
Me.Label2.Text = "neues Geschäftsjahr:"
'
'NumericUpDown
'numAltesGJ
'
Me.NumericUpDown.Location = New System.Drawing.Point(122, 70)
Me.NumericUpDown.Maximum = New Decimal(New Integer() {2100, 0, 0, 0})
Me.NumericUpDown.Minimum = New Decimal(New Integer() {1990, 0, 0, 0})
Me.NumericUpDown.Name = "NumericUpDown"
Me.NumericUpDown.Size = New System.Drawing.Size(72, 20)
Me.NumericUpDown.TabIndex = 19
Me.NumericUpDown.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
Me.NumericUpDown.Value = New Decimal(New Integer() {1990, 0, 0, 0})
Me.numAltesGJ.Location = New System.Drawing.Point(122, 70)
Me.numAltesGJ.Maximum = New Decimal(New Integer() {2100, 0, 0, 0})
Me.numAltesGJ.Minimum = New Decimal(New Integer() {1990, 0, 0, 0})
Me.numAltesGJ.Name = "numAltesGJ"
Me.numAltesGJ.Size = New System.Drawing.Size(72, 20)
Me.numAltesGJ.TabIndex = 19
Me.numAltesGJ.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
Me.numAltesGJ.Value = New Decimal(New Integer() {1990, 0, 0, 0})
'
'NumericUpDown1
'numNeuesGJ
'
Me.NumericUpDown1.Location = New System.Drawing.Point(122, 89)
Me.NumericUpDown1.Maximum = New Decimal(New Integer() {2100, 0, 0, 0})
Me.NumericUpDown1.Minimum = New Decimal(New Integer() {1990, 0, 0, 0})
Me.NumericUpDown1.Name = "NumericUpDown1"
Me.NumericUpDown1.Size = New System.Drawing.Size(72, 20)
Me.NumericUpDown1.TabIndex = 19
Me.NumericUpDown1.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
Me.NumericUpDown1.Value = New Decimal(New Integer() {1990, 0, 0, 0})
Me.numNeuesGJ.Location = New System.Drawing.Point(122, 89)
Me.numNeuesGJ.Maximum = New Decimal(New Integer() {2100, 0, 0, 0})
Me.numNeuesGJ.Minimum = New Decimal(New Integer() {1990, 0, 0, 0})
Me.numNeuesGJ.Name = "numNeuesGJ"
Me.numNeuesGJ.Size = New System.Drawing.Size(72, 20)
Me.numNeuesGJ.TabIndex = 19
Me.numNeuesGJ.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
Me.numNeuesGJ.Value = New Decimal(New Integer() {1990, 0, 0, 0})
'
'btnKassensaldoUbertragen
'
@@ -130,10 +130,12 @@ Partial Class frmKasseAbschliessen
Me.MyTextBox1._DateTimeOnly = False
Me.MyTextBox1._numbersOnly = False
Me.MyTextBox1._numbersOnlyKommastellen = ""
Me.MyTextBox1._numbersOnlyTrennzeichen = True
Me.MyTextBox1._Prozent = False
Me.MyTextBox1._ShortDateNew = False
Me.MyTextBox1._ShortDateOnly = False
Me.MyTextBox1._TimeOnly = False
Me.MyTextBox1._TimeOnly_Seconds = False
Me.MyTextBox1._value = ""
Me.MyTextBox1._Waehrung = True
Me.MyTextBox1._WaehrungZeichen = True
@@ -152,10 +154,12 @@ Partial Class frmKasseAbschliessen
Me.MyTextBox2._DateTimeOnly = False
Me.MyTextBox2._numbersOnly = False
Me.MyTextBox2._numbersOnlyKommastellen = ""
Me.MyTextBox2._numbersOnlyTrennzeichen = True
Me.MyTextBox2._Prozent = False
Me.MyTextBox2._ShortDateNew = False
Me.MyTextBox2._ShortDateOnly = False
Me.MyTextBox2._TimeOnly = False
Me.MyTextBox2._TimeOnly_Seconds = False
Me.MyTextBox2._value = ""
Me.MyTextBox2._Waehrung = True
Me.MyTextBox2._WaehrungZeichen = True
@@ -236,10 +240,12 @@ Partial Class frmKasseAbschliessen
Me.txtxAbwBetragALT._DateTimeOnly = False
Me.txtxAbwBetragALT._numbersOnly = False
Me.txtxAbwBetragALT._numbersOnlyKommastellen = ""
Me.txtxAbwBetragALT._numbersOnlyTrennzeichen = True
Me.txtxAbwBetragALT._Prozent = False
Me.txtxAbwBetragALT._ShortDateNew = False
Me.txtxAbwBetragALT._ShortDateOnly = False
Me.txtxAbwBetragALT._TimeOnly = False
Me.txtxAbwBetragALT._TimeOnly_Seconds = False
Me.txtxAbwBetragALT._value = ""
Me.txtxAbwBetragALT._Waehrung = True
Me.txtxAbwBetragALT._WaehrungZeichen = True
@@ -257,10 +263,12 @@ Partial Class frmKasseAbschliessen
Me.txtxAbwBetragNEU._DateTimeOnly = False
Me.txtxAbwBetragNEU._numbersOnly = False
Me.txtxAbwBetragNEU._numbersOnlyKommastellen = ""
Me.txtxAbwBetragNEU._numbersOnlyTrennzeichen = True
Me.txtxAbwBetragNEU._Prozent = False
Me.txtxAbwBetragNEU._ShortDateNew = False
Me.txtxAbwBetragNEU._ShortDateOnly = False
Me.txtxAbwBetragNEU._TimeOnly = False
Me.txtxAbwBetragNEU._TimeOnly_Seconds = False
Me.txtxAbwBetragNEU._value = ""
Me.txtxAbwBetragNEU._Waehrung = True
Me.txtxAbwBetragNEU._WaehrungZeichen = True
@@ -301,8 +309,8 @@ Partial Class frmKasseAbschliessen
Me.Controls.Add(Me.MyTextBox1)
Me.Controls.Add(Me.Label3)
Me.Controls.Add(Me.btnKassensaldoUbertragen)
Me.Controls.Add(Me.NumericUpDown1)
Me.Controls.Add(Me.NumericUpDown)
Me.Controls.Add(Me.numNeuesGJ)
Me.Controls.Add(Me.numAltesGJ)
Me.Controls.Add(Me.Label2)
Me.Controls.Add(Me.Label1)
Me.Controls.Add(Me.lblKasseWahlen)
@@ -310,8 +318,8 @@ Partial Class frmKasseAbschliessen
Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
Me.Name = "frmKasseAbschliessen"
Me.Text = "frmKasseAbschliessen"
CType(Me.NumericUpDown, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.NumericUpDown1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.numAltesGJ, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.numNeuesGJ, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -320,8 +328,8 @@ Partial Class frmKasseAbschliessen
Friend WithEvents lblKasseWahlen As System.Windows.Forms.Label
Friend WithEvents Label1 As System.Windows.Forms.Label
Friend WithEvents Label2 As System.Windows.Forms.Label
Friend WithEvents NumericUpDown As System.Windows.Forms.NumericUpDown
Friend WithEvents NumericUpDown1 As System.Windows.Forms.NumericUpDown
Friend WithEvents numAltesGJ As System.Windows.Forms.NumericUpDown
Friend WithEvents numNeuesGJ As System.Windows.Forms.NumericUpDown
Friend WithEvents btnKassensaldoUbertragen As System.Windows.Forms.Button
Friend WithEvents Label3 As System.Windows.Forms.Label
Friend WithEvents MyTextBox1 As VERAG_PROG_ALLGEMEIN.MyTextBox

29
SDL/Administration/frmKasseAbschliessen.vb
View File

@@ -9,8 +9,8 @@
lblTESTSYSTEM.Visible = VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM
MyComboBox2.fillWithSQL("SELECT [KassenbuchNr],[Name] FROM [Personal] WHERE ((Status='A' AND KassenbuchNr IS NOT NULL AND BLC='R') OR (BLC='V00')) ORDER BY Name", False, "FMZOLL")
NumericUpDown.Value = Now.Year - 1
NumericUpDown1.Value = Now.Year
numAltesGJ.Value = Now.Year - 1
numNeuesGJ.Value = Now.Year
End Sub
Private Sub MyComboBox2_SelectedIndexChanged(sender As Object, e As EventArgs) Handles MyComboBox2.SelectedIndexChanged
@@ -25,18 +25,18 @@
initSALDO()
End If
End Sub
Sub initSALDO()
SaldoALT = SQL.getValueTxtBySql("SELECT isnull((Sum(tblKassenbuch.Soll)-Sum(tblKassenbuch.Haben)),0) AS Saldo " &
" FROM Personal INNER JOIN tblKassenbuch ON Personal.ID = tblKassenbuch.Benutzer " &
" WHERE tblKassenbuch.Mandant='" & PERSONAL.Mandant & "' AND tblKassenbuch.Niederlassung='" & PERSONAL.Niederlassung & "' " &
" And tblKassenbuch.Benutzer=" & PERSONAL.ID & " AND tblKassenbuch.Geschäftsjahr=" & NumericUpDown.Value & " AND tblKassenbuch.Konto=" & PERSONAL.KassenbuchNr & "", "FMZOLL")
" And tblKassenbuch.Benutzer=" & PERSONAL.ID & " AND tblKassenbuch.Geschäftsjahr=" & numAltesGJ.Value & " AND tblKassenbuch.Konto=" & PERSONAL.KassenbuchNr & "", "FMZOLL")
SaldoNEU = SQL.getValueTxtBySql("SELECT isnull((Sum(tblKassenbuch.Soll)-Sum(tblKassenbuch.Haben)),0) AS Saldo " &
" FROM Personal INNER JOIN tblKassenbuch ON Personal.ID = tblKassenbuch.Benutzer " &
" WHERE tblKassenbuch.Mandant='" & PERSONAL.Mandant & "' AND tblKassenbuch.Niederlassung='" & PERSONAL.Niederlassung & "' " &
" And tblKassenbuch.Benutzer=" & PERSONAL.ID & " AND tblKassenbuch.Geschäftsjahr=" & NumericUpDown1.Value & " AND tblKassenbuch.Konto=" & PERSONAL.KassenbuchNr & "", "FMZOLL")
" And tblKassenbuch.Benutzer=" & PERSONAL.ID & " AND tblKassenbuch.Geschäftsjahr=" & numNeuesGJ.Value & " AND tblKassenbuch.Konto=" & PERSONAL.KassenbuchNr & "", "FMZOLL")
@@ -82,7 +82,7 @@
Sub insertBELEGALT(KASSE As cRKSV_Kasse, betrag As Double)
Dim BELEG_ALT As New EABeleg(PERSONAL.Mandant, PERSONAL.Niederlassung, PERSONAL.ID) '!!!!!!!!!!!!!!!!
BELEG_ALT.BelegDat = cRKSV.getGJ_EndOfYear(NumericUpDown.Value, KASSE.rksv_firma).ToShortDateString 'CDate("31.01." & NumericUpDown1.Value)
BELEG_ALT.BelegDat = cRKSV.getGJ_EndOfYear(numAltesGJ.Value, KASSE.rksv_firma).ToShortDateString 'CDate("31.01." & NumericUpDown1.Value)
If txtxAbwBetragALT._value <> "" AndAlso IsNumeric(txtxAbwBetragALT._value) Then betrag = txtxAbwBetragALT._value
@@ -101,7 +101,7 @@
Dim KBEntryGB As cKassenbuch = Nothing
' Dim JournalNr = 0
If Not insertKB(BELEG_ALT, 9800, KASSE.rksv_id, RKSV_Beleg_Id, KBEntry, KBEntryGB, KASSE.rksv_aktiv) Then ' Eintrag ins Kassenbuch
If Not insertKB(BELEG_ALT, 9800, KASSE, KASSE.rksv_id, RKSV_Beleg_Id, KBEntry, KBEntryGB, KASSE.rksv_aktiv) Then ' Eintrag ins Kassenbuch
MsgBox(BELEG_ALT, "Programmfehler bei Eintrag ins Kassenbuch.")
Me.Cursor = Cursors.Default : Me.Close() : Exit Sub
End If
@@ -143,7 +143,7 @@
End Sub
Sub insertBELEGNEU(KASSE As cRKSV_Kasse, betrag As Double)
Dim BELEG_NEU As New EABeleg(PERSONAL.Mandant, PERSONAL.Niederlassung, PERSONAL.ID) '!!!!!!!!!!!!!!!!
BELEG_NEU.BelegDat = cRKSV.getGJ_BeginOfYear(NumericUpDown1.Value, KASSE.rksv_firma).ToShortDateString '' CDate("01.02." & NumericUpDown1.Value)
BELEG_NEU.BelegDat = cRKSV.getGJ_BeginOfYear(numNeuesGJ.Value, KASSE.rksv_firma).ToShortDateString '' CDate("01.02." & NumericUpDown1.Value)
BELEG_NEU.Beleg_TYP = "E"
BELEG_NEU.Belegart = 1 'EINGANG
BELEG_NEU.rksv_aktiv = KASSE.rksv_aktiv
@@ -161,7 +161,7 @@
Dim KBEntryGB As cKassenbuch = Nothing
' Dim JournalNr = 0
If Not insertKB(BELEG_NEU, 9800, KASSE.rksv_id, RKSV_Beleg_Id, KBEntry, KBEntryGB, KASSE.rksv_aktiv) Then ' Eintrag ins Kassenbuch
If Not insertKB(BELEG_NEU, 9800, KASSE, KASSE.rksv_id, RKSV_Beleg_Id, KBEntry, KBEntryGB, KASSE.rksv_aktiv) Then ' Eintrag ins Kassenbuch
MsgBox(BELEG_NEU, "Programmfehler bei Eintrag ins Kassenbuch.")
Me.Cursor = Cursors.Default : Me.Close() : Exit Sub
End If
@@ -203,8 +203,9 @@
End Sub
Function insertKB(BELEG As EABeleg, Gegenkonto As Integer, RKSV_id As Integer, RKSV_Beleg_Id As Integer, ByRef KBEntry As cKassenbuch, ByRef KBEntryGB As cKassenbuch, RKSV_Aktiv As Boolean) As Boolean
Dim GJBeleg = New cGeschaeftsjahr(BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, cRKSV.getGJ(BELEG.BelegDat))
Function insertKB(BELEG As EABeleg, Gegenkonto As Integer, KASSE As cRKSV_Kasse, RKSV_id As Integer, RKSV_Beleg_Id As Integer, ByRef KBEntry As cKassenbuch, ByRef KBEntryGB As cKassenbuch, RKSV_Aktiv As Boolean) As Boolean
Dim GJBeleg = New cGeschaeftsjahr(BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, cRKSV.getGJ_FIRMA(BELEG.BelegDat, KASSE.rksv_firma))
BELEG.BelegNr = GJBeleg.INCREASE_BELEG() 'Vergabe der Belegnummer
' BELEG.BelegDat = Now.ToShortDateString
@@ -219,8 +220,8 @@
'################
' EINTRAG: Kassenbuch
'################
Dim GJ As New cGeschaeftsjahr(PERSONAL.Mandant, PERSONAL.Niederlassung, PERSONAL.ID, cRKSV.getGJ(BELEG.BelegDat))
KBEntry = New cKassenbuch(PERSONAL.Mandant, PERSONAL.Niederlassung, PERSONAL.ID, cRKSV.getGJ(BELEG.BelegDat), 0)
Dim GJ As New cGeschaeftsjahr(PERSONAL.Mandant, PERSONAL.Niederlassung, PERSONAL.ID, cRKSV.getGJ_FIRMA(BELEG.BelegDat, KASSE.rksv_firma))
KBEntry = New cKassenbuch(PERSONAL.Mandant, PERSONAL.Niederlassung, PERSONAL.ID, cRKSV.getGJ_FIRMA(BELEG.BelegDat, KASSE.rksv_firma), 0)
KBEntry.JournalNr = GJ.INCREASE_JOURNAL() 'Vergabe der Journalnummer
' KBEntry.JournalNr = fktJournalNr(rst1!Mandant, rst1!Niederlassung, rst1!Benutzer, rst1!BelegDat)
KBEntry.Konto = PERSONAL.KassenbuchNr
@@ -252,7 +253,7 @@
'################
' EINTRAG: Kassenbuch
'################
KBEntryGB = New cKassenbuch(PERSONAL.Mandant, PERSONAL.Niederlassung, PERSONAL.ID, cRKSV.getGJ(BELEG.BelegDat), 0)
KBEntryGB = New cKassenbuch(PERSONAL.Mandant, PERSONAL.Niederlassung, PERSONAL.ID, cRKSV.getGJ_FIRMA(BELEG.BelegDat, KASSE.rksv_firma), 0)
KBEntryGB.JournalNr = GJ.INCREASE_JOURNAL() 'Vergabe der Journalnummer
' KBEntryGB.JournalNr = fktJournalNr(rst1!Mandant, rst1!Niederlassung, rst1!Benutzer, rst1!BelegDat)
KBEntryGB.Konto = Gegenkonto