From 14419be3314ebe54a54d9631ccedfa494bf985e8 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Wed, 23 Nov 2022 19:25:14 +0100 Subject: [PATCH 1/2] GG public --- .../usrcntlGestellungsgarantie.Designer.vb | 40 ++++++++++++++++--- .../usrcntlGestellungsgarantie.vb | 1 + 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlGestellungsgarantie.Designer.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlGestellungsgarantie.Designer.vb index 8d45e2a8..ae56a602 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlGestellungsgarantie.Designer.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlGestellungsgarantie.Designer.vb @@ -129,10 +129,12 @@ Partial Class usrcntlGestellungsgarantie Me.txtEmail._DateTimeOnly = False Me.txtEmail._numbersOnly = False Me.txtEmail._numbersOnlyKommastellen = "" + Me.txtEmail._numbersOnlyTrennzeichen = True Me.txtEmail._Prozent = False Me.txtEmail._ShortDateNew = False Me.txtEmail._ShortDateOnly = False Me.txtEmail._TimeOnly = False + Me.txtEmail._TimeOnly_Seconds = False Me.txtEmail._value = Nothing Me.txtEmail._Waehrung = False Me.txtEmail._WaehrungZeichen = True @@ -150,10 +152,12 @@ Partial Class usrcntlGestellungsgarantie Me.txtFax._DateTimeOnly = False Me.txtFax._numbersOnly = False Me.txtFax._numbersOnlyKommastellen = "" + Me.txtFax._numbersOnlyTrennzeichen = True Me.txtFax._Prozent = False Me.txtFax._ShortDateNew = False Me.txtFax._ShortDateOnly = False Me.txtFax._TimeOnly = False + Me.txtFax._TimeOnly_Seconds = False Me.txtFax._value = Nothing Me.txtFax._Waehrung = False Me.txtFax._WaehrungZeichen = True @@ -171,10 +175,12 @@ Partial Class usrcntlGestellungsgarantie Me.txtTel._DateTimeOnly = False Me.txtTel._numbersOnly = False Me.txtTel._numbersOnlyKommastellen = "" + Me.txtTel._numbersOnlyTrennzeichen = True Me.txtTel._Prozent = False Me.txtTel._ShortDateNew = False Me.txtTel._ShortDateOnly = False Me.txtTel._TimeOnly = False + Me.txtTel._TimeOnly_Seconds = False Me.txtTel._value = Nothing Me.txtTel._Waehrung = False Me.txtTel._WaehrungZeichen = True @@ -192,10 +198,12 @@ Partial Class usrcntlGestellungsgarantie Me.txtAnsprechpartner._DateTimeOnly = False Me.txtAnsprechpartner._numbersOnly = False Me.txtAnsprechpartner._numbersOnlyKommastellen = "" + Me.txtAnsprechpartner._numbersOnlyTrennzeichen = True Me.txtAnsprechpartner._Prozent = False Me.txtAnsprechpartner._ShortDateNew = False Me.txtAnsprechpartner._ShortDateOnly = False Me.txtAnsprechpartner._TimeOnly = False + Me.txtAnsprechpartner._TimeOnly_Seconds = False Me.txtAnsprechpartner._value = Nothing Me.txtAnsprechpartner._Waehrung = False Me.txtAnsprechpartner._WaehrungZeichen = True @@ -213,10 +221,12 @@ Partial Class usrcntlGestellungsgarantie Me.txtAdresse2._DateTimeOnly = False Me.txtAdresse2._numbersOnly = False Me.txtAdresse2._numbersOnlyKommastellen = "" + Me.txtAdresse2._numbersOnlyTrennzeichen = True Me.txtAdresse2._Prozent = False Me.txtAdresse2._ShortDateNew = False Me.txtAdresse2._ShortDateOnly = False Me.txtAdresse2._TimeOnly = False + Me.txtAdresse2._TimeOnly_Seconds = False Me.txtAdresse2._value = Nothing Me.txtAdresse2._Waehrung = False Me.txtAdresse2._WaehrungZeichen = True @@ -234,10 +244,12 @@ Partial Class usrcntlGestellungsgarantie Me.txtAdresse1._DateTimeOnly = False Me.txtAdresse1._numbersOnly = False Me.txtAdresse1._numbersOnlyKommastellen = "" + Me.txtAdresse1._numbersOnlyTrennzeichen = True Me.txtAdresse1._Prozent = False Me.txtAdresse1._ShortDateNew = False Me.txtAdresse1._ShortDateOnly = False Me.txtAdresse1._TimeOnly = False + Me.txtAdresse1._TimeOnly_Seconds = False Me.txtAdresse1._value = Nothing Me.txtAdresse1._Waehrung = False Me.txtAdresse1._WaehrungZeichen = True @@ -255,10 +267,12 @@ Partial Class usrcntlGestellungsgarantie Me.txtFirma._DateTimeOnly = False Me.txtFirma._numbersOnly = False Me.txtFirma._numbersOnlyKommastellen = "" + Me.txtFirma._numbersOnlyTrennzeichen = True Me.txtFirma._Prozent = False Me.txtFirma._ShortDateNew = False Me.txtFirma._ShortDateOnly = False Me.txtFirma._TimeOnly = False + Me.txtFirma._TimeOnly_Seconds = False Me.txtFirma._value = Nothing Me.txtFirma._Waehrung = False Me.txtFirma._WaehrungZeichen = True @@ -353,10 +367,12 @@ Partial Class usrcntlGestellungsgarantie Me.txtBestimmungszollamt._DateTimeOnly = False Me.txtBestimmungszollamt._numbersOnly = False Me.txtBestimmungszollamt._numbersOnlyKommastellen = "" + Me.txtBestimmungszollamt._numbersOnlyTrennzeichen = True Me.txtBestimmungszollamt._Prozent = False Me.txtBestimmungszollamt._ShortDateNew = False Me.txtBestimmungszollamt._ShortDateOnly = False Me.txtBestimmungszollamt._TimeOnly = False + Me.txtBestimmungszollamt._TimeOnly_Seconds = False Me.txtBestimmungszollamt._value = Nothing Me.txtBestimmungszollamt._Waehrung = False Me.txtBestimmungszollamt._WaehrungZeichen = True @@ -384,10 +400,12 @@ Partial Class usrcntlGestellungsgarantie Me.txtEORI._DateTimeOnly = False Me.txtEORI._numbersOnly = False Me.txtEORI._numbersOnlyKommastellen = "" + Me.txtEORI._numbersOnlyTrennzeichen = True Me.txtEORI._Prozent = False Me.txtEORI._ShortDateNew = False Me.txtEORI._ShortDateOnly = False Me.txtEORI._TimeOnly = False + Me.txtEORI._TimeOnly_Seconds = False Me.txtEORI._value = Nothing Me.txtEORI._Waehrung = False Me.txtEORI._WaehrungZeichen = True @@ -414,10 +432,12 @@ Partial Class usrcntlGestellungsgarantie Me.txtZulassungsnummer1._DateTimeOnly = False Me.txtZulassungsnummer1._numbersOnly = False Me.txtZulassungsnummer1._numbersOnlyKommastellen = "" + Me.txtZulassungsnummer1._numbersOnlyTrennzeichen = True Me.txtZulassungsnummer1._Prozent = False Me.txtZulassungsnummer1._ShortDateNew = False Me.txtZulassungsnummer1._ShortDateOnly = False Me.txtZulassungsnummer1._TimeOnly = False + Me.txtZulassungsnummer1._TimeOnly_Seconds = False Me.txtZulassungsnummer1._value = Nothing Me.txtZulassungsnummer1._Waehrung = False Me.txtZulassungsnummer1._WaehrungZeichen = True @@ -465,10 +485,12 @@ Partial Class usrcntlGestellungsgarantie Me.txtZulassungsnummer2._DateTimeOnly = False Me.txtZulassungsnummer2._numbersOnly = False Me.txtZulassungsnummer2._numbersOnlyKommastellen = "" + Me.txtZulassungsnummer2._numbersOnlyTrennzeichen = True Me.txtZulassungsnummer2._Prozent = False Me.txtZulassungsnummer2._ShortDateNew = False Me.txtZulassungsnummer2._ShortDateOnly = False Me.txtZulassungsnummer2._TimeOnly = False + Me.txtZulassungsnummer2._TimeOnly_Seconds = False Me.txtZulassungsnummer2._value = Nothing Me.txtZulassungsnummer2._Waehrung = False Me.txtZulassungsnummer2._WaehrungZeichen = True @@ -496,10 +518,12 @@ Partial Class usrcntlGestellungsgarantie Me.txtAnmerkung1._DateTimeOnly = False Me.txtAnmerkung1._numbersOnly = False Me.txtAnmerkung1._numbersOnlyKommastellen = "" + Me.txtAnmerkung1._numbersOnlyTrennzeichen = True Me.txtAnmerkung1._Prozent = False Me.txtAnmerkung1._ShortDateNew = False Me.txtAnmerkung1._ShortDateOnly = False Me.txtAnmerkung1._TimeOnly = False + Me.txtAnmerkung1._TimeOnly_Seconds = False Me.txtAnmerkung1._value = Nothing Me.txtAnmerkung1._Waehrung = False Me.txtAnmerkung1._WaehrungZeichen = True @@ -517,10 +541,12 @@ Partial Class usrcntlGestellungsgarantie Me.txtAnmerkung2._DateTimeOnly = False Me.txtAnmerkung2._numbersOnly = False Me.txtAnmerkung2._numbersOnlyKommastellen = "" + Me.txtAnmerkung2._numbersOnlyTrennzeichen = True Me.txtAnmerkung2._Prozent = False Me.txtAnmerkung2._ShortDateNew = False Me.txtAnmerkung2._ShortDateOnly = False Me.txtAnmerkung2._TimeOnly = False + Me.txtAnmerkung2._TimeOnly_Seconds = False Me.txtAnmerkung2._value = Nothing Me.txtAnmerkung2._Waehrung = False Me.txtAnmerkung2._WaehrungZeichen = True @@ -538,10 +564,12 @@ Partial Class usrcntlGestellungsgarantie Me.txtAnmerkung3._DateTimeOnly = False Me.txtAnmerkung3._numbersOnly = False Me.txtAnmerkung3._numbersOnlyKommastellen = "" + Me.txtAnmerkung3._numbersOnlyTrennzeichen = True Me.txtAnmerkung3._Prozent = False Me.txtAnmerkung3._ShortDateNew = False Me.txtAnmerkung3._ShortDateOnly = False Me.txtAnmerkung3._TimeOnly = False + Me.txtAnmerkung3._TimeOnly_Seconds = False Me.txtAnmerkung3._value = Nothing Me.txtAnmerkung3._Waehrung = False Me.txtAnmerkung3._WaehrungZeichen = True @@ -602,10 +630,7 @@ Partial Class usrcntlGestellungsgarantie End Sub Friend WithEvents lbl As System.Windows.Forms.Label - Friend WithEvents txtFirma As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents txtAdresse1 As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label1 As System.Windows.Forms.Label - Friend WithEvents txtAdresse2 As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents txtAnsprechpartner As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label2 As System.Windows.Forms.Label Friend WithEvents txtFax As VERAG_PROG_ALLGEMEIN.MyTextBox @@ -621,10 +646,7 @@ Partial Class usrcntlGestellungsgarantie Friend WithEvents btnUp As System.Windows.Forms.Button Friend WithEvents btnDel As System.Windows.Forms.Button Friend WithEvents Label12 As System.Windows.Forms.Label - Friend WithEvents cboSprache As VERAG_PROG_ALLGEMEIN.MyComboBox - Friend WithEvents txtBestimmungszollamt As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label3 As System.Windows.Forms.Label - Friend WithEvents txtEORI As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label7 As System.Windows.Forms.Label Friend WithEvents txtZulassungsnummer1 As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label8 As System.Windows.Forms.Label @@ -635,4 +657,10 @@ Partial Class usrcntlGestellungsgarantie Friend WithEvents txtAnmerkung1 As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents txtAnmerkung2 As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents txtAnmerkung3 As VERAG_PROG_ALLGEMEIN.MyTextBox + Public WithEvents txtFirma As VERAG_PROG_ALLGEMEIN.MyTextBox + Public WithEvents txtAdresse1 As VERAG_PROG_ALLGEMEIN.MyTextBox + Public WithEvents txtAdresse2 As VERAG_PROG_ALLGEMEIN.MyTextBox + Public WithEvents cboSprache As VERAG_PROG_ALLGEMEIN.MyComboBox + Public WithEvents txtBestimmungszollamt As VERAG_PROG_ALLGEMEIN.MyTextBox + Public WithEvents txtEORI As VERAG_PROG_ALLGEMEIN.MyTextBox End Class diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlGestellungsgarantie.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlGestellungsgarantie.vb index 5b9e4350..c32fcbfe 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlGestellungsgarantie.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlGestellungsgarantie.vb @@ -12,6 +12,7 @@ initKdNR(kdnr) End Sub + Sub initControlsHandler() For Each c In Me.Controls Select Case c.GetType.ToString From a83a8b02c942a323b2d4c414c43247fce98b35ae Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Thu, 24 Nov 2022 23:22:10 +0100 Subject: [PATCH 2/2] RKSV DE --- SDL/Classes/cRKSV.vb | 59 ++++++++++++++++++++++------------- SDL/cProgramFunctions.vb | 5 ++- SDL/kassenbuch/frmBelegNeu.vb | 3 +- 3 files changed, 41 insertions(+), 26 deletions(-) diff --git a/SDL/Classes/cRKSV.vb b/SDL/Classes/cRKSV.vb index 076bb88f..ca694860 100644 --- a/SDL/Classes/cRKSV.vb +++ b/SDL/Classes/cRKSV.vb @@ -2427,7 +2427,7 @@ Public Class cRKSV_DE ' Dim [error] = "" 'm_com.InitializeLibrary(tbLicense.Text, "D:\Database\DSFinVK\dsfinvkdb.db3", "Administrator", "test", cashbox) m_com.InitializeLibrary("SQLGUIDE01.verag.ost.dmn", "itg_RKSV_DE", "dsfinvk", "dsfinvk#1337", cashbox, [error], InitializeLibraryResultSpecified) - ' MsgBox("1: " & [error]) + ' MsgBox("1: " & [error]) If [error] <> VERAG_PROG_ALLGEMEIN.DSFinVKService.ErrorCode.OK Then If [error].ToString() <> "CASHBOX_ALREADY_MANAGED" Then '--> CASHBOX_ALREADY_MANAGED --> der Fehler darf auftreten, die Cashbox wird Serverseitig initialisert, hier nur der Versuch, falls das nciht geschehen ist... lt. Jan Mika / AITG @@ -2437,17 +2437,28 @@ Public Class cRKSV_DE End If ' MsgBox("2") - Dim BON_ID As Integer = 0 - Dim BON_IDSpecified = False - Dim GetNextBON_IDResultSpecified = False - m_com.GetNextBON_ID(cashbox, BON_ID, BON_IDSpecified, [error], GetNextBON_IDResultSpecified) - 'MsgBox("3: " & [error]) - If [error] <> VERAG_PROG_ALLGEMEIN.DSFinVKService.ErrorCode.OK Then - MessageBox.Show([error].ToString(), "Error2", MessageBoxButtons.OK, MessageBoxIcon.[Error]) - Return False + + + 'BelegNr wird von RKSV übernommen + Dim BON_ID As Integer = 0 + If False Then + + Dim BON_IDSpecified = False + Dim GetNextBON_IDResultSpecified = False + m_com.GetNextBON_ID(cashbox, BON_ID, BON_IDSpecified, [error], GetNextBON_IDResultSpecified) + ' MsgBox("3: " & [error]) + + If [error] <> VERAG_PROG_ALLGEMEIN.DSFinVKService.ErrorCode.OK Then + MessageBox.Show([error].ToString(), "Error2", MessageBoxButtons.OK, MessageBoxIcon.[Error]) + Return False + End If + Else + ' MsgBox(RKSV_Beleg_Id) + BON_ID = RKSV_Beleg_Id End If + 'Dim BON_NR As Integer = 0 '[error] = m_com.GetNextBON_NR(cashbox, BON_NR) @@ -2455,11 +2466,12 @@ Public Class cRKSV_DE ' MessageBox.Show([error].ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) ' Return False 'End If - - ' MsgBox("4") - 'Rechnung beginnen + + '------------------------------------------------------------------------------------- + '--------------------------------- Rechnung beginnen --------------------------------- + '------------------------------------------------------------------------------------- Dim bonkopfBegin As VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.BonKopfBegin = New VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.BonKopfBegin() @@ -2475,7 +2487,7 @@ Public Class cRKSV_DE bonkopfBegin.BON_NOTIZ = "" 'tbBON_NOTIZ.Text - bonkopfBegin.BON_NR = BON_ID + bonkopfBegin.BON_NR = bonkopfBegin.BON_ID bonkopfBegin.BON_STORNO = storno 'If(cbBON_STORNO.Checked, "1", "0") @@ -2575,12 +2587,11 @@ Public Class cRKSV_DE ' MsgBox(POS.Betrag) position_vat.UST_SCHLUESSEL = steuersatzID 'm_com.GetTaxIds(cashbox,) 'Convert.ToInt32(dgvBonPos.Rows[m_dgvCurrentRow].Cells["UST_SCHLUESSEL"].Value) - Dim steuerBetrag = POS.Betrag * position_vat.UST_SCHLUESSEL - position_vat.POS_BRUTTO = POS.Betrag + steuerBetrag 'Convert.ToDecimal(dgvBonPos.Rows[m_dgvCurrentRow].Cells["POS_BRUTTO"].Value) + Dim steuerBetrag As Double = POS.Betrag * steuersatz + position_vat.POS_BRUTTO = Convert.ToDecimal(POS.Betrag + steuerBetrag) 'Convert.ToDecimal(dgvBonPos.Rows[m_dgvCurrentRow].Cells["POS_BRUTTO"].Value) + position_vat.POS_NETTO = Convert.ToDecimal(POS.Betrag) 'Convert.ToDecimal(dgvBonPos.Rows[m_dgvCurrentRow].Cells["POS_NETTO"].Value) - position_vat.POS_NETTO = POS.Betrag 'Convert.ToDecimal(dgvBonPos.Rows[m_dgvCurrentRow].Cells["POS_NETTO"].Value) - - position_vat.POS_UST = steuerBetrag 'Convert.ToDecimal(dgvBonPos.Rows[m_dgvCurrentRow].Cells["POS_UST"].Value) + position_vat.POS_UST = Convert.ToDecimal(steuerBetrag) 'Convert.ToDecimal(dgvBonPos.Rows[m_dgvCurrentRow].Cells["POS_UST"].Value) Dim AddPositionToReceiptResultSpecified As Boolean m_com.AddPositionToReceipt(cashbox, position, position_vat, transactionNumber, transactionNumberSpecified, [error], AddPositionToReceiptResultSpecified) @@ -2603,11 +2614,15 @@ Public Class cRKSV_DE bonkopfFinish.BON_ID = BON_ID - - - If Not Decimal.TryParse(GES_BRUTTO, bonkopfFinish.UMS_BRUTTO) Then + Try + bonkopfFinish.UMS_BRUTTO = Convert.ToDecimal(GES_BRUTTO) + Catch ex As Exception bonkopfFinish.UMS_BRUTTO = 0.00 - End If + End Try + + 'If Not Decimal.TryParse(GES_BRUTTO, bonkopfFinish.UMS_BRUTTO) Then + ' bonkopfFinish.UMS_BRUTTO = 0.00 + 'End If bonkopfFinish.PROCESS_TYPE = "Kassenbeleg-V1" diff --git a/SDL/cProgramFunctions.vb b/SDL/cProgramFunctions.vb index 593def0f..66b934af 100644 --- a/SDL/cProgramFunctions.vb +++ b/SDL/cProgramFunctions.vb @@ -475,12 +475,11 @@ Public Class cProgramFunctions - Public Shared Sub initDrucker(cboPrinter As ComboBox, Optional srch As String = "") + Public Shared Sub initDrucker(cboPrinter As ComboBox, Optional srch As String = "", Optional usePRINTER_LIST As Boolean = True) ' alle installierten Drucker ermitteln und ' in in ein ArrayList-Objekt speichern Dim sPrinters As ArrayList - - If VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_LIST IsNot Nothing Then + If usePRINTER_LIST AndAlso VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_LIST IsNot Nothing Then sPrinters = VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_LIST Else sPrinters = New ArrayList diff --git a/SDL/kassenbuch/frmBelegNeu.vb b/SDL/kassenbuch/frmBelegNeu.vb index d55ca55e..ab3aafe3 100644 --- a/SDL/kassenbuch/frmBelegNeu.vb +++ b/SDL/kassenbuch/frmBelegNeu.vb @@ -820,6 +820,7 @@ Public Class frmBelegNeu ' Dim TEST_KASSE = (BELEG.Niederlassung = "WAI") If KASSE.rksvDE_aktiv Then ' WENN für die Kasse die RKSV DEUTSCHLAND gilt Dim answer = "" + If Not cRKSV_DE.insertRKSV_DE(PERSONAL, BELEG, KASSE, RKSV_Beleg_Id, If(EA = "E", summeBRUTTO, summeBRUTTO * -1), QR_CodeString, LastJWS, TESTBUCHUNG, answer) Then 'Digitale Signierung und Erfassung in die RKSV-Datenbank mittels ITG-Service If Not TESTBUCHUNG Then KASSE.DECREASE_BELEG_UMSATZ(oldBelegZaehler, If(EA = "E", summeBRUTTO * -1, summeBRUTTO)) @@ -831,7 +832,7 @@ Public Class frmBelegNeu KASSE.SET_LAST_QR_JWS(LastJWS, QR_CodeString) 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - If KASSE.rksv_KassaGuid = "KASSE_01" Then + If KASSE.rksv_KassaGuid = "KASSE_01" Then 'Testkasse BELEG.rksv_jws = Nothing BELEG.rksv_qr = Nothing End If