Index: APPS/TRANSP/enu/ToegelatenLandCode.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/enu/ToegelatenLandCode.cls.xml	(revision 0)
+++ APPS/TRANSP/enu/ToegelatenLandCode.cls.xml	(revision 33148)
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.enu.ToegelatenLandCode">
+<ClassType>datatype</ClassType>
+<Super>TECH.Enumeration</Super>
+
+<Parameter name="DISPLAYLIST">
+<Default>;Bulgarije;Cyprus;Denemarken;Duitsland;Estland;Finland;Frankrijk;Griekenland;Hongarije;Ierland;Italië;Kroatië;Letland;Litouwen;Malta;Oostenrijk;Polen;Portugal;Roemenië;Slovenië;Slowakije;Spanje;Tsjechië;Verenigd Koninkrijk;Zweden;Verenigde staten</Default>
+</Parameter>
+
+<Parameter name="VALUELIST">
+<Default>;BG;CY;DK;DE;EE;FI;FR;GR;HU;IE;IT;HR;LV;LT;MT;AT;PL;PT;RO;SI;SK;ES;CZ;UK;SE;US</Default>
+</Parameter>
+
+<Method name="BG">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.enu.ToegelatenLandCode</ReturnType>
+<Implementation><![CDATA[ Quit "BG"
+]]></Implementation>
+</Method>
+
+<Method name="CY">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.enu.ToegelatenLandCode</ReturnType>
+<Implementation><![CDATA[ Quit "CY"
+]]></Implementation>
+</Method>
+
+<Method name="DK">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.enu.ToegelatenLandCode</ReturnType>
+<Implementation><![CDATA[ Quit "DK"
+]]></Implementation>
+</Method>
+
+<Method name="DE">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.enu.ToegelatenLandCode</ReturnType>
+<Implementation><![CDATA[ Quit "DE"
+]]></Implementation>
+</Method>
+
+<Method name="EE">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.enu.ToegelatenLandCode</ReturnType>
+<Implementation><![CDATA[ Quit "EE"
+]]></Implementation>
+</Method>
+
+<Method name="FI">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.enu.ToegelatenLandCode</ReturnType>
+<Implementation><![CDATA[ Quit "FI"
+]]></Implementation>
+</Method>
+
+<Method name="FR">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.enu.ToegelatenLandCode</ReturnType>
+<Implementation><![CDATA[ Quit "FR"
+]]></Implementation>
+</Method>
+
+<Method name="GR">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.enu.ToegelatenLandCode</ReturnType>
+<Implementation><![CDATA[ Quit "GR"
+]]></Implementation>
+</Method>
+
+<Method name="HU">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.enu.ToegelatenLandCode</ReturnType>
+<Implementation><![CDATA[ Quit "HU"
+]]></Implementation>
+</Method>
+
+<Method name="IE">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.enu.ToegelatenLandCode</ReturnType>
+<Implementation><![CDATA[ Quit "IE"
+]]></Implementation>
+</Method>
+
+<Method name="IT">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.enu.ToegelatenLandCode</ReturnType>
+<Implementation><![CDATA[ Quit "IT"
+]]></Implementation>
+</Method>
+
+<Method name="HR">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.enu.ToegelatenLandCode</ReturnType>
+<Implementation><![CDATA[ Quit "BR"
+]]></Implementation>
+</Method>
+
+<Method name="LV">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.enu.ToegelatenLandCode</ReturnType>
+<Implementation><![CDATA[ Quit "LV"
+]]></Implementation>
+</Method>
+
+<Method name="LT">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.enu.ToegelatenLandCode</ReturnType>
+<Implementation><![CDATA[ Quit "LT"
+]]></Implementation>
+</Method>
+
+<Method name="MT">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.enu.ToegelatenLandCode</ReturnType>
+<Implementation><![CDATA[ Quit "MT"
+]]></Implementation>
+</Method>
+
+<Method name="AT">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.enu.ToegelatenLandCode</ReturnType>
+<Implementation><![CDATA[ Quit "AT"
+]]></Implementation>
+</Method>
+
+<Method name="PL">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.enu.ToegelatenLandCode</ReturnType>
+<Implementation><![CDATA[ Quit "PL"
+]]></Implementation>
+</Method>
+
+<Method name="PT">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.enu.ToegelatenLandCode</ReturnType>
+<Implementation><![CDATA[ Quit "PT"
+]]></Implementation>
+</Method>
+
+<Method name="RO">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.enu.ToegelatenLandCode</ReturnType>
+<Implementation><![CDATA[ Quit "RO"
+]]></Implementation>
+</Method>
+
+<Method name="SI">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.enu.ToegelatenLandCode</ReturnType>
+<Implementation><![CDATA[ Quit "SI"
+]]></Implementation>
+</Method>
+
+<Method name="SK">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.enu.ToegelatenLandCode</ReturnType>
+<Implementation><![CDATA[ Quit "SK"
+]]></Implementation>
+</Method>
+
+<Method name="ES">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.enu.ToegelatenLandCode</ReturnType>
+<Implementation><![CDATA[ Quit "ES"
+]]></Implementation>
+</Method>
+
+<Method name="CZ">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.enu.ToegelatenLandCode</ReturnType>
+<Implementation><![CDATA[ Quit "CZ"
+]]></Implementation>
+</Method>
+
+<Method name="UK">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.enu.ToegelatenLandCode</ReturnType>
+<Implementation><![CDATA[ Quit "UK"
+]]></Implementation>
+</Method>
+
+<Method name="SE">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.enu.ToegelatenLandCode</ReturnType>
+<Implementation><![CDATA[ Quit "SE"
+]]></Implementation>
+</Method>
+
+<Method name="US">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.enu.ToegelatenLandCode</ReturnType>
+<Implementation><![CDATA[ Quit "US"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/UPS/impl/BerekenInputValidator.cls.xml
===================================================================
diff -u -r33140 -r33148
--- APPS/TRANSP/UPS/impl/BerekenInputValidator.cls.xml	(.../BerekenInputValidator.cls.xml)	(revision 33140)
+++ APPS/TRANSP/UPS/impl/BerekenInputValidator.cls.xml	(.../BerekenInputValidator.cls.xml)	(revision 33148)
@@ -91,6 +91,12 @@
 	{
 		Do ..RegistreerFoutmelding("Er is geen landcode meegegeven.", "LandCode",LeverAdres.LandCode)
 	}
+	
+	try {
+		Do ##class(APPS.TRANSP.enu.ToegelatenLandCode).Validate(LeverAdres.LandCode) 
+	} catch {
+		Do ..RegistreerFoutmelding("Dit is geen geldige landcode.", "LandCode",LeverAdres.LandCode)
+	}
 
 	If (LeverAdres.Postcode = "") 
 	{
Index: APPS/TRANSP/enu/ToegelatenLandCode/AutoComplete.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/enu/ToegelatenLandCode/AutoComplete.cls.xml	(revision 0)
+++ APPS/TRANSP/enu/ToegelatenLandCode/AutoComplete.cls.xml	(revision 33148)
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.enu.ToegelatenLandCode.AutoComplete">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de Enumeratie - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+De enumeratie Eigenschapn moeten als type de enumeratieklasse zelf terug geven. De enumeratieklasse moet afleiden van TECH.Enumeration</Description>
+<ClassType>serial</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%SerialObject</Super>
+
+<Property name="AT">
+<Type>APPS.TRANSP.enu.ToegelatenLandCode</Type>
+<InitialExpression>"AT"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="BG">
+<Type>APPS.TRANSP.enu.ToegelatenLandCode</Type>
+<InitialExpression>"BG"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="CY">
+<Type>APPS.TRANSP.enu.ToegelatenLandCode</Type>
+<InitialExpression>"CY"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="CZ">
+<Type>APPS.TRANSP.enu.ToegelatenLandCode</Type>
+<InitialExpression>"CZ"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="DE">
+<Type>APPS.TRANSP.enu.ToegelatenLandCode</Type>
+<InitialExpression>"DE"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="DK">
+<Type>APPS.TRANSP.enu.ToegelatenLandCode</Type>
+<InitialExpression>"DK"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="EE">
+<Type>APPS.TRANSP.enu.ToegelatenLandCode</Type>
+<InitialExpression>"EE"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="ES">
+<Type>APPS.TRANSP.enu.ToegelatenLandCode</Type>
+<InitialExpression>"ES"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="FI">
+<Type>APPS.TRANSP.enu.ToegelatenLandCode</Type>
+<InitialExpression>"FI"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="FR">
+<Type>APPS.TRANSP.enu.ToegelatenLandCode</Type>
+<InitialExpression>"FR"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="GR">
+<Type>APPS.TRANSP.enu.ToegelatenLandCode</Type>
+<InitialExpression>"GR"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="HR">
+<Type>APPS.TRANSP.enu.ToegelatenLandCode</Type>
+<InitialExpression>"BR"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="HU">
+<Type>APPS.TRANSP.enu.ToegelatenLandCode</Type>
+<InitialExpression>"HU"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="IE">
+<Type>APPS.TRANSP.enu.ToegelatenLandCode</Type>
+<InitialExpression>"IE"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="IT">
+<Type>APPS.TRANSP.enu.ToegelatenLandCode</Type>
+<InitialExpression>"IT"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="LT">
+<Type>APPS.TRANSP.enu.ToegelatenLandCode</Type>
+<InitialExpression>"LT"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="LV">
+<Type>APPS.TRANSP.enu.ToegelatenLandCode</Type>
+<InitialExpression>"LV"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="MT">
+<Type>APPS.TRANSP.enu.ToegelatenLandCode</Type>
+<InitialExpression>"MT"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="PL">
+<Type>APPS.TRANSP.enu.ToegelatenLandCode</Type>
+<InitialExpression>"PL"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="PT">
+<Type>APPS.TRANSP.enu.ToegelatenLandCode</Type>
+<InitialExpression>"PT"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="RO">
+<Type>APPS.TRANSP.enu.ToegelatenLandCode</Type>
+<InitialExpression>"RO"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="SE">
+<Type>APPS.TRANSP.enu.ToegelatenLandCode</Type>
+<InitialExpression>"SE"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="SI">
+<Type>APPS.TRANSP.enu.ToegelatenLandCode</Type>
+<InitialExpression>"SI"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="SK">
+<Type>APPS.TRANSP.enu.ToegelatenLandCode</Type>
+<InitialExpression>"SK"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="UK">
+<Type>APPS.TRANSP.enu.ToegelatenLandCode</Type>
+<InitialExpression>"UK"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="US">
+<Type>APPS.TRANSP.enu.ToegelatenLandCode</Type>
+<InitialExpression>"US"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/enu/ToegelatenLandCode/Verwerker.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/enu/ToegelatenLandCode/Verwerker.cls.xml	(revision 0)
+++ APPS/TRANSP/enu/ToegelatenLandCode/Verwerker.cls.xml	(revision 33148)
@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.enu.ToegelatenLandCode.Verwerker">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de Enumeratie - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+De enumeratie methoden moeten als type de enumeratieklasse zelf terug geven. De enumeratieklasse moet afleiden van TECH.Enumeration</Description>
+<Abstract>1</Abstract>
+<ProcedureBlock>1</ProcedureBlock>
+
+<Method name="Verwerk">
+<Final>1</Final>
+<FormalSpec>ToegelatenLandCode:APPS.TRANSP.enu.ToegelatenLandCode</FormalSpec>
+<Implementation><![CDATA[
+	If ToegelatenLandCode = "AT" {
+		Do ..VerwerkAT()
+	} ElseIf ToegelatenLandCode = "BG" {
+		Do ..VerwerkBG()
+	} ElseIf ToegelatenLandCode = "CY" {
+		Do ..VerwerkCY()
+	} ElseIf ToegelatenLandCode = "CZ" {
+		Do ..VerwerkCZ()
+	} ElseIf ToegelatenLandCode = "DE" {
+		Do ..VerwerkDE()
+	} ElseIf ToegelatenLandCode = "DK" {
+		Do ..VerwerkDK()
+	} ElseIf ToegelatenLandCode = "EE" {
+		Do ..VerwerkEE()
+	} ElseIf ToegelatenLandCode = "ES" {
+		Do ..VerwerkES()
+	} ElseIf ToegelatenLandCode = "FI" {
+		Do ..VerwerkFI()
+	} ElseIf ToegelatenLandCode = "FR" {
+		Do ..VerwerkFR()
+	} ElseIf ToegelatenLandCode = "GR" {
+		Do ..VerwerkGR()
+	} ElseIf ToegelatenLandCode = "BR" {
+		Do ..VerwerkHR()
+	} ElseIf ToegelatenLandCode = "HU" {
+		Do ..VerwerkHU()
+	} ElseIf ToegelatenLandCode = "IE" {
+		Do ..VerwerkIE()
+	} ElseIf ToegelatenLandCode = "IT" {
+		Do ..VerwerkIT()
+	} ElseIf ToegelatenLandCode = "LT" {
+		Do ..VerwerkLT()
+	} ElseIf ToegelatenLandCode = "LV" {
+		Do ..VerwerkLV()
+	} ElseIf ToegelatenLandCode = "MT" {
+		Do ..VerwerkMT()
+	} ElseIf ToegelatenLandCode = "PL" {
+		Do ..VerwerkPL()
+	} ElseIf ToegelatenLandCode = "PT" {
+		Do ..VerwerkPT()
+	} ElseIf ToegelatenLandCode = "RO" {
+		Do ..VerwerkRO()
+	} ElseIf ToegelatenLandCode = "SE" {
+		Do ..VerwerkSE()
+	} ElseIf ToegelatenLandCode = "SI" {
+		Do ..VerwerkSI()
+	} ElseIf ToegelatenLandCode = "SK" {
+		Do ..VerwerkSK()
+	} ElseIf ToegelatenLandCode = "UK" {
+		Do ..VerwerkUK()
+	} ElseIf ToegelatenLandCode = "US" {
+		Do ..VerwerkUS()
+	} Else {
+		Set Exceptie = ##class(TECH.Exceptions.EnumerationException).%New(ToegelatenLandCode,"APPS.TRANSP.enu.ToegelatenLandCode",$classname())
+		Do ##class(TECH.ExceptionHandler).Throw(Exceptie)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkAT">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkBG">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkCY">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkCZ">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkDE">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkDK">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkEE">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkES">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkFI">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkFR">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkGR">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkHR">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkHU">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkIE">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkIT">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkLT">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkLV">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkMT">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkPL">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkPT">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkRO">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkSE">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkSI">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkSK">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkUK">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkUS">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/TRANSP/UPS/impl/OfferteBerekenaar/BerekenInputValidator/Test.cls.xml
===================================================================
diff -u -r33055 -r33148
--- vhUnitTest/APPS/TRANSP/UPS/impl/OfferteBerekenaar/BerekenInputValidator/Test.cls.xml	(.../Test.cls.xml)	(revision 33055)
+++ vhUnitTest/APPS/TRANSP/UPS/impl/OfferteBerekenaar/BerekenInputValidator/Test.cls.xml	(.../Test.cls.xml)	(revision 33148)
@@ -22,14 +22,59 @@
 <Method name="Test: UPS BerekenInput Valideerder - Adressen ">
 <Implementation><![CDATA[
 	#dim BerekenInputValideerder As APPS.TRANSP.UPS.impl.BerekenInputValidator = ##class(APPS.TRANSP.UPS.impl.BerekenInputValidator).%New()
-	Do BerekenInputValideerder.Valideer(..GeefBerekeningInputSintNiklaas())
+	Do BerekenInputValideerder.Valideer(..GeefBerekeningInputGeldigAdres())
 	Do BerekenInputValideerder.Valideer(..GeefBerekeningInputCapanago())
 	Do BerekenInputValideerder.Valideer(..GeefBerekeningInputStanley())
 
 	Do $$$AssertTrue(1)
 ]]></Implementation>
 </Method>
 
+<Method name="Test: UPS BerekenInput Valideerder - Belgisch adres (niet toegelaten) ">
+<Implementation><![CDATA[
+	#dim BerekenInputValideerder As APPS.TRANSP.UPS.impl.BerekenInputValidator = ##class(APPS.TRANSP.UPS.impl.BerekenInputValidator).%New()
+
+	try{
+		Do BerekenInputValideerder.Valideer(..GeefBerekeningInputBelgischAdres())
+		Do $$$AssertFalse(1)
+	} catch {
+		#dim Exceptie As TECH.Exceptions.TemplateBaseException = ##class(TECH.ExceptionHandler).Catch()
+		Do $$$AssertEquals(Exceptie.GeefExceptionCode(),##class(TECH.enu.ExceptionCode).InvalidInput())
+		Do $$$AssertEquals(Exceptie.ToString(), "Dit is geen geldige landcode.\LandCode\BE")
+	}
+]]></Implementation>
+</Method>
+
+<Method name="Test: UPS BerekenInput Valideerder - Nederlands adres (niet toegelaten) ">
+<Implementation><![CDATA[
+	#dim BerekenInputValideerder As APPS.TRANSP.UPS.impl.BerekenInputValidator = ##class(APPS.TRANSP.UPS.impl.BerekenInputValidator).%New()
+
+	try{
+		Do BerekenInputValideerder.Valideer(..GeefBerekeningInputNederlandsAdres())
+		Do $$$AssertFalse(1)
+	} catch {
+		#dim Exceptie As TECH.Exceptions.TemplateBaseException = ##class(TECH.ExceptionHandler).Catch()
+		Do $$$AssertEquals(Exceptie.GeefExceptionCode(),##class(TECH.enu.ExceptionCode).InvalidInput())
+		Do $$$AssertEquals(Exceptie.ToString(), "Dit is geen geldige landcode.\LandCode\NL")
+	}
+]]></Implementation>
+</Method>
+
+<Method name="Test: UPS BerekenInput Valideerder - Luxemburgs adres (niet toegelaten) ">
+<Implementation><![CDATA[
+	#dim BerekenInputValideerder As APPS.TRANSP.UPS.impl.BerekenInputValidator = ##class(APPS.TRANSP.UPS.impl.BerekenInputValidator).%New()
+
+	try{
+		Do BerekenInputValideerder.Valideer(..GeefBerekeningInputLuxemburgsAdres())
+		Do $$$AssertFalse(1)
+	} catch {
+		#dim Exceptie As TECH.Exceptions.TemplateBaseException = ##class(TECH.ExceptionHandler).Catch()
+		Do $$$AssertEquals(Exceptie.GeefExceptionCode(),##class(TECH.enu.ExceptionCode).InvalidInput())
+		Do $$$AssertEquals(Exceptie.ToString(), "Dit is geen geldige landcode.\LandCode\LU")
+	}
+]]></Implementation>
+</Method>
+
 <Method name="Test: UPS BerekenInput Valideerder - Foutief adres (Woonplaats leeg) ">
 <Implementation><![CDATA[
 	#dim BerekenInputValideerder As APPS.TRANSP.UPS.impl.BerekenInputValidator = ##class(APPS.TRANSP.UPS.impl.BerekenInputValidator).%New()
@@ -249,19 +294,58 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefBerekeningInputSintNiklaas">
+<Method name="GeefBerekeningInputGeldigAdres">
 <Private>1</Private>
 <ReturnType>APPS.TRANSP.OfferteService.dto.BerekenInput</ReturnType>
 <Implementation><![CDATA[
 	Set LeverAdres = ##class(APPS.TRANSP.dto.InternationaalAdres).%New()
 	Set LeverAdres.ProvincieCode = ""
+	Set LeverAdres.LandCode = "DE"
+	Set LeverAdres.Postcode = "57462"
+	Set LeverAdres.Woonplaats = "Olpe"
+	Quit ..GeefBerekenInput(LeverAdres)
+]]></Implementation>
+</Method>
+
+<Method name="GeefBerekeningInputBelgischAdres">
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.OfferteService.dto.BerekenInput</ReturnType>
+<Implementation><![CDATA[
+	Set LeverAdres = ##class(APPS.TRANSP.dto.InternationaalAdres).%New()
+	Set LeverAdres.ProvincieCode = ""
 	Set LeverAdres.LandCode = "BE"
-	Set LeverAdres.Postcode = "9100"
-	Set LeverAdres.Woonplaats = "Sint-Niklaas"
+	Set LeverAdres.Postcode = "9000"
+	Set LeverAdres.Woonplaats = "Gent"
 	Quit ..GeefBerekenInput(LeverAdres)
 ]]></Implementation>
 </Method>
 
+<Method name="GeefBerekeningInputNederlandsAdres">
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.OfferteService.dto.BerekenInput</ReturnType>
+<Implementation><![CDATA[
+	Set LeverAdres = ##class(APPS.TRANSP.dto.InternationaalAdres).%New()
+	Set LeverAdres.ProvincieCode = ""
+	Set LeverAdres.LandCode = "NL"
+	Set LeverAdres.Postcode = "9761"
+	Set LeverAdres.Woonplaats = "Eelde"
+	Quit ..GeefBerekenInput(LeverAdres)
+]]></Implementation>
+</Method>
+
+<Method name="GeefBerekeningInputLuxemburgsAdres">
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.OfferteService.dto.BerekenInput</ReturnType>
+<Implementation><![CDATA[
+	Set LeverAdres = ##class(APPS.TRANSP.dto.InternationaalAdres).%New()
+	Set LeverAdres.ProvincieCode = ""
+	Set LeverAdres.LandCode = "LU"
+	Set LeverAdres.Postcode = "6562"
+	Set LeverAdres.Woonplaats = "Berdorf"
+	Quit ..GeefBerekenInput(LeverAdres)
+]]></Implementation>
+</Method>
+
 <Method name="GeefBerekeningInputCapanago">
 <Private>1</Private>
 <ReturnType>APPS.TRANSP.OfferteService.dto.BerekenInput</ReturnType>
@@ -301,9 +385,9 @@
 	Set BerekenInput.GewensteLeverDatum = GewensteLeverDatum
 	Set BerekenInput.LeverAdres = ##class(APPS.TRANSP.dto.InternationaalAdres).%New()
 	Set BerekenInput.LeverAdres.ProvincieCode = ""
-	Set BerekenInput.LeverAdres.LandCode = "BE"
-	Set BerekenInput.LeverAdres.Postcode = "9100"
-	Set BerekenInput.LeverAdres.Woonplaats = "Sint-Niklaas"
+	Set BerekenInput.LeverAdres.LandCode = "DE"
+	Set BerekenInput.LeverAdres.Postcode = "57462"
+	Set BerekenInput.LeverAdres.Woonplaats = "Olpe"
 	
 	Do ..VoegDetailLijnenToe(BerekenInput)
 	
@@ -338,9 +422,9 @@
 	Set BerekenInput.GewensteLeverDatum = ..GeefGeldigeDatum()
 	Set BerekenInput.LeverAdres = ##class(APPS.TRANSP.dto.InternationaalAdres).%New()
 	Set BerekenInput.LeverAdres.ProvincieCode = ""
-	Set BerekenInput.LeverAdres.LandCode = "BE"
-	Set BerekenInput.LeverAdres.Postcode = "9100"
-	Set BerekenInput.LeverAdres.Woonplaats = "Sint-Niklaas"
+	Set BerekenInput.LeverAdres.LandCode = "DE"
+	Set BerekenInput.LeverAdres.Postcode = "57462"
+	Set BerekenInput.LeverAdres.Woonplaats = "Olpe"
 	
 	Do BerekenInput.TeVerzendenItems.Clear()