Index: APPS/TBXWeb/impl/AbstractOrderHandler.cls.xml
===================================================================
diff -u -r2 -r10
--- APPS/TBXWeb/impl/AbstractOrderHandler.cls.xml	(.../AbstractOrderHandler.cls.xml)	(revision 2)
+++ APPS/TBXWeb/impl/AbstractOrderHandler.cls.xml	(.../AbstractOrderHandler.cls.xml)	(revision 10)
@@ -68,7 +68,7 @@
 	. Do ..Logger.ErrorMail("PREPROCESSING_FAILED",$$ParseStatus^vhLib.System(stPreProcessing)) 
 	
 	; Ordertype order niet van het juiste begin type
-	If $$$ISERR(..OrderStartTypeValid()) Do  Quit $$$ERROR($$$GeneralError,"WSOrder start type not correct")
+	If $$$ISERR(..OrderStartTypeValid()) Do  Quit $$$ERROR($$$errStartTypeIncorrect,"WSOrder start type not correct")
 	. Do ..Logger.ErrorMail("ORDERSTARTTYPE_INVALID",..WSOrd.%Id()_" : "_..WSOrd.BonType) 
 	
 	If '(..IsValidWebDomain()) Do  Quit $$$ERROR($$$GeneralError,"WSOrder has no valid WebDomain for this shop")
Index: vhUnitTest/TestCase.cls.xml
===================================================================
diff -u
--- vhUnitTest/TestCase.cls.xml	(revision 0)
+++ vhUnitTest/TestCase.cls.xml	(revision 10)
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.TestCase">
+<Description>
+Adopted from InterSystems's %UnitTest.TestCase by logist (Dimas ltd., Russia)
+Adapted to Van Hoecke's needs by JCL and FMA
+
+Test case class. All test cases are derived from here.
+Every test method should start with prefix "Test".</Description>
+<IncludeCode>%outUnitTest,vhUnitTest,vhLib.Macro</IncludeCode>
+<IncludeGenerator>%outUnitTest,vhUnitTest</IncludeGenerator>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="Debug">
+</Property>
+
+<Property name="Manager">
+<Type>vhUnitTest.Manager</Type>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>AManager</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	 Set r%Manager=AManager
+	 Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="OnBeforeAllTests">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[ 	 Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	 Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	set %VarsInMemoryBefore = 0
+	set Var = "%" for  set Var = $order(@Var) quit:Var=""  if ..ValidVar(Var) set %VarsInMemoryBefore=$i(%VarsInMemoryBefore)
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+
+	set %VarsInMemoryAfter = 0
+	set Var = "%" for  set Var = $order(@Var) quit:Var=""  if ..ValidVar(Var) set %VarsInMemoryAfter=$i(%VarsInMemoryAfter)
+	 
+	;if %VarsInMemoryAfter'=%VarsInMemoryBefore do ..Fail("Vars niet mooi opgekuisd")
+	
+	While (0 '= $TLevel) {
+		TRollback
+		Do ..Fail("Een openstaande transactie werd niet gesloten!")
+	}
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="ValidVar">
+<FormalSpec>Var</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	quit:$extract(Var)="%" 0
+	quit:Var="SQLCODE" 0
+	quit:Var="sc" 0
+	
+	quit 1
+]]></Implementation>
+</Method>
+
+<Method name="AssertEqualsViaMacro">
+<FormalSpec>aAutoQuoted,aValue1,aValue2,aMessage</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	 Set manager=r%Manager
+	 Set aMessage=$g(aMessage)
+	     _":("_aValue1_"=="_aValue2_"):"
+	     _"["_..ParseAutoQuoted(aAutoQuoted,"equals")_"]"
+	 Set success = aValue1=aValue2
+	 Do manager.LogAssert(success,"AssertEquals",aMessage)
+	 Quit success
+]]></Implementation>
+</Method>
+
+<Method name="AssertNotEqualsViaMacro">
+<FormalSpec>aAutoQuoted,aValue1,aValue2,aMessage</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	 Set manager=r%Manager
+	 Set aMessage=$g(aMessage)
+	     _":("_aValue1_"'="_aValue2_"):"
+	     _"["_..ParseAutoQuoted(aAutoQuoted,"equals")_"]"
+	 Set success=aValue1'=aValue2
+	 Do manager.LogAssert(success,"AssertNotEquals",aMessage)
+	 Quit success
+]]></Implementation>
+</Method>
+
+<Method name="AssertAlmostEqualsViaMacro">
+<FormalSpec>aAutoQuoted,aValue1,aValue2,aDifference,aMessage</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	 Set manager=r%Manager
+	 Set aMessage=$g(aMessage)
+	     _":("_aValue1_"="_aValue2_" [margin = "_ aDifference _"]):"
+	     _"["_..ParseAutoQuoted(aAutoQuoted,"equals")_"]"
+	 Set success=($zabs(aValue1-aValue2))'>(aDifference)
+	 Do manager.LogAssert(success,"AssertAlmostEquals",aMessage)
+	 Quit success
+]]></Implementation>
+</Method>
+
+<Method name="AssertTrueViaMacro">
+<FormalSpec>aAutoQuoted,aValue,aMessage</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	 Set manager=r%Manager
+	 Set aMessage=$g(aMessage)
+	     _":("_aValue_"=TRUE):"
+	     _"["_..ParseAutoQuoted(aAutoQuoted,"expr")_"]"
+	 Set success=''aValue
+	 Do manager.LogAssert(success,"AssertTrue",aMessage)
+	 Quit success
+]]></Implementation>
+</Method>
+
+<Method name="AssertNotTrueViaMacro">
+<FormalSpec>aAutoQuoted,aValue,aMessage</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	 Set manager=r%Manager
+	 Set aMessage=$g(aMessage)
+	     _":("_aValue_"=FALSE):"
+	     _"["_..ParseAutoQuoted(aAutoQuoted,"expr")_"]"
+	 Set success='aValue
+	 Do manager.LogAssert(success,"AssertNotTrue",aMessage)
+	 Quit success
+]]></Implementation>
+</Method>
+
+<Method name="AssertStatusOKViaMacro">
+<FormalSpec>aAutoQuoted,status,aMessage</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	 Set manager=r%Manager
+	 Set aMessage=$g(aMessage)_"["_..ParseAutoQuoted(aAutoQuoted,"expr")_"]"
+	 Set success=$$$ISOK(status)
+	 If $$$ISERR(status) Do
+	 . Do $system.Status.DecomposeStatus(status,.errorarray,"-d")
+	 . Set aMessage=aMessage_" => "_$g(errorarray(1))
+	 Do manager.LogAssert(success,"AssertStatusOK",aMessage)
+	 Quit success
+]]></Implementation>
+</Method>
+
+<Method name="AssertStatusNotOKViaMacro">
+<FormalSpec>aAutoQuoted,status,aMessage</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	 Set manager=r%Manager
+	 Set aMessage=$g(aMessage)_"["_..ParseAutoQuoted(aAutoQuoted,"expr")_"]"
+	 Set success=$$$ISERR(status)
+	 Do manager.LogAssert(success,"AssertStatusNotOK",aMessage)
+	 Quit success
+]]></Implementation>
+</Method>
+
+<Method name="Fail">
+<FormalSpec>aMessage</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	 Set manager=r%Manager
+	 Do manager.LogAssert(0,"FAIL",$g(aMessage))
+	 Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="AssertFilesSameViaMacro">
+<FormalSpec>aAutoQuoted,file1,file2,aMessage</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	 Set manager=r%Manager
+	 Set aMessage=$g(aMessage,"'"_file1_"'=='"_file2_"'")
+	 If file1=$tr(file1,"/","\") If file1'["\" Set file1=manager.CurrentDir_"\"_file1
+	 If file2=$tr(file2,"/","\") If file2'["\" Set file2=manager.CurrentDir_"\"_file2
+	 Set success=$$isfilesame^%qccKeyword(file1,file2)
+	 Do manager.LogAssert(success,"AssertFilesSame",aMessage)
+	 Quit success
+]]></Implementation>
+</Method>
+
+<Method name="LogMessage">
+<FormalSpec>message</FormalSpec>
+<Implementation><![CDATA[
+	 Set manager=r%Manager
+	 Do manager.LogMessage($g(message))
+	 Quit
+]]></Implementation>
+</Method>
+
+<Method name="ParseAutoQuoted">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>argline:%String,type:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	 s p=0,q=0,ptr=1,piece=0
+	 f i=1:1:$l(argline)+1 q:i>$l(argline)  s c=$e(argline,i) d
+	 . i c="""" s q='q
+	 . i c="("  s p=p+1
+	 . i c=")"  s p=p-1
+	 . i c=",",q=0,p=0 s args($increment(piece))=$e(argline,ptr,i-1),ptr=i+1
+	 s args($increment(piece))=$e(argline,ptr,i-1)
+	 i type="expr"   q $g(args(1))
+	 i type="equals" q $g(args(1))_"=="_$g(args(2))
+	 q ""
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: vhUnitTest/APPS/TBXWeb/impl/VHEPNOrderHandler.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/TBXWeb/impl/VHEPNOrderHandler.cls.xml	(revision 0)
+++ vhUnitTest/APPS/TBXWeb/impl/VHEPNOrderHandler.cls.xml	(revision 10)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.APPS.TBXWeb.impl.VHEPNOrderHandler">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhUnitTest.TestCase</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="TestSFSOrder">
+<Description>
+Oproepen via 
+	do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.TBXWeb.impl.VHEPNOrderHandler") 
+</Description>
+<Implementation><![CDATA[
+	set WSOrdID = ..CreateWSOrd("OFF")
+	set impl = ##class(APPS.TBXWeb.impl.VHEPNOrderHandler).%New(WSOrdID,"VHEPN","SFS")
+	do $$$AssertFalse($$$OK=impl.OrderStartTypeValid())
+	
+	do ..CleanUpWSOrd(WSOrdID)
+
+	set WSOrdID = ..CreateWSOrd("BBON")
+	set impl = ##class(APPS.TBXWeb.impl.VHEPNOrderHandler).%New(WSOrdID,"VHEPN","SFS")
+	do $$$AssertTrue($$$OK=impl.OrderStartTypeValid())
+	
+	do ..CleanUpWSOrd(WSOrdID)
+	
+	quit
+]]></Implementation>
+</Method>
+
+<Method name="CleanUpWSOrd">
+<FormalSpec>WSOrdID:%String</FormalSpec>
+<Implementation><![CDATA[
+	do ##class(WS.TBX.Order).%DeleteId(WSOrdID)
+	do $$$AssertFalse(##class(WS.TBX.Order).%ExistsId(WSOrdID))
+]]></Implementation>
+</Method>
+
+<Method name="CreateWSOrd">
+<FormalSpec>BonType:%String="OFF"</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	set WSOrd=##class(WS.TBX.Order).%New()
+	set WSOrd.BonType=BonType
+	set WSOrd.WebDomain = "tbx.sfsunimarket.biz"
+	set WSOrd.KLNummer = 55946
+	
+	do WSOrd.%Save() 
+	
+	quit WSOrd.%Id()
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: APPS/TBXWeb.inc.rou
===================================================================
diff -u -r2 -r10
--- APPS/TBXWeb.inc.rou	(.../TBXWeb.inc.rou)	(revision 2)
+++ APPS/TBXWeb.inc.rou	(.../TBXWeb.inc.rou)	(revision 10)
@@ -11,4 +11,7 @@
 #Include APPS.TBXWeb.EMailAdressen
 #Include APPS.TBXWeb.DomeinNamen
  
-#define Vertaling(%s,%t)	##class(Res.Vertaling).GetVertaling("TBW",%s,"L",%t)
\ No newline at end of file
+#define Vertaling(%s,%t)	##class(Res.Vertaling).GetVertaling("TBW",%s,"L",%t)
+ 
+ 
+#define errStartTypeIncorrect		3001
\ No newline at end of file
Index: vhUnitTest/WS/TBX/SFS/OrderServiceInternal.cls.xml
===================================================================
diff -u
--- vhUnitTest/WS/TBX/SFS/OrderServiceInternal.cls.xml	(revision 0)
+++ vhUnitTest/WS/TBX/SFS/OrderServiceInternal.cls.xml	(revision 10)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.WS.TBX.SFS.OrderServiceInternal">
+<IncludeCode>APPS.TBXWeb</IncludeCode>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhUnitTest.TestCase</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="TestBuildSFSMessage">
+<Description>
+Oproepen via 
+	do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","WS.TBX.SFS.OrderServiceInternal") 
+</Description>
+<Implementation><![CDATA[
+	set SFSMessage = ##class(WS.TBX.SFS.OrderServiceInternal).GetSFSMessage($$$ERROR($$$GeneralError,"wsID not existing"))
+	do $$$AssertEquals("Order not confirmed",SFSMessage)
+	
+	set SFSMessage = ##class(WS.TBX.SFS.OrderServiceInternal).GetSFSMessage($$$ERROR($$$errStartTypeIncorrect,"Error startType incorrect"))
+	do $$$AssertEquals("Order already confirmed",SFSMessage)
+	
+	quit
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: vhUnitTest/Report.cls.xml
===================================================================
diff -u
--- vhUnitTest/Report.cls.xml	(revision 0)
+++ vhUnitTest/Report.cls.xml	(revision 10)
@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.Report">
+<Abstract>1</Abstract>
+<Super>%CSP.Page</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<UDLText name="T">
+<Content><![CDATA[
+//procedureblock; can't have procedureblock turned on when using &html<>
+
+]]></Content>
+</UDLText>
+
+<Method name="OnPage">
+<Description>
+Adapted to Van Hoecke's needs by FMA (small change: reversed the order of the test runs in the report: most recent first).</Description>
+<ClassMethod>1</ClassMethod>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+ Set namespace=%request.Get("NS")
+ Set index=%request.Get("INDEX")
+ Set suite=%request.Get("SUITE")
+ set case=%request.Get("CASE")
+ set method=%request.Get("METHOD")
+ &html<<HTML><HEAD>#(..HyperEventHead())#</HEAD><BODY>>
+ If namespace=""  { Quit ..NoNameSpace()                                  }
+ ElseIf index=""  { Quit ..ShowIndices(namespace)                         }
+ ElseIf suite=""  { Quit ..ShowSuites(namespace,index)                    }
+ ElseIf case=""   { Quit ..ShowCases(namespace,index,suite)               }
+ ElseIf method="" { Quit ..ShowMethods(namespace,index,suite,case)        }
+ Else             { Quit ..ShowAsserts(namespace,index,suite,case,method) }
+ &html<</BODY></HTML>>
+ Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="NoNameSpace">
+<ClassMethod>1</ClassMethod>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+ &html<<H1>Please Enter a NameSpace with NS parameter</H1>>
+ Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="ShowIndices">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>namespace</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+ Write ..HyperEventBody()
+ Write "<script language=javascript>",!
+ Write "function deleteSuite(namespace,index) {",!
+ Write " if ( confirm('Are you sure you want to delete this log?\nNameSpace='+namespace+'\nLogIndex='+index) ) {",!
+ Write "  ",..HyperEventCall("..DeleteSuite","namespace,index",0),";",!
+ Write "  document.location.reload();",!
+ Write " }",!
+ Write "}",!
+ Write "</script>",!
+ &html<<basefont face="Sans-Serif" size="3">>
+ &html<<table width="100%" bgcolor="#BBBBBB"><tr><td><font size=5 color="#FFFFFF"><b>Unit Test Report</b></font></td></tr></table>>
+ &html<<table>>
+ &html<<tr><td align=right><b>NameSpace: </b></td><td><b>#(namespace)#</b></td></tr>>
+ &html<</table>>
+ &html<<br>>
+ &html<<table border="1" cellspacing="0" cellpadding="4" bordercolor="#CCCCCC">>
+ &html<<tr bgcolor="#ACBBD5">>
+ &html<<td><font color="#FFFFFF"><b>Test Index</b></font></td>>
+ &html<<td><font color="#FFFFFF"><b>Test Time</b></font></td>>
+ &html<<td width=100 align=center><font color="#FFFFFF"><b>Status</b></font></td>>
+ &html<<td>&nbsp;</td>>
+ &html<</tr>>
+ Set index="" For  Set index=$o(^|namespace|UnitTestLog(index),-1) Quit:index=""  Do
+ . Set href="vhUnitTest.Report.cls?NS="_..EscapeURL(namespace)_"&INDEX="_index
+ . &html<<tr>>
+ . &html<<td align="center"><a href="#(href)#">#(index)#</a></td>>
+ . &html<<td><a href="#(href)#">#($zdatetime(^|namespace|UnitTestLog(index),5,3))#</a></td>>
+ . Set succ=0,fail=0
+ . Set suite="" For  Set suite=$o(^|namespace|UnitTestLog(index,suite)) Quit:suite=""  Do
+ . . If ..IsSuccess(namespace,index,suite) { Set succ=succ+1 } Else { Set fail=fail+1 }
+ . If fail &html<<td><font color="red">#(fail)# Test Suite#($s(fail=1:"",1:"s"))# Failed</font></td>> If 1
+ . Else    &html<<td><font color="green">All Test Suites Passed</font></td>>
+ . &html<<td><input type="button" value="Delete" onClick="deleteSuite('#(namespace)#','#(index)#')"></td>>
+ . &html<</tr>>
+ &html<</table>>
+ Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="ShowSuites">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>namespace,index</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+ &html<<basefont face="Sans-Serif" size="3">>
+ &html<<table width="100%" bgcolor="#BBBBBB"><tr><td><font size=5 color="#FFFFFF"><b>Unit Test Report</b></font></td></tr></table>>
+ If $d(^|namespace|UnitTestLog(index))=0 &html<<br><font size=5 color="##FF0000"><b>Log Entry Doesn't Exist!</b></font>> Quit $$$OK
+ &html<<table>>
+ &html<<tr><td align=right><b>NameSpace: </b></td><td><b><a href="vhUnitTest.Report.cls?NS=#(..EscapeURL(namespace))#">#(namespace)#</a></b></td></tr>>
+ &html<<tr><td align=right><b>LogIndex: </b></td><td><b>#(index)# ( Test finished on #($zdatetime(^|namespace|UnitTestLog(index),5,3))# )</b></td></tr>>
+ &html<</table>>
+ &html<<br>>
+ &html<<table border="1" cellspacing="0" cellpadding="4" bordercolor="#CCCCCC">>
+ &html<<tr bgcolor="#ACBBD5">>
+ &html<<td><font color="#FFFFFF"><b>Test Suites</b></font></td>>
+ &html<<td width=100 align=center><font color="#FFFFFF"><b>Status</b></font></td>>
+ &html<</tr>>
+ Set suite="" For  Set suite=$o(^|namespace|UnitTestLog(index,suite)) Quit:suite=""  Do
+ . Set result=^|namespace|UnitTestLog(index,suite)
+ . Set href="vhUnitTest.Report.cls?NS="_..EscapeURL(namespace)_"&INDEX="_index_"&SUITE="_..EscapeURL(suite)
+ . &html<<tr>>
+ . If $data(^|namespace|UnitTestLog(index,suite))>1
+ . If    &html<<td valign=top><a href="#(href)#">#(suite)#</a></td>>
+ . Else  &html<<td valign=top>#(suite)#</td>>
+ . If ..IsSuccess(namespace,index,suite) { Set color="green",status="Passed" } Else { Set color="red",status="Failed" }
+ . If +result
+ . If    &html<<td align=left><font color="#(color)#"><b>#(status)#</b></font></td>>
+ . Else  &html<<td align=left><font color="#(color)#"><b>#(status_"<br>"_$p(result,":",2,99))#</b></font></td>>
+ . &html<</tr>>
+ &html<</table>>
+ Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="ShowCases">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>namespace,index,suite</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+ &html<<basefont face="Sans-Serif" size="3">>
+ &html<<table width="100%" bgcolor="#BBBBBB"><tr><td><font size=5 color="#FFFFFF"><b>Unit Test Report</b></font></td></tr></table>>
+ If $d(^|namespace|UnitTestLog(index,suite))=0 &html<<br><font size=5 color="##FF0000"><b>Log Entry Doesn't Exist!</b></font>> Quit $$$OK
+ &html<<table>>
+ &html<<tr><td align=right><b>NameSpace: </b></td><td><b><a href="vhUnitTest.Report.cls?NS=#(..EscapeURL(namespace))#">#(namespace)#</a></b></td></tr>>
+ &html<<tr><td align=right><b>LogIndex: </b></td><td><b><a href="vhUnitTest.Report.cls?NS=#(..EscapeURL(namespace))#&INDEX=#(index)#">#(index)# ( Test finished on #($zdatetime(^|namespace|UnitTestLog(index),5,3))# )</a></b></td></tr>>
+ &html<<tr><td align=right><b>TestSuite: </b></td><td><b>#(suite)#</b></td></tr>>
+ &html<</table>>
+ &html<<br>>
+ &html<<table border="1" cellspacing="0" cellpadding="4" bordercolor="#CCCCCC">>
+ &html<<tr bgcolor="#ACBBD5">>
+ &html<<td><font color="#FFFFFF"><b>Test Cases</b></font></td>>
+ &html<<td width=100 align=center><font color="#FFFFFF"><b>Status</b></font></td>>
+ &html<</tr>>
+ Set case="" For  Set case=$o(^|namespace|UnitTestLog(index,suite,case)) Quit:case=""  Do
+ . Set result=^|namespace|UnitTestLog(index,suite,case)
+ . Set href="vhUnitTest.Report.cls?NS="_..EscapeURL(namespace)_"&INDEX="_index_"&SUITE="_..EscapeURL(suite)_"&CASE="_..EscapeURL(case)
+ . &html<<tr>>
+ . If $data(^|namespace|UnitTestLog(index,suite,case))>1
+ . If    &html<<td valign=top><a href="#(href)#">#(case)#</a></td>>
+ . Else  &html<<td valign=top>#(case)#</td>>
+ . If ..IsSuccess(namespace,index,suite,case) { Set color="green",status="Passed" } Else { Set color="red",status="Failed" }
+ . If +result
+ . If    &html<<td align=left><font color="#(color)#"><b>#(status)#</b></font></td>>
+ . Else  &html<<td align=left><font color="#(color)#"><b>#(status_"<br>"_$p(result,":",2,99))#</b></font></td>>
+ . &html<</tr>>
+ &html<</table>>
+ Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="ShowMethods">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>namespace,index,suite,case</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+ &html<<basefont face="Sans-Serif" size="3">>
+ &html<<table width="100%" bgcolor="#BBBBBB"><tr><td><font size=5 color="#FFFFFF"><b>Unit Test Report</b></font></td></tr></table>>
+ If $d(^|namespace|UnitTestLog(index,suite,case))=0 &html<<br><font size=5 color="##FF0000"><b>Log Entry Doesn't Exist!</b></font>> Quit $$$OK
+ &html<<table>>
+ &html<<tr><td align=right><b>NameSpace: </b></td><td><b><a href="vhUnitTest.Report.cls?NS=#(..EscapeURL(namespace))#">#(namespace)#</a></b></td></tr>>
+ &html<<tr><td align=right><b>LogIndex: </b></td><td><b><a href="vhUnitTest.Report.cls?NS=#(..EscapeURL(namespace))#&INDEX=#(index)#">#(index)# ( Test finished on #($zdatetime(^|namespace|UnitTestLog(index),5,3))# )</a></b></td></tr>>
+ &html<<tr><td align=right><b>TestSuite: </b></td><td><b><a href="vhUnitTest.Report.cls?NS=#(..EscapeURL(namespace))#&INDEX=#(index)#&SUITE=#(..EscapeURL(suite))#">#(suite)#</a></b></td></tr>>
+ &html<<tr><td align=right><b>TestCase: </b></td><td><b>#(case)#</b></td></tr>>
+ &html<</table>>
+ &html<<br>>
+ &html<<table border="1" cellspacing="0" cellpadding="4" bordercolor="#CCCCCC">>
+ &html<<tr bgcolor="#ACBBD5">>
+ &html<<td><font color="#FFFFFF"><b>Methods</b></font></td>>
+ &html<<td width=100 align=center><font color="#FFFFFF"><b>Description</b></font></td>>   // JCL - Method description toegevoegd
+ &html<<td width=100 align=center><font color="#FFFFFF"><b>Status</b></font></td>>
+ &html<</tr>>
+ Set method="" For  Set method=$o(^|namespace|UnitTestLog(index,suite,case,method)) Quit:method=""  Do
+ . Set result=^|namespace|UnitTestLog(index,suite,case,method)
+ . Set href="vhUnitTest.Report.cls?NS="_..EscapeURL(namespace)_"&INDEX="_index_"&SUITE="_..EscapeURL(suite)_"&CASE="_..EscapeURL(case)_"&METHOD="_..EscapeURL(method)
+ . &html<<tr>>
+ . If $data(^|namespace|UnitTestLog(index,suite,case,method))>1
+ . If    &html<<td valign=top><a href="#(href)#">#(method)#()</a></td>>
+ . Else  &html<<td valign=top>#(method)#()</td>>
+ . If 1
+ . If  &html<<td border="1">#($$MethodDescription^vhLib(case,method))#</td>>   // JCL - Method description toegevoegd
+ . If ..IsSuccess(namespace,index,suite,case,method) { Set color="green",status="Passed" } Else { Set color="red",status="Failed" }
+ . If +result
+ . If    &html<<td align=left><font color="#(color)#"><b>#(status)#</b></font></td>>
+ . Else  &html<<td align=left><font color="#(color)#"><b>#(status_"<br>"_$p(result,":",2,99))#</b></font></td>>
+ . &html<</tr>>
+ &html<</table>>
+ Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="ShowAsserts">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>namespace,index,suite,case,method</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+ &html<<basefont face="Sans-Serif" size="3">>
+ &html<<table width="100%" bgcolor="#BBBBBB"><tr><td><font size=5 color="#FFFFFF"><b>Unit Test Report</b></font></td></tr></table>>
+ If $d(^|namespace|UnitTestLog(index,suite,case,method))=0 &html<<br><font size=5 color="##FF0000"><b>Log Entry Doesn't Exist!</b></font>> Quit $$$OK
+ &html<<table>>
+ &html<<tr><td align=right><b>NameSpace: </b></td><td><b><a href="vhUnitTest.Report.cls?NS=#(..EscapeURL(namespace))#">#(namespace)#</a></b></td></tr>>
+ &html<<tr><td align=right><b>LogIndex: </b></td><td><b><a href="vhUnitTest.Report.cls?NS=#(..EscapeURL(namespace))#&INDEX=#(index)#">#(index)# ( Test finished on #($zdatetime(^|namespace|UnitTestLog(index),5,3))# )</a></b></td></tr>>
+ &html<<tr><td align=right><b>TestSuite: </b></td><td><b><a href="vhUnitTest.Report.cls?NS=#(..EscapeURL(namespace))#&INDEX=#(index)#&SUITE=#(..EscapeURL(suite))#">#(suite)#</a></b></td></tr>>
+ &html<<tr><td align=right><b>TestCase: </b></td><td><b><a href="vhUnitTest.Report.cls?NS=#(..EscapeURL(namespace))#&INDEX=#(index)#&SUITE=#(..EscapeURL(suite))#&CASE=#(..EscapeURL(case))#">#(case)#</a></b></td></tr>>
+ &html<<tr><td align=right><b>Method: </b></td><td><b>#(method)#()</b></td></tr>>
+ &html<</table>>
+ &html<<br>>
+ &html<<table border="1" cellspacing="0" cellpadding="4" bordercolor="#CCCCCC">>
+ &html<<tr bgcolor="#ACBBD5">>
+ &html<<td><font color="#FFFFFF"><b>Asserts</b></font></td>>
+ &html<<td><font color="#FFFFFF"><b>Assert Description</b></font></td>>
+ &html<<td width=100 align=center><font color="#FFFFFF"><b>Status</b></font></td>>
+ &html<</tr>>
+ Set action="" For  Set action=$o(^|namespace|UnitTestLog(index,suite,case,method,action)) Quit:action=""  Do
+ . Set result=^|namespace|UnitTestLog(index,suite,case,method,action)
+ . &html<<tr>>
+ . &html<<td valign=top>#($p(result,":",2))#</td>>
+ . &html<<td valign=top>#($p(result,":",3,99))#</td>>
+ . If ..IsSuccess(namespace,index,suite,case,method,action) { Set color="green",status="Passed" } Else { Set color="red",status="Failed" }
+ . &html<<td valign=top align=center><font color="#(color)#"><b>#(status)#</b></font></td>>
+ . &html<</tr>>
+ &html<</table>>
+ Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="DeleteSuite">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>namespace,index</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+ Kill ^|namespace|UnitTestLog(index)
+ Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="IsSuccess">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>namespace,index,suite,case,method,action</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+ Set success=1
+ If $d(action) {
+ Quit ''^|namespace|UnitTestLog(index,suite,case,method,action)
+ } Elseif $d(method) {
+ If '^|namespace|UnitTestLog(index,suite,case,method) Quit 0
+ Set action="" For  Set action=$o(^|namespace|UnitTestLog(index,suite,case,method,action)) Quit:action=""  Do  Quit:success=0
+ . Set success=..IsSuccess(namespace,index,suite,case,method,action)
+ Quit success
+ } Elseif $d(case) {
+ If '^|namespace|UnitTestLog(index,suite,case) Quit 0
+ Set method="" For  Set method=$o(^|namespace|UnitTestLog(index,suite,case,method)) Quit:method=""  Do  Quit:success=0
+ . Set success=..IsSuccess(namespace,index,suite,case,method)
+ Quit success
+ } Elseif $d(suite) {
+ If '^|namespace|UnitTestLog(index,suite) Quit 0
+ Set case="" For  Set case=$o(^|namespace|UnitTestLog(index,suite,case)) Quit:case=""  Do  Quit:success=0
+ . Set success=..IsSuccess(namespace,index,suite,case)
+ Quit success
+ } Else {
+ Quit 1
+ }
+]]></Implementation>
+</Method>
+
+<Method name="OnPreHTTP">
+<ClassMethod>1</ClassMethod>
+<ReturnType>%Boolean</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set %session.AppTimeout = 305
+	Quit $$$OK
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: WS/TBX/SFS/OrderServiceInternal.cls.xml
===================================================================
diff -u -r2 -r10
--- WS/TBX/SFS/OrderServiceInternal.cls.xml	(.../OrderServiceInternal.cls.xml)	(revision 2)
+++ WS/TBX/SFS/OrderServiceInternal.cls.xml	(.../OrderServiceInternal.cls.xml)	(revision 10)
@@ -4,7 +4,7 @@
 <Description>
 Web service for SFS to confirm orders
 This is the internal version, called by our proxy running in the DMZ</Description>
-<IncludeCode>vhLib.Macro</IncludeCode>
+<IncludeCode>APPS.TBXWeb</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%SOAP.WebService</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
@@ -15,20 +15,6 @@
 <Default>OrderServiceInternal</Default>
 </Parameter>
 
-<Parameter name="LOCATION">
-<Description>
-URL for invoking the WebService.</Description>
-<Default>http://iserv.vanhoecke.be/csp/hadev</Default>
-</Parameter>
-
-<Parameter name="LOCATIONxxWWW01xxHADEV">
-<Default>http://iserv.vanhoecke.be/csp/hadev</Default>
-</Parameter>
-
-<Parameter name="LOCATIONxxCACHE02xxDEVADMIN1">
-<Default>http://cache02/csp/admin1</Default>
-</Parameter>
-
 <Parameter name="NAMESPACE">
 <Description>
 SOAP Namespace for the WebService</Description>
@@ -71,9 +57,9 @@
 	If 'scSaved Do  Do ..ReturnFault(##class(WS.WSServerFault).%New("Order not saved", ..#SERVICENAME, "CO")) 
 	. Do oLogger.Error("SAVE_wsORD","EDInr: "_EDInr_" not saved : "_$$ParseStatus^vhLib.System(scSaved))
 
-	
 	Set scOrdered = ##class(APPS.TBXWeb.OrderHandling).Order(wsID,"VHEPN","SFS")
-	If 'scOrdered Do  Do ..ReturnFault(##class(WS.WSServerFault).%New("Order not confirmed", ..#SERVICENAME, "CO")) 
+	If 'scOrdered Do  Do ..ReturnFault(##class(WS.WSServerFault).%New(SFSMessage, ..#SERVICENAME, "CO")) 
+	. Set SFSMessage = ..GetSFSMessage(scOrdered)
 	. Do oLogger.Error("wsORD_ORDER","Order not confirmed : "_$$ParseStatus^vhLib.System(scOrdered))
 	
 	Do oLogger.Info("wsORD_ORDER","Order "_EDInr_" ordered")
@@ -83,5 +69,13 @@
 	//Quit ##class(ConfirmOrderResult).%New(EDInr,$$ProductieDagen^FLOWHALUX())
 ]]></Implementation>
 </Method>
+
+<Method name="GetSFSMessage">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Status:%Status</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit $select($$$GETERRORCODE(Status)=$$$errStartTypeIncorrect:"Order already confirmed",1:"Order not confirmed")
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: vhUnitTest/APPS/TBXWeb/TestActies.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/TBXWeb/TestActies.cls.xml	(revision 0)
+++ vhUnitTest/APPS/TBXWeb/TestActies.cls.xml	(revision 10)
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.APPS.TBXWeb.TestActies">
+<Description>
+Oproepen via 
+	do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.TBXWeb.TestActies") 
+	</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhUnitTest.TestCase</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="TestIsActieGeldig">
+<Implementation><![CDATA[
+	Set Actie=##class(APPS.TBXWeb.Actie).%OpenId("SFS_GRATIS_KORPUSSCHIENEN_2011")
+	Do $$$AssertTrue($IsObject(Actie),"Actie SFS_GRATIS_KORPUSSCHIENEN_2011 bestaat")
+	
+	Set DatumVooraf=62075
+	Set DatumTijdens=62115
+	Set DatumAchteraf=62375
+	Do $$$AssertEquals(Actie.IsGeldigePeriode(DatumVooraf),0,"Actie is niet geldig vooraf")
+	Do $$$AssertEquals(Actie.IsGeldigePeriode(DatumTijdens),1,"Actie is geldig tijdens periode")
+	Do $$$AssertEquals(Actie.IsGeldigePeriode(DatumAchteraf),0,"Actie is niet geldig achteraf")
+
+	Set ShopSFS="SFS"
+	Set ShopVHEPN="VHEPN"
+	Do $$$AssertEquals(Actie.IsGeldigeShop(ShopSFS),1,"Actie is geldig voor shop SFS")
+	Do $$$AssertEquals(Actie.IsGeldigeShop(ShopVHEPN),0,"Actie is geldig voor shop VHEPN")
+	Do $$$AssertEquals(Actie.IsGeldigeShop(""),0,"Actie is geldig voor lege shop")
+	Do $$$AssertEquals(Actie.IsGeldigeShop("ABC"),0,"Actie is geldig voor onbestaande shop ABC")
+	
+	Set Klant="55946"
+	Do $$$AssertEquals(Actie.IsGeldigeKlant(Klant),1,"Actie is geldig voor klant 55946")
+
+	// Volledige IsGeldig() test
+	Do $$$AssertEquals(Actie.IsGeldig(DatumTijdens,ShopSFS,Klant),1,"Actie is geldig (set 1)")
+	Do $$$AssertEquals(Actie.IsGeldig(DatumAchteraf,ShopSFS,Klant),0,"Actie is niet geldig (set 2)")
+	Do $$$AssertEquals(Actie.IsGeldig(DatumTijdens,ShopVHEPN,Klant),0,"Actie is niet geldig (set 3)")
+
+	Quit
+]]></Implementation>
+</Method>
+
+<Method name="TestGeefGeldigeActies">
+<Implementation><![CDATA[
+	Set DatumTijdens=62115
+	Set ShopSFS="SFS"
+	Set Klant="55946"
+	Set ProductMetCP=""
+	Set ActiesList=##class(APPS.TBXWeb.Actie).GeefActieveActies(DatumTijdens,ShopSFS,Klant)   ; ,ProductMetCP)
+	
+	Do $$$AssertEquals(ActiesList.Count(),1,"De ActiesList bevat slechts 1 item")
+	
+	Set Iterator=##class(TECH.ListIterator).%New(ActiesList)
+	Set Actie1=Iterator.Next()
+	Do $$$AssertTrue($IsObject(Actie1),"Actie1 is een object")
+	Do $$$AssertEquals(Actie1.ActieCode,"SFS_GRATIS_KORPUSSCHIENEN_2011","Actie1 is de actie met code SFS_GRATIS_KORPUSSCHIENEN_2011")
+
+	// Test geen enkele geldige actie : DatumVooraf i.p.v. DatumTijdens. 
+	Do $$$LogMessage("Testen met DatumVooraf :")
+	
+	Set DatumVooraf=62075
+	Set ActiesList=##class(APPS.TBXWeb.Actie).GeefActieveActies(DatumVooraf,ShopSFS,Klant)   ; ,ProductMetCP)
+	
+	Do $$$AssertEquals(ActiesList.Count(),0,"De ActiesList bevat geen items")
+	
+	Quit
+]]></Implementation>
+</Method>
+
+<Method name="TestWSOrdVervallen">
+<Implementation><![CDATA[
+	Set DatumVooraf=62090
+	Set DatumTijdens=62115
+	Set DatumAchteraf=62375
+
+	/***  ============================================  ***/ 
+	/***   BLOK 1 : RefDatum is vóór de Actie periode   ***/ 
+	/***  ============================================  ***/ 
+	Do $$$LogMessage("BLOK 1 : RefDatum is vóór de Actie periode")
+	
+	Set RefDatum=DatumVooraf
+	Set DatumRecent=RefDatum-29
+	Set DatumVervallen=RefDatum-31
+
+	// WSOrd is geen Offerte 
+	Set WSOrd=..CreateWSOrd("BBON",,"")
+	Do $$$AssertEquals(WSOrd.IsOfferteVervallen(,.VervalReden),0,"WSOrd is geen Offerte, dus IsVervallen=0")
+	Do $$$AssertEquals(VervalReden,##class(APPS.TBXWeb.enu.RedenOfferteVervallen).IsGeenOfferte(),"Reden: WSOrd is geen Offerte (blok 1)")
+
+	// Offerte is nog niet vervallen 
+	Set WSOrd=..CreateWSOrd("OFF",DatumRecent,"")
+	Do $$$AssertEquals(WSOrd.IsOfferteVervallen(RefDatum),0,"De offerte is nog niet vervallen")
+	
+	// Offerte is vervallen 
+	Set WSOrd=..CreateWSOrd("OFF",DatumVervallen,"")
+	Do $$$AssertEquals(WSOrd.IsOfferteVervallen(RefDatum),1,"De offerte is vervallen")
+
+
+	/***  ===============================================  ***/ 
+	/***   BLOK 2 : RefDatum is tijdens de Actie periode   ***/ 
+	/***  ===============================================  ***/ 
+	Do $$$LogMessage("BLOK 2 : RefDatum is tijdens de Actie periode")
+	
+	// Offerte valt binnen de periode van de Actie(s) 
+	Set RefDatum=DatumTijdens
+	Set DatumRecent=RefDatum-1
+	Set DatumVervallen=RefDatum-31
+
+	// Offerte is nog niet vervallen 
+	Set WSOrd=..CreateWSOrd("OFF",DatumRecent,$LB("SFS_GRATIS_KORPUSSCHIENEN_2011"))
+	Do $$$AssertEquals(WSOrd.IsOfferteVervallen(RefDatum),0,"De offerte is nog niet vervallen")
+	
+	// Offerte is vervallen 
+	Set WSOrd=..CreateWSOrd("OFF",DatumVervallen,$LB("SFS_GRATIS_KORPUSSCHIENEN_2011"))
+	Do $$$AssertEquals(WSOrd.IsOfferteVervallen(RefDatum),1,"De offerte is vervallen")
+
+	// Offerte valt voor actie en wordt bekeken tijdens de actie, deze is dus vervallen omdat er een nieuwe prijs is
+	Set WSOrd=..CreateWSOrd("OFF",DatumVooraf,"")
+	Do $$$AssertEquals(WSOrd.IsOfferteVervallen(RefDatum,.VervalReden),1,"De offerte is vervallen")
+	Do $$$AssertEquals(VervalReden,##class(APPS.TBXWeb.enu.RedenOfferteVervallen).NieuweActie(),"Er is een nieuwe actie")
+	
+	// WSOrd is geen Offerte, maar is een Bestelbon ingegeven vóór de actie 
+	Set WSOrd=..CreateWSOrd("BBON",DatumVooraf,"")
+	Do $$$AssertEquals(WSOrd.IsOfferteVervallen(RefDatum,.VervalReden),0,"WSOrd is geen Offerte, dus IsVervallen=0, ook tijdens actieperiode")
+	Do $$$AssertEquals(VervalReden,##class(APPS.TBXWeb.enu.RedenOfferteVervallen).IsGeenOfferte(),"Reden: WSOrd is geen Offerte (blok 2)")
+
+
+	/***  ==========================================  ***/ 
+	/***   BLOK 3 : RefDatum is na de Actie periode   ***/ 
+	/***  ==========================================  ***/ 
+	Do $$$LogMessage("BLOK 3 : RefDatum is na de Actie periode")
+
+	Set RefDatum=DatumAchteraf
+	Set DatumRecent=RefDatum-29
+	Set DatumVervallen=RefDatum-31
+
+	// Offerte is nog niet vervallen en maar valt wel buiten de periode van de Actie(s) 
+	Set WSOrd=..CreateWSOrd("OFF",DatumRecent,$LB("SFS_GRATIS_KORPUSSCHIENEN_2011"))
+	Do $$$AssertEquals(WSOrd.IsOfferteVervallen(RefDatum),1,"De offerte is vervallen")
+	
+
+	Quit
+]]></Implementation>
+</Method>
+
+<Method name="TestWSOrdBevatActies">
+<Implementation><![CDATA[
+	Set WSOrd=..CreateWSOrd(,,$LB("SFS_GRATIS_KORPUSSCHIENEN_2011"))
+	Do $$$AssertEquals(WSOrd.BevatActies(),1,"Het WSOrd bevat actie(s)")
+
+	Set WSOrd.ActieCodesList=""
+	Do $$$AssertEquals(WSOrd.BevatActies(),0,"Het WSOrd bevat geen acties")
+	
+	Set WSOrd=..CreateWSOrd(,,$LB(""))
+	Do $$$AssertEquals(WSOrd.BevatActies(),0,"Het WSOrd bevat geen acties (eerste item is leeg)")
+
+	Set WSOrd=..CreateWSOrd(,,$LB("SFS_GRATIS_KORPUSSCHIENEN_2011"))
+	Do WSOrd.ActieCodesList.Clear()
+	Do $$$AssertEquals(WSOrd.BevatActies(),0,"Het WSOrd bevat geen acties (de lijst is leeggemaakt)")
+
+	Set WSOrd=..CreateWSOrd(,,"")
+	Do $$$AssertEquals(WSOrd.BevatActies(),0,"Het WSOrd bevat geen acties")
+]]></Implementation>
+</Method>
+
+<Method name="TestWSOrdActiesNogGeldig">
+<Implementation><![CDATA[
+	Set DatumVooraf=62075
+	Set DatumTijdens=62115
+	Set DatumAchteraf=62375
+
+	Set RefDatum=DatumVooraf
+	Set DatumVervallen=RefDatum-31
+
+	Set WSOrd=..CreateWSOrd("OFF",DatumVervallen,$LB("SFS_GRATIS_KORPUSSCHIENEN_2011"))
+
+	
+	Do $$$AssertEquals(WSOrd.ZijnActiesNogGeldig(DatumVooraf),0,"De ActiesList bevat geen items")
+	Do $$$AssertEquals(WSOrd.ZijnActiesNogGeldig(DatumTijdens),1,"De ActiesList bevat geen items")
+	Do $$$AssertEquals(WSOrd.ZijnActiesNogGeldig(DatumAchteraf),0,"De ActiesList bevat geen items")
+
+	// WSOrder zonder acties 
+	Set WSOrd=..CreateWSOrd("OFF",DatumTijdens,"")
+	Do $$$AssertEquals(WSOrd.ZijnActiesNogGeldig(DatumVooraf),1,"De ActiesList bevat geen items")
+
+	Quit
+]]></Implementation>
+</Method>
+
+<Method name="TestTBXLijnKorting">
+<Implementation><![CDATA[
+	Set TBXLijn=##class(WS.TBX.EM.OrderLijn).%New()
+	Do $$$AssertEquals(TBXLijn.BerekenKorting(),0,"De korting van een lege TBXLijn is 0")
+
+	Do TBXLijn.VoegToeActieGegevens("A01","5")
+	Do TBXLijn.VoegToeActieGegevens("A02","7")
+	Do TBXLijn.VoegToeActieGegevens("A03","0")
+	Do TBXLijn.VoegToeActieGegevens("A04","2")
+	
+	Do $$$AssertEquals(TBXLijn.BerekenKorting(),14,"De gesommeerde korting is 14")
+
+	// Test: Verwijder Actie met code A01 
+	Do TBXLijn.VerwijderActieItem("A01")
+	Do $$$AssertEquals(TBXLijn.BerekenKorting(),9,"De gesommeerde korting na weglaten Actie A01 is 9")
+
+	// Test: Wijzig korting van Actie met code A02 naar 11 
+	Do TBXLijn.VoegToeActieGegevens("A02","11")
+	Do $$$AssertEquals(TBXLijn.BerekenKorting(),13,"De gesommeerde korting na wijzigen van Actie A02 is 13")
+
+	// Test: Wis alle kortingen
+	Do TBXLijn.WisAlleActieGegevens()
+	Do $$$AssertEquals(TBXLijn.BerekenKorting(),0,"De gesommeerde korting na WisAlleActieGegevens is 0")
+
+	// Test met Lijn.ActieItems="" 
+	Set TBXLijn.ActieItems=""
+	Do $$$AssertEquals(TBXLijn.BerekenKorting(),0,"De korting als Lijn.ActieItems="""" is 0")
+]]></Implementation>
+</Method>
+
+<Method name="TestWSOrdVerzamelActieCodes">
+<Implementation><![CDATA[
+	// Test 1 
+	Set i=0
+	Set WSOrd=##class(WS.TBX.Order).%New()
+
+	Set TBXLijn=##class(WS.TBX.EM.OrderLijn).%New()
+	Do TBXLijn.VoegToeActieGegevens("A01","")
+	Do WSOrd.Lijnen.SetAt(TBXLijn,$I(i))
+
+	Set TBXLijn=##class(WS.TBX.EM.OrderLijn).%New()
+	Do TBXLijn.VoegToeActieGegevens("A01","")
+	Do TBXLijn.VoegToeActieGegevens("A02","")
+	Do WSOrd.Lijnen.SetAt(TBXLijn,$I(i))
+
+	Set TBXLijn=##class(WS.TBX.EM.OrderLijn).%New()
+	Do TBXLijn.VoegToeActieGegevens("A99","")
+	Do TBXLijn.WisAlleActieGegevens()
+	Do WSOrd.Lijnen.SetAt(TBXLijn,$I(i))          ; d.i. een TBXLijn met leeggemaakte ActiesList 
+
+	Set TBXLijn=##class(WS.TBX.EM.OrderLijn).%New()
+	Set TBXLijn.ActieItems=""
+	Do WSOrd.Lijnen.SetAt(TBXLijn,$I(i))
+
+	Set TBXLijn=##class(WS.TBX.EM.OrderLijn).%New()
+	Do TBXLijn.VoegToeActieGegevens("A04","")
+	Do TBXLijn.VoegToeActieGegevens("A01","")
+	Do WSOrd.Lijnen.SetAt(TBXLijn,$I(i))
+
+	Set TBXLijn=##class(WS.TBX.EM.OrderLijn).%New()
+	Do TBXLijn.VoegToeActieGegevens("A03","")
+	Do WSOrd.Lijnen.SetAt(TBXLijn,$I(i))
+
+	Do WSOrd.VerzamelActieCodesVanLijnen()
+	
+	Set lbActieCodes=$$ListOfDataTypesToLB^vhLib(WSOrd.ActieCodesList)
+	Do $$$AssertEquals(lbActieCodes,$LB("A01","A02","A04","A03"),"De Verzamelde ActieCodesList is correct.")
+
+	// Test 2 : Lijn(en) zonder ActieCode 
+	Set WSOrd=##class(WS.TBX.Order).%New()
+
+	Set TBXLijn=##class(WS.TBX.EM.OrderLijn).%New()
+	Set TBXLijn.ActieItems=""
+	Do WSOrd.Lijnen.SetAt(TBXLijn,$I(i))
+
+	Do WSOrd.VerzamelActieCodesVanLijnen()
+	
+	Set lbActieCodes=$$ListOfDataTypesToLB^vhLib(WSOrd.ActieCodesList)
+	Do $$$AssertEquals(lbActieCodes,"","De Verzamelde ActieCodesList is leeg.")
+	
+	Quit
+]]></Implementation>
+</Method>
+
+<UDLText name="T">
+<Content><![CDATA[
+/*
+// Methods ter voorbereiding van de testen
+// ======= === ============= === == ====== 
+*/
+]]></Content>
+</UDLText>
+
+<Method name="CreateWSOrd">
+<FormalSpec>BonType:%String="OFF",IngaveTijdstip:%String=$H,lbActies:%List</FormalSpec>
+<ReturnType>WS.TBX.Order</ReturnType>
+<Implementation><![CDATA[
+	Set lbActies=$G(lbActies,$LB("SFS_GRATIS_KORPUSSCHIENEN_2011"))
+	; "62075,00001"
+
+	Set WSOrd=##class(WS.TBX.Order).%New()
+	Set WSOrd.BonType=BonType
+	Set WSOrd.IngaveTijdStip=$ZDT(IngaveTijdstip,3)
+	Set WSOrd.WebDomain = "tbx.sfsunimarket.biz"
+	Set WSOrd.KLNummer = 55946
+	If lbActies="" {
+		Set WSOrd.ActieCodesList=""
+	} Else {
+		Do LBToListOfDataTypes^vhLib(lbActies,WSOrd.ActieCodesList)
+	}
+	
+	Quit WSOrd
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: APPS/TBXWeb/impl/SFSOrderHandler.cls.xml
===================================================================
diff -u -r2 -r10
--- APPS/TBXWeb/impl/SFSOrderHandler.cls.xml	(.../SFSOrderHandler.cls.xml)	(revision 2)
+++ APPS/TBXWeb/impl/SFSOrderHandler.cls.xml	(.../SFSOrderHandler.cls.xml)	(revision 10)
@@ -30,11 +30,7 @@
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
  
- #If ($$$Server["WWW") && ($$$NSpace'="DEMO")
-  Set flagTest = 0
- #Else
-  Set flagTest = 1
- #EndIf 
+ set flagTest = $$$Not(##class(TECH.Config.ConfigMgr).Instance().GetBoolean("APPS.TBXWeb.impl.SFSOrderHandler_PostHttpRequest"))
  
  Set blProxy=##class(BL.Prod.GAData.TBXLadeXML).Instantiate()  ; instantiate BL object
 
Index: vhUnitTest/Manager.cls.xml
===================================================================
diff -u
--- vhUnitTest/Manager.cls.xml	(revision 0)
+++ vhUnitTest/Manager.cls.xml	(revision 10)
@@ -0,0 +1,390 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.Manager">
+<Description>
+Adopted from InterSystems's %UnitTest.Manager by logist (Dimas ltd., Russia)
+Adapted to Van Hoecke's needs by JCL and FMA
+
+do ##class(vhUnitTest.Manager).RunTest() to run all tests.
+You can turn on debug mode by do ##class(vhUnitTest.Manager).RunTest("/debug=1")
+You can run unittest within a specific package using ##class(vhUnitTest.Manager).RunTest(,packagename)
+</Description>
+<IncludeCode>vhLib.Macro</IncludeCode>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="LogIndex">
+</Property>
+
+<Property name="Debug">
+</Property>
+
+<Property name="Display">
+</Property>
+
+<Property name="CurrentDir">
+</Property>
+
+<Property name="TestCount">
+</Property>
+
+<Property name="TestCaseCount">
+</Property>
+
+<Property name="TheStack">
+<MultiDimensional>1</MultiDimensional>
+</Property>
+
+<Property name="TheLog">
+<MultiDimensional>1</MultiDimensional>
+</Property>
+
+<Property name="MailOnError">
+<InitialExpression>0</InitialExpression>
+</Property>
+
+<Method name="RunTest">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>qualifiers,package=""</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+ Set sc=..RunTestSuite(.qualifiers,,package)
+ If $$$ISERR(sc) Do $system.Status.DisplayError(sc)
+ Quit sc
+]]></Implementation>
+</Method>
+
+<Method name="RunTestSuite">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>qualifiers,userparam="",package=""</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+ 
+
+ ; hier heb ik een lijntje commentaar toegevoegd bij wijze van test..
+ 
+ Set manager=..%New()
+ If manager=$$$NULLOREF Quit %objlasterror
+ 
+ set package=$G(package)
+ set:$L(package) package = "vhUnitTest."_package
+ ;
+ Do ..ParseQualifiers(.qualifiers,"/nodebug/display=errors/load/run/recursive/quiet/mailonerror=0")
+ Set manager.Debug=+qualifiers("debug")
+ Set manager.Display=qualifiers("display")
+ Set manager.MailOnError=qualifiers("mailonerror")
+ 
+ if manager.MailOnError {
+	 set ^vhUnitTest=$zdatetime($horolog,8)
+ }
+ 
+ Set testsuite="vhUnitTests"
+ if $length(package) set testsuite = package
+ 
+ ;set classQuery=##class(%ResultSet).%New("%Dictionary.ClassDefinition:Summary")
+ set classQuery=##class(%ResultSet).%New("%Dictionary.ClassDefinitionQuery:SubclassOf")
+ $$$QuitOnError(classQuery.Execute("vhUnitTest.TestCase"))
+ while (classQuery.Next() ) {
+	set className=classQuery.Data("Name")
+	if $L(package),'$$$StartsWithVar(className,package) continue
+	set isAbstract=##class(%Dictionary.ClassDefinition).%OpenId(className).Abstract
+	If ('isAbstract)
+	{
+		do manager.RunOneTestCase(testsuite,className)
+	} 
+ }
+ write !," -- Test cases: " , manager.TestCaseCount, "; Methods: ",manager.TestCount , !
+ if 'manager.IsSuccess(testsuite) {
+	 write !,!," ===== ERRORS: ===== ",!,!
+	 do manager.DisplayFails(testsuite)	 
+ }
+ 
+ if 'manager.Debug {
+ 	Do manager.SaveLog()
+ 	Set manager.Display="all"
+ 	Do manager.PrintURL()
+ }
+ 
+ if manager.MailOnError { 
+ 	Set From = $$$SystemMail($$$Server_" - UnitTests")
+ 	Set port=$get(^%SYS("SSPort"),1972)
+	set Message = "http://"_$$$Server_":"_port_"/csp/admin1/vhUnitTest.Report.cls?NS="_##class(%CSP.Page).EscapeURL($znspace)_"&INDEX="_manager.LogIndex_"&SUITE="_testsuite
+   	if 'manager.IsSuccess(testsuite) {	 
+    	Set MailTo = $listbuild(##class(TECH.Config.ConfigMgr).Instance().GetString("vhUnitTest.SendToWhenFailed"))
+    	Do SendMiniMail^vhLib(From,MailTo,"UnitTest "_manager.LogIndex_" Failed on ["_$$$Server_"]",Message,0) 
+	} 
+	else {
+		Set MailTo = $listbuild(##class(TECH.Config.ConfigMgr).Instance().GetString("vhUnitTest.SendToWhenSucceeded"))
+    	Do SendMiniMail^vhLib(From,MailTo,"UnitTest "_manager.LogIndex_" Succeeded on ["_$$$Server_"]",Message,0) 
+	}
+ }
+
+ Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="ParseQualifiers">
+<ClassMethod>1</ClassMethod>
+<FormalSpec><![CDATA[&qualifiers,defaults]]></FormalSpec>
+<Implementation><![CDATA[
+ for qspec=$g(defaults),$g(qualifiers) {
+    for i=2:1:$l(qspec,"/") {
+       Set qspecone=$zcvt($p(qspec,"/",i),"l")
+       If qspecone["=" {
+          Set qname=$p(qspecone,"=",1),qvalue=$p(qspecone,"=",2)
+       } ElseIf $e(qspecone,1,2)="no" {
+          Set qname=$e(qspecone,3,999),qvalue=0
+       } Else {
+          Set qname=qspecone,qvalue=1
+       }
+     Set qualifiers(qname)=qvalue
+     }
+ }
+ Quit
+]]></Implementation>
+</Method>
+
+<Method name="RunOneTestCase">
+<FormalSpec>suite:%String,class:%String</FormalSpec>
+<Implementation><![CDATA[
+ //Set suite = $P(class, ".", 1, $L(class,".") - 1)
+ Set ..TestCaseCount = ..TestCaseCount + 1
+ Do ..LogStateBegin(suite)
+ Do ..LogStateBegin(suite,class) Do  Do ..LogStateEnd(suite,class)
+ . Set testcase=$zobjclassmethod(class,"%New",##this)
+ . Set testcase.Debug=..Debug
+ . Set:'..Debug $zt= "MethErrorOnBeforeAllTests"
+ . Set sc=testcase.OnBeforeAllTests() If $$$ISERR(sc) Do ..LogStateStatus(sc,"OnBeforeAllTests") Quit
+
+ . Set method="" For  Set method=$$$comMemberNext(class,$$$cCLASSmethod,method) q:method=""  If $e(method,1,4)="Test" Do
+ . . Do ..LogStateBegin(suite,class,method) Do  Do ..LogStateEnd(suite,class,method)
+ . . . Set success=0
+ . . . Set:'..Debug $zt="MethError"
+ . . . Set sc=testcase.OnBeforeOneTest(method) If $$$ISERR(sc) Do ..LogStateStatus(sc,"OnBeforeOneTest") Quit
+ . . . Set zhbeg=$zh Do $zobjmethod(testcase,method) Set zhend=$zh
+ . . . Set ..TestCount=..TestCount+1
+ . . . Do ..LogMessage("Duration of execution: "_(zhend-zhbeg)_" sec.")
+ . . . Set sc=testcase.OnAfterOneTest(method) If $$$ISERR(sc) Do ..LogStateStatus(sc,"OnAfterOneTest") Quit
+ . . . Quit
+MethError	. . . Set zhend=$zh Do ..LogStateStatus($$$ERROR($$$CacheError,$ze_":"_$Text(@$Piece($ze,">",2,32767))),method)
+ . . . Quit
+ . Goto AfterAllTests
+MethErrorOnBeforeAllTests . Set zhend=$zh Do ..LogStateStatus($$$ERROR($$$CacheError,$ze_":"_$Text(@$Piece($ze,">",2,32767))),"OnBeforeAllTests")
+AfterAllTests . Set:'..Debug $zt= "MethErrorOnAfterAllTests"
+ . Set sc=testcase.OnAfterAllTests() If $$$ISERR(sc) Do ..LogStateStatus(sc,"OnAfterAllTests") Quit
+ . Goto Einde
+MethErrorOnAfterAllTests . Set zhend=$zh Do ..LogStateStatus($$$ERROR($$$CacheError,$ze_":"_$Text(@$Piece($ze,">",2,32767))),"OnAfterAllTests") Goto Einde
+Einde
+ . Set $zt = ""
+ . Kill testcase
+ Do ..LogStateEnd(suite)
+ ;
+ Quit
+]]></Implementation>
+</Method>
+
+<Method name="LogStateBegin">
+<FormalSpec>testsuite,testcase,testmethod</FormalSpec>
+<Implementation><![CDATA[
+ Set i%TheStack=$g(i%TheStack)+1
+ Set i%TheStack(i%TheStack,"suite")=$g(testsuite)
+ Set i%TheStack(i%TheStack,"case")=$g(testcase)
+ Set i%TheStack(i%TheStack,"method")=$g(testmethod)
+ If $d(testcase)=0 {
+ Set i%TheLog(testsuite)=1
+ Do ..PrintLine(testsuite_" begins ...",1)
+ Quit
+ } Elseif $d(testmethod)=0 {
+ Set i%TheLog(testsuite,testcase)=1
+ Do ..PrintLine(testcase_" begins ...",2)
+ Quit
+ } Else {
+ Set i%TheLog(testsuite,testcase,testmethod)=1
+ Do ..PrintLine(testmethod_"() begins ...",3)
+ Quit
+ }
+]]></Implementation>
+</Method>
+
+<Method name="LogStateEnd">
+<FormalSpec>testsuite,testcase,testmethod</FormalSpec>
+<Implementation><![CDATA[
+ Kill i%TheStack(i%TheStack)
+ Set i%TheStack=i%TheStack-1
+ If $d(testcase)=0 {
+ Do ..PrintLine(testsuite_$s(..IsSuccess(testsuite):" passed",1:" failed"),1)
+ Quit
+ } Elseif $d(testmethod)=0 {
+ Do ..PrintLine(testcase_$s(..IsSuccess(testsuite,testcase):" passed",1:" failed"),2)
+ Quit
+ } Else {
+ Do ..PrintLine(testmethod_$s(..IsSuccess(testsuite,testcase,testmethod):" passed",1:" failed"),3)
+ Quit
+ }
+]]></Implementation>
+</Method>
+
+<Method name="LogStateStatus">
+<FormalSpec>status,action</FormalSpec>
+<Implementation><![CDATA[
+ If $$$ISOK(status) Quit
+ Do $system.Status.DecomposeStatus(status,.errorarray,"-d") Set errortext=$g(errorarray(1))
+ Set suite=i%TheStack(i%TheStack,"suite")
+ Set case=i%TheStack(i%TheStack,"case")
+ Set method=i%TheStack(i%TheStack,"method")
+ Set message="0:"_case_":"_method_":"_action_"():"_errortext
+ If case="" {
+ Set i%TheLog(suite)=message
+ } Elseif method="" {
+ Set i%TheLog(suite,case)=message
+ } Else {
+ Set i%TheLog(suite,case,method)=message
+ }
+ Do ..PrintLine("LogStateStatus:"_message)
+ Do ..PrintErrorLine("LogStateStatus:"_message)
+ If '..Debug Quit
+]]></Implementation>
+</Method>
+
+<Method name="LogAssert">
+<FormalSpec>success,action,description</FormalSpec>
+<Implementation><![CDATA[
+ Set suite=i%TheStack(i%TheStack,"suite")
+ Set case=i%TheStack(i%TheStack,"case")
+ Set method=i%TheStack(i%TheStack,"method")
+ If method="" Quit
+ Set next=$o(i%TheLog(suite,case,method,""),-1)+1
+ Set i%TheLog(suite,case,method,next)=success_":"_case_":"_method_":"_action_":"_description
+ Set line=action_":"_description_" ("_$s(success:"passed",1:"failed")_")"
+ Do ..PrintLine(line,4)
+ If 'success Do ..PrintErrorLine(line)
+ Quit
+]]></Implementation>
+</Method>
+
+<Method name="LogMessage">
+<FormalSpec>message</FormalSpec>
+<Implementation><![CDATA[
+ Set suite=i%TheStack(i%TheStack,"suite")
+ Set case=i%TheStack(i%TheStack,"case")
+ Set method=i%TheStack(i%TheStack,"method")
+ If method="" Quit
+ Set next=$o(i%TheLog(suite,case,method,""),-1)+1
+ Set i%TheLog(suite,case,method,next)="1:LogMessage:"_$g(message)
+ Do ..PrintLine("LogMessage:"_$g(message),4)
+ Quit
+]]></Implementation>
+</Method>
+
+<Method name="PrintLine">
+<FormalSpec>text,level</FormalSpec>
+<Implementation><![CDATA[
+ If ..Display'="all" Quit
+ Write !
+ For i=2:1:$g(level) Write "  "
+ Write $g(text)
+ Quit
+]]></Implementation>
+</Method>
+
+<Method name="PrintErrorLine">
+<FormalSpec>text</FormalSpec>
+<Implementation><![CDATA[
+ If ..Display'="error" Quit
+ Write !
+ Write i%TheStack(i%TheStack,"suite"),":"
+ Write i%TheStack(i%TheStack,"case"),":"
+ Write i%TheStack(i%TheStack,"method"),":"
+ Write !,$g(text),!
+ Quit
+]]></Implementation>
+</Method>
+
+<Method name="IsSuccess">
+<FormalSpec>suite,case,method,action</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+ Set success=1
+ If $d(action) {
+ Quit ''i%TheLog(suite,case,method,action)
+ } Elseif $d(method) {
+ If 'i%TheLog(suite,case,method) Quit 0
+ Set action="" For  Set action=$o(i%TheLog(suite,case,method,action)) Quit:action=""  Do  Quit:success=0
+ . Set success=..IsSuccess(suite,case,method,action)
+ Quit success
+ } Elseif $d(case) {
+ If 'i%TheLog(suite,case) Quit 0
+ Set method="" For  Set method=$o(i%TheLog(suite,case,method)) Quit:method=""  Do  Quit:success=0
+ . Set success=..IsSuccess(suite,case,method)
+ Quit success
+ } Elseif $d(suite) {
+ Set case="" For  Set case=$o(i%TheLog(suite,case)) Quit:case=""  Do  Quit:success=0
+ . Set success=..IsSuccess(suite,case)
+ Quit success
+ } Else {
+ Quit 1
+ }
+]]></Implementation>
+</Method>
+
+<Method name="DisplayFails">
+<FormalSpec>suite,case,method,action</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+ Set success=1
+ If $d(action) {
+    if 'i%TheLog(suite,case,method,action) {
+	    write i%TheLog(suite,case,method,action),!,!
+    }
+ } Elseif $d(method) {
+    If 'i%TheLog(suite,case,method) write i%TheLog(suite,case,method),!,!
+    Set action="" For  Set action=$o(i%TheLog(suite,case,method,action)) Quit:action=""  Do  Quit:success=0
+    . Set success=..DisplayFails(suite,case,method,action)
+    Quit success
+ } Elseif $d(case) {
+	If 'i%TheLog(suite,case) write i%TheLog(suite,case),!,!
+    Set method="" For  Set method=$o(i%TheLog(suite,case,method)) Quit:method=""  Do  Quit:success=0
+    . Set success=..DisplayFails(suite,case,method)
+    Quit success
+ } Elseif $d(suite) {
+    Set case="" For  Set case=$o(i%TheLog(suite,case)) Quit:case=""  Do  Quit:success=0
+    . Set success=..DisplayFails(suite,case)
+    Quit success
+ } Else {
+    Quit 1
+ }
+]]></Implementation>
+</Method>
+
+<Method name="PrintURL">
+<Implementation><![CDATA[
+ Set port=$get(^%SYS("SSPort"),1972)
+ Do ..PrintLine("Use the following URL to view the result:")
+ Do ..PrintLine("http://"_$$$Server_":"_port_"/csp/"_$$$NSpace_"/vhUnitTest.Report.cls?NS="_##class(%CSP.Page).EscapeURL($znspace)_"&INDEX="_i%LogIndex)
+ Quit
+]]></Implementation>
+</Method>
+
+<Method name="SaveLog">
+<Implementation><![CDATA[
+ Lock +^UnitTestLog
+ Set i%LogIndex=$o(^UnitTestLog(""),-1)+1
+ Lock -^UnitTestLog
+ Merge ^UnitTestLog(i%LogIndex)=i%TheLog
+ Set ^UnitTestLog(i%LogIndex)=$H
+ Quit
+]]></Implementation>
+</Method>
+
+<Method name="PurgeLog">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+ Lock +^UnitTestLog
+ Kill ^UnitTestLog
+ Lock -^UnitTestLog
+ Quit
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: WS/WebService.cls.xml
===================================================================
diff -u
--- WS/WebService.cls.xml	(revision 0)
+++ WS/WebService.cls.xml	(revision 10)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="WS.WebService">
+<Description>
+Uitgebreide ErrorInfo bij SOAP fault</Description>
+<IncludeCode>vhLib.Macro,WS.WebService,TECH.Error</IncludeCode>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%SOAP.WebService</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Parameter name="SERVICENAME">
+<Description>
+SERVICENAME - Should be the name of the service for which this is a proxy.
+Override this parameter in the subclass.</Description>
+<Default>dummy</Default>
+</Parameter>
+
+<Parameter name="XMLIGNORENULL">
+<Default>1</Default>
+</Parameter>
+
+<Method name="OnInternalFault">
+<Description>
+The OnInternalFault method may be overridden by the user to change the default SOAP
+ fault returned by Cache for internal errors.
+OnInternalFault is passed the fault which may be modified to suit the applications needs.
+After OnInternalFault returns this fault will be sent to the SOAP client.
+The %Status that represents the error is also passed.</Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>fault:%SOAP.Fault,status:%Status</FormalSpec>
+<Private>1</Private>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	#define cvtHTML(%v)   $ZConvert(%v,"O","HTML")
+	If '$isObject($G(%ErrorObject)) && (fault.faultcode="SOAP-ENV:Server")
+	{ 
+		Do ##class(TECH.Error.impl.ErrorHandler).Handler("NotHandledFault")
+	}
+	
+	If $isObject($G(%ErrorObject)) 
+	{ 
+		Set detail=$$$CRLF_"    <error xmlns='"_..#NAMESPACE_"' >"_$$$CRLF
+		Set detail=detail_"     <label>"_$$$cvtHTML(%ErrorObject.Label)_"</label>"_$$$CRLF
+		Set detail=detail_"     <text>"_$$$cvtHTML(%ErrorObject.ErrorCode)_"</text>"_$$$CRLF
+		Set:($L(%ErrorObject.UserText)) detail=detail_"     <usertext>"_$$$cvtHTML(%ErrorObject.UserText)_"</usertext>"_$$$CRLF
+		//Set:($$$UCase(%ErrorObject.Server)="CACHE02") detail=detail_"     <stack>"_$$$cvtHTML(%ErrorObject.StackTrace)_"</stack>"_$$$CRLF
+		Set detail=detail_"     <zerror>"_$$$cvtHTML(%ErrorObject.ErrorCode2)_"</zerror>"_$$$CRLF
+		Set detail=detail_"     <remoteIP>"_$$$cvtHTML(%ErrorObject.RemoteIP)_"</remoteIP>"_$$$CRLF
+		Set detail=detail_"     <deviceInfo>"_$$$cvtHTML("device: "_%ErrorObject.Device_"  job: "_%ErrorObject.Job)_"</deviceInfo>"_$$$CRLF
+		Set detail=detail_"    </error>"_$$$CRLF
+
+		Set fault.detail=detail
+	}
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: TECH/SourceCodeUtils.cls.xml
===================================================================
diff -u -r2 -r10
--- TECH/SourceCodeUtils.cls.xml	(.../SourceCodeUtils.cls.xml)	(revision 2)
+++ TECH/SourceCodeUtils.cls.xml	(.../SourceCodeUtils.cls.xml)	(revision 10)
@@ -23,6 +23,9 @@
 		set CSPFilename = ##class(TECH.CSP.CSPApplicatie).GetPhysicalFilename(InternalName)
 		if $length(CSPFilename) set Exists = ##class(%File).Exists(CSPFilename)
 	}
+	if ItemType = "project" {
+		set Exists = $data(^oddPROJECT(..StripExtension(InternalName)))>0
+	}
 	quit Exists
 ]]></Implementation>
 </Method>
@@ -67,6 +70,24 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsDataType">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>InternalName:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	set IsDataType = 0
+	if ..Exists(InternalName) {
+		set Type = ..Type(InternalName) 
+		if Type = "class" {
+			set Class = ##class(%Dictionary.ClassDefinition).%OpenId(..StripExtension(InternalName))
+			if $isObject(Class) Set IsDataType = (Class.ClassType = "datatype" )
+		}
+	}
+		
+	quit IsDataType
+]]></Implementation>
+</Method>
+
 <Method name="StripExtension">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>InternalName:%String</FormalSpec>
Index: vhDeploy/JCL/D201106291436.cls.xml
===================================================================
diff -u
--- vhDeploy/JCL/D201106291436.cls.xml	(revision 0)
+++ vhDeploy/JCL/D201106291436.cls.xml	(revision 10)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhDeploy.JCL.D201106291436">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>svn.Deploy</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Parameter name="Omschrijving">
+<Default>Instellen ConfigItem : APPS.TBXWeb.impl.SFSOrderHandler_PostHttpRequest</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<Description>
+do ##class(vhDeploy.JCL.D201106291436).ExecCode()</Description>
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	if ##class(TECH.Config.ConfigMgr).Instance().GetOmgeving()["PROD" {
+		do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("APPS.TBXWeb.impl.SFSOrderHandler_PostHttpRequest",1)
+	} else {
+	    do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("APPS.TBXWeb.impl.SFSOrderHandler_PostHttpRequest",0)
+	}
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: APPS/TBXWeb/OrderHandling.cls.xml
===================================================================
diff -u -r2 -r10
--- APPS/TBXWeb/OrderHandling.cls.xml	(.../OrderHandling.cls.xml)	(revision 2)
+++ APPS/TBXWeb/OrderHandling.cls.xml	(.../OrderHandling.cls.xml)	(revision 10)
@@ -36,7 +36,7 @@
 	Set factory = ##class(OrderHandlerFactory).%New()
 	Set blOH = factory.CreateOrderHandler(wsID,Shop,Requester)
 	If '$IsObject(blOH) Do  Quit $$$ERROR($$$GeneralError,"Could not create business logic object")
-	. Do Logger.ErrorMail("CREATE_OBJECT_FAIDED","wsID="_$G(wsID)_"Shop="_$G(Shop)_" ")
+	. Do Logger.ErrorMail("CREATE_OBJECT_FAILED","wsID="_$G(wsID)_"Shop="_$G(Shop)_" ")
 
 	Set Logger = ""