Ueberstuden, Einfuhrverbot, Formulare, Timas, Datev

SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEinfuhrverbot.Designer.vb

@@ -34,6 +34,7 @@ Partial Class usrcntlEinfuhrverbot
         Me.txtFirma = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
         Me.Label4 = New System.Windows.Forms.Label()
         Me.cboSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.txtAdresse3 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
@@ -206,12 +207,36 @@ Partial Class usrcntlEinfuhrverbot
         Me.cboSprache.Size = New System.Drawing.Size(89, 21)
         Me.cboSprache.TabIndex = 60
         '
+        'txtAdresse3
+        '
+        Me.txtAdresse3._DateTimeOnly = False
+        Me.txtAdresse3._numbersOnly = False
+        Me.txtAdresse3._numbersOnlyKommastellen = ""
+        Me.txtAdresse3._numbersOnlyTrennzeichen = True
+        Me.txtAdresse3._Prozent = False
+        Me.txtAdresse3._ShortDateNew = False
+        Me.txtAdresse3._ShortDateOnly = False
+        Me.txtAdresse3._TimeOnly = False
+        Me.txtAdresse3._TimeOnly_Seconds = False
+        Me.txtAdresse3._value = Nothing
+        Me.txtAdresse3._Waehrung = False
+        Me.txtAdresse3._WaehrungZeichen = True
+        Me.txtAdresse3.ForeColor = System.Drawing.Color.Black
+        Me.txtAdresse3.Location = New System.Drawing.Point(254, 92)
+        Me.txtAdresse3.MaxLineLength = -1
+        Me.txtAdresse3.MaxLines_Warning = ""
+        Me.txtAdresse3.MaxLines_Warning_Label = Nothing
+        Me.txtAdresse3.Name = "txtAdresse3"
+        Me.txtAdresse3.Size = New System.Drawing.Size(709, 20)
+        Me.txtAdresse3.TabIndex = 61
+        '
         'usrcntlEinfuhrverbot
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.Color.WhiteSmoke
         Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Controls.Add(Me.txtAdresse3)
         Me.Controls.Add(Me.Label4)
         Me.Controls.Add(Me.cboSprache)
         Me.Controls.Add(Me.lblEinfuhrverbot)
@@ -225,7 +250,7 @@ Partial Class usrcntlEinfuhrverbot
         Me.Controls.Add(Me.txtAdresse1)
         Me.Controls.Add(Me.lbl)
         Me.Name = "usrcntlEinfuhrverbot"
-        Me.Size = New System.Drawing.Size(1000, 108)
+        Me.Size = New System.Drawing.Size(1000, 118)
         CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
@@ -243,4 +268,5 @@ Partial Class usrcntlEinfuhrverbot
     Friend WithEvents txtFirma As VERAG_PROG_ALLGEMEIN.KdSearchBox
     Friend WithEvents Label4 As Label
     Friend WithEvents cboSprache As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents txtAdresse3 As VERAG_PROG_ALLGEMEIN.MyTextBox
 End Class

SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEinfuhrverbot.vb

@@ -60,7 +60,8 @@
                                                          Dim KUNDE = txtFirma.KdData_KUNDE
                                                          txtFirma.Text = If(ADRESSE.Name_1, ADRESSE.Ordnungsbegriff)
                                                          txtAdresse1.Text = If(ADRESSE.Straße, "")
-                                                         txtAdresse2.Text = (If(ADRESSE.LandKz, "") & " " & If(ADRESSE.PLZ, "") & " " & If(ADRESSE.Ort, "")).ToString.Trim
+                                                         txtAdresse2.Text = (If(ADRESSE.LandKz, "") & " " & If(ADRESSE.PLZ, "")).ToString.Trim
+                                                         txtAdresse3.Text = (If(ADRESSE.Ort, "")).ToString.Trim
                                                      End If
                                                  End If
                                                  RaiseEvent KDNR_CHANGED(KdNR)

SDL/Formulare/KDFormulare/frmFormulare.vb

@@ -1744,8 +1744,11 @@ Public Class FormularManagerNEU
 
             For Each s In SENDUNGEN
                 'Ä tb.Rows.Add(cnt, s.AbfertigungsNr, s.tblSnd_Abfertigungsart_ID)
-                tb.Rows.Add(SENDUNGEN.IndexOf(s))
+                If s.tblSnd_Abfertigungsart_ID <> 44 Then
-                cnt += 1
+                    tb.Rows.Add(SENDUNGEN.IndexOf(s))
+                    cnt += 1
+                End If
+
             Next
 
 
@@ -5424,9 +5427,10 @@ Public Class FormularManagerNEU
 
         Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues)
 
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrcntl.txtFirma.Text, 40, 150, 100, 20, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrcntl.txtFirma.Text, 40, 150, 200, 20, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT))
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrcntl.txtAdresse1.Text, 40, 155, 110, 20, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrcntl.txtAdresse1.Text, 40, 155, 200, 20, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT))
-        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrcntl.txtAdresse2.Text, 40, 160, 110, 20, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrcntl.txtAdresse2.Text, 40, 160, 200, 20, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT))
+        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrcntl.txtAdresse3.Text, 40, 165, 200, 20, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT))
 
         Select Case usrcntl.cboSprache._value
             Case "EN"

SDL/kunden/usrcntlKundeBearbeitenFull.vb

@@ -92,6 +92,7 @@ Public Class usrcntlKundeBearbeitenFull
                         cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("3000000-3099999: AMBAR", "3000000-3099990"))
                         cboKundenkreis.changeItem("3000000-3099990")
                         KUNDE.Zahlungsziel = 0
+                        ADRESSE.Rechnungsdruck = 2
                     Case "ATILLA"
                         cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  100000-199999: ATILLA", "100000-199999"))
                         cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("  900000-999999: Sonstige", "900000-999999"))

VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb

@@ -412,7 +412,7 @@ Public Class frmMitarbeitersuche
 
                 Dim resultCode As Integer = IIf(cbxHomeoffice.Checked, 3, 0)
 
-                If MA.mit_nname.ToLower = "celan" Or MA.mit_nname.ToLower = "breimaier" Then 'aktuell Hardcoded, wenn Zeit ist dynamisch (per SQL-tbl)
+                If MA.mit_nname.ToLower = "celan" Then 'aktuell Hardcoded, wenn Zeit ist dynamisch (per SQL-tbl)
 
                     Dim f As New frmZEButtons(art)
                     f.ShowDialog()

VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb

@@ -764,9 +764,14 @@ Public Class frmUeberstundenauszahlen
 
 
             Dim info As String = ""
-            If timas.setTimeAccountEntries(MA, dtsetEntries, auszahlugsdatum, info) AndAlso ues.SAVE() Then
+            If timas.setTimeAccountEntries(MA, dtsetEntries, auszahlugsdatum, info) Then
-                MsgBox("Erfolgreich in Timas eingetragen")
+                If ues.SAVE() Then
+                    MsgBox("Erfolgreich in Timas eingetragen")
+                Else
+                    MsgBox("Fehler beim Speichern")
+                End If
             Else
+
                 MsgBox(info)
             End If
 
@@ -818,7 +823,8 @@ Public Class frmUeberstundenauszahlen
                 dtdeleteEntries.Rows.InsertAt(row, dtdeleteEntries.Rows.Count)
             End If
 
-            If timas.deleteTimeAccounts(auszahlugsdatum, auszahlugsdatum, MA.mit_timasId, dtdeleteEntries) Then
+            Dim info As String = ""
+            If timas.deleteTimeAccounts(auszahlugsdatum, auszahlugsdatum, MA.mit_timasId, dtdeleteEntries, info) Then
 
                 'Dim dtEntriesset0 As New DataTable
                 'dtEntriesset0.Columns.Add("accountid", GetType(Integer))
@@ -843,6 +849,8 @@ Public Class frmUeberstundenauszahlen
                 picDel.Visible = False
                 Thread.Sleep(1000) 'warten bis Eintrag in Timas-DB
                 getUeberstunden(cbxabwDatum.Checked)
+            Else
+                MsgBox(info)
             End If
 
         End If

VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb

@@ -1250,7 +1250,7 @@ Public Class cTimasAPI
 
     End Function
 
-    Public Function deleteTimeAccounts(ByRef from As Date, ByRef toDate As Date, ByRef employeeNr As Integer, ByRef accountsdt As DataTable) As Boolean
+    Public Function deleteTimeAccounts(ByRef from As Date, ByRef toDate As Date, ByRef employeeNr As Integer, ByRef accountsdt As DataTable, ByRef info As String) As Boolean
         Dim timeEntryDeleted As Boolean = False
         Try
 
@@ -1281,7 +1281,11 @@ Public Class cTimasAPI
             End If
 
             If (rest.ResponseStatusCode <> 200) Then
-                Debug.WriteLine(rest.ResponseStatusCode & " " & rest.ResponseStatusText & sbResponseBody.ToString)
+                Debug.WriteLine(rest.ResponseHeader)
+                info = rest.ResponseStatusCode & " " & rest.ResponseStatusText
+                If sbResponseBody <> "" Then
+                    info &= vbNewLine & sbResponseBody
+                End If
                 Return timeEntryDeleted
             Else
                 timeEntryDeleted = True

VERAG_PROG_ALLGEMEIN/Schnittstellen/cDatev_Interface.vb

@@ -1,4 +1,6 @@
-Imports DocumentFormat.OpenXml.Wordprocessing
+Imports System.IO
+Imports System.Net
+Imports DocumentFormat.OpenXml.Wordprocessing
 
 Public Class cDatev_Interface
 
@@ -117,13 +119,14 @@ Public Class cDatev_Interface
 
             '----------------- STAMMDATEN  -----------------
             Dim dt_Stamm As DataTable = getStammdaten(filialNr)
-            If dt_Stamm IsNot Nothing AndAlso dt_Stamm.Rows.Count > 0 Then
+
+            If True Then 'dt_Stamm IsNot Nothing AndAlso dt_Stamm.Rows.Count > 0 Then
 
                 Dim fileKD As System.IO.StreamWriter
                 Dim DateinameKD = "DTVF_KD_" & Now.ToString("ddMMyyyy_HHmm") & ".csv"
                 fileKD = My.Computer.FileSystem.OpenTextFileWriter(pathKD & DateinameKD, True, System.Text.Encoding.GetEncoding("iso-8859-15"))
 
-                Dim month = IIf(automatischerExport, Now.AddDays(-1).Month, Now.Month)
+                Dim month As String = IIf(automatischerExport, Now.AddDays(-1).Month.ToString("d2"), Now.Month.ToString("d2"))
 
                 fileKD.WriteLine(genStammdatenHeader(Geschaeftsjahr, month))
                 fileKD.WriteLine(genStammdatenBeginn())
@@ -165,7 +168,7 @@ Public Class cDatev_Interface
 
 
 
-    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, Optional automatischerExport As Boolean = True) 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, Optional automatischerExport As Boolean = True, Optional kindOfExport As String = "mail") As Boolean
 
         If PathList IsNot Nothing Then
             PathList.Clear()
@@ -179,19 +182,70 @@ Public Class cDatev_Interface
             Return ExportfileCreated
         End If
 
-        If boolKunden Then
+        Select Case kindOfExport
-            If genDatensatzCSV_Stammdaten(24, OpenFile, Geschaeftsjahr, Path, automatischerExport) Then
+            Case "mail"
-                ExportfileCreated = True
+
-                If Path <> "" Then PathList.Add(Path)
+                If boolKunden Then
-            End If
+                    If genDatensatzCSV_Stammdaten(24, OpenFile, Geschaeftsjahr, Path, automatischerExport) Then
-        End If
+                        ExportfileCreated = True
-        If boolBuchungen Then
+                        If Path <> "" Then PathList.Add(Path)
-            If genDatensatzCSV_Buchungen(24, OpenFile, Geschaeftsjahr, Path, automatischerExport) Then
+                    End If
-                ExportfileCreated = True
+                End If
-                If Path <> "" Then PathList.Add(Path)
+                If boolBuchungen Then
-            End If
+                    If genDatensatzCSV_Buchungen(24, OpenFile, Geschaeftsjahr, Path, automatischerExport) Then
-        End If
+                        ExportfileCreated = True
-        Return ExportfileCreated
+                        If Path <> "" Then PathList.Add(Path)
+                    End If
+                End If
+                Return ExportfileCreated
+
+
+            Case "ftp"
+                Try
+
+                    Dim API As New DataTable
+                    Dim Program = "DATEV-PDF"
+                    API = SQL.loadDgvBySql("SELECT top(1) * FROM tblAPIEinstellungen WHERE api_program='" & Program & "' and api_productive ='" & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "0", "1") & "'", "ADMIN")
+                    If API.Rows.Count = 0 Then
+                        MsgBox("keine gültigen FTP-Einstellungen für " & Program & " gefunden!" & vbNewLine & "Vorgang wird abgebrochen!")
+                        Return ExportfileCreated
+                    Else
+
+
+                        Dim client As WebClient = New WebClient
+                        client.Credentials = New NetworkCredential(API.Rows(0).Item("api_user").ToString, API.Rows(0).Item("api_password").ToString)
+
+
+                        If boolKunden Then
+                            If genDatensatzCSV_Stammdaten(24, OpenFile, Geschaeftsjahr, Path, automatischerExport) Then
+                                ExportfileCreated = True
+                                If Path <> "" Then
+                                    Dim fi As FileInfo = New FileInfo(Path)
+                                    client.UploadFile(API.Rows(0).Item("api_url") & "/DATEV/ " & fi.Name, Path)
+                                End If
+                            End If
+                        End If
+                        If boolBuchungen Then
+                            If genDatensatzCSV_Buchungen(24, OpenFile, Geschaeftsjahr, Path, automatischerExport) Then
+                                ExportfileCreated = True
+                                If Path <> "" Then
+                                    Dim fi As FileInfo = New FileInfo(Path)
+                                    client.UploadFile(API.Rows(0).Item("api_url") & "/DATEV/ " & fi.Name, Path)
+                                End If
+                            End If
+                        End If
+                        Return ExportfileCreated
+
+                    End If
+
+                Catch ex As Exception
+                    MsgBox("FTP Fehler!" & ex.Message & ex.StackTrace)
+                    Return False
+                End Try
+
+
+        End Select
+
 
     End Function
 
@@ -319,7 +373,7 @@ Public Class cDatev_Interface
 
 
 
-    Public Shared Function genStammdatenHeader(Geschäftsjahr As Integer, aktuellesMonat As Integer) As String
+    Public Shared Function genStammdatenHeader(Geschäftsjahr As Integer, aktuellesMonat As String) As String
 
         Dim day = New cFeiertage(Geschäftsjahr)
 
@@ -334,14 +388,14 @@ Public Class cDatev_Interface
         headerString &= Geschäftsjahr.ToString & "0101" & ";" 'WJ-Beginn
         headerString &= KontenlängePersonKto.ToString & ";"
         headerString &= Geschäftsjahr.ToString & aktuellesMonat & "01" & ";" 'DatumVon
-        headerString &= Geschäftsjahr.ToString & aktuellesMonat & day.GetLastyDayYInxMonth(Now.DayOfWeek, aktuellesMonat, Geschäftsjahr, True) & ";" 'DatumBis
+        headerString &= Geschäftsjahr.ToString & aktuellesMonat & day.GetLastyDayYInxMonth(Now.DayOfWeek, CInt(aktuellesMonat), Geschäftsjahr, True).Day & ";" 'DatumBis
         headerString &= "IMPORT AUS AVISO;" 'Bezeichnung
         headerString &= Chr(34) & Chr(34) & ";"
         headerString &= emptyFormatedValueWithoutCommas(12)
         Return headerString
     End Function
 
-    Public Shared Function genStapelbuchungsHeader(Geschäftsjahr As Integer, aktuellesMonat As Integer) As String
+    Public Shared Function genStapelbuchungsHeader(Geschäftsjahr As Integer, aktuellesMonat As String) As String
         Dim headerString = Chr(34) & "EXTF" & Chr(34) & ";" 'Export aus 3rd Party App
         Dim day = New cFeiertage(Geschäftsjahr)
         headerString &= datevVersion.ToString & ";" 'Versionnummer Datev
@@ -354,7 +408,7 @@ Public Class cDatev_Interface
         headerString &= Geschäftsjahr.ToString & "0101" & ";" 'WJ-Beginn
         headerString &= KontenlängeSachKto.ToString & ";"
         headerString &= Geschäftsjahr.ToString & aktuellesMonat & "01" & ";"  'DatumVon
-        headerString &= Geschäftsjahr.ToString & aktuellesMonat & day.GetLastyDayYInxMonth(Now.DayOfWeek, aktuellesMonat, Geschäftsjahr, True) & ";" 'DatumBis
+        headerString &= Geschäftsjahr.ToString & aktuellesMonat & day.GetLastyDayYInxMonth(Now.DayOfWeek, CInt(aktuellesMonat), Geschäftsjahr, True).Day & ";" 'DatumBis
         headerString &= "IMPORT AUS AVISO;" 'Bezeichnung
         headerString &= Chr(34) & Chr(34) & ";"
         headerString &= emptyFormatedValueWithoutCommas(12)