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 = ? ) ")