faktAbr, CreditsafeAPI, etc.

2025-09-25 13:04:53 +02:00
parent 28ce22c2bd
commit 0871e82f58
4 changed files with 333 additions and 174 deletions
--- a/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb
+++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb
@@ -158,6 +158,8 @@ Partial Class usrCntlFaktAbrechnung
        Me.txtZollbelegNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.Label10 = New System.Windows.Forms.Label()
        Me.pnlRechnungAn = New System.Windows.Forms.Panel()
+        Me.cboRgArt = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Label57 = New System.Windows.Forms.Label()
        Me.cboVorauskasse = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Label56 = New System.Windows.Forms.Label()
        Me.txtRechnungAnZusatz = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -204,7 +206,7 @@ Partial Class usrCntlFaktAbrechnung
        Me.Button7 = New System.Windows.Forms.Button()
        Me.btnVorauskasseAnzeigen = New System.Windows.Forms.Button()
        Me.Button5 = New System.Windows.Forms.Button()
-        Me.btn = New System.Windows.Forms.Button()
+        Me.btnZoll_EUST = New System.Windows.Forms.Button()
        Me.txtUnterNrRef = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.cboFilialeRef = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.txtAbfertigungsnummerRef = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -286,8 +288,6 @@ Partial Class usrCntlFaktAbrechnung
        Me.GutschriftAnVeragToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.VeragAGToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.VeragCSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.cboRgArt = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.Label57 = New System.Windows.Forms.Label()
        Me.pnlTop.SuspendLayout()
        Me.Panel3.SuspendLayout()
        Me.Panel1.SuspendLayout()
@@ -2058,6 +2058,27 @@ Partial Class usrCntlFaktAbrechnung
        Me.pnlRechnungAn.Size = New System.Drawing.Size(582, 153)
        Me.pnlRechnungAn.TabIndex = 0
        '
+        'cboRgArt
+        '
+        Me.cboRgArt._allowedValuesFreiText = Nothing
+        Me.cboRgArt._allowFreiText = False
+        Me.cboRgArt._value = ""
+        Me.cboRgArt.FormattingEnabled = True
+        Me.cboRgArt.Location = New System.Drawing.Point(478, 127)
+        Me.cboRgArt.Name = "cboRgArt"
+        Me.cboRgArt.Size = New System.Drawing.Size(97, 21)
+        Me.cboRgArt.TabIndex = 246
+        '
+        'Label57
+        '
+        Me.Label57.AutoSize = True
+        Me.Label57.Location = New System.Drawing.Point(431, 130)
+        Me.Label57.Name = "Label57"
+        Me.Label57.Size = New System.Drawing.Size(42, 13)
+        Me.Label57.TabIndex = 245
+        Me.Label57.Text = "RG-Art:"
+        Me.Label57.TextAlign = System.Drawing.ContentAlignment.TopRight
+        '
        'cboVorauskasse
        '
        Me.cboVorauskasse._allowedValuesFreiText = Nothing
@@ -2715,7 +2736,7 @@ Partial Class usrCntlFaktAbrechnung
        Me.Panel7.Controls.Add(Me.Button7)
        Me.Panel7.Controls.Add(Me.btnVorauskasseAnzeigen)
        Me.Panel7.Controls.Add(Me.Button5)
-        Me.Panel7.Controls.Add(Me.btn)
+        Me.Panel7.Controls.Add(Me.btnZoll_EUST)
        Me.Panel7.Controls.Add(Me.txtUnterNrRef)
        Me.Panel7.Controls.Add(Me.cboFilialeRef)
        Me.Panel7.Controls.Add(Me.txtAbfertigungsnummerRef)
@@ -2851,15 +2872,15 @@ Partial Class usrCntlFaktAbrechnung
        Me.Button5.Text = "Offerten bearbeiten"
        Me.Button5.UseVisualStyleBackColor = True
        '
-        'btn
+        'btnZoll_EUST
        '
-        Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btn.Location = New System.Drawing.Point(656, 3)
-        Me.btn.Name = "btn"
-        Me.btn.Size = New System.Drawing.Size(165, 23)
-        Me.btn.TabIndex = 10
-        Me.btn.Text = "ZOLL / EUST Daten (F3)"
-        Me.btn.UseVisualStyleBackColor = True
+        Me.btnZoll_EUST.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnZoll_EUST.Location = New System.Drawing.Point(656, 3)
+        Me.btnZoll_EUST.Name = "btnZoll_EUST"
+        Me.btnZoll_EUST.Size = New System.Drawing.Size(165, 23)
+        Me.btnZoll_EUST.TabIndex = 10
+        Me.btnZoll_EUST.Text = "ZOLL / EUST Daten (F3)"
+        Me.btnZoll_EUST.UseVisualStyleBackColor = True
        '
        'txtUnterNrRef
        '
@@ -4035,27 +4056,6 @@ Partial Class usrCntlFaktAbrechnung
        Me.VeragCSToolStripMenuItem.Size = New System.Drawing.Size(122, 22)
        Me.VeragCSToolStripMenuItem.Text = "Verag CS"
        '
-        'cboRgArt
-        '
-        Me.cboRgArt._allowedValuesFreiText = Nothing
-        Me.cboRgArt._allowFreiText = False
-        Me.cboRgArt._value = ""
-        Me.cboRgArt.FormattingEnabled = True
-        Me.cboRgArt.Location = New System.Drawing.Point(478, 127)
-        Me.cboRgArt.Name = "cboRgArt"
-        Me.cboRgArt.Size = New System.Drawing.Size(97, 21)
-        Me.cboRgArt.TabIndex = 246
-        '
-        'Label57
-        '
-        Me.Label57.AutoSize = True
-        Me.Label57.Location = New System.Drawing.Point(431, 130)
-        Me.Label57.Name = "Label57"
-        Me.Label57.Size = New System.Drawing.Size(42, 13)
-        Me.Label57.TabIndex = 245
-        Me.Label57.Text = "RG-Art:"
-        Me.Label57.TextAlign = System.Drawing.ContentAlignment.TopRight
-        '
        'usrCntlFaktAbrechnung
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -4264,7 +4264,7 @@ Partial Class usrCntlFaktAbrechnung
    Friend WithEvents btnNeueUnterNR As Button
    Friend WithEvents cboRgGS As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents cboSammelrechnung As VERAG_PROG_ALLGEMEIN.MyComboBox
-    Friend WithEvents btn As Button
+    Friend WithEvents btnZoll_EUST As Button
    Friend WithEvents Button5 As Button
    Friend WithEvents btnVorauskasseAnzeigen As Button
    Friend WithEvents Button6 As Button
--- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb
+++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb
@@ -3686,7 +3686,7 @@ Nächste_Textzeile_lesen:
            End If

            If keyData = Keys.F3 AndAlso cboSammelrechnung._value = 0 Then
-                btn.PerformClick()
+                btnZoll_EUST.PerformClick()
                Return True
            End If

@@ -3740,7 +3740,7 @@ Nächste_Textzeile_lesen:
        f.Show(Me)
    End Sub

-    Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click
+    Private Sub btn_Click(sender As Object, e As EventArgs) Handles btnZoll_EUST.Click
        Dim bezugsNr = ""
        If RECHNUNG IsNot Nothing Then
            bezugsNr = RECHNUNG.FilialenNr & "/" & RECHNUNG.AbfertigungsNr & ""
@@ -4707,7 +4707,7 @@ Nächste_Textzeile_lesen:

    Private Sub cboSammelrechnung_SelectedValueChanged(sender As Object, e As EventArgs) Handles cboSammelrechnung.SelectedValueChanged

-        btn.Enabled = IIf(cboSammelrechnung._value = 0, True, False)
+        btnZoll_EUST.Enabled = IIf(cboSammelrechnung._value = 0, True, False)

    End Sub

--- a/SDL/kunden/usrCntlIDSPreise.vb
+++ b/SDL/kunden/usrCntlIDSPreise.vb
@@ -203,47 +203,48 @@ Public Class usrCntlIDSPreise

                If edit Then

-                    'Select Case cbxTypes._value
-                    '    Case "L"
-                    '        SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID,  tbl_IDS_Rechenwerte.OutletCountryCode,tbl_IDS_Länder.OutletCountry,  tbl_IDS_Rechenwerte.ProductTypeCode,tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter
-                    '    FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN tbl_IDS_Rechenwerte ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode
-                    '    WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & "
-                    '    ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;"
+                    Select Case cbxTypes._value
+                        Case "L"
+                            SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID,  tbl_IDS_Rechenwerte.OutletCountryCode,tbl_IDS_Länder.OutletCountry,  tbl_IDS_Rechenwerte.ProductTypeCode,tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter
+                        FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN tbl_IDS_Rechenwerte ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode
+                        WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & "
+                        ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;"

-                    '    Case "LS"
-                    '        SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID,tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Stationen.OutletName,tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription,  tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter
-                    '    FROM tbl_IDS_Produkte 
-                    '    INNER JOIN (tbl_IDS_Länder 
-                    '    INNER JOIN (tbl_IDS_Stationen 
-                    '    INNER JOIN tbl_IDS_Rechenwerte ON (tbl_IDS_Stationen.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) AND (tbl_IDS_Stationen.OutletCode = tbl_IDS_Rechenwerte.OutletCode)) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) 
-                    '    ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode
-                    '    WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & "
-                    '    ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;"
+                        Case "LS"
+                            SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID,tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Stationen.OutletName,tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription,  tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter
+                        FROM tbl_IDS_Produkte 
+                        INNER JOIN (tbl_IDS_Länder 
+                        INNER JOIN (tbl_IDS_Stationen 
+                        INNER JOIN tbl_IDS_Rechenwerte ON (tbl_IDS_Stationen.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) AND (tbl_IDS_Stationen.OutletCode = tbl_IDS_Rechenwerte.OutletCode)) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) 
+                        ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode
+                        WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & "
+                        ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;"

-                    '    Case "LK"
-                    '        FUNC.dgvCellToCbo(dgvOfferteDetails, 1, "OutletCountryCode", "OutletCountryCode", " SELECT [OutletCountryCode], OutletCountry FROM [tbl_IDS_Länder] ORDER BY OutletCountry ", "FMZOLL", 150)
-                    '    'FUNC.dgvCellToCbo(dgvOfferteDetails, 5, "BGebLeist.", "BGebLeistungsNr", " SELECT [LeistungsNr], CAST(LeistungsNr as varchar(3)) + ' - ' + [LeistungsBez] as LeistungsBez FROM [Leistungen] ORDER BY [LeistungsNr] ", "FMZOLL", 250)
+                        Case "LK"

-                    '    Case "LSK"
-                    '        SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID,tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Länder.OutletCountry,tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Stationen.OutletName,  tbl_IDS_Rechenwerte.CustomerCode,Adressen.Ordnungsbegriff AS CustomerName, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription,  tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter
-                    '    FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN (Adressen INNER JOIN (tbl_IDS_Stationen INNER JOIN tbl_IDS_Rechenwerte ON (tbl_IDS_Stationen.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) AND (tbl_IDS_Stationen.OutletCode = tbl_IDS_Rechenwerte.OutletCode)) ON Adressen.AdressenNr = tbl_IDS_Rechenwerte.CustomerCode) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode
-                    '    WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Not Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & "
-                    '    ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, Adressen.Ordnungsbegriff, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;"
+                            FUNC.dgvCellToCbo(dgvOfferteDetails, 1, "OutletCountryCode", "OutletCountryCode", " SELECT [OutletCountryCode], OutletCountry FROM [tbl_IDS_Länder] ORDER BY OutletCountry ", "FMZOLL", 150)
+                        'FUNC.dgvCellToCbo(dgvOfferteDetails, 5, "BGebLeist.", "BGebLeistungsNr", " SELECT [LeistungsNr], CAST(LeistungsNr as varchar(3)) + ' - ' + [LeistungsBez] as LeistungsBez FROM [Leistungen] ORDER BY [LeistungsNr] ", "FMZOLL", 250)

-                    '    Case "KRW"
-                    '        SQL_ = "SELECT tbl_IDS_Kategorien_Rechenwerte.ID as ID, tbl_IDS_Kategorien_Rechenwerte.KategorieNr, tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Kategorien_Rechenwerte.Rechenwert, tbl_IDS_Kategorien_Rechenwerte.Zeitstempel, tbl_IDS_Kategorien_Rechenwerte.Sachbearbeiter
-                    '    FROM tbl_IDS_Produkte INNER JOIN tbl_IDS_Kategorien_Rechenwerte ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode
-                    '    WHERE 1 = 1 " & SQL_WHERE & "
-                    '    ORDER BY tbl_IDS_Kategorien_Rechenwerte.KategorieNr, tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode;"
+                        Case "LSK"
+                            SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID,tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Länder.OutletCountry,tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Stationen.OutletName,  tbl_IDS_Rechenwerte.CustomerCode,Adressen.Ordnungsbegriff AS CustomerName, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription,  tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.KategorieNr, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter
+                        FROM tbl_IDS_Produkte INNER JOIN (tbl_IDS_Länder INNER JOIN (Adressen INNER JOIN (tbl_IDS_Stationen INNER JOIN tbl_IDS_Rechenwerte ON (tbl_IDS_Stationen.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) AND (tbl_IDS_Stationen.OutletCode = tbl_IDS_Rechenwerte.OutletCode)) ON Adressen.AdressenNr = tbl_IDS_Rechenwerte.CustomerCode) ON tbl_IDS_Länder.OutletCountryCode = tbl_IDS_Rechenwerte.OutletCountryCode) ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Rechenwerte.ProductTypeCode
+                        WHERE (((tbl_IDS_Rechenwerte.OutletCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.CustomerCode) Is Not Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & "
+                        ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, Adressen.Ordnungsbegriff, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;"
+
+                        Case "KRW"
+                            SQL_ = "SELECT tbl_IDS_Kategorien_Rechenwerte.ID as ID, tbl_IDS_Kategorien_Rechenwerte.KategorieNr, tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Kategorien_Rechenwerte.Rechenwert, tbl_IDS_Kategorien_Rechenwerte.Zeitstempel, tbl_IDS_Kategorien_Rechenwerte.Sachbearbeiter
+                        FROM tbl_IDS_Produkte INNER JOIN tbl_IDS_Kategorien_Rechenwerte ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode
+                        WHERE 1 = 1 " & SQL_WHERE & "
+                        ORDER BY tbl_IDS_Kategorien_Rechenwerte.KategorieNr, tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode;"


-                    '    Case "KOR"
-                    '        SQL_ = "SELECT tbl_IDS_Kunden_ohne_Rabatt.CustomerCode, tbl_IDS_Kunden_ohne_Rabatt.Zeitstempel, tbl_IDS_Kunden_ohne_Rabatt.Sachbearbeiter
-                    '    FROM tbl_IDS_Kunden_ohne_Rabatt
-                    '    WHERE 1 = 1 " & SQL_WHERE & "
-                    '    ORDER BY tbl_IDS_Kunden_ohne_Rabatt.CustomerCode;"
+                        Case "KOR"
+                            SQL_ = "SELECT tbl_IDS_Kunden_ohne_Rabatt.CustomerCode, tbl_IDS_Kunden_ohne_Rabatt.Zeitstempel, tbl_IDS_Kunden_ohne_Rabatt.Sachbearbeiter
+                        FROM tbl_IDS_Kunden_ohne_Rabatt
+                        WHERE 1 = 1 " & SQL_WHERE & "
+                        ORDER BY tbl_IDS_Kunden_ohne_Rabatt.CustomerCode;"

-                    'End Select
+                    End Select
                End If


@@ -514,8 +515,8 @@ Public Class usrCntlIDSPreise
                                Case "LK"

                                    Select Case dgvOfferteDetails.CurrentCell.ColumnIndex
-                                       ' Case 1 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvOfferteDetails.CurrentCell.Value) Then currentIDS.OutletCode = CInt(dgvOfferteDetails.CurrentCell.Value)
-                                       ' Case 2 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso dgvOfferteDetails.CurrentCell.Value <> "" Then dgvOfferteDetails.CurrentRow.Cells("").Value =
+                                        Case 1 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvOfferteDetails.CurrentCell.Value) Then currentIDS.OutletCode = CInt(dgvOfferteDetails.CurrentCell.Value)
+                                        'Case 2 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso dgvOfferteDetails.CurrentCell.Value <> "" Then dgvOfferteDetails.CurrentRow.Cells("").Value =
                                        Case 5 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvOfferteDetails.CurrentCell.Value) Then currentIDS.Rechenwert = CDbl(dgvOfferteDetails.CurrentCell.Value)
                                        Case 6 : If dgvOfferteDetails.CurrentCell.Value IsNot Nothing AndAlso dgvOfferteDetails.CurrentCell.Value <> "" AndAlso (dgvOfferteDetails.CurrentCell.Value = "R" Or dgvOfferteDetails.CurrentCell.Value = "P") Then currentIDS.Kz = dgvOfferteDetails.CurrentCell.Value.ToString
                                    End Select
@@ -762,7 +763,7 @@ Public Class usrCntlIDSPreise

        Else

-            'currentIDS = New cIDSDieselpreisRW()
+            currentIDS = New cIDSDieselpreisRW()

        End If