merge

2025-10-02 09:12:21 +02:00
parent 827c68ad49 6a03240f7e
commit bfc2aef24d
47 changed files with 3882 additions and 1835 deletions
--- a/VERAG_PROG_ALLGEMEIN/Classes/cAPI.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cAPI.vb
@@ -27,6 +27,7 @@ Public Enum cAPI_ART
    AVISO_IN_MSE = 80
    SDL_OUT_FA = 81
    SDL_OUT_SAMMELRECHNUNG = 82
+    AVISO_IN_CS = 83


 End Enum
--- a/VERAG_PROG_ALLGEMEIN/Classes/cDY_Zollanmeldungen_Import.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cDY_Zollanmeldungen_Import.vb
@@ -143,6 +143,7 @@ Public Class cDY_Zollanmeldungen_Import
    Property UST_ID_Fiskalvertreter As Object = Nothing
    Property Shipmentnummer As Object = Nothing
    Property Importstatus As Object = Nothing
+    Property Importdate As Object = Nothing

    Public hasEntry = False

@@ -297,6 +298,7 @@ Public Class cDY_Zollanmeldungen_Import
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UST_ID_Fiskalvertreter", UST_ID_Fiskalvertreter))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Shipmentnummer", Shipmentnummer))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Importstatus", Importstatus))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Importdate", Importdate))

        Return list
    End Function
--- a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb
@@ -17,7 +17,6 @@ Public Class cKundenErweitert
    'Property kde_Hoechstkredit As Object = Nothing
    Property kde_Versicherung_Deckungsstopp As Boolean = False
    Property kde_Versicherung_DeckungsstoppDatum As Object = Nothing
-
    Property kde_Versicherung_Uebergeben As Boolean = False
    Property kde_Versicherung_UebergebenAm As Object = Nothing
    Property kde_Versicherung_AnerkennungVersicherungsfall As Boolean = False
@@ -28,7 +27,6 @@ Public Class cKundenErweitert
    Property kde_Versicherung_GemeldeterBetrag As Object = Nothing
    Property kde_txtVersicherungEHNr As Object = Nothing

-
    Property kde_Leihgeld_Provision As Object = Nothing
    Property kde_Leihgeld_ProvisionPreisstaffel As Object = Nothing
    Property kde_Leihgeld_ProvisionAuftraggeber As Object = Nothing
@@ -44,7 +42,6 @@ Public Class cKundenErweitert
    Property Email_AVM As Boolean = False
    Property Depot_Kunde As Boolean = False
    Property FiBuSchnittstelleLG As Boolean = False
-
    Property Zahlungsziel2 As Object = Nothing
    Property Zahlungsziel3 As Object = Nothing
    Property EmailAnkunft_Export As Boolean = False
@@ -53,7 +50,6 @@ Public Class cKundenErweitert
    Property kde_CreditSaveBonitaetsklasse As Object = Nothing
    Property kde_CreditSaveBonitaetsIndex As Object = Nothing
    Property kde_CreditSaveBonitaetsScore As Object = Nothing
-
    Property kde_CreditSaveId As String = ""
    Property kde_CreditSaveNo As String = ""
    Property kde_Inkasso_Uebergeben As Boolean = False
@@ -98,8 +94,8 @@ Public Class cKundenErweitert
    Property kde_Erstattungsart As Object = Nothing
    Property kde_BezFIBU As Object = Nothing
    Property kde_Kopfsammelrechnung As Boolean = False
-
    Property kde_CSPortfolioAdded As Boolean = False
+    Property kde_CSinsolventAm As Object = Nothing


    Property kde_Provisionsverguetung As Boolean = False
@@ -210,6 +206,7 @@ Public Class cKundenErweitert
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_Provisionsverguetung", kde_Provisionsverguetung))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_Provisionsverguetung_ProzentDL", kde_Provisionsverguetung_ProzentDL))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_Provisionsverguetung_GSAnKdNr", kde_Provisionsverguetung_GSAnKdNr))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CSinsolventAm", kde_CSinsolventAm))

        Return list
    End Function
--- a/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb
@@ -196,7 +196,7 @@ Public Class cRMC
    End Function


-    Public Shared Function UPDATE_ARCHIV(reDat As Date, reNr As Integer, rmc_kdNr As Integer, UStVAn_ID As Integer) As Boolean
+    Public Shared Function UPDATE_ARCHIV(reDat As Date, reNr As String, rmc_kdNr As Integer, UStVAn_ID As Integer) As Boolean
        Try
            Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL

--- a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb
@@ -2,6 +2,7 @@
 Imports System.Reflection
 Imports System.Windows.Forms
 Imports com.sun.org.apache.xpath.internal.operations
+Imports com.sun.source.tree
 'Imports DocumentFormat.OpenXml.Drawing.Charts
 'Imports DocumentFormat.OpenXml.Spreadsheet

@@ -525,38 +526,48 @@ Public Class cRechnungsausgang
                End If

            End If
-            End If
+        End If

-            If dgv Is Nothing Then
-                errMsg = "ERROR: Keine Positionen angegeben!" : Return False
-            ElseIf dgv.Rows.Count = 0 Then
-                errMsg = "ERROR: Keine Positionen angegeben!" : Return False
-            Else
-                If dgv.Rows.Count > 1 Then
-                    'Prüfung für doppelte Positionen mit PK: Bezeichnung und LeistungNr!
-                    Dim dt As New DataTable
-                    dt.Columns.Add("name", GetType(String))
+        If dgv Is Nothing Then
+            errMsg = "ERROR: Keine Positionen angegeben!" : Return False
+        ElseIf dgv.Rows.Count = 0 Then
+            errMsg = "ERROR: Keine Positionen angegeben!" : Return False
+        Else
+            If dgv.Rows.Count > 1 Then
+                'Prüfung für doppelte Positionen mit PK: Bezeichnung und LeistungNr!
+                Dim dt As New DataTable
+                dt.Columns.Add("name", GetType(String))

-                    For Each row As DataGridViewRow In dgv.Rows
-                        Dim R As DataRow = dt.NewRow
-                        R("name") = row.Cells(0).Value
-                        dt.Rows.Add(R)
-                    Next
-                    Dim dv As New DataView(dt)
-                    Dim distinct As DataTable = dv.ToTable(True, New String() {"name"})
-
-                    If distinct.Rows.Count <> dt.Rows.Count Then
-                        errMsg = "ERROR: Doppelte Positionen vorhanden!" : Return False
-                    End If
+                For Each row As DataGridViewRow In dgv.Rows
+                    Dim R As DataRow = dt.NewRow
+                    R("name") = row.Cells(0).Value
+                    dt.Rows.Add(R)
+                Next
+                Dim dv As New DataView(dt)
+                Dim distinct As DataTable = dv.ToTable(True, New String() {"name"})

+                If distinct.Rows.Count <> dt.Rows.Count Then
+                    errMsg = "ERROR: Doppelte Positionen vorhanden!" : Return False
                End If
+
            End If
+        End If
+
+
+        If FIRMA.Firma_ID = 19 Then
+
+            Select Case Me.BelegartenKz
+                Case "AR" : If (Me.SteuerfreierGesamtbetrag + Me.SteuerpflichtigerGesamtbetrag) < 0 Then errMsg = "ERROR: Vorzeichenfehler!" : Return False
+                Case "AG" : If (Me.SteuerfreierGesamtbetrag + Me.SteuerpflichtigerGesamtbetrag) < 0 Then errMsg = "ERROR: Vorzeichenfehler!" : Return False
+            End Select
+        End If



-            'checkFirmen

-            Return True
+        'checkFirmen
+
+        Return True
            End Function

    Public Function SAVE_POSITIONEN(RK_ID) As Boolean
--- a/VERAG_PROG_ALLGEMEIN/Classes/cTrdInvoice.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cTrdInvoice.vb
@@ -576,7 +576,7 @@ Class TrdInvoice_FUNCTIONS

                    If isVZ > 0 Then
                        Select Case ROW("RP_LeistungsNr")
-                            Case "124", "125", "126", "117", "118", "119"
+                            Case "123", "124", "125", "126", "128", "117", "118", "119"
                                TRD_PRODUCT.VZBetrag = TRD_PRODUCT.SteuerfreierBetragLokal

                            Case Else
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb
@@ -408,12 +408,14 @@ Public Class frmUeberstundenauszahlen
            Next

            If (stunden100bereitsausbezahl + stunden50bereitsausbezahlt + stunden25bereitsausbezahlt) > 0 Then
+                If MA.mit_firma = "ATILLA" Then GoTo sonderRegelungAtilla : 
                picDel.Visible = True
                Button1.Enabled = False
                txtAusz.Enabled = False
                picShow.Visible = True
            Else
-                Button1.Enabled = True
+sonderRegelungAtilla:
+            Button1.Enabled = True
                txtAusz.Enabled = True
                picShow.Visible = False

@@ -816,6 +818,10 @@ Public Class frmUeberstundenauszahlen
        If istTeilzeit Then txtAusgabe.Append("25% ÜS: " & CDbl(txtberAusz25.Text) & vbNewLine)
        'txtAusgabe.Append("ÜS gesamt: " & CDbl(txtberAusz100.Text) + CDbl(txtberAusz50.Text) + CDbl(txtberAusz25.Text))

+        If cbxabwDatum.Checked Then
+            MsgBox("Das Zurücksetzen von bereits ausgezahlten Stunden bei abweichenden Datum wird aktuell (noch) nicht unterstützt!")
+            Exit Sub
+        End If

        Dim aksAuszahlung As MsgBoxResult = MsgBox(txtAusgabe.ToString, vbYesNo)
        If aksAuszahlung = vbYes Then
--- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb
+++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb
--- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb
+++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb
@@ -934,7 +934,7 @@ Public Class cTimasAPI

        Select Case inout
            Case "in"
-                entryType = "KOMMT"
+                entryType = "KOMMT" & IIf(art = 0, "(Büro)", "") & IIf(art = 3, "(Homeoffice)", "")

            Case "out"
                entryType = "GEHT"
--- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
+++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
@@ -386,6 +386,12 @@
    <Compile Include="AuditFlow\Classes\cAuditFlow.vb" />
    <Compile Include="AuditFlow\Classes\cAuditFlow_Pruefobjekte.vb" />
    <Compile Include="AuditFlow\Classes\cAuditFlow_Pruefungen.vb" />
+    <Compile Include="frmTimasabfrage.Designer.vb">
+      <DependentUpon>frmTimasabfrage.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmTimasabfrage.vb">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="frmDatumsabfrage.Designer.vb">
      <DependentUpon>frmDatumsabfrage.vb</DependentUpon>
    </Compile>
@@ -808,6 +814,9 @@
    <EmbeddedResource Include="DATENSERVER\frmVorlagenUpload.resx">
      <DependentUpon>frmVorlagenUpload.vb</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="frmTimasabfrage.resx">
+      <DependentUpon>frmTimasabfrage.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="frmDatumsabfrage.resx">
      <DependentUpon>frmDatumsabfrage.vb</DependentUpon>
    </EmbeddedResource>
--- a/VERAG_PROG_ALLGEMEIN/cErrorHandler.vb
+++ b/VERAG_PROG_ALLGEMEIN/cErrorHandler.vb
@@ -5,7 +5,7 @@ Imports System.Windows.Forms

 Public Class cErrorHandler

-    Public Shared Sub ERR(message As String, stack As String, functionName As String, Optional OP As String = "", Optional title As String = "", Optional mailadess As String = "error@verag.ag", Optional recieverMailAdress As String = "", Optional zusatz As String = "", Optional errCode As String = Nothing)
+    Public Shared Sub ERR(message As String, stack As String, functionName As String, Optional OP As String = "", Optional title As String = "", Optional mailadess As String = "error@verag.ag", Optional recieverMailAdress As String = "", Optional zusatz As String = "", Optional errCode As String = Nothing, Optional furtherMailAdress As String = "")
        If OP = "" Then OP = VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL ' GLobal gesetzes Errorhandling! (Standart=SHOW)

        'If Form.ActiveForm IsNot Nothing Then
@@ -19,7 +19,7 @@ Public Class cErrorHandler

            Select Case OP
                Case ERROR_OP.MAIL
-                    sendERRORperMail(title & " | " & My.Application.Info.AssemblyName, message, stack, mailadess, zusatz, functionName)
+                    sendERRORperMail(title & " | " & My.Application.Info.AssemblyName, message, stack, mailadess, zusatz, functionName, furtherMailAdress)
                Case ERROR_OP.SHOW
                    Dim c As New cProgramFunctions
                    Dim url = c.MakeScreenshot()
@@ -44,7 +44,7 @@ Public Class cErrorHandler

    End Sub

-    Public Shared Sub sendERRORperMail(title, errmsg, errstack, recieverMailAdress, zusatz, functionName)
+    Public Shared Sub sendERRORperMail(title, errmsg, errstack, recieverMailAdress, zusatz, functionName, furtherMailAdress)
        Dim Msg As New MailMessage
        Dim myCredentials As New System.Net.NetworkCredential
        'myCredentials.UserName = "support@verag.ag"
@@ -66,6 +66,8 @@ Public Class cErrorHandler
            Msg.From = New MailAddress("edv@verag.ag")
            Msg.To.Add(recieverMailAdress)

+            If furtherMailAdress <> "" Then Msg.To.Add(furtherMailAdress)
+
            Msg.Subject = title '"ERROR - DAKOSY Einarbeitung"
            Msg.Body = "Uhrzeit: " & Now.ToShortDateString & " " & Now.ToShortTimeString
            Msg.Body = "Function: " & functionName
--- a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb
+++ b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb
@@ -441,7 +441,7 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object(
        End Try
    End Function

-    Public Shared Function sendMail(eMailTo, betreff, text, Optional eMailfrom = "support@verag.ag", Optional prio = False, Optional uhrzeitAngeben = True, Optional cc = "", Optional bcc = "", Optional anhaenge = Nothing, Optional art = 0)
+    Public Shared Function sendMail(eMailTo, betreff, text, Optional eMailfrom = "support@verag.ag", Optional prio = False, Optional uhrzeitAngeben = True, Optional cc = "", Optional bcc = "", Optional anhaenge = Nothing, Optional art = 0, Optional furtherMailAdress = "")
        Dim Msg As New MailMessage
        Dim myCredentials As New System.Net.NetworkCredential
        Msg.IsBodyHtml = True
@@ -549,7 +549,7 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object(

        Catch ex As Exception
            Try
-                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("MAIL ERROR - VOR SENDEN" & ex.Message, "TO: " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
+                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("MAIL ERROR - VOR SENDEN" & ex.Message, "TO: " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL,,,,, furtherMailAdress)
            Catch ex2 As Exception
                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("MAIL ERROR - VOR SENDEN LOG! " & ex2.Message, "TO: " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, ex2.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.LOG)
            End Try
@@ -559,7 +559,7 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object(

        'Prüfen, ob Empfänger angegeben:
        If Msg.To.Count = 0 And Msg.CC.Count = 0 And Msg.Bcc.Count = 0 Then
-            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Kein Empfänger!", "TO:  " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Kein Empfänger!", "TO:  " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL,,,,,, furtherMailAdress)
            Return False
        End If

@@ -579,7 +579,7 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object(
        Catch ex As Exception
            Try 'Falls Fehler nicht beim Senden, sonder was anderes.

-                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "TO:  " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
+                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "TO:  " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL,,,,, furtherMailAdress)
            Catch ex3 As Exception
            End Try

--- a/VERAG_PROG_ALLGEMEIN/frmTimasabfrage.Designer.vb
+++ b/VERAG_PROG_ALLGEMEIN/frmTimasabfrage.Designer.vb
@@ -0,0 +1,172 @@
+Imports System.Windows.Forms
+
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class frmTimasabfrage
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()>
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()>
+    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
+        Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
+        Me.rbHO = New System.Windows.Forms.RadioButton()
+        Me.rbBuero = New System.Windows.Forms.RadioButton()
+        Me.Button1 = New System.Windows.Forms.Button()
+        Me.cboTyp = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.btnClose = New System.Windows.Forms.Button()
+        Me.btn = New System.Windows.Forms.Button()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.MyPanel1.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'MyPanel1
+        '
+        Me.MyPanel1.BackColor = System.Drawing.Color.White
+        Me.MyPanel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.MyPanel1.Controls.Add(Me.rbHO)
+        Me.MyPanel1.Controls.Add(Me.rbBuero)
+        Me.MyPanel1.Controls.Add(Me.Button1)
+        Me.MyPanel1.Controls.Add(Me.cboTyp)
+        Me.MyPanel1.Controls.Add(Me.btnClose)
+        Me.MyPanel1.Controls.Add(Me.btn)
+        Me.MyPanel1.Controls.Add(Me.Label1)
+        Me.MyPanel1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.MyPanel1.Location = New System.Drawing.Point(0, 0)
+        Me.MyPanel1.Name = "MyPanel1"
+        Me.MyPanel1.Size = New System.Drawing.Size(264, 103)
+        Me.MyPanel1.TabIndex = 3
+        '
+        'rbHO
+        '
+        Me.rbHO.AutoSize = True
+        Me.rbHO.Location = New System.Drawing.Point(76, 46)
+        Me.rbHO.Name = "rbHO"
+        Me.rbHO.Size = New System.Drawing.Size(79, 17)
+        Me.rbHO.TabIndex = 9
+        Me.rbHO.TabStop = True
+        Me.rbHO.Text = "Homeoffice"
+        Me.rbHO.UseVisualStyleBackColor = True
+        '
+        'rbBuero
+        '
+        Me.rbBuero.AutoSize = True
+        Me.rbBuero.Location = New System.Drawing.Point(76, 23)
+        Me.rbBuero.Name = "rbBuero"
+        Me.rbBuero.Size = New System.Drawing.Size(47, 17)
+        Me.rbBuero.TabIndex = 8
+        Me.rbBuero.TabStop = True
+        Me.rbBuero.Text = "Büro"
+        Me.rbBuero.UseVisualStyleBackColor = True
+        '
+        'Button1
+        '
+        Me.Button1.DialogResult = System.Windows.Forms.DialogResult.OK
+        Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!)
+        Me.Button1.Location = New System.Drawing.Point(6, 71)
+        Me.Button1.Margin = New System.Windows.Forms.Padding(0)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(57, 22)
+        Me.Button1.TabIndex = 7
+        Me.Button1.Text = "OK"
+        Me.Button1.UseVisualStyleBackColor = True
+        '
+        'cboTyp
+        '
+        Me.cboTyp._allowedValuesFreiText = Nothing
+        Me.cboTyp._allowFreiText = False
+        Me.cboTyp._value = ""
+        Me.cboTyp.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
+        Me.cboTyp.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboTyp.DropDownWidth = 224
+        Me.cboTyp.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.cboTyp.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboTyp.FormattingEnabled = True
+        Me.cboTyp.Items.AddRange(New Object() {"", "100000-199999: XXXXXX", "200000-299999: XXXXXX", "300000-399999: XXXXXX", "400000-499999: XXXXXX", "500000-599999: XXXXXX", "600000-699999: XXXXXX", "700000-799999: XXXXXX", "800000-899999: XXXXXX", "900000-999999: XXXXXX"})
+        Me.cboTyp.Location = New System.Drawing.Point(201, 33)
+        Me.cboTyp.Name = "cboTyp"
+        Me.cboTyp.Size = New System.Drawing.Size(58, 28)
+        Me.cboTyp.TabIndex = 4
+        Me.cboTyp.Visible = False
+        '
+        'btnClose
+        '
+        Me.btnClose.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnClose.BackColor = System.Drawing.Color.Red
+        Me.btnClose.FlatAppearance.BorderColor = System.Drawing.Color.White
+        Me.btnClose.FlatAppearance.BorderSize = 0
+        Me.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnClose.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!, System.Drawing.FontStyle.Bold)
+        Me.btnClose.ForeColor = System.Drawing.Color.White
+        Me.btnClose.Location = New System.Drawing.Point(231, 0)
+        Me.btnClose.Name = "btnClose"
+        Me.btnClose.RightToLeft = System.Windows.Forms.RightToLeft.Yes
+        Me.btnClose.Size = New System.Drawing.Size(31, 20)
+        Me.btnClose.TabIndex = 5
+        Me.btnClose.Text = "X"
+        Me.btnClose.UseVisualStyleBackColor = False
+        '
+        'btn
+        '
+        Me.btn.DialogResult = System.Windows.Forms.DialogResult.Cancel
+        Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btn.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!)
+        Me.btn.Location = New System.Drawing.Point(178, 71)
+        Me.btn.Margin = New System.Windows.Forms.Padding(0)
+        Me.btn.Name = "btn"
+        Me.btn.Size = New System.Drawing.Size(76, 22)
+        Me.btn.TabIndex = 2
+        Me.btn.Text = "Abbrechen"
+        Me.btn.UseVisualStyleBackColor = True
+        '
+        'Label1
+        '
+        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label1.ForeColor = System.Drawing.SystemColors.ControlText
+        Me.Label1.Location = New System.Drawing.Point(3, 2)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(222, 18)
+        Me.Label1.TabIndex = 6
+        '
+        'frmTimasabfrage
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(264, 103)
+        Me.Controls.Add(Me.MyPanel1)
+        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
+        Me.Name = "frmTimasabfrage"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+        Me.Text = "frmDatumsabfrage"
+        Me.MyPanel1.ResumeLayout(False)
+        Me.MyPanel1.PerformLayout()
+        Me.ResumeLayout(False)
+
+    End Sub
+
+    Friend WithEvents MyPanel1 As VERAG_PROG_ALLGEMEIN.MyPanel
+    Friend WithEvents btnClose As Button
+    Friend WithEvents btn As Button
+    Friend WithEvents Label1 As Label
+    Public WithEvents cboTyp As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Button1 As Button
+    Friend WithEvents rbHO As RadioButton
+    Friend WithEvents rbBuero As RadioButton
+End Class
--- a/VERAG_PROG_ALLGEMEIN/frmTimasabfrage.resx
+++ b/VERAG_PROG_ALLGEMEIN/frmTimasabfrage.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
--- a/VERAG_PROG_ALLGEMEIN/frmTimasabfrage.vb
+++ b/VERAG_PROG_ALLGEMEIN/frmTimasabfrage.vb
@@ -0,0 +1,61 @@
+Public Class frmTimasabfrage
+    Dim mit As VERAG_PROG_ALLGEMEIN.cMitarbeiter
+    Public Datum As Date = CDate(Now.ToShortDateString)
+    Public typ As Integer = -1
+
+    Sub New()
+        ' Dieser Aufruf ist für den Designer erforderlich.
+        InitializeComponent()
+    End Sub
+
+    Sub New(mit_ As cMitarbeiter)
+        ' Dieser Aufruf ist für den Designer erforderlich.
+        InitializeComponent()
+        mit = mit_
+    End Sub
+
+    Private Sub frmTimasabfrage(sender As Object, e As EventArgs) Handles Me.Load
+
+        cboTyp.Items.Clear()
+        cboTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Büro", "0"))
+        cboTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Homeoffice", "3"))
+
+        If mit IsNot Nothing Then
+            Label1.Text = "Zeit erfassen für: " & mit.mit_nname & " " & mit.mit_vname
+            If mit.mit_homeoffice Then
+                rbHO.Checked = True
+                cboTyp.changeItem("Homeoffice")
+            Else
+                rbHO.Checked = False
+                cboTyp.changeItem("Büro")
+            End If
+        End If
+
+
+
+    End Sub
+
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+
+        If typ = -1 Then
+            MsgBox("Bitte Typ auswählen")
+            DialogResult = Windows.Forms.DialogResult.None
+        Else
+            DialogResult = Windows.Forms.DialogResult.OK
+        End If
+
+    End Sub
+
+    Private Sub rbBuero_CheckedChanged(sender As Object, e As EventArgs) Handles rbBuero.CheckedChanged, rbHO.CheckedChanged
+
+        If rbBuero.Checked Then
+            typ = 0
+        ElseIf rbHO.Checked Then
+            typ = 3
+        Else
+            typ = -1
+        End If
+
+    End Sub
+
+End Class