Index: cspBasis/GAProdDfls.cls.xml
===================================================================
diff -u -r629 -r648
--- cspBasis/GAProdDfls.cls.xml	(.../GAProdDfls.cls.xml)	(revision 629)
+++ cspBasis/GAProdDfls.cls.xml	(.../GAProdDfls.cls.xml)	(revision 648)
@@ -609,8 +609,9 @@
 <Implementation><![CDATA[
 	#define pcDefaultVPK   $P(pdlMatenDfl,"\",6)
 
-	Set NietBewarenV1Verpakking = 1
-	If (NietBewarenV1Verpakking) && ($$$pcDefaultVPK = "S") {
+	Set VHKlantIDsMetDefaultV1 = ##class(APPS.TBXWeb.VerpakkingUtils).%New().GeefVHKlantIDsMetDefaultV1()
+	Set WisV1VerpakkingAlsDefault = $$$Not(##class(TECH.ListUtils).Contains(VHKlantIDsMetDefaultV1, ..KLNr))
+	If (WisV1VerpakkingAlsDefault) && ($$$pcDefaultVPK = "S") {
 		Set $$$pcDefaultVPK = ""
 	}