Index: WS/TBX/GroepOrder.cls.xml
===================================================================
diff -u -r334 -r363
--- WS/TBX/GroepOrder.cls.xml	(.../GroepOrder.cls.xml)	(revision 334)
+++ WS/TBX/GroepOrder.cls.xml	(.../GroepOrder.cls.xml)	(revision 363)
@@ -29,6 +29,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsOnderdeelVanGroepOrder">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit 0
+]]></Implementation>
+</Method>
+
 <Method name="GeefOrderReferentie">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit ..Referentie
Index: WS/TBX/OrderAbstract.cls.xml
===================================================================
diff -u -r334 -r363
--- WS/TBX/OrderAbstract.cls.xml	(.../OrderAbstract.cls.xml)	(revision 334)
+++ WS/TBX/OrderAbstract.cls.xml	(.../OrderAbstract.cls.xml)	(revision 363)
@@ -426,6 +426,11 @@
 <ReturnType>%Boolean</ReturnType>
 </Method>
 
+<Method name="IsOnderdeelVanGroepOrder">
+<Abstract>1</Abstract>
+<ReturnType>%Boolean</ReturnType>
+</Method>
+
 <Storage name="Default">
 <Type>%Library.CacheStorage</Type>
 <DataLocation>^WS.TBX.OrderAbstractD</DataLocation>
Index: csp/vhisie/TBX/Main/tmpDev.mac.rou
===================================================================
diff -u -r362 -r363
--- csp/vhisie/TBX/Main/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 362)
+++ csp/vhisie/TBX/Main/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 363)
@@ -885,7 +885,7 @@
 	Quit:($$$Not(WSOrd.IsBonTypeGeldig()))
 	Quit:(WSOrd.BonType'?1(1"OFF",1"BBON",1"INKP"))
 	Quit:(WSOrd.IsTransferredToAdmin())   ; Eenmaal door VH in Admin ge�mporteerd, SubmitToVHEPN() niet meer mogelijk via website.
-	;Quit:('WSOrd.IsGroepOrder())&&(WSOrd.IsOnderdeelVanGroepOrder())
+	Quit:(WSOrd.IsOnderdeelVanGroepOrder())
 	New tmpAr,lbLog,tmpLbl
 	Merge tmpAr=tmpRq
 	Set tmpAr("Taal")=Taal
@@ -914,25 +914,26 @@
 	Quit
 MShowSubmitAdminVerw(Visible,WSOrd)
 	Quit:('Visible)
-	;Quit:('WSOrd.IsGroepOrder())&&(WSOrd.IsOnderdeelVanGroepOrder())
-	New tmpAr,lbLog,SubmitAdminHREF
-	Merge tmpAr=tmpRq
-	Kill tmpAr("TRANSF")
-	Set tmpAr("TRANSF")="ADM"
-	If ('WSOrd.IsGroepOrder())&&(WSOrd.IsOnderdeelVanGroepOrder()) {
+	New tmpAr,lbLog,SubmitAdminHREF,SubmitAdminAgainHREF
+	If (WSOrd.IsOnderdeelVanGroepOrder()) {
 		Set msg="Dit order is onderdeel van GroepOrder "_WSOrd.OrderNrCalc(WSOrd.GeefIDVanParentGroepOrder())_". "_$$$CRLF_"Order-To-Admin is alleen mogelijk voor het GroepOrder (via Historiek)."
 		Set SubmitAdminHREF="javascript:alert("_$$$QuoteJS(msg)_")"
+		Set SubmitAdminAgainHREF=SubmitAdminHREF
 	}
 	Else {
+		Merge tmpAr=tmpRq
+		Kill tmpAr("TRANSF")
+		Set tmpAr("TRANSF")="ADM"
 		Set SubmitAdminHREF="main.csp?"_##class(cspBasis.GAProdTBox).CQueryString(.tmpAr)
+		Set tmpAr("TRANSF")="AGAIN;ADM"
+		Set SubmitAdminAgainHREF="main.csp?"_##class(cspBasis.GAProdTBox).CQueryString(.tmpAr)
 	}
 	Set arShow("SubmitAdmin","BTN")=Visible
 	Set arShow("SubmitAdmin","HREF")=SubmitAdminHREF
 	
 	If WSOrd.IsTransferredToAdmin() Do
 	. Set lbLog=$LG(WSOrd.TransferLog,1)
-	. Set tmpAr("TRANSF")="AGAIN;ADM"
-	. Set arShow("SubmitAdminAgain","HREF")="main.csp?"_##class(cspBasis.GAProdTBox).CQueryString(.tmpAr)
+	. Set arShow("SubmitAdminAgain","HREF")=SubmitAdminAgainHREF
 	. Set arShow("SubmitAdminAgain","INFO")="<U>offerte</U>: "_$LG(lbLog,2)_"  "_$$mssSubmitAdminTime($LG(lbLog,1))_"    +++klantnr "_$S(TBXContext.IsDomeinVHEPN():KLNr, 1:TBXContext.GeefDomeinKlantNummer())_"+++"
 	. Set arShow("SubmitAdminAgain","INFO")=$$$Replace(arShow("SubmitAdminAgain","INFO")," ","&nbsp;")
 	Else  Do