Index: vhUnitTest/APPS/PM/impl/EANCodeMock/ProductImpl.cls.xml
===================================================================
diff -u -r29059 -r38760
--- vhUnitTest/APPS/PM/impl/EANCodeMock/ProductImpl.cls.xml	(.../ProductImpl.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/PM/impl/EANCodeMock/ProductImpl.cls.xml	(.../ProductImpl.cls.xml)	(revision 38760)
@@ -29,7 +29,7 @@
 <Method name="GeefGenerischProductID">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	If ..MockProductID=1003 {
+	If (..MockProductID=1003) || (..MockProductID=1006) {
 		Quit 99999
 	}
 	Else {
Index: vhUnitTest/APPS/PM/TestEANCodeService.cls.xml
===================================================================
diff -u -r29059 -r38760
--- vhUnitTest/APPS/PM/TestEANCodeService.cls.xml	(.../TestEANCodeService.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/PM/TestEANCodeService.cls.xml	(.../TestEANCodeService.cls.xml)	(revision 38760)
@@ -45,7 +45,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="TestIsNieuweEANCodeNodigGenerischAfgeleid">
+<Method name="TestIsNieuweEANCodeNodigGenerischAfgeleidStandaard">
 <Implementation><![CDATA[
 	Set EANCodeService=##class(APPS.PM.EANCodeService).%New()
 	#dim IsNieuweEANCodeNodig As %Boolean = EANCodeService.IsNieuweEANCodeNodigVoorProduct(1003)
@@ -54,6 +54,15 @@
 ]]></Implementation>
 </Method>
 
+<Method name="TestIsNieuweEANCodeNodigGenerischAfgeleidUitzonderlijkeClassificatie">
+<Implementation><![CDATA[
+	Set EANCodeService=##class(APPS.PM.EANCodeService).%New()
+	#dim IsNieuweEANCodeNodig As %Boolean = EANCodeService.IsNieuweEANCodeNodigVoorProduct(1006)
+	
+	Do $$$AssertEquals(IsNieuweEANCodeNodig,1, "De waarde is correct (ID:1006)")
+]]></Implementation>
+</Method>
+
 <Method name="TestIsNieuweEANCodeNodigAlsEANCodeReedsAanwezig">
 <Implementation><![CDATA[
 	Set EANCodeService=##class(APPS.PM.EANCodeService).%New()
Index: DOM/PM/enu/Classificatie.cls.xml
===================================================================
diff -u -r33101 -r38760
--- DOM/PM/enu/Classificatie.cls.xml	(.../Classificatie.cls.xml)	(revision 33101)
+++ DOM/PM/enu/Classificatie.cls.xml	(.../Classificatie.cls.xml)	(revision 38760)
@@ -5,7 +5,7 @@
 <Super>TECH.Enumeration</Super>
 
 <Parameter name="VALUELIST">
-<Default>;425;837;1327;1328;1371;1108;1406;769;1459;1645;1603;542;543;863;1440</Default>
+<Default>;425;837;1327;1328;1371;1108;1406;769;1459;1645;1603;542;543;863;1440;1628;1629;1630</Default>
 </Parameter>
 
 <Method name="Antislipmatten">
@@ -120,6 +120,27 @@
 <Implementation><![CDATA[	Quit "1440"
 ]]></Implementation>
 </Method>
+
+<Method name="TaorBoxFineerV10">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.PM.enu.Classificatie</ReturnType>
+<Implementation><![CDATA[	Quit "1628"
+]]></Implementation>
+</Method>
+
+<Method name="TaorBoxHoutDecorV10">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.PM.enu.Classificatie</ReturnType>
+<Implementation><![CDATA[	Quit "1629"
+]]></Implementation>
+</Method>
+
+<Method name="TaorBoxBicolorV10">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.PM.enu.Classificatie</ReturnType>
+<Implementation><![CDATA[	Quit "1630"
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/PM/EANCodeService.cls.xml
===================================================================
diff -u -r29059 -r38760
--- APPS/PM/EANCodeService.cls.xml	(.../EANCodeService.cls.xml)	(revision 29059)
+++ APPS/PM/EANCodeService.cls.xml	(.../EANCodeService.cls.xml)	(revision 38760)
@@ -71,14 +71,36 @@
 		#dim Product As DOM.PM.Product = ##class(DOM.DomeinContext).Instance().GeefProductAPI().GeefProduct(ProductID)
 		#dim EANCode As %String = Product.GeefEANCode()
 		#dim IsGenerischAfgeleidProduct As %Boolean = (Product.GeefGenerischProductID()'="")
-		If (EANCode="")&&($$$Not(IsGenerischAfgeleidProduct))&&(AdministratiefProduct.GeefClassificatieKnoop().GeefAutomatischEANCodeToekennen()) {
+		#dim ClassificatieKnoop As DOM.PM.ClassificatieKnoop = AdministratiefProduct.GeefClassificatieKnoop()
+		#dim MagEanCodeVoorProductEnClassificatie As %Boolean
+		Set MagEanCodeVoorProductEnClassificatie 
+			= ( (ClassificatieKnoop.GeefAutomatischEANCodeToekennen()) &&
+				($$$Not(IsGenerischAfgeleidProduct) || ..IsClassificatieWaarinOokGenerischAfgeleideProductenEenEanCodeKrijgen(ClassificatieKnoop)) )
+		If (EANCode="")&&MagEanCodeVoorProductEnClassificatie {
 			Set IsNieuweEANCodeNodig=1
 		}
 	}
 	Quit IsNieuweEANCodeNodig
 ]]></Implementation>
 </Method>
 
+<Method name="IsClassificatieWaarinOokGenerischAfgeleideProductenEenEanCodeKrijgen">
+<FormalSpec>ClassificatieKnoop:DOM.PM.ClassificatieKnoop</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ..IsLosseComponentenClassificatie(ClassificatieKnoop)
+]]></Implementation>
+</Method>
+
+<Method name="IsLosseComponentenClassificatie">
+<FormalSpec>ClassificatieKnoop:DOM.PM.ClassificatieKnoop</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Quit (  (ClassificatieKnoop.GeefID()=##class(DOM.PM.enu.Classificatie).TaorBoxFineerV10()) ||
+			(ClassificatieKnoop.GeefID()=##class(DOM.PM.enu.Classificatie).TaorBoxBicolorV10()) ||
+			(ClassificatieKnoop.GeefID()=##class(DOM.PM.enu.Classificatie).TaorBoxHoutDecorV10())  )
+]]></Implementation>
+</Method>
+
 <Method name="ZetEnBewaarEANCodeOpProductenInClassificatie">
 <FormalSpec>ClassificatieID:%String</FormalSpec>
 <Implementation><![CDATA[
Index: DOM/PM/enu/Classificatie/Verwerker.cls.xml
===================================================================
diff -u -r33101 -r38760
--- DOM/PM/enu/Classificatie/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 33101)
+++ DOM/PM/enu/Classificatie/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 38760)
@@ -40,6 +40,12 @@
 		Do ..VerwerkTAOR()
 	} ElseIf Classificatie = "1459" {
 		Do ..VerwerkTAORCUBICOVERInzet()
+	} ElseIf Classificatie = "1630" {
+		Do ..VerwerkTaorBoxBicolorV10()
+	} ElseIf Classificatie = "1628" {
+		Do ..VerwerkTaorBoxFineerV10()
+	} ElseIf Classificatie = "1629" {
+		Do ..VerwerkTaorBoxHoutDecorV10()
 	} ElseIf Classificatie = "1440" {
 		Do ..VerwerkTaorDrukwerk()
 	} Else {
@@ -133,6 +139,24 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkTaorBoxBicolorV10">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkTaorBoxFineerV10">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkTaorBoxHoutDecorV10">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkTaorDrukwerk">
 <Abstract>1</Abstract>
 <Private>1</Private>
Index: vhUnitTest/APPS/PM/impl/EANCodeMock/ProductAPI.cls.xml
===================================================================
diff -u -r29059 -r38760
--- vhUnitTest/APPS/PM/impl/EANCodeMock/ProductAPI.cls.xml	(.../ProductAPI.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/PM/impl/EANCodeMock/ProductAPI.cls.xml	(.../ProductAPI.cls.xml)	(revision 38760)
@@ -11,7 +11,7 @@
 <FormalSpec>ProductID:DOM.common.ProductID</FormalSpec>
 <ReturnType>DOM.PM.Product</ReturnType>
 <Implementation><![CDATA[
-	If (ProductID < 1006)
+	If (ProductID < 1007)
 	{
 		Quit ##class(vhUnitTest.APPS.PM.impl.EANCodeMock.ProductImpl).%New(ProductID)
 	}
Index: vhUnitTest/APPS/PM/impl/EANCodeMock/ProductRolAPI.cls.xml
===================================================================
diff -u -r29059 -r38760
--- vhUnitTest/APPS/PM/impl/EANCodeMock/ProductRolAPI.cls.xml	(.../ProductRolAPI.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/PM/impl/EANCodeMock/ProductRolAPI.cls.xml	(.../ProductRolAPI.cls.xml)	(revision 38760)
@@ -7,7 +7,7 @@
 <FormalSpec>ProductID:DOM.common.ProductID</FormalSpec>
 <ReturnType>vhUnitTest.APPS.PM.impl.EANCodeMock.AdministratiefProductImpl</ReturnType>
 <Implementation><![CDATA[
-	If (ProductID < 1006)
+	If (ProductID < 1007)
 	{
 		Quit ##class(vhUnitTest.APPS.PM.impl.EANCodeMock.AdministratiefProductImpl).%New(ProductID,"","","")
 	}
Index: DOM/PM/enu/Classificatie/AutoComplete.cls.xml
===================================================================
diff -u -r33101 -r38760
--- DOM/PM/enu/Classificatie/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 33101)
+++ DOM/PM/enu/Classificatie/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 38760)
@@ -10,105 +10,126 @@
 <Super>%SerialObject</Super>
 
 <Property name="Antislipmatten">
-<Type>DOM.PM.enu.Classificatie</Type>
+<Type>%String</Type>
 <InitialExpression>"425"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
 
 <Property name="CataloogBlum">
-<Type>DOM.PM.enu.Classificatie</Type>
+<Type>%String</Type>
 <InitialExpression>"542"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
 
 <Property name="CataloogVH">
-<Type>DOM.PM.enu.Classificatie</Type>
+<Type>%String</Type>
 <InitialExpression>"543"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
 
 <Property name="InlegmattenIngekort">
-<Type>DOM.PM.enu.Classificatie</Type>
+<Type>%String</Type>
 <InitialExpression>"1603"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
 
 <Property name="LBXVoorstuk">
-<Type>DOM.PM.enu.Classificatie</Type>
+<Type>%String</Type>
 <InitialExpression>"1371"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
 
 <Property name="OrgalineOnderdelen">
-<Type>DOM.PM.enu.Classificatie</Type>
+<Type>%String</Type>
 <InitialExpression>"769"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
 
 <Property name="Orgalux">
-<Type>DOM.PM.enu.Classificatie</Type>
+<Type>%String</Type>
 <InitialExpression>"837"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
 
 <Property name="OrgaluxBrochures">
-<Type>DOM.PM.enu.Classificatie</Type>
+<Type>%String</Type>
 <InitialExpression>"863"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
 
 <Property name="OrgaluxDwarslatOpMaat">
-<Type>DOM.PM.enu.Classificatie</Type>
+<Type>%String</Type>
 <InitialExpression>"1327"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
 
 <Property name="OrgaluxOpMaat">
-<Type>DOM.PM.enu.Classificatie</Type>
+<Type>%String</Type>
 <InitialExpression>"1328"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
 
 <Property name="ServoDriveFlex">
-<Type>DOM.PM.enu.Classificatie</Type>
+<Type>%String</Type>
 <InitialExpression>"1108"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
 
 <Property name="SpaceTower">
-<Type>DOM.PM.enu.Classificatie</Type>
+<Type>%String</Type>
 <InitialExpression>"1645"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
 
 <Property name="TAOR">
-<Type>DOM.PM.enu.Classificatie</Type>
+<Type>%String</Type>
 <InitialExpression>"1406"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
 
 <Property name="TAORCUBICOVERInzet">
-<Type>DOM.PM.enu.Classificatie</Type>
+<Type>%String</Type>
 <InitialExpression>"1459"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="TaorBoxBicolorV10">
+<Type>%String</Type>
+<InitialExpression>"1630"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="TaorBoxFineerV10">
+<Type>%String</Type>
+<InitialExpression>"1628"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="TaorBoxHoutDecorV10">
+<Type>%String</Type>
+<InitialExpression>"1629"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="TaorDrukwerk">
-<Type>DOM.PM.enu.Classificatie</Type>
+<Type>%String</Type>
 <InitialExpression>"1440"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
Index: vhUnitTest/APPS/PM/impl/EANCodeMock/AdministratiefProductImpl.cls.xml
===================================================================
diff -u -r29059 -r38760
--- vhUnitTest/APPS/PM/impl/EANCodeMock/AdministratiefProductImpl.cls.xml	(.../AdministratiefProductImpl.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/PM/impl/EANCodeMock/AdministratiefProductImpl.cls.xml	(.../AdministratiefProductImpl.cls.xml)	(revision 38760)
@@ -27,7 +27,10 @@
 	If ..ProductID=1005 {
 		Quit ##class(DOM.PM.impl.DataM.DataMSubgroepClassificatie).%New(378)   ; Scharnier : EANCode niet nodig 
 	}
-	Else {
+	ElseIf ..ProductID=1006 {
+		Quit ##class(DOM.PM.impl.DataM.DataMSubgroepClassificatie).%New(1628)   ; TAOR losse componenten : EANCode wel nodig, ook voor generisch afgeleide 
+	}
+	Else  {
 		Quit ##class(DOM.PM.impl.DataM.DataMSubgroepClassificatie).%New(1454)   ; TAOR : EANCode wel nodig 
 	}
 ]]></Implementation>