Index: vhCARETAKER.mac.rou
===================================================================
diff -u -r62553 -r62600
--- vhCARETAKER.mac.rou	(.../vhCARETAKER.mac.rou)	(revision 62553)
+++ vhCARETAKER.mac.rou	(.../vhCARETAKER.mac.rou)	(revision 62600)
@@ -1216,12 +1216,21 @@
 DiffAXVersusCacheOrders	; Verschillen tussen orders in AX en Cache opsporen
 	Try {
 		Do InitRuntimeContext
-		Do ##class(AXimpl.Controle.OrdDiff.MaakDiff).%New().Maak()
+		Do ##class(AXimpl.Controle.OrdDiff.MaakDiff).%New(0).Maak()
 	} Catch {
 		Do OnError
 	}
 	Quit
-	
+
+TAXArdisSelcoParser	; Ardis XML voor Selco inlezen en de prioriteit aanpassen in Ardis voor de andere werkstukken van diezelfde batch
+	Try {
+		Do InitRuntimeContext
+		Do ##class(APPS.Halux.Opvolging.ProductieStap.TAOR.impl.ArdisSelcoParser).%New().VerwerkAlle()
+	} Catch {
+		Do OnError
+	}
+	Quit
+
 SyncGewichtenEnPrijzen ; Sync gewichten en prijzen per product naar DotNet databank
 	Try {
 		Do InitRuntimeContext
Index: EWPAL.mac.rou
===================================================================
diff -u -r61990 -r62600
--- EWPAL.mac.rou	(.../EWPAL.mac.rou)	(revision 61990)
+++ EWPAL.mac.rou	(.../EWPAL.mac.rou)	(revision 62600)
@@ -384,7 +384,7 @@
  New MPRNr,CPPL,MPRNrs
  Set Dir=$P("1\-1",D,$G(Dir)+1),Serie=$G(Serie),MPRNr=""
  For  Set MPRNr=$O(^PRLINK("IKM",KPRNr,MPRNr)) Quit:MPRNr=""  Do
- .Set CPPL=$P($$PRIJSGEG^KPRIJS(MPRNr),D,6)
+ .Set CPPL=$$CifPPL^KPRIJS(MPRNr)
  .Set CPPL(+CPPL,MPRNr)=""
  Set (CPPL,MPRNrs)=""
  If Serie Do
@@ -542,15 +542,15 @@
  . Set $P(Rec,D,6)=$G(Result.Data("LocX"))
  . Set $P(Rec,D,7)=$G(Result.Data("LocY"))
  . Set $P(Rec,D,8,9)=D,R=$G(Result.Data("InvTime"))
- . Do:$L(R)
+ . Do:$L($TR(R," "))
  . . Set $P(Rec,D,8)=$$INTDATE^vhLib.DataTypes($P(R,"-",1,3))
  . . Set $P(Rec,D,9)=$$INTTIME^vhLib.DataTypes($P($P(R,"-",4),".",1,3))
  . Set $P(Rec,D,10,11)=D,R=$G(Result.Data("LocTime"))
- . Do:$L(R)
+ . Do:$L($TR(R," "))
  . . Set $P(Rec,D,10)=$$INTDATE^vhLib.DataTypes($P(R,"-",1,3))
  . . Set $P(Rec,D,11)=$$INTTIME^vhLib.DataTypes($P($P(R,"-",4),".",1,3))
  . Set R=$G(Result.Data("LastCCTime"))
- . Do:$L(R)
+ . Do:$L($TR(R," "))
  . . Set $P(Rec,D,12)=$$INTDATE^vhLib.DataTypes($P(R,"-",1,3))
  . . Set $P(Rec,D,13)=$$INTTIME^vhLib.DataTypes($P($P(R,"-",4),".",1,3))
  . Set $P(Rec,D,14)=$G(Result.Data("AutoCCFlag"))
@@ -560,9 +560,12 @@
  ;De vertalling moet achteraf gebeuren omdat 2 geneste SQL queries niet werken over de SQL gateway
  For I=1:1:Count Do
  . Set Rec=^HULP(%J,I)
- . Set $P(Rec,D,16)=##class(EWMS.TransLoc).GetTransLocation(+$P(Rec,D,4),+$P(Rec,D,5),+$P(Rec,D,6),+$P(Rec,D,7))
- . If $P(Rec,D,16)="" Do ; geen transloc
- . . Set $P(Rec,D,16)=$E(100+$P(Rec,D,5),2,3)_" "_$E(100+$P(Rec,D,6),2,3)_" "_$E(100+$P(Rec,D,7),2,3)
+ . If ($P(Rec,D,4)=4) && ($P(Rec,D,5)=2) Do
+ . . Set $P(Rec,D,16)="HALUX"
+ . Else  Do
+ . . Set $P(Rec,D,16)=##class(EWMS.TransLoc).GetTransLocation(+$P(Rec,D,4),+$P(Rec,D,5),+$P(Rec,D,6),+$P(Rec,D,7))
+ . . If $P(Rec,D,16)="" Do ; geen transloc
+ . . . Set $P(Rec,D,16)=$E(100+$P(Rec,D,5),2,3)_" "_$E(100+$P(Rec,D,6),2,3)_" "_$E(100+$P(Rec,D,7),2,3)
  . Set ^HULP(%J,I)=Rec
  Quit
  
Index: AXimpl/PM/Kenmerk/AXProductIterator.cls.xml
===================================================================
diff -u -r62525 -r62600
--- AXimpl/PM/Kenmerk/AXProductIterator.cls.xml	(.../AXProductIterator.cls.xml)	(revision 62525)
+++ AXimpl/PM/Kenmerk/AXProductIterator.cls.xml	(.../AXProductIterator.cls.xml)	(revision 62600)
@@ -42,28 +42,55 @@
 	_"   case isnull(ResProductMaster.ADUCALCTECHNOLOGYBOMBOL,0) WHEN 3 THEN sl.ITEMID WHEN 0 THEN sl.ITEMID ELSE ResProduct.DISPLAYPRODUCTNUMBER END as ProductID,"
 	_"   Kenmerk.RecID,   "
 	_"   sl.INVENTTRANSID as InventTransID,   "
-	_"   case isnull(ResProductMaster.ADUCALCTECHNOLOGYBOMBOL,0) WHEN 3 THEN 'KIND' WHEN 0 THEN 'BESLAG' ELSE 'MW' END as ProductType,   "
 	_"   Inventtable.VHProductGroup as Familie,"
 	_"   AdminProductNummer "
 	_" FROM SalesLine sl "
 	_" join InventTable   "  
     _"    on InventTable.ITEMID = sl.ITEMID and InventTable.DataAreaId = sl.DataAreaId and inventtable.PARTITION = sl.PARTITION "
 	_" join INVENTDIM dim    "
 	_"        on dim.DATAAREAID = sl.DATAAREAID and dim.INVENTDIMID = sl.INVENTDIMID and dim.Partition=sl.PARTITION "
-	_" join INVENTDIM dimbase    "
+	_" left outer join INVENTDIM dimbase    "
 	_"        on dimbase.DATAAREAID = dim.DATAAREAID and dimbase.Partition=dim.PARTITION "
 	_"        and dim.ConfigID =dimbase.configid and dimbase.WMSLOCATIONID='' and dimbase.inventlocationid ='' and dimbase.inventsiteid='' "
 	_"        and dimbase.inventbatchid=''"
-	_" join INVENTDIMCOMBINATION as Idc"
+	_" left outer join INVENTDIMCOMBINATION as Idc"
 	_"        on  Idc.DATAAREAID= sl.DATAAREAID and Idc.ITEMID=sl.ITEMID and Idc.INVENTDIMID=DimBase.INVENTDIMID and idc.PARTITION = sl.PARTITION "
-    _" join ECORESPRODUCT ResProduct"
+    _" left outer join ECORESPRODUCT ResProduct"
     _"       on idc.DISTINCTPRODUCTVARIANT= ResProduct.RecID and ResProduct.PARTITION = sl.PARTITION "
-    _" join ECORESPRODUCT ResProductMaster"
+    _" left outer join ECORESPRODUCT ResProductMaster"
     _"       on ResProductMaster.RecID= ResProduct.ProductMaster and ResProduct.PARTITION = sl.PARTITION "
     _" left outer join ADUEcoResAttributeCombination as Kenmerk  "
     _"       on dim.ConfigId=Kenmerk.ConfigId and sl.ITEMID=Kenmerk.ITEMID and dim.ConfigId<>'' and kenmerk.Partition=sl.Partition "
     _" where sl.Dataareaid='vhbe' and sl.Partition='5637144576' "
     _" and ResProductMaster.ADUCALCTECHNOLOGYBOMBOL = 2"
+    
+
+    Set SqlStatement = "select "
+ _" case isnull(ResProductMaster.ADUCALCTECHNOLOGYBOMBOL,0) WHEN 3 THEN sl.ITEMID WHEN 0 THEN sl.ITEMID ELSE case InventTable.STANDARDCONFIGID when dim.CONFIGID then InventTable.ITEMID else ResProduct.DISPLAYPRODUCTNUMBER end END as ProductID,"
+ _" sl.InventDimID,"
+ _" Inventtable.VHProductGroup as Familie, "
+ _" AdminProductNummer,"
+ _" sl.INVENTTRANSID as InventTransID"
+ _" FROM  SalesLine sl"
+ _" join InventTable  "
+ _"    on InventTable.ITEMID = sl.ITEMID and InventTable.DataAreaId = sl.DataAreaId and inventtable.PARTITION = sl.PARTITION"
+ _" join INVENTDIM dim "
+ _"    on dim.DATAAREAID = sl.DATAAREAID and dim.INVENTDIMID = sl.INVENTDIMID and dim.Partition=sl.PARTITION"
+ _" left outer join INVENTDIM dimbase "
+ _"    on dimbase.DATAAREAID = dim.DATAAREAID and dimbase.Partition=dim.PARTITION and dim.ConfigID =dimbase.configid and dimbase.WMSLOCATIONID='' and dimbase.inventlocationid ='' and dimbase.inventsiteid='' and dimbase.inventbatchid='' and dimbase.inventsizeid='' and dimbase.recversion=dim.recversion"
+ _" left outer join INVENTDIMCOMBINATION as Idc "
+ _"    on  Idc.DATAAREAID= sl.DATAAREAID and Idc.ITEMID=sl.ITEMID and Idc.INVENTDIMID=DimBase.INVENTDIMID and idc.PARTITION = sl.PARTITION "
+ _" left outer join ECORESPRODUCT ResProduct "
+ _"   on idc.DISTINCTPRODUCTVARIANT= ResProduct.RecID and ResProduct.PARTITION = sl.PARTITION "
+ _" left outer join ECORESPRODUCT ResProductMaster "
+ _"   on ResProductMaster.RecID= isnull(ResProduct.ProductMaster,ResProduct.RecID) and ResProduct.PARTITION = sl.PARTITION "
+ _" left outer join ADUEcoResAttributeCombination as Kenmerk "
+ _" 	on dim.ConfigId=Kenmerk.ConfigId and sl.ITEMID=Kenmerk.ITEMID and dim.ConfigId<>'' and Kenmerk.PARTITION=sl.PARTITION "
+ _" where sl.Dataareaid='vhbe' "
+ _"   and sl.Partition='5637144576' "
+ _"   and isnull(ResProductMaster.ADUCALCTECHNOLOGYBOMBOL,0)=2 "
+    
+     
 	If VanafDatum
 	{
 		Set SqlStatement=SqlStatement_" and sl.CREATEDDATETIME >= '"_$zd(VanafDatum,3)_"'"
@@ -83,7 +110,7 @@
 <ReturnType>%List</ReturnType>
 <Implementation><![CDATA[
     /// Listbuild : QlikProductID, AdminPRNr, AXRecID
- 	Quit $LB(..ResultSet.Data("ProductID"),..ResultSet.Data("AdminProductNummer"),..ResultSet.Data("RecID"),..ResultSet.Data("InventTransID"))
+ 	Quit $LB(..ResultSet.Data("ProductID"),..ResultSet.Data("AdminProductNummer"),..ResultSet.Data("InventDimID"),..ResultSet.Data("InventTransID"))
 ]]></Implementation>
 </Method>
 
Index: EWORDS6.mac.rou
===================================================================
diff -u -r58234 -r62600
--- EWORDS6.mac.rou	(.../EWORDS6.mac.rou)	(revision 58234)
+++ EWORDS6.mac.rou	(.../EWORDS6.mac.rou)	(revision 62600)
@@ -310,7 +310,8 @@
  	Set:SendWMSStatus="" SendWMSStatus=$E($P(^KKL(^KK1(KLNr),2),"\",8))
  	Set:SendWMSStatus'="M" SendWMSStatus="A"
  }
- Quit SendWMSStatus
+ Set SendWMSStatus="A" ;TIJDELIJKE AANPASSING overbruggen van het manueel doorsturen, dus steeds automatisch- PV 02 10 2020
+ Quit SendWMSStatus 
  
  ; Do orders moeten gesloten zijn
 OrderGesloten(ORDNr)
Index: AX/Uitgaand/EC/DataAX/impl/HistoriekOphalen.cls.xml
===================================================================
diff -u -r61756 -r62600
--- AX/Uitgaand/EC/DataAX/impl/HistoriekOphalen.cls.xml	(.../HistoriekOphalen.cls.xml)	(revision 61756)
+++ AX/Uitgaand/EC/DataAX/impl/HistoriekOphalen.cls.xml	(.../HistoriekOphalen.cls.xml)	(revision 62600)
@@ -40,6 +40,11 @@
 <Collection>array</Collection>
 </Property>
 
+<Property name="arProductItems">
+<Type>WS.Vhisie4.KlantDocument.dto.HistoriekItem</Type>
+<Collection>array</Collection>
+</Property>
+
 <Property name="Translator">
 <Type>AX.Uitgaand.EC.DataAX.impl.Translator</Type>
 <Private>1</Private>
@@ -66,8 +71,11 @@
 	Set:..GenerationId="" ..GenerationId=##class(AX.Uitgaand.EC.KlantenAX.impl.Klanten).LaatsteGenerationID()
 	Set ..ProductValidator=##class(AX.Uitgaand.EC.DataAX.impl.ProductValidator).%New(..KlantId,..GenerationId)
 
-	Do ..GenereerLijst()
-		
+	Do ..GenereerLijst(..KlantId)
+	Do:..KlantId=33895 ..GenereerLijst(19046) ; append oude klant ELISE BADMEUBELS - 16/09/2020 PV
+	
+	Do ..SorteerProductGroepen()
+
 	Set ..Response.Tijd=Timer.Stop()\1
 	
 	Quit $$$OK
@@ -88,21 +96,21 @@
 </Method>
 
 <Method name="GenereerLijst">
+<FormalSpec>KlantId:%String</FormalSpec>
 <Implementation><![CDATA[
  	Set HoofdGroep=0
  	Set LijnCnt=0
- 	For  Set HoofdGroep=$O(^KKAAP(..KlantId,HoofdGroep)) Quit:HoofdGroep=""  Do
+ 	For  Set HoofdGroep=$O(^KKAAP(KlantId,HoofdGroep)) Quit:HoofdGroep=""  Do
 	. Set Groep=""
-	. For  Set Groep=$O(^KKAAP(..KlantId,HoofdGroep,Groep)) Quit:Groep=""  Do
+	. For  Set Groep=$O(^KKAAP(KlantId,HoofdGroep,Groep)) Quit:Groep=""  Do
 	. . Set SubGroep=""
-	. . For  Set SubGroep=$O(^KKAAP(..KlantId,HoofdGroep,Groep,SubGroep)) Quit:SubGroep=""  Do
+	. . For  Set SubGroep=$O(^KKAAP(KlantId,HoofdGroep,Groep,SubGroep)) Quit:SubGroep=""  Do
 	. . . Set KortText=""
-	. . . For  Set KortText=$O(^KKAAP(..KlantId,HoofdGroep,Groep,SubGroep,KortText)) Quit:KortText=""  Do
-	. . . . Set HistRec=^KKAAP(..KlantId,HoofdGroep,Groep,SubGroep,KortText)
+	. . . For  Set KortText=$O(^KKAAP(KlantId,HoofdGroep,Groep,SubGroep,KortText)) Quit:KortText=""  Do
+	. . . . Set HistRec=^KKAAP(KlantId,HoofdGroep,Groep,SubGroep,KortText)
 	. . . . Set PRNr=$P(HistRec,"\",15)
 	. . . . Quit:'..CheckProduct(PRNr)
 	. . . . Do ..ToevoegenHistoriek(HistRec)
-	Do ..SorteerProductGroepen()
 ]]></Implementation>
 </Method>
 
@@ -119,10 +127,45 @@
 	Set pxItem.Munt=$P(HistRec,"\",7)
 	Set pxItem.LaatsteDatum=$$INTDATE^vhLib.DataTypes($P(HistRec,"\",5))
 	Do pxItem.VulAanMetProduct(..Taal)
-	Do ..ToevoegenAanGroep(pxItem)
+	Do ..Test(pxItem)
+	;Do ..ToevoegenAanGroep(pxItem)
 ]]></Implementation>
 </Method>
 
+<Method name="Test">
+<FormalSpec>pxItem:WS.Vhisie4.KlantDocument.dto.HistoriekItem</FormalSpec>
+<Implementation><![CDATA[
+	#Dim ProductGroep as WS.Vhisie4.KlantDocument.enu.ProductGroep
+	#Dim pxProductGroep as  WS.Vhisie4.KlantDocument.dto.HistoriekGroep
+	#dim pxItemOrig As WS.Vhisie4.KlantDocument.dto.HistoriekItem
+	Set GroepSleutel=pxItem.GeefSubgroepSorteerSleutel()
+	Set pxProductGroep=..arProductGroepen.GetAt(GroepSleutel)
+	If '$isObject(pxProductGroep)
+	{
+		Set pxProductGroep=##class(WS.Vhisie4.KlantDocument.dto.HistoriekGroep).%New()
+		Set pxProductGroep.ProductGroep=pxItem.ProductGroep
+		Set pxProductGroep.ProductSubGroep=pxItem.ProductSubGroep
+		Do ..arProductGroepen.SetAt(pxProductGroep,GroepSleutel)
+	}
+	
+	Set pxProductGroep.AantalStuks=pxProductGroep.AantalStuks+pxItem.JaarAfname
+	Set pxProductGroep.Omzet=pxProductGroep.Omzet+pxItem.JaarOmzet
+	Set pxItemOrig=..arProductItems.GetAt(pxItem.ProductID)
+
+	If '$isObject(pxItemOrig)
+	{
+		Set pxProductGroep.AantalLijnen=pxProductGroep.AantalLijnen+1
+		Do pxProductGroep.Producten.Insert(pxItem)
+		Do ..arProductItems.SetAt(pxItem,pxItem.ProductID)
+	}
+	Else
+	{
+		Set pxItemOrig.JaarAfname=pxItemOrig.JaarAfname+pxItem.JaarAfname
+		Set pxItemOrig.JaarOmzet=pxItemOrig.JaarOmzet+pxItem.JaarOmzet
+	}
+]]></Implementation>
+</Method>
+
 <Method name="ToevoegenAanGroep">
 <FormalSpec>pxItem:WS.Vhisie4.KlantDocument.dto.HistoriekItem</FormalSpec>
 <Implementation><![CDATA[