Zahlungsmittel in Kassabuch

SDL/Classes/cKassenbuch.vb

@@ -23,6 +23,7 @@ Public Class cKassenbuch
     Property Referenz As String = ""
     Property Belegverbuchung As Boolean = False
     Property gebucht As Boolean = False
+    Property Finanzwege As String = ""
     Property rksv_id As Object = Nothing
     Property rksv_BelegId As Object = Nothing
     Property rksv_aktiv As Boolean = False
@@ -97,6 +98,7 @@ Public Class cKassenbuch
                         Me.Referenz = cSqlDb.checkNullStr(dr.Item("Referenz"))
                         Me.Belegverbuchung = cSqlDb.checkNullBool(dr.Item("Belegverbuchung"))
                         Me.gebucht = cSqlDb.checkNullBool(dr.Item("gebucht"))
+                        Me.Finanzwege = cSqlDb.checkNullStr(dr.Item("Finanzwege"))
                         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)
@@ -141,6 +143,7 @@ Public Class cKassenbuch
         list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("Referenz", Referenz))
         list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("Belegverbuchung", Belegverbuchung))
         list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("gebucht", gebucht))
+        list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("Finanzwege", Finanzwege))
         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))

SDL/Classes/cRKSV.vb

@@ -2118,7 +2118,7 @@ Public Class cRKSV
         Return GJ.INCREASE_JOURNAL()
     End Function
 
-    Public Shared Function insertKB(PERSONAL As cPersonal, BELEG As EABeleg, RKSV_id As Integer, RKSV_Beleg_Id As Integer, RKSV_aktiv As Integer, ByRef JournalNr As Integer, Firma As String)
+    Public Shared Function insertKB(PERSONAL As cPersonal, BELEG As EABeleg, RKSV_id As Integer, RKSV_Beleg_Id As Integer, RKSV_aktiv As Integer, ByRef JournalNr As Integer, Firma As String, Optional Finanzwege As String = "Bar")
         Try
             If BELEG.POS.Count = 0 Then
                 MsgBox("Keine Positionen gefunden")
@@ -2190,6 +2190,7 @@ Public Class cRKSV
 
                     KBEntry.Belegverbuchung = True
                     KBEntry.gebucht = True
+                    KBEntry.Finanzwege = Finanzwege
 
                     If Not KBEntry.INSERT() Then
                         Return False
@@ -2241,6 +2242,7 @@ Public Class cRKSV
 
                         KBEntryGB.Belegverbuchung = True
                         KBEntryGB.gebucht = True
+                        KBEntryGB.Finanzwege = Finanzwege
 
                         If Not KBEntryGB.INSERT() Then
                             Return False

SDL/kassenbuch/frmBelegNeu.Designer.vb

@@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmBelegNeu
     Inherits System.Windows.Forms.Form
 
     'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
     Protected Overrides Sub Dispose(ByVal disposing As Boolean)
         Try
             If disposing AndAlso components IsNot Nothing Then
@@ -20,7 +20,7 @@ Partial Class frmBelegNeu
     'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
     'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmBelegNeu))
@@ -410,7 +410,7 @@ Partial Class frmBelegNeu
         '
         Me.Label12.AutoSize = True
         Me.Label12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label12.Location = New System.Drawing.Point(352, 80)
+        Me.Label12.Location = New System.Drawing.Point(352, 87)
         Me.Label12.Name = "Label12"
         Me.Label12.Size = New System.Drawing.Size(60, 13)
         Me.Label12.TabIndex = 13
@@ -420,7 +420,7 @@ Partial Class frmBelegNeu
         '
         Me.Label16.AutoSize = True
         Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label16.Location = New System.Drawing.Point(352, 60)
+        Me.Label16.Location = New System.Drawing.Point(352, 67)
         Me.Label16.Name = "Label16"
         Me.Label16.Size = New System.Drawing.Size(84, 13)
         Me.Label16.TabIndex = 11
@@ -866,7 +866,7 @@ Partial Class frmBelegNeu
         Me.lblErr_steuer.AutoSize = True
         Me.lblErr_steuer.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblErr_steuer.ForeColor = System.Drawing.Color.Red
-        Me.lblErr_steuer.Location = New System.Drawing.Point(376, 41)
+        Me.lblErr_steuer.Location = New System.Drawing.Point(376, 48)
         Me.lblErr_steuer.Name = "lblErr_steuer"
         Me.lblErr_steuer.Size = New System.Drawing.Size(244, 13)
         Me.lblErr_steuer.TabIndex = 9
@@ -936,7 +936,7 @@ Partial Class frmBelegNeu
         Me.txtSteuersatz._Waehrung = False
         Me.txtSteuersatz._WaehrungZeichen = True
         Me.txtSteuersatz.ForeColor = System.Drawing.Color.Black
-        Me.txtSteuersatz.Location = New System.Drawing.Point(441, 77)
+        Me.txtSteuersatz.Location = New System.Drawing.Point(441, 84)
         Me.txtSteuersatz.MaxLineLength = -1
         Me.txtSteuersatz.MaxLines_Warning = ""
         Me.txtSteuersatz.MaxLines_Warning_Label = Nothing
@@ -952,7 +952,7 @@ Partial Class frmBelegNeu
         Me.cboSteuerschlüssel._value = ""
         Me.cboSteuerschlüssel.CausesValidation = False
         Me.cboSteuerschlüssel.FormattingEnabled = True
-        Me.cboSteuerschlüssel.Location = New System.Drawing.Point(441, 57)
+        Me.cboSteuerschlüssel.Location = New System.Drawing.Point(441, 64)
         Me.cboSteuerschlüssel.Name = "cboSteuerschlüssel"
         Me.cboSteuerschlüssel.Size = New System.Drawing.Size(179, 21)
         Me.cboSteuerschlüssel.TabIndex = 20

SDL/kassenbuch/frmBelegNeu.vb

@@ -39,6 +39,7 @@ Public Class frmBelegNeu
     Private posTerminal As cRKSV_POS
     Private dt As DataTable
     Private setBreak As Boolean = True
+    Private Zahlungsmittel As String
     Dim sourceCnTxt As Control = Nothing
 
 
@@ -168,7 +169,7 @@ Public Class frmBelegNeu
                 Case "SUA"
                     cboKassen.changeItem(5)
                 Case Else
-                    MsgBox("Fehler: Dem Benutzer ist noch keine RKSV-Kasse bze. keine Niederlassung zugeordnet!")
+                    MsgBox("Fehler: Dem Benutzer ist noch keine RKSV-Kasse bzw. keine Niederlassung zugeordnet!")
 
             End Select
         End If
@@ -239,6 +240,7 @@ Public Class frmBelegNeu
                 ' FlowLayoutPanel1.Enabled = False
                 Label17.Visible = True
                 btnPrint.Text = "Beleg Kopie" & vbNewLine & "drucken"
+
             End If
 
             If BELEG.Belegart = "1" Then
@@ -339,6 +341,8 @@ Public Class frmBelegNeu
         If BELEG.rksv_BelegId > 0 Then
             lblBelegNr.Text = BELEG.rksv_BelegId
         End If
+
+
         cboFiliale.changeItem(BELEG.FilialenNr)
         txtAbfertigungsNr.Text = IIf(BELEG.AbfertigungsNr <= 0, "", BELEG.AbfertigungsNr)
 
@@ -744,12 +748,12 @@ Public Class frmBelegNeu
 
 
     ' Dim RKSV_Service_Location = "\\192.168.0.106:8733/Design_Time_Addresses/RKSVCompleteServer/Service1/"
-    Private Sub Button1_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnPrint.Click 'btnPOS.Click
+    Private Sub Button1_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnPrint.Click
-
+        Zahlungsmittel = "Bar"
         If Not printRoutine() Then
             Exit Sub
         End If
-        setRKSV()
+        setRKSV(sender)
 
     End Sub
 
@@ -1343,16 +1347,17 @@ Public Class frmBelegNeu
         Dim ZVTKey As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\GUB\ZVT", True)
         Dim returnCode = CInt(ZVTKey.GetValue("Ergebnis"))
         Dim response As String = ZVTKey.GetValue("ErgebnisText")
+        Dim ZahlungsmittelCode As Integer = ZVTKey.GetValue("Kartentyp")
 
         ZVTKey.Close()
         MsgBox(response)
         If returnCode = 0 Then 'Zahlung wurde erfolgreich durchgeführt
-            setRKSV()
+            setRKSV(sender)
         End If
     End Sub
 
     Private Sub POSpayment(sender As Object, e As EventArgs) Handles btnPOS.Click
-
+        Zahlungsmittel = "EC-Karte"
         If cboKassen.SelectedItem.Text = "" Then
             MsgBox("Keine Kasse ausgewählt!")
             Exit Sub
@@ -1513,9 +1518,10 @@ Public Class frmBelegNeu
 
     End Function
 
-    Private Sub setRKSV()
+    Private Sub setRKSV(sender As System.Object)
 
         Try
+
             If Not BELEG.gebucht And Not BELEG.gebuchtStorno Then
 
                 Me.Cursor = Cursors.WaitCursor
@@ -1540,7 +1546,11 @@ Public Class frmBelegNeu
                 End If
                 ' MsgBox(BELEG.POS.Count)
                 Dim JournalNr = 0
-                If Not cRKSV.insertKB(PERSONAL, BELEG, KASSE.rksv_id, RKSV_Beleg_Id, KASSE.rksv_aktiv, JournalNr, KASSE.rksv_firma) Then
+
+
+                Zahlungsmittel = sender.Text
+
+                If Not cRKSV.insertKB(PERSONAL, BELEG, KASSE.rksv_id, RKSV_Beleg_Id, KASSE.rksv_aktiv, JournalNr, KASSE.rksv_firma, Zahlungsmittel) Then
                     KASSE.DECREASE_BELEG_UMSATZ(oldBelegZaehler, summeBRUTTO * -1)
                     MsgBox("Programmfehler bei Eintrag ins Kassenbuch.")
                     Me.Cursor = Cursors.Default : warnClose = False : Me.Close() : Exit Sub

SDL/kassenbuch/frmKassenbuch.vb

@@ -252,7 +252,7 @@ Public Class frmKassenbuch
                 End If
 
 
-                .SET_SQL("SELECT [JournalNr],[BelegDat],[BelegNr],CASE WHEN Belegart=1 THEN 'E' ELSE 'A' END as Belegart,[Buchungstext],([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 " &
                   " 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")
@@ -278,12 +278,13 @@ Public Class frmKassenbuch
                 .Columns("Belegart").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter
                 .Columns("Buchungstext").MinimumWidth = 60
                 .Columns("Buchungstext").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+                .Columns("FW").Width = 30
                 .Columns("Konto").Width = 40
                 .Columns("Soll").Width = 80
                 .Columns("Soll").DefaultCellStyle.Format = "C"
                 .Columns("Haben").Width = 80
                 .Columns("Haben").DefaultCellStyle.Format = "C"
-                .Columns("Steuer").Width = 80
+                .Columns("Steuer").Width = 60
                 .Columns("Steuer").DefaultCellStyle.Format = "C"
                 .Columns("Benutzer").Visible = False
 

SDL/kassenbuch/frmPOSTerminal.Designer.vb

@@ -91,6 +91,8 @@ Partial Class frmPOSTerminal
         Me.btn_Autorisierung = New System.Windows.Forms.Button()
         Me.txt_Betrag = New System.Windows.Forms.TextBox()
         Me.lblWarning = New System.Windows.Forms.Label()
+        Me.txt_Kartentyp = New System.Windows.Forms.TextBox()
+        Me.Label23 = New System.Windows.Forms.Label()
         CType(Me.dgvTerminals, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.TabControl1.SuspendLayout()
         Me.TabPage1.SuspendLayout()
@@ -589,6 +591,8 @@ Partial Class frmPOSTerminal
         '
         'TabPage3
         '
+        Me.TabPage3.Controls.Add(Me.Label23)
+        Me.TabPage3.Controls.Add(Me.txt_Kartentyp)
         Me.TabPage3.Controls.Add(Me.cbx_Sprache)
         Me.TabPage3.Controls.Add(Me.Label22)
         Me.TabPage3.Controls.Add(Me.btn_Sprache)
@@ -669,7 +673,7 @@ Partial Class frmPOSTerminal
         'Label21
         '
         Me.Label21.AutoSize = True
-        Me.Label21.Location = New System.Drawing.Point(14, 355)
+        Me.Label21.Location = New System.Drawing.Point(14, 344)
         Me.Label21.Name = "Label21"
         Me.Label21.Size = New System.Drawing.Size(43, 13)
         Me.Label21.TabIndex = 134
@@ -696,7 +700,7 @@ Partial Class frmPOSTerminal
         'TextBox_Aktiv
         '
         Me.TextBox_Aktiv.BackColor = System.Drawing.Color.Gray
-        Me.TextBox_Aktiv.Location = New System.Drawing.Point(13, 440)
+        Me.TextBox_Aktiv.Location = New System.Drawing.Point(13, 444)
         Me.TextBox_Aktiv.Name = "TextBox_Aktiv"
         Me.TextBox_Aktiv.Size = New System.Drawing.Size(123, 20)
         Me.TextBox_Aktiv.TabIndex = 129
@@ -712,16 +716,16 @@ Partial Class frmPOSTerminal
         '
         'txt_ErgebnisText
         '
-        Me.txt_ErgebnisText.Location = New System.Drawing.Point(167, 382)
+        Me.txt_ErgebnisText.Location = New System.Drawing.Point(167, 371)
         Me.txt_ErgebnisText.Multiline = True
         Me.txt_ErgebnisText.Name = "txt_ErgebnisText"
         Me.txt_ErgebnisText.ReadOnly = True
-        Me.txt_ErgebnisText.Size = New System.Drawing.Size(375, 43)
+        Me.txt_ErgebnisText.Size = New System.Drawing.Size(375, 65)
         Me.txt_ErgebnisText.TabIndex = 113
         '
         'txt_Ergebnis
         '
-        Me.txt_Ergebnis.Location = New System.Drawing.Point(109, 382)
+        Me.txt_Ergebnis.Location = New System.Drawing.Point(109, 371)
         Me.txt_Ergebnis.Name = "txt_Ergebnis"
         Me.txt_Ergebnis.ReadOnly = True
         Me.txt_Ergebnis.Size = New System.Drawing.Size(44, 20)
@@ -730,7 +734,7 @@ Partial Class frmPOSTerminal
         'Label12
         '
         Me.Label12.AutoSize = True
-        Me.Label12.Location = New System.Drawing.Point(13, 412)
+        Me.Label12.Location = New System.Drawing.Point(13, 401)
         Me.Label12.Name = "Label12"
         Me.Label12.Size = New System.Drawing.Size(45, 13)
         Me.Label12.TabIndex = 133
@@ -739,7 +743,7 @@ Partial Class frmPOSTerminal
         'Label9
         '
         Me.Label9.AutoSize = True
-        Me.Label9.Location = New System.Drawing.Point(13, 385)
+        Me.Label9.Location = New System.Drawing.Point(13, 374)
         Me.Label9.Name = "Label9"
         Me.Label9.Size = New System.Drawing.Size(48, 13)
         Me.Label9.TabIndex = 111
@@ -747,7 +751,7 @@ Partial Class frmPOSTerminal
         '
         'txt_BelegNr
         '
-        Me.txt_BelegNr.Location = New System.Drawing.Point(109, 405)
+        Me.txt_BelegNr.Location = New System.Drawing.Point(109, 394)
         Me.txt_BelegNr.Name = "txt_BelegNr"
         Me.txt_BelegNr.ReadOnly = True
         Me.txt_BelegNr.Size = New System.Drawing.Size(44, 20)
@@ -781,6 +785,23 @@ Partial Class frmPOSTerminal
         Me.lblWarning.TabIndex = 150
         Me.lblWarning.Text = "Warning"
         '
+        'txt_Kartentyp
+        '
+        Me.txt_Kartentyp.Location = New System.Drawing.Point(109, 420)
+        Me.txt_Kartentyp.Name = "txt_Kartentyp"
+        Me.txt_Kartentyp.ReadOnly = True
+        Me.txt_Kartentyp.Size = New System.Drawing.Size(44, 20)
+        Me.txt_Kartentyp.TabIndex = 140
+        '
+        'Label23
+        '
+        Me.Label23.AutoSize = True
+        Me.Label23.Location = New System.Drawing.Point(13, 423)
+        Me.Label23.Name = "Label23"
+        Me.Label23.Size = New System.Drawing.Size(52, 13)
+        Me.Label23.TabIndex = 141
+        Me.Label23.Text = "Kartentyp"
+        '
         'frmPOSTerminal
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -875,4 +896,6 @@ Partial Class frmPOSTerminal
     Friend WithEvents cbx_Sprache As ComboBox
     Friend WithEvents Label22 As Label
     Friend WithEvents btn_Sprache As Button
+    Friend WithEvents Label23 As Label
+    Friend WithEvents txt_Kartentyp As TextBox
 End Class

SDL/kassenbuch/frmPOSTerminal.vb

@@ -185,6 +185,7 @@ Public Class frmPOSTerminal
 		txt_Drucktext2.Text = Replace(ZVTKey.GetValue("Drucktext2"), vbLf, vbCrLf)
 
 		txt_BelegNr.Text = ZVTKey.GetValue("BelegNr").ToString
+		txt_Kartentyp.Text = ZVTKey.GetValue("Kartentyp").ToString
 		txt_Betrag.Text = ""
 
 		If cbx_Autodruck.Checked Then