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

fix IDS, etc.

Browse Source
This commit is contained in:
d.breimaier
2025-11-21 08:48:51 +01:00
parent 12a89518c5
commit a6e2674b30
5 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SDL/USTV/usrCntlUSTV.vb
View File

@@ -192,7 +192,7 @@ Public Class usrCntlUSTV
WHERE Kunden.KundenNr = " & KdSearchBox1.KdNr, "FMZOLL") WHERE Kunden.KundenNr = " & KdSearchBox1.KdNr, "FMZOLL")
OPSaldo = CInt((New SQL).getValueTxtBySql("SELECT isnull(sum(Gesamtausstand),0) FROM [Offene Posten] WHERE [Kontonummer]=" & KdSearchBox1.KdNr, "FMZOLL")) OPSaldo = CDbl((New SQL).getValueTxtBySql("SELECT isnull(sum(Gesamtausstand),0) FROM [Offene Posten] WHERE [Kontonummer]=" & KdSearchBox1.KdNr, "FMZOLL"))
calcRisiko = True calcRisiko = True
If dt.Rows.Count = 1 Then If dt.Rows.Count = 1 Then

36
SDL/kunden/frmKundenblatt.vb
View File

@@ -643,12 +643,12 @@ Public Class frmKundenblatt
Sub initStat() Sub initStat()
lblStat_Lkws.Text = SQL.getSqlCount("SELECT Count(KfzKennzeichen) FROM LKW WHERE KundenNr=" & kdNr & " and isnull(Verkauft,0) <> 1 and isnull(Abgemeldet,0) <> 1 ") & " aktive LKWs registriert" 'OK lblStat_Lkws.Text = SQL.getSqlCount("SELECT Count(KfzKennzeichen) FROM LKW WHERE KundenNr=" & kdNr & " and isnull(Verkauft,0) <> 1 and isnull(Abgemeldet,0) <> 1 ") & " aktive LKWs registriert" 'OK
Dim dt = SQL.loadDgvBySql("SELECT Kunden.KundenNr as KundenNr, Kunden.UStV_Summe3470BetragEUR, Kunden.UStV_SummeVZBetragEUR, Kunden.UStV_SummeVorschaubetragEUR Dim dt = SQL.loadDgvBySql("SELECT Kunden.KundenNr as KundenNr, Kunden.UStV_SummeUmsatzsteuerbetragEUR, Kunden.UStV_SummeErstattungsbetragEUR, Kunden.UStV_Summe3470BetragEUR, Kunden.UStV_SummeVZBetragEUR, Kunden.UStV_SummeVorschaubetragEUR
FROM Kunden FROM Kunden
WHERE Kunden.KundenNr = " & kdNr, "FMZOLL") WHERE Kunden.KundenNr = " & kdNr, "FMZOLL")
Dim GesamtUSteuer As Double = 0 Dim GesamtUSteuer As Double = 0
Dim GesamtErstattung As Double = 0 Dim GesamtErstattung As Double = 0
Dim Differnezbetrag As Double = 0 Dim Differnezbetrag As Double = 0
Dim Gesamt3470 As Double = 0 Dim Gesamt3470 As Double = 0
@@ -661,11 +661,15 @@ Public Class frmKundenblatt
OPSaldo = CDbl((New SQL).getValueTxtBySql("SELECT isnull(sum(Gesamtausstand),0) FROM [Offene Posten] WHERE [Kontonummer]=" & kdNr, "FMZOLL")) OPSaldo = CDbl((New SQL).getValueTxtBySql("SELECT isnull(sum(Gesamtausstand),0) FROM [Offene Posten] WHERE [Kontonummer]=" & kdNr, "FMZOLL"))
If dt.Rows.Count = 1 Then If dt.Rows.Count = 1 Then
GesamtUSteuer = dt.Rows(0).Item("UStV_SummeUmsatzsteuerbetragEUR")
GesamtErstattung = dt.Rows(0).Item("UStV_SummeErstattungsbetragEUR")
Gesamt3470 = dt.Rows(0).Item("UStV_Summe3470BetragEUR") Gesamt3470 = dt.Rows(0).Item("UStV_Summe3470BetragEUR")
GesamtVZBetrag = dt.Rows(0).Item("UStV_SummeVZBetragEUR") GesamtVZBetrag = dt.Rows(0).Item("UStV_SummeVZBetragEUR")
VorschaubetrGes = dt.Rows(0).Item("UStV_SummeVorschaubetragEUR") VorschaubetrGes = dt.Rows(0).Item("UStV_SummeVorschaubetragEUR")
End If End If
Differnezbetrag = GesamtUSteuer - GesamtErstattung
Risiko = OPSaldo - Differnezbetrag - Gesamt3470 + GesamtVZBetrag - VorschaubetrGes Risiko = OPSaldo - Differnezbetrag - Gesamt3470 + GesamtVZBetrag - VorschaubetrGes
txt3470Betrag.Text = Gesamt3470.ToString("C2") txt3470Betrag.Text = Gesamt3470.ToString("C2")
@@ -673,23 +677,23 @@ Public Class frmKundenblatt
'lblStat_SdlLeistungen.Text = SQL.getSqlCount("SELECT Count(SDL.SDLNr) FROM SDL, Speditionsdienstleistungen WHERE KundenNr=" & kdNr & " and ISNULL(Archiviert,0) <> 1 and ISNULL(LKWAbgemeldet,0) <> 1 and ISNULL(Gesperrt,0) <> 1 and ISNULL(Defekt,0) <> 1 and ISNULL(Verloren,0) <> 1 and ISNULL(Gestohlen,0) <> 1 AND SDL.SDLNr=Speditionsdienstleistungen.SDLNr ") & " aktive SDL Leistungen" 'lblStat_SdlLeistungen.Text = SQL.getSqlCount("SELECT Count(SDL.SDLNr) FROM SDL, Speditionsdienstleistungen WHERE KundenNr=" & kdNr & " and ISNULL(Archiviert,0) <> 1 and ISNULL(LKWAbgemeldet,0) <> 1 and ISNULL(Gesperrt,0) <> 1 and ISNULL(Defekt,0) <> 1 and ISNULL(Verloren,0) <> 1 and ISNULL(Gestohlen,0) <> 1 AND SDL.SDLNr=Speditionsdienstleistungen.SDLNr ") & " aktive SDL Leistungen"
'With dgvLeistungen With dgvLeistungen
' .DataSource = SQL.loadDgvBySql(" SELECT Count(SDL.SDLNr) as Anzahl , SDLBez as Leistung FROM SDL, Speditionsdienstleistungen .DataSource = SQL.loadDgvBySql(" SELECT Count(SDL.SDLNr) as Anzahl , SDLBez as Leistung FROM SDL, Speditionsdienstleistungen
' WHERE KundenNr=" & kdNr & " and ISNULL(Archiviert,0) <> 1 and ISNULL(LKWAbgemeldet,0) <> 1 and ISNULL(Gesperrt,0) <> 1 and ISNULL(Defekt,0) <> 1 and ISNULL(Verloren,0) <> 1 and ISNULL(Gestohlen,0) <> 1 WHERE KundenNr=" & kdNr & " and ISNULL(Archiviert,0) <> 1 and ISNULL(LKWAbgemeldet,0) <> 1 and ISNULL(Gesperrt,0) <> 1 and ISNULL(Defekt,0) <> 1 and ISNULL(Verloren,0) <> 1 and ISNULL(Gestohlen,0) <> 1
' AND SDL.SDLNr=Speditionsdienstleistungen.SDLNr group by SDLBez order by Count(SDL.SDLNr) desc ") AND SDL.SDLNr=Speditionsdienstleistungen.SDLNr group by SDLBez order by Count(SDL.SDLNr) desc ")
' .Columns(1).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns(1).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
' .RowTemplate.Height = 20 .RowTemplate.Height = 20
' .AllowUserToAddRows = False .AllowUserToAddRows = False
' .AllowUserToDeleteRows = False .AllowUserToDeleteRows = False
' .AllowUserToOrderColumns = False .AllowUserToOrderColumns = False
' .AllowUserToResizeColumns = False .AllowUserToResizeColumns = False
' .AllowUserToResizeRows = False .AllowUserToResizeRows = False
' .RowTemplate.ReadOnly = True .RowTemplate.ReadOnly = True
' .RowHeadersVisible = False .RowHeadersVisible = False
'End With End With
'Dim SQL_Diesel As String = " FROM SDL, Speditionsdienstleistungen WHERE KundenNr=" & kdNr & " AND ISNULL(Archiviert,0) <> 1 and ISNULL(LKWAbgemeldet,0) <> 1 and ISNULL(Gesperrt,0) <> 1 and ISNULL(Defekt,0) <> 1 and ISNULL(Verloren,0) <> 1 and ISNULL(Gestohlen,0) <> 1 AND SDL.SDLNr=Speditionsdienstleistungen.SDLNr AND SDL.SDLNr IN (100,101)" 'Dim SQL_Diesel As String = " FROM SDL, Speditionsdienstleistungen WHERE KundenNr=" & kdNr & " AND ISNULL(Archiviert,0) <> 1 and ISNULL(LKWAbgemeldet,0) <> 1 and ISNULL(Gesperrt,0) <> 1 and ISNULL(Defekt,0) <> 1 and ISNULL(Verloren,0) <> 1 and ISNULL(Gestohlen,0) <> 1 AND SDL.SDLNr=Speditionsdienstleistungen.SDLNr AND SDL.SDLNr IN (100,101)"

8
SDL/kunden/frmKundenlogin.vb
View File

@@ -1,6 +1,4 @@
Imports VERAG_PROG_ALLGEMEIN Public Class frmKundenlogin
Public Class frmKundenlogin
Dim kdNr As Integer Dim kdNr As Integer
Dim Lieferant As String Dim Lieferant As String
@@ -26,7 +24,7 @@ Public Class frmKundenlogin
cboLieferant.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IDS", "Q8-TRUCK")) cboLieferant.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IDS", "Q8-TRUCK"))
cboLieferant.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MSE", "MSTSTTOLLS")) cboLieferant.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MSE", "MSTSTTOLLS"))
cboLieferant.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("TELEPASS", "HUB4TRUCKS")) cboLieferant.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("TELEPASS", "HUB4TRUCKS"))
cboLieferant.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UTA", "EDENRED-CONNECT")) cboLieferant.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UTA", "UTA PORTAL"))
cboLieferant.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("PLOSE", "PLOSE APR")) cboLieferant.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("PLOSE", "PLOSE APR"))
cboLieferant.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UTA-INTERN", "UTA-INTERN")) cboLieferant.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UTA-INTERN", "UTA-INTERN"))
@@ -117,7 +115,7 @@ Public Class frmKundenlogin
Select Case txtPortal.Text Select Case txtPortal.Text
Case "Q8-TRUCK" : link.AccessibleDescription = "https://iaccount.q8.com/" : link.Text = cboLieferant.Text & "-Link" Case "Q8-TRUCK" : link.AccessibleDescription = "https://iaccount.q8.com/" : link.Text = cboLieferant.Text & "-Link"
Case "EDENRED-CONNECT" : link.AccessibleDescription = "https://meinedenred.at/login" : link.Text = cboLieferant.Text & "-Link" Case "UTA PORTAL" : link.AccessibleDescription = "https://meinedenred.at/login" : link.Text = cboLieferant.Text & "-Link"
Case "PLOSE APR" : link.AccessibleDescription = "https://www.apr.plose.it/login" : link.Text = cboLieferant.Text & "-Link" Case "PLOSE APR" : link.AccessibleDescription = "https://www.apr.plose.it/login" : link.Text = cboLieferant.Text & "-Link"
Case "MSTSTTOLLS" : link.AccessibleDescription = "https://iaccount.q8.com/" : link.Text = cboLieferant.Text & "-Link" Case "MSTSTTOLLS" : link.AccessibleDescription = "https://iaccount.q8.com/" : link.Text = cboLieferant.Text & "-Link"
Case "HUB4TRUCKS" : link.AccessibleDescription = "https://truck.telepass.com/api/uaa/login" : link.Text = cboLieferant.Text & "-Link" Case "HUB4TRUCKS" : link.AccessibleDescription = "https://truck.telepass.com/api/uaa/login" : link.Text = cboLieferant.Text & "-Link"

4
SDL/kunden/usrCntlKundenlogin.vb
View File

@@ -186,8 +186,8 @@ Public Class usrCntlKundenlogin
Select Case Portal Select Case Portal
Case "Q8-TRUCK" : link = "https://iaccount.q8.com/" Case "Q8-TRUCK" : link = "https://iaccount.q8.com/"
Case "EDENRED-CONNECT" : link = "https://meinedenred.at/login" Case "UTA PORTAL" : link = "https://meinedenred.at/login"
Case "PLOSE" : link = "https://www.apr.plose.it/login" Case "PLOSE ARP" : link = "https://www.apr.plose.it/login"
Case "MSTSTTOLLS" : link = "https://iaccount.q8.com/" Case "MSTSTTOLLS" : link = "https://iaccount.q8.com/"
Case "HUB4TRUCKS" : link = "https://truck.telepass.com/api/uaa/login" Case "HUB4TRUCKS" : link = "https://truck.telepass.com/api/uaa/login"
End Select End Select

2
SDL/mdm/usrcntlFremdrechnungen.vb
View File

@@ -1449,7 +1449,7 @@ Public Class usrcntlFremdrechnungen
Dim sql = " select [YearMonthDay] as Rechnungsdatum,[Invoicenumber] as Rechnungsnummer, CustomerCode as Kundennummer,[daId],[TransactionVolume] as Transaktionsmenge,[AmminclVAT] as Bruttobetrag,[TotalNetAmount] as Nettobetrag,[VATAmount] as MWSt, Dim sql = " select [YearMonthDay] as Rechnungsdatum,[Invoicenumber] as Rechnungsnummer, CustomerCode as Kundennummer,[daId],[TransactionVolume] as Transaktionsmenge,[AmminclVAT] as Bruttobetrag,[TotalNetAmount] as Nettobetrag,[VATAmount] as MWSt,
cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden,cast(case when InvToCustomer is not null then 1 else 0 end as bit) as OrigRE ,[Country] as Land cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden,cast(isnull(InvToCustomer, 0) as bit) as OrigRE ,[Country] as Land
FROM [VERAG].[dbo].[tblIDSInvoicesNewSplittedByCountry] WHERE [TotalInvoiceId] = " & rechnugnsID & setSQLDetailWhere(aktLieferant, "Country", , KundenNr_Input, dtKundeMWSTTemp) FROM [VERAG].[dbo].[tblIDSInvoicesNewSplittedByCountry] WHERE [TotalInvoiceId] = " & rechnugnsID & setSQLDetailWhere(aktLieferant, "Country", , KundenNr_Input, dtKundeMWSTTemp)
If setDatatable Then If setDatatable Then