LeistungenFIBU, Abrechungsmaske, ZE-Buttons, creditsafe, bugfix PLOSE (bei Rechnungsausgang)

2024-06-20 10:01:00 +02:00
parent e928df34a0
commit fe4b4304bc
23 changed files with 1646 additions and 53 deletions
--- a/SDL/kunden/frmKundenblatt.Designer.vb
+++ b/SDL/kunden/frmKundenblatt.Designer.vb
@@ -22,6 +22,7 @@ Partial Class frmKundenblatt
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
@@ -162,21 +163,21 @@ Partial Class frmKundenblatt
        Me.scanUSTVVollmachten = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
        Me.tbUSTVAntrage = New System.Windows.Forms.TabPage()
        Me.UsrCntlUSTV = New SDL.usrCntlUSTV()
-        Me.cntxtExcel = New System.Windows.Forms.ContextMenuStrip()
+        Me.cntxtExcel = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem()
        Me.btnAbfVerb = New System.Windows.Forms.Button()
        Me.lblAbfVerb = New System.Windows.Forms.Label()
-        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip()
-        Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip()
+        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.LöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip()
+        Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
        Me.mne = New System.Windows.Forms.MenuStrip()
        Me.AllgemeinToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMenuItem4 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.cntxtCntxtMDM = New System.Windows.Forms.ContextMenuStrip()
+        Me.cntxtCntxtMDM = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.ToolStripMenuItem8 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMenuItem5 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMenuItem7 = New System.Windows.Forms.ToolStripMenuItem()
@@ -300,7 +301,7 @@ Partial Class frmKundenblatt
        Me.tbcntrMain.Margin = New System.Windows.Forms.Padding(0)
        Me.tbcntrMain.Name = "tbcntrMain"
        Me.tbcntrMain.SelectedIndex = 0
-        Me.tbcntrMain.Size = New System.Drawing.Size(1638, 807)
+        Me.tbcntrMain.Size = New System.Drawing.Size(1638, 824)
        Me.tbcntrMain.TabIndex = 3
        '
        'tbAllgemein
@@ -333,7 +334,7 @@ Partial Class frmKundenblatt
        Me.tbAllgemein.Margin = New System.Windows.Forms.Padding(0)
        Me.tbAllgemein.Name = "tbAllgemein"
        Me.tbAllgemein.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbAllgemein.Size = New System.Drawing.Size(1630, 778)
+        Me.tbAllgemein.Size = New System.Drawing.Size(1630, 795)
        Me.tbAllgemein.TabIndex = 0
        Me.tbAllgemein.Text = "Allgemein"
        '
@@ -668,7 +669,7 @@ Partial Class frmKundenblatt
        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
        Me.dgvSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle6
-        Me.dgvSperrliste.Size = New System.Drawing.Size(835, 668)
+        Me.dgvSperrliste.Size = New System.Drawing.Size(835, 685)
        Me.dgvSperrliste.TabIndex = 23
        '
        'PictureBox2
@@ -1813,7 +1814,7 @@ Partial Class frmKundenblatt
        Me.tbUSTV.Controls.Add(Me.tbcntrUSTV)
        Me.tbUSTV.Location = New System.Drawing.Point(4, 25)
        Me.tbUSTV.Name = "tbUSTV"
-        Me.tbUSTV.Size = New System.Drawing.Size(1630, 778)
+        Me.tbUSTV.Size = New System.Drawing.Size(1630, 795)
        Me.tbUSTV.TabIndex = 12
        Me.tbUSTV.Text = "USTV"
        Me.tbUSTV.UseVisualStyleBackColor = True
@@ -1827,7 +1828,7 @@ Partial Class frmKundenblatt
        Me.tbcntrUSTV.Margin = New System.Windows.Forms.Padding(0)
        Me.tbcntrUSTV.Name = "tbcntrUSTV"
        Me.tbcntrUSTV.SelectedIndex = 0
-        Me.tbcntrUSTV.Size = New System.Drawing.Size(1630, 778)
+        Me.tbcntrUSTV.Size = New System.Drawing.Size(1630, 795)
        Me.tbcntrUSTV.TabIndex = 1
        '
        'tbUSTVDokumente
@@ -1840,7 +1841,7 @@ Partial Class frmKundenblatt
        Me.tbUSTVDokumente.Controls.Add(Me.scanUSTVVollmachten)
        Me.tbUSTVDokumente.Location = New System.Drawing.Point(4, 22)
        Me.tbUSTVDokumente.Name = "tbUSTVDokumente"
-        Me.tbUSTVDokumente.Size = New System.Drawing.Size(1622, 752)
+        Me.tbUSTVDokumente.Size = New System.Drawing.Size(1622, 769)
        Me.tbUSTVDokumente.TabIndex = 8
        Me.tbUSTVDokumente.Text = "Dokumente"
        Me.tbUSTVDokumente.UseVisualStyleBackColor = True
@@ -2093,7 +2094,7 @@ Partial Class frmKundenblatt
        '
        Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24)
        Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM"
-        Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8
+        Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4
        Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4)
        Me.cntxtCntxtMDM.Text = "cntxtMDM"
        '
@@ -2233,7 +2234,7 @@ Partial Class frmKundenblatt
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.AutoScroll = True
        Me.BackColor = System.Drawing.Color.White
-        Me.ClientSize = New System.Drawing.Size(1180, 936)
+        Me.ClientSize = New System.Drawing.Size(1180, 953)
        Me.Controls.Add(Me.lblAbfVerb)
        Me.Controls.Add(Me.btnAbfVerb)
        Me.Controls.Add(Me.tbcntrMain)
--- a/SDL/kunden/usrCntlKundenuebersicht.vb
+++ b/SDL/kunden/usrCntlKundenuebersicht.vb
@@ -1,6 +1,7 @@
 Imports System.Data.SqlClient
 Imports System.Globalization
 Imports System.IO
+Imports System.ServiceModel.Configuration
 Imports SDL.EORI
 Imports VERAG_PROG_ALLGEMEIN

@@ -2649,9 +2650,9 @@ Public Class usrCntlKundenuebersicht
                                                                Dim eoripruef As New cEORIPruefung(frmList.dgv.SelectedRows(0).Cells("eori_id").Value)
                                                                Dim msgErgebnis
                                                                Select Case eoripruef.eori_valid
-                                                                        Case 0 : msgErgebnis = "EORI-Nr. GÜLTIG   -   OK"
-                                                                        Case 1 : msgErgebnis = "EORI-Nr. UNGÜLTIG"
-                                                                    End Select
+                                                                    Case 0 : msgErgebnis = "EORI-Nr. GÜLTIG   -   OK"
+                                                                    Case 1 : msgErgebnis = "EORI-Nr. UNGÜLTIG"
+                                                                End Select

                                                                Dim PdfTmp = SDL.FormularManagerNEU.EORI_PRUEFUNG(msgErgebnis, eoripruef.eori_firma, eoripruef.eori_sessionID, KUNDE.EORITIN,, eoripruef.eori_sendungsid)
                                                                If PdfTmp <> "" Then
@@ -2831,32 +2832,53 @@ Public Class usrCntlKundenuebersicht



-                    If cs.checkDateOfLastRequest(company) < lastChecked Then
-                        Dim a As MsgBoxResult = MsgBox("Seit der letzen Abfrage (" & lastChecked.ToShortDateString & ") wurde bei Creditsafe keine Änderung gemacht!" & vbNewLine & "Trotzdem Creditreport-Daten aktualisieren?", vbYesNo)
-                        If a = vbYes Then
+                    ' If cs.checkDateOfLastRequest(company) < lastChecked Then
+                    Dim dtEvents As New DataTable

-                            setCreditsafereportEntry(cs, company, True) 'doppelte Abfragen mitprotokollieren
+                    dtEvents.Columns.Add("eventId", GetType(String))
+                    dtEvents.Columns.Add("companyId", GetType(String))
+                    dtEvents.Columns.Add("portfolioId", GetType(String))
+                    dtEvents.Columns.Add("ruleName", GetType(String))
+                    dtEvents.Columns.Add("localEventCode", GetType(String))
+                    dtEvents.Columns.Add("globalEventCode", GetType(String))
+                    dtEvents.Columns.Add("newValue", GetType(String))
+                    dtEvents.Columns.Add("oldValue", GetType(String))
+                    dtEvents.Columns.Add("eventDate", GetType(DateTime))
+                    dtEvents.Columns.Add("createdDate", GetType(DateTime))
+
+                    cs.getCompanieEvents(company, dtEvents)
+
+                    If dtEvents.Rows.Count > 0 Then
+                        dtEvents.DefaultView.Sort = "eventDate desc"
+                        If dtEvents.Rows(0).Item("eventDate") < lastChecked Then
+
+                            Dim a As MsgBoxResult = MsgBox("Seit der letzen Abfrage (" & lastChecked.ToShortDateString & ") wurde bei Creditsafe keine Änderung gemacht!" & vbNewLine & "Trotzdem Creditreport-Daten aktualisieren?", vbYesNo)
+                            If a = vbYes Then
+
+                                setCreditsafereportEntry(cs, company, True) 'doppelte Abfragen mitprotokollieren
+
+                            End If
+
+                        Else
+                            setCreditsafereportEntry(cs, company)

                        End If
-
                    Else
+
                        setCreditsafereportEntry(cs, company)

                    End If
-                Else

-                    setCreditsafereportEntry(cs, company)
+
+                Else
+                    MsgBox("Authentifizierungsfehler bei Creditsafe-User")

                End If

-
-            Else
-                MsgBox("Authentifizierungsfehler bei Creditsafe-User")
-
            End If
-
        End If

+
        initCreditsave()
        setKD(kdNr)
        Cursor = Cursors.Default
--- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb
+++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb
@@ -91,6 +91,7 @@ Public Class usrcntlKundeBearbeitenFull
                    Case "AMBAR"
                        cboKundenkreis.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("3000000-3099999: AMBAR", "3000000-3099990"))
                        cboKundenkreis.changeItem("3000000-3099990")
+                        KUNDE.Zahlungsziel = 0
                    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"))