Index: WS/TBX/OrderAbstract.cls.xml
===================================================================
diff -u -r320 -r334
--- WS/TBX/OrderAbstract.cls.xml	(.../OrderAbstract.cls.xml)	(revision 320)
+++ WS/TBX/OrderAbstract.cls.xml	(.../OrderAbstract.cls.xml)	(revision 334)
@@ -199,6 +199,15 @@
 <Parameter name="XMLNAME" value="EXTRA_TEKST"/>
 </Property>
 
+<Property name="SubmitToVHLog">
+<Description>
+Logt de SubmitToVHEPN acties: 
+Format: $LB($LB($H,info),$LB(prev $H, ...), ...)
+Bij een nieuwe SubmitToVHEPN wordt de log steeds vooraan toegevoegd. Gebruik hiervoor de method AddToSubmitToVHLog()</Description>
+<Type>%List</Type>
+<Parameter name="XMLPROJECTION" value="NONE"/>
+</Property>
+
 <Property name="TransferLog">
 <Description>
 Logt de WSOrdToAdmin() acties: 
@@ -245,6 +254,15 @@
 <Parameter name="XMLPROJECTION" value="NONE"/>
 </Property>
 
+<Property name="OrderReferentie">
+<Type>%String</Type>
+<Calculated>1</Calculated>
+<Private>1</Private>
+<SqlComputeCode> set {*}=##class(WS.TBX.OrderAbstract).%OpenId({ID}).GeefOrderReferentie() </SqlComputeCode>
+<SqlComputed>1</SqlComputed>
+<Parameter name="XMLPROJECTION" value="NONE"/>
+</Property>
+
 <Method name="%OnBeforeSave">
 <FormalSpec>IsNew:%Library.Boolean=1</FormalSpec>
 <ProcedureBlock>0</ProcedureBlock>
@@ -292,6 +310,11 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefOrderReferentie">
+<Abstract>1</Abstract>
+<ReturnType>%String</ReturnType>
+</Method>
+
 <Method name="GeefVerpakkingsType">
 <Abstract>1</Abstract>
 <ReturnType>%String</ReturnType>
@@ -330,6 +353,12 @@
 <FormalSpec>BonType:APPS.TBXWeb.enu.BonType</FormalSpec>
 </Method>
 
+<Method name="ZetSubmitTS">
+<FormalSpec>DollarH:%String=$H</FormalSpec>
+<Implementation><![CDATA[	Set ..SubmitTS=$ZDT($H,3)
+]]></Implementation>
+</Method>
+
 <Method name="ExtraTekstGet">
 <ProcedureBlock>0</ProcedureBlock>
 <ReturnType>%String</ReturnType>
@@ -346,6 +375,16 @@
 ]]></Implementation>
 </Method>
 
+<Method name="AddToSubmitToVHLog">
+<FormalSpec>Status:%String,Info:%String</FormalSpec>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+ Set ..SubmitToVHLog=$LB($LB($H,$G(Status),$G(Info)))_..SubmitToVHLog
+ Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="AddToTransferLog">
 <FormalSpec>OffID:%String,SOAPDest:%String,Info:%String</FormalSpec>
 <ReturnType>%Status</ReturnType>
@@ -476,6 +515,9 @@
 <Value name="27">
 <Value>IsInGroepOrder</Value>
 </Value>
+<Value name="28">
+<Value>SubmitToVHLog</Value>
+</Value>
 </Data>
 </Storage>
 </Class>
Index: APPS/TBXWeb/TBXContext.cls.xml
===================================================================
diff -u -r328 -r334
--- APPS/TBXWeb/TBXContext.cls.xml	(.../TBXContext.cls.xml)	(revision 328)
+++ APPS/TBXWeb/TBXContext.cls.xml	(.../TBXContext.cls.xml)	(revision 334)
@@ -596,7 +596,7 @@
 
 <Method name="IsVerwerkerToegelaten">
 <Description>
-De button "ExportXML" voor een bestelling is beschikbaar </Description>
+Verwerker voor dit domein toegelaten (typisch VHEPN en DomeinVerwerker) </Description>
 <FormalSpec>VERW:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
Index: csp/vhisie/TBX/Main/tmpDev.mac.rou
===================================================================
diff -u -r330 -r334
--- csp/vhisie/TBX/Main/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 330)
+++ csp/vhisie/TBX/Main/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 334)
@@ -694,11 +694,12 @@
 	Merge tmpAr=tmpRq
 	Kill tmpAr("REF")
 	Set tmpAr("Taal")=Taal
-	Set tmpAr("KLNR")=KLNr
-	Set tmpAr("IsGroepBestelling")=1
 	Set arShow("SubmitGroep","BTN")=Visible
 	Set arShow("SubmitGroep","HREF")="MailSend.csp?"_##class(cspBasis.GAProdTBox).CQueryString(.tmpAr)
 	Set arShow("SubmitGroep","TEXT")=##class(cspBasis.GAProdTBox).WebTextValue("GroepVerzenden",Taal,"L")
+	Set %session.Data("VERW")=VERW
+	Set %session.Data("KLNR")=KLNr
+	Set %session.Data("IsGroepBestelling")=1
 	quit 	
 MShowNewOrder(Visible)
 	Quit:((TBXContext.AlleenToegangMetLogin())&&('TBXContext.IsKlantIDIngevuld(KLNr)))
@@ -760,7 +761,7 @@
 	Quit
 MShowBookmarkPage(Visible,WSOrd)
 	New BookmTxt
-	Set BookmTxt="TandemBOX - "_$S($IsObject(WSOrd):WSOrd.OrderNr_" - "_WSOrd.Commissie, 1:"")   ; WSOrd.OrderNrCalc()
+	Set BookmTxt="TandemBOX - "_$S($IsObject(WSOrd):WSOrd.OrderNr_" - "_WSOrd.GeefOrderReferentie(), 1:"")   ; WSOrd.OrderNrCalc()
 	Set arShow("BookmarkPage","BTN")=Visible
 	Set arShow("BookmarkPage","HREF")="javascript:window.external.AddFavorite(location.href,'"_BookmTxt_"');"
 	Quit
@@ -778,8 +779,10 @@
 	Set %session.Data("Taal")=Taal
 	Set %session.Data("WSID")=wsID
 	Set %session.Data("KLNR")=KLNr
+	Set %session.Data("VERW")=VERW
+	Set %session.Data("VERW")=VERW
+	Set %session.Data("IsGroepBestelling")=0
 	Kill tmpAr("REF")
-	Set tmpAr("IsGroepBestelling")=0
  
 	Set OnvoldoendeBestelhoeveelheid=$$$Not(TBXOrdersDto.HeeftVoldoendeBestelhoeveelheid())
 	If OnvoldoendeBestelhoeveelheid {
@@ -877,6 +880,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())
 	New tmpAr,lbLog,tmpLbl
 	Merge tmpAr=tmpRq
 	Set tmpAr("Taal")=Taal
@@ -905,12 +909,21 @@
 	Quit
 MShowSubmitAdminVerw(Visible,WSOrd)
 	Quit:('Visible)
-	New tmpAr,lbLog
+	;Quit:('WSOrd.IsGroepOrder())&&(WSOrd.IsOnderdeelVanGroepOrder())
+	New tmpAr,lbLog,SubmitAdminHREF
 	Merge tmpAr=tmpRq
 	Kill tmpAr("TRANSF")
 	Set tmpAr("TRANSF")="ADM"
+	If ('WSOrd.IsGroepOrder())&&(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)_")"
+	}
+	Else {
+		Set SubmitAdminHREF="main.csp?"_##class(cspBasis.GAProdTBox).CQueryString(.tmpAr)
+	}
 	Set arShow("SubmitAdmin","BTN")=Visible
-	Set arShow("SubmitAdmin","HREF")="main.csp?"_##class(cspBasis.GAProdTBox).CQueryString(.tmpAr)
+	Set arShow("SubmitAdmin","HREF")=SubmitAdminHREF
+	
 	If WSOrd.IsTransferredToAdmin() Do
 	. Set lbLog=$LG(WSOrd.TransferLog,1)
 	. Set tmpAr("TRANSF")="AGAIN;ADM"
@@ -1115,7 +1128,7 @@
 	Else  If 0  && $$IsInternIPAdres^cspBasis.Library($G(%RemoteIP)) Do
 	. Set MinShowH=$$$shShownForVHEPN
  
-	set Query = "SELECT Top 1000  KLNummer, KLNaam, BonType, ID, IngaveTijdStip, TotAantal, TotPrijs, Commissie, SubmitTS, ShowInHist"
+	set Query = "SELECT Top 1000  KLNummer, KLNaam, BonType, ID, IngaveTijdStip, TotAantal, TotPrijs, OrderReferentie As Commissie , SubmitTS, ShowInHist"
 			  _ " FROM "_$select(blnShowComplete:"WS_TBX.OrderAbstract",1:"WS_TBX.WebOrder")
 			  _ " WHERE ( WebDomain = ? ) AND ( ShowInHist BETWEEN ? AND ? )"
 			  _ $select(blnListALL:"",1:"AND ( KLNummer = ? ) ")
Index: WS/TBX/GroepOrder.cls.xml
===================================================================
diff -u -r320 -r334
--- WS/TBX/GroepOrder.cls.xml	(.../GroepOrder.cls.xml)	(revision 320)
+++ WS/TBX/GroepOrder.cls.xml	(.../GroepOrder.cls.xml)	(revision 334)
@@ -29,6 +29,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefOrderReferentie">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..Referentie
+]]></Implementation>
+</Method>
+
 <Method name="GeefVerpakkingType">
 <ReturnType>APPS.TBXWeb.enu.VerpakkingsType</ReturnType>
 <Implementation><![CDATA[
@@ -54,6 +60,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetSubmitTS">
+<FormalSpec>DollarH:%String=$H</FormalSpec>
+<Implementation><![CDATA[
+	set itOrders = ##class(TECH.ListIterator).%New(..Orders)
+	while itOrders.HasNext() {
+		set Order = itOrders.Next()
+		do Order.ZetSubmitTS(DollarH)
+	}
+	Do ##super(DollarH)
+]]></Implementation>
+</Method>
+
 <Method name="GeefLijnenMetFout">
 <ReturnType>%ListOfDataTypes</ReturnType>
 <Implementation><![CDATA[
@@ -111,6 +129,20 @@
 ]]></Implementation>
 </Method>
 
+<Method name="AddToSubmitToVHLog">
+<FormalSpec>Status:%String,Info:%String</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	set itOrders = ##class(TECH.ListIterator).%New(..Orders)
+	while itOrders.HasNext() {
+		set Order = itOrders.Next()
+		do Order.AddToSubmitToVHLog(Status , Info  )
+	}
+	
+ 	Quit ##super(Status , Info)
+]]></Implementation>
+</Method>
+
 <Method name="AddToTransferLog">
 <FormalSpec>OffID:%String,SOAPDest:%String,Info:%String</FormalSpec>
 <ReturnType>%Status</ReturnType>
@@ -162,7 +194,6 @@
 <Type>%Library.CacheStorage</Type>
 <DefaultData>GroepOrderDefaultData</DefaultData>
 <Data name="GroepOrderDefaultData">
-<Structure>listnode</Structure>
 <Subscript>"GroepOrder"</Subscript>
 <Value name="1">
 <Value>Referentie</Value>
Index: APPS/TBXWeb/impl/AbstractOrderHandler.cls.xml
===================================================================
diff -u -r320 -r334
--- APPS/TBXWeb/impl/AbstractOrderHandler.cls.xml	(.../AbstractOrderHandler.cls.xml)	(revision 320)
+++ APPS/TBXWeb/impl/AbstractOrderHandler.cls.xml	(.../AbstractOrderHandler.cls.xml)	(revision 334)
@@ -102,7 +102,7 @@
 	if (..Shop = "VHEPN") && (..Requester'="VHEPN" ) {
 		Do ..WSOrd.AddToSubmitToVHLog("1")
 	} else	{	
-		Set ..WSOrd.SubmitTS=$ZDT($H,3)
+		Do ..WSOrd.ZetSubmitTS($H)
 	}
 	
 	; bon bewaren
@@ -192,11 +192,12 @@
 	If stSendMail Do
 	. Set MailTo=$TR($$$LCVT($G(lbTo)),"""","")
     . Set:(MailTo?1"(".E1")") MailTo=$E(MailTo,2,$L(MailTo)-1)
+    . Set VERW=..Requester
 	. Set lbExtras=""
 	. Set:($L($G(From))) lbExtras=lbExtras_$LB("MailFrom="_$TR(From,"""","")) 
 	. Set:($L($G(lbTo))) lbExtras=lbExtras_$LB("MailTo="_MailTo)
 	. Set:($L(..WSOrd.Opmerking1)) lbExtras=lbExtras_$LB("MailComment="_..WSOrd.Opmerking1)
-	. Do ##class(cspBasis.GAProdTBox).AddToLog("MAIL_SEND",..WSOrd.WebDomain,..WSOrd.KLNummer,"shop="_..Shop,..WSOrd.mID,,$G(Taal),,lbExtras)
+	. Do ##class(cspBasis.GAProdTBox).AddToLog("MAIL_SEND",..WSOrd.WebDomain,..WSOrd.KLNummer,"shop="_..Shop,..WSOrd.mID,VERW,$G(Taal),,lbExtras)
 	. Set Info = "From="_From_" To="_$$$LCVT(lbTo)
 	. Do ..Logger.Info("MAIL_SEND",Info)
 	Else  Do
Index: WS/TBX/Order.cls.xml
===================================================================
diff -u -r320 -r334
--- WS/TBX/Order.cls.xml	(.../Order.cls.xml)	(revision 320)
+++ WS/TBX/Order.cls.xml	(.../Order.cls.xml)	(revision 334)
@@ -34,15 +34,6 @@
 <Parameter name="XMLNAME" value="TRANSFSTATUS"/>
 </Property>
 
-<Property name="SubmitToVHLog">
-<Description>
-Logt de SubmitToVHEPN acties: 
-Format: $LB($LB($H,info),$LB(prev $H, ...), ...)
-Bij een nieuwe SubmitToVHEPN wordt de log steeds vooraan toegevoegd. Gebruik hiervoor de method AddToSubmitToVHLog()</Description>
-<Type>%List</Type>
-<Parameter name="XMLPROJECTION" value="NONE"/>
-</Property>
-
 <Property name="ActieCodesList">
 <Type>%String</Type>
 <Collection>list</Collection>
@@ -76,12 +67,43 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefOrderReferentie">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..Commissie
+]]></Implementation>
+</Method>
+
 <Method name="IsGroepOrder">
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	quit 0
 ]]></Implementation>
 </Method>
 
+<Method name="IsOnderdeelVanGroepOrder">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Quit (..BepaalIDVanParentGroepOrder(..mID)>0)
+	;Quit ..IsInGroepOrder
+]]></Implementation>
+</Method>
+
+<Method name="GeefIDVanParentGroepOrder">
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[	Quit ..BepaalIDVanParentGroepOrder(..mID)
+]]></Implementation>
+</Method>
+
+<Method name="BepaalIDVanParentGroepOrder">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>wsID</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	;Set SQLStatemt="SELECT GroepOrder FROM WS_TBX.GroepOrder_Orders WHERE Orders=:wsID ORDER BY GroepOrder DESC"
+	&SQL(SELECT TOP 1 GroepOrder INTO :GroepOrderID FROM WS_TBX.GroepOrder_Orders WHERE Orders=:wsID ORDER BY GroepOrder DESC)
+	Quit $G(GroepOrderID)
+]]></Implementation>
+</Method>
+
 <Method name="GetDC">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
@@ -92,16 +114,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="AddToSubmitToVHLog">
-<FormalSpec>Status:%String,Info:%String</FormalSpec>
-<ProcedureBlock>1</ProcedureBlock>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
- Set ..SubmitToVHLog=$LB($LB($H,$G(Status),$G(Info)))_..SubmitToVHLog
- Quit $$$OK
-]]></Implementation>
-</Method>
-
 <Method name="TransfStatusSetByID">
 <Description>
 Set the new TransfStatus. It is saved immedately. </Description>
@@ -815,9 +827,7 @@
 
 <Method name="ZetBonType">
 <FormalSpec>BonType:APPS.TBXWeb.enu.BonType</FormalSpec>
-<Implementation><![CDATA[
-	set ..BonType = BonType 
-	quit
+<Implementation><![CDATA[	set ..BonType = BonType
 ]]></Implementation>
 </Method>
 
Index: APPS/TBXWeb/Utils.cls.xml
===================================================================
diff -u -r320 -r334
--- APPS/TBXWeb/Utils.cls.xml	(.../Utils.cls.xml)	(revision 320)
+++ APPS/TBXWeb/Utils.cls.xml	(.../Utils.cls.xml)	(revision 334)
@@ -52,9 +52,9 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	if ..IsGroepOrder(OrderID) { 
-		set OrderReferentie = ##class(WS.TBX.GroepOrder).%OpenId(OrderID).Referentie
+		set OrderReferentie = ##class(WS.TBX.GroepOrder).%OpenId(OrderID).GeefOrderReferentie()
 	} else { 
-		set OrderReferentie = ##class(WS.TBX.Order).%OpenId(OrderID).Commissie 
+		set OrderReferentie = ##class(WS.TBX.Order).%OpenId(OrderID).GeefOrderReferentie()
 	}
 	quit OrderReferentie
 ]]></Implementation>