Merge branch 'ADMIN' of https://git.it.verag.ag/edv/ADMIN into ADMIN
This commit is contained in:
975
UID/Mitarbeiter/frmMitarbDetails.Designer.vb
generated
975
UID/Mitarbeiter/frmMitarbDetails.Designer.vb
generated
File diff suppressed because it is too large
Load Diff
@@ -1681,6 +1681,15 @@ Public Class frmMitarbDetails
|
||||
Catch ex As Exception
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
||||
End Try
|
||||
|
||||
ElseIf TabControl2.SelectedIndex = 3 Then
|
||||
|
||||
txtSessDatVon.Text = Now.ToShortDateString
|
||||
txtSessDatBis.Text = Now.ToShortDateString
|
||||
|
||||
btnMonat.Text = MONAT.ToString("MMMM")
|
||||
btnJahr.Text = JAHR.Year
|
||||
|
||||
End If
|
||||
|
||||
End Sub
|
||||
@@ -1707,6 +1716,128 @@ Public Class frmMitarbDetails
|
||||
End If
|
||||
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub Button6_Click1(sender As Object, e As EventArgs) Handles btnReduceDay.Click
|
||||
srcTAG = srcTAG.AddDays(-1)
|
||||
initBtns("Tag")
|
||||
End Sub
|
||||
|
||||
Private Sub Button7_Click1(sender As Object, e As EventArgs) Handles btnAddDay.Click
|
||||
srcTAG = srcTAG.AddDays(1)
|
||||
initBtns("Tag")
|
||||
End Sub
|
||||
|
||||
Private Sub Button5_Click1(sender As Object, e As EventArgs) Handles btnToday.Click
|
||||
initBtns("Tag")
|
||||
End Sub
|
||||
|
||||
Private Sub btnJahr_Click(sender As Object, e As EventArgs) Handles btnJahr.Click
|
||||
initBtns("Jahr")
|
||||
End Sub
|
||||
|
||||
Private Sub btnBisMonat_Click(sender As Object, e As EventArgs) Handles btnBisMonat.Click
|
||||
MONAT = MONAT.AddMonths(1)
|
||||
initBtns("Monat")
|
||||
End Sub
|
||||
|
||||
Private Sub btnVonMonat_Click(sender As Object, e As EventArgs) Handles btnVonMonat.Click
|
||||
MONAT = MONAT.AddMonths(-1)
|
||||
initBtns("Monat")
|
||||
End Sub
|
||||
|
||||
Private Sub btnBisJahr_Click(sender As Object, e As EventArgs) Handles btnBisJahr.Click
|
||||
JAHR = JAHR.AddYears(1)
|
||||
initBtns("Jahr")
|
||||
End Sub
|
||||
|
||||
Private Sub btnVonJahr_Click(sender As Object, e As EventArgs) Handles btnVonJahr.Click
|
||||
JAHR = JAHR.AddYears(-1)
|
||||
initBtns("Jahr")
|
||||
End Sub
|
||||
|
||||
Private Sub btnMonat_Click(sender As Object, e As EventArgs) Handles btnMonat.Click
|
||||
initBtns("Monat")
|
||||
End Sub
|
||||
|
||||
Dim MONAT As Date = CDate("01." & Now.Month & "." & Now.Year) '.AddMonths(-1)
|
||||
Dim srcTAG As Date = CDate(Now.ToShortDateString)
|
||||
|
||||
Dim JAHR As Date = CDate("01.01." & Now.Year)
|
||||
Sub initBtns(MonatJahr)
|
||||
btnMonat.Text = MONAT.ToString("MMMM")
|
||||
btnJahr.Text = JAHR.Year
|
||||
Select Case MonatJahr
|
||||
Case "Monat"
|
||||
DateTimePicker1.Value = MONAT
|
||||
DateTimePicker2.Value = MONAT.AddMonths(1).AddDays(-1)
|
||||
Case "Jahr"
|
||||
' If cbxGeschaftsjahr.Checked Then
|
||||
'DateTimePicker1.Value = JAHR.AddMonths(1)
|
||||
' DateTimePicker2.Value = JAHR.AddYears(1).AddMonths(1).AddDays(-1)
|
||||
' Else
|
||||
DateTimePicker1.Value = JAHR
|
||||
DateTimePicker2.Value = JAHR.AddYears(1).AddDays(-1)
|
||||
'End If
|
||||
Case "Tag"
|
||||
' If cbxGeschaftsjahr.Checked Then
|
||||
'DateTimePicker1.Value = JAHR.AddMonths(1)
|
||||
' DateTimePicker2.Value = JAHR.AddYears(1).AddMonths(1).AddDays(-1)
|
||||
' Else
|
||||
DateTimePicker1.Value = srcTAG
|
||||
DateTimePicker2.Value = srcTAG
|
||||
If srcTAG = Now.ToShortDateString Then
|
||||
btnToday.Text = "Heute"
|
||||
ElseIf srcTAG = Now.AddDays(-1).ToShortDateString Then
|
||||
btnToday.Text = "Gestern"
|
||||
ElseIf srcTAG = Now.AddDays(-2).ToShortDateString Then
|
||||
btnToday.Text = "Vorgestern"
|
||||
Else
|
||||
btnToday.Text = srcTAG.ToString("dd.MM")
|
||||
End If
|
||||
|
||||
'End If
|
||||
Case ""
|
||||
DateTimePicker1.Value = ("01." & Now.Month & "." & Now.Year)
|
||||
DateTimePicker2.Value = Now
|
||||
End Select
|
||||
|
||||
initdgvSessions(CDate(DateTimePicker1.Value).Date, CDate(DateTimePicker2.Value).Date)
|
||||
'btnSuche.PerformClick()
|
||||
End Sub
|
||||
|
||||
Private Sub initdgvSessions(von As Date, bis As Date)
|
||||
|
||||
Dim SQL_SESSIONS = "select [sess_niederlassung],[sess_ipAddress],[sess_PCName],[sess_PCUserName],[sess_login],[sess_logout],[sess_lastRm],[sess_lastActivity],[sess_lastBootUpTime]
|
||||
FROM [ADMIN].[dbo].[tblSessions]
|
||||
where cast(sess_login as Date) between '" & von.ToShortDateString & "' and '" & bis.ToShortDateString & "' and sess_maId = " & mitarbeiter.mit_id & "
|
||||
Order by sess_login"
|
||||
|
||||
dgvSessions.SET_SQL(SQL_SESSIONS, "ADMIN")
|
||||
dgvSessions.LOAD()
|
||||
|
||||
With dgvSessions
|
||||
|
||||
''.AutoGenerateColumns = False
|
||||
''.Columns("ignoreAuszahlungsdatum").CellTemplate = cell
|
||||
'.Columns("ignoreAuszahlungsdatum").Width = 70
|
||||
'.Columns("ignoreAuszahlungsdatum").HeaderText = "zu spät eingetragen"
|
||||
'.Columns("ignoreAuszahlungsdatum").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
|
||||
'.Columns("Datum").Width = 70
|
||||
'.Columns("ÜS100").Width = 70
|
||||
'.Columns("ÜS100").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
|
||||
'.Columns("ÜS50").Width = 70
|
||||
'.Columns("ÜS50").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
|
||||
'.Columns("ÜS25").Width = 70
|
||||
'.Columns("ÜS25").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
|
||||
'.Columns("ÜS50_Saldo").Width = 70
|
||||
'.Columns("ÜS50_Saldo").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
|
||||
'.Columns("ausbezahlt").Width = 70
|
||||
'.Columns("ausbezahlt").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
|
||||
|
||||
End With
|
||||
|
||||
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
|
||||
@@ -6936,7 +6936,7 @@ repeatRequest:
|
||||
|
||||
Select Case Lieferant
|
||||
Case "IDS"
|
||||
sql_query = " select Adressen.AdressenNr as KundenNr, invoice_id, LandKz as KundenLandKz, VATAmount as MWST, Country as RELandKz FROM tblIDSInvoicesNewSplittedByCountry
|
||||
sql_query = " select Adressen.AdressenNr as KundenNr,Adressen.AdressenNr as KundenNrVerag, invoice_id, LandKz as KundenLandKz, VATAmount as MWST, Country as RELandKz FROM tblIDSInvoicesNewSplittedByCountry
|
||||
inner join [VERAG].[dbo].[tbl_IDS_Kunden] on tblIDSInvoicesNewSplittedByCountry.CustomerCode = tbl_IDS_Kunden.CustomerCode
|
||||
inner join Adressen on Adressen.AdressenNr = KdNrVERAG
|
||||
WHERE tblIDSInvoicesNewSplittedByCountry.[CustomerCode] in (SELECT distinct([CustomerCode]) FROM [VERAG].[dbo].[tbl_IDS_Kunden]
|
||||
@@ -6949,7 +6949,7 @@ repeatRequest:
|
||||
WHERE 1 = 1 AND isnull([tbl_IDS_Kunden].KdNrAlt, 0) = 0) AND tblIDSInvoicesNewSplittedByCountry.InvToCustomer is null and Year(YearMonthDay) > 2024 and kde_keineMWSt = 1"
|
||||
|
||||
Case "MSE"
|
||||
sql_query = " select customer_number as KundenNr,invoice_id,LandKz as KundenLandKz, total_vat_amount_euro as MWST, country as RELandKz FROM tblMSEInvoices
|
||||
sql_query = " select customer_number as KundenNr,Adressen.AdressenNr as KundenNrVerag,invoice_id,LandKz as KundenLandKz, total_vat_amount_euro as MWST, country as RELandKz FROM tblMSEInvoices
|
||||
inner join tblMSECustomers on customer_id = [customer_number]
|
||||
inner join Adressen on Adressen.AdressenNr = partner_customer_number
|
||||
where tblMSEInvoices.InvToCustomer is null and Year(invoice_date) > 2024"
|
||||
@@ -6966,7 +6966,7 @@ repeatRequest:
|
||||
kdNrPlose = " AND plInv_PLOSEKundennummer = " & txtPLoseKdNr.Text
|
||||
End If
|
||||
|
||||
sql_query = " select plInv_PLOSEKundennummer as KundenNr, [plInv_Id] as invoice_id,LandKz as KundenLandKz ,[plInv_MWSTBetrag] as MWST, [plInv_SupplierCountry] as RELandKz FROM tblPLOSE_Inv_Data
|
||||
sql_query = " select plInv_PLOSEKundennummer as KundenNr,Adressen.AdressenNr as KundenNrVerag, [plInv_Id] as invoice_id,LandKz as KundenLandKz ,[plInv_MWSTBetrag] as MWST, [plInv_SupplierCountry] as RELandKz FROM tblPLOSE_Inv_Data
|
||||
inner join Adressen on Adressen.PLOSEKundenNr = plInv_PLOSEKundennummer
|
||||
where plInv_InvToCustomer is null and YEAR(plInv_SupplierRechnungsDatum) > 2024" & kdNrPlose
|
||||
|
||||
@@ -6977,11 +6977,11 @@ repeatRequest:
|
||||
where plInv_InvToCustomer is null and YEAR(plInv_SupplierRechnungsDatum) > 2024 and kde_keineMWSt = 1 "
|
||||
|
||||
Case "UTA"
|
||||
sql_query = " select Adressen.UTAKundenNr as KundenNr,[Rechnungsnummer_pro_Lieferland] as invoice_id,LandKz as KundenLandKz, SUM(Gesamtbetrag_Umsatzsteuer_in_Darstellwährung) as MWSt,[Lieferland_ISO2] as RELandKz FROM [VERAG].[dbo].[tblUTAImportNew]
|
||||
sql_query = " select Adressen.UTAKundenNr as KundenNr,Adressen.AdressenNr as KundenNrVerag,[Rechnungsnummer_pro_Lieferland] as invoice_id,LandKz as KundenLandKz, SUM(Gesamtbetrag_Umsatzsteuer_in_Darstellwährung) as MWSt,[Lieferland_ISO2] as RELandKz FROM [VERAG].[dbo].[tblUTAImportNew]
|
||||
inner join Adressen on Adressen.UTAKundenNr= [tblUTAImportNew].Kundennummer
|
||||
inner join tblKundenErweitert on tblKundenErweitert.kde_KundenNr = Adressen.AdressenNr
|
||||
where InvToCustomer is null and Year(Rechnungsdatum) > 2024
|
||||
group by Adressen.UTAKundenNr ,[Rechnungsnummer_pro_Lieferland],LandKz,[Lieferland_ISO2]"
|
||||
group by Adressen.UTAKundenNr,Adressen.AdressenNr ,[Rechnungsnummer_pro_Lieferland],LandKz,[Lieferland_ISO2]"
|
||||
|
||||
sql_query_keineMWST = "select distinct(Adressen.UTAKundenNr) as KundenNr FROM [VERAG].[dbo].[tblUTAImportNew]
|
||||
inner join Adressen on Adressen.UTAKundenNr= [tblUTAImportNew].Kundennummer
|
||||
@@ -6990,7 +6990,7 @@ repeatRequest:
|
||||
group by Adressen.UTAKundenNr "
|
||||
|
||||
Case "RMC"
|
||||
sql_query = " select Adressen.WölflKundenNr as KundenNr,rmc_id as invoice_id,LandKz as KundenLandKz,[rmc_betragMWST] as MWST,rmc_landKZ as RELandKz
|
||||
sql_query = " select Adressen.WölflKundenNr as KundenNr,Adressen.AdressenNr as KundenNrVerag,rmc_id as invoice_id,LandKz as KundenLandKz,[rmc_betragMWST] as MWST,rmc_landKZ as RELandKz
|
||||
FROM [VERAG].[dbo].[tblRMCImport]
|
||||
inner join Adressen on Adressen.WölflKundenNr = rmc_kdNr
|
||||
where InvToCustomer is null and Year(rmc_reDatum) > 2024"
|
||||
@@ -7063,9 +7063,10 @@ repeatRequest:
|
||||
Continue For
|
||||
Else
|
||||
|
||||
If Not IsDBNull(r.Item("KundenNr")) AndAlso Not IsDBNull(r.Item("KundenLandKz")) Then
|
||||
If Not IsDBNull(r.Item("KundenNr")) AndAlso Not IsDBNull(r.Item("KundenLandKz")) AndAlso Not IsDBNull(r.Item("KundenNrVerag")) Then
|
||||
|
||||
Dim kdnr As Integer = r.Item("KundenNr")
|
||||
Dim kdnrVerag As Integer = r.Item("KundenNrVerag")
|
||||
Dim LandKz = r.Item("KundenLandKz")
|
||||
Dim landKZiso2 = ""
|
||||
|
||||
@@ -7085,31 +7086,31 @@ repeatRequest:
|
||||
'wenn die Rechnung in dem Land in dem er ansässig ist ausgestellt wurde (rumän. Kunde – Rechnung ausgestellt in Rumänien = z.B. IDS in RO getankt…)
|
||||
UpdateLieferantInvToCustomer(Lieferant, r.Item("invoice_id"), r.Item("KundenNr"))
|
||||
Continue For
|
||||
End If
|
||||
End If
|
||||
|
||||
|
||||
If landKZiso2 <> "" AndAlso dtkeineMWST.Rows.Count > 0 Then
|
||||
'Rechnungen der Länder in denen der Kunde keine MWST erstattet bekommt
|
||||
Dim rows_keineMWST() As DataRow = dtkeineMWST.Select("Land = '" & landKZiso2 & "' AND Erstattungsland= '" & Erstattungsland & "'" & IIf(Lieferant <> "IDS", " AND Lieferant <> 'IDS'", ""))
|
||||
If rows_keineMWST.Length > 0 Then
|
||||
If landKZiso2 <> "" AndAlso dtkeineMWST.Rows.Count > 0 Then
|
||||
'Rechnungen der Länder in denen der Kunde keine MWST erstattet bekommt
|
||||
Dim rows_keineMWST() As DataRow = dtkeineMWST.Select("Land = '" & landKZiso2 & "' AND Erstattungsland= '" & Erstattungsland & "'" & IIf(Lieferant <> "IDS", " AND Lieferant <> 'IDS'", ""))
|
||||
If rows_keineMWST.Length > 0 Then
|
||||
UpdateLieferantInvToCustomer(Lieferant, r.Item("invoice_id"), r.Item("KundenNr"))
|
||||
Continue For
|
||||
End If
|
||||
|
||||
End If
|
||||
|
||||
'Rechnungen der Länder, in denen der Kunde selber MWST beantragt
|
||||
If landKZiso2 <> "" AndAlso dtKundeMWST.Rows.Count > 0 Then
|
||||
Dim rows_KundeMWST() As DataRow = dtKundeMWST.Select("LandKz = '" & Erstattungsland & "' AND KdNr =" & kdnr)
|
||||
If rows_KundeMWST.Length > 0 Then
|
||||
UpdateLieferantInvToCustomer(Lieferant, r.Item("invoice_id"), r.Item("KundenNr"))
|
||||
Continue For
|
||||
End If
|
||||
End If
|
||||
|
||||
|
||||
End If
|
||||
|
||||
'Rechnungen der Länder, in denen der Kunde selber MWST beantragt
|
||||
If landKZiso2 <> "" AndAlso dtKundeMWST.Rows.Count > 0 Then
|
||||
Dim rows_KundeMWST() As DataRow = dtKundeMWST.Select("LandKz = '" & Erstattungsland & "' AND KdNr =" & kdnrVerag)
|
||||
If rows_KundeMWST.Length > 0 Then
|
||||
UpdateLieferantInvToCustomer(Lieferant, r.Item("invoice_id"), r.Item("KundenNr"))
|
||||
Continue For
|
||||
End If
|
||||
End If
|
||||
|
||||
|
||||
End If
|
||||
End If
|
||||
|
||||
|
||||
Next
|
||||
|
||||
Reference in New Issue
Block a user