Index: HADETIK.mac.rou
===================================================================
diff -u -r59279 -r59304
--- HADETIK.mac.rou	(.../HADETIK.mac.rou)	(revision 59279)
+++ HADETIK.mac.rou	(.../HADETIK.mac.rou)	(revision 59304)
@@ -75,7 +75,7 @@
  ;
 TOE(TOENr,TLNr,Print,Order) 
  ; TOENr verplicht, TLNr optioneel
- New C,R,%SC,KLNr,PRNr,Dev,Aantal,DefAant,SortKey,PrintEtiketten
+ New C,R,%SC,KLNr,PRNr,Dev,Aantal,DefAant,SortKey,PrintEtiketten,DnaCode
  Set LEVNr=$$$LevHalux
  Kill %Print2File,PrintEtiketten
  Set PrintEtiketten = ##class(%ListOfObjects).%New()
@@ -93,7 +93,12 @@
  .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)
- ..Do PRINT(Dev,"T",TOENr,TLNr,PRNr,Aantal)
+ ..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,,"")
  Else  Do
  .Set Dev=$G(Print("DEV"))
  .Do:0[Dev INIT
@@ -119,7 +124,13 @@
  ..If $G(Order) Do
  ...Set SortKey=$$SortKey(PRNr) Set:$L(SortKey) SortKey=SortKey_"-" Set SortKey=SortKey_TLNr
  ...Set Order(SortKey)=PRNr_D_Aantal_D_TLNr
- ..Else  Do PRINT(Dev,"T",TOENr,TLNr,PRNr,Aantal)
+ ..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 PrintNaarDropfolder($G(Dev))
 Quit
@@ -401,7 +412,7 @@
 	#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 ..."	
@@ -432,7 +443,7 @@
 	 Set C("LABELTYP")=$G(C("LABELTYP"),$S($L($G(C("DOSNR"))):"ALGBARC",1:"ALG")) // Indien Halux dossiernummer, dan etiketlayout m�t barcode.
 	 Set:((C("LABELTYP")="ALG") && ($L($G(C("BARCODE"))))) C("LABELTYP")="ALGBARC" // Indien een klantbarcode, dan etiketlayout m�t barcode.
  
-	 Set C("LOGO")=$G(^IPCom("CS","LOGO4682",0))
+ 	 Set C("LOGO")=$G(^IPCom("CS","LOGO4682",0))
 	 Set:$D(^IPCom("CS","LOGO"_C("KLNR"))) C("LOGO")=$G(^IPCom("CS","LOGO"_C("KLNR"),0))
 	 Set:($G(C("KLNR"))=$$$KlantDKGDeKeukenfabriek) C("LOGO")=""
 	 For Loop=1:1:$G(C("AANTAL"),Aantal) Do