Index: HADETIK.mac.rou
===================================================================
diff -u -r60007 -r60008
--- HADETIK.mac.rou	(.../HADETIK.mac.rou)	(revision 60007)
+++ HADETIK.mac.rou	(.../HADETIK.mac.rou)	(revision 60008)
@@ -93,12 +93,7 @@
  .Set SortKey=""
  .For  Set SortKey=$O(Order(SortKey)) Quit:SortKey=""  Do
  ..Set R=Order(SortKey),PRNr=$P(R,D),Aantal=$P(R,D,2),TLNr=$P(R,D,3)
- ..If ##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefDnaCodeOpEtiket() Do
- ...For EtiketTeller=1:1:Aantal  Do
- ....Set DnaCode = ##class(APPS.Halux.AAP.DnaCodeService).%New().GeefVolgendeAfTeDrukkenDnaCode(TOENr,PRNr,"")
- ....Do PRINT(Dev,"T",TOENr,TLNr,PRNr,1,,DnaCode)
- ..Else  Do
- ...Do PRINT(Dev,"T",TOENr,TLNr,PRNr,Aantal,,"")
+ ..Do PRINT(Dev,"T",TOENr,TLNr,PRNr,Aantal,,"")
  Else  Do
  .Set Dev=$G(Print("DEV"))
  .Do:0[Dev INIT
@@ -125,12 +120,7 @@
  ...Set SortKey=$$SortKey(PRNr) Set:$L(SortKey) SortKey=SortKey_"-" Set SortKey=SortKey_TLNr
  ...Set Order(SortKey)=PRNr_D_Aantal_D_TLNr
  ..Else  Do 
- ...If ##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefDnaCodeOpEtiket() Do
- ....For EtiketTeller=1:1:Aantal  Do
- .....Set DnaCode = ##class(APPS.Halux.AAP.DnaCodeService).%New().GeefVolgendeAfTeDrukkenDnaCode(TOENr,PRNr,"")
- .....Do PRINT(Dev,"T",TOENr,TLNr,PRNr,1,,DnaCode)
- ...Else  Do
- ....Do PRINT(Dev,"T",TOENr,TLNr,PRNr,Aantal,,"")
+ ...Do PRINT(Dev,"T",TOENr,TLNr,PRNr,Aantal,,"")
  
  Do PrintNaarDropfolder($G(Dev))
 Quit
@@ -412,12 +402,18 @@
 	#dim IsLegrabox As %Boolean = ProductTypeAPI.IsLegraboxProduct(ProductID)
 	Quit (IsTandembox || IsLegrabox || IsTAORbox)
  
-PRINT(Dev,ObjTyp,ObjRef,ObjLNr,PRNr,Aantal,VoorkeurPrinter,DnaCode) 
+PRINT(Dev,ObjTyp,ObjRef,ObjLNr,PRNr,Aantal,VoorkeurPrinter,DnaCode="") 
  New C,GenTyp,ProdGrp,Etiket,AantalEtiketten
  Set VoorkeurPrinter = $G(VoorkeurPrinter)
  If '$data(%request) Set FP=2001 Write @F,@F1,!?2,"Printing ..."	
+ 
  If $$HeeftMaatwerkEtiketNodig(PRNr){
 	#dim Etiket As APPS.common.Print.AbstractLabel
+ 
+	 If DnaCode="" && ObjTyp = "T" && ##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefDnaCodeOpEtiket(){
+		Set DnaCode = ##class(APPS.Halux.AAP.DnaCodeService).%New().GeefVolgendeAfTeDrukkenDnaCode(ObjRef,PRNr,"") 
+		Set Aantal = 1
+	 }
 	#dim AantalEtiketten As %Integer = $G(C("AANTAL"),Aantal)
  	
 	If ObjTyp="T" {
@@ -433,8 +429,15 @@
 	 Do:ObjTyp="O" FETCHO(ObjRef,ObjLNr,PRNr,$G(Aantal),.C)
  
 	 If $E($$$PRGet($$$KortTekst),1,3)="Z37" Do  Quit ; Glazen boxside op maat
-	 . Do ##class(CHUI.Prod.ProductLabel).PrintVHMaatwerk(PRNr,$G(C("KLNMBIG")),$G(C("TOENR")),$G(C("ORDNR")),Aantal)
+	 . Do ##class(CHUI.Prod.ProductLabel).PrintVHMaatwerkMetDnaCodes(PRNr,$G(C("KLNMBIG")),$G(C("TOENR")),$G(C("ORDNR")),Aantal)
  
+ 
+ 
+	 If DnaCode="" && ObjTyp = "T" && ##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefDnaCodeOpEtiket(){
+		Set DnaCode = ##class(APPS.Halux.AAP.DnaCodeService).%New().GeefVolgendeAfTeDrukkenDnaCode(ObjRef,PRNr,"") 
+		Set Aantal = 1
+	 }
+ 
 	 Set ProdGrp=##class(BL.PPS.TBX.LeanBatch).%New().ProdGrp(PRNr,$G(C("KLNR")))
 	 Quit:ProdGrp?1(1"A",1"B") ; VHoss - wordt afgedrukt NA de optimalisatie
 	 Quit:ProdGrp="+" ; Keller - geen etiket nodig // Niet meer van toepassing.
Index: CHUI/Prod/ProductLabel.cls.xml
===================================================================
diff -u -r41360 -r60008
--- CHUI/Prod/ProductLabel.cls.xml	(.../ProductLabel.cls.xml)	(revision 41360)
+++ CHUI/Prod/ProductLabel.cls.xml	(.../ProductLabel.cls.xml)	(revision 60008)
@@ -100,6 +100,48 @@
 ]]></Implementation>
 </Method>
 
+<Method name="PrintVHMaatwerkMetDnaCodes">
+<Description>
+d ##class(CHUI.Prod.ProductLabel).PrintVHMaatwerk(483079,"XSDS",1)</Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>PRNr,KlantNaam,TOENr,ORDNr,Aantal,Device</FormalSpec>
+<Implementation><![CDATA[
+	Set bl=..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 {
+		//Set ..pxLabel = ##class(CHUI.Prod.sub.pxProductLabel).%New()
+		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=""
+		}
+		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="GetUniqueLocID">
 <ClassMethod>1</ClassMethod>
 <Implementation><![CDATA[	Quit $I(^RES("EWPAL","CNT","MAATWERK"))
@@ -277,6 +319,7 @@
 <Method name="DefaultVH">
 <Description>
 Invullen van property pxLabel met VH product gegevens</Description>
+<FormalSpec>pxLabel:APPS.common.Print.AbstractLabel</FormalSpec>
 <Implementation><![CDATA[
 	#dim Korttekst As TECH.String = ..Product.KortTekst
 	Set ..pxLabel=##class(CHUI.Prod.sub.pxProductLabel).%New()
Index: BL/Sys/LabelPrinter.cls.xml
===================================================================
diff -u -r58845 -r60008
--- BL/Sys/LabelPrinter.cls.xml	(.../LabelPrinter.cls.xml)	(revision 58845)
+++ BL/Sys/LabelPrinter.cls.xml	(.../LabelPrinter.cls.xml)	(revision 60008)
@@ -321,7 +321,7 @@
 	{
 		#dim BartLayout As %String = $O(..Data(BartDevice,""))
 		While BartLayout '= "" 
-		{   
+		{
 			Do ..Print2BartenderOnDeviceWithLayout(BartDevice,BartLayout)
 			Set BartLayout = $O(..Data(BartDevice,BartLayout))
 		}