Index: APPS/OV/OrderBevestiging/data/Order.cls.xml
===================================================================
diff -u -r29059 -r31707
--- APPS/OV/OrderBevestiging/data/Order.cls.xml	(.../Order.cls.xml)	(revision 29059)
+++ APPS/OV/OrderBevestiging/data/Order.cls.xml	(.../Order.cls.xml)	(revision 31707)
@@ -8,25 +8,40 @@
 <Type>DOM.common.PartijID</Type>
 </Property>
 
+<Property name="OrderID">
+<Type>TECH.String</Type>
+</Property>
+
 <Property name="BevestigingStatus">
 <Type>APPS.OV.OrderBevestiging.enu.BevestigingStatus</Type>
 </Property>
 
-<Index name="ZoekIndex">
-<Properties>KlantID,BevestigingStatus</Properties>
+<Property name="OrderBevestiging">
+<Type>APPS.OV.OrderBevestiging.dto.OrderBevestiging</Type>
+<Parameter name="CLASSNAME" value="1"/>
+</Property>
+
+<Index name="KlantIDIndex">
+<Properties>KlantID</Properties>
 </Index>
 
-<Property name="OrderID">
-<Type>%String</Type>
-</Property>
+<Index name="OrderIDIndex">
+<Properties>OrderID</Properties>
+</Index>
 
+<Index name="OrderIDBevestigingStatus">
+<Properties>BevestigingStatus</Properties>
+</Index>
+
 <Method name="%OnNew">
-<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,OrderID:%String</FormalSpec>
+<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,OrderID:%String,OrderBevestiging:APPS.OV.OrderBevestiging.dto.OrderBevestiging</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set ..OrderID = OrderID
 	Set ..KlantID = KlantID
+	Set ..OrderBevestiging = OrderBevestiging
 	Set ..BevestigingStatus = ##class(APPS.OV.OrderBevestiging.enu.BevestigingStatus).NogTeBevestigen()
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -39,8 +54,6 @@
 <IndexLocation>^APPS.OV.OrderBevesti4216.OrderI</IndexLocation>
 <StreamLocation>^APPS.OV.OrderBevesti4216.OrderS</StreamLocation>
 <Data name="OrderDefaultData">
-<Structure>listnode</Structure>
-<Subscript/>
 <Value name="1">
 <Value>%%CLASSNAME</Value>
 </Value>
@@ -68,6 +81,12 @@
 <Value name="9">
 <Value>OrderID</Value>
 </Value>
+<Value name="10">
+<Value>OrderBevestigingen</Value>
+</Value>
+<Value name="11">
+<Value>OrderBevestiging</Value>
+</Value>
 </Data>
 </Storage>
 </Class>