merge

SDL/Creditsafe/usrcntlCreditsafe.vb

@@ -1,8 +1,4 @@
-
-Imports System.Runtime.Serialization
-Imports DocumentFormat.OpenXml.Drawing.Diagrams
-Imports itextsharp.text.pdf
-Imports VERAG_PROG_ALLGEMEIN
+Imports VERAG_PROG_ALLGEMEIN
 
 
 Public Class usrcntlCreditsafe

SDL/Creditsafe/usrcntlVAT_ATEZ.Designer.vb

@@ -39,6 +39,8 @@ Partial Class usrcntlVAT_ATEZ
         Me.dgvVAT = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.cboLand = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.lblPagecount = New System.Windows.Forms.Label()
+        Me.CheckVatService1 = New SDL.eu.europa.ec.checkVatService()
+        Me.bcxOnlySetPrice = New System.Windows.Forms.CheckBox()
         CType(Me.dgvVAT, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
@@ -47,7 +49,7 @@ Partial Class usrcntlVAT_ATEZ
         Me.lblUID.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.lblUID.AutoSize = True
         Me.lblUID.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
-        Me.lblUID.Location = New System.Drawing.Point(1129, 10)
+        Me.lblUID.Location = New System.Drawing.Point(1239, 10)
         Me.lblUID.Name = "lblUID"
         Me.lblUID.Size = New System.Drawing.Size(40, 13)
         Me.lblUID.TabIndex = 1
@@ -58,7 +60,7 @@ Partial Class usrcntlVAT_ATEZ
         '
         Me.txtUID.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.txtUID.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
-        Me.txtUID.Location = New System.Drawing.Point(1132, 26)
+        Me.txtUID.Location = New System.Drawing.Point(1242, 26)
         Me.txtUID.Name = "txtUID"
         Me.txtUID.Size = New System.Drawing.Size(134, 23)
         Me.txtUID.TabIndex = 3
@@ -71,7 +73,7 @@ Partial Class usrcntlVAT_ATEZ
         Me.txtFirma.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
         Me.txtFirma.Location = New System.Drawing.Point(73, 27)
         Me.txtFirma.Name = "txtFirma"
-        Me.txtFirma.Size = New System.Drawing.Size(633, 23)
+        Me.txtFirma.Size = New System.Drawing.Size(743, 23)
         Me.txtFirma.TabIndex = 1
         Me.txtFirma.Visible = False
         '
@@ -112,7 +114,7 @@ Partial Class usrcntlVAT_ATEZ
         Me.btnUebernehmen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.btnUebernehmen.DialogResult = System.Windows.Forms.DialogResult.OK
         Me.btnUebernehmen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnUebernehmen.Location = New System.Drawing.Point(1244, 359)
+        Me.btnUebernehmen.Location = New System.Drawing.Point(1354, 359)
         Me.btnUebernehmen.Name = "btnUebernehmen"
         Me.btnUebernehmen.Size = New System.Drawing.Size(136, 41)
         Me.btnUebernehmen.TabIndex = 9
@@ -123,7 +125,7 @@ Partial Class usrcntlVAT_ATEZ
         '
         Me.txtStrasse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.txtStrasse.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
-        Me.txtStrasse.Location = New System.Drawing.Point(712, 27)
+        Me.txtStrasse.Location = New System.Drawing.Point(822, 27)
         Me.txtStrasse.Name = "txtStrasse"
         Me.txtStrasse.Size = New System.Drawing.Size(163, 23)
         Me.txtStrasse.TabIndex = 101
@@ -134,7 +136,7 @@ Partial Class usrcntlVAT_ATEZ
         Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Label1.AutoSize = True
         Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
-        Me.Label1.Location = New System.Drawing.Point(709, 11)
+        Me.Label1.Location = New System.Drawing.Point(819, 11)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(42, 13)
         Me.Label1.TabIndex = 100
@@ -145,7 +147,7 @@ Partial Class usrcntlVAT_ATEZ
         '
         Me.txtPLZ.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.txtPLZ.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
-        Me.txtPLZ.Location = New System.Drawing.Point(1042, 26)
+        Me.txtPLZ.Location = New System.Drawing.Point(1152, 26)
         Me.txtPLZ.Name = "txtPLZ"
         Me.txtPLZ.Size = New System.Drawing.Size(84, 23)
         Me.txtPLZ.TabIndex = 103
@@ -156,7 +158,7 @@ Partial Class usrcntlVAT_ATEZ
         Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Label2.AutoSize = True
         Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
-        Me.Label2.Location = New System.Drawing.Point(1039, 10)
+        Me.Label2.Location = New System.Drawing.Point(1149, 10)
         Me.Label2.Name = "Label2"
         Me.Label2.Size = New System.Drawing.Size(27, 13)
         Me.Label2.TabIndex = 102
@@ -167,7 +169,7 @@ Partial Class usrcntlVAT_ATEZ
         '
         Me.txtOrt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.txtOrt.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
-        Me.txtOrt.Location = New System.Drawing.Point(881, 26)
+        Me.txtOrt.Location = New System.Drawing.Point(991, 26)
         Me.txtOrt.Name = "txtOrt"
         Me.txtOrt.Size = New System.Drawing.Size(155, 23)
         Me.txtOrt.TabIndex = 105
@@ -178,7 +180,7 @@ Partial Class usrcntlVAT_ATEZ
         Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Label3.AutoSize = True
         Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
-        Me.Label3.Location = New System.Drawing.Point(878, 10)
+        Me.Label3.Location = New System.Drawing.Point(988, 10)
         Me.Label3.Name = "Label3"
         Me.Label3.Size = New System.Drawing.Size(21, 13)
         Me.Label3.TabIndex = 104
@@ -201,7 +203,7 @@ Partial Class usrcntlVAT_ATEZ
         Me.dgvVAT.ReadOnly = True
         Me.dgvVAT.RowHeadersVisible = False
         Me.dgvVAT.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvVAT.Size = New System.Drawing.Size(1368, 297)
+        Me.dgvVAT.Size = New System.Drawing.Size(1478, 297)
         Me.dgvVAT.TabIndex = 7
         '
         'cboLand
@@ -223,18 +225,36 @@ Partial Class usrcntlVAT_ATEZ
         Me.lblPagecount.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.lblPagecount.AutoSize = True
         Me.lblPagecount.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
-        Me.lblPagecount.Location = New System.Drawing.Point(1268, 10)
+        Me.lblPagecount.Location = New System.Drawing.Point(1378, 10)
         Me.lblPagecount.Name = "lblPagecount"
         Me.lblPagecount.Size = New System.Drawing.Size(77, 13)
         Me.lblPagecount.TabIndex = 106
         Me.lblPagecount.Text = "Gesamtseiten: "
         '
+        'CheckVatService1
+        '
+        Me.CheckVatService1.Credentials = Nothing
+        Me.CheckVatService1.Url = "http://ec.europa.eu/taxation_customs/vies/services/checkVatService"
+        Me.CheckVatService1.UseDefaultCredentials = False
+        '
+        'bcxOnlySetPrice
+        '
+        Me.bcxOnlySetPrice.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.bcxOnlySetPrice.AutoSize = True
+        Me.bcxOnlySetPrice.Location = New System.Drawing.Point(1214, 372)
+        Me.bcxOnlySetPrice.Name = "bcxOnlySetPrice"
+        Me.bcxOnlySetPrice.Size = New System.Drawing.Size(115, 17)
+        Me.bcxOnlySetPrice.TabIndex = 107
+        Me.bcxOnlySetPrice.Text = "nur Beträge setzen"
+        Me.bcxOnlySetPrice.UseVisualStyleBackColor = True
+        '
         'usrcntlVAT_ATEZ
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.AutoScroll = True
         Me.BackColor = System.Drawing.Color.White
+        Me.Controls.Add(Me.bcxOnlySetPrice)
         Me.Controls.Add(Me.lblPagecount)
         Me.Controls.Add(Me.txtOrt)
         Me.Controls.Add(Me.Label3)
@@ -252,7 +272,7 @@ Partial Class usrcntlVAT_ATEZ
         Me.Controls.Add(Me.txtUID)
         Me.Controls.Add(Me.lblUID)
         Me.Name = "usrcntlVAT_ATEZ"
-        Me.Size = New System.Drawing.Size(1398, 403)
+        Me.Size = New System.Drawing.Size(1508, 403)
         CType(Me.dgvVAT, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
@@ -274,4 +294,6 @@ Partial Class usrcntlVAT_ATEZ
     Friend WithEvents txtOrt As TextBox
     Friend WithEvents Label3 As Label
     Friend WithEvents lblPagecount As Label
+    Friend WithEvents CheckVatService1 As eu.europa.ec.checkVatService
+    Friend WithEvents bcxOnlySetPrice As CheckBox
 End Class

SDL/Creditsafe/usrcntlVAT_ATEZ.resx

@@ -117,4 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="CheckVatService1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>

SDL/Creditsafe/usrcntlVAT_ATEZ.vb

@@ -9,6 +9,7 @@ Public Class usrcntlVAT_ATEZ
     Public va As VAT
     Dim uidDefault As String
     Public createCostumer As Boolean = False
+    Public setAmountOnly As Boolean = False
 
     Sub New()
 
@@ -17,8 +18,6 @@ Public Class usrcntlVAT_ATEZ
     End Sub
 
 
-
-
     Sub New(_UID As String, _name As String, _land As String, _PLZ As String, _Strasse As String, _Ort As String)
 
         InitializeComponent()
@@ -35,8 +34,6 @@ Public Class usrcntlVAT_ATEZ
 
     Private Sub init()
 
-
-
         'cboLand.changeItem(land)
         'initDataTable()
         btnUebernehmen.Enabled = False
@@ -56,6 +53,7 @@ Public Class usrcntlVAT_ATEZ
 
         End If
 
+        bcxOnlySetPrice.Checked = setAmountOnly
 
 
     End Sub
@@ -70,6 +68,8 @@ Public Class usrcntlVAT_ATEZ
 
             Dim pageCpunterCheck = 0
 
+
+
             lblPagecount.Text &= dgvVAT.Rows(0).Cells("total_pages").Value
 
             With dgvVAT

SDL/Fakturierung/cAutomailversand.vb

@@ -1,4 +1,6 @@
-Imports Microsoft.Office.Interop
+Imports System.IO
+Imports com.sun.tools.doclets.internal.toolkit.util
+Imports Microsoft.Office.Interop
 Imports VERAG_PROG_ALLGEMEIN
 
 Public Class cAutomailversand
@@ -148,7 +150,7 @@ Public Class cAutomailversand
 
             Next
         Catch ex As System.Exception
-            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL,,,,,, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "d.breimaier@verag.ag", "mmdabrechnung@verag.ag"))
 
         End Try
     End Sub
@@ -256,6 +258,9 @@ Public Class cAutomailversand
         ATTACHMENTS.Clear()
         'Rechnungsanhänge anfügen
 
+        Dim zielPfadZusammenfassung = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("Attachment", ".pdf",, False, "Zusammenfassung")
+
+
         For Each l In listPDFs
 
             ATTACHMENTS.Add(New cFakt_MailATTach(l, ""))
@@ -263,13 +268,42 @@ Public Class cAutomailversand
         Next
         '-----------------------------------------------------------------
         If SR_DT IsNot Nothing AndAlso SR_DT.Rows.Count > 0 Then
-            For Each r In SR_DT.Rows
+
+            Dim myList As New List(Of String)
+
+            For Each r As DataRow In SR_DT.Rows
                 Dim RG_ANH = VERAG_PROG_ALLGEMEIN.cRechnungsausgang.LOAD_ANHAENGE_LIST(r("RK_ID"))
                 If RG_ANH IsNot Nothing Then
+
+                    Dim FilialenNr = IIf(Not IsDBNull(r.Item("FilialenNr")) AndAlso IsNumeric(r.Item("FilialenNr")), CInt(r.Item("FilialenNr")), 0)
+
+                    If FilialenNr = 4817 Then 'diese immer zusammenfassen!
+
+                        For Each ANH In RG_ANH
+
+                            Dim path = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(ANH.dsId)
+                            If Not (path.ToString.Contains("Sammelrechnung") OrElse path.ToString.Contains("Maut") OrElse path.ToString.Contains("POS")) Then
+                                myList.Add(path)
+                            Else
+                                ATTACHMENTS.Add(New cFakt_MailATTach(path, ANH.Bezeichnung))
+                            End If
+
+                        Next
+
+                        If FormularManagerNEU.MergePdfFiles(myList, zielPfadZusammenfassung) Then
+                            Dim fileInfo As New FileInfo(zielPfadZusammenfassung)
+                            ATTACHMENTS.Add(New cFakt_MailATTach(zielPfadZusammenfassung, fileInfo.Name))
+                        End If
+
+                    Else
                         For Each ANH In RG_ANH
                             ATTACHMENTS.Add(New cFakt_MailATTach(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(ANH.dsId), ANH.Bezeichnung))
                         Next
                     End If
+
+
+
+                End If
             Next
         End If
 
@@ -350,7 +384,7 @@ Public Class cAutomailversand
             Next
 
 
-            If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, EMail_subject, EMail_HTML, "mmdabrechnung@verag.ag", False, False, EMails_CC, EMails_BCC, attachList) Then
+            If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, EMail_subject, EMail_HTML, "mmdabrechnung@verag.ag", False, False, EMails_CC, EMails_BCC, attachList,, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "d.breimaier@verag.ag", "mmdabrechnung@verag.ag")) Then
                 API.UPDTAE_OK()
                 mailcreated = True
             Else

SDL/Fakturierung/cFakturierung.vb

@@ -2114,6 +2114,13 @@ Public Class cFakturierung
                     desc.Type = InvoiceType.CreditNote
             End Select
 
+
+            'Die „Berechnung BT-10“ bezieht sich auf das Feld BT-10 „Buyer reference“ (Käuferreferenz) in der elektronischen Rechnung, speziell im XRechnung-Standard. Dieses Feld dient zur Angabe der Leitweg-ID
+            'für öffentliche Auftraggeber oder anderer Referenzinformationen für interne Zuordnungsprozesse.
+            'Die Leitweg-ID ist in Deutschland eine Pflichtangabe für elektronische Rechnungen an die Bundesverwaltung und muss vom Rechnungssteller vom Auftraggeber erhalten werden. 
+
+            desc.ReferenceOrderNo = IIf(RECHNUNG.KdAuftragsNr Is Nothing, "", RECHNUNG.KdAuftragsNr)
+
             If RECHNUNG.Besonderheiten IsNot Nothing Then desc.AddNote(RECHNUNG.Besonderheiten.ToString, SubjectCodes.AAI)
             If RECHNUNG.Text IsNot Nothing Then desc.AddNote(RECHNUNG.Text.ToString, SubjectCodes.AAI)
             desc.AddNote("Es bestehen Rabatt- und Bonusvereinbarungen.", SubjectCodes.AAK)
@@ -2319,6 +2326,17 @@ Public Class cFakturierung
             End Select
 
 
+            'Die „Berechnung BT-10“ bezieht sich auf das Feld BT-10 „Buyer reference“ (Käuferreferenz) in der elektronischen Rechnung, speziell im XRechnung-Standard. Dieses Feld dient zur Angabe der Leitweg-ID
+            'für öffentliche Auftraggeber oder anderer Referenzinformationen für interne Zuordnungsprozesse.
+            'Die Leitweg-ID ist in Deutschland eine Pflichtangabe für elektronische Rechnungen an die Bundesverwaltung und muss vom Rechnungssteller vom Auftraggeber erhalten werden. 
+
+            Dim BestellungsRefNr As String = ""
+            If ROW("KdAuftragsNr") IsNot DBNull.Value AndAlso ROW("KdAuftragsNr") <> "" Then
+                desc.ReferenceOrderNo = ROW("KdAuftragsNr")
+            Else
+                desc.ReferenceOrderNo = " "
+            End If
+
             Dim Rechnugnsname2 As String = ""
             If ROW("RechnungsName 2") IsNot DBNull.Value AndAlso ROW("RechnungsName 2") <> "" Then
                 Rechnugnsname2 = ROW("RechnungsName 2")
@@ -2394,7 +2412,6 @@ Public Class cFakturierung
 
             ' Optionally, to support Peppol-----------------------------
 
-
             If RE_UID <> "" Then
                 desc.AddBuyerTaxRegistration(RE_UID, TaxRegistrationSchemeID.VA)
                 If vatBuyer Then
@@ -5183,6 +5200,8 @@ Public Class cFakturierung
             Dim RG As New VERAG_PROG_ALLGEMEIN.cRechnungsausgang(r("RK_ID"))
             If RG IsNot Nothing Then
                 RG.LOAD_ANHAENGE()
+                Dim PDFList As New List(Of String)
+                Dim mergedPDFList = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("Attachment_" & RG.RechnungsNr & ".pdf", "pdf",, False, "Zusammenfassung")
                 For Each RG_AH In RG.ANHAENGE.Where(Function(x) x.Bezeichnung.ToLower.EndsWith(extTyp))
 
                     Select Case extTyp
@@ -5195,6 +5214,18 @@ Public Class cFakturierung
                                 End If
                             Else
 
+
+                                If RG.Firma_ID = 19 AndAlso RG.Sammelrechnung = 6 AndAlso RG.FilialenNr = 4817 Then 'in diesem Fall PDFs zusammenfassen!
+
+                                    Dim Path = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(RG_AH.dsId)
+                                    If Not Path.ToString.Contains("Sammelrechnung") Then
+                                        PDFList.Add(Path)
+                                    Else
+                                        listAnh.Add(Path)
+                                    End If
+
+                                Else
+
                                     If RG_AH.Bezeichnung.ToUpper.Contains("MAUT") Or RG_AH.Bezeichnung.ToUpper.Contains("DIESEL") Or RG_AH.Bezeichnung.ToUpper.Contains("INVOICE") Then
                                         Dim Path = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(RG_AH.dsId)
                                         If Not listAnh.Contains(Path) Then
@@ -5207,6 +5238,8 @@ Public Class cFakturierung
                                     End If
                                 End If
 
+                            End If
+
 
                         Case "csv"
 
@@ -5224,7 +5257,14 @@ Public Class cFakturierung
 
 
                 Next
+
+                If mergedPDFList.Count > 0 Then
+                    If FormularManagerNEU.MergePdfFiles(PDFList, mergedPDFList) Then
+                        listAnh.Add(mergedPDFList)
                     End If
+                End If
+            End If
+
         Next
 
 

SDL/Fakturierung/frmAbrechnungsMaske.vb

@@ -1,4 +1,5 @@
 Imports System.IO
+Imports com.sun.org.apache.xalan.internal.xsltc.compiler.util
 Imports Microsoft.Office.Interop
 
 Public Class frmAbrechnungsMaske
@@ -201,7 +202,7 @@ Public Class frmAbrechnungsMaske
 
                 ' sqlstr &= " SELECT FilialenNr, AbfertigungsNr, UnterNr, Firma_ID, Status, Sammelrechnung, Sachbearbeiter, SteuerpflichtigerGesamtbetrag, SteuerfreierGesamtbetrag, RechnungsNr, RechnungsDatum, DruckDatumZeit, Buchungsjahr, RK_ID"
                 sqlstr &= " SELECT " & reNrSQL & " FilialenNr, AbfertigungsNr, cast(FilialenNr as varchar) + ' ' + cast(AbfertigungsNr  as varchar) as PosNr,UnterNr, Firma_ID,Rechnungsausgang.Sammelrechnung as Art, [RechnungsName 1] as Rechnungsempfänger, (isnull(SteuerpflichtigerGesamtbetrag,0) + isnull(SteuerfreierGesamtbetrag,0)) as Betrag, RK_ID,RechnungsLandKz,RechnungsKundenNr"
-                sqlstr &= ",(CASE WHEN Rechnungsdruck =0 THEN 'POST' WHEN Rechnungsdruck=1 THEN 'FAX' WHEN Rechnungsdruck=2 THEN 'E-MAIL' WHEN Rechnungsdruck=5 THEN 'MAIL+KOPIE' ELSE '-' END) as Rechnungsdruck "
+                sqlstr &= ",(CASE WHEN Rechnungsdruck =0 THEN 'POST' WHEN Rechnungsdruck=1 THEN 'FAX' WHEN Rechnungsdruck=2 THEN 'E-MAIL' WHEN Rechnungsdruck=5 THEN 'MAIL+KOPIE' ELSE '-' END) as Rechnungsdruck, isnull(BelegartenKz, '') as BelegartenKz "
                 sqlstr &= " FROM Rechnungsausgang INNER JOIN Adressen ON AdressenNr=Rechnungsausgang.RechnungsKundenNr"
                 sqlstr &= " WHERE 1=1 "
 
@@ -219,6 +220,7 @@ Public Class frmAbrechnungsMaske
                 .Columns("Firma_ID").Visible = False
                 .Columns("RechnungsLandKz").Visible = False
                 .Columns("RechnungsKundenNr").Visible = False
+                .Columns("BelegartenKz").Visible = False
                 .Columns("PosNr").HeaderText = "Pos-Nr."
 
                 If cbx.Checked Then .Columns("ReNr").HeaderText = "ReNr."
@@ -239,6 +241,22 @@ Public Class frmAbrechnungsMaske
                 .Columns("Betrag").DefaultCellStyle.Format = "C2"
             End If
 
+            If cboFirma._value <> "" AndAlso cboFirma._value = "19" Then
+
+                For Each r In .Rows
+
+                    If r.Cells("Betrag").Value IsNot DBNull.Value AndAlso IsNumeric(r.Cells("Betrag").Value) Then
+                        Select Case r.Cells("BelegartenKz").Value.ToString
+                            Case "AR" : If r.Cells("Betrag").Value < 0 Then r.DefaultCellStyle.ForeColor = Color.Red
+                            Case "AG" : If r.Cells("Betrag").Value > 0 Then r.DefaultCellStyle.ForeColor = Color.Red
+                        End Select
+
+                    End If
+
+                Next
+
+            End If
+
         End With
     End Sub
 

SDL/Fakturierung/frmFaktSammelRgDrucken.vb

@@ -679,7 +679,7 @@ Public Class frmFaktSammelRgDrucken
 
         If MyDatagridview1.SelectedRows.Count > 0 Then
 
-            If Not vbYes = MsgBox("Möchten Sie für alle markieren Rechnungen den automatischen Emailversand JETZT versenden?" & vbNewLine & "Ansonten werden sie im Nachtlauf automatisch versendet!", vbYesNoCancel) Then Exit Sub
+            If Not vbYes = MsgBox("Möchten Sie für alle markieren Rechnungen den automatischen Emailversand JETZT durchführen?" & vbNewLine & "Ansonten werden sie im Nachtlauf automatisch versendet!", vbYesNoCancel) Then Exit Sub
 
             Dim fun As New cAutomailversand
             For Each r In MyDatagridview1.SelectedRows

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

SDL/Fakturierung/usrCntlFaktAbrechnung.vb

@@ -2765,7 +2765,7 @@ Public Class usrCntlFaktAbrechnung
                 Else
                     curBGebBetrag = curBGebMinBetrag            'Mindestbetrag verwenden
                     summeFremdBearb += If(OFFERT_FREMD, curBGebErrBetrag, 0)
-                    summeRMCBearb += If(OFFERT_FREMD, curBGebErrBetrag, 0)
+                    summeRMCBearb += If(OFFERT_RMC, curBGebErrBetrag, 0)
                     minBetragRMCUsed = IIf(OFFERT_FREMD OrElse OFFERT_RMC, True, False)
                 End If
 
@@ -2805,6 +2805,7 @@ Public Class usrCntlFaktAbrechnung
                                         preisInital = (summeRMCBearb + summeFremdBearb) * IIf(RECHNUNG.Vorzeichen = "-", -1, 1)
                                         row.Cells("Preis").Value = preisInital
                                         Exit For
+
                                     Else
                                         row.Cells("Preis").Value = preisInital
                                         Exit For
@@ -2843,7 +2844,43 @@ Public Class usrCntlFaktAbrechnung
                                 If (sumOffertRMC + sumOffertFremd) * IIf(RECHNUNG.Vorzeichen = "-", -1, 1) <> POS.Preis Then
                                     For Each row As DataGridViewRow In dgvOfferteDetailsUebersicht.Rows
                                         If row.Cells("LeistungsNr").Value = BGebLeistungsNr And row.Cells("BerechnungsartNr").Value = 9 Then
-                                            If row.Cells("Preis").Value <> (sumOffertRMC + sumOffertFremd) * IIf(RECHNUNG.Vorzeichen = "-", -1, 1) Then
+
+                                            Dim preisecChanged = row.Cells("Preis").Value
+
+                                            If preisecChanged <> (sumOffertRMC + sumOffertFremd) * IIf(RECHNUNG.Vorzeichen = "-", -1, 1) Then
+
+                                                '    If row.Cells("Preis").Value = curBGebBetrag * 2 AndAlso minBetragRMCUsed Then 'wenn RMCPOS und MIND-BERTAG 2x verrechnet -> nur 1x berechnen v
+
+                                                '        row.Cells("Preis").Value = preisecChanged / 2
+                                                '        POS.Anzahl = 1
+                                                '        initSteuerbetraege(RECHNUNG, POS)
+                                                '        POSChanged = True
+                                                '        Exit For
+
+                                                '    ElseIf preisecChanged <> curBGebBetrag * 2 AndAlso (summeRMCBearb + summeFremdBearb) <> preisecChanged AndAlso (minBetragRMCUsed OrElse isRMC OrElse isFREMD) AndAlso (summeRMCBearb + summeFremdBearb) > curBGebMinBetrag Then 'wenn RMCPOS und Summe der berechneten Bearb > Mindestbetrag --> berechnetBearb verrechnet!
+
+                                                '        preisecChanged = (summeRMCBearb + summeFremdBearb) * IIf(RECHNUNG.Vorzeichen = "-", -1, 1)
+                                                '        row.Cells("Preis").Value = preisecChanged
+                                                '        POS.Anzahl = 1
+                                                '        initSteuerbetraege(RECHNUNG, POS)
+                                                '        POSChanged = True
+
+                                                '        If FremdUndRMC AndAlso summeRMCBearb > 0 AndAlso summeFremdBearb > 0 Then Exit For
+
+                                                '    ElseIf sumOffertRMC + sumOffertFremd > curBGebMinBetrag Then
+
+                                                '        row.Cells("Preis").Value = (sumOffertRMC + sumOffertFremd) * IIf(RECHNUNG.Vorzeichen = "-", -1, 1)
+                                                '        POS.Anzahl = 1
+                                                '        initSteuerbetraege(RECHNUNG, POS)
+                                                '        POSChanged = True
+                                                '        'Exit For
+
+                                                '    End If
+
+                                                'End if
+
+
+
                                                 row.Cells("Preis").Value = (sumOffertRMC + sumOffertFremd) * IIf(RECHNUNG.Vorzeichen = "-", -1, 1)
                                                 POS.Anzahl = 1
                                                 initSteuerbetraege(RECHNUNG, POS)
@@ -2853,6 +2890,7 @@ Public Class usrCntlFaktAbrechnung
                                         End If
 
 
+
                                     Next
 
 
@@ -3686,7 +3724,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 +3778,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 +4745,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
 

SDL/Formulare/KDFormulare/frmFormulare.vb

@@ -6678,21 +6678,32 @@ Public Class FormularManagerNEU
             Dim reader As PdfReader = Nothing
 
 
+
             reader.unethicalreading = True ' Damit geschützte PDFs gelesen werden können... ' PdfReader not opened with owner password
 
+
+            Dim hasPages As Boolean = False
+
             Try
-                document.Open()
+
                 For Each file As String In fileNames
+                    hasPages = False
                     If file.ToUpper.EndsWith(".PDF") Then
                         reader = New PdfReader(file)
 
+                        If reader.NumberOfPages > 0 Then
+                            document.Open()
                             addAttachmentToCurrentPDF(reader, pdf)
 
                             pdf.AddDocument(reader)
                             reader.Close()
+                            hasPages = True
+                        End If
 
                     End If
                 Next
+
+
             Catch __unusedException1__ As Exception
                 MsgBox(__unusedException1__.Message & __unusedException1__.StackTrace)
                 merged = False
@@ -6702,8 +6713,13 @@ Public Class FormularManagerNEU
 
             Finally
                 If document IsNot Nothing Then
+                    If hasPages Then
                         document.Close()
+                    Else
+                        document.Dispose()
                     End If
+                End If
+
             End Try
         End Using
 

SDL/My Project/AssemblyInfo.vb

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

SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb

@@ -2833,7 +2833,7 @@ Public Class usrCntlSpeditionsBuchSuche
                               ,Absender
 	                          ,Rechnungsbetrag Betrag 
   	                          ,BelegNr
-                              ,[FilialenNr],[AbfertigungsNr],Speditionsbuch.Abfertigungsart,Abfertigungsbezeichnung,Speditionsbuch.Zollsystem_Land
+                              ,[FilialenNr],[AbfertigungsNr],Speditionsbuch.Abfertigungsart,Abfertigungsbezeichnung,Speditionsbuch.Zollsystem_Land, Speditionsbuch.[LKW Kennzeichen]
                           FROM Speditionsbuch INNER JOIN [Abfertigungsarten] ON Speditionsbuch.Abfertigungsart=Abfertigungsarten.Abfertigungsart
                           where EmpfängerKundenNr IN (" & kdnrsrch & ") and VermittlerKundenNr IN (" & kdnrsrch & ") and Abfertigungsdatum BETWEEN '" & txtAbfertDat.Text & "' AND '" & txtAbfertDatBis.Text & "' And Speditionsbuch.Abfertigungsart IN (1,29,38)", "FMZOLL")
 
@@ -3012,6 +3012,71 @@ Public Class usrCntlSpeditionsBuchSuche
                         Datei = .Workbooks.Open(Path) 'Anpassen
                         Blatt = Datei.Worksheets(1) 'Anpassen
 
+
+                        If KUNDE.KundenNr = 902452 Then 'KUNDE WILL WIEDER EXZTAWURST!!!!!!!
+
+                            Blatt.Range("H1").Value = txtAbfertDat.Text & "-" & txtAbfertDatBis.Text
+
+                            Blatt.Range("A" & 2).Value = "Nr"
+                            Blatt.Range("B" & 2).Value = "Datum"
+                            Blatt.Range("C" & 2).Value = "MRN-Nr."
+                            Blatt.Range("D" & 2).Value = "LKW/Cont."
+                            Blatt.Range("E" & 2).Value = "Rg.-Nr."
+                            Blatt.Range("F" & 2).Value = "EUST"
+                            Blatt.Range("G" & 2).Value = "Anzahl Pos."
+                            Blatt.Range("H" & 2).Value = ""
+                            Blatt.Range("I" & 2).Value = ""
+                            Blatt.Range("J" & 2).Value = ""
+                            Blatt.Range("K" & 2).Value = ""
+                            Blatt.Range("L" & 2).Value = ""
+
+                            Dim cnt = 3
+                            For Each r In dt.Rows
+                                Blatt.Range("A" & cnt).Value = cnt - 2
+                                Blatt.Range("B" & cnt).Value = r("Abfertigungsdatum")
+                                Blatt.Range("C" & cnt).Value = r("BelegNr")
+                                Blatt.Range("D" & cnt).Value = r("LKW Kennzeichen")
+
+                                Dim ZOLLANMELDUNG As New DAKOSY_Worker.cZollsysteme_Aktenbeschriftung
+                                Try
+                                    Dim zS = If(r("Zollsystem_Land") IsNot DBNull.Value, r("Zollsystem_Land").ToString(), "")
+                                    If ZOLLANMELDUNG.getDataByBezugsnummer(r("FilialenNr") & "/" & r("AbfertigungsNr"), r("Abfertigungsart"), "", False, zS) Then
+
+                                        If ZOLLANMELDUNG.Handelsrechnung <> "" Then
+
+                                            Dim RechnungsString = ZOLLANMELDUNG.Handelsrechnung.Replace(", ", "," & vbNewLine)
+                                            Dim rows() As String = RechnungsString.Split(New Char() {" "c}, StringSplitOptions.RemoveEmptyEntries)
+
+                                            For Each row As String In rows
+
+                                                If IsDate(row) AndAlso row.Length = 10 Then
+                                                    RechnungsString = RechnungsString.Replace(row.ToString, "")
+                                                End If
+
+                                            Next
+
+                                            Blatt.Range("E" & cnt).Value = RechnungsString.Trim
+                                        End If
+
+
+                                        Blatt.Range("F" & cnt).Value = ZOLLANMELDUNG.ABGABEN_EUST
+                                        Blatt.Range("G" & cnt).Value = ZOLLANMELDUNG.ANZ_POS
+                                        If If(ZOLLANMELDUNG.ATCMRN, "") <> "" Then
+                                                Blatt.Range("C" & cnt).Value = ZOLLANMELDUNG.ATCMRN
+                                            End If
+                                        End If
+
+                                Catch ex As Exception
+                                    MsgBox(ex.Message & ex.StackTrace)
+                                End Try
+                                lblKdAusFortschritt.Text = (cnt - 2) & "/" & dt.Rows.Count
+                                Me.Refresh()
+                                cnt += 1
+                            Next
+
+
+                        Else
+
                             Blatt.Range("I1").Value = txtAbfertDat.Text & "-" & txtAbfertDatBis.Text
 
                             Dim cnt = 3
@@ -3024,6 +3089,7 @@ Public Class usrCntlSpeditionsBuchSuche
                                 Blatt.Range("E" & cnt).Value = r("Absender")
                                 Blatt.Range("F" & cnt).Value = "" 'r("Betrag")
                                 Blatt.Range("H" & cnt).Value = r("BelegNr")
+                                Blatt.Range("L" & cnt).Value = r("LKW Kennzeichen")
 
                                 Dim ZOLLANMELDUNG As New DAKOSY_Worker.cZollsysteme_Aktenbeschriftung
                                 Try
@@ -3032,7 +3098,8 @@ Public Class usrCntlSpeditionsBuchSuche
                                         Blatt.Range("F" & cnt).Value = ZOLLANMELDUNG.RechnungspreisohneWahrung
                                         Blatt.Range("G" & cnt).Value = ZOLLANMELDUNG.Handelsrechnung.Replace(", ", "," & vbNewLine)
                                         Blatt.Range("I" & cnt).Value = ZOLLANMELDUNG.ABGABEN_ZOLL
-                                    Blatt.Range("J" & cnt).Value = ZOLLANMELDUNG.ANZ_POS
+                                        Blatt.Range("J" & cnt).Value = ZOLLANMELDUNG.ABGABEN_EUST
+                                        Blatt.Range("K" & cnt).Value = ZOLLANMELDUNG.ANZ_POS
 
                                         If If(ZOLLANMELDUNG.ATCMRN, "") <> "" Then
                                             Blatt.Range("H" & cnt).Value = ZOLLANMELDUNG.ATCMRN
@@ -3046,6 +3113,9 @@ Public Class usrCntlSpeditionsBuchSuche
                                 Me.Refresh()
                                 cnt += 1
                             Next
+
+                        End If
+
                         Datei.Save
 
                         If False Then

SDL/USTV/frmMDM_USTVAntrag.vb

@@ -1026,7 +1026,7 @@ Public Class frmMDM_USTVAntrag
                     USTV_POS.UStVPo_ReDat = r.Item("rmc_reDatum")
                     USTV_POS.UStVPo_ReNr = r.Item("rmc_reNr").ToString
                     USTV_POS.UStVPo_SchnittstellenNr = bytSchnittstellenNr
-                    'USTV_POS.UStVPo_daId = r.Item("rmc_daId")
+                    USTV_POS.UStVPo_daId = r.Item("rmc_daId")
                     If IsNumeric(USTV_POS.UStVPo_daId) AndAlso USTV_POS.UStVPo_daId > 0 Then
                         USTV_POS.UStVPo_daId_loeschbar = False
                     Else
@@ -1039,20 +1039,27 @@ Public Class frmMDM_USTVAntrag
                         USTV_POS.UStVPo_Schnittstelle = True
                         USTV_POS.UStVPo_Leistungsbezeichnung = "Diesel"
 
-                        Dim leistender As New cUStVLeistender("RMC Service GmbH" & " " & Antrag_LandKz, Antrag_LandKz)
+                        Dim leist As String = "RMC Service GmbH"
+
+                        If USTV_POS.UStVPo_ReNr.ToString.ToLower.StartsWith("fit") Then
+                            leist = "Con.Tir Scar"
+                            USTV_POS.UStVPo_Leistungsbezeichnung = "Maut"
+                        End If
+
+                        Dim leistender As New cUStVLeistender(leist & " " & Antrag_LandKz, Antrag_LandKz)
                         If leistender.UStV_LeistenderId < 1 Then
-                            leistender = New cUStVLeistender("RMC Service GmbH")
+                            leistender = New cUStVLeistender(leist)
                         End If
 
                         USTV_POS.UStVPo_Leistender = leistender.UStV_Leistender.ToString
-
-
                         USTV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
                         USTV_POS.UStVPo_Zeitstempel = Now()
 
                         ' Berechnungen
                         'von RMC bekommen wir Fremdwährung und EUR, d.b. wir können und den Umrechnungskurs selbst berechnen!
 
+                        'EasyTrip können wir nicht auslesen, deshalb geben wir immer 0,1 als Betrag mit!
+
                         Dim umrechKurs As Double = 1
                         If (CDbl(r.Item("rmc_betragBrutto")) <> 0 AndAlso CDbl(r.Item("rmc_euroBrutto")) <> 0) Then
 
@@ -1072,7 +1079,7 @@ Public Class frmMDM_USTVAntrag
                         End If
 
                         If USTV_POS.INSERT() Then
-                            cRMC.UPDATE_ARCHIV(USTV_POS.UStVPo_ReDat, USTV_POS.UStVPo_ReNr, kdNr, USTV_POS.UStVAn_ID)
+                            cRMC.UPDATE_ARCHIV(USTV_POS.UStVPo_ReDat, USTV_POS.UStVPo_ReNr.ToString, kdNr, USTV_POS.UStVAn_ID)
                         End If
 
                     End If
@@ -1423,10 +1430,6 @@ Public Class frmMDM_USTVAntrag
                                 USTV_POS.UStVPo_Leistungsbezeichnung = "Maut/Diesel"
                                 USTV_POS.UStVPo_Schnittstelle = True
 
-
-
-
-
                                 If Not alreadyExists(USTV_ANTRAG.UStVAn_KuNr, USTV_ANTRAG.UStVAn_LandNr, USTV_POS) Then
 
 
@@ -1469,11 +1472,6 @@ Public Class frmMDM_USTVAntrag
 
                                     End If
 
-
-
-
-
-
                                     Dim leistenderName As String = r.Cells("seller_name").Value
                                     Dim leistenderUID As String = r.Cells("seller_VAT_id").Value
                                     Dim leistender As New cUStVLeistender(leistenderUID, True)
@@ -2135,7 +2133,7 @@ Public Class frmMDM_USTVAntrag
                 If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL")
 
             Case 7  'RMC - neue Schnittstelle - OK
-                sqlText = "Update [tblRMCImport] Set rmc_archiv=0, [rmc_archiviertDatum] = NULL, UStVAn_ID = NULL FROM [tblRMCImport] inner join adressen on adressen.WölflKundenNr = tblRMCImport.rmc_kdNr Where cast(rmc_reDatum as date) = '" & RechnungsDatum.ToShortDateString & "' And rmc_reNr = " & RechnungsNr & " AND adressen.AdressenNr=" & USTV_ANTRAG.UStVAn_KuNr
+                sqlText = "Update [tblRMCImport] Set rmc_archiv=0, [rmc_archiviertDatum] = NULL, UStVAn_ID = NULL FROM [tblRMCImport] inner join adressen on adressen.WölflKundenNr = tblRMCImport.rmc_kdNr Where cast(rmc_reDatum as date) = '" & RechnungsDatum.ToShortDateString & "' And rmc_reNr = '" & RechnungsNr & "' AND adressen.AdressenNr=" & USTV_ANTRAG.UStVAn_KuNr
                 If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL")
             Case 8, 12  'IDS neue Schnittstelle - OK
                 sqlText = "update tblIDSTransactionsNew set  UStVAn_ID = NULL
@@ -3670,13 +3668,15 @@ Public Class frmMDM_USTVAntrag
 
                 Select Case spracheRechnung
                 Case "DE" : Attachmens_Bez = "Lief.-Rechn" : Attachmens_Bez_POS = "POS-Liste"
-                Case "EN", "TR" : Attachmens_Bez = "Supplier Invoice(s)" : Attachmens_Bez_POS = "Item List"
-                Case "RO" : Attachmens_Bez = "Factura furnizorului" : Attachmens_Bez_POS = "Lista articolelor"
+                Case "EN", "TR" : Attachmens_Bez = "Supplier-Invoice(s)" : Attachmens_Bez_POS = "Item-List"
+                Case "RO" : Attachmens_Bez = "Factura-furnizorului" : Attachmens_Bez_POS = "Lista-articolelor"
             End Select
 
             Dim path As String = PDFInvoicesPath(posID)
             Dim fileInfo As New FileInfo(path)
-            If path <> "" Then Mail.Attachments.Add(path, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue,, Attachmens_Bez & fileInfo.Extension)
+            If path <> "" Then
+                Mail.Attachments.Add(path, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue,, Attachmens_Bez & fileInfo.Extension)
+            End If
 
             If vbYes = MsgBox("Möchten Sie die Positionsliste an die Mail hinzufügen?", vbYesNoCancel) Then
 
@@ -3687,7 +3687,9 @@ Public Class frmMDM_USTVAntrag
                     Dim pathPosList As String = generatePOSListe(spedBuch, posID, False)
                     If pathPosList <> "" Then
                         Dim fileInfoPos As New FileInfo(pathPosList)
-                        If pathPosList <> "" Then Mail.Attachments.Add(pathPosList, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue,, Attachmens_Bez_POS & fileInfoPos.Extension)
+                        If pathPosList <> "" Then
+                            Mail.Attachments.Add(pathPosList, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue,, Attachmens_Bez_POS & fileInfoPos.Extension)
+                        End If
                     End If
 
                 End If
@@ -3706,6 +3708,10 @@ Public Class frmMDM_USTVAntrag
             Mail.CC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(AD.AdressenNr, "Rechnung an")
             Mail.BCC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(AD.AdressenNr, "Rechnung an")
 
+            If Mail.To = "" Then
+                Mail.To &= IIf(AD.E_Mail IsNot Nothing, AD.E_Mail, "")
+            End If
+
             Mail.Display()
             Me.Cursor = Cursors.Default
         Catch ex As Exception

SDL/USTV/usrCntlUSTV.vb

@@ -1441,10 +1441,13 @@ Public Class usrCntlUSTV
         If MyComboBox1._value <> "" Then whereStr &= " AND dbo.Adressen.LandKz='" & MyComboBox1._value & "' "
 
 
+
+
+
         Dim sqlQery = "SELECT dbo.tblUStVAntrag.UStVAn_ID, dbo.tblUStVAntrag.UStVAn_KuNr, dbo.tblUStVAntrag.UStVAn_ReDatVon, 
                         dbo.tblUStVAntrag.UStVAn_ReDatBis, 
                         dbo.tblUStVAntrag.UStVAn_Ausstellungsdatum, 
-                        dbo.tblUStVAntrag.UStVAn_LandNr, 
+                        (SELECT LandKz from  [Länderverzeichnis für die Außenhandelsstatistik] where LandNr = dbo.tblUStVAntrag.UStVAn_LandNr)  as AntragsLand, 
                         dbo.tblUStVAntrag.UStVAn_VZDatum, dbo.tblUStVAntrag.UStVAn_VZBetrag, dbo.tblUStVAntrag.UStVAn_RZBetragVZ, dbo.Adressen.Ordnungsbegriff, dbo.Adressen.LandKz, ISNULL
                                                      ((SELECT        SUM(UStVEr_USteuerbetragEUR) AS Expr1
                                                          FROM            dbo.tblUStVErstattung
@@ -1466,6 +1469,15 @@ Public Class usrCntlUSTV
         If dtVorauszahlung.Rows.Count = 0 Then
             MsgBox("keine Daten!")
             Exit Sub
+        Else
+            For Each col In dtVorauszahlung.Columns
+
+                Dim colName = col.ColumnName.Replace("UStVAn_", "")
+
+                If Not col.ColumnName.Contains(colName) Then col.ColumnName = col.ColumnName.Replace("UStVAn_", "")
+
+            Next
+
         End If
 
 

SDL/USTV/ustCntlUSTV_AntragPosition.vb

@@ -633,7 +633,15 @@ Public Class ustCntlUSTV_AntragPosition
         cnS_KIUPLOAD.Hide()
         Dim item As ToolStripMenuItem = TryCast(sender, ToolStripMenuItem)
 
-        If UStV_POS.UStVPo_daId < 1 Then Exit Sub
+        'If UStV_POS.UStVPo_daId Is Nothing AndAlso UStV_POS.UStVPo_USteuerbetragEUR = 0.01 AndAlso UStV_POS.UStVPo_SchnittstellenNr = 7 Then
+        '    UStV_POS.UStVPo_daId = sql.getValueTxtBySql("SELECT TOP(1) [rmc_daId] FROM [tblRMCImport] where rmc_reDatum='" & UStV_POS.UStVPo_ReDat & "' and rmc_reNr='" & UStV_POS.UStVPo_ReNr & "' and rmc_landKZ='" & Antrag_LandKz & "' AND [rmc_daId] is not null", "FMZOLL",,, -1)
+        'End If
+
+
+        If UStV_POS.UStVPo_daId < 1 Then
+            MsgBox("kein Dokument hinterlegt!")
+            Exit Sub
+        End If
 
         If item IsNot Nothing Then
 
@@ -653,9 +661,10 @@ Public Class ustCntlUSTV_AntragPosition
                         MsgBox("Authentifizierung fehlgeschlagen" & vbNewLine & authResp)
                         Exit Sub
                     Else
-                        'If API.SendRequestWithAuthHeader("application/json", failreDesc, "/health", "GET") = "200" Then
 
+                        'If API.SendRequestWithAuthHeader("application/json", failreDesc, "/health", "GET") = "200" Then
                         'document_type = vat_invoice or receipt
+
                         If API.setJsonVAT(item.Name, UStV_POS.UStVPo_daId) Then
 
                             resp = API.SendRequestWithAuthHeader("application/json", failreDesc, "/process", "POST", dt, item.Name)
@@ -668,8 +677,12 @@ Public Class ustCntlUSTV_AntragPosition
                                 f.usrcntlVAT_ATEZ1.btnUebernehmen.Enabled = UStV_POS.UStVPo_daId_loeschbar 'NUR ÜBERNEHMEN WENN LÖSCHBAR!
                                 f.usrcntlVAT_ATEZ1.initDGV(dt)
                                 f.usrcntlVAT_ATEZ1.setColorIndgv()
+                                f.usrcntlVAT_ATEZ1.setAmountOnly = IIf(UStV_POS.UStVPo_SchnittstellenNr = 7, True, False)
+
 
                                 If f.ShowDialog = DialogResult.OK Then
+
+                                    If Not f.usrcntlVAT_ATEZ1.setAmountOnly Then
                                         txtRgDatum.Text = f.usrcntlVAT_ATEZ1.va.invoice_date
                                         txtRgNr.Text = f.usrcntlVAT_ATEZ1.va.invoice_id
                                         txtStrasse.Text = f.usrcntlVAT_ATEZ1.va.seller_address_street
@@ -677,6 +690,8 @@ Public Class ustCntlUSTV_AntragPosition
                                         txtLand.Text = f.usrcntlVAT_ATEZ1.va.seller_address_country
                                         txtPLZ.Text = f.usrcntlVAT_ATEZ1.va.seller_address_postcode
                                         sbLeistender._value = f.usrcntlVAT_ATEZ1.va.seller_name
+                                    End If
+
                                     If IsNumeric(f.usrcntlVAT_ATEZ1.va.total_VAT_amount) AndAlso f.usrcntlVAT_ATEZ1.va.total_VAT_amount <> 0 AndAlso f.usrcntlVAT_ATEZ1.va.currency <> "" Then
                                         Dim antr As New cUSTVAntrag(UStV_POS.UStVAn_ID)
 
@@ -684,46 +699,54 @@ Public Class ustCntlUSTV_AntragPosition
                                         If f.usrcntlVAT_ATEZ1.va.currency = antr.UStVAn_Währungscode Then
                                             Dim kurs As New cEZB_Waehrungskurse(antr.UStVAn_Währungscode)
                                             If antr.UStVAn_Währungscode = "EUR" Then
-                                                UStV_POS.UStVPo_USteuerbetragEUR = f.usrcntlVAT_ATEZ1.va.total_VAT_amount
+                                                UStV_POS.UStVPo_USteuerbetragEUR = f.usrcntlVAT_ATEZ1.va.total_VAT_amount.Replace(",", ".")
                                                 'If USTV_ANTRAG.UStVAn_Währungscode <> "EUR" Then
                                                 '    USTV_POS.UStVPo_USteuerbetrag = Math.Round(kurs.EXCHANGE_EURTOCUR(r.Cells("total_VAT_amount").Value, USTV_ANTRAG.UStVAn_Währungscode, CDate(USTV_POS.UStVPo_ReDat)), 2)
                                                 '    USTV_POS.UStVPo_Umrechnungskurs = Math.Floor((CDbl(USTV_POS.UStVPo_USteuerbetrag) / CDbl(USTV_POS.UStVPo_USteuerbetragEUR) * 100 + 0.5)) / 100
                                                 'Else
-                                                UStV_POS.UStVPo_USteuerbetrag = f.usrcntlVAT_ATEZ1.va.total_VAT_amount
+                                                UStV_POS.UStVPo_USteuerbetrag = f.usrcntlVAT_ATEZ1.va.total_VAT_amount.Replace(",", ".")
                                                 UStV_POS.UStVPo_Umrechnungskurs = 1
                                                 'End If
 
+                                                UStV_POS.SAVE()
                                             Else
 
-                                                UStV_POS.UStVPo_USteuerbetrag = f.usrcntlVAT_ATEZ1.va.total_VAT_amount
+                                                UStV_POS.UStVPo_USteuerbetrag = f.usrcntlVAT_ATEZ1.va.total_VAT_amount.Replace(",", ".")
                                                 UStV_POS.UStVPo_USteuerbetragEUR = Math.Round(kurs.EXCHANGE_CURTOEUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, f.usrcntlVAT_ATEZ1.va.currency, CDate(UStV_POS.UStVPo_ReDat)), 2)
                                                 UStV_POS.UStVPo_Umrechnungskurs = Math.Floor((CDbl(UStV_POS.UStVPo_USteuerbetrag) / CDbl(UStV_POS.UStVPo_USteuerbetragEUR) * 100 + 0.5)) / 100
+                                                UStV_POS.SAVE()
                                             End If
+
+
                                         Else
                                             '2. Antragswährung <> Belegswährung (EUR zu FREMD und FREMD zu EUR)
                                             If antr.UStVAn_Währungscode = "EUR" Then
                                                 Dim kurs As New cEZB_Waehrungskurse(f.usrcntlVAT_ATEZ1.va.currency)
                                                 If f.usrcntlVAT_ATEZ1.va.currency <> "EUR" Then
-                                                    UStV_POS.UStVPo_USteuerbetrag = f.usrcntlVAT_ATEZ1.va.total_VAT_amount
+                                                    UStV_POS.UStVPo_USteuerbetrag = f.usrcntlVAT_ATEZ1.va.total_VAT_amount.Replace(",", ".")
                                                     UStV_POS.UStVPo_USteuerbetragEUR = Math.Round(kurs.EXCHANGE_CURTOEUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, f.usrcntlVAT_ATEZ1.va.currency, CDate(UStV_POS.UStVPo_ReDat)), 2)
                                                     UStV_POS.UStVPo_Umrechnungskurs = Math.Floor((CDbl(UStV_POS.UStVPo_USteuerbetrag) / CDbl(UStV_POS.UStVPo_USteuerbetragEUR) * 100 + 0.5)) / 100
+                                                    UStV_POS.SAVE()
                                                 ElseIf f.usrcntlVAT_ATEZ1.va.currency = "EUR" Then
                                                     UStV_POS.UStVPo_USteuerbetrag = Math.Round(kurs.EXCHANGE_EURTOCUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, antr.UStVAn_Währungscode, CDate(UStV_POS.UStVPo_ReDat)), 2)
                                                     UStV_POS.UStVPo_USteuerbetragEUR = UStV_POS.UStVPo_USteuerbetrag
                                                     UStV_POS.UStVPo_Umrechnungskurs = 1
+                                                    UStV_POS.SAVE()
                                                 End If
                                             Else
                                                 '2.1 Antragswährung <> Belegswährung (FREMD zu FREMD)
                                                 If f.usrcntlVAT_ATEZ1.va.currency = "EUR" Then
-                                                    UStV_POS.UStVPo_USteuerbetragEUR = f.usrcntlVAT_ATEZ1.va.total_VAT_amount
+                                                    UStV_POS.UStVPo_USteuerbetragEUR = f.usrcntlVAT_ATEZ1.va.total_VAT_amount.Replace(",", ".")
                                                     Dim kurs As New cEZB_Waehrungskurse(antr.UStVAn_Währungscode)
                                                     UStV_POS.UStVPo_USteuerbetrag = Math.Round(kurs.EXCHANGE_EURTOCUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, antr.UStVAn_Währungscode, CDate(UStV_POS.UStVPo_ReDat)), 2)
                                                     UStV_POS.UStVPo_Umrechnungskurs = Math.Floor((CDbl(UStV_POS.UStVPo_USteuerbetrag) / CDbl(UStV_POS.UStVPo_USteuerbetragEUR) * 100 + 0.5)) / 100
+                                                    UStV_POS.SAVE()
                                                 Else
                                                     UStV_POS.UStVPo_USteuerbetrag = VERAG_PROG_ALLGEMEIN.cProgramFunctions.fktEuro(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, f.usrcntlVAT_ATEZ1.va.currency, antr.UStVAn_Währungscode)
                                                     Dim kurs As New cEZB_Waehrungskurse(antr.UStVAn_Währungscode)
                                                     UStV_POS.UStVPo_USteuerbetragEUR = Math.Round(kurs.EXCHANGE_CURTOEUR(f.usrcntlVAT_ATEZ1.va.total_VAT_amount, f.usrcntlVAT_ATEZ1.va.currency, CDate(UStV_POS.UStVPo_ReDat)), 2)
                                                     UStV_POS.UStVPo_Umrechnungskurs = Math.Floor((CDbl(UStV_POS.UStVPo_USteuerbetrag) / CDbl(UStV_POS.UStVPo_USteuerbetragEUR) * 100 + 0.5)) / 100
+                                                    UStV_POS.SAVE()
 
 
                                                 End If
@@ -735,7 +758,6 @@ Public Class ustCntlUSTV_AntragPosition
 
                                         End If
 
-
                                     End If
                                 End If
 

SDL/frmMain.vb

@@ -151,23 +151,41 @@ Public Class frmMain
                 Dim isEndpointRunning As Boolean = True
                 timas.getTimeEntries(cAllgemein.MITARBEITER.mit_timasId, infoMessage, timeEntryExisting,, isEndpointRunning)
                 If Not timeEntryExisting AndAlso isEndpointRunning Then
-                    Dim a As MsgBoxResult = MsgBox("Für " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & " wurde heute noch keine Zeit erfasst" & vbNewLine & Now.ToString() & " als Startzeit erfassen?", vbYesNo)
-                    If a = vbYes Then
 
+                    Dim frm As New frmTimasabfrage(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER)
+                    frm.TopMost = True
+                    frm.ShowDialog()
+
+                    If frm.DialogResult = DialogResult.OK Then
                         If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasMehrereFirmen Then
                             Dim f As New frmZEButtons("in", VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasFirmen)
                             f.ShowDialog()
-                            f.BringToFront()
+                            f.TopMost = True
                         Else
                             Dim info
-                            timas.setTimeEntry(cAllgemein.MITARBEITER, Now, info, "in", IIf(cAllgemein.MITARBEITER.mit_homeoffice, 3, 0))
+                            timas.setTimeEntry(cAllgemein.MITARBEITER, Now, info, "in", frm.typ)
                             MsgBox(info)
                         End If
 
-                    Else
-
                     End If
 
+                    'Dim a As MsgBoxResult = MsgBox("Für " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & " wurde heute noch keine Zeit erfasst" & vbNewLine & Now.ToString() & " als Startzeit erfassen?", vbYesNo)
+                    'If a = vbYes Then
+
+                    '    If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasMehrereFirmen Then
+                    '        Dim f As New frmZEButtons("in", VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasFirmen)
+                    '        f.ShowDialog()
+                    '        f.BringToFront()
+                    '    Else
+                    '        Dim info
+                    '        timas.setTimeEntry(cAllgemein.MITARBEITER, Now, info, "in", IIf(cAllgemein.MITARBEITER.mit_homeoffice, 3, 0))
+                    '        MsgBox(info)
+                    '    End If
+
+                    'Else
+
+                    'End If
+
                 End If
 
             End If

SDL/kunden/frmBonitätsverlauf.Designer.vb

@@ -32,6 +32,7 @@ Partial Class frmBonitätsverlauf
         Me.Label1 = New System.Windows.Forms.Label()
         Me.lblBonitatsverlauf = New System.Windows.Forms.Label()
         Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.btnCreditsafeDetails = New System.Windows.Forms.Button()
         Me.pnl.SuspendLayout()
         CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
@@ -39,6 +40,7 @@ Partial Class frmBonitätsverlauf
         'pnl
         '
         Me.pnl.BackColor = System.Drawing.Color.White
+        Me.pnl.Controls.Add(Me.btnCreditsafeDetails)
         Me.pnl.Controls.Add(Me.btnExcel)
         Me.pnl.Controls.Add(Me.FlatButton7)
         Me.pnl.Controls.Add(Me.KdSearchBox1)
@@ -89,6 +91,7 @@ Partial Class frmBonitätsverlauf
         Me.KdSearchBox1._displayWoelflKd = False
         Me.KdSearchBox1._hideIfListEmpty = True
         Me.KdSearchBox1._loadKdData = False
+        Me.KdSearchBox1._searchName1 = True
         Me.KdSearchBox1._UseFIRMA = ""
         Me.KdSearchBox1._ValueKdAndName = True
         Me.KdSearchBox1.dgvpos = "LEFT"
@@ -154,6 +157,18 @@ Partial Class frmBonitätsverlauf
         Me.MyDatagridview1.Size = New System.Drawing.Size(829, 403)
         Me.MyDatagridview1.TabIndex = 1
         '
+        'btnCreditsafeDetails
+        '
+        Me.btnCreditsafeDetails.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnCreditsafeDetails.BackgroundImage = Global.SDL.My.Resources.Resources.creditsafe
+        Me.btnCreditsafeDetails.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
+        Me.btnCreditsafeDetails.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnCreditsafeDetails.Location = New System.Drawing.Point(632, 5)
+        Me.btnCreditsafeDetails.Name = "btnCreditsafeDetails"
+        Me.btnCreditsafeDetails.Size = New System.Drawing.Size(91, 34)
+        Me.btnCreditsafeDetails.TabIndex = 7
+        Me.btnCreditsafeDetails.UseVisualStyleBackColor = True
+        '
         'frmBonitätsverlauf
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -180,4 +195,5 @@ Partial Class frmBonitätsverlauf
     Friend WithEvents lblBonitatsverlauf As System.Windows.Forms.Label
     Friend WithEvents btnExcel As System.Windows.Forms.Button
     Friend WithEvents FlatButton7 As System.Windows.Forms.Button
+    Friend WithEvents btnCreditsafeDetails As Button
 End Class

SDL/kunden/frmBonitätsverlauf.vb

@@ -1,5 +1,4 @@
-Imports GrapeCity.DataVisualization.Chart
-Imports VERAG_PROG_ALLGEMEIN
+Imports VERAG_PROG_ALLGEMEIN
 
 Public Class frmBonitätsverlauf
 
@@ -186,4 +185,51 @@ Public Class frmBonitätsverlauf
 
     End Sub
 
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnCreditsafeDetails.Click
+
+        Try
+
+            Dim SQL_String = "SELECT
+       [createdDate] as Datum
+      ,[ruleName] as Bezeichnung
+      ,[globalEventCode] as Code
+      ,[oldValue] as alterWert
+      ,[newValue] as neuerWert
+      ,[sachbearbeiter] as Sachbearbeiter
+      ,[oldValueCL] as KreditlimitAlt
+      ,[newValueCL] as KreditlimitNeu
+      ,[oldValueCR] as BonRateAlt
+      ,[newValueCR] as BonRateNeu
+      ,[newValueCRIndex] as BonIndexNeu
+      ,[oldValueCRIndex] as BonIndexAlt
+      ,[oldRiskClass] as RiskoklasseAlt
+      ,[newRiskClass] as RiskoklasseNeu
+        FROM [VERAG].[dbo].[tblCreditsafeEvents] where [kundenNr] = " & KdSearchBox1.KdNr & " order by eventDate desc"
+
+
+            Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+            Dim frm As New Form
+            frm.Text = "Creditsafe-Details"
+            Dim dgv As New DataGridView()
+            Dim dt As DataTable = SQL.loadDgvBySql(SQL_String, "FMZOLL")
+            dgv.DataSource = dt
+            If dgv IsNot Nothing Then
+                frm.Size = New Size(1500, 500)
+                dgv.Size = New Size(frm.Size.Width - 10, frm.Size.Height - 10)
+                dgv.Dock = DockStyle.Fill
+                dgv.Anchor = AnchorStyles.Left
+                dgv.Anchor = AnchorStyles.Top
+                dgv.ReadOnly = True
+                frm.Controls.Add(dgv)
+                frm.StartPosition = FormStartPosition.CenterScreen
+                frm.ShowDialog()
+            End If
+
+
+        Catch ex As System.Exception
+
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+
+    End Sub
 End Class

SDL/kunden/frmKundenblatt.Designer.vb

@@ -635,7 +635,7 @@ Partial Class frmKundenblatt
         Me.dgvUmsaetze.RowHeadersDefaultCellStyle = DataGridViewCellStyle8
         Me.dgvUmsaetze.RowHeadersVisible = False
         Me.dgvUmsaetze.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 836)
+        Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 799)
         Me.dgvUmsaetze.TabIndex = 182
         '
         'Label13
@@ -2446,7 +2446,7 @@ Partial Class frmKundenblatt
         '
         Me.btnFirmendatenFormularSpeichern.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.btnFirmendatenFormularSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnFirmendatenFormularSpeichern.Location = New System.Drawing.Point(91, 18)
+        Me.btnFirmendatenFormularSpeichern.Location = New System.Drawing.Point(568, 3)
         Me.btnFirmendatenFormularSpeichern.Name = "btnFirmendatenFormularSpeichern"
         Me.btnFirmendatenFormularSpeichern.Size = New System.Drawing.Size(71, 52)
         Me.btnFirmendatenFormularSpeichern.TabIndex = 17
@@ -2724,7 +2724,7 @@ Partial Class frmKundenblatt
         '
         Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM"
-        Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4
+        Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8
         Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4)
         Me.cntxtCntxtMDM.Text = "cntxtMDM"
         '

SDL/kunden/usrCntlCBAM.vb

@@ -468,7 +468,9 @@ Public Class usrCntlCBAM
                      ,isnull(max(Empfänger_CN_EORI),'') as EmpfängerEORI
                      ,isnull(max(CN_Name), '') as Empfänger
                      ,isnull(max(Versender_CZ_EORI),'') as AbsenderEORI
-                     ,isnull(max(CZ_Name), '') as Absender"
+                     ,isnull(max(CZ_Name), '') as Absender
+                     ,'' as 'Rechnungsnummer'
+					 ,'' as 'Rechnungsdatum'"
 
             Dim SQLSTR = " FROM [tbl_DY_Zollmeldungen_Import]
                   where  
@@ -541,9 +543,39 @@ Public Class usrCntlCBAM
                            inner join Kunden on Speditionsbuch.[VermittlerKundenNr] = Kunden.KundenNr OR  Speditionsbuch.[EmpfängerKundenNr]= Kunden.KundenNr OR Speditionsbuch.[VermittlerKundenNr] = Kunden.KundenNr OR Speditionsbuch.[EmpfängerKundenNr] = Kunden.KundenNr 
                             where 1 = 1 AND Kunden.EORITIN = '" & EORI & "' AND BelegNr <> '' AND (Speditionsbuch.[Abfertigungsdatum] BETWEEN '" & txtVon._value & "' and '" & txtBis._value & "' )" & IIf(MRNNr <> "", SQLWhereMRN, "")
 
+            Dim ReDaten As New DataTable
+
+            If MRNNr <> "" Then
+                ReDaten = SQL.loadDgvBySql("SELECT Positionsunterlagenart, Positionsunterlagennummer, Positionsunterlagendatum,Registriernummer_MRN  FROM [tbl_DY_Zollmeldungen_Import] WHERE [Positionsunterlagenart] in ('N380','N325') and Registriernummer_MRN IN (" & MRNNr & ")", "AVISO", 600)
+            End If
+
+            If ReDaten.Rows.Count > 0 Then
+                dt.Columns("Rechnungsdatum").ReadOnly = False
+                dt.Columns("Rechnungsnummer").ReadOnly = False
+                dt.Columns("Rechnungsdatum").MaxLength = -1
+                dt.Columns("Rechnungsnummer").MaxLength = -1
+            End If
 
-            '   MsgBox(SQLSTR)
             If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
+
+                For Each r As DataRow In dt.Rows
+                    Dim MDN_NR As String = r("RegistriernummerATLAS")
+
+                    ' Look for matching row in dt2
+                    Dim found() As DataRow = ReDaten.Select("Registriernummer_MRN = '" & MDN_NR & "'")
+
+                    If found.Length > 0 Then
+                        Dim rechnugnsdatum As String = found(0)("Positionsunterlagendatum")
+                        If rechnugnsdatum <> "" Then rechnugnsdatum.Replace("00:00:00", "")
+                        r("Rechnungsdatum") = rechnugnsdatum
+                        r("Rechnungsnummer") = found(0)("Positionsunterlagennummer")
+                    Else
+                        r("Rechnungsdatum") = "-"
+                        r("Rechnungsnummer") = "-"
+                    End If
+
+                Next
+
                 Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False, EORI & "_Detailbericht_" & txtVon._value & "-" & txtBis._value)
                 btnCBAM_DS_DAKOSY_Detail.Tag = path
                 btnCBAM_DS_DAKOSY_Detail.Enabled = True
@@ -551,8 +583,39 @@ Public Class usrCntlCBAM
 
             End If
 
+
+
             If dtGP IsNot Nothing AndAlso dt.Rows.Count > 0 Then
 
+                If ReDaten.Rows.Count > 0 Then
+                    dtGP.Columns("invoice date").ReadOnly = False
+                    dtGP.Columns("invoice numbers").ReadOnly = False
+                    dtGP.Columns("invoice date").MaxLength = -1
+                    dtGP.Columns("invoice numbers").MaxLength = -1
+                End If
+
+                For Each r As DataRow In dtGP.Rows
+                    Dim MDN_NR As String = r("declaration no")
+
+                    ' Look for matching row in dt2
+                    Dim found() As DataRow = ReDaten.Select("Registriernummer_MRN = '" & MDN_NR & "'")
+
+
+
+                    If found.Length > 0 Then
+
+                        Dim rechnugnsdatum As String = found(0)("Positionsunterlagendatum")
+                        If rechnugnsdatum <> "" Then rechnugnsdatum.Replace("00:00:00", "")
+
+                        r("invoice date") = rechnugnsdatum
+                        r("invoice numbers") = found(0)("Positionsunterlagennummer")
+                    Else
+                        r("invoice date") = "-"
+                        r("invoice numbers") = "-"
+                    End If
+
+                Next
+
                 btnCBAM_DS_DAKOSY_GP.Tag = ""
                 btnCBAM_DS_DAKOSY_GP.Tag = createExcelForGreenPulse(dtGP, EORI, IIf(AD.Ort <> "", AD.Ort, ""))
                 btnCBAM_DS_DAKOSY_GP.Enabled = True
@@ -1636,7 +1699,7 @@ Public Class usrCntlCBAM
                 Blatt.Range("F" & cnt).Value = row("origin country code")
                 Blatt.Range("G" & cnt).Value = row("requested procedure")
                 Blatt.Range("H" & cnt).Value = row("previous procedure")
-                Blatt.Range("J" & cnt).Value = row("net mass")
+                Blatt.Range("I" & cnt).Value = row("net mass")
                 Blatt.Range("J" & cnt).Value = row("type of measurement unit")
                 Blatt.Range("K" & cnt).Value = row("invoice numbers")
                 Blatt.Range("L" & cnt).Value = row("invoice date")

SDL/kunden/usrCntlIDSPreise.Designer.vb

@@ -25,8 +25,7 @@ Partial Class usrCntlIDSPreise
         Me.components = New System.ComponentModel.Container()
         Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.lblIDS = New System.Windows.Forms.TextBox()
-        Me.Label11 = New System.Windows.Forms.Label()
-        Me.dgvOfferteDetails = New System.Windows.Forms.DataGridView()
+        Me.dgvIDSData = New System.Windows.Forms.DataGridView()
         Me.cntxtAddSdl = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.DToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.btnOfferteSpeichern = New System.Windows.Forms.Button()
@@ -35,9 +34,15 @@ Partial Class usrCntlIDSPreise
         Me.cbxTypes = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.btnCloseEditMode = New VERAG_PROG_ALLGEMEIN.FlatButton()
         Me.lblEditMode = New System.Windows.Forms.Label()
-        CType(Me.dgvOfferteDetails, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.btnKunde = New System.Windows.Forms.Button()
+        Me.dgvFILTER = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.btnRW = New System.Windows.Forms.Button()
+        Me.btnAdd = New System.Windows.Forms.Button()
+        CType(Me.dgvIDSData, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.cntxtAddSdl.SuspendLayout()
         CType(Me.dgvIDS, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.dgvFILTER, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'lblIDS
@@ -53,36 +58,26 @@ Partial Class usrCntlIDSPreise
         Me.lblIDS.TabIndex = 0
         Me.lblIDS.Text = "IDS"
         '
-        'Label11
+        'dgvIDSData
         '
-        Me.Label11.AutoSize = True
-        Me.Label11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label11.Location = New System.Drawing.Point(233, 16)
-        Me.Label11.Name = "Label11"
-        Me.Label11.Size = New System.Drawing.Size(50, 13)
-        Me.Label11.TabIndex = 2
-        Me.Label11.Text = "Details:"
-        '
-        'dgvOfferteDetails
-        '
-        Me.dgvOfferteDetails.AllowUserToAddRows = False
-        Me.dgvOfferteDetails.AllowUserToDeleteRows = False
-        Me.dgvOfferteDetails.AllowUserToOrderColumns = True
-        Me.dgvOfferteDetails.AllowUserToResizeRows = False
+        Me.dgvIDSData.AllowUserToAddRows = False
+        Me.dgvIDSData.AllowUserToDeleteRows = False
+        Me.dgvIDSData.AllowUserToOrderColumns = True
+        Me.dgvIDSData.AllowUserToResizeRows = False
         DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvOfferteDetails.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
-        Me.dgvOfferteDetails.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+        Me.dgvIDSData.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        Me.dgvIDSData.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.dgvOfferteDetails.BackgroundColor = System.Drawing.Color.White
-        Me.dgvOfferteDetails.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing
-        Me.dgvOfferteDetails.Location = New System.Drawing.Point(235, 32)
-        Me.dgvOfferteDetails.MultiSelect = False
-        Me.dgvOfferteDetails.Name = "dgvOfferteDetails"
-        Me.dgvOfferteDetails.RowHeadersVisible = False
-        Me.dgvOfferteDetails.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvOfferteDetails.Size = New System.Drawing.Size(796, 475)
-        Me.dgvOfferteDetails.TabIndex = 5
+        Me.dgvIDSData.BackgroundColor = System.Drawing.Color.White
+        Me.dgvIDSData.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing
+        Me.dgvIDSData.Location = New System.Drawing.Point(182, 63)
+        Me.dgvIDSData.MultiSelect = False
+        Me.dgvIDSData.Name = "dgvIDSData"
+        Me.dgvIDSData.RowHeadersVisible = False
+        Me.dgvIDSData.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
+        Me.dgvIDSData.Size = New System.Drawing.Size(981, 444)
+        Me.dgvIDSData.TabIndex = 5
         '
         'cntxtAddSdl
         '
@@ -103,7 +98,7 @@ Partial Class usrCntlIDSPreise
         Me.btnOfferteSpeichern.ForeColor = System.Drawing.Color.Black
         Me.btnOfferteSpeichern.Image = Global.SDL.My.Resources.Resources.save
         Me.btnOfferteSpeichern.ImageAlign = System.Drawing.ContentAlignment.TopLeft
-        Me.btnOfferteSpeichern.Location = New System.Drawing.Point(899, 514)
+        Me.btnOfferteSpeichern.Location = New System.Drawing.Point(1031, 514)
         Me.btnOfferteSpeichern.Name = "btnOfferteSpeichern"
         Me.btnOfferteSpeichern.Size = New System.Drawing.Size(132, 36)
         Me.btnOfferteSpeichern.TabIndex = 15
@@ -121,7 +116,7 @@ Partial Class usrCntlIDSPreise
         Me.btnEditIDS.FlatAppearance.BorderSize = 0
         Me.btnEditIDS.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnEditIDS.ForeColor = System.Drawing.Color.Black
-        Me.btnEditIDS.Location = New System.Drawing.Point(965, 6)
+        Me.btnEditIDS.Location = New System.Drawing.Point(1097, 4)
         Me.btnEditIDS.Name = "btnEditIDS"
         Me.btnEditIDS.Size = New System.Drawing.Size(20, 20)
         Me.btnEditIDS.TabIndex = 1
@@ -143,7 +138,7 @@ Partial Class usrCntlIDSPreise
         Me.dgvIDS.Name = "dgvIDS"
         Me.dgvIDS.ReadOnly = True
         Me.dgvIDS.RowHeadersVisible = False
-        Me.dgvIDS.Size = New System.Drawing.Size(228, 444)
+        Me.dgvIDS.Size = New System.Drawing.Size(176, 444)
         Me.dgvIDS.TabIndex = 30
         '
         'cbxTypes
@@ -168,7 +163,7 @@ Partial Class usrCntlIDSPreise
         Me.btnCloseEditMode.FlatAppearance.BorderSize = 0
         Me.btnCloseEditMode.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnCloseEditMode.ForeColor = System.Drawing.Color.Black
-        Me.btnCloseEditMode.Location = New System.Drawing.Point(1000, 8)
+        Me.btnCloseEditMode.Location = New System.Drawing.Point(1132, 6)
         Me.btnCloseEditMode.Name = "btnCloseEditMode"
         Me.btnCloseEditMode.Size = New System.Drawing.Size(20, 20)
         Me.btnCloseEditMode.TabIndex = 31
@@ -180,40 +175,115 @@ Partial Class usrCntlIDSPreise
         Me.lblEditMode.AutoSize = True
         Me.lblEditMode.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblEditMode.ForeColor = System.Drawing.Color.Red
-        Me.lblEditMode.Location = New System.Drawing.Point(551, 13)
+        Me.lblEditMode.Location = New System.Drawing.Point(551, 11)
         Me.lblEditMode.Name = "lblEditMode"
         Me.lblEditMode.Size = New System.Drawing.Size(64, 13)
         Me.lblEditMode.TabIndex = 32
         Me.lblEditMode.Text = "Edit Mode"
         Me.lblEditMode.Visible = False
         '
+        'btnKunde
+        '
+        Me.btnKunde.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnKunde.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnKunde.ForeColor = System.Drawing.Color.Black
+        Me.btnKunde.ImageAlign = System.Drawing.ContentAlignment.TopLeft
+        Me.btnKunde.Location = New System.Drawing.Point(993, 4)
+        Me.btnKunde.Name = "btnKunde"
+        Me.btnKunde.Size = New System.Drawing.Size(76, 28)
+        Me.btnKunde.TabIndex = 33
+        Me.btnKunde.Tag = ""
+        Me.btnKunde.Text = "Kunde"
+        Me.btnKunde.UseVisualStyleBackColor = True
+        Me.btnKunde.Visible = False
+        '
+        'dgvFILTER
+        '
+        Me.dgvFILTER.AKTUALISIERUNGS_INTERVALL = -1
+        Me.dgvFILTER.AllowUserToAddRows = False
+        Me.dgvFILTER.AllowUserToDeleteRows = False
+        Me.dgvFILTER.AllowUserToResizeColumns = False
+        Me.dgvFILTER.AllowUserToResizeRows = False
+        Me.dgvFILTER.BackgroundColor = System.Drawing.Color.White
+        Me.dgvFILTER.BorderStyle = System.Windows.Forms.BorderStyle.None
+        Me.dgvFILTER.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.dgvFILTER.ColumnHeadersVisible = False
+        Me.dgvFILTER.Location = New System.Drawing.Point(182, 35)
+        Me.dgvFILTER.Name = "dgvFILTER"
+        Me.dgvFILTER.ScrollBars = System.Windows.Forms.ScrollBars.None
+        Me.dgvFILTER.Size = New System.Drawing.Size(796, 22)
+        Me.dgvFILTER.TabIndex = 34
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label1.ForeColor = System.Drawing.Color.Red
+        Me.Label1.Location = New System.Drawing.Point(64, 15)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(0, 13)
+        Me.Label1.TabIndex = 35
+        '
+        'btnRW
+        '
+        Me.btnRW.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnRW.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnRW.ForeColor = System.Drawing.Color.Black
+        Me.btnRW.ImageAlign = System.Drawing.ContentAlignment.TopLeft
+        Me.btnRW.Location = New System.Drawing.Point(911, 4)
+        Me.btnRW.Name = "btnRW"
+        Me.btnRW.Size = New System.Drawing.Size(76, 28)
+        Me.btnRW.TabIndex = 36
+        Me.btnRW.Tag = ""
+        Me.btnRW.Text = "RW"
+        Me.btnRW.UseVisualStyleBackColor = True
+        Me.btnRW.Visible = False
+        '
+        'btnAdd
+        '
+        Me.btnAdd.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnAdd.BackgroundImage = Global.SDL.My.Resources.Resources.plus
+        Me.btnAdd.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.btnAdd.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnAdd.ForeColor = System.Drawing.Color.Black
+        Me.btnAdd.Location = New System.Drawing.Point(869, 3)
+        Me.btnAdd.Name = "btnAdd"
+        Me.btnAdd.Size = New System.Drawing.Size(36, 28)
+        Me.btnAdd.TabIndex = 37
+        Me.btnAdd.Tag = ""
+        Me.btnAdd.UseVisualStyleBackColor = True
+        '
         'usrCntlIDSPreise
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.Color.White
+        Me.Controls.Add(Me.btnAdd)
+        Me.Controls.Add(Me.btnRW)
+        Me.Controls.Add(Me.Label1)
+        Me.Controls.Add(Me.dgvFILTER)
+        Me.Controls.Add(Me.btnKunde)
         Me.Controls.Add(Me.lblEditMode)
         Me.Controls.Add(Me.btnCloseEditMode)
         Me.Controls.Add(Me.cbxTypes)
         Me.Controls.Add(Me.dgvIDS)
         Me.Controls.Add(Me.btnOfferteSpeichern)
         Me.Controls.Add(Me.btnEditIDS)
-        Me.Controls.Add(Me.Label11)
         Me.Controls.Add(Me.lblIDS)
-        Me.Controls.Add(Me.dgvOfferteDetails)
+        Me.Controls.Add(Me.dgvIDSData)
         Me.Margin = New System.Windows.Forms.Padding(2)
         Me.Name = "usrCntlIDSPreise"
-        Me.Size = New System.Drawing.Size(1041, 576)
-        CType(Me.dgvOfferteDetails, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.Size = New System.Drawing.Size(1173, 576)
+        CType(Me.dgvIDSData, System.ComponentModel.ISupportInitialize).EndInit()
         Me.cntxtAddSdl.ResumeLayout(False)
         CType(Me.dgvIDS, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.dgvFILTER, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
     End Sub
     Friend WithEvents lblIDS As System.Windows.Forms.TextBox
-    Friend WithEvents Label11 As System.Windows.Forms.Label
-    Friend WithEvents dgvOfferteDetails As System.Windows.Forms.DataGridView
+    Friend WithEvents dgvIDSData As System.Windows.Forms.DataGridView
     Friend WithEvents btnEditIDS As VERAG_PROG_ALLGEMEIN.FlatButton
     Friend WithEvents cntxtAddSdl As ContextMenuStrip
     Friend WithEvents DToolStripMenuItem As ToolStripMenuItem
@@ -222,4 +292,9 @@ Partial Class usrCntlIDSPreise
     Friend WithEvents cbxTypes As VERAG_PROG_ALLGEMEIN.MyComboBox
     Friend WithEvents btnCloseEditMode As VERAG_PROG_ALLGEMEIN.FlatButton
     Friend WithEvents lblEditMode As Label
+    Friend WithEvents btnKunde As Button
+    Friend WithEvents dgvFILTER As VERAG_PROG_ALLGEMEIN.MyDatagridview
+    Friend WithEvents Label1 As Label
+    Friend WithEvents btnRW As Button
+    Friend WithEvents btnAdd As Button
 End Class

SDL/kunden/usrCntlIDSPreise.vb

@@ -6,7 +6,7 @@ Public Class usrCntlIDSPreise
     Dim SQL As New SQL
     Public Event IDSChanged()
 
-
+    Public kdNr_filter As Boolean = False
     Dim IDSDIESEL_Bind As cEasyBinding
     Dim table
     Public BIND_DB = "FMZOLL"
@@ -18,6 +18,9 @@ Public Class usrCntlIDSPreise
     Dim loaded = False
     Dim ofID As Integer
     Dim isVerag360 As Boolean = False
+    Dim dgvInitWait As Boolean = False
+    Dim RW As Double = -1
+    Dim Kunde As Integer = -1
 
     Sub New()
         InitializeComponent()
@@ -33,56 +36,176 @@ Public Class usrCntlIDSPreise
 
     End Sub
 
+    Sub initfilterColumnsWidth()
+
+        If dgvFILTER.ColumnCount > 0 AndAlso dgvFILTER.ColumnCount = dgvIDSData.ColumnCount Then
+
+            dgvFILTER.Width = dgvIDSData.Width
+            For Each c As DataGridViewColumn In dgvIDSData.Columns
+                dgvFILTER.Columns(c.Index).Width = c.Width
+            Next
+
+            If Not dgvInitWait Then
+
+                If dgvIDS.SelectedCells.Count > 0 Then
+
+                    Select Case cbxTypes._value
+                        Case "LK", "L", "LS", "LSK"
+                            If dgvIDS.SelectedCells(0).RowIndex > -1 AndAlso dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value > 0 Then
+                                Dim row As DataGridViewRow = dgvFILTER.Rows(0)
+                                row.Cells("OutletCountryCode").Value = dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value
+                            Else
+                                dgvFILTER.Rows(0).Cells("OutletCountryCode").Value = Nothing
+                            End If
+                    End Select
+                End If
+            End If
 
 
-    Sub initDGVDieselpreiseDetails(Optional OutletCountryCode As Integer = -1)
+
+            If kdNr_filter Then
+                Select Case cbxTypes._value
+                    Case "LSK", "LK" : initKDFilter()
+                End Select
+
+
+            End If
+        End If
+    End Sub
+
+
+
+
+    Sub initFilter()
+        dgvInitWait = True
+
+        dgvFILTER.RowTemplate.Height = dgvFILTER.Height
+        'If Not fullyPainted Then Exit Sub ' nur wenn die usrcntl komplett gelden wurde...
+        'pnlFilter.Controls.Clear()
+        Try
+            dgvFILTER.Columns.Clear()
+        Catch ex As Exception
+
+        End Try
+
+        Dim sortedCols = dgvIDSData.Columns.Cast(Of DataGridViewColumn)() _
+                                    .OrderBy(Function(c) c.DisplayIndex)
+
+        For Each c As DataGridViewColumn In sortedCols
+
+            If c.Visible Then
+                Dim cNew As DataGridViewColumn = c.Clone
+
+
+                If c.ReadOnly And c.Name = "CustomerCode" Then
+                    cNew = New DataGridViewTextBoxColumn
+                    cNew.Name = c.Name
+                    cNew.Width = c.Width
+                    cNew.Visible = c.Visible
+                    'KundenNr
+                End If
+                cNew.MinimumWidth = c.Width
+                dgvFILTER.Columns.Add(cNew)
+                'cNew.DisplayIndex = counter
+                If cNew.GetType Is GetType(DataGridViewCheckBoxColumn) Then
+                    DirectCast(cNew, DataGridViewCheckBoxColumn).ThreeState = True
+                    DirectCast(cNew, DataGridViewCheckBoxColumn).DefaultCellStyle.NullValue = CheckState.Indeterminate
+                End If
+            End If
+
+        Next
+
+        If dgvFILTER IsNot Nothing AndAlso dgvFILTER.ColumnCount > 0 Then
+
+            'dgv.AllowUserToAddRows = False
+            dgvFILTER.Rows.Add()
+            '   pnlTest.Controls.Add(dgv)
+            ' dgv.Top = 0
+            ' dgv.Left = 0
+            dgvFILTER.Width = dgvIDSData.Width
+            If kdNr_filter Then
+                initKDFilter()
+            End If
+        End If
+
+        dgvInitWait = False
+
+    End Sub
+
+
+    Sub initDGVDieselpreiseDetails(Optional OutletCountryCode As Integer = -1, Optional doFilter As Boolean = False)
         loaded = False
         Try
 
-            With dgvOfferteDetails
+            If cbxTypes._value = "" Then Exit Sub
+
+            With dgvIDSData
 
                 Dim SQL_ = ""
+                Dim SQL_WHERE = ""
+
+                If doFilter Then
+                    Dim filter As String = getFilter()
+
+                    If filter <> "" Then
+                        SQL_WHERE &= " AND " & filter
+                    End If
+                    ' sql &= " ORDER BY sdl.[Erfassungsdatum] ASC"
+                Else
+                    '  clearFilter()
+                End If
+
+                dgvIDSData.Columns.Clear()
 
                 Select Case cbxTypes._value
                     Case "L"
-                        SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter, tbl_IDS_Rechenwerte.SSMA_TimeStamp, tbl_IDS_Rechenwerte.KategorieNr
+                        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, "") & " ) 
+                        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_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter, tbl_IDS_Rechenwerte.SSMA_TimeStamp, tbl_IDS_Rechenwerte.KategorieNr
+                        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, "") & " ) 
+                        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 "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, tbl_IDS_Kategorien_Rechenwerte.SSMA_TimeStamp
-                        FROM tbl_IDS_Produkte INNER JOIN tbl_IDS_Kategorien_Rechenwerte ON tbl_IDS_Produkte.ProductTypeCode = tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode
-                        ORDER BY tbl_IDS_Kategorien_Rechenwerte.KategorieNr, tbl_IDS_Kategorien_Rechenwerte.ProductTypeCode;"
-
                     Case "LK"
-                        SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, Adressen.Ordnungsbegriff AS CustomerName, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter, tbl_IDS_Rechenwerte.SSMA_TimeStamp, tbl_IDS_Rechenwerte.KategorieNr
+                        SQL_ = "SELECT tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Länder.OutletCountry,  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_Rechenwerte 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.CustomerCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.OutletCode) Is Null) " & IIf(OutletCountryCode > 0, " WHERE tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode, "") & " ) 
+                        WHERE (((tbl_IDS_Rechenwerte.CustomerCode) Is Not Null) AND ((tbl_IDS_Rechenwerte.OutletCode) Is Null) " & IIf(OutletCountryCode > 0, " AND tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode & ") ", ") ") & SQL_WHERE & "
                         ORDER BY tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, Adressen.Ordnungsbegriff, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode;"
 
+
                     Case "LSK"
-                        SQL_ = "SELECT tbl_IDS_Rechenwerte.ID as ID, tbl_IDS_Länder.OutletCountry, tbl_IDS_Rechenwerte.OutletCountryCode, tbl_IDS_Stationen.OutletName, tbl_IDS_Rechenwerte.OutletCode, Adressen.Ordnungsbegriff AS CustomerName, tbl_IDS_Rechenwerte.CustomerCode, tbl_IDS_Produkte.ProductDescription, tbl_IDS_Rechenwerte.ProductTypeCode, tbl_IDS_Rechenwerte.Rechenwert, tbl_IDS_Rechenwerte.Kz, tbl_IDS_Rechenwerte.Zeitstempel, tbl_IDS_Rechenwerte.Sachbearbeiter, tbl_IDS_Rechenwerte.SSMA_TimeStamp, tbl_IDS_Rechenwerte.KategorieNr
+                        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, " WHERE tbl_IDS_Rechenwerte.OutletCountryCode = " & OutletCountryCode, "") & " ) 
+                        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"
+                        If SQL_WHERE <> "" Then
+                            SQL_WHERE = SQL_WHERE.Replace("tbl_IDS_Rechenwerte.", "")
+                        End If
+
                         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
 
                 If SQL_ = "" Then Exit Sub
@@ -98,69 +221,30 @@ Public Class usrCntlIDSPreise
                     Next
 
                     .DataSource = IDSDIESEL_Bind.bindingdataTable
+                    .AllowUserToAddRows = False
 
 
                 Catch ex As Exception
                     VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
                 End Try
 
-
-                '.DataSource = SQL.loadDgvBySql(" SELECT [LeistungsNr],[LeistungsBez],[BerechnungsartNr],[Preis],[Anzahl],[BGebLeistungsNr],[BGebProzent],[BGebMinBetrag],[Eingegeben am],[Geändert am],[Sachbearbeiter],[PreisänderungProzent],[PreisAlt],[Preisänderung] " &
-                '                                  " FROM [Offertenpositionen] " &
-                '                               " WHERE KundenNr='" & kdNr & "' and OffertenNr='" & OffertenNr & "' ORDER BY LeistungsNr ", "FMZOLL")
-
-                'FUNC.dgvCellToCbo(dgvOfferteDetails, 2, "Kz", "Kz", " SELECT [BerechnungsartNr], CAST(BerechnungsartNr as varchar(3))  + ' - ' + [BerechnungsartBez] as [BerechnungsartBez]  FROM [Berechnungsart] ORDER BY BerechnungsartNr ", "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)
-
-                'checkPerimissionsDGVDetails()
                 If .Columns.Contains("ID") Then .Columns("ID").Visible = False
-                '.Columns("KundenNr").Visible = False
-                '.Columns("LeistungsNr").Width = 30
-                '.Columns("LeistungsNr").HeaderText = "Nr"
-                '.Columns("LeistungsBez").MinimumWidth = 200
-                '.Columns("LeistungsBez").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
-                '.Columns("LeistungsBez").HeaderText = "Leistung"
-                '.Columns("BerechnungsartNr").MinimumWidth = 150
-                '.Columns("Preis").Width = 60
-                '.Columns("Preis").DefaultCellStyle.Format = "N2"
-                '.Columns("Preis").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight
-                '.Columns("Anzahl").Width = 50
-                '.Columns("Anzahl").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter
+                If .Columns.Contains("Kz") Then .Columns("Kz").Width = 25
 
-                '.Columns("BerechnungsartPosInkludiert").HeaderText = "Pos.inkl."
-                '.Columns("BerechnungsartPosInkludiert").Width = 45
+                'If cbxTypes._value = "LS" Then
+                '    If .Columns.Contains("OutletName") Then .Columns("OutletName").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+                'Else
+                '    If .Columns.Contains("CustomerName") Then .Columns("CustomerName").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+                'End If
 
-                '.Columns("BGebLeistungsNr").Width = 60
-                '.Columns("BGebProzent").Width = 55
-                '.Columns("BGebProzent").HeaderText = "BGeb %"
-                '.Columns("BGebProzent").DefaultCellStyle.Format = "P"
-                '.Columns("BGebProzent").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight
-                '.Columns("BGebMinBetrag").Width = 60
-                '.Columns("BGebMinBetrag").HeaderText = "BGebMinBetr."
-                '.Columns("BGebMinBetrag").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight
-                '.Columns("Eingegeben am").Visible = False
-                '' .Columns("Sachbearbeiter").Visible = False
-                ''  .Columns("Geändert am").Visible = False
-                '.Columns("PreisänderungProzent").Width = 70
-                '.Columns("PreisänderungProzent").HeaderText = "Preisänd. %"
-                '.Columns("PreisänderungProzent").DefaultCellStyle.Format = "p"
-                '.Columns("PreisänderungProzent").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight
-                '.Columns("PreisAlt").Width = 60
-                '.Columns("PreisAlt").DefaultCellStyle.Format = "N2"
-                '.Columns("PreisAlt").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight
-                '.Columns("Preisänderung").Width = 60
-                '.Columns("Preisänderung").HeaderText = "PreisNeu"
-                '.Columns("Preisänderung").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight
-                ''  .Columns("OffertenBez").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
-                ''  .Columns("OffertenBez").HeaderText = "Bezeichnung"
-
-                '.Columns("PreisänderungProzent").Visible = False
-                '.Columns("PreisAlt").Visible = False
-                '.Columns("Preisänderung").Visible = False
 
                 loaded = True
             End With
 
+            If Not doFilter Then
+                initFilter()
+            End If
+
             DGVHasChaged = False
         Catch ex As Exception
             VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
@@ -168,6 +252,86 @@ Public Class usrCntlIDSPreise
 
     End Sub
 
+    Function getSqlText(t) As String
+        Try
+            Return t.Replace("'", "")
+        Catch ex As Exception
+            Return ""
+        End Try
+    End Function
+
+    Function getFilter() As String
+
+
+        Dim filter As String = ""
+        Dim andstr As String = ""
+
+        If dgvFILTER.RowCount > 0 Then
+            For Each c As DataGridViewCell In dgvFILTER.Rows(0).Cells
+                If c.Value IsNot DBNull.Value Then
+                    If c.GetType Is GetType(DataGridViewTextBoxCell) Then
+                        If c.Value IsNot Nothing Then
+                            Dim srchstr = getSqlText(c.Value.ToString.Trim)
+                            'MsgBox(c.OwningColumn.DataPropertyName)
+                            If c.OwningColumn.Name.Contains("ProductTypeCode") Then
+                                filter &= andstr & " tbl_IDS_Rechenwerte.[" & c.OwningColumn.Name & "] = '" & srchstr & "' "
+                            ElseIf c.OwningColumn.Name.Contains("OutletCountryCode") Then
+                                filter &= andstr & " tbl_IDS_Rechenwerte.[" & c.OwningColumn.Name & "] = '" & srchstr & "' "
+
+                            ElseIf c.OwningColumn.Name.Contains("OutletCode") Then
+                                filter &= andstr & " tbl_IDS_Rechenwerte.[" & c.OwningColumn.Name & "] = '" & srchstr & "' "
+
+                            ElseIf c.OwningColumn.Name.Contains("CustomerCode") Then
+                                filter &= andstr & " tbl_IDS_Rechenwerte.[" & c.OwningColumn.Name & "] = '" & srchstr & "' "
+
+                            ElseIf c.OwningColumn.Name.Contains("CustomerName") Then
+                                filter &= andstr & " Adressen.Ordnungsbegriff LIKE '%" & srchstr & "%' "
+
+                            ElseIf IsNumeric(srchstr) Then
+
+                                If srchstr.ToLower = "ist null" Then
+                                    filter &= andstr & "( [" & c.OwningColumn.Name & "] LIKE '' OR  [" & c.OwningColumn.Name & "] is null ) "
+                                Else
+                                    filter &= andstr & " [" & c.OwningColumn.Name & "] = " & srchstr.Replace(",", ".") & ""
+                                End If
+
+                            ElseIf IsDate(srchstr) Then
+                                If srchstr.ToLower = "ist null" Then
+                                    filter &= andstr & "( [" & c.OwningColumn.Name & "] is null ) "
+                                Else
+                                    filter &= andstr & " convert(varchar,[" & c.OwningColumn.Name & "] ,104) LIKE '%" & srchstr & "%' "
+                                End If
+
+
+                            Else
+                                If srchstr.ToLower = "ist null" Then
+                                    filter &= andstr & "( [" & c.OwningColumn.Name & "] LIKE '' OR  [" & c.OwningColumn.Name & "] is null ) "
+                                Else
+                                    filter &= andstr & " [" & c.OwningColumn.Name & "] LIKE '%" & srchstr & "%' "
+                                End If
+                            End If
+                            andstr = " AND "
+                        End If
+
+                    ElseIf c.GetType Is GetType(DataGridViewCheckBoxCell) Then
+                        If c.Value IsNot Nothing AndAlso c.Value.ToString <> "" Then
+                            If c.Value = CheckState.Checked Then
+                                filter &= andstr & " [" & c.OwningColumn.Name & "] =1 "
+                                andstr = " AND "
+                            ElseIf c.Value = CheckState.Unchecked Then
+                                filter &= andstr & " [" & c.OwningColumn.Name & "] =0 "
+                                andstr = " AND "
+                            End If
+                        End If
+                    End If
+
+                End If
+            Next
+        End If
+
+        Return filter
+    End Function
+
 
 
     Private Sub dgvIDS_SelectionChanged(sender As Object, e As EventArgs) Handles dgvIDS.SelectionChanged
@@ -175,18 +339,44 @@ Public Class usrCntlIDSPreise
 
         If dgvIDS.SelectedCells.Count > 0 Then
 
-            If dgvIDS.SelectedCells(0).RowIndex > -1 Then
-                initDGVDieselpreiseDetails(dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value)
+            If dgvIDS.SelectedCells(0).RowIndex > -1 AndAlso dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value > 0 Then
+                initDGVDieselpreiseDetails(dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value, True)
+            Else
+                initDGVDieselpreiseDetails(, True)
             End If
 
         End If
 
     End Sub
 
+    Public Shared Sub EnableDoubleBuffered(ByRef dgv As DataGridView)
+        'Dim dgvType As Type = dgv.[GetType]()
+        'Dim pi As PropertyInfo = dgvType.GetProperty("DoubleBuffered", BindingFlags.Instance Or BindingFlags.NonPublic)
+        'pi.SetValue(dgv, True, Nothing)
+    End Sub
+
+    Sub initKDFilter()
+
+        dgvIDS.Columns("CustomerCode").ReadOnly = True
+        dgvIDS.Columns("CustomerCode").Visible = False
+        Try
+
+            dgvFILTER.Columns("CustomerCode").ReadOnly = True
+            dgvFILTER.Columns("CustomerCode").Visible = False
+            'DirectCast(pnlFilterInside.Controls("txtSrch_KundenNr"), TextBox).Text = kdNr
+            'DirectCast(pnlFilterInside.Controls("txtSrch_KundenNr"), TextBox).Enabled = False
+            '  DirectCast(pnlFilterInside.Controls("txtSrch_KundenNr"), TextBox).ReadOnly = True
+            '  initSearch(pnlFilterInside.Controls("txtSrch_KundenNr"), New EventArgs)
+        Catch ex As Exception
+            '  MsgBox(ex.Message)
+        End Try
+    End Sub
+
 
 
 
     Private Sub usrCntlOfferte_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+
         init(isVerag360)
 
         cbxTypes.Items.Clear()
@@ -199,19 +389,35 @@ Public Class usrCntlIDSPreise
 
         checkPermissions()
 
+
         Dim SQL_ As String = ""
         SQL_ = "SELECT OutletCountry, OutletCountryCode FROM [VERAG].[dbo].[tbl_IDS_Länder] ORDER BY OutletCountry"
+        Dim dt As New DataTable
+
+        dt = SQL.loadDgvBySql(SQL_, "FMZOLL")
+        If dt.Rows.Count > 0 Then
+            Dim newRow As DataRow = dt.NewRow()
+            newRow("OutletCountry") = "Alle"
+            newRow("OutletCountryCode") = -1
+            dt.Rows.InsertAt(newRow, 0)
+            dt.AcceptChanges()
+
+        End If
+
         With dgvIDS
-            .DataSource = SQL.loadDgvBySql(SQL_, "FMZOLL")
+            .DataSource = dt
             .Columns("OutletCountry").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
             .Columns("OutletCountry").HeaderText = "Bezeichnung"
             .Columns("OutletCountryCode").Visible = False
         End With
-
-        dgvOfferteDetails.Columns.Clear()
+        'EnableDoubleBuffered(dgvOfferteDetails)
+        dgvIDSData.Columns.Clear()
         dgvIDS.ClearSelection()
 
         initDGVDieselpreiseDetails()
+        'initFilter()
+        initDGVWidth()
+
 
 
         'AddHandler OFFERTEBind.bindingdataTable.ColumnChanged, Sub(ev As EventArgs, change As DataColumnChangeEventArgs)
@@ -224,6 +430,20 @@ Public Class usrCntlIDSPreise
 
     End Sub
 
+    Sub initDGVWidth()
+        Dim DGVwidth = 0
+        Dim reduceWidth = 0
+        For Each c As DataGridViewColumn In dgvIDSData.Columns
+            DGVwidth += c.Width
+        Next
+        Dim DGVheight = 0
+        For Each r As DataGridViewRow In dgvIDSData.Rows
+            DGVheight += r.Height
+        Next
+        DGVheight += 50
+        ' 
+    End Sub
+
 
 
     Private Sub AddOffert_Click(sender As Object, e As EventArgs) Handles DToolStripMenuItem.Click
@@ -237,27 +457,95 @@ Public Class usrCntlIDSPreise
     End Sub
 
 
-    Private Sub dgvOfferteDetails_CellValueChanged(sender As Object, e As DataGridViewCellEventArgs) Handles dgvOfferteDetails.CellValueChanged
+    Private Sub dgvOfferteDetails_CellValueChanged(sender As Object, e As DataGridViewCellEventArgs) Handles dgvIDSData.CellValueChanged
         Try
             Select Case cbxTypes._value
-                Case "L", "LS", "LSK", "KRW", "LSK"
+                Case "L", "LS", "LSK", "KRW", "LSK", "LK"
                     If loaded = True Then
                         If currentIDS IsNot Nothing Then
                             currentIDS.Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
                             currentIDS.Zeitstempel = Now
 
-                            Select Case dgvOfferteDetails.CurrentCell.ColumnIndex
-                                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
+                            Select Case cbxTypes._value
+                                Case "L"
+                                    Select Case dgvIDSData.CurrentCell.ColumnIndex
+                                        Case 5 : If dgvIDSData.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvIDSData.CurrentCell.Value) Then
+                                                currentIDS.Rechenwert = CDbl(dgvIDSData.CurrentCell.Value)
+                                                DGVHasChaged = True
+                                            End If
+                                        Case 6 : If dgvIDSData.CurrentCell.Value IsNot Nothing AndAlso dgvIDSData.CurrentCell.Value <> "" AndAlso (dgvIDSData.CurrentCell.Value = "R" Or dgvIDSData.CurrentCell.Value = "P") Then
+                                                currentIDS.Kz = dgvIDSData.CurrentCell.Value.ToString
+                                                DGVHasChaged = True
+                                            End If
+                                        Case 7 : If dgvIDSData.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvIDSData.CurrentCell.Value) Then
+                                                currentIDS.KategorieNr = dgvIDSData.CurrentCell.Value.ToString
+                                                DGVHasChaged = True
+                                            Else
+                                                currentIDS.KategorieNr = Nothing
+                                                DGVHasChaged = True
+                                            End If
+                                    End Select
+
+                                Case "LK", "LS"
+
+                                    Select Case dgvIDSData.CurrentCell.ColumnIndex
+                                        Case 7 : If dgvIDSData.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvIDSData.CurrentCell.Value) Then
+                                                currentIDS.Rechenwert = CDbl(dgvIDSData.CurrentCell.Value)
+                                                DGVHasChaged = True
+                                            End If
+                                        Case 8 : If dgvIDSData.CurrentCell.Value IsNot Nothing AndAlso dgvIDSData.CurrentCell.Value <> "" AndAlso (dgvIDSData.CurrentCell.Value = "R" Or dgvIDSData.CurrentCell.Value = "P") Then
+                                                currentIDS.Kz = dgvIDSData.CurrentCell.Value.ToString
+                                                DGVHasChaged = True
+                                            End If
+                                        Case 9 : If dgvIDSData.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvIDSData.CurrentCell.Value) Then
+                                                currentIDS.KategorieNr = dgvIDSData.CurrentCell.Value.ToString
+                                                DGVHasChaged = True
+                                            Else
+                                                currentIDS.KategorieNr = Nothing
+                                                DGVHasChaged = True
+                                            End If
+                                    End Select
+
+                                Case "LSK"
+
+                                    Select Case dgvIDSData.CurrentCell.ColumnIndex
+                                        Case 9 : If dgvIDSData.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvIDSData.CurrentCell.Value) Then
+                                                currentIDS.Rechenwert = CDbl(dgvIDSData.CurrentCell.Value)
+                                                DGVHasChaged = True
+                                            End If
+                                        Case 10 : If dgvIDSData.CurrentCell.Value IsNot Nothing AndAlso dgvIDSData.CurrentCell.Value <> "" AndAlso (dgvIDSData.CurrentCell.Value = "R" Or dgvIDSData.CurrentCell.Value = "P") Then
+                                                currentIDS.Kz = dgvIDSData.CurrentCell.Value.ToString
+                                                DGVHasChaged = True
+                                            End If
+
+                                        Case 11 : If dgvIDSData.CurrentCell.Value IsNot Nothing AndAlso IsNumeric(dgvIDSData.CurrentCell.Value) Then
+                                                currentIDS.KategorieNr = dgvIDSData.CurrentCell.Value.ToString
+                                                DGVHasChaged = True
+                                            Else
+                                                currentIDS.KategorieNr = Nothing
+                                                DGVHasChaged = True
+                                            End If
+                                    End Select
+
+                                Case "KRW"
+
+                                    Select Case dgvIDSData.CurrentCell.ColumnIndex
+                                        Case 4 : If dgvIDSData.CurrentCell.Value IsNot Nothing AndAlso dgvIDSData.CurrentCell.Value <> "" AndAlso (dgvIDSData.CurrentCell.Value = "R" Or dgvIDSData.CurrentCell.Value = "P") Then
+                                                currentIDS.Kz = dgvIDSData.CurrentCell.Value.ToString
+                                                DGVHasChaged = True
+                                            End If
+                                    End Select
+
 
                             End Select
 
-                            DGVHasChaged = True
+                            If DGVHasChaged Then
+
                                 If currentIDS.SAVE() Then
 
                                     If dgvIDS.SelectedCells.Count > 0 Then
 
-                                    If dgvIDS.SelectedCells(0).RowIndex > -1 Then
+                                        If dgvIDS.SelectedCells(0).RowIndex > -1 AndAlso dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value > 0 Then
                                             initDGVDieselpreiseDetails(dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value)
                                         End If
 
@@ -267,7 +555,7 @@ Public Class usrCntlIDSPreise
                                     End If
 
                                 End If
-
+                            End If
                         End If
                     End If
 
@@ -294,33 +582,33 @@ Public Class usrCntlIDSPreise
 
     End Sub
 
-    Private Sub cbxArchivierteOffertenAnzeigen_CheckedChanged(sender As Object, e As EventArgs)
+    'Private Sub cbxArchivierteOffertenAnzeigen_CheckedChanged(sender As Object, e As EventArgs)
 
-        If dgvIDS.SelectedRows.Count = 0 Then Exit Sub
+    '    If dgvIDS.SelectedRows.Count = 0 Then Exit Sub
 
-        initDGVDieselpreiseDetails(dgvIDS.SelectedRows(0).Cells("OffertenNr").Value)
+    '    initDGVDieselpreiseDetails(dgvIDS.SelectedRows(0).Cells("OffertenNr").Value)
 
 
-    End Sub
+    'End Sub
 
 
     Private Sub checkPerimissionsDGVDetails()
 
         Try
-            With dgvOfferteDetails
+            With dgvIDSData
 
                 If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("DIESELPREISE_BEARBEITEN", "SDL") Then
                     For Each c As DataGridViewColumn In .Columns
                         c.ReadOnly = True
                         handleEditMode(False)
                     Next
-                    dgvOfferteDetails.AllowUserToDeleteRows = False
+                    dgvIDSData.AllowUserToDeleteRows = False
                 Else
 
                     For Each c As DataGridViewColumn In .Columns
 
                         If isVerag360 Then
-                            If (c.Name = "Rechenwert" Or c.Name = "Kz") Then
+                            If (c.Name = "Rechenwert" Or c.Name = "Kz" Or c.Name = "OutletCountryCode" Or c.Name = "OutletCountry" Or c.Name = "ProductTypeCode" Or c.Name = "ProductDescription" Or c.Name = "KategorieNr" Or c.Name = "CustomerCode" Or c.Name = "CustomerName") Then
                                 If edit Then
                                     c.ReadOnly = False
                                     handleEditMode(edit)
@@ -336,7 +624,7 @@ Public Class usrCntlIDSPreise
                         End If
 
                     Next
-                    dgvOfferteDetails.AllowUserToDeleteRows = False
+                    dgvIDSData.AllowUserToDeleteRows = False
                 End If
 
             End With
@@ -353,7 +641,7 @@ Public Class usrCntlIDSPreise
 
             dgvIDS.Enabled = False
             'currentOffert = New VERAG_PROG_ALLGEMEIN.cOfferte(dgvIDS.SelectedRows(0).Cells("OffertenNr").Value, False)
-            Dim orgDataTable As DataTable = dgvOfferteDetails.DataSource
+            Dim orgDataTable As DataTable = dgvIDSData.DataSource
             tmpDataTable = orgDataTable.Copy
 
         Catch ex As Exception
@@ -371,9 +659,9 @@ Public Class usrCntlIDSPreise
             dgvIDS.ReadOnly = True
 
         Else
-            dgvOfferteDetails.AllowUserToAddRows = True
-            dgvOfferteDetails.AllowUserToDeleteRows = True
-            dgvOfferteDetails.RowHeadersVisible = True
+            dgvIDSData.AllowUserToAddRows = True
+            dgvIDSData.AllowUserToDeleteRows = True
+            dgvIDSData.RowHeadersVisible = True
 
         End If
 
@@ -390,7 +678,7 @@ Public Class usrCntlIDSPreise
         If isInEditMode Then
 
             dgvIDS.Enabled = False
-            dgvOfferteDetails.ReadOnly = False
+            dgvIDSData.ReadOnly = False
             btnOfferteSpeichern.Enabled = True
             btnCloseEditMode.Visible = True
             cbxTypes.Enabled = False
@@ -398,7 +686,7 @@ Public Class usrCntlIDSPreise
         Else
 
             dgvIDS.Enabled = True
-            dgvOfferteDetails.ReadOnly = True
+            dgvIDSData.ReadOnly = True
             btnOfferteSpeichern.Enabled = False
             btnCloseEditMode.Visible = False
             cbxTypes.Enabled = True
@@ -408,14 +696,14 @@ Public Class usrCntlIDSPreise
     End Sub
 
 
-    Private Sub dgvOfferteDetails_UserDeletingRow(sender As Object, e As DataGridViewRowCancelEventArgs) Handles dgvOfferteDetails.UserDeletingRow
+    Private Sub dgvOfferteDetails_UserDeletingRow(sender As Object, e As DataGridViewRowCancelEventArgs) Handles dgvIDSData.UserDeletingRow
         DGVHasChaged = True
     End Sub
 
-    Private Sub dgvOfferteDetails_KeyUp(sender As Object, e As KeyEventArgs) Handles dgvOfferteDetails.KeyUp
+    Private Sub dgvOfferteDetails_KeyUp(sender As Object, e As KeyEventArgs) Handles dgvIDSData.KeyUp
         If e.KeyCode = Keys.Tab Then
 
-            dgvOfferteDetails.CurrentCell = GetNextCell(dgvOfferteDetails.CurrentCell)
+            dgvIDSData.CurrentCell = GetNextCell(dgvIDSData.CurrentCell)
             e.Handled = True
 
         End If
@@ -428,13 +716,13 @@ Public Class usrCntlIDSPreise
         Dim nextCell As DataGridViewCell = currentCell
         Dim j = 0
         Do
-            Dim nextCellIndex As Integer = (nextCell.ColumnIndex + j) Mod dgvOfferteDetails.ColumnCount
-            Dim nextRowIndex As Integer = If(nextCellIndex = 0, (nextCell.RowIndex + 1) Mod dgvOfferteDetails.RowCount, nextCell.RowIndex)
+            Dim nextCellIndex As Integer = (nextCell.ColumnIndex + j) Mod dgvIDSData.ColumnCount
+            Dim nextRowIndex As Integer = If(nextCellIndex = 0, (nextCell.RowIndex + 1) Mod dgvIDSData.RowCount, nextCell.RowIndex)
             'lblIDS.Text = "C" & nextCellIndex & "R" & nextRowIndex & "RO" & IIf(nextCell.[ReadOnly], "1", "0") & "H" & IIf(Not nextCell.Visible, "1", "0")
-            nextCell = dgvOfferteDetails.Rows(nextRowIndex).Cells(nextCellIndex)
+            nextCell = dgvIDSData.Rows(nextRowIndex).Cells(nextCellIndex)
             i += 1
             j = 1
-        Loop While (i < (dgvOfferteDetails.RowCount * dgvOfferteDetails.ColumnCount) AndAlso (nextCell.[ReadOnly]) Or i < (dgvOfferteDetails.RowCount * dgvOfferteDetails.ColumnCount) AndAlso Not nextCell.Visible)
+        Loop While (i < (dgvIDSData.RowCount * dgvIDSData.ColumnCount) AndAlso (nextCell.[ReadOnly]) Or i < (dgvIDSData.RowCount * dgvIDSData.ColumnCount) AndAlso Not nextCell.Visible)
 
         Return nextCell
 
@@ -448,6 +736,9 @@ Public Class usrCntlIDSPreise
             initDGVDieselpreiseDetails()
         End If
 
+        'initFilter()
+        initDGVWidth()
+
     End Sub
 
 
@@ -475,20 +766,275 @@ Public Class usrCntlIDSPreise
         checkPerimissionsDGVDetails()
     End Sub
 
-    Private Sub dgvOfferteDetails_SelectionChanged(sender As Object, e As EventArgs) Handles dgvOfferteDetails.SelectionChanged
+    Private Sub dgvOfferteDetails_SelectionChanged(sender As Object, e As EventArgs) Handles dgvIDSData.SelectionChanged
 
-        If dgvOfferteDetails.Columns.Contains("ID") Then
+        If dgvIDSData.Columns.Contains("ID") Then
 
-            If dgvOfferteDetails.SelectedCells.Count > 0 Then
+            If dgvIDSData.SelectedCells.Count > 0 Then
 
-                If dgvOfferteDetails.SelectedCells(0).RowIndex > -1 Then
-                    currentIDS = New cIDSDieselpreisRW(dgvOfferteDetails.Rows(dgvOfferteDetails.SelectedCells(0).RowIndex).Cells("ID").Value)
+                If dgvIDSData.SelectedCells(0).RowIndex > -1 Then
+                    currentIDS = New cIDSDieselpreisRW(dgvIDSData.Rows(dgvIDSData.SelectedCells(0).RowIndex).Cells("ID").Value)
                 End If
 
             End If
 
+        Else
+
+            currentIDS = New cIDSDieselpreisRW()
 
         End If
 
     End Sub
+
+    Private Sub btnKunde_Click(sender As Object, e As EventArgs) Handles btnKunde.Click
+
+        '1. Check ob der neue Kunde noch keine Einträge hat! -> ja -> abbrechen
+        '2. Check ob der Quellkunde Einträge besitzt! -> nein -> abbrechen
+        '3. alle Einträge durchlaufen und insert_into
+
+        If dgvIDSData.Rows.Count > 0 Then
+
+            Dim newRWKunde As Integer = 0
+
+            Dim s = InputBox("Bitte die neuen IDS-KundenNr eingeben:", "KundenNr")
+            If Not IsNumeric(s) Then
+                Exit Sub
+            Else
+                newRWKunde = s
+                Dim adresse As New cAdressen(s)
+                If Not adresse.hasEntry Then
+                    MsgBox("Der Kunde ist nicht in der Datenbank angelegt!" & vbNewLine & "Vorgang wird abgebrochen!")
+                    Exit Sub
+                End If
+            End If
+
+            Dim count As Integer = 0
+
+            Dim countString As String = SQL.getValueTxtBySql("select count(*) from tbl_IDS_Rechenwerte where CustomerCode =" & newRWKunde, "FMZOLL")
+            If countString <> "" Then
+                count = CInt(countString)
+            End If
+
+            If newRWKunde > 0 Then
+
+                If count > 0 Then
+                    MsgBox("Es gibt bereits Rechnenwerte für die IDS-KundenNr " & newRWKunde & "!" & vbNewLine & "Vorgang wird abgebrochen!")
+                    Exit Sub
+                End If
+
+                If vbYes = MsgBox("Möchten Sie die Rechenwerte von Kunden " & Kunde & " übernehmen?" & vbNewLine & "Es werden alle verfügbaren Rechenwerte auf den neuen Kunden kopiert!", vbYesNoCancel) Then
+                    Dim counter As Integer = 0
+                    'do-it
+
+                    Dim dt As New DataTable
+                    dt = SQL.loadDgvBySql("SELECT [OutletCountryCode],[OutletCode],[CustomerCode],[ProductTypeCode],[Rechenwert],[Kz],[Zeitstempel],[Sachbearbeiter],[KategorieNr] FROM tbl_IDS_Rechenwerte where CustomerCode =" & Kunde, "FMZOLL")
+
+                    If dt IsNot Nothing Then
+
+                        For Each r In dt.Rows
+
+                            If SQL.doSQL("INSERT INTO [tbl_IDS_Rechenwerte] ([OutletCountryCode],[OutletCode],[CustomerCode],[ProductTypeCode],[Rechenwert],[Kz],[Zeitstempel],[Sachbearbeiter],[KategorieNr]) 
+                            VALUES ('" & r(0) & "','" & r(1) & "','" & newRWKunde & "','" & r(3) & "','" & r(4) & "','" & r(5) & "','" & Now() & "','" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & "','" & r(8) & "')", "FMZOLL") Then counter += 1
+
+                        Next
+
+                        info(counter & " Datensätze wurden angelegt!")
+
+                    End If
+
+                End If
+
+            End If
+        End If
+
+
+
+    End Sub
+
+    Private Sub dgvOfferteDetails_ColumnWidthChanged(sender As Object, e As DataGridViewColumnEventArgs) Handles dgvIDSData.ColumnWidthChanged
+        initfilterColumnsWidth()
+    End Sub
+
+    Private Sub dgvFILTER_CellValueChanged(sender As Object, e As DataGridViewCellEventArgs) Handles dgvFILTER.CellValueChanged
+
+
+        If e.RowIndex >= 0 AndAlso e.ColumnIndex >= 0 Then
+            Dim dgv As DataGridView = CType(sender, DataGridView)
+            ' Spaltenname
+            Dim colName As String = dgv.Columns(e.ColumnIndex).Name
+
+            ' Neuer Wert (Nothing prüfen, falls leer)
+            Dim newValue As Object = dgv.Rows(e.RowIndex).Cells(e.ColumnIndex).Value
+
+
+            If colName = "CustomerCode" AndAlso IsNumeric(newValue) Then
+                Kunde = newValue
+                btnKunde.Visible = True
+            Else
+                btnKunde.Visible = False
+            End If
+
+            If colName = "Rechenwert" AndAlso IsNumeric(newValue) Then
+                RW = newValue
+                btnRW.Visible = True
+            Else
+                btnRW.Visible = False
+            End If
+
+        End If
+
+        Dim enableButtonAdd As Boolean = True
+
+        For Each col As DataGridViewColumn In dgvFILTER.Columns
+            Dim colName As String = dgvFILTER.Columns(col.Index).Name
+            Dim value As String = dgvFILTER.Rows(0).Cells(col.Index).Value
+            Dim isVisible As Boolean = dgvFILTER.Rows(0).Cells(col.Index).Visible
+
+            'Prüfung ob alle Pflichtfelder ausgefüllt sind.
+            If (colName.Contains("Code") Or colName.Contains("Kz") Or colName.Contains("Rechenwert")) AndAlso (value Is Nothing Or value = "") AndAlso isVisible Then
+                enableButtonAdd = False
+                Exit For
+            End If
+
+        Next
+        btnAdd.Visible = enableButtonAdd
+
+        If dgvIDS.SelectedCells.Count > 0 Then
+
+            If dgvIDS.SelectedCells(0).RowIndex > -1 AndAlso dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value > 0 Then
+                initDGVDieselpreiseDetails(dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value, True)
+            Else
+                initDGVDieselpreiseDetails(, True)
+
+            End If
+        Else
+            initDGVDieselpreiseDetails(, True)
+
+        End If
+
+        initfilterColumnsWidth()
+    End Sub
+
+    Private Sub dgvFILTER_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvFILTER.CellContentClick
+        If dgvFILTER.Columns(e.ColumnIndex).GetType Is GetType(DataGridViewCheckBoxColumn) Then
+            dgvIDS.Focus()
+        End If
+    End Sub
+
+    Private Sub dgvFILTER_SelectionChanged(sender As Object, e As EventArgs) Handles dgvFILTER.SelectionChanged
+        dgvFILTER.ClearSelection()
+    End Sub
+
+    Private Sub btnRW_Click(sender As Object, e As EventArgs) Handles btnRW.Click
+
+        If dgvIDSData.Rows.Count > 0 Then
+
+            Dim newRW As Double = 0
+
+            Dim s = InputBox("Bitte den neuen RW eingeben:", "Rechenwert")
+            If IsNumeric(s) Then
+                newRW = s
+            Else
+                Exit Sub
+            End If
+
+            If vbYes = MsgBox("Möchten Sie den Rechenwert von " & RW & " auf " & s & " setzen?", vbYesNoCancel) Then
+
+                Dim counter As Integer = 0
+                For Each r As DataGridViewRow In dgvIDSData.Rows
+
+                    If r.Cells("ID").Value IsNot Nothing AndAlso IsNumeric(r.Cells("ID").Value) Then
+
+                        Dim curDP = New VERAG_PROG_ALLGEMEIN.cIDSDieselpreisRW(r.Cells("ID").Value)
+                        curDP.Rechenwert = s.Replace(",", ".")
+                        curDP.Zeitstempel = Now()
+                        curDP.Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
+                        If curDP.SAVE() Then counter += 1
+                    End If
+
+                Next
+
+
+                If dgvIDS.SelectedCells.Count > 0 Then
+
+                    If dgvIDS.SelectedCells(0).RowIndex > -1 AndAlso dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value > 0 Then
+                        initDGVDieselpreiseDetails(dgvIDS.Rows(dgvIDS.SelectedCells(0).RowIndex).Cells("OutletCountryCode").Value, True)
+                    Else
+                        initDGVDieselpreiseDetails(, True)
+
+                    End If
+                Else
+                    initDGVDieselpreiseDetails(, True)
+
+                End If
+
+                info(counter & " Datensätze wurden aktualisiert!")
+
+            End If
+
+
+        End If
+
+
+    End Sub
+
+    Private Sub info(text As String)
+
+        If text <> "" Then
+            MsgBox(text)
+        End If
+
+
+
+    End Sub
+
+    Private Sub btnAdd_Click(sender As Object, e As EventArgs) Handles btnAdd.Click
+
+        If dgvIDSData.Rows.Count = 0 Then
+            If vbYes = MsgBox("Möchten Sie den die oben angegebenen Werte für " & cbxTypes.SelectedItem.ToString & " in die Datenbank eintragen?", vbYesNoCancel) Then
+
+                Select Case cbxTypes._value
+
+                    Case "KOR"
+                        If dgvFILTER.Columns.Contains("CustomerCode") AndAlso dgvFILTER.Rows(0).Cells("CustomerCode").Value IsNot Nothing AndAlso IsNumeric(dgvFILTER.Rows(0).Cells("CustomerCode").Value) Then
+                            Dim CustomerCode As Integer = dgvFILTER.Rows(0).Cells("CustomerCode").Value
+
+
+                            If SQL.doSQL("INSERT INTO [tbl_IDS_Kunden_ohne_Rabatt] ([CustomerCode],[Zeitstempel],[Sachbearbeiter]) 
+                            VALUES ('" & CustomerCode & "','" & Now() & "','" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & "')", "FMZOLL") Then
+                                MsgBox("Eintrag wurde gespeichert!")
+                                initDGVDieselpreiseDetails(-1, True)
+                            End If
+                        End If
+                    Case Else
+
+
+                        Dim newIDS As New VERAG_PROG_ALLGEMEIN.cIDSDieselpreisRW()
+                        Dim OutletCountryCode As Integer = -1
+                        If dgvFILTER.Columns.Contains("CustomerCode") AndAlso dgvFILTER.Rows(0).Cells("CustomerCode").Value IsNot Nothing AndAlso IsNumeric(dgvFILTER.Rows(0).Cells("CustomerCode").Value) Then newIDS.CustomerCode = dgvFILTER.Rows(0).Cells("CustomerCode").Value
+                        If dgvFILTER.Columns.Contains("OutletCode") AndAlso dgvFILTER.Rows(0).Cells("OutletCode").Value IsNot Nothing AndAlso IsNumeric(dgvFILTER.Rows(0).Cells("OutletCode").Value) Then newIDS.OutletCode = dgvFILTER.Rows(0).Cells("OutletCode").Value
+                        If dgvFILTER.Columns.Contains("OutletCountryCode") AndAlso dgvFILTER.Rows(0).Cells("OutletCountryCode").Value IsNot Nothing AndAlso IsNumeric(dgvFILTER.Rows(0).Cells("OutletCountryCode").Value) Then
+                            newIDS.OutletCountryCode = dgvFILTER.Rows(0).Cells("OutletCountryCode").Value
+                            OutletCountryCode = dgvFILTER.Rows(0).Cells("OutletCountryCode").Value
+                        End If
+                        If dgvFILTER.Columns.Contains("ProductTypeCode") AndAlso dgvFILTER.Rows(0).Cells("ProductTypeCode").Value IsNot Nothing AndAlso IsNumeric(dgvFILTER.Rows(0).Cells("ProductTypeCode").Value) Then newIDS.ProductTypeCode = dgvFILTER.Rows(0).Cells("ProductTypeCode").Value
+                        If dgvFILTER.Columns.Contains("Rechenwert") AndAlso dgvFILTER.Rows(0).Cells("Rechenwert").Value IsNot Nothing AndAlso IsNumeric(dgvFILTER.Rows(0).Cells("Rechenwert").Value) Then newIDS.Rechenwert = dgvFILTER.Rows(0).Cells("Rechenwert").Value
+                        If dgvFILTER.Columns.Contains("KategorieNr") AndAlso dgvFILTER.Rows(0).Cells("KategorieNr").Value IsNot Nothing AndAlso IsNumeric(dgvFILTER.Rows(0).Cells("KategorieNr").Value) Then newIDS.KategorieNr = dgvFILTER.Rows(0).Cells("KategorieNr").Value
+                        If dgvFILTER.Columns.Contains("Kz") AndAlso dgvFILTER.Rows(0).Cells("Kz").Value IsNot Nothing AndAlso dgvFILTER.Rows(0).Cells("Kz").Value <> "" Then newIDS.Kz = dgvFILTER.Rows(0).Cells("Kz").Value
+
+                        newIDS.Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
+                        newIDS.Zeitstempel = Now
+
+                        If newIDS.SAVE() Then
+                            MsgBox("Eintrag wurde gespeichert!")
+                            initDGVDieselpreiseDetails(OutletCountryCode, True)
+
+                        End If
+
+                End Select
+
+            End If
+        End If
+
+    End Sub
 End Class

SDL/kunden/usrCntlKundenuebersicht.vb

@@ -518,6 +518,8 @@ Public Class usrCntlKundenuebersicht
             '   TMPText = TMPText.Replace("/", "" & vbNewLine)
             rtbAbf_Besonderheiten.Text = TMPText
 
+            initInsolvent(KUNDE_ERW.kde_CSinsolventAm)
+
             ' lblKreditlimit.BackColor = Color.White
             lblKreditlimit.Text = checkNullNbr(KUNDE.Kreditlimit).ToString("C", CultureInfo.CurrentCulture)
             If KUNDE.Kreditlimit <> 0 And KUNDE.Kreditlimit <> 2600 Then
@@ -714,6 +716,15 @@ Public Class usrCntlKundenuebersicht
         End If
     End Sub
 
+    Sub initInsolvent(insolvent)
+        If insolvent IsNot Nothing Then
+            lblInsolvent.Visible = True
+            lblInsolvent.Text = "KUNDE INSOLVENT " & IIf(IsDate(insolvent), " SEIT " & CDate(insolvent).ToShortDateString, "")
+        Else
+            lblInsolvent.Visible = False
+        End If
+    End Sub
+
 
     Sub showForm(t As String, Optional h As String = "")
         Dim f As New Form
@@ -3362,14 +3373,14 @@ Public Class usrCntlKundenuebersicht
             End If
 
 
-            company.lastChecked = IIf(IsDate(lastChecked), lastChecked, Today().AddDays(-30))
+            company.lastChecked = IIf(IsDate(lastChecked), lastChecked, Today().AddDays(-365))
 
             Dim currentBonID As Integer = SQL.getValueTxtBySql("Select Top(1) isnull(ba_id, -1) FROM [tblBonitaetsauskunft] where ba_KundenNr = " & KUNDE.KundenNr & " AND [ba_Pruefungstool] = 'creditsafe API' ORDER BY ba_Datum DESC", "FMZOLL")
 
             If currentBonID > 0 Then company.csBonID = currentBonID
 
             Dim dt As New DataTable()
-            If cs.getCompanyEvents(company, dt, checklastDate, True) = "Error" Then
+            If cs.getCompanyEventsDetails(company, dt, checklastDate, True, False) = "Error" Then
                 Exit Sub
             End If
 
@@ -3399,10 +3410,10 @@ Public Class usrCntlKundenuebersicht
                     frm.Controls.Add(dgv)
                     frm.StartPosition = FormStartPosition.CenterScreen
 
-                    If frm.ShowDialog().Cancel Then
+                    'If frm.ShowDialog() = DialogResult.Cancel Then
                     initCreditsave()
                     setKD(kdNr)
-                    End If
+                    'End If
 
 
 

SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb

@@ -272,6 +272,8 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.txtUSt_GVAngefordertAm = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.tbSonstiges = New System.Windows.Forms.TabPage()
         Me.cbxCS_Added = New System.Windows.Forms.CheckBox()
+        Me.cbxCSInsolvent = New System.Windows.Forms.CheckBox()
+        Me.cbxCS_Added = New System.Windows.Forms.CheckBox()
         Me.Label113 = New System.Windows.Forms.Label()
         Me.Label112 = New System.Windows.Forms.Label()
         Me.dgvIDS_Rabatte = New System.Windows.Forms.DataGridView()
@@ -412,6 +414,7 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.cboAuswahl = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.btnBnkExcel = New System.Windows.Forms.Button()
         Me.tbcntrDetails.SuspendLayout()
         Me.tbAbfertigung.SuspendLayout()
         Me.tbcntrAbf.SuspendLayout()
@@ -3851,6 +3854,7 @@ Partial Class usrcntlKundeBearbeitenFull
         '
         'tbSonstiges
         '
+        Me.tbSonstiges.Controls.Add(Me.cbxCSInsolvent)
         Me.tbSonstiges.Controls.Add(Me.cbxCS_Added)
         Me.tbSonstiges.Controls.Add(Me.Label113)
         Me.tbSonstiges.Controls.Add(Me.Label112)
@@ -3897,6 +3901,16 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.tbSonstiges.Text = "Sonstiges"
         Me.tbSonstiges.UseVisualStyleBackColor = True
         '
+        'cbxCSInsolvent
+        '
+        Me.cbxCSInsolvent.AutoSize = True
+        Me.cbxCSInsolvent.Location = New System.Drawing.Point(406, 26)
+        Me.cbxCSInsolvent.Name = "cbxCSInsolvent"
+        Me.cbxCSInsolvent.Size = New System.Drawing.Size(102, 17)
+        Me.cbxCSInsolvent.TabIndex = 39
+        Me.cbxCSInsolvent.Text = "Kunde insolvent"
+        Me.cbxCSInsolvent.UseVisualStyleBackColor = True
+        '
         'cbxCS_Added
         '
         Me.cbxCS_Added.AutoSize = True
@@ -3922,7 +3936,7 @@ Partial Class usrcntlKundeBearbeitenFull
         '
         Me.Label112.AutoSize = True
         Me.Label112.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label112.Location = New System.Drawing.Point(425, 92)
+        Me.Label112.Location = New System.Drawing.Point(425, 119)
         Me.Label112.Name = "Label112"
         Me.Label112.Size = New System.Drawing.Size(119, 13)
         Me.Label112.TabIndex = 35
@@ -4040,7 +4054,7 @@ Partial Class usrcntlKundeBearbeitenFull
         '
         'txtSonst_KdNrTOBB
         '
-        Me.txtSonst_KdNrTOBB.Location = New System.Drawing.Point(540, 50)
+        Me.txtSonst_KdNrTOBB.Location = New System.Drawing.Point(540, 71)
         Me.txtSonst_KdNrTOBB.MaxLength = 20
         Me.txtSonst_KdNrTOBB.Name = "txtSonst_KdNrTOBB"
         Me.txtSonst_KdNrTOBB.Size = New System.Drawing.Size(122, 20)
@@ -4052,7 +4066,7 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.Label96.AutoSize = True
         Me.Label96.Enabled = False
         Me.Label96.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label96.Location = New System.Drawing.Point(427, 53)
+        Me.Label96.Location = New System.Drawing.Point(427, 74)
         Me.Label96.Name = "Label96"
         Me.Label96.Size = New System.Drawing.Size(83, 13)
         Me.Label96.TabIndex = 21
@@ -4122,37 +4136,37 @@ Partial Class usrcntlKundeBearbeitenFull
         'cbxSonst_CsvAsfinag
         '
         Me.cbxSonst_CsvAsfinag.AutoSize = True
-        Me.cbxSonst_CsvAsfinag.Location = New System.Drawing.Point(428, 131)
+        Me.cbxSonst_CsvAsfinag.Location = New System.Drawing.Point(504, 165)
         Me.cbxSonst_CsvAsfinag.Name = "cbxSonst_CsvAsfinag"
-        Me.cbxSonst_CsvAsfinag.Size = New System.Drawing.Size(136, 17)
+        Me.cbxSonst_CsvAsfinag.Size = New System.Drawing.Size(62, 17)
         Me.cbxSonst_CsvAsfinag.TabIndex = 15
-        Me.cbxSonst_CsvAsfinag.Text = "AT-Abrechnungsdaten "
+        Me.cbxSonst_CsvAsfinag.Text = "AT-Abr."
         Me.cbxSonst_CsvAsfinag.UseVisualStyleBackColor = True
         '
         'cbxSonst_CsvUTA
         '
         Me.cbxSonst_CsvUTA.AutoSize = True
-        Me.cbxSonst_CsvUTA.Location = New System.Drawing.Point(428, 177)
+        Me.cbxSonst_CsvUTA.Location = New System.Drawing.Point(572, 165)
         Me.cbxSonst_CsvUTA.Name = "cbxSonst_CsvUTA"
-        Me.cbxSonst_CsvUTA.Size = New System.Drawing.Size(144, 17)
+        Me.cbxSonst_CsvUTA.Size = New System.Drawing.Size(73, 17)
         Me.cbxSonst_CsvUTA.TabIndex = 14
-        Me.cbxSonst_CsvUTA.Text = "UTA-Abrechnungsdaten "
+        Me.cbxSonst_CsvUTA.Text = "UTA-Abr. "
         Me.cbxSonst_CsvUTA.UseVisualStyleBackColor = True
         '
         'cbxSonst_CsvMSE
         '
         Me.cbxSonst_CsvMSE.AutoSize = True
-        Me.cbxSonst_CsvMSE.Location = New System.Drawing.Point(428, 154)
+        Me.cbxSonst_CsvMSE.Location = New System.Drawing.Point(428, 165)
         Me.cbxSonst_CsvMSE.Name = "cbxSonst_CsvMSE"
-        Me.cbxSonst_CsvMSE.Size = New System.Drawing.Size(142, 17)
+        Me.cbxSonst_CsvMSE.Size = New System.Drawing.Size(71, 17)
         Me.cbxSonst_CsvMSE.TabIndex = 9
-        Me.cbxSonst_CsvMSE.Text = "MSE-Abrechnungsdaten"
+        Me.cbxSonst_CsvMSE.Text = "MSE-Abr."
         Me.cbxSonst_CsvMSE.UseVisualStyleBackColor = True
         '
         'cbxSonst_CsvMautbericht
         '
         Me.cbxSonst_CsvMautbericht.AutoSize = True
-        Me.cbxSonst_CsvMautbericht.Location = New System.Drawing.Point(428, 111)
+        Me.cbxSonst_CsvMautbericht.Location = New System.Drawing.Point(428, 141)
         Me.cbxSonst_CsvMautbericht.Name = "cbxSonst_CsvMautbericht"
         Me.cbxSonst_CsvMautbericht.Size = New System.Drawing.Size(82, 17)
         Me.cbxSonst_CsvMautbericht.TabIndex = 2
@@ -4178,7 +4192,7 @@ Partial Class usrcntlKundeBearbeitenFull
         '
         'txtSonst_KdNrTelepass
         '
-        Me.txtSonst_KdNrTelepass.Location = New System.Drawing.Point(540, 73)
+        Me.txtSonst_KdNrTelepass.Location = New System.Drawing.Point(540, 94)
         Me.txtSonst_KdNrTelepass.Name = "txtSonst_KdNrTelepass"
         Me.txtSonst_KdNrTelepass.Size = New System.Drawing.Size(122, 20)
         Me.txtSonst_KdNrTelepass.TabIndex = 11
@@ -4187,7 +4201,7 @@ Partial Class usrcntlKundeBearbeitenFull
         '
         Me.Label74.AutoSize = True
         Me.Label74.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label74.Location = New System.Drawing.Point(425, 76)
+        Me.Label74.Location = New System.Drawing.Point(425, 97)
         Me.Label74.Name = "Label74"
         Me.Label74.Size = New System.Drawing.Size(109, 13)
         Me.Label74.TabIndex = 10
@@ -4230,7 +4244,7 @@ Partial Class usrcntlKundeBearbeitenFull
         'txtSonst_KdNrIDS
         '
         Me.txtSonst_KdNrIDS.Enabled = False
-        Me.txtSonst_KdNrIDS.Location = New System.Drawing.Point(540, 28)
+        Me.txtSonst_KdNrIDS.Location = New System.Drawing.Point(540, 49)
         Me.txtSonst_KdNrIDS.Name = "txtSonst_KdNrIDS"
         Me.txtSonst_KdNrIDS.Size = New System.Drawing.Size(122, 20)
         Me.txtSonst_KdNrIDS.TabIndex = 4
@@ -4241,7 +4255,7 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.Label70.AutoSize = True
         Me.Label70.Enabled = False
         Me.Label70.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label70.Location = New System.Drawing.Point(427, 28)
+        Me.Label70.Location = New System.Drawing.Point(427, 49)
         Me.Label70.Name = "Label70"
         Me.Label70.Size = New System.Drawing.Size(72, 13)
         Me.Label70.TabIndex = 3
@@ -4481,6 +4495,7 @@ Partial Class usrcntlKundeBearbeitenFull
         '
         'tbBankverbindungen
         '
+        Me.tbBankverbindungen.Controls.Add(Me.btnBnkExcel)
         Me.tbBankverbindungen.Controls.Add(Me.dgvBankverbindungen)
         Me.tbBankverbindungen.Controls.Add(Me.cbxAlleBVanzeigen)
         Me.tbBankverbindungen.Controls.Add(Me.Label108)
@@ -5644,6 +5659,18 @@ Partial Class usrcntlKundeBearbeitenFull
         Me.DataGridViewTextBoxColumn2.HeaderText = "E-Mail"
         Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2"
         '
+        'btnBnkExcel
+        '
+        Me.btnBnkExcel.BackgroundImage = Global.SDL.My.Resources.Resources.Excel_logo
+        Me.btnBnkExcel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.btnBnkExcel.FlatAppearance.BorderSize = 0
+        Me.btnBnkExcel.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnBnkExcel.Location = New System.Drawing.Point(15, 290)
+        Me.btnBnkExcel.Name = "btnBnkExcel"
+        Me.btnBnkExcel.Size = New System.Drawing.Size(25, 20)
+        Me.btnBnkExcel.TabIndex = 137
+        Me.btnBnkExcel.UseVisualStyleBackColor = True
+        '
         'usrcntlKundeBearbeitenFull
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -6105,6 +6132,8 @@ Partial Class usrcntlKundeBearbeitenFull
     Friend WithEvents cbxErstattungsart As VERAG_PROG_ALLGEMEIN.MyComboBox
     Friend WithEvents cbpKopfsammelrechnung As CheckBox
     Friend WithEvents cbxCS_Added As CheckBox
+    Friend WithEvents cbxCSInsolvent As CheckBox
+    Friend WithEvents btnBnkExcel As Button
     Friend WithEvents Panel2 As Panel
     Friend WithEvents Label114 As Label
     Friend WithEvents txtProvDLProzent As VERAG_PROG_ALLGEMEIN.MyTextBox

SDL/kunden/usrcntlKundeBearbeitenFull.vb

@@ -1,4 +1,6 @@
-Public Class usrcntlKundeBearbeitenFull
+Imports com.sun.xml.internal.rngom
+
+Public Class usrcntlKundeBearbeitenFull
 
     Dim KUNDE As VERAG_PROG_ALLGEMEIN.cKunde = Nothing
     Dim KUNDE_ERW As VERAG_PROG_ALLGEMEIN.cKundenErweitert = Nothing
@@ -213,6 +215,7 @@
         txtVorauszahlung.Text = loadValue(KUNDE_ERW.kde_AnmerkungVZ, "")
         cbxFR.Checked = loadValue(KUNDE_ERW.kde_FR, False)
         cbxCS_Added.Checked = loadValue(KUNDE_ERW.kde_CSPortfolioAdded, False)
+        cbxCSInsolvent.Checked = IIf(Not IsDBNull(KUNDE_ERW.kde_CSinsolventAm) AndAlso KUNDE_ERW.kde_CSinsolventAm IsNot Nothing, True, False)
         txtFR.Text = loadValue(KUNDE_ERW.kde_AnmerkungFR, "")
         cbpKopfsammelrechnung.Checked = KUNDE_ERW.kde_Kopfsammelrechnung
         txtAnmerkungAntraege.Text = loadValue(KUNDE_ERW.kde_AnmerkungAntrag, "")
@@ -722,6 +725,7 @@
         KUNDE_ERW.kde_txtVersicherungDeckungsquote = isLeerNothingDbl(txtVersicherungDeckungsquote._value)
         KUNDE_ERW.kde_txtVersicherungNichtVersicherbar = cbxNichtVersicherbar.Checked
         KUNDE_ERW.kde_CSPortfolioAdded = cbxCS_Added.Checked
+
         KUNDE_ERW.kde_Versicherung_GemeldeterBetrag = isLeerNothingDbl(txtVersicherung_GemeldeterBetrag._value)
         KUNDE_ERW.kde_txtVersicherungEHNr = isLeerNothing(txtVers_EHNr._value)
 
@@ -1279,7 +1283,7 @@
                     If isVerag360 Then
                         cbxFiBu.Checked = True : cboFirma.changeItem("19") : cboFiliale.changeItem("8001") : cbxErstattungsart.changeItem("1")
                     Else
-                        cbxFiBu.Checked = False : cboFirma.changeItem("1") : cboFiliale.changeItem("4803") :: cbxErstattungsart.changeItem("0")
+                        cbxFiBu.Checked = False : cboFirma.changeItem("1") : cboFiliale.changeItem("4803") : cbxErstattungsart.changeItem("0")
                     End If
 
             End Select
@@ -1828,7 +1832,7 @@
 
             cBinding_dgvBankverbindungen.initBinding(" SELECT [bnk_id],[bnk_KundenNr],[bnk_iban],[bnk_bic],[bnk_anschrift],[bnk_daid],[bnk_hauptkonto],[bnk_archiv],cast([bnk_Datum] as Date) as bnk_Datum " &
                                                " FROM tblBankverbindungen " &
-                                               " WHERE bnk_KundenNr = '" & KUNDE.KundenNr & "'" & IIf(Not archivierteDSAnzeigen, " AND ISNULL(bnk_archiv,0) = 0", ""), "tbl_IDS_Kunden")
+                                               " WHERE bnk_KundenNr = '" & KUNDE.KundenNr & "'" & IIf(Not archivierteDSAnzeigen, " AND ISNULL(bnk_archiv,0) = 0", ""), "tblBankverbindungen")
 
             AddHandler btnBankspeichern.Click,
                          Sub(send As Object, evnt As EventArgs)
@@ -2360,5 +2364,30 @@
         If Not cbxVorauszahlung.Checked Then txtVorauszahlung.Text = ""
     End Sub
 
+    Private Sub cbxCSInsolvent_CheckedChanged(sender As Object, e As EventArgs) Handles cbxCSInsolvent.CheckedChanged
+        If KUNDE_ERW.kde_CSinsolventAm IsNot Nothing AndAlso Not cbxCSInsolvent.Checked Then
 
+            If vbYes = MsgBox("Möchten Sie die Anmerkung der Insolvent deaktivieren?" & vbNewLine & " Diese Anmerkung wurde automatisch über die Creditsafe-API eingelesen!", vbYesNoCancel) Then
+                cbxCSInsolvent.Checked = False
+                KUNDE_ERW.kde_CSinsolventAm = Nothing
+                KUNDE_ERW.SAVE()
+            Else
+                cbxCSInsolvent.Checked = True
+            End If
+
+        ElseIf KUNDE_ERW.kde_CSinsolventAm Is Nothing AndAlso cbxCSInsolvent.Checked Then
+            MsgBox("Wert kann nicht manuell gesetzt werden!")
+            cbxCSInsolvent.Checked = False
+        End If
+
+    End Sub
+
+    Private Sub btnBnkExcel_Click(sender As Object, e As EventArgs) Handles btnBnkExcel.Click
+        Dim SQL As String = "SELECT [bnk_KundenNr] as KdNr,[bnk_iban] as IBAN,[bnk_bic] as BIC,[bnk_anschrift] as Name,isnull([bnk_hauptkonto],0) as HK,isnull([bnk_archiv],0) as geschlossen ,cast([bnk_Datum] as Date) as Datum 
+                            FROM tblBankverbindungen order by bnk_KundenNr"
+
+        Dim dt_Bank As DataTable = (New SQL).loadDgvBySql(SQL, "FMZOLL")
+        VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt_Bank,,,,,,,, True)
+
+    End Sub
 End Class

SDL/mdm/usrCntlMDMAuswertungen.vb

@@ -85,10 +85,27 @@ Public Class usrCntlMDMAuswertungen
         Folder = NSpace.GetDefaultFolder(Microsoft.Office.Interop.Outlook.OlDefaultFolders.olFolderSentMail)
         EItem = Folder.Items.Add(Microsoft.Office.Interop.Outlook.OlItemType.olMailItem)
 
-        EItem.To = "a.rissbacher@woelfl-trans.at"
-        EItem.Subject = "Wölfl Rechnungen/Gutschriften"
+        EItem.To = "a.rissbacher@rmc-service.com"
+        EItem.CC = "juricevic@verag.ag"
+        EItem.Subject = "RMC Rechnungen/Gutschriften"
 
-        EItem.Attachments.Add(path, OlAttachmentType.olByValue, 1, "WOELFL.csv ")
+
+        Dim accountToSent = "mmdabrechnung@verag.ag" 'bewusst falsch geschrieben!!!!
+
+
+        If accountToSent <> "" Then
+            If outApp.Session.Accounts.Count > 0 Then
+                For Each oAccount In outApp.Session.Accounts
+                    If oAccount.SmtpAddress = accountToSent Then
+                        EItem.SendUsingAccount = oAccount
+                        Exit For
+                    End If
+                Next
+            End If
+        End If
+
+
+        EItem.Attachments.Add(path, OlAttachmentType.olByValue, 1, "RMC.csv ")
 
         EItem.Display(False) 'öffnet das 'neue E-Mail-Form' von Outlook
 
@@ -1506,6 +1523,7 @@ Public Class usrCntlMDMAuswertungen
 
         Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
         Dim frm As New Form
+        frm.Icon = My.Resources.sdl_ico
 
         frm.Size = New Size(1600, 1000)
         uscCntl.Size = New Size(frm.Size.Width - 50, frm.Size.Height - 50)

SDL/mdm/usrcntlFremdrechnungen.Designer.vb

@@ -61,6 +61,7 @@ Partial Class usrcntlFremdrechnungen
         Me.cntxtExcel = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.cbxMailoeffnen = New System.Windows.Forms.CheckBox()
         Me.FlowLayoutPanel.SuspendLayout()
         Me.ContextMenuStrip1.SuspendLayout()
         Me.Panel1.SuspendLayout()
@@ -274,6 +275,7 @@ Partial Class usrcntlFremdrechnungen
         Me.Panel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
         Me.Panel1.BackColor = System.Drawing.SystemColors.ControlLightLight
         Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Panel1.Controls.Add(Me.cbxMailoeffnen)
         Me.Panel1.Controls.Add(Me.cbxPDFhinterlegt)
         Me.Panel1.Controls.Add(Me.cbx)
         Me.Panel1.Controls.Add(Me.Label4)
@@ -366,7 +368,7 @@ Partial Class usrcntlFremdrechnungen
         Me.Button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
         Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button1.Location = New System.Drawing.Point(200, 218)
+        Me.Button1.Location = New System.Drawing.Point(5, 268)
         Me.Button1.Name = "Button1"
         Me.Button1.Size = New System.Drawing.Size(50, 44)
         Me.Button1.TabIndex = 45
@@ -435,7 +437,7 @@ Partial Class usrcntlFremdrechnungen
         Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button8.Image = Global.SDL.My.Resources.Resources.Excel_logo
         Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button8.Location = New System.Drawing.Point(132, 168)
+        Me.Button8.Location = New System.Drawing.Point(132, 218)
         Me.Button8.Name = "Button8"
         Me.Button8.Size = New System.Drawing.Size(118, 44)
         Me.Button8.TabIndex = 31
@@ -539,6 +541,18 @@ Partial Class usrcntlFremdrechnungen
         Me.ToolStripMenuItem6.Size = New System.Drawing.Size(210, 22)
         Me.ToolStripMenuItem6.Text = "Formatiert (dauert länger)"
         '
+        'cbxMailoeffnen
+        '
+        Me.cbxMailoeffnen.AutoSize = True
+        Me.cbxMailoeffnen.Checked = True
+        Me.cbxMailoeffnen.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxMailoeffnen.Location = New System.Drawing.Point(146, 183)
+        Me.cbxMailoeffnen.Name = "cbxMailoeffnen"
+        Me.cbxMailoeffnen.Size = New System.Drawing.Size(91, 17)
+        Me.cbxMailoeffnen.TabIndex = 54
+        Me.cbxMailoeffnen.Text = "Mail anzeigen"
+        Me.cbxMailoeffnen.UseVisualStyleBackColor = True
+        '
         'usrcntlFremdrechnungen
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -600,4 +614,5 @@ Partial Class usrcntlFremdrechnungen
     Friend WithEvents dat_Sum_Von As DateTimePicker
     Friend WithEvents dgvDetails As VERAG_PROG_ALLGEMEIN.MyDatagridview
     Friend WithEvents cbxPDFhinterlegt As CheckBox
+    Friend WithEvents cbxMailoeffnen As CheckBox
 End Class

SDL/mdm/usrcntlFremdrechnungen.vb

@@ -226,7 +226,7 @@ Public Class usrcntlFremdrechnungen
 
             'IDS
             Case "IDS" : SQL_STR = "SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahlTop, "") &
-                    " invoice_id, [YearMonthDay] as Rechnungsdatum,[Invoicenumber] as Rechnungsnummer, CustomerCode as Kundennummer,[daId],[TransactionVolume] as Transaktionsmenge,[AmminclVAT] as Bruttobetrag,[TotalNetAmount] as Nettobetrag,[VATAmount] as MWSt, cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblIDSInvoicesNew WHERE [CustomerCode] in (SELECT distinct([CustomerCode]) FROM [VERAG].[dbo].[tbl_IDS_Kunden]  WHERE 1 = 1 AND isnull([tbl_IDS_Kunden].KdNrAlt, 0) = 0 " & sqlfehlendePDF & IIf(kdNr > 0, " AND [KdNrVERAG]=" & kdNr, "") & ") and [YearMonthDay] " & setSQLWhere(SDLNrTmp, "") & " order by [YearMonthDay] desc, [Invoicenumber]"
+                    " invoice_id,[tbl_IDS_Kunden].KdNrVERAG as AdressenNr, [YearMonthDay] as Rechnungsdatum,[Invoicenumber] as Rechnungsnummer, tblIDSInvoicesNew.CustomerCode as Kundennummer,[daId],[TransactionVolume] as Transaktionsmenge,[AmminclVAT] as Bruttobetrag,[TotalNetAmount] as Nettobetrag,[VATAmount] as MWSt, cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblIDSInvoicesNew inner join [VERAG].[dbo].[tbl_IDS_Kunden] on tblIDSInvoicesNew.CustomerCode = tbl_IDS_Kunden.CustomerCode WHERE tblIDSInvoicesNew.[CustomerCode] in (SELECT distinct([CustomerCode]) FROM [VERAG].[dbo].[tbl_IDS_Kunden]  WHERE 1 = 1 AND isnull([tbl_IDS_Kunden].KdNrAlt, 0) = 0 " & sqlfehlendePDF & IIf(kdNr > 0, " AND [KdNrVERAG]=" & kdNr, "") & ") and [YearMonthDay] " & setSQLWhere(SDLNrTmp, "") & " order by [YearMonthDay] desc, [Invoicenumber]"
 
             'UTA
             Case "UTA" : SQL_STR = "SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahlTop, "") &
@@ -252,34 +252,34 @@ Public Class usrcntlFremdrechnungen
             Case "ALLE" : Dim anzahl As Integer = anzahlTop / 6 : SQL_STR = " select * from (SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") &
                     "
                         --IDS
-                          'IDS' as Lieferant,invoice_id, [YearMonthDay] as Rechnungsdatum,[Invoicenumber] as Rechnungsnummer,CustomerCode as Kundennummer,[AmminclVAT] as Bruttobetrag,[TotalNetAmount] as Nettobetrag,[VATAmount] as MWSt,'' as Land, 'RE' as Art,[daId], cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblIDSInvoicesNew WHERE [CustomerCode] in  (SELECT [CustomerCode] FROM [VERAG].[dbo].[tbl_IDS_Kunden] WHERE 1 = 1 and isnull([tbl_IDS_Kunden].KdNrAlt, 1) = 0  " & sqlfehlendePDF & IIf(kdNr > 0, " AND [KdNrVERAG]=" & kdNr, "") & " ) and [YearMonthDay] " & setSQLWhere("IDS", "") & " -- order by [YearMonthDay], [Invoicenumber]
+                          'IDS' as Lieferant,invoice_id,[tbl_IDS_Kunden].KdNrVERAG as AdressenNr, [YearMonthDay] as Rechnungsdatum,[Invoicenumber] as Rechnungsnummer,tblIDSInvoicesNew.CustomerCode as Kundennummer,[AmminclVAT] as Bruttobetrag,[TotalNetAmount] as Nettobetrag,[VATAmount] as MWSt,'' as Land, 'RE' as Art,[daId], cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblIDSInvoicesNew inner join [VERAG].[dbo].[tbl_IDS_Kunden] on tblIDSInvoicesNew.CustomerCode = tbl_IDS_Kunden.CustomerCode WHERE tblIDSInvoicesNew.[CustomerCode] in (SELECT [CustomerCode] FROM [VERAG].[dbo].[tbl_IDS_Kunden] WHERE 1 = 1 and isnull([tbl_IDS_Kunden].KdNrAlt, 1) = 0  " & sqlfehlendePDF & IIf(kdNr > 0, " AND [KdNrVERAG]=" & kdNr, "") & " ) and [YearMonthDay] " & setSQLWhere("IDS", "") & " -- order by [YearMonthDay], [Invoicenumber]
                         
                         UNION ALL
                         
                         
                         --MSE
-                        SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'MSE' as Lieferant,-1 as invoice_id, [invoice_date] as Rechnungsdatum, cast([invoice_id] as nvarchar) as Rechnungsnummer,[customer_number] as Kundennummer,  [total_amount_euro] as Bruttobetrag ,(total_amount_euro - [total_vat_amount_euro]) as Nettobetrag  ,[total_vat_amount_euro] as MWST,[country] as Land,'RE' as Art,daId, cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblMSEInvoices inner join tblMSECustomers on customer_id = [customer_number] where 1 = 1 " & sqlfehlendePDF & IIf(kdNr > 0, " AND [partner_customer_number]=" & kdNr, "") & " and [invoice_date] " & setSQLWhere("MSE", "country") & "  --order by invoice_date, invoice_id
+                        SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'MSE' as Lieferant,-1 as invoice_id,partner_customer_number as AdressenNr, [invoice_date] as Rechnungsdatum, cast([invoice_id] as nvarchar) as Rechnungsnummer,[customer_number] as Kundennummer,  [total_amount_euro] as Bruttobetrag ,(total_amount_euro - [total_vat_amount_euro]) as Nettobetrag  ,[total_vat_amount_euro] as MWST,[country] as Land,'RE' as Art,daId, cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblMSEInvoices inner join tblMSECustomers on customer_id = [customer_number] where 1 = 1 " & sqlfehlendePDF & IIf(kdNr > 0, " AND [partner_customer_number]=" & kdNr, "") & " and [invoice_date] " & setSQLWhere("MSE", "country") & "  --order by invoice_date, invoice_id
                         
                         UNION ALL
                         
                         --UTA
-                        SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'UTA' as Lieferant,-1 as invoice_id, [Rechnungsdatum],STR([Rechnungsnummer_pro_Lieferland])  as Rechnungsnummer,Kundennummer,SUM(Gesamtbetrag_Brutto_in_Darstellwährung) as Bruttobetrag,SUM(Gesamtbetrag_Netto_in_Darstellwährung) as Nettobetrag, SUM(Gesamtbetrag_Umsatzsteuer_in_Darstellwährung) as MWSt,[Lieferland_ISO2] as Land, 'RE' as Art,[daId], cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM [VERAG].[dbo].[tblUTAImportNew] inner join adressen on Kundennummer = UTAKundenNr  where 1 = 1 " & sqlfehlendePDF & IIf(kdNr > 0, " AND [AdressenNr]=" & kdNr, "") & " and [Rechnungsdatum] " & setSQLWhere("UTA", "Lieferland_ISO2") & "     group by [Rechnungsnummer_pro_Lieferland],[Rechnungsdatum],Kundennummer,[daId],[Lieferland_ISO2] UNION ALL SELECT 'UTA',-1, [Datum], cast([RechnungsNr] as nvarchar) ,[KundenNr],0,0,0,'',[DocumentTyp],[daId], cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden  FROM [VERAG].[dbo].[tblUTADocuments] inner join adressen on KundenNr = UTAKundenNr  where AdressenNr = " & kdNr & " AND Datum " & setSQLWhere("UTA_", "") & "  --order by Rechnungsnummer desc 
+                        SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'UTA' as Lieferant,-1 as invoice_id,Adressen.AdressenNr, [Rechnungsdatum],STR([Rechnungsnummer_pro_Lieferland])  as Rechnungsnummer,Kundennummer,SUM(Gesamtbetrag_Brutto_in_Darstellwährung) as Bruttobetrag,SUM(Gesamtbetrag_Netto_in_Darstellwährung) as Nettobetrag, SUM(Gesamtbetrag_Umsatzsteuer_in_Darstellwährung) as MWSt,[Lieferland_ISO2] as Land, 'RE' as Art,[daId], cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM [VERAG].[dbo].[tblUTAImportNew] inner join adressen on Kundennummer = UTAKundenNr  where 1 = 1 " & sqlfehlendePDF & IIf(kdNr > 0, " AND [AdressenNr]=" & kdNr, "") & " and [Rechnungsdatum] " & setSQLWhere("UTA", "Lieferland_ISO2") & "     group by [Rechnungsnummer_pro_Lieferland],[Rechnungsdatum],Kundennummer,AdressenNr,[daId],[Lieferland_ISO2] UNION ALL SELECT 'UTA',-1,AdressenNr, [Datum], cast([RechnungsNr] as nvarchar) ,[KundenNr],0,0,0,'',[DocumentTyp],[daId], cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden  FROM [VERAG].[dbo].[tblUTADocuments] inner join adressen on KundenNr = UTAKundenNr  where AdressenNr = " & kdNr & " AND Datum " & setSQLWhere("UTA_", "") & "  --order by Rechnungsnummer desc 
                         
                         UNION ALL
                         --VERAG
                         
-                        SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'VERAG' as Lieferant,-1 as invoice_id,  tblTrdinInvoice.Rechnungsdatum, cast(tblTrdinInvoice.Rechnungsnummer as nvarchar) as Rechnungsnummer ,tblTrdinInvoice.KundenNrZentrale as Kundennummer, tblTrdinInvoice.SteuerpflichtigerBetragLokal + tblTrdinInvoice.SteuerfreierBetragLokal as Bruttobetrag ,tblTrdinInvoice.SteuerpflichtigerBetragLokal + tblTrdinInvoice.SteuerfreierBetragLokal - tblTrdinInvoice.SteuerbetragLokal  as Nettobetrag ,tblTrdinInvoice.SteuerbetragLokal as MWST, 'AT' as Land, 'RE' as Art, 1 as daId, cast(1 as bit) PDFvorhanden FROM tblTrdinInvoice WHERE 1 = 1 " & IIf(kdNr > 0, " AND tblTrdinInvoice.RechnungsKundenNr=" & kdNr, "") & " and tblTrdinInvoice.Rechnungsdatum " & setSQLWhere("VERAG", "'AT'") & "    AND tblTrdinInvoice.FilialenNr = 4814 --ORDER BY tblTrdinInvoice.Rechnungsdatum, tblTrdinInvoice.Rechnungsnummer
+                        SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'VERAG' as Lieferant,-1 as invoice_id,Adressen.AdressenNr,  tblTrdinInvoice.Rechnungsdatum, cast(tblTrdinInvoice.Rechnungsnummer as nvarchar) as Rechnungsnummer ,tblTrdinInvoice.KundenNrZentrale as Kundennummer, tblTrdinInvoice.SteuerpflichtigerBetragLokal + tblTrdinInvoice.SteuerfreierBetragLokal as Bruttobetrag ,tblTrdinInvoice.SteuerpflichtigerBetragLokal + tblTrdinInvoice.SteuerfreierBetragLokal - tblTrdinInvoice.SteuerbetragLokal  as Nettobetrag ,tblTrdinInvoice.SteuerbetragLokal as MWST, 'AT' as Land, 'RE' as Art, 1 as daId, cast(1 as bit) PDFvorhanden FROM tblTrdinInvoice inner join Adressen on KundenNrZentrale = AdressenNr  WHERE 1 = 1 " & IIf(kdNr > 0, " AND tblTrdinInvoice.RechnungsKundenNr=" & kdNr, "") & " and tblTrdinInvoice.Rechnungsdatum " & setSQLWhere("VERAG", "'AT'") & "    AND tblTrdinInvoice.FilialenNr = 4814 --ORDER BY tblTrdinInvoice.Rechnungsdatum, tblTrdinInvoice.Rechnungsnummer
                         
                         
                         UNION ALL
                         --PLOSE
                         
-                        SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'PLOSE' as Lieferant,-1 as invoice_id,  [plInv_SupplierRechnungsDatum] as Rechnungsdatum, cast([plInv_SupplierRechnungsNr]  as nvarchar) as Rechnungsnummer,[plInv_PLOSEKundennummer] as Kundennummer,[plInv_Bruttobetrag] as Bruttobetrag,[plInv_Nettobetrag] as Nettobetrag,[plInv_MWSTBetrag] as MWST, [plInv_SupplierCountry] as Land, 'RE' as Art,[plInv_daId] as daId, cast(case when [plInv_daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblPLOSE_Inv_Data  inner join Adressen on Adressen.PLOSEKundenNr = plInv_PLOSEKundennummer where 1 = 1 " & sqlfehlendePDF_PLOSE & IIf(kdNr > 0, " AND Adressen.AdressenNr=" & kdNr, "") & " and [plInv_SupplierRechnungsDatum] " & setSQLWhere("PLOSE", "plInv_SupplierCountry") & "-- Order by plInv_SupplierRechnungsDatum desc, [plInv_SupplierRechnungsNr]
+                        SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'PLOSE' as Lieferant,-1 as invoice_id,Adressen.AdressenNr,  [plInv_SupplierRechnungsDatum] as Rechnungsdatum, cast([plInv_SupplierRechnungsNr]  as nvarchar) as Rechnungsnummer,[plInv_PLOSEKundennummer] as Kundennummer,[plInv_Bruttobetrag] as Bruttobetrag,[plInv_Nettobetrag] as Nettobetrag,[plInv_MWSTBetrag] as MWST, [plInv_SupplierCountry] as Land, 'RE' as Art,[plInv_daId] as daId, cast(case when [plInv_daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblPLOSE_Inv_Data  inner join Adressen on Adressen.PLOSEKundenNr = plInv_PLOSEKundennummer where 1 = 1 " & sqlfehlendePDF_PLOSE & IIf(kdNr > 0, " AND Adressen.AdressenNr=" & kdNr, "") & " and [plInv_SupplierRechnungsDatum] " & setSQLWhere("PLOSE", "plInv_SupplierCountry") & "-- Order by plInv_SupplierRechnungsDatum desc, [plInv_SupplierRechnungsNr]
                         
                         UNION ALL
                         
                         --RMC
-                        SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'RMC' as Lieferant,-1 as invoice_id, [rmc_reDatum]  as Rechnungsdatum,cast([rmc_reNr] as nvarchar) as Rechnungsnummer,rmc_kdNr as Kundennummer ,[rmc_betragBrutto] as Bruttobetrag,[rmc_betragNetto] as Nettobetrag,[rmc_betragMWST] as MWST, rmc_landKZ as Land, 'RE' as Art, [rmc_daId] as daId, cast(case when [rmc_daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM [VERAG].[dbo].[tblRMCImport] inner join Adressen on Adressen.WölflKundenNr = rmc_kdNr where 1 = 1 " & sqlfehlendePDF_RMC & IIf(kdNr > 0, " AND AdressenNr=" & kdNr, "") & " and [rmc_reDatum] " & setSQLWhere("RMC", "rmc_landKZ") & "-- order by rmc_reDatum, rmc_reNr
+                        SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " 'RMC' as Lieferant,-1 as invoice_id,Adressen.AdressenNr, [rmc_reDatum]  as Rechnungsdatum,cast([rmc_reNr] as nvarchar) as Rechnungsnummer,rmc_kdNr as Kundennummer ,[rmc_betragBrutto] as Bruttobetrag,[rmc_betragNetto] as Nettobetrag,[rmc_betragMWST] as MWST, rmc_landKZ as Land, 'RE' as Art, [rmc_daId] as daId, cast(case when [rmc_daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM [VERAG].[dbo].[tblRMCImport] inner join Adressen on Adressen.WölflKundenNr = rmc_kdNr where 1 = 1 " & sqlfehlendePDF_RMC & IIf(kdNr > 0, " AND AdressenNr=" & kdNr, "") & " and [rmc_reDatum] " & setSQLWhere("RMC", "rmc_landKZ") & "-- order by rmc_reDatum, rmc_reNr
                         
                         ) as temp where 1=1 and temp.Rechnungsdatum" & setSQLWhere(SDLNrTmp, "temp.Land") & " order by Rechnungsdatum desc"
 
@@ -647,7 +647,30 @@ Public Class usrcntlFremdrechnungen
     Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click
 
 
-        If dgvLFRechnung.SelectedRows.Count > 0 Then
+        Dim groups As New Dictionary(Of Object, List(Of DataGridViewRow))
+
+        For Each r As DataGridViewRow In dgvLFRechnung.SelectedRows
+            Dim key = r.Cells("AdressenNr").Value
+            If Not groups.ContainsKey(key) Then
+                groups(key) = New List(Of DataGridViewRow)
+            End If
+            groups(key).Add(r)
+        Next
+
+        If aktLieferant = "ALLE" And cbxMax1000Eintrage.Checked Then
+            MsgBox("Entferne die MAX 1000 Einträge Beschänkung, da ansonsten können nicht alle Daten ermittelt werden!")
+            Exit Sub
+        End If
+
+
+        If groups.Count > 0 Then
+
+            If Not vbYes = MsgBox("Möchten Sie die Rechnungen von " & groups.Count & " Kunden per Mail verschicken? " & IIf(Not cbxMailoeffnen.Checked, vbNewLine & "Die Mails werden sofort verschickt!", ""), vbYesNoCancel) Then
+                Exit Sub
+            End If
+
+
+            For Each kvp In groups
 
                     Dim TextHTMLtable = ""
 
@@ -655,7 +678,8 @@ Public Class usrcntlFremdrechnungen
                     TextHTMLtable &= "<tr><td>Supplier</td><td>Country</td><td>Date</td></tr>"
 
                     Dim pdflist As New List(Of String)
-            For Each row In dgvLFRechnung.SelectedRows
+
+                    For Each row In kvp.Value
 
 
                         Dim Lieferant = ""
@@ -677,17 +701,12 @@ Public Class usrcntlFremdrechnungen
                             '    cFakturierung.doRechnungsDruck_SRorER(da_id,, False, 3)
                             'End If
 
-
                         Else
 
-
-
-                    '
-
                             If Lieferant = "IDS" Then
 
                                 Dim dt As New DataTable
-                        dt = initDGVRechnungsdetails(row.Cells("invoice_id").value, True)
+                                dt = initDGVRechnungsdetails(row.Cells("invoice_id").Value, True)
 
                                 For Each r As DataRow In dt.Rows
 
@@ -735,11 +754,12 @@ Public Class usrcntlFremdrechnungen
                     Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
                     Mail = outl.CreateItem(0)
 
+                Dim kundeMail As New cKunden()
+                kundeMail = kundenSQL.getKundeByKdNr(kvp.Key)
 
-
-            Select Case KUNDE.LandKz
+                Select Case kundeMail.LandKz
                     Case "TR"
-                    Mail.Subject = KUNDE.Kurzname & " - ORIJINAL FATURA "
+                        Mail.Subject = kundeMail.Kurzname & " - ORIJINAL FATURA "
 
 
                         Mail.HTMLBody = "Bayanlar ve Baylar!,<br><br>Ekte izlere orijinal faturalarinizi gönderiyoruz.<br><br>"
@@ -750,7 +770,7 @@ Public Class usrcntlFremdrechnungen
 
                     Case "A", "AT", "D", "DE", "CH"
 
-                    Mail.Subject = KUNDE.Kurzname & " - ORIGINAL RECHNUNG "
+                        Mail.Subject = kundeMail.Kurzname & " - ORIGINAL RECHNUNG "
 
                         Mail.HTMLBody = "Sehr geehrte Damen und Herren,<br><br>im Anhang senden wir Ihnen die Originalrechnungen.<br><br>"
 
@@ -759,7 +779,7 @@ Public Class usrcntlFremdrechnungen
                         Mail.HTMLBody &= "<br><br><br>Mit freundlichen Grüßen<br><br>"
                     Case "RO"
 
-                    Mail.Subject = KUNDE.Kurzname & " - FACTURI RETURNATE "
+                        Mail.Subject = kundeMail.Kurzname & " - FACTURI RETURNATE "
 
                         Mail.HTMLBody = "Stimati domni, stimate doamne,<br><br>Va returnam facturile originale care nu au fost utilizate spre recuperare TVA.<br><br>Va multumim pentru colaborarea.<br><br>"
 
@@ -768,7 +788,7 @@ Public Class usrcntlFremdrechnungen
                         Mail.HTMLBody &= "<br><br><br>Cu stima<br><br>"
 
                     Case "HR", "BIH", "SLO", "SRB", "BIH"
-                    Mail.Subject = KUNDE.Kurzname & " - ORGINALNI RACUNI "
+                        Mail.Subject = kundeMail.Kurzname & " - ORGINALNI RACUNI "
 
 
                         Mail.HTMLBody = "Postovanje,<br><br>prilozeno Vam dostavljamo orginalne racune za Vasu daljnu upotrebu.<br><br>Za pitanja stojimo na raspolaganju.<br><br>"
@@ -778,7 +798,7 @@ Public Class usrcntlFremdrechnungen
                         Mail.HTMLBody &= "<br><br><br>Srdacan pozdrav<br><br>"
 
                     Case Else
-                    Mail.Subject = KUNDE.Kurzname & " - Invoice No."
+                        Mail.Subject = kundeMail.Kurzname & " - Invoice No."
 
                         Mail.HTMLBody = TextHTMLtable
 
@@ -796,12 +816,46 @@ Public Class usrcntlFremdrechnungen
                         Next
                     End If
 
-            Mail.To &= KUNDE.EMail
-            Mail.CC &= KUNDE.EMail2
+                Mail.To &= kundeMail.EMail
+                Mail.CC &= kundeMail.EMail2
 
+                If cbxMailoeffnen.Checked Then
 
                     Mail.Display()
 
+                Else
+
+                    If Mail IsNot Nothing Then
+
+
+                        Dim API = VERAG_PROG_ALLGEMEIN.cAPI.INSERT_API(VERAG_PROG_ALLGEMEIN.cAPI_INOUT.OUT, VERAG_PROG_ALLGEMEIN.cAPI_Type.MAIL, VERAG_PROG_ALLGEMEIN.cAPI_ART.SDL_OUT_SAMMELRECHNUNG, "MAIL-ORIG-RG",,, kvp.Key)
+
+                        API.api_EMail = Mail.To
+                        API.api_EMailCC = Mail.CC
+                        API.api_EMailBCC = Mail.BCC
+                        API.api_EMailSubject = Mail.Subject
+                        API.api_EMailText = Mail.HTMLBody
+                        API.api_EMailAttCnt = Mail.Attachments.Count
+
+                        If Mail IsNot Nothing Then
+
+                            If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(API.api_EMail, API.api_EMailSubject, API.api_EMailText, "mmdabrechnung@verag.ag", False, False, API.api_EMailCC, API.api_EMailBCC, pdflist,, "mmdabrechnung@verag.ag") Then
+                                API.UPDTAE_OK()
+
+                            Else
+                                API.UPDTAE_ERR()
+
+                            End If
+
+                        End If
+
+                    End If
+
+                End If
+
+
+                Next
+
             End If
 
     End Sub

SDL/seriendruck/usrCntlFakturierung.Designer.vb

@@ -418,7 +418,7 @@ Partial Class usrcntlFakturierung
         Me.Label11.Name = "Label11"
         Me.Label11.Size = New System.Drawing.Size(440, 17)
         Me.Label11.TabIndex = 125
-        Me.Label11.Text = "6. Fixe Taxe 20€ (bei Belegsumme < 500) berechnen"
+        Me.Label11.Text = "6. Fixe Taxe 441 (bei Belegsumme < 500) berechnen"
         '
         'PictureBox6
         '

VERAG_PROG_ALLGEMEIN/Classes/cAPI.vb

@@ -27,6 +27,7 @@ Public Enum cAPI_ART
     AVISO_IN_MSE = 80
     SDL_OUT_FA = 81
     SDL_OUT_SAMMELRECHNUNG = 82
+    AVISO_IN_CS = 83
 
 
 End Enum

VERAG_PROG_ALLGEMEIN/Classes/cDY_Zollanmeldungen_Import.vb

@@ -143,6 +143,7 @@ Public Class cDY_Zollanmeldungen_Import
     Property UST_ID_Fiskalvertreter As Object = Nothing
     Property Shipmentnummer As Object = Nothing
     Property Importstatus As Object = Nothing
+    Property Importdate As Object = Nothing
 
     Public hasEntry = False
 
@@ -297,6 +298,7 @@ Public Class cDY_Zollanmeldungen_Import
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UST_ID_Fiskalvertreter", UST_ID_Fiskalvertreter))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Shipmentnummer", Shipmentnummer))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Importstatus", Importstatus))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Importdate", Importdate))
 
         Return list
     End Function

VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb

@@ -17,7 +17,6 @@ Public Class cKundenErweitert
     'Property kde_Hoechstkredit As Object = Nothing
     Property kde_Versicherung_Deckungsstopp As Boolean = False
     Property kde_Versicherung_DeckungsstoppDatum As Object = Nothing
-
     Property kde_Versicherung_Uebergeben As Boolean = False
     Property kde_Versicherung_UebergebenAm As Object = Nothing
     Property kde_Versicherung_AnerkennungVersicherungsfall As Boolean = False
@@ -28,7 +27,6 @@ Public Class cKundenErweitert
     Property kde_Versicherung_GemeldeterBetrag As Object = Nothing
     Property kde_txtVersicherungEHNr As Object = Nothing
 
-
     Property kde_Leihgeld_Provision As Object = Nothing
     Property kde_Leihgeld_ProvisionPreisstaffel As Object = Nothing
     Property kde_Leihgeld_ProvisionAuftraggeber As Object = Nothing
@@ -44,7 +42,6 @@ Public Class cKundenErweitert
     Property Email_AVM As Boolean = False
     Property Depot_Kunde As Boolean = False
     Property FiBuSchnittstelleLG As Boolean = False
-
     Property Zahlungsziel2 As Object = Nothing
     Property Zahlungsziel3 As Object = Nothing
     Property EmailAnkunft_Export As Boolean = False
@@ -53,7 +50,6 @@ Public Class cKundenErweitert
     Property kde_CreditSaveBonitaetsklasse As Object = Nothing
     Property kde_CreditSaveBonitaetsIndex As Object = Nothing
     Property kde_CreditSaveBonitaetsScore As Object = Nothing
-
     Property kde_CreditSaveId As String = ""
     Property kde_CreditSaveNo As String = ""
     Property kde_Inkasso_Uebergeben As Boolean = False
@@ -98,8 +94,8 @@ Public Class cKundenErweitert
     Property kde_Erstattungsart As Object = Nothing
     Property kde_BezFIBU As Object = Nothing
     Property kde_Kopfsammelrechnung As Boolean = False
-
     Property kde_CSPortfolioAdded As Boolean = False
+    Property kde_CSinsolventAm As Object = Nothing
 
 
     Property kde_Provisionsverguetung As Boolean = False
@@ -210,6 +206,7 @@ Public Class cKundenErweitert
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_Provisionsverguetung", kde_Provisionsverguetung))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_Provisionsverguetung_ProzentDL", kde_Provisionsverguetung_ProzentDL))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_Provisionsverguetung_GSAnKdNr", kde_Provisionsverguetung_GSAnKdNr))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CSinsolventAm", kde_CSinsolventAm))
 
         Return list
     End Function

VERAG_PROG_ALLGEMEIN/Classes/cRMC.vb

@@ -196,7 +196,7 @@ Public Class cRMC
     End Function
 
 
-    Public Shared Function UPDATE_ARCHIV(reDat As Date, reNr As Integer, rmc_kdNr As Integer, UStVAn_ID As Integer) As Boolean
+    Public Shared Function UPDATE_ARCHIV(reDat As Date, reNr As String, rmc_kdNr As Integer, UStVAn_ID As Integer) As Boolean
         Try
             Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
 

VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb

@@ -2,6 +2,7 @@
 Imports System.Reflection
 Imports System.Windows.Forms
 Imports com.sun.org.apache.xpath.internal.operations
+Imports com.sun.source.tree
 'Imports DocumentFormat.OpenXml.Drawing.Charts
 'Imports DocumentFormat.OpenXml.Spreadsheet
 
@@ -553,6 +554,16 @@ Public Class cRechnungsausgang
         End If
 
 
+        If FIRMA.Firma_ID = 19 Then
+
+            Select Case Me.BelegartenKz
+                Case "AR" : If (Me.SteuerfreierGesamtbetrag + Me.SteuerpflichtigerGesamtbetrag) < 0 Then errMsg = "ERROR: Vorzeichenfehler!" : Return False
+                Case "AG" : If (Me.SteuerfreierGesamtbetrag + Me.SteuerpflichtigerGesamtbetrag) < 0 Then errMsg = "ERROR: Vorzeichenfehler!" : Return False
+            End Select
+        End If
+
+
+
 
         'checkFirmen
 

VERAG_PROG_ALLGEMEIN/Classes/cTrdInvoice.vb

@@ -576,7 +576,7 @@ Class TrdInvoice_FUNCTIONS
 
                     If isVZ > 0 Then
                         Select Case ROW("RP_LeistungsNr")
-                            Case "124", "125", "126", "117", "118", "119"
+                            Case "123", "124", "125", "126", "128", "117", "118", "119"
                                 TRD_PRODUCT.VZBetrag = TRD_PRODUCT.SteuerfreierBetragLokal
 
                             Case Else

VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb

@@ -408,11 +408,13 @@ Public Class frmUeberstundenauszahlen
             Next
 
             If (stunden100bereitsausbezahl + stunden50bereitsausbezahlt + stunden25bereitsausbezahlt) > 0 Then
+                If MA.mit_firma = "ATILLA" Then GoTo sonderRegelungAtilla : 
                 picDel.Visible = True
                 Button1.Enabled = False
                 txtAusz.Enabled = False
                 picShow.Visible = True
             Else
+sonderRegelungAtilla:
             Button1.Enabled = True
                 txtAusz.Enabled = True
                 picShow.Visible = False
@@ -816,6 +818,10 @@ Public Class frmUeberstundenauszahlen
         If istTeilzeit Then txtAusgabe.Append("25% ÜS: " & CDbl(txtberAusz25.Text) & vbNewLine)
         'txtAusgabe.Append("ÜS gesamt: " & CDbl(txtberAusz100.Text) + CDbl(txtberAusz50.Text) + CDbl(txtberAusz25.Text))
 
+        If cbxabwDatum.Checked Then
+            MsgBox("Das Zurücksetzen von bereits ausgezahlten Stunden bei abweichenden Datum wird aktuell (noch) nicht unterstützt!")
+            Exit Sub
+        End If
 
         Dim aksAuszahlung As MsgBoxResult = MsgBox(txtAusgabe.ToString, vbYesNo)
         If aksAuszahlung = vbYes Then

VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb

@@ -2,16 +2,10 @@
 Imports System.Data.SqlClient
 Imports System.IO
 Imports System.Net
-Imports System.Numerics
 Imports System.Reflection
-Imports System.Runtime.InteropServices.ComTypes
 Imports System.Text.RegularExpressions
 Imports System.Threading
-Imports System.Web.UI
-Imports com.sun.org.apache.xalan.internal.xsltc
 Imports com.sun.source.tree
-Imports Microsoft.VisualBasic.ApplicationServices
-Imports Org.BouncyCastle.Ocsp
 
 
 Public Class cCreditSafeAPI
@@ -104,7 +98,7 @@ Public Class cCreditSafeAPI
 
 
 
-    Shared Function SendGetRequestWithAuthHeader(url As String, company As Company, acceptContentType As String, method As String, authenticationToken As String, ByRef failureDesc As String, Optional isMonitoring As Boolean = False, Optional csvImport As Boolean = False, Optional csvFile As String = "") As String
+    Shared Function SendGetRequestWithAuthHeader(url As String, company As Company, acceptContentType As String, method As String, authenticationToken As String, ByRef failureDesc As String, Optional csvFile As String = "", Optional page As Integer = 0, Optional type As String = "") As String
         Try
 
             VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat()
@@ -123,15 +117,25 @@ Public Class cCreditSafeAPI
                 Return failureDesc
             End If
 
-            rest.ClearAllQueryParams()
+            '-----------------------------------
+            'aktuelle aufrufe
+            '-----------------------------------
+            '"getCompanyEvents"
+            '"getCompanyEventsDetails"
+            '"addCompanyToPortfolio"
+            '"addCompanyToPortfolio_CSV"
+            '"getCompaniesFromPortfolio"
+            '"searchCompanies"
+            '"getReport"
+            '"getPDF"
+            '"checkDateOfLastRequest"
+            '"getSubscriptionCountries"
+            '-----------------------------------
 
-            If company IsNot Nothing AndAlso Not isMonitoring Then
 
-                setSearchParam(rest, company)
+            setSearchParam(rest, company, page, type)
 
-            End If
-
-            If isMonitoring AndAlso csvFile <> "" Then
+            If type = "addCompanyToPortfolio_CSV" Then
                 rest.PartSelector = "0"
                 rest.AddHeader("Content-Type", "multipart/form-data")
                 rest.AddHeader("Expect", "100-continue")
@@ -142,15 +146,10 @@ Public Class cCreditSafeAPI
 
             rest.AddHeader("Authorization", "Bearer " & authenticationToken)
 
-
             Dim responseJson As String
             Dim pdfData As New Chilkat.BinData
 
-            rest.VerboseLogging = 1
-
-            If isMonitoring Then
-
-                If csvImport Then
+            If type = "addCompanyToPortfolio_CSV" Then
 
                 Dim fileInfo As New FileInfo(csvFile)
 
@@ -161,6 +160,7 @@ Public Class cCreditSafeAPI
                 rest.PartSelector = "1"
                 rest.AddHeader("Content-Disposition", "form-data; name=""importcsv""; filename=""importcsv.csv""")
                 rest.AddHeader("Content-Type", "text/csv")
+                rest.SetMultipartBodyString("d.breimaier@verag.ag")
                 rest.SetMultipartBodyStream(fileStream)
 
                 rest.PartSelector = "0"
@@ -182,7 +182,7 @@ Public Class cCreditSafeAPI
                 End If
 
 
-                Else
+            ElseIf type = "addCompanyToPortfolio" Then
 
                 Dim json As New Chilkat.JsonObject
                 success = json.UpdateString("id", company.creditSafeId)
@@ -214,11 +214,12 @@ Public Class cCreditSafeAPI
 
 
                 End If
-                End If
+
             End If
 
 
-            If acceptContentType.Contains("application/pdf") Then
+
+            If acceptContentType.Contains("application/pdf") AndAlso (type = "getReport" Or type = "getPDF") Then
                 'If acceptContentType.Contains("application/json+pdf") Or acceptContentType.Contains("application/json") Then
 
                 responseJson = rest.FullRequestNoBodyBd(method, url, pdfData)
@@ -319,9 +320,6 @@ Public Class cCreditSafeAPI
 
     End Sub
 
-
-
-
     Shared Function authenticate(Optional username As String = "", Optional password As String = "") As String
 
         Dim myUri As String = API_STRING & "/v1/authenticate"
@@ -334,25 +332,23 @@ Public Class cCreditSafeAPI
 
         Return response
 
-
     End Function
 
     Shared Function AddCompanyToPortfolio(company As Company, Optional PortfolioID As String = "1662419") As String
 
         Dim myUri As String = API_STRING & "/v1/monitoring/portfolios/" & PortfolioID & "/companies" 'Default
 
-        Dim jsonRespString = SendGetRequestWithAuthHeader(myUri, company, "application/json", "POST", token, "", True)
+        Dim jsonRespString = SendGetRequestWithAuthHeader(myUri, company, "application/json", "POST", token, "",,, "addCompanyToPortfolio")
 
         Return jsonRespString
 
     End Function
 
+    Shared Function AddCompaniesCSVToPortfolio(csvFilePath As String, sync As Boolean, Optional PortfolioID As String = "1662419") As String
 
-    Shared Function AddCompaniesCSVToPortfolio(csvFilePath As String, Optional PortfolioID As String = "1662419") As String
+        Dim myUri As String = API_STRING & "/v1/monitoring/portfolios/" & PortfolioID & IIf(sync, "/sync", "/import") 'Default
 
-        Dim myUri As String = API_STRING & "/v1/monitoring/portfolios/" & PortfolioID & "/import" 'Default
-
-        Dim jsonRespString = SendGetRequestWithAuthHeader(myUri, Nothing, "application/json", "POST", token, "", True, True, csvFilePath)
+        Dim jsonRespString = SendGetRequestWithAuthHeader(myUri, Nothing, "application/json", "POST", token, "", csvFilePath,, "addCompanyToPortfolio_CSV")
 
         Return jsonRespString
 
@@ -362,7 +358,7 @@ Public Class cCreditSafeAPI
 
         Dim myUri As String = API_STRING & "/v1/monitoring/portfolios/" & PortfolioID & "/companies" 'Default
 
-        Dim jsonRespString = SendGetRequestWithAuthHeader(myUri, Nothing, "application/json", "GET", token, "", False)
+        Dim jsonRespString = SendGetRequestWithAuthHeader(myUri, Nothing, "application/json", "GET", token, "",,, "getCompaniesFromPortfolio")
 
         Dim json As New Chilkat.JsonObject
         Dim success As Boolean = json.Load(jsonRespString)
@@ -374,7 +370,6 @@ Public Class cCreditSafeAPI
             totalCount = -1
         End If
 
-
         Return jsonRespString
 
     End Function
@@ -386,7 +381,7 @@ Public Class cCreditSafeAPI
 
         Dim failureDesc As String
         Dim myUrl As String = API_STRING & "/v1/companies"
-        Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc)
+        Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc,,, "searchCompanies")
 
 
         Dim json As New Chilkat.JsonObject
@@ -477,10 +472,10 @@ Public Class cCreditSafeAPI
 
     End Function
 
+    Shared Function getCompanyEventsDetails(company As Company, ByRef dtEvents As DataTable, Optional checklastChecked As Boolean = False, Optional updateKunden As Boolean = False, Optional showError As Boolean = False, Optional getTotalNr As Boolean = False, Optional setzeKundenbesonderheiten As Boolean = False, Optional sendMail As Boolean = False, Optional firma As String = "VERAG") As String
 
-    Shared Function getCompanyEvents(company As Company, ByRef dtEvents As DataTable, Optional checklastChecked As Boolean = False, Optional updateKunden As Boolean = False, Optional showError As Boolean = False, Optional getTotalNr As Boolean = False, Optional setzeKundenbesonderheiten As Boolean = False, Optional sendMail As Boolean = False) As String
 
-        VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat()
+        '------------------------------- PRO KUNDE
 
         'rest.AddQueryParam("from", Today().AddDays(-1))
 
@@ -489,23 +484,23 @@ Public Class cCreditSafeAPI
         If company IsNot Nothing AndAlso IsDate(company.lastChecked) Then
             checkDate = company.lastChecked.ToString("yyyy-MM-ddTHH:mm:ss")
         Else
-            checkDate = Today().AddDays(-30).ToString("yyyy-MM-ddTHH:mm:ss")
+            checkDate = Today().AddDays(-365).ToString("yyyy-MM-ddTHH:mm:ss")
         End If
 
         Dim failureDesc As String
         Dim myUrl As String = API_STRING & "/v1/monitoring/companies/" & company.creditSafeId & "/events" & IIf(checklastChecked, "?startDate=" & checkDate, "")
-        Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc)
+        Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc, ,, "getCompanyEventsDetails")
 
         If failureDesc <> "" Then
             If showError Then MsgBox(failureDesc)
-            Return "Error"
+            Return "Error" & vbNewLine & failureDesc & vbNewLine & myUrl
         End If
 
         Dim json As New Chilkat.JsonObject
         Dim success As Boolean = json.Load(jsonRespString)
         If (success <> True) Then
             Debug.WriteLine(json.LastErrorText)
-            Return "Verbindungsfehler"
+            Return "Verbindungsfehler" & vbNewLine & json.LastErrorText
         End If
 
         If dtEvents.Columns.Count = 0 Then
@@ -576,14 +571,424 @@ Public Class cCreditSafeAPI
 
             dtEvents.Rows.Add(R)
 
-            Dim cEvent As New cCreditsafeEvent(CLng(R("eventId")))
+            createEvents(R, company.kdNr, company, CL, CR, CL_Datum, CR_Datum, "ED")
+
+            j = j + 1
+        End While
+        'Next
+
+
+        If dtEvents.Rows.Count > 1 Then
+            dtEvents.DefaultView.Sort = "eventDate ASC"
+            dtEvents = dtEvents.DefaultView.ToTable
+            'viewEvents = New DataView(dtEvents, "localEventCode IN ('CL','CR') or e.globalEventCode IN ('CL','CR')", "", DataViewRowState.CurrentRows)
+        End If
+
+        Dim triggerMail As Boolean = False
+        Dim KUNDE As New cKunde(company.kdNr)
+        Dim Mailtext As String = ""
+
+        updateKundenWithEvent(KUNDE, company, CL, CR, CL_Datum, CR_Datum, setzeKundenbesonderheiten, defaultCR, defaultCL, updateKunden, sendMail, triggerMail, Mailtext, firma)
+
+        'If company.kdNr > 0 AndAlso (CR <> -1000000 Or CL <> -1000000) Then
+        '    Dim KUNDE As New cKunde(company.kdNr)
+
+        '    Dim Mailtext As String = ""
+
+        '    If KUNDE.Bonitätsdatum <= CL_Datum Or KUNDE.Bonitätsdatum <= CR_Datum Then
+
+        '        Dim Index As Double = -1
+        '        Dim ADR As New cAdressen(KUNDE.KundenNr)
+        '        Dim riskClass As String = ""
+        '        Dim riskClassChanged As Boolean = False
+        '        Dim KUNDE_ERW As New cKundenErweitert(KUNDE.KundenNr)
+
+        '        If Not (ADR.LandKz = "AT" Or ADR.LandKz = "A") Then 'bei nicht österr. den Index nehmen, sonst den Score
+        '            Index = IIf(CR = defaultCL, -1, calculatedBonIndexFromBonScore(CR, riskClass))
+        '        Else
+        '            If CR <> defaultCL Then calculatedBonIndexFromBonScore(CR, riskClass)
+        '        End If
+
+        '        If Index <> -1 Then
+        '            If KUNDE_ERW.kde_CreditSaveBonitaetsIndex <> Index Then
+        '                createInfo("B-INDEX", KUNDE_ERW, KUNDE, Index, riskClass, Mailtext, triggerMail, setzeKundenbesonderheiten)
+        '                KUNDE_ERW.kde_CreditSaveBonitaetsIndex = Index
+        '                KUNDE_ERW.kde_CreditSaveBonitaetsklasse = riskClass
+        '                KUNDE.Bonitätsdatum = Today()
+        '            End If
+        '        Else
+        '            If KUNDE_ERW.kde_CreditSaveBonitaetsScore <> CR AndAlso CR <> defaultCR Then
+        '                createInfo("B-SCORE", KUNDE_ERW, KUNDE, CR, riskClass, Mailtext, triggerMail, setzeKundenbesonderheiten)
+        '                KUNDE_ERW.kde_CreditSaveBonitaetsScore = CR
+        '                KUNDE_ERW.kde_CreditSaveBonitaetsklasse = riskClass
+        '                KUNDE.Bonitätsdatum = Today()
+        '            End If
+        '        End If
+
+        '        If KUNDE.Höchstkredit <> CL AndAlso CL <> defaultCL Then
+        '            createInfo("KREDITLIMIT", KUNDE_ERW, KUNDE, CL, riskClass, Mailtext, triggerMail, setzeKundenbesonderheiten)
+        '            KUNDE.Höchstkredit = CL
+        '            If KUNDE.Bonitätsdatum <= CDate(CL_Datum) Then
+        '                KUNDE.Bonitätsdatum = Today()
+        '            End If
+        '        End If
+
+        '        If updateKunden Then KUNDE_ERW.SAVE()
+        '    End If
+
+        '    If updateKunden Then KUNDE.SAVE()
+
+        If triggerMail AndAlso sendMail Then
+            Dim ADR As New cAdressen(KUNDE.KundenNr)
+
+            Dim empfanegerMail As String = ""
+
+            Select Case firma
+                Case "VERAG" : empfanegerMail = "as@verag.ag"
+                Case "IMEX" : empfanegerMail = "Viktoria.Leirich@imex-group.at"
+                    'Case "AMBAR" : empfanegerMail = "Buchhaltung@ambarlog.com"
+                    'Case "UNISPED" : empfanegerMail = "sabine.muehlboeck@unisped.at"
+            End Select
+
+            If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then empfanegerMail = "d.breimaier@verag.ag"
+
+            If empfanegerMail <> "" Then VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfanegerMail, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & "CREDITSAFE " & KUNDE.KundenNr, "Änderungen der Creditsafe-Daten von Kunden " & KUNDE.KundenNr & " " & ADR.Ordnungsbegriff & Mailtext.ToString & "<br><br>" & "*Automatic generated e-mail*",,,,, "d.breimaier@verag.ag")
+        End If
+
+        'End if
+
+
+        Return "Anzahl gefundener Datensätze: " & numCompanies
+
+    End Function
+
+
+
+    Shared Function getCompanyEvents(company As Company, ByRef dtEvents As DataTable, ByRef companyDetailEvents As Boolean, ByRef maxPages As Integer, Optional checklastChecked As Boolean = False, Optional updateKunden As Boolean = False, Optional showError As Boolean = False, Optional getTotalNr As Boolean = False, Optional setzeKundenbesonderheiten As Boolean = False, Optional sendMail As Boolean = False, Optional firma As String = "VERAG", Optional page As Integer = 0) As String
+
+        '------------------------------- ALLE KUNDEN
+
+        Dim checkDate As String = ""
+
+        If company IsNot Nothing AndAlso IsDate(company.lastChecked) Then
+            checkDate = company.lastChecked.ToString("yyyy-MM-ddTHH:mm:ss")
+        Else
+            checkDate = Today().AddDays(-30).ToString("yyyy-MM-ddTHH:mm:ss")
+        End If
+
+        Dim failureDesc As String
+
+        Dim myUrl As String = API_STRING & "/v1/monitoring/portfolios/1662419/notificationEvents"
+
+        Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc,, page, "getCompanyEvents")
+
+        If failureDesc <> "" Then
+            If showError Then MsgBox(failureDesc)
+            Return "Error" & vbNewLine & failureDesc & vbNewLine & myUrl
+        End If
+
+        Dim json As New Chilkat.JsonObject
+        Dim success As Boolean = json.Load(jsonRespString)
+        If (success <> True) Then
+            Debug.WriteLine(json.LastErrorText)
+            Return "Verbindungsfehler" & vbNewLine & json.LastErrorText
+        End If
+
+        If dtEvents.Columns.Count = 0 Then
+            dtEvents.Columns.Add("eventId", GetType(String))
+            dtEvents.Columns.Add("companyId", GetType(String))
+            dtEvents.Columns.Add("portfolioId", GetType(String))
+            dtEvents.Columns.Add("ruleName", GetType(String))
+            dtEvents.Columns.Add("localEventCode", GetType(String))
+            dtEvents.Columns.Add("globalEventCode", GetType(String))
+            dtEvents.Columns.Add("newValue", GetType(String))
+            dtEvents.Columns.Add("oldValue", GetType(String))
+            dtEvents.Columns.Add("eventDate", GetType(DateTime))
+            dtEvents.Columns.Add("createdDate", GetType(DateTime))
+        End If
+
+        dtEvents.Rows.Clear()
+
+        Dim num As Integer = json.SizeOfArray("data")
+        If num = 0 OrElse getTotalNr Then
+            Return json.StringOf("totalCount")
+        End If
+
+        Dim companieData As Chilkat.JsonArray = json.ArrayOf("data")
+        If (json.LastMethodSuccess = False) Then
+            Return "data not found."
+        End If
+
+
+        Dim pagination As Chilkat.JsonObject = json.ObjectOf("paging")
+        If Not (json.LastMethodSuccess = False) Then
+            Dim Lastpage As String = pagination.StringOf("last")
+            If IsNumeric(Lastpage) Then maxPages = Lastpage
+        End If
+
+        Dim numCompanies As Integer = companieData.Size
+
+        Dim defaultCL As Double = -10000000
+        Dim defaultCR As Integer = -10000000
+
+        Dim CL As Double = defaultCL
+        Dim CR As Integer = defaultCR
+        Dim CL_Datum As Date = company.lastChecked
+        Dim CR_Datum As Date = company.lastChecked
+
+        Dim j As Integer = 0
+
+        Dim lastcompanyID As String = ""
+        Dim Mailtext As String = ""
+        Dim triggerMail As Boolean = False
+
+        Dim triggerMailEnd As Boolean = False
+        Dim MailtextEnd As String = ""
+
+        While j < numCompanies
+
+            Dim compObj As Chilkat.JsonObject = companieData.ObjectAt(j)
+            Dim compObjNext As Chilkat.JsonObject = Nothing
+
+            If (j + 1) < numCompanies Then
+                compObjNext = companieData.ObjectAt(j + 1)
+            Else
+                compObjNext = companieData.ObjectAt(j)
+            End If
+
+            Dim companychanges As Boolean = False
+            Dim index = companieData.FindString("eventId", False)
+
+            Dim dateTime As New Chilkat.CkDateTime
+            Dim dt As New Chilkat.DtObj
+            Dim getAsLocal As Boolean = False
+
+            success = compObj.DateOf("eventDate", dateTime)
+            success = compObj.DateOf("createdDate", dateTime)
+            Debug.WriteLine(dateTime.GetAsTimestamp(getAsLocal))
+
+
+            Dim R As DataRow = dtEvents.NewRow
+            R("eventId") = compObj.StringOf("eventId")
+            R("companyId") = compObj.StringOf("companyId")
+            R("portfolioId") = compObj.StringOf("portfolioId")
+            R("ruleName") = compObj.StringOf("ruleName")
+            R("localEventCode") = compObj.StringOf("localEventCode")
+            R("globalEventCode") = compObj.StringOf("globalEventCode")
+            R("oldValue") = compObj.StringOf("oldValue")
+            R("newValue") = compObj.StringOf("newValue")
+            R("eventDate") = dateTime.GetAsTimestamp(getAsLocal)
+            R("createdDate") = dateTime.GetAsTimestamp(getAsLocal)
+
+            If IsDBNull(R("companyId")) Then
+                Dim compObjHead As Chilkat.JsonObject = compObj.ObjectOf("company")
+                R("companyId") = compObjHead.StringOf("id")
+                If IsDBNull(R("portfolioId")) Then R("portfolioId") = compObjHead.StringOf("portfolioId")
+            End If
+
+            Dim nextcompid = ""
+
+            If compObjNext IsNot Nothing Then
+                Dim nextcompObjHead As Chilkat.JsonObject = compObjNext.ObjectOf("company")
+                nextcompid = nextcompObjHead.StringOf("id")
+
+                If nextcompid <> R("companyId") Then
+                    companychanges = True
+                Else
+                    companychanges = False
+                End If
+
+            End If
+            'dtEvents.Rows.Add(R)
+
+            Dim dtKundenNr As New DataTable
+            'If company.kdNr = 0 Then
+            dtKundenNr = SQL.loadDgvBySql("select distinct(ba_KundenNr),f.Firma from Kunden 
+									inner join tblKundenErweitert on Kunden.KundenNr = kde_KundenNr
+                                    inner join Filialen as  f on f.FilialenNr = Kunden.FilialenNr
+                                    inner join tblBonitaetsauskunft on ba_KundenNr = kde_KundenNr
+									 where  isnull(tblKundenErweitert.kde_CreditSaveId,'') ='" & R("companyId") & "'", "FMZOLL")
+
+
+            'End If
+
+            Dim dtFirmen As New DataTable()
+
+            If dtFirmen.Columns.Count = 0 Then dtFirmen.Columns.Add("Firma", GetType(String))
+
+            If dtKundenNr.Rows.Count > 0 Then
+
+                For Each row As DataRow In dtKundenNr.Rows
+                    company.kdNr = row("ba_KundenNr")
+                    company.creditSafeId = R("companyId")
+                    firma = row("Firma")
+
+                    Dim firmRow As DataRow = dtFirmen.NewRow
+                    firmRow("Firma") = firma
+                    dtFirmen.Rows.Add(firmRow)
+
+                    Dim currentBonID As String = (New SQL).getValueTxtBySql("Select Top(1) isnull(ba_id, -1) FROM [tblBonitaetsauskunft] where ba_KundenNr = " & company.kdNr & " AND [ba_Pruefungstool] = 'creditsafe API' ORDER BY ba_Datum DESC", "FMZOLL")
+                    If currentBonID <> "" AndAlso IsNumeric(currentBonID) AndAlso currentBonID > 0 Then
+                        company.csBonID = currentBonID
+                    End If
+
+                    createEvents(R, company.kdNr, company, CL, CR, CL_Datum, CR_Datum, "E")
+
+                Next
+
+
+            End If
+
+
+            '--------------------------------------------------------------------
+
+            If companychanges Then
+
+                If dtKundenNr.Rows.Count > 0 Then
+                    For Each row As DataRow In dtKundenNr.Rows
+
+
+                        Dim KUNDE As New cKunde(row("ba_KundenNr"))
+                        company.kdNr = row("ba_KundenNr")
+                        company.creditSafeId = R("companyId")
+                        firma = row("Firma")
+                        updateKundenWithEvent(KUNDE, company, CL, CR, CL_Datum, CR_Datum, setzeKundenbesonderheiten, defaultCR, defaultCL, updateKunden, sendMail, triggerMail, Mailtext, firma)
+
+                        If company.kdNr <> 0 Then
+                            If triggerMail AndAlso sendMail AndAlso Mailtext <> "" Then
+                                Dim ADR As New cAdressen(company.kdNr)
+                                Dim empfanegerMail = ""
+
+                                For Each firmRowTemp As DataRow In dtFirmen.Rows
+                                    Select Case firmRowTemp("Firma")
+                                        Case "VERAG" : empfanegerMail = "as@verag.ag"
+                                        Case "IMEX" : empfanegerMail = "Viktoria.Leirich@imex-group.at"
+                                            'Case "AMBAR" : empfanegerMail = "Buchhaltung@ambarlog.com"
+                                            'Case "UNISPED" : empfanegerMail = "sabine.muehlboeck@unisped.at"
+                                    End Select
+
+                                    If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then empfanegerMail = "d.breimaier@verag.ag"
+                                    If empfanegerMail <> "" Then VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(empfanegerMail, IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & "CREDITSAFE " & KUNDE.KundenNr & " (" & firmRowTemp("Firma") & ")", "Änderungen der Creditsafe-Daten von Kunden " & KUNDE.KundenNr & " " & ADR.Ordnungsbegriff & Mailtext.ToString & "<br><br>" & "*Automatic generated e-mail*",,,,, "d.breimaier@verag.ag")
+                                Next
+                                Mailtext = ""
+                            End If
+
+                        End If
+
+                    Next
+                End If
+                'wichtig, alles wieder zurücksetzen!!!!!
+                CL = defaultCL
+                CR = defaultCR
+                CL_Datum = company.lastChecked
+                CR_Datum = company.lastChecked
+                company.kdNr = 0
+                triggerMail = False
+                Mailtext = ""
+                company.BANKRUPT_REGISTERED = False
+            End If
+
+            '--------------------------------------------------------------------
+
+            j = j + 1
+
+        End While
+
+        Return "Anzahl gefundener Datensätze: " & numCompanies
+
+    End Function
+
+    Private Shared Sub resetValues(com As Company)
+
+    End Sub
+
+
+
+    Private Shared Sub updateKundenWithEvent(KUNDE As cKunde, company As Company, CL As Integer, CR As Integer, CL_Datum As Date, CR_Datum As Date, setzeKundenbesonderheiten As Boolean, defaultCR As Integer, defaultCL As Integer, updateKunden As Boolean, sendMail As Boolean, ByRef triggerMail As Boolean, ByRef MailText As String, Optional firma As String = "VERAG")
+
+        If company.kdNr > 0 AndAlso (CR <> -1000000 Or CL <> -1000000) Then
+
+            If KUNDE.Bonitätsdatum <= CL_Datum Or KUNDE.Bonitätsdatum <= CR_Datum Then
+
+                Dim Index As Double = -1
+                Dim ADR As New cAdressen(KUNDE.KundenNr)
+                Dim riskClass As String = ""
+                Dim riskClassChanged As Boolean = False
+                Dim KUNDE_ERW As New cKundenErweitert(KUNDE.KundenNr)
+
+                If Not (ADR.LandKz = "AT" Or ADR.LandKz = "A") Then 'bei nicht österr. den Index nehmen, sonst den Score
+                    Index = IIf(CR = defaultCL, -1, calculatedBonIndexFromBonScore(CR, riskClass))
+                Else
+                    If CR <> defaultCL Then calculatedBonIndexFromBonScore(CR, riskClass)
+                End If
+
+                If Index <> -1 Then
+                    If KUNDE_ERW.kde_CreditSaveBonitaetsIndex <> Index Then
+                        createInfo("B-INDEX", KUNDE_ERW, KUNDE, Index, riskClass, MailText, triggerMail, setzeKundenbesonderheiten)
+                        KUNDE_ERW.kde_CreditSaveBonitaetsIndex = Index
+                        KUNDE_ERW.kde_CreditSaveBonitaetsklasse = riskClass
+                        KUNDE.Bonitätsdatum = Today()
+                    End If
+                Else
+                    If KUNDE_ERW.kde_CreditSaveBonitaetsScore <> CR AndAlso CR <> defaultCR Then
+                        createInfo("B-SCORE", KUNDE_ERW, KUNDE, CR, riskClass, MailText, triggerMail, setzeKundenbesonderheiten)
+                        KUNDE_ERW.kde_CreditSaveBonitaetsScore = CR
+                        KUNDE_ERW.kde_CreditSaveBonitaetsklasse = riskClass
+                        KUNDE.Bonitätsdatum = Today()
+                    End If
+                End If
+
+                If KUNDE.Höchstkredit <> CL AndAlso CL <> defaultCL Then
+                    createInfo("KREDITLIMIT", KUNDE_ERW, KUNDE, CL, riskClass, MailText, triggerMail, setzeKundenbesonderheiten)
+                    KUNDE.Höchstkredit = CL
+                    If KUNDE.Bonitätsdatum <= CDate(CL_Datum) Then
+                        KUNDE.Bonitätsdatum = Today()
+                    End If
+                End If
+
+                If company.BANKRUPT_REGISTERED AndAlso Not MailText.Contains("FÜR INSOLVENT ERKLÄRT") Then
+                    createInfo("BANKRUPT_REGISTERED", KUNDE_ERW, KUNDE, CL, riskClass, MailText, triggerMail, setzeKundenbesonderheiten, company)
+                    KUNDE_ERW.kde_CSinsolventAm = company.BANKRUPT_REGISTERED_DATE
+                End If
+
+                If updateKunden Then KUNDE_ERW.SAVE()
+            End If
+
+            If updateKunden Then KUNDE.SAVE()
+
+
+        End If
+    End Sub
+
+    Private Shared Sub createEvents(R As DataRow, KundeNr As Integer, company As Company, ByRef CL As Integer, ByRef CR As Integer, ByRef CL_Datum As Date, ByRef CR_Datum As Date, ByRef Importtype As String)
+
+
+        Dim cEvent As New cCreditsafeEvent(CLng(R("eventId")), KundeNr)
+        Dim globaleventcode As String = ""
+
+        If Not IsDBNull(R("globalEventCode")) Then
+            globaleventcode = R("globalEventCode").trim()
+        ElseIf Not IsDBNull(R("localEventCode")) Then
+            Select Case R("localEventCode").trim()
+                Case "DECREASE_LIMIT", "INCREASE_LIMIT", "CL" : globaleventcode = "CL"
+                Case "DECREASE_RATING", "INCREASE_RATING", "CR" : globaleventcode = "CR"
+                Case "55" : If R("companyId").ToString.StartsWith("NL") Then globaleventcode = "CR" 'nur Holland!
+                Case "56" : If R("companyId").ToString.StartsWith("NL") Then globaleventcode = "CL" 'nur Holland!
+            End Select
+        End If
+
+        If globaleventcode = "" Then
+            If Not IsDBNull(R("ruleName")) AndAlso R("ruleName").ToString.Contains("Limit") Then globaleventcode = "CL"
+            If Not IsDBNull(R("ruleName")) AndAlso R("ruleName").ToString.Contains("International Score") Then globaleventcode = "CR"
+        End If
+
 
         cEvent.eventId = R("eventId")
         cEvent.companyId = R("companyId")
         cEvent.portfolioId = R("portfolioId")
         cEvent.ruleName = R("ruleName")
         cEvent.localEventCode = R("localEventCode").trim()
-            cEvent.globalEventCode = R("globalEventCode").trim()
+        cEvent.globalEventCode = globaleventcode
         cEvent.eventDate = R("eventDate")
         cEvent.createdDate = R("createdDate")
         cEvent.importDate = Now()
@@ -644,84 +1049,24 @@ Public Class cCreditSafeAPI
 
         End If
 
+        If cEvent.localEventCode = "BANKRUPT_REGISTERED" Or cEvent.globalEventCode = "PR" Then
+            setBANCKRUPT_Entry(company, cEvent.eventDate)
+        End If
+
         If cEvent.bonId Is Nothing AndAlso company.csBonID > 0 Then
             cEvent.bonId = company.csBonID
         End If
 
-            cEvent.kundenNr = company.kdNr
+        'cEvent.kundenNr = company.kdNr
+
+        'die Events sind besser strukturiert als die EventDetails, somit soll ein bereits bestehender Eintrag der über die Events importiert werden nicht von einem Eventdetail überschrieben werden!!!
+        If Not (cEvent.hasEntry AndAlso Importtype = "ED") Then
             cEvent.SAVE()
-
-            j = j + 1
-        End While
-        'Next
-
-
-        If dtEvents.Rows.Count > 1 Then
-            dtEvents.DefaultView.Sort = "eventDate ASC"
-            dtEvents = dtEvents.DefaultView.ToTable
-            'viewEvents = New DataView(dtEvents, "localEventCode IN ('CL','CR') or e.globalEventCode IN ('CL','CR')", "", DataViewRowState.CurrentRows)
         End If
 
-        Dim triggerMail As Boolean = False
-
-        If company.kdNr > 0 AndAlso (CR <> -1000000 Or CL <> -1000000) Then
-            Dim KUNDE As New cKunde(company.kdNr)
-
-            Dim Mailtext As String = ""
-
-            If KUNDE.Bonitätsdatum <= CL_Datum Or KUNDE.Bonitätsdatum <= CR_Datum Then
-
-                Dim Index As Double = -1
-                Dim ADR As New cAdressen(KUNDE.KundenNr)
-                Dim riskClass As String = ""
-                Dim riskClassChanged As Boolean = False
-                Dim KUNDE_ERW As New cKundenErweitert(KUNDE.KundenNr)
-
-                If Not (ADR.LandKz = "AT" Or ADR.LandKz = "A") Then 'bei nicht österr. den Index nehmen, sonst den Score
-                    Index = IIf(CR = defaultCL, -1, calculatedBonIndexFromBonScore(CR, riskClass))
-                Else
-                    If CR <> defaultCL Then calculatedBonIndexFromBonScore(CR, riskClass)
-                End If
-
-                If Index <> -1 Then
-                    If KUNDE_ERW.kde_CreditSaveBonitaetsIndex <> Index Then
-                        createInfo("B-INDEX", KUNDE_ERW, KUNDE, Index, riskClass, Mailtext, triggerMail, setzeKundenbesonderheiten)
-                        KUNDE_ERW.kde_CreditSaveBonitaetsIndex = Index
-                        KUNDE_ERW.kde_CreditSaveBonitaetsklasse = riskClass
-                        KUNDE.Bonitätsdatum = Today()
-                    End If
-                Else
-                    If KUNDE_ERW.kde_CreditSaveBonitaetsScore <> CR AndAlso CR <> defaultCR Then
-                        createInfo("B-SCORE", KUNDE_ERW, KUNDE, CR, riskClass, Mailtext, triggerMail, setzeKundenbesonderheiten)
-                        KUNDE_ERW.kde_CreditSaveBonitaetsScore = CR
-                        KUNDE_ERW.kde_CreditSaveBonitaetsklasse = riskClass
-                        KUNDE.Bonitätsdatum = Today()
-                    End If
-                End If
-
-                If KUNDE.Höchstkredit <> CL AndAlso CL <> defaultCL Then
-                    createInfo("KREDITLIMIT", KUNDE_ERW, KUNDE, CL, riskClass, Mailtext, triggerMail, setzeKundenbesonderheiten)
-                    KUNDE.Höchstkredit = CL
-                    If KUNDE.Bonitätsdatum <= CDate(CL_Datum) Then
-                        KUNDE.Bonitätsdatum = Today()
-                    End If
-                End If
-
-                If updateKunden Then KUNDE_ERW.SAVE()
-            End If
-
-            If updateKunden Then KUNDE.SAVE()
-
-            If triggerMail AndAlso sendMail Then
-                VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("as@verag.ag", IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "TEST-", "") & "CREDITSAFE " & KUNDE.KundenNr, "Änderungen der Creditsafe-Daten" & vbNewLine & vbNewLine & vbNewLine & Mailtext.ToString & vbNewLine & vbNewLine & vbNewLine & "*Automatic generated e-mail*",,,,, "d.breimaier@verag.ag")
-            End If
-
-        End If
+    End Sub
 
 
-        Return "Anzahl gefundener Datensätze: " & numCompanies
-
-    End Function
 
     Private Shared Sub setCL_CR_Entry(ByVal cs_date As Date, ByVal type As String, ByRef value As Object, ByRef CL As Double, ByRef CR As Integer, ByRef CL_Datum As Date, ByRef CR_Datum As Date)
 
@@ -734,7 +1079,9 @@ Public Class cCreditSafeAPI
                     saveCR = True
                 End If
 
-                If saveCR AndAlso IsNumeric(value) Then CR = value
+                If saveCR AndAlso IsNumeric(value) Then
+                    CR = value
+                End If
 
             Case "CL"
                 Dim saveCL As Boolean = False
@@ -743,12 +1090,24 @@ Public Class cCreditSafeAPI
                     saveCL = True
                 End If
 
-                If saveCL AndAlso IsNumeric(value) Then CL = value
+                If saveCL AndAlso IsNumeric(value) Then
+                    CL = value
+                End If
 
         End Select
 
     End Sub
 
+    Private Shared Sub setBANCKRUPT_Entry(company As Company, ByVal BK_date As Date)
+
+        If company.kdNr > 0 Then
+            company.BANKRUPT_REGISTERED = True
+            company.BANKRUPT_REGISTERED_DATE = BK_date
+        End If
+
+
+    End Sub
+
     Shared Function getReport(ByRef company As Company, withPDF As Boolean) As String 'Shared Function getReport(ByRef company As Company, withPDF As Boolean, ByRef bytes As Byte()) As String
         Dim failureDesc As String = ""
         Dim myUrl As String = API_STRING & "/v1/companies/" & company.creditSafeId & "/"
@@ -771,7 +1130,7 @@ Public Class cCreditSafeAPI
 
 
 
-        Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, Nothing, acceptContentType, "GET", token, failureDesc)
+        Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, Nothing, acceptContentType, "GET", token, failureDesc,,, "getReport")
         If failureDesc <> "" Then Return failureDesc
 
         Dim json As New Chilkat.JsonObject
@@ -945,7 +1304,7 @@ Public Class cCreditSafeAPI
         Dim acceptContentType = "application/pdf"
         Dim pdfData2 As New Chilkat.BinData
         Dim failureDesc As String = ""
-        Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, Nothing, acceptContentType, "GET", token, failureDesc)
+        Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, Nothing, acceptContentType, "GET", token, failureDesc,,, "getPDF")
 
         If failureDesc <> "" Then
             Dim jsonFailure As New Chilkat.JsonObject
@@ -980,7 +1339,7 @@ Public Class cCreditSafeAPI
         Dim company
         Dim failureDesc As String
         Dim myUrl As String = API_STRING & "/v1/access"
-        Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc)
+        Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc,,, "getSubscriptionCountries")
 
         Dim json As New Chilkat.JsonObject
         success = json.Load(jsonRespString)
@@ -1026,12 +1385,45 @@ Public Class cCreditSafeAPI
     End Function
 
 
-    Shared Sub setSearchParam(ByRef rest As Chilkat.Rest, ByRef company As Company)
+    Shared Sub setSearchParam(ByRef rest As Chilkat.Rest, ByRef company As Company, Optional page As Integer = 0, Optional type As String = "")
 
 
+        Dim setCompanyQueryParam As Boolean = False
+
+        rest.ClearAllQueryParams()
+
+        If company IsNot Nothing Then
+
+            Select Case type
+                Case "getCompanyEvents"
+                    rest.AddQueryParam("sortBy", "companyName")
+                    rest.AddQueryParam("sortDir", "asc")
+
+                    If company.lastChecked >= Today.AddYears(-50) Then
+                        rest.AddQueryParam("startDate", company.lastChecked.ToString("yyyy-MM-ddTHH:mm:ss"))
+                        rest.AddQueryParam("endDate", Now().ToString("yyyy-MM-ddTHH:mm:ss"))
+                        rest.AddQueryParam("filterByCreatedDate", "true")
+                        rest.AddQueryParam("pageSize", "1000") 'maximum
+                        rest.AddQueryParam("page", page)
+                    End If
+                Case "getCompanyEventsDetails"
+                    'Start and Enddate in URL!
+                Case "addCompanyToPortfolio"
+                    'NIX
+                Case "addCompanyToPortfolio_CSV"
+                    'NIX
+                Case "getCompaniesFromPortfolio" : setCompanyQueryParam = True
+                Case "searchCompanies" : setCompanyQueryParam = True
+                Case "getReport" : setCompanyQueryParam = True
+                Case "getPDF" : setCompanyQueryParam = True
+                Case "checkDateOfLastRequest" : setCompanyQueryParam = True
+                Case "getSubscriptionCountries" : setCompanyQueryParam = True
+            End Select
+
+            If setCompanyQueryParam Then
+
                 rest.AddQueryParam("countries", company.country)
 
-
                 If company.creditsafeNo <> "" Then 'Eindeutiger Schlüssel
                     rest.AddQueryParam("safeNo", company.creditsafeNo)
 
@@ -1050,13 +1442,21 @@ Public Class cCreditSafeAPI
 
                 End If
 
+
+
+            End If
+
+        End If
+
+
+
     End Sub
 
 
     Shared Function checkDateOfLastRequest(company As Company) As Date
         Dim failureDesc As String
         Dim myUrl As String = API_STRING & "/v1/companies"
-        Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc)
+        Dim jsonRespString = SendGetRequestWithAuthHeader(myUrl, company, "application/json", "GET", token, failureDesc,,, "checkDateOfLastRequest")
 
         Dim json As New Chilkat.JsonObject
         Dim success As Boolean = json.Load(jsonRespString)
@@ -1108,6 +1508,8 @@ Public Class cCreditSafeAPI
                 riskClass = "D"
             Case 1 To 14
                 riskClass = "D"
+            Case -10000000
+                riskClass = ""
             Case Else
                 riskClass = "E"
         End Select
@@ -1198,12 +1600,14 @@ Public Class cCreditSafeAPI
                 Return 1.1
             Case 99 To 100
                 Return 1
+            Case -10000000
+                Return -1
             Case Else
                 Return 6
         End Select
     End Function
 
-    Shared Sub createInfo(typ As String, kundeErw As cKundenErweitert, kunde As cKunde, newValue As Object, risikoklasse As String, ByRef mailText As String, ByRef triggerMail As Boolean, setzeKundeninfo As Boolean)
+    Shared Sub createInfo(typ As String, kundeErw As cKundenErweitert, kunde As cKunde, newValue As Object, risikoklasse As String, ByRef mailText As String, ByRef triggerMail As Boolean, setzeKundeninfo As Boolean, Optional company As Company = Nothing)
 
         Dim createInfo As Boolean = False
 
@@ -1252,10 +1656,15 @@ Public Class cCreditSafeAPI
                 End If
 
                 'LIMITs DEFINIEREN
-                If newValue = 0 Then
+                If newValue = 0 Or changedInProzent > infoAbxProzentVerschlechertung Then createInfo = True
+                If newValue = 0 Or changedInProzent > infoAbxProzentVerschlechertungMailInfo Then triggerMail = True
+
+
+            Case "BANKRUPT_REGISTERED"
                 createInfo = True
                 triggerMail = True
-                End If
+
+
         End Select
 
         If Not createInfo Then Exit Sub
@@ -1264,7 +1673,12 @@ Public Class cCreditSafeAPI
             Risk = " Risikoklasse: " & oldRiksClass & " -> " & risikoklasse
         End If
 
-        Dim textVermerk As String = "ACHTUNG, Änderung des " & typ & " von " & oldValue.ToString & " um " & changedInProzent.ToString("F2") & "% " & " auf " & newValue.ToString & Risk
+        Dim textVermerk As String = ""
+
+        Select Case typ
+            Case "B-INDEX", "B-SCORE", "KREDITLIMIT" : textVermerk &= "ACHTUNG, Veränderung des " & typ & " von " & oldValue.ToString & " auf " & newValue.ToString & " ( um " & changedInProzent.ToString("F2") & "% ) " & Risk
+            Case "BANKRUPT_REGISTERED" : textVermerk &= " KUNDE WURDE LAUT CREDITSAFE " & IIf(company IsNot Nothing, " AM " & company.BANKRUPT_REGISTERED_DATE.ToShortDateString, "") & " FÜR INSOLVENT ERKLÄRT " & Risk
+        End Select
 
         mailText &= "<br><br>" & textVermerk
 
@@ -1350,6 +1764,8 @@ Public Class cCreditSafeAPI
         Public Property language As String
         Public Property csBank As String
         Public Property csBonID As Integer = -1
+        Public Property BANKRUPT_REGISTERED As Boolean = False
+        Public Property BANKRUPT_REGISTERED_DATE As Date
 
 
 
@@ -1409,9 +1825,16 @@ Public Class cCreditSafeAPI
             Me.eventId = eventId
             LOAD()
         End Sub
+
+        Sub New(eventId_, kundenNr_) 'zwei unterschiedliche KundenNr können dieselbe eventID besitzen (weil bei uns alles tlw. doppelt angelegt ist!!!!!)
+            Me.eventId = eventId_
+            kundenNr = kundenNr_
+            LOADKDNR()
+        End Sub
         Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
             Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
-            list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eventId", eventId,, True))
+            'list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eventId", eventId,, True))
+            list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eventId", eventId))
             list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("companyId", companyId))
             list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("portfolioId", portfolioId))
             list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ruleName", ruleName))
@@ -1443,7 +1866,7 @@ Public Class cCreditSafeAPI
         Public Function SAVE() As Boolean
             Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
 
-            Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblCreditsafeEvents  WHERE eventId=@eventId) " &
+            Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblCreditsafeEvents  WHERE eventId=@eventId AND kundenNr=@kundenNr) " &
                        " BEGIN " & getUpdateCmd() & " END " &
                        " Else " &
                        " BEGIN " & getInsertCmd() & " END " &
@@ -1480,6 +1903,35 @@ Public Class cCreditSafeAPI
             End Try
         End Sub
 
+        Public Sub LOADKDNR()
+            Try
+                hasEntry = False
+                Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
+                    Using cmd As New SqlCommand("SELECT * FROM tblCreditsafeEvents WHERE eventId=@eventId AND kundenNr=@kundenNr  ", conn)
+                        cmd.Parameters.AddWithValue("@eventId", eventId)
+                        cmd.Parameters.AddWithValue("@kundenNr", kundenNr)
+                        Dim dr = cmd.ExecuteReader()
+                        If dr.Read Then
+                            For Each li In getParameterList()
+                                Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable)
+
+                                If dr.Item(li.Text) Is DBNull.Value Then
+                                    propInfo.SetValue(Me, Nothing)
+                                Else
+                                    propInfo.SetValue(Me, dr.Item(li.Text))
+                                End If
+
+                            Next
+                            hasEntry = True
+                        End If
+                        dr.Close()
+                    End Using
+                End Using
+            Catch ex As Exception
+                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+            End Try
+        End Sub
+
 
 
         Public Function getUpdateCmd() As String
@@ -1493,7 +1945,7 @@ Public Class cCreditSafeAPI
                     End If
                 Next
                 str = str.Substring(0, str.Length - 1) 'wg. ','
-                Return (" UPDATE tblCreditsafeEvents SET " & str & " WHERE eventId=@eventId ")
+                Return (" UPDATE tblCreditsafeEvents SET " & str & " WHERE eventId=@eventId AND kundenNr=@kundenNr")
 
             Catch ex As Exception
                 VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)

VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb

@@ -934,7 +934,7 @@ Public Class cTimasAPI
 
         Select Case inout
             Case "in"
-                entryType = "KOMMT"
+                entryType = "KOMMT" & IIf(art = 0, "(Büro)", "") & IIf(art = 3, "(Homeoffice)", "")
 
             Case "out"
                 entryType = "GEHT"

VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj

@@ -386,6 +386,12 @@
     <Compile Include="AuditFlow\Classes\cAuditFlow.vb" />
     <Compile Include="AuditFlow\Classes\cAuditFlow_Pruefobjekte.vb" />
     <Compile Include="AuditFlow\Classes\cAuditFlow_Pruefungen.vb" />
+    <Compile Include="frmTimasabfrage.Designer.vb">
+      <DependentUpon>frmTimasabfrage.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmTimasabfrage.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="frmDatumsabfrage.Designer.vb">
       <DependentUpon>frmDatumsabfrage.vb</DependentUpon>
     </Compile>
@@ -808,6 +814,9 @@
     <EmbeddedResource Include="DATENSERVER\frmVorlagenUpload.resx">
       <DependentUpon>frmVorlagenUpload.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="frmTimasabfrage.resx">
+      <DependentUpon>frmTimasabfrage.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmDatumsabfrage.resx">
       <DependentUpon>frmDatumsabfrage.vb</DependentUpon>
     </EmbeddedResource>

VERAG_PROG_ALLGEMEIN/cErrorHandler.vb

@@ -5,7 +5,7 @@ Imports System.Windows.Forms
 
 Public Class cErrorHandler
 
-    Public Shared Sub ERR(message As String, stack As String, functionName As String, Optional OP As String = "", Optional title As String = "", Optional mailadess As String = "error@verag.ag", Optional recieverMailAdress As String = "", Optional zusatz As String = "", Optional errCode As String = Nothing)
+    Public Shared Sub ERR(message As String, stack As String, functionName As String, Optional OP As String = "", Optional title As String = "", Optional mailadess As String = "error@verag.ag", Optional recieverMailAdress As String = "", Optional zusatz As String = "", Optional errCode As String = Nothing, Optional furtherMailAdress As String = "")
         If OP = "" Then OP = VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL ' GLobal gesetzes Errorhandling! (Standart=SHOW)
 
         'If Form.ActiveForm IsNot Nothing Then
@@ -19,7 +19,7 @@ Public Class cErrorHandler
 
             Select Case OP
                 Case ERROR_OP.MAIL
-                    sendERRORperMail(title & " | " & My.Application.Info.AssemblyName, message, stack, mailadess, zusatz, functionName)
+                    sendERRORperMail(title & " | " & My.Application.Info.AssemblyName, message, stack, mailadess, zusatz, functionName, furtherMailAdress)
                 Case ERROR_OP.SHOW
                     Dim c As New cProgramFunctions
                     Dim url = c.MakeScreenshot()
@@ -44,7 +44,7 @@ Public Class cErrorHandler
 
     End Sub
 
-    Public Shared Sub sendERRORperMail(title, errmsg, errstack, recieverMailAdress, zusatz, functionName)
+    Public Shared Sub sendERRORperMail(title, errmsg, errstack, recieverMailAdress, zusatz, functionName, furtherMailAdress)
         Dim Msg As New MailMessage
         Dim myCredentials As New System.Net.NetworkCredential
         'myCredentials.UserName = "support@verag.ag"
@@ -66,6 +66,8 @@ Public Class cErrorHandler
             Msg.From = New MailAddress("edv@verag.ag")
             Msg.To.Add(recieverMailAdress)
 
+            If furtherMailAdress <> "" Then Msg.To.Add(furtherMailAdress)
+
             Msg.Subject = title '"ERROR - DAKOSY Einarbeitung"
             Msg.Body = "Uhrzeit: " & Now.ToShortDateString & " " & Now.ToShortTimeString
             Msg.Body = "Function: " & functionName

VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb

@@ -441,7 +441,7 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object(
         End Try
     End Function
 
-    Public Shared Function sendMail(eMailTo, betreff, text, Optional eMailfrom = "support@verag.ag", Optional prio = False, Optional uhrzeitAngeben = True, Optional cc = "", Optional bcc = "", Optional anhaenge = Nothing, Optional art = 0)
+    Public Shared Function sendMail(eMailTo, betreff, text, Optional eMailfrom = "support@verag.ag", Optional prio = False, Optional uhrzeitAngeben = True, Optional cc = "", Optional bcc = "", Optional anhaenge = Nothing, Optional art = 0, Optional furtherMailAdress = "")
         Dim Msg As New MailMessage
         Dim myCredentials As New System.Net.NetworkCredential
         Msg.IsBodyHtml = True
@@ -549,7 +549,7 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object(
 
         Catch ex As Exception
             Try
-                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("MAIL ERROR - VOR SENDEN" & ex.Message, "TO: " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
+                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("MAIL ERROR - VOR SENDEN" & ex.Message, "TO: " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL,,,,, furtherMailAdress)
             Catch ex2 As Exception
                 VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("MAIL ERROR - VOR SENDEN LOG! " & ex2.Message, "TO: " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, ex2.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.LOG)
             End Try
@@ -559,7 +559,7 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object(
 
         'Prüfen, ob Empfänger angegeben:
         If Msg.To.Count = 0 And Msg.CC.Count = 0 And Msg.Bcc.Count = 0 Then
-            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Kein Empfänger!", "TO:  " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Kein Empfänger!", "TO:  " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL,,,,,, furtherMailAdress)
             Return False
         End If
 
@@ -579,7 +579,7 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object(
         Catch ex As Exception
             Try 'Falls Fehler nicht beim Senden, sonder was anderes.
 
-                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "TO:  " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
+                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "TO:  " & eMailTo & vbNewLine & "SUBJ: " & betreff & vbNewLine & "TXT: " & text, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL,,,,, furtherMailAdress)
             Catch ex3 As Exception
             End Try
 

VERAG_PROG_ALLGEMEIN/frmTimasabfrage.Designer.vb

@@ -0,0 +1,172 @@
+Imports System.Windows.Forms
+
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class frmTimasabfrage
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()>
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()>
+    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
+        Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
+        Me.rbHO = New System.Windows.Forms.RadioButton()
+        Me.rbBuero = New System.Windows.Forms.RadioButton()
+        Me.Button1 = New System.Windows.Forms.Button()
+        Me.cboTyp = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.btnClose = New System.Windows.Forms.Button()
+        Me.btn = New System.Windows.Forms.Button()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.MyPanel1.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'MyPanel1
+        '
+        Me.MyPanel1.BackColor = System.Drawing.Color.White
+        Me.MyPanel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.MyPanel1.Controls.Add(Me.rbHO)
+        Me.MyPanel1.Controls.Add(Me.rbBuero)
+        Me.MyPanel1.Controls.Add(Me.Button1)
+        Me.MyPanel1.Controls.Add(Me.cboTyp)
+        Me.MyPanel1.Controls.Add(Me.btnClose)
+        Me.MyPanel1.Controls.Add(Me.btn)
+        Me.MyPanel1.Controls.Add(Me.Label1)
+        Me.MyPanel1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.MyPanel1.Location = New System.Drawing.Point(0, 0)
+        Me.MyPanel1.Name = "MyPanel1"
+        Me.MyPanel1.Size = New System.Drawing.Size(264, 103)
+        Me.MyPanel1.TabIndex = 3
+        '
+        'rbHO
+        '
+        Me.rbHO.AutoSize = True
+        Me.rbHO.Location = New System.Drawing.Point(76, 46)
+        Me.rbHO.Name = "rbHO"
+        Me.rbHO.Size = New System.Drawing.Size(79, 17)
+        Me.rbHO.TabIndex = 9
+        Me.rbHO.TabStop = True
+        Me.rbHO.Text = "Homeoffice"
+        Me.rbHO.UseVisualStyleBackColor = True
+        '
+        'rbBuero
+        '
+        Me.rbBuero.AutoSize = True
+        Me.rbBuero.Location = New System.Drawing.Point(76, 23)
+        Me.rbBuero.Name = "rbBuero"
+        Me.rbBuero.Size = New System.Drawing.Size(47, 17)
+        Me.rbBuero.TabIndex = 8
+        Me.rbBuero.TabStop = True
+        Me.rbBuero.Text = "Büro"
+        Me.rbBuero.UseVisualStyleBackColor = True
+        '
+        'Button1
+        '
+        Me.Button1.DialogResult = System.Windows.Forms.DialogResult.OK
+        Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!)
+        Me.Button1.Location = New System.Drawing.Point(6, 71)
+        Me.Button1.Margin = New System.Windows.Forms.Padding(0)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(57, 22)
+        Me.Button1.TabIndex = 7
+        Me.Button1.Text = "OK"
+        Me.Button1.UseVisualStyleBackColor = True
+        '
+        'cboTyp
+        '
+        Me.cboTyp._allowedValuesFreiText = Nothing
+        Me.cboTyp._allowFreiText = False
+        Me.cboTyp._value = ""
+        Me.cboTyp.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
+        Me.cboTyp.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboTyp.DropDownWidth = 224
+        Me.cboTyp.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.cboTyp.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboTyp.FormattingEnabled = True
+        Me.cboTyp.Items.AddRange(New Object() {"", "100000-199999: XXXXXX", "200000-299999: XXXXXX", "300000-399999: XXXXXX", "400000-499999: XXXXXX", "500000-599999: XXXXXX", "600000-699999: XXXXXX", "700000-799999: XXXXXX", "800000-899999: XXXXXX", "900000-999999: XXXXXX"})
+        Me.cboTyp.Location = New System.Drawing.Point(201, 33)
+        Me.cboTyp.Name = "cboTyp"
+        Me.cboTyp.Size = New System.Drawing.Size(58, 28)
+        Me.cboTyp.TabIndex = 4
+        Me.cboTyp.Visible = False
+        '
+        'btnClose
+        '
+        Me.btnClose.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnClose.BackColor = System.Drawing.Color.Red
+        Me.btnClose.FlatAppearance.BorderColor = System.Drawing.Color.White
+        Me.btnClose.FlatAppearance.BorderSize = 0
+        Me.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnClose.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!, System.Drawing.FontStyle.Bold)
+        Me.btnClose.ForeColor = System.Drawing.Color.White
+        Me.btnClose.Location = New System.Drawing.Point(231, 0)
+        Me.btnClose.Name = "btnClose"
+        Me.btnClose.RightToLeft = System.Windows.Forms.RightToLeft.Yes
+        Me.btnClose.Size = New System.Drawing.Size(31, 20)
+        Me.btnClose.TabIndex = 5
+        Me.btnClose.Text = "X"
+        Me.btnClose.UseVisualStyleBackColor = False
+        '
+        'btn
+        '
+        Me.btn.DialogResult = System.Windows.Forms.DialogResult.Cancel
+        Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btn.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!)
+        Me.btn.Location = New System.Drawing.Point(178, 71)
+        Me.btn.Margin = New System.Windows.Forms.Padding(0)
+        Me.btn.Name = "btn"
+        Me.btn.Size = New System.Drawing.Size(76, 22)
+        Me.btn.TabIndex = 2
+        Me.btn.Text = "Abbrechen"
+        Me.btn.UseVisualStyleBackColor = True
+        '
+        'Label1
+        '
+        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label1.ForeColor = System.Drawing.SystemColors.ControlText
+        Me.Label1.Location = New System.Drawing.Point(3, 2)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(222, 18)
+        Me.Label1.TabIndex = 6
+        '
+        'frmTimasabfrage
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(264, 103)
+        Me.Controls.Add(Me.MyPanel1)
+        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
+        Me.Name = "frmTimasabfrage"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+        Me.Text = "frmDatumsabfrage"
+        Me.MyPanel1.ResumeLayout(False)
+        Me.MyPanel1.PerformLayout()
+        Me.ResumeLayout(False)
+
+    End Sub
+
+    Friend WithEvents MyPanel1 As VERAG_PROG_ALLGEMEIN.MyPanel
+    Friend WithEvents btnClose As Button
+    Friend WithEvents btn As Button
+    Friend WithEvents Label1 As Label
+    Public WithEvents cboTyp As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Button1 As Button
+    Friend WithEvents rbHO As RadioButton
+    Friend WithEvents rbBuero As RadioButton
+End Class

VERAG_PROG_ALLGEMEIN/frmTimasabfrage.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

VERAG_PROG_ALLGEMEIN/frmTimasabfrage.vb

@@ -0,0 +1,61 @@
+Public Class frmTimasabfrage
+    Dim mit As VERAG_PROG_ALLGEMEIN.cMitarbeiter
+    Public Datum As Date = CDate(Now.ToShortDateString)
+    Public typ As Integer = -1
+
+    Sub New()
+        ' Dieser Aufruf ist für den Designer erforderlich.
+        InitializeComponent()
+    End Sub
+
+    Sub New(mit_ As cMitarbeiter)
+        ' Dieser Aufruf ist für den Designer erforderlich.
+        InitializeComponent()
+        mit = mit_
+    End Sub
+
+    Private Sub frmTimasabfrage(sender As Object, e As EventArgs) Handles Me.Load
+
+        cboTyp.Items.Clear()
+        cboTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Büro", "0"))
+        cboTyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Homeoffice", "3"))
+
+        If mit IsNot Nothing Then
+            Label1.Text = "Zeit erfassen für: " & mit.mit_nname & " " & mit.mit_vname
+            If mit.mit_homeoffice Then
+                rbHO.Checked = True
+                cboTyp.changeItem("Homeoffice")
+            Else
+                rbHO.Checked = False
+                cboTyp.changeItem("Büro")
+            End If
+        End If
+
+
+
+    End Sub
+
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+
+        If typ = -1 Then
+            MsgBox("Bitte Typ auswählen")
+            DialogResult = Windows.Forms.DialogResult.None
+        Else
+            DialogResult = Windows.Forms.DialogResult.OK
+        End If
+
+    End Sub
+
+    Private Sub rbBuero_CheckedChanged(sender As Object, e As EventArgs) Handles rbBuero.CheckedChanged, rbHO.CheckedChanged
+
+        If rbBuero.Checked Then
+            typ = 0
+        ElseIf rbHO.Checked Then
+            typ = 3
+        Else
+            typ = -1
+        End If
+
+    End Sub
+
+End Class