Index: APPS/Halux/Docs/impl/LadeKlantEtiketBuilder.cls.xml
===================================================================
diff -u -r56759 -r56761
--- APPS/Halux/Docs/impl/LadeKlantEtiketBuilder.cls.xml	(.../LadeKlantEtiketBuilder.cls.xml)	(revision 56759)
+++ APPS/Halux/Docs/impl/LadeKlantEtiketBuilder.cls.xml	(.../LadeKlantEtiketBuilder.cls.xml)	(revision 56761)
@@ -138,19 +138,7 @@
 	
 	Set Etiket.KlantBarcode = ..GeefKlantBarcode(Partij,ProductOrderLijn)
 	If $$$HasLength(Etiket.KlantBarcode) {
-		If Partij.GeefID()=##class(DOM.VKP.enu.Klant).Labonorm() {
-			If ##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefLabonormVhoss() {
-				If Etiket.VerzendWijze = ##class(DOM.PM.enu.LBXVerpakkingType).VHoss() {
-					Set Etiket.Layout = "MaatwerkProductInVHoss2D 5x10"
-				} Else {
-					Set Etiket.Layout = "MaatwerkProduct 5x10"
-				}
-			} Else {
-				Set Etiket.Layout = "MaatwerkProduct 5x10"
-			}
-		} Else {
-			Set Etiket.Layout = "MaatwerkProductBAR 8x11"
-		}
+		Set Etiket.Layout = $$$If((Partij.GeefID()=##class(DOM.VKP.enu.Klant).Labonorm()),"MaatwerkProduct 5x10","MaatwerkProductBAR 8x11")
 	}
 	
 	If $$$HasLength(ProductOrderLijn.GeefToeleveringID()) {
Index: vhUnitTest/APPS/Halux/common/impl/VoegToeBezwaren/ToeleveringInBatch/Test.cls.xml
===================================================================
diff -u -r56759 -r56761
--- vhUnitTest/APPS/Halux/common/impl/VoegToeBezwaren/ToeleveringInBatch/Test.cls.xml	(.../Test.cls.xml)	(revision 56759)
+++ vhUnitTest/APPS/Halux/common/impl/VoegToeBezwaren/ToeleveringInBatch/Test.cls.xml	(.../Test.cls.xml)	(revision 56761)
@@ -49,12 +49,6 @@
 	set BatchService = ##class(APPS.Halux.common.impl.BatchService).%New()
 	#dim Batch As APPS.Halux.common.Batch = BatchService.MaakNieuweLegeBatch(##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate(),##class(APPS.Halux.common.enu.Categorie).Tandembox())
 	#dim Toelevering As DOM.AKP.Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(..#ToeleveringID)
-	
-	Set Toeleveringen = ##class(%ListOfObjects).%New()
-	Do Toelevering.ZetKlantID("K||6279")
-	Do Toeleveringen.Insert(Toelevering)
-	Do Batch.VoegToeToeleveringenAanBatch(Toeleveringen)	
-	
 	#dim Bezwaren As %ListOfDataTypes = ##class(APPS.Halux.common.impl.VoegToeBezwaren.ToeleveringInBatch).%New(Batch,Toelevering).GeefBezwaren()
 	if $$$AssertEquals(Bezwaren.Count(),1) {
 		do $$$AssertContains(Bezwaren.GetAt(1),"Deze toelevering zit reeds in batch")
@@ -65,12 +59,10 @@
 
 <Method name="TestToeleveringReedsInDezeBatch">
 <Implementation><![CDATA[
-	Do ..MaakToelevering()
 	Do ..MaakBatch()
 	set BatchService = ##class(APPS.Halux.common.impl.BatchService).%New()
 	#dim Batch As APPS.Halux.common.Batch = BatchService.GeefBatch(..BatchID)
 	#dim Toelevering As DOM.AKP.Toelevering = ##class(DOM.DomeinContext).Instance().GeefToeleveringAPI().GeefToelevering(..#ToeleveringID)
-	Do Toelevering.ZetKlantID("K||6279")
 	#dim Bezwaren As %ListOfDataTypes = ##class(APPS.Halux.common.impl.VoegToeBezwaren.ToeleveringInBatch).%New(Batch,Toelevering).GeefBezwaren()
 	if $$$AssertEquals(Bezwaren.Count(),1) {
 		do $$$AssertEquals(Bezwaren.GetAt(1),"De toelevering zit reeds in deze batch")
@@ -86,20 +78,11 @@
   	Set ^KTO1(..#ToeleveringID)="6332\"
  	
  	Set ^KTO(6332,..#ToeleveringID,0)=103                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         
-	Set ^KTO(6332,..#ToeleveringID,1)="\16.02.11\KOMM. TESTKLANT VAN HOECK\\\6332\\6279\\\\\\\\\\EUR\62151,43200\\\2\\\\"
+	Set ^KTO(6332,..#ToeleveringID,1)="\16.02.11\KOMM. TESTKLANT VAN HOECK\\\6332\\1000\\\\\\\\\\EUR\62151,43200\\\2\\\\"
 	Set ^KTO(6332,..#ToeleveringID,4)=3
 	Set ^KTO(6332,..#ToeleveringID,101)="\700\250\\\44.33\#\\11082.50\11082.50\\L\1\\100\11082.50\KTRPL\\\\E\EUR\\\11/08\\\101\\\\\\\\"
 	Set ^KTO(6332,..#ToeleveringID,102)="\595226\1\\\64.71\#\\64.71\64.71\\L\2\\200\64.71\KTRPL\\\\E\EUR\\\11/08\\\102\\\\\\\\"
 	
-	Set ^KOD(6279,"F",118153,1)="\02.02.11\45263 cuisine cote basque\\\6279\DI2;1`DI2;2`DI2;3`DI2;4`DI2;5\1087#1096#62124,64781\\ygransart@lmc.tm.fr\\\\1\\\\EUR\\\00\2\\1087#62124,64781#118153\\\\\\\\\\\\\\\\\\\\\62124,64781"
-	Set ^KOD(6279,"F",118153,2)="\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
-	Set ^KOD(6279,"F",118153,3)="0\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
-	Set ^KOD(6279,"F",118153,4)=2
-	Set ^KOD(6279,"F",118153,101)="703100 \629192\30\\\59.60\40#0\0\59.60\59.60\703100 \L\\\100\59.60\KF0\\\\E1\EUR\\\62138\\296195\101\62143\\\\\\\\\\\\\\\\\1\\"
-	Set ^KOD(6279,"F",118153,102)="703100 \629192\30\\\59.60\40#0\0\59.60\59.60\703100 \L\\\200\59.60\KF0\\\\E1\EUR\\\62138\\296195\102\62143\\\\\\\\\\\\\\\\\1\\"
-	do ##class(vhUnitTest.DataHelper).MaakOrderCompleet(6279,118153)
-	
-	
 	Set DnaCode = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode.Toelevering = ..#ToeleveringID
 	Set DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).Nieuw()