Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

VERAG_PROG_ALLGEMEIN/Classes/cUeberstunden.vb

@@ -9,6 +9,7 @@ Public Class cUeberstunden
     Property uest_timasId As Object = Nothing
     Property uest_100 As Object = Nothing
     Property uest_50 As Object = Nothing
+    Property uest_25 As Object = Nothing
     Property uest_0 As Object = Nothing
     Property uest_date As Date = Nothing
     Property uest_created As Object = Nothing
@@ -17,6 +18,7 @@ Public Class cUeberstunden
     Property uest_systemuser As Object = Nothing
     Property uest_maxUE As Object = Nothing
     Property uest_ignoreLimit As Boolean
+    Property uest_overwriteValue As Boolean
 
     Public hasEntry = False
 
@@ -43,6 +45,7 @@ Public Class cUeberstunden
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uest_timasId", uest_timasId))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uest_100", uest_100))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uest_50", uest_50))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uest_25", uest_25))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uest_0", uest_0))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uest_date", uest_date))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uest_created", uest_created))
@@ -51,6 +54,7 @@ Public Class cUeberstunden
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uest_systemuser", uest_systemuser))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uest_ignoreLimit", uest_ignoreLimit))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uest_maxUE", uest_maxUE))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uest_overwriteValue", uest_overwriteValue))
 
         Return list
         End Function

VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb

@@ -808,6 +808,7 @@ Public Class frmMessenger
 
     Function checkNewestShit() As Boolean
         Try
+            If Not VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_ChatBenutzer Then Return False
 
 
             Dim Dt_New As DataTable = SQL.loadDgvBySql("SELECT [chat_id],CASE WHEN chat_name<>'' THEN chat_name ELSE (SELECT TOP 1 mit_vname + ' ' + mit_nname FROM tblMessenger_ChatMembers INNER JOIN tblMitarbeiter ON mit_id=chatMb_maId where chatMb_chatId=chat_id AND chatMb_maId <>" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & ") END as chat_name 

VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.Designer.vb

@@ -23,6 +23,7 @@ Partial Class frmUeberstundenauszahlen
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmUeberstundenauszahlen))
         Me.dtpMonat = New System.Windows.Forms.DateTimePicker()
         Me.lblMonat = New System.Windows.Forms.Label()
         Me.Label2 = New System.Windows.Forms.Label()
@@ -48,17 +49,25 @@ Partial Class frmUeberstundenauszahlen
         Me.txtberAusz100 = New System.Windows.Forms.TextBox()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.txtlfdSaldo = New System.Windows.Forms.TextBox()
-        Me.Label6 = New System.Windows.Forms.Label()
+        Me.lbllfdSaldo = New System.Windows.Forms.Label()
         Me.picDel = New System.Windows.Forms.PictureBox()
         Me.txtAusz50vonSaldo = New System.Windows.Forms.TextBox()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.cx25 = New System.Windows.Forms.CheckBox()
+        Me.cbx50 = New System.Windows.Forms.CheckBox()
+        Me.cbx100 = New System.Windows.Forms.CheckBox()
+        Me.txtberAusz25 = New System.Windows.Forms.TextBox()
+        Me.cbxoverwrite = New System.Windows.Forms.CheckBox()
         Me.Label8 = New System.Windows.Forms.Label()
         Me.txt50x1 = New System.Windows.Forms.TextBox()
+        Me.cbxTeilzeit = New System.Windows.Forms.CheckBox()
+        Me.txtAuszManuell = New System.Windows.Forms.TextBox()
         Me.dgvUeberstunden = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
-        Me.cbxoverwrite = New System.Windows.Forms.CheckBox()
+        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
         CType(Me.picDel, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel1.SuspendLayout()
         CType(Me.dgvUeberstunden, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'dtpMonat
@@ -82,7 +91,7 @@ Partial Class frmUeberstundenauszahlen
         'Label2
         '
         Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(13, 11)
+        Me.Label2.Location = New System.Drawing.Point(33, 11)
         Me.Label2.Name = "Label2"
         Me.Label2.Size = New System.Drawing.Size(196, 13)
         Me.Label2.TabIndex = 2
@@ -91,7 +100,7 @@ Partial Class frmUeberstundenauszahlen
         'Label3
         '
         Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(12, 131)
+        Me.Label3.Location = New System.Drawing.Point(32, 131)
         Me.Label3.Name = "Label3"
         Me.Label3.Size = New System.Drawing.Size(138, 13)
         Me.Label3.TabIndex = 3
@@ -100,7 +109,7 @@ Partial Class frmUeberstundenauszahlen
         'Label4
         '
         Me.Label4.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(13, 53)
+        Me.Label4.Location = New System.Drawing.Point(33, 53)
         Me.Label4.Name = "Label4"
         Me.Label4.Size = New System.Drawing.Size(113, 13)
         Me.Label4.TabIndex = 4
@@ -108,7 +117,7 @@ Partial Class frmUeberstundenauszahlen
         '
         'txt100
         '
-        Me.txt100.Location = New System.Drawing.Point(16, 27)
+        Me.txt100.Location = New System.Drawing.Point(36, 27)
         Me.txt100.Name = "txt100"
         Me.txt100.ReadOnly = True
         Me.txt100.Size = New System.Drawing.Size(47, 20)
@@ -117,7 +126,7 @@ Partial Class frmUeberstundenauszahlen
         '
         'txt50
         '
-        Me.txt50.Location = New System.Drawing.Point(16, 69)
+        Me.txt50.Location = New System.Drawing.Point(36, 69)
         Me.txt50.Name = "txt50"
         Me.txt50.ReadOnly = True
         Me.txt50.Size = New System.Drawing.Size(47, 20)
@@ -126,7 +135,7 @@ Partial Class frmUeberstundenauszahlen
         '
         'txtMehr
         '
-        Me.txtMehr.Location = New System.Drawing.Point(15, 147)
+        Me.txtMehr.Location = New System.Drawing.Point(35, 147)
         Me.txtMehr.Name = "txtMehr"
         Me.txtMehr.ReadOnly = True
         Me.txtMehr.Size = New System.Drawing.Size(47, 20)
@@ -135,7 +144,7 @@ Partial Class frmUeberstundenauszahlen
         '
         'txtAusz
         '
-        Me.txtAusz.Location = New System.Drawing.Point(192, 196)
+        Me.txtAusz.Location = New System.Drawing.Point(212, 196)
         Me.txtAusz.Name = "txtAusz"
         Me.txtAusz.Size = New System.Drawing.Size(54, 20)
         Me.txtAusz.TabIndex = 9
@@ -144,7 +153,7 @@ Partial Class frmUeberstundenauszahlen
         'lblMA
         '
         Me.lblMA.AutoSize = True
-        Me.lblMA.Location = New System.Drawing.Point(238, 6)
+        Me.lblMA.Location = New System.Drawing.Point(236, 25)
         Me.lblMA.Name = "lblMA"
         Me.lblMA.Size = New System.Drawing.Size(56, 13)
         Me.lblMA.TabIndex = 10
@@ -153,7 +162,7 @@ Partial Class frmUeberstundenauszahlen
         'Label7
         '
         Me.Label7.AutoSize = True
-        Me.Label7.Location = New System.Drawing.Point(238, 26)
+        Me.Label7.Location = New System.Drawing.Point(236, 45)
         Me.Label7.Name = "Label7"
         Me.Label7.Size = New System.Drawing.Size(65, 13)
         Me.Label7.TabIndex = 11
@@ -162,7 +171,7 @@ Partial Class frmUeberstundenauszahlen
         'Button1
         '
         Me.Button1.DialogResult = System.Windows.Forms.DialogResult.OK
-        Me.Button1.Location = New System.Drawing.Point(321, 170)
+        Me.Button1.Location = New System.Drawing.Point(341, 170)
         Me.Button1.Name = "Button1"
         Me.Button1.Size = New System.Drawing.Size(87, 30)
         Me.Button1.TabIndex = 12
@@ -171,7 +180,7 @@ Partial Class frmUeberstundenauszahlen
         '
         'txt100x2
         '
-        Me.txt100x2.Location = New System.Drawing.Point(112, 27)
+        Me.txt100x2.Location = New System.Drawing.Point(132, 27)
         Me.txt100x2.Name = "txt100x2"
         Me.txt100x2.ReadOnly = True
         Me.txt100x2.Size = New System.Drawing.Size(49, 20)
@@ -180,7 +189,7 @@ Partial Class frmUeberstundenauszahlen
         '
         'txt50x15
         '
-        Me.txt50x15.Location = New System.Drawing.Point(112, 69)
+        Me.txt50x15.Location = New System.Drawing.Point(132, 69)
         Me.txt50x15.Name = "txt50x15"
         Me.txt50x15.ReadOnly = True
         Me.txt50x15.Size = New System.Drawing.Size(49, 20)
@@ -189,7 +198,7 @@ Partial Class frmUeberstundenauszahlen
         '
         'txtAusz100
         '
-        Me.txtAusz100.Location = New System.Drawing.Point(197, 27)
+        Me.txtAusz100.Location = New System.Drawing.Point(217, 27)
         Me.txtAusz100.Name = "txtAusz100"
         Me.txtAusz100.ReadOnly = True
         Me.txtAusz100.Size = New System.Drawing.Size(54, 20)
@@ -198,7 +207,7 @@ Partial Class frmUeberstundenauszahlen
         '
         'txtAusz50
         '
-        Me.txtAusz50.Location = New System.Drawing.Point(197, 69)
+        Me.txtAusz50.Location = New System.Drawing.Point(217, 69)
         Me.txtAusz50.Name = "txtAusz50"
         Me.txtAusz50.ReadOnly = True
         Me.txtAusz50.Size = New System.Drawing.Size(54, 20)
@@ -243,7 +252,7 @@ Partial Class frmUeberstundenauszahlen
         '
         'txtSummeAuszb
         '
-        Me.txtSummeAuszb.Location = New System.Drawing.Point(110, 196)
+        Me.txtSummeAuszb.Location = New System.Drawing.Point(130, 196)
         Me.txtSummeAuszb.Name = "txtSummeAuszb"
         Me.txtSummeAuszb.ReadOnly = True
         Me.txtSummeAuszb.Size = New System.Drawing.Size(49, 20)
@@ -252,7 +261,7 @@ Partial Class frmUeberstundenauszahlen
         '
         'txtberAusz50
         '
-        Me.txtberAusz50.Location = New System.Drawing.Point(291, 69)
+        Me.txtberAusz50.Location = New System.Drawing.Point(311, 69)
         Me.txtberAusz50.Name = "txtberAusz50"
         Me.txtberAusz50.ReadOnly = True
         Me.txtberAusz50.Size = New System.Drawing.Size(54, 20)
@@ -261,7 +270,7 @@ Partial Class frmUeberstundenauszahlen
         '
         'txtberAusz100
         '
-        Me.txtberAusz100.Location = New System.Drawing.Point(291, 27)
+        Me.txtberAusz100.Location = New System.Drawing.Point(311, 27)
         Me.txtberAusz100.Name = "txtberAusz100"
         Me.txtberAusz100.ReadOnly = True
         Me.txtberAusz100.Size = New System.Drawing.Size(54, 20)
@@ -271,7 +280,7 @@ Partial Class frmUeberstundenauszahlen
         'Label1
         '
         Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(289, 11)
+        Me.Label1.Location = New System.Drawing.Point(309, 11)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(92, 13)
         Me.Label1.TabIndex = 25
@@ -279,27 +288,27 @@ Partial Class frmUeberstundenauszahlen
         '
         'txtlfdSaldo
         '
-        Me.txtlfdSaldo.Location = New System.Drawing.Point(17, 108)
+        Me.txtlfdSaldo.Location = New System.Drawing.Point(36, 108)
         Me.txtlfdSaldo.Name = "txtlfdSaldo"
         Me.txtlfdSaldo.ReadOnly = True
         Me.txtlfdSaldo.Size = New System.Drawing.Size(49, 20)
         Me.txtlfdSaldo.TabIndex = 26
         Me.txtlfdSaldo.Text = "0"
         '
-        'Label6
+        'lbllfdSaldo
         '
-        Me.Label6.AutoSize = True
+        Me.lbllfdSaldo.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(18, 92)
+        Me.lbllfdSaldo.Location = New System.Drawing.Point(33, 92)
-        Me.Label6.Name = "Label6"
+        Me.lbllfdSaldo.Name = "lbllfdSaldo"
-        Me.Label6.Size = New System.Drawing.Size(48, 13)
+        Me.lbllfdSaldo.Size = New System.Drawing.Size(48, 13)
-        Me.Label6.TabIndex = 27
+        Me.lbllfdSaldo.TabIndex = 27
-        Me.Label6.Text = "lfd Saldo"
+        Me.lbllfdSaldo.Text = "lfd Saldo"
         '
         'picDel
         '
         Me.picDel.BackgroundImage = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.del
         Me.picDel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.picDel.Location = New System.Drawing.Point(387, 11)
+        Me.picDel.Location = New System.Drawing.Point(407, 11)
         Me.picDel.Name = "picDel"
         Me.picDel.Size = New System.Drawing.Size(21, 16)
         Me.picDel.TabIndex = 28
@@ -307,7 +316,7 @@ Partial Class frmUeberstundenauszahlen
         '
         'txtAusz50vonSaldo
         '
-        Me.txtAusz50vonSaldo.Location = New System.Drawing.Point(197, 108)
+        Me.txtAusz50vonSaldo.Location = New System.Drawing.Point(217, 108)
         Me.txtAusz50vonSaldo.Name = "txtAusz50vonSaldo"
         Me.txtAusz50vonSaldo.ReadOnly = True
         Me.txtAusz50vonSaldo.Size = New System.Drawing.Size(49, 20)
@@ -316,6 +325,11 @@ Partial Class frmUeberstundenauszahlen
         '
         'Panel1
         '
+        Me.Panel1.Controls.Add(Me.txtAuszManuell)
+        Me.Panel1.Controls.Add(Me.cx25)
+        Me.Panel1.Controls.Add(Me.cbx50)
+        Me.Panel1.Controls.Add(Me.cbx100)
+        Me.Panel1.Controls.Add(Me.txtberAusz25)
         Me.Panel1.Controls.Add(Me.cbxoverwrite)
         Me.Panel1.Controls.Add(Me.Label8)
         Me.Panel1.Controls.Add(Me.txt50x1)
@@ -324,7 +338,7 @@ Partial Class frmUeberstundenauszahlen
         Me.Panel1.Controls.Add(Me.Label3)
         Me.Panel1.Controls.Add(Me.picDel)
         Me.Panel1.Controls.Add(Me.Label4)
-        Me.Panel1.Controls.Add(Me.Label6)
+        Me.Panel1.Controls.Add(Me.lbllfdSaldo)
         Me.Panel1.Controls.Add(Me.txt100)
         Me.Panel1.Controls.Add(Me.txtlfdSaldo)
         Me.Panel1.Controls.Add(Me.txt50)
@@ -341,13 +355,62 @@ Partial Class frmUeberstundenauszahlen
         Me.Panel1.Controls.Add(Me.txtAusz50)
         Me.Panel1.Location = New System.Drawing.Point(15, 67)
         Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(421, 235)
+        Me.Panel1.Size = New System.Drawing.Size(447, 235)
         Me.Panel1.TabIndex = 30
         '
+        'cx25
+        '
+        Me.cx25.AutoSize = True
+        Me.cx25.Location = New System.Drawing.Point(196, 111)
+        Me.cx25.Name = "cx25"
+        Me.cx25.Size = New System.Drawing.Size(15, 14)
+        Me.cx25.TabIndex = 36
+        Me.cx25.UseVisualStyleBackColor = True
+        '
+        'cbx50
+        '
+        Me.cbx50.AutoSize = True
+        Me.cbx50.Location = New System.Drawing.Point(196, 72)
+        Me.cbx50.Name = "cbx50"
+        Me.cbx50.Size = New System.Drawing.Size(15, 14)
+        Me.cbx50.TabIndex = 35
+        Me.cbx50.UseVisualStyleBackColor = True
+        '
+        'cbx100
+        '
+        Me.cbx100.AutoSize = True
+        Me.cbx100.Location = New System.Drawing.Point(196, 30)
+        Me.cbx100.Name = "cbx100"
+        Me.cbx100.Size = New System.Drawing.Size(15, 14)
+        Me.cbx100.TabIndex = 32
+        Me.cbx100.UseVisualStyleBackColor = True
+        '
+        'txtberAusz25
+        '
+        Me.txtberAusz25.Location = New System.Drawing.Point(311, 108)
+        Me.txtberAusz25.Name = "txtberAusz25"
+        Me.txtberAusz25.ReadOnly = True
+        Me.txtberAusz25.Size = New System.Drawing.Size(54, 20)
+        Me.txtberAusz25.TabIndex = 34
+        Me.txtberAusz25.Text = "0"
+        Me.txtberAusz25.Visible = False
+        '
+        'cbxoverwrite
+        '
+        Me.cbxoverwrite.AutoSize = True
+        Me.cbxoverwrite.Checked = True
+        Me.cbxoverwrite.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxoverwrite.Location = New System.Drawing.Point(79, 179)
+        Me.cbxoverwrite.Name = "cbxoverwrite"
+        Me.cbxoverwrite.Size = New System.Drawing.Size(102, 17)
+        Me.cbxoverwrite.TabIndex = 31
+        Me.cbxoverwrite.Text = "max. auszahlbar"
+        Me.cbxoverwrite.UseVisualStyleBackColor = True
+        '
         'Label8
         '
         Me.Label8.AutoSize = True
-        Me.Label8.Location = New System.Drawing.Point(194, 179)
+        Me.Label8.Location = New System.Drawing.Point(214, 179)
         Me.Label8.Name = "Label8"
         Me.Label8.Size = New System.Drawing.Size(56, 13)
         Me.Label8.TabIndex = 33
@@ -355,13 +418,32 @@ Partial Class frmUeberstundenauszahlen
         '
         'txt50x1
         '
-        Me.txt50x1.Location = New System.Drawing.Point(112, 108)
+        Me.txt50x1.Location = New System.Drawing.Point(132, 108)
         Me.txt50x1.Name = "txt50x1"
         Me.txt50x1.ReadOnly = True
         Me.txt50x1.Size = New System.Drawing.Size(49, 20)
         Me.txt50x1.TabIndex = 32
         Me.txt50x1.Text = "0"
         '
+        'cbxTeilzeit
+        '
+        Me.cbxTeilzeit.AutoSize = True
+        Me.cbxTeilzeit.Location = New System.Drawing.Point(239, 5)
+        Me.cbxTeilzeit.Name = "cbxTeilzeit"
+        Me.cbxTeilzeit.Size = New System.Drawing.Size(59, 17)
+        Me.cbxTeilzeit.TabIndex = 31
+        Me.cbxTeilzeit.Text = "Teilzeit"
+        Me.cbxTeilzeit.UseVisualStyleBackColor = True
+        '
+        'txtAuszManuell
+        '
+        Me.txtAuszManuell.Location = New System.Drawing.Point(272, 196)
+        Me.txtAuszManuell.Name = "txtAuszManuell"
+        Me.txtAuszManuell.Size = New System.Drawing.Size(54, 20)
+        Me.txtAuszManuell.TabIndex = 37
+        Me.txtAuszManuell.Text = "0"
+        Me.txtAuszManuell.Visible = False
+        '
         'dgvUeberstunden
         '
         Me.dgvUeberstunden.AKTUALISIERUNGS_INTERVALL = -1
@@ -376,23 +458,23 @@ Partial Class frmUeberstundenauszahlen
         Me.dgvUeberstunden.TabIndex = 13
         Me.dgvUeberstunden.Visible = False
         '
-        'cbxoverwrite
+        'PictureBox1
         '
-        Me.cbxoverwrite.AutoSize = True
+        Me.PictureBox1.BackgroundImage = CType(resources.GetObject("PictureBox1.BackgroundImage"), System.Drawing.Image)
-        Me.cbxoverwrite.Checked = True
+        Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.cbxoverwrite.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.PictureBox1.Location = New System.Drawing.Point(422, 12)
-        Me.cbxoverwrite.Location = New System.Drawing.Point(59, 179)
+        Me.PictureBox1.Name = "PictureBox1"
-        Me.cbxoverwrite.Name = "cbxoverwrite"
+        Me.PictureBox1.Size = New System.Drawing.Size(29, 26)
-        Me.cbxoverwrite.Size = New System.Drawing.Size(102, 17)
+        Me.PictureBox1.TabIndex = 38
-        Me.cbxoverwrite.TabIndex = 31
+        Me.PictureBox1.TabStop = False
-        Me.cbxoverwrite.Text = "max. auszahlbar"
-        Me.cbxoverwrite.UseVisualStyleBackColor = True
         '
         'frmUeberstundenauszahlen
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(463, 337)
+        Me.Controls.Add(Me.PictureBox1)
+        Me.Controls.Add(Me.cbxTeilzeit)
         Me.Controls.Add(Me.Panel1)
         Me.Controls.Add(Me.lblBis)
         Me.Controls.Add(Me.dtpBis)
@@ -409,6 +491,7 @@ Partial Class frmUeberstundenauszahlen
         Me.Panel1.ResumeLayout(False)
         Me.Panel1.PerformLayout()
         CType(Me.dgvUeberstunden, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -440,11 +523,18 @@ Partial Class frmUeberstundenauszahlen
     Friend WithEvents txtberAusz100 As Windows.Forms.TextBox
     Friend WithEvents Label1 As Windows.Forms.Label
     Friend WithEvents txtlfdSaldo As Windows.Forms.TextBox
-    Friend WithEvents Label6 As Windows.Forms.Label
+    Friend WithEvents lbllfdSaldo As Windows.Forms.Label
     Friend WithEvents picDel As Windows.Forms.PictureBox
     Friend WithEvents txtAusz50vonSaldo As Windows.Forms.TextBox
     Friend WithEvents Panel1 As Windows.Forms.Panel
     Friend WithEvents txt50x1 As Windows.Forms.TextBox
     Friend WithEvents Label8 As Windows.Forms.Label
     Friend WithEvents cbxoverwrite As Windows.Forms.CheckBox
+    Friend WithEvents cbxTeilzeit As Windows.Forms.CheckBox
+    Friend WithEvents txtberAusz25 As Windows.Forms.TextBox
+    Friend WithEvents cx25 As Windows.Forms.CheckBox
+    Friend WithEvents cbx50 As Windows.Forms.CheckBox
+    Friend WithEvents cbx100 As Windows.Forms.CheckBox
+    Friend WithEvents txtAuszManuell As Windows.Forms.TextBox
+    Friend WithEvents PictureBox1 As Windows.Forms.PictureBox
 End Class

VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.resx

@@ -120,4 +120,183 @@
   <metadata name="CheckVatTestService1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="PictureBox1.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+</value>
+  </data>
 </root>

VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb

@@ -1,8 +1,8 @@
-Imports System.Runtime.InteropServices.ComTypes
+
+Imports System.Text
 Imports System.Threading
 Imports System.Windows.Forms
-Imports Microsoft.Office.Interop.Outlook
+
-Imports Therefore.API
 
 Public Class frmUeberstundenauszahlen
 
@@ -14,7 +14,9 @@ Public Class frmUeberstundenauszahlen
     Dim tag As cFeiertage
     Dim auszahlugsdatum As New Date
     Dim maxUberstundenpruefung As Boolean = True
-    Dim stunden100ausz, stunden50ausz, stunden100auszbere, stunden50auszbere, stunden100bereitsausbezahl, stunden50bereitsausbezahlt, mehrabeit, stundenlfdSaldo, stundenlfdSaldobere As Double
+    Dim istTeilzeit As Boolean = False
+    Dim faktorTeilzeit As Double = 100
+    Dim stunden100ausz, stunden50ausz, stunden100auszbere, stunden50auszbere, stunden100bereitsausbezahl, stunden50bereitsausbezahlt, stunden25bereitsausbezahlt, mehrabeit, stundenlfdSaldo, stundenlfdSaldobere, overwrittenSum As Double
 
 
     Sub New(mit_id)
@@ -57,6 +59,11 @@ Public Class frmUeberstundenauszahlen
 
     End Sub
 
+    Private Sub cbxTeilzeit_CheckedChanged(sender As Object, e As EventArgs) Handles cbxTeilzeit.CheckedChanged
+        istTeilzeit = cbxTeilzeit.Checked
+        changeTeilzeit()
+    End Sub
+
     Private Sub getUeberstunden(abwDatum As Boolean)
 
         Dim startdate, enddate As Date
@@ -65,7 +72,7 @@ Public Class frmUeberstundenauszahlen
             If abwDatum Then
                 startdate = (dtpMonat.Value)
                 enddate = (dtpBis.Value)
-                auszahlugsdatum = enddate
+                auszahlugsdatum = tag.GetLastyDayYInxMonth(enddate.DayOfWeek, enddate.Month, enddate.Year, True) 'Endmonat des Enddates
             Else
                 startdate = tag.GetFirstyDayYInxMonth(DateTime.Parse(dtpMonat.Value).DayOfWeek, DateTime.Parse(dtpMonat.Value).Month, DateTime.Parse(dtpMonat.Value).Year, True)
                 enddate = tag.GetLastyDayYInxMonth(DateTime.Parse(dtpMonat.Value).DayOfWeek, DateTime.Parse(dtpMonat.Value).Month, DateTime.Parse(dtpMonat.Value).Year, True)
@@ -82,7 +89,7 @@ Public Class frmUeberstundenauszahlen
                 Panel1.Enabled = True
             End If
 
-            Dim dt = calcUeberstunden(timeaccountdt, dtResult)
+            Dim dt = getUeberstunden(timeaccountdt, dtResult)
             fillFields(dt)
             dgvUeberstunden.DataSource = dt
 
@@ -90,7 +97,7 @@ Public Class frmUeberstundenauszahlen
     End Sub
 
 
-    Private Function calcUeberstunden(dtAccouts As DataTable, dtSumUeberstunden As DataTable) As DataTable
+    Private Function getUeberstunden(dtAccouts As DataTable, dtSumUeberstunden As DataTable) As DataTable
         Dim dtmerged As DataTable
         If dtAccouts IsNot Nothing AndAlso dtSumUeberstunden IsNot Nothing Then
 
@@ -140,6 +147,49 @@ Public Class frmUeberstundenauszahlen
         Return dtmerged
     End Function
 
+    Private Sub cbx100_CheckedChanged(sender As Object, e As EventArgs) Handles cbx100.CheckedChanged, cbx50.CheckedChanged, cx25.CheckedChanged
+
+        txtAusz100.ReadOnly = Not cbx100.Checked
+        txtAusz50.ReadOnly = Not cbx50.Checked
+        txtAusz50vonSaldo.ReadOnly = Not cx25.Checked
+
+    End Sub
+
+    Private Sub PictureBox1_Click(sender As Object, e As EventArgs) Handles PictureBox1.Click
+        getUeberstunden(cbxabwDatum.Checked)
+    End Sub
+
+    Private Sub txtAusz100_TextChanged(sender As Object, e As EventArgs) Handles txtAusz100.TextChanged, txtAusz50.TextChanged, txtAusz50vonSaldo.TextChanged
+
+        overwrittenSum = 0
+
+        If cbx100.Checked AndAlso txtAusz100.Text <> "" AndAlso IsNumeric(txtAusz100.Text) AndAlso CDbl(txtAusz100.Text) >= 0 Then
+            stunden100auszbere = CDbl(txtAusz100.Text)
+            overwrittenSum += stunden100auszbere
+        End If
+
+        If cbx50.Checked AndAlso txtAusz50.Text <> "" AndAlso IsNumeric(txtAusz50.Text) AndAlso CDbl(txtAusz50.Text) >= 0 Then
+            stunden50auszbere = CDbl(txtAusz50.Text)
+            overwrittenSum += stunden50auszbere
+        End If
+
+        If cx25.Checked AndAlso txtAusz50vonSaldo.Text <> "" AndAlso IsNumeric(txtAusz50vonSaldo.Text) AndAlso CDbl(txtAusz50vonSaldo.Text) >= 0 Then
+            stundenlfdSaldobere = RoundOfDigits(txtAusz50vonSaldo.Text, 2)
+            overwrittenSum += stundenlfdSaldobere
+        End If
+
+        If overwrittenSum > 0 Then
+            txtAuszManuell.Text = overwrittenSum
+            txtAusz.Visible = False
+            txtAuszManuell.Visible = True
+        Else
+            txtAusz.Visible = True
+            txtAuszManuell.Visible = False
+
+        End If
+
+    End Sub
+
     Public Sub fillFields(dt As DataTable)
 
         '69  10-Na 22-06		
@@ -157,9 +207,13 @@ Public Class frmUeberstundenauszahlen
             End If
         Next
 
+        'alle zurücksetzen, falls im neuen Monat dieser Wert nicht mitgegeben wird!
+        stunden50ausz = 0
+        stunden100ausz = 0
+        mehrabeit = 0
         stunden50bereitsausbezahlt = 0
         stunden100bereitsausbezahl = 0
-
+        stunden25bereitsausbezahlt = 0
 
         If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
             Dim calc As Double = 0
@@ -202,6 +256,15 @@ Public Class frmUeberstundenauszahlen
                         stunden50bereitsausbezahlt = calc
                     End If
 
+                    If r.Item("accountid") = "1553" Then
+                        txtberAusz25.Visible = True
+                        calc = CDbl(txtberAusz25.Text)
+                        calc += r.Item("value") * (r.Item("multiplier") & "1")
+                        txtberAusz25.Text = calc
+                        stunden25bereitsausbezahlt = calc
+                        cbxTeilzeit.Checked = True
+                    End If
+
                     'Berechnung von lfd Saldo im Zeitraum -> deaktiviert, es soll immer der aktuelle Saldo gezogen werden, egal in welchem Monat ich bin (22.02.2024)
                     'If r.Item("accountid") = "65" Then
                     '    calc = CDbl(txtlfdSaldo.Text)
@@ -212,7 +275,7 @@ Public Class frmUeberstundenauszahlen
                 End If
             Next
 
-            If (stunden100bereitsausbezahl + stunden50bereitsausbezahlt) > 0 Then
+            If (stunden100bereitsausbezahl + stunden50bereitsausbezahlt + stunden25bereitsausbezahlt) > 0 Then
                 picDel.Visible = True
                 Button1.Enabled = False
                 txtAusz.Enabled = False
@@ -221,30 +284,7 @@ Public Class frmUeberstundenauszahlen
                 txtAusz.Enabled = True
             End If
 
-            stunden100auszbere = stunden100ausz * 2
+            calxMaxauszahlbar()
-            stunden50auszbere = stunden50ausz * 1.5
-
-            txt100x2.Text = stunden100auszbere
-            txt50x15.Text = stunden50auszbere
-
-            'If CDbl(txtlfdSaldo.Text) < 0 Or auszahlugsdatum.Month = Today.Month AndAlso auszahlugsdatum.Year = Today.Year Then
-            'wenn berechneter Saldo negativ, dann ist im Regelfall das aktuelle MOnat noch nicht abgeschlossen!, daher anstatt den berechneten Saldo in overallBalance laden!
-            txtlfdSaldo.Text = timas.getTimeSaldo(MA.mit_timasId, "", "overallBalance")
-
-            'End If
-
-
-            stundenlfdSaldo = CDbl(txtlfdSaldo.Text)
-            stundenlfdSaldobere = stundenlfdSaldo
-
-            stundenlfdSaldobere -= stunden100auszbere
-            stundenlfdSaldobere -= stunden50auszbere
-            stundenlfdSaldobere = Math.Round(stundenlfdSaldobere, 2)
-
-
-            If stundenlfdSaldo <= 0 Then Button1.Enabled = False
-
-            txtSummeAuszb.Text = stundenlfdSaldo
 
         End If
 
@@ -252,69 +292,7 @@ Public Class frmUeberstundenauszahlen
 
     Private Sub txtAusz_TextChanged(sender As Object, e As EventArgs) Handles txtAusz.TextChanged
 
-
+        calcUeberstunden()
-
-        If txtAusz.Text <> "" AndAlso IsNumeric(txtAusz.Text) Then
-
-            Dim summeAusz = CDbl(txtAusz.Text)
-            If summeAusz <= 0 Then
-                txtAusz50vonSaldo.Text = "0"
-                txtAusz50.Text = "0"
-                txtAusz100.Text = "0"
-                txtAusz.Text = "0"
-                Button1.Enabled = False
-                Exit Sub
-            End If
-
-            txt100x2.Text = stunden100auszbere
-            txt50x15.Text = stunden50auszbere
-            txt50x1.Text = stundenlfdSaldobere
-
-            If stundenlfdSaldo >= summeAusz Then 'Prüfung, damit nicht zuviele ÜS ausbezahlt werden können!
-
-                Button1.Enabled = True
-
-            Else
-                If maxUberstundenpruefung Then
-                    Button1.Enabled = False
-                Else
-                    Button1.Enabled = True
-                End If
-
-            End If
-
-
-            If summeAusz >= stunden100auszbere Then
-                txtAusz100.Text = stunden100auszbere
-            Else
-                txtAusz100.Text = summeAusz
-            End If
-
-            summeAusz = Math.Round(summeAusz - stunden100auszbere, 2)
-
-            If summeAusz >= stunden50auszbere Then
-                txtAusz50.Text = stunden50auszbere
-                summeAusz = Math.Round(summeAusz - stunden50auszbere, 2)
-            ElseIf summeAusz < 0 Then
-                txtAusz50.Text = "0"
-            Else
-                txtAusz50.Text = summeAusz
-                summeAusz = Math.Round(summeAusz - stunden50auszbere, 2)
-            End If
-
-            If summeAusz >= stundenlfdSaldo Then
-                txtAusz50vonSaldo.Text = stundenlfdSaldo
-                summeAusz = Math.Round(summeAusz - stundenlfdSaldo, 2)
-            ElseIf summeAusz < 0 Then
-                txtAusz50vonSaldo.Text = "0"
-            Else
-                txtAusz50vonSaldo.Text = summeAusz
-                summeAusz = Math.Round(summeAusz - stundenlfdSaldo, 2)
-            End If
-
-        End If
-
-
 
     End Sub
 
@@ -338,12 +316,19 @@ Public Class frmUeberstundenauszahlen
 
 
         Dim sum100, sum50, sum0, gesamt As Double
-        sum100 = RoundOfDigits(CDbl(txtAusz100.Text) * 0.5, 2) 'Übergabe in ZE-System als heruntergerechnete 100%ige bzw. 50%ige ÜS!
+        sum100 = RoundOfDigits(CDbl(txtAusz100.Text) * 100 / 200, 2) 'Übergabe in ZE-System als heruntergerechnete 100%ige bzw. 50%ige ÜS!
         sum50 = RoundOfDigits(CDbl(txtAusz50.Text) * 100 / 150, 2)
-        sum0 = CDbl(txtAusz50vonSaldo.Text)
+        sum0 = RoundOfDigits(CDbl(txtAusz50vonSaldo.Text) * 100 / faktorTeilzeit, 2)
-        gesamt = CDbl(txtAusz.Text)
+        gesamt = IIf(overwrittenSum > 0, overwrittenSum, CDbl(txtAusz.Text))
 
-        Dim aksAuszahlung As MsgBoxResult = MsgBox("Überstunden für " & MA.mit_vname & " " & MA.mit_nname & " mit " & auszahlugsdatum.ToShortDateString() & " auszahlen?" & vbNewLine & sum100 & "x 100% ÜS :" & txtAusz100.Text & vbNewLine & sum50 & "x 50% ÜS: " & CDbl(txtAusz50.Text) + CDbl(txtAusz50vonSaldo.Text) & vbNewLine & "ÜS gesamt: " & gesamt, vbYesNo)
+        Dim txtAusgabe As New StringBuilder
+        txtAusgabe.Append("Überstunden für " & MA.mit_vname & " " & MA.mit_nname & " mit " & auszahlugsdatum.ToShortDateString() & " auszahlen?" & vbNewLine)
+        txtAusgabe.Append(sum100 & "x 100% ÜS :" & txtAusz100.Text & vbNewLine)
+        txtAusgabe.Append(IIf(Not istTeilzeit, sum50 + sum0, sum50) & "x 50% ÜS: " & CDbl(txtAusz50.Text) + IIf(Not istTeilzeit, CDbl(txtAusz50vonSaldo.Text), 0) & vbNewLine)
+        If istTeilzeit Then txtAusgabe.Append(sum0 & "x 25% ÜS: " & CDbl(txtAusz50vonSaldo.Text) & vbNewLine)
+        txtAusgabe.Append("ÜS gesamt: " & gesamt)
+
+        Dim aksAuszahlung As MsgBoxResult = MsgBox(txtAusgabe.ToString, vbYesNo)
 
         If aksAuszahlung = vbYes Then
             Dim dtsetEntries As New DataTable
@@ -351,28 +336,28 @@ Public Class frmUeberstundenauszahlen
             dtsetEntries.Columns.Add("accountid", GetType(Integer))
             dtsetEntries.Columns.Add("value", GetType(String))
 
-            If sum100 >= 0 Then
+            If sum100 > 0 Then
                 Dim row = dtsetEntries.NewRow
                 row.Item("accountid") = 1550
                 row.Item("value") = sum100.ToString.Replace(",", ".")
                 dtsetEntries.Rows.InsertAt(row, dtsetEntries.Rows.Count)
             End If
 
-            If sum50 >= 0 Then
+            If sum50 > 0 Then
                 Dim row = dtsetEntries.NewRow
                 row.Item("accountid") = 1551
                 row.Item("value") = sum50.ToString.Replace(",", ".")
                 dtsetEntries.Rows.InsertAt(row, dtsetEntries.Rows.Count)
             End If
 
-            If sum0 >= 0 Then
+            If sum0 > 0 Then
                 Dim row = dtsetEntries.NewRow
-                row.Item("accountid") = 1551
+                row.Item("accountid") = IIf(istTeilzeit, 1553, 1551)
                 row.Item("value") = sum0.ToString.Replace(",", ".")
                 dtsetEntries.Rows.InsertAt(row, dtsetEntries.Rows.Count)
             End If
 
-            If gesamt >= 0 Then 'vom ldf Saldo, ev. über API Möglich monatliche Korrektur direkt zu befüllen, dann muss dieser If Zweig überarbeitet werden!!!!!!!!!!!!!!
+            If gesamt > 0 Then 'vom ldf Saldo, ev. über API Möglich monatliche Korrektur direkt zu befüllen, dann muss dieser If Zweig überarbeitet werden!!!!!!!!!!!!!!
                 Dim row = dtsetEntries.NewRow
                 row.Item("accountid") = 993
                 row.Item("value") = gesamt.ToString.Replace(",", ".")
@@ -383,11 +368,17 @@ Public Class frmUeberstundenauszahlen
             ues.uest_timasId = MA.mit_timasId
             ues.uest_100 = sum100
             ues.uest_50 = sum50
-            ues.uest_0 = sum0
+            ues.uest_overwriteValue = IIf(cbx100.Checked Or cbx50.Checked Or cx25.Checked, True, False)
             ues.uest_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
             ues.uest_ignoreLimit = Not maxUberstundenpruefung
             ues.uest_maxUE = CDbl(txtSummeAuszb.Text)
 
+            If istTeilzeit Then
+                ues.uest_25 = sum0
+            Else
+                ues.uest_0 = sum0
+            End If 
+
 
             Dim info As String = ""
             If timas.setTimeAccountEntries(MA, dtsetEntries, auszahlugsdatum, info) AndAlso ues.SAVE() Then
@@ -402,7 +393,17 @@ Public Class frmUeberstundenauszahlen
     End Sub
 
     Private Sub picDel_Click(sender As Object, e As EventArgs) Handles picDel.Click
-        Dim aksAuszahlung As MsgBoxResult = MsgBox("Ausbezahlte Überstunden für " & MA.mit_vname & " " & MA.mit_nname & " mit " & auszahlugsdatum.ToShortDateString() & " zurücksetzen?" & vbNewLine & "100% ÜS: " & txtberAusz100.Text & vbNewLine & "50% ÜS: " & txtberAusz50.Text & vbNewLine & "ÜS gesamt: " & CDbl(txtberAusz100.Text) + CDbl(txtberAusz50.Text), vbYesNo)
+
+
+        Dim txtAusgabe As New StringBuilder
+        txtAusgabe.Append("Ausbezahlte Überstunden für  " & MA.mit_vname & " " & MA.mit_nname & " mit " & auszahlugsdatum.ToShortDateString() & " zurücksetzen?" & vbNewLine)
+        txtAusgabe.Append("100% ÜS: " & txtberAusz100.Text & vbNewLine)
+        txtAusgabe.Append("50% ÜS: " & txtberAusz50.Text + IIf(Not istTeilzeit, CDbl(txtberAusz25.Text), 0) & vbNewLine)
+        If istTeilzeit Then txtAusgabe.Append("25% ÜS: " & CDbl(txtberAusz25.Text) & vbNewLine)
+        txtAusgabe.Append("ÜS gesamt: " & CDbl(txtberAusz100.Text) + CDbl(txtberAusz50.Text) + CDbl(txtberAusz25.Text))
+
+
+        Dim aksAuszahlung As MsgBoxResult = MsgBox(txtAusgabe.ToString, vbYesNo)
         If aksAuszahlung = vbYes Then
             Dim dtdeleteEntries As New DataTable
 
@@ -425,12 +426,18 @@ Public Class frmUeberstundenauszahlen
                 dtdeleteEntries.Rows.InsertAt(row, dtdeleteEntries.Rows.Count)
             End If
 
+            If txtberAusz25.Text <> "" AndAlso IsNumeric(txtberAusz25.Text) Then
+                Dim row = dtdeleteEntries.NewRow
+                row.Item("accountid") = 1553
+                dtdeleteEntries.Rows.InsertAt(row, dtdeleteEntries.Rows.Count)
+            End If
+
             If timas.deleteTimeAccounts(auszahlugsdatum, auszahlugsdatum, MA.mit_timasId, dtdeleteEntries) Then
-                Dim ues As New cUeberstunden(MA.mit_id, auszahlugsdatum.ToShortDateString)
+                Dim ues As New cUeberstunden(MA.mit_id, auszahlugsdatum.ToString("dd/MM/yyyy"))
                 ues.uest_deleted = True
-                ues.uest_lastChanged = Now()
+                    ues.uest_lastChanged = Now()
-                ues.uest_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
+                    ues.uest_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
-                ues.SAVE()
+                    ues.SAVE()
 
                 MsgBox("Erfolgreich aus Timas zurückgesetzt!")
                 picDel.Visible = False
@@ -447,4 +454,116 @@ Public Class frmUeberstundenauszahlen
         If Digits < 0 Then Return Math.Round(Value * CDec(Math.Pow(10, Digits)), 0, MidpointRounding.AwayFromZero) / CDec(Math.Pow(10, Digits))
         Return Math.Round(Value, Digits)
     End Function
+
+    Private Sub changeTeilzeit()
+
+        If istTeilzeit Then
+            lbllfdSaldo.Text = "Mehrarbeit 25% (nur Teilzeit-MA)"
+            faktorTeilzeit = 100 ' werden Zeitlich nicht hochgerechnet, sondern nur mit aufschlag ausbezahlt, somit keine Hochrechnung um Faktor!
+        Else
+            lbllfdSaldo.Text = "lfd Saldo"
+            faktorTeilzeit = 100
+        End If
+
+        calcUeberstunden()
+        calxMaxauszahlbar()
+
+    End Sub
+
+
+    Private Sub calcUeberstunden()
+
+
+
+        If txtAusz.Text <> "" AndAlso IsNumeric(txtAusz.Text) Then
+
+            Dim summeAusz = CDbl(txtAusz.Text)
+            If summeAusz <= 0 Then
+                txtAusz50vonSaldo.Text = "0"
+                txtAusz50.Text = "0"
+                txtAusz100.Text = "0"
+                txtAusz.Text = "0"
+                Button1.Enabled = False
+                Exit Sub
+            End If
+
+            txt100x2.Text = stunden100auszbere
+            txt50x15.Text = stunden50auszbere
+            'txt50x1.Text = RoundOfDigits(stundenlfdSaldobere * faktorTeilzeit / 100, 2)
+
+            If stundenlfdSaldo >= summeAusz Then 'Prüfung, damit nicht zuviele ÜS ausbezahlt werden können!
+
+                Button1.Enabled = True
+
+            Else
+                If maxUberstundenpruefung Then
+                    Button1.Enabled = False
+                Else
+                    Button1.Enabled = True
+                End If
+
+            End If
+
+
+            If summeAusz >= stunden100auszbere Then
+                txtAusz100.Text = stunden100auszbere
+            Else
+                txtAusz100.Text = summeAusz
+            End If
+
+            summeAusz = RoundOfDigits(summeAusz - stunden100auszbere, 2)
+
+            If summeAusz >= stunden50auszbere Then
+                txtAusz50.Text = stunden50auszbere
+                summeAusz = RoundOfDigits(summeAusz - stunden50auszbere, 2)
+            ElseIf summeAusz < 0 Then
+                txtAusz50.Text = "0"
+            Else
+                txtAusz50.Text = summeAusz
+                summeAusz = RoundOfDigits(summeAusz - stunden50auszbere, 2)
+            End If
+
+            If summeAusz >= stundenlfdSaldo Then
+                txtAusz50vonSaldo.Text = stundenlfdSaldo
+                summeAusz = RoundOfDigits(summeAusz - stundenlfdSaldo, 2)
+            ElseIf summeAusz < 0 Then
+                txtAusz50vonSaldo.Text = "0"
+            Else
+                txtAusz50vonSaldo.Text = summeAusz
+                summeAusz = RoundOfDigits(summeAusz - stundenlfdSaldo, 2)
+            End If
+
+        End If
+
+    End Sub
+
+    Private Sub calxMaxauszahlbar()
+
+
+        'wenn berechneter Saldo negativ, dann ist im Regelfall das aktuelle MOnat noch nicht abgeschlossen!, daher anstatt den berechneten Saldo in overallBalance laden!
+        txtlfdSaldo.Text = timas.getTimeSaldo(MA.mit_timasId, "", "overallBalance")
+
+        stunden100auszbere = RoundOfDigits(stunden100ausz * 2, 2)
+        stunden50auszbere = RoundOfDigits(stunden50ausz * 1.5, 2)
+
+        txt100x2.Text = stunden100auszbere
+        txt50x15.Text = stunden50auszbere
+
+        stundenlfdSaldo = CDbl(txtlfdSaldo.Text)
+        stundenlfdSaldobere = RoundOfDigits(stundenlfdSaldo * faktorTeilzeit / 100, 2)
+
+        txt50x1.Text = stundenlfdSaldobere
+
+        stundenlfdSaldobere -= stunden100auszbere
+        stundenlfdSaldobere -= stunden50auszbere
+        stundenlfdSaldobere = Math.Round(stundenlfdSaldobere, 2)
+
+
+        If stundenlfdSaldo <= 0 Then Button1.Enabled = False
+
+        txtSummeAuszb.Text = stundenlfdSaldo
+        'txtSummeAuszb.Text = stundenlfdSaldobere
+
+
+    End Sub
 End Class