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

SDL/Fakturierung/frmAbrechnungsMaske.vb

@@ -157,7 +157,7 @@ Public Class frmAbrechnungsMaske
                 sqlstr &= "   WHERE 1=1 AND R1.Firma_ID=24 "
                 sqlstr &= getRGWhere(MyComboBox3._value)
                 sqlstr &= "   and (SELECT COUNT(*) FROM Rechnungsausgang as R2 where"
-                sqlstr &= "   R1.FilialenNr=R2.FilialenNr and R1.AbfertigungsNr=R2.AbfertigungsNr and R1.SpeditionsbuchUnterNr=R2.SpeditionsbuchUnterNr AND RechnungsKundenNr=3013401 and R2.[BelegartenNr]=71)=0"
+                sqlstr &= "   R1.FilialenNr=R2.FilialenNr and R1.AbfertigungsNr=R2.AbfertigungsNr and R1.SpeditionsbuchUnterNr=R2.SpeditionsbuchUnterNr AND (RechnungsKundenNr=3013401 OR RechnungsKundenNr = 3017683) and R2.[BelegartenNr]=71)=0"
                 sqlstr &= "   and Speditionsbuch.Abfertigungsart IN (1)"
                 sqlstr &= "   ORDER BY FilialenNr, AbfertigungsNr, UnterNr"
 

SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb

@@ -277,6 +277,8 @@ Partial Class usrCntlFaktAbrechnung
         Me.GutschriftAusRechnungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.SeperateRechnungFürEUSTToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.GutschriftAnVeragToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.VeragAGToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.VeragCSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.pnlTop.SuspendLayout()
         Me.Panel3.SuspendLayout()
         Me.Panel1.SuspendLayout()
@@ -3929,7 +3931,7 @@ Partial Class usrCntlFaktAbrechnung
         '
         Me.ContextMenuStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GutschriftAusRechnungToolStripMenuItem, Me.SeperateRechnungFürEUSTToolStripMenuItem, Me.GutschriftAnVeragToolStripMenuItem})
         Me.ContextMenuStrip2.Name = "ContextMenuStrip2"
-        Me.ContextMenuStrip2.Size = New System.Drawing.Size(224, 70)
+        Me.ContextMenuStrip2.Size = New System.Drawing.Size(224, 92)
         '
         'GutschriftAusRechnungToolStripMenuItem
         '
@@ -3945,9 +3947,22 @@ Partial Class usrCntlFaktAbrechnung
         '
         'GutschriftAnVeragToolStripMenuItem
         '
+        Me.GutschriftAnVeragToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VeragAGToolStripMenuItem, Me.VeragCSToolStripMenuItem})
         Me.GutschriftAnVeragToolStripMenuItem.Name = "GutschriftAnVeragToolStripMenuItem"
         Me.GutschriftAnVeragToolStripMenuItem.Size = New System.Drawing.Size(223, 22)
-        Me.GutschriftAnVeragToolStripMenuItem.Text = "Gutschrift an Verag"
+        Me.GutschriftAnVeragToolStripMenuItem.Text = "Gutschrift an"
+        '
+        'VeragAGToolStripMenuItem
+        '
+        Me.VeragAGToolStripMenuItem.Name = "VeragAGToolStripMenuItem"
+        Me.VeragAGToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.VeragAGToolStripMenuItem.Text = "Verag AG"
+        '
+        'VeragCSToolStripMenuItem
+        '
+        Me.VeragCSToolStripMenuItem.Name = "VeragCSToolStripMenuItem"
+        Me.VeragCSToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.VeragCSToolStripMenuItem.Text = "Verag CS"
         '
         'usrCntlFaktAbrechnung
         '
@@ -4231,4 +4246,6 @@ Partial Class usrCntlFaktAbrechnung
     Friend WithEvents Label56 As Label
     Friend WithEvents txtRechnungAnZusatz As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents GutschriftAnVeragToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents VeragAGToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents VeragCSToolStripMenuItem As ToolStripMenuItem
 End Class

SDL/Fakturierung/usrCntlFaktAbrechnung.vb

@@ -1,5 +1,4 @@
-Imports System.IO
+
-Imports com.sun.xml.internal.rngom.digested
 Imports VERAG_PROG_ALLGEMEIN
 
 Public Class usrCntlFaktAbrechnung
@@ -545,7 +544,7 @@ Public Class usrCntlFaktAbrechnung
         End If
 
         'If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
-        '    FirmaTmp = "AMBAR"
+        'FirmaTmp = "AMBAR"
         'End If
 
         Select Case FirmaTmp
@@ -1886,6 +1885,7 @@ Public Class usrCntlFaktAbrechnung
 
         Dim FIRMATMP = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(cboFiliale._value)
         kdFirmaRechnungAn._UseFIRMA = FIRMATMP
+        If cboFiliale._value = "5701" AndAlso VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AMBAR_ALLE_RECHNUNGSEMPFÄNGER", "SDL") Then kdFirmaRechnungAn._UseFIRMA = Nothing
         kdFirmaAbsender._UseFIRMA = FIRMATMP
         kdFirmaAuftraggeber._UseFIRMA = FIRMATMP
         kdFirmaEmpfaenger._UseFIRMA = FIRMATMP
@@ -3974,14 +3974,26 @@ Nächste_Textzeile_lesen:
         End If
     End Sub
 
-    Private Sub EUStGutschriftAnVeragToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GutschriftAnVeragToolStripMenuItem.Click
+    Private Sub EUStGutschriftAnVeragToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VeragAGToolStripMenuItem.Click, VeragCSToolStripMenuItem.Click
+
+        Dim verag As String = ""
+
+        Select Case sender.name
+            Case "VeragAGToolStripMenuItem"
+                verag = "Verag AG"
+                veragKunde = 3013401
+
+            Case "VeragCSToolStripMenuItem"
+                verag = "Verag Customs Service"
+                veragKunde = 3017683
+        End Select
 
         Dim spedbuch = New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch(cboFiliale._value, txtAbfertigungsnummer.Text, cboSpedBuchUnterNr._value)
 
         If spedbuch.Abfertigungsart <> 1 AndAlso RECHNUNG.[BelegartenNr] = 71 Then Exit Sub 'nur bei Rechnung und abfertigungsart 1
 
 
-        Dim abfrage = "Soll eine neue Gutschrift an die Verag AG für die Verzollung/EUST erstellt werden?"
+        Dim abfrage = "Soll eine neue Gutschrift an die " & verag & " für die Verzollung/EUST erstellt werden?"
         Dim PosWithWEustOrVerz As Boolean = False
         Dim selectedPOS As New List(Of VERAG_PROG_ALLGEMEIN.cRechnungsausgangPositionen)
         For Each POS In RECHNUNG.POSITIONEN.Where(Function(x) x.Anzahl > 0).ToList
@@ -3994,7 +4006,6 @@ Nächste_Textzeile_lesen:
         If Not PosWithWEustOrVerz Then Exit Sub
 
         If vbYes = MsgBox(abfrage, vbYesNoCancel) Then
-            veragKunde = 3013401
             saveMe()
             Dim RECHNUNGOldID = RECHNUNG.RK_ID
             Dim RECHNUNG_TMP = New VERAG_PROG_ALLGEMEIN.cRechnungsausgang(RECHNUNGOldID)
@@ -4110,4 +4121,6 @@ Nächste_Textzeile_lesen:
         btn.Enabled = IIf(cboSammelrechnung._value = 0, True, False)
 
     End Sub
+
+
 End Class

SDL/kunden/usrCntlKundenuebersicht.vb

@@ -2811,6 +2811,7 @@ Public Class usrCntlKundenuebersicht
                 End Select
 
 
+
                 Dim company As New cCreditSafeAPI.Company("", "", "", land, KUNDE_ERW.kde_CreditSaveNo, KUNDE_ERW.kde_CreditSaveId, Nothing, "", "", "", "", "", "", "", "", "")
 
                 If lblBonitaetsdatum._value <> Nothing Then
@@ -2832,50 +2833,30 @@ Public Class usrCntlKundenuebersicht
 
 
 
-                    ' If cs.checkDateOfLastRequest(company) < lastChecked Then
+                    If cs.checkDateOfLastRequest(company) < lastChecked Then
-                    Dim dtEvents As New DataTable
+                        Dim a As MsgBoxResult = MsgBox("Seit der letzen Abfrage (" & lastChecked.ToShortDateString & ") wurde bei Creditsafe keine Änderung gemacht!" & vbNewLine & "Trotzdem Creditreport-Daten aktualisieren?", vbYesNo)
+                        If a = vbYes Then
 
-                    dtEvents.Columns.Add("eventId", GetType(String))
+                            setCreditsafereportEntry(cs, company, True) 'doppelte Abfragen mitprotokollieren
-                    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))
-
-                    cs.getCompanieEvents(company, dtEvents)
-
-                    If dtEvents.Rows.Count > 0 Then
-                        dtEvents.DefaultView.Sort = "eventDate desc"
-                        If dtEvents.Rows(0).Item("eventDate") < lastChecked Then
-
-                            Dim a As MsgBoxResult = MsgBox("Seit der letzen Abfrage (" & lastChecked.ToShortDateString & ") wurde bei Creditsafe keine Änderung gemacht!" & vbNewLine & "Trotzdem Creditreport-Daten aktualisieren?", vbYesNo)
-                            If a = vbYes Then
-
-                                setCreditsafereportEntry(cs, company, True) 'doppelte Abfragen mitprotokollieren
-
-                            End If
-
-                        Else
-                            setCreditsafereportEntry(cs, company)
 
                         End If
-                    Else
 
+                    Else
                         setCreditsafereportEntry(cs, company)
 
                     End If
-
-
                 Else
-                    MsgBox("Authentifizierungsfehler bei Creditsafe-User")
+
+                    setCreditsafereportEntry(cs, company)
 
                 End If
 
+
+            Else
+                MsgBox("Authentifizierungsfehler bei Creditsafe-User")
+
             End If
+
         End If
 
 

VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.resx

@@ -139,7 +139,7 @@
     <value>242, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>91</value>
+    <value>86</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb

@@ -70,7 +70,6 @@ Public Class frmMitarbeitersuche
         btnEdit.Visible = False
         pnl.Visible = False
         'lblTimasZeiten.Visible = False
-        lblTimasSaldo.Visible = False
         Panel1.Visible = False
         btnSettings.Visible = False
         Button3.Visible = False
@@ -170,12 +169,19 @@ Public Class frmMitarbeitersuche
             'requestDone = Not callTimasSaldo
             initTimasData()
 
-            If VERAG_PROG_ALLGEMEIN.cAllgemein.USRID = MA.mit_id AndAlso VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasId IsNot Nothing Then
+            If VERAG_PROG_ALLGEMEIN.cAllgemein.USRID = MA.mit_id Then
-                pnlZeiten.Visible = True
+                btnEdit.Visible = True
+
+                If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasId IsNot Nothing Then
+                    pnlZeiten.Visible = True
+                Else
+                    pnlZeiten.Visible = False
+                End If
             Else
                 pnlZeiten.Visible = False
             End If
 
+
             If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMINFUNCTIONS", "SDL") Then
                 btnEdit.Visible = True
                 btnSettings.Visible = True
@@ -406,7 +412,7 @@ Public Class frmMitarbeitersuche
 
                 Dim resultCode As Integer = IIf(cbxHomeoffice.Checked, 3, 0)
 
-                If MA.mit_nname.ToLower = "celan" Then 'aktuell Hardcoded, wenn Zeit ist dynamisch (per SQL-tbl)
+                If MA.mit_nname.ToLower = "celan" Or MA.mit_nname.ToLower = "breimaier" Then 'aktuell Hardcoded, wenn Zeit ist dynamisch (per SQL-tbl)
 
                     Dim f As New frmZEButtons(art)
                     f.ShowDialog()
@@ -444,11 +450,11 @@ Public Class frmMitarbeitersuche
         'Eintrag für Zeitübersicht
         'lblTimasZeiten.Visible = True
 
-        lblTimasSaldo.Visible = False
-        lblTimasSaldo.Text = ""
-
         If Not requestDone Then
 
+            'lblTimasSaldo.Visible = False
+            lblTimasSaldo.Text = ""
+
             Dim dtZeiten As New DataTable
             If timas IsNot Nothing Then
                 Dim isServiceRunning As Boolean = True

VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmZEButtons.Designer.vb

@@ -65,7 +65,7 @@ Partial Class frmZEButtons
         Me.btnVergGehen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnVergGehen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_gehen
         Me.btnVergGehen.ImageAlign = System.Drawing.ContentAlignment.TopRight
-        Me.btnVergGehen.Location = New System.Drawing.Point(132, 168)
+        Me.btnVergGehen.Location = New System.Drawing.Point(132, 174)
         Me.btnVergGehen.Name = "btnVergGehen"
         Me.btnVergGehen.Size = New System.Drawing.Size(90, 45)
         Me.btnVergGehen.TabIndex = 132
@@ -82,7 +82,7 @@ Partial Class frmZEButtons
         Me.btnVergKommen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnVergKommen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_kommen
         Me.btnVergKommen.ImageAlign = System.Drawing.ContentAlignment.TopLeft
-        Me.btnVergKommen.Location = New System.Drawing.Point(20, 168)
+        Me.btnVergKommen.Location = New System.Drawing.Point(20, 174)
         Me.btnVergKommen.Name = "btnVergKommen"
         Me.btnVergKommen.Size = New System.Drawing.Size(106, 45)
         Me.btnVergKommen.TabIndex = 131
@@ -99,7 +99,7 @@ Partial Class frmZEButtons
         Me.btnFOGehen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnFOGehen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_gehen
         Me.btnFOGehen.ImageAlign = System.Drawing.ContentAlignment.TopRight
-        Me.btnFOGehen.Location = New System.Drawing.Point(132, 117)
+        Me.btnFOGehen.Location = New System.Drawing.Point(132, 123)
         Me.btnFOGehen.Name = "btnFOGehen"
         Me.btnFOGehen.Size = New System.Drawing.Size(90, 45)
         Me.btnFOGehen.TabIndex = 130
@@ -116,7 +116,7 @@ Partial Class frmZEButtons
         Me.btnFOKommen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnFOKommen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_kommen
         Me.btnFOKommen.ImageAlign = System.Drawing.ContentAlignment.TopLeft
-        Me.btnFOKommen.Location = New System.Drawing.Point(20, 117)
+        Me.btnFOKommen.Location = New System.Drawing.Point(20, 123)
         Me.btnFOKommen.Name = "btnFOKommen"
         Me.btnFOKommen.Size = New System.Drawing.Size(106, 45)
         Me.btnFOKommen.TabIndex = 129
@@ -128,7 +128,7 @@ Partial Class frmZEButtons
         '
         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.Location = New System.Drawing.Point(145, -1)
+        Me.Label1.Location = New System.Drawing.Point(145, 5)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(50, 13)
         Me.Label1.TabIndex = 128
@@ -138,7 +138,7 @@ Partial Class frmZEButtons
         '
         Me.lblkommen.AutoSize = True
         Me.lblkommen.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblkommen.Location = New System.Drawing.Point(43, -1)
+        Me.lblkommen.Location = New System.Drawing.Point(43, 5)
         Me.lblkommen.Name = "lblkommen"
         Me.lblkommen.Size = New System.Drawing.Size(61, 13)
         Me.lblkommen.TabIndex = 127
@@ -153,7 +153,7 @@ Partial Class frmZEButtons
         Me.btnATTGehen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnATTGehen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_gehen
         Me.btnATTGehen.ImageAlign = System.Drawing.ContentAlignment.TopRight
-        Me.btnATTGehen.Location = New System.Drawing.Point(132, 66)
+        Me.btnATTGehen.Location = New System.Drawing.Point(132, 72)
         Me.btnATTGehen.Name = "btnATTGehen"
         Me.btnATTGehen.Size = New System.Drawing.Size(90, 45)
         Me.btnATTGehen.TabIndex = 126
@@ -170,7 +170,7 @@ Partial Class frmZEButtons
         Me.btnATTKommen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnATTKommen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_kommen
         Me.btnATTKommen.ImageAlign = System.Drawing.ContentAlignment.TopLeft
-        Me.btnATTKommen.Location = New System.Drawing.Point(20, 66)
+        Me.btnATTKommen.Location = New System.Drawing.Point(20, 72)
         Me.btnATTKommen.Name = "btnATTKommen"
         Me.btnATTKommen.Size = New System.Drawing.Size(106, 45)
         Me.btnATTKommen.TabIndex = 125
@@ -187,7 +187,7 @@ Partial Class frmZEButtons
         Me.btnIMEXGehen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnIMEXGehen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_gehen
         Me.btnIMEXGehen.ImageAlign = System.Drawing.ContentAlignment.TopRight
-        Me.btnIMEXGehen.Location = New System.Drawing.Point(132, 15)
+        Me.btnIMEXGehen.Location = New System.Drawing.Point(132, 21)
         Me.btnIMEXGehen.Name = "btnIMEXGehen"
         Me.btnIMEXGehen.Size = New System.Drawing.Size(90, 45)
         Me.btnIMEXGehen.TabIndex = 124
@@ -204,7 +204,7 @@ Partial Class frmZEButtons
         Me.btnIMEXKommen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnIMEXKommen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_kommen
         Me.btnIMEXKommen.ImageAlign = System.Drawing.ContentAlignment.TopLeft
-        Me.btnIMEXKommen.Location = New System.Drawing.Point(20, 15)
+        Me.btnIMEXKommen.Location = New System.Drawing.Point(20, 21)
         Me.btnIMEXKommen.Name = "btnIMEXKommen"
         Me.btnIMEXKommen.Size = New System.Drawing.Size(106, 45)
         Me.btnIMEXKommen.TabIndex = 123
@@ -217,10 +217,11 @@ Partial Class frmZEButtons
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(236, 232)
+        Me.ControlBox = False
         Me.Controls.Add(Me.pnlButtons)
+        Me.KeyPreview = True
         Me.Name = "frmZEButtons"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
-        Me.Text = "Zeiterfassung"
         Me.pnlButtons.ResumeLayout(False)
         Me.pnlButtons.PerformLayout()
         Me.ResumeLayout(False)

VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmZEButtons.vb

@@ -1,4 +1,6 @@
-Public Class frmZEButtons
+Imports System.Windows.Forms
+
+Public Class frmZEButtons
 
     Dim art As String
     Public resultCode As Integer = -1
@@ -39,5 +41,12 @@
 
         End Select
 
+        Me.TopMost = True
+
+    End Sub
+
+
+    Private Sub frmZEButtons_KeyDown(sender As Object, e As KeyEventArgs) Handles MyBase.KeyDown
+        If e.KeyCode = Keys.Escape Then Me.Close()
     End Sub
 End Class

VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb

@@ -299,7 +299,7 @@ Public Class cCreditSafeAPI
     End Function
 
 
-    Shared Function getCompanieEvents(company As Company, ByRef dataTable As DataTable) As String
+    Shared Function getCompanyEvents(company As Company, ByRef dtEvents As DataTable) As String
 
         VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat()
 
@@ -315,6 +315,21 @@ Public Class cCreditSafeAPI
             Return "Verbindungsfehler"
         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 Then
             Return json.StringOf("totalCount")
@@ -346,7 +361,7 @@ Public Class cCreditSafeAPI
                 Debug.WriteLine(dateTime.GetAsTimestamp(getAsLocal))
 
 
-                Dim R As DataRow = dataTable.NewRow
+                Dim R As DataRow = dtEvents.NewRow
                 R("eventId") = compObj.StringOf("eventId")
                 R("companyId") = compObj.StringOf("companyId")
                 R("portfolioId") = compObj.StringOf("portfolioId")
@@ -357,7 +372,7 @@ Public Class cCreditSafeAPI
                 R("oldValue") = compObj.StringOf("oldValue")
                 R("eventDate") = dateTime.GetAsTimestamp(getAsLocal)
                 R("createdDate") = dateTime.GetAsTimestamp(getAsLocal)
-                dataTable.Rows.Add(R)
+                dtEvents.Rows.Add(R)
 
                 j = j + 1
             End While

VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb

@@ -284,7 +284,7 @@ Public Class cSyska_Interface
         End If
     End Function
 
-    Public Shared Function genDatensatz_Buchungen(ByRef Firma_ID As Integer, Optional OpenFile As Boolean = False, Optional WdhDateiname As String = "", Optional ambargubuchungen As Boolean = False) As Boolean '  Optional OpenFile = False, Optional boolKunden = True, Optional boolBuchungen = True ) As Boolean
+    Public Shared Function genDatensatz_Buchungen(ByRef Firma_ID As Integer, Optional OpenFile As Boolean = False, Optional WdhDateiname As String = "", Optional ambargubuchungen As Boolean = False, Optional ambarKreditor As String = "") As Boolean '  Optional OpenFile = False, Optional boolKunden = True, Optional boolBuchungen = True ) As Boolean
         Try
             Dim FIRMA As New VERAG_PROG_ALLGEMEIN.cFirmen(Firma_ID)
 
@@ -315,13 +315,13 @@ Public Class cSyska_Interface
             '----------------- Buchungssätze -----------------
             If True Then 'boolBuchungen Then
                 If WdhDateiname = "" AndAlso Not ambargubuchungen Then TrdInvoice_FUNCTIONS.TrdinSchreiben(FIRMA.Firma_ID) 'Lädt die Daten aus der Tabelle Rechnungsausgang in die Tabelle trdInvoice (nur für 20 = IMEX )
-                Dim dt_Buchungen As DataTable = getBuchungen(FIRMA.Firma_ID, WdhDateiname, ambargubuchungen)
+                Dim dt_Buchungen As DataTable = getBuchungen(FIRMA.Firma_ID, WdhDateiname, ambargubuchungen, ambarKreditor)
                 '    MsgBox(WdhDateiname & " -  " & dt_Buchungen.Rows.Count)
                 If dt_Buchungen IsNot Nothing AndAlso dt_Buchungen.Rows.Count > 0 Then
 
                     Try
                         Dim file As System.IO.StreamWriter
-                        Dim Dateiname = IIf(ambargubuchungen, "GS_AMBAR_", "AVISO_BUBE_") & Now.ToString("ddMMyyyy_HHmm") & ".txt"
+                        Dim Dateiname = IIf(ambargubuchungen, "GS_AMBAR_" & ambarKreditor & "_", "AVISO_BUBE_") & Now.ToString("ddMMyyyy_HHmm") & ".txt"
                         file = My.Computer.FileSystem.OpenTextFileWriter(path & Dateiname, True, System.Text.Encoding.GetEncoding("iso-8859-15"))
 
                         '   initKDNr(dt_Buchungen)
@@ -345,7 +345,7 @@ Public Class cSyska_Interface
                             If Not ambargubuchungen Then
                                 dt_BuchungenZeilen = getBuchungenZeilen(FIRMA.Firma_ID, r("Rechnungsnummer"), r("Rechnungsdatum"), WdhDateiname)
                             Else
-                                dt_BuchungenZeilen = getBuchungenZeilenAMBAR(FIRMA.Firma_ID, r("Rechnungsnummer"), r("Rechnungsdatum"), WdhDateiname)
+                                dt_BuchungenZeilen = getBuchungenZeilenAMBAR(r("Rechnungsnummer"), r("Rechnungsdatum"), WdhDateiname)
                             End If
 
                             If dt_BuchungenZeilen IsNot Nothing AndAlso dt_BuchungenZeilen.Rows.Count > 0 Then
@@ -512,14 +512,19 @@ Public Class cSyska_Interface
         If IsNumeric(s) Then Return CDbl(s).ToString("N" & Nachkommastellen)
         Return s.ToString
     End Function
-    Shared Function getBuchungen(Firma_ID As Integer, Optional WdhDateiname As String = "", Optional ambargubuchungen As Boolean = False) As DataTable
+    Shared Function getBuchungen(Firma_ID As Integer, Optional WdhDateiname As String = "", Optional ambargubuchungen As Boolean = False, Optional ambarKreditor As String = "") As DataTable
 
         Dim where As String = ""
 
         If Not ambargubuchungen Then
             where = "WHERE Firma_ID ='" & Firma_ID & "'  AND " & If(WdhDateiname = "", " TrdinDateiname Is Null ", " TrdinDateiname ='" & WdhDateiname & "' ") & " "
         Else
-            where = "WHERE Firma_ID ='24'  and RechnungsKundenNr = 3013401 and RechnungsUstIdNr = 'U53187000' And BelegartenNr = 71  AND " & If(WdhDateiname = "", " AmbDateiname Is Null ", " AmbDateiname ='" & WdhDateiname & "' ") & " "
+            If ambarKreditor = "AG" Then
+                where = "WHERE Firma_ID ='24'  and RechnungsKundenNr = 3013401 and RechnungsUstIdNr = 'U53187000' And BelegartenNr = 71  AND " & If(WdhDateiname = "", " AmbDateiname Is Null ", " AmbDateiname ='" & WdhDateiname & "' ") & " "
+            ElseIf ambarKreditor = "CS" Then
+                where = "WHERE Firma_ID ='24'  and RechnungsKundenNr = 3017683 and RechnungsUstIdNr = 'U68374109' And BelegartenNr = 71  AND " & If(WdhDateiname = "", " AmbDateiname Is Null ", " AmbDateiname ='" & WdhDateiname & "' ") & " "
+            End If
+
         End If
 
         Dim kundennr = IIf(Not ambargubuchungen, "min(KundenNrZentrale)", "'725012'") 'fixe Debitorennr für AMBAR - VERAG Buchungen
@@ -594,10 +599,10 @@ Public Class cSyska_Interface
 
     End Function
 
-    Shared Function getBuchungenZeilenAMBAR(Firma_ID As Integer, Rechnungsnummer As Integer, Rechnungsdatum As Date, Optional WdhDateiname As String = "") As DataTable
+    Shared Function getBuchungenZeilenAMBAR(Rechnungsnummer As Integer, Rechnungsdatum As Date, Optional WdhDateiname As String = "") As DataTable
 
 
-        Dim sqlStr = " SELECT le.SachkontoEUSteuerfrei as Sachkonto ,IVO.Rechnungsdatum Rechnungsdatum,IVO.Rechnungsnummer Rechnungsnummer,FilialenNr,AbfertigungsNr,UnterNr,PROD.steuerpflichtig,[Steuersatz %] Steuersatz,BelegartenNr,
+        Dim sqlStr = " SELECT isnull(le.SachkontoEUSteuerfrei,'0000') as Sachkonto ,IVO.Rechnungsdatum Rechnungsdatum,IVO.Rechnungsnummer Rechnungsnummer,FilialenNr,AbfertigungsNr,UnterNr,PROD.steuerpflichtig,[Steuersatz %] Steuersatz,BelegartenNr,
 					   WährungFremd, WährungLokal,sum(PROD.[SteuerpflichtigerBetragLokal] + PROD.[SteuerfreierBetragLokal])BetragLokal,
 					   sum(PROD.[SteuerpflichtigerBetragFremd]+PROD.[SteuerfreierBetragFremd])BetragFremd ,sum(RechnungsbetragLokal) RechnungsbetragLokal,sum(RechnungsbetragFremd) RechnungsbetragFremd
                        FROM VERAG.dbo.tblTrdinInvoice as IVO