Index: vhUnitTest/WSimpl/Unishop/BeschikbareLandenBepaler/Bepaal/Test.cls.xml
===================================================================
diff -u -r36760 -r36775
--- vhUnitTest/WSimpl/Unishop/BeschikbareLandenBepaler/Bepaal/Test.cls.xml	(.../Test.cls.xml)	(revision 36760)
+++ vhUnitTest/WSimpl/Unishop/BeschikbareLandenBepaler/Bepaal/Test.cls.xml	(.../Test.cls.xml)	(revision 36775)
@@ -11,7 +11,7 @@
 	#Dim VertaalAPIStub As vhTest.Mock.DOM.common.Transl.VertaalAPI = ##class(vhTest.Mock.DOM.common.Transl.VertaalAPI).%New()
 	Do VertaalAPIStub.IndienMethodCall("GeefVertaler",$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde).DanReturn(VertalerStub)
 	
-	#Dim NietBeneluxLandenMock As vhTest.Mock.APPS.TRANSP.Common.NietBeneluxLanden = ##class(vhTest.Mock.APPS.TRANSP.Common.NietBeneluxLanden).%New()
+	#Dim NietBeneluxLandenMock As vhTest.Mock.APPS.TRANSP.OfferteService.data.BeschikbareLanden = ##class(vhTest.Mock.APPS.TRANSP.OfferteService.data.BeschikbareLanden).%New()
 	Do NietBeneluxLandenMock.VerwachtMethodCall("GeefBeschikbareLandCodes").DanReturn(##class(TECH.ListbuildIterator).%New($ListBuild("BG","SE")))
 	
 	#Dim BeschikbareLandenBepaler As WSimpl.Unishop.BeschikbareLandenBepaler = ##class(WSimpl.Unishop.BeschikbareLandenBepaler).%New(NietBeneluxLandenMock, VertaalAPIStub)
@@ -29,7 +29,7 @@
 	#Dim VertaalAPIMock As vhTest.Mock.DOM.common.Transl.VertaalAPI = ##class(vhTest.Mock.DOM.common.Transl.VertaalAPI).%New()
 	Do VertaalAPIMock.VerwachtMethodCall("GeefVertaler","DummyTaal","Unishop","ALG","LAND").DanReturn(VertalerStub)
 	
-	#Dim NietBeneluxLandenStub As vhTest.Mock.APPS.TRANSP.Common.NietBeneluxLanden = ##class(vhTest.Mock.APPS.TRANSP.Common.NietBeneluxLanden).%New()
+	#Dim NietBeneluxLandenStub As vhTest.Mock.APPS.TRANSP.OfferteService.data.BeschikbareLanden = ##class(vhTest.Mock.APPS.TRANSP.OfferteService.data.BeschikbareLanden).%New()
 	Do NietBeneluxLandenStub.IndienMethodCall("GeefBeschikbareLandCodes").DanReturn(##class(TECH.ListbuildIterator).%New($ListBuild("BG","SE")))
 	
 	#Dim BeschikbareLandenBepaler As WSimpl.Unishop.BeschikbareLandenBepaler = ##class(WSimpl.Unishop.BeschikbareLandenBepaler).%New(NietBeneluxLandenStub, VertaalAPIMock)
@@ -47,7 +47,7 @@
 	#Dim VertaalAPIStub As vhTest.Mock.DOM.common.Transl.VertaalAPI = ##class(vhTest.Mock.DOM.common.Transl.VertaalAPI).%New()
 	Do VertaalAPIStub.IndienMethodCall("GeefVertaler",$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde).DanReturn(VertalerStub)
 	
-	#Dim NietBeneluxLandenStub As vhTest.Mock.APPS.TRANSP.Common.NietBeneluxLanden = ##class(vhTest.Mock.APPS.TRANSP.Common.NietBeneluxLanden).%New()
+	#Dim NietBeneluxLandenStub As vhTest.Mock.APPS.TRANSP.OfferteService.data.BeschikbareLanden = ##class(vhTest.Mock.APPS.TRANSP.OfferteService.data.BeschikbareLanden).%New()
 	Do NietBeneluxLandenStub.IndienMethodCall("GeefBeschikbareLandCodes").DanReturn(##class(TECH.ListbuildIterator).%New($ListBuild("BG")))
 
 	#Dim BeschikbareLandenList As WS.EC.ExterneVerkoop.dto.Landen = ##class(WS.EC.ExterneVerkoop.dto.Landen).%New()
@@ -72,7 +72,7 @@
 	#Dim VertaalAPIStub As vhTest.Mock.DOM.common.Transl.VertaalAPI = ##class(vhTest.Mock.DOM.common.Transl.VertaalAPI).%New()
 	Do VertaalAPIStub.IndienMethodCall("GeefVertaler",$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde).DanReturn(VertalerStub)
 	
-	#Dim NietBeneluxLandenStub As vhTest.Mock.APPS.TRANSP.Common.NietBeneluxLanden = ##class(vhTest.Mock.APPS.TRANSP.Common.NietBeneluxLanden).%New()
+	#Dim NietBeneluxLandenStub As vhTest.Mock.APPS.TRANSP.OfferteService.data.BeschikbareLanden = ##class(vhTest.Mock.APPS.TRANSP.OfferteService.data.BeschikbareLanden).%New()
 	Do NietBeneluxLandenStub.IndienMethodCall("GeefBeschikbareLandCodes").DanReturn(##class(TECH.ListbuildIterator).%New($ListBuild("BG")))
 	
 	#Dim BeschikbareLandenBepaler As WSimpl.Unishop.BeschikbareLandenBepaler = ##class(WSimpl.Unishop.BeschikbareLandenBepaler).%New(NietBeneluxLandenStub, VertaalAPIStub)
Index: WSimpl/Unishop/BeschikbareLandenBepaler.cls.xml
===================================================================
diff -u -r36760 -r36775
--- WSimpl/Unishop/BeschikbareLandenBepaler.cls.xml	(.../BeschikbareLandenBepaler.cls.xml)	(revision 36760)
+++ WSimpl/Unishop/BeschikbareLandenBepaler.cls.xml	(.../BeschikbareLandenBepaler.cls.xml)	(revision 36775)
@@ -14,7 +14,7 @@
 </Property>
 
 <Property name="NietBeneluxLanden">
-<Type>APPS.TRANSP.Common.NietBeneluxLanden</Type>
+<Type>APPS.TRANSP.OfferteService.data.BeschikbareLanden</Type>
 <Private>1</Private>
 </Property>
 
@@ -29,13 +29,13 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>NietBeneluxLanden:APPS.TRANSP.Common.NietBeneluxLanden,VertaalAPI:DOM.common.Transl.VertaalAPI,Sorter:WSimpl.Unishop.BeschikbareLandenSort</FormalSpec>
+<FormalSpec>NietBeneluxLanden:APPS.TRANSP.OfferteService.data.BeschikbareLanden,VertaalAPI:DOM.common.Transl.VertaalAPI,Sorter:WSimpl.Unishop.BeschikbareLandenSort</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..NietBeneluxLanden = $$$Inject(NietBeneluxLanden,##class(APPS.TRANSP.Common.NietBeneluxLanden).%New())
+	Set ..NietBeneluxLanden = $$$Inject(NietBeneluxLanden,##class(APPS.TRANSP.OfferteService.data.BeschikbareLanden).%New())
 	Set ..VertaalAPI = $$$Inject(VertaalAPI,##class(DOM.DomeinContext).Instance().GeefVertaalAPI())
 	Set ..Sorter = $$$Inject(Sorter,##class(WSimpl.Unishop.BeschikbareLandenSort).%New())
 	Set ..Comparator = ##class(WSimpl.Unishop.BeschikbareLandenComparator).%New()
Index: APPS/TRANSP/Offerte/impl/DHL/TransportduurImporter.cls.xml
===================================================================
diff -u -r36744 -r36775
--- APPS/TRANSP/Offerte/impl/DHL/TransportduurImporter.cls.xml	(.../TransportduurImporter.cls.xml)	(revision 36744)
+++ APPS/TRANSP/Offerte/impl/DHL/TransportduurImporter.cls.xml	(.../TransportduurImporter.cls.xml)	(revision 36775)
@@ -92,7 +92,7 @@
 <Method name="ImportFiles">
 <FormalSpec>Path:%String</FormalSpec>
 <Implementation><![CDATA[
-	#dim LandCodes As TECH.Iterator = ##class(APPS.TRANSP.Common.NietBeneluxLanden).%New().GeefBeschikbareLandCodes()
+	#dim LandCodes As TECH.Iterator = ##class(APPS.TRANSP.OfferteService.data.BeschikbareLanden).%New().GeefBeschikbareLandCodes()
 	while LandCodes.HasNext()
 	{
 		#dim LandCode As %String = LandCodes.Next()
Index: vhTest/Fake/APPS/TRANSP/OfferteService/data/BeschikbareLanden.cls.xml
===================================================================
diff -u
--- vhTest/Fake/APPS/TRANSP/OfferteService/data/BeschikbareLanden.cls.xml	(revision 0)
+++ vhTest/Fake/APPS/TRANSP/OfferteService/data/BeschikbareLanden.cls.xml	(revision 36775)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.APPS.TRANSP.OfferteService.data.BeschikbareLanden">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.TRANSP.OfferteService.data.BeschikbareLanden</Super>
+
+<Method name="GeefBeschikbareLandCodes">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhConsistency/Checks/Unishop/LandVertalingControle.cls.xml
===================================================================
diff -u -r36744 -r36775
--- vhConsistency/Checks/Unishop/LandVertalingControle.cls.xml	(.../LandVertalingControle.cls.xml)	(revision 36744)
+++ vhConsistency/Checks/Unishop/LandVertalingControle.cls.xml	(.../LandVertalingControle.cls.xml)	(revision 36775)
@@ -6,7 +6,7 @@
 <Method name="VoerUit">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	#Dim LandIterator As TECH.ListbuildIterator = ##class(APPS.TRANSP.Common.NietBeneluxLanden).%New().GeefBeschikbareLandCodes()
+	#Dim LandIterator As TECH.ListbuildIterator = ##class(APPS.TRANSP.OfferteService.data.BeschikbareLanden).%New().GeefBeschikbareLandCodes()
 	#Dim ExportTalenIterator As TECH.ListIterator = ##class(WSimpl.Unishop.enu.Taal).ValueListIterator()
 	While LandIterator.HasNext()
 	{
Index: vhTest/Mock/APPS/TRANSP/OfferteService/data/BeschikbareLanden.cls.xml
===================================================================
diff -u
--- vhTest/Mock/APPS/TRANSP/OfferteService/data/BeschikbareLanden.cls.xml	(revision 0)
+++ vhTest/Mock/APPS/TRANSP/OfferteService/data/BeschikbareLanden.cls.xml	(revision 36775)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.APPS.TRANSP.OfferteService.data.BeschikbareLanden">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.TRANSP.OfferteService.data.BeschikbareLanden,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="GeefBeschikbareLandCodes">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefBeschikbareLandCodes")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/OfferteService/data/NietBeneluxLanden.cls.xml
===================================================================
diff -u -r36744 -r36775
--- APPS/TRANSP/OfferteService/data/NietBeneluxLanden.cls.xml	(.../Common/NietBeneluxLanden.cls.xml)	(revision 36744)
+++ APPS/TRANSP/OfferteService/data/NietBeneluxLanden.cls.xml	(.../OfferteService/data/BeschikbareLanden.cls.xml)	(revision 36775)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
-<Class name="APPS.TRANSP.Common.NietBeneluxLanden">
+<Class name="APPS.TRANSP.OfferteService.data.BeschikbareLanden">
 <Super>TECH.Mockable</Super>
 
 <Method name="GeefBeschikbareLandCodes">
Index: vhTest/WS/EC/Unishop/InternationaleZending/DummyService.cls.xml
===================================================================
diff -u -r36744 -r36775
--- vhTest/WS/EC/Unishop/InternationaleZending/DummyService.cls.xml	(.../DummyService.cls.xml)	(revision 36744)
+++ vhTest/WS/EC/Unishop/InternationaleZending/DummyService.cls.xml	(.../DummyService.cls.xml)	(revision 36775)
@@ -39,7 +39,7 @@
 <Implementation><![CDATA[
 	Do ..ZetVertaler(Taal)
 	#dim EuropeseLanden As WS.EC.ExterneVerkoop.dto.Landen = ##class(WS.EC.ExterneVerkoop.dto.Landen).%New()
-	#dim BeschikbareLandCodes As TECH.Iterator = ##class(APPS.TRANSP.Common.NietBeneluxLanden).%New().GeefBeschikbareLandCodes()
+	#dim BeschikbareLandCodes As TECH.Iterator = ##class(APPS.TRANSP.OfferteService.data.BeschikbareLanden).%New().GeefBeschikbareLandCodes()
 	
 	While BeschikbareLandCodes.HasNext()
 	{	
FishEye: Tag 36775 refers to a dead (removed) revision in file `APPS/TRANSP/Common/NietBeneluxLanden.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 36775 refers to a dead (removed) revision in file `vhTest/Mock/APPS/TRANSP/Common/NietBeneluxLanden.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 36775 refers to a dead (removed) revision in file `vhTest/Fake/APPS/TRANSP/Common/NietBeneluxLanden.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?