diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb index 700b7a1c..558945ef 100644 --- a/SDL/USTV/usrCntlUSTV.vb +++ b/SDL/USTV/usrCntlUSTV.vb @@ -381,6 +381,7 @@ Public Class usrCntlUSTV Next cProgramFunctions.genExcelFromDT_NEW(dtNew, {"K1:K" & (dtNew.Rows.Count + 1), "O1:T" & (dtNew.Rows.Count + 1)},,,,, True) + End If diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index 844b9c5d..25ac8e20 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -2363,7 +2363,7 @@ Public Class frmMDMDatenverarbetiung trans.device_product_number as [Card Number], trans.entry_point_name as [Entry Terminal], trans.exit_point_name as [Exit Terminal], - case when trans.device_product_type like '%System Fee' then (msts_fee_amount + transaction_gross_amount) - trans.USteuer_EUR else transaction_gross_amount - trans.USteuer_EUR End As [Nett Amount], + case when trans.device_product_type like '%System Fee' then (msts_fee_amount + transaction_gross_amount) - trans.USteuer_EUR else transaction_gross_amount - trans.USteuer_EUR End As [Net Amount], trans.USteuer_EUR As [VAT Amount], case when trans.device_product_type like '%System Fee' then msts_fee_amount + transaction_gross_amount else transaction_gross_amount End as [Total Amount] From [VERAG].[dbo].[tblMSESettlements] as bills @@ -2390,8 +2390,8 @@ Public Class frmMDMDatenverarbetiung Datenquelle, [Customer No], [Licence Plate Number], + [Transaction Date], [Transaction Country], - [Transaction Date], [Product description], [Card Number], [Entry Terminal], @@ -2499,7 +2499,7 @@ transAgg AS FROM VERAG.dbo.tblIDSTransactionsNew trans - WHERE trans.charged = 0 and KdNrVERAG not in (756150, 711104) + WHERE trans.chargedDatetime is not null and KdNrVERAG not in (756150, 711104) GROUP BY CAST(trans.YearMonthDay AS date),