Index: AX/Uitgaand/PM/impl/Convertor/Sopr/ProductConvertor.cls.xml =================================================================== diff -u -r50245 -r54528 --- AX/Uitgaand/PM/impl/Convertor/Sopr/ProductConvertor.cls.xml (.../ProductConvertor.cls.xml) (revision 50245) +++ AX/Uitgaand/PM/impl/Convertor/Sopr/ProductConvertor.cls.xml (.../ProductConvertor.cls.xml) (revision 54528) @@ -19,11 +19,11 @@ -d ##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New().testone(1809195) +d ##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New().testone(273543) 1 -PRNr:%Integer +PRNr:%Integer,KindToelaten:%Boolean=0 %String 0,$list(lbBLIDs),"") ]]> @@ -180,9 +180,12 @@ Quit:$E($$$PRGet($$$IdentNummer))="6"&&('KindToelaten) "" Set BLID=..GeefBlumID(PRNr) Set lbPRNrs="" + ;w:$io["pv-w8" BLID For BI=0,1,2,3,4,5,7,8 DO IF BI=8 FOR CH=65:1:90 Set BI=$char(CH) Do ; [IDENT] JCL ; UGLY 0..8 & A..Z . Set IdentNr=BI_$S($L(BLID)=8:$E(BLID,2,8),1:BLID)_" " + . ;w:$io["pv-w8" IdentNr . Quit:'$D(^KPR2(IdentNr)) + . ;w:$io["pv-w8" "+" . Set BSKey=$O(^PRBS("BS",+^KPR2(IdentNr),"")) ; Geen kind product . Quit:BSKey="" . Set lbPRNrs=lbPRNrs_$LB(+^KPR2(IdentNr)) @@ -192,7 +195,6 @@ PRNr:%String -1 oude klant Bruynzeel Set it=..SoprConvertor.GeefSOPRIterator(PRNr) While it.HasNext() { Set TestPRNr=it.Next() - If $D(^PRPUTZ("N",TestPRNr,KLNr)) + ;w TestPRNr," ",$P(^KPR(TestPRNr),"\"),! + If $D(^PRPUTZ("N",TestPRNr,KLNr))||$D(^PRPUTZ("N",TestPRNr,KLNr2)) { Set PRNr=TestPRNr } Index: AXimpl/Admin/STAT/Invoice/Processor.cls.xml =================================================================== diff -u -r54330 -r54528 --- AXimpl/Admin/STAT/Invoice/Processor.cls.xml (.../Processor.cls.xml) (revision 54330) +++ AXimpl/Admin/STAT/Invoice/Processor.cls.xml (.../Processor.cls.xml) (revision 54528) @@ -75,6 +75,7 @@ Do ..ProcessKlantProductMaandRec(Line, KlantNr, ProductId, Maand) // Ook ProductMaandRec EN ProductKlantMaandRec Do ..ProcessProductLastInfoRec(Line, ProductId) } + Do ..ProcessKlantMaandRec(Line, KlantNr, Maand) // Ook ProductMaandRec EN ProductKlantMaandRec Do ..SetLastProcessedRecord(Line.RecId) } If $$$Not(Line.Currency = "EUR") { @@ -247,7 +248,14 @@ Set $Piece(ProductMaandRec,"\",3) = $Piece(ProductMaandRec,"\",3) + Line.LineAmount Set $Piece(ProductMaandRec,"\",4) = $Piece(ProductMaandRec,"\",4)+Marge Set ^KSTPR(ProductId,0,Maand) = ProductMaandRec - +]]> + + + +Line:AXimpl.Admin.STAT.Invoice.Line,KlantNr:%Integer,Maand:%String +1 + kost=omzet @@ -360,8 +372,8 @@ } Else { - Set CifPPL=$$$PRGet($$$CifPPLEUR) - Set Line.LineCost=+$J(CifPPL*Line.InventQty,0,4) + Set CifPPL=$$$PRGet($$$CifPPLEUR) + Set Line.LineCost=+$J(CifPPL*Line.InventQty,0,4) } } catch Index: AXimpl/Admin/STAT/Invoice/LineIterator.cls.xml =================================================================== diff -u -r54319 -r54528 --- AXimpl/Admin/STAT/Invoice/LineIterator.cls.xml (.../LineIterator.cls.xml) (revision 54319) +++ AXimpl/Admin/STAT/Invoice/LineIterator.cls.xml (.../LineIterator.cls.xml) (revision 54528) @@ -47,19 +47,19 @@ _" CustInvoiceJour.RecId, CustInvoiceTrans.CurrencyCode, CustInvoiceTrans.PriceUnit,CustInvoiceTrans.SalesPrice" _" FROM CustInvoiceTrans" _" LEFT OUTER JOIN INVENTTRANSORIGIN ito ON CustInvoiceTrans.inventTransId = ito.INVENTTRANSID AND ito.DATAAREAID = CustInvoiceTrans.DATAAREAID" - _" AND CustInvoiceTrans.PARTITION = ito.PARTITION" + _" AND CustInvoiceTrans.PARTITION = ito.PARTITION" _" LEFT OUTER JOIN" _" (SELECT SUM(Qty) Qty, SUM(REVENUEAMOUNTPHYSICAL) REVENUEAMOUNTPHYSICAL, SUM(COSTAMOUNTOPERATIONS) COSTAMOUNTOPERATIONS, dataareaid, partition, inventtransorigin, invoiceid" _" FROM inventtrans it1 GROUP BY dataareaid, inventtransorigin, invoiceid, PARTITION) it ON it.INVENTTRANSORIGIN = ito.recid AND it.DATAAREAID = ito.DATAAREAID" - _" AND it.INVOICEID = CustInvoiceTrans.INVOICEID AND it.PARTITION = CustInvoiceTrans.PARTITION" + _" AND it.INVOICEID = CustInvoiceTrans.INVOICEID AND it.PARTITION = CustInvoiceTrans.PARTITION" _" JOIN InventDim ON InventDim.InventDimId = CustInvoiceTrans.InventDimId AND InventDim.DataAreaId = CustInvoiceTrans.DataAreaId" - _" AND inventdim.PARTITION = custinvoicetrans.PARTITION" + _" AND inventdim.PARTITION = custinvoicetrans.PARTITION" _" JOIN CustInvoiceJour ON CustInvoiceJour.InvoiceId = CustInvoiceTrans.InvoiceId AND CustInvoiceJour.InvoiceDate = CustInvoiceTrans.InvoiceDate" - _" AND CustInvoiceJour.DataAreaId = CustInvoiceTrans.DataAreaId" + _" AND CustInvoiceJour.DataAreaId = CustInvoiceTrans.DataAreaId AND CustInvoiceJour.Partition = CustInvoiceTrans.Partition" _" LEFT OUTER JOIN AduEcoresAttributeCombinatiON COM ON com.ItemId = CustInvoiceTrans.ItemId AND com.ConfigId = InventDim.ConfigId AND InventDim.ConfigId <> ''" - _" AND com.PARTITION = CUSTINVOICETRANS.PARTITION" + _" AND com.PARTITION = CUSTINVOICETRANS.PARTITION" _" WHERE CustInvoiceTrans.InvoiceDate >= '"_FirstDate_"' AND CustInvoiceTrans.InvoiceDate <= '"_LastDate_"' AND CustInvoiceTrans.ItemId <> ''" - _" AND custinvoicetrans.DATAAREAID = 'vhbe' AND CUSTINVOICETRANS.PARTITION = '5637144576'" + _" AND custinvoicetrans.DATAAREAID = 'vhbe' AND CUSTINVOICETRANS.PARTITION = '5637144576'" _" ORDER BY CustInvoiceJour.InvoiceAccount, CustInvoiceTrans.ItemId" Set ..ResultSet = ..SqlQueryConnection.GetResultSet(SqlStatement)