Index: vhTest/Mock/APPS/Halux/common/ProductieService.cls.xml
===================================================================
diff -u -r59389 -r59484
--- vhTest/Mock/APPS/Halux/common/ProductieService.cls.xml	(.../ProductieService.cls.xml)	(revision 59389)
+++ vhTest/Mock/APPS/Halux/common/ProductieService.cls.xml	(.../ProductieService.cls.xml)	(revision 59484)
@@ -8,7 +8,7 @@
 <Super>APPS.Halux.common.ProductieService,Tools.Mock.MockClassBase</Super>
 
 <Method name="%OnNew">
-<FormalSpec>initvalue:%CacheString</FormalSpec>
+<FormalSpec>ProjectSettingsApi:DOM.common.ProjectSettingsAPI</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[	Quit $$$OK
 ]]></Implementation>
Index: vhUnitTest/APPS/Halux/common/TestProductieService.cls.xml
===================================================================
diff -u -r59387 -r59484
--- vhUnitTest/APPS/Halux/common/TestProductieService.cls.xml	(.../TestProductieService.cls.xml)	(revision 59387)
+++ vhUnitTest/APPS/Halux/common/TestProductieService.cls.xml	(.../TestProductieService.cls.xml)	(revision 59484)
@@ -36,10 +36,10 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: GeefKlantDisplayNaamBijToelevering: Indien Alpnach rechtstreeks besteld (projectsetting), geen wijziging">
+<Method name="Test: GeefKlantDisplayNaamBijToelevering: Indien Alpnach rechtstreeks besteld (projectsetting), dan eenvoudigste geval">
 <Implementation><![CDATA[
 	Do ..ProjectSettingsApiStub.IndienMethodCall("IsActiefAlpnachRechtstreeks").DanReturn($$$True)
-	Do ..AssertGeefKlantDisplayNaamBijToelevering("ALPNACH")
+	Do ..AssertGeefKlantDisplayNaamBijToelevering("EenKlantNaam (EenAdresNaam)")
 ]]></Implementation>
 </Method>
 
Index: APPS/Halux/common/ProductieService.cls.xml
===================================================================
diff -u -r59389 -r59484
--- APPS/Halux/common/ProductieService.cls.xml	(.../ProductieService.cls.xml)	(revision 59389)
+++ APPS/Halux/common/ProductieService.cls.xml	(.../ProductieService.cls.xml)	(revision 59484)
@@ -5,13 +5,20 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>TECH.Mockable</Super>
 
+<Property name="ProjectSettingsApi">
+<Type>DOM.common.ProjectSettingsAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>initvalue:%CacheString</FormalSpec>
+<FormalSpec>ProjectSettingsApi:DOM.common.ProjectSettingsAPI</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
-<Implementation><![CDATA[	Quit $$$OK
+<Implementation><![CDATA[
+	Set ..ProjectSettingsApi = $$$Inject(ProjectSettingsApi,##class(DOM.common.impl.ProjectSettingsAPI).%New())
+	Quit $$$OK
 ]]></Implementation>
 </Method>
 
@@ -131,7 +138,9 @@
 		Set:(##class(TECH.StringUtils).ToUpper(Order.GeefCommissieReferentie()) [ "TALSEE") DisplayNaam = "TALSEE | " _ DisplayNaam
 		Set:(##class(TECH.StringUtils).ToUpper(Order.GeefOrderReferentie()) [ "TALSEE") DisplayNaam = "TALSEE | " _ DisplayNaam
 		
-		If $$$Not(##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAlpnachRechtstreeks()) {
+		Do ##class(Tools.Wlip).%New(127).String("projsetting "_..ProjectSettingsApi.IsActiefAlpnachRechtstreeks())
+		
+		If $$$Not(..ProjectSettingsApi.IsActiefAlpnachRechtstreeks()) {
 			Set:(##class(TECH.StringUtils).ToUpper(Order.GeefCommissieReferentie()) [ "ALPNACH") DisplayNaam = "ALPNACH | " _ DisplayNaam
 			Set:(##class(TECH.StringUtils).ToUpper(Order.GeefOrderReferentie()) [ "ALPNACH") DisplayNaam = "ALPNACH | " _ DisplayNaam
 		}