Index: vhUnitTest/APPS/PM/TestEANCodeService.cls.xml
===================================================================
diff -u -r38760 -r38765
--- vhUnitTest/APPS/PM/TestEANCodeService.cls.xml	(.../TestEANCodeService.cls.xml)	(revision 38760)
+++ vhUnitTest/APPS/PM/TestEANCodeService.cls.xml	(.../TestEANCodeService.cls.xml)	(revision 38765)
@@ -19,65 +19,47 @@
 </Method>
 
 <Method name="TestIsNieuweEANCodeNodigOK">
-<Implementation><![CDATA[
-	Set EANCodeService=##class(APPS.PM.EANCodeService).%New()
-	#dim IsNieuweEANCodeNodig As %Boolean = EANCodeService.IsNieuweEANCodeNodigVoorProduct(1000)
-	
-	Do $$$AssertEquals(IsNieuweEANCodeNodig,1, "De waarde is correct (ID:1000)")
+<Implementation><![CDATA[	Do ..AssertIsNieuweEANCodeNodig(1000, 1)
 ]]></Implementation>
 </Method>
 
 <Method name="TestIsNieuweEANCodeNodigBeperktActief">
-<Implementation><![CDATA[
-	Set EANCodeService=##class(APPS.PM.EANCodeService).%New()
-	#dim IsNieuweEANCodeNodig As %Boolean = EANCodeService.IsNieuweEANCodeNodigVoorProduct(1001)
-	
-	Do $$$AssertEquals(IsNieuweEANCodeNodig,0, "De waarde is correct (ID:1001)")
+<Implementation><![CDATA[	Do ..AssertIsNieuweEANCodeNodig(1001, 0)
 ]]></Implementation>
 </Method>
 
 <Method name="TestIsNieuweEANCodeNodigNietActief">
-<Implementation><![CDATA[
-	Set EANCodeService=##class(APPS.PM.EANCodeService).%New()
-	#dim IsNieuweEANCodeNodig As %Boolean = EANCodeService.IsNieuweEANCodeNodigVoorProduct(1002)
-	
-	Do $$$AssertEquals(IsNieuweEANCodeNodig,0, "De waarde is correct (ID:1002)")
+<Implementation><![CDATA[	Do ..AssertIsNieuweEANCodeNodig(1002, 0)
 ]]></Implementation>
 </Method>
 
 <Method name="TestIsNieuweEANCodeNodigGenerischAfgeleidStandaard">
-<Implementation><![CDATA[
-	Set EANCodeService=##class(APPS.PM.EANCodeService).%New()
-	#dim IsNieuweEANCodeNodig As %Boolean = EANCodeService.IsNieuweEANCodeNodigVoorProduct(1003)
-	
-	Do $$$AssertEquals(IsNieuweEANCodeNodig,0, "De waarde is correct (ID:1003)")
+<Implementation><![CDATA[	Do ..AssertIsNieuweEANCodeNodig(1003, 0)
 ]]></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><![CDATA[	Do ..AssertIsNieuweEANCodeNodig(1006, 1)
 ]]></Implementation>
 </Method>
 
 <Method name="TestIsNieuweEANCodeNodigAlsEANCodeReedsAanwezig">
-<Implementation><![CDATA[
-	Set EANCodeService=##class(APPS.PM.EANCodeService).%New()
-	#dim IsNieuweEANCodeNodig As %Boolean = EANCodeService.IsNieuweEANCodeNodigVoorProduct(1004)
-	
-	Do $$$AssertEquals(IsNieuweEANCodeNodig,0, "De waarde is correct (ID:1004)")
+<Implementation><![CDATA[	Do ..AssertIsNieuweEANCodeNodig(1004, 0)
 ]]></Implementation>
 </Method>
 
 <Method name="TestIsNieuweEANCodeNodigClassifZonderEAN">
+<Implementation><![CDATA[	Do ..AssertIsNieuweEANCodeNodig(1005, 0)
+]]></Implementation>
+</Method>
+
+<Method name="AssertIsNieuweEANCodeNodig">
+<FormalSpec>ProductID:%String,VerwachteNoodAanEANCode:%Boolean</FormalSpec>
 <Implementation><![CDATA[
 	Set EANCodeService=##class(APPS.PM.EANCodeService).%New()
-	#dim IsNieuweEANCodeNodig As %Boolean = EANCodeService.IsNieuweEANCodeNodigVoorProduct(1005)
+	#dim IsNieuweEANCodeNodig As %Boolean = EANCodeService.IsNieuweEANCodeNodigVoorProduct(ProductID)
 	
-	Do $$$AssertEquals(IsNieuweEANCodeNodig,0, "De waarde is correct (ID:1005)")
+	Do $$$AssertEquals(IsNieuweEANCodeNodig, VerwachteNoodAanEANCode, "De waarde is correct (ID:" _ ProductID _ ")")
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/APPS/PM/impl/EANCodeMock/ProductAPI.cls.xml
===================================================================
diff -u -r38760 -r38765
--- vhUnitTest/APPS/PM/impl/EANCodeMock/ProductAPI.cls.xml	(.../ProductAPI.cls.xml)	(revision 38760)
+++ vhUnitTest/APPS/PM/impl/EANCodeMock/ProductAPI.cls.xml	(.../ProductAPI.cls.xml)	(revision 38765)
@@ -20,6 +20,13 @@
 	}
 ]]></Implementation>
 </Method>
+
+<Method name="BestaatProduct">
+<FormalSpec>ProductID:DOM.common.ProductID</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (ProductID < 1007)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/PM/EANCodeService.cls.xml
===================================================================
diff -u -r38760 -r38765
--- APPS/PM/EANCodeService.cls.xml	(.../EANCodeService.cls.xml)	(revision 38760)
+++ APPS/PM/EANCodeService.cls.xml	(.../EANCodeService.cls.xml)	(revision 38765)
@@ -70,37 +70,24 @@
 	{
 		#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()'="")
-		#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
+		If (EANCode="") {
+			#dim IsGenerischAfgeleidProduct As %Boolean = (Product.GeefGenerischProductID()'="")
+			Set IsNieuweEANCodeNodig 
+				= ( (AdministratiefProduct.GeefClassificatieKnoop().GeefAutomatischEANCodeToekennen()) &&
+					($$$Not(IsGenerischAfgeleidProduct) || ..MagGenerischAfgeleidProductEanCodeKrijgen(ProductID)) )
 		}
 	}
 	Quit IsNieuweEANCodeNodig
 ]]></Implementation>
 </Method>
 
-<Method name="IsClassificatieWaarinOokGenerischAfgeleideProductenEenEanCodeKrijgen">
-<FormalSpec>ClassificatieKnoop:DOM.PM.ClassificatieKnoop</FormalSpec>
+<Method name="MagGenerischAfgeleidProductEanCodeKrijgen">
+<FormalSpec>ProductID:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ..IsLosseComponentenClassificatie(ClassificatieKnoop)
+<Implementation><![CDATA[	Quit ##class(DOM.DomeinContext).Instance().GeefProductTypeAPI().IsTaxLosseComponentenProduct(ProductID)
 ]]></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: vhTest/Mock/DOM/PM/ProductTypeAPI.cls.xml
===================================================================
diff -u -r35039 -r38765
--- vhTest/Mock/DOM/PM/ProductTypeAPI.cls.xml	(.../ProductTypeAPI.cls.xml)	(revision 35039)
+++ vhTest/Mock/DOM/PM/ProductTypeAPI.cls.xml	(.../ProductTypeAPI.cls.xml)	(revision 38765)
@@ -199,6 +199,13 @@
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("IsTandemboxProduct",ProductID)
 ]]></Implementation>
 </Method>
+
+<Method name="IsTaxLosseComponentenProduct">
+<FormalSpec>ProductID:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("IsTaxLosseComponentenProduct",ProductID)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: DOM/PM/impl/ProductTypeAPIimpl.cls.xml
===================================================================
diff -u -r38568 -r38765
--- DOM/PM/impl/ProductTypeAPIimpl.cls.xml	(.../ProductTypeAPIimpl.cls.xml)	(revision 38568)
+++ DOM/PM/impl/ProductTypeAPIimpl.cls.xml	(.../ProductTypeAPIimpl.cls.xml)	(revision 38765)
@@ -176,6 +176,21 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsTaxLosseComponentenProduct">
+<FormalSpec>ProductID:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Do ..ControleerOfProductBestaat(ProductID)
+	#dim AdministratiefProduct As DOM.PM.AdministratiefProduct = ##class(DOM.DomeinContext).Instance().GeefProductRolAPI().GeefAdministratiefProduct(ProductID)
+	#dim ClassificatieKnoop As DOM.PM.ClassificatieKnoop = AdministratiefProduct.GeefClassificatieKnoop()
+
+	Quit (  ##class(TECH.StringUtils).Equals( ClassificatieKnoop.GeefID(),
+				##class(DOM.PM.enu.Classificatie).TaorBoxFineerV10(),
+				##class(DOM.PM.enu.Classificatie).TaorBoxBicolorV10(),
+				##class(DOM.PM.enu.Classificatie).TaorBoxHoutDecorV10() )  )
+]]></Implementation>
+</Method>
+
 <Method name="IsTAORCubicsKindProduct">
 <FormalSpec>ProductID:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
Index: DOM/PM/ProductTypeAPI.cls.xml
===================================================================
diff -u -r35039 -r38765
--- DOM/PM/ProductTypeAPI.cls.xml	(.../ProductTypeAPI.cls.xml)	(revision 35039)
+++ DOM/PM/ProductTypeAPI.cls.xml	(.../ProductTypeAPI.cls.xml)	(revision 38765)
@@ -136,6 +136,12 @@
 <ReturnType>DOM.PM.TAORProduct.TAORLade</ReturnType>
 </Method>
 
+<Method name="IsTaxLosseComponentenProduct">
+<Abstract>1</Abstract>
+<FormalSpec>ProductID:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+</Method>
+
 <Method name="GeefLegraboxProduct">
 <Abstract>1</Abstract>
 <FormalSpec>ProductID:%String</FormalSpec>