API Einstellungen, Überstundenauszahlung, Sammelrechnungsdruck, etc

2024-04-17 08:50:07 +02:00
parent 928df14ded
commit 39169c98f8
14 changed files with 230 additions and 56 deletions
--- a/SDL/Creditsafe/usrcntlCreditsafe.vb
+++ b/SDL/Creditsafe/usrcntlCreditsafe.vb
@@ -1,4 +1,5 @@

+Imports System.Runtime.Serialization
 Imports DocumentFormat.OpenXml.Drawing.Diagrams
 Imports itextsharp.text.pdf
 Imports VERAG_PROG_ALLGEMEIN
@@ -12,6 +13,7 @@ Public Class usrcntlCreditsafe
    Public comp As Company
    Dim uidDefault As String
    Public createCostumer As Boolean = False
+    Dim creditsafeAPI As New cCreditSafeAPI("creditsafe")
    Sub New()

        InitializeComponent()
@@ -35,12 +37,14 @@ Public Class usrcntlCreditsafe
    End Sub

    Private Sub init()
-        user = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_CSuser
-        pw = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_CSpwd
+
+        user = creditsafeAPI.dataTablecs.Rows(0).Item("api_user")
+        pw = creditsafeAPI.dataTablecs.Rows(0).Item("api_password")
+

        'Zugangsdaten hartcoded, da Webservice-User nicht Mitarbeiterabhängig ist!!!
-        user = "creditsafe@verag.ag"
-        pw = "^AZcBVTBUIHTT5SQ1C9OOH"
+        'user = "creditsafe@verag.ag"
+        'pw = "^AZcBVTBUIHTT5SQ1C9OOH"

        cboLand.fillWithSQL(" SELECT [Länderverzeichnis für die Außenhandelsstatistik].LandKz,[Länderverzeichnis für die Außenhandelsstatistik].LandBez  " &
                                      " FROM [Länderverzeichnis für die Außenhandelsstatistik] LEFT JOIN [Währungstabelle] ON [Länderverzeichnis für die Außenhandelsstatistik].LandNr = [Währungstabelle].[Währungsschlüssel] " &
@@ -98,10 +102,10 @@ Public Class usrcntlCreditsafe

            dataTable.Clear()

-            Dim cs = New cCreditSafeAPI()
+            Dim cs = New cCreditSafeAPI("creditsafe")
            Cursor = Cursors.WaitCursor

-            If cs.authenticate(user, pw) = "200" Then
+            If cs.authenticate() = "200" Then

                Dim company = New cCreditSafeAPI.Company(cbxSprache._value, txtFirma.Text, txtUID.Text, cboLand.SelectedItem.Value, "", "", Nothing, txtStrasse.Text, txtPLZ.Text, txtOrt.Text, "", "", "", "", "", "")
                lblWarning.Text = cs.searchCompanies(company, dataTable).ToString
--- a/SDL/Fakturierung/cFakturierung.vb
+++ b/SDL/Fakturierung/cFakturierung.vb
@@ -2327,7 +2327,7 @@ Public Class cFakturierung

    End Function

-    Public Shared Function doSAMMELRechnungsDruck_Abschnitt(ByRef RechnungsNr As Integer, Firma_ID As Integer, Buchungsjahr As Integer, DruckdatumUhrzeit As DateTime, PrinterName As String, Optional AnlageEinzelRg As Boolean = True, Optional Sammelrechnungsbericht As Boolean = True, Optional RechnungsdruckArt As Integer = -1, Optional ByRef pathPDF As String = "", Optional SRDruckWiederholen As Boolean = False, Optional SB As String = "", Optional AnlageExcelEvolog As Boolean = False, Optional ByRef SonstAnlagen As List(Of String) = Nothing, Optional VorschauID As String = "", Optional AnlageExcelTransferry360 As Boolean = False, Optional FakturierungsGruppe As String = "", Optional Abfertigungsart As String = "") As Boolean
+    Public Shared Function doSAMMELRechnungsDruck_Abschnitt(ByRef RechnungsNr As Integer, Firma_ID As Integer, Buchungsjahr As Integer, DruckdatumUhrzeit As DateTime, PrinterName As String, Optional AnlageEinzelRg As Boolean = True, Optional Sammelrechnungsbericht As Boolean = True, Optional RechnungsdruckArt As Integer = -1, Optional ByRef pathPDF As String = "", Optional SRDruckWiederholen As Boolean = False, Optional SB As String = "", Optional AnlageExcelEvolog As Boolean = False, Optional ByRef SonstAnlagen As List(Of String) = Nothing, Optional VorschauID As String = "", Optional AnlageExcelTransferry360 As Boolean = False, Optional FakturierungsGruppe As String = "", Optional Abfertigungsart As String = "", Optional mergePDF As Boolean = False) As Boolean
        'SB Nicht mehr benötigt, da RG-Nr und DruckdatumUhrzeit

        Dim dt As DataTable
@@ -3073,7 +3073,7 @@ Public Class cFakturierung
        Return ""
    End Function

-    Shared Function doSAMMELRechnungDruck_Rechnungsdruck(dt As DataTable, RechnungsNr As Integer, DruckdatumUhrzeit As Date, Rgstatus As Integer, Optional Rechnugnsdruck As Integer = -1, Optional ByRef Path As String = "", Optional PrinterName As String = "", Optional SRDruckWiederholen As Boolean = False, Optional VorschauID As String = "") As Boolean 'RECHNUNG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, Optional vorschau As Boolean = False, Optional Rechnugnsdruck As Integer = -1, Optional ByRef Path As String = "") As Boolean
+    Shared Function doSAMMELRechnungDruck_Rechnungsdruck(dt As DataTable, RechnungsNr As Integer, DruckdatumUhrzeit As Date, Rgstatus As Integer, Optional Rechnugnsdruck As Integer = -1, Optional ByRef Path As String = "", Optional PrinterName As String = "", Optional SRDruckWiederholen As Boolean = False, Optional VorschauID As String = "", Optional mergePDF As Boolean = False) As Boolean 'RECHNUNG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, Optional vorschau As Boolean = False, Optional Rechnugnsdruck As Integer = -1, Optional ByRef Path As String = "") As Boolean
        Try


--- a/SDL/Fakturierung/frmAbrechnungsMaske.Designer.vb
+++ b/SDL/Fakturierung/frmAbrechnungsMaske.Designer.vb
@@ -83,6 +83,7 @@ Partial Class frmAbrechnungsMaske
        Me.btnBisJahr = New System.Windows.Forms.Button()
        Me.btnVonJahr = New System.Windows.Forms.Button()
        Me.UsrCntlFaktAbrechnung1 = New SDL.usrCntlFaktAbrechnung()
+        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.pnl.SuspendLayout()
        CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainer.Panel1.SuspendLayout()
@@ -902,6 +903,11 @@ Partial Class frmAbrechnungsMaske
        Me.UsrCntlFaktAbrechnung1.Size = New System.Drawing.Size(863, 615)
        Me.UsrCntlFaktAbrechnung1.TabIndex = 0
        '
+        'ContextMenuStrip1
+        '
+        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
+        '
        'frmAbrechnungsMaske
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -989,4 +995,5 @@ Partial Class frmAbrechnungsMaske
    Public WithEvents cboSort As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents cbxOriginalDrucken As CheckBox
    Friend WithEvents Button11 As Button
+    Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
 End Class
--- a/SDL/Fakturierung/frmAbrechnungsMaske.resx
+++ b/SDL/Fakturierung/frmAbrechnungsMaske.resx
@@ -117,6 +117,9 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
+  <metadata name="ContextMenuStrip1.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="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
--- a/SDL/Fakturierung/frmAbrechnungsMaske.vb
+++ b/SDL/Fakturierung/frmAbrechnungsMaske.vb
@@ -688,16 +688,50 @@ Public Class frmAbrechnungsMaske
    End Sub

    Private Sub Button4_Click(sender As Object, e As EventArgs) Handles btnWiederholeRgDruck.Click
-        Dim SR_RechnungsNr = InputBox("SR-Nummer eingeben: ")
+
+
+
+        If Not ContextMenuStrip1.Items.ContainsKey("1") Then
+            Dim print = New ToolStripMenuItem() With {.Text = "Drucken", .Name = "1", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
+            AddHandler print.Click, AddressOf mnuItem_Clicked
+            ContextMenuStrip1.Items.Add(print)
+        End If
+
+        If Not ContextMenuStrip1.Items.ContainsKey("2") Then
+            Dim mail = New ToolStripMenuItem() With {.Text = "E-Mail", .Name = "2", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
+            ContextMenuStrip1.Items.Add(mail)
+            AddHandler mail.Click, AddressOf mnuItem_Clicked
+        End If
+
+        If Not ContextMenuStrip1.Items.ContainsKey("3") Then
+            Dim pdf = New ToolStripMenuItem() With {.Text = "PDF", .Name = "3", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
+            AddHandler pdf.Click, AddressOf mnuItem_Clicked
+            ContextMenuStrip1.Items.Add(pdf)
+        End If
+
+        ContextMenuStrip1.Show(Cursor.Position)
+
+    End Sub
+
+    Private Sub mnuItem_Clicked(sender As Object, e As EventArgs)
+        ContextMenuStrip1.Hide()
+        Dim id = 3 'default per PDF
+        Dim item As ToolStripMenuItem = TryCast(sender, ToolStripMenuItem)
+
+        If item IsNot Nothing Then id = item.Name
+
+        Dim SR_RechnungsNr = InputBox("SR-Nummer eingeben: ", "Rechnungsdruck - " & IIf(item.Text IsNot Nothing, item.Text, "PDF"))
        If IsNumeric(SR_RechnungsNr) Then
-            Dim RK_ID = SQL.getValueTxtBySql("SELECT TOP 1 RK_ID FROM Rechnungsausgang WHERE RechnungsNr='" & SR_RechnungsNr & "' AND Firma_ID='" & cboFirma._value & "' ORDER BY DruckDatumZeit DESC", "FMZOLL")
-            If IsNumeric(RK_ID) Then
-                Dim RG_TMP As New VERAG_PROG_ALLGEMEIN.cRechnungsausgang(RK_ID)
-                If RG_TMP IsNot Nothing Then
-                    cFakturierung.doSAMMELRechnungsDruck_Abschnitt(RG_TMP.RechnungsNr, -1, -1, RG_TMP.DruckDatumZeit, "", False, , 3,, True)
+                Dim RK_ID = SQL.getValueTxtBySql("SELECT TOP 1 RK_ID FROM Rechnungsausgang WHERE RechnungsNr='" & SR_RechnungsNr & "' AND Firma_ID='" & cboFirma._value & "' ORDER BY DruckDatumZeit DESC", "FMZOLL")
+                If IsNumeric(RK_ID) Then
+                    Dim RG_TMP As New VERAG_PROG_ALLGEMEIN.cRechnungsausgang(RK_ID)
+                    If RG_TMP IsNot Nothing Then
+                        'id mitübergeben (1_> drucken, 2 Email, 3 PDF)
+                        cFakturierung.doSAMMELRechnungsDruck_Abschnitt(RG_TMP.RechnungsNr, -1, -1, RG_TMP.DruckDatumZeit, "", False, , id,, True)
+                    End If
                End If
            End If
-        End If
+
    End Sub

    Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
--- a/SDL/frmMain.vb
+++ b/SDL/frmMain.vb
@@ -145,7 +145,7 @@ Public Class frmMain


        If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasId IsNot Nothing Then
-            Dim timas As New cTimasAPI
+            Dim timas As New cTimasAPI("timas")
            Dim infoMessage As String = ""
            Dim timeEntryExisting As Boolean = False
            Dim isEndpointRunning As Boolean = True
@@ -560,6 +560,37 @@ Public Class frmMain


    Private Sub btnClose_Click(sender As Object, e As EventArgs) Handles btnClose.Click
+
+        Try
+            If False Then
+                If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasId IsNot Nothing Then
+                    If Not VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasNichtStempeln Then
+                        Dim timas As New cTimasAPI("timas")
+                        Dim infoMessage As New DataTable
+                        Dim timeEntryExisting As Boolean = False
+                        Dim isEndpointRunning As Boolean = True
+                        Dim isPresent = timas.getTimeEntries(cAllgemein.MITARBEITER.mit_timasId, infoMessage, timeEntryExisting,, isEndpointRunning)
+                        If timeEntryExisting AndAlso isEndpointRunning AndAlso isPresent Then
+                            Dim a As MsgBoxResult = MsgBox("Soll " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & " ausgestempelt werden?" & vbNewLine & Now.ToString() & " als Endzeit erfassen?", vbYesNo)
+                            If a = vbYes Then
+                                Dim info
+                                timas.setTimeEntry(cAllgemein.MITARBEITER, Now, info, "out")
+                                MsgBox(info)
+                            Else
+
+                            End If
+
+                        End If
+
+                    End If
+                End If
+            End If
+
+
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+
        Me.Close()
    End Sub

--- a/SDL/kunden/usrCntlKundenBesonderheiten.vb
+++ b/SDL/kunden/usrCntlKundenBesonderheiten.vb
@@ -85,7 +85,7 @@ Public Class usrCntlKundenBesonderheiten
    End Sub
    Private Sub initDGV(Optional kdnrTmp = -1, Optional simpleView = False, Optional preferedKategorie = "", Optional preferedKategorieOtherIN = "")

-        If dgvBesonderheiten.Columns IsNot Nothing Then
+        If dgvBesonderheiten.Columns IsNot Nothing AndAlso dgvBesonderheiten.Columns.Count > 0 Then
            dgvBesonderheiten.Columns.Clear()
        End If

--- a/SDL/kunden/usrCntlKundenuebersicht.vb
+++ b/SDL/kunden/usrCntlKundenuebersicht.vb
@@ -2739,10 +2739,10 @@ Public Class usrCntlKundenuebersicht


        Else
-            Dim cs = New cCreditSafeAPI()
+            Dim cs = New cCreditSafeAPI("creditsafe")

            'If cs.authenticate(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_CSuser, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_CSpwd) = "200" Then
-            If cs.authenticate("creditsafe@verag.ag", "^AZcBVTBUIHTT5SQ1C9OOH") = "200" Then
+            If cs.authenticate() = "200" Then

                'Prüfung wird benötigt, da deutsche Abfragen einen Reasoncode benötigen!
                If checkNullStr(ADRESSE.LandKz) = "" Then
@@ -2788,7 +2788,7 @@ Public Class usrCntlKundenuebersicht


            Else
-                MsgBox("Authentifizierungsfehler für User " & VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_CSuser)
+                MsgBox("Authentifizierungsfehler bei Creditsafe-User")

            End If