Index: WS/TBX/Order.cls.xml
===================================================================
diff -u -r224 -r232
--- WS/TBX/Order.cls.xml	(.../Order.cls.xml)	(revision 224)
+++ WS/TBX/Order.cls.xml	(.../Order.cls.xml)	(revision 232)
@@ -5,58 +5,13 @@
 <IncludeCode>PRGACNTs,APPS.TBXWeb,TECH.Error</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <SqlTableName>WebOrder</SqlTableName>
-<Super>%Persistent,%XML.Adaptor</Super>
+<Super>WS.TBX.OrderAbstract</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
-<Index name="PrimaryIndex">
-<IdKey>1</IdKey>
-<PrimaryKey>1</PrimaryKey>
-<Properties>mID</Properties>
-<Unique>1</Unique>
-</Index>
-
-<Index name="IndexKLNr">
-<Properties>KLNummer</Properties>
-</Index>
-
-<Index name="IndexWebDomain">
-<Properties>WebDomain</Properties>
-</Index>
-
 <Index name="IndexHist">
 <Properties>ShowInHist</Properties>
 </Index>
 
-<Property name="mID">
-<Description>
-ID van het object</Description>
-<Type>%Integer</Type>
-<InitialExpression>0</InitialExpression>
-<Parameter name="XMLNAME" value="ID"/>
-</Property>
-
-<Property name="Taal">
-<Description>
-Taal van de aanvrager</Description>
-<Type>%String</Type>
-<Parameter name="XMLNAME" value="TAAL"/>
-</Property>
-
-<Property name="BonType">
-<Type>%String</Type>
-<Parameter name="XMLNAME" value="BONTYPE"/>
-</Property>
-
-<Property name="LeverTijd">
-<Type>%String</Type>
-<Parameter name="XMLNAME" value="LEVERTIJD"/>
-</Property>
-
-<Property name="LeverTijdID">
-<Type>%String</Type>
-<Parameter name="XMLNAME" value="LEVERTIJDID"/>
-</Property>
-
 <Property name="Commissie">
 <Type>%String</Type>
 <Parameter name="XMLNAME" value="KLANTORDERREF"/>
@@ -67,63 +22,6 @@
 <Parameter name="XMLNAME" value="INGAVETIJDSTIP"/>
 </Property>
 
-<Property name="KLNaam">
-<Type>%String</Type>
-<Parameter name="MAXLEN" value="100"/>
-<Parameter name="TRUNCATE" value="1"/>
-<Parameter name="XMLNAME" value="KL_NAAM"/>
-</Property>
-
-<Property name="KLNummer">
-<Type>%String</Type>
-<Parameter name="XMLNAME" value="KL_NUMMER"/>
-</Property>
-
-<Property name="KLStraatNrBus">
-<Type>%String</Type>
-<Parameter name="XMLNAME" value="KL_STRAATNRBUS"/>
-</Property>
-
-<Property name="KLPostNr">
-<Type>%String</Type>
-<Parameter name="XMLNAME" value="KL_POSTNR"/>
-</Property>
-
-<Property name="KLWoonPlaats">
-<Type>%String</Type>
-<Parameter name="XMLNAME" value="KL_WOONPLAATS"/>
-</Property>
-
-<Property name="KLTelefoon">
-<Type>%String</Type>
-<Parameter name="XMLNAME" value="KL_TELEFOON"/>
-</Property>
-
-<Property name="KLFax">
-<Type>%String</Type>
-<Parameter name="XMLNAME" value="KL_FAX"/>
-</Property>
-
-<Property name="KLEMail">
-<Type>%String</Type>
-<Parameter name="XMLNAME" value="KL_EMAIL"/>
-</Property>
-
-<Property name="KLPrijsKlasse">
-<Type>%String</Type>
-<Parameter name="XMLNAME" value="KL_AFDRUKCODE"/>
-</Property>
-
-<Property name="KLKorting">
-<Type>%String</Type>
-<Parameter name="XMLNAME" value="KL_KORTING"/>
-</Property>
-
-<Property name="KLBTWNr">
-<Type>%String</Type>
-<Parameter name="XMLNAME" value="KL_BTWNR"/>
-</Property>
-
 <Property name="Lijnen">
 <Type>WS.TBX.EM.OrderLijn</Type>
 <Collection>array</Collection>
@@ -141,11 +39,6 @@
 <Parameter name="XMLNAME" value="TOTAANTAL"/>
 </Property>
 
-<Property name="WebDomain">
-<Type>%String</Type>
-<Parameter name="XMLNAME" value="WEBDOMAIN"/>
-</Property>
-
 <Property name="WebURL">
 <Type>%String</Type>
 <Parameter name="MAXLEN" value="500"/>
@@ -198,13 +91,6 @@
 <Parameter name="XMLPROJECTION" value="NONE"/>
 </Property>
 
-<Property name="Opmerking1">
-<Type>%String</Type>
-<Parameter name="MAXLEN" value="500"/>
-<Parameter name="TRUNCATE" value="1"/>
-<Parameter name="XMLNAME" value="OPMERKING1"/>
-</Property>
-
 <Property name="NietMeeleveren">
 <Description>
 De optie Niet Meeleveren wordt toegepast op alle lijnen van het order.  Vandaar als propt. van de hoofding i.p.v. de lijnen 
@@ -258,7 +144,7 @@
 <ProcedureBlock>0</ProcedureBlock>
 <ReturnType>%Library.Status</ReturnType>
 <Implementation><![CDATA[
-#define StorageIndexNode ^WS.TBX.OrderD
+#define StorageIndexNode ^WS.TBX.OrderAbstractD
  Set:(IsNew)||(..IngaveTijdStip="") ..IngaveTijdStip=$ZDT($H,3)
  Set id=+..mID
  If 'id Set id=$INCREMENT($$$StorageIndexNode)
@@ -1133,113 +1019,53 @@
 
 <Storage name="Default">
 <Type>%Library.CacheStorage</Type>
-<DataLocation>^WS.TBX.OrderD</DataLocation>
 <DefaultData>OrderDefaultData</DefaultData>
-<IdLocation>^WS.TBX.OrderD</IdLocation>
-<IndexLocation>^WS.TBX.OrderI</IndexLocation>
-<StreamLocation>^WS.TBX.OrderS</StreamLocation>
 <Data name="Lijnen">
 <Attribute>Lijnen</Attribute>
 <Structure>subnode</Structure>
-<Subscript>"LN"</Subscript>
+<Subscript>"Lijnen"</Subscript>
 </Data>
 <Data name="OrderDefaultData">
+<Subscript>"Order"</Subscript>
 <Value name="1">
-<Value>%%CLASSNAME</Value>
+<Value>ActieCodesList</Value>
 </Value>
 <Value name="2">
-<Value>BonType</Value>
+<Value>Commissie</Value>
 </Value>
 <Value name="3">
-<Value>Commissie</Value>
+<Value>IngaveTijdStip</Value>
 </Value>
 <Value name="4">
-<Value>IngaveTijdStip</Value>
+<Value>NietMeeleveren</Value>
 </Value>
 <Value name="5">
-<Value>KLFax</Value>
+<Value>ShowInHist</Value>
 </Value>
 <Value name="6">
-<Value>KLNaam</Value>
+<Value>SubmitTS</Value>
 </Value>
 <Value name="7">
-<Value>KLNummer</Value>
+<Value>SubmitToVHLog</Value>
 </Value>
 <Value name="8">
-<Value>KLPostNr</Value>
+<Value>TotAantal</Value>
 </Value>
 <Value name="9">
-<Value>KLStraatNrBus</Value>
+<Value>TotPrijs</Value>
 </Value>
 <Value name="10">
-<Value>KLTelefoon</Value>
+<Value>TransfStatus</Value>
 </Value>
 <Value name="11">
-<Value>KLWoonPlaats</Value>
+<Value>TransferLog</Value>
 </Value>
 <Value name="12">
-<Value>LeverTijd</Value>
+<Value>WebQSData</Value>
 </Value>
 <Value name="13">
-<Value>Taal</Value>
-</Value>
-<Value name="14">
-<Value>TotPrijs</Value>
-</Value>
-<Value name="15">
-<Value>TotAantal</Value>
-</Value>
-<Value name="16">
-<Value>KLEMail</Value>
-</Value>
-<Value name="17">
-<Value>StdLade</Value>
-</Value>
-<Value name="18">
-<Value>WebDomain</Value>
-</Value>
-<Value name="19">
 <Value>WebURL</Value>
 </Value>
-<Value name="20">
-<Value>WebQSData</Value>
-</Value>
-<Value name="21">
-<Value>KLPrijsKlasse</Value>
-</Value>
-<Value name="22">
-<Value>SubmitTS</Value>
-</Value>
-<Value name="23">
-<Value>KLKorting</Value>
-</Value>
-<Value name="24">
-<Value>KLBTWNr</Value>
-</Value>
-<Value name="25">
-<Value>TransferLog</Value>
-</Value>
-<Value name="26">
-<Value>SubmitToVHLog</Value>
-</Value>
-<Value name="27">
-<Value>LeverTijdID</Value>
-</Value>
-<Value name="28">
-<Value>Opmerking1</Value>
-</Value>
-<Value name="29">
-<Value>NietMeeleveren</Value>
-</Value>
-<Value name="30">
-<Value>ShowInHist</Value>
-</Value>
-<Value name="31">
-<Value>TransfStatus</Value>
-</Value>
-<Value name="32">
-<Value>ActieCodesList</Value>
-</Value>
 </Data>
 </Storage>
 </Class>