Index: BL/Derde/Agenda/GeoDynamicsImport.cls.xml
===================================================================
diff -u -r38931 -r39394
--- BL/Derde/Agenda/GeoDynamicsImport.cls.xml	(.../GeoDynamicsImport.cls.xml)	(revision 38931)
+++ BL/Derde/Agenda/GeoDynamicsImport.cls.xml	(.../GeoDynamicsImport.cls.xml)	(revision 39394)
@@ -24,7 +24,7 @@
 </Parameter>
 
 <Parameter name="DefaultDagenInVerleden">
-<Default>5</Default>
+<Default>0</Default>
 </Parameter>
 
 <Property name="User">
@@ -54,6 +54,21 @@
 ]]></Implementation>
 </Method>
 
+<Method name="TestOphalenLocaties">
+<Description>
+d ##class(BL.Derde.Agenda.GeoDynamicsImport).%New(1017).TestOphalenLocaties()</Description>
+<Implementation><![CDATA[
+	Set WebService=##class(WS.GeoDynamics.IntegratorWebserviceSoap).%New()
+	Set WebService.SSLConfiguration="GeoDynamicsAPI"
+
+	Set VanafTijdstip="" ;$G(^Derde.Agenda.GeoMobileCfg("LASTUPDATE",..User.GeoDevice))
+	Set:VanafTijdstip="" VanafTijdstip=$zdt(($P($H,",",1)-..#DefaultDagenInVerleden)_",1",3)
+	Set TotTijdstip=$zdt($H,3)
+	Set Locaties=WebService.LocationGetByVehicleIdDateRange(..GeefCallerID(),"6726f44a-b65b-4775-8cf6-c3d410f1d5fd",VanafTijdstip,TotTijdstip)
+	Do ObjToXMLFile^vhLib(Locaties,"\\notes01\shared\P V\GEODYNAMICS Locaties"_".xml")
+]]></Implementation>
+</Method>
+
 <Method name="OphalenLocaties">
 <Description>
 d ##class(BL.Derde.Agenda.GeoDynamicsImport).%New(1017).OphalenLocaties()</Description>
Index: APPS/BD/OrderStat/impl/Extract2IntakeEnGeleverd.cls.xml
===================================================================
diff -u -r34389 -r39394
--- APPS/BD/OrderStat/impl/Extract2IntakeEnGeleverd.cls.xml	(.../Extract2IntakeEnGeleverd.cls.xml)	(revision 34389)
+++ APPS/BD/OrderStat/impl/Extract2IntakeEnGeleverd.cls.xml	(.../Extract2IntakeEnGeleverd.cls.xml)	(revision 39394)
@@ -132,6 +132,8 @@
 	Set ..TotDatum=+$G(Tot)
 	Set:..VanDatum=0 ..VanDatum=$$CALCDATE^vhLib.DataTypes($H,"BJ",-1,"FD")
 	Set:..TotDatum=0 ..TotDatum=$$CALCDATE^vhLib.DataTypes($H,"BJ",-1,"LD") 
+	Set ..VanDatum=$$CALCDATE^vhLib.DataTypes($H,"J",-1,"FD")
+	Set ..TotDatum=$$CALCDATE^vhLib.DataTypes($H,"M",-1,"LD") 
 	Set ..AfstandBepaler=##class(APPS.BD.CarbonFootprint.impl.AfstandBepaler).%New()
 	
 	Quit $$$OK
@@ -148,7 +150,7 @@
 	Do ..HerbouwenOrders()
 	;Do CLOSE^vhDEV(Dev)
 	Do ##class(APPS.BD.OrderStat.impl.OrderGeleverd).Export2File()
-	Do ##class(APPS.BD.OrderStat.impl.OrderIntake).Export2File()
+	;Do ##class(APPS.BD.OrderStat.impl.OrderIntake).Export2File()
 ]]></Implementation>
 </Method>
 
@@ -385,7 +387,7 @@
 	Set ..PostKode=$P(AdresRec,"\",6)
 	Set ..Straat=$P(AdresRec,"\",5)
 	Set ..LandKode=$$LAND^vhRtn1($P(AdresRec,"\",8),1,1)
-	Set ..Afstand=..AfstandBepaler.BepaalAfstandTot(..Woonplaats,..LandKode)
+	;Set ..Afstand=..AfstandBepaler.BepaalAfstandTot(..Woonplaats,..LandKode)
 ]]></Implementation>
 </Method>
 
Index: PV.mac.rou
===================================================================
diff -u -r29059 -r39394
--- PV.mac.rou	(.../PV.mac.rou)	(revision 29059)
+++ PV.mac.rou	(.../PV.mac.rou)	(revision 39394)
@@ -1,21 +1,276 @@
 #include vhLib.Macro
 #include Prod.Product
 #include BL.Derde.KlantSpecifiek
+#include BL.Derde.LevSpecifiek
+
+quit
+DELMAIL
+	Set ml=""
+	For  Set ml=$O(^vhMAIL("D",ml)) Quit:ml=""  Do
+	.Quit:$P(^vhMAIL("D",ml),"\",8)'="Stockcorr. N.S."
+	.D DELOBJ^vhMAIL(ml)
+	Quit
+
+job
+	d ##class(AX.Uitgaand.EC.Service).%New().GenerateAll()
+	q
+
+StatGew
+ Set KLNr=0
+ Kill SomGewicht
+	Set BeginDatum=$$CALCDATE^vhLib.DataTypes($H,"BJ","FD",-5)
+	Set EindDatum=$$CALCDATE^vhLib.DataTypes($H,"BJ","LD",-1)
+	Use Dev
+	Set KLNr=""
+	For  Set KLNr=$O(^KFA1("F",KLNr)) Quit:KLNr=""  Do
+	. Set KlKey=^KK1(KLNr)
+	. Set Regio=$P(^KKL(KlKey,0),"\",20)
+	. Set Datum="" ; beginnen vanaf vandaag omdat orders van vorige maand ook in facturen van vandaag kunnen zitten
+	. For  Set Datum=$O(^KFA1("F",KLNr,Datum)) Quit:Datum=""  Do
+	. . Quit:-Datum>EindDatum
+	. . Quit:-Datum<BeginDatum
+	. . Set BKJaar=$$CALCDATE^vhLib.DataTypes(-Datum,"BJ","LD")
+	. . Set FAKNr=""
+ 	. . For  Set FAKNr=$O(^KFA1("F",KLNr,Datum,FAKNr)) Quit:FAKNr=""  Do
+	. . . Set BONNr="U"
+	. . . For  Set BONNr=$O(^KFA("F",FAKNr,BONNr)) Quit:$E(BONNr)'="U"  Do
+	. . . . Set BonRec=^KFA("F",FAKNr,BONNr,1)
+	. . . . Set Vzw=$E($P(BonRec,"\",7),1,3)
+	. . . . Set LNr=99
+	. . . . For  Set LNr=$O(^KFA("F",FAKNr,BONNr,LNr)) Quit:LNr'?3.4N  Do
+	. . . . . Set LRec=^KFA("F",FAKNr,BONNr,LNr)
+	. . . . . Set PRNr=$P(LRec,"\",2)
+	. . . . . Quit:'PRNr
+	. . . . . Quit:$P(LRec,"\",17)="KF5"
+	. . . . . Set Qty=$P(LRec,"\",3)
+	. . . . . Quit:Qty<1
+	. . . . . Set Gewicht=$$GetOrOld^PRODUKT(PRNr,$$$Gewicht)/1000
+	. . . . . Quit:'Gewicht
+	. . . . . Set IsHalux=$$GetOrOld^PRODUKT(PRNr,$$$LeveranciersNr)=$$$LevHalux
+
+    . . . . . Set SomGewicht("ALLE",BKJaar)=$G(SomGewicht("ALLE",BKJaar))+(Qty*Gewicht)
+    . . . . . Set:IsHalux SomGewicht("HALUX",BKJaar)=$G(SomGewicht("HALUX",BKJaar))+(Qty*Gewicht)
+ zw SomGewicht
+ Quit
+
+StatMnd 
+ Set Dev=$$OPEN^vhDEV(,"Qty HalfFab Halux.txt","W","T")
+ Use Dev
+ Set KLNr=0
+ Write "KLNr	PRNr	KortTekst	GenTyp	SubGenTyp	Maand	Aantal	AantalHalfFab",!
+ For  Set KLNr=$O(^KSTKL(KLNr)) Quit:KLNr=""  Do  ;q:KLNr>1007
+ . Set PRNr=0
+ . For  Set PRNr=$O(^KSTKL(KLNr,PRNr)) Quit:PRNr=""  Do
+ . . Set KT=$P($G(^KPR(PRNr,0)),D,1)
+ . . Quit:$E(KT,1,3)="GEN"
+ . . Quit:$$GetOrOld^PRODUKT(PRNr,$$$LeveranciersNr)'=$$$LevHalux
+ . . Set CntHalfFab=$$NbrHalfFab(PRNr)
+ . . Quit:'CntHalfFab
+ . . Set GenTyp=$$GENTYP^HAD(PRNr,1)
+ . . Set Mnd=0
+ . . For  Set Mnd=$O(^KSTKL(KLNr,PRNr,Mnd)) Quit:Mnd=""  Do
+ . . . Set Maand=$$INTDATE^vhLib.DataTypes(Mnd,"DM4")
+ . . . Set Qty=$P(^KSTKL(KLNr,PRNr,Mnd),"\",1)
+ . . . Quit:Qty<1
+ . . . Write KLNr,*9,PRNr,*9,KT,*9,$P(GenTyp,"\"),*9,$P(GenTyp,"\",2),*9,$$$ExcelDat(Maand),*9,$$$ExcelNum(Qty),*9,$$$ExcelNum(CntHalfFab),!
+ Do CLOSE^vhDEV(Dev)
+ Quit
  q
  
-StatIO
-	Set Device=$$OPEN^vhDEV(,"StatIO.txt","W","T")
+NbrHalfFab(PRNr)	New CntHalfFabr,BSKey
+	Set CntHalfFabr="",BSNode="BS"
+	Set BSKey=""
+	For  Set BSKey=$O(^PRBS(BSNode,PRNr,BSKey)) Quit:BSKey=""  Do
+	. Set:$P(^PRBS(BSNode,PRNr,BSKey),"\",3)="H" CntHalfFabr=CntHalfFabr+1
+	Quit CntHalfFabr
+ 
+ 
+PlaatMat 
+ Set Dev=$$OPEN^vhDEV(,"Plaatmat.txt","W","T")
+ Use Dev
+ Set KLNr=0
+ Write "KLNr	Naam	Regio	PRNr	KortTekst	GenTyp	SubGenTyp	Maand	Aantal",!
+ Set PRNr=0
+ For  Set PRNr=$O(^KPR(PRNr)) Quit:PRNr=""  Do
+ . Set KT=$P($G(^KPR(PRNr,0)),D,1)
+ . Quit:'((KT?1"SLF".E)||(KT?1"SPP".E)||(KT?1"SPF".E))
+ .WRite PRNr,*9,KT,*9,$$$ExcelNum($$$PRGet($$$CifPPLEUR)),!
+ Do CLOSE^vhDEV(Dev)
+ Quit
+ q
+
+KomLinkMetStock
+ Set Device=0 ;$$OPEN^vhDEV(,"StatIO.txt","W","T")
+ Use Device
+ Write "KLNr	ORDNr	PRNr	Korttekst	ToeLev	OrderQty	FysStock	AantalOrdlijnen",!
+ Set KLNr=""
+ For  Set KLNr=$O(^KOD(KLNr)) Quit:KLNr=""  Do
+ .
+ . Quit:KLNr=6780
+ . Quit:KLNr=4100
+ .
+ . Set ORDNr=""
+ . For  Set ORDNr=$O(^KOD(KLNr,"F",ORDNr)) Quit:ORDNr=""  Do
+ . . Set OLNr=""
+ . . For  Set OLNr=$O(^KOD(KLNr,"F",ORDNr,OLNr)) Quit:OLNr=""  Do
+ . . . Set LijnRec=^(OLNr)
+ . . . Set PRNr=$P(LijnRec,"\",2)
+ . . . Quit:PRNr'?4.8N
+ . . . Quit:$$$PRGet($$$LeveranciersNr)'=$$$LevHalux
+ . . . Set FysStock=$$GETSTOCK^PRODUKT4(PRNr,"F")
+ . . . Set KomLink=$P(LijnRec,"\",27)
+ . . . Quit:'((KomLink?6N)&&(+FysStock'=0))
+ . . . Set NbrOfLines=0
+ . . . Set (TmpORDNr,TmpOLUNr)=""
+ . . . For  Set TmpORDNr=$O(^ORD("IP",PRNr,TmpORDNr)) Quit:TmpORDNr=""  Do 
+ . . . . For  Set TmpOLUNr=$O(^ORD("IP",PRNr,TmpORDNr,TmpOLUNr)) Quit:TmpOLUNr=""  Set NbrOfLines=NbrOfLines+1 
+ . . . Set OrdQty=$P(LijnRec,"\",3)
+ . . . Write KLNr,*9,ORDNr,*9,PRNr,*9,$$$PRGet($$$KortTekst),*9,KomLink, *9,OrdQty, *9,FysStock,*9,NbrOfLines-1
+ . . . Write !
+ 
+ Do CLOSE^vhDEV(Device)
+ 
+ Quit
+
+PickingWho
+ Set Device=$$OPEN^vhDEV(,"StatIO.txt","W","T")
+ Use Device
+ Write "KLNr	BONNr	Datum	Tijd	Vzw	Persoon	SoftMag	PickAantal	PRNr	KortTekst",!
+ Set CONSNr=""
+ For  Set CONSNr=$O(^ORDW("D",CONSNr)) Quit:CONSNr=""  Do
+ . Set ORDNr=""
+ . For  Set ORDNr=$O(^ORDW("D",CONSNr,"D",ORDNr)) Quit:ORDNr=""  Do
+ . . Set OLUNr=""
+ . . For  Set OLUNr=$O(^ORDW("D",CONSNr,"D",ORDNr,OLUNr)) Quit:OLUNr=""  Do
+ . . . Set Rec=^(OLUNr)
+ . . . Set LijnCnt=0
+ . . . Set SOLNr=""
+ . . . For  Set SOLNr=$O(^ORDW("D",CONSNr,"D",ORDNr,OLUNr,SOLNr)) Quit:SOLNr=""  Do
+ . . . . Set SOLRec=^(SOLNr)
+ . . . . Set SoftMag=$P(SOLRec,"\",13)
+ . . . . Set User=$P(SOLRec,"\",12)
+ . . . . Set TijdStip=$P(SOLRec,"\",6)
+ . . . . Set PRNr=$P(SOLRec,D,1)
+ . . . . Set KLNr=$P(^ORDW("D",CONSNr),"\")
+ . . . . Write KLNr,*9,CONSNr,*9,$$$ExcelDat(TijdStip),*9,$$$ExcelTime($P(TijdStip,",",2)),*9,$P(^ORDW("D",CONSNr),"\",2),*9,User,*9,SoftMag,*9,$P(SOLRec,D,4),*9,PRNr,*9,$$GetOrOld^PRODUKT(PRNr,$$$KortTekst)
+ . . . . Write !
+ 
+ Do CLOSE^vhDEV(Device)
+ 
+ Quit
+ 
+REDO
+	Merge Fetch=^MRPRESLog(63720,82822,"MARK")
+	zw Fetch
+	Do CLOSE^MRPRES("Fetch")
+	Quit
+	
+ReceptieMaatwerk2
+	Set Device=$$OPEN^vhDEV(,"DagProd.txt","W","T")
 	Use Device
+	Write "PRNr	KortTekst	Datum	Tijd	GenTyp	Aantal",!
 	Set PRNr=0
 	For  Set PRNr=$O(^KPR(PRNr)) Quit:PRNr=""  Do
 	. Set KortT=$$$PRGet($$$KortTekst)
- 	. Quit:$E(KortT,1,2)'="IO"
-	. Set Stat=$$PROD^STAT(PRNr,0,"2014.07 ","2014.12 ","1,3")
-	. Quit:'$P(Stat,"\")
-	. WRite PRNr,*9,KortT,*9,$P(Stat,"\",1),*9,$$$ExcelNum($P(Stat,"\",3)),!
+ 	. Set GenTyp=$$GENTYP^HAD(PRNr,1)
+ 	. Quit:($P(GenTyp,"\")'="TBX")&&($P(GenTyp,"\")'="LBX") ;&&($P(GenTyp,"\")'="TAO")
+  	. For  Set Key=$O(^PRHIST(PRNr,Key)) Quit:Key=""  Do
+ 	. . Set Rec=^PRHIST(PRNr,Key)
+ 	. . Quit:$P(Rec,"\",5)'="M"
+ 	. . Quit:$P(Rec,"\",4)'="I"
+	. . Set Datum=+$P(Rec,"\")
+	. . Quit:Datum<($H-50)
+	. . Write PRNr,*9,KortT,*9,$$$ExcelDat(Datum),*9,$$$ExcelTime($P($P(Rec,"\"),",",2)),*9,$P(GenTyp,"\"),*9,$P(Rec,"\",2)
+	. . Write !
 	Do CLOSE^vhDEV(Device)
+	Quit
+	
+	
+	
+ReceptieMaatwerk
+	Set Device=$$OPEN^vhDEV(,"DagProd.txt","W","T")
+	Use Device
+	Write "Datum	GenType	Telbaar	Aantal",!
+	Set PRNr=0
+	Kill Cache,VoorraadCache
+	For  Set PRNr=$O(^KPR(PRNr)) Quit:PRNr=""  Do
+	. Set KortT=$$$PRGet($$$KortTekst)
+	. Set Telbaar=$$$PRGet($$$Telbaar) ; nodig voor TA'OR Bulk in onderdelen
+	. Set Telbaar=$S(Telbaar="":"*",1:Telbaar)
+ 	. Set GenTyp=$$GENTYP^HAD(PRNr,1)
+ 	. Quit:($P(GenTyp,"\")'="TBX")&&($P(GenTyp,"\")'="LBX") ;&&($P(GenTyp,"\")'="TAO")
+ 	. Set Voorraad=$P($G(^PRSTOCK("D",PRNr)),"\",1)
+ 	. If Voorraad>0 Set VoorraadCache(PRNr,$P(GenTyp,"\",1),Telbaar)=Voorraad
+ 	. Set Key=""
+ 	. Set Cumul="",Aantal=""
+ 	. For  Set Key=$O(^PRHIST(PRNr,Key)) Quit:Key=""  Do
+ 	. . Set Rec=^PRHIST(PRNr,Key)
+ 	. . Quit:$P(Rec,"\",5)'="M"
+ 	. . Quit:$P(Rec,"\",4)'="I"
+	. . Set Datum=+$P(Rec,"\")
+	. . Set Cache(Datum,$P(GenTyp,"\"),$S(Telbaar="":"*",1:Telbaar))=$G(Cache(Datum,$P(GenTyp,"\"),$S(Telbaar="":"*",1:Telbaar)))+$P(Rec,"\",2)
+	;zw Cache
+	Set Datum="",GenTyp="",Telbaar=""
+	For  Set Datum=$O(Cache(Datum)) Quit:Datum=""  Do
+	. For  Set GenTyp=$O(Cache(Datum,GenTyp)) Quit:GenTyp=""  Do
+	. . For  Set Telbaar=$O(Cache(Datum,GenTyp,Telbaar)) Quit:Telbaar=""  Do
+	. . . Write $$$ExcelDat(Datum),*9,GenTyp,*9,Telbaar,*9,Cache(Datum,GenTyp,Telbaar),!
+	Do CLOSE^vhDEV(Device)
+	Set Device=$$OPEN^vhDEV(,"VoorraadProd.txt","W","T")
+	Use Device
+	Write "PRNr	GenType	Telbaar	Aantal",!
+	Set PRNr=""
+	Set GenTyp="",Telbaar=""
+	For  Set PRNr=$O(VoorraadCache(PRNr)) Quit:PRNr=""  Do
+	. For  Set GenTyp=$O(VoorraadCache(PRNr,GenTyp)) Quit:GenTyp=""  Do
+	. . For  Set Telbaar=$O(VoorraadCache(PRNr,GenTyp,Telbaar)) Quit:Telbaar=""  Do
+	. . . Write PRNr,*9,GenTyp,*9,Telbaar,*9,VoorraadCache(PRNr,GenTyp,Telbaar),!
+	Do CLOSE^vhDEV(Device)
 	Quit 
- 
+FacturatieMaatwerk
+	Set Device=$$OPEN^vhDEV(,"DagFacturatie.txt","W","T")
+	Use Device
+	Write "Datum	GenType	Telbaar Aantal",!
+	Kill Cache
+	Set KLNr=0
+	Set BeginDatum=$$CALCDATE^vhLib.DataTypes($H,"BJ","FD",0)
+	Set EindDatum=+$H
+	For  Set KLNr=$O(^KFA1("F",KLNr)) Quit:KLNr=""  Do
+	. Set KlKey=^KK1(KLNr)
+	. Set Regio=$P(^KKL(KlKey,0),"\",20)
+	. Set Datum="" ; beginnen vanaf vandaag omdat orders van vorige maand ook in facturen van vandaag kunnen zitten
+	. For  Set Datum=$O(^KFA1("F",KLNr,Datum)) Quit:Datum=""  Do
+	. . Quit:-Datum>EindDatum
+	. . Quit:-Datum<BeginDatum
+	. . Set BKJaar=$$CALCDATE^vhLib.DataTypes(-Datum,"BJ","LD")
+	. . Set FAKNr=""
+ 	. . For  Set FAKNr=$O(^KFA1("F",KLNr,Datum,FAKNr)) Quit:FAKNr=""  Do
+	. . . Set BONNr="U"
+	. . . For  Set BONNr=$O(^KFA("F",FAKNr,BONNr)) Quit:$E(BONNr)'="U"  Do
+	. . . . Set BonRec=^KFA("F",FAKNr,BONNr,1)
+	. . . . Set Vzw=$E($P(BonRec,"\",7),1,3)
+	. . . . Set LNr=99
+	. . . . For  Set LNr=$O(^KFA("F",FAKNr,BONNr,LNr)) Quit:LNr'?3.4N  Do
+	. . . . . Set LRec=^KFA("F",FAKNr,BONNr,LNr)
+	. . . . . Quit:$P(LRec,"\",17)="KF5"
+	. . . . . Quit:($P(LRec,"\",14)["Z")||($P(LRec,"\",14)["S") ;zonder stockaanpassing
+	. . . . . Set PRNr=$P(LRec,"\",2)
+	. . . . . Quit:'PRNr
+	. . . . . Set Telbaar=$$$PRGet($$$Telbaar) ; nodig voor TA'OR Bulk in onderdelen
+	. . . . . Set:Telbaar=3 Telbaar=Telbaar_" "_PRNr
+ 	. . . . . Set GenTyp=$$GENTYP^HAD(PRNr,1)
+ 	. . . . . Quit:($P(GenTyp,"\")'="TBX")&&($P(GenTyp,"\")'="LBX")&&($P(GenTyp,"\")'="TAO")
+	. . . . . Set Qty=$P(LRec,"\",3)
+	. . . . . Quit:Qty<1
+ 	. . . . . Set Cache(-Datum,$P(GenTyp,"\"),$S(Telbaar="":"*",1:Telbaar))=$G(Cache(-Datum,$P(GenTyp,"\"),$S(Telbaar="":"*",1:Telbaar)))+Qty
+
+	Set Datum="",GenTyp="",Telbaar=""
+	For  Set Datum=$O(Cache(Datum)) Quit:Datum=""  Do
+	. For  Set GenTyp=$O(Cache(Datum,GenTyp)) Quit:GenTyp=""  Do
+	. . For  Set Telbaar=$O(Cache(Datum,GenTyp,Telbaar)) Quit:Telbaar=""  Do
+	. . . Write $$$ExcelDat(Datum),*9,GenTyp,*9,Telbaar,*9,Cache(Datum,GenTyp,Telbaar),!
+	Do CLOSE^vhDEV(Device)
+	Quit
 X
 	s bl=##class(APPS.StockBeheer.impl.PalletLijstMetWaarde).%New()
  	Set bl.LocM=1
@@ -144,6 +399,12 @@
  . . If LijnCnt Do
  . . . Set $P(^ORDW("D",CONSNr,"D",ORDNr,OLUNr),"\",8)=$TR($P(^ORDW("D",CONSNr,"D",ORDNr,OLUNr),"\",8),FromMag,ToMag)
 
+ If BonCnt Do
+ . Merge ^ORDW("D",CONSNr,"S",ToMag)=^ORDW("D",CONSNr,"S",FromMag)
+ . Kill ^ORDW("D",CONSNr,"S",FromMag)
+ . Set ^ORDW("IW",CONSNr)=$TR(^ORDW("IW",CONSNr),FromMag,ToMag)
+ Quit
+ 
 Scholen
 	Set KLID=$O(^KKL(0))
 	Set NewCodex="L"
@@ -163,14 +424,6 @@
 		Set KLID=$O(^KKL(KLID))
 	}
 	Quit
-
- If BonCnt Do
- . Merge ^ORDW("D",CONSNr,"S",ToMag)=^ORDW("D",CONSNr,"S",FromMag)
- . Kill ^ORDW("D",CONSNr,"S",FromMag)
- . Set ^ORDW("IW",CONSNr)=$TR(^ORDW("IW",CONSNr),FromMag,ToMag)
- Quit
- 
-
 	
 GetLocation(LocId)
 	Set (LocM,LocG,LocX,LocY, LocTrans)=""
@@ -194,8 +447,6 @@
 	}
 	Quit Result
 	
- 
- 
 MergeORDW ; Tijdelijk copieren van ORDW om de Dueout tijdstip te controleren
 	Set Tijdstip=$O(^PVORDW(""))
 	While Tijdstip'=""
@@ -329,56 +580,37 @@
 	. S $P(^RES("KLANT","PI","VERZENDWIJZE","D",Vzw),"`",15)="LEVBON_ORGALUX"
 	q
 H
- 	Set Dev=$$OPEN^vhDEV(,"Recepties.txt","W","T")
+ 	Set Dev=$$OPEN^vhDEV(,"Recepties Halux.txt","W","T")
 	Use Dev
 	
  	Set PRNr=0
 	For  Set PRNr=$O(^KPR(PRNr)) Quit:PRNr=""  Do
+	. Set GenTyp=$$GENTYP^HAD(PRNr)
+	. Quit:'(($P(GenTyp,"\")="TBX")||($P(GenTyp,"\")="LBX"))
 	. Do HOne(PRNr,.C)
-	. Quit:'$D(C)
-	. Set KT=$$$PRGet($$$KortTekst)
-	. Set LevNr=$$$PRGet($$$LeveranciersNr)
-	. Set LevNm=$P(^KLE(^KL1(LevNr),0),"\",2)
-	. Set Mnd="" 
-	. For  Set Mnd=$o(C(Mnd)) Quit:Mnd=""  Do
-	. . Write $$$ExcelDat(Mnd),*9,PRNr,*9,KT,*9,LevNr,*9,LevNm,*9,$$$ExcelNum($lg(C(Mnd))),*9,$$$ExcelNum($lg(C(Mnd),2)),!
 	Do CLOSE^vhDEV(Dev)
 	Q
  
-HOne(PRNr,C) 
+HOne(PRNr,GenTyp) 
  ;Begin,Einde : $H formaat
  ;Actie : Zie RES(PRHIST,PI,BEPERK)
  ;Magazijn : M = Magazijn, W = Werkvloer, K = Stock over kind, Z = Zonderstock
  ;Cumul, Aantal oproep via .Local (byRef)
+ New Key,I,Rec
+ Set KT=$$$PRGet($$$KortTekst)
  Set Actie="I"
  Set Magazijn="M"
-	Set Begin=$$CALCDATE^vhLib.DataTypes($H,"M","FD",-6)
-	Set Einde=$$CALCDATE^vhLib.DataTypes($H,"M","LD",-1)
- Kill C
- New Key,I,Rec
- Set Begin=$G(Begin)
- Set Einde=$G(Einde,999999)
- Set:$G(Magazijn)="" Magazijn="M"
+ Set Begin=$$CALCDATE^vhLib.DataTypes($H,"M","FD",-10)
+ Set Einde=$$CALCDATE^vhLib.DataTypes($H,"M","LD",-1)
+ Set Verpakking=$$GeefVerpakking^HATBXLeanLijst(PRNr)
  Set Key=""
- Set Cumul="",Aantal=""
  For  Set Key=$O(^PRHIST(PRNr,Key)) Quit:Key=""  Do
  . Set Rec=^PRHIST(PRNr,Key)
  . Quit:+$P(Rec,"\")<Begin
  . Quit:+$P(Rec,"\")>Einde
  . Quit:$P(Rec,"\",5)'=Magazijn
  . Quit:$P(Rec,"\",4)'=Actie
- . ;W Rec, "->",Cumul,!
- . Set Mnd=$$CALCDATE^vhLib.DataTypes(+$P(Rec,"\"),"M","FD")
- . Set Mnd=+$P(Rec,"\")
- . Set lb=$G(C(Mnd))
- . Set $li(lb)=$lg(lb)+1
- . Set Pal=""
- . Set Found=0
- . For  Set Pal=$O(^PRHIST(PRNr,Key,Pal)) Quit:Pal=""  Do
- . . Set $li(lb,2)=$lg(lb,2)+1
- . . Set Found=1
- . Set:'Found $li(lb,2)=$lg(lb,2)+1
- . Set C(Mnd)=lb
+ . Write PRNr,*9,KT,*9,$$$ExcelDat($P(Rec,"\")),*9,$$$ExcelNum($P(Rec,"\",2)),*9,Verpakking,!
  Quit
  
  
@@ -627,7 +859,7 @@
  
 All
  
-	Set Dev=$$OPEN^vhDEV(,"ProdBufferWeken2.txt","W","T")
+	Set Dev=0 ;$$OPEN^vhDEV(,"ProdBufferWeken2.txt","W","T")
 	Use Dev
 	Set PRNr=""
 	For  Set PRNr=$O(^KPR(PRNr)) Quit:PRNr=""  Do
@@ -815,8 +1047,10 @@
  	q
  
  ; d ORDSTAT^PV($H-400,$H) 
-ORDINTAKE(Van,Tot)
+ 
+ORDINTAKE
 	S Van=$$CALCDATE^vhLib.DataTypes($H,"M",-12,"FD")
+	;S Van=$$CALCDATE^vhLib.DataTypes($H,"M",-1,"FD")
 	S Tot=$$CALCDATE^vhLib.DataTypes($H,"M",-1,"LD")
 	Set FaktVan=-Van
 	Set Datum=-Tot-1
@@ -851,39 +1085,53 @@
 	. . . . . Else  If ORDNr,$P(FakRec,D,2)?4.7N  Do
 	. . . . . . Set PRNr=$P(FakRec,D,2)
 	. . . . . . Set GenTyp=$$GENTYP^HAD(PRNr,1) ; ook in KPRO
-	. . . . . . Set Omzet=$P(FakRec,D,34)
-	. . . . . . Set lb=^HULP(%J,"C",KLNr,ORDNr)
 	. . . . . . If $P(GenTyp,"\")="TBX" Do
-	. . . . . . . Set $LI(lb,10)=$LG(lb,10)+1
-	. . . . . . . Set $LI(lb,11)=$LG(lb,11)+Omzet
-	. . . . . . Else  Do ; std
-	. . . . . . . Set $LI(lb,5)=$LG(lb,5)+1
-	. . . . . . . Set $LI(lb,6)=$LG(lb,6)+Omzet
-	. . . . . . Set ^HULP(%J,"C",KLNr,ORDNr)=lb
+	. . . . . . . Set ^HULP(%J,"C",KLNr,ORDNr,$O(^HULP(%J,"C",KLNr,ORDNr,""),-1)+1)=FakRec
 	s t2=$P($H,",",2)
 	Set Dev=$$OPEN^vhDEV(,"OrderIntake.txt","W","T")
 	Use Dev
-	Write "KLNr	KLNm	Regio	SubDivisie	Divisie	ORDNr	Dubbel	OrdDat	Week	Maand	EDI	ProdGrp	#L	Omzet	FactNr	EdiRef",!
+	Write "KLNr	KLNm	Regio	ORDNr	OrdDat	FactNr	EdiRef	LevDat	Werkdagen	Aantal	PRNr	KortTekst"
+	Do HeaderKenmerken^PVJB
+	Write !
 	Set KLNr=""
 	For  Set KLNr=$O(^HULP(%J,"C",KLNr)) Quit:KLNr=""  Do
 	. Set ORDNr=""
 	. For  Set ORDNr=$O(^HULP(%J,"C",KLNr,ORDNr)) Quit:ORDNr=""  Do
 	. . Set Rec0=^KKL(^KK1(KLNr),0)
 	. . Set KLNm=$P(Rec0,D,2)
 	. . Set Regio=$P(Rec0,D,20)
-	. . Set lb=^HULP(%J,"C",KLNr,ORDNr)
-	. . For I=5,10 Do ; STD en TBX
-	. . . Quit:'$LG(lb,I)
-	. . . Write KLNr,*9,KLNm,*9,Regio,*9,##class(Derde.Klant.Klant).SubDivisieFetch(Regio),*9,##class(Derde.Klant.Klant).DivisieFetch(Regio),*9,ORDNr,*9,$S(I=10&&$LG(lb,5):1,1:"")
-	. . . Write *9,$$EXTDATE^vhLib.DataTypes($LG(lb,2),"DK"),*9,"`"_$$EXTDATE^vhLib.DataTypes($LG(lb,2),"DW"),*9,$$EXTDATE^vhLib.DataTypes($$CALCDATE^vhLib.DataTypes($LG(lb,2),"M","FD"),"DK")
-	. . . Write *9,$S($LG(lb,3)?5.8N:"EDI",1:"OV"),*9,$S(I=5:"STD",1:"TBX"),*9,$LG(lb,I),*9,$$$ExcelNum($LG(lb,I+1)),*9,$LG(lb,4),*9,$LG(lb,3),!
+	. . Set lbOrder=^HULP(%J,"C",KLNr,ORDNr)
+	. . Set VolgNr=""
+	. . For  Set VolgNr=$O(^HULP(%J,"C",KLNr,ORDNr,VolgNr)) Quit:VolgNr=""  Do
+	. . . Set FakRec=^HULP(%J,"C",KLNr,ORDNr,VolgNr)
+	. . . Set PRNr=$P(FakRec,D,2)
+	. . . Do FetchKenmerken^PVJB(PRNr)
+	. . . Write KLNr,*9,KLNm,*9,Regio,*9,ORDNr
+	. . . Write *9,$$EXTDATE^vhLib.DataTypes($LG(lbOrder,2),"DK")
+	. . . Write *9,$LG(lbOrder,4),*9,$LG(lbOrder,3)
+	. . . Set DiffDate=$$DIFFDATE^vhLib.DataTypes($LG(lbOrder,2),$P(FakRec,D,25),"A")
+	. . . Write *9,$$$ExcelDat($P(FakRec,D,25)),*9,DiffDate,*9,$$$ExcelNum($P(FakRec,D,3))
+	. . . Write *9,PRNr,*9,$P(^KPR(PRNr,0),D)
+	. . . Do WriteKenmerken
+	. . . W !
+
 	;Close:0'[Dev Dev
 	Do CLOSE^vhDEV(Dev)
 	s t3=$P($H,",",2)
 	Write "Duur fetch=",t2-t1,!
 	Write "Duur file=",t3-t2,!
 	Quit 
- 
+	
+
+WriteKenmerken
+	Write *9,DC,*9,DS,*9,KLAS,*9,LC,*9,LT,*9,LD,*9,RH,*9,$$$ExcelNum(IB),*9,KL,*9,DK,*9,KB,*9,IsSR,*9,BS,*9,VPK,*9,KB,*9,$S(FS=0:"",1:FS),*9,$S(BGRP=0:"",1:BGRP),*9,$S(ASM=0:"",1:ASM),*9,$S(BM=0:"",1:BM),*9,KV,*9,NMCP,*9,RSTL,*9,$$$ExcelNum(ProboxDoos),*9,$$$ExcelNum(ProboxDeksel),*9,$$$ExcelNum(ProboxPallet)
+	Write *9,LadeBeoordeling
+	Write *9,$$$ExcelNum(KostenplaatsTBZAAG)
+	Write *9,$$$ExcelNum(KostenplaatsTBMONT)
+	Write *9,$$$ExcelNum(KostenplaatsTBVERPAK)
+	Write *9,$$$ExcelNum(KostenplaatsHALUXKARTON)
+	Quit
+	
 KLANTVZW
 	Set Dev=$$OPEN^vhDEV(,"KlantVZW.txt","W","T")
 	Use Dev
@@ -1780,3 +2028,4 @@
 
 
 
+