From 8e01eadc1f0a2b417b2382dacbd7afecc8c102ac Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Fri, 10 Mar 2023 08:22:03 +0100 Subject: [PATCH] Celeg Korr --- SDL/Checkliste/frmCheckliste.Designer.vb | 26 ++++++++-------- .../FormulareBaukasten/usrcntlVorauskasse.vb | 4 ++- SDL/kassenbuch/frmBelegNeu.vb | 8 ++--- SDL/kunden/usrCntlKundenuebersicht.vb | 8 ++--- VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb | 30 +++++++++++++++++++ VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb | 5 ++++ 6 files changed, 59 insertions(+), 22 deletions(-) diff --git a/SDL/Checkliste/frmCheckliste.Designer.vb b/SDL/Checkliste/frmCheckliste.Designer.vb index 4f4c2b05..3835d148 100644 --- a/SDL/Checkliste/frmCheckliste.Designer.vb +++ b/SDL/Checkliste/frmCheckliste.Designer.vb @@ -75,8 +75,8 @@ Partial Class frmCheckliste Me.btnInfo = New System.Windows.Forms.Button() Me.Label1 = New System.Windows.Forms.Label() Me.cboPrinter = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.Button1 = New System.Windows.Forms.Button() Me.lkl = New System.Windows.Forms.LinkLabel() + Me.Button1 = New System.Windows.Forms.Button() Me.GroupBox1.SuspendLayout() Me.GroupBox2.SuspendLayout() Me.GroupBox3.SuspendLayout() @@ -468,7 +468,7 @@ Partial Class frmCheckliste 'btnPrint ' Me.btnPrint.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnPrint.Image = Global.SDL.My.Resources.printer2 + Me.btnPrint.Image = Global.SDL.My.Resources.Resources.printer2 Me.btnPrint.ImageAlign = System.Drawing.ContentAlignment.TopCenter Me.btnPrint.Location = New System.Drawing.Point(426, 707) Me.btnPrint.Name = "btnPrint" @@ -635,16 +635,6 @@ Partial Class frmCheckliste Me.cboPrinter.Size = New System.Drawing.Size(176, 21) Me.cboPrinter.TabIndex = 39 ' - 'Button1 - ' - Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button1.Location = New System.Drawing.Point(352, 29) - Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(75, 23) - Me.Button1.TabIndex = 40 - Me.Button1.Text = "prüfen DE" - Me.Button1.UseVisualStyleBackColor = True - ' 'lkl ' Me.lkl.AutoSize = True @@ -655,6 +645,16 @@ Partial Class frmCheckliste Me.lkl.TabStop = True Me.lkl.Text = "Link" ' + 'Button1 + ' + Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button1.Location = New System.Drawing.Point(352, 29) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(75, 23) + Me.Button1.TabIndex = 40 + Me.Button1.Text = "prüfen DE" + Me.Button1.UseVisualStyleBackColor = True + ' 'frmCheckliste ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -771,6 +771,6 @@ Partial Class frmCheckliste Friend WithEvents cboPrinter As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents dgvVollmachten As DataGridView Friend WithEvents lblVMErr As Label - Friend WithEvents Button1 As Button Friend WithEvents lkl As LinkLabel + Friend WithEvents Button1 As Button End Class diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb index 57c53430..abe8f6ec 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVorauskasse.vb @@ -215,6 +215,7 @@ txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("0%", "0")) txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("7%", "0,07")) + txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("10%", "0,10")) txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("19%", "0,19")) txtEustProzent.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("20%", "0,20")) txtEustProzent.changeItem("0,19") @@ -708,7 +709,8 @@ Case "AMBAR" txtVerzollungskosten._value = 93 txtATLAS._value = 8 - txtClearing._value = 40 + ' txtClearing._value = 40 + txtClearing._value = 0 txtAviso._value = 20 txtSonstigeKosten._value = 40 txtSonstigeKostenText.Text = "Sonstige Kosten" diff --git a/SDL/kassenbuch/frmBelegNeu.vb b/SDL/kassenbuch/frmBelegNeu.vb index c7301c49..eddbc7ea 100644 --- a/SDL/kassenbuch/frmBelegNeu.vb +++ b/SDL/kassenbuch/frmBelegNeu.vb @@ -34,7 +34,7 @@ Public Class frmBelegNeu Private EasyZVT_Worker As System.ComponentModel.BackgroundWorker = New System.ComponentModel.BackgroundWorker() Private Funktion As Integer - Private Betrag As Integer = 0 + Private Betrag As Double = 0 Private posTerminal As cRKSV_POS Private dt As DataTable Private setBreak As Boolean = True @@ -1131,10 +1131,10 @@ Public Class frmBelegNeu End If ' If EA = "E" Then - lblBetrag_Netto.Text = sum.ToString("C") - lblBetrag_Steuern.Text = (sum * txtSteuersatz._value).ToString("C") + lblBetrag_Netto.Text = sum.ToString("C2") + lblBetrag_Steuern.Text = (sum * txtSteuersatz._value).ToString("C2") Betrag = (sum + sum * txtSteuersatz._value) - lblBetrag_Brutto.Text = (Betrag).ToString("C") + lblBetrag_Brutto.Text = (Betrag).ToString("C2") ' Else ' lblBetrag_Netto.Text = (-1 * sum).ToString("C") ' lblBetrag_Steuern.Text = (-1 * (sum * txtSteuersatz._value)).ToString("C") diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index 21b6b01f..b034636a 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -1886,11 +1886,11 @@ Public Class usrCntlKundenuebersicht Dim sGetValue As EORI.eoriValidationResult = CallWebService.validateEORI(arrEori) Dim f As EORI.eoriResponse - MsgBox(sGetValue.requestDate) - MsgBox(sGetValue.errorDescription.ToString) + 'MsgBox(sGetValue.requestDate) + 'MsgBox(sGetValue.errorDescription.ToString) - MsgBox("OK") - MsgBox(sGetValue.result) + 'MsgBox("OK") + 'MsgBox(sGetValue.result) If f.status = 100 Then diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb b/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb index 420f3488..448aa28c 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb @@ -115,6 +115,36 @@ Public Class cUIDPruefung Return Nothing End Function + Public Shared Function LOADByKdNrNewestDate(uid_KundenNr As Integer) As cUIDPruefung + Try + Dim UID As New cUIDPruefung + Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() + Using cmd As New SqlCommand("SELECT Top 1 * FROM tblUIDPruefung WHERE [uid_KundenNr]=@uid_KundenNr AND [uid_valid]=1 ORDER BY [uid_Datum] DESC", conn) + cmd.Parameters.AddWithValue("@uid_KundenNr", uid_KundenNr) + Dim dr = cmd.ExecuteReader() + If dr.Read Then + For Each li In UID.getParameterList() + Dim propInfo As PropertyInfo = UID.GetType.GetProperty(li.Scalarvariable) + + If dr.Item(li.Text) Is DBNull.Value Then + propInfo.SetValue(UID, Nothing) + Else + propInfo.SetValue(UID, dr.Item(li.Text)) + End If + + Next + dr.Close() + Return UID + End If + dr.Close() + End Using + End Using + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + Return Nothing + End Function + Public Shared Function doUIDPruefungALL(Optional datum As Object = Nothing, Optional SaveErgInAdressen As Boolean = True, Optional Sciherheitsabfrage As Boolean = True, Optional MaxEintraege As Integer = -1, Optional showErr As Boolean = True) As DataTable Dim dt As DataTable = Nothing diff --git a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb index 9f530f48..b690a288 100644 --- a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb +++ b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb @@ -298,6 +298,11 @@ Public Class cProgramFunctions ' mySmtpsvr.EnableSsl = True ' eMailfrom = "import@ambarlog.com" End Select + Case "UNISPED" + myCredentials.UserName = "no-reply@unisped.at" + myCredentials.Password = "GL5unisped!KNL3" + mySmtpsvr.Host = "owa.verag.ag" + mySmtpsvr.Port = 587 '25 '587 '25 Case Else myCredentials.UserName = "support@verag.ag" myCredentials.Password = "$up0Rt2809!"