Index: APPS/BD/OrderStat/impl/Extract2IntakeEnGeleverd.cls.xml
===================================================================
diff -u -r44378 -r47555
--- APPS/BD/OrderStat/impl/Extract2IntakeEnGeleverd.cls.xml	(.../Extract2IntakeEnGeleverd.cls.xml)	(revision 44378)
+++ APPS/BD/OrderStat/impl/Extract2IntakeEnGeleverd.cls.xml	(.../Extract2IntakeEnGeleverd.cls.xml)	(revision 47555)
@@ -132,8 +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,"M",-15,"FD")
-	Set ..TotDatum=$$CALCDATE^vhLib.DataTypes($H,"M",-1,"LD") 
+	Set ..VanDatum=..TotDatum-30 ;$$CALCDATE^vhLib.DataTypes($H,"M",-24,"FD")
+	;Set ..TotDatum=$$CALCDATE^vhLib.DataTypes($H,"M",-1,"LD") 
 	Set ..AfstandBepaler=##class(APPS.BD.CarbonFootprint.impl.AfstandBepaler).%New()
 	
 	Quit $$$OK
@@ -142,15 +142,16 @@
 
 <Method name="BouwEnFile">
 <Description>
-	D ##class(APPS.BD.OrderStat.impl.Extract2IntakeEnGeleverd).%New().BouwEnFile()</Description>
+	D ##class(APPS.BD.OrderStat.impl.Extract2IntakeEnGeleverd).%New().BouwEnFile("I")</Description>
+<FormalSpec>WelkBestand:%String="IL"</FormalSpec>
 <Implementation><![CDATA[
 	;Set Dev=$$OPEN^vhDEV("c:\scratch","OrderStat_Build.txt","W","T")
 	;Use Dev
 
 	Do ..HerbouwenOrders()
 	;Do CLOSE^vhDEV(Dev)
-	Do ##class(APPS.BD.OrderStat.impl.OrderGeleverd).Export2File()
-	;Do ##class(APPS.BD.OrderStat.impl.OrderIntake).Export2File()
+	Do:WelkBestand["L" ##class(APPS.BD.OrderStat.impl.OrderGeleverd).Export2File()
+	Do:WelkBestand["I" ##class(APPS.BD.OrderStat.impl.OrderIntake).Export2File()
 ]]></Implementation>
 </Method>
 
@@ -407,13 +408,14 @@
 	Set ..OrderTijd=$P($P(OrderIntakeRec,"#",2),",",2)
 	
 	Set EDIRef=$P(Rec,"\",21)
+	Set EDIOorsprong=$P(Rec,"\",28)
 	If (EDIRef'?4.9N)&&(..KLNr=$$$KlantKeller)&&($P(Rec,"\",5)["EDI") ; Keller
  	{
  		Set EDIRef=$P($P(Rec,"\",5),"EDI",2)
  		Set EDIRef=$P($P(EDIRef,"."),"/")
  		Set EDIRef=$$TRIMN^vhRtn1(EDIRef)
  	}
- 	Set ..IntakeType=$S(EDIRef'="":"EDI",1:"")
+ 	Set ..IntakeType=$S(EDIOorsprong'="":EDIOorsprong,EDIRef'="":"EDI",1:"")
 ]]></Implementation>
 </Method>
 
@@ -468,13 +470,15 @@
 	}	
 	Set ..OrderTijd=$P($P(OrderIntakeRec,"#",2),",",2)
 	Set EDIRef=$P(Rec,"\",40)
+	Set EDIOorsprong=$P(Rec,"\",53)
+
 	If (EDIRef'?4.9N)&&(..KLNr=$$$KlantKeller)&&($P(Rec,"\",5)["EDI")
 	{
 		Set EDIRef=$P($P(Rec,"\",3),"EDI",2)
 		Set EDIRef=$P($P(EDIRef,"."),"/")
 		Set EDIRef=$$TRIMN^vhRtn1(EDIRef)
 	}
- 	Set ..IntakeType=$S(EDIRef'="":"EDI",1:"")
+ 	Set ..IntakeType=$S(EDIOorsprong'="":EDIOorsprong,EDIRef'="":"EDI",1:"")
 ]]></Implementation>
 </Method>