Index: AXimpl/Admin/STAT/Invoice/Line.cls.xml =================================================================== diff -u -r49546 -r49548 --- AXimpl/Admin/STAT/Invoice/Line.cls.xml (.../Line.cls.xml) (revision 49546) +++ AXimpl/Admin/STAT/Invoice/Line.cls.xml (.../Line.cls.xml) (revision 49548) @@ -7,6 +7,10 @@ %String + +%String + + %Numeric Index: AXimpl/Admin/STAT/Invoice/Processor.cls.xml =================================================================== diff -u -r49547 -r49548 --- AXimpl/Admin/STAT/Invoice/Processor.cls.xml (.../Processor.cls.xml) (revision 49547) +++ AXimpl/Admin/STAT/Invoice/Processor.cls.xml (.../Processor.cls.xml) (revision 49548) @@ -8,6 +8,11 @@ 1 + +vhLib.Logger +1 + + DOM.PM.ProductAPI 1 @@ -26,7 +31,7 @@ -InvoiceLineIterator:AXimpl.Admin.STAT.Invoice.LineIterator,ProductApi:DOM.PM.ProductAPI,DateTimeApi:TECH.DateTime.DateTimeAPI +InvoiceLineIterator:AXimpl.Admin.STAT.Invoice.LineIterator,Logger:vhLib.Logger,ProductApi:DOM.PM.ProductAPI,DateTimeApi:TECH.DateTime.DateTimeAPI 1 1 %Status @@ -37,6 +42,7 @@ Set ..InvoiceLineIterator = $$$Inject(InvoiceLineIterator, ##class(AXimpl.Admin.STAT.Invoice.LineIterator).%New(,InvoiceDate)) Set ..ProductApi = $$$Inject(ProductApi, ##class(DOM.DomeinContext).Instance().GeefProductAPI()) Set ..DateTimeApi = $$$Inject(DateTimeApi, ##class(TECH.Context).Instance().GeefDateTimeAPI()) + Set ..Logger = $$$Inject(Logger, ##class(vhLib.Logger).%New()) Quit $$$OK ]]> @@ -54,6 +60,9 @@ #dim Line As AXimpl.Admin.STAT.Invoice.Line = ..InvoiceLineIterator.Next() #dim KlantNr As %Integer = +Line.InvoiceAccount #dim ProductId As %Integer = ..GetAdminProductId(Line) + If $$$Not(Line.Currency = "EUR") { + Do ..LogCurrencyError(Line, KlantNr, ProductId) + } #dim ProductBestaatNiet As %Boolean = (ProductId = 0) #dim Maand As %String = $Piece(..GeefDag1LopendeMaand(),"-",1)_"."_$Piece(..GeefDag1LopendeMaand(),"-",2)_" " If $$$Not(..IsNietMeeTeNemenKlant(KlantNr)) { @@ -352,6 +361,15 @@ ]]> + +Line:AXimpl.Admin.STAT.Invoice.Line,KlantNr:%Integer,ProductId:%Integer +1 + + + KlantNr:%String 1 Index: AXimpl/Admin/STAT/Invoice/LineIterator.cls.xml =================================================================== diff -u -r49523 -r49548 --- AXimpl/Admin/STAT/Invoice/LineIterator.cls.xml (.../LineIterator.cls.xml) (revision 49523) +++ AXimpl/Admin/STAT/Invoice/LineIterator.cls.xml (.../LineIterator.cls.xml) (revision 49548) @@ -45,7 +45,7 @@ #dim SqlStatement As %String = "" Set SqlStatement = "SELECT CustInvoiceJour.InvoiceAccount,CustInvoiceJour.OrderAccount,CustInvoiceJour.InvoiceId,CustInvoiceTrans.ItemId,com.AdminProductNummer," - _" CustInvoiceTrans.InventQty,CustInvoiceTrans.LineAmount,CustInvoiceTrans.TaxAmount, CustInvoiceJour.InvoiceDate, CustInvoiceJour.RecId" + _" CustInvoiceTrans.InventQty,CustInvoiceTrans.LineAmount,CustInvoiceTrans.TaxAmount, CustInvoiceJour.InvoiceDate, CustInvoiceJour.RecId, CustInvoiceJour.CurrencyCode" _" FROM CustInvoiceTrans" _" JOIN InventDim ON InventDim.InventDimId = CustInvoiceTrans.InventDimId AND InventDim.DataAreaId = CustInvoiceTrans.DataAreaId" _" JOIN CustInvoiceJour ON CustInvoiceJour.InvoiceId = CustInvoiceTrans.InvoiceId AND CustInvoiceJour.InvoiceDate = CustInvoiceTrans.InvoiceDate" @@ -79,6 +79,7 @@ Set InvoiceLine.TaxAmount = ResultSet.GetDataByName("TaxAmount") Set InvoiceLine.InvoiceDate = ResultSet.GetDataByName("InvoiceDate") Set InvoiceLine.RecId = ResultSet.GetDataByName("RecId") + Set InvoiceLine.Currency = ResultSet.GetDataByName("CurrencyCode") Quit InvoiceLine ]]>