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

Timas -> TerminalID, Prvisionsverguetung, Rechnungssuche, etc.

Browse Source
This commit is contained in:
d.breimaier
2026-03-27 10:17:24 +01:00
parent 47bd09109f
commit ddae3769d0
12 changed files with 207 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
SDL/Fakturierung/cFakturierung.vb
View File

@@ -1197,6 +1197,7 @@ Public Class cFakturierung
If Buchungsjahr Is Nothing Then Buchungsjahr = Now.Year
rpt.txtBank3.Visible = False
rpt.txtBank2.Visible = True
' Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Select Case FIRMA.Firma_ID
@@ -1213,6 +1214,8 @@ Public Class cFakturierung
rpt.txtBank2.Text = If(FIRMA.Firma_Bankverbindung2, "") & vbNewLine & If(FIRMA.Firma_IBAN2, "") & vbNewLine & If(FIRMA.Firma_BIC2, "").ToString.Trim
rpt.txtBank3.Visible = True
rpt.txtBank2.Visible = False 'soll beim AMBAR ausgeblendet werden (Laut I.Ordu am 27.03.2026)
'Änderung Ticket_Nr.: 6983
'rpt.txtBank3.Text = "Garanti Bank Türkei – Euro Konto" & vbNewLine & "IBAN: TR90 0006 2001 6040 0009 0804 66" & vbNewLine & "BIC/SWIFT: TGBATRISXXX".ToString.Trim
'rpt.txtBank3.Text = "Garanti Bank Türkei – Euro Konto" & vbNewLine & "IBAN: TR90 0006 2001 6040 0009 0804 66" & vbNewLine & "BIC/SWIFT: TGBATRISXXX".ToString.Trim

38
SDL/Fakturierung/frmRechnungenSuche.Designer.vb generated
View File

@@ -115,6 +115,7 @@ Partial Class frmRechnungenSuche
Me.NachRechnungslandToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.NachLeistungsnummerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.NachZollabfertigungspreisenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.RechnungenOhnePositionenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.Button3 = New System.Windows.Forms.Button()
Me.Button1 = New System.Windows.Forms.Button()
Me.Label10 = New System.Windows.Forms.Label()
@@ -140,7 +141,7 @@ Partial Class frmRechnungenSuche
Me.pnlTop = New System.Windows.Forms.Panel()
Me.PictureBox5 = New System.Windows.Forms.PictureBox()
Me.TestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.RechnungenOhnePositionenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.PictureBox1 = New System.Windows.Forms.PictureBox()
CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainer.Panel1.SuspendLayout()
Me.SplitContainer.Panel2.SuspendLayout()
@@ -162,6 +163,7 @@ Partial Class frmRechnungenSuche
Me.ctxtRg.SuspendLayout()
Me.pnlTop.SuspendLayout()
CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'SplitContainer
@@ -1543,6 +1545,7 @@ Partial Class frmRechnungenSuche
'
'pnlBerichte
'
Me.pnlBerichte.Controls.Add(Me.PictureBox1)
Me.pnlBerichte.Controls.Add(Me.Button8)
Me.pnlBerichte.Controls.Add(Me.MenuStrip2)
Me.pnlBerichte.Controls.Add(Me.Button3)
@@ -1580,7 +1583,7 @@ Partial Class frmRechnungenSuche
Me.MenuStrip2.Location = New System.Drawing.Point(3, 27)
Me.MenuStrip2.Name = "MenuStrip2"
Me.MenuStrip2.Padding = New System.Windows.Forms.Padding(5, 2, 0, 2)
Me.MenuStrip2.Size = New System.Drawing.Size(263, 28)
Me.MenuStrip2.Size = New System.Drawing.Size(143, 28)
Me.MenuStrip2.TabIndex = 45
Me.MenuStrip2.Text = "Kundenauswertungen"
'
@@ -1599,30 +1602,37 @@ Partial Class frmRechnungenSuche
'
Me.ToolStripMenuItem3.Image = Global.SDL.My.Resources.Resources.statistik_small
Me.ToolStripMenuItem3.Name = "ToolStripMenuItem3"
Me.ToolStripMenuItem3.Size = New System.Drawing.Size(276, 26)
Me.ToolStripMenuItem3.Size = New System.Drawing.Size(272, 24)
Me.ToolStripMenuItem3.Text = "Nach Rechnungsanschrift"
'
'NachRechnungslandToolStripMenuItem
'
Me.NachRechnungslandToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.NachRechnungslandToolStripMenuItem.Name = "NachRechnungslandToolStripMenuItem"
Me.NachRechnungslandToolStripMenuItem.Size = New System.Drawing.Size(276, 26)
Me.NachRechnungslandToolStripMenuItem.Size = New System.Drawing.Size(272, 24)
Me.NachRechnungslandToolStripMenuItem.Text = "Nach Rechnungsland"
'
'NachLeistungsnummerToolStripMenuItem
'
Me.NachLeistungsnummerToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.NachLeistungsnummerToolStripMenuItem.Name = "NachLeistungsnummerToolStripMenuItem"
Me.NachLeistungsnummerToolStripMenuItem.Size = New System.Drawing.Size(276, 26)
Me.NachLeistungsnummerToolStripMenuItem.Size = New System.Drawing.Size(272, 24)
Me.NachLeistungsnummerToolStripMenuItem.Text = "Nach Leistungsnummer"
'
'NachZollabfertigungspreisenToolStripMenuItem
'
Me.NachZollabfertigungspreisenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.NachZollabfertigungspreisenToolStripMenuItem.Name = "NachZollabfertigungspreisenToolStripMenuItem"
Me.NachZollabfertigungspreisenToolStripMenuItem.Size = New System.Drawing.Size(276, 26)
Me.NachZollabfertigungspreisenToolStripMenuItem.Size = New System.Drawing.Size(272, 24)
Me.NachZollabfertigungspreisenToolStripMenuItem.Text = "Nach Zollabf.-preisen (LNr: 340)"
'
'RechnungenOhnePositionenToolStripMenuItem
'
Me.RechnungenOhnePositionenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.RechnungenOhnePositionenToolStripMenuItem.Name = "RechnungenOhnePositionenToolStripMenuItem"
Me.RechnungenOhnePositionenToolStripMenuItem.Size = New System.Drawing.Size(272, 24)
Me.RechnungenOhnePositionenToolStripMenuItem.Text = "Rechnungen ohne Positionen"
'
'Button3
'
Me.Button3.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
@@ -1881,12 +1891,16 @@ Partial Class frmRechnungenSuche
Me.TestToolStripMenuItem.Size = New System.Drawing.Size(150, 19)
Me.TestToolStripMenuItem.Text = "test"
'
'RechnungenOhnePositionenToolStripMenuItem
'PictureBox1
'
Me.RechnungenOhnePositionenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.RechnungenOhnePositionenToolStripMenuItem.Name = "RechnungenOhnePositionenToolStripMenuItem"
Me.RechnungenOhnePositionenToolStripMenuItem.Size = New System.Drawing.Size(276, 26)
Me.RechnungenOhnePositionenToolStripMenuItem.Text = "Rechnungen ohne Positionen"
Me.PictureBox1.BackgroundImage = Global.SDL.My.Resources.Resources.fragezeichen
Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.PictureBox1.Location = New System.Drawing.Point(900, 20)
Me.PictureBox1.Name = "PictureBox1"
Me.PictureBox1.Size = New System.Drawing.Size(18, 19)
Me.PictureBox1.TabIndex = 132
Me.PictureBox1.TabStop = False
Me.PictureBox1.Visible = False
'
'frmRechnungenSuche
'
@@ -1929,6 +1943,7 @@ Partial Class frmRechnungenSuche
Me.pnlTop.ResumeLayout(False)
Me.pnlTop.PerformLayout()
CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
End Sub
@@ -2049,4 +2064,5 @@ Partial Class frmRechnungenSuche
Friend WithEvents NachLeistungsnummerToolStripMenuItem As ToolStripMenuItem
Friend WithEvents Button8 As Button
Friend WithEvents RechnungenOhnePositionenToolStripMenuItem As ToolStripMenuItem
Friend WithEvents PictureBox1 As PictureBox
End Class

4
SDL/Fakturierung/frmRechnungenSuche.vb
View File

@@ -1031,4 +1031,8 @@ Public Class frmRechnungenSuche
End Try
End Sub
Private Sub PictureBox1_Click(sender As Object, e As EventArgs) Handles PictureBox1.Click
Dim webAddress As String = "https://wiki.verag.ag/de/abteilungen/verrechnung/xxxx#provisionsverg%C3%BCtung"
Process.Start(webAddress)
End Sub
End Class

61
SDL/Fakturierung/usrCntlFaktAbrechnung.vb
View File

@@ -1,6 +1,7 @@
Imports System.Data.SqlClient
Imports System.IO
Imports System.Web.UI.WebControls.Expressions
Imports com.sun.xml.internal.rngom
Imports VERAG_PROG_ALLGEMEIN
Public Class usrCntlFaktAbrechnung
@@ -1885,6 +1886,8 @@ Public Class usrCntlFaktAbrechnung
.Rows.Add(0, r("anh_Art"), r("anh_Name"), r("anh_docId"), r("anh_id"))
Next
End If
End If
RECHNUNG.LOAD_ANHAENGE()
@@ -1899,7 +1902,7 @@ Public Class usrCntlFaktAbrechnung
End If
Next
'-----------------------------
addCBamFlyer(dgvAnhaenge)
'-----------------------------
'ANHÄNGE SELEKTIEREN
'-----------------------------
@@ -5363,10 +5366,7 @@ mwst:
Return isMWST
End Function
Private Sub ApplyPreis(
r As DataGridViewRow,
summen As AntragSummen,
isRMCKunde As Boolean)
Private Sub ApplyPreis(r As DataGridViewRow, summen As AntragSummen, isRMCKunde As Boolean)
r.Cells("Anzahl").Value = 1
@@ -5381,24 +5381,13 @@ mwst:
End Sub
Private Sub ApplyBearbeitungsGebuehr(
r As DataGridViewRow,
summen As AntragSummen,
ByRef summeRMC As Double,
ByRef summeFremd As Double,
ByRef fremdUndRMC As Boolean,
ByRef posChanged As Boolean,
changed As Boolean,
sumOffertRMC As Double,
sumOffertFremd As Double)
Private Sub ApplyBearbeitungsGebuehr(r As DataGridViewRow, summen As AntragSummen, ByRef summeRMC As Double, ByRef summeFremd As Double, ByRef fremdUndRMC As Boolean, ByRef posChanged As Boolean, changed As Boolean, sumOffertRMC As Double, sumOffertFremd As Double)
If IsDBNull(r.Cells("BGebLeistungsNr").Value) Then Exit Sub
If IsDBNull(r.Cells("BGebProzent").Value) Then Exit Sub
If IsDBNull(r.Cells("Preis").Value) Then Exit Sub
' hier nur noch Gebühr-Logik
' KEINE MWST-Logik mehr
' KEINE Antrag-Logik mehr
posChanged = True
@@ -5419,4 +5408,40 @@ mwst:
OrElse SPEDBUCH.Abfertigungsart = 10
End Function
Private Sub addCBamFlyer(dgv As DataGridView)
If RECHNUNG Is Nothing Then Exit Sub
If SPEDBUCH Is Nothing Then Exit Sub
If RECHNUNG.ReErfZeitstempel IsNot Nothing AndAlso CDate(RECHNUNG.ReErfZeitstempel) <= DateTime.Parse("26/05/2026") AndAlso RECHNUNG.DruckDatumZeit Is Nothing Then
Select Case FIRMA.Firma_ID
Case 7, 19
Case Else
If SPEDBUCH.Abfertigungsart IsNot Nothing Then
If RECHNUNG.RechnungsLandKz <> "TR" AndAlso RECHNUNG.RechnungsLandKz <> "GB" Then
Select Case SPEDBUCH.Abfertigungsart
Case 1, 3, 5, 7, 26, 28, 38, 39, 29, 66
Dim docID As Integer = IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, 13567402, 13638537)
Dim exists = dgv.Rows.Cast(Of DataGridViewRow)().Any(Function(r) Not r.IsNewRow AndAlso CInt(r.Cells("anh_docId").Value) = docID)
If Not exists Then
dgv.Rows.Add(1, "INFO", "CBAM-FLYER", docID, 0)
End If
End Select
End If
End If
End Select
End If
End Sub
End Class

6
SDL/Speditionsbuch/frmProvisionisverguetung.vb
View File

@@ -152,7 +152,7 @@ Public Class frmProvisionisverguetung
Dim mailText As String = "Sehr geehrte Damen und Herren," & vbNewLine & vbNewLine & "anbei die PROVISIONSABRECHNUNG von " & txtAbfertDat._value & " bis " & txtAbfertDatBis._value & "." & vbNewLine & vbNewLine & vbNewLine
mailText &= "<table border=1>"
mailText &= "<tr><td></td><td>Anzahl Rechnungen</td><td>Umsatz</td><td>Provision</td></tr>"
mailText &= "<tr><td>Kunde</td><td>Anzahl Rechnungen</td><td>Umsatz</td><td>Provision</td></tr>"
Dim sumProv As Double = 0
Dim sumUmsatz As Double = 0
@@ -161,7 +161,7 @@ Public Class frmProvisionisverguetung
For Each row As DataGridViewRow In dgv.SelectedRows
mailText &= "<tr>"
mailText &= "<td><b></b></td>"
mailText &= "<td><b>" & row.Cells("Ordnungsbegriff").Value & "</b></td>"
mailText &= "<td><b>" & row.Cells("Anzahl").Value & "</b></td>"
mailText &= "<td><b>" & CDbl(row.Cells("Umsatz").Value) & "</b></td>"
mailText &= "<td><b>" & CDbl(row.Cells("Provision").Value) & "</b></td>"
@@ -189,6 +189,8 @@ Public Class frmProvisionisverguetung
Mail.HTMLBody = TextHTML
End If
Mail.Subject = "Provisionsauswertung"
Mail.To = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(ad.AdressenNr, "Rechnung an")
Mail.CC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(ad.AdressenNr, "Rechnung an")
Mail.BCC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(ad.AdressenNr, "Rechnung an")

14
SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb
View File

@@ -54,7 +54,7 @@ Public Class usrCntlSpeditionsBuchSuche
dgvLKW.Visible = False
sqlstr &= " SELECT " & TopMax & " [FilialenNr],[AbfertigungsNr],[UnterNr],[Abfertigungsdatum],speditionsbuch.[Abfertigungsart],Abfertigungsarten.Abfertigungsbezeichnung, " &
" isnull(cast([AbsenderKundenNr] as nvarchar(7)) + ' ','') + [Absender] as Absender,isnull(cast([EmpfängerKundenNr] as nvarchar(7)) + ' ','') + [Empfänger] as Empfänger,isnull(cast([VermittlerKundenNr] as nvarchar(7)) + ' ','') + [Vermittler] as Vermittler,isnull(cast([FrachtführerKundenNr] as nvarchar(7)) + ' ','') + [Frachtführer] as Frachtführer, " &
" isnull(cast([AbsenderKundenNr] as nvarchar(7)) + ' ','') + [Absender] as Absender,isnull(cast([EmpfängerKundenNr] as nvarchar(7)) + ' ','') + [Empfänger] as Empfänger,isnull(cast([VermittlerKundenNr] as nvarchar(7)) + ' ','') + [Vermittler] as Vermittler,isnull(cast([FrachtführerKundenNr] as nvarchar(7)) + ' ','') + [Frachtführer] as Frachtführer,isnull(cast([AvisiererKundenNr] as nvarchar(7)) + ' ','') + [Avisierer] as Avisierer, " &
" [LKW Kennzeichen],QKN,(SELECT isnull(Name,'') FROM Personal Where Personalnummer=ID) AS Sachbearbeiter,BelegNr, Grenzstelle FROM [Speditionsbuch] LEFT JOIN Abfertigungsarten ON Abfertigungsarten.Abfertigungsart=speditionsbuch.Abfertigungsart WHERE 1=1 "
'/*Sachbearbeiter ,[Bar],[Fakturiert],[BelegNr],[ErfassungsNr],[AnzahlZA],[AnzahlZAFremd],[AnzahlZnV],[AnzahlZnVFremd],[AnzahlT1],[AnzahlT2],[AnzahlAE],[AnzahlCarnetTIR],[AnzahlBarvorlagen],[AnzahlSonstiges],[AnzahlGrenzgebühren],[AvisUhrzeit],[Rechnungsbetrag],[Abfertigungsanzahl],[Barzahlungsbetrag],[Sachbearbeiter],[Personalnummer],[AtlasBezNrEZA],[AtlasBezNrNCTS],[Versendungsland],[SB_CMR],[SB_CMRDatum],[veoerz_basbtg],[Zucker_MRN_Nr],[Zucker_MRN_Datum],[Zucker_Aufschub],[Zollsystem],[Bestimmungszollstelle],[Bürgschaft],[Sicherheitsbetrag],[SgutKompl],[Bestimmungsland],[EuFiskalEmpfänger],[QKN],[EndempfängerKundenNr],[Endempfänger] */
With DataGridView
@@ -103,9 +103,11 @@ Public Class usrCntlSpeditionsBuchSuche
.Columns("Frächter").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
.Columns("Frächter").MinimumWidth = 150
.Columns("Avisierer").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
.Columns("Avisierer").MinimumWidth = 150
.Columns("Freigabe").Width = 105
@@ -116,7 +118,7 @@ Public Class usrCntlSpeditionsBuchSuche
If dgvLKW.SelectedRows().Count = 0 Then Exit Sub
Dim sqlstrTmp = " SELECT " & TopMax & " [FilialenNr],[AbfertigungsNr],[UnterNr],[Abfertigungsdatum],speditionsbuch.[Abfertigungsart],Abfertigungsarten.Abfertigungsbezeichnung, " &
" isnull(cast([AbsenderKundenNr] as nvarchar(7)) + ' ','') + [Absender] as Absender,isnull(cast([EmpfängerKundenNr] as nvarchar(7)) + ' ','') + [Empfänger] as Empfänger,isnull(cast([VermittlerKundenNr] as nvarchar(7)) + ' ','') + [Vermittler] as Vermittler,isnull(cast([FrachtführerKundenNr] as nvarchar(7)) + ' ','') + [Frachtführer] as Frachtführer, " &
" isnull(cast([AbsenderKundenNr] as nvarchar(7)) + ' ','') + [Absender] as Absender,isnull(cast([EmpfängerKundenNr] as nvarchar(7)) + ' ','') + [Empfänger] as Empfänger,isnull(cast([VermittlerKundenNr] as nvarchar(7)) + ' ','') + [Vermittler] as Vermittler,isnull(cast([FrachtführerKundenNr] as nvarchar(7)) + ' ','') + [Frachtführer] as Frachtführer,isnull(cast([AvisiererKundenNr] as nvarchar(7)) + ' ','') + [Avisierer] as Avisierer, " &
" [LKW Kennzeichen],QKN,(SELECT isnull(Name,'') FROM Personal Where Personalnummer=ID) AS Sachbearbeiter ,BelegNr, Grenzstelle FROM [Speditionsbuch] LEFT JOIN Abfertigungsarten ON Abfertigungsarten.Abfertigungsart=speditionsbuch.Abfertigungsart WHERE 1=1 "
With DataGridView
@@ -179,10 +181,18 @@ Public Class usrCntlSpeditionsBuchSuche
.Columns("Frachtführer").HeaderText = "Frachtführer"
.Columns("Frachtführer").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
.Columns("Avisierer").MinimumWidth = 150
.Columns("Avisierer").HeaderText = "Avisierer"
.Columns("Avisierer").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
.Columns("LKW Kennzeichen").Width = 120
.Columns("LKW Kennzeichen").HeaderText = "LKW Kennzeichen"
.Columns("Grenzstelle").Visible = False
'.Columns("Avisierer").Visible = False
.Columns("BelegNr").Width = 160
.Columns("Sachbearbeiter").MinimumWidth = 100
'MsgBox(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_niederlassung)

19
SDL/mdm/usrcntlFremdrechnungen.vb
View File

@@ -641,6 +641,7 @@ Public Class usrcntlFremdrechnungen
'SET_SDL("ALLE")
Dim btcNotSet As Integer = 0
Dim missingInvoices As Integer = 0
Dim uta As cUTA
Dim ids As cIDS
@@ -660,9 +661,19 @@ Public Class usrcntlFremdrechnungen
lblCountOrigRechnungen.Text = btcNotSet
countbtcNotSet = btcNotSet
missingInvoices += ids.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value, , txtKundenNrvon.Text, txtKundenNrbis.Text)
missingInvoices += uta.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value, , txtKundenNrvon.Text, txtKundenNrbis.Text)
missingInvoices += rmc.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value, , txtKundenNrvon.Text, txtKundenNrbis.Text)
missingInvoices += ploseRE.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value, , txtKundenNrvon.Text, txtKundenNrbis.Text)
missingInvoices += mse.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value, , txtKundenNrvon.Text, txtKundenNrbis.Text)
lblCountMissingInvoices.Text = missingInvoices
countMissingInvoices = missingInvoices
ElseIf txtKundenNrvon.Text = "" AndAlso txtKundenNrbis.Text = "" Then
SET_SDL("ALLE")
btcNotSet += ids.countBackToCustomerNotSet(New VERAG_PROG_ALLGEMEIN.SQL)
btcNotSet += uta.countBackToCustomerNotSet(New VERAG_PROG_ALLGEMEIN.SQL)
btcNotSet += rmc.countBackToCustomerNotSet(New VERAG_PROG_ALLGEMEIN.SQL)
@@ -671,6 +682,14 @@ Public Class usrcntlFremdrechnungen
lblCountOrigRechnungen.Text = btcNotSet
countbtcNotSet = btcNotSet
missingInvoices += ids.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value)
missingInvoices += uta.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value)
missingInvoices += rmc.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value)
missingInvoices += ploseRE.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value)
missingInvoices += mse.checkPDFInvoices(dat_Sum_Von.Value, dat_Sum_Bis.Value)
lblCountMissingInvoices.Text = missingInvoices
countMissingInvoices = missingInvoices
End If
End Sub

6
VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb
View File

@@ -88,7 +88,7 @@ Public Class cMitarbeiter
Property mit_CSuser As Object = Nothing
Property mit_CSpwd As Object = Nothing
Property mit_PersonalNr As Object = Nothing
Property mit_timasId As Object = Nothing
Property mit_timasId As Object = Nothing 'interne ID von TIMAS
Property mit_ATGRNAccessCode_AT51FP7 As Object = Nothing
Property mit_ATGRNAccessCode_AT52VA6 As Object = Nothing
Property mit_Sprachkentnisse As Object = Nothing
@@ -97,12 +97,12 @@ Public Class cMitarbeiter
Property mit_ausstempelnBeiBeenden As Boolean = False
Property mit_timasMehrereFirmen As Boolean = False
Property mit_timasFirmen As Object = Nothing
Property mit_Notfall_Name As Object = Nothing
Property mit_Notfall_Handy As Object = Nothing
Property mit_Notfall_Mail As Object = Nothing
Property mit_SchalterID As Object = Nothing
Property mit_Funktion As Object = Nothing
Property mit_terminalTimasId As Object = Nothing 'externe ID von TIMAS
@@ -223,6 +223,7 @@ Public Class cMitarbeiter
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_Notfall_Mail", mit_Notfall_Mail))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_SchalterID", mit_SchalterID))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_Funktion", mit_Funktion))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_terminalTimasId", mit_terminalTimasId))
@@ -434,6 +435,7 @@ Public Class cMitarbeiter
If Not dr.Item("mit_Notfall_Mail") Is DBNull.Value Then Me.mit_Notfall_Mail = dr.Item("mit_Notfall_Mail")
If Not dr.Item("mit_SchalterID") Is DBNull.Value Then Me.mit_SchalterID = dr.Item("mit_SchalterID")
If Not dr.Item("mit_Funktion") Is DBNull.Value Then Me.mit_Funktion = dr.Item("mit_Funktion")
If Not dr.Item("mit_terminalTimasId") Is DBNull.Value Then Me.mit_terminalTimasId = dr.Item("mit_terminalTimasId")
Catch ex As Exception

90
VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb generated
View File

@@ -28,6 +28,7 @@ Partial Class frmMitarbeitersuche
Me.Button4 = New System.Windows.Forms.Button()
Me.btnClose = New System.Windows.Forms.Button()
Me.PictureBox2 = New System.Windows.Forms.PictureBox()
Me.sbMitarbeiter = New VERAG_PROG_ALLGEMEIN.MySearchBox()
Me.pnlMain = New System.Windows.Forms.Panel()
Me.pnl = New System.Windows.Forms.Panel()
Me.Button3 = New System.Windows.Forms.Button()
@@ -73,7 +74,6 @@ Partial Class frmMitarbeitersuche
Me.pnlGeburtstag = New System.Windows.Forms.Panel()
Me.lblGeburtstag = New System.Windows.Forms.Label()
Me.PictureBox1 = New System.Windows.Forms.PictureBox()
Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
Me.Panel1 = New System.Windows.Forms.Panel()
Me.lblPosition = New System.Windows.Forms.Label()
@@ -89,7 +89,9 @@ Partial Class frmMitarbeitersuche
Me.Label17 = New System.Windows.Forms.Label()
Me.lblNotfall_Handy = New System.Windows.Forms.Label()
Me.lblNotfall_Name = New System.Windows.Forms.Label()
Me.sbMitarbeiter = New VERAG_PROG_ALLGEMEIN.MySearchBox()
Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.Label14 = New System.Windows.Forms.Label()
Me.lblTimasID = New System.Windows.Forms.Label()
Me.pnlSrch.SuspendLayout()
CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
Me.pnlMain.SuspendLayout()
@@ -163,6 +165,32 @@ Partial Class frmMitarbeitersuche
Me.PictureBox2.TabIndex = 18
Me.PictureBox2.TabStop = False
'
'sbMitarbeiter
'
Me.sbMitarbeiter._allowFreitext = False
Me.sbMitarbeiter._AllowSetValue = False
Me.sbMitarbeiter._allowSpaceAsSplitter = True
Me.sbMitarbeiter._autoSizeGross = False
Me.sbMitarbeiter._hideIfListEmpty = True
Me.sbMitarbeiter._value = Nothing
Me.sbMitarbeiter.conn_art = "FMZOLL"
Me.sbMitarbeiter.dgvpos = "LEFT"
Me.sbMitarbeiter.DISPLAY_PARAM = Nothing
Me.sbMitarbeiter.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!)
Me.sbMitarbeiter.INVISIBLE_COLUMNS = Nothing
Me.sbMitarbeiter.key_visible = False
Me.sbMitarbeiter.KEYPARAM = Nothing
Me.sbMitarbeiter.Location = New System.Drawing.Point(45, 11)
Me.sbMitarbeiter.Name = "sbMitarbeiter"
Me.sbMitarbeiter.searchActive = True
Me.sbMitarbeiter.Size = New System.Drawing.Size(582, 29)
Me.sbMitarbeiter.SQL_ORDER_BY = Nothing
Me.sbMitarbeiter.SQL_SELECT = Nothing
Me.sbMitarbeiter.SQL_WHERE = Nothing
Me.sbMitarbeiter.SQL_WhereParamList = Nothing
Me.sbMitarbeiter.TabIndex = 0
Me.sbMitarbeiter.usrcntl = Nothing
'
'pnlMain
'
Me.pnlMain.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
@@ -178,6 +206,8 @@ Partial Class frmMitarbeitersuche
'
Me.pnl.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
Me.pnl.BackColor = System.Drawing.Color.FromArgb(CType(CType(250, Byte), Integer), CType(CType(254, Byte), Integer), CType(CType(255, Byte), Integer))
Me.pnl.Controls.Add(Me.lblTimasID)
Me.pnl.Controls.Add(Me.Label14)
Me.pnl.Controls.Add(Me.Button3)
Me.pnl.Controls.Add(Me.Panel2)
Me.pnl.Controls.Add(Me.pnlZeiten)
@@ -698,11 +728,6 @@ Partial Class frmMitarbeitersuche
Me.PictureBox1.TabIndex = 13
Me.PictureBox1.TabStop = False
'
'ContextMenuStrip1
'
Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
'
'MyPanel1
'
Me.MyPanel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(250, Byte), Integer), CType(CType(254, Byte), Integer), CType(CType(255, Byte), Integer))
@@ -874,31 +899,32 @@ Partial Class frmMitarbeitersuche
Me.lblNotfall_Name.Text = "-"
Me.lblNotfall_Name.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
'
'sbMitarbeiter
'ContextMenuStrip1
'
Me.sbMitarbeiter._allowFreitext = False
Me.sbMitarbeiter._AllowSetValue = False
Me.sbMitarbeiter._allowSpaceAsSplitter = True
Me.sbMitarbeiter._autoSizeGross = False
Me.sbMitarbeiter._hideIfListEmpty = True
Me.sbMitarbeiter._value = Nothing
Me.sbMitarbeiter.conn_art = "FMZOLL"
Me.sbMitarbeiter.dgvpos = "LEFT"
Me.sbMitarbeiter.DISPLAY_PARAM = Nothing
Me.sbMitarbeiter.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!)
Me.sbMitarbeiter.INVISIBLE_COLUMNS = Nothing
Me.sbMitarbeiter.key_visible = False
Me.sbMitarbeiter.KEYPARAM = Nothing
Me.sbMitarbeiter.Location = New System.Drawing.Point(45, 11)
Me.sbMitarbeiter.Name = "sbMitarbeiter"
Me.sbMitarbeiter.searchActive = True
Me.sbMitarbeiter.Size = New System.Drawing.Size(582, 29)
Me.sbMitarbeiter.SQL_ORDER_BY = Nothing
Me.sbMitarbeiter.SQL_SELECT = Nothing
Me.sbMitarbeiter.SQL_WHERE = Nothing
Me.sbMitarbeiter.SQL_WhereParamList = Nothing
Me.sbMitarbeiter.TabIndex = 0
Me.sbMitarbeiter.usrcntl = Nothing
Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
'
'Label14
'
Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label14.Location = New System.Drawing.Point(501, 93)
Me.Label14.Name = "Label14"
Me.Label14.Size = New System.Drawing.Size(74, 20)
Me.Label14.TabIndex = 130
Me.Label14.Text = "TiMas-ID:"
Me.Label14.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
'
'lblTimasID
'
Me.lblTimasID.AutoSize = True
Me.lblTimasID.Cursor = System.Windows.Forms.Cursors.Hand
Me.lblTimasID.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.lblTimasID.Location = New System.Drawing.Point(581, 93)
Me.lblTimasID.Name = "lblTimasID"
Me.lblTimasID.Size = New System.Drawing.Size(59, 20)
Me.lblTimasID.TabIndex = 131
Me.lblTimasID.Text = "12345"
Me.lblTimasID.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
'
'frmMitarbeitersuche
'
@@ -1006,4 +1032,6 @@ Partial Class frmMitarbeitersuche
Friend WithEvents lblNotfall_Handy As Windows.Forms.Label
Friend WithEvents lblNotfall_Name As Windows.Forms.Label
Friend WithEvents cbxLaengergearbeitet As Windows.Forms.CheckBox
Friend WithEvents lblTimasID As Windows.Forms.Label
Friend WithEvents Label14 As Windows.Forms.Label
End Class

1
VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb
View File

@@ -87,6 +87,7 @@ Public Class frmMitarbeitersuche
lblFirma.Text = MA.getFirma
lblNiederlassung.Text = If(MA.mit_niederlassung, "")
lblMAId.Text = MA.mit_id
lblTimasID.Text = MA.mit_terminalTimasId
lblTelefon.Text = If(MA.mit_durchwahl, "")
lblMail.Text = If(MA.mit_email, "")

48
VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb
View File

@@ -1195,36 +1195,46 @@ Public Class cMSEAPI
' Amounts
If Not IsDBNull(currentRow(35)) Then
Double.TryParse(currentRow(35).ToString(), total_amount_euro)
Double.TryParse(currentRow(35).ToString().Replace(".", ","), total_amount_euro)
End If
If Not IsDBNull(currentRow(36)) Then
Double.TryParse(currentRow(36).ToString().Replace(".", ","), total_vat_amount_euro)
End If
'If total_amount_euro <> 0 OrElse total_vat_amount_euro <> 0 Then
' MsgBox("Hier " & total_amount_euro & " " & total_vat_amount_euro)
'End If
Dim inv As New cMSEInvoices(invoiceDate, Country, customerID)
inv.invoice_id = invoiceID
If lngRecordCount = 2 Then
MDMEinarb.invoicedate = invoiceDate
End If
If Not inv.hasEntry Then
inv.invoice_id = invoiceID
If lngRecordCount = 2 Then
MDMEinarb.invoicedate = invoiceDate
End If
If inv.hasEntry Then
inv.total_amount_euro += total_amount_euro
inv.total_vat_amount_euro += total_vat_amount_euro
Else
inv.total_amount_euro = total_amount_euro
inv.total_vat_amount_euro = total_vat_amount_euro
End If
inv.name = "TEMP"
inv.msts_vat_number = -1
inv.alternativeImport = True
inv.SAVEBYCUSTOMERIDDATE()
inv.name = "TEMP"
inv.msts_vat_number = -1
inv.alternativeImport = True
inv.SAVEBYCUSTOMERIDDATE()
Console.WriteLine("MSE: " & isleernothing((currentRow(1))) & " - " & lngRecordCount & " - " & isleernothing((currentRow(10))))
Else
If total_amount_euro <> 0 OrElse total_vat_amount_euro <> 0 Then 'nicht relevanten Änderungen überspringen!
inv.total_amount_euro += total_amount_euro
inv.total_vat_amount_euro += total_vat_amount_euro
inv.SAVEBYCUSTOMERIDDATE()
End If
End If
Console.WriteLine("MSE: " & isleernothing((currentRow(1))) & " - " & lngRecordCount & " - " & isleernothing((currentRow(10))))
@@ -1796,7 +1806,7 @@ Public Class cMSEInvoices
Public Function SAVEBYCUSTOMERIDDATE() As Boolean
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblMSEInvoices WHERE invoice_date=@invoice_date AND invoice_id = @invoice_id AND customer_number = @customer_number) " &
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblMSEInvoices WHERE invoice_date=@invoice_date AND invoice_id = @invoice_id AND customer_number = @customer_number AND country = @country) " &
" BEGIN " & getUpdateCmdBYCustomeridDate() & " END " &
" Else " &
" BEGIN " & getInsertCmd() & " END " &
@@ -1809,7 +1819,7 @@ Public Class cMSEInvoices
Public Function SAVEBYCountry() As Boolean
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblMSEInvoices WHERE invoice_date=@invoice_date AND invoice_id = @invoice_id AND customer_number = @customer_number) " &
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblMSEInvoices WHERE invoice_date=@invoice_date AND country = @country AND customer_number = @customer_number) " &
" BEGIN " & getUpdateCmdBYCustomeridDateCountry() & " END " &
" Else " &
" BEGIN " & getInsertCmd() & " END " &
@@ -1966,7 +1976,7 @@ Public Class cMSEInvoices
End If
Next
str = str.Substring(0, str.Length - 1) 'wg. ','
Return (" UPDATE tblMSEInvoices SET " & str & " WHERE invoice_date=@invoice_date AND invoice_id = @invoice_id AND customer_number = @customer_number ")
Return (" UPDATE tblMSEInvoices SET " & str & " WHERE invoice_date=@invoice_date AND invoice_id = @invoice_id AND customer_number = @customer_number AND country = @country ")
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)

4
VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb
View File

@@ -304,14 +304,14 @@ Public Class cTimasAPI
Dim success As Boolean
Dim json As New Chilkat.JsonObject
success = json.UpdateString("externid", mitarbeiter.mit_id)
success = json.UpdateString("externid", mitarbeiter.mit_terminalTimasId)
success = json.UpdateString("markingColor", "#3acc2d")
success = json.UpdateString("pnr1", mitarbeiter.mit_PersonalNr) 'für Personalverr.
'success = json.UpdateString("pnr2", "ZZ-3A-Q")
success = json.UpdateString("firstname", mitarbeiter.mit_vname)
success = json.UpdateString("lastname", mitarbeiter.mit_nname)
success = json.UpdateString("gender", IIf(mitarbeiter.mit_geschlecht = "m", "male", "female"))
success = json.UpdateInt("card", mitarbeiter.mit_id)
success = json.UpdateInt("card", mitarbeiter.mit_terminalTimasId)
success = json.UpdateString("info", mitarbeiter.mit_firma & " - " & mitarbeiter.mit_abteilung)
If mitarbeiter.mit_gebdat <> "" And IsDate(mitarbeiter.mit_gebdat) Then
success = json.UpdateString("birthday", CDate(mitarbeiter.mit_gebdat).ToString("yyyy-MM-dd"))