Index: BL/Legacy/EWORDSW.cls.xml
===================================================================
diff -u -r46898 -r52359
--- BL/Legacy/EWORDSW.cls.xml	(.../EWORDSW.cls.xml)	(revision 46898)
+++ BL/Legacy/EWORDSW.cls.xml	(.../EWORDSW.cls.xml)	(revision 52359)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="BL.Legacy.EWORDSW">
+<IncludeCode>Prod.Product</IncludeCode>
 <Super>TECH.RegisteredObject</Super>
 
 <Method name="Bevat">
@@ -70,6 +71,8 @@
 	 Set Magazijn = ##class(APPS.MAG.enu.Magazijn).Orgalux() ;##class(APPS.MAG.enu.Magazijn).TAORIndeling() ; PV 17/11/2016
  }ElseIf ..KomtVanHaluxEnServoDriveOmpak(MagList,PRNr) {
 	 Set Magazijn = ##class(APPS.MAG.enu.Magazijn).Ugly()
+ }ElseIf ..KomtVanHaluxEnSpecifiek(MagList,PRNr) {
+	 Set Magazijn = ##class(APPS.MAG.enu.Magazijn).Ugly()
  }ElseIf ..KomtVanHaluxEnGeenPalletInAutomatischMagazijn(MagList,PRNr) {
 	 Set Magazijn = ##class(APPS.MAG.enu.Magazijn).Halux()
  }
@@ -108,6 +111,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="KomtVanHaluxEnSpecifiek">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>MagList:%String,PRNr:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	quit:$D(^KPR(PRNr)) ($D(^KPR(PRNr,"J6332")))&&(($E($P($G(^KPR(PRNr,0)),"\"),1,11)="SET#TAORBOX")||($E($P($G(^KPR(PRNr,0)),"\"),1,4)="ZW7H")) ; Korttekst begint met
+	quit:$D(^KPRO(PRNr)) ($D(^KPRO(PRNr,"J6332")))&&(($E($P($G(^KPRO(PRNr,0)),"\"),1,11)="SET#TAORBOX")||($E($P($G(^KPRO(PRNr,0)),"\"),1,4)="ZW7H"))
+	Quit 0
+]]></Implementation>
+</Method>
+
 <Method name="KomtVanHaluxEnServoDriveOmpak">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>MagList:%String,PRNr:%String</FormalSpec>
Index: AX/Uitgaand/VKP/Trip/impl/GeoDynamicsImport.cls.xml
===================================================================
diff -u -r51953 -r52359
--- AX/Uitgaand/VKP/Trip/impl/GeoDynamicsImport.cls.xml	(.../GeoDynamicsImport.cls.xml)	(revision 51953)
+++ AX/Uitgaand/VKP/Trip/impl/GeoDynamicsImport.cls.xml	(.../GeoDynamicsImport.cls.xml)	(revision 52359)
@@ -59,27 +59,52 @@
 ]]></Implementation>
 </Method>
 
-<Method name="FetchAll">
+<Method name="FetchAllOLD">
 <Description>
 d ##class(AX.Uitgaand.VKP.Trip.impl.GeoDynamicsImport).%New().FetchAll()</Description>
 <Implementation><![CDATA[
+	Lock +GeoDynamics:1 Else  Do ##class(vhLib.Logger).%New("GeoDynamics").Info("OphalenTrip","FetchAll: local GeoDynamics locked") Quit
 	&sql(DECLARE GeoUsers CURSOR FOR
-	Select ID into :IPNr from Res.InternePersoon where length(isnull(GeoDevice,''))>15)
+	Select ID into :IPNr from Res.InternePersoon where length(isnull(GeoDevice,''))>15 order by id asc)
    	&sql(OPEN GeoUsers)
  	For  &sql(FETCH GeoUsers) Quit:SQLCODE  Do
+ 	. q:IPNr=11
 	. Do ..FetchOne(IPNr)
-	. Hang 50
 	&sql(CLOSE GeoUsers)
+	Lock -GeoDynamics
 ]]></Implementation>
 </Method>
 
+<Method name="FetchAll">
+<Description>
+d ##class(AX.Uitgaand.VKP.Trip.impl.GeoDynamicsImport).%New().FetchAll()</Description>
+<Implementation><![CDATA[
+	Lock +GeoDynamics:1 Else  Do ##class(vhLib.Logger).%New("GeoDynamics").Info("OphalenTrip","FetchAll: local GeoDynamics locked") Quit
+	
+	&sql(DECLARE GeoUsersSamen CURSOR FOR
+	Select ID into :IPNr from Res.InternePersoon where length(isnull(GeoDevice,''))>15 order by id asc)
+   	&sql(OPEN GeoUsersSamen)
+   	#dim Devices as %ListOfDataTypes=""
+ 	For  &sql(FETCH GeoUsersSamen) Quit:SQLCODE  Do
+ 	. Quit:IPNr=11 ; LDS heeft tijdelijk problemen 24/07/2018 (land Litouwen)
+	. Set Devices=..GeefWagenVanGebruiker(IPNr,Devices)
+	&sql(CLOSE GeoUsersSamen)
+	Do ..OphalenTripsOverPeriode(Devices,"ALL")
+	Lock -GeoDynamics
+]]></Implementation>
+</Method>
+
 <Method name="FetchOne">
 <Description>
-d ##class(AX.Uitgaand.VKP.Trip.impl.GeoDynamicsImport).%New().FetchOne(1034)</Description>
+d ##class(AX.Uitgaand.VKP.Trip.impl.GeoDynamicsImport).%New().FetchOne(1103)</Description>
 <FormalSpec>User:Res.InternePersoon</FormalSpec>
 <Implementation><![CDATA[
-	Set Wagens=..GeefWagenVanGebruiker(User)
-	Do ..OphalenTripsOverPeriode(Wagens,User)
+	Try {
+			Set Wagens=..GeefWagenVanGebruiker(User)
+			Do ..OphalenTripsOverPeriode(Wagens,User)
+		} Catch {
+			Do ##class(vhLib.Logger).%New("GeoDynamics").LogExceptie(##class(TECH.ExceptionHandler).Catch())
+		}
 ]]></Implementation>
 </Method>
 
@@ -95,12 +120,12 @@
 </Method>
 
 <Method name="GeefWagenVanGebruiker">
-<FormalSpec>User:Res.InternePersoon</FormalSpec>
+<FormalSpec>User:Res.InternePersoon,Devices:%ListOfDataTypes=""</FormalSpec>
 <Private>1</Private>
 <ReturnType>%ListOfDataTypes</ReturnType>
 <Implementation><![CDATA[
 	Set:'$isObject(User) User=##class(Res.InternePersoon).%OpenId(User)
-	Set Devices=##class(%ListOfDataTypes).%New()
+	Set:'$isObject(Devices) Devices=##class(%ListOfDataTypes).%New()
 	Do Devices.Insert(User.GeoDevice)
 	Quit Devices
 ]]></Implementation>
@@ -113,8 +138,9 @@
 	#dim Datum as %Date
 	For Datum=..VanDatum:1:..TotDatum
 	{
-		Do ##class(vhLib.Logger).%New("GeoDynamics").Info("OphalenTrip","User:"_User_", #Wagens:"_Wagens.Count()_", Datum:"_Datum)
+		Do ##class(vhLib.Logger).%New("GeoDynamics").Info("OphalenTrip","User:"_User_", #Wagens:"_Wagens.Count()_", Datum:"_$$EXTDATE^vhLib.DataTypes(Datum))
 		Do ..OphalenTrips(Wagens, Datum)
+		Hang 20
 	}
 ]]></Implementation>
 </Method>
@@ -128,7 +154,7 @@
 
 	#Dim TripsPerVehicles as %ListOfObjects
 	Set TripsPerVehicles=WebService.TripOverviewGetByVehicleIdLstDt(..GeefCallerID(),Devices,$$EXTDATE^vhLib.DataTypes(Datum,"J4"),$$EXTDATE^vhLib.DataTypes(Datum,"MN"),$$EXTDATE^vhLib.DataTypes(Datum,"DMN"))
-	
+
 	For VehicleCount=1:1:TripsPerVehicles.Count()
 	{
 		#Dim TripsPerVehicle as WS.GeoDynamics.tns.TripOverviewEntity
Index: FLOWORD9.mac.rou
===================================================================
diff -u
--- FLOWORD9.mac.rou	(revision 0)
+++ FLOWORD9.mac.rou	(revision 52359)
@@ -0,0 +1,133 @@
+
+ ; Status van de orderlijn in productie, voorraad en picking
+StatusVerwerking(KLNr, ORDNr, OLNr)
+	New D, LijnRec,PRNr,Status,OLUNr,CONSNr
+	Set D="\"
+	Set LijnRec=$G(^KOD(KLNr,"F",ORDNr,OLNr))
+	Set OLUNr=$P(LijnRec,"\",15)
+	Set PRNr=$P(LijnRec,"\",2)
+	Quit:'PRNr ""
+	Set:'($D(^||OrderBijVH)#1) ^||OrderBijVH=$$CALCDATE^vhLib.DataTypes($H,"A",+2)
+	Quit:($P(LijnRec,"\",25)>(^||OrderBijVH)) ""
+	Set Status =""
+	
+	If $P(LijnRec,"\",27)'="" ; kom link 
+	{
+		Set Status="1;Productie : Onbekend"
+		Set FabKey=$$FABKEYO^HADOPV(KLNr,ORDNr,OLUNr)
+		Set TOENr=$P(FabKey,";")
+		If $L(FabKey) && ($P($G(^HADPR("F",FabKey,"K")),"\",3)="A")
+		{
+			Set Status="2;Productie : klaargezet"
+		}
+		Set pxZoek=##class(APPS.Halux.Planning.impl.BatchService).%New().ZoekToelevering(TOENr) 
+		If $isObject(pxZoek)
+		{
+			Set Status="3;Productie : in batch;"_$$FormatVanafNu($ZDTH(pxZoek.ToeleveringGeplandTijdstip,3,,2))
+		}
+	}
+	
+	Set CONSNr=$G(^ORDW("IO",ORDNr,OLUNr))
+	
+	If Status="" && 'CONSNr &&($$GETSTOCK^PRODUKT4(PRNr,"F")<$P(LijnRec,"\",3))
+	{
+		Set Status="4;Onvoldoende stock;"_$$GETSTOCK^PRODUKT4(PRNr,"F")
+	}
+	
+	
+	If Status="" && ($P(LijnRec,"\",28)'="") && 'CONSNr 
+	{
+		If $$GoederenBijHalux(ORDNr)
+		{		
+			Set Status="5;Geproduceerd, nog in Halux;"_$$FormatVanafNu($$ZoekLaatsteReceptie(PRNr))
+		}
+		Else
+		{
+			Set Status="6;Wachten op doorsturen"
+		}
+	}
+	If Status="" ; status picking
+	{
+		If CONSNr
+		{
+			If (Status="") && ($P($G(^ORDW("D",CONSNr)),"\",21)'="")
+			{
+				Set Status="7;PickProbleem"
+			}
+			Set PickStatus=$P(^ORDW("D",CONSNr,"D",ORDNr,OLUNr),"\",2)
+			If (Status="") && (PickStatus="B")
+			{
+				Set Status="99;Op bon" ; komt niet voor omdat de orderlijn niet meer bestaat
+			}
+			If (Status="") && (PickStatus="A")
+			{
+				Set Status="88;Geraapt"
+			}
+			If (Status="") && ((PickStatus="W")||(PickStatus="P"))
+			{
+				Set Status="77;Wachtend op picking;"_$$TranslateMag($P(^ORDW("D",CONSNr,"D",ORDNr,OLUNr),"\",8))
+			}
+			If (Status="") && (PickStatus="")
+			{
+				Set Status="8;Wachtend op picking activatie"
+			}
+		}
+		Else
+		{
+			Set Status="6;Wachten op doorsturen"
+		}
+
+	}
+	Quit Status
+TranslateMag(MagCode)
+	Quit:MagCode="U" "Ugly"
+	Quit:MagCode="O" "Orgalux"
+	Quit:MagCode="A" "T/A"
+	Quit:MagCode="H" "Halux"
+	Quit:MagCode?1(1"E",1N) "Auto"
+	Quit "?"_MagCode
+
+FormatVanafVandaag(DatumEnTijd)
+	New Dag,Uur
+	Set Dag=DatumEnTijd-$H
+	Set Dag=$S(Dag>0:"+"_Dag,Dag<0:Dag,1:"+0")
+	Set Uur=$P(DatumEnTijd,",",2)\3600
+	Quit Dag_" "_Uur_"u"
+	
+FormatVanafNu(DatumEnTijd)
+	New Dag
+	Set Diff=$$DIFFTIME^vhLib.DataTypes(DatumEnTijd,$H)
+	Set Uur=Diff\3600
+	Quit Uur_" u"
+ZoekLaatsteReceptie(PRNr)
+	New VolgNr
+	Set VolgNr=$O(^PRHIST(PRNr,""),-1)
+	Set DatumEnTijd=""
+	While VolgNr'=""
+	{
+		If $P(^PRHIST(PRNr,VolgNr),"\",4)="I" 
+		{
+			Set DatumEnTijd=$P(^PRHIST(PRNr,VolgNr),"\",1)
+			Set VolgNr=""
+		}
+		Else
+		{
+			Set VolgNr=$O(^PRHIST(PRNr,VolgNr),-1)
+		}		
+	}
+	Quit DatumEnTijd
+
+GoederenBijHalux(ORDNr)
+	New Status
+	If $D(^||OrderBijVH(ORDNr))
+	{
+		Set Status=^||OrderBijVH(ORDNr)
+	}
+	Else
+	{
+		Set Status=##class(BL.Legacy.EWTOE).OrderStaatVolledigBijVanHoecke(ORDNr)
+		Set ^||OrderBijVH(ORDNr)=Status
+	}
+	
+	Quit 'Status
+
Index: Flow/Order/Lijn.cls.xml
===================================================================
diff -u -r50135 -r52359
--- Flow/Order/Lijn.cls.xml	(.../Lijn.cls.xml)	(revision 50135)
+++ Flow/Order/Lijn.cls.xml	(.../Lijn.cls.xml)	(revision 52359)
@@ -654,6 +654,18 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="StatusVerwerking">
+<Type>%String</Type>
+<Calculated>1</Calculated>
+<SqlComputeCode>set {*}=$$StatusVerwerking^FLOWORD9({Klant},{OrderNr},{LijnNr})</SqlComputeCode>
+<SqlComputed>1</SqlComputed>
+</Property>
+
+<Method name="StatusVerwerkingGet">
+<Implementation><![CDATA[	Quit $$StatusVerwerking^FLOWORD9(..Klant,..OrderNr,..LijnNr)
+]]></Implementation>
+</Method>
+
 <Storage name="DataM">
 <Type>%CacheSQLStorage</Type>
 <StreamLocation>^Flow.Ord.LijnS</StreamLocation>
Index: CHUI/Prod/FSCTelling.cls.xml
===================================================================
diff -u -r40889 -r52359
--- CHUI/Prod/FSCTelling.cls.xml	(.../FSCTelling.cls.xml)	(revision 40889)
+++ CHUI/Prod/FSCTelling.cls.xml	(.../FSCTelling.cls.xml)	(revision 52359)
@@ -79,6 +79,7 @@
  Write $TR("Actie;Magazijn;PRNr;Product;Aantal;CifPPL;ClaimTransactie;FSCGewicht*Qty",";",$C(9)),!
  Set PRNr=""
  For  Set PRNr=$O(^KPR(PRNr)) Quit:PRNr=""  Do
+ . Use 0 w "." Use Dev
  . Do ..QtyHist(PRNr,.arHist)
  . Quit:'$D(arHist)
  . Set KT=$P(^KPR(PRNr,0),"\",1)
@@ -155,14 +156,47 @@
 ]]></Implementation>
 </Method>
 
+<Method name="PrijsInBon">
+<FormalSpec>PRNr,Rec</FormalSpec>
+<Implementation><![CDATA[
+	Quit:(..Domein'="VH") 0
+	Quit:$P(Rec,"\",4)'="U" 0 ; Actie
+	Set BONNr=$P(Rec,"\",7)
+	Set KLNr=$P(Rec,"\",6)
+	Set HistAantal=$P(Rec,"\",2)
+	Set Found=0 ; normaal is het juist
+	Set LijnNr=""
+	Quit:'BONNr 0
+	Quit:'KLNr 0
+	Set Node="F" If '$D(^KUL(KLNr,Node,BONNr)) Set Node="G"
+	For  Set LijnNr=$O(^KUL(KLNr,Node,BONNr,LijnNr)) Quit:LijnNr=""  Do  Quit:Found
+	. Quit:$P($G(^KUL(KLNr,Node,BONNr,LijnNr)),"\",2)'=PRNr
+	. Set Omzet=$P(^KUL(KLNr,Node,BONNr,LijnNr),"\",9)
+	. Set Aantal=$P(^KUL(KLNr,Node,BONNr,LijnNr),"\",3)
+	. Set Found=1
+	Quit:'Found $P($$KLANTPR^KPRIJSADMIN(KLNr,PRNr),"\",14)
+	Quit $S(Aantal>0:Omzet/Aantal,1:0)
+]]></Implementation>
+</Method>
+
+<Method name="PrijsInKSTKL">
+<FormalSpec>PRNr,Rec</FormalSpec>
+<Implementation><![CDATA[
+	Set KLNr=$P(Rec,"\",6)
+	Quit:'KLNr 0
+	Set Prijs=$P($G(^KSTPR(PRNr,KLNr,0)),"\",2)/$S($E($P($G(^KSTPR(PRNr,KLNr,0)),"\",4))="H":100,1:1)
+	Quit Prijs
+]]></Implementation>
+</Method>
+
 <Method name="PrijsInFactuur">
 <FormalSpec>PRNr,Rec</FormalSpec>
 <Implementation><![CDATA[
 	Quit:(..Domein'="VH") 0
 	Quit:$P(Rec,"\",4)'="U" 0 ; Actie
 	Set FAKNr=$P(Rec,"\",10)
-	Quit:'FAKNr 0
-	Quit:'$D(^KFA("F",FAKNr)) 0
+	Quit:'FAKNr ..PrijsInKSTKL(PRNr,Rec)
+	Quit:'$D(^KFA("F",FAKNr)) ..PrijsInKSTKL(PRNr,Rec)
 	Set BonNr=$P(Rec,"\",7)
 	Set Found=0 ; normaal is het juist
 	Set LijnNr=""
Index: WS/Vhisie4/KlantDocument/KlantDocumentService.cls.xml
===================================================================
diff -u -r50354 -r52359
--- WS/Vhisie4/KlantDocument/KlantDocumentService.cls.xml	(.../KlantDocumentService.cls.xml)	(revision 50354)
+++ WS/Vhisie4/KlantDocument/KlantDocumentService.cls.xml	(.../KlantDocumentService.cls.xml)	(revision 52359)
@@ -179,10 +179,10 @@
 	#dim FacturenOld As %ListOfObjects
 	If ..Connected2AX
 	{
-		Set Response = ##class(AX.Uitgaand.EC.Data.impl.FacturenOphalen).%New(Request,..ModeAX).GeefResponse()
-		Set FacturenOld=Response.Lijst
+		;Set Response = ##class(AX.Uitgaand.EC.Data.impl.FacturenOphalen).%New(Request,..ModeAX).GeefResponse()
+		;Set FacturenOld=Response.Lijst
 		Set Response = ##class(AX.Uitgaand.EC.DataAX.impl.FacturenOphalen).%New(Request,..ModeAX).GeefResponse()
-		Do ..AppendList(Response.Lijst,FacturenOld)
+		;Do ..AppendList(Response.Lijst,FacturenOld)
 		Set:..WebsiteAXIds Response.KlantId = ..Translator.GeefCustomerIDForAX(Response.KlantId)
 	}
 	Else
Index: AX/Uitgaand/MAG/impl/ProductIteratorFilterExclMaatwerk.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/MAG/impl/ProductIteratorFilterExclMaatwerk.cls.xml	(revision 0)
+++ AX/Uitgaand/MAG/impl/ProductIteratorFilterExclMaatwerk.cls.xml	(revision 52359)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.MAG.impl.ProductIteratorFilterExclMaatwerk">
+<IncludeCode>Prod.Product,BL.Derde.LevSpecifiek</IncludeCode>
+<Super>AX.Uitgaand.MAG.impl.ProductIteratorFilter</Super>
+
+<Property name="SoprIteratorFilter">
+<Type>AX.Uitgaand.PM.impl.SoprIteratorFilter</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="StartDatum">
+<Type>%Date</Type>
+</Property>
+
+<Method name="IsValid">
+<FormalSpec>Item:TECH.ResultSet</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set PRNr=Item.GetData(1)
+
+	Quit:$D(^||LogFlowVerwerkteProducten(PRNr)) 0 ; reeds verwerkt
+	Quit:$$GENTYP^HAD(PRNr)'="" 0
+	Quit:$E($$$PRGet($$$IdentNummer))=6 0 ; geen kind producten
+	;Quit:$$$PRGet($$$LeveranciersNr)'=$$$LevHalux 0
+	
+	Set VolgNr=$O(^PRHIST(PRNr,""),-1)
+	Quit:VolgNr="" 0 ; geen beweging
+	Quit:..StartDatum>+$P(^PRHIST(PRNr,VolgNr),"\") 0 ; geen recente beweging
+	Quit 1
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/MAG/dto/BewegingOutbound.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/MAG/dto/BewegingOutbound.cls.xml	(revision 0)
+++ AX/Uitgaand/MAG/dto/BewegingOutbound.cls.xml	(revision 52359)
@@ -0,0 +1,463 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.MAG.dto.BewegingOutbound">
+<IncludeCode>Prod.Product,BL.Derde.LevSpecifiek</IncludeCode>
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="PRNr">
+<Type>%String</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="Product">
+<Type>AX.Uitgaand.PM.Product.impl.Product</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="ShippingDatum">
+<Type>%String</Type>
+</Property>
+
+<Property name="ShipmentNumber">
+<Type>%String</Type>
+</Property>
+
+<Property name="ShipmentType">
+<Type>%String</Type>
+</Property>
+
+<Property name="Transporteur">
+<Type>%String</Type>
+</Property>
+
+<Property name="Klant">
+<Type>%String</Type>
+</Property>
+
+<Property name="Gemeente">
+<Type>%String</Type>
+</Property>
+
+<Property name="Land">
+<Type>%String</Type>
+</Property>
+
+<Property name="LaadlijstNummer">
+<Type>%String</Type>
+</Property>
+
+<Property name="PickDatum">
+<Type>%String</Type>
+</Property>
+
+<Property name="Picklocatie">
+<Type>%String</Type>
+</Property>
+
+<Property name="OrdernummerKlant">
+<Type>%String</Type>
+</Property>
+
+<Property name="KitComponentNvt">
+<Type>%String</Type>
+</Property>
+
+<Property name="ItemId">
+<Type>%String</Type>
+</Property>
+
+<Property name="Lades">
+<Type>%String</Type>
+</Property>
+
+<Property name="Productielijn">
+<Type>%String</Type>
+</Property>
+
+<Property name="Omschrijving">
+<Type>%String</Type>
+</Property>
+
+<Property name="UM">
+<Type>%String</Type>
+</Property>
+
+<Property name="LengteUM">
+<Type>%String</Type>
+</Property>
+
+<Property name="BreedteUM">
+<Type>%String</Type>
+</Property>
+
+<Property name="HoogteUM">
+<Type>%String</Type>
+</Property>
+
+<Property name="TotaalVerstuurdUM">
+<Type>%String</Type>
+</Property>
+
+<Property name="PalletSscc">
+<Type>%String</Type>
+</Property>
+
+<Property name="TypeDrager">
+<Type>%String</Type>
+</Property>
+
+<Property name="Stroom">
+<Type>%String</Type>
+</Property>
+
+<Property name="SOPRConvertor">
+<Type>AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="SOPRIterator">
+<Type>TECH.Iterator</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="ExportLabels">
+<Type>%String</Type>
+<MultiDimensional>1</MultiDimensional>
+<Private>1</Private>
+<Transient>1</Transient>
+</Property>
+
+<Property name="OpnemenInExport">
+<Type>%Boolean</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="BasisData">
+<Type>AX.Uitgaand.MAG.impl.ExportOutbound</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="Dimensie">
+<Type>AX.Uitgaand.MAG.dto.Dimensie</Type>
+<Transient>1</Transient>
+</Property>
+
+<Method name="CreatePicking">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>BasisData:AX.Uitgaand.MAG.impl.ExportOutbound,ComponentNVT:%String</FormalSpec>
+<Implementation><![CDATA[
+	Set px=..%New()
+	Set px.BasisData=BasisData
+	Do px.VulinPicking(ComponentNVT)
+	Quit px
+]]></Implementation>
+</Method>
+
+<Method name="CreateMoeder">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>BasisData:AX.Uitgaand.MAG.impl.ExportOutbound</FormalSpec>
+<Implementation><![CDATA[
+	Set px=..%New()
+	Set px.BasisData=BasisData
+	Do px.VulinMoeder()
+	Quit px
+]]></Implementation>
+</Method>
+
+<Method name="%OnNew">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Do ..DefineLabels()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="VulinPicking">
+<FormalSpec>ComponentNVT:%String</FormalSpec>
+<Implementation><![CDATA[
+	Set ..PRNr=$LG(..BasisData.lbSOL,1)
+	Set ..KitComponentNvt=ComponentNVT
+	Do ..VulinProduct()
+	Do ..VulinConsolidatie()
+	Set ..TotaalVerstuurdUM=$LG(..BasisData.lbSOL,2)
+	Set ..Picklocatie=..GeefMagLocatie($LG(..BasisData.lbSOL,3))
+	Do ..VulinDimensies()
+	If ..IsOrgal()
+	{
+		Set ..Productielijn="OL"
+	}
+]]></Implementation>
+</Method>
+
+<Method name="IsOrgal">
+<Implementation><![CDATA[
+		Set MPRNr=$P(..BasisData.OLRec,"\",1)
+		Quit ($$AantalKinderen^PRBS(MPRNr)>0)&&($$ISORGAL^PRODUKT2(MPRNr)||$$IsOrgaluxOpMaat^PRODUKT2(MPRNr)||$$IsTaorCubicover^PRODUKT2(MPRNr))
+]]></Implementation>
+</Method>
+
+<Method name="VulinMoeder">
+<Implementation><![CDATA[
+	Set ..PRNr=$P(..BasisData.OLRec,"\",1)
+	Set ..KitComponentNvt="Kit"
+	Set ..TotaalVerstuurdUM=$P(..BasisData.OLRec,"\",4)
+	Set ..Lades="NVT"
+	Do ..VulinConsolidatie()
+	Do ..VulinProduct()
+	If ..IsOrgal()
+	{
+		Set ..Productielijn="OL"
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VulinConsolidatie">
+<Implementation><![CDATA[
+	Set ..Klant=$P(..BasisData.CONSRec,"\")
+	Set ..LaadlijstNummer=..BasisData.CONSNr
+	Set ..PickDatum=+$P(..BasisData.CONSRec,"\",19)
+	Set ..OrdernummerKlant=..BasisData.ORDNr
+]]></Implementation>
+</Method>
+
+<Method name="VulinProduct">
+<Implementation><![CDATA[
+	Set ..Product=##class(AX.Uitgaand.PM.Product.impl.Product).%New(..PRNr)
+	Set SOPRPRNr=..BasisData.SOPRConvertor.GeefVervangProductDoorSOPRInAX(..PRNr)
+	Set:SOPRPRNr="" SOPRPRNr=..PRNr
+	Set ..ItemId=$$$ProductGet(SOPRPRNr,$$$IdentNummer)
+	Set ..Omschrijving=..Product.Basis.KortTekst
+	Set ..UM="STK"
+	Set Dimensie=##class(AX.Uitgaand.MAG.dto.Dimensie).%New(..Product)
+]]></Implementation>
+</Method>
+
+<Method name="VulinDimensies">
+<Implementation><![CDATA[
+	If (..Product.Prijs.Leverancier.%Id()=$$$LevHalux)&&('..Product.Basis.StockNietStock)
+	{
+		Set ..Dimensie=##class(AX.Uitgaand.MAG.dto.Dimensie).%New(..Product)
+		Set ..Lades=..Dimensie.ProductGroep
+		Set ..LengteUM=..Dimensie.Diepte
+		Set ..BreedteUM=..Dimensie.Breedte
+		Set ..HoogteUM=..Dimensie.Hoogte
+		Set ..TypeDrager=..Dimensie.Verpakkingsvorm
+		Set ..Productielijn=..GeefProductielijn()
+		If ..Productielijn="" Set ..Productielijn=..Dimensie.ProductGroep
+		Set ..PalletSscc=$$ListToPieces^vhLib($LG(..BasisData.lbSOL,3))
+		Set ..Picklocatie="TRANSIT"
+		Set ..Stroom=16
+		If ..Dimensie.ProductGroep="DIV" Set ..Stroom=19,..Productielijn="Voormontage"
+	}
+	Else
+	{
+		Set ..Lades=..Dimensie.ProductGroep
+		Set:..Lades="" ..Lades="NVT"
+		Set ..Stroom=15
+		If $$$ProductGet(..PRNr,$$$PalletQty)'>..TotaalVerstuurdUM Set ..Stroom=14
+	}
+	If $$$ProductGet(..PRNr,$$$LinkType)?1(1"HH",1"HHS") Set ..Stroom=18
+]]></Implementation>
+</Method>
+
+<Method name="GeefMagLocatie">
+<FormalSpec>lbPallet:%List</FormalSpec>
+<Implementation><![CDATA[
+	/*
+	Set sc=result.Prepare("SELECT i.loc_id,t.IsPickbaar,loc_trans"
+	_" FROM EWMS.Inventory i"
+	_"LEFT OUTER JOIN EWMS.Locations l on I.Loc_Id=L.Loc_ID"
+	_"LEFT OUTER JOIN EWMS.TransLoc t on t.loc_m=l.loc_M and t.loc_g=l.loc_g and t.loc_x=l.loc_x and t.loc_y=l.loc_y"
+	_"WHERE (product = ?) AND (i.loc_m<5)")
+
+	*/
+
+	If $D(^||LocatieCache(..PRNr)) { 
+		Set ResultLoc=^||LocatieCache(..PRNr) 
+	} Else {
+		Set PickLoc="",PalletInLoc="",PalletInAuto="",ResultLoc=""
+
+		Set result=##class(%ResultSet).%New("%DynamicQuery:SQL")
+		Set sc=result.Prepare("SELECT i.loc_id as LocId,t.loc_ispickbaar as IsPickbaar,loc_trans as LocTrans,l.loc_m as LocM"
+		_" FROM EWMS.Inventory i"
+		_" LEFT OUTER JOIN EWMS.Locations l on I.Loc_Id=L.Loc_ID"
+		_" LEFT OUTER JOIN EWMS.TransLoc t on t.loc_m=l.loc_M and t.loc_g=l.loc_g and t.loc_x=l.loc_x and t.loc_y=l.loc_y"
+		_" WHERE (product = ?) AND (i.loc_m<5)")
+		If $$$ISERR(sc) Do DisplayError^%apiOBJ(sc) Quit ""
+		Set sc=result.Execute(..PRNr)
+		If $$$ISERR(sc) Do DisplayError^%apiOBJ(sc) Quit ""
+		If result.Next(.sc) {
+			Set:result.Data("IsPickbaar") PickLoc=result.Data("LocTrans")
+			Set:result.Data("LocM")=1 PalletInAuto=1
+			Set:$LF(lbPallet,+result.Data("LocId"))&&(PalletInLoc="") PalletInLoc=result.Data("LocTrans")
+		}
+		If $$$ISERR(sc) Do DisplayError^%apiOBJ(sc) Quit ""
+
+		If PickLoc'="" { Set ResultLoc=PickLoc }
+		ElseIf PalletInAuto { Set ResultLoc="APM" }
+		Else { Set ResultLoc=PalletInLoc }
+		
+		If ResultLoc="",..Product.Basis.OpslagZone=1 Set ResultLoc="APM"
+
+		Set ^||LocatieCache(..PRNr)=ResultLoc
+	}
+	Quit ResultLoc ;_" : "_$$ListToPieces^vhLib(lbPallet,";")
+]]></Implementation>
+</Method>
+
+<Method name="GeefProductielijn">
+<Implementation><![CDATA[
+	Set result=##class(%ResultSet).%New("%DynamicQuery:SQL")
+	Set sc=result.Prepare("SELECT Werkpost FROM APPS_VKP_Maatwerk_LadeRegistratie_impl.Registratie WHERE PRNr=? order by tijdstip desc")
+	If $$$ISERR(sc) Do DisplayError^%apiOBJ(sc) Quit ""
+	Set sc=result.Execute(..PRNr)
+	If $$$ISERR(sc) Do DisplayError^%apiOBJ(sc) Quit ""
+	If result.Next(.sc) {
+ 		Set Productielijn=result.Data("Werkpost")
+	}
+	If $$$ISERR(sc) Do DisplayError^%apiOBJ(sc) Quit ""
+	Set Productielijn=$case($G(Productielijn),"P1":"L1","P2":"L4","LP1":"L1","LP2":"L2","LP3":"L3",:"")
+	Quit $G(Productielijn)
+]]></Implementation>
+</Method>
+
+<Method name="DefineLabels">
+<Implementation><![CDATA[
+ Do ..SetLabel("ShippingDatum","K400","DATE")
+ Do ..SetLabel("ShipmentNumber","K401","TXT")
+ Do ..SetLabel("ShipmentType","K402","TXT")
+ Do ..SetLabel("Transporteur","K403","TXT")
+ Do ..SetLabel("Klant","K404A","TXT")
+ Do ..SetLabel("Gemeente","K404B","TXT")
+ Do ..SetLabel("Land","K404C","TXT")
+ Do ..SetLabel("LaadlijstNummer","K405","TXT")
+ Do ..SetLabel("PickDatum","K407","DATE")
+ Do ..SetLabel("Picklocatie","K408","TXT")
+ Do ..SetLabel("OrdernummerKlant","K409","TXT")
+ Do ..SetLabel("KitComponentNvt","K410","TXT")
+ Do ..SetLabel("ItemId","K411","TXT")
+ Do ..SetLabel("Lades","K412","TXT")
+ Do ..SetLabel("Productielijn","K413","TXT")
+ Do ..SetLabel("Omschrijving","K414","TXT")
+ Do ..SetLabel("UM","K415")
+ Do ..SetLabel("LengteUM","K416")
+ Do ..SetLabel("BreedteUM","K417")
+ Do ..SetLabel("HoogteUM","K418")
+ Do ..SetLabel("TotaalVerstuurdUM","K419")
+ Do ..SetLabel("PalletSscc","K424","TXT")
+ Do ..SetLabel("TypeDrager","K425","TXT")
+ Do ..SetLabel("Stroom","K428","TXT")
+]]></Implementation>
+</Method>
+
+<Method name="SetLabel">
+<FormalSpec>Naam:%String,Code:%String,DataType:%String,Qty:%Integer</FormalSpec>
+<Implementation><![CDATA[	Set ..ExportLabels(Code,Naam)=$LB($G(DataType),$G(Qty))
+]]></Implementation>
+</Method>
+
+<Method name="WriteHeader">
+<FormalSpec><![CDATA[SubVolgNr:%Integer="",&Maanden:%String]]></FormalSpec>
+<Implementation><![CDATA[
+	Set Key1=$O(..ExportLabels(""))
+	While Key1'=""
+	{
+		Set Key2=$O(..ExportLabels(Key1,""))
+		While Key2'=""
+		{
+			Set ArrayType=$LG(..ExportLabels(Key1,Key2))
+			If "TXT,DATE"[ArrayType
+			{
+				Write Key1,$S(SubVolgNr:"."_SubVolgNr,1:""),":",Key2,*9	
+			}
+			Elseif "DataType"=ArrayType
+			{
+				For I=$LG(..ExportLabels(Key1,Key2),2):-1:1
+				{
+					Write Key1,".",I,":",..GeefMaand(I,.Maanden,2),":",Key2,*9
+				}
+				
+			}
+			Else  ; Object
+			{
+				For I=$LG(..ExportLabels(Key1,Key2),2):-1:1
+				{
+					Set obj= $zobjclassmethod(ArrayType,"%New")
+					Do obj.WriteHeader(I_":"_..GeefMaand(I,.Maanden))
+				}
+			}
+			Set Key2=$O(..ExportLabels(Key1,Key2))
+		}
+		Set Key1=$O(..ExportLabels(Key1))
+	}
+]]></Implementation>
+</Method>
+
+<Method name="GeefMaand">
+<FormalSpec><![CDATA[I:%Integer,&Maanden:%Integer,NeemPiece:%Integer]]></FormalSpec>
+<Implementation><![CDATA[
+	Set Maand=$O(Maanden(""))
+	While Maand'=""
+	{
+		If $P(Maanden(Maand),"\")=I	Set GevondenMaand=$$EXTDATE^vhLib.DataTypes($S($G(NeemPiece):$P(Maanden(Maand),"\",NeemPiece),1:Maand),"DM")
+		Set Maand=$O(Maanden(Maand))
+	}
+	Quit $G(GevondenMaand)
+]]></Implementation>
+</Method>
+
+<Method name="WriteData">
+<Implementation><![CDATA[
+	Set Key1=$O(..ExportLabels(""))
+	While Key1'=""
+	{
+		Set Key2=$O(..ExportLabels(Key1,""))
+		While Key2'=""
+		{
+			Set ArrayType=$LG(..ExportLabels(Key1,Key2))
+			If ArrayType=""
+			{
+				Write $$$ExcelNum($zobjProperty(%this,Key2)),*9
+			}
+			ElseIf ArrayType="TXT"
+			{
+				Write $zobjProperty(%this,Key2),*9
+			}
+			ElseIf ArrayType="DATE"
+			{
+				Write $$$ExcelDat($zobjProperty(%this,Key2)),*9
+			}
+			Elseif "DataType"=ArrayType
+			{
+				#dim Array as %ArrayOfDataTypes =($zobjProperty(%this,Key2))
+				Set Element=Array.GetNext(.Key) 
+				Set Count=0
+				While Key'=""
+				{
+					Set Count=Count+1
+					Write Element,*9
+					Set Element=Array.GetNext(.Key) 
+				}
+			}
+			Else  ; object
+			{
+				#dim ArrayObj as %ArrayOfObjects =($zobjProperty(%this,Key2))
+				Set Element=ArrayObj.GetNext(.Key) 
+				Set Count=0
+				While Key'=""
+				{
+					Set Count=Count+1
+					Do Element.WriteData()
+					Set Element=ArrayObj.GetNext(.Key) 
+				}
+			}
+			Set Key2=$O(..ExportLabels(Key1,Key2))
+		}
+		Set Key1=$O(..ExportLabels(Key1))
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/MAG/impl/ProductIteratorFilter.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/MAG/impl/ProductIteratorFilter.cls.xml	(revision 0)
+++ AX/Uitgaand/MAG/impl/ProductIteratorFilter.cls.xml	(revision 52359)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.MAG.impl.ProductIteratorFilter">
+<IncludeCode>Prod.Product,BL.Derde.LevSpecifiek</IncludeCode>
+<Super>TECH.RegisteredObject,TECH.Filter</Super>
+
+<Property name="SoprIteratorFilter">
+<Type>AX.Uitgaand.PM.impl.SoprIteratorFilter</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="StartDatum">
+<Type>%Date</Type>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>StartDatum:%Date</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..StartDatum=StartDatum
+	Set ..SoprIteratorFilter = ##class(AX.Uitgaand.PM.impl.SoprIteratorFilter).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="IsValid">
+<FormalSpec>Item:TECH.ResultSet</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set PRNr=Item.GetData(1)
+
+	Quit:$E($$$PRGet($$$IdentNummer))=6 0 ; geen kind producten
+	;Quit:$$$PRGet($$$LeveranciersNr)'=$$$LevHalux 0
+	Set VolgNr=$O(^PRHIST(PRNr,""),-1)
+	Quit:VolgNr="" 0 ; geen beweging
+	Quit:..StartDatum>+$P(^PRHIST(PRNr,VolgNr),"\") 0 ; geen recente beweging
+	Quit 1
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/MAG/impl/ExportBijladen.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/MAG/impl/ExportBijladen.cls.xml	(revision 0)
+++ AX/Uitgaand/MAG/impl/ExportBijladen.cls.xml	(revision 52359)
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.MAG.impl.ExportBijladen">
+<IncludeCode>BL.Derde.KlantSpecifiek,BL.Derde.LevSpecifiek,Prod.Product</IncludeCode>
+<Super>TECH.RegisteredObject,TECH.Filter</Super>
+
+<Property name="RefDatum">
+<Type>%Date</Type>
+</Property>
+
+<Property name="StartDatum">
+<Type>%Date</Type>
+</Property>
+
+<Property name="SOPRConvertor">
+<Type>AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor</Type>
+</Property>
+
+<Property name="ResultSet">
+<Type>TECH.FileReader</Type>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>AantalMaanden=2</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..SOPRConvertor=##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
+	Set ..RefDatum=$$INTDATE^vhLib.DataTypes("01/07/2018")
+	Set ..StartDatum=$$CALCDATE^vhLib.DataTypes(..RefDatum,"M",-AantalMaanden,"FD")
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkAlle">
+<Description>
+d ##class(AX.Uitgaand.MAG.impl.ExportBijladen).%New().VerwerkAlle()</Description>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+	Set Count=0	
+	Set Dev=$$OPEN^vhDEV("\\notes01\shared\p v\","ProductBijladen "_$TR($ZDT($H),"/:")_".txt","W","T")
+	Use Dev
+	Do ..WriteHeader() Write !
+	
+	Set ..ResultSet=##class(TECH.FileReader).%New("\\notes01\shared\p v\bijladen.txt")
+	Do ..ResultSet.SetTranslateHeader2UpperCase()
+	While ..ResultSet.Next()
+	{
+		If ..IsGeldig()
+		{
+			Do ..Verwerk()
+		}
+ 	}
+	
+	Do CLOSE^vhDEV(Dev)
+]]></Implementation>
+</Method>
+
+<Method name="IsGeldig">
+<Implementation><![CDATA[
+		Set Datum=$zdh($P(..ResultSet.Data("TOINSERTTIME"),"-",1,3),3)
+		Quit:Datum<..StartDatum 0
+		Quit:Datum>..RefDatum 0
+		Quit 1
+]]></Implementation>
+</Method>
+
+<Method name="Verwerk">
+<Implementation><![CDATA[
+	
+	Set px=##class(AX.Uitgaand.MAG.dto.Bijladen).Create(%this)
+	Do px.WriteData() Write !
+]]></Implementation>
+</Method>
+
+<Method name="WriteHeader">
+<Implementation><![CDATA[	Do ##class(AX.Uitgaand.MAG.dto.Bijladen).%New().WriteHeader()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/MAG/dto/Dimensie.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/MAG/dto/Dimensie.cls.xml	(revision 0)
+++ AX/Uitgaand/MAG/dto/Dimensie.cls.xml	(revision 52359)
@@ -0,0 +1,372 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.MAG.dto.Dimensie">
+<IncludeCode>Prod.Product,BL.Derde.LevSpecifiek</IncludeCode>
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="Diepte">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="Breedte">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="Hoogte">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="PalletDiepte">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="PalletAantal">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="PalletBreedte">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="PalletHoogte">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="BrutoGewicht">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="NettoGewicht">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="Verpakkingsvorm">
+<Type>%String</Type>
+</Property>
+
+<Property name="ProductGroep">
+<Type>%String</Type>
+</Property>
+
+<Property name="Aantal">
+<Type>%Decimal</Type>
+</Property>
+
+<Property name="Calc">
+<Type>%String</Type>
+</Property>
+
+<Property name="Product">
+<Type>AX.Uitgaand.PM.Product.impl.Product</Type>
+<Private>1</Private>
+<Transient>1</Transient>
+</Property>
+
+<Property name="PRNr">
+<Type>%String</Type>
+<Private>1</Private>
+<Transient>1</Transient>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..Product=$G(Product)
+	Set ..PRNr=..Product.Basis.%Id()
+	Do ..Bereken()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Bereken">
+<Implementation><![CDATA[
+	If ..Product.Prijs.Leverancier.Nummer=$$$LevBlum
+	{
+		Do ..BerekenBlum()
+	}
+	ElseIf ..Product.Prijs.Leverancier.Nummer=$$$LevHalux
+	{
+		Set GenTyp=$$GENTYP^HAD(..PRNr)
+		If $P(GenTyp,"\")="TBX"
+		{ 
+			If $P(GenTyp,"\",2)="HKS"
+			{
+				Do ..BerekenHKS()
+			} Else {
+				Do ..BerekenTBX()
+			}
+		}
+		ElseIf $P(GenTyp,"\")="LBX"
+		{
+			Do ..BerekenLBX()
+		}
+		ElseIf $P(GenTyp,"\")="TAO"
+		{
+			Do ..BerekenTAX()
+		}
+		ElseIf ";KAD;PRF;GLA;"[(";"_$P(GenTyp,"\")_";")
+		{
+			Do ..BerekenKAD()
+		}
+		Else
+		{
+			Set ..ProductGroep="DIV"
+			}
+		
+
+	}
+	ElseIf ..Product.Prijs.Leverancier.Nummer=$$$LevVanHoecke
+	{
+		IF $$ISORGAL^PRODUKT2(..PRNr)||$$IsOrgaluxOpMaat^PRODUKT2(..PRNr)||$$IsTaorCubicover^PRODUKT2(..PRNr)
+		{
+			Do ..BerekenOrgalux()
+		}
+	}
+
+	Quit
+]]></Implementation>
+</Method>
+
+<Method name="BerekenOrgalux">
+<Implementation><![CDATA[
+	Set ..Verpakkingsvorm="OL Doos"
+	Set ..ProductGroep="OL"
+]]></Implementation>
+</Method>
+
+<Method name="BerekenBlum">
+<Implementation><![CDATA[
+	Set BLID=$$GetBlumID^BLPROD(..PRNr)
+	If $L(BLID)
+	{
+		Set BLData=$G(^BLProd("D",BLID))
+		Set ..Diepte=$P(BLData,"\",23)
+		Set ..Breedte=$P(BLData,"\",24)
+		Set ..Hoogte=$P(BLData,"\",25)
+		Set ..Verpakkingsvorm=$S($P(BLData,"\",28)=1:"Cubisch",$P(BLData,"\",28)=2:"Buis",1:$P(BLData,"\",28))
+		Set Tarra=$P(BLData,"\",27)
+		Set ..NettoGewicht=$P(BLData,"\",26)
+		Set ..BrutoGewicht=..NettoGewicht+Tarra
+		Set ..Aantal=$P(BLData,"\",6)
+		Set ..PalletHoogte=1200
+		Set ..PalletBreedte=1200
+		Set ..PalletDiepte=800
+		Set ..PalletAantal=..Product.Basis.PalletAantal
+		Set ..Calc="BLUM"
+	}
+]]></Implementation>
+</Method>
+
+<Method name="BerekenHKS">
+<Implementation><![CDATA[
+	Set ..Diepte=1200
+	Set ..Breedte=800
+	Set ..Hoogte=900
+	Set ..Verpakkingsvorm="Pallet"
+	Set ..NettoGewicht=50000
+	Set ..BrutoGewicht=50000
+	Set ..Aantal=1
+	Set ..Calc="HKS"
+	Set ..ProductGroep="TBX"
+]]></Implementation>
+</Method>
+
+<Method name="BerekenTBX">
+<Implementation><![CDATA[
+	#dim Lade As DOM.PM.TBXProduct.TBXLade = ##class(DOM.DomeinContext).Instance().GeefProductAPI().GeefProduct(..PRNr)
+
+	Set Diepte=Lade.GeefLadeDiepte()
+	Set ZijCode=Lade.GeefZijwandHoogte()
+	Set Breedte=Lade.GeefInterneBreedte()
+	Set Verpakking=Lade.GeefVerpakking()
+	Set ..ProductGroep="TBX"
+
+	Set Hoogte=$Case(ZijCode,"N":80,"M":100,"K":120,:200)
+	
+	If (Verpakking="S")||(Verpakking="Z")
+	{
+		Set ..Diepte=Diepte
+		Set ..Breedte=Breedte
+		Set ..Hoogte=Hoogte
+		Set ..PalletDiepte=800
+		Set ..PalletHoogte=1500
+		Set ..PalletBreedte=$S(Breedte>1100:1500,1:1200)
+		Set ..PalletAantal=10
+		Set ..Verpakkingsvorm="Lade V1"
+		
+	}
+	ElseIf (Verpakking="X")||(Verpakking="Y")
+	{
+		Set ..Diepte=Diepte
+		Set ..Breedte=Breedte
+		Set ..Hoogte=Hoogte
+		Set ..PalletDiepte=800
+		Set ..PalletHoogte=1200
+		Set ..PalletBreedte=600
+		Set ..PalletAantal=5
+		Set ..Verpakkingsvorm="Lade ProBox"
+	}	
+	ElseIf (Verpakking="A")||(Verpakking="B")
+	{
+		Set ..Diepte=Diepte
+		Set ..Breedte=Breedte
+		Set ..Hoogte=Hoogte
+		Set ..PalletDiepte=1200
+		Set ..PalletHoogte=2000
+		Set ..PalletBreedte=1200
+		Set ..PalletAantal=30
+		Set ..Verpakkingsvorm="Lade VHOSS"
+	}	
+	Else
+	{
+		Set ..Diepte=Diepte
+		Set ..Breedte=Breedte
+		Set ..Hoogte=Hoogte
+		Set ..PalletDiepte=800
+		Set ..PalletHoogte=1500
+		Set ..PalletBreedte=$S(Breedte>1100:1500,1:1200)
+		Set ..PalletAantal=10
+		Set ..Verpakkingsvorm="Lade Pallet"
+	}
+	Set ..Aantal=1
+	Set ..Calc="TBX"
+]]></Implementation>
+</Method>
+
+<Method name="BerekenLBX">
+<Implementation><![CDATA[
+   ;s px=##class(DOM.DomeinContext).Instance().GeefProductAPI().GeefProduct($$SELECT^PRODUKT6()) Do DumpObject^%apiOBJ(px)
+	#dim Lade As DOM.PM.LBXProduct.impl.LBXLadeImpl = ##class(DOM.DomeinContext).Instance().GeefProductAPI().GeefProduct(..PRNr)
+	Set Diepte=Lade.GeefLadeDiepte() 
+	Set ZijCode=Lade.GeefZijwandHoogte()
+	Set Breedte=Lade.GeefInbouwBreedte()
+	Set Verpakking=Lade.GeefVerpakking()
+	Set Hoogte=$Case(ZijCode,"N":80,"M":100,"K":120,"F":250,:200)
+	Set ..ProductGroep="LBX"
+
+	If (Verpakking="V1")
+	{
+		Set ..Diepte=Diepte
+		Set ..Breedte=Breedte
+		Set ..Hoogte=Hoogte
+		Set ..Diepte=Diepte
+		Set ..Breedte=Breedte
+		Set ..Hoogte=Hoogte
+		Set ..PalletDiepte=800
+		Set ..PalletHoogte=1500
+		Set ..PalletBreedte=$S(Breedte>1100:1500,1:1200)
+		Set ..PalletAantal=10
+		Set ..Verpakkingsvorm="Lade V1"
+	}
+	ElseIf (Verpakking="Probox")
+	{
+		Set ..Diepte=Diepte
+		Set ..Breedte=Breedte
+		Set ..Hoogte=Hoogte
+		Set ..PalletDiepte=800
+		Set ..PalletHoogte=1200
+		Set ..PalletBreedte=600
+		Set ..PalletAantal=5
+
+		Set ..Verpakkingsvorm="Lade ProBox"
+	}	
+	ElseIf (Verpakking="VHoss")
+	{
+		Set ..Diepte=Diepte
+		Set ..Breedte=Breedte
+		Set ..Hoogte=Hoogte
+		Set ..PalletDiepte=1200
+		Set ..PalletHoogte=2000
+		Set ..PalletBreedte=1200
+		Set ..PalletAantal=20
+		Set ..Verpakkingsvorm="Lade VHOSS"
+	}	
+	Else
+	{
+		Set ..Diepte=Diepte
+		Set ..Breedte=Breedte
+		Set ..Hoogte=Hoogte
+		Set ..PalletDiepte=800
+		Set ..PalletHoogte=1500
+		Set ..PalletBreedte=$S(Breedte>1100:1500,1:1200)
+		Set ..PalletAantal=10
+		Set ..Verpakkingsvorm="Lade Pallet"
+	}
+	Set ..Aantal=1
+	Set ..Calc="TBX"
+]]></Implementation>
+</Method>
+
+<Method name="BerekenTAX">
+<Implementation><![CDATA[
+	#dim Lade As DOM.PM.TAORProduct.impl.TAORLadeImpl= ##class(DOM.DomeinContext).Instance().GeefProductAPI().GeefProduct(..PRNr)
+	#dim Kenmerken as DOM.PM.Maatwerk.Calc.Common.impl.TAORKenmerken=Lade.GeefIngegevenKenmerken()
+	Set Diepte=Kenmerken.LadeDiepte
+	Set ZijCode=Kenmerken.LadeHoogte
+	Set Breedte=Kenmerken.InterneBreedte
+	Set Verpakking=Kenmerken.VerpakkingType
+	Set Hoogte=$Case(ZijCode,"N":80,"M":100,"K":120,"F":250,:200)
+	Set ..ProductGroep="TAX"
+
+
+	If (Verpakking="V1")
+	{
+		Set ..Diepte=Diepte
+		Set ..Breedte=Breedte
+		Set ..Hoogte=Hoogte
+		Set ..Diepte=Diepte
+		Set ..Breedte=Breedte
+		Set ..Hoogte=Hoogte
+		Set ..PalletDiepte=800
+		Set ..PalletHoogte=1500
+		Set ..PalletBreedte=$S(Breedte>1100:1500,1:1200)
+		Set ..PalletAantal=10
+		Set ..Verpakkingsvorm="Lade V1"
+	}
+	ElseIf (Verpakking="Probox")
+	{
+		Set ..Diepte=Diepte
+		Set ..Breedte=Breedte
+		Set ..Hoogte=Hoogte
+		Set ..PalletDiepte=800
+		Set ..PalletHoogte=1200
+		Set ..PalletBreedte=600
+		Set ..PalletAantal=5
+		Set ..Verpakkingsvorm="Lade ProBox"
+	}	
+	ElseIf (Verpakking="VHoss")
+	{
+		Set ..Diepte=Diepte
+		Set ..Breedte=Breedte
+		Set ..Hoogte=Hoogte
+		Set ..PalletDiepte=1200
+		Set ..PalletHoogte=2000
+		Set ..PalletBreedte=1200
+		Set ..PalletAantal=20
+		Set ..Verpakkingsvorm="Lade VHOSS"
+	}	
+	Else
+	{
+		Set ..Diepte=Diepte
+		Set ..Breedte=Breedte
+		Set ..Hoogte=Hoogte
+		Set ..PalletDiepte=800
+		Set ..PalletHoogte=1500
+		Set ..PalletBreedte=$S(Breedte>1100:1500,1:1200)
+		Set ..PalletAantal=10
+		Set ..Verpakkingsvorm="Lade Pallet"
+	}
+	Set ..Aantal=1
+	Set ..Calc="TBX"
+]]></Implementation>
+</Method>
+
+<Method name="BerekenKAD">
+<Implementation><![CDATA[		Set ..ProductGroep="KAD"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/MAG/dto/Bijladen.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/MAG/dto/Bijladen.cls.xml	(revision 0)
+++ AX/Uitgaand/MAG/dto/Bijladen.cls.xml	(revision 52359)
@@ -0,0 +1,299 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.MAG.dto.Bijladen">
+<IncludeCode>Prod.Product,BL.Derde.LevSpecifiek</IncludeCode>
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="PRNr">
+<Type>%String</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="Product">
+<Type>AX.Uitgaand.PM.Product.impl.Product</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="Datum">
+<Type>%String</Type>
+</Property>
+
+<Property name="Uur">
+<Type>%String</Type>
+</Property>
+
+<Property name="ReplenishmentOrder">
+<Type>%String</Type>
+</Property>
+
+<Property name="VanLocatie">
+<Type>%String</Type>
+</Property>
+
+<Property name="NaarLocatie">
+<Type>%String</Type>
+</Property>
+
+<Property name="ItemId">
+<Type>%String</Type>
+</Property>
+
+<Property name="Omschrijving">
+<Type>%String</Type>
+</Property>
+
+<Property name="SourcingVanHalux">
+<Type>%String</Type>
+</Property>
+
+<Property name="UM">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalUM">
+<Type>%String</Type>
+</Property>
+
+<Property name="QtyKVP">
+<Type>%String</Type>
+</Property>
+
+<Property name="QtyGVP">
+<Type>%String</Type>
+</Property>
+
+<Property name="QtyPallet">
+<Type>%String</Type>
+</Property>
+
+<Property name="Stroom">
+<Type>%String</Type>
+</Property>
+
+<Property name="ExportLabels">
+<Type>%String</Type>
+<MultiDimensional>1</MultiDimensional>
+<Private>1</Private>
+<Transient>1</Transient>
+</Property>
+
+<Property name="OpnemenInExport">
+<Type>%Boolean</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="BasisData">
+<Type>AX.Uitgaand.MAG.impl.ExportBijladen</Type>
+<Transient>1</Transient>
+</Property>
+
+<Method name="Create">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>BasisData</FormalSpec>
+<Implementation><![CDATA[
+	Set px=..%New()
+	Set px.BasisData=BasisData
+	Set px.PRNr=BasisData.ResultSet.Data("PRODUCT")
+	Set px.Product=##class(AX.Uitgaand.PM.Product.impl.Product).%New(px.PRNr)
+
+	Do px.Vulin()
+	Quit px
+]]></Implementation>
+</Method>
+
+<Method name="GeefData">
+<FormalSpec>Label:%String</FormalSpec>
+<Implementation><![CDATA[	Quit ..BasisData.ResultSet.Data(Label)
+]]></Implementation>
+</Method>
+
+<Method name="%OnNew">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Do ..DefineLabels()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Vulin">
+<FormalSpec>HistRec:%String,HistIndex:%String</FormalSpec>
+<Implementation><![CDATA[
+		Set SOPRPRNr=..BasisData.SOPRConvertor.GeefVervangProductDoorSOPRInAX(..PRNr)
+		Set:SOPRPRNr="" SOPRPRNr=..PRNr
+		Set ..ItemId=$$$ProductGet(SOPRPRNr,$$$IdentNummer)
+
+		Set ..Omschrijving=..Product.Basis.KortTekst
+		Set ..ReplenishmentOrder="NVT"
+		Set ..UM="STK"
+		Set ..Datum=$zdh($P(..GeefData("TOINSERTTIME"),"-",1,3),3)
+		Set ..Uur=$J($zth($TR($P($P(..GeefData("TOINSERTTIME"),"-",4),".",1,2),".",":"))/600,0,0)*600
+		Set ..VanLocatie=..GeefData("FROMLOC")
+		Set ..NaarLocatie=..GeefData("TOLOC")
+		Do ..VerdeelAantal(..GeefData("FROMCHANGE"))
+		Set ..Stroom=3
+]]></Implementation>
+</Method>
+
+<Method name="VerdeelAantal">
+<FormalSpec>Aantal</FormalSpec>
+<Implementation><![CDATA[
+	Set (..QtyPallet,..QtyGVP,..QtyKVP,..AantalUM)=0
+	Set AantalInPallet=..Product.Basis.PalletAantal
+	Set AantalInGVP=..Product.Prijs.GrootVerpakking	
+	Set AantalInKVP=..Product.Prijs.NormaleVerpakking	
+	Set:AantalInGVP=1 AantalInGVP=""
+	Set:AantalInKVP=1 AantalInKVP=""
+	Set ..AantalUM=Aantal
+	
+	If (Aantal'<AantalInPallet) && (AantalInPallet>1)
+	{
+		Set ..QtyPallet=(Aantal\AantalInPallet)
+		Set Aantal=Aantal-(..QtyPallet*AantalInPallet)
+	}
+	If (Aantal'<AantalInGVP) && (AantalInGVP>1)
+	{
+		Set ..QtyGVP=(Aantal\AantalInGVP)
+		Set Aantal=Aantal-(..QtyGVP*AantalInGVP)
+	}
+	If (Aantal'<AantalInKVP) && (AantalInKVP>1)
+	{
+		Set ..QtyKVP=(Aantal\AantalInKVP)
+		Set Aantal=Aantal-(..QtyKVP*AantalInKVP)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="DefineLabels">
+<Implementation><![CDATA[
+ Do ..SetLabel("Datum","K700","DATE")
+ Do ..SetLabel("Uur","K701","TIME")
+ Do ..SetLabel("ReplenishmentOrder","K702","TXT")
+ Do ..SetLabel("VanLocatie","K703","TXT")
+ Do ..SetLabel("NaarLocatie","K704","TXT")
+ Do ..SetLabel("ItemId","K705","TXT")
+ Do ..SetLabel("Omschrijving","K706","TXT")
+ ;Do ..SetLabel("SourcingVanHalux","K807","TXT")
+ Do ..SetLabel("UM","K708","TXT")
+ Do ..SetLabel("AantalUM","K709","")
+ Do ..SetLabel("QtyKVP","K710","")
+ Do ..SetLabel("QtyGVP","K711","")
+ Do ..SetLabel("QtyPallet","K712","")
+ Do ..SetLabel("Stroom","K713","")
+]]></Implementation>
+</Method>
+
+<Method name="SetLabel">
+<FormalSpec>Naam:%String,Code:%String,DataType:%String,Qty:%Integer</FormalSpec>
+<Implementation><![CDATA[	Set ..ExportLabels(Code,Naam)=$LB($G(DataType),$G(Qty))
+]]></Implementation>
+</Method>
+
+<Method name="WriteHeader">
+<FormalSpec><![CDATA[SubVolgNr:%Integer="",&Maanden:%String]]></FormalSpec>
+<Implementation><![CDATA[
+	Set Key1=$O(..ExportLabels(""))
+	While Key1'=""
+	{
+		Set Key2=$O(..ExportLabels(Key1,""))
+		While Key2'=""
+		{
+			Set ArrayType=$LG(..ExportLabels(Key1,Key2))
+			If "TXT,DATE,TIME"[ArrayType
+			{
+				Write Key1,$S(SubVolgNr:"."_SubVolgNr,1:""),":",Key2,*9	
+			}
+			Elseif "DataType"=ArrayType
+			{
+				For I=$LG(..ExportLabels(Key1,Key2),2):-1:1
+				{
+					Write Key1,".",I,":",..GeefMaand(I,.Maanden,2),":",Key2,*9
+				}
+				
+			}
+			Else  ; Object
+			{
+				For I=$LG(..ExportLabels(Key1,Key2),2):-1:1
+				{
+					Set obj= $zobjclassmethod(ArrayType,"%New")
+					Do obj.WriteHeader(I_":"_..GeefMaand(I,.Maanden))
+				}
+			}
+			Set Key2=$O(..ExportLabels(Key1,Key2))
+		}
+		Set Key1=$O(..ExportLabels(Key1))
+	}
+]]></Implementation>
+</Method>
+
+<Method name="GeefMaand">
+<FormalSpec><![CDATA[I:%Integer,&Maanden:%Integer,NeemPiece]]></FormalSpec>
+<Implementation><![CDATA[
+	Set Maand=$O(Maanden(""))
+	While Maand'=""
+	{
+		If $P(Maanden(Maand),"\")=I	Set GevondenMaand=$$EXTDATE^vhLib.DataTypes($S($G(NeemPiece):$P(Maanden(Maand),"\",NeemPiece),1:Maand),"DM")
+		Set Maand=$O(Maanden(Maand))
+	}
+	Quit $G(GevondenMaand)
+]]></Implementation>
+</Method>
+
+<Method name="WriteData">
+<Implementation><![CDATA[
+	Set Key1=$O(..ExportLabels(""))
+	While Key1'=""
+	{
+		Set Key2=$O(..ExportLabels(Key1,""))
+		While Key2'=""
+		{
+			Set ArrayType=$LG(..ExportLabels(Key1,Key2))
+			If ArrayType=""
+			{
+				Write $$$ExcelNum($zobjProperty(%this,Key2)),*9
+			}
+			ElseIf ArrayType="TXT"
+			{
+				Write $zobjProperty(%this,Key2),*9
+			}
+			ElseIf ArrayType="DATE"
+			{
+				Write $$$ExcelDat($zobjProperty(%this,Key2)),*9
+			}
+			ElseIf ArrayType="TIME"
+			{
+				Write $$$ExcelTime($zobjProperty(%this,Key2)),*9
+			}
+			Elseif "DataType"=ArrayType
+			{
+				#dim Array as %ArrayOfDataTypes =($zobjProperty(%this,Key2))
+				Set Element=Array.GetNext(.Key) 
+				Set Count=0
+				While Key'=""
+				{
+					Set Count=Count+1
+					Write Element,*9
+					Set Element=Array.GetNext(.Key) 
+				}
+			}
+			Else  ; object
+			{
+				#dim ArrayObj as %ArrayOfObjects =($zobjProperty(%this,Key2))
+				Set Element=ArrayObj.GetNext(.Key) 
+				Set Count=0
+				While Key'=""
+				{
+					Set Count=Count+1
+					Do Element.WriteData()
+					Set Element=ArrayObj.GetNext(.Key) 
+				}
+			}
+			Set Key2=$O(..ExportLabels(Key1,Key2))
+		}
+		Set Key1=$O(..ExportLabels(Key1))
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/MAG/impl/ExportInbound.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/MAG/impl/ExportInbound.cls.xml	(revision 0)
+++ AX/Uitgaand/MAG/impl/ExportInbound.cls.xml	(revision 52359)
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.MAG.impl.ExportInbound">
+<IncludeCode>BL.Derde.LevSpecifiek,Prod.Product</IncludeCode>
+<Super>TECH.RegisteredObject,TECH.Filter</Super>
+
+<Property name="ProductIterator">
+<Type>TECH.Iterator</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Product">
+<Type>AX.Uitgaand.PM.Product.impl.Product</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="VoorraadMaanden">
+<Type>%Date</Type>
+<MultiDimensional>1</MultiDimensional>
+<Private>1</Private>
+</Property>
+
+<Property name="RefDatum">
+<Type>%Date</Type>
+</Property>
+
+<Property name="StartDatum">
+<Type>%Date</Type>
+</Property>
+
+<Property name="SOPRConvertor">
+<Type>AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="SOPRIterator">
+<Type>TECH.ListbuildIterator</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>AantalMaanden=2</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..SOPRConvertor=##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
+	Set ..RefDatum=$$INTDATE^vhLib.DataTypes("01/07/2018")
+	Set ..StartDatum=$$CALCDATE^vhLib.DataTypes(..RefDatum,"M",-AantalMaanden,"FD")
+	Kill ^||LogFlowVerwerkteProducten
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkAlle">
+<Description>
+d ##class(AX.Uitgaand.MAG.impl.ExportInbound).%New().VerwerkAlle()</Description>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+	Write @F11,@F1
+	Set Dev=$$OPEN^vhDEV("\\notes01\shared\p v\","ProductInbound"_$TR($ZDT($H),"/:")_".txt","W","T")
+	Use Dev
+	Do ..WriteHeader() Write !
+	Use 0
+	Set Filter=##class(AX.Uitgaand.MAG.impl.ProductIteratorFilter).%New(..StartDatum)
+	Set ..ProductIterator=##class(ProductIterator).%New(Filter)
+	Set Count=0
+	Set Verwerkt=0
+	While ..ProductIterator.HasNext() ;&&(Verwerkt<1000)
+	{
+		Set Count=Count+1
+		Set ..Product=..ProductIterator.Next()
+		Set ..SOPRIterator=..GeefSOPRIterator()
+		Use Dev
+		Do ..ExportOneProduct()
+		Set Verwerkt=Verwerkt+1
+		If Count#100=0
+		{
+			Use 0
+			Set FP=2301 Write @F,@F1
+			Write " ",Verwerkt," / ",Count
+		}
+
+	}
+	Do CLOSE^vhDEV(Dev)
+	Set FP=2301	Write @F,@F1
+	Write Verwerkt," / ",Count
+]]></Implementation>
+</Method>
+
+<Method name="ExportOneProduct">
+<Implementation><![CDATA[
+	Quit:'..IsGeldigProduct()
+	Set PRNr=..Product.Basis.%Id()
+	Set HistIndex=$O(^PRHIST(PRNr,""))
+	While HistIndex'=""
+	{
+		Set HistRec=^PRHIST(PRNr,HistIndex)
+		If ..IsGeldig(HistRec)
+		{
+			Set px=..MaakProxy(HistRec,HistIndex)
+			Do px.WriteData() Write !
+		}
+		Set HistIndex=$O(^PRHIST(PRNr,HistIndex))
+	}
+]]></Implementation>
+</Method>
+
+<Method name="IsGeldigProduct">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Quit:(+..Product.Basis.StockNietStock=0)&&(..Product.Prijs.Leverancier.%Id()=$$$LevHalux) 0
+	Quit 1
+]]></Implementation>
+</Method>
+
+<Method name="IsGeldig">
+<FormalSpec>HistRec:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set Magazijn=$P(HistRec,"\",5)
+	Set Actie=$P(HistRec,"\",4)
+	Set Datum=+$P(HistRec,"\",1)
+	Quit:(Actie'="I")&&(Actie'="R") 0
+	Quit:Datum'<..RefDatum 0
+	Quit:Datum<..StartDatum 0
+	Quit 1
+]]></Implementation>
+</Method>
+
+<Method name="GeefSOPRIterator">
+<Implementation><![CDATA[
+	Set PRNr=..Product.Basis.%Id()
+	Set it=..SOPRConvertor.GeefSOPRIterator(PRNr)
+	Set lb=""
+	While it.HasNext()
+	{
+		Set PRNr=it.Next()
+		Set lb=lb_$LB(PRNr)
+	}
+	If $LL(lb)=0 Set lb=$lb(PRNr)
+	Quit ##class(TECH.ListbuildIterator).%New(lb)
+]]></Implementation>
+</Method>
+
+<Method name="WriteHeader">
+<Implementation><![CDATA[	Do ##class(AX.Uitgaand.MAG.dto.BewegingInbound).%New().WriteHeader()
+]]></Implementation>
+</Method>
+
+<Method name="MaakProxy">
+<FormalSpec>HistRec:%String,HistIndex:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set px=##class(AX.Uitgaand.MAG.dto.BewegingInbound).Create(..Product,..SOPRIterator,HistRec,HistIndex)
+	Quit px
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/MAG/dto/Voorraad.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/MAG/dto/Voorraad.cls.xml	(revision 0)
+++ AX/Uitgaand/MAG/dto/Voorraad.cls.xml	(revision 52359)
@@ -0,0 +1,287 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.MAG.dto.Voorraad">
+<IncludeCode>Prod.Product,BL.Derde.LevSpecifiek</IncludeCode>
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="PRNr">
+<Type>%String</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="Product">
+<Type>AX.Uitgaand.PM.Product.impl.Product</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="Datum">
+<Type>%String</Type>
+</Property>
+
+<Property name="Detaillocatie">
+<Type>%String</Type>
+</Property>
+
+<Property name="BulkOfPicklocatie">
+<Type>%String</Type>
+</Property>
+
+<Property name="Magazijn">
+<Type>%String</Type>
+</Property>
+
+<Property name="SoortOpslag">
+<Type>%String</Type>
+</Property>
+
+<Property name="ItemId">
+<Type>%String</Type>
+</Property>
+
+<Property name="Omschrijving">
+<Type>%String</Type>
+</Property>
+
+<Property name="UM">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalUM">
+<Type>%String</Type>
+</Property>
+
+<Property name="SOPRConvertor">
+<Type>AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="SOPRIterator">
+<Type>TECH.Iterator</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="ExportLabels">
+<Type>%String</Type>
+<MultiDimensional>1</MultiDimensional>
+<Private>1</Private>
+<Transient>1</Transient>
+</Property>
+
+<Property name="OpnemenInExport">
+<Type>%Boolean</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="BasisData">
+<Type>AX.Uitgaand.MAG.impl.ExportVoorraad</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="Dimensie">
+<Type>AX.Uitgaand.MAG.dto.Dimensie</Type>
+<Transient>1</Transient>
+</Property>
+
+<Method name="Create">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>BasisData:AX.Uitgaand.MAG.impl.ExportVoorraad</FormalSpec>
+<Implementation><![CDATA[
+	Set px=..%New()
+	Set px.BasisData=BasisData
+	Do px.Vulin()
+	Quit px
+]]></Implementation>
+</Method>
+
+<Method name="%OnNew">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Do ..DefineLabels()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Vulin">
+<Implementation><![CDATA[
+	Set ..PRNr=+..BasisData.Data("PRNr")
+	Do ..VulinProduct()
+	Set ..Datum=+$H
+	Set ..Detaillocatie=..BasisData.Data("Locatie")
+	Set ..BulkOfPicklocatie=$S(..BasisData.Data("IsPickbaar"):"Pickbaar",1:"Bulk")
+	Set ..SoortOpslag=$S(..BasisData.Data("IsPickbaar"):"Pickbaar",1:"Bulk")
+	Set ..AantalUM=..BasisData.Data("Aantal")
+	Set LocM=..BasisData.Data("LocM")
+	If LocM=1
+	{
+		Set ..Magazijn="APM"
+		Set ..SoortOpslag="palletrek"
+	}
+	ElseIf LocM=4
+	{
+		Set ..Magazijn="Transit"
+		Set ..SoortOpslag="grondopslag"
+	}
+	Else
+	{
+		Set ..Magazijn="Ugly"
+		Set ..SoortOpslag="palletrek"
+		If ..AantalVakken()>3 Set ..SoortOpslag="legbord"
+	}
+]]></Implementation>
+</Method>
+
+<Method name="AantalVakken">
+<Implementation><![CDATA[
+	Set LocTrans=..BasisData.Data("Locatie")
+	Quit:LocTrans'?2N1A2N1A2N ""
+	Set ResultSet=##class(%ResultSet).%New("%DynamicQuery:SQL")
+	Set sc=ResultSet.Prepare("select count(*) as AantalVakken from EWMS.transloc where left(loc_trans,5)= ? and right(loc_trans,2)= ?")
+	If $$$ISERR(sc) Do DisplayError^%apiOBJ(sc) Quit ""
+	Set sc=ResultSet.Execute($E(LocTrans,1,5),$E(LocTrans,7,8))
+	If $$$ISERR(sc) Do DisplayError^%apiOBJ(sc) Quit ""
+	If ResultSet.Next(.sc) 
+	{
+		Set Aantal=ResultSet.Data("AantalVakken")
+	}
+	If $$$ISERR(sc) Do DisplayError^%apiOBJ(sc) Quit ""
+	Quit $G(Aantal)
+]]></Implementation>
+</Method>
+
+<Method name="VulinProduct">
+<Implementation><![CDATA[
+	Set ..Product=##class(AX.Uitgaand.PM.Product.impl.Product).%New(..PRNr)
+	Set SOPRPRNr=..BasisData.SOPRConvertor.GeefVervangProductDoorSOPRInAX(..PRNr)
+	Set:SOPRPRNr="" SOPRPRNr=..PRNr
+	Set ..ItemId=$$$ProductGet(SOPRPRNr,$$$IdentNummer) ;_":"_SOPRPRNr_":"_..PRNr
+	Set ..Omschrijving=..Product.Basis.KortTekst
+	Set ..UM="STK"
+	;Set Dimensie=##class(AX.Uitgaand.MAG.dto.Dimensie).%New(..Product)
+]]></Implementation>
+</Method>
+
+<Method name="DefineLabels">
+<Implementation><![CDATA[
+ Do ..SetLabel("Datum","K600","DATE")
+ Do ..SetLabel("Detaillocatie","K601","TXT")
+ Do ..SetLabel("BulkOfPicklocatie","K602","TXT")
+ Do ..SetLabel("Magazijn","K603","TXT")
+ Do ..SetLabel("SoortOpslag","K604","TXT")
+ Do ..SetLabel("ItemId","K605","TXT")
+ Do ..SetLabel("Omschrijving","K606","TXT")
+ Do ..SetLabel("UM","K607","TXT")
+ Do ..SetLabel("AantalUM","K608")
+]]></Implementation>
+</Method>
+
+<Method name="SetLabel">
+<FormalSpec>Naam:%String,Code:%String,DataType:%String,Qty:%Integer</FormalSpec>
+<Implementation><![CDATA[	Set ..ExportLabels(Code,Naam)=$LB($G(DataType),$G(Qty))
+]]></Implementation>
+</Method>
+
+<Method name="WriteHeader">
+<FormalSpec><![CDATA[SubVolgNr:%Integer="",&Maanden:%String]]></FormalSpec>
+<Implementation><![CDATA[
+	Set Key1=$O(..ExportLabels(""))
+	While Key1'=""
+	{
+		Set Key2=$O(..ExportLabels(Key1,""))
+		While Key2'=""
+		{
+			Set ArrayType=$LG(..ExportLabels(Key1,Key2))
+			If "TXT,DATE"[ArrayType
+			{
+				Write Key1,$S(SubVolgNr:"."_SubVolgNr,1:""),":",Key2,*9	
+			}
+			Elseif "DataType"=ArrayType
+			{
+				For I=$LG(..ExportLabels(Key1,Key2),2):-1:1
+				{
+					Write Key1,".",I,":",..GeefMaand(I,.Maanden,2),":",Key2,*9
+				}
+				
+			}
+			Else  ; Object
+			{
+				For I=$LG(..ExportLabels(Key1,Key2),2):-1:1
+				{
+					Set obj= $zobjclassmethod(ArrayType,"%New")
+					Do obj.WriteHeader(I_":"_..GeefMaand(I,.Maanden))
+				}
+			}
+			Set Key2=$O(..ExportLabels(Key1,Key2))
+		}
+		Set Key1=$O(..ExportLabels(Key1))
+	}
+]]></Implementation>
+</Method>
+
+<Method name="GeefMaand">
+<FormalSpec><![CDATA[I:%Integer,&Maanden:%Integer,NeemPiece:%Integer]]></FormalSpec>
+<Implementation><![CDATA[
+	Set Maand=$O(Maanden(""))
+	While Maand'=""
+	{
+		If $P(Maanden(Maand),"\")=I	Set GevondenMaand=$$EXTDATE^vhLib.DataTypes($S($G(NeemPiece):$P(Maanden(Maand),"\",NeemPiece),1:Maand),"DM")
+		Set Maand=$O(Maanden(Maand))
+	}
+	Quit $G(GevondenMaand)
+]]></Implementation>
+</Method>
+
+<Method name="WriteData">
+<Implementation><![CDATA[
+	Set Key1=$O(..ExportLabels(""))
+	While Key1'=""
+	{
+		Set Key2=$O(..ExportLabels(Key1,""))
+		While Key2'=""
+		{
+			Set ArrayType=$LG(..ExportLabels(Key1,Key2))
+			If ArrayType=""
+			{
+				Write $$$ExcelNum($zobjProperty(%this,Key2)),*9
+			}
+			ElseIf ArrayType="TXT"
+			{
+				Write $zobjProperty(%this,Key2),*9
+			}
+			ElseIf ArrayType="DATE"
+			{
+				Write $$$ExcelDat($zobjProperty(%this,Key2)),*9
+			}
+			Elseif "DataType"=ArrayType
+			{
+				#dim Array as %ArrayOfDataTypes =($zobjProperty(%this,Key2))
+				Set Element=Array.GetNext(.Key) 
+				Set Count=0
+				While Key'=""
+				{
+					Set Count=Count+1
+					Write Element,*9
+					Set Element=Array.GetNext(.Key) 
+				}
+			}
+			Else  ; object
+			{
+				#dim ArrayObj as %ArrayOfObjects =($zobjProperty(%this,Key2))
+				Set Element=ArrayObj.GetNext(.Key) 
+				Set Count=0
+				While Key'=""
+				{
+					Set Count=Count+1
+					Do Element.WriteData()
+					Set Element=ArrayObj.GetNext(.Key) 
+				}
+			}
+			Set Key2=$O(..ExportLabels(Key1,Key2))
+		}
+		Set Key1=$O(..ExportLabels(Key1))
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/MAG/impl/ProductIterator.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/MAG/impl/ProductIterator.cls.xml	(revision 0)
+++ AX/Uitgaand/MAG/impl/ProductIterator.cls.xml	(revision 52359)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.MAG.impl.ProductIterator">
+<Super>TECH.RegisteredObject,TECH.Filter</Super>
+
+<Property name="Vestiging">
+<Type>%String</Type>
+<InitialExpression>##class(AXimpl.InterneFirmaInitialen).VanHoeckeNv()</InitialExpression>
+<Private>1</Private>
+</Property>
+
+<Property name="DynIterator">
+<Type>TECH.Iterator</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="QueryAPI">
+<Type>TECH.Query.QueryAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ResultSet">
+<Type>TECH.ResultSet</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>Filter</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..QueryAPI = $$$Implementation(QueryAPI,##class(TECH.Context).Instance().GeefQueryAPI())
+	Do ..VoerUitQuery()
+	Set Filter=$$$Implementation(Filter,##class(AX.Uitgaand.MAG.impl.ProductIteratorFilter).%New(StartDatum))
+	Set ResultSetIterator = ##class(TECH.ResultSetIterator).%New(..ResultSet)
+	Set ..DynIterator = ##class(TECH.DynamicIterator).%New(ResultSetIterator,,Filter)
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="VoerUitQuery">
+<Private>1</Private>
+<Implementation><![CDATA[
+	#Dim SqlStatement as %String
+	Set SqlStatement = "SELECT ID FROM Prod.Product WHERE korttekst not like 'GEN%' AND (NonAktief IS null OR NonAktief = '2')"
+	Set ..ResultSet = ..QueryAPI.GetResultSet(##class(TECH.DynamicQuery).%New(SqlStatement))
+]]></Implementation>
+</Method>
+
+<Method name="HasNext">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ..DynIterator.HasNext()
+]]></Implementation>
+</Method>
+
+<Method name="Next">
+<ReturnType>AX.Uitgaand.PM.Product.impl.Product</ReturnType>
+<Implementation><![CDATA[
+	set Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..DynIterator.Next().GetData(1))
+	
+	Quit Product
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/MAG/dto/ArtikelTransactiesPerMaand.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/MAG/dto/ArtikelTransactiesPerMaand.cls.xml	(revision 0)
+++ AX/Uitgaand/MAG/dto/ArtikelTransactiesPerMaand.cls.xml	(revision 52359)
@@ -0,0 +1,471 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.MAG.dto.ArtikelTransactiesPerMaand">
+<IncludeCode>BL.Derde.LevSpecifiek</IncludeCode>
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="Maand">
+<Type>%Date</Type>
+</Property>
+
+<Property name="AantalLijnenVHPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalLijnenVHSTKPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalLijnenVHKVPPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalLijnenVHGVPPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalLijnenVHPalletPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalLijnenICPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalLijnenICSTKPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalLijnenICKVPPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalLijnenICGVPPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalLijnenICPalletPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalLijnenHLXPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalLijnenHLXSTKPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalLijnenHLXKVPPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalLijnenHLXGVPPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalStuksVHPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalStuksVHSTKPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalStuksVHKVPPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalStuksVHGVPPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalStuksVHPalletPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalStuksICPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalStuksICSTKPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalStuksICKVPPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalStuksICGVPPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalStuksICPalletPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalStuksHLXPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalStuksHLXSTKPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalStuksHLXKVPPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalStuksHLXGVPPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalLijnenReceptie">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalStuksReceptie">
+<Type>%String</Type>
+</Property>
+
+<Property name="HistRec">
+<Type>%String</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="Artikel">
+<Type>Artikel</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="QtyStk">
+<Type>%Integer</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="QtyGVP">
+<Type>%Integer</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="QtyKVP">
+<Type>%Integer</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="QtyPallet">
+<Type>%Integer</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="ExportLabels">
+<Type>%String</Type>
+<MultiDimensional>1</MultiDimensional>
+</Property>
+
+<Property name="OpnemenInExport">
+<Type>%Boolean</Type>
+<Transient>1</Transient>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>Artikel:AX.Uitgaand.MAG.dto.Artikel</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..Artikel=$G(Artikel)
+	Do ..DefineLabels()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="VoegToe">
+<FormalSpec>HistRec:%String</FormalSpec>
+<Implementation><![CDATA[
+	Set ..HistRec=HistRec
+	Do ..VerdeelAantal()
+	Do ..VoegToeVolgensBeweging()
+	Set ..Maand=$$CALCDATE^vhLib.DataTypes($P(HistRec,"\"),"M","FD")
+]]></Implementation>
+</Method>
+
+<Method name="VerdeelAantal">
+<Implementation><![CDATA[
+	Set (..QtyPallet,..QtyGVP,..QtyKVP,..QtyStk)=0
+	Set Aantal=$P(..HistRec,"\",2)
+	;Set:Aantal<0 Aantal=-Aantal
+	If (Aantal>..Artikel.AantalPallet) && (..Artikel.AantalPallet>1)
+	{
+		Set ..QtyPallet=(Aantal\..Artikel.AantalPallet)*..Artikel.AantalPallet
+		Set Aantal=Aantal-..QtyPallet
+	}
+	If (Aantal>..Artikel.AantalGVP) && (..Artikel.AantalGVP>1)
+	{
+		Set ..QtyGVP=(Aantal\..Artikel.AantalGVP)*..Artikel.AantalGVP
+		Set Aantal=Aantal-..QtyGVP
+	}
+	If (Aantal>..Artikel.AantalKVP) && (..Artikel.AantalKVP>1)
+	{
+		Set ..QtyKVP=(Aantal\..Artikel.AantalKVP)*..Artikel.AantalKVP
+		Set Aantal=Aantal-..QtyKVP
+	}
+	Set ..QtyStk=Aantal
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeVolgensBeweging">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set Magazijn=$P(..HistRec,"\",5)
+	Set Actie=$P(..HistRec,"\",4)
+	If "M;K"[Magazijn,"U"[Actie
+	{
+		 Do ..VoegToeVH()
+	}
+	ElseIf "M;K"[Magazijn,"T"[Actie
+	{
+		Do ..VoegToeIC()
+	}
+	ElseIf "M;K"[Magazijn,"I"[Actie
+	{
+		If ..Artikel.Leverancier=$$$LevHalux 
+		{
+			Do ..VoegToeIC()
+		}
+		Else
+		{
+			Do ..VoegToeRCP()
+		}
+	}
+	ElseIf "M;K"[Magazijn,"R"[Actie
+	{
+		Do ..VoegToeRCP()
+	}
+	ElseIf "W"[Magazijn,"H"[Actie
+	{
+		Do ..VoegToeHLX()
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeVH">
+<Implementation><![CDATA[
+	If ..QtyPallet
+	{
+		Set ..AantalLijnenVHPalletPicking=..AantalLijnenVHPalletPicking+1
+		Set ..AantalStuksVHPalletPicking=..AantalStuksVHPalletPicking+..QtyPallet
+	}
+	If ..QtyGVP
+	{
+		Set ..AantalLijnenVHGVPPicking=..AantalLijnenVHGVPPicking+1
+		Set ..AantalStuksVHGVPPicking=..AantalStuksVHGVPPicking+..QtyGVP
+	}
+	If ..QtyKVP
+	{
+		Set ..AantalLijnenVHKVPPicking=..AantalLijnenVHKVPPicking+1
+		Set ..AantalStuksVHKVPPicking=..AantalStuksVHKVPPicking+..QtyKVP
+	}
+	If ..QtyStk
+	{
+		Set ..AantalLijnenVHSTKPicking=..AantalLijnenVHSTKPicking+1
+		Set ..AantalStuksVHSTKPicking=..AantalStuksVHSTKPicking+..QtyStk
+	}
+	Set ..AantalLijnenVHPicking=..AantalLijnenVHPicking+1
+	Set ..AantalStuksVHPicking=..AantalStuksVHPicking+(..QtyStk+..QtyKVP+..QtyGVP+..QtyPallet)
+	Set ..OpnemenInExport=1
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeIC">
+<Implementation><![CDATA[
+	If ..QtyPallet
+	{
+		Set ..AantalLijnenICPalletPicking=..AantalLijnenICPalletPicking+1
+		Set ..AantalStuksICPalletPicking=..AantalStuksICPalletPicking+..QtyPallet
+	}
+	If ..QtyGVP
+	{
+		Set ..AantalLijnenICGVPPicking=..AantalLijnenICGVPPicking+1
+		Set ..AantalStuksICGVPPicking=..AantalStuksICGVPPicking+..QtyGVP
+	}
+	If ..QtyKVP
+	{
+		Set ..AantalLijnenICKVPPicking=..AantalLijnenICKVPPicking+1
+		Set ..AantalStuksICKVPPicking=..AantalStuksICKVPPicking+..QtyKVP
+	}
+	If ..QtyStk
+	{
+		Set ..AantalLijnenICSTKPicking=..AantalLijnenICSTKPicking+1
+		Set ..AantalStuksICSTKPicking=..AantalStuksICSTKPicking+..QtyStk
+	}
+	Set ..AantalLijnenICPicking=..AantalLijnenICPicking+1
+	Set ..AantalStuksICPicking=..AantalStuksICPicking+(..QtyStk+..QtyKVP+..QtyGVP+..QtyPallet)
+	Set ..OpnemenInExport=1
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeHLX">
+<Implementation><![CDATA[
+	If ..QtyGVP||..QtyPallet
+	{
+		Set ..AantalLijnenHLXGVPPicking=..AantalLijnenHLXGVPPicking+1
+		Set ..AantalStuksHLXGVPPicking=..AantalStuksHLXGVPPicking+(..QtyGVP+..QtyPallet)
+	}
+	If ..QtyKVP
+	{
+		Set ..AantalLijnenHLXKVPPicking=..AantalLijnenHLXKVPPicking+1
+		Set ..AantalStuksHLXKVPPicking=..AantalStuksHLXKVPPicking+..QtyKVP
+	}
+	If ..QtyStk
+	{
+		Set ..AantalLijnenHLXSTKPicking=..AantalLijnenHLXSTKPicking+1
+		Set ..AantalStuksHLXSTKPicking=..AantalStuksHLXSTKPicking+..QtyStk
+	}
+	Set ..AantalLijnenHLXPicking=..AantalLijnenHLXPicking+1
+	Set ..AantalStuksHLXPicking=..AantalStuksHLXPicking+(..QtyStk+..QtyKVP+..QtyGVP+..QtyPallet)
+	Set ..OpnemenInExport=1
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeRCP">
+<Implementation><![CDATA[
+	Set ..AantalLijnenReceptie=..AantalLijnenReceptie+1
+	Set ..AantalStuksReceptie=..AantalStuksReceptie+(..QtyStk+..QtyKVP+..QtyGVP+..QtyPallet)
+	Set ..OpnemenInExport=1
+]]></Implementation>
+</Method>
+
+<Method name="DefineLabels">
+<Implementation><![CDATA[
+	 Kill ..ExportLabels
+	 
+	 Do ..SetLabel("Maand", 699,"DATE")
+	 Do ..SetLabel("AantalLijnenVHPicking", 300)
+	 Do ..SetLabel("AantalLijnenVHSTKPicking", 301)
+	 Do ..SetLabel("AantalLijnenVHKVPPicking", 302)
+	 Do ..SetLabel("AantalLijnenVHGVPPicking", 303)
+	 Do ..SetLabel("AantalLijnenVHPalletPicking", 304)
+	 Do ..SetLabel("AantalLijnenICPicking", 305)
+	 Do ..SetLabel("AantalLijnenICSTKPicking", 306)
+	 Do ..SetLabel("AantalLijnenICKVPPicking", 307)
+	 Do ..SetLabel("AantalLijnenICGVPPicking", 308)
+	 Do ..SetLabel("AantalLijnenICPalletPicking", 309)
+	 Do ..SetLabel("AantalLijnenHLXPicking", 310)
+	 Do ..SetLabel("AantalLijnenHLXSTKPicking", 311)
+	 Do ..SetLabel("AantalLijnenHLXKVPPicking", 312)
+	 Do ..SetLabel("AantalLijnenHLXGVPPicking", 313)
+	 Do ..SetLabel("AantalStuksVHPicking", 400)
+	 Do ..SetLabel("AantalStuksVHSTKPicking", 401)
+	 Do ..SetLabel("AantalStuksVHKVPPicking", 402)
+	 Do ..SetLabel("AantalStuksVHGVPPicking", 403)
+	 Do ..SetLabel("AantalStuksVHPalletPicking", 404)
+	 Do ..SetLabel("AantalStuksICPicking", 405)
+	 Do ..SetLabel("AantalStuksICSTKPicking", 406)
+	 Do ..SetLabel("AantalStuksICKVPPicking", 407)
+	 Do ..SetLabel("AantalStuksICGVPPicking", 408)
+	 Do ..SetLabel("AantalStuksICPalletPicking", 409)
+	 Do ..SetLabel("AantalStuksHLXPicking", 410)
+	 Do ..SetLabel("AantalStuksHLXSTKPicking", 411)
+	 Do ..SetLabel("AantalStuksHLXKVPPicking", 412)
+	 Do ..SetLabel("AantalStuksHLXGVPPicking", 413)
+	 Do ..SetLabel("AantalLijnenReceptie", 500)
+	 Do ..SetLabel("AantalStuksReceptie", 600)
+]]></Implementation>
+</Method>
+
+<Method name="SetLabel">
+<FormalSpec>Naam:%String,Code:%String,ArrayType:%String,Qty:%Integer</FormalSpec>
+<Implementation><![CDATA[	Set ..ExportLabels(Code,Naam)=$LB($G(ArrayType),$G(Qty))
+]]></Implementation>
+</Method>
+
+<Method name="WriteHeader">
+<FormalSpec>SubVolgNr:%Integer=""</FormalSpec>
+<Implementation><![CDATA[
+	Set Key1=$O(..ExportLabels(""))
+	While Key1'=""
+	{
+		Set Key2=$O(..ExportLabels(Key1,""))
+		While Key2'=""
+		{
+			Set ArrayType=$LG(..ExportLabels(Key1,Key2))
+			If "TXT,DATE"[ArrayType
+			{
+				Write Key1,$S(SubVolgNr:"."_SubVolgNr,1:""),":",Key2,*9	
+			}
+			Elseif "DataType"=ArrayType
+			{
+				For I=1:1:$LG(..ExportLabels(Key1,Key2),2)
+				{
+					Write Key1,".",I,":",Key2,*9
+				}
+			}
+			Else  ; Object
+			{
+				For I=1:1:$LG(..ExportLabels(Key1,Key2),2)
+				{
+					Set obj= $zobjclassmethod(ArrayType,"%New")
+					Do obj.WriteHeader(I)
+				}
+			}
+			Set Key2=$O(..ExportLabels(Key1,Key2))
+		}
+		Set Key1=$O(..ExportLabels(Key1))
+	}
+]]></Implementation>
+</Method>
+
+<Method name="WriteData">
+<Implementation><![CDATA[
+	Set Key1=$O(..ExportLabels(""))
+	While Key1'=""
+	{
+		Set Key2=$O(..ExportLabels(Key1,""))
+		While Key2'=""
+		{
+			Set ArrayType=$LG(..ExportLabels(Key1,Key2))
+			If ArrayType=""
+			{
+				Write $$$ExcelNum($zobjProperty(%this,Key2)),*9
+			}
+			ElseIf ArrayType="TXT"
+			{
+				Write $zobjProperty(%this,Key2),*9
+			}
+			ElseIf ArrayType="DATE"
+			{
+				Write $$$ExcelDat($zobjProperty(%this,Key2)),*9
+			}
+			Elseif "DataType"=ArrayType
+			{
+				#dim Array as %ArrayOfDataTypes =($zobjProperty(%this,Key2))
+				Set Element=Array.GetNext(.Key) 
+				Set Count=0
+				While Key'=""
+				{
+					Set Count=Count+1
+					Write Element,*9
+					Set Element=Array.GetNext(.Key) 
+				}
+			}
+			Else  ; object
+			{
+				#dim ArrayObj as %ArrayOfObjects =($zobjProperty(%this,Key2))
+				Set Element=ArrayObj.GetNext(.Key) 
+				Set Count=0
+				While Key'=""
+				{
+					Set Count=Count+1
+					Do Element.WriteData()
+					Set Element=ArrayObj.GetNext(.Key) 
+				}
+			}
+			Set Key2=$O(..ExportLabels(Key1,Key2))
+		}
+		Set Key1=$O(..ExportLabels(Key1))
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/MAG/impl/ExportOutbound.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/MAG/impl/ExportOutbound.cls.xml	(revision 0)
+++ AX/Uitgaand/MAG/impl/ExportOutbound.cls.xml	(revision 52359)
@@ -0,0 +1,299 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.MAG.impl.ExportOutbound">
+<IncludeCode>BL.Derde.KlantSpecifiek,BL.Derde.LevSpecifiek,Prod.Product</IncludeCode>
+<Super>TECH.RegisteredObject,TECH.Filter</Super>
+
+<Property name="RefDatum">
+<Type>%Date</Type>
+</Property>
+
+<Property name="StartDatum">
+<Type>%Date</Type>
+</Property>
+
+<Property name="SOPRConvertor">
+<Type>AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor</Type>
+</Property>
+
+<Property name="CONSNr">
+<Type>%String</Type>
+</Property>
+
+<Property name="ORDNr">
+<Type>%String</Type>
+</Property>
+
+<Property name="OLRec">
+<Type>%String</Type>
+</Property>
+
+<Property name="lbSOL">
+<Type>%List</Type>
+</Property>
+
+<Property name="CONSRec">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalKinderen">
+<Type>%Integer</Type>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>AantalMaanden=2</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..SOPRConvertor=##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
+	Set ..RefDatum=$$INTDATE^vhLib.DataTypes("01/07/2018")
+	Set ..StartDatum=$$CALCDATE^vhLib.DataTypes(..RefDatum,"M",-AantalMaanden,"FD")
+	Kill ^||LocatieCache
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkAlle">
+<Description>
+d ##class(AX.Uitgaand.MAG.impl.ExportOutbound).%New().VerwerkAlle()</Description>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+	Write @F11,@F1
+	Set Dev=$$OPEN^vhDEV("\\notes01\shared\p v\","ProductOutbound "_$TR($ZDT($H),"/:")_".txt","W","T")
+	Use Dev
+	Do ..WriteHeader() Write !
+	Set Count=0
+	Set Verwerkt=0
+	Set ..CONSNr=$O(^ORDW("D",""))
+	While ..CONSNr'=""
+	{
+		Set Count=Count+1
+		If ..IsGeldig()
+		{
+			Set Verwerkt=Verwerkt+1
+			Do ..VerwerkConsolidatie()
+		}
+		If Count#100=0
+		{
+			Use 0
+			Set FP=2301 Write @F,@F1
+			Write " ",Verwerkt," / ",Count
+			Use Dev
+		}
+		Set ..CONSNr=$O(^ORDW("D",..CONSNr))
+	}
+	Do CLOSE^vhDEV(Dev)
+	Set FP=2301	Write @F,@F1
+	Write Verwerkt," / ",Count
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkConsolidatie">
+<Implementation><![CDATA[
+	Set ..CONSRec=^ORDW("D",..CONSNr)
+	
+	Set ..ORDNr=$O(^ORDW("D",..CONSNr,"D",""))
+	While ..ORDNr'=""
+	{
+		Set OLUNr=$O(^ORDW("D",..CONSNr,"D",..ORDNr,""))
+		While OLUNr'=""
+		{
+			Set ..OLRec=^ORDW("D",..CONSNr,"D",..ORDNr,OLUNr)
+	
+			If ..IsGeldigLijn()
+			{
+				#dim itKind as TECH.ArrayOneDimIterator =..GeefKinderIterator(OLUNr)
+				
+				Do itKind.Reset()
+				While itKind.HasNext()
+				{
+					Set ..lbSOL=itKind.Next()
+					Do ..VerwerkPicking()
+				}
+				
+				If ..AantalKinderen>1 Do ..VerwerkMoeder()
+			}
+			Set OLUNr=$O(^ORDW("D",..CONSNr,"D",..ORDNr,OLUNr))
+		}
+		Set ..ORDNr=$O(^ORDW("D",..CONSNr,"D",..ORDNr))
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkPicking">
+<Implementation><![CDATA[
+	If ..AantalKinderen > 1
+	{
+			Set ComponentNVT="Component"
+	}
+	Else 
+	{
+		Set ComponentNVT="NVT"
+	}
+	Set px=##class(AX.Uitgaand.MAG.dto.BewegingOutbound).CreatePicking(%this,ComponentNVT)
+	Do ..VulinTransport(px)
+	Do ..VulinAdres(px)
+	Do px.WriteData() Write !
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkMoeder">
+<Implementation><![CDATA[
+	Set px=##class(AX.Uitgaand.MAG.dto.BewegingOutbound).CreateMoeder(%this)
+	Do ..VulinTransport(px)
+	Do ..VulinAdres(px)
+	Do px.WriteData() Write !
+]]></Implementation>
+</Method>
+
+<Method name="VulinAdres">
+<FormalSpec>px:AX.Uitgaand.MAG.dto.BewegingOutbound</FormalSpec>
+<Implementation><![CDATA[
+	Set KLNr=$P(..CONSRec,"\")
+	Set AdrRec=$G(^ORDW("D",..CONSNr,"A"))
+	Set:AdrRec="" AdrRec=^KKL(^KK1(KLNr),0)
+	Set LandCode=$P(AdrRec,"\",8)
+	Set px.Land=$$LAND^vhRtn1(LandCode,1,1)
+	Set px.Gemeente=$P(AdrRec,"\",7)
+]]></Implementation>
+</Method>
+
+<Method name="VulinTransport">
+<FormalSpec>px:AX.Uitgaand.MAG.dto.BewegingOutbound</FormalSpec>
+<Implementation><![CDATA[
+	Set KLNr=$P(..CONSRec,"\")
+	Set BONRec=$G(^KUL(KLNr,"F",..CONSNr,1))
+	Set:BONRec="" BONRec=$G(^KUL(KLNr,"G",..CONSNr,1))
+	Set TranspIndex=$P(BONRec,"\",8)
+	Set TranspNr=$P(TranspIndex,";",1)
+	Set Transporteur=""
+	If (TranspNr'="") {
+		If '$D(^TRANSP("D",TranspNr)) {
+			Set TranspIndex="", TranspNr=""
+		} Else {
+			Set Transporteur=$P(^TRANSP("D",TranspNr),"\",1)
+		}
+	}		
+	Set VerzendWijze=$P($P(BONRec,"\",7)," - ")
+	Set:VerzendWijze="" VerzendWijze=$P($P(..CONSRec,"\",2),"#")
+	Set VerzendWijze=$P(VerzendWijze,"#")
+	Set VerzendWijze=$P(VerzendWijze," ")
+		
+	Set px.ShipmentType=..VertaalShipment(Transporteur,VerzendWijze) ;_"("_VerzendWijze_")"
+	Set px.Transporteur=..VertaalTransporteur(Transporteur,VerzendWijze)
+	
+	If TranspNr=""
+	{
+		Set px.ShippingDatum=px.PickDatum
+		Set px.ShipmentNumber=""
+	}
+	Else
+	{
+		Set px.ShippingDatum=$P(^TRANSP("D",TranspNr),"\",11)
+		Set px.ShipmentNumber=TranspNr
+		Set:$P(TranspIndex,";",2) px.LaadlijstNummer=$P(TranspIndex,";",2)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VertaalShipment">
+<FormalSpec>Transporteur:%String,VerzendW:%String</FormalSpec>
+<Implementation><![CDATA[
+	Set TransporteurCode=""
+	Set:Transporteur=""&&(VerzendW'="") Transporteur=$P($G(^RES("KLANT","PI","VERZENDWIJZE","D",VerzendW)),"`",12)
+	Set:Transporteur'="" TransporteurCode=$P(^TRANSP("T",Transporteur),"\")_"("_Transporteur_")"
+	
+	Quit:TransporteurCode="TMJ" "express"
+	Quit:TransporteurCode="JETC" "express"
+	Quit:TransporteurCode="JETL" "express"
+	Quit:TransporteurCode="FEDEX" "express"
+	Quit:$E(VerzendW,1,3)="SNT" "express"
+	Quit:$E(VerzendW,1,3)="EXU" "express"
+
+	Quit:$E(VerzendW,1,3)="SRV" "vertegenwoordiger"
+	Quit:$E(VerzendW,1,3)="INT" "vertegenwoordiger"
+	Quit:VerzendW?1"R"2N "vertegenwoordiger"
+
+	Quit:$E(VerzendW,1,2)="AF" "afhaling"
+
+	Quit:$E(VerzendW,1,2)="DI" "groupage"
+	Quit:$E(VerzendW,1,2)="DD" "groupage"
+	Quit:$E(VerzendW,1,2)="DH" "groupage"
+	Quit:VerzendW?1"E"2N "groupage"
+	Quit:VerzendW?1"U"2N "groupage"
+	
+	Quit "dedicated"
+]]></Implementation>
+</Method>
+
+<Method name="VertaalTransporteur">
+<FormalSpec>Transporteur:%String,VerzendW:%String</FormalSpec>
+<Implementation><![CDATA[
+	Set:Transporteur=""&&(VerzendW'="") Transporteur=$P($G(^RES("KLANT","PI","VERZENDWIJZE","D",VerzendW)),"`",12)
+	Set:Transporteur'="" TransporteurCode=$P(^TRANSP("T",Transporteur),"\") ;_"("_Transporteur_")"
+	Quit $G(TransporteurCode,VerzendW)
+]]></Implementation>
+</Method>
+
+<Method name="GeefKinderIterator">
+<FormalSpec>OLUNr:%String</FormalSpec>
+<Implementation><![CDATA[
+	Set ..AantalKinderen=0
+	Set SOLNr=$O(^ORDW("D",..CONSNr,"D",..ORDNr,OLUNr,""))
+	While SOLNr'=""
+	{
+		Set PRNr=$P(^ORDW("D",..CONSNr,"D",..ORDNr,OLUNr,SOLNr),"\")
+		Set Aantal=$P(^ORDW("D",..CONSNr,"D",..ORDNr,OLUNr,SOLNr),"\",3)
+		Set Pallet=$P(^ORDW("D",..CONSNr,"D",..ORDNr,OLUNr,SOLNr),"\",10)
+		Set Key=PRNr_";"_$S(";TBX;LBX;TAO;"[(";"_$$GENTYP^HAD(PRNr)_";"):Pallet,1:"*")
+		If '$D(Prod(PRNr))
+		{
+			Set ..AantalKinderen=..AantalKinderen+1
+			Set Prod(PRNr)=""
+		}
+		If '$D(ProdCnt(Key))
+		{
+			Set ProdCnt(Key)=$LB(PRNr,Aantal)
+		}
+		Else
+		{
+			Set $LI(ProdCnt(Key),2)=$LG(ProdCnt(Key),2)+Aantal
+		}
+		Set $LI(ProdCnt(Key),3)=$LG(ProdCnt(Key),3)_$LB(Pallet)
+		Set SOLNr=$O(^ORDW("D",..CONSNr,"D",..ORDNr,OLUNr,SOLNr))
+	}
+	Quit ##class(TECH.ArrayOneDimIterator).%New(.ProdCnt)
+]]></Implementation>
+</Method>
+
+<Method name="IsGeldig">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set CONSRec=^ORDW("D",..CONSNr)
+	Quit:$P(^ORDW("D",..CONSNr),"\")=$$$KlantHalux 0
+	Set PickDatum=+$P(^ORDW("D",..CONSNr),"\",19)
+	Quit:..RefDatum<PickDatum 0
+	Quit:..StartDatum>PickDatum 0
+	Quit 1
+]]></Implementation>
+</Method>
+
+<Method name="IsGeldigLijn">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Quit:$P(..OLRec,"\",4)'>0 0
+	
+	Quit 1
+]]></Implementation>
+</Method>
+
+<Method name="WriteHeader">
+<Implementation><![CDATA[	Do ##class(AX.Uitgaand.MAG.dto.BewegingOutbound).%New().WriteHeader()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/MAG/dto/BewegingInbound.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/MAG/dto/BewegingInbound.cls.xml	(revision 0)
+++ AX/Uitgaand/MAG/dto/BewegingInbound.cls.xml	(revision 52359)
@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.MAG.dto.BewegingInbound">
+<IncludeCode>Prod.Product,BL.Derde.LevSpecifiek</IncludeCode>
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="PRNr">
+<Type>%String</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="Product">
+<Type>AX.Uitgaand.PM.Product.impl.Product</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="ReceptieDatum">
+<Type>%String</Type>
+</Property>
+
+<Property name="Firma">
+<Type>%String</Type>
+</Property>
+
+<Property name="ReceptieID">
+<Type>%String</Type>
+</Property>
+
+<Property name="Leverancier">
+<Type>%String</Type>
+</Property>
+
+<Property name="Leveringsnota">
+<Type>%String</Type>
+</Property>
+
+<Property name="ItemId">
+<Type>%String</Type>
+</Property>
+
+<Property name="Omschrijving">
+<Type>%String</Type>
+</Property>
+
+<Property name="UM">
+<Type>%String</Type>
+</Property>
+
+<Property name="QtyStk">
+<Type>%String</Type>
+</Property>
+
+<Property name="Retour">
+<Type>%String</Type>
+</Property>
+
+<Property name="QtyGVP">
+<Type>%String</Type>
+</Property>
+
+<Property name="QtyPallet">
+<Type>%String</Type>
+</Property>
+
+<Property name="Stroom">
+<Type>%String</Type>
+</Property>
+
+<Property name="SOPRConvertor">
+<Type>AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="SOPRIterator">
+<Type>TECH.Iterator</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="ExportLabels">
+<Type>%String</Type>
+<MultiDimensional>1</MultiDimensional>
+<Private>1</Private>
+<Transient>1</Transient>
+</Property>
+
+<Property name="OpnemenInExport">
+<Type>%Boolean</Type>
+<Transient>1</Transient>
+</Property>
+
+<Method name="Create">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product,SOPRIterator:TECH.Iterator,HistRec:%String,HistIndex:%String</FormalSpec>
+<Implementation><![CDATA[
+	Set px=..%New()
+	Set px.Product=Product
+	Set px.PRNr=Product.Basis.ProductNr
+	Set px.SOPRIterator=SOPRIterator
+	Set px.SOPRConvertor=##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
+
+	Do px.Vulin(HistRec,HistIndex)
+	Quit px
+]]></Implementation>
+</Method>
+
+<Method name="%OnNew">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Do ..DefineLabels()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Vulin">
+<FormalSpec>HistRec:%String,HistIndex:%String</FormalSpec>
+<Implementation><![CDATA[
+		Set SOPRPRNr=..SOPRConvertor.GeefVervangProductDoorSOPRInAX(..PRNr)
+		Set:SOPRPRNr="" SOPRPRNr=..PRNr
+		Set ..ItemId=$$$ProductGet(SOPRPRNr,$$$IdentNummer)
+
+		Set ..Omschrijving=..Product.Basis.KortTekst
+		If $P(HistRec,"\",5)="W" ; magazijn
+		{
+			Set ..Firma="HALUX"
+			If $$$ProductGet(..PRNr,$$$WerkvloerSubMag)?1"TA"1.E
+			{
+			 	Set ..Firma="TAOR"
+			}
+			Set ..Stroom=2
+		}
+		Else
+		{
+			Set ..Firma="VH"
+			Set ..Stroom=1
+		}
+		Set ..UM="STK"
+		Set ..ReceptieDatum=+$P(HistRec,"\")
+		Set ..Leveringsnota=$P(HistRec,"\",11)
+		Set ..ReceptieID=$P(HistRec,"\",10)
+		Set:..ReceptieID="" ..ReceptieID=$P(HistRec,"\",7)
+		Set ..Leverancier=..Product.Prijs.Leverancier.%Id()
+		Set ..Retour=$P(HistRec,"\",4)="R"
+		Do ..VerdeelAantal($P(HistRec,"\",2))
+]]></Implementation>
+</Method>
+
+<Method name="VerdeelAantal">
+<FormalSpec>Aantal</FormalSpec>
+<Implementation><![CDATA[
+	Set (..QtyPallet,..QtyGVP,..QtyStk)=0
+	Set AantalInPallet=..Product.Basis.PalletAantal
+	Set AantalInGVP=..Product.Prijs.GrootVerpakking	
+	Set:AantalInGVP=1 AantalInGVP=""
+	Set ..QtyStk=Aantal
+	
+	If (Aantal'<AantalInPallet) && (AantalInPallet>1)
+	{
+		Set ..QtyPallet=(Aantal\AantalInPallet)
+		Set Aantal=Aantal-(..QtyPallet*AantalInPallet)
+	}
+	If (Aantal'<AantalInGVP) && (AantalInGVP>1)
+	{
+		Set ..QtyGVP=(Aantal\AantalInGVP)
+		Set Aantal=Aantal-(..QtyGVP*AantalInGVP)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="DefineLabels">
+<Implementation><![CDATA[
+ Do ..SetLabel("ReceptieDatum","K300","DATE")
+ Do ..SetLabel("Firma","K301","TXT")
+ Do ..SetLabel("ReceptieID","K304","TXT")
+ Do ..SetLabel("Leverancier","K307","TXT")
+ Do ..SetLabel("Leveringsnota","K308","TXT")
+ Do ..SetLabel("ItemId","K309","TXT")
+ Do ..SetLabel("Omschrijving","K310","TXT")
+ Do ..SetLabel("UM","K311","TXT")
+ Do ..SetLabel("QtyStk","K313")
+ Do ..SetLabel("Retour","K314","TXT")
+ Do ..SetLabel("QtyGVP","K317")
+ Do ..SetLabel("QtyPallet","K318")
+ Do ..SetLabel("Stroom","K319","TXT")
+]]></Implementation>
+</Method>
+
+<Method name="SetLabel">
+<FormalSpec>Naam:%String,Code:%String,DataType:%String,Qty:%Integer</FormalSpec>
+<Implementation><![CDATA[	Set ..ExportLabels(Code,Naam)=$LB($G(DataType),$G(Qty))
+]]></Implementation>
+</Method>
+
+<Method name="WriteHeader">
+<FormalSpec><![CDATA[SubVolgNr:%Integer="",&Maanden:%String]]></FormalSpec>
+<Implementation><![CDATA[
+	Set Key1=$O(..ExportLabels(""))
+	While Key1'=""
+	{
+		Set Key2=$O(..ExportLabels(Key1,""))
+		While Key2'=""
+		{
+			Set ArrayType=$LG(..ExportLabels(Key1,Key2))
+			If "TXT,DATE"[ArrayType
+			{
+				Write Key1,$S(SubVolgNr:"."_SubVolgNr,1:""),":",Key2,*9	
+			}
+			Elseif "DataType"=ArrayType
+			{
+				For I=$LG(..ExportLabels(Key1,Key2),2):-1:1
+				{
+					Write Key1,".",I,":",..GeefMaand(I,.Maanden,2),":",Key2,*9
+				}
+				
+			}
+			Else  ; Object
+			{
+				For I=$LG(..ExportLabels(Key1,Key2),2):-1:1
+				{
+					Set obj= $zobjclassmethod(ArrayType,"%New")
+					Do obj.WriteHeader(I_":"_..GeefMaand(I,.Maanden))
+				}
+			}
+			Set Key2=$O(..ExportLabels(Key1,Key2))
+		}
+		Set Key1=$O(..ExportLabels(Key1))
+	}
+]]></Implementation>
+</Method>
+
+<Method name="GeefMaand">
+<FormalSpec><![CDATA[I:%Integer,&Maanden:%Integer,NeemPiece]]></FormalSpec>
+<Implementation><![CDATA[
+	Set Maand=$O(Maanden(""))
+	While Maand'=""
+	{
+		If $P(Maanden(Maand),"\")=I	Set GevondenMaand=$$EXTDATE^vhLib.DataTypes($S($G(NeemPiece):$P(Maanden(Maand),"\",NeemPiece),1:Maand),"DM")
+		Set Maand=$O(Maanden(Maand))
+	}
+	Quit $G(GevondenMaand)
+]]></Implementation>
+</Method>
+
+<Method name="WriteData">
+<Implementation><![CDATA[
+	Set Key1=$O(..ExportLabels(""))
+	While Key1'=""
+	{
+		Set Key2=$O(..ExportLabels(Key1,""))
+		While Key2'=""
+		{
+			Set ArrayType=$LG(..ExportLabels(Key1,Key2))
+			If ArrayType=""
+			{
+				Write $$$ExcelNum($zobjProperty(%this,Key2)),*9
+			}
+			ElseIf ArrayType="TXT"
+			{
+				Write $zobjProperty(%this,Key2),*9
+			}
+			ElseIf ArrayType="DATE"
+			{
+				Write $$$ExcelDat($zobjProperty(%this,Key2)),*9
+			}
+			Elseif "DataType"=ArrayType
+			{
+				#dim Array as %ArrayOfDataTypes =($zobjProperty(%this,Key2))
+				Set Element=Array.GetNext(.Key) 
+				Set Count=0
+				While Key'=""
+				{
+					Set Count=Count+1
+					Write Element,*9
+					Set Element=Array.GetNext(.Key) 
+				}
+			}
+			Else  ; object
+			{
+				#dim ArrayObj as %ArrayOfObjects =($zobjProperty(%this,Key2))
+				Set Element=ArrayObj.GetNext(.Key) 
+				Set Count=0
+				While Key'=""
+				{
+					Set Count=Count+1
+					Do Element.WriteData()
+					Set Element=ArrayObj.GetNext(.Key) 
+				}
+			}
+			Set Key2=$O(..ExportLabels(Key1,Key2))
+		}
+		Set Key1=$O(..ExportLabels(Key1))
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/MAG/impl/ExportProductMaster.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/MAG/impl/ExportProductMaster.cls.xml	(revision 0)
+++ AX/Uitgaand/MAG/impl/ExportProductMaster.cls.xml	(revision 52359)
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.MAG.impl.ExportProductMaster">
+<IncludeCode>BL.Derde.LevSpecifiek,Prod.Product</IncludeCode>
+<Super>TECH.RegisteredObject,TECH.Filter</Super>
+
+<Property name="ProductIterator">
+<Type>TECH.Iterator</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Product">
+<Type>AX.Uitgaand.PM.Product.impl.Product</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="VoorraadMaanden">
+<Type>%Date</Type>
+<MultiDimensional>1</MultiDimensional>
+<Private>1</Private>
+</Property>
+
+<Property name="RefDatum">
+<Type>%Date</Type>
+</Property>
+
+<Property name="StartDatum">
+<Type>%Date</Type>
+</Property>
+
+<Property name="SOPRConvertor">
+<Type>AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="SOPRIterator">
+<Type>TECH.ListbuildIterator</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..SOPRConvertor=##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
+	Set ..RefDatum=$$INTDATE^vhLib.DataTypes("01/07/2018")
+	Set ..StartDatum=$$CALCDATE^vhLib.DataTypes(..RefDatum,"M",-12,"FD")
+	Do ..BepaalMaanden()
+	Kill ^||LogFlowVerwerkteProducten
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkAlle">
+<Description>
+d ##class(AX.Uitgaand.MAG.impl.ExportProductMaster).%New().VerwerkAlle()</Description>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+	Write @F11,@F1
+	Set Dev=$$OPEN^vhDEV("\\notes01\shared\p v\","ProductBasis.txt","W","T")
+	Use Dev
+	Do ..WriteHeader() Write !
+	Use 0
+	Set Filter=##class(AX.Uitgaand.MAG.impl.ProductIteratorFilter).%New(..StartDatum)
+	Set ..ProductIterator=##class(ProductIterator).%New(Filter)
+	Set Count=0
+	Set Verwerkt=0
+	While ..ProductIterator.HasNext() ;&&(Verwerkt<1000)
+	{
+		Set Count=Count+1
+		Set ..Product=..ProductIterator.Next()
+		Set ..SOPRIterator=..GeefSOPRIterator()
+		Do ..MarkVerwerk()
+		Set px=..MaakProxy()
+		If px.OpnemenInExport ;&&(..Product.Basis.GenerischeRoutine?4.9N)
+		{
+			Set Verwerkt=Verwerkt+1
+			use Dev
+			Do px.WriteData() Write !
+			use 0
+		}
+		If Count#100=0
+		{
+			Set FP=2301 Write @F,@F1
+			Write " ",Verwerkt," / ",Count
+		}
+	}
+	Do CLOSE^vhDEV(Dev)
+	Set FP=2301	Write @F,@F1
+	Write Verwerkt," / ",Count
+]]></Implementation>
+</Method>
+
+<Method name="MarkVerwerk">
+<Implementation><![CDATA[
+	Do ..SOPRIterator.Reset()
+	While ..SOPRIterator.HasNext()
+	{
+		Set PRNr=..SOPRIterator.Next()
+		Set ^||LogFlowVerwerkteProducten(PRNr)=$$$PRGet($$$KortTekst)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="GeefSOPRIterator">
+<Implementation><![CDATA[
+	Set PRNr=..Product.Basis.%Id()
+	Set it=..SOPRConvertor.GeefSOPRIterator(PRNr)
+	Set lb=""
+	While it.HasNext()
+	{
+		Set PRNr=it.Next()
+		Set lb=lb_$LB(PRNr)
+	}
+	If $LL(lb)=0 Set lb=$lb(PRNr)
+	Quit ##class(TECH.ListbuildIterator).%New(lb)
+]]></Implementation>
+</Method>
+
+<Method name="WriteHeader">
+<Implementation><![CDATA[
+	Merge Maanden=..VoorraadMaanden
+	Do ##class(AX.Uitgaand.MAG.dto.Artikel).%New().WriteHeader(,.Maanden)
+]]></Implementation>
+</Method>
+
+<Method name="MaakProxy">
+<Private>1</Private>
+<Implementation><![CDATA[
+	Merge Maanden=..VoorraadMaanden
+	Set px=##class(AX.Uitgaand.MAG.dto.Artikel).Create(..Product,..SOPRIterator)
+	Do px.AanvullenMetVoorraad(.Maanden)
+	Do px.AanvullenMetTransacties(.Maanden,..RefDatum)
+	Quit px
+]]></Implementation>
+</Method>
+
+<Method name="BepaalMaanden">
+<Implementation><![CDATA[
+	Kill ..VoorraadMaanden
+	For I=1:1:13
+	{
+		Set DatumTrans=$$CALCDATE^vhLib.DataTypes(..RefDatum,"M",-I,"FD")
+		Set (DatumVoorraad,DatumVoorraad2)=$$CALCDATE^vhLib.DataTypes(..RefDatum,"M",-I+1,"FD")
+		If '$D(^DW.StockWaardeD("VH",DatumVoorraad))
+		{
+			Set DatumVoorraad2=$O(^DW.StockWaardeD("VH",DatumVoorraad))
+
+		}
+		If (DatumVoorraad2-DatumVoorraad)<5 Set DatumVoorraad=DatumVoorraad2 ; mag niet te ver na de 1ste van de maand liggen
+		Set ..VoorraadMaanden(DatumTrans)=I_"\"_DatumVoorraad
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/MAG/impl/ExportIC.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/MAG/impl/ExportIC.cls.xml	(revision 0)
+++ AX/Uitgaand/MAG/impl/ExportIC.cls.xml	(revision 52359)
@@ -0,0 +1,419 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.MAG.impl.ExportIC">
+<IncludeCode>BL.Derde.LevSpecifiek,BL.Derde.KlantSpecifiek,Prod.Product</IncludeCode>
+<Super>TECH.RegisteredObject,TECH.Filter</Super>
+
+<Property name="ProductIterator">
+<Type>TECH.Iterator</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Product">
+<Type>AX.Uitgaand.PM.Product.impl.Product</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="VoorraadMaanden">
+<Type>%Date</Type>
+<MultiDimensional>1</MultiDimensional>
+<Private>1</Private>
+</Property>
+
+<Property name="RefDatum">
+<Type>%Date</Type>
+</Property>
+
+<Property name="StartDatum">
+<Type>%Date</Type>
+</Property>
+
+<Property name="CONSNr">
+<Type>%String</Type>
+</Property>
+
+<Property name="Node">
+<Type>%String</Type>
+</Property>
+
+<Property name="ORDNr">
+<Type>%String</Type>
+</Property>
+
+<Property name="OLRec">
+<Type>%String</Type>
+</Property>
+
+<Property name="lbSOL">
+<Type>%List</Type>
+</Property>
+
+<Property name="CONSRec">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalKinderen">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="SOPRConvertor">
+<Type>AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="SOPRIterator">
+<Type>TECH.ListbuildIterator</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Dev">
+<Type>%String</Type>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>AantalMaand=2</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..SOPRConvertor=##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
+	Set ..RefDatum=$$INTDATE^vhLib.DataTypes("01/07/2018")
+	Set ..StartDatum=$$CALCDATE^vhLib.DataTypes(..RefDatum,"M",-AantalMaand,"FD")
+	Kill ^||LogFlowVerwerkteProducten
+	Kill ^||LocatieCache
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkAlle">
+<Description>
+d ##class(AX.Uitgaand.MAG.impl.ExportIC).%New().VerwerkAlle()</Description>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+	Write @F11,@F1
+	Set ..Dev=$$OPEN^vhDEV("\\notes01\shared\p v\","ProductIC "_$TR($ZDT($H),"/:")_".txt","W","T")
+	Use ..Dev
+	Do ..WriteHeader() Write !
+	Use 0
+	Set Filter=##class(AX.Uitgaand.MAG.impl.ProductIteratorFilter).%New(..StartDatum)
+	Set ..ProductIterator=##class(ProductIterator).%New(Filter)
+	Do ..VerwerkHist()
+	Do ..VerwerkCons()
+	Do CLOSE^vhDEV(..Dev)
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHist">
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+	Set Filter=##class(AX.Uitgaand.MAG.impl.ProductIteratorFilter).%New(..StartDatum)
+	Set ..ProductIterator=##class(ProductIterator).%New(Filter)
+	Set Count=0
+	Set Verwerkt=0
+	While ..ProductIterator.HasNext() ;&&(Verwerkt<1000)
+	{
+		Set Count=Count+1
+		Set ..Product=..ProductIterator.Next()
+		Set ..SOPRIterator=..GeefSOPRIterator()
+		Use ..Dev
+		If ..IsGeldigHistProduct()
+		{
+			Do ..ExportOneHistProduct()
+			Set Verwerkt=Verwerkt+1
+		}
+		If Count#100=0
+		{
+			Use 0
+			Set FP=2301 Write @F,@F1
+			Write "Hist ",Verwerkt," / ",Count
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkCons">
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+	Set Count=0
+	Set Verwerkt=0
+	Set ..Node=$O(^KUL($$$KlantHalux,""))
+	While ..Node'="" 
+	{
+		Set ..CONSNr=$O(^KUL($$$KlantHalux,..Node,""))
+		While ..CONSNr'=""
+		{
+			Set Count=Count+1
+			Set ..CONSRec=^KUL($$$KlantHalux,..Node,..CONSNr,1)
+
+			If ..IsGeldigCons()
+			{
+				Set Verwerkt=Verwerkt+1
+				Do ..VerwerkConsolidatie()
+			}
+			
+			If Count#100=0
+			{
+				Use 0
+				Set FP=2301 Write @F,@F1
+				Write "Cons ",Verwerkt," / ",Count
+				Use ..Dev
+			}
+			Set ..CONSNr=$O(^KUL($$$KlantHalux,..Node,..CONSNr))
+		}
+		Set ..Node=$O(^KUL($$$KlantHalux,..Node))
+	}
+	Use 0
+	Set FP=2301	Write @F,@F1
+	Write "Cons ",Verwerkt," / ",Count
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkConsolidatie">
+<Implementation><![CDATA[
+	
+	Set LijnNr=$O(^KUL($$$KlantHalux,..Node,..CONSNr,99))
+	While LijnNr?3.N
+	{
+		Set ..OLRec=^KUL($$$KlantHalux,..Node,..CONSNr,LijnNr)
+	
+		If ..IsGeldigConsLijn() 
+		{
+			Do ..VerwerkPicking()
+		}
+				
+
+		Set LijnNr=$O(^KUL($$$KlantHalux,..Node,..CONSNr,LijnNr))
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkPicking">
+<Implementation><![CDATA[
+	Use ..Dev
+	Set HistRec=""
+	Set $P(HistRec,"\",1)=$S($P(..CONSRec,"\",45)'="":$P(..CONSRec,"\",45),$P(..CONSRec,"\",49)'="":$P(..CONSRec,"\",49),1:$$INTDATE^vhLib.DataType($P(..CONSRec,"\",2)))
+	Set $P(HistRec,"\",2)=$P(..OLRec,"\",3)
+	Set $P(HistRec,"\",4)="T"
+	Set $P(HistRec,"\",5)="M"
+	Set $P(HistRec,"\",7)=..CONSNr
+	Set $P(HistRec,"\",12)=$P($P(..CONSRec,"\",7),"#")
+	Set ..Product=##class(AX.Uitgaand.PM.Product.impl.Product).%New($P(..OLRec,"\",2))
+	Set px=..MaakProxy(HistRec,"KUL")
+	Do px.WriteData() Write !
+]]></Implementation>
+</Method>
+
+<Method name="IsGeldigCons">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set PickDatum=+$S($P(..CONSRec,"\",45)'="":$P(..CONSRec,"\",45),$P(..CONSRec,"\",49)'="":$P(..CONSRec,"\",49),1:$$INTDATE^vhLib.DataType($P(..CONSRec,"\",2)))
+	Quit:..RefDatum<PickDatum 0
+	Quit:..StartDatum>PickDatum 0
+	Quit 1
+]]></Implementation>
+</Method>
+
+<Method name="IsGeldigConsLijn">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Quit:'$P(..OLRec,"\",2) 0
+	Quit:'$D(^KPR($P(..OLRec,"\",2))) 0
+	Quit 1
+]]></Implementation>
+</Method>
+
+<UDLText name="T">
+<Content><![CDATA[
+/*Method VerwerkCons() [ ProcedureBlock = 0 ]
+{
+	Set Count=0
+	Set Verwerkt=0
+	Set ..CONSNr=$O(^ORDW("D",""))
+	While ..CONSNr'=""
+	{
+		Set Count=Count+1
+		If ..IsGeldigCons()
+		{
+			Set Verwerkt=Verwerkt+1
+			Do ..VerwerkConsolidatie()
+		}
+		
+		If Count#100=0
+		{
+			Use 0
+			Set FP=2301 Write @F,@F1
+			Write "Cons ",Verwerkt," / ",Count
+			Use ..Dev
+		}
+		Set ..CONSNr=$O(^ORDW("D",..CONSNr))
+	}
+	Use 0
+	Set FP=2301	Write @F,@F1
+	Write "Cons ",Verwerkt," / ",Count
+}
+
+Method VerwerkConsolidatie()
+{
+	Set ..CONSRec=^ORDW("D",..CONSNr)
+	
+	Set ..ORDNr=$O(^ORDW("D",..CONSNr,"D",""))
+	While ..ORDNr'=""
+	{
+		Set OLUNr=$O(^ORDW("D",..CONSNr,"D",..ORDNr,""))
+		While OLUNr'=""
+		{
+			Set ..OLRec=^ORDW("D",..CONSNr,"D",..ORDNr,OLUNr)
+	
+			If ..IsGeldigConsLijn()
+			{
+				#dim itKind as TECH.ArrayOneDimIterator =..GeefKinderIterator(OLUNr)
+				
+				Do itKind.Reset()
+				While itKind.HasNext()
+				{
+					Set ..lbSOL=itKind.Next()
+					Do ..VerwerkPicking()
+				}
+				
+				;If ..AantalKinderen>1 Do ..VerwerkMoeder()
+			}
+			Set OLUNr=$O(^ORDW("D",..CONSNr,"D",..ORDNr,OLUNr))
+		}
+		Set ..ORDNr=$O(^ORDW("D",..CONSNr,"D",..ORDNr))
+	}
+}
+Method VerwerkPicking()
+{
+	Set HistRec=""
+	Set $P(HistRec,"\",1)=$P(^ORDW("D",..CONSNr),"\",19)
+	Set $P(HistRec,"\",2)=$LG(..lbSOL,2)
+	Set $P(HistRec,"\",4)="T"
+	Set $P(HistRec,"\",5)="M"
+	Set $P(HistRec,"\",10)=..CONSNr
+	Set ..Product=##class(AX.Uitgaand.PM.Product.impl.Product).%New($LG(..lbSOL))
+	Set px=..MaakProxy(HistRec,"CONS")
+	Do px.WriteData() Write !
+}
+Method IsGeldigCons() As %Boolean
+{
+	Set CONSRec=^ORDW("D",..CONSNr)
+	Quit:$P(^ORDW("D",..CONSNr),"\")'=$$$KlantHalux 0
+	Set PickDatum=+$P(^ORDW("D",..CONSNr),"\",19) ; aanmaak ORDW
+	Set:PickDatum="" PickDatum=+$P(^ORDW("D",..CONSNr),"\",22) ; doorsturen wms
+	Quit:..RefDatum<PickDatum 0
+	Quit:..StartDatum>PickDatum 0
+	Quit 1
+}
+
+Method IsGeldigConsLijn() As %Boolean
+{
+	Quit 1
+}
+
+*/
+]]></Content>
+</UDLText>
+
+<Method name="ExportOneHistProduct">
+<Implementation><![CDATA[
+	Set PRNr=..Product.Basis.%Id()
+	Set HistIndex=$O(^PRHIST(PRNr,""))
+	While HistIndex'=""
+	{
+		Set HistRec=^PRHIST(PRNr,HistIndex)
+		If ..IsGeldigHist(HistRec)
+		{
+			Set px=..MaakProxy(HistRec,HistIndex)
+			Do px.WriteData() Write !
+		}
+		Set HistIndex=$O(^PRHIST(PRNr,HistIndex))
+	}
+]]></Implementation>
+</Method>
+
+<Method name="IsGeldigHistProduct">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Quit:(+..Product.Basis.StockNietStock'=0)&&(..Product.Prijs.Leverancier.%Id()=$$$LevHalux) 1
+	Quit 0
+]]></Implementation>
+</Method>
+
+<Method name="IsGeldigHist">
+<FormalSpec>HistRec:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set Magazijn=$P(HistRec,"\",5)
+	Set Actie=$P(HistRec,"\",4)
+	Set Datum=+$P(HistRec,"\",1)
+	Set Klant=$P(HistRec,"\",6)
+	Quit:Datum'<..RefDatum 0
+	Quit:Datum<..StartDatum 0
+	Quit (Actie="I")
+]]></Implementation>
+</Method>
+
+<Method name="GeefSOPRIterator">
+<Implementation><![CDATA[
+	Set PRNr=..Product.Basis.%Id()
+	Set it=..SOPRConvertor.GeefSOPRIterator(PRNr)
+	Set lb=""
+	While it.HasNext()
+	{
+		Set PRNr=it.Next()
+		Set lb=lb_$LB(PRNr)
+	}
+	If $LL(lb)=0 Set lb=$lb(PRNr)
+	Quit ##class(TECH.ListbuildIterator).%New(lb)
+]]></Implementation>
+</Method>
+
+<Method name="GeefKinderIterator">
+<FormalSpec>OLUNr:%String</FormalSpec>
+<Implementation><![CDATA[
+	Set ..AantalKinderen=0
+	Set SOLNr=$O(^ORDW("D",..CONSNr,"D",..ORDNr,OLUNr,""))
+	While SOLNr'=""
+	{
+		Set PRNr=$P(^ORDW("D",..CONSNr,"D",..ORDNr,OLUNr,SOLNr),"\")
+		Set Aantal=$P(^ORDW("D",..CONSNr,"D",..ORDNr,OLUNr,SOLNr),"\",3)
+		Set Pallet=$P(^ORDW("D",..CONSNr,"D",..ORDNr,OLUNr,SOLNr),"\",10)
+		Set Key=PRNr ;_";"_$S(";TBX;LBX;TAO;"[(";"_$$GENTYP^HAD(PRNr)_";"):Pallet,1:"*")
+		If '$D(Prod(PRNr))
+		{
+			Set ..AantalKinderen=..AantalKinderen+1
+			Set Prod(PRNr)=""
+		}
+		If '$D(ProdCnt(Key))
+		{
+			Set ProdCnt(Key)=$LB(PRNr,Aantal)
+		}
+		Else
+		{
+			Set $LI(ProdCnt(Key),2)=$LG(ProdCnt(Key),2)+Aantal
+		}
+		Set $LI(ProdCnt(Key),3)=$LG(ProdCnt(Key),3)_$LB(Pallet)
+		Set SOLNr=$O(^ORDW("D",..CONSNr,"D",..ORDNr,OLUNr,SOLNr))
+	}
+	Quit ##class(TECH.ArrayOneDimIterator).%New(.ProdCnt)
+]]></Implementation>
+</Method>
+
+<Method name="WriteHeader">
+<Implementation><![CDATA[	Do ##class(AX.Uitgaand.MAG.dto.BewegingIC).%New().WriteHeader()
+]]></Implementation>
+</Method>
+
+<Method name="MaakProxy">
+<FormalSpec>HistRec:%String,HistIndex:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set px=##class(AX.Uitgaand.MAG.dto.BewegingIC).Create(..Product,..SOPRIterator,HistRec,HistIndex)
+	Quit px
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/MAG/dto/Artikel.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/MAG/dto/Artikel.cls.xml	(revision 0)
+++ AX/Uitgaand/MAG/dto/Artikel.cls.xml	(revision 52359)
@@ -0,0 +1,678 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.MAG.dto.Artikel">
+<IncludeCode>Prod.Product,BL.Derde.LevSpecifiek</IncludeCode>
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="PRNr">
+<Type>%String</Type>
+</Property>
+
+<Property name="Product">
+<Type>AX.Uitgaand.PM.Product.impl.Product</Type>
+</Property>
+
+<Property name="ItemId">
+<Type>%String</Type>
+</Property>
+
+<Property name="Omschrijving">
+<Type>%String</Type>
+</Property>
+
+<Property name="ProductStatus">
+<Type>%String</Type>
+</Property>
+
+<Property name="ArtikelGroep">
+<Type>%String</Type>
+</Property>
+
+<Property name="Unit">
+<Type>%String</Type>
+</Property>
+
+<Property name="Diepte">
+<Type>%String</Type>
+</Property>
+
+<Property name="Breedte">
+<Type>%String</Type>
+</Property>
+
+<Property name="Hoogte">
+<Type>%String</Type>
+</Property>
+
+<Property name="Gewicht">
+<Type>%String</Type>
+</Property>
+
+<Property name="GenestVolume">
+<Type>%String</Type>
+</Property>
+
+<Property name="VerpakTypeKVP">
+<Type>%String</Type>
+</Property>
+
+<Property name="VerpakTypeGVP">
+<Type>%String</Type>
+</Property>
+
+<Property name="VerpakTypePallet">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalKVP">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalGVP">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalPallet">
+<Type>%String</Type>
+</Property>
+
+<Property name="DiepteKVP">
+<Type>%String</Type>
+</Property>
+
+<Property name="BreedteKVP">
+<Type>%String</Type>
+</Property>
+
+<Property name="HoogteKVP">
+<Type>%String</Type>
+</Property>
+
+<Property name="GewichtKVP">
+<Type>%String</Type>
+</Property>
+
+<Property name="DiepteGVP">
+<Type>%String</Type>
+</Property>
+
+<Property name="BreedteGVP">
+<Type>%String</Type>
+</Property>
+
+<Property name="HoogteGVP">
+<Type>%String</Type>
+</Property>
+
+<Property name="GewichtGVP">
+<Type>%String</Type>
+</Property>
+
+<Property name="DieptePallet">
+<Type>%String</Type>
+</Property>
+
+<Property name="BreedtePallet">
+<Type>%String</Type>
+</Property>
+
+<Property name="HoogtePallet">
+<Type>%String</Type>
+</Property>
+
+<Property name="GewichtPallet">
+<Type>%String</Type>
+</Property>
+
+<Property name="DieptePalletOverhang">
+<Type>%String</Type>
+</Property>
+
+<Property name="BreedtePalletOverhang">
+<Type>%String</Type>
+</Property>
+
+<Property name="Tracking">
+<Type>%String</Type>
+</Property>
+
+<Property name="Leverancier">
+<Type>%String</Type>
+</Property>
+
+<Property name="CifPPL">
+<Type>%String</Type>
+</Property>
+
+<Property name="SourcingVH">
+<Type>%String</Type>
+</Property>
+
+<Property name="SourcingHLX">
+<Type>%String</Type>
+</Property>
+
+<Property name="AssortimentEC">
+<Type>%String</Type>
+</Property>
+
+<Property name="FirstDateOfStock">
+<Type>%String</Type>
+</Property>
+
+<Property name="ABCPicking">
+<Type>%String</Type>
+</Property>
+
+<Property name="BeginStock">
+<Type>%Integer</Type>
+<Collection>array</Collection>
+</Property>
+
+<Property name="StockVH">
+<Type>%String</Type>
+</Property>
+
+<Property name="StockHLX">
+<Type>%String</Type>
+</Property>
+
+<Property name="DefaultMagazijn">
+<Type>%String</Type>
+</Property>
+
+<Property name="TransLoc">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalProducten">
+<Type>%String</Type>
+</Property>
+
+<Property name="arTrans">
+<Type>ArtikelTransactiesPerMaand</Type>
+<Collection>array</Collection>
+</Property>
+
+<Property name="SOPRConvertor">
+<Type>AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="SOPRIterator">
+<Type>TECH.Iterator</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="ExportLabels">
+<Type>%String</Type>
+<MultiDimensional>1</MultiDimensional>
+<Private>1</Private>
+<Transient>1</Transient>
+</Property>
+
+<Property name="OpnemenInExport">
+<Type>%Boolean</Type>
+<Transient>1</Transient>
+</Property>
+
+<Method name="Create">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product,SOPRIterator:TECH.Iterator</FormalSpec>
+<Implementation><![CDATA[
+	Set px=..%New()
+	Set px.Product=Product
+	Set px.PRNr=Product.Basis.ProductNr
+	Set px.SOPRIterator=SOPRIterator
+	Set px.SOPRConvertor=##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
+
+	Do px.Vulin()
+	Quit px
+]]></Implementation>
+</Method>
+
+<Method name="%OnNew">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Do ..DefineLabels()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Vulin">
+<Implementation><![CDATA[
+		Set SOPRPRNr=..SOPRConvertor.GeefVervangProductDoorSOPRInAX(..PRNr)
+		Set:SOPRPRNr="" SOPRPRNr=..PRNr
+		Set ..ItemId=$$$ProductGet(SOPRPRNr,$$$IdentNummer)
+
+		Set ..Omschrijving=$$$ProductGet(..PRNr, $$$KortTekst)
+		Set ..ArtikelGroep=..Product.Basis.ProductGroep
+		Set ..ProductStatus="" ; achteraf via transactie
+		Set ..Unit="STK" ; achteraf via transactie
+
+		Do ..Verpakking()
+		Set ..Tracking="FIFO"
+		Set ..ABCPicking=..Product.Basis.ABCTransport
+		Set ..Leverancier=..Product.Prijs.Leverancier.Nummer_" "_$E(..Product.Prijs.Leverancier.Naam,1 ,10)
+		Set ..CifPPL=..Product.Prijs.CifPPL
+		Do ..FirstDayOfStock()
+		Do ..ECAssortiment()
+		Do ..Sourcing()
+		Do ..Locatie()
+]]></Implementation>
+</Method>
+
+<Method name="AanvullenMetTransacties">
+<FormalSpec><![CDATA[&Maanden:%String,LaatsteDatum:%Date]]></FormalSpec>
+<Implementation><![CDATA[
+	Set Datum=""
+	Kill Trans
+	Set Datum=$O(Maanden(""))
+    While Datum'=""
+	{
+		If ($P(Maanden(Datum),"\")'=13) ; 12 maanden voldoende
+		{
+			Set Trans(Datum)=##class(ArtikelTransactiesPerMaand).%New(%this)
+			Do ..arTrans.SetAt(Trans(Datum),Datum)
+		}
+		Set Datum=$O(Maanden(Datum))		
+	}
+	
+	Do ..SOPRIterator.Reset()
+	While ..SOPRIterator.HasNext()
+	{
+		Set PRNr=..SOPRIterator.Next()
+		Set VolgNr=$O(^PRHIST(PRNr,""))
+		While VolgNr'=""
+		{
+			Set HistRec=^PRHIST(PRNr,VolgNr)
+			Set Datum=+$P(HistRec,"\")
+			If (Datum<LaatsteDatum)
+			{
+				If '$D(Trans(Datum)) Set Datum=$O(Trans(Datum),-1)
+				If (Datum'="")
+				{
+					Do Trans(Datum).VoegToe(HistRec)
+					If Trans(Datum).OpnemenInExport Set ..OpnemenInExport=1 
+				}
+			}
+			Set VolgNr=$O(^PRHIST(PRNr,VolgNr))
+		}
+		Set ..AantalProducten=..AantalProducten+1
+	}
+]]></Implementation>
+</Method>
+
+<Method name="AanvullenMetVoorraad">
+<FormalSpec><![CDATA[&Maanden:%String]]></FormalSpec>
+<Implementation><![CDATA[
+  	Set Maand=$O(Maanden(""))
+  	While Maand'=""
+	{
+		Set Datum=$P(Maanden(Maand),"\",2)
+		If Datum
+		{ 	Set (StockVH,StockHLX)=0
+			Do ..SOPRIterator.Reset()
+			While ..SOPRIterator.HasNext()
+			{
+				Set PRNr=..SOPRIterator.Next()
+				
+				Set StockWaardeVH=##class(DW.StockWaarde).%OpenId("VH||"_Datum_"||"_PRNr)
+				If $IsObject(StockWaardeVH)
+				{
+					 Set StockVH=StockVH+StockWaardeVH.Stock
+					 Set StockHLX=StockHLX+StockWaardeVH.WerkVloer
+					 
+				}
+				Set StockWaardeHLX=##class(DW.StockWaarde).%OpenId("HALUX||"_Datum_"||"_PRNr)
+				If $IsObject(StockWaardeHLX)
+				{
+					 Set StockHLX=StockHLX+StockWaardeHLX.WerkVloer
+					 
+				}
+			}
+			If $P(Maanden(Maand),"\")=1
+			{
+				Set ..StockVH=StockVH
+				Set ..StockHLX=StockHLX
+			}
+			;w Datum," ",VHBE+HLX," "
+			Do ..BeginStock.SetAt(StockVH+StockHLX,Datum)
+		}	
+		Set Maand=$O(Maanden(Maand))
+	}
+]]></Implementation>
+</Method>
+
+<Method name="FirstDayOfStock">
+<Implementation><![CDATA[
+		Set Datum=""
+		Do ..SOPRIterator.Reset()
+		While ..SOPRIterator.HasNext()
+		{
+			Set PRNr=..SOPRIterator.Next()
+			Set VolgNr=$O(^PRHIST(PRNr,""))
+			If VolgNr
+			{
+				Set HistDatum=+$P(^PRHIST(PRNr,VolgNr),"\")
+				If Datum=""||(Datum>HistDatum)
+				{
+					Set Datum=HistDatum
+				}
+			}
+		}
+		Set ..FirstDateOfStock=Datum
+]]></Implementation>
+</Method>
+
+<Method name="ECAssortiment">
+<Implementation><![CDATA[
+	Set ..AssortimentEC="Neen"
+ 	Do ..SOPRIterator.Reset()
+	While ..SOPRIterator.HasNext()
+	{
+		Set PRNr=..SOPRIterator.Next()
+		Set GenerationID=$O(^AX.Uitgaan6850.BasisAssort150AD(""),-1)
+		Set:$D(^AX.Uitgaan6850.BasisAssort150AD(GenerationID,..PRNr,"0000000005")) ..AssortimentEC="Ja"
+	}
+]]></Implementation>
+</Method>
+
+<Method name="Locatie">
+<Implementation><![CDATA[
+	Set PRNr=..PRNr
+	Set KindPRNr=..SOPRConvertor.GeefSOPRKindInCache(PRNr)
+	If KindPRNr Set PRNr=KindPRNr
+	
+	Set (LocM, Pickbaar, LocTrans)=""
+
+	&SQL( DECLARE WMS CURSOR FOR 
+	SELECT l.loc_M,  loc_trans, loc_isPickbaar
+	into :LocM, :LocTrans,:Pickbaar
+	from EWMS.inventory i
+	join EWMS.locations l on l.loc_id=i.loc_id
+	left outer join EWMS.Transloc t on t.loc_m=l.loc_m and t.loc_g=l.loc_g and t.loc_x=l.loc_x and t.loc_y=l.loc_y
+	where product=:PRNr and l.loc_m<5
+	order by isnull(loc_ispickbaar,0) desc , l.loc_m asc)
+	&sql(OPEN WMS)
+  	&sql(FETCH WMS)
+  	
+	If (+LocM=1)||((LocM="")&&($$$PRGet($$$OpslagZone)=1))
+	{
+		Set ..DefaultMagazijn="AUTO"
+	}
+	Else
+	{
+		Set ..DefaultMagazijn="TRAD"
+		Set:Pickbaar ..TransLoc=LocTrans
+	}
+
+	If $$ISORGAL^PRODUKT2(..PRNr)||$$IsTaorCubicover^PRODUKT2(..PRNr)
+	{
+		Set ..DefaultMagazijn="VAL"
+	}
+ 	&sql(CLOSE WMS)
+]]></Implementation>
+</Method>
+
+<Method name="Sourcing">
+<Implementation><![CDATA[
+	Set (VHBE,HLX)=""
+	Set OwnerHLX=$E(..Product.Basis.LinkType,1,2)="HH"
+	Set StockVH=(..Product.Basis.StockNietStock=1)||(..Product.Basis.StockNietStock=2)
+	If OwnerHLX
+	{
+		Set HLX="BTS"
+		Set VHBE=""
+		Set ProductStatus="COMP"
+	}
+	Else
+	{
+		If ..Product.Basis.LinkType="S"
+		{
+			Set VHBE="MTO"
+			Set HLX=""
+			Set ProductStatus="SET"
+		}
+		ElseIf ..Leverancier=$$$LevHalux
+		{
+			Set VHBE=$S(StockVH:"BTS",1:"BTO")
+			Set HLX="MTO-IC"
+			Set ProductStatus="MW"
+		}
+		Else
+		{
+			Set VHBE=$S(StockVH:"BTS",1:"BTO")
+			Set x=..Product.Basis.WerkvloerSubmagazijn
+			Set y=$$$ProductGet(..PRNr,$$$WerkvloerHerbestelAfronding)
+			If $L(x)
+			{
+				Set HLX=$S($L(y):"BTS-IC",1:"BTO-IC")
+			}
+			Set ProductStatus="BSL"
+		}
+		
+	}
+	Set ..ProductStatus=ProductStatus
+	Set ..SourcingVH=VHBE
+	Set ..SourcingHLX=HLX
+]]></Implementation>
+</Method>
+
+<Method name="Verpakking">
+<Implementation><![CDATA[
+	Set GVP=..Product.Prijs.GrootVerpakking
+	Set KVP=..Product.Prijs.NormaleVerpakking
+	; Verplaatsen
+	If 'GVP, KVP Set GVP=KVP, KVP=""
+	If GVP=1 Set GVP="",KVP=""
+	If KVP=1 Set KVP=""
+	
+	;Ophalen dimensie
+	#dim pxDimensie as Dimensie = ##class(Dimensie).%New(..Product)
+	
+	If 'pxDimensie.NettoGewicht
+	{
+		Set pxDimensie.NettoGewicht=..Product.Basis.GewichtPerDuizendStuksInKG
+	}
+	If 'pxDimensie.BrutoGewicht
+	{
+		Set pxDimensie.BrutoGewicht=pxDimensie.NettoGewicht
+	}
+	Set ..VerpakTypeGVP=pxDimensie.Verpakkingsvorm ; tijdelijk 
+	If GVP && ('pxDimensie.Aantal || (pxDimensie.Aantal=GVP))
+	{
+		Set ..AantalGVP=GVP
+		Set ..GewichtGVP=pxDimensie.BrutoGewicht*GVP
+		Set ..HoogteGVP=pxDimensie.Hoogte
+		Set ..BreedteGVP=pxDimensie.Breedte
+		Set ..DiepteGVP=pxDimensie.Diepte
+		Set ..VerpakTypeGVP=pxDimensie.Verpakkingsvorm
+	}
+	If KVP
+	{
+		Set ..AantalKVP=KVP
+		Set ..GewichtKVP=pxDimensie.BrutoGewicht*KVP
+	}
+	If GVP=""
+	{
+		Set ..Gewicht=pxDimensie.BrutoGewicht
+		Set ..Hoogte=pxDimensie.Hoogte
+		Set ..Breedte=pxDimensie.Breedte
+		Set ..Diepte=pxDimensie.Diepte
+	}
+	
+	Set Pallet=pxDimensie.PalletAantal
+	If Pallet
+	{
+		Set ..AantalPallet=Pallet
+		Set ..GewichtPallet=Pallet*pxDimensie.BrutoGewicht
+		Set ..HoogtePallet=pxDimensie.PalletHoogte
+		Set ..DieptePallet=pxDimensie.PalletDiepte
+		Set ..BreedtePallet=pxDimensie.PalletBreedte	}
+
+	Set ..Gewicht=pxDimensie.NettoGewicht
+]]></Implementation>
+</Method>
+
+<Method name="DefineLabels">
+<Implementation><![CDATA[
+ Do ..SetLabel("ItemId", 100,"TXT")
+ Do ..SetLabel("Omschrijving", 101,"TXT")
+ Do ..SetLabel("ProductStatus", 102,"TXT")
+ Do ..SetLabel("ArtikelGroep", 103,"TXT")
+ Do ..SetLabel("Unit", 104,"TXT")
+ Do ..SetLabel("Diepte", 105)
+ Do ..SetLabel("Breedte", 106)
+ Do ..SetLabel("Hoogte", 107)
+ Do ..SetLabel("Gewicht", 108)
+ Do ..SetLabel("GenestVolume", 109)
+ Do ..SetLabel("VerpakTypeKVP", 110,"TXT")
+ Do ..SetLabel("VerpakTypeGVP", 111,"TXT")
+ Do ..SetLabel("VerpakTypePallet", 112,"TXT")
+ Do ..SetLabel("AantalKVP", 113)
+ Do ..SetLabel("AantalGVP", 114)
+ Do ..SetLabel("AantalPallet", 115)
+ Do ..SetLabel("DiepteGVP", 116)
+ Do ..SetLabel("BreedteGVP", 117)
+ Do ..SetLabel("HoogteGVP", 118)
+ Do ..SetLabel("GewichtGVP", 119)
+ Do ..SetLabel("DiepteKVP", 120)
+ Do ..SetLabel("BreedteKVP", 121)
+ Do ..SetLabel("HoogteKVP", 122)
+ Do ..SetLabel("GewichtKVP", 123)
+ Do ..SetLabel("DieptePallet", 124)
+ Do ..SetLabel("BreedtePallet", 125)
+ Do ..SetLabel("HoogtePallet", 126)
+ Do ..SetLabel("GewichtPallet", 127)
+ Do ..SetLabel("DieptePalletOverhang", 128)
+ Do ..SetLabel("BreedtePalletOverhang", 129)
+ Do ..SetLabel("Tracking", 132)
+ Do ..SetLabel("Leverancier", 138,"TXT")
+ Do ..SetLabel("CifPPL", 139)
+ Do ..SetLabel("SourcingVH", 140)
+ Do ..SetLabel("SourcingHLX", 141)
+ Do ..SetLabel("AssortimentEC", 160,"TXT")
+ Do ..SetLabel("FirstDateOfStock", 169,"DATE")
+ Do ..SetLabel("ABCPicking", 170)
+ Do ..SetLabel("BeginStock", 200, "DataType",13)
+ Do ..SetLabel("StockVH", 201.1)
+ Do ..SetLabel("StockHLX", 201.2)
+ Do ..SetLabel("DefaultMagazijn", 202,"TXT")
+ Do ..SetLabel("TransLoc", 224,"TXT")
+ Do ..SetLabel("AantalProducten", 998)
+ Do ..SetLabel("arTrans", 999, "AX.Uitgaand.MAG.dto.ArtikelTransactiesPerMaand",12)
+]]></Implementation>
+</Method>
+
+<Method name="SetLabel">
+<FormalSpec>Naam:%String,Code:%String,DataType:%String,Qty:%Integer</FormalSpec>
+<Implementation><![CDATA[	Set ..ExportLabels(Code,Naam)=$LB($G(DataType),$G(Qty))
+]]></Implementation>
+</Method>
+
+<Method name="WriteHeader">
+<FormalSpec><![CDATA[SubVolgNr:%Integer="",&Maanden:%String]]></FormalSpec>
+<Implementation><![CDATA[
+	Set Key1=$O(..ExportLabels(""))
+	While Key1'=""
+	{
+		Set Key2=$O(..ExportLabels(Key1,""))
+		While Key2'=""
+		{
+			Set ArrayType=$LG(..ExportLabels(Key1,Key2))
+			If "TXT,DATE"[ArrayType
+			{
+				Write Key1,$S(SubVolgNr:"."_SubVolgNr,1:""),":",Key2,*9	
+			}
+			Elseif "DataType"=ArrayType
+			{
+				For I=$LG(..ExportLabels(Key1,Key2),2):-1:1
+				{
+					Write Key1,".",I,":",..GeefMaand(I,.Maanden,2),":",Key2,*9
+				}
+				
+			}
+			Else  ; Object
+			{
+				For I=$LG(..ExportLabels(Key1,Key2),2):-1:1
+				{
+					Set obj= $zobjclassmethod(ArrayType,"%New")
+					Do obj.WriteHeader(I_":"_..GeefMaand(I,.Maanden))
+				}
+			}
+			Set Key2=$O(..ExportLabels(Key1,Key2))
+		}
+		Set Key1=$O(..ExportLabels(Key1))
+	}
+]]></Implementation>
+</Method>
+
+<Method name="GeefMaand">
+<FormalSpec><![CDATA[I:%Integer,&Maanden:%Integer,NeemPiece]]></FormalSpec>
+<Implementation><![CDATA[
+	Set Maand=$O(Maanden(""))
+	While Maand'=""
+	{
+		If $P(Maanden(Maand),"\")=I	Set GevondenMaand=$$EXTDATE^vhLib.DataTypes($S($G(NeemPiece):$P(Maanden(Maand),"\",NeemPiece),1:Maand),"DM")
+		Set Maand=$O(Maanden(Maand))
+	}
+	Quit $G(GevondenMaand)
+]]></Implementation>
+</Method>
+
+<Method name="WriteData">
+<Implementation><![CDATA[
+	Set Key1=$O(..ExportLabels(""))
+	While Key1'=""
+	{
+		Set Key2=$O(..ExportLabels(Key1,""))
+		While Key2'=""
+		{
+			Set ArrayType=$LG(..ExportLabels(Key1,Key2))
+			If ArrayType=""
+			{
+				Write $$$ExcelNum($zobjProperty(%this,Key2)),*9
+			}
+			ElseIf ArrayType="TXT"
+			{
+				Write $zobjProperty(%this,Key2),*9
+			}
+			ElseIf ArrayType="DATE"
+			{
+				Write $$$ExcelDat($zobjProperty(%this,Key2)),*9
+			}
+			Elseif "DataType"=ArrayType
+			{
+				#dim Array as %ArrayOfDataTypes =($zobjProperty(%this,Key2))
+				Set Element=Array.GetNext(.Key) 
+				Set Count=0
+				While Key'=""
+				{
+					Set Count=Count+1
+					Write Element,*9
+					Set Element=Array.GetNext(.Key) 
+				}
+			}
+			Else  ; object
+			{
+				#dim ArrayObj as %ArrayOfObjects =($zobjProperty(%this,Key2))
+				Set Element=ArrayObj.GetNext(.Key) 
+				Set Count=0
+				While Key'=""
+				{
+					Set Count=Count+1
+					Do Element.WriteData()
+					Set Element=ArrayObj.GetNext(.Key) 
+				}
+			}
+			Set Key2=$O(..ExportLabels(Key1,Key2))
+		}
+		Set Key1=$O(..ExportLabels(Key1))
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/MAG/dto/BewegingIC.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/MAG/dto/BewegingIC.cls.xml	(revision 0)
+++ AX/Uitgaand/MAG/dto/BewegingIC.cls.xml	(revision 52359)
@@ -0,0 +1,357 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.MAG.dto.BewegingIC">
+<IncludeCode>Prod.Product,BL.Derde.LevSpecifiek</IncludeCode>
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="PRNr">
+<Type>%String</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="Product">
+<Type>AX.Uitgaand.PM.Product.impl.Product</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="Datum">
+<Type>%String</Type>
+</Property>
+
+<Property name="Uur">
+<Type>%String</Type>
+</Property>
+
+<Property name="ReplenishmentOrder">
+<Type>%String</Type>
+</Property>
+
+<Property name="VanLocatie">
+<Type>%String</Type>
+</Property>
+
+<Property name="NaarLocatie">
+<Type>%String</Type>
+</Property>
+
+<Property name="ItemId">
+<Type>%String</Type>
+</Property>
+
+<Property name="Omschrijving">
+<Type>%String</Type>
+</Property>
+
+<Property name="SourcingVanHalux">
+<Type>%String</Type>
+</Property>
+
+<Property name="UM">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalUM">
+<Type>%String</Type>
+</Property>
+
+<Property name="QtyKVP">
+<Type>%String</Type>
+</Property>
+
+<Property name="QtyGVP">
+<Type>%String</Type>
+</Property>
+
+<Property name="QtyPallet">
+<Type>%String</Type>
+</Property>
+
+<Property name="Stroom">
+<Type>%String</Type>
+</Property>
+
+<Property name="SOPRConvertor">
+<Type>AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="SOPRIterator">
+<Type>TECH.Iterator</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="ExportLabels">
+<Type>%String</Type>
+<MultiDimensional>1</MultiDimensional>
+<Private>1</Private>
+<Transient>1</Transient>
+</Property>
+
+<Property name="OpnemenInExport">
+<Type>%Boolean</Type>
+<Transient>1</Transient>
+</Property>
+
+<Method name="Create">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Product:AX.Uitgaand.PM.Product.impl.Product,SOPRIterator:TECH.Iterator,HistRec:%String,HistIndex:%String</FormalSpec>
+<Implementation><![CDATA[
+	Set px=..%New()
+	Set px.Product=Product
+	Set px.PRNr=Product.Basis.ProductNr
+	Set px.SOPRIterator=SOPRIterator
+	Set px.SOPRConvertor=##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
+
+	Do px.Vulin(HistRec,HistIndex)
+	Quit px
+]]></Implementation>
+</Method>
+
+<Method name="%OnNew">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Do ..DefineLabels()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Vulin">
+<FormalSpec>HistRec:%String,HistIndex:%String</FormalSpec>
+<Implementation><![CDATA[
+		Set SOPRPRNr=..SOPRConvertor.GeefVervangProductDoorSOPRInAX(..PRNr)
+		Set:SOPRPRNr="" SOPRPRNr=..PRNr
+		Set ..ItemId=$$$ProductGet(SOPRPRNr,$$$IdentNummer)
+
+		Set ..Omschrijving=..Product.Basis.KortTekst
+		If ($P(HistRec,"\",4)="I")
+		{
+			Set ..Stroom=17
+		}
+		Else
+		{
+			Set ..Stroom=6
+			Set ..SourcingVanHalux=$S(..Product.Basis.HerbestelAfronding'="":"BTS",1:"BTO")
+			Set ..NaarLocatie=$P(HistRec,"\",12)
+			Set:..NaarLocatie="R97 " ..NaarLocatie="TH " ; foutje wegwerken
+			Set ..VanLocatie=..GeefMagLocatie()
+			 ;..Product.Basis.WerkvloerSubmagazijn_":"_..Product.Basis.WerkvloerSubmagazijnOmschrijving
+			;Set:..Product.Basis.WerkvloerSubmagazijn="" ..NaarLocatie="X:Algemeen"
+		}
+
+		Set ..ReplenishmentOrder=$P(HistRec,"\",7)
+		Set ..UM="STK"
+		Set ..Datum=+$P(HistRec,"\")
+		Set ..Uur=$J($P($P(HistRec,"\"),",",2)/600,0,0)*600
+		Do ..VerdeelAantal($S($P(HistRec,"\",4)="I":1,1:-1)*$P(HistRec,"\",2))
+]]></Implementation>
+</Method>
+
+<Method name="VerdeelAantal">
+<FormalSpec>Aantal</FormalSpec>
+<Implementation><![CDATA[
+	Set (..QtyPallet,..QtyGVP,..QtyKVP,..AantalUM)=0
+	Set AantalInPallet=..Product.Basis.PalletAantal
+	Set AantalInGVP=..Product.Prijs.GrootVerpakking	
+	Set AantalInKVP=..Product.Prijs.NormaleVerpakking	
+	Set:AantalInGVP=1 AantalInGVP=""
+	Set:AantalInKVP=1 AantalInKVP=""
+	Set ..AantalUM=Aantal
+	
+	If (Aantal'<AantalInPallet) && (AantalInPallet>1)
+	{
+		Set ..QtyPallet=(Aantal\AantalInPallet)
+		Set Aantal=Aantal-(..QtyPallet*AantalInPallet)
+	}
+	If (Aantal'<AantalInGVP) && (AantalInGVP>1)
+	{
+		Set ..QtyGVP=(Aantal\AantalInGVP)
+		Set Aantal=Aantal-(..QtyGVP*AantalInGVP)
+	}
+	If (Aantal'<AantalInKVP) && (AantalInKVP>1)
+	{
+		Set ..QtyKVP=(Aantal\AantalInKVP)
+		Set Aantal=Aantal-(..QtyKVP*AantalInKVP)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="GeefMagLocatie">
+<FormalSpec>lbPallet:%List</FormalSpec>
+<Implementation><![CDATA[
+	/*
+	Set sc=result.Prepare("SELECT i.loc_id,t.IsPickbaar,loc_trans"
+	_" FROM EWMS.Inventory i"
+	_"LEFT OUTER JOIN EWMS.Locations l on I.Loc_Id=L.Loc_ID"
+	_"LEFT OUTER JOIN EWMS.TransLoc t on t.loc_m=l.loc_M and t.loc_g=l.loc_g and t.loc_x=l.loc_x and t.loc_y=l.loc_y"
+	_"WHERE (product = ?) AND (i.loc_m<5)")
+
+	*/
+
+	If $D(^||LocatieCache(..PRNr)) { 
+		Set ResultLoc=^||LocatieCache(..PRNr) 
+	} Else {
+		Set PickLoc="",PalletInLoc="",PalletInAuto="",ResultLoc=""
+
+		Set result=##class(%ResultSet).%New("%DynamicQuery:SQL")
+		Set sc=result.Prepare("SELECT i.loc_id as LocId,t.loc_ispickbaar as IsPickbaar,loc_trans as LocTrans,l.loc_m as LocM"
+		_" FROM EWMS.Inventory i"
+		_" LEFT OUTER JOIN EWMS.Locations l on I.Loc_Id=L.Loc_ID"
+		_" LEFT OUTER JOIN EWMS.TransLoc t on t.loc_m=l.loc_M and t.loc_g=l.loc_g and t.loc_x=l.loc_x and t.loc_y=l.loc_y"
+		_" WHERE (product = ?) AND (i.loc_m<5)"
+		_" order by i.Insert_time asc" )
+		If $$$ISERR(sc) Do DisplayError^%apiOBJ(sc) Quit ""
+		Set sc=result.Execute(..PRNr)
+		If $$$ISERR(sc) Do DisplayError^%apiOBJ(sc) Quit ""
+		If result.Next(.sc) {
+			Set:result.Data("IsPickbaar") PickLoc=result.Data("LocTrans")
+			Set:result.Data("LocM")=1 PalletInAuto=1
+			Set PalletInLoc=result.Data("LocTrans")
+		}
+		If $$$ISERR(sc) Do DisplayError^%apiOBJ(sc) Quit ""
+
+		If PickLoc'="" { Set ResultLoc=PickLoc }
+		ElseIf PalletInAuto { Set ResultLoc="APM" }
+		Else { Set ResultLoc=PalletInLoc }
+		
+		If ResultLoc="",..Product.Basis.OpslagZone=1 Set ResultLoc="APM"
+		
+		Set ^||LocatieCache(..PRNr)=ResultLoc
+	}
+	Quit ResultLoc ;_" : "_$$ListToPieces^vhLib(lbPallet,";")
+]]></Implementation>
+</Method>
+
+<Method name="DefineLabels">
+<Implementation><![CDATA[
+ Do ..SetLabel("Datum","K800","DATE")
+ Do ..SetLabel("Uur","K801","TIME")
+ Do ..SetLabel("ReplenishmentOrder","K802","TXT")
+ Do ..SetLabel("VanLocatie","K803","TXT")
+ Do ..SetLabel("NaarLocatie","K804","TXT")
+ Do ..SetLabel("ItemId","K805","TXT")
+ Do ..SetLabel("Omschrijving","K806","TXT")
+ Do ..SetLabel("SourcingVanHalux","K807","TXT")
+ Do ..SetLabel("UM","K808","TXT")
+ Do ..SetLabel("AantalUM","K810","")
+ Do ..SetLabel("QtyKVP","K811","")
+ Do ..SetLabel("QtyGVP","K812","")
+ Do ..SetLabel("QtyPallet","K813","")
+ Do ..SetLabel("Stroom","K814","")
+]]></Implementation>
+</Method>
+
+<Method name="SetLabel">
+<FormalSpec>Naam:%String,Code:%String,DataType:%String,Qty:%Integer</FormalSpec>
+<Implementation><![CDATA[	Set ..ExportLabels(Code,Naam)=$LB($G(DataType),$G(Qty))
+]]></Implementation>
+</Method>
+
+<Method name="WriteHeader">
+<FormalSpec><![CDATA[SubVolgNr:%Integer="",&Maanden:%String]]></FormalSpec>
+<Implementation><![CDATA[
+	Set Key1=$O(..ExportLabels(""))
+	While Key1'=""
+	{
+		Set Key2=$O(..ExportLabels(Key1,""))
+		While Key2'=""
+		{
+			Set ArrayType=$LG(..ExportLabels(Key1,Key2))
+			If "TXT,DATE,TIME"[ArrayType
+			{
+				Write Key1,$S(SubVolgNr:"."_SubVolgNr,1:""),":",Key2,*9	
+			}
+			Elseif "DataType"=ArrayType
+			{
+				For I=$LG(..ExportLabels(Key1,Key2),2):-1:1
+				{
+					Write Key1,".",I,":",..GeefMaand(I,.Maanden,2),":",Key2,*9
+				}
+				
+			}
+			Else  ; Object
+			{
+				For I=$LG(..ExportLabels(Key1,Key2),2):-1:1
+				{
+					Set obj= $zobjclassmethod(ArrayType,"%New")
+					Do obj.WriteHeader(I_":"_..GeefMaand(I,.Maanden))
+				}
+			}
+			Set Key2=$O(..ExportLabels(Key1,Key2))
+		}
+		Set Key1=$O(..ExportLabels(Key1))
+	}
+]]></Implementation>
+</Method>
+
+<Method name="GeefMaand">
+<FormalSpec><![CDATA[I:%Integer,&Maanden:%Integer,NeemPiece]]></FormalSpec>
+<Implementation><![CDATA[
+	Set Maand=$O(Maanden(""))
+	While Maand'=""
+	{
+		If $P(Maanden(Maand),"\")=I	Set GevondenMaand=$$EXTDATE^vhLib.DataTypes($S($G(NeemPiece):$P(Maanden(Maand),"\",NeemPiece),1:Maand),"DM")
+		Set Maand=$O(Maanden(Maand))
+	}
+	Quit $G(GevondenMaand)
+]]></Implementation>
+</Method>
+
+<Method name="WriteData">
+<Implementation><![CDATA[
+	Set Key1=$O(..ExportLabels(""))
+	While Key1'=""
+	{
+		Set Key2=$O(..ExportLabels(Key1,""))
+		While Key2'=""
+		{
+			Set ArrayType=$LG(..ExportLabels(Key1,Key2))
+			If ArrayType=""
+			{
+				Write $$$ExcelNum($zobjProperty(%this,Key2)),*9
+			}
+			ElseIf ArrayType="TXT"
+			{
+				Write $zobjProperty(%this,Key2),*9
+			}
+			ElseIf ArrayType="DATE"
+			{
+				Write $$$ExcelDat($zobjProperty(%this,Key2)),*9
+			}
+			ElseIf ArrayType="TIME"
+			{
+				Write $$$ExcelTime($zobjProperty(%this,Key2)),*9
+			}
+			Elseif "DataType"=ArrayType
+			{
+				#dim Array as %ArrayOfDataTypes =($zobjProperty(%this,Key2))
+				Set Element=Array.GetNext(.Key) 
+				Set Count=0
+				While Key'=""
+				{
+					Set Count=Count+1
+					Write Element,*9
+					Set Element=Array.GetNext(.Key) 
+				}
+			}
+			Else  ; object
+			{
+				#dim ArrayObj as %ArrayOfObjects =($zobjProperty(%this,Key2))
+				Set Element=ArrayObj.GetNext(.Key) 
+				Set Count=0
+				While Key'=""
+				{
+					Set Count=Count+1
+					Do Element.WriteData()
+					Set Element=ArrayObj.GetNext(.Key) 
+				}
+			}
+			Set Key2=$O(..ExportLabels(Key1,Key2))
+		}
+		Set Key1=$O(..ExportLabels(Key1))
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/MAG/impl/ExportVoorraad.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/MAG/impl/ExportVoorraad.cls.xml	(revision 0)
+++ AX/Uitgaand/MAG/impl/ExportVoorraad.cls.xml	(revision 52359)
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.MAG.impl.ExportVoorraad">
+<IncludeCode>BL.Derde.KlantSpecifiek,BL.Derde.LevSpecifiek,Prod.Product</IncludeCode>
+<Super>TECH.RegisteredObject,TECH.Filter</Super>
+
+<Property name="RefDatum">
+<Type>%Date</Type>
+</Property>
+
+<Property name="StartDatum">
+<Type>%Date</Type>
+</Property>
+
+<Property name="SOPRConvertor">
+<Type>AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor</Type>
+</Property>
+
+<Property name="CONSNr">
+<Type>%String</Type>
+</Property>
+
+<Property name="ORDNr">
+<Type>%String</Type>
+</Property>
+
+<Property name="OLRec">
+<Type>%String</Type>
+</Property>
+
+<Property name="lbSOL">
+<Type>%List</Type>
+</Property>
+
+<Property name="CONSRec">
+<Type>%String</Type>
+</Property>
+
+<Property name="Data">
+<Type>%String</Type>
+<MultiDimensional>1</MultiDimensional>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..SOPRConvertor=##class(AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor).%New()
+	Set ..RefDatum=$$INTDATE^vhLib.DataTypes("01/07/2018")
+	Set ..StartDatum=$$CALCDATE^vhLib.DataTypes(..RefDatum,"M",-3,"FD")
+	Set ..StartDatum=$$CALCDATE^vhLib.DataTypes(..RefDatum,"M",-1,"FD")
+	Kill ^||Voorraad
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkAlle">
+<Description>
+d ##class(AX.Uitgaand.MAG.impl.ExportVoorraad).%New().VerwerkAlle()</Description>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+	Set Count=0	
+	Set ResultSet=##class(%ResultSet).%New("%DynamicQuery:SQL")
+	Set sc=ResultSet.Prepare("select i.product as PRNr, i.loc_id LocID, i.qty_pcs Aantal, isnull(t.loc_trans, case when l.loc_m=1 then 'APM' when l.loc_m=4 then 'Transit' else '?' end) Locatie, "
+	_"       l.loc_m LocM,l.loc_g LocG, l.loc_y LocY, l.loc_x  LocX,t.loc_ispickbaar as IsPickbaar "
+	_" from EWMS.inventory i"
+	_" join EWMS.locations l on i.loc_id=l.loc_id and l.loc_m < 5"
+	_" left outer join EWMS.transloc t on t.loc_m=l.loc_m and t.loc_g=l.loc_g and t.loc_x=l.loc_x and  t.loc_y=l.loc_y")
+	If $$$ISERR(sc) Do DisplayError^%apiOBJ(sc) Quit
+	Set sc=ResultSet.Execute()
+	If $$$ISERR(sc) Do DisplayError^%apiOBJ(sc) Quit
+	While ResultSet.Next(.sc) 
+	{
+		Set Count=Count+1
+		Merge ^||Voorraad($I(^||Voorraad))=ResultSet.Data	
+	}
+	If $$$ISERR(sc) Do DisplayError^%apiOBJ(sc) Quit
+	
+	Write @F11,@F1
+	Set Dev=$$OPEN^vhDEV("\\notes01\shared\p v\","ProductVoorraad "_$TR($ZDT($H),"/:")_".txt","W","T")
+	Use Dev
+	Do ..WriteHeader() Write !
+	For I=1:1:^||Voorraad
+	{
+		Merge ..Data=^||Voorraad(I)
+		Do ..Verwerk()
+	}
+	If $$$ISERR(sc) Do DisplayError^%apiOBJ(sc) Quit
+	
+	Do CLOSE^vhDEV(Dev)
+	Set FP=2301	Write @F,@F1
+	Write ^||Voorraad
+]]></Implementation>
+</Method>
+
+<Method name="Verwerk">
+<Implementation><![CDATA[
+	Set px=##class(AX.Uitgaand.MAG.dto.Voorraad).Create(%this)
+	Do px.WriteData() Write !
+]]></Implementation>
+</Method>
+
+<Method name="WriteHeader">
+<Implementation><![CDATA[	Do ##class(AX.Uitgaand.MAG.dto.Voorraad).%New().WriteHeader()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/MAG/impl/ProductIteratorTest.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/MAG/impl/ProductIteratorTest.cls.xml	(revision 0)
+++ AX/Uitgaand/MAG/impl/ProductIteratorTest.cls.xml	(revision 52359)
@@ -0,0 +1,443 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.MAG.impl.ProductIteratorTest">
+<Super>TECH.RegisteredObject,TECH.Filter</Super>
+
+<Property name="Products">
+<Type>%String</Type>
+<Collection>list</Collection>
+</Property>
+
+<Property name="DynIterator">
+<Type>TECH.Iterator</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>StartDatum:%Date</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Do ..AddProducts()
+	Set ..DynIterator=##class(TECH.ListIterator).%New(..Products)
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="AddProducts">
+<Private>1</Private>
+<Implementation><![CDATA[
+	Do ..Products.Insert(3551)
+	Do ..Products.Insert(794517)
+	Do ..Products.Insert(841864)
+	Do ..Products.Insert(1214442)
+	Do ..Products.Insert(1342627)
+	Do ..Products.Insert(1598830)
+	Do ..Products.Insert(1038761)
+	Do ..Products.Insert(1028117)
+ Do ..Products.Insert(1847933)
+ Do ..Products.Insert(1847929)
+ Do ..Products.Insert(1847926)
+ Do ..Products.Insert(1847925)
+ Do ..Products.Insert(1847830)
+ Do ..Products.Insert(1847826)
+ Do ..Products.Insert(1847816)
+ Do ..Products.Insert(1847503)
+ Do ..Products.Insert(1847502)
+ Do ..Products.Insert(1847438)
+ Do ..Products.Insert(1847432)
+ Do ..Products.Insert(1847431)
+ Do ..Products.Insert(1847429)
+ Do ..Products.Insert(1847427)
+ Do ..Products.Insert(1847425)
+ Do ..Products.Insert(1847423)
+ Do ..Products.Insert(1847317)
+ Do ..Products.Insert(1847316)
+ Do ..Products.Insert(1847315)
+ Do ..Products.Insert(1847314)
+ Do ..Products.Insert(1847313)
+ Do ..Products.Insert(1847311)
+ Do ..Products.Insert(1847308)
+ Do ..Products.Insert(1847176)
+ Do ..Products.Insert(1847156)
+ Do ..Products.Insert(1847117)
+ Do ..Products.Insert(1847116)
+ Do ..Products.Insert(1847115)
+ Do ..Products.Insert(1847102)
+ Do ..Products.Insert(1847101)
+ Do ..Products.Insert(1847039)
+ Do ..Products.Insert(1847031)
+ Do ..Products.Insert(1847023)
+ Do ..Products.Insert(1846975)
+ Do ..Products.Insert(1846974)
+ Do ..Products.Insert(1846939)
+ Do ..Products.Insert(1846938)
+ Do ..Products.Insert(1846900)
+ Do ..Products.Insert(1846899)
+ Do ..Products.Insert(1846889)
+ Do ..Products.Insert(1846888)
+ Do ..Products.Insert(1846887)
+ Do ..Products.Insert(1846874)
+ Do ..Products.Insert(1846873)
+ Do ..Products.Insert(1846872)
+ Do ..Products.Insert(1846871)
+ Do ..Products.Insert(1846870)
+ Do ..Products.Insert(1846869)
+ Do ..Products.Insert(1846868)
+ Do ..Products.Insert(1846867)
+ Do ..Products.Insert(1846866)
+ Do ..Products.Insert(1846865)
+ Do ..Products.Insert(1846864)
+ Do ..Products.Insert(1846860)
+ Do ..Products.Insert(1846854)
+ Do ..Products.Insert(1846853)
+ Do ..Products.Insert(1846821)
+ Do ..Products.Insert(1846795)
+ Do ..Products.Insert(1846794)
+ Do ..Products.Insert(1846793)
+ Do ..Products.Insert(1846792)
+ Do ..Products.Insert(1846791)
+ Do ..Products.Insert(1846788)
+ Do ..Products.Insert(1846786)
+ Do ..Products.Insert(1846785)
+ Do ..Products.Insert(1846784)
+ Do ..Products.Insert(1846783)
+ Do ..Products.Insert(1846776)
+ Do ..Products.Insert(1846775)
+ Do ..Products.Insert(1846773)
+ Do ..Products.Insert(1846772)
+ Do ..Products.Insert(1846771)
+ Do ..Products.Insert(1846770)
+ Do ..Products.Insert(1846742)
+ Do ..Products.Insert(1846741)
+ Do ..Products.Insert(1846740)
+ Do ..Products.Insert(1846739)
+ Do ..Products.Insert(1846738)
+ Do ..Products.Insert(1846737)
+ Do ..Products.Insert(1846736)
+ Do ..Products.Insert(1846727)
+ Do ..Products.Insert(1846726)
+ Do ..Products.Insert(1846725)
+ Do ..Products.Insert(1846724)
+ Do ..Products.Insert(1846723)
+ Do ..Products.Insert(1846695)
+ Do ..Products.Insert(1846694)
+ Do ..Products.Insert(1846693)
+ Do ..Products.Insert(1846692)
+ Do ..Products.Insert(1846691)
+ Do ..Products.Insert(1846690)
+ Do ..Products.Insert(1846689)
+ Do ..Products.Insert(1846688)
+ Do ..Products.Insert(1846674)
+ Do ..Products.Insert(1846673)
+ Do ..Products.Insert(1846667)
+ Do ..Products.Insert(1846661)
+ Do ..Products.Insert(1846658)
+ Do ..Products.Insert(1846657)
+ Do ..Products.Insert(1846656)
+ Do ..Products.Insert(1846638)
+ Do ..Products.Insert(1846637)
+ Do ..Products.Insert(1846636)
+ Do ..Products.Insert(1846635)
+ Do ..Products.Insert(1846633)
+ Do ..Products.Insert(1846632)
+ Do ..Products.Insert(1846631)
+ Do ..Products.Insert(1846608)
+ Do ..Products.Insert(1846607)
+ Do ..Products.Insert(1846606)
+ Do ..Products.Insert(1846605)
+ Do ..Products.Insert(1846604)
+ Do ..Products.Insert(1846588)
+ Do ..Products.Insert(1846587)
+ Do ..Products.Insert(1846586)
+ Do ..Products.Insert(1846585)
+ Do ..Products.Insert(1846574)
+ Do ..Products.Insert(1846573)
+ Do ..Products.Insert(1846572)
+ Do ..Products.Insert(1846571)
+ Do ..Products.Insert(1846564)
+ Do ..Products.Insert(1846563)
+ Do ..Products.Insert(1846562)
+ Do ..Products.Insert(1846561)
+ Do ..Products.Insert(1846560)
+ Do ..Products.Insert(1846559)
+ Do ..Products.Insert(1846558)
+ Do ..Products.Insert(1846557)
+ Do ..Products.Insert(1846556)
+ Do ..Products.Insert(1846553)
+ Do ..Products.Insert(1846552)
+ Do ..Products.Insert(1846546)
+ Do ..Products.Insert(1846544)
+ Do ..Products.Insert(1846543)
+ Do ..Products.Insert(1846542)
+ Do ..Products.Insert(1846541)
+ Do ..Products.Insert(1846540)
+ Do ..Products.Insert(1846539)
+ Do ..Products.Insert(1846538)
+ Do ..Products.Insert(1846537)
+ Do ..Products.Insert(1846536)
+ Do ..Products.Insert(1846535)
+ Do ..Products.Insert(1846534)
+ Do ..Products.Insert(1846517)
+ Do ..Products.Insert(1846516)
+ Do ..Products.Insert(1846515)
+ Do ..Products.Insert(1846514)
+ Do ..Products.Insert(1846513)
+ Do ..Products.Insert(1846509)
+ Do ..Products.Insert(1846508)
+ Do ..Products.Insert(1846507)
+ Do ..Products.Insert(1846503)
+ Do ..Products.Insert(1846502)
+ Do ..Products.Insert(1846501)
+ Do ..Products.Insert(1846500)
+ Do ..Products.Insert(1846499)
+ Do ..Products.Insert(1846489)
+ Do ..Products.Insert(1846488)
+ Do ..Products.Insert(1846487)
+ Do ..Products.Insert(1846482)
+ Do ..Products.Insert(1846481)
+ Do ..Products.Insert(1846480)
+ Do ..Products.Insert(1846479)
+ Do ..Products.Insert(1846476)
+ Do ..Products.Insert(1846465)
+ Do ..Products.Insert(1846452)
+ Do ..Products.Insert(1846450)
+ Do ..Products.Insert(1846449)
+ Do ..Products.Insert(1846446)
+ Do ..Products.Insert(1846445)
+ Do ..Products.Insert(1846444)
+ Do ..Products.Insert(1846443)
+ Do ..Products.Insert(1846442)
+ Do ..Products.Insert(1846441)
+ Do ..Products.Insert(1846440)
+ Do ..Products.Insert(1846439)
+ Do ..Products.Insert(1846438)
+ Do ..Products.Insert(1846426)
+ Do ..Products.Insert(1846398)
+ Do ..Products.Insert(1846397)
+ Do ..Products.Insert(1846396)
+ Do ..Products.Insert(1846395)
+ Do ..Products.Insert(1846394)
+ Do ..Products.Insert(1846393)
+ Do ..Products.Insert(1846392)
+ Do ..Products.Insert(1846391)
+ Do ..Products.Insert(1846390)
+ Do ..Products.Insert(1846389)
+ Do ..Products.Insert(1846388)
+ Do ..Products.Insert(1846387)
+ Do ..Products.Insert(1846372)
+ Do ..Products.Insert(1846371)
+ Do ..Products.Insert(1846370)
+ Do ..Products.Insert(1846369)
+ Do ..Products.Insert(1846368)
+ Do ..Products.Insert(1846367)
+ Do ..Products.Insert(1846366)
+ Do ..Products.Insert(1846365)
+ Do ..Products.Insert(1846362)
+ Do ..Products.Insert(1846357)
+ Do ..Products.Insert(1846354)
+ Do ..Products.Insert(1846353)
+ Do ..Products.Insert(1846352)
+ Do ..Products.Insert(1846351)
+ Do ..Products.Insert(1846326)
+ Do ..Products.Insert(1846325)
+ Do ..Products.Insert(1846324)
+ Do ..Products.Insert(1846311)
+ Do ..Products.Insert(1846310)
+ Do ..Products.Insert(1846309)
+ Do ..Products.Insert(1846308)
+ Do ..Products.Insert(1846307)
+ Do ..Products.Insert(1846306)
+ Do ..Products.Insert(1846305)
+ Do ..Products.Insert(1846304)
+ Do ..Products.Insert(1846303)
+ Do ..Products.Insert(1846300)
+ Do ..Products.Insert(1846299)
+ Do ..Products.Insert(1846298)
+ Do ..Products.Insert(1846297)
+ Do ..Products.Insert(1846296)
+ Do ..Products.Insert(1846295)
+ Do ..Products.Insert(1846294)
+ Do ..Products.Insert(1846293)
+ Do ..Products.Insert(1846292)
+ Do ..Products.Insert(1846286)
+ Do ..Products.Insert(1846285)
+ Do ..Products.Insert(1846284)
+ Do ..Products.Insert(1846283)
+ Do ..Products.Insert(1846282)
+ Do ..Products.Insert(1846281)
+ Do ..Products.Insert(1846276)
+ Do ..Products.Insert(1846275)
+ Do ..Products.Insert(1846274)
+ Do ..Products.Insert(1846273)
+ Do ..Products.Insert(1846272)
+ Do ..Products.Insert(1846271)
+ Do ..Products.Insert(1846270)
+ Do ..Products.Insert(1846269)
+ Do ..Products.Insert(1846268)
+ Do ..Products.Insert(1846267)
+ Do ..Products.Insert(1846266)
+ Do ..Products.Insert(1846265)
+ Do ..Products.Insert(1846264)
+ Do ..Products.Insert(1846263)
+ Do ..Products.Insert(1846262)
+ Do ..Products.Insert(1846261)
+ Do ..Products.Insert(1846260)
+ Do ..Products.Insert(1846259)
+ Do ..Products.Insert(1846258)
+ Do ..Products.Insert(1846257)
+ Do ..Products.Insert(1846256)
+ Do ..Products.Insert(1846255)
+ Do ..Products.Insert(1846253)
+ Do ..Products.Insert(1846252)
+ Do ..Products.Insert(1846251)
+ Do ..Products.Insert(1846250)
+ Do ..Products.Insert(1846249)
+ Do ..Products.Insert(1846248)
+ Do ..Products.Insert(1846247)
+ Do ..Products.Insert(1844934)
+ Do ..Products.Insert(1844933)
+ Do ..Products.Insert(1844932)
+ Do ..Products.Insert(1844931)
+ Do ..Products.Insert(1844930)
+ Do ..Products.Insert(1844929)
+ Do ..Products.Insert(1844928)
+ Do ..Products.Insert(1844927)
+ Do ..Products.Insert(1844926)
+ Do ..Products.Insert(1844925)
+ Do ..Products.Insert(1844924)
+ Do ..Products.Insert(1844923)
+ Do ..Products.Insert(1844922)
+ Do ..Products.Insert(1844916)
+ Do ..Products.Insert(1844915)
+ Do ..Products.Insert(1844914)
+ Do ..Products.Insert(1844907)
+ Do ..Products.Insert(1844904)
+ Do ..Products.Insert(1844903)
+ Do ..Products.Insert(1844902)
+ Do ..Products.Insert(1221)
+ Do ..Products.Insert(1847)
+ Do ..Products.Insert(1890)
+ Do ..Products.Insert(1897)
+ Do ..Products.Insert(1935)
+ Do ..Products.Insert(1941)
+ Do ..Products.Insert(1972)
+ Do ..Products.Insert(1982)
+ Do ..Products.Insert(1985)
+ Do ..Products.Insert(1988)
+ Do ..Products.Insert(2001)
+ Do ..Products.Insert(2021)
+ Do ..Products.Insert(2151)
+ Do ..Products.Insert(2205)
+ Do ..Products.Insert(2247)
+ Do ..Products.Insert(2367)
+ Do ..Products.Insert(2470)
+ Do ..Products.Insert(2534)
+ Do ..Products.Insert(2535)
+ Do ..Products.Insert(2536)
+ Do ..Products.Insert(2537)
+ Do ..Products.Insert(2538)
+ Do ..Products.Insert(2539)
+ Do ..Products.Insert(2568)
+ Do ..Products.Insert(2638)
+ Do ..Products.Insert(2743)
+ Do ..Products.Insert(2744)
+ Do ..Products.Insert(2745)
+ Do ..Products.Insert(2746)
+ Do ..Products.Insert(2747)
+ Do ..Products.Insert(2748)
+ Do ..Products.Insert(2749)
+ Do ..Products.Insert(2750)
+ Do ..Products.Insert(2751)
+ Do ..Products.Insert(2752)
+ Do ..Products.Insert(2753)
+ Do ..Products.Insert(2754)
+ Do ..Products.Insert(2812)
+ Do ..Products.Insert(2813)
+ Do ..Products.Insert(2814)
+ Do ..Products.Insert(2815)
+ Do ..Products.Insert(2816)
+ Do ..Products.Insert(2817)
+ Do ..Products.Insert(2818)
+ Do ..Products.Insert(2820)
+ Do ..Products.Insert(2824)
+ Do ..Products.Insert(2834)
+ Do ..Products.Insert(2841)
+ Do ..Products.Insert(2842)
+ Do ..Products.Insert(2852)
+ Do ..Products.Insert(2864)
+ Do ..Products.Insert(2865)
+ Do ..Products.Insert(2868)
+ Do ..Products.Insert(2869)
+ Do ..Products.Insert(2930)
+ Do ..Products.Insert(3018)
+ Do ..Products.Insert(3019)
+ Do ..Products.Insert(3025)
+ Do ..Products.Insert(3026)
+ Do ..Products.Insert(3231)
+ Do ..Products.Insert(3289)
+ Do ..Products.Insert(486167)
+ Do ..Products.Insert(489155)
+ Do ..Products.Insert(489156)
+ Do ..Products.Insert(491162)
+ Do ..Products.Insert(491454)
+ Do ..Products.Insert(492257)
+ Do ..Products.Insert(495386)
+ Do ..Products.Insert(495426)
+ Do ..Products.Insert(495483)
+ Do ..Products.Insert(495592)
+ Do ..Products.Insert(497841)
+ Do ..Products.Insert(497856)
+ Do ..Products.Insert(498849)
+ Do ..Products.Insert(498865)
+ Do ..Products.Insert(498934)
+ Do ..Products.Insert(498937)
+ Do ..Products.Insert(498951)
+ Do ..Products.Insert(498955)
+ Do ..Products.Insert(498982)
+ Do ..Products.Insert(499224)
+ Do ..Products.Insert(499234)
+ Do ..Products.Insert(499238)
+ Do ..Products.Insert(499266)
+ Do ..Products.Insert(499270)
+ Do ..Products.Insert(500276)
+ Do ..Products.Insert(500291)
+ Do ..Products.Insert(500314)
+ Do ..Products.Insert(500320)
+ Do ..Products.Insert(500321)
+ Do ..Products.Insert(500346)
+ Do ..Products.Insert(500348)
+ Do ..Products.Insert(500434)
+ Do ..Products.Insert(500439)
+ Do ..Products.Insert(500443)
+ Do ..Products.Insert(500781)
+ Do ..Products.Insert(500816)
+ Do ..Products.Insert(500825)
+ Do ..Products.Insert(500867)
+ Do ..Products.Insert(501010)
+ Do ..Products.Insert(501019)
+ Do ..Products.Insert(501020)
+ Do ..Products.Insert(501100)
+]]></Implementation>
+</Method>
+
+<Method name="HasNext">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ..DynIterator.HasNext()
+]]></Implementation>
+</Method>
+
+<Method name="Next">
+<ReturnType>AX.Uitgaand.PM.Product.impl.Product</ReturnType>
+<Implementation><![CDATA[
+	set Product = ##class(AX.Uitgaand.PM.Product.impl.Product).%New(..DynIterator.Next())
+	
+	Quit Product
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>