Barverkauf, etc.

2026-02-16 17:58:26 +01:00
parent 75c9d6ed49
commit a9bca96996
12 changed files with 358 additions and 30 deletions
--- a/SDL/Classes/cEABeleg.vb
+++ b/SDL/Classes/cEABeleg.vb
@@ -22,7 +22,6 @@ Public Class EABelegPositionen
    Property Betrag As Double = 0
    Property Preisbindung As Integer = 0
    Property EABPo_Zeitstempel As DateTime = Now
-
    Property FilialenNr As Integer = -1
    Property AbfertigungsNr As Integer = -1

@@ -275,10 +274,14 @@ Public Class EABeleg
    Property Beleg_TYP As String = Nothing
    Property Auftraggeber_KdAuftragsnummer As Object = Nothing
    Property Auftraggeber_Provision As Object = Nothing
-
    Property LKW_Id As Object = Nothing
    Property LKW_Beleg As Object = Nothing
    Property Benutzer_LG As Object = Nothing
+    Property durchfuehrender_Benutzer As Object = Nothing
+    Property ECZahlungsNr As Object = Nothing
+    Property ECZahlungsPerAPI As Boolean = True
+    Property ECTerminalreturnCode As Object = Nothing
+    Property EC_daid As Integer = 0


    Property POS As New List(Of EABelegPositionen)
@@ -354,6 +357,11 @@ Public Class EABeleg
                        Me.LKW_Id = cSqlDb.checkNullReturnValue(dr.Item("LKW_Id"), Nothing)
                        Me.LKW_Beleg = cSqlDb.checkNullReturnValue(dr.Item("LKW_Beleg"), Nothing)
                        Me.Benutzer_LG = cSqlDb.checkNullReturnValue(dr.Item("Benutzer_LG"), Nothing)
+                        Me.durchfuehrender_Benutzer = cSqlDb.checkNullReturnValue(dr.Item("durchfuehrender_Benutzer"), -1)
+                        Me.ECZahlungsNr = cSqlDb.checkNullReturnValue(dr.Item("ECZahlungsNr"), Nothing)
+                        Me.ECZahlungsPerAPI = cSqlDb.checkNullReturnValue(dr.Item("ECZahlungsPerAPI"), Nothing)
+                        Me.ECTerminalreturnCode = cSqlDb.checkNullReturnValue(dr.Item("ECTerminalreturnCode"), Nothing)
+                        Me.EC_daid = cSqlDb.checkNullReturnValue(dr.Item("EC_daid"), Nothing)

                        If loadPosAswell Then POS = LOAD_POS_List(Mandant, Niederlassung, Benutzer, BelegNr, BelegDat)
                        ' MsgBox(POS.Count)
@@ -534,6 +542,12 @@ Public Class EABeleg
        list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("LKW_Beleg", LKW_Beleg))
        list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("Benutzer_LG", Benutzer_LG))

+        list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("durchfuehrender_Benutzer", durchfuehrender_Benutzer))
+        list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("ECZahlungsNr", ECZahlungsNr))
+        list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("ECZahlungsPerAPI", ECZahlungsPerAPI))
+        list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("ECTerminalreturnCode", ECTerminalreturnCode))
+        list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("EC_daid", EC_daid))
+
        'For Each p As System.Reflection.PropertyInfo In Me.GetType().GetProperties()
        'If p.CanRead Then
        'Dim name = p.Name
--- a/SDL/Classes/cKassenbuch.vb
+++ b/SDL/Classes/cKassenbuch.vb
@@ -27,6 +27,7 @@ Public Class cKassenbuch
    Property rksv_id As Object = Nothing
    Property rksv_BelegId As Object = Nothing
    Property rksv_aktiv As Boolean = False
+    Property durchfuehrender_Benutzer As Integer = -1

    Dim SQL As New SQL

@@ -102,6 +103,7 @@ Public Class cKassenbuch
                        Me.rksv_id = cSqlDb.checkNullReturnValue(dr.Item("rksv_id"), Nothing)
                        Me.rksv_BelegId = cSqlDb.checkNullReturnValue(dr.Item("rksv_BelegId"), Nothing)
                        Me.rksv_aktiv = cSqlDb.checkNullReturnValue(dr.Item("rksv_aktiv"), False)
+                        Me.durchfuehrender_Benutzer = cSqlDb.checkNullInteger(dr.Item("durchfuehrender_Benutzer"))



@@ -147,6 +149,7 @@ Public Class cKassenbuch
        list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_id", rksv_id))
        list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_BelegId", rksv_BelegId))
        list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_aktiv", rksv_aktiv))
+        list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("durchfuehrender_Benutzer", durchfuehrender_Benutzer))

        Return list
    End Function
--- a/SDL/Classes/cRKSV.vb
+++ b/SDL/Classes/cRKSV.vb
@@ -2234,6 +2234,7 @@ Public Class cRKSV
                    KBEntry.Belegverbuchung = True
                    KBEntry.gebucht = True
                    KBEntry.Finanzwege = Finanzwege
+                    KBEntry.durchfuehrender_Benutzer = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID

                    If Not KBEntry.INSERT() Then
                        Return False
@@ -2288,6 +2289,7 @@ Public Class cRKSV
                        KBEntryGB.Belegverbuchung = True
                        KBEntryGB.gebucht = True
                        KBEntryGB.Finanzwege = Finanzwege
+                        KBEntryGB.durchfuehrender_Benutzer = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID

                        If Not KBEntryGB.INSERT() Then
                            Return False
@@ -2322,6 +2324,7 @@ Public Class cRKSV

                        KBEntryST.Belegverbuchung = True
                        KBEntryST.gebucht = True
+                        KBEntryST.durchfuehrender_Benutzer = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID

                        If Not KBEntryST.INSERT() Then
                            Return False
@@ -2378,6 +2381,7 @@ Public Class cRKSV
                            KBEntryEC.Belegverbuchung = True
                            KBEntryEC.gebucht = True
                            KBEntryEC.Finanzwege = Finanzwege
+                            KBEntryEC.durchfuehrender_Benutzer = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID

                            If Not KBEntryEC.INSERT() Then
                                Return False
--- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen.vb
+++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen.vb
@@ -1,4 +1,6 @@
-Public Class usrcntlVerzollungsunterlagen
+Imports VERAG_PROG_ALLGEMEIN
+
+Public Class usrcntlVerzollungsunterlagen
    Implements FormualrInterface

    Public Event CHANGED(name, value)
@@ -96,14 +98,31 @@
                                                 If txtFirma.KdNr_value > 0 Then
                                                     If txtFirma.KdData_ADRESSEN IsNot Nothing Then
                                                         Dim ADRESSE = txtFirma.KdData_ADRESSEN
-                                                         ' txtFirma.Text = If(ADRESSE.Name_1, ADRESSE.Ordnungsbegriff)
+                                                         Dim KUNDE_ERW As New cKundenErweitert(txtFirma.KdNr_value)
+                                                         Dim zusatzAdr As String = ""
+                                                         If KUNDE_ERW IsNot Nothing AndAlso KUNDE_ERW.kde_AdressZusatz IsNot Nothing AndAlso KUNDE_ERW.kde_AdressZusatz <> "" Then
+                                                             zusatzAdr = KUNDE_ERW.kde_AdressZusatz & " "
+                                                         End If
+
                                                         txtFirma2.Text = If(ADRESSE.Name_2, "")
-                                                         txtAdresse1.Text = If(ADRESSE.Straße, "")
-                                                         txtAdresse2.Text = (If(ADRESSE.LandKz, "") & " " & If(ADRESSE.PLZ, "") & " " & If(ADRESSE.Ort, "")).ToString.Trim
-                                                         Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
-                                                         txtAdresse3.Text = If(ADRESSE.LandKz IsNot Nothing, sql.getValueTxtBySql("SELECT isnull([Land],'')  FROM [Währungstabelle] WHERE [LandKz]='" & ADRESSE.LandKz & "'", "FMZOLL"), "")
+
+                                                         If zusatzAdr <> "" Then
+                                                             txtAdresse1.MaxLength = 100
+                                                             txtAdresse1.Text = zusatzAdr
+                                                             txtAdresse2.Text = If(ADRESSE.Straße, "")
+                                                             txtAdresse3.Text = (If(ADRESSE.LandKz, "") & " " & If(ADRESSE.PLZ, "") & " " & If(ADRESSE.Ort, "")).ToString.Trim
+                                                         Else
+                                                             txtAdresse1.MaxLength = 40
+                                                             txtAdresse1.Text = If(ADRESSE.Straße, "")
+                                                             txtAdresse2.Text = (If(ADRESSE.LandKz, "") & " " & If(ADRESSE.PLZ, "") & " " & If(ADRESSE.Ort, "")).ToString.Trim
+                                                             Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
+                                                             txtAdresse3.Text = If(ADRESSE.LandKz IsNot Nothing, sql.getValueTxtBySql("SELECT isnull([Land],'')  FROM [Währungstabelle] WHERE [LandKz]='" & ADRESSE.LandKz & "'", "FMZOLL"), "")
+
+                                                         End If
+
+
+                                                     End If
                                                     End If
-                                                 End If
                                                 RaiseEvent KDNR_CHANGED(KdNR)
                                             End Sub
        initControlsHandler()
--- a/SDL/Formulare/KDFormulare/frmFormulare.vb
+++ b/SDL/Formulare/KDFormulare/frmFormulare.vb
@@ -692,7 +692,7 @@ Public Class frmFormulare
                        AddHandler c.MOVE_DOWN, AddressOf ControlMoveDown
                        AddHandler c.LOADED, Sub()
                                                 If param IsNot Nothing Then
-                                                     c.MyComboBox1.changeItem(param(0))
+                                                     c.MyComboBoxSprache.changeItem(0)
                                                     c.btnStandardPreiseLaden.PerformClick()
                                                 End If
                                             End Sub
--- a/SDL/SDL.vbproj
+++ b/SDL/SDL.vbproj
@@ -927,6 +927,12 @@
    <Compile Include="frmEssensbestellungenAdministration.vb">
      <SubType>Form</SubType>
    </Compile>
+    <Compile Include="kassenbuch\BelegReports\rptZahlungsbeleg.Designer.vb">
+      <DependentUpon>rptZahlungsbeleg.vb</DependentUpon>
+    </Compile>
+    <Compile Include="kassenbuch\BelegReports\rptZahlungsbeleg.vb">
+      <SubType>Component</SubType>
+    </Compile>
    <Compile Include="kassenbuch\frmPOSTerminal.Designer.vb">
      <DependentUpon>frmPOSTerminal.vb</DependentUpon>
    </Compile>
@@ -3632,6 +3638,9 @@
      <DependentUpon>frmEssensbestellungenAdministration.vb</DependentUpon>
      <SubType>Designer</SubType>
    </EmbeddedResource>
+    <EmbeddedResource Include="kassenbuch\BelegReports\rptZahlungsbeleg.resx">
+      <DependentUpon>rptZahlungsbeleg.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="kassenbuch\frmPOSTerminal.resx">
      <DependentUpon>frmPOSTerminal.vb</DependentUpon>
    </EmbeddedResource>
--- a/SDL/kassenbuch/BelegReports/rptZahlungsbeleg.Designer.vb
+++ b/SDL/kassenbuch/BelegReports/rptZahlungsbeleg.Designer.vb
@@ -0,0 +1,91 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Public Class rptZahlungsBeleg
+    Inherits GrapeCity.ActiveReports.SectionReport
+
+    'Form overrides dispose to clean up the component list.
+    Protected Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
+        If disposing Then
+        End If
+        MyBase.Dispose(disposing)
+    End Sub
+
+    'NOTE: The following procedure is required by the ActiveReports Designer
+    'It can be modified using the ActiveReports Designer.
+    'Do not modify it using the code editor.
+    Private WithEvents PageHeader As GrapeCity.ActiveReports.SectionReportModel.PageHeader
+    Private WithEvents PageFooter As GrapeCity.ActiveReports.SectionReportModel.PageFooter
+    <System.Diagnostics.DebuggerStepThrough()>
+    Private Sub InitializeComponent()
+        Dim resources As System.Resources.ResourceManager = New System.Resources.ResourceManager(GetType(rptZahlungsBeleg))
+        Me.PageHeader = New GrapeCity.ActiveReports.SectionReportModel.PageHeader()
+        Me.Detail = New GrapeCity.ActiveReports.SectionReportModel.Detail()
+        Me.PageFooter = New GrapeCity.ActiveReports.SectionReportModel.PageFooter()
+        Me.ReportHeader1 = New GrapeCity.ActiveReports.SectionReportModel.ReportHeader()
+        Me.ReportFooter1 = New GrapeCity.ActiveReports.SectionReportModel.ReportFooter()
+        Me.lbl_Details = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        CType(Me.lbl_Details, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me, System.ComponentModel.ISupportInitialize).BeginInit()
+        '
+        'PageHeader
+        '
+        Me.PageHeader.Height = 0.2697397!
+        Me.PageHeader.Name = "PageHeader"
+        '
+        'Detail
+        '
+        Me.Detail.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.lbl_Details})
+        Me.Detail.Height = 2.148031!
+        Me.Detail.Name = "Detail"
+        '
+        'PageFooter
+        '
+        Me.PageFooter.Height = 0!
+        Me.PageFooter.Name = "PageFooter"
+        '
+        'ReportHeader1
+        '
+        Me.ReportHeader1.CanShrink = True
+        Me.ReportHeader1.Height = 0.2096124!
+        Me.ReportHeader1.Name = "ReportHeader1"
+        '
+        'ReportFooter1
+        '
+        Me.ReportFooter1.CanShrink = True
+        Me.ReportFooter1.Height = 3.039764!
+        Me.ReportFooter1.Name = "ReportFooter1"
+        '
+        'lbl_Details
+        '
+        Me.lbl_Details.Height = 2.148031!
+        Me.lbl_Details.HyperLink = Nothing
+        Me.lbl_Details.Left = 0!
+        Me.lbl_Details.Name = "lbl_Details"
+        Me.lbl_Details.Style = "font-size: 8pt; text-align: center"
+        Me.lbl_Details.Text = "A 4975 Suben  |  Suben 14-15" & Global.Microsoft.VisualBasic.ChrW(10) & "UID: ATU53187000"
+        Me.lbl_Details.Top = 0!
+        Me.lbl_Details.Width = 2.649606!
+        '
+        'rptZahlungsBeleg
+        '
+        Me.MasterReport = False
+        Me.PageSettings.Margins.Bottom = 0.1968504!
+        Me.PageSettings.Margins.Left = 0.1574803!
+        Me.PageSettings.Margins.Right = 0.1574803!
+        Me.PageSettings.Margins.Top = 0!
+        Me.PageSettings.PaperHeight = 11.0!
+        Me.PageSettings.PaperWidth = 8.5!
+        Me.PrintWidth = 2.64252!
+        Me.Sections.Add(Me.ReportHeader1)
+        Me.Sections.Add(Me.PageHeader)
+        Me.Sections.Add(Me.Detail)
+        Me.Sections.Add(Me.PageFooter)
+        Me.Sections.Add(Me.ReportFooter1)
+        CType(Me.lbl_Details, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me, System.ComponentModel.ISupportInitialize).EndInit()
+
+    End Sub
+    Private WithEvents ReportHeader1 As GrapeCity.ActiveReports.SectionReportModel.ReportHeader
+    Public WithEvents Detail As GrapeCity.ActiveReports.SectionReportModel.Detail
+    Public WithEvents ReportFooter1 As GrapeCity.ActiveReports.SectionReportModel.ReportFooter
+    Public WithEvents lbl_Details As GrapeCity.ActiveReports.SectionReportModel.Label
+End Class
--- a/SDL/kassenbuch/BelegReports/rptZahlungsbeleg.resx
+++ b/SDL/kassenbuch/BelegReports/rptZahlungsbeleg.resx
@@ -0,0 +1,126 @@
+<?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>
+  <metadata name="$this.ScriptEditorPositionForUndo" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>0, 0</value>
+  </metadata>
+  <metadata name="$this.ScriptEditorPositionForRedo" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>0, 0</value>
+  </metadata>
+</root>
--- a/SDL/kassenbuch/BelegReports/rptZahlungsbeleg.vb
+++ b/SDL/kassenbuch/BelegReports/rptZahlungsbeleg.vb
@@ -0,0 +1,9 @@
+Imports GrapeCity.ActiveReports 
+Imports GrapeCity.ActiveReports.Document
+
+Public Class rptZahlungsBeleg
+
+    Private Sub rptAEBeleg_ReportStart(sender As Object, e As EventArgs) Handles MyBase.ReportStart
+        '   Me.PageSettings.PaperKind = GrapeCity.ActiveReports.Printing.PaperKind.Custom
+    End Sub
+End Class
--- a/SDL/kassenbuch/frmBelegNeu.vb
+++ b/SDL/kassenbuch/frmBelegNeu.vb
@@ -1,10 +1,11 @@
 Imports System.Drawing.Printing
 Imports System.Globalization
-Imports System.Web.UI.WebControls.Expressions
-Imports com.sun.org.apache.xalan.internal.xsltc.compiler.util
+Imports javax.print.attribute.standard
 Imports Microsoft.Win32
 Imports SDL.RKSVServer

+
+
 Public Class frmBelegNeu
    Implements System.ComponentModel.INotifyPropertyChanged
    Dim dgvInitWait As Boolean = False
@@ -1399,19 +1400,39 @@ Public Class frmBelegNeu
        Dim returnCode = CInt(ZVTKey.GetValue("Ergebnis"))
        Dim response As String = ZVTKey.GetValue("ErgebnisText")
        Dim ZahlungsmittelCode As Integer = ZVTKey.GetValue("Kartentyp")
+        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)
+
+        If ECZahlungsNr = "" Then
+            ECZahlungsNr = -1
+        End If
+
+        Dim daid As Integer = -1
+        If (txt_Drucktext <> "" Or txt_Drucktext2 <> "") AndAlso BELEG IsNot Nothing Then
+            If returnCode = 1000 Or returnCode = 0 Then
+                daid = createZahlungsBeleg(txt_Drucktext & " " & txt_Drucktext2, 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()
+            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()
+                setRKSV(True, ECZahlungsNr, returnCode, daid)
            Else
                Me.Cursor = Cursors.Default
            End If
        Else
-                Me.Cursor = Cursors.Default
+            Me.Cursor = Cursors.Default
        End If
    End Sub

@@ -1429,7 +1450,7 @@ Public Class frmBelegNeu

        dt = SQL.loadDgvBySql("SELECT * FROM tblRKSV_POS WHERE [pos_aktiv] = 1 And [pos_kasse]='" & cboKassen.SelectedItem.Value & "'", "FMZOLL")

-                Select Case dt.Rows.Count
+        Select Case dt.Rows.Count
            Case 0
                MsgBox("Für diese Kasse ist kein aktives POS-Terminal hinterlegt!")
            Case 1
@@ -1593,7 +1614,7 @@ Public Class frmBelegNeu
        Return False
    End Function

-    Private Sub setRKSV()
+    Private Sub setRKSV(Optional ECZahlung As Boolean = False, Optional ECZahlungsNr As String = "", Optional ECTerminalreturnCode As Integer = -1, Optional DA_ID As Integer = 0)

        Try

@@ -1601,6 +1622,12 @@ Public Class frmBelegNeu

            If Not BELEG.gebucht And Not BELEG.gebuchtStorno Then

+                BELEG.ECZahlungsNr = ECZahlungsNr
+                BELEG.ECZahlungsPerAPI = ECZahlung
+                BELEG.ECTerminalreturnCode = ECTerminalreturnCode
+                If DA_ID <> 0 Then BELEG.EC_daid = DA_ID
+                BELEG.durchfuehrender_Benutzer = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
+
                Me.Cursor = Cursors.WaitCursor

                Dim isLeihgeldeinzahlung As Boolean = False
@@ -1780,6 +1807,37 @@ Public Class frmBelegNeu

    End Sub

+    Private Function createZahlungsBeleg(Ausdruck As String, BelegNr As String, Belegtyp As String, BELEG As EABeleg) As Integer
+
+        If Ausdruck <> "" Then
+
+            Dim filename As String = Belegtyp & "_" & BELEG.KundenNr & "_" & Now.ToString("yyyyMMddHHmmss")
+
+            Dim rpt As New rptZahlungsBeleg
+            rpt.lbl_Details.Text = Ausdruck
+            Dim tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(filename, ".pdf", , False)
+            Dim p As New GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport
+            rpt.Run(True)
+            p.NeverEmbedFonts = ""
+            p.Export(rpt.Document, tmpPath)
+
+            Dim RG_DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("BARZAHLUNGBELEGE", "Firma_" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA_ID, CDate(BELEG.BelegDat).Year & "_" & CDate(BELEG.BelegDat).Month, "", "", filename & ".pdf", BELEG.KundenNr, False)
+            If RG_DS.uploadDataToDATENSERVER(tmpPath, filename & ".pdf", ".pdf",,,, True) Then
+                Return RG_DS.da_id
+            End If
+
+        Else
+            Return -1
+
+        End If
+
+
+
+
+    End Function
+
+
+
    Private Sub LinkLabel1_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel1.LinkClicked
        Process.Start("https://wiki.verag.ag/de/software/aviso/howtos/Bankomat")
    End Sub
--- a/SDL/kassenbuch/frmKassenbuch.vb
+++ b/SDL/kassenbuch/frmKassenbuch.vb
@@ -190,7 +190,7 @@ Public Class frmKassenbuch
                If PERSONAL.isLeihgeldkasse Then
                    lgTxt = ",[Fahrer],[Passnummer] "
                End If
-                .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, " &
+                .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, " &
                                               " CASE WHEN b.storniert=1 THEN 'JA' ELSE '' END as [storniert], b.Beleg_TYP ,b.Benutzer  " & benutzerBezTMP & lgTxt &
                                                    " 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 & "'   " &
                                                    "  ORDER BY  b.rksv_BelegId DESC, b.[upsize_ts] desc;", "FMZOLL")
@@ -221,6 +221,7 @@ Public Class frmKassenbuch
                .Columns("storniert").HeaderText = "Storn."
                .Columns("storniert").Width = 45
                .Columns("Benutzer").Visible = False
+                .Columns("kassiertDurch").Visible = False

                If PERSONAL.isLeihgeldkasse Then
                    .Columns("Fahrer").Visible = False
@@ -252,7 +253,7 @@ Public Class frmKassenbuch
                End If


-                .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 " &
+                .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 " &
                  " FROM Personal INNER JOIN tblKassenbuch ON Personal.ID = tblKassenbuch.Benutzer  " &
                  "    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")
@@ -287,6 +288,7 @@ Public Class frmKassenbuch
                .Columns("Steuer").Width = 60
                .Columns("Steuer").DefaultCellStyle.Format = "C"
                .Columns("Benutzer").Visible = False
+                .Columns("kassiertDurch").Visible = False

            End If
        End With
--- a/SDL/kassenbuch/frmPOSTerminal.vb
+++ b/SDL/kassenbuch/frmPOSTerminal.vb
@@ -1,10 +1,5 @@
 Imports System.Drawing.Printing
-Imports System.Security.Authentication.ExtendedProtection
-Imports com.sun.tools.corba.se.idl.constExpr
-Imports DocumentFormat.OpenXml.Drawing.Diagrams
-Imports java.awt.print
 Imports Microsoft.Win32
-Imports TAlex.WPF.Helpers

 Public Class frmPOSTerminal

@@ -188,7 +183,7 @@ Public Class frmPOSTerminal


 		Dim ZVTKey As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\GUB\ZVT", True)
-		TextBox_Aktiv.Text = ""
+		'TextBox_Aktiv.Text = ""
 		txt_Ergebnis.Text = ZVTKey.GetValue("Ergebnis")
 		txt_ErgebnisText.Text = ZVTKey.GetValue("ErgebnisText")
 		txt_Drucktext.Text = Replace(ZVTKey.GetValue("Drucktext"), vbLf, vbCrLf)
@@ -285,16 +280,14 @@ Public Class frmPOSTerminal

 	Private Sub PDoc_SeiteDrucken(ByVal sender As System.Object, ByVal e As System.Drawing.Printing.PrintPageEventArgs) Handles PDoc.PrintPage

-		'Dim Textfont As Font = TextBox_Kassenbon.Font
+
 		Dim Hoehe, Breite As Integer
 		Dim Links, Oben As Integer
 		With PDoc.DefaultPageSettings
-			'Hoehe = .PaperSize.Height - .Margins.Top - .Margins.Bottom
-			'Breite = .PaperSize.Width - .Margins.Left - .Margins.Right
+
 			Hoehe = 500 ' 5,00 Zoll
 			Breite = 270 ' = 2,70 zoll 
-			'Links = PDoc.DefaultPageSettings.Margins.Left
-			'Oben = PDoc.DefaultPageSettings.Margins.Top
+
 			Links = 10
 			Oben = 10
 		End With