Index: vhTest/Utils/DOM/PM/Product.cls.xml
===================================================================
diff -u
--- vhTest/Utils/DOM/PM/Product.cls.xml	(revision 0)
+++ vhTest/Utils/DOM/PM/Product.cls.xml	(revision 36603)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Utils.DOM.PM.Product">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="Creeer">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>PRNrStart:%Integer=1000,PRNrStop:%Integer=1099</FormalSpec>
+<Implementation><![CDATA[
+	#define ProductPrijs 10	
+
+	do ##class(vhLib.OldSchool).InitVars()
+	
+	#dim PRNr,Nr,Node As %Integer
+	#dim KortTekst As %String
+	
+	for PRNr = PRNrStart:1:PRNrStop {  
+		Set Nr = $translate($justify(PRNr - PRNrStart,2)," ",0)
+	    for Node=1:1:5 set ^KPR(PRNr,Node)="\"
+	   	#dim GenerischProduct As %String = ""
+	   	#dim LeverancierNr As %String = 5005
+	   	set KortTekst = "OL.UTPROD"_Nr_"\TEST PRODUCT "_Nr	
+		set ^KPR(PRNr,"I1")="01CH \01CH04ACC \01CH04ACC01MPL/BL \374"
+		
+		Set ^KPR(PRNr,0) = KortTekst
+		#dim IdentNr As %String = "0.123.45"_$extract(Nr,1)_"."_$extract(Nr,2)
+	    set $piece(^KPR(PRNr,2),"\",25)=IdentNr
+	    set $piece(^KPR(PRNr,0),"\",5)=8		   ; btw code
+	    set $piece(^KPR(PRNr,0),"\",14)=PRNr	   ; fysische stock
+	    set $piece(^KPR(PRNr,2),"\",14)="BAR"_PRNr ; barcode 
+		set ^KPR(PRNr,"I")=""
+		set ^KPR(PRNr,"J")=""		
+		set ^KPR(PRNr,"J"_LeverancierNr)=LeverancierNr ; _"\ \ \\\\\\22\\\\\\\1\EUR\\5\6.100000\\10\3.900000\61.000000\10\4.000000\40\"
+		set $piece(^KPR(PRNr,"J"_LeverancierNr),"\",3)= $replace(IdentNr,"0.123","L.123")
+		set $piece(^KPR(PRNr,"J"_LeverancierNr),"\",16)= 1 			      ; grootverpakking
+		set $piece(^KPR(PRNr,"J"_LeverancierNr),"\",17)= "EUR"			  ; muntcode
+		set $piece(^KPR(PRNr,"J"_LeverancierNr),"\",19)= $$$ProductPrijs
+		set $piece(^KPR(PRNr,"J"_LeverancierNr),"\",20)= 1
+		set $piece(^KPR(PRNr,"J"_LeverancierNr),"\",22)= $$$ProductPrijs
+		set $piece(^KPR(PRNr,"J"_LeverancierNr),"\",23)= $$$ProductPrijs-1
+		set $piece(^KPR(PRNr,"J"_LeverancierNr),"\",25)= $$$ProductPrijs
+	}
+	
+	do BLDIND^PRODUKT2(PRNr) 
+	do Gemaakt^PRODUKT2(PRNr)
+]]></Implementation>
+</Method>
+
+<Method name="Verwijder">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>PRNrStart:%Integer=1000,PRNrStop:%Integer=1099</FormalSpec>
+<Implementation><![CDATA[
+	do ##class(vhLib.OldSchool).InitVars()
+	
+	#dim ProductAPI As DOM.PM.ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI()
+	
+	#dim PRNr As %Integer
+	for PRNr = PRNrStart:1:PRNrStop {  
+		if ProductAPI.BestaatProduct(PRNr) do DELETE^PRODUKT2(PRNr,1)
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/BL/ProdHist/TestChargeTrace.cls.xml
===================================================================
diff -u -r29059 -r36603
--- vhUnitTest/BL/ProdHist/TestChargeTrace.cls.xml	(.../TestChargeTrace.cls.xml)	(revision 29059)
+++ vhUnitTest/BL/ProdHist/TestChargeTrace.cls.xml	(.../TestChargeTrace.cls.xml)	(revision 36603)
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.BL.ProdHist.TestChargeTrace">
-<Description>
-d ##class(vhUnitTest.Manager).RunTest("/debug/display=all","BL.ProdHist.TestChargeTrace")</Description>
 <Super>vhUnitTest.TestCase</Super>
 
-<Parameter name="ProductIDMetChargeNr">
+<Parameter name="ProductId">
 <Type>%String</Type>
-<Default>651472</Default>
+<Default>1000</Default>
 </Parameter>
 
 <Parameter name="AantalProductenMetChargeNr">
@@ -20,11 +18,17 @@
 <Default>1234</Default>
 </Parameter>
 
+<Property name="Magazijn">
+<Type>APPS.MAG.enu.Magazijn</Type>
+<InitialExpression>##class(APPS.MAG.enu.Magazijn).Ugly()</InitialExpression>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
-	#dim Magazijn As APPS.MAG.enu.Magazijn = ##class(APPS.MAG.enu.Magazijn).Ugly()
-	Do ..MaakBon(..#BonID,Magazijn)
+	Do ##class(vhTest.Utils.DOM.PM.Product).Creeer(..#ProductId,..#ProductId)
+	Do ..MaakBon(..#BonID, ..Magazijn)
 	Do ##super(aTestName)
 ]]></Implementation>
 </Method>
@@ -33,18 +37,17 @@
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
 	Do ..VerwijderBon(..#BonID)	
+	Do ##class(vhTest.Utils.DOM.PM.Product).Verwijder(..#ProductId,..#ProductId)
 	Do ##super(aTestName)
 ]]></Implementation>
 </Method>
 
-<Method name="TestRegisterORDWChargeTraceNormaal">
+<Method name="Test: Register ORDW ChargeTrace - Normaal">
 <Implementation><![CDATA[
-	#dim Magazijn As APPS.MAG.enu.Magazijn = ##class(APPS.MAG.enu.Magazijn).Ugly()
-		
-	#dim Resultaat As %String = ##class(BL.ProdHist.ChargeTrace).RegisterORDWChargeTrace(..#BonID,Magazijn,..#ProductIDMetChargeNr,1,"BAU12345")
+	#dim Resultaat As %String = ##class(BL.ProdHist.ChargeTrace).RegisterORDWChargeTrace(..#BonID, ..Magazijn,..#ProductId,1,"BAU12345")
 	Do $$$AssertEquals(Resultaat,"","Eerste van twee producten afmelden.")
 	
-	Set Resultaat = ##class(BL.ProdHist.ChargeTrace).RegisterORDWChargeTrace(..#BonID,Magazijn,..#ProductIDMetChargeNr,1,"BAU12346")
+	Set Resultaat = ##class(BL.ProdHist.ChargeTrace).RegisterORDWChargeTrace(..#BonID, ..Magazijn,..#ProductId,1,"BAU12346")
 	Do $$$AssertEquals(Resultaat,"","Tweede van twee producten afmelden.")
 	
 	Set Hoofding = ##class(Flow.OrderWMS.Hoofding).%OpenId(..#BonID,0)
@@ -54,13 +57,13 @@
 		#dim ChargeTrace As ProdHist.ChargeTrace = Lijn.ChargeTrace
 		Do $$$AssertEquals(ChargeTrace.Leveringsbon,"1234")		
 		Do $$$AssertEquals(ChargeTrace.Actie,"U")
-		Do $$$AssertEquals(ChargeTrace.GetTotalChargeTraceQtyForProd(..#ProductIDMetChargeNr),2)		
+		Do $$$AssertEquals(ChargeTrace.GetTotalChargeTraceQtyForProd(..#ProductId),2)		
 		
 		If $$$AssertTrue($IsObject(ChargeTrace.ChargeAantal)){
 			#dim AantalKey As %String = ChargeTrace.ChargeAantal.Next("")
 			#dim ChargeTraceAantal As ProdHist.ChargeTraceAantal = ChargeTrace.ChargeAantal.GetAt(AantalKey)
 			Do $$$AssertEquals(ChargeTraceAantal.Aantal,1)	
-			Do $$$AssertEquals(ChargeTraceAantal.Product.ProductNr,..#ProductIDMetChargeNr)
+			Do $$$AssertEquals(ChargeTraceAantal.Product.ProductNr,..#ProductId)
 			Do $$$AssertTrue($IsObject(ChargeTraceAantal.Beweging))
 			Do $$$AssertEquals(ChargeTraceAantal.ChargeID,"BAU12345")
 			
@@ -76,24 +79,20 @@
 ]]></Implementation>
 </Method>
 
-<Method name="TestRegisterORDWChargeTraceTeveelInEenKeer">
+<Method name="Test: Register ORDW ChargeTrace - Teveel in één keer">
 <Implementation><![CDATA[
-	#dim Magazijn As APPS.MAG.enu.Magazijn = ##class(APPS.MAG.enu.Magazijn).Ugly()
-		
 	#dim AantalRegistreren As %Integer = 4
-	#dim Resultaat As %String = ##class(BL.ProdHist.ChargeTrace).RegisterORDWChargeTrace(..#BonID,Magazijn,..#ProductIDMetChargeNr,AantalRegistreren,"BAU12345")
+	#dim Resultaat As %String = ##class(BL.ProdHist.ChargeTrace).RegisterORDWChargeTrace(..#BonID, ..Magazijn,..#ProductId,AantalRegistreren,"BAU12345")
 	Do $$$AssertEquals(Resultaat,"Van het opgegeven aantal is/zijn er "_(AantalRegistreren-..#AantalProductenMetChargeNr)_" niet gekoppeld.")
 ]]></Implementation>
 </Method>
 
-<Method name="TestRegisterORDWChargeTraceTeveelInTweeKeer">
+<Method name="Test: Register ORDW ChargeTrace - Teveel in twee keer">
 <Implementation><![CDATA[
-	#dim Magazijn As APPS.MAG.enu.Magazijn = ##class(APPS.MAG.enu.Magazijn).Ugly()
-		
 	#dim AantalRegistreren As %Integer = 2
-	#dim Resultaat As %String = ##class(BL.ProdHist.ChargeTrace).RegisterORDWChargeTrace(..#BonID,Magazijn,..#ProductIDMetChargeNr,AantalRegistreren,"BAU12345")
+	#dim Resultaat As %String = ##class(BL.ProdHist.ChargeTrace).RegisterORDWChargeTrace(..#BonID, ..Magazijn,..#ProductId,AantalRegistreren,"BAU12345")
 	
-	Set Resultaat = ##class(BL.ProdHist.ChargeTrace).RegisterORDWChargeTrace(..#BonID,Magazijn,..#ProductIDMetChargeNr,AantalRegistreren,"BAU99999")
+	Set Resultaat = ##class(BL.ProdHist.ChargeTrace).RegisterORDWChargeTrace(..#BonID, ..Magazijn,..#ProductId,AantalRegistreren,"BAU99999")
 	Do $$$AssertEquals(Resultaat,"Van het opgegeven aantal is/zijn er "_AantalRegistreren_" niet gekoppeld.")
 	
 	Set Hoofding = ##class(Flow.OrderWMS.Hoofding).%OpenId(..#BonID,0)
@@ -103,13 +102,13 @@
 		#dim ChargeTrace As ProdHist.ChargeTrace = Lijn.ChargeTrace
 		Do $$$AssertEquals(ChargeTrace.Leveringsbon,"1234")		
 		Do $$$AssertEquals(ChargeTrace.Actie,"U")
-		Do $$$AssertEquals(ChargeTrace.GetTotalChargeTraceQtyForProd(..#ProductIDMetChargeNr),2)		
+		Do $$$AssertEquals(ChargeTrace.GetTotalChargeTraceQtyForProd(..#ProductId),2)		
 		
 		If $$$AssertTrue($IsObject(ChargeTrace.ChargeAantal)){
 			#dim AantalKey As %String = ChargeTrace.ChargeAantal.Next("")
 			#dim ChargeTraceAantal As ProdHist.ChargeTraceAantal = ChargeTrace.ChargeAantal.GetAt(AantalKey)
 			Do $$$AssertEquals(ChargeTraceAantal.Aantal,2)	
-			Do $$$AssertEquals(ChargeTraceAantal.Product.ProductNr,..#ProductIDMetChargeNr)
+			Do $$$AssertEquals(ChargeTraceAantal.Product.ProductNr,..#ProductId)
 			Do $$$AssertTrue($IsObject(ChargeTraceAantal.Beweging))
 			Do $$$AssertEquals(ChargeTraceAantal.ChargeID,"BAU12345")
 
@@ -122,34 +121,29 @@
 
 <Method name="MaakBon">
 <FormalSpec>ID:%Integer,Magazijn:APPS.MAG.enu.Magazijn</FormalSpec>
-<ReturnType>%Status</ReturnType>
+<Private>1</Private>
 <Implementation><![CDATA[
-		
 	Set ^ORDW("IW",ID)=Magazijn
 	Set ^ORDW("D",ID)="15522\AFH\62957,3600\005004\62957\F\\\\\\\\\\\\62957,52808\\P\\62957,52808\\\1110"
-	Set ^ORDW("D",ID,"D",116897,100)=..#ProductIDMetChargeNr_"\W\\"_..#AantalProductenMetChargeNr_"\\\\U"
-	Set ^ORDW("D",ID,"D",116897,100,100)=..#ProductIDMetChargeNr_"\W\"_..#AantalProductenMetChargeNr_"\\\\\\\\\\U"
+	Set ^ORDW("D",ID,"D",116897,100)=..#ProductId_"\W\\"_..#AantalProductenMetChargeNr_"\\\\U"
+	Set ^ORDW("D",ID,"D",116897,100,100)=..#ProductId_"\W\"_..#AantalProductenMetChargeNr_"\\\\\\\\\\U"
 	Set ^ORDW("D",ID,"S","U")="W"
 	
 	Set OrderHoofding = ##class(Flow.OrderWMS.Hoofding).%OpenId(ID)
 	Set OrderHoofding.StatusWMS = "W"
 	Do OrderHoofding.KlantSetObjectId(1000)
 	Set OrderHoofding.DueOutTime = "62276,48446"
-	Do OrderHoofding.%Save()	
-	
-	Quit $$$OK
+	Do OrderHoofding.%Save()
 ]]></Implementation>
 </Method>
 
 <Method name="VerwijderBon">
 <FormalSpec>ID:%Integer</FormalSpec>
-<ReturnType>%Status</ReturnType>
+<Private>1</Private>
 <Implementation><![CDATA[
 	Kill ^ORDW("D",ID)
 	Kill ^ORDW("IW",ID)
-	Do ##class(BL.MB.UGLYPicking.OrderReservatie).RollbackReservations(ID,##class(APPS.MAG.UGLYPicking.enu.Magazijn).Ugly())
-	
-	Quit $$$OK
+	Do ##class(BL.MB.UGLYPicking.OrderReservatie).RollbackReservations(ID,..Magazijn)
 ]]></Implementation>
 </Method>
 </Class>