Index: EXT/Unishop/PurchaseOrder001/CreateOrder/LadeEigenschappenLBX.cls.xml
===================================================================
diff -u -r36516 -r37155
--- EXT/Unishop/PurchaseOrder001/CreateOrder/LadeEigenschappenLBX.cls.xml	(.../LadeEigenschappenLBX.cls.xml)	(revision 36516)
+++ EXT/Unishop/PurchaseOrder001/CreateOrder/LadeEigenschappenLBX.cls.xml	(.../LadeEigenschappenLBX.cls.xml)	(revision 37155)
@@ -12,17 +12,17 @@
 </Parameter>
 
 <Property name="ZijwandType">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="BoxSystemSide"/>
 </Property>
 
 <Property name="VoorwandTypeVanCBinnenlade">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="FrontTypeFromInsideBoxSystemC"/>
 </Property>
 
 <Property name="VoorwandTypeVanMBinnenlade">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="FrontTypeFromInsideBoxSystemM"/>
 </Property>
 
@@ -32,37 +32,37 @@
 </Property>
 
 <Property name="AantalDwarsverdelingen">
-<Type>TECH.Integer</Type>
+<Type>%Integer</Type>
 <Parameter name="XMLNAME" value="NumberOfCrossGalleries"/>
 </Property>
 
 <Property name="UitsparingDataAantalUitsparingen">
-<Type>TECH.Integer</Type>
+<Type>%Integer</Type>
 <Parameter name="XMLNAME" value="NumberOfSiphonCaps"/>
 </Property>
 
 <Property name="UitsparingDataBreedteX">
-<Type>TECH.Numeric</Type>
+<Type>%Numeric</Type>
 <Parameter name="XMLNAME" value="SiphonDataWidthLeftX"/>
 </Property>
 
 <Property name="UitsparingDataBreedteZ1">
-<Type>TECH.Numeric</Type>
+<Type>%Numeric</Type>
 <Parameter name="XMLNAME" value="SiphonDataWidthCapZ1"/>
 </Property>
 
 <Property name="UitsparingDataBreedteM">
-<Type>TECH.Numeric</Type>
+<Type>%Numeric</Type>
 <Parameter name="XMLNAME" value="SiphonDataWidthCentreM"/>
 </Property>
 
 <Property name="UitsparingDataBreedteZ2">
-<Type>TECH.Numeric</Type>
+<Type>%Numeric</Type>
 <Parameter name="XMLNAME" value="SiphonDataWidthCapZ2"/>
 </Property>
 
 <Property name="UitsparingDataBreedteY">
-<Type>TECH.Numeric</Type>
+<Type>%Numeric</Type>
 <Parameter name="XMLNAME" value="SiphonDataWidthRightY"/>
 </Property>
 
Index: EXT/Unishop/PurchaseOrder001/CreateOrder/OrderLijn.cls.xml
===================================================================
diff -u -r33312 -r37155
--- EXT/Unishop/PurchaseOrder001/CreateOrder/OrderLijn.cls.xml	(.../OrderLijn.cls.xml)	(revision 33312)
+++ EXT/Unishop/PurchaseOrder001/CreateOrder/OrderLijn.cls.xml	(.../OrderLijn.cls.xml)	(revision 37155)
@@ -12,22 +12,22 @@
 </Parameter>
 
 <Property name="Nummer">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="PurchaseOrderLineNumber"/>
 </Property>
 
 <Property name="Referentie">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="PurchaseOrderLineReference"/>
 </Property>
 
 <Property name="Aantal">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="Quantity"/>
 </Property>
 
 <Property name="GevraagdeLeverdatum">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="RequestDate"/>
 <Parameter name="XMLPROJECTION" value="NONE"/>
 </Property>
Index: EXT/Unishop/PurchaseOrder001/CreateOrder/LadeEigenschappenTAX.cls.xml
===================================================================
diff -u -r36522 -r37155
--- EXT/Unishop/PurchaseOrder001/CreateOrder/LadeEigenschappenTAX.cls.xml	(.../LadeEigenschappenTAX.cls.xml)	(revision 36522)
+++ EXT/Unishop/PurchaseOrder001/CreateOrder/LadeEigenschappenTAX.cls.xml	(.../LadeEigenschappenTAX.cls.xml)	(revision 37155)
@@ -12,17 +12,17 @@
 </Parameter>
 
 <Property name="LadeBinnenKleur">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="InteriorColour"/>
 </Property>
 
 <Property name="FrontEindkapKleur">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="CoverColour"/>
 </Property>
 
 <Property name="GlijderType">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="RunnerType"/>
 </Property>
 
@@ -32,7 +32,7 @@
 </Property>
 
 <Property name="KoppelingType">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="TypeLockingDevice"/>
 </Property>
 
@@ -45,7 +45,7 @@
 <Property name="LosseComponent">
 <Description>
 Nog niet ondersteund via EDI </Description>
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME"/>
 <Parameter name="XMLPROJECTION" value="NONE"/>
 </Property>
Index: EXT/Unishop/PurchaseOrder001/CreateOrder/LadeEigenschappen.cls.xml
===================================================================
diff -u -r35923 -r37155
--- EXT/Unishop/PurchaseOrder001/CreateOrder/LadeEigenschappen.cls.xml	(.../LadeEigenschappen.cls.xml)	(revision 35923)
+++ EXT/Unishop/PurchaseOrder001/CreateOrder/LadeEigenschappen.cls.xml	(.../LadeEigenschappen.cls.xml)	(revision 37155)
@@ -4,27 +4,27 @@
 <Abstract>1</Abstract>
 
 <Property name="Klasse">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="Application"/>
 </Property>
 
 <Property name="LadeKleur">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="BoxSystemColour"/>
 </Property>
 
 <Property name="BodemKleur">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="BaseColour"/>
 </Property>
 
 <Property name="LadeHoogte">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="BuildInHeight"/>
 </Property>
 
 <Property name="LadeDiepte">
-<Type>TECH.Numeric</Type>
+<Type>%Numeric</Type>
 <Parameter name="XMLNAME" value="BoxSystemDepth"/>
 </Property>
 
@@ -34,12 +34,12 @@
 </Property>
 
 <Property name="FrontBevestiging">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="FrontAttachment"/>
 </Property>
 
 <Property name="CorpusBreedte">
-<Type>TECH.Numeric</Type>
+<Type>%Numeric</Type>
 <Parameter name="XMLNAME" value="CabinetWidth"/>
 </Property>
 
@@ -49,7 +49,7 @@
 </Property>
 
 <Property name="CorpusWandDikte">
-<Type>TECH.Numeric</Type>
+<Type>%Numeric</Type>
 <Parameter name="XMLNAME" value="CabinetWallThickness"/>
 </Property>
 
@@ -64,17 +64,17 @@
 </Property>
 
 <Property name="OpvullijstKleur">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="SupportPanelColour"/>
 </Property>
 
 <Property name="Draagkracht">
-<Type>TECH.Numeric</Type>
+<Type>%Numeric</Type>
 <Parameter name="XMLNAME" value="LoadBearingCapacity"/>
 </Property>
 
 <Property name="GeleiderTechnologie">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="RunnerSystem"/>
 </Property>
 
@@ -84,7 +84,7 @@
 </Property>
 
 <Property name="VerpakkingType">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="TypeOfPackaging"/>
 </Property>
 
@@ -94,12 +94,12 @@
 </Property>
 
 <Property name="MatMateriaal">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="MatMaterial"/>
 </Property>
 
 <Property name="MatKleur">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="MatColour"/>
 </Property>
 
Index: EXT/Unishop/PurchaseOrder001/CreateOrder/Order.cls.xml
===================================================================
diff -u -r33312 -r37155
--- EXT/Unishop/PurchaseOrder001/CreateOrder/Order.cls.xml	(.../Order.cls.xml)	(revision 33312)
+++ EXT/Unishop/PurchaseOrder001/CreateOrder/Order.cls.xml	(.../Order.cls.xml)	(revision 37155)
@@ -12,24 +12,24 @@
 </Parameter>
 
 <Property name="KlantOrderNummer">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="PurchaseOrderNumber"/>
 </Property>
 
 <Property name="OrderReferentie">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="PurchaseOrderReference"/>
 </Property>
 
 <Property name="CommissieReferentie">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="PurchaseOrderCommissionReference"/>
 </Property>
 
 <Property name="GevraagdeLeverdatum">
 <Description>
 Datumformaat is YYYY.MM.DD</Description>
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="RequestedDeliveryDate"/>
 </Property>
 
Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/EXT.Unishop.PurchaseOrder001.Service.txt
===================================================================
diff -u -r37067 -r37155
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/EXT.Unishop.PurchaseOrder001.Service.txt	(.../EXT.Unishop.PurchaseOrder001.Service.txt)	(revision 37067)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/EXT.Unishop.PurchaseOrder001.Service.txt	(.../EXT.Unishop.PurchaseOrder001.Service.txt)	(revision 37155)
@@ -86,37 +86,37 @@
                 <s:complexContent>
                     <s:extension base="s0:ProductFeatures">
                         <s:sequence>
-                            <s:element minOccurs="0" name="Application" type="s0:String"/>
-                            <s:element minOccurs="0" name="BoxSystemColour" type="s0:String"/>
-                            <s:element minOccurs="0" name="BaseColour" type="s0:String"/>
-                            <s:element minOccurs="0" name="BuildInHeight" type="s0:String"/>
-                            <s:element minOccurs="0" name="BoxSystemDepth" type="s0:Numeric"/>
+                            <s:element minOccurs="0" name="Application" type="s:string"/>
+                            <s:element minOccurs="0" name="BoxSystemColour" type="s:string"/>
+                            <s:element minOccurs="0" name="BaseColour" type="s:string"/>
+                            <s:element minOccurs="0" name="BuildInHeight" type="s:string"/>
+                            <s:element minOccurs="0" name="BoxSystemDepth" type="s:decimal"/>
                             <s:element minOccurs="0" name="IsInsideBoxSystem" type="s:boolean"/>
-                            <s:element minOccurs="0" name="FrontAttachment" type="s0:String"/>
-                            <s:element minOccurs="0" name="CabinetWidth" type="s0:Numeric"/>
+                            <s:element minOccurs="0" name="FrontAttachment" type="s:string"/>
+                            <s:element minOccurs="0" name="CabinetWidth" type="s:decimal"/>
                             <s:element minOccurs="0" name="IsInteriorCabinetWidth" type="s:boolean"/>
-                            <s:element minOccurs="0" name="CabinetWallThickness" type="s0:Numeric"/>
+                            <s:element minOccurs="0" name="CabinetWallThickness" type="s:decimal"/>
                             <s:element minOccurs="0" name="HasSupportPanelLeft" type="s:boolean"/>
                             <s:element minOccurs="0" name="HasSupportPanelRight" type="s:boolean"/>
-                            <s:element minOccurs="0" name="SupportPanelColour" type="s0:String"/>
-                            <s:element minOccurs="0" name="LoadBearingCapacity" type="s0:Numeric"/>
-                            <s:element minOccurs="0" name="RunnerSystem" type="s0:String"/>
+                            <s:element minOccurs="0" name="SupportPanelColour" type="s:string"/>
+                            <s:element minOccurs="0" name="LoadBearingCapacity" type="s:decimal"/>
+                            <s:element minOccurs="0" name="RunnerSystem" type="s:string"/>
                             <s:element minOccurs="0" name="HasSideStabiliser" type="s:boolean"/>
-                            <s:element minOccurs="0" name="TypeOfPackaging" type="s0:String"/>
+                            <s:element minOccurs="0" name="TypeOfPackaging" type="s:string"/>
                             <s:element minOccurs="0" name="HasCustomMat" type="s:boolean"/>
-                            <s:element minOccurs="0" name="MatMaterial" type="s0:String"/>
-                            <s:element minOccurs="0" name="MatColour" type="s0:String"/>
-                            <s:element minOccurs="0" name="BoxSystemSide" type="s0:String"/>
-                            <s:element minOccurs="0" name="FrontTypeFromInsideBoxSystemC" type="s0:String"/>
-                            <s:element minOccurs="0" name="FrontTypeFromInsideBoxSystemM" type="s0:String"/>
+                            <s:element minOccurs="0" name="MatMaterial" type="s:string"/>
+                            <s:element minOccurs="0" name="MatColour" type="s:string"/>
+                            <s:element minOccurs="0" name="BoxSystemSide" type="s:string"/>
+                            <s:element minOccurs="0" name="FrontTypeFromInsideBoxSystemC" type="s:string"/>
+                            <s:element minOccurs="0" name="FrontTypeFromInsideBoxSystemM" type="s:string"/>
                             <s:element minOccurs="0" name="HasCrossGallery" type="s:boolean"/>
-                            <s:element minOccurs="0" name="NumberOfCrossGalleries" type="s0:Integer"/>
-                            <s:element minOccurs="0" name="NumberOfSiphonCaps" type="s0:Integer"/>
-                            <s:element minOccurs="0" name="SiphonDataWidthLeftX" type="s0:Numeric"/>
-                            <s:element minOccurs="0" name="SiphonDataWidthCapZ1" type="s0:Numeric"/>
-                            <s:element minOccurs="0" name="SiphonDataWidthCentreM" type="s0:Numeric"/>
-                            <s:element minOccurs="0" name="SiphonDataWidthCapZ2" type="s0:Numeric"/>
-                            <s:element minOccurs="0" name="SiphonDataWidthRightY" type="s0:Numeric"/>
+                            <s:element minOccurs="0" name="NumberOfCrossGalleries" type="s:long"/>
+                            <s:element minOccurs="0" name="NumberOfSiphonCaps" type="s:long"/>
+                            <s:element minOccurs="0" name="SiphonDataWidthLeftX" type="s:decimal"/>
+                            <s:element minOccurs="0" name="SiphonDataWidthCapZ1" type="s:decimal"/>
+                            <s:element minOccurs="0" name="SiphonDataWidthCentreM" type="s:decimal"/>
+                            <s:element minOccurs="0" name="SiphonDataWidthCapZ2" type="s:decimal"/>
+                            <s:element minOccurs="0" name="SiphonDataWidthRightY" type="s:decimal"/>
                             <s:element minOccurs="0" name="NotRequiredForDelivery" type="s0:NotRequiredForDeliveryLBX"/>
                         </s:sequence>
                     </s:extension>
@@ -127,12 +127,6 @@
                     <s:extension base="s0:DataTransferObject"/>
                 </s:complexContent>
             </s:complexType>
-            <s:simpleType name="Numeric">
-                <s:restriction base="s:decimal"/>
-            </s:simpleType>
-            <s:simpleType name="Integer">
-                <s:restriction base="s:long"/>
-            </s:simpleType>
             <s:complexType name="NotRequiredForDeliveryLBX">
                 <s:complexContent>
                     <s:extension base="s0:NotRequiredForDelivery">
@@ -162,31 +156,31 @@
                 <s:complexContent>
                     <s:extension base="s0:ProductFeatures">
                         <s:sequence>
-                            <s:element minOccurs="0" name="Application" type="s0:String"/>
-                            <s:element minOccurs="0" name="BoxSystemColour" type="s0:String"/>
-                            <s:element minOccurs="0" name="BaseColour" type="s0:String"/>
-                            <s:element minOccurs="0" name="BuildInHeight" type="s0:String"/>
-                            <s:element minOccurs="0" name="BoxSystemDepth" type="s0:Numeric"/>
+                            <s:element minOccurs="0" name="Application" type="s:string"/>
+                            <s:element minOccurs="0" name="BoxSystemColour" type="s:string"/>
+                            <s:element minOccurs="0" name="BaseColour" type="s:string"/>
+                            <s:element minOccurs="0" name="BuildInHeight" type="s:string"/>
+                            <s:element minOccurs="0" name="BoxSystemDepth" type="s:decimal"/>
                             <s:element minOccurs="0" name="IsInsideBoxSystem" type="s:boolean"/>
-                            <s:element minOccurs="0" name="FrontAttachment" type="s0:String"/>
-                            <s:element minOccurs="0" name="CabinetWidth" type="s0:Numeric"/>
+                            <s:element minOccurs="0" name="FrontAttachment" type="s:string"/>
+                            <s:element minOccurs="0" name="CabinetWidth" type="s:decimal"/>
                             <s:element minOccurs="0" name="IsInteriorCabinetWidth" type="s:boolean"/>
-                            <s:element minOccurs="0" name="CabinetWallThickness" type="s0:Numeric"/>
+                            <s:element minOccurs="0" name="CabinetWallThickness" type="s:decimal"/>
                             <s:element minOccurs="0" name="HasSupportPanelLeft" type="s:boolean"/>
                             <s:element minOccurs="0" name="HasSupportPanelRight" type="s:boolean"/>
-                            <s:element minOccurs="0" name="SupportPanelColour" type="s0:String"/>
-                            <s:element minOccurs="0" name="LoadBearingCapacity" type="s0:Numeric"/>
-                            <s:element minOccurs="0" name="RunnerSystem" type="s0:String"/>
+                            <s:element minOccurs="0" name="SupportPanelColour" type="s:string"/>
+                            <s:element minOccurs="0" name="LoadBearingCapacity" type="s:decimal"/>
+                            <s:element minOccurs="0" name="RunnerSystem" type="s:string"/>
                             <s:element minOccurs="0" name="HasSideStabiliser" type="s:boolean"/>
-                            <s:element minOccurs="0" name="TypeOfPackaging" type="s0:String"/>
+                            <s:element minOccurs="0" name="TypeOfPackaging" type="s:string"/>
                             <s:element minOccurs="0" name="HasCustomMat" type="s:boolean"/>
-                            <s:element minOccurs="0" name="MatMaterial" type="s0:String"/>
-                            <s:element minOccurs="0" name="MatColour" type="s0:String"/>
-                            <s:element minOccurs="0" name="InteriorColour" type="s0:String"/>
-                            <s:element minOccurs="0" name="CoverColour" type="s0:String"/>
-                            <s:element minOccurs="0" name="RunnerType" type="s0:String"/>
+                            <s:element minOccurs="0" name="MatMaterial" type="s:string"/>
+                            <s:element minOccurs="0" name="MatColour" type="s:string"/>
+                            <s:element minOccurs="0" name="InteriorColour" type="s:string"/>
+                            <s:element minOccurs="0" name="CoverColour" type="s:string"/>
+                            <s:element minOccurs="0" name="RunnerType" type="s:string"/>
                             <s:element minOccurs="0" name="DepthAdjustment" type="s:boolean"/>
-                            <s:element minOccurs="0" name="TypeLockingDevice" type="s0:String"/>
+                            <s:element minOccurs="0" name="TypeLockingDevice" type="s:string"/>
                             <s:element minOccurs="0" name="NotRequiredForDelivery" type="s0:NotRequiredForDeliveryTAX"/>
                         </s:sequence>
                     </s:extension>
@@ -211,30 +205,30 @@
                 <s:complexContent>
                     <s:extension base="s0:ProductFeatures">
                         <s:sequence>
-                            <s:element minOccurs="0" name="Application" type="s0:String"/>
-                            <s:element minOccurs="0" name="BoxSystemColour" type="s0:String"/>
-                            <s:element minOccurs="0" name="BaseColour" type="s0:String"/>
-                            <s:element minOccurs="0" name="BuildInHeight" type="s0:String"/>
-                            <s:element minOccurs="0" name="BoxSystemDepth" type="s0:Numeric"/>
+                            <s:element minOccurs="0" name="Application" type="s:string"/>
+                            <s:element minOccurs="0" name="BoxSystemColour" type="s:string"/>
+                            <s:element minOccurs="0" name="BaseColour" type="s:string"/>
+                            <s:element minOccurs="0" name="BuildInHeight" type="s:string"/>
+                            <s:element minOccurs="0" name="BoxSystemDepth" type="s:decimal"/>
                             <s:element minOccurs="0" name="IsInsideBoxSystem" type="s:boolean"/>
-                            <s:element minOccurs="0" name="FrontAttachment" type="s0:String"/>
-                            <s:element minOccurs="0" name="CabinetWidth" type="s0:Numeric"/>
+                            <s:element minOccurs="0" name="FrontAttachment" type="s:string"/>
+                            <s:element minOccurs="0" name="CabinetWidth" type="s:decimal"/>
                             <s:element minOccurs="0" name="IsInteriorCabinetWidth" type="s:boolean"/>
-                            <s:element minOccurs="0" name="CabinetWallThickness" type="s0:Numeric"/>
+                            <s:element minOccurs="0" name="CabinetWallThickness" type="s:decimal"/>
                             <s:element minOccurs="0" name="HasSupportPanelLeft" type="s:boolean"/>
                             <s:element minOccurs="0" name="HasSupportPanelRight" type="s:boolean"/>
-                            <s:element minOccurs="0" name="SupportPanelColour" type="s0:String"/>
-                            <s:element minOccurs="0" name="LoadBearingCapacity" type="s0:Numeric"/>
-                            <s:element minOccurs="0" name="RunnerSystem" type="s0:String"/>
+                            <s:element minOccurs="0" name="SupportPanelColour" type="s:string"/>
+                            <s:element minOccurs="0" name="LoadBearingCapacity" type="s:decimal"/>
+                            <s:element minOccurs="0" name="RunnerSystem" type="s:string"/>
                             <s:element minOccurs="0" name="HasSideStabiliser" type="s:boolean"/>
-                            <s:element minOccurs="0" name="TypeOfPackaging" type="s0:String"/>
+                            <s:element minOccurs="0" name="TypeOfPackaging" type="s:string"/>
                             <s:element minOccurs="0" name="HasCustomMat" type="s:boolean"/>
-                            <s:element minOccurs="0" name="MatMaterial" type="s0:String"/>
-                            <s:element minOccurs="0" name="MatColour" type="s0:String"/>
+                            <s:element minOccurs="0" name="MatMaterial" type="s:string"/>
+                            <s:element minOccurs="0" name="MatColour" type="s:string"/>
                             <s:element minOccurs="0" name="HasCrossDivider" type="s:boolean"/>
                             <s:element minOccurs="0" name="NumberOfCrossDividers">
                                 <s:simpleType>
-                                    <s:restriction base="s0:String">
+                                    <s:restriction base="s:string">
                                         <s:enumeration value="1"/>
                                         <s:enumeration value="2"/>
                                         <s:enumeration value="3"/>
@@ -244,7 +238,7 @@
                             </s:element>
                             <s:element minOccurs="0" name="NumberOfFrontSupports">
                                 <s:simpleType>
-                                    <s:restriction base="s0:String">
+                                    <s:restriction base="s:string">
                                         <s:enumeration value="1"/>
                                         <s:enumeration value="2"/>
                                         <s:enumeration value="3"/>
@@ -253,7 +247,7 @@
                             </s:element>
                             <s:element minOccurs="0" name="InsideBoxSystemFrontHandle">
                                 <s:simpleType>
-                                    <s:restriction base="s0:String">
+                                    <s:restriction base="s:string">
                                         <s:enumeration value="No"/>
                                         <s:enumeration value="Handle"/>
                                         <s:enumeration value="HandleAndLatch"/>
@@ -262,7 +256,7 @@
                             </s:element>
                             <s:element minOccurs="0" name="BoxSystemSideHeight">
                                 <s:simpleType>
-                                    <s:restriction base="s0:String">
+                                    <s:restriction base="s:string">
                                         <s:enumeration value="N"/>
                                         <s:enumeration value="M"/>
                                         <s:enumeration value="K"/>
@@ -271,7 +265,7 @@
                             </s:element>
                             <s:element minOccurs="0" name="SideRaiseType">
                                 <s:simpleType>
-                                    <s:restriction base="s0:String">
+                                    <s:restriction base="s:string">
                                         <s:enumeration value="NoGallery"/>
                                         <s:enumeration value="SimpleGallery"/>
                                         <s:enumeration value="DesignElement"/>
@@ -280,7 +274,7 @@
                             </s:element>
                             <s:element minOccurs="0" name="SideRaiseDesignElementMaterial">
                                 <s:simpleType>
-                                    <s:restriction base="s0:String">
+                                    <s:restriction base="s:string">
                                         <s:enumeration value="GL8"/>
                                         <s:enumeration value="ALU8"/>
                                         <s:enumeration value="CustomerFilling"/>
@@ -289,7 +283,7 @@
                             </s:element>
                             <s:element minOccurs="0" name="SideRaiseDesignElementColour">
                                 <s:simpleType>
-                                    <s:restriction base="s0:String">
+                                    <s:restriction base="s:string">
                                         <s:enumeration value="FZ8"/>
                                         <s:enumeration value="FG8"/>
                                         <s:enumeration value="ALU.MG"/>
@@ -300,29 +294,29 @@
                             </s:element>
                             <s:element minOccurs="0" name="NumberOfCutOuts">
                                 <s:simpleType>
-                                    <s:restriction base="s0:Integer">
+                                    <s:restriction base="s:long">
                                         <s:enumeration value="0"/>
                                         <s:enumeration value="1"/>
                                         <s:enumeration value="2"/>
                                     </s:restriction>
                                 </s:simpleType>
                             </s:element>
-                            <s:element minOccurs="0" name="CutOutDataWidthLeftX" type="s0:String"/>
-                            <s:element minOccurs="0" name="CutOutDataWidthCapZ1" type="s0:String"/>
-                            <s:element minOccurs="0" name="CutOutDataWidthCentreM" type="s0:String"/>
-                            <s:element minOccurs="0" name="CutOutDataWidthCapZ2" type="s0:String"/>
-                            <s:element minOccurs="0" name="CutOutDataWidthRightY" type="s0:String"/>
+                            <s:element minOccurs="0" name="CutOutDataWidthLeftX" type="s:string"/>
+                            <s:element minOccurs="0" name="CutOutDataWidthCapZ1" type="s:string"/>
+                            <s:element minOccurs="0" name="CutOutDataWidthCentreM" type="s:string"/>
+                            <s:element minOccurs="0" name="CutOutDataWidthCapZ2" type="s:string"/>
+                            <s:element minOccurs="0" name="CutOutDataWidthRightY" type="s:string"/>
                             <s:element minOccurs="0" name="CutOutBackMaterial">
                                 <s:simpleType>
-                                    <s:restriction base="s0:String">
+                                    <s:restriction base="s:string">
                                         <s:enumeration value="W"/>
                                         <s:enumeration value="S"/>
                                     </s:restriction>
                                 </s:simpleType>
                             </s:element>
                             <s:element minOccurs="0" name="SinkDrawerBackMaterial">
                                 <s:simpleType>
-                                    <s:restriction base="s0:String">
+                                    <s:restriction base="s:string">
                                         <s:enumeration value="W"/>
                                         <s:enumeration value="S"/>
                                     </s:restriction>
Index: EXT/Unishop/PurchaseOrder001/CreateOrder/LadeEigenschappenTBX.cls.xml
===================================================================
diff -u -r36536 -r37155
--- EXT/Unishop/PurchaseOrder001/CreateOrder/LadeEigenschappenTBX.cls.xml	(.../LadeEigenschappenTBX.cls.xml)	(revision 36536)
+++ EXT/Unishop/PurchaseOrder001/CreateOrder/LadeEigenschappenTBX.cls.xml	(.../LadeEigenschappenTBX.cls.xml)	(revision 37155)
@@ -23,86 +23,86 @@
 </Property>
 
 <Property name="AantalDwarsverdelingen">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="VALUELIST" value=",1,2,3,4"/>
 <Parameter name="XMLNAME" value="NumberOfCrossDividers"/>
 </Property>
 
 <Property name="FrontOndersteuningAantal">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="VALUELIST" value=",1,2,3"/>
 <Parameter name="XMLNAME" value="NumberOfFrontSupports"/>
 </Property>
 
 <Property name="GreepEnMeenemer">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="VALUELIST" value=",No,Handle,HandleAndLatch"/>
 <Parameter name="XMLNAME" value="InsideBoxSystemFrontHandle"/>
 </Property>
 
 <Property name="ZijkantHoogte">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="VALUELIST" value=",N,M,K"/>
 <Parameter name="XMLNAME" value="BoxSystemSideHeight"/>
 </Property>
 
 <Property name="ZijwandVerhogingType">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="VALUELIST" value=",NoGallery,SimpleGallery,DesignElement"/>
 <Parameter name="XMLNAME" value="SideRaiseType"/>
 </Property>
 
 <Property name="ZijwandVerhogingMateriaal">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="VALUELIST" value=",GL8,ALU8,CustomerFilling"/>
 <Parameter name="XMLNAME" value="SideRaiseDesignElementMaterial"/>
 </Property>
 
 <Property name="ZijwandVerhogingKleur">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="VALUELIST" value=",FZ8,FG8,ALU.MG,ALU.SW,ALU.TS"/>
 <Parameter name="XMLNAME" value="SideRaiseDesignElementColour"/>
 </Property>
 
 <Property name="UitsparingDataAantalUitsparingen">
-<Type>TECH.Integer</Type>
+<Type>%Integer</Type>
 <Parameter name="VALUELIST" value=",0,1,2"/>
 <Parameter name="XMLNAME" value="NumberOfCutOuts"/>
 </Property>
 
 <Property name="UitsparingDataBreedteX">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="CutOutDataWidthLeftX"/>
 </Property>
 
 <Property name="UitsparingDataBreedteZ1">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="CutOutDataWidthCapZ1"/>
 </Property>
 
 <Property name="UitsparingDataBreedteM">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="CutOutDataWidthCentreM"/>
 </Property>
 
 <Property name="UitsparingDataBreedteZ2">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="CutOutDataWidthCapZ2"/>
 </Property>
 
 <Property name="UitsparingDataBreedteY">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="XMLNAME" value="CutOutDataWidthRightY"/>
 </Property>
 
 <Property name="TussenrugMateriaal">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="VALUELIST" value=",W,S"/>
 <Parameter name="XMLNAME" value="CutOutBackMaterial"/>
 </Property>
 
 <Property name="RugwandMateriaal">
-<Type>TECH.String</Type>
+<Type>%String</Type>
 <Parameter name="VALUELIST" value=",W,S"/>
 <Parameter name="XMLNAME" value="SinkDrawerBackMaterial"/>
 </Property>