Index: vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/PickingCompleetConverter/Convert/Test.cls.xml
===================================================================
diff -u -r55297 -r60874
--- vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/PickingCompleetConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 55297)
+++ vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/PickingCompleetConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 60874)
@@ -416,6 +416,138 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Pickdatum in verleden omgezet naar systeemdatum">
+<Implementation><![CDATA[
+	#dim UitleveringID = $$$DummyInteger
+	
+	do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer("01.05.2016")
+	
+	Set Request = ##class(AXimpl.Request).%New("Inventory/PickingCompleet", UitleveringID)
+	
+	#dim Antwoord As AXif.Dynamics.Inventory.MessageParts = ..MaakInventSyncAntwoord(1)
+	
+	Set InventoryOutConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter).%New()
+	Do InventoryOutConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde).DanReturn(Antwoord)
+	
+	Set Bonlijnen = ##class(%ListOfObjects).%New()
+	Do Bonlijnen.Insert(##class(vhTest.Utils.DOM.VKP.BonLijn).ProductLijn("100",1))
+	
+	Set StandaardBon = ##class(vhTest.Mock.DOM.VKP.Bon).%New()
+	Do StandaardBon.IndienMethodCall("GeefBonLijnIterator").DanReturn(##class(TECH.ListIterator).%New(Bonlijnen))
+	Do StandaardBon.IndienMethodCall("GeefID").DanReturn("123456")
+	
+	Set OrderApiStub = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
+	Do OrderApiStub.IndienMethodCall("GeefBon",UitleveringID,$$$ElkeWaarde).DanReturn(StandaardBon)
+	
+	#dim OrderWMSHoofding As Flow.OrderWMS.Hoofding = ##class(Flow.OrderWMS.Hoofding).%New()
+	Set OrderWMSHoofding.DueOutTime = $$$CurrentDate - 1
+	
+	Set OrderWMSHoofdingRepositoryStub = ##class(vhTest.Mock.Flow.OrderWMS.HoofdingRepository).%New()
+	Do OrderWMSHoofdingRepositoryStub.IndienMethodCall("GeefViaID","123456").DanReturn(OrderWMSHoofding)
+	
+	Set ProductTypeApiStub = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
+	Do ProductTypeApiStub.IndienMethodCall("IsSpaceTowerProduct", "1001").DanReturn($$$False)
+	
+	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(1), OrderWMSHoofdingRepositoryStub, ProductTypeApiStub, )
+	
+	#dim GUID As %String = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}"
+	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(Request,GUID)
+	
+	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).Pick.Count(),1)
+	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).Pick.GetAt(1).PickId,"123456")
+	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).Pick.GetAt(1).ShippingDate,$$$CurrentDate)
+	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).InventSync.Count(),1)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Pickdatum tot en met systeemdatum+10 wordt zo doorgegeven">
+<Implementation><![CDATA[
+	#dim UitleveringID = $$$DummyInteger
+	
+	do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer("01.05.2016")
+	
+	Set Request = ##class(AXimpl.Request).%New("Inventory/PickingCompleet", UitleveringID)
+	
+	#dim Antwoord As AXif.Dynamics.Inventory.MessageParts = ..MaakInventSyncAntwoord(1)
+	
+	Set InventoryOutConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter).%New()
+	Do InventoryOutConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde).DanReturn(Antwoord)
+	
+	Set Bonlijnen = ##class(%ListOfObjects).%New()
+	Do Bonlijnen.Insert(##class(vhTest.Utils.DOM.VKP.BonLijn).ProductLijn("100",1))
+	
+	Set StandaardBon = ##class(vhTest.Mock.DOM.VKP.Bon).%New()
+	Do StandaardBon.IndienMethodCall("GeefBonLijnIterator").DanReturn(##class(TECH.ListIterator).%New(Bonlijnen))
+	Do StandaardBon.IndienMethodCall("GeefID").DanReturn("123456")
+	
+	Set OrderApiStub = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
+	Do OrderApiStub.IndienMethodCall("GeefBon",UitleveringID,$$$ElkeWaarde).DanReturn(StandaardBon)
+	
+	#dim OrderWMSHoofding As Flow.OrderWMS.Hoofding = ##class(Flow.OrderWMS.Hoofding).%New()
+	Set OrderWMSHoofding.DueOutTime = $$$CurrentDate +10
+	
+	Set OrderWMSHoofdingRepositoryStub = ##class(vhTest.Mock.Flow.OrderWMS.HoofdingRepository).%New()
+	Do OrderWMSHoofdingRepositoryStub.IndienMethodCall("GeefViaID","123456").DanReturn(OrderWMSHoofding)
+	
+	Set ProductTypeApiStub = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
+	Do ProductTypeApiStub.IndienMethodCall("IsSpaceTowerProduct", "1001").DanReturn($$$False)
+	
+	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(1), OrderWMSHoofdingRepositoryStub, ProductTypeApiStub, )
+	
+	#dim GUID As %String = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}"
+	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(Request,GUID)
+	
+	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).Pick.Count(),1)
+	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).Pick.GetAt(1).PickId,"123456")
+	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).Pick.GetAt(1).ShippingDate,$$$CurrentDate+10)
+	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).InventSync.Count(),1)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Pickdatum vanaf &gt; systeemdatum+10 wordt als systeemdatum doorgegeven">
+<Implementation><![CDATA[
+	#dim UitleveringID = $$$DummyInteger
+	
+	do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer("01.05.2016")
+	
+	Set Request = ##class(AXimpl.Request).%New("Inventory/PickingCompleet", UitleveringID)
+	
+	#dim Antwoord As AXif.Dynamics.Inventory.MessageParts = ..MaakInventSyncAntwoord(1)
+	
+	Set InventoryOutConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter).%New()
+	Do InventoryOutConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde).DanReturn(Antwoord)
+	
+	Set Bonlijnen = ##class(%ListOfObjects).%New()
+	Do Bonlijnen.Insert(##class(vhTest.Utils.DOM.VKP.BonLijn).ProductLijn("100",1))
+	
+	Set StandaardBon = ##class(vhTest.Mock.DOM.VKP.Bon).%New()
+	Do StandaardBon.IndienMethodCall("GeefBonLijnIterator").DanReturn(##class(TECH.ListIterator).%New(Bonlijnen))
+	Do StandaardBon.IndienMethodCall("GeefID").DanReturn("123456")
+	
+	Set OrderApiStub = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
+	Do OrderApiStub.IndienMethodCall("GeefBon",UitleveringID,$$$ElkeWaarde).DanReturn(StandaardBon)
+	
+	#dim OrderWMSHoofding As Flow.OrderWMS.Hoofding = ##class(Flow.OrderWMS.Hoofding).%New()
+	Set OrderWMSHoofding.DueOutTime = $$$CurrentDate +11
+	
+	Set OrderWMSHoofdingRepositoryStub = ##class(vhTest.Mock.Flow.OrderWMS.HoofdingRepository).%New()
+	Do OrderWMSHoofdingRepositoryStub.IndienMethodCall("GeefViaID","123456").DanReturn(OrderWMSHoofding)
+	
+	Set ProductTypeApiStub = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
+	Do ProductTypeApiStub.IndienMethodCall("IsSpaceTowerProduct", "1001").DanReturn($$$False)
+	
+	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(1), OrderWMSHoofdingRepositoryStub, ProductTypeApiStub, )
+	
+	#dim GUID As %String = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}"
+	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(Request,GUID)
+	
+	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).Pick.Count(),1)
+	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).Pick.GetAt(1).PickId,"123456")
+	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).Pick.GetAt(1).ShippingDate,$$$CurrentDate)
+	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).InventSync.Count(),1)
+]]></Implementation>
+</Method>
+
 <Method name="MaakInventSyncAntwoord">
 <FormalSpec>AantalInventSync:%Integer</FormalSpec>
 <Private>1</Private>
Index: AXimpl/Dynamics/InventoryOut/Converter/PickingCompleetConverter.cls.xml
===================================================================
diff -u -r58257 -r60874
--- AXimpl/Dynamics/InventoryOut/Converter/PickingCompleetConverter.cls.xml	(.../PickingCompleetConverter.cls.xml)	(revision 58257)
+++ AXimpl/Dynamics/InventoryOut/Converter/PickingCompleetConverter.cls.xml	(.../PickingCompleetConverter.cls.xml)	(revision 60874)
@@ -100,8 +100,18 @@
 				#dim ShippingDate as %Date = +..OrderWMSHoofdingRepository.GeefViaID(Bon.GeefID()).DueOutTime
 				; Je kan niet in het verleden goederen verzenden die vandaag geraapt zijn.
 				If ShippingDate<+##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentHorolog() {
+					Do ##class(vhLib.Logger).%New("").Warning("PickingCompleetConverter - ShippingDate in verleden",
+						"ShippingDate in PickingCompleet-bericht was '"_ ShippingDate _ "', wordt gezet op '" _ +##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentHorolog() _ "'."
+						_ "MessageId='" _ MessageId _ "', Bonnummer='" _ Bon.GeefID() _ "'.")
 					Set ShippingDate=+##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentHorolog()
 				}
+				; Door vreemde kronkels geraakt soms een datum van 1 of 2 maanden in de toekomst als pickingdatum in ^ORDW. Dat is probleem voor facturatie en voorraad-boekingen.
+				If ShippingDate > (10 + +##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentHorolog()) {
+					Do ##class(vhLib.Logger).%New("").Warning("PickingCompleetConverter - ShippingDate in toekomst",
+						"ShippingDate in PickingCompleet-bericht was '"_ ShippingDate _ "', wordt gezet op '" _ +##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentHorolog() _ "'."
+						_ "MessageId='" _ MessageId _ "', Bonnummer='" _ Bon.GeefID() _ "'.")
+					Set ShippingDate=+##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentHorolog()
+				}
 				Set Pick.ShippingDate = ##class(TECH.DateTime).HorologToDate(ShippingDate)
 				
 				If $$$Not(Pick.Qty = 0) {