Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024

This commit is contained in:
2025-12-03 16:53:00 +01:00
20 changed files with 283 additions and 127 deletions

View File

@@ -1104,8 +1104,6 @@ Public Class frmFaktEmail
If MergePDF And ATTACHMENTS.Count > 1 Then
Dim extension = ".pdf"
Dim Belegsbezeichnung As String = "Beleg"

View File

@@ -435,6 +435,7 @@
'dgvZusatzleistung.Rows.Add("", "", "CMR dispatch note", CDbl(25).ToString("C2"))
dgvZusatzleistung.Rows.Add("", "", "Transit T1", CDbl(15).ToString("C2"))
dgvZusatzleistung.Rows.Add("", "", "Neutralization", CDbl(15).ToString("C2"))
dgvZusatzleistung.Rows.Add("", "", "Customs inspection costs per 30 min.", CDbl(40).ToString("C2"))
dgvZusatzleistung.Rows.Add("", "", "VERAG goods location", CDbl(60).ToString("C2"))
dgvZusatzleistung.Rows.Add("", "", "Additional costs for vegetables, pharmaceuticals, food", "on request")
dgvZusatzleistung.Rows.Add("", "", "Cancellation costs", "50%")
@@ -900,6 +901,7 @@
dgvZusatzleistung.Rows.Add("", "380", "Übersetzung Rechnung", CDbl(1.5).ToString("C2") & "/min")
' dgvZusatzleistung.Rows.Add("", "", "CMR-Versendungsbeleg", CDbl(25).ToString("C2"))
dgvZusatzleistung.Rows.Add("", "", "Ü-T1", CDbl(15).ToString("C2"))
dgvZusatzleistung.Rows.Add("", "", "Zollbeschaukosten je 30 min.", CDbl(40).ToString("C2"))
dgvZusatzleistung.Rows.Add("", "", "Neutralisierung", CDbl(15).ToString("C2"))
dgvZusatzleistung.Rows.Add("", "", "VERAG Warenort", CDbl(60).ToString("C2"))
dgvZusatzleistung.Rows.Add("", "", "Zusatzkosten Gemüse,Arznei,Lebensmittel", "nach Anfrage")

View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.4.9.8")>
<Assembly: AssemblyFileVersion("1.4.9.8")>
<Assembly: AssemblyVersion("1.5.0.0")>
<Assembly: AssemblyFileVersion("1.5.0.0")>

View File

@@ -1,4 +1,5 @@
Imports System.Globalization
Imports com.sun.source.tree
Imports Microsoft.Office.Interop
Imports VERAG_PROG_ALLGEMEIN
@@ -410,17 +411,17 @@ Public Class frmBU_Mahnlauf
Select Case Sprache
Case "EN"
rpt.lblSummeUeberschrift.Text = "Total:"
rpt.lblSteuersatz.Text = "Interest for late payment 9.5% "
rpt.lblSteuersatz.Text = "Interest for late payment 9,5 %"
rpt.lblZwText.Text = "Reminder Fee"
rpt.lblZwischensumme.Text = "Subtotal"
Case "RO"
rpt.lblSummeUeberschrift.Text = "Total:"
rpt.lblSteuersatz.Text = "Penalitati întârziere la plată 9,5 % "
rpt.lblSteuersatz.Text = "Penalitati întârziere la plată 9,5 %"
rpt.lblZwText.Text = "Taxa somatie"
rpt.lblZwischensumme.Text = "Subtotal"
Case "TR"
rpt.lblSummeUeberschrift.Text = "Toplam:"
rpt.lblSteuersatz.Text = "Gecikme faizi %9,5 "
rpt.lblSteuersatz.Text = "Gecikme faizi 9,5 %"
rpt.lblZwText.Text = "Hhatırlatma ücreti"
rpt.lblZwischensumme.Text = "Ara toplam"
End Select
@@ -528,6 +529,13 @@ Public Class frmBU_Mahnlauf
Else
'ZinssatzVerzugszinsen pro Kunde und wenn nichts hingerlegt, dann defaultwert!
If Not IsDBNull(KD_ERW.kde_zinssatz) AndAlso IsNumeric(KD_ERW.kde_zinssatz) Then
ZinssatzVerzugszinsen = CDbl(KD_ERW.kde_zinssatz) / 100
rpt.lblSteuersatz.Text = rpt.lblSteuersatz.Text.ToString.Replace("9,5", KD_ERW.kde_zinssatz)
End If
Select Case MAHNSTUFE
Case -2 : Mahngeb = 0 : rpt.Label24.Visible = False : rpt.lblSteuersatz.Visible = False : rpt.Label23.Visible = False : rpt.lblZwText.Visible = False
Case -1 : Mahngeb = 0
@@ -585,13 +593,13 @@ Public Class frmBU_Mahnlauf
' End If
'Else
rpt.Label16.Text = cFakturierung.checkNull(rpt.Fields.Item("Faelligkeit").Value)
If (CDate(rpt.Fields.Item("Faelligkeit").Value) > CDate(Now.ToShortDateString) And cFakturierung.checkNull(rpt.Fields.Item("Ausstand").Value, 0) > 0) Or cFakturierung.checkNull(rpt.Fields.Item("Ausstand").Value, 0) <= 0 Then
rpt.Label15.ForeColor = Color.Black
rpt.Label16.ForeColor = Color.Black
Else
rpt.Label15.ForeColor = Color.DarkRed
rpt.Label16.ForeColor = Color.DarkRed
End If
If (CDate(rpt.Fields.Item("Faelligkeit").Value) > CDate(Now.ToShortDateString) And cFakturierung.checkNull(rpt.Fields.Item("Ausstand").Value, 0) > 0) Or cFakturierung.checkNull(rpt.Fields.Item("Ausstand").Value, 0) <= 0 Then
rpt.Label15.ForeColor = Color.Black
rpt.Label16.ForeColor = Color.Black
Else
rpt.Label15.ForeColor = Color.DarkRed
rpt.Label16.ForeColor = Color.DarkRed
End If
'End If
@@ -807,16 +815,24 @@ Public Class frmBU_Mahnlauf
If Firma_ID = 19 Then
Select Case AD.LandKz
Case "RO" : Mail_BCC &= "alex@verag.ag;maut.ro@verag.ag;ma@verag.ag;" 'später mal über eigene Logik!!
Case "AT", "BA", "BG", "CZ", "DE", "HU", "LU", "SRB", "BIH", "HR", "ME", "MKD", "SK", "SI", "RS" : Mail_BCC &= "z.batinic@verag.ag;n.ljubas@verag.ag;s.vidovic@verag.ag;"
Case "RO" : Mail_BCC &= "alex@verag.ag;maut.ro@verag.ag;ma@verag.ag;" 'immer an alle bei RO!
Case "AT", "BA", "BG", "CZ", "DE", "HU", "LU", "SRB", "BIH", "HR", "ME", "MKD", "SK", "SI", "RS"
If KD_ERW IsNot Nothing AndAlso Not IsDBNull(KD_ERW.kde_betreuer) Then
Select Case KD_ERW.kde_betreuer
Case "Ljubas" : Mail_BCC &= "n.ljubas@verag.ag;"
Case "Batinic" : Mail_BCC &= "z.batinic@verag.ag;"
Case "Vidovic" : Mail_BCC &= "s.vidovic@verag.ag;"
Case Else
Mail_BCC &= "z.batinic@verag.ag;n.ljubas@verag.ag;s.vidovic@verag.ag;"
End Select
Else
Mail_BCC &= "z.batinic@verag.ag;n.ljubas@verag.ag;s.vidovic@verag.ag;"
End If
End Select
End If
' isnull(( SELECT TOP 1 [kkd_Email] FROM [FMZOLL\SQLFMZOLL].[VERAG].[dbo].[tblKundenKontakt] where kkd_kkaId=10 and kkd_KundenNr=i_personenkonto ) ,'') Email,
'isnull(( SELECT TOP 1 [kkd_Email] FROM [FMZOLL\SQLFMZOLL].[VERAG].[dbo].[tblKundenKontakt] where kkd_kkaId=10 and kkd_KundenNr=i_personenkonto ) ,'') Email,
If Mail_To = "" Then Mahndruckart = 2 ' Wenn keine Mahn-Mail hinterlegt, sollte die Mail geöffenet werden
Dim pdfBezeichnung As String = ""

View File

@@ -1245,8 +1245,8 @@ Public Class usrCntlBH
End If
Dim LimitBEtrag As Integer = -1
If txtAbBetragAbrechnen._value <> "" AndAlso IsNumeric(txtAbBetragAbrechnen._value) Then
LimitBEtrag = CInt(txtAbBetragAbrechnen._value)
If txtAbBetragAbrechnen.Text <> "" AndAlso IsNumeric(txtAbBetragAbrechnen.Text) Then
LimitBEtrag = CInt(txtAbBetragAbrechnen.Text)
End If
Dim dt_Main As DataTable = SQL.loadDgvBySql_Param("Select [kundenNr],SUM([zinsbetrag]) as Zinsbetrag, zahlungsperiode_start,zahlungsperiode_ende FROM [VERAG].[dbo].[tblMDM_Zinsberechnung] where [verrechnet] Is null group by [kundenNr], zahlungsperiode_start, zahlungsperiode_ende" & IIf(LimitBEtrag > 0, " having SUM([zinsbetrag]) >= " & LimitBEtrag, ""), "FMZOLL")

View File

@@ -1,5 +1,6 @@
Imports System.Drawing.Printing
Imports System.Globalization
Imports com.sun.org.apache.xalan.internal.xsltc.compiler.util
Imports Microsoft.Win32
Imports SDL.RKSVServer
@@ -1531,7 +1532,7 @@ Public Class frmBelegNeu
TESTBUCHUNG = False
' VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM()
If cRKSV.isforbiddenDate Then
MsgBox("Die Kasse wir am Monatsende abgeschlossen. Es dürfen keine weiteren Belege erstellt werden. Bitte veruchen Sie den Vorgang nach Mitternacht erneut.")
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Die Kasse wir am Monatsende abgeschlossen. Es dürfen keine weiteren Belege erstellt werden. Bitte veruchen Sie den Vorgang nach Mitternacht erneut.", "", System.Reflection.MethodInfo.GetCurrentMethod.Name)
Return False
End If
@@ -1542,6 +1543,7 @@ Public Class frmBelegNeu
Else
KASSE.LOAD(cboKassen._value) 'Laden der Kasse anhand der Auswahlbox
End If
BELEG.rksv_id = KASSE.rksv_id ' bei Fehler wird sonst die ID nicht richtig übernommen
If kdkunde.Text.Trim.Length > 50 Then
@@ -1563,7 +1565,7 @@ Public Class frmBelegNeu
Me.DialogResult = Windows.Forms.DialogResult.None
Me.Cursor = Cursors.Default
printErfolgreich = False
MsgBox("Allgemeiner Programmfehler - Belegerfassung wird geschlossen!" & ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Allgemeiner Programmfehler - Belegerfassung wird geschlossen!" & ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
warnClose = False
Me.Close()
End Try
@@ -1617,7 +1619,7 @@ Public Class frmBelegNeu
If Not cRKSV.insertKB(PERSONAL, BELEG, KASSE.rksv_id, RKSV_Beleg_Id, KASSE.rksv_aktiv, JournalNr, KASSE.rksv_firma, POSFIBU, Zahlungsmittel, isLeihgeldeinzahlung) Then
KASSE.DECREASE_BELEG_UMSATZ(oldBelegZaehler, summeBRUTTO * -1)
MsgBox("Programmfehler bei Eintrag ins Kassenbuch.")
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Programmfehler bei Eintrag ins Kassenbuch.", "", System.Reflection.MethodInfo.GetCurrentMethod.Name)
Me.Cursor = Cursors.Default : warnClose = False : Me.Close() : Exit Sub
End If
@@ -1632,7 +1634,9 @@ Public Class frmBelegNeu
KASSE.DECREASE_BELEG_UMSATZ(oldBelegZaehler, If(EA = "E", summeBRUTTO * -1, summeBRUTTO))
cRKSV.DELETE(BELEG, KASSE.rksv_firma)
End If
MsgBox("Programmfehler bei der digitalen Signatur." & vbNewLine & vbNewLine & answer, MsgBoxStyle.Critical)
Dim Errmsg = "Programmfehler bei der digitalen Signatur." & vbNewLine & vbNewLine & answer
MsgBox(Errmsg, MsgBoxStyle.Critical)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(Errmsg, "", System.Reflection.MethodInfo.GetCurrentMethod.Name)
Me.Cursor = Cursors.Default : warnClose = False : Me.Close() : Exit Sub
End If
KASSE.SET_LAST_QR_JWS(LastJWS, QR_CodeString)
@@ -1661,7 +1665,10 @@ Public Class frmBelegNeu
KASSE.DECREASE_BELEG_UMSATZ(oldBelegZaehler, If(EA = "E", summeBRUTTO * -1, summeBRUTTO))
cRKSV.DELETE(BELEG, KASSE.rksv_firma)
End If
MsgBox("Programmfehler bei der digitalen Signatur." & vbNewLine & vbNewLine & answer, MsgBoxStyle.Critical)
Dim Errmsg = "Programmfehler bei der digitalen Signatur." & vbNewLine & vbNewLine & answer
MsgBox(Errmsg, MsgBoxStyle.Critical)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(Errmsg, "", System.Reflection.MethodInfo.GetCurrentMethod.Name)
Me.Cursor = Cursors.Default : warnClose = False : Me.Close() : Exit Sub
End If
KASSE.SET_LAST_QR_JWS(LastJWS, QR_CodeString)
@@ -1743,7 +1750,7 @@ Public Class frmBelegNeu
Me.DialogResult = Windows.Forms.DialogResult.None
Me.Cursor = Cursors.Default
printErfolgreich = False
MsgBox("Allgemeiner Programmfehler - Belegerfassung wird geschlossen!" & ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Allgemeiner Programmfehler - Belegerfassung wird geschlossen!" & ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
warnClose = False
Me.Close()
End Try

View File

@@ -1,7 +1,4 @@
Imports com.sun.tools.javac.util
Imports com.sun.xml.internal.ws.api.pipe
Imports GrapeCity.ActiveReports
Imports VERAG_PROG_ALLGEMEIN
Imports GrapeCity.ActiveReports
Public Class frmNacherfassungLeihgeld
Dim cOptionenDAL As New cOptionenDAL
@@ -282,7 +279,7 @@ Public Class frmNacherfassungLeihgeld
If BELEG.KundenNr > 0 AndAlso cbxOP_sofort_buchen.Checked Then
Dim KundenKontoArchiv As String = SQL.getValueTxtBySqlVarList("SELECT c_archiv FROM [FIBU2].dbo.fibu_konto WHERE i_konto = " & BELEG.KundenNr & " AND i_firm_refid = 7", "FIBU") 'ATILLA MANDANT!'
If KundenKontoArchiv <> "" Then
MsgBox("ACHTUNG, die Kundennummer ist in der Syska-FIBU inaktiv, bitte andere KundenNr verwenden!")
MsgBox("ACHTUNG, der Debitor mit der Nr: " & BELEG.KundenNr & " ist in der Syska-FIBU inaktiv, bitte andere KundenNr verwenden!")
Exit Sub
End If

View File

@@ -494,7 +494,7 @@ Public Class usrCntlCBAM
If dtGP IsNot Nothing AndAlso dt.Rows.Count > 0 Then
If dtGP IsNot Nothing AndAlso dtGP.Rows.Count > 0 Then
If ReDaten.Rows.Count > 0 Then
dtGP.Columns("invoice date").ReadOnly = False
@@ -509,8 +509,6 @@ Public Class usrCntlCBAM
' Look for matching row in dt2
Dim found() As DataRow = ReDaten.Select("Registriernummer_MRN = '" & MDN_NR & "'")
If found.Length > 0 Then
Dim rechnugnsdatum As String = found(0)("Positionsunterlagendatum")

View File

@@ -1,6 +1,7 @@
Imports System.Data.SqlClient
Imports System.Globalization
Imports System.IO
Imports org.BouncyCastle.Asn1.Ocsp
Imports SDL.EORI
Imports VERAG_PROG_ALLGEMEIN
@@ -1690,7 +1691,11 @@ Public Class usrCntlKundenuebersicht
Private Sub dgvVertraege_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvVertraege.CellDoubleClick
If dgvVertraege.SelectedRows.Count = 1 Then
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dgvVertraege.SelectedRows(0).Cells("kv_datenarchivId").Value)
DS.OPEN_SINGLE()
If DS.hasITEMS Then
For Each i In DS.DATA_LIST.LIST
Process.Start(i.coll_pfad)
Next
End If
End If
End Sub

View File

@@ -321,6 +321,7 @@ Public Class usrcntlKundeBearbeitenFull
cbxAPITradeshift.Checked = loadValue(KUNDE_ERW.kde_API_Tradeshift, False)
cboRechnungSprache._value = loadValue(KUNDE_ERW.kde_Fakturierung_Sprache, "")
cbxBetreuer._value = loadValue(KUNDE_ERW.kde_betreuer, "")
txtVERAG_Schnittstellen_ID.Text = If(KUNDE_ERW.kde_VERAG_INTERFACE_ID, "")
' ----- Abfertigungsverbot -----

View File

@@ -22,9 +22,9 @@ Partial Class usrcntlVertraege
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent()
Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Me.dgvVertraege = New System.Windows.Forms.DataGridView()
Me.components = New System.ComponentModel.Container()
Me.Panel1 = New System.Windows.Forms.Panel()
Me.PictureBox1 = New System.Windows.Forms.PictureBox()
Me.Button11 = New System.Windows.Forms.Button()
Me.Button12 = New System.Windows.Forms.Button()
Me.txtVertragVermerk = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -33,31 +33,12 @@ Partial Class usrcntlVertraege
Me.cboVertrag = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.datVertrag = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Label4 = New System.Windows.Forms.Label()
Me.PictureBox1 = New System.Windows.Forms.PictureBox()
CType(Me.dgvVertraege, System.ComponentModel.ISupportInitialize).BeginInit()
Me.dgvVertraegeNew = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.Panel1.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.dgvVertraegeNew, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'dgvVertraege
'
Me.dgvVertraege.AllowUserToAddRows = False
Me.dgvVertraege.AllowUserToDeleteRows = False
Me.dgvVertraege.AllowUserToOrderColumns = True
Me.dgvVertraege.AllowUserToResizeRows = False
DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
Me.dgvVertraege.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
Me.dgvVertraege.BackgroundColor = System.Drawing.Color.White
Me.dgvVertraege.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvVertraege.Location = New System.Drawing.Point(0, 0)
Me.dgvVertraege.MultiSelect = False
Me.dgvVertraege.Name = "dgvVertraege"
Me.dgvVertraege.ReadOnly = True
Me.dgvVertraege.RowHeadersVisible = False
Me.dgvVertraege.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
Me.dgvVertraege.Size = New System.Drawing.Size(495, 97)
Me.dgvVertraege.TabIndex = 9
'
'Panel1
'
Me.Panel1.BackColor = System.Drawing.Color.White
@@ -76,6 +57,17 @@ Partial Class usrcntlVertraege
Me.Panel1.Size = New System.Drawing.Size(495, 46)
Me.Panel1.TabIndex = 10
'
'PictureBox1
'
Me.PictureBox1.BackgroundImage = Global.SDL.My.Resources.Resources.pdf
Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.PictureBox1.Location = New System.Drawing.Point(473, 0)
Me.PictureBox1.Name = "PictureBox1"
Me.PictureBox1.Size = New System.Drawing.Size(22, 19)
Me.PictureBox1.TabIndex = 8
Me.PictureBox1.TabStop = False
Me.PictureBox1.Visible = False
'
'Button11
'
Me.Button11.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -191,33 +183,34 @@ Partial Class usrcntlVertraege
Me.Label4.TabIndex = 0
Me.Label4.Text = "Vertrag:"
'
'PictureBox1
'dgvVertraegeNew
'
Me.PictureBox1.BackgroundImage = Global.SDL.My.Resources.Resources.pdf
Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.PictureBox1.Location = New System.Drawing.Point(473, 0)
Me.PictureBox1.Name = "PictureBox1"
Me.PictureBox1.Size = New System.Drawing.Size(22, 19)
Me.PictureBox1.TabIndex = 8
Me.PictureBox1.TabStop = False
Me.PictureBox1.Visible = False
Me.dgvVertraegeNew.AKTUALISIERUNGS_INTERVALL = -1
Me.dgvVertraegeNew.AllowUserToDeleteRows = False
Me.dgvVertraegeNew.AllowUserToOrderColumns = True
Me.dgvVertraegeNew.AllowUserToResizeRows = False
Me.dgvVertraegeNew.BackgroundColor = System.Drawing.Color.White
Me.dgvVertraegeNew.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvVertraegeNew.Location = New System.Drawing.Point(0, 0)
Me.dgvVertraegeNew.Name = "dgvVertraegeNew"
Me.dgvVertraegeNew.Size = New System.Drawing.Size(492, 97)
Me.dgvVertraegeNew.TabIndex = 11
'
'usrcntlVertraege
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.Controls.Add(Me.dgvVertraegeNew)
Me.Controls.Add(Me.Panel1)
Me.Controls.Add(Me.dgvVertraege)
Me.Name = "usrcntlVertraege"
Me.Size = New System.Drawing.Size(495, 146)
CType(Me.dgvVertraege, System.ComponentModel.ISupportInitialize).EndInit()
Me.Panel1.ResumeLayout(False)
Me.Panel1.PerformLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.dgvVertraegeNew, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
End Sub
Public WithEvents dgvVertraege As DataGridView
Friend WithEvents Panel1 As Panel
Public WithEvents Button11 As Button
Friend WithEvents Button12 As Button
@@ -228,4 +221,5 @@ Partial Class usrcntlVertraege
Friend WithEvents datVertrag As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents Label4 As Label
Friend WithEvents PictureBox1 As PictureBox
Public WithEvents dgvVertraegeNew As VERAG_PROG_ALLGEMEIN.MyDatagridview
End Class

View File

@@ -1,6 +1,4 @@
Imports com.esendex.sdk.surveys.models
Imports sun.swing
Imports VERAG_PROG_ALLGEMEIN
Imports VERAG_PROG_ALLGEMEIN
Public Class usrcntlVertraege
@@ -10,18 +8,18 @@ Public Class usrcntlVertraege
Public Vid = -1
Public Shared Event clickOK(ByVal sender As System.Object, ByVal e As System.EventArgs)
Private Sub dgvVertraege_CellContentDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvVertraege.CellContentDoubleClick
If dgvVertraege.SelectedRows.Count = 1 Then
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dgvVertraege.SelectedRows(0).Cells("kv_datenarchivId").Value)
Private Sub dgvVertraege_CellContentDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvVertraegeNew.CellContentDoubleClick
If dgvVertraegeNew.SelectedRows.Count = 1 Then
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dgvVertraegeNew.SelectedRows(0).Cells("kv_datenarchivId").Value)
DS.OPEN_SINGLE()
End If
End Sub
Private Sub dgvVertraege_CellMouseClick(sender As Object, e As DataGridViewCellMouseEventArgs) Handles dgvVertraege.CellMouseClick
Private Sub dgvVertraege_CellMouseClick(sender As Object, e As DataGridViewCellMouseEventArgs) Handles dgvVertraegeNew.CellMouseClick
If e.RowIndex < 0 Then Exit Sub
DirectCast(sender, DataGridView).Rows(e.RowIndex).Selected = True
If e.Button = Windows.Forms.MouseButtons.Right Then
If dgvVertraege.SelectedRows.Count > 0 Then
If dgvVertraegeNew.SelectedRows.Count > 0 Then
'ContextMenuStrip4.Show(Cursor.Position)
End If
End If
@@ -54,8 +52,8 @@ Public Class usrcntlVertraege
If cboVertrag._value <> "" And datVertrag._value <> "" Then
Dim KV As New VERAG_PROG_ALLGEMEIN.cKundenVertraege
If Button12.Visible Then
If dgvVertraege.SelectedRows.Count = 1 Then
KV = New VERAG_PROG_ALLGEMEIN.cKundenVertraege(dgvVertraege.SelectedRows(0).Cells("kv_id").Value)
If dgvVertraegeNew.SelectedRows.Count = 1 Then
KV = New VERAG_PROG_ALLGEMEIN.cKundenVertraege(dgvVertraegeNew.SelectedRows(0).Cells("kv_id").Value)
Else
Exit Sub
End If
@@ -69,7 +67,7 @@ Public Class usrcntlVertraege
If KV.SAVEOBJECT Then
If PDF_Attach_TMP <> "" Then
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "KD_VERTRÄGE", "", "", "", "KV_" & dgvVertraege.SelectedRows(0).Cells("kv_id").Value, kdnr)
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "KD_VERTRÄGE", "", "", "", "KV_" & dgvVertraegeNew.SelectedRows(0).Cells("kv_id").Value, kdnr)
If DS.uploadDataToDATENSERVERFileDialog(, ".pdf", , "PDF") Then
KV.kv_datenarchivId = DS.da_id
KV.SAVE()
@@ -96,8 +94,8 @@ Public Class usrcntlVertraege
If cboVertrag._value <> "" And datVertrag._value <> "" Then
Dim KV As New VERAG_PROG_ALLGEMEIN.cKundenVertraege
If Button12.Visible Then
If dgvVertraege.SelectedRows.Count = 1 Then
KV = New VERAG_PROG_ALLGEMEIN.cKundenVertraege(dgvVertraege.SelectedRows(0).Cells("kv_id").Value)
If dgvVertraegeNew.SelectedRows.Count = 1 Then
KV = New VERAG_PROG_ALLGEMEIN.cKundenVertraege(dgvVertraegeNew.SelectedRows(0).Cells("kv_id").Value)
Else
Exit Sub
End If
@@ -125,7 +123,7 @@ Public Class usrcntlVertraege
PictureBox1.Visible = PDF_Attach_TMP <> ""
With dgvVertraege
With dgvVertraegeNew
.Columns.Clear()
If kdnr = -1 Or kdnr Is Nothing Then Exit Sub
@@ -179,10 +177,10 @@ Public Class usrcntlVertraege
Private Sub markDGVVertraege(Optional vid As Integer = 0)
dgvVertraege.ClearSelection()
dgvVertraegeNew.ClearSelection()
If vid > 0 Then
For Each row As DataGridViewRow In dgvVertraege.Rows
For Each row As DataGridViewRow In dgvVertraegeNew.Rows
If row.Cells("kv_Id").Value = vid Then
row.Selected = True
End If

View File

@@ -22,8 +22,7 @@ Partial Class usrcntlGestellungsgarantien
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Me.dgvGestGarantie = New System.Windows.Forms.DataGridView()
Me.components = New System.ComponentModel.Container()
Me.Panel2 = New System.Windows.Forms.Panel()
Me.cbxGG = New System.Windows.Forms.CheckBox()
Me.txtGGDatum = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -31,29 +30,11 @@ Partial Class usrcntlGestellungsgarantien
Me.Label11 = New System.Windows.Forms.Label()
Me.Button8 = New System.Windows.Forms.Button()
Me.Button9 = New System.Windows.Forms.Button()
CType(Me.dgvGestGarantie, System.ComponentModel.ISupportInitialize).BeginInit()
Me.dgvGestGarantieNew = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.Panel2.SuspendLayout()
CType(Me.dgvGestGarantieNew, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'dgvGestGarantie
'
Me.dgvGestGarantie.AllowUserToAddRows = False
Me.dgvGestGarantie.AllowUserToDeleteRows = False
Me.dgvGestGarantie.AllowUserToOrderColumns = True
Me.dgvGestGarantie.AllowUserToResizeRows = False
DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
Me.dgvGestGarantie.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
Me.dgvGestGarantie.BackgroundColor = System.Drawing.Color.White
Me.dgvGestGarantie.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvGestGarantie.Location = New System.Drawing.Point(3, 3)
Me.dgvGestGarantie.MultiSelect = False
Me.dgvGestGarantie.Name = "dgvGestGarantie"
Me.dgvGestGarantie.ReadOnly = True
Me.dgvGestGarantie.RowHeadersVisible = False
Me.dgvGestGarantie.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
Me.dgvGestGarantie.Size = New System.Drawing.Size(506, 102)
Me.dgvGestGarantie.TabIndex = 13
'
'Panel2
'
Me.Panel2.BackColor = System.Drawing.Color.White
@@ -166,22 +147,33 @@ Partial Class usrcntlGestellungsgarantien
Me.Button9.UseVisualStyleBackColor = True
Me.Button9.Visible = False
'
'dgvGestGarantieNew
'
Me.dgvGestGarantieNew.AKTUALISIERUNGS_INTERVALL = -1
Me.dgvGestGarantieNew.AllowUserToAddRows = False
Me.dgvGestGarantieNew.AllowUserToDeleteRows = False
Me.dgvGestGarantieNew.AllowUserToResizeRows = False
Me.dgvGestGarantieNew.BackgroundColor = System.Drawing.Color.White
Me.dgvGestGarantieNew.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvGestGarantieNew.Location = New System.Drawing.Point(0, 0)
Me.dgvGestGarantieNew.Name = "dgvGestGarantieNew"
Me.dgvGestGarantieNew.Size = New System.Drawing.Size(506, 105)
Me.dgvGestGarantieNew.TabIndex = 15
'
'usrcntlGestellungsgarantien
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.Controls.Add(Me.dgvGestGarantieNew)
Me.Controls.Add(Me.Panel2)
Me.Controls.Add(Me.dgvGestGarantie)
Me.Name = "usrcntlGestellungsgarantien"
Me.Size = New System.Drawing.Size(509, 153)
CType(Me.dgvGestGarantie, System.ComponentModel.ISupportInitialize).EndInit()
Me.Panel2.ResumeLayout(False)
Me.Panel2.PerformLayout()
CType(Me.dgvGestGarantieNew, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
End Sub
Public WithEvents dgvGestGarantie As DataGridView
Friend WithEvents Panel2 As Panel
Friend WithEvents cbxGG As CheckBox
Friend WithEvents txtGGDatum As VERAG_PROG_ALLGEMEIN.MyTextBox
@@ -189,4 +181,5 @@ Partial Class usrcntlGestellungsgarantien
Friend WithEvents Label11 As Label
Friend WithEvents Button8 As Button
Friend WithEvents Button9 As Button
Public WithEvents dgvGestGarantieNew As VERAG_PROG_ALLGEMEIN.MyDatagridview
End Class

View File

@@ -13,7 +13,7 @@
kdnr = _kdnr
With dgvGestGarantie
With dgvGestGarantieNew
.Columns.Clear()
If kdnr = -1 Then Exit Sub
@@ -54,8 +54,8 @@
If (txtT1VerzollungsadresseBestimmungszollstelle._value <> "" Or cbxGG.Checked) And txtGGDatum._value <> "" Then
Dim GG As New VERAG_PROG_ALLGEMEIN.cGestellungsgarantien
If Button9.Visible Then
If dgvGestGarantie.SelectedRows.Count = 1 Then
GG = New VERAG_PROG_ALLGEMEIN.cGestellungsgarantien(dgvGestGarantie.SelectedRows(0).Cells("gg_id").Value)
If dgvGestGarantieNew.SelectedRows.Count = 1 Then
GG = New VERAG_PROG_ALLGEMEIN.cGestellungsgarantien(dgvGestGarantieNew.SelectedRows(0).Cells("gg_id").Value)
Else
Exit Sub
End If
@@ -108,9 +108,9 @@
End Sub
Private Sub dgvGestGarantie_CellContentDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvGestGarantie.CellContentDoubleClick
If dgvGestGarantie.SelectedRows.Count = 1 Then
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dgvGestGarantie.SelectedRows(0).Cells("gg_datenarchivId").Value)
Private Sub dgvGestGarantie_CellContentDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvGestGarantieNew.CellContentDoubleClick
If dgvGestGarantieNew.SelectedRows.Count = 1 Then
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dgvGestGarantieNew.SelectedRows(0).Cells("gg_datenarchivId").Value)
DS.OPEN_SINGLE()
End If
End Sub
@@ -118,10 +118,10 @@
Private Sub markDGVGestGarantie(Optional gid As Integer = 0)
dgvGestGarantie.ClearSelection()
dgvGestGarantieNew.ClearSelection()
If gid > 0 Then
For Each row As DataGridViewRow In dgvGestGarantie.Rows
For Each row As DataGridViewRow In dgvGestGarantieNew.Rows
If row.Cells("gg_Id").Value = gid Then
row.Selected = True
End If

View File

@@ -615,6 +615,7 @@ Public Class SQL
Case "WEB" : conn = GetNewOpenConnectionWEB()
Case "FIBU", "SYSKA" : conn = GetNewOpenConnectionSYSKA()
Case "PARKZEIT" : conn = GetNewOpenConnectionPARKZEIT()
Case "SCANCANON" : conn = GetNewOpenConnectionSCANCANON()
Case "AVISO_ATILLA"

View File

@@ -11,6 +11,8 @@ Public Class cKundenVertraege
Property kv_datenarchivId As Object = Nothing
Property kv_gueltig As Boolean = True
Public hasEntry As Boolean = False
Dim SQL As New SQL
@@ -22,6 +24,13 @@ Public Class cKundenVertraege
LOAD()
End Sub
Sub New(kv_KundenNr, kv_erhalten_Datum, kv_vertragArtId)
Me.kv_KundenNr = kv_KundenNr
Me.kv_erhalten_Datum = kv_erhalten_Datum
Me.kv_vertragArtId = kv_vertragArtId
LOAD(kv_KundenNr, kv_erhalten_Datum, kv_vertragArtId)
End Sub
Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kv_Id", kv_Id, , True, True))
@@ -85,7 +94,36 @@ Public Class cKundenVertraege
End If
Next
hasEntry = True
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
End Sub
Public Sub LOAD(KundenNr, erhaltenAm, vertragArtId)
Try
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand("Select * FROM tblKundenVertraege WHERE kv_KundenNr=@KundenNr AND kv_erhalten_Datum=@erhaltenAm AND kv_vertragArtId=@vertragArtId ", conn)
cmd.Parameters.AddWithValue("@KundenNr", KundenNr)
cmd.Parameters.AddWithValue("@erhaltenAm", erhaltenAm)
cmd.Parameters.AddWithValue("@vertragArtId", vertragArtId)
Dim dr = cmd.ExecuteReader()
If dr.Read Then
For Each li In getParameterList()
Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable)
If dr.Item(li.Text) Is DBNull.Value Then
propInfo.SetValue(Me, Nothing)
Else
propInfo.SetValue(Me, dr.Item(li.Text))
End If
Next
hasEntry = True
End If
dr.Close()
End Using

View File

@@ -498,9 +498,9 @@ Class TrdInvoice_FUNCTIONS
Dim Buchungstext As String = ROW("RK_Buchungstext")
If Buchungstext <> "" AndAlso Buchungstext.Contains("Zahlungen vom") Then
Buchungstext = Buchungstext.Replace("Zahlungen vom", "Zinsen")
Buchungstext &= " / nicht verzinsen"
If Buchungstext <> "" AndAlso Buchungstext.Contains("Zahlungen von") Then
Buchungstext = Buchungstext.Replace("Zahlungen von", "Zinsen")
' Buchungstext &= " / nicht verzinsen"
End If
If TRD_INVOICE.SAVE Then

View File

@@ -48,7 +48,7 @@
Public Shared Function genBuchungenBeginn(Geschaeftsjahr As Integer) As String
Return "100,""AR "",4,""" & Now.ToString("ddMMyyyy") & """," & Now.AddDays(-1).Month & ",0"
Return "100,""AR "",4,""" & Now.ToString("ddMMyyyy") & """," & Now.Month & ",0"
End Function

View File

@@ -1,4 +1,5 @@
Imports System.ServiceModel.Configuration
Imports com
Imports Therefore.API
Public Class cTherefore
@@ -146,6 +147,109 @@ Public Class cTherefore
' 8. Close Therefore™ document object
doc.Close()
Return True
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
End Try
Return False
End Function
Shared Function getFileFromFolderCat(Category As String, Optional Category2 As String = "", Optional UpdateExistingVertraege As Boolean = False)
Try
If Category2 = "" Then Category2 = Category
Dim SQL As New SQL
' 1. Connect to the Therefore™ Server
Dim server As New TheServer
server.Connect(TheClientType.CustomApplication)
' 2. Create a new Therefore™ Document
Dim TableName = ""
If IsNumeric(Category) Then
TableName = "TheCat" & Category
If SQL.getValueTxtBySql("SELECT count(*) FROM [TheCategory] WHERE TableName='" & TableName & "'", "SCANCANON",,, "") = 0 Then
MsgBox("Therefore: Tabelle nicht gefunden: " & TableName)
Return False
End If
Else
TableName = SQL.getValueTxtBySql("SELECT [TableName] FROM [TheCategory] WHERE Title='" & Category & "'", "SCANCANON",,, "")
End If
Dim docs As DataTable = SQL.loadDgvBySql("SELECT isnull([DocNo],-1) as DocNo,[String],[Eingabedatum] FROM " & TableName & " where isNUmeric(left(string,6)) = 1", "SCANCANON")
If Not vbYes = MsgBox("Möchten Sie die " & docs.Rows.Count & " Dokumente aus Therefore als Unternehmensbescheinigung hochladen?" & vbNewLine & "Existierende Datenarchiv-Einträge werden " & IIf(UpdateExistingVertraege, "-ÜBERSCHRIEBEN-", "-ÜBERSPRUNGEN-") & "!", vbYesNoCancel) Then Return False
For Each TFdoc As DataRow In docs.Rows
Dim filename As String = ""
If TFdoc.Item("DocNo") > 0 Then
If Not IsDBNull(TFdoc("String")) AndAlso TFdoc("String").ToString() <> "" AndAlso TFdoc.Item("String").ToString.Length > 6 AndAlso IsNumeric(TFdoc.Item("String").ToString.Substring(0, 6)) Then
Dim kdNr = TFdoc.Item("String").ToString.Substring(0, 6)
Dim Kunde As New cKunde(kdNr)
If Kunde IsNot Nothing Then
Dim EingabeDatum As Date
If Not IsDBNull(TFdoc("Eingabedatum")) AndAlso TFdoc("Eingabedatum").ToString() <> "" AndAlso IsDate(TFdoc.Item("Eingabedatum").ToString) Then
EingabeDatum = CDate(TFdoc("Eingabedatum"))
Else
EingabeDatum = Now()
End If
Dim KV As New VERAG_PROG_ALLGEMEIN.cKundenVertraege(Kunde.KundenNr, EingabeDatum, 7)
If KV.hasEntry AndAlso KV.kv_datenarchivId IsNot Nothing AndAlso KV.kv_datenarchivId > 0 AndAlso Not UpdateExistingVertraege Then Continue For 'dann nicht aktualisieren!
Dim extractDir As String = System.IO.Path.GetTempPath() & Kunde.KundenNr & "\"
If Not System.IO.Directory.Exists(extractDir) Then
System.IO.Directory.CreateDirectory(extractDir)
End If
Dim doc As New TheDocument()
Dim folder = ""
Dim VerionNo As Integer
filename = doc.Retrieve(TFdoc.Item("DocNo"), VerionNo, folder, server, False)
' 4. Extract all file streams to the specified directory
Dim i As Integer
Dim DSID As Integer = -1
Dim multiFiles As Boolean = (doc.StreamCount > 1)
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "UM-BESCHEINIGUNG", Now.ToString("ddMMyy_HHmmss.ffff"), "", "", "UM-Bescheinigung", Kunde.KundenNr, multiFiles)
For i = 0 To doc.StreamCount - 1 'Step i + 1
Dim extractFile As String = doc.ExtractStream(i, extractDir)
If Not DS.uploadDataToDATENSERVER(extractFile) Then
MsgBox("Fehler beim Hochladen!")
End If
Next
KV.kv_Info = "aus TF importiert"
KV.kv_datenarchivId = DS.da_id
KV.SAVE()
doc.Close()
End If
End If
End If
Next
Return True
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)

View File

@@ -27,6 +27,8 @@ Public Class cSicherheiten
Property gs_ReferenzAenderung As Boolean
Property gs_zuletztgeandert As Object = Nothing
Property gs_systemuser As Object = Nothing
Property gs_MRNNr As Object = Nothing
Property gs_posSubNr As Object = Nothing
Public hasEntry = False
@@ -73,6 +75,8 @@ Public Class cSicherheiten
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_ReferenzAenderung", gs_ReferenzAenderung))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_zuletztgeandert", gs_zuletztgeandert))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_systemuser", gs_systemuser))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_MRNNr", gs_MRNNr))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_posSubNr", gs_posSubNr))
Return list
End Function