Index: BL/PPS/TBX/WPPers.cls.xml
===================================================================
diff -u -r57653 -r57658
--- BL/PPS/TBX/WPPers.cls.xml	(.../WPPers.cls.xml)	(revision 57653)
+++ BL/PPS/TBX/WPPers.cls.xml	(.../WPPers.cls.xml)	(revision 57658)
@@ -68,29 +68,17 @@
 <Default>8</Default>
 </Parameter>
 
-<Property name="MatFormatter">
-<Type>APPS.Halux.PPS.impl.Formatter.Mat</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="InfoBepaler">
 <Type>BL.PPS.TBX.WPPers.InfoBepaler</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="TBXMatToEnuMatConverter">
-<Type>BL.PPS.TBX.impl.TBXMatToEnuMatConverter</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="%OnNew">
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..MatFormatter = ##class(APPS.Halux.PPS.impl.Formatter.Mat).%New()
-	set ..TBXMatToEnuMatConverter = ##class(BL.PPS.TBX.impl.TBXMatToEnuMatConverter).%New()
 	Set ..InfoBepaler = ##class(BL.PPS.TBX.WPPers.InfoBepaler).%New()
 	Quit $$$OK
 ]]></Implementation>
@@ -552,19 +540,8 @@
 	
 	/* invullen Info1 en Info2 TBX*/
 	Set (Info1,Info2)=""
-	Set:LT="B" Info1=$S($L(Info1):Info1_"; ",1:"R:")_"FRONT"
-	Set:"0"'[ASM Info1=$S($L(Info1):Info1_"; ",1:"R:")_"MAT "_..MatFormatter.GeefKorteNotatie(..TBXMatToEnuMatConverter.GeefMateriaal(ASM),..TBXMatToEnuMatConverter.GeefKleur(ASM))
-	Set:ODSP'="" Info1=$S($L(Info1):Info1_"; ",1:"R:")_"SPECIAAL : "_$CASE(ODSP,"F":"FRONT","R":"RUG","B":"BODEM","BR":"BODEM&RUG",:ODSP)
-	Set:IsSpoel Info1=$S($L(Info1):Info1_"; ",1:"R:")_"SPOELBAK/SYFON"
-	Set:BM="T" Info1=$S($L(Info1):Info1_"; ",1:"R:")_"TIP-ON"
-	Set:DC="B" Info1=$S($L(Info1):Info1_"; ",1:"R:")_"HOUTEN BALIKO LADE"
-	Set:IB<..#MinIB Info1=$S($L(Info1):Info1_"; ",1:"R:")_"EXTRA SMAL"
-	Set:IB>..#MaxIB Info1=$S($L(Info1):Info1_"; ",1:"R:")_">1500"
-	Set:DK=80 Info1=$S($L(Info1):Info1_"; ",1:"G:")_"80kg"
-	Set:IsSR Info1=$S($L(Info1):Info1_"; ",1:"G:")_"stalen rug"
-	Set:oQ.Status=$$$tsRemoved Info1="B:Verwijderd" ; overschrijft alle vorige
-	If ..GetNext(oQ.%Id())="" Do
-	. Set Info2= ..InfoBepaler.GeefInfo2(oQ.BatchID)
+	Set Info1= ..InfoBepaler.GeefInfo1(LT, ASM, ODSP, IsSpoel, BM, DC, IB, DK, IsSR, oQ.Status)
+	Set:(..GetNext(oQ.%Id())="") Info2= ..InfoBepaler.GeefInfo2(oQ.BatchID)
 	
 	Set WaarschuwingTijd=40
 	Set RedenTijd=60