Index: vhUnitTest/BL/Flow/Proxy/pxLevering/TestAfzenderHoofding.cls.xml
===================================================================
diff -u -r51124 -r51127
--- vhUnitTest/BL/Flow/Proxy/pxLevering/TestAfzenderHoofding.cls.xml	(.../TestAfzenderHoofding.cls.xml)	(revision 51124)
+++ vhUnitTest/BL/Flow/Proxy/pxLevering/TestAfzenderHoofding.cls.xml	(.../TestAfzenderHoofding.cls.xml)	(revision 51127)
@@ -18,12 +18,14 @@
 
 <Method name="TestHoofdingVanHoeckexGeenHoofdingIngevuld">
 <Implementation><![CDATA[
-   Do ..MaakTestLevering(1000)
-   #dim BONNr As %String = ..BonID
-   #dim pxLevering As BL.Flow.Proxy.pxLevering = ##class(BL.Flow.Proxy.pxLevering).Create(BONNr,0,"F")
-   Do $$$AssertFalse($IsObject(pxLevering.AfzenderHoofding))
-   
-   Do $$$AssertEquals(pxLevering.HeaderType,"VHEPN")
+	Do ..MaakTestLevering(1000)
+	#dim BONNr As %String = ..BonID
+	#dim pxLevering As BL.Flow.Proxy.pxLevering = ##class(BL.Flow.Proxy.pxLevering).Create(BONNr,0,"F")
+	Do $$$AssertFalse($IsObject(pxLevering.AfzenderHoofding))
+
+	Do $$$AssertEquals(pxLevering.HeaderType,"VHEPN")
+	Do $$$AssertEquals(pxLevering.BarCodeBONNr,"900000")
+	Do $$$AssertEquals(pxLevering.LEVERINGSNR,"900000")
 ]]></Implementation>
 </Method>
 
@@ -54,6 +56,8 @@
 	Do $$$AssertEquals(pxLevering.BTWNR,"GEEN")
 	Do $$$AssertEquals(pxLevering.FactuurAan,"","""Factuur aan: "" niet ingevuld")
 	Do $$$AssertEquals(pxLevering.CheckSumBon,"","Checksum niet ingevuld")
+	Do $$$AssertEquals(pxLevering.BarCodeBONNr,"900000")
+	Do $$$AssertEquals(pxLevering.LEVERINGSNR,"900000")
   
    Quit $$$OK
 ]]></Implementation>
@@ -92,6 +96,8 @@
 	Do $$$AssertEquals(pxLevering.BTWNR,"")
 	Do $$$AssertEquals(pxLevering.FactuurAan,"","""Factuur aan: "" niet ingevuld")
 	Do $$$AssertEquals(pxLevering.CheckSumBon,"","Checksum niet ingevuld")
+	Do $$$AssertEquals(pxLevering.BarCodeBONNr,"","Barcodenummer leeg")
+	Do $$$AssertEquals(pxLevering.LEVERINGSNR,"","Leveringsnummer leeg")
 	
 	Quit $$$OK
 ]]></Implementation>
Index: BL/Flow/Proxy/pxLevering.cls.xml
===================================================================
diff -u -r51124 -r51127
--- BL/Flow/Proxy/pxLevering.cls.xml	(.../pxLevering.cls.xml)	(revision 51124)
+++ BL/Flow/Proxy/pxLevering.cls.xml	(.../pxLevering.cls.xml)	(revision 51127)
@@ -451,6 +451,12 @@
 	Set ..CheckDigitLevNr=$$CalcCDigit6^vhRtn2(BONNr)
 	Set ..BarCodeBONNr=BONNr
 	
+	If AfzenderHoofdingDto.HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).HaefeleNL() {
+		Set ..LEVERINGSNR=""
+		Set ..CheckDigitLevNr=""
+		Set ..BarCodeBONNr=""
+	}
+	
 	#dim KlantID As DOM.VKP.VanHoeckeKlantID = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID(KLNr)
 	Set ..KlantType=$S(##class(DOM.DomeinContext).Instance().GeefKlantTypeAPI().IsIndustriePoolKlant(KlantID):"I", 1:"K")   ; Industrie klant of KS