Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

SDL/kunden/frmBonitaet.Designer.vb

@@ -23,7 +23,7 @@ Partial Class frmBonitaet
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmBonitaet))
-        Me.Label3 = New System.Windows.Forms.Label()
+        Me.lblBonitätsindex = New System.Windows.Forms.Label()
         Me.Button1 = New System.Windows.Forms.Button()
         Me.btnStandardPreiseLaden = New System.Windows.Forms.Button()
         Me.Label10 = New System.Windows.Forms.Label()
@@ -40,15 +40,15 @@ Partial Class frmBonitaet
         Me.txtCRDatum = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.SuspendLayout()
         '
-        'Label3
+        'lblBonitätsindex
         '
-        Me.Label3.AutoSize = True
+        Me.lblBonitätsindex.AutoSize = True
-        Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblBonitätsindex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label3.Location = New System.Drawing.Point(14, 68)
+        Me.lblBonitätsindex.Location = New System.Drawing.Point(14, 68)
-        Me.Label3.Name = "Label3"
+        Me.lblBonitätsindex.Name = "lblBonitätsindex"
-        Me.Label3.Size = New System.Drawing.Size(87, 13)
+        Me.lblBonitätsindex.Size = New System.Drawing.Size(87, 13)
-        Me.Label3.TabIndex = 2
+        Me.lblBonitätsindex.TabIndex = 2
-        Me.Label3.Text = "Bonitätsindex:"
+        Me.lblBonitätsindex.Text = "Bonitätsindex:"
         '
         'Button1
         '
@@ -264,7 +264,7 @@ Partial Class frmBonitaet
         Me.Controls.Add(Me.cboRisikostufe)
         Me.Controls.Add(Me.Label1)
         Me.Controls.Add(Me.txtBonitaetsindex)
-        Me.Controls.Add(Me.Label3)
+        Me.Controls.Add(Me.lblBonitätsindex)
         Me.Controls.Add(Me.Button1)
         Me.Controls.Add(Me.btnStandardPreiseLaden)
         Me.Controls.Add(Me.txtCRDatum)
@@ -280,7 +280,7 @@ Partial Class frmBonitaet
     End Sub
 
     Friend WithEvents txtBonitaetsindex As VERAG_PROG_ALLGEMEIN.MyTextBox
-    Friend WithEvents Label3 As Label
+    Friend WithEvents lblBonitätsindex As Label
     Friend WithEvents Button1 As Button
     Friend WithEvents btnStandardPreiseLaden As Button
     Friend WithEvents txtCRDatum As VERAG_PROG_ALLGEMEIN.MyTextBox

SDL/kunden/frmBonitaet.vb

@@ -5,12 +5,14 @@ Imports com.sun.xml.internal.ws.client
 Public Class frmBonitaet
 
     Public KdNR As Integer
+    Dim ADRESSE As VERAG_PROG_ALLGEMEIN.cAdressen
     Dim VSQL As New VERAG_PROG_ALLGEMEIN.SQL
     Sub New(KdNR As Integer)
 
         ' Dieser Aufruf ist für den Designer erforderlich.
         InitializeComponent()
         Me.KdNR = KdNR
+        ADRESSE = New VERAG_PROG_ALLGEMEIN.cAdressen(KdNR)
         ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
 
     End Sub
@@ -36,7 +38,13 @@ Public Class frmBonitaet
             cBonitaetsauskunft.ba_Datum = cProgramFunctions.isLeerNothing(txtCRDatum._value)
 
             cBonitaetsauskunft.ba_BonitaetsIndex = If(IsNumeric(txtBonitaetsindex.Text), txtBonitaetsindex.Text, 0)
-            cBonitaetsauskunft.ba_Risikostufe = If(IsNumeric(cboRisikostufe._value), cboRisikostufe._value, Nothing)
+            If cboTool._value = "creditsafe" Then
+                cBonitaetsauskunft.ba_Risikoklasse = cboRisikostufe._value
+            Else
+                cBonitaetsauskunft.ba_Risikostufe = If(IsNumeric(cboRisikostufe._value), cboRisikostufe._value, Nothing)
+            End If
+
+
             cBonitaetsauskunft.ba_Pruefungstool = cboTool._value
 
             cBonitaetsauskunft.ba_MaId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
@@ -51,10 +59,16 @@ Public Class frmBonitaet
             If cBonitaetsauskunft.SAVE Then
                 VSQL.doSQL("UPDATE Kunden SET Bonität='" & cBonitaetsauskunft.ba_BonitaetsIndex & "', Bonitätsdatum='" & cBonitaetsauskunft.ba_Datum & "', Höchstkredit=" & If(cBonitaetsauskunft.ba_Hoechstkredit Is Nothing, "null", "'" & cBonitaetsauskunft.ba_Hoechstkredit & "'") & " WHERE KundenNr='" & cBonitaetsauskunft.ba_KundenNr & "'", "FMZOLL")
                 Dim KDERW As New VERAG_PROG_ALLGEMEIN.cKundenErweitert(KdNR)
-                KDERW.kde_BonitaetsStufe = cBonitaetsauskunft.ba_Risikostufe
+
+                If cboTool._value = "creditsafe" Then
+                    KDERW.kde_Bonitaetsklasse = cBonitaetsauskunft.ba_Risikoklasse
+                Else
+                    KDERW.kde_BonitaetsStufe = cBonitaetsauskunft.ba_Risikostufe
+                End If
+
                 KDERW.SAVE()
-                Me.Close()
+                    Me.Close()
-            End If
+                End If
 
         Catch ex As Exception
             MsgBox(ex.Message)
@@ -66,6 +80,14 @@ Public Class frmBonitaet
     Private Sub frmBonitaet_Load(sender As Object, e As EventArgs) Handles Me.Load
 
 
+        If ADRESSE.LandKz = "A" Or ADRESSE.LandKz = "AT" Then
+
+            lblBonitätsindex.Text = "Boni-Score"
+        Else
+
+            lblBonitätsindex.Text = "Bonitätsindex:"
+
+        End If
 
         cboTool.Items.Clear()
         cboTool.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CreditSafe", "creditsafe"))
@@ -86,30 +108,26 @@ Public Class frmBonitaet
         End Select
 
         txtCRDatum._value = Now
-        cboRisikostufe.Items.Clear()
+        setRisikostufeList()
-        cboRisikostufe.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
-        cboRisikostufe.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("A", 1))
-        cboRisikostufe.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("B", 2))
-        cboRisikostufe.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("C", 3))
-        cboRisikostufe.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("D", 4))
-        cboRisikostufe.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("E", 5))
-        cboRisikostufe.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("F", 6))
-        cboRisikostufe.changeItem("")
 
     End Sub
 
     Private Sub cboTool_SelectedValueChanged(sender As Object, e As EventArgs) Handles cboTool.SelectedValueChanged
+        setRisikostufeList()
+    End Sub
+
+    Private Sub setRisikostufeList()
 
         If (cboTool._value = "creditsafe") Then
 
             cboRisikostufe.Items.Clear()
             cboRisikostufe.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
-            cboRisikostufe.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("A", 1))
+            cboRisikostufe.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("A", "A"))
-            cboRisikostufe.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("B", 2))
+            cboRisikostufe.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("B", "B"))
-            cboRisikostufe.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("C", 3))
+            cboRisikostufe.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("C", "C"))
-            cboRisikostufe.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("D", 4))
+            cboRisikostufe.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("D", "D"))
-            cboRisikostufe.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("E", 5))
+            cboRisikostufe.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("E", "E"))
-            cboRisikostufe.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("F", 6))
+            cboRisikostufe.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("F", "F"))
             cboRisikostufe.changeItem("")
 
         Else
@@ -125,5 +143,7 @@ Public Class frmBonitaet
             cboRisikostufe.changeItem("")
 
         End If
+
     End Sub
+
 End Class

VERAG_PROG_ALLGEMEIN/Classes/cBonitaetsauskunft.vb

@@ -25,6 +25,7 @@ Public Class cBonitaetsauskunft
     Property ba_GFName As Object = Nothing
     Property ba_Sonstiges As Object = Nothing
     Property ba_Risikostufe As Object = Nothing
+    Property ba_Risikoklasse As Object = Nothing
     Property ba_Pruefungstool As Object = Nothing
 
 
@@ -62,6 +63,7 @@ Public Class cBonitaetsauskunft
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_GFName", ba_GFName))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_Sonstiges", ba_Sonstiges))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_Risikostufe", ba_Risikostufe))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_Risikoklasse", ba_Risikoklasse))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ba_Pruefungstool", ba_Pruefungstool))
 
         Return list

VERAG_PROG_ALLGEMEIN/Classes/cGesamtsicherheitsPositionen.vb

@@ -17,6 +17,8 @@ Public Class cGesamtsicherheitsPositionen
     Property gsp_ATCNr As String
     Property gsp_erstellungsdatum As DateTime
 
+    Property gsp_datum As Object = Nothing
+
     Public hasEntry = False
 
     Dim SQL As New SQL
@@ -46,6 +48,7 @@ Public Class cGesamtsicherheitsPositionen
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_abfertigungsNr", gsp_abfertigungsNr))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_ATCNr", gsp_ATCNr))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_erstellungsdatum", gsp_erstellungsdatum))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_datum", gsp_datum))
 
 
         Return list

VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb

@@ -49,6 +49,7 @@ Public Class cKundenErweitert
     Property EmailAnkunft_Export As Boolean = False
     Property EmailFreigabe_Export As Boolean = False
     Property kde_BonitaetsStufe As Object = Nothing
+    Property kde_Bonitaetsklasse As Object = Nothing
 
     Property kde_Inkasso_Uebergeben As Boolean = False
     Property kde_Inkasso_UebergebenAm As Object = Nothing
@@ -132,6 +133,7 @@ Public Class cKundenErweitert
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_FakturierungSR_Details", kde_FakturierungSR_Details))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_Fakturierung_Sprache", kde_Fakturierung_Sprache))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_TOBB_KundenNr", kde_TOBB_KundenNr))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_Bonitaetsklasse", kde_Bonitaetsklasse))
 
         Return list
     End Function