Index: AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml
===================================================================
diff -u -r72739 -r72870
--- AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 72739)
+++ AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 72870)
@@ -128,6 +128,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="VhConfigRepository">
+<Type>APPS.PM.Maatwerk.impl.VhConfigRepository</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="DataMProductRepository">
 <Type>DOM.PM.impl.DataM.DataMProductRepository</Type>
 <Private>1</Private>
@@ -172,6 +177,7 @@
 	
 	Set ..VerkoopApi = $$$Inject(VerkoopApi, ##class(DOM.VKP.impl.VerkoopAPI).%New())
 	Set ..VhConfigHelper = ##class(APPS.PM.Maatwerk.impl.VhConfigHelper).%New()
+	Set ..VhConfigRepository = ##class(APPS.PM.Maatwerk.impl.VhConfigRepository).%New()
 	
 	Set ..Logger = ##class(vhLib.Logger).%New()
 
@@ -552,6 +558,7 @@
 	
 	If ($$$Not(OrderLine.CID = "{00000000-0000-0000-0000-000000000000}") && $$$Not(OrderLine.CID = "")) {
 		Set CID = ##class(TECH.StringUtils).Replace(##class(TECH.StringUtils).Replace(OrderLine.CID, "}", ""), "{", "")
+		Do ..VhConfigRepository.SaveVhConfig(OrderLine.CID, OrderLine.VhConfig)
 		Set ProductId = ..GeefProductIdVanVhConfigMaatwerkProduct(Order, OrderLine, CID, .ReedsGekendeProductId)
 	}
 	
@@ -589,8 +596,6 @@
 	#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = ..GeefJSONParsedVhConfig(OrderLine.VhConfig)
 	Set ReedsGekendeProductId = ..GeefProductIdVanDossierCodeVoorMaatwerkModel(OrderLine.DossierCode, VhConfig.Model)
 	
-	Set VhConfig.BerekendeKenmerken.Korttekst = ##class(TECH.StringUtils).Replace(VhConfig.BerekendeKenmerken.Korttekst, "%1", OrderLine.DossierCode)
-
 	Do ..VhConfigHelper.ZetVhConfig(VhConfig)
 	Set ProductData = ##class(DOM.PM.dto.ProductData).%New()
 	Set ProductData.CID = CID
Index: DOM/PM/impl/DataM/DataMLBXLadeCreator.cls.xml
===================================================================
diff -u -r72682 -r72870
--- DOM/PM/impl/DataM/DataMLBXLadeCreator.cls.xml	(.../DataMLBXLadeCreator.cls.xml)	(revision 72682)
+++ DOM/PM/impl/DataM/DataMLBXLadeCreator.cls.xml	(.../DataMLBXLadeCreator.cls.xml)	(revision 72870)
@@ -41,7 +41,7 @@
 	#dim Korttekst As %String
 	
 	If (..BepaalIsMaatwerkCalculatieInEncoway()) {
-		Set Korttekst = ..VhConfig.BerekendeKenmerken.Korttekst
+		Set Korttekst = ##class(TECH.StringUtils).Replace(..VhConfig.BerekendeKenmerken.Korttekst, "%1", $J(..DossierNummer,5))
 	} Else {
 		Set Korttekst = ##class(DOM.PM.KorttekstUtils).BepaalKorttekstLBX(DossierNummer, ..ProductSpecificatie.GeefIngegevenKenmerken(), ..HalffabItemsBoom)
 	}
Index: APPS/PM/Maatwerk/impl/VhConfigHelper.cls.xml
===================================================================
diff -u -r72739 -r72870
--- APPS/PM/Maatwerk/impl/VhConfigHelper.cls.xml	(.../VhConfigHelper.cls.xml)	(revision 72739)
+++ APPS/PM/Maatwerk/impl/VhConfigHelper.cls.xml	(.../VhConfigHelper.cls.xml)	(revision 72870)
@@ -41,7 +41,12 @@
 
 <Method name="GeefHalffabrikatenListIterator">
 <ReturnType>TECH.ListIterator</ReturnType>
-<Implementation><![CDATA[	Quit ##class(TECH.ListIterator).%New(..VhConfig.MaatwerkDetails.Halffabrikaten)
+<Implementation><![CDATA[
+	If $$$Not($$$HasLength(..VhConfig.MaatwerkDetails.Halffabrikaten)) {
+		Quit ##class(TECH.ListIterator).%New(##class(%ArrayOfObjects).%New())
+	}
+	
+	Quit ##class(TECH.ListIterator).%New(..VhConfig.MaatwerkDetails.Halffabrikaten)
 ]]></Implementation>
 </Method>
 
Index: APPS/PM/Maatwerk/impl/VhConfigRepository.cls.xml
===================================================================
diff -u
--- APPS/PM/Maatwerk/impl/VhConfigRepository.cls.xml	(revision 0)
+++ APPS/PM/Maatwerk/impl/VhConfigRepository.cls.xml	(revision 72870)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.PM.Maatwerk.impl.VhConfigRepository">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="BestaatVhConfigVoorCID">
+<FormalSpec>CID:%String</FormalSpec>
+<Implementation><![CDATA[	Quit $Data(^VhConfigVoorCID(CID))
+]]></Implementation>
+</Method>
+
+<Method name="SaveVhConfig">
+<FormalSpec>CID:%String,VhConfig:%String</FormalSpec>
+<Implementation><![CDATA[
+	kill ^VhConfigVoorCID(CID)
+	Set ^VhConfigVoorCID(CID) = VhConfig
+]]></Implementation>
+</Method>
+
+<Method name="GeefVhConfig">
+<FormalSpec>CID:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ^VhConfigVoorCID(CID)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/PM/Maatwerk/MaatwerkService/Encoway.cls.xml
===================================================================
diff -u -r72853 -r72870
--- WSimpl/PM/Maatwerk/MaatwerkService/Encoway.cls.xml	(.../Encoway.cls.xml)	(revision 72853)
+++ WSimpl/PM/Maatwerk/MaatwerkService/Encoway.cls.xml	(.../Encoway.cls.xml)	(revision 72870)
@@ -13,6 +13,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="VhConfigRepository">
+<Type>APPS.PM.Maatwerk.impl.VhConfigRepository</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>EncowayJsonConverter:WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter="",EncowayHttpClient:WSimpl.PM.Maatwerk.MaatwerkService.EncowayHttpClient=""</FormalSpec>
 <Private>1</Private>
@@ -22,6 +27,7 @@
 <Implementation><![CDATA[
 	Set ..EncowayJsonConverter = $$$Inject(EncowayJsonConverter, ##class(WSimpl.PM.Maatwerk.MaatwerkService.Encoway.EncowayJsonConverter).%New())
 	Set ..EncowayHttpClient = $$$Inject(EncowayHttpClient, ##class(WSimpl.PM.Maatwerk.MaatwerkService.EncowayHttpClient).%New())
+	Set ..VhConfigRepository = ##class(APPS.PM.Maatwerk.impl.VhConfigRepository).%New()
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -31,17 +37,22 @@
 <FormalSpec>CID:TECH.String</FormalSpec>
 <ReturnType>APPS.PM.Maatwerk.dto.VhConfig</ReturnType>
 <Implementation><![CDATA[
+	#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = ""
+	#dim MaatwerkDetailsResponseJsonString As %Stream.GlobalBinary = ""
+	
 	If (CID = "") {
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Ophalen VHConfig is mislukt aangezien de CID leeg is."))
+	}	
+	
+	If (..VhConfigRepository.BestaatVhConfigVoorCID(CID)) // && context != testen
+	{
+		Set VhConfig = ..EncowayJsonConverter.ParseVhConfig(..VhConfigRepository.GeefVhConfig(CID))
+	} Else {
+		#dim GeefMaatwerkDetailsRequestJsonStream As %Stream.GlobalBinary = ..EncowayJsonConverter.Stringify(..GeefMaatwerkDetailsRequest(CID))
+		Set MaatwerkDetailsResponseJsonString = ..EncowayHttpClient.HaalOpVhConfig(GeefMaatwerkDetailsRequestJsonStream)
+		Set VhConfig = ..EncowayJsonConverter.ParseMaatwerkDetailsResponse(MaatwerkDetailsResponseJsonString).VhConfig
 	}
 	
-	#dim VhConfig As APPS.PM.Maatwerk.dto.VhConfig = ""
-	
-	#dim GeefMaatwerkDetailsRequestJsonStream As %Stream.GlobalBinary = ..EncowayJsonConverter.Stringify(..GeefMaatwerkDetailsRequest(CID))
-	#dim VhConfigJsonString As %Stream.GlobalBinary = ..EncowayHttpClient.HaalOpVhConfig(GeefMaatwerkDetailsRequestJsonStream)	
-	#dim MaatwerkDetailsResponse As WSimpl.PM.Maatwerk.MaatwerkService.Encoway.GeefMaatwerkDetailsResponse = ..EncowayJsonConverter.Parse(VhConfigJsonString)
-	Set VhConfig = MaatwerkDetailsResponse.VhConfig
-	
 	Quit VhConfig
 ]]></Implementation>
 </Method>