Index: AX/Uitgaand/MAG/dto/BewegingProductie.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/MAG/dto/BewegingProductie.cls.xml	(revision 0)
+++ AX/Uitgaand/MAG/dto/BewegingProductie.cls.xml	(revision 53245)
@@ -0,0 +1,319 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.MAG.dto.BewegingProductie">
+<IncludeCode>Prod.Product,BL.Derde.LevSpecifiek</IncludeCode>
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="PRNr">
+<Type>%String</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="Key1">
+<Type>%String</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="Key2">
+<Type>%String</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="Key3">
+<Type>%String</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="Product">
+<Type>AX.Uitgaand.PM.Product.impl.Product</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="DatumProductieOrder">
+<Type>%String</Type>
+</Property>
+
+<Property name="Uur">
+<Type>%String</Type>
+</Property>
+
+<Property name="ProductieOrder">
+<Type>%String</Type>
+</Property>
+
+<Property name="BatchNrAanlevering">
+<Type>%String</Type>
+</Property>
+
+<Property name="VanPickLocatie">
+<Type>%String</Type>
+</Property>
+
+<Property name="NaarDropzone">
+<Type>%String</Type>
+</Property>
+
+<Property name="ProductieZone">
+<Type>%String</Type>
+</Property>
+
+<Property name="VerpakkingsType">
+<Type>%String</Type>
+</Property>
+
+<Property name="EindProducten">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalEindProducten">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalVerschillendeEindProducten">
+<Type>%String</Type>
+</Property>
+
+<Property name="ItemId">
+<Type>%String</Type>
+</Property>
+
+<Property name="Omschrijving">
+<Type>%String</Type>
+</Property>
+
+<Property name="LangTekst">
+<Type>%String</Type>
+</Property>
+
+<Property name="UM">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalUM">
+<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>SOPRIterator:TECH.Iterator,Key1,Key2,Key3</FormalSpec>
+<Implementation><![CDATA[
+	Set px=..%New()
+	Set px.Key1=Key1
+	Set px.Key2=Key2
+	Set px.Key3=Key3
+	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 lbCache=^||Cache(..Key1,..Key2,..Key3)
+	Set ..PRNr=$LI(lbCache)
+	Set ..Product=##class(AX.Uitgaand.PM.Product.impl.Product).%New(..PRNr)
+	
+	Set SOPRPRNr=..SOPRConvertor.GeefVervangProductDoorSOPRInAX(..PRNr)
+	Set:SOPRPRNr="" SOPRPRNr=..PRNr
+	
+	Set ..ItemId=$$$ProductGet(SOPRPRNr,$$$IdentNummer)
+	Set ..Omschrijving=$$$ProductGet(..PRNr,$$$KortTekst)
+	Set ..LangTekst=..Product.Tekst.GetOmschrijving("N",";")
+	
+	Set ..UM="STK"
+	Set ..DatumProductieOrder=+$LI(lbCache,4)
+	Set ..Uur=$P($LI(lbCache,4),",",2)\60*60
+	Set ..ProductieOrder=$LI(lbCache,5)
+	
+	Set ..AantalUM=$LI(lbCache,10)
+	Set ..AantalEindProducten=$LI(lbCache,12)
+	Set ..VerpakkingsType=$LI(lbCache,6)
+	Set ..NaarDropzone=$LI(lbCache,2)
+	Set ..Stroom=$LI(lbCache,7)
+	Set ..ProductieZone=$LI(lbCache,8)
+	
+	Set Key4=$O(^||Cache(..Key1,..Key2,..Key3,""))
+	Set ..EindProducten=""
+	Set ..AantalVerschillendeEindProducten=0
+	While Key4'=""
+	{
+		Set ..EindProducten=..EindProducten_$S(..EindProducten="":"",1:"; ")_$$$ProductGet($LI(^||Cache(..Key1,..Key2,..Key3,Key4)),$$$IdentNummer)
+		Set ..AantalVerschillendeEindProducten=..AantalVerschillendeEindProducten+1
+		Set Key4=$O(^||Cache(..Key1,..Key2,..Key3, Key4))
+	}
+]]></Implementation>
+</Method>
+
+<Method name="DefineLabels">
+<Implementation><![CDATA[
+ Do ..SetLabel("DatumProductieOrder","K500","DATE")
+ Do ..SetLabel("Uur","K501","TIME")
+ Do ..SetLabel("ProductieOrder","K502","TXT")
+ Do ..SetLabel("BatchNrAanlevering","K503","TXT")
+ Do ..SetLabel("VanPickLocatie","K504","TXT")
+ Do ..SetLabel("NaarDropzone","K505.1","TXT")
+ Do ..SetLabel("ProductieZone","K505.2","TXT")
+ Do ..SetLabel("VerpakkingsType","K506","TXT")
+ Do ..SetLabel("EindProducten","K507.1","TXT")
+ Do ..SetLabel("AantalEindProducten","K507.2","TXT")
+ Do ..SetLabel("AantalVerschillendeEindProducten","K507.3","TXT")
+ Do ..SetLabel("ItemId","K508","TXT")
+ Do ..SetLabel("Omschrijving","K509.1","TXT")
+ Do ..SetLabel("LangTekst","K509.2","TXT")
+ Do ..SetLabel("UM","K510","TXT")
+ Do ..SetLabel("AantalUM","K510","")
+ Do ..SetLabel("Stroom","K511","")
+]]></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/ExportProductie.cls.xml
===================================================================
diff -u
--- AX/Uitgaand/MAG/impl/ExportProductie.cls.xml	(revision 0)
+++ AX/Uitgaand/MAG/impl/ExportProductie.cls.xml	(revision 53245)
@@ -0,0 +1,362 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AX.Uitgaand.MAG.impl.ExportProductie">
+<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="ProductIterator">
+<Type>TECH.Iterator</Type>
+</Property>
+
+<Property name="SOPRConvertor">
+<Type>AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor</Type>
+</Property>
+
+<Property name="Product">
+<Type>AX.Uitgaand.PM.Product.impl.Product</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="SubMagRec">
+<Type>%String</Type>
+</Property>
+
+<Property name="AantalKinderen">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="Dimensie">
+<Type>AX.Uitgaand.MAG.dto.Dimensie</Type>
+<Transient>1</Transient>
+</Property>
+
+<Property name="SubMagTabel">
+<Type>%String</Type>
+<MultiDimensional>1</MultiDimensional>
+</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 ^||Cache
+	Do ..BuildSubMagTabel()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkAlle">
+<Description>
+d ##class(AX.Uitgaand.MAG.impl.ExportProductie).%New().VerwerkAlle()</Description>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+   Write @F11,@F1
+   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<100)
+   {
+      Set Count=Count+1
+      Set ..Product=..ProductIterator.Next()
+      If ..IsGeldigProduct()
+	  {
+      	Do ..BuildCacheFromProduct()
+      	Set Verwerkt=Verwerkt+1
+	  }
+      If Count#100=0
+      {
+        Set FP=2301 Write @F,@F1
+        Write " ",Verwerkt," / ",Count
+      }
+
+   }
+   ;zw ^||Cache
+   
+   Set Dev=$$OPEN^vhDEV("\\notes01\shared\p v\","ProductProductie"_$TR($ZDT($H),"/:")_".txt","W","T")
+   Use Dev
+   Do ..WriteHeader() Write !
+   Use 0
+   Set Key1=$O(^||Cache(""))
+   While Key1'=""
+   {
+	   Set Key2=$O(^||Cache(Key1,""))
+	   While Key2'=""
+	   {
+		   Set Key3=$O(^||Cache(Key1,Key2,""))
+		   While Key3'=""
+		   {
+			   Set px=..MaakProxy(Key1,Key2,Key3)
+			   Use Dev
+			   Do px.WriteData()
+			   Write !
+		     Set Key3=$O(^||Cache(Key1,Key2,Key3))   
+		   }
+	      Set Key2=$O(^||Cache(Key1,Key2))
+	   }
+      Set Key1=$O(^||Cache(Key1))
+   }
+
+   Do CLOSE^vhDEV(Dev)
+   Set FP=2301 Write @F,@F1
+   Write Verwerkt," / ",Count
+]]></Implementation>
+</Method>
+
+<Method name="BuildCacheFromProduct">
+<Implementation><![CDATA[
+   Set PRNr=..Product.Basis.%Id()
+   Set HistIndex=$O(^PRHIST(PRNr,""))
+   While HistIndex'=""
+   {
+      Set HistRec=^PRHIST(PRNr,HistIndex)
+      If ..IsGeldig(HistRec)
+      {
+         Do ..BuildCacheFromBS(HistRec)
+      }
+      Set HistIndex=$O(^PRHIST(PRNr,HistIndex))
+   }
+]]></Implementation>
+</Method>
+
+<Method name="BuildCacheFromBS">
+<FormalSpec>HistRec:%String</FormalSpec>
+<Implementation><![CDATA[
+   Set MPRNr=..Product.Basis.%Id()
+   Set ..Dimensie=##class(AX.Uitgaand.MAG.dto.Dimensie).%New(..Product)
+   Set BSKey=$O(^PRBS("BS",MPRNr,""))
+   
+   While BSKey'=""
+   {
+       Set BSRec=^PRBS("BS",MPRNr,BSKey)
+       If ..IsGeldigBS(BSRec)
+       {
+     	  	Do ..BuildCache(HistRec,BSRec,$G(^PRBS("BS",MPRNr,BSKey,"D")))
+       }
+	   Set BSKey=$O(^PRBS("BS",MPRNr,BSKey))
+   }
+]]></Implementation>
+</Method>
+
+<Method name="BuildCache">
+<FormalSpec>HistRec:%String,BSRec:%String,BSDim:%String</FormalSpec>
+<Implementation><![CDATA[
+	Set PRNr=$P(BSRec,"\")
+	Set ..SubMagRec=..ConversieSubMag(PRNr)
+	Set TOENr=$P(HistRec,"\",7)
+	Set:TOENr="" TOENr="*"
+	Set Key1=TOENr, Key2=PRNr
+	If ..IsBulkOnderdeel(PRNr)
+	{
+		Set Key3=0
+	}
+	Else
+	{
+		Set Key3=$O(^||Cache(Key1,Key2,""),-1)+1
+	}
+	If '$D(^||Cache(Key1,Key2,Key3))
+	{
+		; Cache = $LB(PRNr,Locatie, ProdGrp,Datum, TOENr, VerpakkingsVorm, Stroom,GenTypMoeder,,Aantal)
+		Set ^||Cache(Key1,Key2,Key3)=$LB(PRNr,$P(..SubMagRec,"`",1),$P(..SubMagRec,"`",2),$P(HistRec,"\"),TOENr,..Dimensie.Verpakkingsvorm,$P(..SubMagRec,"`",4),..GeefGenTypMoeder())
+	}
+	Set Aantal=$P(HistRec,"\",2)*$P(BSRec,"\",2)
+	Set $LI(^||Cache(Key1,Key2,Key3),10)=$LG(^||Cache(Key1,Key2,Key3),10)+$$CV2WV^MRP(PRNr,Aantal,0,$P(BSDim,"\",3))
+	Set $LI(^||Cache(Key1,Key2,Key3),11)=$LG(^||Cache(Key1,Key2,Key3),11)+Aantal
+	Set $LI(^||Cache(Key1,Key2,Key3),12)=$LG(^||Cache(Key1,Key2,Key3),12)+$P(HistRec,"\",2)
+	Set ^||Cache(Key1,Key2,Key3,$O(^||Cache(Key1,Key2,Key3,""),-1)+1)=$LB(..Product.Basis.%Id(),HistRec,BSRec,BSDim)
+]]></Implementation>
+</Method>
+
+<Method name="GeefGenTypMoeder">
+<Implementation><![CDATA[
+	Set GenTyp=$P($$GENTYP^HAD(..Product.Basis.%Id()),"\")
+	If ";KAD;GLA;PRF;"[(";"_GenTyp_";") Set GenTyp="KAD"
+	If ";TBX;LBX;"[(";"_GenTyp_";") Set GenTyp="TBX/LBX"
+	If ";KAD;TBX/LBX;TAO;TAX;"'[(";"_GenTyp_";") Set GenTyp="DIV"
+	Quit GenTyp
+]]></Implementation>
+</Method>
+
+<Method name="IsBulkOnderdeel">
+<FormalSpec>BSRec</FormalSpec>
+<Implementation><![CDATA[	Quit $P(..SubMagRec,"`",3)&&(..Dimensie.LosseOnderdelen="Groep")
+]]></Implementation>
+</Method>
+
+<Method name="ConversieSubMag">
+<FormalSpec>PRNr:%String</FormalSpec>
+<Implementation><![CDATA[
+	Quit:$$$PRGet($$$KortTekst)?1"ZRG.10"2N.E "Voormontage`TBX``8"
+	Quit:$$$PRGet($$$KortTekst)?1"ZFZ".E&&($$$PRGet($$$KortTekst)?1.E1"FROB"2N.E) "Productie`TAX``8"
+	Quit:$$$PRGet($$$IdentNummer)="9.061.808.9" "RugWH`TBX``10"
+	Set SubMag=$$$PRGet($$$WerkvloerSubMag)
+	Quit:SubMag="" "Div```8"
+	Set SubMagRec=$G(..SubMagTabel(SubMag))
+	Quit:SubMagRec="" "Div```8"
+	Quit SubMagRec
+]]></Implementation>
+</Method>
+
+<Method name="ZijnLosseOnderdelenInBulk">
+<Implementation><![CDATA[	Quit ..Dimensie.LosseOnderdelen="Groep"
+]]></Implementation>
+</Method>
+
+<Method name="IsGeldigBS">
+<FormalSpec>BSRec:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+   Quit:$P(BSRec,"\")'?4.9N 0
+   Quit:$P(BSRec,"\",2)'>0 0
+   Quit:$P(BSRec,"\",3)'="H" 0
+   Quit 1
+]]></Implementation>
+</Method>
+
+<Method name="IsGeldigProduct">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+   Quit:(..Product.Prijs.Leverancier.%Id()'=$$$LevHalux) 0
+   Set PRNr=..Product.Basis.%Id()
+   ;Quit:$P($$GENTYP^HAD(PRNr),"\")'="LBX" 0
+   Set Key=$O(^PRHIST(PRNr,""),-1)
+   Quit:Key="" 0
+   Quit:+$P(^PRHIST(PRNr,Key),"\")<..StartDatum 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") 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.BewegingProductie).%New().WriteHeader()
+]]></Implementation>
+</Method>
+
+<Method name="MaakProxy">
+<FormalSpec>Key1,Key2,Key3</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set px=##class(AX.Uitgaand.MAG.dto.BewegingProductie).Create(..SOPRConvertor,Key1,Key2,Key3)
+    Quit px
+]]></Implementation>
+</Method>
+
+<Method name="BuildSubMagTabel">
+<Implementation><![CDATA[
+               S ..SubMagTabel("ALHD") ="Div```8`ALU Hardoor``"
+               S ..SubMagTabel("BAN") ="Div```8`Banco``"
+               S ..SubMagTabel("CCYST")="Div```8`Slotstang op maat``S"
+               S ..SubMagTabel("CP") ="LosOnd`TBX`1`10`TBX Corpusprofielen`O`1"
+               S ..SubMagTabel("EASYS")="Div```9`EasyScreen``"
+               S ..SubMagTabel("EL") ="Div```9`Verlichting``7"
+               S ..SubMagTabel("GLAS") ="LosOnd`TBX`1`12`Glas TBX`O`1"
+               S ..SubMagTabel("HOEHY")="Hoekkast```8`Hoekkast Hygena``2"
+               S ..SubMagTabel("HOEST")="Hoekkast```8`Hoekkast standaard``"
+               S ..SubMagTabel("LBCP") ="LosOnd`LBX`1`10`LBX Corpusprofielen`L`1"
+               S ..SubMagTabel("LBFRE")="Zijkant`LBX``10`LBX Free`L`R"
+               S ..SubMagTabel("LBGLA")="Zijkant`LBX``10`LBX Glas`L`E"
+               S ..SubMagTabel("LBOND")="LosOnd`LBX`1`10`LBX Onderdelen`L`3"
+               S ..SubMagTabel("LBPM") ="Plaatmat.`LBX``12`LBX Plaatmateriaal`L`4"
+               S ..SubMagTabel("LBRWH")="RugWH`LBX``10`LBX Rugwandhouder`L`F"
+               S ..SubMagTabel("LBSR") ="RugWH`LBX``10`LBX Stalen rug`L`5"
+               S ..SubMagTabel("LBVST")="Voormontage`LBX``8`LBX Voorstukken`L`9"
+               S ..SubMagTabel("LBZIJ")="Zijkant`LBX``10`LBX Zijkanten GVP`L`C"
+               S ..SubMagTabel("LBZIN")="Zijkant`LBX``10`LBX Zijkanten GVP IN`L`C"
+               S ..SubMagTabel("LBZKV")="Zijkant`LBX``10`LBX Zijkanten KVP`L`8"
+               S ..SubMagTabel("LBZOG")="Zijkant`LBX``10`LBX Zijkanten GVP OG`L`C"
+               S ..SubMagTabel("LBZPS")="Zijkant`LBX``10`LBX Zijkanten GVP PS-M`L`C"
+               S ..SubMagTabel("LBZSW")="Zijkant`LBX``10`LBX Zijkanten GVP SW`L`C"
+               S ..SubMagTabel("LBZTS")="Zijkant`LBX``10`LBX Zijkanten GVP TS`L`C"
+               S ..SubMagTabel("M") ="Div```8`Montage`M"
+               S ..SubMagTabel("MAT") ="Voormontage matten`Matten``9`Matten`O`G"
+               S ..SubMagTabel("MONDO")="Div```9`Mondo``2"
+               S ..SubMagTabel("O") ="Div```8`Onderdeel-Verpak`O"
+               S ..SubMagTabel("OI") ="LosOnd`TBX`1`10`TBX Onderdelen INTIVO`O`3"
+               S ..SubMagTabel("OIB") ="LosOnd`TBX`1`10`TBX Onderdelen BOXCAP`O`3"
+               S ..SubMagTabel("OP") ="LosOnd`TBX`1`10`TBX Onderdelen Plus`O`3"
+               S ..SubMagTabel("ORELA")="LosOnd`TBX`1`10`TBX Reling Antaro`O`3"
+               S ..SubMagTabel("P") ="Div```8`Pro`P"
+               S ..SubMagTabel("PDE") ="Plaatmat.`TBX``12`TBX Plaatmat. Unilin``4"
+               S ..SubMagTabel("PHULP")="Div````Productie hulpmiddelen``"
+               S ..SubMagTabel("PHY") ="Div```9`Hoekkast Plaatmat. Hygena``2"
+               S ..SubMagTabel("PM") ="Plaatmat.```12`Plaatmateriaal``4"
+               S ..SubMagTabel("PRF") ="ALU```9`Profielen``4"
+               S ..SubMagTabel("PSA") ="Plaatmat.`TBX``12`TBX Plaatmat. Stylin'Art``4"
+               S ..SubMagTabel("RWH") ="RugWH`TBX``10`TBX Rugwandhouder`Z`5"
+               S ..SubMagTabel("SCR") ="Montage```10`Schroeven`O`5"
+               S ..SubMagTabel("SPSY") ="Spoelbak```10`TBX Onderdelen spoelbak`Z`6"
+               S ..SubMagTabel("SRUG") ="RugWH`TBX``10`TBX Stalen rug`Z`5"
+               S ..SubMagTabel("TAFIM")="Plaatmat.`TAX``12`TA'OR Plaatmat. Decospan``"
+               S ..SubMagTabel("TAOND")="LosOnd`TAX`1`10`TA'OR Onderdelen``"
+               S ..SubMagTabel("TAPEG")="Plaatmat.`TAX``12`TA'OR Plaatmat. Egger``"
+               S ..SubMagTabel("TAZEI")="Plaatmat.`TAX``12`TA'OR Zijkanten Eik``"
+               S ..SubMagTabel("TAZNO")="Plaatmat.`TAX``12`TA'OR Zijkanten Noten``"
+               S ..SubMagTabel("TAZZE")="Plaatmat.`TAX``12`TA'OR Zijkanten Zwart eik``"
+               S ..SubMagTabel("TIPON")="LosOnd`TBX``10`TBX Tip-on`Z`6"
+               S ..SubMagTabel("VPK") ="Verpakking```12`Verpakking``Z"
+               S ..SubMagTabel("VRSTK")="Voormontage`TBX``8`TBX Voorstukken`O`9"
+               S ..SubMagTabel("X") ="Div```12`Algemeen``9"
+               S ..SubMagTabel("Z") ="Plaatmat```12`Zaag`Z"
+               S ..SubMagTabel("ZK") ="Zijkant`TBX``10`TBX Zijkanten`M`C"
+               S ..SubMagTabel("ZKGVM")="Zijkant`TBX``10`TBX Zijkanten GVP M`M`C"
+               S ..SubMagTabel("ZKGVP")="Zijkant`TBX``10`TBX Zijkanten GVP andere`M`C"
+               S ..SubMagTabel("ZKKVP")="Zijkant`TBX``10`TBX Zijkanten KVP`M`8"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/MAG/dto/Dimensie.cls.xml
===================================================================
diff -u -r52359 -r53245
--- AX/Uitgaand/MAG/dto/Dimensie.cls.xml	(.../Dimensie.cls.xml)	(revision 52359)
+++ AX/Uitgaand/MAG/dto/Dimensie.cls.xml	(.../Dimensie.cls.xml)	(revision 53245)
@@ -44,6 +44,10 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="LosseOnderdelen">
+<Type>%String</Type>
+</Property>
+
 <Property name="ProductGroep">
 <Type>%String</Type>
 </Property>
@@ -194,6 +198,7 @@
 		Set ..PalletBreedte=$S(Breedte>1100:1500,1:1200)
 		Set ..PalletAantal=10
 		Set ..Verpakkingsvorm="Lade V1"
+		Set ..LosseOnderdelen="V1"
 		
 	}
 	ElseIf (Verpakking="X")||(Verpakking="Y")
@@ -206,6 +211,7 @@
 		Set ..PalletBreedte=600
 		Set ..PalletAantal=5
 		Set ..Verpakkingsvorm="Lade ProBox"
+		Set ..LosseOnderdelen="Groep"
 	}	
 	ElseIf (Verpakking="A")||(Verpakking="B")
 	{
@@ -217,6 +223,7 @@
 		Set ..PalletBreedte=1200
 		Set ..PalletAantal=30
 		Set ..Verpakkingsvorm="Lade VHOSS"
+		Set ..LosseOnderdelen="Groep"
 	}	
 	Else
 	{
@@ -228,6 +235,7 @@
 		Set ..PalletBreedte=$S(Breedte>1100:1500,1:1200)
 		Set ..PalletAantal=10
 		Set ..Verpakkingsvorm="Lade Pallet"
+		Set ..LosseOnderdelen="Groep"
 	}
 	Set ..Aantal=1
 	Set ..Calc="TBX"
@@ -258,6 +266,8 @@
 		Set ..PalletBreedte=$S(Breedte>1100:1500,1:1200)
 		Set ..PalletAantal=10
 		Set ..Verpakkingsvorm="Lade V1"
+		Set ..LosseOnderdelen="V1"
+
 	}
 	ElseIf (Verpakking="Probox")
 	{
@@ -270,6 +280,8 @@
 		Set ..PalletAantal=5
 
 		Set ..Verpakkingsvorm="Lade ProBox"
+		Set ..LosseOnderdelen="Groep"
+
 	}	
 	ElseIf (Verpakking="VHoss")
 	{
@@ -281,6 +293,8 @@
 		Set ..PalletBreedte=1200
 		Set ..PalletAantal=20
 		Set ..Verpakkingsvorm="Lade VHOSS"
+		Set ..LosseOnderdelen="Groep"
+
 	}	
 	Else
 	{
@@ -292,6 +306,8 @@
 		Set ..PalletBreedte=$S(Breedte>1100:1500,1:1200)
 		Set ..PalletAantal=10
 		Set ..Verpakkingsvorm="Lade Pallet"
+		Set ..LosseOnderdelen="Groep"
+
 	}
 	Set ..Aantal=1
 	Set ..Calc="TBX"
@@ -323,6 +339,7 @@
 		Set ..PalletBreedte=$S(Breedte>1100:1500,1:1200)
 		Set ..PalletAantal=10
 		Set ..Verpakkingsvorm="Lade V1"
+		Set ..LosseOnderdelen="V1"
 	}
 	ElseIf (Verpakking="Probox")
 	{
@@ -334,6 +351,7 @@
 		Set ..PalletBreedte=600
 		Set ..PalletAantal=5
 		Set ..Verpakkingsvorm="Lade ProBox"
+		Set ..LosseOnderdelen="Groep"
 	}	
 	ElseIf (Verpakking="VHoss")
 	{
@@ -345,6 +363,7 @@
 		Set ..PalletBreedte=1200
 		Set ..PalletAantal=20
 		Set ..Verpakkingsvorm="Lade VHOSS"
+		Set ..LosseOnderdelen="Groep"
 	}	
 	Else
 	{
@@ -356,6 +375,7 @@
 		Set ..PalletBreedte=$S(Breedte>1100:1500,1:1200)
 		Set ..PalletAantal=10
 		Set ..Verpakkingsvorm="Lade Pallet"
+		Set ..LosseOnderdelen="Groep"
 	}
 	Set ..Aantal=1
 	Set ..Calc="TBX"
Index: AX/Uitgaand/MAG/impl/ExportProductMaster.cls.xml
===================================================================
diff -u -r52359 -r53245
--- AX/Uitgaand/MAG/impl/ExportProductMaster.cls.xml	(.../ExportProductMaster.cls.xml)	(revision 52359)
+++ AX/Uitgaand/MAG/impl/ExportProductMaster.cls.xml	(.../ExportProductMaster.cls.xml)	(revision 53245)
@@ -59,15 +59,15 @@
 <ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
 	Write @F11,@F1
-	Set Dev=$$OPEN^vhDEV("\\notes01\shared\p v\","ProductBasis.txt","W","T")
+	Set Dev=$$OPEN^vhDEV("\\notes01\shared\p v\","ProductBasis "_$TR($ZDT($H),"/:")_".txt","W","T")
 	Use Dev
 	Do ..WriteHeader() Write !
 	Use 0
-	Set Filter=##class(AX.Uitgaand.MAG.impl.ProductIteratorFilter).%New(..StartDatum)
+	Set Filter=##class(AX.Uitgaand.MAG.impl.ProductIteratorFilterExclMaatwerk).%New(..StartDatum)
 	Set ..ProductIterator=##class(ProductIterator).%New(Filter)
 	Set Count=0
 	Set Verwerkt=0
-	While ..ProductIterator.HasNext() ;&&(Verwerkt<1000)
+	While ..ProductIterator.HasNext() ;&&(Verwerkt<100)
 	{
 		Set Count=Count+1
 		Set ..Product=..ProductIterator.Next()
Index: AX/Uitgaand/MAG/impl/ExportIC.cls.xml
===================================================================
diff -u -r52359 -r53245
--- AX/Uitgaand/MAG/impl/ExportIC.cls.xml	(.../ExportIC.cls.xml)	(revision 52359)
+++ AX/Uitgaand/MAG/impl/ExportIC.cls.xml	(.../ExportIC.cls.xml)	(revision 53245)
@@ -223,98 +223,6 @@
 ]]></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()
Index: AX/Uitgaand/MAG/dto/Artikel.cls.xml
===================================================================
diff -u -r52359 -r53245
--- AX/Uitgaand/MAG/dto/Artikel.cls.xml	(.../Artikel.cls.xml)	(revision 52359)
+++ AX/Uitgaand/MAG/dto/Artikel.cls.xml	(.../Artikel.cls.xml)	(revision 53245)
@@ -20,6 +20,10 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="LangTekst">
+<Type>%String</Type>
+</Property>
+
 <Property name="ProductStatus">
 <Type>%String</Type>
 </Property>
@@ -28,6 +32,18 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="ArtikelGroepGR">
+<Type>%String</Type>
+</Property>
+
+<Property name="ArtikelHoofdGroepOms">
+<Type>%String</Type>
+</Property>
+
+<Property name="ArtikelGroepOms">
+<Type>%String</Type>
+</Property>
+
 <Property name="Unit">
 <Type>%String</Type>
 </Property>
@@ -246,7 +262,11 @@
 		Set ..ItemId=$$$ProductGet(SOPRPRNr,$$$IdentNummer)
 
 		Set ..Omschrijving=$$$ProductGet(..PRNr, $$$KortTekst)
-		Set ..ArtikelGroep=..Product.Basis.ProductGroep
+		Set ..LangTekst=..Product.Tekst.GetOmschrijving("N",";")
+		Set ..ArtikelGroep=$E(..Product.Klassificatie.HoofdGroep,3,4)_"-"_$E(..Product.Klassificatie.Groep,7,9)
+		Set ..ArtikelHoofdGroepOms=$P(^KPHG1(..Product.Klassificatie.HoofdGroep),"\",1)
+		Set ..ArtikelGroepOms=$P(^KPGR1(..Product.Klassificatie.Groep),"\",1)
+		
 		Set ..ProductStatus="" ; achteraf via transactie
 		Set ..Unit="STK" ; achteraf via transactie
 
@@ -399,7 +419,7 @@
   	
 	If (+LocM=1)||((LocM="")&&($$$PRGet($$$OpslagZone)=1))
 	{
-		Set ..DefaultMagazijn="AUTO"
+		Set ..DefaultMagazijn="APM"
 	}
 	Else
 	{
@@ -434,9 +454,9 @@
 			Set HLX=""
 			Set ProductStatus="SET"
 		}
-		ElseIf ..Leverancier=$$$LevHalux
+		ElseIf ..Product.Prijs.Leverancier.Nummer=$$$LevHalux
 		{
-			Set VHBE=$S(StockVH:"BTS",1:"BTO")
+			Set VHBE=$S(StockVH:"BTS-IC",1:"BTO-IC")
 			Set HLX="MTO-IC"
 			Set ProductStatus="MW"
 		}
@@ -518,9 +538,12 @@
 <Method name="DefineLabels">
 <Implementation><![CDATA[
  Do ..SetLabel("ItemId", 100,"TXT")
- Do ..SetLabel("Omschrijving", 101,"TXT")
+ Do ..SetLabel("Omschrijving", 101.1,"TXT")
+ Do ..SetLabel("LangTekst", 101.2,"TXT")
  Do ..SetLabel("ProductStatus", 102,"TXT")
- Do ..SetLabel("ArtikelGroep", 103,"TXT")
+ Do ..SetLabel("ArtikelGroep", 103.1,"TXT")
+ Do ..SetLabel("ArtikelHoofdGroepOms", 103.2,"TXT")
+ Do ..SetLabel("ArtikelGroepOms", 103.3,"TXT")
  Do ..SetLabel("Unit", 104,"TXT")
  Do ..SetLabel("Diepte", 105)
  Do ..SetLabel("Breedte", 106)
@@ -566,112 +589,151 @@
 </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))
+<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><![CDATA[SubVolgNr:%Integer="",&Maanden:%String]]></FormalSpec>
+<Method name="GeefLabelIterator">
 <Implementation><![CDATA[
+	Set Keys=##class(%ListOfDataTypes).%New()
 	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))
-				}
-			}
+			Do Keys.Insert($LB(Key1,Key2))
+		
 			Set Key2=$O(..ExportLabels(Key1,Key2))
 		}
 		Set Key1=$O(..ExportLabels(Key1))
 	}
+	Quit ##class(TECH.ListIterator).%New(Keys)
 ]]></Implementation>
 </Method>
 
-<Method name="GeefMaand">
-<FormalSpec><![CDATA[I:%Integer,&Maanden:%Integer,NeemPiece]]></FormalSpec>
+<Method name="WriteHeader">
+<FormalSpec><![CDATA[SubVolgNr:%Integer="",&Maanden:%String]]></FormalSpec>
 <Implementation><![CDATA[
-	Set Maand=$O(Maanden(""))
-	While Maand'=""
+	Set it=..GeefLabelIterator()
+	While it.HasNext()
 	{
-		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))
+		Set Keys=it.Next()
+		Do ..WriteHeaderElement(Keys,SubVolgNr,.Maanden)
 	}
-	Quit $G(GevondenMaand)
 ]]></Implementation>
 </Method>
 
-<Method name="WriteData">
+<Method name="WriteHeaderElement">
+<FormalSpec><![CDATA[Keys:%List,SubVolgNr:%Integer,&Maanden:%String]]></FormalSpec>
 <Implementation><![CDATA[
-	Set Key1=$O(..ExportLabels(""))
-	While Key1'=""
+	Set Key1=$LG(Keys)
+	Set Key2=$LG(Keys,2)
+	Set ArrayType=$LG(..ExportLabels(Key1,Key2))
+	If "TXT,DATE"[ArrayType
 	{
-		Set Key2=$O(..ExportLabels(Key1,""))
-		While Key2'=""
+		Write Key1,$S(SubVolgNr:"."_SubVolgNr,1:""),":",Key2,*9	
+	}
+	Elseif "DataType"=ArrayType
+	{
+		For I=1:1:$LG(..ExportLabels(Key1,Key2),2)
 		{
-			Set ArrayType=$LG(..ExportLabels(Key1,Key2))
-			If ArrayType=""
+			Write Key1,".",I,":",Key2,*9
+		}
+	}
+	Else  ; Object
+	{
+		Set obj= $zobjclassmethod(ArrayType,"%New")
+		Set itData=obj.GeefLabelIterator()
+		While itData.HasNext()
+		{
+			Set SubKeys=itData.Next()
+			Set SubKey1=$LG(SubKeys)
+			Set SubKey2=$LG(SubKeys,2)
+			For I=$LG(..ExportLabels(Key1,Key2),2):-1:1
 			{
-				Write $$$ExcelNum($zobjProperty(%this,Key2)),*9
+				Do obj.WriteHeaderElement(SubKeys,I_":"_..GeefMaand(I,.Maanden))
 			}
-			ElseIf ArrayType="TXT"
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="WriteData">
+<Implementation><![CDATA[
+	Set it=..GeefLabelIterator()
+	While it.HasNext()
+	{
+		Set Keys=it.Next()
+		Do ..WriteDataElement(Keys)			
+	}
+]]></Implementation>
+</Method>
+
+<Method name="WriteDataElement">
+<FormalSpec>Keys</FormalSpec>
+<Implementation><![CDATA[
+	Set Key1=$LG(Keys)
+	Set Key2=$LG(Keys,2)
+	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 obj= $zobjclassmethod(ArrayType,"%New")
+		Set itData=obj.GeefLabelIterator()
+		While itData.HasNext()
+		{
+			Set SubKeys=itData.Next()
+			Set Element=ArrayObj.GetNext(.Key) 
+			Set Count=0
+			While Key'=""
 			{
-				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 Count=Count+1
+				Do Element.WriteDataElement(SubKeys)
 				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>
+
+<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>
 </Class>
 
 
Index: AX/Uitgaand/MAG/dto/BewegingOutbound.cls.xml
===================================================================
diff -u -r52359 -r53245
--- AX/Uitgaand/MAG/dto/BewegingOutbound.cls.xml	(.../BewegingOutbound.cls.xml)	(revision 52359)
+++ AX/Uitgaand/MAG/dto/BewegingOutbound.cls.xml	(.../BewegingOutbound.cls.xml)	(revision 53245)
@@ -223,7 +223,7 @@
 <Method name="VulinProduct">
 <Implementation><![CDATA[
 	Set ..Product=##class(AX.Uitgaand.PM.Product.impl.Product).%New(..PRNr)
-	Set SOPRPRNr=..BasisData.SOPRConvertor.GeefVervangProductDoorSOPRInAX(..PRNr)
+	Set SOPRPRNr=..BasisData.SOPRConvertor.GeefVervangProductDoorSOPRInAX(..PRNr,1)
 	Set:SOPRPRNr="" SOPRPRNr=..PRNr
 	Set ..ItemId=$$$ProductGet(SOPRPRNr,$$$IdentNummer)
 	Set ..Omschrijving=..Product.Basis.KortTekst
Index: AX/Uitgaand/MAG/impl/ExportOutbound.cls.xml
===================================================================
diff -u -r52359 -r53245
--- AX/Uitgaand/MAG/impl/ExportOutbound.cls.xml	(.../ExportOutbound.cls.xml)	(revision 52359)
+++ AX/Uitgaand/MAG/impl/ExportOutbound.cls.xml	(.../ExportOutbound.cls.xml)	(revision 53245)
@@ -241,6 +241,7 @@
 <FormalSpec>OLUNr:%String</FormalSpec>
 <Implementation><![CDATA[
 	Set ..AantalKinderen=0
+	Kill ProdCnt
 	Set SOLNr=$O(^ORDW("D",..CONSNr,"D",..ORDNr,OLUNr,""))
 	While SOLNr'=""
 	{
Index: AX/Uitgaand/MAG/dto/ArtikelTransactiesPerMaand.cls.xml
===================================================================
diff -u -r52359 -r53245
--- AX/Uitgaand/MAG/dto/ArtikelTransactiesPerMaand.cls.xml	(.../ArtikelTransactiesPerMaand.cls.xml)	(revision 52359)
+++ AX/Uitgaand/MAG/dto/ArtikelTransactiesPerMaand.cls.xml	(.../ArtikelTransactiesPerMaand.cls.xml)	(revision 53245)
@@ -182,33 +182,47 @@
 <FormalSpec>HistRec:%String</FormalSpec>
 <Implementation><![CDATA[
 	Set ..HistRec=HistRec
-	Do ..VerdeelAantal()
-	Do ..VoegToeVolgensBeweging()
-	Set ..Maand=$$CALCDATE^vhLib.DataTypes($P(HistRec,"\"),"M","FD")
+	If +$P(..HistRec,"\",2)'=0
+	{
+		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)
+	Quit:Aantal=0
+	Set:$P(..HistRec,"\",4)?1(1"U",1"T",1"H") Aantal=-Aantal
+	
+	Set Sign=$S(Aantal<0:-1,1:1)
+	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)
+	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)
+	If (Aantal'<..Artikel.AantalKVP) && (..Artikel.AantalKVP>1)
 	{
 		Set ..QtyKVP=(Aantal\..Artikel.AantalKVP)*..Artikel.AantalKVP
 		Set Aantal=Aantal-..QtyKVP
 	}
+	
 	Set ..QtyStk=Aantal
+	
+	Set ..QtyPallet=Sign*..QtyPallet
+	Set ..QtyGVP=Sign*..QtyGVP
+	Set ..QtyKVP=Sign*..QtyKVP
+	Set ..QtyStk=Sign*..QtyStk
 ]]></Implementation>
 </Method>
 
@@ -249,6 +263,7 @@
 
 <Method name="VoegToeVH">
 <Implementation><![CDATA[
+	
 	If ..QtyPallet
 	{
 		Set ..AantalLijnenVHPalletPicking=..AantalLijnenVHPalletPicking+1
@@ -269,6 +284,7 @@
 		Set ..AantalLijnenVHSTKPicking=..AantalLijnenVHSTKPicking+1
 		Set ..AantalStuksVHSTKPicking=..AantalStuksVHSTKPicking+..QtyStk
 	}
+	
 	Set ..AantalLijnenVHPicking=..AantalLijnenVHPicking+1
 	Set ..AantalStuksVHPicking=..AantalStuksVHPicking+(..QtyStk+..QtyKVP+..QtyGVP+..QtyPallet)
 	Set ..OpnemenInExport=1
@@ -338,7 +354,7 @@
 <Implementation><![CDATA[
 	 Kill ..ExportLabels
 	 
-	 Do ..SetLabel("Maand", 699,"DATE")
+	 ;Do ..SetLabel("Maand", 699,"DATE")
 	 Do ..SetLabel("AantalLijnenVHPicking", 300)
 	 Do ..SetLabel("AantalLijnenVHSTKPicking", 301)
 	 Do ..SetLabel("AantalLijnenVHKVPPicking", 302)
@@ -378,93 +394,146 @@
 ]]></Implementation>
 </Method>
 
-<Method name="WriteHeader">
-<FormalSpec>SubVolgNr:%Integer=""</FormalSpec>
+<Method name="GeefLabelIterator">
 <Implementation><![CDATA[
+	Set Keys=##class(%ListOfDataTypes).%New()
 	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)
-				}
-			}
+			Do Keys.Insert($LB(Key1,Key2))
+		
 			Set Key2=$O(..ExportLabels(Key1,Key2))
 		}
 		Set Key1=$O(..ExportLabels(Key1))
 	}
+	Quit ##class(TECH.ListIterator).%New(Keys)
 ]]></Implementation>
 </Method>
 
-<Method name="WriteData">
+<Method name="WriteHeader">
+<FormalSpec><![CDATA[SubVolgNr:%Integer="",&Maanden:%String]]></FormalSpec>
 <Implementation><![CDATA[
-	Set Key1=$O(..ExportLabels(""))
-	While Key1'=""
+	Set it=..GeefLabelIterator()
+	While it.HasNext()
 	{
-		Set Key2=$O(..ExportLabels(Key1,""))
-		While Key2'=""
+		Set Keys=it.Next()
+		Do ..WriteHeaderElement(Keys,SubVolgNr,.Maanden)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="WriteHeaderElement">
+<FormalSpec><![CDATA[Keys:%List,SubVolgNr:%Integer,&Maanden:%String]]></FormalSpec>
+<Implementation><![CDATA[
+	Set Key1=$LG(Keys)
+	Set Key2=$LG(Keys,2)
+	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)
 		{
-			Set ArrayType=$LG(..ExportLabels(Key1,Key2))
-			If ArrayType=""
+			Write Key1,".",I,":",Key2,*9
+		}
+	}
+	Else  ; Object
+	{
+		Set obj= $zobjclassmethod(ArrayType,"%New")
+		Set itData=obj.GeefLabelIterator()
+		While itData.HasNext()
+		{
+			Set SubKeys=itData.Next()
+			Set SubKey1=$LG(SubKeys)
+			Set SubKey2=$LG(SubKeys,2)
+			For I=$LG(..ExportLabels(Key1,Key2),2):-1:1
 			{
-				Write $$$ExcelNum($zobjProperty(%this,Key2)),*9
+				Do obj.WriteHeaderElement(SubKeys,I_":"_..GeefMaand(I,.Maanden))
 			}
-			ElseIf ArrayType="TXT"
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="WriteData">
+<Implementation><![CDATA[
+	Set it=..GeefLabelIterator()
+	While it.HasNext()
+	{
+		Set Keys=it.Next()
+		Do ..WriteDataElement(Keys)			
+	}
+]]></Implementation>
+</Method>
+
+<Method name="WriteDataElement">
+<FormalSpec>Keys</FormalSpec>
+<Implementation><![CDATA[
+	Set Key1=$LG(Keys)
+	Set Key2=$LG(Keys,2)
+	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 obj= $zobjclassmethod(ArrayType,"%New")
+		Set itData=obj.GeefLabelIterator()
+		While itData.HasNext()
+		{
+			Set SubKeys=itData.Next()
+			Set Element=ArrayObj.GetNext(.Key) 
+			Set Count=0
+			While Key'=""
 			{
-				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 Count=Count+1
+				Do Element.WriteDataElement(SubKeys)
 				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>
+
+<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>
 </Class>