diff --git a/SDL/buchhaltung/usrCntlBH.vb b/SDL/buchhaltung/usrCntlBH.vb index 929ebe67..2ef72a76 100644 --- a/SDL/buchhaltung/usrCntlBH.vb +++ b/SDL/buchhaltung/usrCntlBH.vb @@ -1616,7 +1616,7 @@ Public Class usrCntlBH REPLACE( REPLACE(da.da_name, 'Rechnung_', ''), '.pdf', ''), - 'Gutschrift_', '') AS RechnungsNr, da_name as Bezeichnung + 'Gutschrift_', '') AS RechnungsNr, da_name as Bezeichnung, da_date as Erstellungszeitpunkt FROM tblDatenarchiv da WHERE da.da_kategorie = 'Rechnungen' AND da.da_ordner = 'Firma_' + CAST(@FirmaID AS VARCHAR) @@ -1642,7 +1642,7 @@ Public Class usrCntlBH SELECT DISTINCT REPLACE( REPLACE(da.da_name, 'Sammelrechnung_', ''), - '.pdf', '') AS RechnungsNr, da_name as Bezeichnung + '.pdf', '') AS RechnungsNr, da_name as Bezeichnung, da_date as Erstellungszeitpunkt FROM tblDatenarchiv da WHERE da.da_kategorie = 'Rechnungen' AND da.da_ordner = 'Firma_' + CAST(@FirmaID AS VARCHAR) diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cAufschubKonten.vb b/VERAG_PROG_ALLGEMEIN/Classes/cAufschubKonten.vb index 9fc84513..9743947c 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cAufschubKonten.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cAufschubKonten.vb @@ -2,6 +2,7 @@ Imports System.Data.SqlClient Imports System.Reflection +Imports com.sun.org.apache.xerces.internal.dom Public Class cAufschubKonten Property brgakto_id As Integer @@ -328,12 +329,7 @@ FROM If showMessage Then - MsgBox( - "Saldo zum Stichtag " & - datumBis.ToShortDateString() & - ":" & vbNewLine & - brgakto_gs_aktSaldo.ToString("N2") - ) + MsgBox("Saldo zum Stichtag " & datumBis.ToShortDateString() & ":" & vbNewLine & brgakto_gs_aktSaldo.ToString("N2")) End If @@ -350,7 +346,15 @@ FROM Try - Return SQL.getValueTxtBySql("select TOP (1) brgarefb_refbetrag from [tblBrgAufschubReferenzberaege] where [brgarefb_gsid]=" & brgakto_id & " and brgarefb_gs_aktiv = 1 And cast([brgarefb_gueltig_ab] as Date) <= '" & nowDate.ToShortDateString & "' order by [brgarefb_gueltig_ab] desc", "ADMIN",,,,) + Dim refBetrag As Double = 0 + + Dim refBetagDB As String = SQL.getValueTxtBySql("select TOP (1) brgarefb_refbetrag from [tblBrgAufschubReferenzberaege] where [brgarefb_gsid]=" & brgakto_id & " and brgarefb_gs_aktiv = 1 And cast([brgarefb_gueltig_ab] as Date) <= '" & nowDate.ToShortDateString & "' order by [brgarefb_gueltig_ab] desc", "ADMIN",,, 0,) + + If refBetagDB <> "" AndAlso IsNumeric(refBetagDB) Then + refBetrag = CDbl(refBetagDB) + End If + + Return refBetrag Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)