BelegeNeu, Verzollungspreise, EABeleg, etc.

SDL/Classes/cEABeleg.vb

@@ -279,7 +279,7 @@ Public Class EABeleg
     Property Benutzer_LG As Object = Nothing
     Property durchfuehrender_Benutzer As Object = Nothing
     Property ECZahlungsNr As Object = Nothing
-    Property ECZahlungsPerAPI As Boolean = True
+    Property ECZahlungsPerAPI As Boolean = False
     Property ECTerminalreturnCode As Object = Nothing
     Property EC_daid As Integer = 0
 

SDL/Classes/cRKSV.vb

@@ -2353,7 +2353,12 @@ Public Class cRKSV
                                 KBEntryEC.Konto = PERSONAL.KassenbuchNr
                             End If
 
-                            KBEntryEC.Buchungstext = "Umb. BK/KASSA"
+                            Dim Buchungstext As String = "Umb.BK / KASSA"
+                            if BELEG.ECZahlungsNr IsNot Nothing AndAlso BELEG.ECZahlungsNr <> "" Then
+                                Buchungstext &= " " & BELEG.ECZahlungsNr
+                            End If
+
+                            KBEntryEC.Buchungstext = Buchungstext
 
                             KBEntryEC.Buchungsdatum = Now.ToShortDateString
                             KBEntryEC.BelegDat = BELEG.BelegDat.ToShortDateString
@@ -2473,7 +2478,7 @@ Public Class cRKSV
 
         End If
 
-    End Sub
+                            End Sub
 
     Private Shared Sub getDEBDaten(ByRef Mandant As String, ByRef DebKonto As Integer, ByRef c_sprache As String, ByRef c_ustidnr As String, ByRef c_zahlziel As String, ByRef si_tage As Integer, ByRef dec_skonto As Integer, ByRef si_ntage As Integer, ByRef SkontoDatum As Date, ByRef Nettodatum As Date)
 

SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.Designer.vb

@@ -47,7 +47,7 @@ Partial Class usrcntlVerzollungspreise
         Me.ZPreis = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.cbxZollpflichtigeAbfertigung = New System.Windows.Forms.CheckBox()
         Me.Label1 = New System.Windows.Forms.Label()
-        Me.MyComboBoxSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cboSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.cbxAusDB = New System.Windows.Forms.CheckBox()
         CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -299,16 +299,16 @@ Partial Class usrcntlVerzollungspreise
         Me.Label1.TabIndex = 38
         Me.Label1.Text = "Sprache:"
         '
-        'MyComboBoxSprache
+        'cboSprache
         '
-        Me.MyComboBoxSprache._allowedValuesFreiText = Nothing
+        Me.cboSprache._allowedValuesFreiText = Nothing
-        Me.MyComboBoxSprache._allowFreiText = False
+        Me.cboSprache._allowFreiText = False
-        Me.MyComboBoxSprache._value = ""
+        Me.cboSprache._value = ""
-        Me.MyComboBoxSprache.FormattingEnabled = True
+        Me.cboSprache.FormattingEnabled = True
-        Me.MyComboBoxSprache.Location = New System.Drawing.Point(72, 89)
+        Me.cboSprache.Location = New System.Drawing.Point(72, 89)
-        Me.MyComboBoxSprache.Name = "MyComboBoxSprache"
+        Me.cboSprache.Name = "cboSprache"
-        Me.MyComboBoxSprache.Size = New System.Drawing.Size(144, 21)
+        Me.cboSprache.Size = New System.Drawing.Size(144, 21)
-        Me.MyComboBoxSprache.TabIndex = 39
+        Me.cboSprache.TabIndex = 39
         '
         'cbxAusDB
         '
@@ -330,7 +330,7 @@ Partial Class usrcntlVerzollungspreise
         Me.BackColor = System.Drawing.Color.WhiteSmoke
         Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.Controls.Add(Me.cbxAusDB)
-        Me.Controls.Add(Me.MyComboBoxSprache)
+        Me.Controls.Add(Me.cboSprache)
         Me.Controls.Add(Me.Label1)
         Me.Controls.Add(Me.cbxZollpflichtigeAbfertigung)
         Me.Controls.Add(Me.dgvZusatzleistung)
@@ -382,6 +382,6 @@ Partial Class usrcntlVerzollungspreise
     Friend WithEvents ZPreis As System.Windows.Forms.DataGridViewTextBoxColumn
     Friend WithEvents cbxZollpflichtigeAbfertigung As CheckBox
     Friend WithEvents Label1 As Label
-    Friend WithEvents MyComboBoxSprache As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents cboSprache As VERAG_PROG_ALLGEMEIN.MyComboBox
     Friend WithEvents cbxAusDB As CheckBox
 End Class

SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.vb

@@ -258,7 +258,7 @@
             Dim dtHaupt As DataTable = (New SQL).loadDgvBySql(sqlstrHauptleistungen, "FMZOLL")
             Dim dtZusatz As DataTable = (New SQL).loadDgvBySql(sqlstrZusatzleistungen, "FMZOLL")
 
-            loadDGV(dtHaupt, dtZusatz, MyComboBoxSprache._value)
+            loadDGV(dtHaupt, dtZusatz, cboSprache._value)
 
 
         Else
@@ -266,7 +266,7 @@
             DataGridView.Rows.Clear()
             dgvZusatzleistung.Rows.Clear()
 
-            Select Case MyComboBoxSprache._value
+            Select Case cboSprache._value
                 Case "EN"
                     Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
                         Case "IMEX"
@@ -2387,7 +2387,7 @@
         btnStandardPreiseLaden.PerformClick()
     End Sub
 
-    Private Sub MyComboBoxSprache_SelectedIndexChanged(sender As Object, e As EventArgs) Handles MyComboBoxSprache.SelectedIndexChanged
+    Private Sub MyComboBoxSprache_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboSprache.SelectedIndexChanged
         initPreisliste()
     End Sub
 End Class

SDL/Formulare/KDFormulare/frmFormulare.vb

@@ -8,7 +8,6 @@ Imports System.Reflection
 Imports System.Text.RegularExpressions
 Imports System.Windows.Documents
 Imports VERAG_PROG_ALLGEMEIN
-Imports System.Security.Authentication.ExtendedProtection
 
 Public Class frmFormulare
     Dim isSingleForm = False
@@ -692,15 +691,16 @@ Public Class frmFormulare
                         AddHandler c.MOVE_DOWN, AddressOf ControlMoveDown
                         AddHandler c.LOADED, Sub()
                                                  If param IsNot Nothing Then
-                                                     c.MyComboBoxSprache.changeItem(0)
+                                                     c.cboSprache.changeItem(param(0))
                                                      c.btnStandardPreiseLaden.PerformClick()
                                                  End If
                                              End Sub
                         MyFlowLayoutPanel1.Controls.Add(c)
 
-                        Dim sprachen() As String = {"DE", "EN"}
+
-                        c.MyComboBoxSprache.Items.Clear()
+                        c.cboSprache.Items.Clear()
-                        c.MyComboBoxSprache.Items.AddRange(sprachen)
+                        c.cboSprache.Items.Add(New MyListItem("Deutsch", "DE"))
+                        c.cboSprache.Items.Add(New MyListItem("Englisch", "EN"))
                     End If
                 Case FormularManagerArten.Boniteatsauskunft
                     Dim c As New usrcntlCreditreformBoniAuskunft
@@ -5158,9 +5158,9 @@ Public Class FormularManagerNEU
             dict("ZAHLUNGSZIEL") = usrCntl.txtZahlunsziel.Text
             dict("POSKREDIT") = PosKredit
 
-            Dim rpt As New rptPreislisten(usrCntl.MyComboBoxSprache._value, Nothing, -1, dict)
+            Dim rpt As New rptPreislisten(usrCntl.cboSprache._value, Nothing, -1, dict)
-            Dim subRpt As New subrptPreislisten(usrCntl.MyComboBoxSprache._value, Nothing, -1)
+            Dim subRpt As New subrptPreislisten(usrCntl.cboSprache._value, Nothing, -1)
-            Dim subRpt_Zoll As New subrptPreislisten_Zoll(usrCntl.MyComboBoxSprache._value, Nothing, -1)
+            Dim subRpt_Zoll As New subrptPreislisten_Zoll(usrCntl.cboSprache._value, Nothing, -1)
             rpt.SubReport.Report = subRpt
 
             Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
@@ -5273,7 +5273,7 @@ Public Class FormularManagerNEU
             End If
 
 
-            If usrCntl.MyComboBoxSprache._value = "DE" Then 'weil DE nicht übersetzt wird!!!
+            If usrCntl.cboSprache._value = "DE" Or usrCntl.cboSprache._value = "" Then 'weil DE nicht übersetzt wird!!!
                 For Each pair In dict
                     rpt.txtZahlungsziel.Text = rpt.txtZahlungsziel.Text.ToString.Replace("%" & pair.Key & "%", pair.Value)
                     rpt.txtZahlungsziel2.Text = rpt.txtZahlungsziel2.Text.ToString.Replace("%" & pair.Key & "%", pair.Value)

SDL/My Project/AssemblyInfo.vb

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

SDL/USTV/frmMDM_USTVAntrag.vb

@@ -4281,7 +4281,7 @@ Public Class frmMDM_USTVAntrag
                 .ReferenceNumber = row.Cells("UStVPo_ReNr").Value, ' "25/000616354/987",
                 .IssuingDate = CDate(row.Cells("UStVPo_ReDat").Value).ToString("yyyy-MM-dd"),'"2025-11-30",
                 .GoodsDescription = goods,
-                .TransactionDescription = New TransactionDescription With {.TaxableAmount = Nettobetrag.ToString.Replace(",", "."), .VATAmount = row.Cells("UStVPo_USteuerbetrag").Value.ToString.Replace(",", ".")},
+                .TransactionDescription = New TransactionDescription With {.TaxableAmount = Nothing, .VATAmount = row.Cells("UStVPo_USteuerbetrag").Value.ToString.Replace(",", ".")},
                 .Deduction = New Deduction With {.ProRataRate = "", .DeductibleVATAmount = row.Cells("UStVPo_USteuerbetrag").Value.ToString.Replace(",", ".")},
                 .EUSupplier = New Party With {
                  .NameFree = LeistenderName,'"DKV EURO SERVICE GMBH + CO KG",

SDL/kassenbuch/frmBelegNeu.vb

@@ -1,8 +1,10 @@
 Imports System.Drawing.Printing
 Imports System.Globalization
+Imports java.awt.geom
 Imports javax.print.attribute.standard
 Imports Microsoft.Win32
 Imports SDL.RKSVServer
+Imports VERAG_PROG_ALLGEMEIN
 
 
 
@@ -1403,31 +1405,27 @@ Public Class frmBelegNeu
         Dim ECZahlungsNr As String = ZVTKey.GetValue("BelegNr").ToString
         Dim txt_Drucktext As String = Replace(ZVTKey.GetValue("Drucktext"), vbLf, vbCrLf)
         Dim txt_Drucktext2 As String = Replace(ZVTKey.GetValue("Drucktext2"), vbLf, vbCrLf)
+        Dim txt_Haendlerbeleg As String = Replace(ZVTKey.GetValue("Haendlerbeleg"), vbLf, vbCrLf)
 
         If ECZahlungsNr = "" Then
             ECZahlungsNr = -1
         End If
 
         Dim daid As Integer = -1
-        If (txt_Drucktext <> "" Or txt_Drucktext2 <> "") AndAlso BELEG IsNot Nothing Then
+        If (txt_Haendlerbeleg <> "") AndAlso BELEG IsNot Nothing Then 'Nur Händlerbeleg!!!
             If returnCode = 1000 Or returnCode = 0 Then
-                daid = createZahlungsBeleg(txt_Drucktext & " " & txt_Drucktext2, ECZahlungsNr, "Haendlerbeleg", BELEG)
+                daid = createZahlungsBeleg(txt_Haendlerbeleg, ECZahlungsNr, "Haendlerbeleg", BELEG)
             End If
         End If
 
 
-        'If txt_Drucktext2 <> "" AndAlso BELEG IsNot Nothing Then
-        '    createZahlungsBeleg(txt_Drucktext, ECZahlungsNr, "Händlerbeleg", BELEG)
-        'End If
-
-
         ZVTKey.Close()
         MsgBox(response)
         If returnCode = 0 Then 'Zahlung wurde erfolgreich durchgeführt
             setRKSV(True, ECZahlungsNr, returnCode, daid)
         ElseIf returnCode = 1000 Then 'Workaround, wenn nicht in Registry geschrieben wurden konnte.
             If vbYes = MsgBox("In der Registry wurde der Returncode 1000 abgegeben! " & vbNewLine & "Wurde die Zahlung dennoch vom Zahlungsterminal erfolgreich durchgeführt, dann mit Ja bestätigen", MsgBoxStyle.YesNoCancel) Then
-                setRKSV(True, ECZahlungsNr, returnCode, daid)
+                setRKSV(True, "", returnCode, daid)
             Else
                 Me.Cursor = Cursors.Default
             End If
@@ -1567,8 +1565,19 @@ Public Class frmBelegNeu
                 '  KASSE.LOAD(cboKassen._value)
                 If BELEG.rksv_id > 0 Then KASSE.LOAD(BELEG.rksv_id)
                 Select Case BELEG.Belegart
-                    Case "1" : If cRKSV.printKundenBeleg(BELEG, KASSE, PERSONAL, cboPrinter.SelectedItem.ToString, cbxBelegOffnen.Checked) Then Me.Close()
+                    Case "1" : If cRKSV.printKundenBeleg(BELEG, KASSE, PERSONAL, cboPrinter.SelectedItem.ToString, cbxBelegOffnen.Checked) Then
-                    Case "2" : If cRKSV.printKundenBelegLG(BELEG, KASSE, PERSONAL, cboPrinter.SelectedItem.ToString, "LG") Then Me.Close() 'Beleg drucken 
+                            If cbxBelegOffnen.Checked AndAlso BELEG.EC_daid > 0 Then
+                                openZahlungsbeleg(BELEG.EC_daid)
+                            End If
+                                Me.Close()
+                        End If
+                    Case "2" : If cRKSV.printKundenBelegLG(BELEG, KASSE, PERSONAL, cboPrinter.SelectedItem.ToString, "LG") Then
+                            If cbxBelegOffnen.Checked AndAlso BELEG.EC_daid > 0 Then
+                                openZahlungsbeleg(BELEG.EC_daid)
+                            End If
+
+                            Me.Close() 'Beleg drucken 
+                        End If
                 End Select
             Else
                 TESTBUCHUNG = False
@@ -1836,6 +1845,18 @@ Public Class frmBelegNeu
 
     End Function
 
+    Private Sub openZahlungsbeleg(daid As Integer)
+
+        If daid > 0 Then
+
+            Dim ZahlungsBeleg As New cDATENSERVER(daid)
+            Dim pathPDF = ZahlungsBeleg.GET_TOP1_PATH
+            If pathPDF <> "" Then Process.Start(pathPDF)
+
+        End If
+
+    End Sub
+
 
 
     Private Sub LinkLabel1_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel1.LinkClicked

SDL/kassenbuch/frmKassenbuch.Designer.vb

@@ -130,7 +130,7 @@ Partial Class frmKassenbuch
         Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Label5.ForeColor = System.Drawing.Color.White
-        Me.Label5.Location = New System.Drawing.Point(542, 31)
+        Me.Label5.Location = New System.Drawing.Point(603, 31)
         Me.Label5.Name = "Label5"
         Me.Label5.Size = New System.Drawing.Size(151, 20)
         Me.Label5.TabIndex = 1
@@ -184,7 +184,7 @@ Partial Class frmKassenbuch
         Me.DataGridView2.ReadOnly = True
         Me.DataGridView2.RowHeadersVisible = False
         Me.DataGridView2.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.DataGridView2.Size = New System.Drawing.Size(705, 145)
+        Me.DataGridView2.Size = New System.Drawing.Size(766, 145)
         Me.DataGridView2.TabIndex = 5
         '
         'datVon
@@ -266,7 +266,7 @@ Partial Class frmKassenbuch
         Me.FlatButton7.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.FlatButton7.ForeColor = System.Drawing.Color.Black
         Me.FlatButton7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.FlatButton7.Location = New System.Drawing.Point(654, 20)
+        Me.FlatButton7.Location = New System.Drawing.Point(688, 20)
         Me.FlatButton7.Name = "FlatButton7"
         Me.FlatButton7.Size = New System.Drawing.Size(41, 34)
         Me.FlatButton7.TabIndex = 0
@@ -307,7 +307,7 @@ Partial Class frmKassenbuch
         Me.Label9.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Label9.ForeColor = System.Drawing.Color.White
-        Me.Label9.Location = New System.Drawing.Point(390, 9)
+        Me.Label9.Location = New System.Drawing.Point(451, 9)
         Me.Label9.Name = "Label9"
         Me.Label9.Size = New System.Drawing.Size(305, 20)
         Me.Label9.TabIndex = 9
@@ -419,7 +419,7 @@ Partial Class frmKassenbuch
         Me.Button5.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Button5.ForeColor = System.Drawing.Color.Black
         Me.Button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button5.Location = New System.Drawing.Point(436, 36)
+        Me.Button5.Location = New System.Drawing.Point(458, 36)
         Me.Button5.Name = "Button5"
         Me.Button5.Size = New System.Drawing.Size(184, 42)
         Me.Button5.TabIndex = 19
@@ -434,7 +434,7 @@ Partial Class frmKassenbuch
         Me.btnDGVBelege.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnDGVBelege.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.btnDGVBelege.ForeColor = System.Drawing.Color.White
-        Me.btnDGVBelege.Location = New System.Drawing.Point(373, 24)
+        Me.btnDGVBelege.Location = New System.Drawing.Point(407, 24)
         Me.btnDGVBelege.Name = "btnDGVBelege"
         Me.btnDGVBelege.Size = New System.Drawing.Size(98, 30)
         Me.btnDGVBelege.TabIndex = 418
@@ -448,7 +448,7 @@ Partial Class frmKassenbuch
         Me.btnDGVKassenbuch.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnDGVKassenbuch.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.btnDGVKassenbuch.ForeColor = System.Drawing.Color.DimGray
-        Me.btnDGVKassenbuch.Location = New System.Drawing.Point(477, 24)
+        Me.btnDGVKassenbuch.Location = New System.Drawing.Point(511, 24)
         Me.btnDGVKassenbuch.Name = "btnDGVKassenbuch"
         Me.btnDGVKassenbuch.Size = New System.Drawing.Size(112, 30)
         Me.btnDGVKassenbuch.TabIndex = 419
@@ -477,7 +477,7 @@ Partial Class frmKassenbuch
         Me.btnStorno.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.btnStorno.ForeColor = System.Drawing.Color.Black
         Me.btnStorno.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnStorno.Location = New System.Drawing.Point(436, 84)
+        Me.btnStorno.Location = New System.Drawing.Point(458, 84)
         Me.btnStorno.Name = "btnStorno"
         Me.btnStorno.Size = New System.Drawing.Size(184, 42)
         Me.btnStorno.TabIndex = 420
@@ -498,7 +498,7 @@ Partial Class frmKassenbuch
         Me.pnlTop.Dock = System.Windows.Forms.DockStyle.Top
         Me.pnlTop.Location = New System.Drawing.Point(0, 0)
         Me.pnlTop.Name = "pnlTop"
-        Me.pnlTop.Size = New System.Drawing.Size(707, 60)
+        Me.pnlTop.Size = New System.Drawing.Size(768, 60)
         Me.pnlTop.TabIndex = 421
         '
         'Label15
@@ -526,7 +526,7 @@ Partial Class frmKassenbuch
         '
         Me.Label7.AutoSize = True
         Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label7.Location = New System.Drawing.Point(433, 20)
+        Me.Label7.Location = New System.Drawing.Point(455, 20)
         Me.Label7.Name = "Label7"
         Me.Label7.Size = New System.Drawing.Size(58, 13)
         Me.Label7.TabIndex = 422
@@ -544,7 +544,7 @@ Partial Class frmKassenbuch
         Me.pnlSuche.Dock = System.Windows.Forms.DockStyle.Fill
         Me.pnlSuche.Location = New System.Drawing.Point(0, 470)
         Me.pnlSuche.Name = "pnlSuche"
-        Me.pnlSuche.Size = New System.Drawing.Size(707, 205)
+        Me.pnlSuche.Size = New System.Drawing.Size(768, 205)
         Me.pnlSuche.TabIndex = 423
         '
         'pnlSearch
@@ -566,7 +566,7 @@ Partial Class frmKassenbuch
         Me.pnlSearch.Dock = System.Windows.Forms.DockStyle.Top
         Me.pnlSearch.Location = New System.Drawing.Point(0, 0)
         Me.pnlSearch.Name = "pnlSearch"
-        Me.pnlSearch.Size = New System.Drawing.Size(705, 58)
+        Me.pnlSearch.Size = New System.Drawing.Size(766, 58)
         Me.pnlSearch.TabIndex = 420
         '
         'btnExcel
@@ -574,7 +574,7 @@ Partial Class frmKassenbuch
         Me.btnExcel.BackgroundImage = Global.SDL.My.Resources.Resources.Excel_logo
         Me.btnExcel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
         Me.btnExcel.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnExcel.Location = New System.Drawing.Point(607, 20)
+        Me.btnExcel.Location = New System.Drawing.Point(641, 20)
         Me.btnExcel.Name = "btnExcel"
         Me.btnExcel.Size = New System.Drawing.Size(41, 34)
         Me.btnExcel.TabIndex = 420
@@ -584,7 +584,7 @@ Partial Class frmKassenbuch
         '
         Me.Label14.AutoSize = True
         Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label14.Location = New System.Drawing.Point(375, 8)
+        Me.Label14.Location = New System.Drawing.Point(409, 8)
         Me.Label14.Name = "Label14"
         Me.Label14.Size = New System.Drawing.Size(56, 13)
         Me.Label14.TabIndex = 1
@@ -624,7 +624,7 @@ Partial Class frmKassenbuch
         Me.pnlMain.Dock = System.Windows.Forms.DockStyle.Top
         Me.pnlMain.Location = New System.Drawing.Point(0, 60)
         Me.pnlMain.Name = "pnlMain"
-        Me.pnlMain.Size = New System.Drawing.Size(707, 410)
+        Me.pnlMain.Size = New System.Drawing.Size(768, 410)
         Me.pnlMain.TabIndex = 425
         '
         'Button10
@@ -669,7 +669,7 @@ Partial Class frmKassenbuch
         Me.pnl.Controls.Add(Me.Button8)
         Me.pnl.Controls.Add(Me.cboKassen)
         Me.pnl.Controls.Add(Me.Label18)
-        Me.pnl.Location = New System.Drawing.Point(420, 132)
+        Me.pnl.Location = New System.Drawing.Point(442, 132)
         Me.pnl.Name = "pnl"
         Me.pnl.Size = New System.Drawing.Size(287, 223)
         Me.pnl.TabIndex = 430
@@ -799,7 +799,7 @@ Partial Class frmKassenbuch
         Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Button1.ForeColor = System.Drawing.Color.Black
         Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button1.Location = New System.Drawing.Point(436, 197)
+        Me.Button1.Location = New System.Drawing.Point(458, 197)
         Me.Button1.Name = "Button1"
         Me.Button1.Size = New System.Drawing.Size(260, 42)
         Me.Button1.TabIndex = 434
@@ -812,7 +812,7 @@ Partial Class frmKassenbuch
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.Color.White
-        Me.ClientSize = New System.Drawing.Size(707, 675)
+        Me.ClientSize = New System.Drawing.Size(768, 675)
         Me.Controls.Add(Me.pnlSuche)
         Me.Controls.Add(Me.pnlMain)
         Me.Controls.Add(Me.pnlTop)

SDL/kassenbuch/frmKassenbuch.resx

@@ -121,26 +121,25 @@
   <data name="btnBelegAusgang.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAABVSURBVEhL7c0xDgAgCMVQ7n9pjJGxI8WF4X1NFyIz
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAABSSURBVEhL7c0xDgAgCMVQ7n9pjJGtK8WF4X1NFyIz
-        R2E0YTRhNGE0YTRhNGE0YTRhNL3PfSbU7sE+tXuwT+2Hg4MwmjCaMJowmjCaMJowmjCaMHoyDu1ZWBna
+        YxKCDcGGYEOwIdgQbAg2BBuC7X3uM6F2D/ap3YN9aj8cHIRgQ7Ah2BBsCDYEG4INwYZgO+1ZWBm2HQ2i
-        hF7mAAAAAElFTkSuQmCC
+        AAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="btnBelegKunde.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAABGdBTUEAALGPC/xhBQAAArxJREFUaEPt
+        iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAABGdBTUEAALGPC/xhBQAAAnVJREFUaEPt
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        NvdJpAa/pXxeCylERHNs8B6wuQ/uS2a273BPP1ihqEVwj2pfP1ixqM+ITkL1U1cGKxalCEpQkY/pzf9D
-        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
+        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
-        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
+        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
-        61nYejDvzciNtVdfUSNEI7Sm9Sxs9Thrbm+tK7dqPdS0rrX/Aed5v+yLBHcpjBCnxkhI9Pv9a3phGxxM
+        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
-        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
 </value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

SDL/kassenbuch/frmKassenbuch.vb

@@ -190,9 +190,9 @@ Public Class frmKassenbuch
                 If PERSONAL.isLeihgeldkasse Then
                     lgTxt = ",[Fahrer],[Passnummer] "
                 End If
-                .SET_SQL("SELECT b.rksv_BelegId, b.BelegDat,isnull(durchfuehrender_Benutzer,'') as kassiertDurch, CASE WHEN b.Belegart=1 THEN 'E' ELSE 'A' END as Belegart,CASE WHEN b.Beleg_TYP='E' THEN rksv_umsatz ELSE  (SELECT sum( betrag ) FROM tblEABelegposition WHERE (b.BelegNr = tblEABelegposition.BelegNr) AND (b.BelegDat = tblEABelegposition.BelegDat) AND (b.Benutzer = tblEABelegposition.Benutzer) AND (b.Niederlassung = tblEABelegposition.Niederlassung) AND (b.Mandant = tblEABelegposition.Mandant ) ) END as  Betrag, b.Ordnungsbegriff,  b.BelegNr,  b.Frachtführer, " &
+                .SET_SQL("SELECT b.rksv_BelegId, b.BelegDat, CASE WHEN b.Belegart=1 THEN 'E' ELSE 'A' END as Belegart,CASE WHEN b.Beleg_TYP='E' THEN rksv_umsatz ELSE  (SELECT sum( betrag ) FROM tblEABelegposition WHERE (b.BelegNr = tblEABelegposition.BelegNr) AND (b.BelegDat = tblEABelegposition.BelegDat) AND (b.Benutzer = tblEABelegposition.Benutzer) AND (b.Niederlassung = tblEABelegposition.Niederlassung) AND (b.Mandant = tblEABelegposition.Mandant ) ) END as  Betrag, b.Ordnungsbegriff,  b.BelegNr,  b.Frachtführer, " &
-                                               " CASE WHEN b.storniert=1 THEN 'JA' ELSE '' END as [storniert], b.Beleg_TYP ,b.Benutzer  " & benutzerBezTMP & lgTxt &
+                                               " CASE WHEN b.storniert=1 THEN 'JA' ELSE '' END as [storniert], b.Beleg_TYP ,b.Benutzer  " & benutzerBezTMP & lgTxt & ", b.ECZahlungsPerAPI as EC,b.ECZahlungsNr as ECNr, mit_username as kassiert" &
-                                                    " FROM tblEABelegnummer as b WHERE b.Mandant='" & PERSONAL.Mandant & "' AND b.Niederlassung='" & PERSONAL.Niederlassung & "' " & benutzerTMP & " AND BelegDat BETWEEN '" & datVon.Value.ToShortDateString & "' AND '" & datBis.Value.ToShortDateString & "'   " &
+                                                    " FROM tblEABelegnummer as b LEFT JOIN " & VERAG_PROG_ALLGEMEIN.cAllgemein.AVISO_SERVER & " .[ADMIN].[dbo].[tblMitarbeiter] on durchfuehrender_Benutzer = mit_id WHERE b.Mandant='" & PERSONAL.Mandant & "' AND b.Niederlassung='" & PERSONAL.Niederlassung & "' " & benutzerTMP & " AND BelegDat BETWEEN '" & datVon.Value.ToShortDateString & "' AND '" & datBis.Value.ToShortDateString & "'   " &
                                                     "  ORDER BY  b.rksv_BelegId DESC, b.[upsize_ts] desc;", "FMZOLL")
                 ' .DataSource = SQL.loadDgvBySql("SELECT b.rksv_BelegId, b.BelegDat, CASE WHEN b.Belegart=1 THEN 'E' ELSE 'A' END as Belegart,CASE WHEN b.Beleg_TYP='E' THEN rksv_umsatz ELSE  (SELECT sum( betrag ) FROM tblEABelegposition WHERE (b.BelegNr = tblEABelegposition.BelegNr) AND (b.BelegDat = tblEABelegposition.BelegDat) AND (b.Benutzer = tblEABelegposition.Benutzer) AND (b.Niederlassung = tblEABelegposition.Niederlassung) AND (b.Mandant = tblEABelegposition.Mandant ) ) END as  Betrag, b.Ordnungsbegriff,  b.BelegNr,  b.Frachtführer, " &
                 '                                " CASE WHEN b.storniert=1 THEN 'JA' ELSE '' END as [storniert], b.Beleg_TYP ,b.Benutzer  " & benutzerBezTMP &
@@ -220,8 +220,10 @@ Public Class frmKassenbuch
                 .Columns("Beleg_TYP").Visible = False
                 .Columns("storniert").HeaderText = "Storn."
                 .Columns("storniert").Width = 45
+                .Columns("EC").Width = 45
+                .Columns("ECNr").Width = 60
                 .Columns("Benutzer").Visible = False
-                .Columns("kassiertDurch").Visible = False
+                '.Columns("kassiert").Visible = False
 
                 If PERSONAL.isLeihgeldkasse Then
                     .Columns("Fahrer").Visible = False
@@ -253,8 +255,8 @@ Public Class frmKassenbuch
                 End If
 
 
-                .SET_SQL("SELECT [JournalNr],[BelegDat],[BelegNr],isnull(durchfuehrender_Benutzer,'') as kassiertDurch,CASE WHEN Belegart=1 THEN 'E' ELSE 'A' END as Belegart,[Buchungstext],tblKassenbuch.Finanzwege as FW ,([Betrag]+[Steuerbetrag]) as Brutto,[Konto],[Soll],[Haben],Steuerbetrag as Steuer,tblKassenbuch.Benutzer " &
+                .SET_SQL("SELECT [JournalNr],[BelegDat],[BelegNr],CASE WHEN Belegart=1 THEN 'E' ELSE 'A' END as Belegart,[Buchungstext],tblKassenbuch.Finanzwege as FW ,([Betrag]+[Steuerbetrag]) as Brutto,[Konto],[Soll],[Haben],Steuerbetrag as Steuer,tblKassenbuch.Benutzer, mit_username as kassiert " &
-                  " FROM Personal INNER JOIN tblKassenbuch ON Personal.ID = tblKassenbuch.Benutzer  " &
+                  " FROM Personal INNER JOIN tblKassenbuch ON Personal.ID = tblKassenbuch.Benutzer LEFT JOIN " & VERAG_PROG_ALLGEMEIN.cAllgemein.AVISO_SERVER & " .[ADMIN].[dbo].[tblMitarbeiter] on durchfuehrender_Benutzer = mit_id" &
                   "    WHERE tblKassenbuch.Mandant='" & PERSONAL.Mandant & "' AND tblKassenbuch.Niederlassung='" & PERSONAL.Niederlassung & "' " &
                   " " & benutzerTMP & " AND BelegDat BETWEEN '" & datVon.Value.ToShortDateString & "' AND '" & datBis.Value.ToShortDateString & "' ORDER BY JournalNr DESC", "FMZOLL")
 
@@ -288,7 +290,7 @@ Public Class frmKassenbuch
                 .Columns("Steuer").Width = 60
                 .Columns("Steuer").DefaultCellStyle.Format = "C"
                 .Columns("Benutzer").Visible = False
-                .Columns("kassiertDurch").Visible = False
+                '.Columns("kassiert").Visible = False
 
             End If
         End With