Index: vhUnitTest/APPS/VisiDot/TestVHossCases.cls.xml
===================================================================
diff -u -r2783 -r2786
--- vhUnitTest/APPS/VisiDot/TestVHossCases.cls.xml	(.../TestVHossCases.cls.xml)	(revision 2783)
+++ vhUnitTest/APPS/VisiDot/TestVHossCases.cls.xml	(.../TestVHossCases.cls.xml)	(revision 2786)
@@ -85,13 +85,20 @@
 	//// ^TO(,,..ToeleveringID
 		
 	Do ##class(vhUnitTest.APPS.common.Toelevering).VerwijderToelevering(..ToeleveringID)
-	k ^UPRCP("B","TB")
 	k ^KOD(1239,"F",..#OrderID)
 	k ^KO1(..#OrderID)
 	Quit ##super()
 ]]></Implementation>
 </Method>
 
+<Method name="OnAfterAllTests">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	k ^UPRCP("B","VisiDot")
+	Quit ##super()
+]]></Implementation>
+</Method>
+
 <Method name="TestZijkantCorrect">
 <Implementation><![CDATA[
 	Set Capture=..VHossBuilder.CorrectVHoss(1,1)
@@ -182,6 +189,7 @@
 
 <Method name="TestEnd">
 <Implementation><![CDATA[
+	d WLIP^vhDBG(127,"TestEnd")
 	Set Capture=..VHossBuilder.CorrectVHoss(1,1)
 	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
 	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
@@ -201,11 +209,13 @@
 	
 	Set ErrorCode=..Finish(ProcessedData)	
 	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).OK(),"Alle queue elementen van de batch hebben frameIDs")
+	d WLIP^vhDBG(127,"TestEnd Einde")
 ]]></Implementation>
 </Method>
 
 <Method name="TestEndNotAllDone">
 <Implementation><![CDATA[
+	d WLIP^vhDBG(127,"TestEndNotAllDone")
 	Set Capture=..VHossBuilder.CorrectVHoss(1,1)
 	Set Status = Capture.XMLExportToStream(.CaptureInfoStream,,"literal")	
 	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), CaptureInfoStream, .ResultDesc, .ProcessedData)
@@ -221,6 +231,7 @@
 	
 	Set ErrorCode=..Finish(ProcessedData)	
 	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossOntbrekendeFrame(),"1 ontbrekend frame want 1 zijkant is niet gescanned geworden")
+	d WLIP^vhDBG(127,"TestEndNotAllDone EINDE")
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/APPS/VisiDot/TestVHossXML.cls.xml
===================================================================
diff -u -r2783 -r2786
--- vhUnitTest/APPS/VisiDot/TestVHossXML.cls.xml	(.../TestVHossXML.cls.xml)	(revision 2783)
+++ vhUnitTest/APPS/VisiDot/TestVHossXML.cls.xml	(.../TestVHossXML.cls.xml)	(revision 2786)
@@ -62,6 +62,26 @@
 ]]></Implementation>
 </Method>
 
+<Method name="OnAfterOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Do ##class(vhUnitTest.APPS.common.Toelevering).VerwijderToelevering(..ToeleveringID)
+	k ^KOD(1239,"F",..#OrderID)
+	k ^KO1(..#OrderID)
+	
+	Quit ##super(aTestName)
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	k ^UPRCP("B","VisiDot")
+	Quit ##super()
+]]></Implementation>
+</Method>
+
 <Method name="Import">
 <FormalSpec>Dir,FileName</FormalSpec>
 <Private>1</Private>
@@ -172,19 +192,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="OnAfterOneTest">
-<FormalSpec>aTestName:%String</FormalSpec>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Do ##class(vhUnitTest.APPS.common.Toelevering).VerwijderToelevering(..ToeleveringID)
-	k ^UPRCP("B","TB")
-	k ^KOD(1239,"F",..#OrderID)
-	k ^KO1(..#OrderID)
-	
-	Quit ##super(aTestName)
-]]></Implementation>
-</Method>
-
 <Method name="TestNormalReadAllOK">
 <Implementation><![CDATA[
 	Set Dir = "Stage2_NormalRead_AllOk\"
Index: APPS/VisiDot/impl/VHossProductionHelper.cls.xml
===================================================================
diff -u -r2571 -r2786
--- APPS/VisiDot/impl/VHossProductionHelper.cls.xml	(.../VHossProductionHelper.cls.xml)	(revision 2571)
+++ APPS/VisiDot/impl/VHossProductionHelper.cls.xml	(.../VHossProductionHelper.cls.xml)	(revision 2786)
@@ -38,6 +38,15 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefPalletIDVanVHossID">
+<FormalSpec>VHossID:%String</FormalSpec>
+<Implementation><![CDATA[
+	Set Type = $Extract(VHossID,1,2) 
+	Set VHossNr = $Extract(VHossID,5,10) 
+	Quit Type_VHossNr
+]]></Implementation>
+</Method>
+
 <Method name="GeefBatchVanLadeID">
 <FormalSpec>LadeID:%String</FormalSpec>
 <ReturnType>%Integer</ReturnType>
Index: APPS/VisiDot/impl/EndAfhandelaar.cls.xml
===================================================================
diff -u -r2783 -r2786
--- APPS/VisiDot/impl/EndAfhandelaar.cls.xml	(.../EndAfhandelaar.cls.xml)	(revision 2783)
+++ APPS/VisiDot/impl/EndAfhandelaar.cls.xml	(.../EndAfhandelaar.cls.xml)	(revision 2786)
@@ -21,7 +21,6 @@
 	Do ..RecepteerProducten()
 	Do ..ToeleveringIngescand()
 	
-	
 	Set BestandNaam = "EndInfo_OUT.xml"
 	Do ..BewaarData(ProcessedData,BestandNaam)
 ]]></Implementation>
@@ -52,15 +51,15 @@
 <Implementation><![CDATA[
 	Set ReturnStatus = $$$OK
 	
+	
+	Set ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI()
 	/// Enkel uitvoeren als er een batch te discoveren is.	
 	If (..CaptureHelper.GeefBatchID()){
 		Set ProductionHelper = ##class(APPS.VisiDot.impl.VHossProductionHelper).%New()
 		
-						
 		Set UserID = "VisiDot"
 		Set ReceptieGroepID = "VisiDot"
-		Set FrameID = "Vhoss"
-		Set Locatie = "Locatie"
+		Set LocatieTransit = "04020101"
 		
 		/// Nieuwe bufferVolgNr opbouwen
 		Set ..bfrVolgNr = ##class(BL.MB.UGLYPicking.Receptie).CreateNewBuffer(ReceptieGroepID,UserID)
@@ -71,21 +70,25 @@
 			/// QueueElement As DS.PPS.TBX.Queue
 			Set QueueElement = QueueIterator.Next()
 			
+			Set QueueHelper = ##class(APPS.VisiDot.impl.QueueHelper).%New(QueueElement,ProductAPI)
+			
 			Set $ZTRAP = "CatchReceptieProbleem"
 			
 			If (QueueElement.Status = "W"){
 				
-				Set ProductID = QueueElement.Product.ProductNr
+				Set ProductID = QueueHelper.GeefProductNr()
 				Set BatchID = ..CaptureHelper.GeefBatchID()	
+				Set ToeleveringID = QueueElement.TOENr
 				Set Dossier = QueueElement.DOSNr
+				Set FrameID = ProductionHelper.GeefPalletIDVanVHossID(QueueHelper.GeefFrameID())
 				Set ProdIsInKOM = ""
 				Set DomeinContext = ##class(TECH.Context.RuntimeContext).Instance()
 				Set GebruikerInitialen = DomeinContext.GeefGebruikerInitialen()
-				Set Status = ##class(BL.MB.UGLYPicking.Receptie).AddToBuffer(ReceptieGroepID,..bfrVolgNr,ProductID,Dossier,Locatie,FrameID,GebruikerInitialen,.ProdIsInKOM)
+				Set Status = ##class(BL.MB.UGLYPicking.Receptie).AddToBuffer(ReceptieGroepID,..bfrVolgNr,ProductID,Dossier,LocatieTransit,FrameID,GebruikerInitialen,.ProdIsInKOM,ToeleveringID)
 				
 				If ($LG(Status,1) < 0)
 				{
-					Set FoutString = "##class(BL.MB.UGLYPicking.Receptie).AddToBuffer("_ReceptieGroepID_","_..bfrVolgNr_","_ProductID_","_Dossier_","_Locatie_","_FrameID_","_GebruikerInitialen_","_ProdIsInKOM_")"					
+					Set FoutString = "##class(BL.MB.UGLYPicking.Receptie).AddToBuffer("_ReceptieGroepID_","_..bfrVolgNr_","_ProductID_","_Dossier_","_LocatieTransit_","_FrameID_","_GebruikerInitialen_","_ProdIsInKOM_")"					
 					Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Fout bij uitvoeren van "_FoutString_$C(13,10)_"Fout: "_$LG(Status,2)))	
 				}				
 			}	
@@ -104,16 +107,12 @@
 
 <Method name="ToeleveringIngescand">
 <Implementation><![CDATA[
-	
 	Set ReceptieGroepID = "VisiDot"
-	
 	If (..bfrVolgNr '= ""){	
 		Do WLIP^vhDBG(127,"UglyPickingReceptieVolgNr : "_..bfrVolgNr)
 		Set EventData = ##class(BL.MB.UGLYPicking.Events.ToeFinishedEventData).%New("",ReceptieGroepID,..bfrVolgNr)
 		Set Event = ##class(BL.MB.UGLYPicking.Events.ToeFinishedEvent).%New(EventData)
 		Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(Event)
-	}Else{
-		Do WLIP^vhDBG(127,"UglyPickingReceptieVolgNr niet ingevuld")
 	}
 ]]></Implementation>
 </Method>
Index: vhUnitTest/APPS/common/Toelevering.cls.xml
===================================================================
diff -u -r2783 -r2786
--- vhUnitTest/APPS/common/Toelevering.cls.xml	(.../Toelevering.cls.xml)	(revision 2783)
+++ vhUnitTest/APPS/common/Toelevering.cls.xml	(.../Toelevering.cls.xml)	(revision 2786)
@@ -66,7 +66,14 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>ToeleveringID</FormalSpec>
 <ProcedureBlock>0</ProcedureBlock>
-<Implementation><![CDATA[	Do DELOBJ^FLOWTOE(ToeleveringID)
+<Implementation><![CDATA[
+	If $Data(^KTO1(ToeleveringID)){
+		Set LeverancierID = $Piece(^KTO1(ToeleveringID),"\",1)
+		If ($Data(^KTO(LeverancierID,ToeleveringID))){
+			Do DELOBJ^FLOWTOE(ToeleveringID)
+		}
+	}
+	Quit $$$OK
 ]]></Implementation>
 </Method>
 </Class>
Index: BL/MB/UGLYPicking/Events/AutoReceptie.cls.xml
===================================================================
diff -u -r1074 -r2786
--- BL/MB/UGLYPicking/Events/AutoReceptie.cls.xml	(.../AutoReceptie.cls.xml)	(revision 1074)
+++ BL/MB/UGLYPicking/Events/AutoReceptie.cls.xml	(.../AutoReceptie.cls.xml)	(revision 2786)
@@ -10,17 +10,20 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Event:BL.MB.UGLYPicking.Events.ToeFinishedEventData</FormalSpec>
 <Implementation><![CDATA[
+	
 	Set ChoosenBuffers = $ListBuild($ListBuild(Event.Data.bfrRGID,Event.Data.bfrVolgNr))
 	Set Result = ##class(BL.MB.UGLYPicking.ReceptieProductie).aGetBufferArraySortedOnProd(.ChoosenBuffers)
 	Do ##class(BL.MB.UGLYPicking.ReceptieProductie).aBuildSortedBufferArray()
 	Do ##class(BL.MB.UGLYPicking.ReceptieProductie).aGetToelevArraySortedOnProd()
 	Do ##class(BL.MB.UGLYPicking.ReceptieProductie).aBuildSortedToelevArray()
-	Set Result = ##class(BL.MB.UGLYPicking.ReceptieProductie).KoppelAUTO()
+	
+	Set ResultKoppelAuto = ##class(BL.MB.UGLYPicking.ReceptieProductie).KoppelAUTO()
 	Set NietGekoppeld = ""
-	Set Result = ##class(BL.MB.UGLYPicking.ReceptieProductie).CheckIfAllIsCoupled(.NietGekoppeld)
-	Set Result = ##class(BL.MB.UGLYPicking.ReceptieProductie).SENDCoupledInfo()
 	
-	If ($LI(Result) = 1)
+	Set ResultCheckIfAllIsCoupled = ##class(BL.MB.UGLYPicking.ReceptieProductie).CheckIfAllIsCoupled(.NietGekoppeld)
+	Set ResultSendCoupledInfo = ##class(BL.MB.UGLYPicking.ReceptieProductie).SENDCoupledInfo()
+	
+	If ($LI(ResultSendCoupledInfo) = 1)
 	{
 		Set ^UPRCP("V",Event.Data.bfrRGID,Event.Data.bfrVolgNr) = 1
 	}
@@ -30,6 +33,11 @@
 		Set Datum = $$FormatDateTime^vhLib("dd/mm/yyyy hh:nn",$Piece(^UPRCP("B",Event.Data.bfrRGID,Event.Data.bfrVolgNr),"\",1))
 		Set Gebruiker = $Piece(^UPRCP("B",Event.Data.bfrRGID,Event.Data.bfrVolgNr),"\",3)
 		Set Body = "In buffer gemaakt op "_Datum_" door "_Gebruiker_" zitten nog producten die niet automatisch zijn doorgezonden. Gelieve dit na te kijken."
+		Set Body = Body_$C(13,10)_$C(13,10)_"Mogelijke redenen : "
+		If (ResultCheckIfAllIsCoupled '= 1) Set Body = Body_$C(13,10)_"Result CheckIfAllIsCoupled : "_ResultCheckIfAllIsCoupled
+		If (ResultSendCoupledInfo '= 1) Set Body = Body_$C(13,10)_$C(13,10)_"Result SendCoupledInfo : "_ResultSendCoupledInfo
+		If (ResultKoppelAuto '= 1) Set Body = Body_$C(13,10)_$C(13,10)_"Result KoppelAuto : "_ResultKoppelAuto
+		
 		Do SendMiniMail^vhLib("EWMS <EWMS@vanhoecke.be> ",$LB("npo@halux.be","JoDeBrouwer@halux.be"),"Receptie productie",Body,0)
 	}
 ]]></Implementation>
Index: APPS/VisiDot/impl/VHossService.cls.xml
===================================================================
diff -u -r2783 -r2786
--- APPS/VisiDot/impl/VHossService.cls.xml	(.../VHossService.cls.xml)	(revision 2783)
+++ APPS/VisiDot/impl/VHossService.cls.xml	(.../VHossService.cls.xml)	(revision 2786)
@@ -40,6 +40,10 @@
 </Method>
 
 <Method name="RecepteerVHoss">
+<Description>
+- VHoss in HistPak toevoegen
+- VHoss loskoppelen van klant
+- PalletID van de VHoss uit de Inventory halen van EWMS databank</Description>
 <FormalSpec>VHossID:%String</FormalSpec>
 <Implementation><![CDATA[
 		Set ID = ""
@@ -58,6 +62,7 @@
 			
 			Set AantalVHossen = 1
 			Do ..VulAanHistPak(KlantID, VHossID, AantalVHossen)
+			Do ..VerwijderVHossUitInventory(VHossID)
 			
 			Do ##class(APPS.VisiDot.data.VHossUitlening).DeleteId(ID)
 		}
@@ -85,5 +90,14 @@
 	Set ^HISTPAK("D",KlantID,..#VHossProductID,"H",$h_","_HistPakBeweging) = Saldo_"\"_AantalVHossen_"\F\"_HistPakBeweging_"\\VHoss "_FrameID_"\"
 ]]></Implementation>
 </Method>
+
+<Method name="VerwijderVHossUitInventory">
+<FormalSpec>VHossID:%String</FormalSpec>
+<Implementation><![CDATA[
+	Set ProductionHelper = ##class(APPS.VisiDot.impl.VHossProductionHelper).%New()
+	Set PalletID = ProductionHelper.GeefPalletIDVanVHossID(VHossID)	
+	Do ##class(EWMS.Inventory).RemoveInventoryViaPalletID(PalletID)
+]]></Implementation>
+</Method>
 </Class>
 </Export>