Index: CHUI/Prod/ProductLabel.cls.xml
===================================================================
diff -u -r62482 -r62483
--- CHUI/Prod/ProductLabel.cls.xml	(.../ProductLabel.cls.xml)	(revision 62482)
+++ CHUI/Prod/ProductLabel.cls.xml	(.../ProductLabel.cls.xml)	(revision 62483)
@@ -102,69 +102,23 @@
 
 <Method name="PrintMaatwerkMetDnaCodes">
 <FormalSpec>DnaCodeObject:DOM.Halux.AAP.DnaCode</FormalSpec>
-<Implementation><![CDATA[	Do ..PrintVHMaatwerkMetDnaCodeObject(DnaCodeObject)
-]]></Implementation>
-</Method>
-
-<Method name="PrintVHMaatwerkMetDnaCodes">
-<ClassMethod>1</ClassMethod>
-<FormalSpec>KlantNaam:%String,PRNr:%String,TOENr:%String,ORDNr:%String,Aantal:TECH.Integer,Device:%String,DnaCode:%String</FormalSpec>
 <Implementation><![CDATA[
-	#dim bl As CHUI.Prod.ProductLabel =..Instantiate()
-	Do bl.Init(PRNr)
-	Set bl.DefaultLayout="Product verpak maatwerk VH 5x10"
-	
-	#dim Order As DOM.VKP.Order = ##class(DOM.DomeinContext).Instance().GeefOrderAPI().GeefOrder(ORDNr)
-	#dim Personality As DOM.common.Personality = ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(Order.GeefPersonalityID())
-	#Dim KlantInstellingenService As APPS.common.KlantInstellingenService = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefKlantInstellingenService(Personality)
-	
-	Set LabelPrinter = ##class(BL.Sys.LabelPrinter).%New()
-	
-	#dim EtiketTeller As %Integer = 0
-	For EtiketTeller=0:1:Aantal-1 {
-		Do bl.DefaultVH(bl.pxLabel)
-		Set bl.pxLabel.Layout=bl.DefaultLayout
-		Set:$G(Aantal) bl.pxLabel.Aantal=1
-		
-		Set bl.pxLabel.StockCode=$G(TOENr)
-		Set bl.pxLabel.OrderNr=$G(ORDNr)
-		Set bl.pxLabel.KlantNaam=$G(KlantNaam)
-		Set LocId="X"_$TR($J(..GetUniqueLocID(),5)," ","0")
-		Set bl.pxLabel.Barcode=LocId
-		Set bl.pxLabel.BarcodeTekst="Loc: "_LocId
-		Set bl.pxLabel.Device=$G(Device)
-		Set:bl.pxLabel.Device="" bl.pxLabel.Device="Halux_Productie_Keller"
-		If $$$Not(KlantInstellingenService.MagLogoOpEtiket(Order.GeefKlantID())) {
-			Set bl.pxLabel.Logo = ""
-			Set bl.pxLabel.KlantNaam=""
-		}
-		if $$$HasLength(DnaCode) {
-			Set bl.pxLabel.DnaCode = DnaCode
-		} Else {
-			Set bl.pxLabel.DnaCode = ##class(APPS.Halux.AAP.DnaCodeService).%New().GeefVolgendeAfTeDrukkenDnaCode(TOENr,PRNr)
-		}
-		Do LabelPrinter.Add(bl.pxLabel)
-	}
-	
-	Do LabelPrinter.Print2Bartender()
-]]></Implementation>
-</Method>
-
-<Method name="PrintVHMaatwerkMetDnaCodeObject">
-<Description>
-d ##class(CHUI.Prod.ProductLabel).PrintVHMaatwerk(483079,"XSDS",1)</Description>
-<ClassMethod>1</ClassMethod>
-<FormalSpec>DnaCodeObject:DOM.Halux.AAP.DnaCode</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
 	#dim KlantNaam As %String = ##class(DOM.DomeinContext).Instance().GeefPartijAPI().GeefPartij(DnaCodeObject.KlantNummer).GeefNaam()
 	#dim PRNr As %String = DnaCodeObject.ProductNummer
 	#dim TOENr As %String = DnaCodeObject.Toelevering
 	#dim ORDNr As %String = DnaCodeObject.OrderId
 	#dim Aantal As TECH.Integer = 1
-	#dim DnaCode As %String = DnaCodeObject.DnaCode
 	#dim Device As %String = ""
+	#dim DnaCode As %String = DnaCodeObject.DnaCode
 	
+	Do ..PrintVHMaatwerkMetDnaCodes(KlantNaam, PRNr, TOENr, ORDNr, Aantal, Device, DnaCode)
+]]></Implementation>
+</Method>
+
+<Method name="PrintVHMaatwerkMetDnaCodes">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>KlantNaam:%String,PRNr:%String,TOENr:%String,ORDNr:%String,Aantal:TECH.Integer,Device:%String,DnaCode:%String</FormalSpec>
+<Implementation><![CDATA[
 	#dim bl As CHUI.Prod.ProductLabel =..Instantiate()
 	Do bl.Init(PRNr)
 	Set bl.DefaultLayout="Product verpak maatwerk VH 5x10"