edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

creditsafe bugfix, abrechnungmaske (gu an CS oder AG), ZE-Buttons, Syska

Browse Source
This commit is contained in:
d.breimaier
2024-06-25 08:22:35 +02:00
parent 8841b1381c
commit 37bbc7d14f
10 changed files with 106 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.resx
View File

@@ -139,7 +139,7 @@
<value>242, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>91</value>
<value>86</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

2
VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb
View File

@@ -412,7 +412,7 @@ Public Class frmMitarbeitersuche
Dim resultCode As Integer = IIf(cbxHomeoffice.Checked, 3, 0)
If MA.mit_nname.ToLower = "celan" Then 'aktuell Hardcoded, wenn Zeit ist dynamisch (per SQL-tbl)
If MA.mit_nname.ToLower = "celan" Or MA.mit_nname.ToLower = "breimaier" Then 'aktuell Hardcoded, wenn Zeit ist dynamisch (per SQL-tbl)
Dim f As New frmZEButtons(art)
f.ShowDialog()

23
VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmZEButtons.Designer.vb generated
View File

@@ -65,7 +65,7 @@ Partial Class frmZEButtons
Me.btnVergGehen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnVergGehen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_gehen
Me.btnVergGehen.ImageAlign = System.Drawing.ContentAlignment.TopRight
Me.btnVergGehen.Location = New System.Drawing.Point(132, 168)
Me.btnVergGehen.Location = New System.Drawing.Point(132, 174)
Me.btnVergGehen.Name = "btnVergGehen"
Me.btnVergGehen.Size = New System.Drawing.Size(90, 45)
Me.btnVergGehen.TabIndex = 132
@@ -82,7 +82,7 @@ Partial Class frmZEButtons
Me.btnVergKommen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnVergKommen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_kommen
Me.btnVergKommen.ImageAlign = System.Drawing.ContentAlignment.TopLeft
Me.btnVergKommen.Location = New System.Drawing.Point(20, 168)
Me.btnVergKommen.Location = New System.Drawing.Point(20, 174)
Me.btnVergKommen.Name = "btnVergKommen"
Me.btnVergKommen.Size = New System.Drawing.Size(106, 45)
Me.btnVergKommen.TabIndex = 131
@@ -99,7 +99,7 @@ Partial Class frmZEButtons
Me.btnFOGehen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnFOGehen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_gehen
Me.btnFOGehen.ImageAlign = System.Drawing.ContentAlignment.TopRight
Me.btnFOGehen.Location = New System.Drawing.Point(132, 117)
Me.btnFOGehen.Location = New System.Drawing.Point(132, 123)
Me.btnFOGehen.Name = "btnFOGehen"
Me.btnFOGehen.Size = New System.Drawing.Size(90, 45)
Me.btnFOGehen.TabIndex = 130
@@ -116,7 +116,7 @@ Partial Class frmZEButtons
Me.btnFOKommen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnFOKommen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_kommen
Me.btnFOKommen.ImageAlign = System.Drawing.ContentAlignment.TopLeft
Me.btnFOKommen.Location = New System.Drawing.Point(20, 117)
Me.btnFOKommen.Location = New System.Drawing.Point(20, 123)
Me.btnFOKommen.Name = "btnFOKommen"
Me.btnFOKommen.Size = New System.Drawing.Size(106, 45)
Me.btnFOKommen.TabIndex = 129
@@ -128,7 +128,7 @@ Partial Class frmZEButtons
'
Me.Label1.AutoSize = True
Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label1.Location = New System.Drawing.Point(145, -1)
Me.Label1.Location = New System.Drawing.Point(145, 5)
Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(50, 13)
Me.Label1.TabIndex = 128
@@ -138,7 +138,7 @@ Partial Class frmZEButtons
'
Me.lblkommen.AutoSize = True
Me.lblkommen.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.lblkommen.Location = New System.Drawing.Point(43, -1)
Me.lblkommen.Location = New System.Drawing.Point(43, 5)
Me.lblkommen.Name = "lblkommen"
Me.lblkommen.Size = New System.Drawing.Size(61, 13)
Me.lblkommen.TabIndex = 127
@@ -153,7 +153,7 @@ Partial Class frmZEButtons
Me.btnATTGehen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnATTGehen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_gehen
Me.btnATTGehen.ImageAlign = System.Drawing.ContentAlignment.TopRight
Me.btnATTGehen.Location = New System.Drawing.Point(132, 66)
Me.btnATTGehen.Location = New System.Drawing.Point(132, 72)
Me.btnATTGehen.Name = "btnATTGehen"
Me.btnATTGehen.Size = New System.Drawing.Size(90, 45)
Me.btnATTGehen.TabIndex = 126
@@ -170,7 +170,7 @@ Partial Class frmZEButtons
Me.btnATTKommen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnATTKommen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_kommen
Me.btnATTKommen.ImageAlign = System.Drawing.ContentAlignment.TopLeft
Me.btnATTKommen.Location = New System.Drawing.Point(20, 66)
Me.btnATTKommen.Location = New System.Drawing.Point(20, 72)
Me.btnATTKommen.Name = "btnATTKommen"
Me.btnATTKommen.Size = New System.Drawing.Size(106, 45)
Me.btnATTKommen.TabIndex = 125
@@ -187,7 +187,7 @@ Partial Class frmZEButtons
Me.btnIMEXGehen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnIMEXGehen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_gehen
Me.btnIMEXGehen.ImageAlign = System.Drawing.ContentAlignment.TopRight
Me.btnIMEXGehen.Location = New System.Drawing.Point(132, 15)
Me.btnIMEXGehen.Location = New System.Drawing.Point(132, 21)
Me.btnIMEXGehen.Name = "btnIMEXGehen"
Me.btnIMEXGehen.Size = New System.Drawing.Size(90, 45)
Me.btnIMEXGehen.TabIndex = 124
@@ -204,7 +204,7 @@ Partial Class frmZEButtons
Me.btnIMEXKommen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnIMEXKommen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_kommen
Me.btnIMEXKommen.ImageAlign = System.Drawing.ContentAlignment.TopLeft
Me.btnIMEXKommen.Location = New System.Drawing.Point(20, 15)
Me.btnIMEXKommen.Location = New System.Drawing.Point(20, 21)
Me.btnIMEXKommen.Name = "btnIMEXKommen"
Me.btnIMEXKommen.Size = New System.Drawing.Size(106, 45)
Me.btnIMEXKommen.TabIndex = 123
@@ -217,10 +217,11 @@ Partial Class frmZEButtons
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(236, 232)
Me.ControlBox = False
Me.Controls.Add(Me.pnlButtons)
Me.KeyPreview = True
Me.Name = "frmZEButtons"
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
Me.Text = "Zeiterfassung"
Me.pnlButtons.ResumeLayout(False)
Me.pnlButtons.PerformLayout()
Me.ResumeLayout(False)

11
VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmZEButtons.vb
View File

@@ -1,4 +1,6 @@
Public Class frmZEButtons
Imports System.Windows.Forms
Public Class frmZEButtons
Dim art As String
Public resultCode As Integer = -1
@@ -39,5 +41,12 @@
End Select
Me.TopMost = True
End Sub
Private Sub frmZEButtons_KeyDown(sender As Object, e As KeyEventArgs) Handles MyBase.KeyDown
If e.KeyCode = Keys.Escape Then Me.Close()
End Sub
End Class

21
VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb
View File

@@ -299,7 +299,7 @@ Public Class cCreditSafeAPI
End Function
Shared Function getCompanieEvents(company As Company, ByRef dataTable As DataTable) As String
Shared Function getCompanyEvents(company As Company, ByRef dtEvents As DataTable) As String
VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat()
@@ -315,6 +315,21 @@ Public Class cCreditSafeAPI
Return "Verbindungsfehler"
End If
If dtEvents.Columns.Count = 0 Then
dtEvents.Columns.Add("eventId", GetType(String))
dtEvents.Columns.Add("companyId", GetType(String))
dtEvents.Columns.Add("portfolioId", GetType(String))
dtEvents.Columns.Add("ruleName", GetType(String))
dtEvents.Columns.Add("localEventCode", GetType(String))
dtEvents.Columns.Add("globalEventCode", GetType(String))
dtEvents.Columns.Add("newValue", GetType(String))
dtEvents.Columns.Add("oldValue", GetType(String))
dtEvents.Columns.Add("eventDate", GetType(DateTime))
dtEvents.Columns.Add("createdDate", GetType(DateTime))
End If
dtEvents.Rows.Clear()
Dim num As Integer = json.SizeOfArray("data")
If num = 0 Then
Return json.StringOf("totalCount")
@@ -346,7 +361,7 @@ Public Class cCreditSafeAPI
Debug.WriteLine(dateTime.GetAsTimestamp(getAsLocal))
Dim R As DataRow = dataTable.NewRow
Dim R As DataRow = dtEvents.NewRow
R("eventId") = compObj.StringOf("eventId")
R("companyId") = compObj.StringOf("companyId")
R("portfolioId") = compObj.StringOf("portfolioId")
@@ -357,7 +372,7 @@ Public Class cCreditSafeAPI
R("oldValue") = compObj.StringOf("oldValue")
R("eventDate") = dateTime.GetAsTimestamp(getAsLocal)
R("createdDate") = dateTime.GetAsTimestamp(getAsLocal)
dataTable.Rows.Add(R)
dtEvents.Rows.Add(R)
j = j + 1
End While

19
VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb
View File

@@ -284,7 +284,7 @@ Public Class cSyska_Interface
End If
End Function
Public Shared Function genDatensatz_Buchungen(ByRef Firma_ID As Integer, Optional OpenFile As Boolean = False, Optional WdhDateiname As String = "", Optional ambargubuchungen As Boolean = False) As Boolean ' Optional OpenFile = False, Optional boolKunden = True, Optional boolBuchungen = True ) As Boolean
Public Shared Function genDatensatz_Buchungen(ByRef Firma_ID As Integer, Optional OpenFile As Boolean = False, Optional WdhDateiname As String = "", Optional ambargubuchungen As Boolean = False, Optional ambarKreditor As String = "") As Boolean ' Optional OpenFile = False, Optional boolKunden = True, Optional boolBuchungen = True ) As Boolean
Try
Dim FIRMA As New VERAG_PROG_ALLGEMEIN.cFirmen(Firma_ID)
@@ -315,13 +315,13 @@ Public Class cSyska_Interface
'----------------- Buchungssätze -----------------
If True Then 'boolBuchungen Then
If WdhDateiname = "" AndAlso Not ambargubuchungen Then TrdInvoice_FUNCTIONS.TrdinSchreiben(FIRMA.Firma_ID) 'Lädt die Daten aus der Tabelle Rechnungsausgang in die Tabelle trdInvoice (nur für 20 = IMEX )
Dim dt_Buchungen As DataTable = getBuchungen(FIRMA.Firma_ID, WdhDateiname, ambargubuchungen)
Dim dt_Buchungen As DataTable = getBuchungen(FIRMA.Firma_ID, WdhDateiname, ambargubuchungen, ambarKreditor)
' MsgBox(WdhDateiname & " - " & dt_Buchungen.Rows.Count)
If dt_Buchungen IsNot Nothing AndAlso dt_Buchungen.Rows.Count > 0 Then
Try
Dim file As System.IO.StreamWriter
Dim Dateiname = IIf(ambargubuchungen, "GS_AMBAR_", "AVISO_BUBE_") & Now.ToString("ddMMyyyy_HHmm") & ".txt"
Dim Dateiname = IIf(ambargubuchungen, "GS_AMBAR_" & ambarKreditor & "_", "AVISO_BUBE_") & Now.ToString("ddMMyyyy_HHmm") & ".txt"
file = My.Computer.FileSystem.OpenTextFileWriter(path & Dateiname, True, System.Text.Encoding.GetEncoding("iso-8859-15"))
' initKDNr(dt_Buchungen)
@@ -345,7 +345,7 @@ Public Class cSyska_Interface
If Not ambargubuchungen Then
dt_BuchungenZeilen = getBuchungenZeilen(FIRMA.Firma_ID, r("Rechnungsnummer"), r("Rechnungsdatum"), WdhDateiname)
Else
dt_BuchungenZeilen = getBuchungenZeilenAMBAR(FIRMA.Firma_ID, r("Rechnungsnummer"), r("Rechnungsdatum"), WdhDateiname)
dt_BuchungenZeilen = getBuchungenZeilenAMBAR(r("Rechnungsnummer"), r("Rechnungsdatum"), WdhDateiname)
End If
If dt_BuchungenZeilen IsNot Nothing AndAlso dt_BuchungenZeilen.Rows.Count > 0 Then
@@ -512,14 +512,19 @@ Public Class cSyska_Interface
If IsNumeric(s) Then Return CDbl(s).ToString("N" & Nachkommastellen)
Return s.ToString
End Function
Shared Function getBuchungen(Firma_ID As Integer, Optional WdhDateiname As String = "", Optional ambargubuchungen As Boolean = False) As DataTable
Shared Function getBuchungen(Firma_ID As Integer, Optional WdhDateiname As String = "", Optional ambargubuchungen As Boolean = False, Optional ambarKreditor As String = "") As DataTable
Dim where As String = ""
If Not ambargubuchungen Then
where = "WHERE Firma_ID ='" & Firma_ID & "' AND " & If(WdhDateiname = "", " TrdinDateiname Is Null ", " TrdinDateiname ='" & WdhDateiname & "' ") & " "
Else
where = "WHERE Firma_ID ='24' and RechnungsKundenNr = 3013401 and RechnungsUstIdNr = 'U53187000' And BelegartenNr = 71 AND " & If(WdhDateiname = "", " AmbDateiname Is Null ", " AmbDateiname ='" & WdhDateiname & "' ") & " "
If ambarKreditor = "AG" Then
where = "WHERE Firma_ID ='24' and RechnungsKundenNr = 3013401 and RechnungsUstIdNr = 'U53187000' And BelegartenNr = 71 AND " & If(WdhDateiname = "", " AmbDateiname Is Null ", " AmbDateiname ='" & WdhDateiname & "' ") & " "
ElseIf ambarKreditor = "CS" Then
where = "WHERE Firma_ID ='24' and RechnungsKundenNr = 3017683 and RechnungsUstIdNr = 'U68374109' And BelegartenNr = 71 AND " & If(WdhDateiname = "", " AmbDateiname Is Null ", " AmbDateiname ='" & WdhDateiname & "' ") & " "
End If
End If
Dim kundennr = IIf(Not ambargubuchungen, "min(KundenNrZentrale)", "'725012'") 'fixe Debitorennr für AMBAR - VERAG Buchungen
@@ -594,7 +599,7 @@ Public Class cSyska_Interface
End Function
Shared Function getBuchungenZeilenAMBAR(Firma_ID As Integer, Rechnungsnummer As Integer, Rechnungsdatum As Date, Optional WdhDateiname As String = "") As DataTable
Shared Function getBuchungenZeilenAMBAR(Rechnungsnummer As Integer, Rechnungsdatum As Date, Optional WdhDateiname As String = "") As DataTable
Dim sqlStr = " SELECT isnull(le.SachkontoEUSteuerfrei,'0000') as Sachkonto ,IVO.Rechnungsdatum Rechnungsdatum,IVO.Rechnungsnummer Rechnungsnummer,FilialenNr,AbfertigungsNr,UnterNr,PROD.steuerpflichtig,[Steuersatz %] Steuersatz,BelegartenNr,