Änderungen Fiskalübersicht und Creditsafe

SDL/Creditsafe/usrcntlCreditsafe.vb

@@ -44,7 +44,7 @@ Public Class usrcntlCreditsafe
 
         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] " &
-                                      " WHERE ([Währungstabelle].[MitgliedslandEU] = 1 Or [Länderverzeichnis für die Außenhandelsstatistik].LandKz  = 'TR' Or [Länderverzeichnis für die Außenhandelsstatistik].LandKz  = 'GB' Or [Länderverzeichnis für die Außenhandelsstatistik].LandKz  = 'RS') " &
+                                      " WHERE ([Währungstabelle].[MitgliedslandEU] = 1 Or [Länderverzeichnis für die Außenhandelsstatistik].LandKz  = 'TR' Or [Länderverzeichnis für die Außenhandelsstatistik].LandKz  = 'GB' Or [Länderverzeichnis für die Außenhandelsstatistik].LandKz  = 'RS' Or [Länderverzeichnis für die Außenhandelsstatistik].LandKz  = 'CH') " &
                                       " ORDER BY [Länderverzeichnis für die Außenhandelsstatistik].LandKz ", , "FMZOLL", True)
 
         If land = "" Then land = "AT"

SDL/kunden/Berichte/rptFiskalkunde.vb

@@ -1,13 +1,19 @@
 Imports GrapeCity.ActiveReports 
 Imports GrapeCity.ActiveReports.Document
+Imports sun.misc
+Imports VERAG_PROG_ALLGEMEIN
 
 Public Class rptFiskalkunde
 
     Dim FiskalId As Integer
     Dim Firma = "1"
     Dim KdNr As Integer
+    Dim VM As cKundenVollmachten
+    Dim BR As cBonitaetsauskunft
+    Dim EORI As cEORIPruefung
+    Dim UID As cUIDPruefung
 
-    Sub New(KdNr, FiskalId, Optional Firma = "VERAG")
+    Sub New(KdNr As Integer, FiskalId As Integer, VM As cKundenVollmachten, BR As cBonitaetsauskunft, EORI As cEORIPruefung, UID As cUIDPruefung, Optional Firma As String = "VERAG")
 
         ' Dieser Aufruf ist f<>r den Designer erforderlich.
         InitializeComponent()
@@ -15,6 +21,11 @@ Public Class rptFiskalkunde
         Me.KdNr = KdNr
         Me.FiskalId = FiskalId
         Me.Firma = Firma
+        Me.VM = VM
+        Me.BR = BR
+        Me.EORI = EORI
+        Me.UID = UID
+
         ' F<>gen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
 
     End Sub
@@ -30,22 +41,43 @@ Public Class rptFiskalkunde
         txtKdNr.Text = AD.AdressenNr
         txtKunde.Text = AD.Name_1 & " " & AD.Name_2
 
-        If IsDate(FK.FK_Vollmacht) Then txtVM.Text = CDate(FK.FK_Vollmacht).ToShortDateString
+        If VM IsNot Nothing Then
-        txtUmsatz.Text = ""
 
-
+            If VM.kdvm_emailId > 0 Then
-        If AD.LandKz = "AT" Or AD.LandKz = "A" Then
+                txtVM.Text &= " Vollmacht per Mail erhalten "
-            txtBon.Text = If(KD_ERW.kde_CreditSaveBonitaetsScore, "")
+            ElseIf VM.kdvm_datenarchivId > 0 Then
+                txtVM.Text &= " Vollmacht liegt vor "
             Else
-            txtBon.Text = If(KD_ERW.kde_CreditSaveBonitaetsIndex, "")
+                txtVM.Text &= " Vollmacht liegt NICHT vor "
             End If
 
 
-        If IsDate(FK.FK_Bonitaet) Then txtBon.Text &= " vom " & CDate(FK.FK_Bonitaet).ToShortDateString
+            If IsDate(VM.kdvm_erhalten_Datum) Then txtVM.Text &= CDate(VM.kdvm_erhalten_Datum).ToShortDateString
+
+        End If
+
+
+            If BR IsNot Nothing Then
+            txtBon.Text = "Bonit<EFBFBD>tsklasse"
+            If AD.LandKz = "AT" Or AD.LandKz = "A" Then
+                txtBon.Text = "Bonit<EFBFBD>tsscore: "
+                txtBon.Text &= If(BR.ba_CreditSaveBonitaetsScore, "")
+            Else
+                txtBon.Text = "Bonit<EFBFBD>tsindex: "
+                txtBon.Text &= If(BR.ba_CreditSaveBonitaetsIndex, "")
+            End If
+            If IsDate(BR.ba_Datum) Then txtBon.Text &= " - " & CDate(BR.ba_Datum).ToShortDateString
+
+        End If
+
+
+
+        txtUmsatz.Text = ""
+
+
         If IsNumeric(FK.FK_KreditMax) Then txtKredit.Text = CDbl(FK.FK_KreditMax)
         If IsNumeric(FK.FK_AnzahlMitarbeiter) Then txtAnzMA.Text = CDbl(FK.FK_AnzahlMitarbeiter)
         If IsDate(FK.FK_Gruendungsdatum) Then txtGJ.Text = CDate(FK.FK_Gruendungsdatum).ToShortDateString
-
         txtImport.Text = IIf(FK.FK_Waren <> "", FK.FK_Waren, "")
         txtGesellschafter.Text = IIf(FK.FK_Gesellschafter <> "", FK.FK_Gesellschafter, "")
         txtWebsite.Text = IIf(FK.FK_Homepage_URL <> "", FK.FK_Homepage_URL, "")

SDL/kunden/usrcntlFiskaluebersicht.Designer.vb

@@ -39,6 +39,7 @@ Partial Class usrcntlFiskaluebersicht
         Me.btnPDFReport = New System.Windows.Forms.Button()
         Me.dgvFiskaluebersicht = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.MyPanel2 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
+        Me.lblBon = New System.Windows.Forms.Label()
         Me.rtfZwischenh = New System.Windows.Forms.RichTextBox()
         Me.dgvZwischenh = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.Label6 = New System.Windows.Forms.Label()
@@ -49,7 +50,7 @@ Partial Class usrcntlFiskaluebersicht
         Me.Label3 = New System.Windows.Forms.Label()
         Me.Label2 = New System.Windows.Forms.Label()
         Me.lblAnmerkungen = New System.Windows.Forms.Label()
-        Me.txtGesellschafter = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txtSteuerberater = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.Label12 = New System.Windows.Forms.Label()
         Me.txtGF = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.Label11 = New System.Windows.Forms.Label()
@@ -83,7 +84,6 @@ Partial Class usrcntlFiskaluebersicht
         Me.dgvUnterlagen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.cbxUID = New System.Windows.Forms.CheckBox()
         Me.txtUID = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.lblBon = New System.Windows.Forms.Label()
         CType(Me.picLocked, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.MyPanel1.SuspendLayout()
         CType(Me.dgvFiskaluebersicht, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -289,7 +289,7 @@ Partial Class usrcntlFiskaluebersicht
         Me.MyPanel2.Controls.Add(Me.Label3)
         Me.MyPanel2.Controls.Add(Me.Label2)
         Me.MyPanel2.Controls.Add(Me.lblAnmerkungen)
-        Me.MyPanel2.Controls.Add(Me.txtGesellschafter)
+        Me.MyPanel2.Controls.Add(Me.txtSteuerberater)
         Me.MyPanel2.Controls.Add(Me.Label12)
         Me.MyPanel2.Controls.Add(Me.txtGF)
         Me.MyPanel2.Controls.Add(Me.Label11)
@@ -328,6 +328,16 @@ Partial Class usrcntlFiskaluebersicht
         Me.MyPanel2.Size = New System.Drawing.Size(721, 657)
         Me.MyPanel2.TabIndex = 110
         '
+        'lblBon
+        '
+        Me.lblBon.AutoSize = True
+        Me.lblBon.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblBon.Location = New System.Drawing.Point(539, 50)
+        Me.lblBon.Name = "lblBon"
+        Me.lblBon.Size = New System.Drawing.Size(11, 13)
+        Me.lblBon.TabIndex = 139
+        Me.lblBon.Text = "-"
+        '
         'rtfZwischenh
         '
         Me.rtfZwischenh.Enabled = False
@@ -452,28 +462,28 @@ Partial Class usrcntlFiskaluebersicht
         Me.lblAnmerkungen.TabIndex = 166
         Me.lblAnmerkungen.Text = "Anmerkungen"
         '
-        'txtGesellschafter
+        'txtSteuerberater
         '
-        Me.txtGesellschafter._DateTimeOnly = False
+        Me.txtSteuerberater._DateTimeOnly = False
-        Me.txtGesellschafter._numbersOnly = False
+        Me.txtSteuerberater._numbersOnly = False
-        Me.txtGesellschafter._numbersOnlyKommastellen = ""
+        Me.txtSteuerberater._numbersOnlyKommastellen = ""
-        Me.txtGesellschafter._numbersOnlyTrennzeichen = True
+        Me.txtSteuerberater._numbersOnlyTrennzeichen = True
-        Me.txtGesellschafter._Prozent = False
+        Me.txtSteuerberater._Prozent = False
-        Me.txtGesellschafter._ShortDateNew = False
+        Me.txtSteuerberater._ShortDateNew = False
-        Me.txtGesellschafter._ShortDateOnly = False
+        Me.txtSteuerberater._ShortDateOnly = False
-        Me.txtGesellschafter._TimeOnly = False
+        Me.txtSteuerberater._TimeOnly = False
-        Me.txtGesellschafter._TimeOnly_Seconds = False
+        Me.txtSteuerberater._TimeOnly_Seconds = False
-        Me.txtGesellschafter._value = Nothing
+        Me.txtSteuerberater._value = Nothing
-        Me.txtGesellschafter._Waehrung = False
+        Me.txtSteuerberater._Waehrung = False
-        Me.txtGesellschafter._WaehrungZeichen = True
+        Me.txtSteuerberater._WaehrungZeichen = True
-        Me.txtGesellschafter.ForeColor = System.Drawing.Color.Black
+        Me.txtSteuerberater.ForeColor = System.Drawing.Color.Black
-        Me.txtGesellschafter.Location = New System.Drawing.Point(419, 165)
+        Me.txtSteuerberater.Location = New System.Drawing.Point(419, 165)
-        Me.txtGesellschafter.MaxLineLength = -1
+        Me.txtSteuerberater.MaxLineLength = -1
-        Me.txtGesellschafter.MaxLines_Warning = ""
+        Me.txtSteuerberater.MaxLines_Warning = ""
-        Me.txtGesellschafter.MaxLines_Warning_Label = Nothing
+        Me.txtSteuerberater.MaxLines_Warning_Label = Nothing
-        Me.txtGesellschafter.Name = "txtGesellschafter"
+        Me.txtSteuerberater.Name = "txtSteuerberater"
-        Me.txtGesellschafter.Size = New System.Drawing.Size(239, 20)
+        Me.txtSteuerberater.Size = New System.Drawing.Size(239, 20)
-        Me.txtGesellschafter.TabIndex = 165
+        Me.txtSteuerberater.TabIndex = 165
         '
         'Label12
         '
@@ -481,9 +491,9 @@ Partial Class usrcntlFiskaluebersicht
         Me.Label12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Label12.Location = New System.Drawing.Point(279, 168)
         Me.Label12.Name = "Label12"
-        Me.Label12.Size = New System.Drawing.Size(88, 13)
+        Me.Label12.Size = New System.Drawing.Size(84, 13)
         Me.Label12.TabIndex = 164
-        Me.Label12.Text = "Gesellschafter"
+        Me.Label12.Text = "Steuerberater"
         '
         'txtGF
         '
@@ -981,16 +991,6 @@ Partial Class usrcntlFiskaluebersicht
         Me.txtUID.Size = New System.Drawing.Size(70, 20)
         Me.txtUID.TabIndex = 106
         '
-        'lblBon
-        '
-        Me.lblBon.AutoSize = True
-        Me.lblBon.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblBon.Location = New System.Drawing.Point(539, 50)
-        Me.lblBon.Name = "lblBon"
-        Me.lblBon.Size = New System.Drawing.Size(11, 13)
-        Me.lblBon.TabIndex = 139
-        Me.lblBon.Text = "-"
-        '
         'usrcntlFiskaluebersicht
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1071,7 +1071,7 @@ Partial Class usrcntlFiskaluebersicht
     Friend WithEvents Label7 As Label
     Friend WithEvents txtGeschaeftszweck As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents Label5 As Label
-    Friend WithEvents txtGesellschafter As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents txtSteuerberater As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents Label12 As Label
     Friend WithEvents txtGF As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents Label11 As Label

SDL/kunden/usrcntlFiskaluebersicht.vb

@@ -16,6 +16,9 @@ Public Class usrcntlFiskaluebersicht
     Dim FirmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
     Dim DS As VERAG_PROG_ALLGEMEIN.cDATENSERVER
     Dim BA As VERAG_PROG_ALLGEMEIN.cBonitaetsauskunft
+    Dim UID As cUIDPruefung
+    Dim EORI As cEORIPruefung
+    Dim VM As cKundenVollmachten
     Dim year As Integer
     Sub initDGVFiskaluebersicht()
 
@@ -49,10 +52,10 @@ Public Class usrcntlFiskaluebersicht
 
     Sub initdgvEmfpaenger()
 
-        Label3.Text = "Top 5 Endempfänger (" & year & ")"
+        Label3.Text = "Top 5 Empfänger (" & year & ")"
         With dgvEmpfaenger
             .Columns.Clear()
-            .DataSource() = SQL.loadDgvBySql("SELECT Top(5) [EndempfängerKundenNr] as KdNr, CASE WHEN [EndempfängerKundenNr] IS NULL THEN '-' ELSE MAX(Endempfänger) END as Firma, COUNT(*) as Anzahl FROM [Speditionsbuch]  WHERE year(Abfertigungsdatum) =  '" & year & "' AND " & kdNr & " IN([AbsenderKundenNr],[EmpfängerKundenNr],[FrachtführerKundenNr],[VermittlerKundenNr],[EndempfängerKundenNr]) GROUP BY EndempfängerKundenNr ORDER BY Anzahl DESC ", "FMZOLL")
+            .DataSource() = SQL.loadDgvBySql("SELECT Top(5) [EmpfängerKundenNr] as KdNr, CASE WHEN [EmpfängerKundenNr] IS NULL THEN '-' ELSE MAX(Empfänger) END as Firma, COUNT(*) as Anzahl FROM [Speditionsbuch]  WHERE year(Abfertigungsdatum) =  '" & year & "' AND " & kdNr & " IN([AbsenderKundenNr],[EmpfängerKundenNr],[FrachtführerKundenNr],[VermittlerKundenNr],[EndempfängerKundenNr]) GROUP BY EmpfängerKundenNr ORDER BY Anzahl DESC ", "FMZOLL")
 
         End With
 
@@ -60,10 +63,10 @@ Public Class usrcntlFiskaluebersicht
 
     Sub initdgvZwischenhaendler()
 
-        Label6.Text = "Top 5 Zwischenhändler (" & year & ")"
+        Label6.Text = "Top 5 Auftraggeber (" & year & ")"
         With dgvZwischenh
             .Columns.Clear()
-            .DataSource() = SQL.loadDgvBySql("SELECT Top(5) [EmpfängerKundenNr] as KdNr, CASE WHEN [EmpfängerKundenNr] IS NULL THEN '-' ELSE MAX(Empfänger) END as Firma, COUNT(*) as Anzahl FROM [Speditionsbuch]  WHERE year(Abfertigungsdatum) =  '" & year & "' AND " & kdNr & " IN([AbsenderKundenNr],[EmpfängerKundenNr],[FrachtführerKundenNr],[VermittlerKundenNr],[EndempfängerKundenNr]) GROUP BY EmpfängerKundenNr ORDER BY Anzahl DESC ", "FMZOLL")
+            .DataSource() = SQL.loadDgvBySql("SELECT [VermittlerKundenNr] as KdNr, CASE WHEN [VermittlerKundenNr] IS NULL THEN '-' ELSE MAX(Vermittler) END as Firma, COUNT(*) as Anzahl FROM [Speditionsbuch]   WHERE year(Abfertigungsdatum) =  '" & year & "' AND " & kdNr & " IN([AbsenderKundenNr],[EmpfängerKundenNr],[FrachtführerKundenNr],[VermittlerKundenNr],[EndempfängerKundenNr]) GROUP BY VermittlerKundenNr ORDER BY Anzahl DESC ", "FMZOLL")
             '.Columns("KdNr").Width = 50
 
         End With
@@ -75,10 +78,13 @@ Public Class usrcntlFiskaluebersicht
 
         With dgvUnterlagen
             .DataSource = SQL.loadDgvBySql("SELECT [fka_id],[fka_KdNr],[fka_Name],[fka_Datum] , [fka_Art], [fka_docId]  FROM [tblFiskalkundenAnhaenge] " &
-                                            " WHERE [fka_KdNr]='" & fk.FK_Kdnr & "' AND fka_fkId='" & fk.FK_Id & "'", "AVISO")
+                                            " WHERE [fka_KdNr]='" & fk.FK_Kdnr & "' AND fka_fkId='" & fk.FK_Id & "' ORDER BY fka_Datum desc ", "AVISO")
             .Columns("fka_id").Visible = False
             .Columns("fka_KdNr").Visible = False
             .Columns("fka_docId").Visible = False
+            .Columns("fka_Name").HeaderText = "Name"
+            .Columns("fka_Datum").HeaderText = "Datum"
+            .Columns("fka_Art").HeaderText = "Doku-Art"
 
             .ClearSelection()
             AddHandler .CellDoubleClick, Sub()
@@ -103,12 +109,14 @@ Public Class usrcntlFiskaluebersicht
         cbxFiskalart.Items.Clear()
         cbxFiskalart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AT", "AT"))
         cbxFiskalart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DE", "DE"))
+        cbxFiskalart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
+
 
         cbxAttachmentArt.Items.Clear()
         cbxAttachmentArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Passkopie", "Passkopie"))
-        cbxAttachmentArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Firmenbuchauszug", "FBN-Auszug"))
+        cbxAttachmentArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Gewerbeanmeldung", "GW-Anmeldung"))
         cbxAttachmentArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Handelsregister", "HR"))
-        cbxAttachmentArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Infoblatt", "Info"))
+        cbxAttachmentArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sonstiges", "Sonstiges"))
         cbxAttachmentArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Website", "Website"))
 
 
@@ -127,6 +135,12 @@ Public Class usrcntlFiskaluebersicht
             End If
         Next
 
+        'If ADRESSE.LandKz = "A" Or "AT" Then
+        '    cbxFiskalart.changeItem("DE")
+        'Else
+        '    cbxFiskalart.changeItem("AT")
+        'End If
+
         initDGVFiskaluebersicht()
 
     End Sub
@@ -146,6 +160,8 @@ Public Class usrcntlFiskaluebersicht
             Exit Sub
         End If
 
+        lblWarning.Text = ""
+
         Dim input = InputBox("Bitte geben Sie das Datum der neuen Fiskal-Übersicht ein: ", "Fiskal-Übersicht anlegen")
         If input <> "" Then
             Dim hint As String
@@ -192,7 +208,7 @@ Public Class usrcntlFiskaluebersicht
     Private Sub btnPDFReport_Click(sender As Object, e As EventArgs) Handles btnPDFReport.Click
         Try
 
-            Dim rptFiskalkunden As New SDL.rptFiskalkunde(kdNr, fk.FK_Id)
+            Dim rptFiskalkunden As New SDL.rptFiskalkunde(kdNr, fk.FK_Id, VM, BA, EORI, UID)
             Dim rpt As New frmPrintLayout
             rpt.Text = ""
 
@@ -206,9 +222,25 @@ Public Class usrcntlFiskaluebersicht
             Dim outputFile As String = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("Merge.pdf", ".pdf", True,, "Merge") ' "result.pdf"
 
 
+            If VM IsNot Nothing Then
+                If VM.kdvm_datenarchivId > 0 Then files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(VM.kdvm_datenarchivId))
+                If VM.kdvm_emailId > 0 Then
+
+                    Dim MailFile = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(VM.kdvm_emailId)
+                    'Muss von Mail zu PDF konvertiert und dann der Liste angehängt werden!
+                    'files.Add(MailFile)
+                End If
+            End If
+
+            If BA IsNot Nothing Then
+                If BA.ba_datenarchivId > 0 Then files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(BA.ba_datenarchivId))
+            End If
+
             For Each r As DataGridViewRow In dgvUnterlagen.Rows
                 files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("fka_docId").Value))
             Next
+
+
             VERAG_PROG_ALLGEMEIN.cFormularManager.mergePDFs(files, outputFile)
 
             Process.Start(outputFile)
@@ -272,18 +304,46 @@ Public Class usrcntlFiskaluebersicht
         End If
 
         BA = VERAG_PROG_ALLGEMEIN.cBonitaetsauskunft.LOADByKdNrWithingDate(kdNr)
+        setControlButtons()
 
 
     End Sub
 
     Private Sub setFields()
 
+
+        If checkNullStr(fk.FK_Vollmacht) <> "" Then
+            VM = New cKundenVollmachten(fk.FK_Vollmacht)
+            txtVM.Text = VM.kdvm_erhalten_Datum.ToShortDateString
+        End If
+        If checkNullStr(fk.FK_EORI) <> "" Then
+
+            EORI = New cEORIPruefung(fk.FK_EORI)
+            txtEORI.Text = EORI.eori_datum.ToShortDateString
+        End If
+
+        If checkNullStr(fk.FK_UID) <> "" Then
+
+            UID = New cUIDPruefung(fk.FK_UID)
+            txtVM.Text = UID.uid_Datum.ToShortDateString
+        End If
+
+
+        If checkNullStr(fk.FK_Bonitaet) <> "" Then
+            BA = New cBonitaetsauskunft(fk.FK_Bonitaet)
+            txtBon.Text = BA.ba_Datum.ToShortDateString
+        End If
+
+
+
+
+        'txtVM.Text = checkNullStr(fk.FK_Vollmacht)
+        'txtEORI.Text = checkNullStr(fk.FK_EORI)
+        'txtUID.Text = checkNullStr(fk.FK_UID)
+        'txtBon.Text = checkNullStr(fk.FK_Bonitaet)
+
         cbxFiskalart._value = checkNullStr(fk.FK_Art)
-        txtBon.Text = checkNullStr(fk.FK_Bonitaet)
         txtHomepage.Text = checkNullStr(fk.FK_Homepage_URL)
-        txtVM.Text = checkNullStr(fk.FK_Vollmacht)
-        txtEORI.Text = checkNullStr(fk.FK_EORI)
-        txtUID.Text = checkNullStr(fk.FK_UID)
         rtbAnmerkung.Text = checkNullStr(fk.FK_Anmerkung)
         rtfLieferanten.Text = checkNullStr(fk.FK_Lieferanten)
         rtfEmpfaenger.Text = checkNullStr(fk.FK_Empfaenger)
@@ -294,7 +354,7 @@ Public Class usrcntlFiskaluebersicht
         txtWaren.Text = checkNullStr(fk.FK_Waren)
         txtAnzMA.Text = checkNullStr(fk.FK_AnzahlMitarbeiter)
         txtGF.Text = checkNullStr(fk.FK_Geschaeftsfuehrer)
-        txtGesellschafter.Text = checkNullStr(fk.FK_Gesellschafter)
+        txtSteuerberater.Text = checkNullStr(fk.FK_Gesellschafter)
 
         If txtGriendungsjahr.Text = "" Then
             txtGriendungsjahr.Text = BA.ba_GruendundsDatum
@@ -317,8 +377,8 @@ Public Class usrcntlFiskaluebersicht
             txtAnzMA.Text = BA.ba_Mitarbeiter
         End If
 
-        If txtGesellschafter.Text = "" Then
+        If txtSteuerberater.Text = "" Then
-            txtGesellschafter.Text = BA.ba_GFName
+            txtSteuerberater.Text = BA.ba_GFName
         End If
 
         If txtWaren.Text = "" Then
@@ -328,61 +388,76 @@ Public Class usrcntlFiskaluebersicht
 
 
 
-        If txtBon.Text = "" And KUNDE.Bonitätsdatum IsNot Nothing AndAlso IsDate(KUNDE.Bonitätsdatum) Then
+        If txtBon.Text = "" Then
-            txtBon.Text = CDate(KUNDE.Bonitätsdatum).ToShortDateString
+            Dim baid = SQL.getValueTxtBySql("SELECT TOP(1) ba_id FROM [tblBonitaetsauskunft] where ba_KundenNr=" & kdNr & " ORDER BY ba_Datum DESC", "FMZOLL")
-        End If
+            BA = New cBonitaetsauskunft(baid)
+            If BA IsNot Nothing Then
+
+                txtBon.Text = BA.ba_Datum.ToShortDateString
 
                 If ADRESSE.LandKz = "AT" Or ADRESSE.LandKz = "A" Then
-            lblBon.Text = If(KUNDE_ERW.kde_CreditSaveBonitaetsScore, "")
+                    lblBon.Text = If(BA.ba_CreditSaveBonitaetsScore, "")
                 Else
-            lblBon.Text = If(KUNDE_ERW.kde_CreditSaveBonitaetsIndex, "")
+                    lblBon.Text = If(BA.ba_CreditSaveBonitaetsIndex, "")
                 End If
+            End If
+        End If
+
+
 
 
         If txtUID.Text = "" Then
-            txtUID.Text = CDate(SQL.getValueTxtBySql("SELECT TOP(1) [uid_Datum] FROM [tblUIDPruefung] where uid_KundenNr='" & kdNr & "' AND UID_valid = 1 AND uid_stufe = 2 ORDER BY uid_Datum desc", "FMZOLL")).ToShortDateString
+
+            Dim UIDId = SQL.getValueTxtBySql("Select TOP(1) [uid_id] FROM [tblUIDPruefung] where uid_KundenNr='" & kdNr & "' AND UID_valid = 1 AND uid_stufe = 2 ORDER BY uid_Datum desc", "FMZOLL")
+            UID = New cUIDPruefung(UIDId)
+            If UID IsNot Nothing And IsDate(UID.uid_Datum) Then
+                txtUID.Text = CDate(UID.uid_Datum).ToShortDateString
+            End If
+
         End If
 
         If txtVM.Text = "" And cbxFiskalart._value <> "" Then
 
-            Dim vmId As Integer = -1
+            Dim vmArt As Integer = -1
 
             Select Case FirmaTmp
                 Case "VERAG"
                     If cbxFiskalart._value = "DE" Then
-                        vmId = 2
+                        vmArt = 2
                     ElseIf cbxFiskalart._value = "AT" Then
-                        vmId = 4
+                        vmArt = 4
                     End If
 
                 Case "IMEX"
                     If cbxFiskalart._value = "DE" Then
-                        vmId = 8
+                        vmArt = 8
                     ElseIf cbxFiskalart._value = "AT" Then
-                        vmId = 9
+                        vmArt = 9
                     End If
 
                 Case "UNISPED"
                     If cbxFiskalart._value = "DE" Then
-                        vmId = 22
+                        vmArt = 22
                     ElseIf cbxFiskalart._value = "AT" Then
-                        vmId = 23
+                        vmArt = 23
                     End If
 
             End Select
 
-            If vmId = -1 Then
+            If vmArt = -1 Then
                 lblWarning.Text = "Vollmachtart für " & FirmaTmp & " kann nicht ermittelt werden"
             Else
-                Dim vmDate = SQL.getValueTxtBySql("SELECT Top(1) abf.[kdvm_erhalten_Datum] FROM [tblKundenVollmachtenArt] as art INNER  Join(select * from [tblKundenVollmachten]) as abf on art.[kdvma_Id]=abf.[kdvm_kdvmaId] WHERE art.kdvma_visible = 1 And abf.kdvm_erhalten = 1 And ISNULL(abf.[kdvm_geloescht], 0)!= 1 And [kdvm_KundenNr] ='" & kdNr & "' AND [kdvm_kdvmaId]='" & vmId & "' Order BY abf.kdvm_erhalten_Datum desc", "FMZOLL")
+                Dim vmId = SQL.getValueTxtBySql("SELECT Top(1) abf.[kdvm_id] FROM [tblKundenVollmachtenArt] as art INNER  Join(select * from [tblKundenVollmachten]) as abf on art.[kdvma_Id]=abf.[kdvm_kdvmaId] WHERE art.kdvma_visible = 1 And abf.kdvm_erhalten = 1 And ISNULL(abf.[kdvm_geloescht], 0)!= 1 And [kdvm_KundenNr] ='" & kdNr & "' AND [kdvm_kdvmaId]='" & vmArt & "' Order BY abf.kdvm_erhalten_Datum desc", "FMZOLL")
 
-                If IsDate(vmDate) Then
+                If vmId <> "" Then
-                    txtVM.Text = CDate(vmDate).ToShortDateString
+                    VM = New cKundenVollmachten(vmId)
+                    If IsDate(VM.kdvm_erhalten_Datum) Then txtVM.Text = CDate(VM.kdvm_erhalten_Datum).ToShortDateString
                 End If
 
             End If
         End If
 
+
         If txtHomepage.Text <> "" Then
             cbxHomepage.Checked = IsValidURL(txtHomepage.Text)
         Else
@@ -400,7 +475,7 @@ Public Class usrcntlFiskaluebersicht
 
         Else
             txtEORI.Text = ""
-            lblWarning.Text = "EORI-NR im Kunden fehlt!"
+            'lblWarning.Text = "EORI-NR im Kunden fehlt!"
         End If
 
 
@@ -432,11 +507,20 @@ Public Class usrcntlFiskaluebersicht
 
     Private Sub getFields()
         fk.FK_Art = cbxFiskalart._value
-        fk.FK_Bonitaet = txtBon.Text
+
+        If BA IsNot Nothing Then fk.FK_Bonitaet = BA.ba_id
+
+        If VM IsNot Nothing Then fk.FK_Vollmacht = VM.kdvm_Id
+
+        If EORI IsNot Nothing Then fk.FK_EORI = EORI.eori_id
+
+        If BA IsNot Nothing Then fk.FK_Bonitaet = BA.ba_id
+
         fk.FK_Homepage_URL = txtHomepage.Text
-        fk.FK_Vollmacht = txtVM.Text
+        'fk.FK_Vollmacht = txtVM.Text
-        fk.FK_UID = txtUID.Text
+        'fk.FK_Vollmacht = IIf(VM IsNot Nothing, VM.kdvm_Id, "")
-        fk.FK_EORI = txtEORI.Text
+        'fk.FK_UID = IIf(UID IsNot Nothing, UID.uid_id, "")
+        'fk.FK_EORI = IIf(EORI IsNot Nothing, EORI.eori_id, "")
         fk.FK_Anmerkung = rtbAnmerkung.Text
 
         If txtKredit.Text <> "" Then
@@ -446,7 +530,7 @@ Public Class usrcntlFiskaluebersicht
         fk.FK_Geschaeftsfuehrer = txtGF.Text
         fk.FK_Geschaeftszweck = txtGeschaeftszweck.Text
         fk.FK_AnzahlMitarbeiter = txtAnzMA.Text
-        fk.FK_Gesellschafter = txtGesellschafter.Text
+        fk.FK_Gesellschafter = txtSteuerberater.Text
         fk.FK_Gruendungsdatum = txtGriendungsjahr.Text
         fk.FK_Waren = txtWaren.Text
 
@@ -624,12 +708,7 @@ Public Class usrcntlFiskaluebersicht
     Private Sub usrcntlFiskaluebersicht_Load(sender As Object, e As EventArgs) Handles MyBase.Load
 
         setUIenabled(Not dgvFiskaluebersicht.SelectedRows.Count > 0)
-
+        setControlButtons()
-        For Each c As Control In MyPanel1.Controls
-
-            c.Enabled = dgvFiskaluebersicht.SelectedRows.Count > 0
-
-        Next
 
     End Sub
 
@@ -690,6 +769,7 @@ Public Class usrcntlFiskaluebersicht
             If anh_list.Count > 0 Then
                 DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER(anh_list.ElementAt(0).fka_docId)
                 DS.OPEN_SINGLE()
+                Exit Sub
             End If
 
         End If
@@ -717,23 +797,21 @@ Public Class usrcntlFiskaluebersicht
         End Try
 
 
-        Dim pdf = VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURL(url)
+        Dim pdf = VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURL(url) 'UU langsam....
 
         DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "FISKALKUNDENANHAENGE", fk.FK_Datum, "", "", "Website", kdNr)
         Dim fi As New System.IO.FileInfo(pdf)
         Dim path = DS.uploadDataToDATENSERVER(pdf, fi.Name, fi.Extension)
 
         Dim ANH = New VERAG_PROG_ALLGEMEIN.cFiskalkundenAnhaenge()
-        ANH.fka_Art = DS.da_name
+        ANH.fka_Art = "Website"
         ANH.fka_docId = DS.da_id
         ANH.fka_Datum = Now()
         ANH.fka_KdNr = kdNr
         ANH.fka_fkId = fk.FK_Id
-        ANH.fka_Name = fi.Name
+        ANH.fka_Name = "Website"
         ANH.SAVE()
 
-        initDGVUnterlagen()
-
         'If path Then
         '    fk.FK_Homepage_PDF = DS.da_id
         'End If
@@ -743,6 +821,8 @@ Public Class usrcntlFiskaluebersicht
 
         If Not cbxHomepage.Checked Then cbxHomepage.Checked = True
 
+        initDGVUnterlagen()
+
     End Sub
 
     Private Function IsValidURL(ByVal URL As String) As Boolean
@@ -776,6 +856,7 @@ Public Class usrcntlFiskaluebersicht
                     Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dgvUnterlagen.SelectedRows(0).Cells("fka_docId").Value)
                     If DS.DELETE_COMPLETE() Then
                         Dim anh As New cFiskalkundenAnhaenge(anhId)
+                        anh.DELETE()
                         initDGVUnterlagen()
                     End If
 
@@ -848,7 +929,7 @@ Public Class usrcntlFiskaluebersicht
             If TypeOf (c) Is MyTextBox Then
                 AddHandler CType(c, MyTextBox).TextChanged, AddressOf somethingChanged
             ElseIf TypeOf (c) Is TextBox Then
-                AddHandler CType(c, TextBox).TextChanged, AddressOf SomethingChanged
+                AddHandler CType(c, TextBox).TextChanged, AddressOf somethingChanged
             End If
         Next
     End Sub
@@ -857,5 +938,13 @@ Public Class usrcntlFiskaluebersicht
         If Not btnSave.Enabled Then btnSave.Enabled = True
     End Sub
 
+    Private Sub setControlButtons()
+
+        For Each c As Control In MyPanel1.Controls
+
+            c.Enabled = dgvFiskaluebersicht.SelectedRows.Count > 0
+
+        Next
+    End Sub
 
 End Class

VERAG_PROG_ALLGEMEIN/Classes/cFiskalkundenAnhaenge.vb

@@ -52,7 +52,7 @@ Public Class cFiskalkundenAnhaenge
         Dim ANH_LIST = New List(Of cFiskalkundenAnhaenge)
         ANH_LIST.Clear()
         Dim SQL As New SQL
-        Dim dgv = SQL.loadDgvBySql("SELECT fka_id FROM [tblFiskalkundenAnhaenge] WHERE fka_KdNr=" & fka_KdNr & " And fka_fkId = " & fka_fkId & " And fka_Art = " & fka_Art & " ORDER BY fka_Datum desc", "AVISO")
+        Dim dgv = SQL.loadDgvBySql("SELECT fka_id FROM [tblFiskalkundenAnhaenge] WHERE fka_KdNr=" & fka_KdNr & " And fka_fkId = " & fka_fkId & " And fka_Art = '" & fka_Art & "'" & " ORDER BY fka_Datum desc", "AVISO")
         If dgv IsNot Nothing Then
             For Each r In dgv.Rows
 
@@ -145,12 +145,12 @@ Public Class cFiskalkundenAnhaenge
         End Function
 
     Public Function DELETE() As Boolean 'obj As Object, tablename As String, where As String) As Boolean
-        Dim sqlstr = " DELETE FROM [tblFiskalkundenAnhaenge] WITH(updlock,serializable) WHERE fka_id=" & Me.fka_id
+        Dim sqlstr = " DELETE FROM [tblFiskalkundenAnhaenge]  WHERE fka_id=" & fka_id
         Return SQL.doSQL(sqlstr, "AVISO")
     End Function
 
     Public Function DELETEALL(fka_KdNr As Integer, fka_fkId As Integer) As Boolean
-        Dim sqlstr = " DELETE FROM [tblFiskalkundenAnhaenge] WITH(updlock,serializable) WHERE fka_KdNr=" & Me.fka_KdNr & " and fka_fkId=" & Me.fka_fkId
+        Dim sqlstr = " DELETE FROM [tblFiskalkundenAnhaenge]  WHERE fka_KdNr=" & fka_KdNr & " and fka_fkId=" & fka_fkId
         Return SQL.doSQL(sqlstr, "AVISO")
     End Function
 

VERAG_PROG_ALLGEMEIN/Schnittstellen/cCreditSafeAPI.vb

@@ -299,12 +299,12 @@ Public Class cCreditSafeAPI
 
             If company.country = "DE" Then ' nur bei DE ausführen!
                 Dim companyAddInformObj As Chilkat.JsonObject = reportObj.ObjectOf("additionalInformation")
-                If (reportObj.LastMethodSuccess = True) Then
+                If (reportObj.LastMethodSuccess = True) And companyAddInformObj IsNot Nothing Then
                     Dim companyMiscObj As Chilkat.JsonObject = companyAddInformObj.ObjectOf("misc")
                     company.csBusinessPurpose = companyMiscObj.StringOf("businessPurpose")
                     If (companyAddInformObj.LastMethodSuccess = True) Then
                         Dim deCurrentRatingObj As Chilkat.JsonObject = companyMiscObj.ObjectOf("deCurrentRating")
-                        If (companyAddInformObj.LastMethodSuccess = True) Then
+                        If (companyAddInformObj.LastMethodSuccess = True) And deCurrentRatingObj IsNot Nothing Then
                             If (deCurrentRatingObj.LastMethodSuccess = True) Then
                                 company.csIndex = deCurrentRatingObj.StringOf("value")
                             Else
@@ -320,10 +320,10 @@ Public Class cCreditSafeAPI
 
 
             Dim companyIDObj As Chilkat.JsonObject = reportObj.ObjectOf("companyIdentification")
-            If (reportObj.LastMethodSuccess = True) Then
+            If (reportObj.LastMethodSuccess = True) And companyIDObj IsNot Nothing Then
 
                 Dim basicInfoObj As Chilkat.JsonObject = companyIDObj.ObjectOf("basicInformation")
-                If (companyIDObj.LastMethodSuccess = True) Then
+                If (companyIDObj.LastMethodSuccess = True) And basicInfoObj IsNot Nothing Then
 
                     Dim dateTime As New Chilkat.CkDateTime
                     Dim getAsLocal As Boolean = False
@@ -354,8 +354,10 @@ Public Class cCreditSafeAPI
 
             If (reportObj.LastMethodSuccess = True) Then
 
+                If otherInformationObject IsNot Nothing Then
+
                     Dim employeesInformationsArray As Chilkat.JsonArray = otherInformationObject.ArrayOf("employeesInformation")
-                If (otherInformationObject.LastMethodSuccess = True) Then
+                    If (otherInformationObject.LastMethodSuccess = True) And employeesInformationsArray IsNot Nothing Then
                         Dim employees As Chilkat.JsonObject = employeesInformationsArray.ObjectAt(0)
                         company.csSumEmployees = employees.StringOf("numberOfEmployees")
                     Else
@@ -363,29 +365,30 @@ Public Class cCreditSafeAPI
                     End If
 
                     Dim bankersArray As Chilkat.JsonArray = otherInformationObject.ArrayOf("bankers")
-                If (otherInformationObject.LastMethodSuccess = True) Then
+                    If (otherInformationObject.LastMethodSuccess = True) And bankersArray IsNot Nothing Then
                         Dim bankers As Chilkat.JsonObject = bankersArray.ObjectAt(0)
                         company.csBank = bankers.StringOf("name") & " - " & bankers.StringOf("bankCode")
                     Else
                         Debug.WriteLine("otherInformationObject object not found.")
                     End If
+                End If
 
 
 
                 Dim creditRatingObj As Chilkat.JsonObject = creditScoreObj.ObjectOf("currentCreditRating")
-                If (creditScoreObj.LastMethodSuccess = True) Then
+                If (creditScoreObj.LastMethodSuccess = True) And creditRatingObj IsNot Nothing Then
 
                     company.csRiskclass = creditRatingObj.StringOf("commonValue")
 
                     Dim creditLimitObj As Chilkat.JsonObject = creditRatingObj.ObjectOf("creditLimit")
-                    If (creditRatingObj.LastMethodSuccess = True) Then
+                    If (creditRatingObj.LastMethodSuccess = True) And creditLimitObj IsNot Nothing Then
                         company.csMaxCreditAmount = creditLimitObj.StringOf("value")
                     Else
                         Debug.WriteLine("creditRating object not found.")
                     End If
 
                     Dim providerValueObj As Chilkat.JsonObject = creditRatingObj.ObjectOf("providerValue")
-                    If (creditRatingObj.LastMethodSuccess = True) Then
+                    If (creditRatingObj.LastMethodSuccess = True) And providerValueObj IsNot Nothing Then
                         company.csScore = providerValueObj.StringOf("value")
                     Else
                         Debug.WriteLine("providerValue object not found.")