Kundenkontakte, Mitarbeiter, Bonitaetsauskungt, FIBU, Creditsafe

SDL/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.3.0.9")>
+<Assembly: AssemblyVersion("1.3.1.0")>
-<Assembly: AssemblyFileVersion("1.3.0.9")>
+<Assembly: AssemblyFileVersion("1.3.1.0")>

SDL/buchhaltung/usrCntlBH.vb

@@ -74,8 +74,8 @@ Public Class usrCntlBH
         Dim dt = SQL.loadDgvBySql(getOPSql(), "FMZOLL")
         dt.Columns.Add("VersicherungsBetrag", Type.GetType("System.Double"))
         For Each r In dt.Rows
-            r("VersicherungsBetrag") = getVersBetrag(r("Risiko"), r("Versicherungssumme"), r("GemeldeterBetrag"))
+                r("VersicherungsBetrag") = getVersBetrag(r("Risiko"), r("Versicherungssumme"), r("GemeldeterBetrag"), )
-        Next
+            Next
         dt.Columns("VersicherungsBetrag").ColumnName = "V-Betrag"
         dt.Columns("Versicherungssumme").ColumnName = "V-Summe"
         dt.Columns("Vorauszahlung").ColumnName = "VZ"
@@ -128,8 +128,6 @@ Public Class usrCntlBH
         sqlStr &= IIf(cbxBankgarantieInfo.Checked, "BankgarantieBetrag, BankgarantieGültigBis,", "")
         sqlStr &= "     Versicherungssumme "
 
-
-
         '  sqlStr &= "     CASE WHEN LfdSaldo>" & GrenzeVersicherung & " THEN CASE WHEN ISNUMERIC(Versicherungssumme )=1 THEN cast(Versicherungssumme as decimal(16,2))  ELSE null END  ELSE null END as Versicherungssumme "
 
         '  If cbxOPUmsatz.Checked Then sqlStr &= " ,(SELECT SUM(SteuerfreierGesamtbetrag + SteuerpflichtigerGesamtbetrag)  as UmsatzRg FROM [Rechnungsausgang]  WHERE Kunden.KundenNrZentrale=[Rechnungsausgang].KundenNrZentrale AND RechnungsDatum between '01.06.2016' and '01.06.2017') as UmsatzRg "
@@ -454,37 +452,39 @@ Public Class usrCntlBH
         Me.Cursor = Cursors.Default
     End Sub
 
-    Function getVersBetrag(risiko, Versicherungssumme, GemeldeterBetrag) As Double
+    Function getVersBetrag(risiko, Versicherungssumme, GemeldeterBetrag, Optional versicherungGekündigt = False) As Double
         If risiko Is DBNull.Value Then Return 0
 
-        Dim versBetrag As Double = 0
+        If versicherungGekündigt Then Return 0
-        If risiko <= 0 Then
-            versBetrag = 0
-        ElseIf cbxBagatellgrenze.Checked And risiko <= txtBagatellgrenzeBei._value Then
-            versBetrag = 0 ' kleiner Bagatellgrenze
-        ElseIf risiko <= GrenzeVersicherung Then
-            If Versicherungssumme IsNot DBNull.Value Then
-                If risiko > CDbl(Versicherungssumme) Then
-                    versBetrag = Versicherungssumme
-                Else
-                    versBetrag = risiko
-                End If
-            Else
-                versBetrag = risiko
-            End If
-        Else
-            If Versicherungssumme IsNot DBNull.Value Then
-                If risiko > CDbl(Versicherungssumme) Then
-                    versBetrag = Versicherungssumme
-                Else
-                    versBetrag = risiko
-                End If
-            Else
-                versBetrag = GrenzeVersicherung
-            End If
-        End If
 
-        Return If(GemeldeterBetrag > 0, GemeldeterBetrag, versBetrag)
+        Dim versBetrag As Double = 0
+            If risiko <= 0 Then
+                versBetrag = 0
+            ElseIf cbxBagatellgrenze.Checked And risiko <= txtBagatellgrenzeBei._value Then
+                versBetrag = 0 ' kleiner Bagatellgrenze
+            ElseIf risiko <= GrenzeVersicherung Then
+                If Versicherungssumme IsNot DBNull.Value Then
+                    If risiko > CDbl(Versicherungssumme) Then
+                        versBetrag = Versicherungssumme
+                    Else
+                        versBetrag = risiko
+                    End If
+                Else
+                    versBetrag = risiko
+                End If
+            Else
+                If Versicherungssumme IsNot DBNull.Value Then
+                    If risiko > CDbl(Versicherungssumme) Then
+                        versBetrag = Versicherungssumme
+                    Else
+                        versBetrag = risiko
+                    End If
+                Else
+                    versBetrag = GrenzeVersicherung
+                End If
+            End If
+
+            Return If(GemeldeterBetrag > 0, GemeldeterBetrag, versBetrag)
     End Function
 
     Private Sub cbxOPUmsatz_CheckedChanged(sender As Object, e As EventArgs) Handles cbxOPUmsatz.CheckedChanged

SDL/kunden/frmKundenKontakteDetails.Designer.vb

@@ -27,9 +27,11 @@ Partial Class frmKundenKontakteDetails
         Me.lbl = New System.Windows.Forms.Label()
         Me.cboKontaktArt = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.pnlKontakt = New System.Windows.Forms.Panel()
+        Me.picBoxKorr = New System.Windows.Forms.PictureBox()
         Me.Label2 = New System.Windows.Forms.Label()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.lblEmailBCC = New System.Windows.Forms.TextBox()
+        Me.txtKorrAdd = New System.Windows.Forms.TextBox()
         Me.PictureBox7 = New System.Windows.Forms.PictureBox()
         Me.lblEmailCC = New System.Windows.Forms.TextBox()
         Me.PictureBox6 = New System.Windows.Forms.PictureBox()
@@ -41,11 +43,13 @@ Partial Class frmKundenKontakteDetails
         Me.PictureBox2 = New System.Windows.Forms.PictureBox()
         Me.lblTel = New System.Windows.Forms.TextBox()
         Me.PictureBox3 = New System.Windows.Forms.PictureBox()
+        Me.cboMannFrau = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.lblAnsprechpartnerVN = New System.Windows.Forms.TextBox()
+        Me.PictureBox5 = New System.Windows.Forms.PictureBox()
+        Me.lblAnsprechpartnerNN = New System.Windows.Forms.TextBox()
         Me.pnlGeschaeftsfuehrer = New System.Windows.Forms.Panel()
-        Me.picBoxKorr = New System.Windows.Forms.PictureBox()
         Me.Label5 = New System.Windows.Forms.Label()
         Me.txtPassgueltigbis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.txtKorrAdd = New System.Windows.Forms.TextBox()
         Me.Label4 = New System.Windows.Forms.Label()
         Me.Label3 = New System.Windows.Forms.Label()
         Me.PictureBox10 = New System.Windows.Forms.PictureBox()
@@ -56,24 +60,20 @@ Partial Class frmKundenKontakteDetails
         Me.cbxLand = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.txtOrt = New System.Windows.Forms.TextBox()
         Me.txtStrasse = New System.Windows.Forms.TextBox()
-        Me.cboMannFrau = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.lblAnsprechpartnerVN = New System.Windows.Forms.TextBox()
-        Me.lblAnsprechpartnerNN = New System.Windows.Forms.TextBox()
-        Me.PictureBox5 = New System.Windows.Forms.PictureBox()
         Me.pnlMain = New System.Windows.Forms.Panel()
         Me.pnlKontakt.SuspendLayout()
+        CType(Me.picBoxKorr, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.pnlGeschaeftsfuehrer.SuspendLayout()
-        CType(Me.picBoxKorr, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.pnlMain.SuspendLayout()
         Me.SuspendLayout()
         '
@@ -81,7 +81,7 @@ Partial Class frmKundenKontakteDetails
         '
         Me.btn.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btn.Location = New System.Drawing.Point(394, 430)
+        Me.btn.Location = New System.Drawing.Point(374, 365)
         Me.btn.Name = "btn"
         Me.btn.Size = New System.Drawing.Size(136, 39)
         Me.btn.TabIndex = 9
@@ -111,19 +111,25 @@ Partial Class frmKundenKontakteDetails
         '
         'pnlKontakt
         '
-        Me.pnlKontakt.AutoSize = True
         Me.pnlKontakt.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+        Me.pnlKontakt.Controls.Add(Me.txtOrt)
         Me.pnlKontakt.Controls.Add(Me.picBoxKorr)
         Me.pnlKontakt.Controls.Add(Me.Label2)
         Me.pnlKontakt.Controls.Add(Me.Label1)
         Me.pnlKontakt.Controls.Add(Me.lblEmailBCC)
+        Me.pnlKontakt.Controls.Add(Me.Label3)
         Me.pnlKontakt.Controls.Add(Me.txtKorrAdd)
+        Me.pnlKontakt.Controls.Add(Me.PictureBox10)
         Me.pnlKontakt.Controls.Add(Me.PictureBox7)
+        Me.pnlKontakt.Controls.Add(Me.PictureBox8)
         Me.pnlKontakt.Controls.Add(Me.lblEmailCC)
+        Me.pnlKontakt.Controls.Add(Me.txtPLZ)
         Me.pnlKontakt.Controls.Add(Me.PictureBox6)
+        Me.pnlKontakt.Controls.Add(Me.cbxLand)
         Me.pnlKontakt.Controls.Add(Me.PictureBox1)
         Me.pnlKontakt.Controls.Add(Me.lblMobil)
         Me.pnlKontakt.Controls.Add(Me.lblFax)
+        Me.pnlKontakt.Controls.Add(Me.txtStrasse)
         Me.pnlKontakt.Controls.Add(Me.lblEmail)
         Me.pnlKontakt.Controls.Add(Me.PictureBox4)
         Me.pnlKontakt.Controls.Add(Me.PictureBox2)
@@ -135,13 +141,24 @@ Partial Class frmKundenKontakteDetails
         Me.pnlKontakt.Controls.Add(Me.lblAnsprechpartnerNN)
         Me.pnlKontakt.Location = New System.Drawing.Point(8, 50)
         Me.pnlKontakt.Name = "pnlKontakt"
-        Me.pnlKontakt.Size = New System.Drawing.Size(500, 238)
+        Me.pnlKontakt.Size = New System.Drawing.Size(505, 271)
         Me.pnlKontakt.TabIndex = 10
         '
+        'picBoxKorr
+        '
+        Me.picBoxKorr.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
+        Me.picBoxKorr.Image = CType(resources.GetObject("picBoxKorr.Image"), System.Drawing.Image)
+        Me.picBoxKorr.Location = New System.Drawing.Point(0, 194)
+        Me.picBoxKorr.Name = "picBoxKorr"
+        Me.picBoxKorr.Size = New System.Drawing.Size(25, 18)
+        Me.picBoxKorr.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
+        Me.picBoxKorr.TabIndex = 267
+        Me.picBoxKorr.TabStop = False
+        '
         'Label2
         '
         Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(40, 152)
+        Me.Label2.Location = New System.Drawing.Point(41, 144)
         Me.Label2.Name = "Label2"
         Me.Label2.Size = New System.Drawing.Size(31, 13)
         Me.Label2.TabIndex = 235
@@ -150,7 +167,7 @@ Partial Class frmKundenKontakteDetails
         'Label1
         '
         Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(40, 127)
+        Me.Label1.Location = New System.Drawing.Point(41, 119)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(24, 13)
         Me.Label1.TabIndex = 234
@@ -162,17 +179,28 @@ Partial Class frmKundenKontakteDetails
         Me.lblEmailBCC.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.lblEmailBCC.Cursor = System.Windows.Forms.Cursors.Hand
         Me.lblEmailBCC.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblEmailBCC.Location = New System.Drawing.Point(77, 145)
+        Me.lblEmailBCC.Location = New System.Drawing.Point(78, 137)
         Me.lblEmailBCC.Name = "lblEmailBCC"
-        Me.lblEmailBCC.Size = New System.Drawing.Size(418, 26)
+        Me.lblEmailBCC.Size = New System.Drawing.Size(417, 26)
         Me.lblEmailBCC.TabIndex = 232
         Me.lblEmailBCC.Text = "email"
         '
+        'txtKorrAdd
+        '
+        Me.txtKorrAdd.BackColor = System.Drawing.Color.White
+        Me.txtKorrAdd.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.txtKorrAdd.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtKorrAdd.Location = New System.Drawing.Point(44, 189)
+        Me.txtKorrAdd.Name = "txtKorrAdd"
+        Me.txtKorrAdd.Size = New System.Drawing.Size(451, 26)
+        Me.txtKorrAdd.TabIndex = 264
+        Me.txtKorrAdd.Text = "adresse"
+        '
         'PictureBox7
         '
         Me.PictureBox7.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
         Me.PictureBox7.Image = Global.SDL.My.Resources.Resources.email
-        Me.PictureBox7.Location = New System.Drawing.Point(3, 147)
+        Me.PictureBox7.Location = New System.Drawing.Point(4, 139)
         Me.PictureBox7.Name = "PictureBox7"
         Me.PictureBox7.Size = New System.Drawing.Size(22, 18)
         Me.PictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
@@ -185,9 +213,9 @@ Partial Class frmKundenKontakteDetails
         Me.lblEmailCC.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.lblEmailCC.Cursor = System.Windows.Forms.Cursors.Hand
         Me.lblEmailCC.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblEmailCC.Location = New System.Drawing.Point(77, 120)
+        Me.lblEmailCC.Location = New System.Drawing.Point(78, 112)
         Me.lblEmailCC.Name = "lblEmailCC"
-        Me.lblEmailCC.Size = New System.Drawing.Size(418, 26)
+        Me.lblEmailCC.Size = New System.Drawing.Size(417, 26)
         Me.lblEmailCC.TabIndex = 230
         Me.lblEmailCC.Text = "email"
         '
@@ -195,7 +223,7 @@ Partial Class frmKundenKontakteDetails
         '
         Me.PictureBox6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
         Me.PictureBox6.Image = Global.SDL.My.Resources.Resources.email
-        Me.PictureBox6.Location = New System.Drawing.Point(3, 122)
+        Me.PictureBox6.Location = New System.Drawing.Point(4, 114)
         Me.PictureBox6.Name = "PictureBox6"
         Me.PictureBox6.Size = New System.Drawing.Size(22, 18)
         Me.PictureBox6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
@@ -218,9 +246,9 @@ Partial Class frmKundenKontakteDetails
         Me.lblMobil.BackColor = System.Drawing.Color.White
         Me.lblMobil.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.lblMobil.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblMobil.Location = New System.Drawing.Point(43, 61)
+        Me.lblMobil.Location = New System.Drawing.Point(41, 61)
         Me.lblMobil.Name = "lblMobil"
-        Me.lblMobil.Size = New System.Drawing.Size(452, 26)
+        Me.lblMobil.Size = New System.Drawing.Size(454, 26)
         Me.lblMobil.TabIndex = 220
         Me.lblMobil.Text = "mobil"
         '
@@ -229,9 +257,9 @@ Partial Class frmKundenKontakteDetails
         Me.lblFax.BackColor = System.Drawing.Color.White
         Me.lblFax.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.lblFax.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblFax.Location = New System.Drawing.Point(43, 38)
+        Me.lblFax.Location = New System.Drawing.Point(41, 38)
         Me.lblFax.Name = "lblFax"
-        Me.lblFax.Size = New System.Drawing.Size(452, 26)
+        Me.lblFax.Size = New System.Drawing.Size(454, 26)
         Me.lblFax.TabIndex = 219
         Me.lblFax.Text = "fax"
         '
@@ -241,9 +269,9 @@ Partial Class frmKundenKontakteDetails
         Me.lblEmail.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.lblEmail.Cursor = System.Windows.Forms.Cursors.Hand
         Me.lblEmail.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblEmail.Location = New System.Drawing.Point(43, 95)
+        Me.lblEmail.Location = New System.Drawing.Point(41, 87)
         Me.lblEmail.Name = "lblEmail"
-        Me.lblEmail.Size = New System.Drawing.Size(452, 26)
+        Me.lblEmail.Size = New System.Drawing.Size(454, 26)
         Me.lblEmail.TabIndex = 221
         Me.lblEmail.Text = "email"
         '
@@ -251,7 +279,7 @@ Partial Class frmKundenKontakteDetails
         '
         Me.PictureBox4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
         Me.PictureBox4.Image = Global.SDL.My.Resources.Resources.email
-        Me.PictureBox4.Location = New System.Drawing.Point(3, 97)
+        Me.PictureBox4.Location = New System.Drawing.Point(4, 89)
         Me.PictureBox4.Name = "PictureBox4"
         Me.PictureBox4.Size = New System.Drawing.Size(22, 18)
         Me.PictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
@@ -274,9 +302,9 @@ Partial Class frmKundenKontakteDetails
         Me.lblTel.BackColor = System.Drawing.Color.White
         Me.lblTel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.lblTel.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblTel.Location = New System.Drawing.Point(43, 14)
+        Me.lblTel.Location = New System.Drawing.Point(41, 14)
         Me.lblTel.Name = "lblTel"
-        Me.lblTel.Size = New System.Drawing.Size(452, 26)
+        Me.lblTel.Size = New System.Drawing.Size(454, 26)
         Me.lblTel.TabIndex = 218
         Me.lblTel.Text = "tel"
         '
@@ -291,43 +319,69 @@ Partial Class frmKundenKontakteDetails
         Me.PictureBox3.TabIndex = 225
         Me.PictureBox3.TabStop = False
         '
+        'cboMannFrau
+        '
+        Me.cboMannFrau._allowedValuesFreiText = Nothing
+        Me.cboMannFrau._allowFreiText = False
+        Me.cboMannFrau._value = ""
+        Me.cboMannFrau.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.0!)
+        Me.cboMannFrau.FormattingEnabled = True
+        Me.cboMannFrau.Location = New System.Drawing.Point(44, 163)
+        Me.cboMannFrau.Name = "cboMannFrau"
+        Me.cboMannFrau.Size = New System.Drawing.Size(54, 26)
+        Me.cboMannFrau.TabIndex = 250
+        '
+        'lblAnsprechpartnerVN
+        '
+        Me.lblAnsprechpartnerVN.BackColor = System.Drawing.Color.White
+        Me.lblAnsprechpartnerVN.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.lblAnsprechpartnerVN.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblAnsprechpartnerVN.Location = New System.Drawing.Point(97, 163)
+        Me.lblAnsprechpartnerVN.Name = "lblAnsprechpartnerVN"
+        Me.lblAnsprechpartnerVN.Size = New System.Drawing.Size(200, 26)
+        Me.lblAnsprechpartnerVN.TabIndex = 251
+        Me.lblAnsprechpartnerVN.Text = "ansprechpartner"
+        '
+        'PictureBox5
+        '
+        Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
+        Me.PictureBox5.Image = Global.SDL.My.Resources.Resources.person
+        Me.PictureBox5.Location = New System.Drawing.Point(1, 172)
+        Me.PictureBox5.Name = "PictureBox5"
+        Me.PictureBox5.Size = New System.Drawing.Size(25, 18)
+        Me.PictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
+        Me.PictureBox5.TabIndex = 253
+        Me.PictureBox5.TabStop = False
+        '
+        'lblAnsprechpartnerNN
+        '
+        Me.lblAnsprechpartnerNN.BackColor = System.Drawing.Color.White
+        Me.lblAnsprechpartnerNN.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.lblAnsprechpartnerNN.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblAnsprechpartnerNN.Location = New System.Drawing.Point(296, 163)
+        Me.lblAnsprechpartnerNN.Name = "lblAnsprechpartnerNN"
+        Me.lblAnsprechpartnerNN.Size = New System.Drawing.Size(199, 26)
+        Me.lblAnsprechpartnerNN.TabIndex = 252
+        Me.lblAnsprechpartnerNN.Text = "ansprechpartner"
+        '
         'pnlGeschaeftsfuehrer
         '
-        Me.pnlGeschaeftsfuehrer.AutoSize = True
         Me.pnlGeschaeftsfuehrer.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
         Me.pnlGeschaeftsfuehrer.Controls.Add(Me.Label5)
         Me.pnlGeschaeftsfuehrer.Controls.Add(Me.txtPassgueltigbis)
         Me.pnlGeschaeftsfuehrer.Controls.Add(Me.Label4)
-        Me.pnlGeschaeftsfuehrer.Controls.Add(Me.Label3)
-        Me.pnlGeschaeftsfuehrer.Controls.Add(Me.PictureBox10)
         Me.pnlGeschaeftsfuehrer.Controls.Add(Me.PictureBox9)
-        Me.pnlGeschaeftsfuehrer.Controls.Add(Me.PictureBox8)
         Me.pnlGeschaeftsfuehrer.Controls.Add(Me.txtGebDatum)
-        Me.pnlGeschaeftsfuehrer.Controls.Add(Me.txtPLZ)
+        Me.pnlGeschaeftsfuehrer.Location = New System.Drawing.Point(9, 322)
-        Me.pnlGeschaeftsfuehrer.Controls.Add(Me.cbxLand)
-        Me.pnlGeschaeftsfuehrer.Controls.Add(Me.txtOrt)
-        Me.pnlGeschaeftsfuehrer.Controls.Add(Me.txtStrasse)
-        Me.pnlGeschaeftsfuehrer.Location = New System.Drawing.Point(8, 294)
         Me.pnlGeschaeftsfuehrer.Name = "pnlGeschaeftsfuehrer"
-        Me.pnlGeschaeftsfuehrer.Size = New System.Drawing.Size(500, 102)
+        Me.pnlGeschaeftsfuehrer.Size = New System.Drawing.Size(500, 37)
         Me.pnlGeschaeftsfuehrer.TabIndex = 11
         Me.pnlGeschaeftsfuehrer.Visible = False
         '
-        'picBoxKorr
-        '
-        Me.picBoxKorr.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
-        Me.picBoxKorr.Image = CType(resources.GetObject("picBoxKorr.Image"), System.Drawing.Image)
-        Me.picBoxKorr.Location = New System.Drawing.Point(0, 217)
-        Me.picBoxKorr.Name = "picBoxKorr"
-        Me.picBoxKorr.Size = New System.Drawing.Size(25, 18)
-        Me.picBoxKorr.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
-        Me.picBoxKorr.TabIndex = 267
-        Me.picBoxKorr.TabStop = False
-        '
         'Label5
         '
         Me.Label5.AutoSize = True
-        Me.Label5.Location = New System.Drawing.Point(268, 86)
+        Me.Label5.Location = New System.Drawing.Point(268, 8)
         Me.Label5.Name = "Label5"
         Me.Label5.Size = New System.Drawing.Size(80, 13)
         Me.Label5.TabIndex = 266
@@ -349,32 +403,21 @@ Partial Class frmKundenKontakteDetails
         Me.txtPassgueltigbis._WaehrungZeichen = False
         Me.txtPassgueltigbis.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.txtPassgueltigbis.ForeColor = System.Drawing.Color.Red
-        Me.txtPassgueltigbis.Location = New System.Drawing.Point(354, 73)
+        Me.txtPassgueltigbis.Location = New System.Drawing.Point(354, 3)
         Me.txtPassgueltigbis.MaxLength = 10
         Me.txtPassgueltigbis.MaxLineLength = -1
         Me.txtPassgueltigbis.MaxLines_Warning = ""
         Me.txtPassgueltigbis.MaxLines_Warning_Label = Nothing
         Me.txtPassgueltigbis.Multiline = True
         Me.txtPassgueltigbis.Name = "txtPassgueltigbis"
-        Me.txtPassgueltigbis.Size = New System.Drawing.Size(141, 26)
+        Me.txtPassgueltigbis.Size = New System.Drawing.Size(140, 26)
         Me.txtPassgueltigbis.TabIndex = 265
         Me.txtPassgueltigbis.Text = "passgueltigbis"
         '
-        'txtKorrAdd
-        '
-        Me.txtKorrAdd.BackColor = System.Drawing.Color.White
-        Me.txtKorrAdd.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.txtKorrAdd.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtKorrAdd.Location = New System.Drawing.Point(45, 209)
-        Me.txtKorrAdd.Name = "txtKorrAdd"
-        Me.txtKorrAdd.Size = New System.Drawing.Size(452, 26)
-        Me.txtKorrAdd.TabIndex = 264
-        Me.txtKorrAdd.Text = "adresse"
-        '
         'Label4
         '
         Me.Label4.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(36, 86)
+        Me.Label4.Location = New System.Drawing.Point(34, 8)
         Me.Label4.Name = "Label4"
         Me.Label4.Size = New System.Drawing.Size(53, 13)
         Me.Label4.TabIndex = 263
@@ -383,7 +426,7 @@ Partial Class frmKundenKontakteDetails
         'Label3
         '
         Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(36, 51)
+        Me.Label3.Location = New System.Drawing.Point(35, 247)
         Me.Label3.Name = "Label3"
         Me.Label3.Size = New System.Drawing.Size(78, 13)
         Me.Label3.TabIndex = 262
@@ -393,7 +436,7 @@ Partial Class frmKundenKontakteDetails
         '
         Me.PictureBox10.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
         Me.PictureBox10.Image = CType(resources.GetObject("PictureBox10.Image"), System.Drawing.Image)
-        Me.PictureBox10.Location = New System.Drawing.Point(5, 46)
+        Me.PictureBox10.Location = New System.Drawing.Point(0, 242)
         Me.PictureBox10.Name = "PictureBox10"
         Me.PictureBox10.Size = New System.Drawing.Size(25, 18)
         Me.PictureBox10.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
@@ -404,7 +447,7 @@ Partial Class frmKundenKontakteDetails
         '
         Me.PictureBox9.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
         Me.PictureBox9.Image = CType(resources.GetObject("PictureBox9.Image"), System.Drawing.Image)
-        Me.PictureBox9.Location = New System.Drawing.Point(5, 81)
+        Me.PictureBox9.Location = New System.Drawing.Point(3, 3)
         Me.PictureBox9.Name = "PictureBox9"
         Me.PictureBox9.Size = New System.Drawing.Size(25, 18)
         Me.PictureBox9.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
@@ -415,7 +458,7 @@ Partial Class frmKundenKontakteDetails
         '
         Me.PictureBox8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
         Me.PictureBox8.Image = CType(resources.GetObject("PictureBox8.Image"), System.Drawing.Image)
-        Me.PictureBox8.Location = New System.Drawing.Point(5, 12)
+        Me.PictureBox8.Location = New System.Drawing.Point(1, 217)
         Me.PictureBox8.Name = "PictureBox8"
         Me.PictureBox8.Size = New System.Drawing.Size(25, 18)
         Me.PictureBox8.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
@@ -438,7 +481,7 @@ Partial Class frmKundenKontakteDetails
         Me.txtGebDatum._WaehrungZeichen = False
         Me.txtGebDatum.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.txtGebDatum.ForeColor = System.Drawing.Color.Black
-        Me.txtGebDatum.Location = New System.Drawing.Point(116, 73)
+        Me.txtGebDatum.Location = New System.Drawing.Point(114, 3)
         Me.txtGebDatum.MaxLength = 10
         Me.txtGebDatum.MaxLineLength = -1
         Me.txtGebDatum.MaxLines_Warning = ""
@@ -454,7 +497,7 @@ Partial Class frmKundenKontakteDetails
         Me.txtPLZ.BackColor = System.Drawing.Color.White
         Me.txtPLZ.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.txtPLZ.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtPLZ.Location = New System.Drawing.Point(163, 44)
+        Me.txtPLZ.Location = New System.Drawing.Point(162, 240)
         Me.txtPLZ.Name = "txtPLZ"
         Me.txtPLZ.Size = New System.Drawing.Size(99, 26)
         Me.txtPLZ.TabIndex = 257
@@ -468,9 +511,9 @@ Partial Class frmKundenKontakteDetails
         Me.cbxLand.DropDownWidth = 150
         Me.cbxLand.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.0!)
         Me.cbxLand.FormattingEnabled = True
-        Me.cbxLand.Location = New System.Drawing.Point(116, 44)
+        Me.cbxLand.Location = New System.Drawing.Point(115, 240)
         Me.cbxLand.Name = "cbxLand"
-        Me.cbxLand.Size = New System.Drawing.Size(41, 26)
+        Me.cbxLand.Size = New System.Drawing.Size(50, 26)
         Me.cbxLand.TabIndex = 256
         '
         'txtOrt
@@ -478,9 +521,9 @@ Partial Class frmKundenKontakteDetails
         Me.txtOrt.BackColor = System.Drawing.Color.White
         Me.txtOrt.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.txtOrt.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtOrt.Location = New System.Drawing.Point(268, 44)
+        Me.txtOrt.Location = New System.Drawing.Point(261, 240)
         Me.txtOrt.Name = "txtOrt"
-        Me.txtOrt.Size = New System.Drawing.Size(229, 26)
+        Me.txtOrt.Size = New System.Drawing.Size(234, 26)
         Me.txtOrt.TabIndex = 255
         Me.txtOrt.Text = "ort"
         '
@@ -489,96 +532,52 @@ Partial Class frmKundenKontakteDetails
         Me.txtStrasse.BackColor = System.Drawing.Color.White
         Me.txtStrasse.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.txtStrasse.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtStrasse.Location = New System.Drawing.Point(48, 12)
+        Me.txtStrasse.Location = New System.Drawing.Point(44, 214)
         Me.txtStrasse.Name = "txtStrasse"
-        Me.txtStrasse.Size = New System.Drawing.Size(449, 26)
+        Me.txtStrasse.Size = New System.Drawing.Size(451, 26)
         Me.txtStrasse.TabIndex = 254
         Me.txtStrasse.Text = "adresse"
         '
-        'cboMannFrau
-        '
-        Me.cboMannFrau._allowedValuesFreiText = Nothing
-        Me.cboMannFrau._allowFreiText = False
-        Me.cboMannFrau._value = ""
-        Me.cboMannFrau.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.0!)
-        Me.cboMannFrau.FormattingEnabled = True
-        Me.cboMannFrau.Location = New System.Drawing.Point(43, 177)
-        Me.cboMannFrau.Name = "cboMannFrau"
-        Me.cboMannFrau.Size = New System.Drawing.Size(54, 26)
-        Me.cboMannFrau.TabIndex = 250
-        '
-        'lblAnsprechpartnerVN
-        '
-        Me.lblAnsprechpartnerVN.BackColor = System.Drawing.Color.White
-        Me.lblAnsprechpartnerVN.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.lblAnsprechpartnerVN.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblAnsprechpartnerVN.Location = New System.Drawing.Point(96, 177)
-        Me.lblAnsprechpartnerVN.Name = "lblAnsprechpartnerVN"
-        Me.lblAnsprechpartnerVN.Size = New System.Drawing.Size(200, 26)
-        Me.lblAnsprechpartnerVN.TabIndex = 251
-        Me.lblAnsprechpartnerVN.Text = "ansprechpartner"
-        '
-        'lblAnsprechpartnerNN
-        '
-        Me.lblAnsprechpartnerNN.BackColor = System.Drawing.Color.White
-        Me.lblAnsprechpartnerNN.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.lblAnsprechpartnerNN.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblAnsprechpartnerNN.Location = New System.Drawing.Point(295, 177)
-        Me.lblAnsprechpartnerNN.Name = "lblAnsprechpartnerNN"
-        Me.lblAnsprechpartnerNN.Size = New System.Drawing.Size(200, 26)
-        Me.lblAnsprechpartnerNN.TabIndex = 252
-        Me.lblAnsprechpartnerNN.Text = "ansprechpartner"
-        '
-        'PictureBox5
-        '
-        Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
-        Me.PictureBox5.Image = Global.SDL.My.Resources.Resources.person
-        Me.PictureBox5.Location = New System.Drawing.Point(0, 180)
-        Me.PictureBox5.Name = "PictureBox5"
-        Me.PictureBox5.Size = New System.Drawing.Size(25, 18)
-        Me.PictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
-        Me.PictureBox5.TabIndex = 253
-        Me.PictureBox5.TabStop = False
-        '
         'pnlMain
         '
         Me.pnlMain.Controls.Add(Me.lbl)
+        Me.pnlMain.Controls.Add(Me.btn)
         Me.pnlMain.Controls.Add(Me.pnlGeschaeftsfuehrer)
         Me.pnlMain.Controls.Add(Me.cboKontaktArt)
         Me.pnlMain.Controls.Add(Me.pnlKontakt)
         Me.pnlMain.Location = New System.Drawing.Point(7, 12)
         Me.pnlMain.Name = "pnlMain"
-        Me.pnlMain.Size = New System.Drawing.Size(513, 405)
+        Me.pnlMain.Size = New System.Drawing.Size(513, 407)
         Me.pnlMain.TabIndex = 12
         '
         'frmKundenKontakteDetails
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.AutoSize = True
         Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
         Me.BackColor = System.Drawing.Color.White
-        Me.ClientSize = New System.Drawing.Size(542, 481)
+        Me.ClientSize = New System.Drawing.Size(524, 427)
         Me.Controls.Add(Me.pnlMain)
-        Me.Controls.Add(Me.btn)
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
         Me.Name = "frmKundenKontakteDetails"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "Kunden Kontakt"
         Me.pnlKontakt.ResumeLayout(False)
         Me.pnlKontakt.PerformLayout()
+        CType(Me.picBoxKorr, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit()
         Me.pnlGeschaeftsfuehrer.ResumeLayout(False)
         Me.pnlGeschaeftsfuehrer.PerformLayout()
-        CType(Me.picBoxKorr, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit()
         Me.pnlMain.ResumeLayout(False)
         Me.pnlMain.PerformLayout()
         Me.ResumeLayout(False)

SDL/kunden/frmKundenKontakteDetails.resx

@@ -200,6 +200,48 @@
         uT2bgvb90MAeTUEPPzTyzqagph809I5fJ6bpB029ejLg4Yfmnj0ZqI+pjwWae+ZkQNMPgjxyMuDhh0D3
         nAzo+EOwryYBTT8Id+1kwMMPi7g8GXDHHxazTQKO+2BR9eDr+AMAAAAAAAAAAAAAAAAAAAAAAAAAABzj
         27d/ABBabbXEUZDWAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="PictureBox8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+        27d/ABBabbXEUZDWAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="PictureBox9.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -251,48 +293,6 @@
         JMC7WMcq7/U3w9kA3kGe+GGOEHB/AK8ir/gvomJQH6yob1ZVEEouFTBlHVtlHWd1zPGkBwAAAAAAAAAA
         AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGM+3b/8D
         5YK/CrjgMXgAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="PictureBox8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
-        27d/ABBabbXEUZDWAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

SDL/kunden/frmKundenKontakteDetails.vb

@@ -113,14 +113,6 @@
             pnlGeschaeftsfuehrer.Visible = False
         End If
 
-        If cboKontaktArt._value = "14" Then
-            txtKorrAdd.Visible = True
-            picBoxKorr.Visible = True
-        Else
-            txtKorrAdd.Visible = False
-            picBoxKorr.Visible = False
-
-        End If
     End Sub
 
 

SDL/kunden/usrCntlKundenuebersicht.vb

@@ -2874,7 +2874,7 @@ Public Class usrCntlKundenuebersicht
 
     End Sub
 
-    Private Sub setCreditSafeEntry(company As cCreditSafeAPI.Company, PDF As Byte(), krn As Integer, Optional forcedRequest As Boolean = False)
+    Private Sub setCreditSafeEntry(company As cCreditSafeAPI.Company, PDF As Byte(), krn As Integer, Optional forcedRequest As Boolean = False, Optional cscounterbefore As Integer = 0, Optional cscounterafter As Integer = 0, Optional csmax As Integer = 0)
 
         If company.csFailure <> "" Then
             MsgBox(company.csFailure)
@@ -2905,6 +2905,9 @@ Public Class usrCntlKundenuebersicht
 
 
         cBonitaetsauskunft.ba_Pruefungstool = "creditsafe API"
+        cBonitaetsauskunft.ba_CScounterBeforeRequest = cscounterbefore
+        cBonitaetsauskunft.ba_CScounterAfterRequest = cscounterafter
+        cBonitaetsauskunft.ba_CSmax = csmax
 
         ' Öster. Unternemen -> Creditscore, sonst Index
         If (IsNumeric(company.csIndex)) Then
@@ -3060,6 +3063,21 @@ Public Class usrCntlKundenuebersicht
     Private Sub setCreditsafereportEntry(cs As cCreditSafeAPI, company As cCreditSafeAPI.Company, Optional forecedReqest As Boolean = False)
 
         Dim pdfObject As Byte() = Nothing
+        Dim dt As New DataTable
+        Dim beforeRequestCount As Integer = 0
+        Dim afterRequestCount As Integer = 0
+        Dim limit As Integer = 0
+        Dim country As String = ""
+
+        cs.getSubscriptionCountries(dt)
+
+        If dt.Rows.Count > 0 AndAlso dt.AsEnumerable.Any(Function(c) company.country = c.Item("countryIso2").ToString) Then
+            Dim r As DataRow = dt.AsEnumerable.First((Function(c) company.country = c.Item("countryIso2").ToString))
+            beforeRequestCount = r.Item("used")
+            limit = r.Item("paid")
+            country = r.Item("countryIso2")
+
+        End If
 
         Dim failureDesc As String = cs.getReport(company, True)
         If failureDesc <> "" Then
@@ -3069,13 +3087,25 @@ Public Class usrCntlKundenuebersicht
         End If
 
         pdfObject = cs.getPDF(company, failureDesc)
+
+        cs.getSubscriptionCountries(dt)
+
+        If dt.Rows.Count > 0 AndAlso dt.AsEnumerable.Any(Function(c) company.country = c.Item("countryIso2").ToString) Then
+            Dim r As DataRow = dt.AsEnumerable.First((Function(c) company.country = c.Item("countryIso2").ToString))
+            afterRequestCount = r.Item("used")
+
+        End If
+
+
         If pdfObject Is Nothing Then
-            setCreditSafeEntry(company, Nothing, kdNr)
+            setCreditSafeEntry(company, Nothing, kdNr, beforeRequestCount, afterRequestCount, limit)
             MsgBox("Fehler beim Erstellen des PDF-Dokuments" & vbNewLine & failureDesc)
         Else
-            setCreditSafeEntry(company, pdfObject, kdNr, forecedReqest)
+            setCreditSafeEntry(company, pdfObject, kdNr, forecedReqest, beforeRequestCount, afterRequestCount, limit)
         End If
 
+
+
         If company.vatNo <> "" AndAlso checkNullStr(ADRESSE.UstIdKz) = "" AndAlso checkNullStr(ADRESSE.UstIdNr) = "" Then
             'set and check uid nr
 
@@ -3096,6 +3126,9 @@ Public Class usrCntlKundenuebersicht
 
         End If
 
+        If beforeRequestCount = (limit - 100) Or afterRequestCount = (limit - 100) Then 'Benachrichtigung
+
+        End If
 
 
     End Sub

VERAG_PROG_ALLGEMEIN/Classes/cBonitaetsauskunft.vb

@@ -33,8 +33,11 @@ Public Class cBonitaetsauskunft
     Property ba_Geschaeftszweck As Object = Nothing
     Property ba_GSName As Object = Nothing
     Property ba_UID As String = ""
-
     Property ba_forcedRequest As Boolean = False
+    Property ba_CScounterBeforeRequest As Integer = 0
+    Property ba_CScounterAfterRequest As Integer = 0
+    Property ba_CSmax As Integer = 0
+    Property ba_CScountry As String = ""
 
 
     Dim SQL As New SQL
@@ -80,6 +83,10 @@ Public Class cBonitaetsauskunft
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_GSName", ba_GSName))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_UID", ba_UID))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_forcedRequest", ba_forcedRequest))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_CScounterBeforeRequest", ba_CScounterBeforeRequest))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_CScounterAfterRequest", ba_CScounterAfterRequest))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_CSmax", ba_CSmax))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_CScountry", ba_CScountry))
 
         Return list
     End Function

VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb

@@ -408,7 +408,7 @@ Public Class cMitarbeiter
                             Me.mit_homeoffice = dr.Item("mit_homeoffice")
                             Me.mit_timasNichtStempeln = dr.Item("mit_timasNichtStempeln")
                             If Not dr.Item("mit_emailprivat") Is DBNull.Value Then Me.mit_emailprivat = dr.Item("mit_emailprivat")
-                            Me.mit_timasNichtStempeln = dr.Item("mit_ausstempelnBeiBeenden")
+                            Me.mit_ausstempelnBeiBeenden = dr.Item("mit_ausstempelnBeiBeenden")
 
 
                         Catch ex As Exception

VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb

@@ -1,7 +1,10 @@
 
 Imports System.Net
+Imports System.Runtime.InteropServices.ComTypes
 Imports System.Threading
+Imports System.Web.UI
 Imports Chilkat
+Imports Microsoft.VisualBasic.ApplicationServices
 
 
 Public Class cCreditSafeAPI
@@ -24,12 +27,11 @@ Public Class cCreditSafeAPI
         Else
             apiSettingsloaded = True
             API_STRING = API.Rows(0).Item("api_url")
-
             If Not IsDBNull(API.Rows(0).Item("api_debugpath")) AndAlso API.Rows(0).Item("api_debugpath") <> "" Then
-                Rest.VerboseLogging = True
+                rest.VerboseLogging = True
-                Rest.DebugLogFilePath = API.Rows(0).Item("api_debugpath") & program & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "_Test", "") & ".txt"
+                rest.DebugLogFilePath = API.Rows(0).Item("api_debugpath") & program & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "_Test", "") & ".txt"
             Else
-                Rest.VerboseLogging = False
+                rest.VerboseLogging = False
             End If
 
         End If
@@ -610,7 +612,7 @@ Public Class cCreditSafeAPI
 
     End Function
 
-    Public Function getSubscriptionCountries() As String
+    Public Function getSubscriptionCountries(dtSunscriptions As DataTable) As String
 
         VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat()
 
@@ -618,32 +620,49 @@ Public Class cCreditSafeAPI
 
         Dim rest As New Chilkat.Rest
         Dim success As Boolean
+        Dim company
+        Dim failureDesc As String
+        Dim myUrl As String = API_STRING & "/v1/access"
+        Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc)
 
-        rest.AddHeader("Authorization", "Bearer <YOUR_JWT_HERE>")
+        Dim json As New Chilkat.JsonObject
+        success = json.Load(jsonRespString)
 
-        Dim sbResponseBody As New Chilkat.StringBuilder
+
-        success = rest.FullRequestNoBodySb("GET", "/v1/access", sbResponseBody)
+
-        If (success <> True) Then
+        If dtSunscriptions.Columns.Count = 0 Then
-            Return rest.LastErrorText
+            dtSunscriptions.Columns.Add("countryName", GetType(String))
+            dtSunscriptions.Columns.Add("templateName", GetType(String))
+            dtSunscriptions.Columns.Add("countryIso2", GetType(String))
+            dtSunscriptions.Columns.Add("startDate", GetType(DateTime))
+            dtSunscriptions.Columns.Add("expireDate", GetType(DateTime))
+            dtSunscriptions.Columns.Add("paid", GetType(Integer))
+            dtSunscriptions.Columns.Add("used", GetType(Integer))
         End If
 
-        Dim respStatusCode As Integer = rest.ResponseStatusCode
+        dtSunscriptions.Rows.Clear()
-        Debug.WriteLine("response status code = " & respStatusCode)
-        If (respStatusCode >= 400) Then
-            Debug.WriteLine("Response Status Code = " & respStatusCode)
-            Debug.WriteLine("Response Header:")
-            Debug.WriteLine(rest.ResponseHeader)
-            Debug.WriteLine("Response Body:")
-            Debug.WriteLine(sbResponseBody.GetAsString())
-            Return respStatusCode & " " & sbResponseBody.GetAsString()
-        End If
 
 
-        Dim jsonResponse As New Chilkat.JsonObject
-        jsonResponse.LoadSb(sbResponseBody)
 
-        jsonResponse.EmitCompact = False
+        Dim correlationId As String = json.StringOf("correlationId")
-        Debug.WriteLine(jsonResponse.Emit())
+        Dim i As Integer = 0
+        Dim count_i As Integer = json.SizeOfArray("countryAccess.creditsafeConnectOnlineReports")
+        While i < count_i
+            json.I = i
+            Dim R As DataRow = dtSunscriptions.NewRow
+            R("countryName") = json.StringOf("countryAccess.creditsafeConnectOnlineReports[i].countryName")
+            R("templateName") = json.StringOf("countryAccess.creditsafeConnectOnlineReports[i].templateName")
+            R("countryIso2") = json.StringOf("countryAccess.creditsafeConnectOnlineReports[i].countryIso2")
+            R("startDate") = json.StringOf("countryAccess.creditsafeConnectOnlineReports[i].startDate")
+            R("expireDate") = json.StringOf("countryAccess.creditsafeConnectOnlineReports[i].expireDate")
+            R("paid") = json.IntOf("countryAccess.creditsafeConnectOnlineReports[i].paid")
+            R("used") = json.IntOf("countryAccess.creditsafeConnectOnlineReports[i].used")
+            dtSunscriptions.Rows.Add(R)
+            i = i + 1
+        End While
+
+        Return "Anzahl gefundener Datensätze: " & i
+
 
 
     End Function
@@ -672,8 +691,6 @@ Public Class cCreditSafeAPI
                 If company.City <> "" Then rest.AddQueryParam("city", company.City)
             End If
 
-
-
         End If
 
     End Sub