From 5181503bbc7f37c55666362c253ecf0effdebcd5 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 10 Mar 2023 16:35:13 +0100 Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20POS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SDL/Classes/cRKSV.vb | 14 +-- SDL/Classes/cRKSV_POS.vb | 4 + .../rptKassenbuchBuchhaltung.Designer.vb | 3 +- .../rptKassenbuchBuchhaltung.resx | 2 +- .../BelegReports/rptKassenbuchBuchhaltung.vb | 2 + SDL/kassenbuch/frmBelegNeu.vb | 16 +++- SDL/kassenbuch/frmPOSTerminal.Designer.vb | 93 ++++++++++++++++--- SDL/kassenbuch/frmPOSTerminal.vb | 57 ++++++++---- 8 files changed, 144 insertions(+), 47 deletions(-) diff --git a/SDL/Classes/cRKSV.vb b/SDL/Classes/cRKSV.vb index 87c72d7e..c110c833 100644 --- a/SDL/Classes/cRKSV.vb +++ b/SDL/Classes/cRKSV.vb @@ -2299,24 +2299,20 @@ Public Class cRKSV KBEntryEC.Konto = PERSONAL.KassenbuchNr End If - If i = 0 Then - KBEntryEC.Buchungstext = "-" - Else - KBEntryEC.Buchungstext = "Umbuchung Kassa/Bankomat" - End If + KBEntryEC.Buchungstext = "Umb. BK/KASSA" KBEntryEC.Buchungsdatum = Now.ToShortDateString KBEntryEC.BelegDat = BELEG.BelegDat.ToShortDateString - KBEntryEC.BelegNr = BELEG.BelegNr - KBEntryEC.Belegart = BELEG.Belegart - If KBEntryEC.Belegart = 1 Then + KBEntryEC.Belegart = 3 + KBEntryEC.BelegNr = BELEG.BelegNr & KBEntryEC.Belegart 'zur Generierung von eigenem Buchungssatz + If BELEG.Belegart = 1 Then If i = 0 Then KBEntryEC.Soll = Bruttobetrag Else KBEntryEC.Haben = Bruttobetrag End If - ElseIf KBEntryEC.Belegart = 2 Then + ElseIf BELEG.Belegart = 2 Then If i = 0 Then KBEntryEC.Haben = Bruttobetrag Else diff --git a/SDL/Classes/cRKSV_POS.vb b/SDL/Classes/cRKSV_POS.vb index f176d638..97f7f6bd 100644 --- a/SDL/Classes/cRKSV_POS.vb +++ b/SDL/Classes/cRKSV_POS.vb @@ -27,6 +27,8 @@ Public Class cRKSV_POS Property pos_storno As Object = Nothing Property pos_wartezeit As Object = Nothing Property pos_FIBU As Object = Nothing + Property pos_XML As Object = Nothing + Property pos_Protokollpfad As Object = Nothing Public hasEntry = False @@ -71,6 +73,8 @@ Public Class cRKSV_POS list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("pos_storno", pos_storno)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("pos_wartezeit", pos_wartezeit)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("pos_FIBU", pos_FIBU)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("pos_XML", pos_XML)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("pos_Protokollpfad", pos_Protokollpfad)) Return list End Function diff --git a/SDL/kassenbuch/BelegReports/rptKassenbuchBuchhaltung.Designer.vb b/SDL/kassenbuch/BelegReports/rptKassenbuchBuchhaltung.Designer.vb index 9bc82aed..b6da0803 100644 --- a/SDL/kassenbuch/BelegReports/rptKassenbuchBuchhaltung.Designer.vb +++ b/SDL/kassenbuch/BelegReports/rptKassenbuchBuchhaltung.Designer.vb @@ -195,11 +195,12 @@ Partial Public Class rptKassenbuchBuchhaltung ' 'Label7 ' + Me.Label7.DataField = "" Me.Label7.Height = 0.1377953! Me.Label7.HyperLink = Nothing Me.Label7.Left = 3.327! Me.Label7.Name = "Label7" - Me.Label7.Style = "font-size: 7pt; font-weight: bold; text-align: left" + Me.Label7.Style = "color: Black; font-size: 7pt; font-weight: bold; text-align: center" Me.Label7.Text = "ZM" Me.Label7.Top = 0.004! Me.Label7.Width = 0.4400001! diff --git a/SDL/kassenbuch/BelegReports/rptKassenbuchBuchhaltung.resx b/SDL/kassenbuch/BelegReports/rptKassenbuchBuchhaltung.resx index f016238b..9549e5af 100644 --- a/SDL/kassenbuch/BelegReports/rptKassenbuchBuchhaltung.resx +++ b/SDL/kassenbuch/BelegReports/rptKassenbuchBuchhaltung.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - border-top-width: 1px; border-top-style: : : : : : : : : : : : : solid; border-top-color: gray; border-right-width: 1px; border-right-style: solid; border-right-color: gray; border-bottom-width: 1px; border-bottom-style: : : : : : : : : : : : : solid; border-bottom-color: gray; border-left-width: 1px; border-left-style: : : : : : : : : : : : : solid; border-left-color: gray; font-size: 7pt; text-align: right; ddo-char-set: 1 + border-top-width: 1px; border-top-style: : : : : : : : : : : : : : solid; border-top-color: gray; border-right-width: 1px; border-right-style: solid; border-right-color: gray; border-bottom-width: 1px; border-bottom-style: : : : : : : : : : : : : : solid; border-bottom-color: gray; border-left-width: 1px; border-left-style: : : : : : : : : : : : : : solid; border-left-color: gray; font-size: 7pt; text-align: right; ddo-char-set: 1 0, 0 diff --git a/SDL/kassenbuch/BelegReports/rptKassenbuchBuchhaltung.vb b/SDL/kassenbuch/BelegReports/rptKassenbuchBuchhaltung.vb index b6cf55ec..913b9226 100644 --- a/SDL/kassenbuch/BelegReports/rptKassenbuchBuchhaltung.vb +++ b/SDL/kassenbuch/BelegReports/rptKassenbuchBuchhaltung.vb @@ -30,5 +30,7 @@ Public Class rptKassenbuchBuchhaltung c.Border.Color = Color.Gray End Sub + Private Sub Detail_Format(sender As Object, e As EventArgs) Handles Detail.Format + End Sub End Class diff --git a/SDL/kassenbuch/frmBelegNeu.vb b/SDL/kassenbuch/frmBelegNeu.vb index 94fdfd4f..70014975 100644 --- a/SDL/kassenbuch/frmBelegNeu.vb +++ b/SDL/kassenbuch/frmBelegNeu.vb @@ -1357,6 +1357,8 @@ Public Class frmBelegNeu MsgBox(response) If returnCode = 0 Then 'Zahlung wurde erfolgreich durchgeführt setRKSV() + Else + Me.Cursor = Cursors.Default End If End Sub @@ -1430,6 +1432,16 @@ Public Class frmBelegNeu ZVTKey.SetValue("ComSpeed", CInt(posTerminal.pos_comspeed), RegistryValueKind.DWord) ZVTKey.SetValue("ComStop", CInt(posTerminal.pos_comstop), RegistryValueKind.DWord) ZVTKey.SetValue("Lizenz", posTerminal.pos_lizenz, RegistryValueKind.String) + + If posTerminal.pos_Protokollpfad <> "" Then + ZVTKey.SetValue("Protokollpfad", posTerminal.pos_Protokollpfad.Text, RegistryValueKind.String) + End If + + If posTerminal.pos_XML And posTerminal.pos_Protokollpfad <> "" Then + ZVTKey.SetValue("Ausgabepfad", posTerminal.pos_Protokollpfad.Text, RegistryValueKind.String) + End If + + If Funktion = 0 Or Funktion = 4 Then ZVTKey.SetValue("Betrag", Betrag * 100, RegistryValueKind.DWord) 'CENTbeträge 1€ --> 100 CENT End If @@ -1629,12 +1641,12 @@ Public Class frmBelegNeu Select Case BELEG.Belegart Case "1" - If cRKSV.printKundenBeleg(BELEG, KASSE, PERSONAL, cboPrinter.SelectedItem.ToString, cbxBelegOffnen.Checked) Then + If True Then 'cRKSV.printKundenBeleg(BELEG, KASSE, PERSONAL, cboPrinter.SelectedItem.ToString, cbxBelegOffnen.Checked) Then 'WARTEN printErfolgreich = True End If Case "2" - If cRKSV.printKundenBelegLG(BELEG, KASSE, PERSONAL, cboPrinter.SelectedItem.ToString, "LG") Then + If True Then 'cRKSV.printKundenBelegLG(BELEG, KASSE, PERSONAL, cboPrinter.SelectedItem.ToString, "LG") Then 'WARTEN printErfolgreich = True End If diff --git a/SDL/kassenbuch/frmPOSTerminal.Designer.vb b/SDL/kassenbuch/frmPOSTerminal.Designer.vb index aa5221e7..bc1e7f51 100644 --- a/SDL/kassenbuch/frmPOSTerminal.Designer.vb +++ b/SDL/kassenbuch/frmPOSTerminal.Designer.vb @@ -71,6 +71,8 @@ Partial Class frmPOSTerminal Me.Label18 = New System.Windows.Forms.Label() Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() + Me.Label24 = New System.Windows.Forms.Label() + Me.txtFIBU = New System.Windows.Forms.TextBox() Me.TabPage2 = New System.Windows.Forms.TabPage() Me.TabPage3 = New System.Windows.Forms.TabPage() Me.Label23 = New System.Windows.Forms.Label() @@ -93,8 +95,11 @@ 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.Label24 = New System.Windows.Forms.Label() - Me.txtFIBU = New System.Windows.Forms.TextBox() + Me.Label25 = New System.Windows.Forms.Label() + Me.txtPfad = New System.Windows.Forms.TextBox() + Me.Label26 = New System.Windows.Forms.Label() + Me.CheckBox1 = New System.Windows.Forms.CheckBox() + Me.btnPfad = New VERAG_PROG_ALLGEMEIN.FlatButton() CType(Me.dgvTerminals, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() @@ -538,6 +543,11 @@ Partial Class frmPOSTerminal ' 'TabPage1 ' + Me.TabPage1.Controls.Add(Me.btnPfad) + Me.TabPage1.Controls.Add(Me.CheckBox1) + Me.TabPage1.Controls.Add(Me.Label26) + Me.TabPage1.Controls.Add(Me.Label25) + Me.TabPage1.Controls.Add(Me.txtPfad) Me.TabPage1.Controls.Add(Me.Label24) Me.TabPage1.Controls.Add(Me.txtFIBU) Me.TabPage1.Controls.Add(Me.Label16) @@ -571,6 +581,22 @@ Partial Class frmPOSTerminal Me.TabPage1.Text = "Allgemein" Me.TabPage1.UseVisualStyleBackColor = True ' + 'Label24 + ' + Me.Label24.AutoSize = True + Me.Label24.Location = New System.Drawing.Point(8, 280) + Me.Label24.Name = "Label24" + Me.Label24.Size = New System.Drawing.Size(62, 13) + Me.Label24.TabIndex = 149 + Me.Label24.Text = "FIBU Konto" + ' + 'txtFIBU + ' + Me.txtFIBU.Location = New System.Drawing.Point(135, 277) + Me.txtFIBU.Name = "txtFIBU" + Me.txtFIBU.Size = New System.Drawing.Size(67, 20) + Me.txtFIBU.TabIndex = 150 + ' 'TabPage2 ' Me.TabPage2.Controls.Add(Me.Label15) @@ -806,21 +832,55 @@ Partial Class frmPOSTerminal Me.lblWarning.TabIndex = 150 Me.lblWarning.Text = "Warning" ' - 'Label24 + 'Label25 ' - Me.Label24.AutoSize = True - Me.Label24.Location = New System.Drawing.Point(8, 280) - Me.Label24.Name = "Label24" - Me.Label24.Size = New System.Drawing.Size(62, 13) - Me.Label24.TabIndex = 149 - Me.Label24.Text = "FIBU Konto" + Me.Label25.AutoSize = True + Me.Label25.Location = New System.Drawing.Point(8, 306) + Me.Label25.Name = "Label25" + Me.Label25.Size = New System.Drawing.Size(76, 13) + Me.Label25.TabIndex = 151 + Me.Label25.Text = "Protokollpfad *" ' - 'txtFIBU + 'txtPfad ' - Me.txtFIBU.Location = New System.Drawing.Point(135, 277) - Me.txtFIBU.Name = "txtFIBU" - Me.txtFIBU.Size = New System.Drawing.Size(190, 20) - Me.txtFIBU.TabIndex = 150 + Me.txtPfad.Location = New System.Drawing.Point(135, 303) + Me.txtPfad.Name = "txtPfad" + Me.txtPfad.Size = New System.Drawing.Size(177, 20) + Me.txtPfad.TabIndex = 152 + ' + 'Label26 + ' + Me.Label26.AutoSize = True + Me.Label26.Location = New System.Drawing.Point(134, 326) + Me.Label26.Name = "Label26" + Me.Label26.Size = New System.Drawing.Size(308, 13) + Me.Label26.TabIndex = 153 + Me.Label26.Text = "* wenn leer, Protokolldateien unter Dokumente\GUB\ZVTLOG\" + ' + 'CheckBox1 + ' + Me.CheckBox1.AutoSize = True + Me.CheckBox1.Location = New System.Drawing.Point(345, 302) + Me.CheckBox1.Name = "CheckBox1" + Me.CheckBox1.Size = New System.Drawing.Size(113, 17) + Me.CheckBox1.TabIndex = 154 + Me.CheckBox1.Text = "als XML speichern" + Me.CheckBox1.UseVisualStyleBackColor = True + ' + 'btnPfad + ' + Me.btnPfad.allowBorder = False + Me.btnPfad.BackgroundImage = Global.SDL.My.Resources.Resources.stift + Me.btnPfad.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnPfad.FlatAppearance.BorderSize = 0 + Me.btnPfad.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnPfad.ForeColor = System.Drawing.Color.Black + Me.btnPfad.Location = New System.Drawing.Point(318, 306) + Me.btnPfad.Name = "btnPfad" + Me.btnPfad.Size = New System.Drawing.Size(21, 17) + Me.btnPfad.TabIndex = 155 + Me.btnPfad.UseVisualStyleBackColor = True + Me.btnPfad.Visible = False ' 'frmPOSTerminal ' @@ -920,4 +980,9 @@ Partial Class frmPOSTerminal Friend WithEvents txt_Kartentyp As TextBox Friend WithEvents Label24 As Label Friend WithEvents txtFIBU As TextBox + Friend WithEvents CheckBox1 As CheckBox + Friend WithEvents Label26 As Label + Friend WithEvents Label25 As Label + Friend WithEvents txtPfad As TextBox + Friend WithEvents btnPfad As VERAG_PROG_ALLGEMEIN.FlatButton End Class diff --git a/SDL/kassenbuch/frmPOSTerminal.vb b/SDL/kassenbuch/frmPOSTerminal.vb index 73fafef2..ce49bf14 100644 --- a/SDL/kassenbuch/frmPOSTerminal.vb +++ b/SDL/kassenbuch/frmPOSTerminal.vb @@ -69,6 +69,16 @@ Public Class frmPOSTerminal ZVTKey.SetValue("ComStop", CInt(cbx_ComStop.Text), RegistryValueKind.DWord) ZVTKey.SetValue("Lizenz", txt_Lizenz.Text, RegistryValueKind.String) + If txtPfad.Text <> "" Then + ZVTKey.SetValue("Protokollpfad", txtPfad.Text, RegistryValueKind.String) + End If + + + If CheckBox1.Checked And txtPfad.Text <> "" Then + ZVTKey.SetValue("Ausgabepfad", txtPfad.Text, RegistryValueKind.String) + End If + + Select Case Funktion Case 0, 4 Betrag = CInt("0" & txt_Betrag.Text) @@ -319,11 +329,8 @@ Public Class frmPOSTerminal .Columns.Clear() - .SET_SQL("SELECT [pos_id],[pos_aktiv],[pos_kassennr],[pos_bezeichnung] ,[pos_kasse] ,[pos_com] - ,[pos_baudrate] ,[pos_comspeed] ,[pos_comstop] ,[pos_ip] ,[pos_port] ,[pos_typ] - ,[pos_lizenz] ,[pos_kassendruck] ,[pos_demoausdruck] - ,[pos_demodummyausdruck] ,[pos_pin] ,[pos_händerbeleg_drucken] ,[pos_storno] ,[pos_wartezeit],[pos_fibu] - FROM [VERAG].[dbo].[tblRKSV_POS] WHERE [pos_kasse] =" & kassenID, "FMZOLL") + .SET_SQL("SELECT [pos_id],[pos_aktiv],[pos_kassennr],[pos_bezeichnung] ,[pos_kasse] + ,[pos_ip] FROM [VERAG].[dbo].[tblRKSV_POS] WHERE [pos_kasse] =" & kassenID, "FMZOLL") .LOAD() @@ -338,30 +345,17 @@ Public Class frmPOSTerminal .Columns("pos_kassennr").HeaderText = "K-Nr" .Columns("pos_aktiv").Width = 25 .Columns("pos_aktiv").HeaderText = "" - .Columns("pos_kassendruck").Visible = False .Columns("pos_kasse").Visible = False - .Columns("pos_com").Visible = False - .Columns("pos_baudrate").Visible = False - .Columns("pos_comspeed").Visible = False - .Columns("pos_comstop").Visible = False - .Columns("pos_port").Visible = False - .Columns("pos_typ").Visible = False - .Columns("pos_lizenz").Visible = False - .Columns("pos_kassendruck").Visible = False - .Columns("pos_demoausdruck").Visible = False - .Columns("pos_demodummyausdruck").Visible = False - .Columns("pos_pin").Visible = False - .Columns("pos_händerbeleg_drucken").Visible = False - .Columns("pos_storno").Visible = False - .Columns("pos_wartezeit").Visible = False .Columns("pos_ip").HeaderText = "IP-Adresse" .Columns("pos_ip").Width = 100 + End With End Sub Private Sub frmPOSTerminal_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try + btnPfad.Visible = True Text = kasse & " - POS Terminal einstellen " lblWarning.Text = "" btnNew.Enabled = False @@ -398,6 +392,10 @@ Public Class frmPOSTerminal cbx_ComStop.Text = currentPOS.pos_comstop txt_Lizenz.Text = currentPOS.pos_lizenz txtFIBU.Text = currentPOS.pos_FIBU + txtPfad.Text = currentPOS.pos_Protokollpfad + CheckBox1.Checked = currentPOS.pos_XML + + If currentPOS.pos_kassendruck Then cbx_Kassedruck.Checked = True Else @@ -459,6 +457,8 @@ Public Class frmPOSTerminal currentPOS.pos_comstop = cbx_ComStop.Text currentPOS.pos_lizenz = txt_Lizenz.Text currentPOS.pos_FIBU = txtFIBU.Text + currentPOS.pos_Protokollpfad = txtPfad.Text + currentPOS.pos_XML = CheckBox1.Checked If cbx_Kassedruck.Checked Then currentPOS.pos_kassendruck = True Else @@ -710,5 +710,22 @@ Public Class frmPOSTerminal End Function + Private Sub btnPfad_Click(sender As Object, e As EventArgs) Handles btnPfad.Click + Dim dialog As New FolderBrowserDialog() + If txtPfad.Text = "" Then + dialog.RootFolder = Environment.SpecialFolder.Desktop + dialog.SelectedPath = "C:\" + dialog.Description = "Pfad für Protokolldatei auswählen" + Else + dialog.SelectedPath = txtPfad.Text + dialog.Description = "Pfad für Protokolldatei auswählen" + + End If + + If dialog.ShowDialog() = Windows.Forms.DialogResult.OK Then + txtPfad.Text = dialog.SelectedPath + End If + + End Sub End Class \ No newline at end of file