Index: AXimpl/Admin/STAT/Invoice/Processor.cls.xml
===================================================================
diff -u -r54528 -r55822
--- AXimpl/Admin/STAT/Invoice/Processor.cls.xml (.../Processor.cls.xml) (revision 54528)
+++ AXimpl/Admin/STAT/Invoice/Processor.cls.xml (.../Processor.cls.xml) (revision 55822)
@@ -70,7 +70,6 @@
If $$$Not(..IsNietMeeTeNemenKlant(KlantNr)) {
Do ..ProcessKlantLastInfoRec(Line, KlantNr)
If $$$Not(ProductBestaatNiet) {
- Do ..CorrigeerLineCost(Line,ProductId)
Do ..ProcessKlantProductLastInfoRec(Line, KlantNr, ProductId) // Ook ProductKlantLastInfoRec
Do ..ProcessKlantProductMaandRec(Line, KlantNr, ProductId, Maand) // Ook ProductMaandRec EN ProductKlantMaandRec
Do ..ProcessProductLastInfoRec(Line, ProductId)
@@ -333,55 +332,6 @@
-
-
-
-TIJDELIJK : Correctie van de kost berekend door AX dit voor de maanden juni 2018 tot dat ADU de kost corrigeert en geen gebruik maakt van de gemiddelde kost die voor de voorraadberekening wordt gebruikt.
-Line:AXimpl.Admin.STAT.Invoice.Line,PRNr:%String
- kost=omzet
- {
- Set Line.LineCost=Line.LineAmount
- }
- Else
- {
- try
- {
- Set ^PVLog(+$H,Line.InvoiceAccount,Line.ItemId)=""
- If Line.AdminProductNummer?4.10N
- {
- Set PRNr=Line.AdminProductNummer
- }
- Else
- {
- Set ^PVLog(+$H,Line.InvoiceAccount,Line.ItemId)="try"
- Set PRNrBasis=..Translator.GeefPRNrForAdmin(Line.ItemId)
- Set PRNr=..Translator.GeefPRNrForAdminInclSOPR(Line.ItemId,Line.InvoiceAccount)
- If PRNrBasis'=PRNr Set ^PVLog(+$H,Line.InvoiceAccount,Line.ItemId)=PRNrBasis_"\"_PRNr
- }
-
- If $$$PRGet($$$GenProduct)'?.N ; Generisch moeder product -> kost=omzet
- {
- Set Line.LineCost=Line.LineAmount
- }
- Else
- {
- Set CifPPL=$$$PRGet($$$CifPPLEUR)
- Set Line.LineCost=+$J(CifPPL*Line.InventQty,0,4)
- }
- }
- catch
- {
- }
- }
-]]>
-
Index: AXimpl/Admin/STAT/Invoice/LineIterator.cls.xml
===================================================================
diff -u -r54528 -r55822
--- AXimpl/Admin/STAT/Invoice/LineIterator.cls.xml (.../LineIterator.cls.xml) (revision 54528)
+++ AXimpl/Admin/STAT/Invoice/LineIterator.cls.xml (.../LineIterator.cls.xml) (revision 55822)
@@ -43,7 +43,7 @@
#dim SqlStatement As %String = ""
Set SqlStatement =
"SELECT CustInvoiceJour.InvoiceAccount,CustInvoiceJour.OrderAccount,CustInvoiceJour.InvoiceId,CustInvoiceTrans.ItemId,com.AdminProductNummer,"
- _" CustInvoiceTrans.InventQty,CustInvoiceTrans.LineAmount,CustInvoiceTrans.TaxAmount, ISNULL(it.COSTAMOUNTOPERATIONS,0) LineCost, CustInvoiceJour.InvoiceDate,"
+ _" CustInvoiceTrans.InventQty,CustInvoiceTrans.LineAmount,CustInvoiceTrans.TaxAmount, (- ISNULL(it.ADUSOPRCOSTAMOUNTPOSTED ,0)) LineCost, CustInvoiceJour.InvoiceDate,"
_" 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"