Index: AX/Uitgaand/EC/DataAX/impl/HelperFacturenConverteren.cls.xml
===================================================================
diff -u -r50353 -r53242
--- AX/Uitgaand/EC/DataAX/impl/HelperFacturenConverteren.cls.xml	(.../HelperFacturenConverteren.cls.xml)	(revision 50353)
+++ AX/Uitgaand/EC/DataAX/impl/HelperFacturenConverteren.cls.xml	(.../HelperFacturenConverteren.cls.xml)	(revision 53242)
@@ -103,8 +103,9 @@
 	Set pxLijn.Type="P"
 	Set pxLijn.Aantal=+^||ECCache("D",FactuurNr,"ORD",OrderNr,VolgNr,"QTY")
 	Set pxLijn.GrootteOrde=$S(+^||ECCache("D",FactuurNr,"ORD",OrderNr,VolgNr,"PRICEUNIT")=100:"%",1:"")
-	Set pxLijn.NettoPrijs=+^||ECCache("D",FactuurNr,"ORD",OrderNr,VolgNr,"SALESPRICE")
+	;Set pxLijn.NettoPrijs=+^||ECCache("D",FactuurNr,"ORD",OrderNr,VolgNr,"SALESPRICE")
 	Set pxLijn.TotaalPrijs=+^||ECCache("D",FactuurNr,"ORD",OrderNr,VolgNr,"LINEAMOUNT")
+	Set:pxLijn.Aantal pxLijn.NettoPrijs=pxLijn.TotaalPrijs/pxLijn.Aantal
 	Set pxLijn.Munt=^||ECCache("D",FactuurNr,"ORD",OrderNr,VolgNr,"CURRENCYCODE")
 	Set pxLijn.Type=$S(pxLijn.Aantal<0:"R",1:"L") ; Retour of Levering
 	Set pxLijn.OorsprongDocType="FACTUUR"
@@ -117,15 +118,12 @@
 	{
 		Set pxLijn.ProductOmschrijving= pxLijn.ProductOmschrijving_"<br/>"_"Ref: "_^||ECCache("D",FactuurNr,"ORD",OrderNr,VolgNr,"PRODREF")
 	}
-		If $L(^||ECCache("D",FactuurNr,"ORD",OrderNr,VolgNr,"PRODREF"))
-	{
-		Set pxLijn.ProductOmschrijving= pxLijn.ProductOmschrijving_"<br/>"_"Ref: "_^||ECCache("D",FactuurNr,"ORD",OrderNr,VolgNr,"PRODREF")
-	}
+
 	If $L(^||ECCache("D",FactuurNr,"ORD",OrderNr,VolgNr,"DLVDATE"))
 	{
 		Set pxLijn.LeveringsDatum=$zdh(^||ECCache("D",FactuurNr,"ORD",OrderNr,VolgNr,"DLVDATE"),3)
 		Set VerzendDatum=$$EXTDATE^vhLib.DataTypes(pxLijn.LeveringsDatum,"DK")
-		Set pxLijn.ProductOmschrijving= pxLijn.ProductOmschrijving_"<br/>"_"Shipment date: "_VerzendDatum
+		Set pxLijn.ProductOmschrijving= pxLijn.ProductOmschrijving_"<br/>"_$S(..Taal="N":"Verzenddatum",..Taal="F":"Date d'envoi",1:"Shipment date")_": "_VerzendDatum
 	}
 
 	If 'pxLijn.InAssortiment && 'pxLijn.InConfigurator
Index: AX/Uitgaand/EC/DataAX/impl/ProductValidator.cls.xml
===================================================================
diff -u -r51161 -r53242
--- AX/Uitgaand/EC/DataAX/impl/ProductValidator.cls.xml	(.../ProductValidator.cls.xml)	(revision 51161)
+++ AX/Uitgaand/EC/DataAX/impl/ProductValidator.cls.xml	(.../ProductValidator.cls.xml)	(revision 53242)
@@ -60,6 +60,25 @@
 ]]></Implementation>
 </Method>
 
+<Method name="InBasisAssortiment">
+<FormalSpec>PRNr:%String</FormalSpec>
+<Implementation><![CDATA[
+	Quit:PRNr'?4.9N 0
+	Quit:'$D(^KPR(PRNr)) 0
+	Quit:##class(AX.Uitgaand.EC.AssortimentAX.impl.BasisAssortiment).%ExistsId(..GenerationID_"||"_PRNr_"||"_..AssortimentGroep) 1
+	Quit 0
+]]></Implementation>
+</Method>
+
+<Method name="InEenAssortiment">
+<FormalSpec>PRNr:%String</FormalSpec>
+<Implementation><![CDATA[
+	Quit:PRNr'?4.9N 0
+	Quit:'$D(^KPR(PRNr)) 0
+	Quit $D(^AX.Uitgaan6850.BasisAssort150AD(..GenerationID,PRNr))
+]]></Implementation>
+</Method>
+
 <Method name="GeefAssortimentGroep">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
Index: AX/Uitgaand/EC/Productie/impl/ExportLevertermijnJSON.cls.xml
===================================================================
diff -u -r50353 -r53242
--- AX/Uitgaand/EC/Productie/impl/ExportLevertermijnJSON.cls.xml	(.../ExportLevertermijnJSON.cls.xml)	(revision 50353)
+++ AX/Uitgaand/EC/Productie/impl/ExportLevertermijnJSON.cls.xml	(.../ExportLevertermijnJSON.cls.xml)	(revision 53242)
@@ -41,7 +41,7 @@
 
 <Method name="%OnNew">
 <Description>
-D ##class(AX.Uitgaand.EC.Productie.impl.ExportLevertermijnJSON).%New().ExportAll()</Description>
+D ##class(AX.Uitgaand.EC.Productie.impl.ExportLevertermijnJSON).%New().ExportVeranderde()</Description>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set ..Generator=##class(GenerateLevertermijn).%New()
@@ -81,7 +81,7 @@
 
 <Method name="ExportVeranderde">
 <Implementation><![CDATA[
-	If ..Generator.IsLevertermijnVeranderd
+	If ..Generator.IsVeranderd()
 	{
 		Do ..ExportAll()
 	}
Index: AX/Uitgaand/EC/DataAX/impl/HelperOrdersConverteren.cls.xml
===================================================================
diff -u -r51816 -r53242
--- AX/Uitgaand/EC/DataAX/impl/HelperOrdersConverteren.cls.xml	(.../HelperOrdersConverteren.cls.xml)	(revision 51816)
+++ AX/Uitgaand/EC/DataAX/impl/HelperOrdersConverteren.cls.xml	(.../HelperOrdersConverteren.cls.xml)	(revision 53242)
@@ -94,10 +94,11 @@
 	} Else {
 		Set pxLijn.Aantal=+^||ECCache("D",OrderId,"DTL",VolgNr,"QTYORDERED")
 	}
-	Set pxLijn.NettoPrijs=+^||ECCache("D",OrderId,"DTL",VolgNr,"SALESPRICE")
+    ; Set pxLijn.NettoPrijs=+^||ECCache("D",OrderId,"DTL",VolgNr,"SALESPRICE")
 	Set pxLijn.Munt=^||ECCache("D",OrderId,"DTL",VolgNr,"CURRENCYCODE")
 	Set pxLijn.GrootteOrde=$S(+^||ECCache("D",OrderId,"DTL",VolgNr,"PRICEUNIT")=100:"%",1:"")
 	Set pxLijn.TotaalPrijs=+^||ECCache("D",OrderId,"DTL",VolgNr,"LINEAMOUNT")
+	Set:+^||ECCache("D",OrderId,"DTL",VolgNr,"QTYORDERED") pxLijn.NettoPrijs=pxLijn.TotaalPrijs/+^||ECCache("D",OrderId,"DTL",VolgNr,"QTYORDERED")
 	Set pxLijn.VerwachteLeverDatum=$zdh(^||ECCache("D",OrderId,"DTL",VolgNr,"RECEIPTDATECONFIRMED"),3)
 	Set pxLijn.GevraagdeLeverDatum=$zdh(^||ECCache("D",OrderId,"DTL",VolgNr,"RECEIPTDATEREQUESTED"),3)
 	Set pxLijn.Type=$S(pxLijn.Aantal<0:"R",1:"L") ; Retour of Levering
Index: AX/Uitgaand/EC/DataAX/impl/AxFactuurLijnIterator.cls.xml
===================================================================
diff -u -r50353 -r53242
--- AX/Uitgaand/EC/DataAX/impl/AxFactuurLijnIterator.cls.xml	(.../AxFactuurLijnIterator.cls.xml)	(revision 50353)
+++ AX/Uitgaand/EC/DataAX/impl/AxFactuurLijnIterator.cls.xml	(.../AxFactuurLijnIterator.cls.xml)	(revision 53242)
@@ -21,7 +21,7 @@
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..SqlQueryConnection = $$$Implementation(SqlQueryConnection,##class(AXimpl.SqlQueryConnection).%New())
-	
+
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -30,17 +30,19 @@
 <FormalSpec>CustomerID:%String,VanafDatum:%Date</FormalSpec>
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
-	Set SqlStatement = ..GeefSQLVoorFactuurHoofding()_" where INV.INVOICEACCOUNT='"_CustomerID_"' and INV.INVOICEDATE>'"_$ZD(VanafDatum,3)_"'" 
-	Set ..ResultSet = ..SqlQueryConnection.GetResultSet(SqlStatement)
+	Set SqlStatement = ..GeefSQLVoorFactuurHoofding()_" where INV.INVOICEACCOUNT=? and INV.INVOICEDATE>?" 
+	Set ..ResultSet = ..SqlQueryConnection.GetResultSetWithoutExecute(SqlStatement)
+	Set sc=..ResultSet.Execute(CustomerID,$ZD(VanafDatum,3))
 ]]></Implementation>
 </Method>
 
 <Method name="InitOpenstaande">
 <FormalSpec>CustomerID:%String</FormalSpec>
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
-	Set SqlStatement = ..GeefSQLVoorFactuurHoofding()_" where INV.INVOICEACCOUNT='"_CustomerID_"' and TRANS.CLOSED='1900-01-01' "
-	Set ..ResultSet = ..SqlQueryConnection.GetResultSet(SqlStatement)
+	Set SqlStatement = ..GeefSQLVoorFactuurHoofding()_" where INV.INVOICEACCOUNT=? and TRANS.CLOSED='1900-01-01' "
+	Set ..ResultSet = ..SqlQueryConnection.GetResultSetWithoutExecute(SqlStatement)
+	Set sc=..ResultSet.Execute(CustomerID)
 ]]></Implementation>
 </Method>
 
@@ -52,12 +54,13 @@
 	_"select INV.INVOICEID, INV.ORDERACCOUNT, INV.INVOICEACCOUNT, INV.INVOICEDATE, INV.DUEDATE, INVOICEAMOUNT,SUMTAX,INV.CURRENCYCODE,INV.CASHDISC, INV.CASHDISCDATE, "
 	_"     TRANS.CLOSED,TRANS.AMOUNTCUR,TRANS.SETTLEAMOUNTCUR"
 	_" from CUSTINVOICEJOUR as INV"
-	_" join salestable as ORD on ORD.salesid = INV.salesid "
+	_" join salestable as ORD on ORD.salesid = INV.salesid and ORD.Partition = INV.Partition and ORD.DataAreaId = INV.DataAreaId"
 	_" join CUSTTRANS as TRANS on TRANS.INVOICE = INV.INVOICEID "
 	_"     and TRANS.ACCOUNTNUM = INV.INVOICEACCOUNT "
 	_"     and TRANS.TRANSDATE = INV.INVOICEDATE "
 	_"     and TRANS.VOUCHER = INV.LEDGERVOUCHER "
 	_"     and TRANS.DATAAREAID = INV.DATAAREAID "
+	_"     and TRANS.PARTITION = INV.PARTITION "
 	Quit SqlStatement
 ]]></Implementation>
 </Method>
@@ -72,17 +75,18 @@
 	_"     InvLine.QTY,InvLine.SALESPRICE,InvLine.PRICEUNIT,InvLine.CURRENCYCODE,InvLine.LINEAMOUNT, SalesLine.RECEIPTDATECONFIRMED,SalesLine.RECEIPTDATEREQUESTED,ProdNotes.Body as PRODREF,"
 	_"     ADR.RECID,ADR.COUNTRYREGIONID,ADR.CITY,ADR.ZIPCODE,ADR.STREET,ADR.ADUNOTA1EXTERNAL,ADR.ADUNOTA2EXTERNAL,ADR.ADUTRANSPORTERAUTH" 
 	_" from CUSTINVOICETRANS as InvLine"
-	_" join SalesLine on SalesLine.InventTransId = InvLine.InventTransId and SalesLine.DataAreaId=InvLine.DataAreaId "
-	_" join SalesTable ORD on ORD.SalesId = SalesLine.SALESID"
+	_" join SalesLine on SalesLine.InventTransId = InvLine.InventTransId and SalesLine.DataAreaId=InvLine.DataAreaId and SalesLine.Partition = InvLine.Partition"
+	_" join SalesTable ORD on ORD.SalesId = SalesLine.SALESID and ORD.Partition = SalesLine.Partition and ORD.DataAreaId = SalesLine.DataAreaId "
 	_" left outer join LOGISTICSPOSTALADDRESS as ADR on ADR.RECID =Salesline.DELIVERYPOSTALADDRESS "
-    _" join InventDim  on InventDim.InventDimId = InvLine.InventDimId "
+    _" join InventDim  on InventDim.InventDimId = InvLine.InventDimId and InventDim.Partition = InvLine.Partition"
 	_"      and InventDim.DataAreaId = InvLine.DataAreaId "
 	_" left outer join ADUEcoResAttributeCombination as Kenmerk on InventDim.ConfigId=Kenmerk.ConfigId "
     _"   and SalesLine.ITEMID=Kenmerk.ITEMID "
-    _"   and InventDim.ConfigId<>'' "
-	_" left outer join AduCustomerFormNotes as ProdNotes on ProdNotes.REFTABLEID=359 and ProdNotes.REFRECID=SalesLine.RECID and ADUBODYTYPE=5"
-	_" where InvLine.DataAreaID='vhbe' and InvLine.INVOICEID = '"_FactuurID_"' " ; specifieke factuur
-	Set ..ResultSet = ..SqlQueryConnection.GetResultSet(SqlStatement)
+    _"   and InventDim.ConfigId<>'' and SalesLine.Partition=Kenmerk.Partition "
+	_" left outer join AduCustomerFormNotes as ProdNotes on ProdNotes.REFTABLEID=359 and ProdNotes.REFRECID=SalesLine.RECID and ADUBODYTYPE=5 and ProdNotes.Partition=SalesLine.Partition"
+	_" where InvLine.DataAreaID='vhbe' and InvLine.INVOICEID = ? " ; specifieke factuur
+	Set ..ResultSet = ..SqlQueryConnection.GetResultSetWithoutExecute(SqlStatement)
+	Set sc=..ResultSet.Execute(FactuurID)
 ]]></Implementation>
 </Method>
 
@@ -104,7 +108,10 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Do:$IsObject(..ResultSet) ..SqlQueryConnection.Disconnect()
+	If $IsObject(..ResultSet)
+	{
+		Do ..SqlQueryConnection.Disconnect()
+	}
 	Quit $$$OK
 ]]></Implementation>
 </Method>
Index: AX/Uitgaand/EC/ServiceAX.cls.xml
===================================================================
diff -u -r50353 -r53242
--- AX/Uitgaand/EC/ServiceAX.cls.xml	(.../ServiceAX.cls.xml)	(revision 50353)
+++ AX/Uitgaand/EC/ServiceAX.cls.xml	(.../ServiceAX.cls.xml)	(revision 53242)
@@ -54,7 +54,7 @@
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set ImportService=##class(AX.Uitgaand.EC.impl.ImportBestand).%New(..ExportDefaults)
-	Do ImportService.VerwijderOudeBestanden() ; ouder dan vandaag
+	;Do ImportService.VerwijderOudeBestanden() ; ouder dan vandaag
 	Do ImportService.OphalenBestanden() ; ophalen van de XMLs die een GenerationID hebben
 	If ImportService.AlleBestandenAanwezig()
 	{
@@ -76,6 +76,7 @@
 		{
 			Do ##class(vhLib.Logger).%New("VHISIE").Warning("EC Nachtelijke bestanden","Job heeft gelopen minstens 1 XML maar niet alle 4 zijn aanwezig")
 		}
+		Do ##class(vhLib.Logger).%New("VHISIE").Warning("EC Nachtelijke bestanden","Job heeft gelopen geen bestand aanwezig")
 
 		Set Status='$$$OK
 	}
Index: AX/Uitgaand/EC/DataAX/impl/HelperFacturenOphalen.cls.xml
===================================================================
diff -u -r50353 -r53242
--- AX/Uitgaand/EC/DataAX/impl/HelperFacturenOphalen.cls.xml	(.../HelperFacturenOphalen.cls.xml)	(revision 50353)
+++ AX/Uitgaand/EC/DataAX/impl/HelperFacturenOphalen.cls.xml	(.../HelperFacturenOphalen.cls.xml)	(revision 53242)
@@ -103,6 +103,7 @@
 <Implementation><![CDATA[
 	#dim rsLijn as TECH.ResultSet
 	#dim CountLijnen as %Decimal=0
+	
 	While ..itLijnen.HasNext()
 	{
 		Set rsLijn=..itLijnen.Next()
Index: AX/Uitgaand/EC/DataAX/impl/AxOrderLijnIterator.cls.xml
===================================================================
diff -u -r50353 -r53242
--- AX/Uitgaand/EC/DataAX/impl/AxOrderLijnIterator.cls.xml	(.../AxOrderLijnIterator.cls.xml)	(revision 50353)
+++ AX/Uitgaand/EC/DataAX/impl/AxOrderLijnIterator.cls.xml	(.../AxOrderLijnIterator.cls.xml)	(revision 53242)
@@ -31,18 +31,20 @@
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
 	Set SqlStatement = ..GeefSQLVoorOrderLijnen()_" AND ORD.CUSTACCOUNT='"_CustomerID_"' and ORD.CREATEDDATETIME>='"_$ZD(VanafDatum,3)_"' and SalesLine.SALESSTATUS<>4" 
-	Set ..ResultSet = ..SqlQueryConnection.GetResultSet(SqlStatement)
+	Set ..ResultSet = ..SqlQueryConnection.GetResultSetWithoutExecute(SqlStatement)
+	Set sc=..ResultSet.Execute()
 ]]></Implementation>
 </Method>
 
 <Method name="InitOpenstaande">
 <FormalSpec>CustomerID:%String</FormalSpec>
 <Implementation><![CDATA[
 	#Dim SqlStatement as %String
-	Set SqlStatement = ..GeefSQLVoorOrderLijnen()_" AND ORD.CUSTACCOUNT='"_CustomerID_"' and SalesLine.SALESSTATUS = 1"
+	Set SqlStatement = ..GeefSQLVoorOrderLijnen()_" AND SalesLine.SALESSTATUS = 1 AND ORD.CUSTACCOUNT='"_CustomerID_"'"
 	; SalesStatus order lines  values: Open order = 1, Delivered = 2, Invoiced = 3, Canceled = 4 
 
-	Set ..ResultSet = ..SqlQueryConnection.GetResultSet(SqlStatement)
+	Set ..ResultSet = ..SqlQueryConnection.GetResultSetWithoutExecute(SqlStatement)
+	Set sc=..ResultSet.Execute()
 ]]></Implementation>
 </Method>
 
@@ -59,19 +61,21 @@
     _"   ,isnull(( select -sum(qty) from InventTrans where InventTransOrigin.RECID = InventTrans.INVENTTRANSORIGIN and InventTrans.STATUSISSUE = 3 and "
 	_"            InventTrans.STATUSRECEIPT = 0 and InventTrans.DATAAREAID = InventTransOrigin.DATAAREAID and InventTrans.PARTITION = InventTransOrigin.PARTITION),0) as GEPICKTEHOEVEELHEID"
 	_" from SalesLine "
-	_" join SalesTable as ORD on SalesLine.SALESID = ORD.SALESID and SalesLine.DATAAREAID = ORD.DATAAREAID"
+	_" join SalesTable as ORD on SalesLine.SALESID = ORD.SALESID and SalesLine.DATAAREAID = ORD.DATAAREAID and SalesLine.PARTITION = ORD.PARTITION "
 	_" join InventTransOrigin on InventTransOrigin.INVENTTRANSID = SalesLine.INVENTTRANSID and InventTransOrigin.DATAAREAID = SalesLine.DATAAREAID and "
 	_"                           InventTransOrigin.PARTITION = SalesLine.PARTITION "
-	_" left outer join LOGISTICSPOSTALADDRESS as ADR on ADR.RECID =Salesline.DELIVERYPOSTALADDRESS "
+	_" left outer join LOGISTICSPOSTALADDRESS as ADR on ADR.RECID =Salesline.DELIVERYPOSTALADDRESS and ADR.PARTITION=SalesLine.PARTITION"
 	_" join InventDim  on InventDim.InventDimId =SalesLine.InventDimId "
-	_"   and InventDim.DataAreaId = SalesLine.DataAreaId "
+	_"   and InventDim.DataAreaId = SalesLine.DataAreaId and InventDim.PARTITION = SalesLine.PARTITION "
 	_" left outer join ADUEcoResAttributeCombination as Kenmerk on InventDim.ConfigId=Kenmerk.ConfigId "
     _"   and SalesLine.ITEMID=Kenmerk.ITEMID "
     _"   and InventDim.ConfigId<>'' "
-	_" left outer join AduCustomerFormNotes as ProdNotes on ProdNotes.REFTABLEID=359 and ProdNotes.REFRECID=SalesLine.RECID and ProdNotes.ADUBODYTYPE=5"
-	_" left outer join AduCustomerFormNotes as LijnNotes on LijnNotes.REFTABLEID=359 and LijnNotes.REFRECID=SalesLine.RECID and LijnNotes.ADUBODYTYPE=1"
-	_" left outer join AduCustomerFormNotes as OrdNotes on OrdNotes.REFTABLEID=366 and OrdNotes.REFRECID=ORD.RECID and OrdNotes.ADUBODYTYPE=1"
-	_" where ORD.SALESTYPE = 3 " ; SalesType values: Journal = 0, Sales (order) = 3, Return order = 4 "
+    _"   and Kenmerk.PARTITION=SalesLine.PARTITION"
+	_" left outer join AduCustomerFormNotes as ProdNotes on ProdNotes.REFTABLEID=359 and ProdNotes.REFRECID=SalesLine.RECID and ProdNotes.ADUBODYTYPE=5 and ProdNotes.PARTITION=SalesLine.PARTITION "
+	_" left outer join AduCustomerFormNotes as LijnNotes on LijnNotes.REFTABLEID=359 and LijnNotes.REFRECID=SalesLine.RECID and LijnNotes.ADUBODYTYPE=1 and LijnNotes.PARTITION=SalesLine.PARTITION "
+	_" left outer join AduCustomerFormNotes as OrdNotes on OrdNotes.REFTABLEID=366 and OrdNotes.REFRECID=ORD.RECID and OrdNotes.ADUBODYTYPE=1 and OrdNotes.PARTITION=ORD.PARTITION "
+	_" where ORD.SALESTYPE = 3 " 
+	; SalesType values: Journal = 0, Sales (order) = 3, Return order = 4
 
 	Quit SqlStatement
 ]]></Implementation>