Index: AXimpl/Admin/STAT/Invoice/Processor.cls.xml =================================================================== diff -u -r55822 -r55837 --- AXimpl/Admin/STAT/Invoice/Processor.cls.xml (.../Processor.cls.xml) (revision 55822) +++ AXimpl/Admin/STAT/Invoice/Processor.cls.xml (.../Processor.cls.xml) (revision 55837) @@ -70,6 +70,7 @@ 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) @@ -332,6 +333,53 @@ + + +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 + { + } + } +]]> +