Index: DOM/PM/enu/ProductType/Verwerker.cls.xml
===================================================================
diff -u -r48733 -r62288
--- DOM/PM/enu/ProductType/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 48733)
+++ DOM/PM/enu/ProductType/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 62288)
@@ -30,6 +30,8 @@
 		Do ..VerwerkMDS()
 	} ElseIf ProductType = "Maatwerk" {
 		Do ..VerwerkMaatwerk()
+	} ElseIf ProductType = "Merivobox" {
+		Do ..VerwerkMerivobox()
 	} ElseIf ProductType = "Onbepaald" {
 		Do ..VerwerkOnbepaald()
 	} ElseIf ProductType = "Orgalux" {
@@ -101,6 +103,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkMerivobox">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkOnbepaald">
 <Abstract>1</Abstract>
 <Private>1</Private>
Index: DOM/PM/ProductTypeAPI.cls.xml
===================================================================
diff -u -r56452 -r62288
--- DOM/PM/ProductTypeAPI.cls.xml	(.../ProductTypeAPI.cls.xml)	(revision 56452)
+++ DOM/PM/ProductTypeAPI.cls.xml	(.../ProductTypeAPI.cls.xml)	(revision 62288)
@@ -58,6 +58,12 @@
 <ReturnType>%Boolean</ReturnType>
 </Method>
 
+<Method name="IsMerivoboxProduct">
+<Abstract>1</Abstract>
+<FormalSpec>ProductID:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+</Method>
+
 <Method name="IsSpaceTowerProduct">
 <Abstract>1</Abstract>
 <FormalSpec>ProductID:%String</FormalSpec>
Index: vhTest/Mock/DOM/PM/impl/ProductTypeAPIimpl.cls.xml
===================================================================
diff -u -r59199 -r62288
--- vhTest/Mock/DOM/PM/impl/ProductTypeAPIimpl.cls.xml	(.../ProductTypeAPIimpl.cls.xml)	(revision 59199)
+++ vhTest/Mock/DOM/PM/impl/ProductTypeAPIimpl.cls.xml	(.../ProductTypeAPIimpl.cls.xml)	(revision 62288)
@@ -169,6 +169,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsMerivoboxProduct">
+<FormalSpec>ProductID:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("IsMerivoboxProduct",ProductID)
+]]></Implementation>
+</Method>
+
 <Method name="IsOrgaluxOpMaat">
 <FormalSpec>ProductID:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
Index: AXimpl/PM/enu/LadeVariant/AutoComplete.cls.xml
===================================================================
diff -u -r57263 -r62288
--- AXimpl/PM/enu/LadeVariant/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 57263)
+++ AXimpl/PM/enu/LadeVariant/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 62288)
@@ -16,6 +16,13 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="MVX">
+<Type>%String</Type>
+<InitialExpression>"MVX"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="TAX">
 <Type>%String</Type>
 <InitialExpression>"TAX"</InitialExpression>
Index: DOM/PM/enu/ProductType.cls.xml
===================================================================
diff -u -r29059 -r62288
--- DOM/PM/enu/ProductType.cls.xml	(.../ProductType.cls.xml)	(revision 29059)
+++ DOM/PM/enu/ProductType.cls.xml	(.../ProductType.cls.xml)	(revision 62288)
@@ -6,11 +6,11 @@
 <Super>TECH.Enumeration</Super>
 
 <Parameter name="VALUELIST">
-<Default>,Langgoed,Tandembox,HangmapLade,Kaderdeur,Glas,MDS,TAORbox,TAORIndeling,Legrabox,Antislipmat,Maatwerk,DwarslatOpMaat,Orgalux,Onbepaald</Default>
+<Default>,Langgoed,Tandembox,HangmapLade,Kaderdeur,Glas,MDS,TAORbox,TAORIndeling,Legrabox,Antislipmat,Maatwerk,DwarslatOpMaat,Orgalux,Onbepaald,Merivobox</Default>
 </Parameter>
 
 <Parameter name="DISPLAYLIST">
-<Default>,Langgoed,Tandembox,HangmapLade,Kaderdeur,Glas,MDS,TAORbox,TAORIndeling,Legrabox,Antislipmat,Maatwerk,DwarslatOpMaat,Orgalux,Onbepaald</Default>
+<Default>,Langgoed,Tandembox,HangmapLade,Kaderdeur,Glas,MDS,TAORbox,TAORIndeling,Legrabox,Antislipmat,Maatwerk,DwarslatOpMaat,Orgalux,Onbepaald,Merivobox</Default>
 </Parameter>
 
 <Method name="Langgoed">
@@ -110,6 +110,13 @@
 <Implementation><![CDATA[	 quit "Onbepaald"
 ]]></Implementation>
 </Method>
+
+<Method name="Merivobox">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.PM.enu.ProductType</ReturnType>
+<Implementation><![CDATA[	 quit "Merivobox"
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/LadeVariantBepaler/Test.cls.xml
===================================================================
diff -u -r57324 -r62288
--- vhUnitTest/WSimpl/AX/CalculatedProduct/LadeVariantBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 57324)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/LadeVariantBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 62288)
@@ -35,13 +35,26 @@
 <Implementation><![CDATA[
 	Set ProductTypeApiStub  = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
 	Do ProductTypeApiStub.VerwachtMethodCall("IsTandemboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$True)
-	
 	Set ..ProductTypeApi = ProductTypeApiStub
 	
 	Do ..Assert(##class(%ListOfObjects).%New(), ##class(AXimpl.PM.enu.LadeVariant).TBX())
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Bepaal gebruikt de ProductTypeApi om de LadeVariant te bepalen voor MVX">
+<Implementation><![CDATA[
+	Set ProductTypeApiStub  = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
+	Do ProductTypeApiStub.VerwachtMethodCall("IsMerivoboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$True)
+	Do ProductTypeApiStub.VerwachtMethodCall("IsTandemboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
+	Do ProductTypeApiStub.VerwachtMethodCall("IsTAORboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
+	Do ProductTypeApiStub.VerwachtMethodCall("IsLegraboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
+	
+	Set ..ProductTypeApi = ProductTypeApiStub
+	
+	Do ..Assert(##class(%ListOfObjects).%New(), ##class(AXimpl.PM.enu.LadeVariant).MVX())
+]]></Implementation>
+</Method>
+
 <Method name="Test: Bepaal gebruikt de ProductTypeApi om de LadeVariant te bepalen voor LBX">
 <Implementation><![CDATA[
 	Set ProductTypeApiStub  = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
@@ -82,6 +95,7 @@
 	Do ProductTypeApiStub.VerwachtMethodCall("IsTandemboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
 	Do ProductTypeApiStub.VerwachtMethodCall("IsLegraboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
 	Do ProductTypeApiStub.VerwachtMethodCall("IsTAORboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
+	Do ProductTypeApiStub.VerwachtMethodCall("IsMerivoboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
 	
 	Set ..ProductTypeApi = ProductTypeApiStub
 	
@@ -104,6 +118,7 @@
 	Do ProductTypeApiStub.VerwachtMethodCall("IsTandemboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
 	Do ProductTypeApiStub.VerwachtMethodCall("IsLegraboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
 	Do ProductTypeApiStub.VerwachtMethodCall("IsTAORboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
+	Do ProductTypeApiStub.VerwachtMethodCall("IsMerivoboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
 	
 	Set ..ProductTypeApi = ProductTypeApiStub
 	
@@ -126,13 +141,37 @@
 	Do ProductTypeApiStub.VerwachtMethodCall("IsTandemboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
 	Do ProductTypeApiStub.VerwachtMethodCall("IsLegraboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
 	Do ProductTypeApiStub.VerwachtMethodCall("IsTAORboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
+	Do ProductTypeApiStub.VerwachtMethodCall("IsMerivoboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
 	
 	Set ..ProductTypeApi = ProductTypeApiStub
 	
 	Do ..Assert(KenmerkenLijst, ##class(AXimpl.PM.enu.LadeVariant).TAX())
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Als bepaling LadeVariant via ProductTypeApi leeg geeft =&gt; LadeVariant ophalen uit Kenmerken =&gt; MVX">
+<Implementation><![CDATA[
+	#dim AxVariant As %String = "MVX"
+	
+	#dim Kenmerk As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute).%New()
+	Set Kenmerk.Name = "Data.Kenmerken.Variant"
+	Set Kenmerk.ValueTxt = AxVariant
+	
+	#dim KenmerkenLijst As %ListOfObjects = ##class(%ListOfObjects).%New()
+	Do KenmerkenLijst.Insert(Kenmerk)
+	
+	Set ProductTypeApiStub  = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
+	Do ProductTypeApiStub.VerwachtMethodCall("IsTandemboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
+	Do ProductTypeApiStub.VerwachtMethodCall("IsLegraboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
+	Do ProductTypeApiStub.VerwachtMethodCall("IsTAORboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
+	Do ProductTypeApiStub.VerwachtMethodCall("IsMerivoboxProduct", ..#RandomProductId).ExactAantalKeer(1).DanReturn($$$False)
+	
+	Set ..ProductTypeApi = ProductTypeApiStub
+	
+	Do ..Assert(KenmerkenLijst, ##class(AXimpl.PM.enu.LadeVariant).MVX())
+]]></Implementation>
+</Method>
+
 <Method name="GeefLadeVariantBepaler">
 <Private>1</Private>
 <ReturnType>WSimpl.AX.CalculatedProduct.LadeVariantBepaler</ReturnType>
Index: DOM/PM/enu/ProductType/AutoComplete.cls.xml
===================================================================
diff -u -r48733 -r62288
--- DOM/PM/enu/ProductType/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 48733)
+++ DOM/PM/enu/ProductType/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 62288)
@@ -72,6 +72,13 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="Merivobox">
+<Type>%String</Type>
+<InitialExpression>"Merivobox"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="Onbepaald">
 <Type>%String</Type>
 <InitialExpression>"Onbepaald"</InitialExpression>
Index: vhTest/Fake/DOM/PM/impl/ProductTypeAPIimpl.cls.xml
===================================================================
diff -u -r62073 -r62288
--- vhTest/Fake/DOM/PM/impl/ProductTypeAPIimpl.cls.xml	(.../ProductTypeAPIimpl.cls.xml)	(revision 62073)
+++ vhTest/Fake/DOM/PM/impl/ProductTypeAPIimpl.cls.xml	(.../ProductTypeAPIimpl.cls.xml)	(revision 62288)
@@ -21,6 +21,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsMerivoboxProduct">
+<FormalSpec>ProductID:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="IsCabloxxProduct">
 <FormalSpec>UniekeClassificatieCode:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
Index: AXimpl/PM/enu/LadeVariant.cls.xml
===================================================================
diff -u -r57263 -r62288
--- AXimpl/PM/enu/LadeVariant.cls.xml	(.../LadeVariant.cls.xml)	(revision 57263)
+++ AXimpl/PM/enu/LadeVariant.cls.xml	(.../LadeVariant.cls.xml)	(revision 62288)
@@ -4,11 +4,11 @@
 <Super>TECH.Enumeration</Super>
 
 <Parameter name="VALUELIST">
-<Default>,TBX,LBX,TAX</Default>
+<Default>,TBX,LBX,TAX,MVX</Default>
 </Parameter>
 
 <Parameter name="DISPLAYLIST">
-<Default>,TBX,LBX,TAX</Default>
+<Default>,TBX,LBX,TAX,MVX</Default>
 </Parameter>
 
 <Method name="TBX">
@@ -31,6 +31,13 @@
 <Implementation><![CDATA[	Quit "TAX"
 ]]></Implementation>
 </Method>
+
+<Method name="MVX">
+<ClassMethod>1</ClassMethod>
+<ReturnType>AXimpl.PM.enu.LadeVariant</ReturnType>
+<Implementation><![CDATA[	Quit "MVX"
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AXimpl/PM/enu/LadeVariant/Verwerker.cls.xml
===================================================================
diff -u -r57263 -r62288
--- AXimpl/PM/enu/LadeVariant/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 57263)
+++ AXimpl/PM/enu/LadeVariant/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 62288)
@@ -14,6 +14,8 @@
 <Implementation><![CDATA[
 	If LadeVariant = "LBX" {
 		Do ..VerwerkLBX()
+	} ElseIf LadeVariant = "MVX" {
+		Do ..VerwerkMVX()
 	} ElseIf LadeVariant = "TAX" {
 		Do ..VerwerkTAX()
 	} ElseIf LadeVariant = "TBX" {
@@ -31,6 +33,12 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkMVX">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkTAX">
 <Abstract>1</Abstract>
 <Private>1</Private>
Index: DOM/PM/impl/ProductTypeAPIimpl.cls.xml
===================================================================
diff -u -r62073 -r62288
--- DOM/PM/impl/ProductTypeAPIimpl.cls.xml	(.../ProductTypeAPIimpl.cls.xml)	(revision 62073)
+++ DOM/PM/impl/ProductTypeAPIimpl.cls.xml	(.../ProductTypeAPIimpl.cls.xml)	(revision 62288)
@@ -37,6 +37,7 @@
 	ElseIf ..IsOrgaluxProduct(ProductID) { Set ProductType = ##class(DOM.PM.enu.ProductType).Orgalux()}
 	ElseIf ..IsTandemboxProduct(ProductID) { Set ProductType = ##class(DOM.PM.enu.ProductType).Tandembox()}
 	ElseIf ..IsTAORboxProduct(ProductID) { Set ProductType = ##class(DOM.PM.enu.ProductType).TAORbox()}
+	ElseIf ..IsMerivoboxProduct(ProductID) { Set ProductType = ##class(DOM.PM.enu.ProductType).Merivobox()}
 	ElseIf ..IsTAORIndelingProduct(ProductID) { Set ProductType = ##class(DOM.PM.enu.ProductType).TAORIndeling()}
 	ElseIf ..IsMaatwerkProduct(ProductID) { Set ProductType = ##class(DOM.PM.enu.ProductType).Maatwerk()}
 	
@@ -114,6 +115,23 @@
 ]]></Implementation>
 </Method>
 
+<UDLText name="T">
+<Content><![CDATA[
+// MOET ZEKER NOG NAGEKEKEN WORDEN (PVR 23/09/2020)
+
+]]></Content>
+</UDLText>
+
+<Method name="IsMerivoboxProduct">
+<FormalSpec>ProductID:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Do ..ControleerOfProductBestaat(ProductID)
+	#dim GenType As %String = $$GENTYP^HAD(ProductID,,1)
+	Quit ($Piece(GenType,"\",1) = "MVX")
+]]></Implementation>
+</Method>
+
 <Method name="ControleerOfProductBestaat">
 <FormalSpec>ProductID:%String</FormalSpec>
 <Private>1</Private>
Index: vhTest/Mock/DOM/PM/ProductTypeAPI.cls.xml
===================================================================
diff -u -r56452 -r62288
--- vhTest/Mock/DOM/PM/ProductTypeAPI.cls.xml	(.../ProductTypeAPI.cls.xml)	(revision 56452)
+++ vhTest/Mock/DOM/PM/ProductTypeAPI.cls.xml	(.../ProductTypeAPI.cls.xml)	(revision 62288)
@@ -164,6 +164,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsMerivoboxProduct">
+<FormalSpec>ProductID:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("IsMerivoboxProduct",ProductID)
+]]></Implementation>
+</Method>
+
 <Method name="IsOrgaluxOpMaat">
 <FormalSpec>ProductID:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
Index: WSimpl/AX/CalculatedProduct/LadeVariantBepaler.cls.xml
===================================================================
diff -u -r57322 -r62288
--- WSimpl/AX/CalculatedProduct/LadeVariantBepaler.cls.xml	(.../LadeVariantBepaler.cls.xml)	(revision 57322)
+++ WSimpl/AX/CalculatedProduct/LadeVariantBepaler.cls.xml	(.../LadeVariantBepaler.cls.xml)	(revision 62288)
@@ -62,6 +62,8 @@
 		Set LadeVariant = ##class(AXimpl.PM.enu.LadeVariant).LBX()
 	} ElseIf (..ProductTypeApi.IsTAORboxProduct(ProductId)) {
 		Set LadeVariant = ##class(AXimpl.PM.enu.LadeVariant).TAX()
+	} ElseIf (..ProductTypeApi.IsMerivoboxProduct(ProductId)) {
+		Set LadeVariant = ##class(AXimpl.PM.enu.LadeVariant).MVX()
 	}
 	
 	Quit LadeVariant
@@ -92,6 +94,8 @@
 		Set LadeVariant = ##class(AXimpl.PM.enu.LadeVariant).LBX()
 	} ElseIf (..LadeVariantVolgensAxKenmerken = "TAX") {
 		Set LadeVariant = ##class(AXimpl.PM.enu.LadeVariant).TAX()
+	} ElseIf (..LadeVariantVolgensAxKenmerken = "MVX") {
+		Set LadeVariant = ##class(AXimpl.PM.enu.LadeVariant).MVX()
 	}
 	
 	Quit LadeVariant