FishEye: Tag 50940 refers to a dead (removed) revision in file `vhTest/Mock/APPS/EC/Verkoop/OfferteVoorBestellingValidator.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: vhUnitTest/APPS/EC/impl/ExterneVerkoopService/OfferteBesteller/Test.cls.xml
===================================================================
diff -u -r45377 -r50940
--- vhUnitTest/APPS/EC/impl/ExterneVerkoopService/OfferteBesteller/Test.cls.xml	(.../Test.cls.xml)	(revision 45377)
+++ vhUnitTest/APPS/EC/impl/ExterneVerkoopService/OfferteBesteller/Test.cls.xml	(.../Test.cls.xml)	(revision 50940)
@@ -20,13 +20,13 @@
 	Do OfferteServiceMock.IndienMethodCall("GeefOfferte", $$$ElkeWaarde).DanReturn(OfferteMock)
 	Do OfferteServiceMock.IndienMethodCall("GeefBestelStatusUpdater").DanReturn("")
 	
-	Set OfferteVoorBestellingValidatorMock = ##class(vhTest.Mock.APPS.EC.Verkoop.OfferteVoorBestellingValidator).%New()
-	Do OfferteVoorBestellingValidatorMock.IndienMethodCall("Valideer", $$$ElkeWaarde, $$$ElkeWaarde, $$$ElkeWaarde).DanException($$$DummyException)
+	#dim OfferteVoorBestellingValidatorStub As vhTest.Mock.APPS.EC.Verkoop.impl.OfferteVoorBestellingValidator = ##class(vhTest.Mock.APPS.EC.Verkoop.impl.OfferteVoorBestellingValidator).%New()
+	Do OfferteVoorBestellingValidatorStub.IndienMethodCall("Valideer", $$$ElkeWaarde, $$$ElkeWaarde, $$$ElkeWaarde).DanException($$$DummyException)
 	
 	#dim Substrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("DummyException")
 	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException",Substrings))
 
-	Set OfferteBesteller = ##class(APPS.EC.impl.ExterneVerkoopService.OfferteBesteller).%New(OfferteServiceMock,"",OfferteVoorBestellingValidatorMock)
+	Set OfferteBesteller = ##class(APPS.EC.impl.ExterneVerkoopService.OfferteBesteller).%New(OfferteServiceMock, "", OfferteVoorBestellingValidatorStub)
 	Do OfferteBesteller.BestelOfferte("DummyOfferteID","DummyKlantID", "DummyPersonalityID")
 ]]></Implementation>
 </Method>
@@ -41,16 +41,16 @@
 	Do OfferteServiceMock.IndienMethodCall("GeefOfferte", $$$ElkeWaarde).DanReturn(OfferteMock)
 	Do OfferteServiceMock.IndienMethodCall("GeefBestelStatusUpdater").DanReturn("")
 	
-	Set OfferteVoorBestellingValidatorMock = ##class(vhTest.Mock.APPS.EC.Verkoop.OfferteVoorBestellingValidator).%New()
-	Do OfferteVoorBestellingValidatorMock.IndienMethodCall("Valideer", $$$ElkeWaarde, $$$ElkeWaarde, $$$ElkeWaarde).DanException(##class(APPS.VKP.Offerte.impl.OfferteNietMeerGeldigException).%ClassName(1))
+	#dim OfferteVoorBestellingValidatorStub As vhTest.Mock.APPS.EC.Verkoop.impl.OfferteVoorBestellingValidator = ##class(vhTest.Mock.APPS.EC.Verkoop.impl.OfferteVoorBestellingValidator).%New()
+	Do OfferteVoorBestellingValidatorStub.IndienMethodCall("Valideer", $$$ElkeWaarde, $$$ElkeWaarde, $$$ElkeWaarde).DanException(##class(APPS.VKP.Offerte.impl.OfferteNietMeerGeldigException).%ClassName(1))
 	
 	Set WinkelkarControleurMock = ##class(vhTest.Mock.APPS.EC.Winkelkar.WinkelkarControleur).%New()
 	Do WinkelkarControleurMock.IndienMethodCall("ControleerWinkelkarViaID","DummyWinkelkarID").DanDoeNiks()
 	
 	Set BestelStatusUpdaterMock = ##class(vhTest.Mock.APPS.VKP.Offerte.BestelStatusUpdater).%New()
 	Do BestelStatusUpdaterMock.IndienMethodCall("ZetStatusBesteld", $$$ElkeWaarde).DanDoeNiks()
 	
-	Set OfferteBesteller = ##class(APPS.EC.impl.ExterneVerkoopService.OfferteBesteller).%New(OfferteServiceMock,"",OfferteVoorBestellingValidatorMock, WinkelkarControleurMock, BestelStatusUpdaterMock)
+	Set OfferteBesteller = ##class(APPS.EC.impl.ExterneVerkoopService.OfferteBesteller).%New(OfferteServiceMock, "", OfferteVoorBestellingValidatorStub, WinkelkarControleurMock, BestelStatusUpdaterMock)
 	Do OfferteBesteller.BestelOfferte("DummyOfferteID","DummyKlantID", "DummyPersonalityID")
 ]]></Implementation>
 </Method>
FishEye: Tag 50940 refers to a dead (removed) revision in file `APPS/EC/Verkoop/OfferteVoorBestellingValidator.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: vhTest/Mock/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml
===================================================================
diff -u
--- vhTest/Mock/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(revision 0)
+++ vhTest/Mock/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(revision 50940)
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.APPS.EC.Verkoop.impl.OfferteVoorBestellingValidator">
+<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</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.EC.Verkoop.impl.OfferteVoorBestellingValidator,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="IsGeldig">
+<FormalSpec>Offerte:APPS.VKP.Offerte,KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("IsGeldig",Offerte,KlantID,PersonalityID)
+]]></Implementation>
+</Method>
+
+<Method name="IsStandaardTransport">
+<FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("IsStandaardTransport",VanHoeckePersonality)
+]]></Implementation>
+</Method>
+
+<Method name="Valideer">
+<FormalSpec>Offerte:APPS.VKP.Offerte,KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("Valideer",Offerte,KlantID,PersonalityID)
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkDaro">
+<FormalSpec>DaroPersonality:DOM.common.DaroPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkDaro",DaroPersonality)
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkDestil">
+<FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkDestil",DestilPersonality)
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkDupont">
+<FormalSpec>DupontPersonality:DOM.common.DupontPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkDupont",DupontPersonality)
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleBE">
+<FormalSpec>HaefeleBEPersonality:DOM.common.HaefeleBEPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleBE",HaefeleBEPersonality)
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleNL">
+<FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHaefeleNL",HaefeleNLPersonality)
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHein">
+<FormalSpec>HeinPersonality:DOM.common.HeinPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkHein",HeinPersonality)
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkKisch">
+<FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkKisch",KischPersonality)
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkSFS">
+<FormalSpec>SFSPersonality:DOM.common.SFSPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkSFS",SFSPersonality)
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkSeefelder">
+<FormalSpec>SeefelderPersonality:DOM.common.SeefelderPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkSeefelder",SeefelderPersonality)
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkVanHoecke">
+<FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkVanHoecke",VanHoeckePersonality)
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkVanHoeckeVoorHalux">
+<FormalSpec>VanHoeckVoorHaluxPersonality:DOM.common.VanHoeckeVoorHaluxPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkVanHoeckeVoorHalux",VanHoeckVoorHaluxPersonality)
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkVanRaemdonck">
+<FormalSpec>VanRaemdonckPersonality:DOM.common.VanRaemdonckPersonality</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkVanRaemdonck",VanRaemdonckPersonality)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/EC/impl/ExterneVerkoopService/OfferteBesteller.cls.xml
===================================================================
diff -u -r45383 -r50940
--- APPS/EC/impl/ExterneVerkoopService/OfferteBesteller.cls.xml	(.../OfferteBesteller.cls.xml)	(revision 45383)
+++ APPS/EC/impl/ExterneVerkoopService/OfferteBesteller.cls.xml	(.../OfferteBesteller.cls.xml)	(revision 50940)
@@ -9,7 +9,7 @@
 </Property>
 
 <Property name="OfferteVoorBestellingValidator">
-<Type>APPS.EC.Verkoop.OfferteVoorBestellingValidator</Type>
+<Type>APPS.EC.Verkoop.impl.OfferteVoorBestellingValidator</Type>
 <Private>1</Private>
 </Property>
 
@@ -24,16 +24,16 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>OfferteService:APPS.VKP.OfferteService,KlantInstellingenService:APPS.common.impl.KlantInstellingenService,OfferteVoorBestellingValidator:APPS.EC.Verkoop.OfferteVoorBestellingValidator,WinkelkarControleur:APPS.EC.Winkelkar.WinkelkarControleur="",BestelStatusUpdater:APPS.VKP.Offerte.BestelStatusUpdater=""</FormalSpec>
+<FormalSpec>OfferteService:APPS.VKP.OfferteService="",KlantInstellingenService:APPS.common.impl.KlantInstellingenService="",OfferteVoorBestellingValidator:APPS.EC.Verkoop.impl.OfferteVoorBestellingValidator="",WinkelkarControleur:APPS.EC.Winkelkar.WinkelkarControleur="",BestelStatusUpdater:APPS.VKP.Offerte.BestelStatusUpdater=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..OfferteService = $$$Inject(OfferteService,##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService())
-	Set ..OfferteVoorBestellingValidator = $$$Implementation(OfferteVoorBestellingValidator, ##class(APPS.EC.Verkoop.impl.OfferteVoorBestellingValidator).%New())
-	Set ..WinkelkarControleur = $$$Implementation(WinkelkarControleur, ##class(APPS.EC.Winkelkar.impl.WinkelkarControleur).%New(KlantInstellingenService))
-	Set ..BestelStatusUpdater = $$$Implementation(BestelStatusUpdater, ..OfferteService.GeefBestelStatusUpdater())
+	Set ..OfferteVoorBestellingValidator = $$$Inject(OfferteVoorBestellingValidator, ##class(APPS.EC.Verkoop.impl.OfferteVoorBestellingValidator).%New())
+	Set ..WinkelkarControleur = $$$Inject(WinkelkarControleur, ##class(APPS.EC.Winkelkar.impl.WinkelkarControleur).%New(KlantInstellingenService))
+	Set ..BestelStatusUpdater = $$$Inject(BestelStatusUpdater, ..OfferteService.GeefBestelStatusUpdater())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -42,7 +42,7 @@
 <Method name="BestelOfferte">
 <FormalSpec>OfferteID:%String,KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality</FormalSpec>
 <Implementation><![CDATA[
-	#Dim Offerte As APPS.VKP.Offerte = ..OfferteService.GeefOfferte(OfferteID)
+	#dim Offerte As APPS.VKP.Offerte = ..OfferteService.GeefOfferte(OfferteID)
 	
 	Set KlantID = Offerte.GeefKlantID()
 	
Index: vhTest/Fake/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml
===================================================================
diff -u
--- vhTest/Fake/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(revision 0)
+++ vhTest/Fake/APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(revision 50940)
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.APPS.EC.Verkoop.impl.OfferteVoorBestellingValidator">
+<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.EC.Verkoop.impl.OfferteVoorBestellingValidator</Super>
+
+<Method name="IsGeldig">
+<FormalSpec>Offerte:APPS.VKP.Offerte,KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="IsStandaardTransport">
+<FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="Valideer">
+<FormalSpec>Offerte:APPS.VKP.Offerte,KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkDaro">
+<FormalSpec>DaroPersonality:DOM.common.DaroPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkDestil">
+<FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkDupont">
+<FormalSpec>DupontPersonality:DOM.common.DupontPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleBE">
+<FormalSpec>HaefeleBEPersonality:DOM.common.HaefeleBEPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaefeleNL">
+<FormalSpec>HaefeleNLPersonality:DOM.common.HaefeleNLPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHein">
+<FormalSpec>HeinPersonality:DOM.common.HeinPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkKisch">
+<FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkSFS">
+<FormalSpec>SFSPersonality:DOM.common.SFSPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkSeefelder">
+<FormalSpec>SeefelderPersonality:DOM.common.SeefelderPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkVanHoecke">
+<FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkVanHoeckeVoorHalux">
+<FormalSpec>VanHoeckVoorHaluxPersonality:DOM.common.VanHoeckeVoorHaluxPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkVanRaemdonck">
+<FormalSpec>VanRaemdonckPersonality:DOM.common.VanRaemdonckPersonality</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml
===================================================================
diff -u -r47660 -r50940
--- APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 47660)
+++ APPS/EC/Verkoop/impl/OfferteVoorBestellingValidator.cls.xml	(.../OfferteVoorBestellingValidator.cls.xml)	(revision 50940)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.EC.Verkoop.impl.OfferteVoorBestellingValidator">
-<Super>DOM.common.PersonalityUnishopVisitor,APPS.EC.Verkoop.OfferteVoorBestellingValidator,APPS.common.impl.Validator</Super>
+<Super>DOM.common.PersonalityUnishopVisitor,TECH.Mockable,APPS.common.impl.Validator</Super>
 
 <Parameter name="ASAP">
 <Type>%String</Type>
@@ -39,7 +39,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>WinkelkarService:APPS.EC.Winkelkar.WinkelkarService,CheckoutTypeBepaler:APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler</FormalSpec>
+<FormalSpec>WinkelkarService:APPS.EC.Winkelkar.WinkelkarService="",CheckoutTypeBepaler:APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -61,7 +61,7 @@
 	Set ..PersonalityID = PersonalityID
 	Set ..Meldingen = ##class(%ListOfObjects).%New()
 	
-	#Dim Personality AS DOM.common.Personality = ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(PersonalityID)	
+	#dim Personality AS DOM.common.Personality = ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(PersonalityID)	
 	Do Personality.Accept($this)
 	
 	Quit (..Meldingen.Count() = 0)
@@ -71,8 +71,8 @@
 <Method name="Valideer">
 <FormalSpec>Offerte:APPS.VKP.Offerte,KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality</FormalSpec>
 <Implementation><![CDATA[
-	If '..IsGeldig(Offerte, KlantID, PersonalityID ) { 
-		do ..ThrowError() 
+	If $$$Not(..IsGeldig(Offerte, KlantID, PersonalityID )) { 
+		Do ..ThrowError() 
 	}
 ]]></Implementation>
 </Method>
@@ -89,10 +89,11 @@
 <Implementation><![CDATA[
 	Do ..ControleerReedsBesteld()
 	Do ..ControleerToegangEnPrijzen()
-	If (..IsStandaardTransport(VanHoeckePersonality) && (..Offerte.GeefLeverDatum()="") && $$$Not(..IsAsap()))
-	{
-		#Dim Foutmelding As %String = "De leverdatum is niet ingevuld voor deze bestelde offerte (ID: "_..Offerte.GeefID()_")"
-		#Dim Exception As TECH.Exceptions.Exception = ##class(TECH.Exceptions.InvalidInputException).%New(Foutmelding)
+	
+	If (..IsStandaardTransport(VanHoeckePersonality) && (..Offerte.GeefLeverDatum() = "") && $$$Not(..IsAsap())) {
+		#dim Foutmelding As %String = "De leverdatum is niet ingevuld voor deze bestelde offerte (ID: " _ ..Offerte.GeefID() _ ")"
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.Exceptions.InvalidInputException).%New(Foutmelding)
+		
 		Do ..Meldingen.Insert(Exception)
 	}
 ]]></Implementation>
@@ -101,7 +102,7 @@
 <Method name="IsAsap">
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit (..Offerte.IsVhisie4() && (..Offerte.GeefWensLeverDatum()= ..#ASAP))
+<Implementation><![CDATA[	Quit (..Offerte.IsVhisie4() && (..Offerte.GeefWensLeverDatum() =  ..#ASAP))
 ]]></Implementation>
 </Method>
 
@@ -116,10 +117,12 @@
 <FormalSpec>SFSPersonality:DOM.common.SFSPersonality</FormalSpec>
 <Implementation><![CDATA[
 	If ..Offerte.IsBesteld() {
-		#Dim Foutmelding As %String = "Order already confirmed"
-		#Dim Exception As TECH.Exceptions.Exception = ##class(APPS.VKP.Offerte.impl.OfferteReedsBesteldException).%New(Foutmelding)
+		#dim Foutmelding As %String = "Order already confirmed"
+		#dim Exception As TECH.Exceptions.Exception = ##class(APPS.VKP.Offerte.impl.OfferteReedsBesteldException).%New(Foutmelding)
+		
 		Do ..Meldingen.Insert(Exception)
 	}
+	
 	Do ..ControleerToegangEnPrijzen()
 ]]></Implementation>
 </Method>
@@ -214,8 +217,9 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	If ..Offerte.IsBesteld() {
-		#Dim Foutmelding As %String = "De offerte '"_..Offerte.GeefID()_"' is reeds besteld."
-		#Dim Exception As TECH.Exceptions.Exception = ##class(APPS.VKP.Offerte.impl.OfferteReedsBesteldException).%New(Foutmelding)
+		#dim Foutmelding As %String = "De offerte '" _ ..Offerte.GeefID() _ "' is reeds besteld."
+		#dim Exception As TECH.Exceptions.Exception = ##class(APPS.VKP.Offerte.impl.OfferteReedsBesteldException).%New(Foutmelding)
+		
 		Do ..Meldingen.Insert(Exception)
 	}
 ]]></Implementation>
@@ -225,12 +229,12 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim HeeftMaatwerklijnen As %Boolean = $$$False
-	Set:$Length(..Offerte.GeefWinkelkarID()) HeeftMaatwerklijnen = (..WinkelkarService.GeefMaatwerkLijnen(..Offerte.GeefWinkelkarID()).Count()>0)
+	Set:$Length(..Offerte.GeefWinkelkarID()) HeeftMaatwerklijnen = (..WinkelkarService.GeefMaatwerkLijnen(..Offerte.GeefWinkelkarID()).Count() > 0)
 
-	If (HeeftMaatwerklijnen&&..Offerte.ZijnPrijzenVervallen()) 
-	{
-		#Dim Foutmelding As %String = "De offerte '"_..Offerte.GeefID()_"' is niet meer geldig!"
-		#Dim Exception As TECH.Exceptions.Exception = ##class(APPS.VKP.Offerte.impl.OfferteNietMeerGeldigException).%New(Foutmelding)
+	If (HeeftMaatwerklijnen && ..Offerte.ZijnPrijzenVervallen()) {
+		#dim Foutmelding As %String = "De offerte '" _ ..Offerte.GeefID() _ "' is niet meer geldig!"
+		#dim Exception As TECH.Exceptions.Exception = ##class(APPS.VKP.Offerte.impl.OfferteNietMeerGeldigException).%New(Foutmelding)
+		
 		Do ..Meldingen.Insert(Exception)
 	}
 ]]></Implementation>
@@ -239,17 +243,20 @@
 <Method name="ControleerHeeftToegangTotOfferte">
 <Private>1</Private>
 <Implementation><![CDATA[
-	#Dim Foutmelding As %String = ""
-	#Dim Exception As TECH.Exceptions.Exception = ""
+	#dim Foutmelding As %String = ""
+	#dim Exception As TECH.Exceptions.Exception = ""
 	
-	If ($L(..Offerte.GeefKlantID()) && $$$Not(..Offerte.GeefKlantID()=..KlantID)) {
-		Set Foutmelding = "De klantID, "_..KlantID_", is niet geldig voor deze offerte (ID: "_..Offerte.GeefID()_")"
+	If ($Length(..Offerte.GeefKlantID()) && $$$Not(..Offerte.GeefKlantID() = ..KlantID)) {
+		Set Foutmelding = "De klantID, " _ ..KlantID _ ", is niet geldig voor deze offerte (ID: " _ ..Offerte.GeefID() _ ")"
 		Set Exception = ##class(TECH.Exceptions.InvalidInputException).%New(Foutmelding)
+		
 		Do ..Meldingen.Insert(Exception)
 	}
-	If $$$Not(..Offerte.GeefPersonalityID()=..PersonalityID) {
-		Set Foutmelding = "De PersonalityID, "_..PersonalityID_", is niet geldig voor deze offerte (ID: "_..Offerte.GeefID()_")"
+	
+	If $$$Not(..Offerte.GeefPersonalityID() = ..PersonalityID) {
+		Set Foutmelding = "De PersonalityID, " _ ..PersonalityID _ ", is niet geldig voor deze offerte (ID: " _ ..Offerte.GeefID() _ ")"
 		Set Exception = ##class(TECH.Exceptions.InvalidInputException).%New(Foutmelding)
+		
 		Do ..Meldingen.Insert(Exception)
 	}
 ]]></Implementation>