Index: BL/PPS/TBX/DocsV1.cls.xml
===================================================================
diff -u -r63094 -r63103
--- BL/PPS/TBX/DocsV1.cls.xml	(.../DocsV1.cls.xml)	(revision 63094)
+++ BL/PPS/TBX/DocsV1.cls.xml	(.../DocsV1.cls.xml)	(revision 63103)
@@ -165,6 +165,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="ProboxInhoudEtiketGenerator">
+<Type>BL.PPS.TBX.DocsV1.ProboxInhoudEtiketGenerator</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="Printer">
 <Type>%String</Type>
 <Private>1</Private>
@@ -196,6 +201,7 @@
 	Set ..TBXMatToEnuMatConverter = ##class(BL.PPS.TBX.impl.TBXMatToEnuMatConverter).%New()
 	Set ..MatFormatter = ##class(APPS.Halux.PPS.impl.Formatter.Mat).%New()
 	Set ..LogoBepaler = $$$Inject(LogoBepaler, ##class(BL.PPS.common.impl.OnderdelendoosLogoBepaler).%New())
+	Set ..ProboxInhoudEtiketGenerator = ##class(BL.PPS.TBX.DocsV1.ProboxInhoudEtiketGenerator).%New()
 	Set ..PartijAPI = $$$Inject(PartijAPI, ##class(DOM.DomeinContext).Instance().GeefPartijAPI())
 	Set ..HtmlInhoudProboxEtiketBepaler = $$$Inject(HtmlInhoudProboxEtiketBepaler, ##class(BL.PPS.TBX.DocsV1.HtmlInhoudProboxEtiketBepaler).%New())
 	Quit $$$OK
@@ -1588,36 +1594,9 @@
 <Method name="ProboxInhoudEtiket">
 <FormalSpec>DnaCodeIterator:TECH.Iterator</FormalSpec>
 <Implementation><![CDATA[
-	if ($$$Not(DnaCodeIterator.HasNext())) 
-	{
-		Set Exception = ##class(TECH.Exceptions.InvalidInputException).%New("Geen Dna codes meegegeven.")
-		do ##class(TECH.ExceptionHandler).Throw(Exception)
-	}
-	 	
  	Do ..blLabelPrinter.Clear()
-	
-	#dim DnaCode As DOM.Halux.AAP.DnaCode
-	Set DnaCode = DnaCodeIterator.Next()
-	Do DnaCodeIterator.Reset()
-	
-	#dim PalletId As %String = DnaCode.PalletCode
-	#dim ToeleveringId As %String = DnaCode.Toelevering
-	#dim KlantNummer As %String = DnaCode.KlantNummer
-	#dim Partij As DOM.PARTIJ.Partij = ..PartijAPI.GeefPartij(DnaCode.KlantNummer)
-	
- 	Set ProboxInhoudLabel = ##class(BL.Etiket.ProboxInhoud).%New()
- 	Set ProboxInhoudLabel.Device = ..LabelDevice
- 	
- 	Set ProboxInhoudLabel.Aantal = 1
- 	Set ProboxInhoudLabel.KlantNaam = Partij.GeefNaam()
- 	Set ProboxInhoudLabel.InhoudAlsHTML = ..HtmlInhoudProboxEtiketBepaler.BepaalHtmlInhoudProboxEtiket(DnaCodeIterator)
- 	Set ProboxInhoudLabel.PalletBarcode = PalletId
- 	Set ProboxInhoudLabel.PalletBarcodeTxt = ..FormatteerPalletID(PalletId)
-
- 	Set ProboxInhoudLabel.Logo = ..GeefEtiketLogo(KlantNummer)
- 	
+ 	Set ProboxInhoudLabel = ..ProboxInhoudEtiketGenerator.GenereerProboxInhoudEtiket(DnaCodeIterator, ..LabelDevice)	
  	Do ..blLabelPrinter.Add(ProboxInhoudLabel)
- 	
 	Do ..blLabelPrinter.Print2Bartender()
 ]]></Implementation>
 </Method>