Index: APPS/Halux/common/impl/ProductieService/ProductIDCategorieBepaler.cls.xml
===================================================================
diff -u -r29059 -r62344
--- APPS/Halux/common/impl/ProductieService/ProductIDCategorieBepaler.cls.xml (.../ProductIDCategorieBepaler.cls.xml) (revision 29059)
+++ APPS/Halux/common/impl/ProductieService/ProductIDCategorieBepaler.cls.xml (.../ProductIDCategorieBepaler.cls.xml) (revision 62344)
@@ -54,6 +54,12 @@
+
+
+MVXKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.MVXKenmerken
+
+
Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.AX.DocGen.AankoopOrderService.txt
===================================================================
diff -u -r54282 -r62344
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.AX.DocGen.AankoopOrderService.txt (.../WS.AX.DocGen.AankoopOrderService.txt) (revision 54282)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.AX.DocGen.AankoopOrderService.txt (.../WS.AX.DocGen.AankoopOrderService.txt) (revision 62344)
@@ -207,6 +207,7 @@
+
Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Halux.PPS.AansturingService.txt
===================================================================
diff -u -r54282 -r62344
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Halux.PPS.AansturingService.txt (.../WS.Halux.PPS.AansturingService.txt) (revision 54282)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Halux.PPS.AansturingService.txt (.../WS.Halux.PPS.AansturingService.txt) (revision 62344)
@@ -46,6 +46,7 @@
+
Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.AX.DocGen.FactuurService.txt
===================================================================
diff -u -r54282 -r62344
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.AX.DocGen.FactuurService.txt (.../WS.AX.DocGen.FactuurService.txt) (revision 54282)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.AX.DocGen.FactuurService.txt (.../WS.AX.DocGen.FactuurService.txt) (revision 62344)
@@ -278,6 +278,7 @@
+
Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Halux.Planning.BatchService.txt
===================================================================
diff -u -r59352 -r62344
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Halux.Planning.BatchService.txt (.../WS.Halux.Planning.BatchService.txt) (revision 59352)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Halux.Planning.BatchService.txt (.../WS.Halux.Planning.BatchService.txt) (revision 62344)
@@ -30,6 +30,7 @@
+
Index: APPS/EC/Winkelkar/impl/ProductTypeBepaler.cls.xml
===================================================================
diff -u -r29059 -r62344
--- APPS/EC/Winkelkar/impl/ProductTypeBepaler.cls.xml (.../ProductTypeBepaler.cls.xml) (revision 29059)
+++ APPS/EC/Winkelkar/impl/ProductTypeBepaler.cls.xml (.../ProductTypeBepaler.cls.xml) (revision 62344)
@@ -36,6 +36,12 @@
+
+
+MVXKenmerken:DOM.PM.Maatwerk.Calc.Common.impl.MVXKenmerken
+
+
Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Halux.PPS.TBXZaagServer.txt
===================================================================
diff -u -r61764 -r62344
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Halux.PPS.TBXZaagServer.txt (.../WS.Halux.PPS.TBXZaagServer.txt) (revision 61764)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Halux.PPS.TBXZaagServer.txt (.../WS.Halux.PPS.TBXZaagServer.txt) (revision 62344)
@@ -52,6 +52,7 @@
+
Index: APPS/EC/enu/ProductType.cls.xml
===================================================================
diff -u -r62216 -r62344
--- APPS/EC/enu/ProductType.cls.xml (.../ProductType.cls.xml) (revision 62216)
+++ APPS/EC/enu/ProductType.cls.xml (.../ProductType.cls.xml) (revision 62344)
@@ -6,11 +6,11 @@
%String
-;TBX;LBX;TAX
+;TBX;LBX;TAX;MVX
-;Tandembox;Legrabox;Taorbox
+;Tandembox;Legrabox;Taorbox;Merivobox
@@ -30,6 +30,12 @@
+
+
+1
+
+
Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.AX.DocGen.OrderService.txt
===================================================================
diff -u -r54282 -r62344
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.AX.DocGen.OrderService.txt (.../WS.AX.DocGen.OrderService.txt) (revision 54282)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.AX.DocGen.OrderService.txt (.../WS.AX.DocGen.OrderService.txt) (revision 62344)
@@ -150,6 +150,7 @@
+
Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.AX.DocGen.LeveringService.txt
===================================================================
diff -u -r54282 -r62344
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.AX.DocGen.LeveringService.txt (.../WS.AX.DocGen.LeveringService.txt) (revision 54282)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.AX.DocGen.LeveringService.txt (.../WS.AX.DocGen.LeveringService.txt) (revision 62344)
@@ -274,6 +274,7 @@
+
Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.APPS.algemeen.entiteitcomponent.EntiteitComponentDataService.txt
===================================================================
diff -u -r59352 -r62344
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.APPS.algemeen.entiteitcomponent.EntiteitComponentDataService.txt (.../WS.APPS.algemeen.entiteitcomponent.EntiteitComponentDataService.txt) (revision 59352)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.APPS.algemeen.entiteitcomponent.EntiteitComponentDataService.txt (.../WS.APPS.algemeen.entiteitcomponent.EntiteitComponentDataService.txt) (revision 62344)
@@ -138,6 +138,7 @@
+
Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Halux.Planning.Planningstool.txt
===================================================================
diff -u -r54282 -r62344
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Halux.Planning.Planningstool.txt (.../WS.Halux.Planning.Planningstool.txt) (revision 54282)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.Halux.Planning.Planningstool.txt (.../WS.Halux.Planning.Planningstool.txt) (revision 62344)
@@ -275,6 +275,7 @@
+
Index: APPS/Halux/common/enu/Categorie.cls.xml
===================================================================
diff -u -r29059 -r62344
--- APPS/Halux/common/enu/Categorie.cls.xml (.../Categorie.cls.xml) (revision 29059)
+++ APPS/Halux/common/enu/Categorie.cls.xml (.../Categorie.cls.xml) (revision 62344)
@@ -7,11 +7,11 @@
%EnumString
-,Hoekkast,Servodrive,Tandembox,TAORbox,Burobox ladeblok,Kaderdeur,Mondo,Product op maat,Inpak,Verlichting,Banco,MDS,Mat,Verlichtingsbodem,ISS,ILS,Legrabox,Onbepaald
+,Hoekkast,Servodrive,Tandembox,TAORbox,Burobox ladeblok,Kaderdeur,Mondo,Product op maat,Inpak,Verlichting,Banco,MDS,Mat,Verlichtingsbodem,ISS,ILS,Legrabox,Onbepaald,Merivobox
-,Hoekkast,Servodrive,Tandembox,TAORbox,Burobox ladeblok,Kaderdeur,Mondo,Product op maat,Inpak,Verlichting,Banco,MDS,Mat,Verlichtingsbodem,ISS,ILS,Legrabox,Onbepaald
+,Hoekkast,Servodrive,Tandembox,TAORbox,Burobox ladeblok,Kaderdeur,Mondo,Product op maat,Inpak,Verlichting,Banco,MDS,Mat,Verlichtingsbodem,ISS,ILS,Legrabox,Onbepaald,Merivobox
@@ -139,6 +139,13 @@
+
+
+1
+APPS.Halux.common.enu.Categorie
+
+
Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.AX.DocGen.OfferteService.txt
===================================================================
diff -u -r54282 -r62344
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.AX.DocGen.OfferteService.txt (.../WS.AX.DocGen.OfferteService.txt) (revision 54282)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.AX.DocGen.OfferteService.txt (.../WS.AX.DocGen.OfferteService.txt) (revision 62344)
@@ -159,6 +159,7 @@
+