Index: APPS/VKP/Maatwerk/ConverteerNaarComponent/impl/AxOrderLijnIterator.cls.xml
===================================================================
diff -u
--- APPS/VKP/Maatwerk/ConverteerNaarComponent/impl/AxOrderLijnIterator.cls.xml	(revision 0)
+++ APPS/VKP/Maatwerk/ConverteerNaarComponent/impl/AxOrderLijnIterator.cls.xml	(revision 60424)
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.VKP.Maatwerk.ConverteerNaarComponent.impl.AxOrderLijnIterator">
+<Super>TECH.RegisteredObject,TECH.Iterator</Super>
+
+<Property name="Converter">
+<Type>AXimpl.Controle.Order.Ax.AxOrderLijnConverter</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ResultSet">
+<Type>TECH.ResultSet</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="SqlQueryConnection">
+<Type>AXimpl.SqlQueryConnection</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>AXSalesID:%String,SqlQueryConnection:AXimpl.SqlQueryConnection</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..SqlQueryConnection = $$$Implementation(SqlQueryConnection,##class(AXimpl.SqlQueryConnection).%New())
+	Do ..VoerUitQuery(AXSalesID)
+	//Set ..Converter = ##class(AXimpl.Controle.Order.Ax.AxOrderLijnConverter).%New()
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="VoerUitQuery">
+<Description>
+Wijziging tov vorige versie om ook orders nog in JOURNAAL toe te laten</Description>
+<FormalSpec>AXSalesID:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#Dim SqlStatement as %String
+	
+	Set SqlStatement = "Select salesLine.SALESID,salesLine.CUSTACCOUNT,salesline.INVENTTRANSID,salesline.ITEMID,salesline.CONFIRMEDDLV,salesline.RECEIPTDATECONFIRMED,salesline.QTYORDERED"
+	_"  ,salesline.REMAINSALESPHYSICAL as OPENSTAANDEHOEVEELHEID,ADMINPRODUCTNUMMER "
+	_"  ,InventDim.CONFIGID "
+	_"  ,isnull(LogisticsPostalAddress.CountryRegionId,'') as COUNTRYREGIONID "
+	_"  ,isnull(LogisticsPostalAddress.City,'') as CITY "
+	_"  ,isnull(LogisticsPostalAddress.Street,'') as STREET "
+	_"  ,isnull(LogisticsPostalAddress.Zipcode,'') as ZIPCODE "
+	_"from SALESLINE "
+	_"join inventdim on inventdim.INVENTDIMID = salesline.INVENTDIMID and inventdim.DATAAREAID = SALESLINE.DATAAREAID and inventdim.PARTITION = salesline.PARTITION "
+	_"join SALESTABLE on SALESTABLE.SALESID = salesline.SALESID and SALESTABLE.DATAAREAID = salesline.DATAAREAID and salestable.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 LOGISTICSPOSTALADDRESS on LOGISTICSPOSTALADDRESS.RECID = salesline.DELIVERYPOSTALADDRESS and LOGISTICSPOSTALADDRESS.PARTITION = salesline.PARTITION "
+	_"where  salesline.QTYORDERED >= 0 "
+	_"  and salesLine.DATAAREAID = 'VHBE' and salesline.PARTITION = '5637144576' "
+	_"  and SalesLine.SalesID='"_AXSalesID_"'"
+	_"order by salesline.inventtransid"
+	
+	Set ..ResultSet = ..SqlQueryConnection.GetResultSet(SqlStatement)
+]]></Implementation>
+</Method>
+
+<Method name="VoerUitQuery2">
+<FormalSpec>AXSalesID:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#Dim SqlStatement as %String
+	
+	Set SqlStatement = "Select salesLine.SALESID,salesLine.CUSTACCOUNT,salesline.INVENTTRANSID,salesline.ITEMID,salesline.CONFIRMEDDLV,salesline.RECEIPTDATECONFIRMED,salesline.QTYORDERED"
+	_"  ,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"
+	_"  ,salesline.REMAINSALESPHYSICAL as OPENSTAANDEHOEVEELHEID,ADMINPRODUCTNUMMER "
+	_"  ,inventtransorigin.ADUSOPRCONTRACTID "
+	_"  ,InventDim.CONFIGID "
+	_"  ,isnull(LogisticsPostalAddress.CountryRegionId,'') as COUNTRYREGIONID "
+	_"  ,isnull(LogisticsPostalAddress.City,'') as CITY "
+	_"  ,isnull(LogisticsPostalAddress.Street,'') as STREET "
+	_"  ,isnull(LogisticsPostalAddress.Zipcode,'') as ZIPCODE "
+	_"from SALESLINE "
+	_"join inventdim on inventdim.INVENTDIMID = salesline.INVENTDIMID and inventdim.DATAAREAID = SALESLINE.DATAAREAID and inventdim.PARTITION = salesline.PARTITION "
+	_"join SALESTABLE on SALESTABLE.SALESID = salesline.SALESID and SALESTABLE.DATAAREAID = salesline.DATAAREAID and salestable.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 LOGISTICSPOSTALADDRESS on LOGISTICSPOSTALADDRESS.RECID = salesline.DELIVERYPOSTALADDRESS and LOGISTICSPOSTALADDRESS.PARTITION = salesline.PARTITION "
+	_"join INVENTTRANSORIGIN on INVENTTRANSORIGIN.INVENTTRANSID = salesline.INVENTTRANSID and INVENTTRANSORIGIN.DATAAREAID = salesline.DATAAREAID and "
+	_"   INVENTTRANSORIGIN.PARTITION = salesline.PARTITION "
+	_"where salestable.SALESSTATUS = 1 and salestable.SALESTYPE = 3 and salesline.SALESQTY >= 0 "
+	_"  and salesLine.DATAAREAID = 'VHBE' and salesline.PARTITION = '5637144576' "
+	_"  and salesline.REMAINSALESPHYSICAL - 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) > 0 "
+	_"  and SalesLine.SalesID='"_AXSalesID_"'"
+	_"order by salesline.inventtransid"
+	
+	Set ..ResultSet = ..SqlQueryConnection.GetResultSet(SqlStatement)
+]]></Implementation>
+</Method>
+
+<Method name="HasNext">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (..ResultSet.Next() > 0)
+]]></Implementation>
+</Method>
+
+<Method name="Next">
+<ReturnType>AXimpl.Controle.Order.OrderLijn</ReturnType>
+<Implementation><![CDATA[ 	Quit ..ResultSet
+]]></Implementation>
+</Method>
+
+<Method name="%OnClose">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Do:$IsObject(..ResultSet) ..SqlQueryConnection.Disconnect()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AXimpl/PM/Kenmerk/ConvertAll.cls.xml
===================================================================
diff -u -r58984 -r60424
--- AXimpl/PM/Kenmerk/ConvertAll.cls.xml	(.../ConvertAll.cls.xml)	(revision 58984)
+++ AXimpl/PM/Kenmerk/ConvertAll.cls.xml	(.../ConvertAll.cls.xml)	(revision 60424)
@@ -100,7 +100,7 @@
 <Implementation><![CDATA[
 	If '(..BestaatLinkReeds(ProductID)&&..UpdateOnly)
 	{	
-		w ProductID," ",PRNr," ", RecID," ", InventTransID,!
+		;w ProductID," ",PRNr," ", RecID," ", InventTransID,!
 		;w "Converteer"
 		Do ..ConverteerOne(PRNr)
 		If ##class(Kenmerken).%ExistsId(PRNr)
@@ -124,10 +124,10 @@
 <FormalSpec>PRNr</FormalSpec>
 <Implementation><![CDATA[
 	;w "."
-		Quit:##class(Kenmerken).%ExistsId(PRNr)
+		Set GenTyp=$P($$GENTYP^HAD(PRNr),"\")
+		Quit:##class(Kenmerken).%ExistsId(PRNr)&&(GenTyp'="TBX")
 		;w "+"
 		Do ##class(Kenmerken).%DeleteId(PRNr) ;  steeds herrekenen (laatste versie) ook al wordt het Admin product herbruikt voor een verschillend ProductID (is verschillend ConfigID)
-		Set GenTyp=$P($$GENTYP^HAD(PRNr),"\")
 		If GenTyp="TBX"
 		{   ;w !,PRNr," TBX"
 			Do ##class(ConvertTBX).%New().Converteer(PRNr)
Index: AXimpl/PM/Kenmerk/ConvertProductAbstract.cls.xml
===================================================================
diff -u -r56906 -r60424
--- AXimpl/PM/Kenmerk/ConvertProductAbstract.cls.xml	(.../ConvertProductAbstract.cls.xml)	(revision 56906)
+++ AXimpl/PM/Kenmerk/ConvertProductAbstract.cls.xml	(.../ConvertProductAbstract.cls.xml)	(revision 60424)
@@ -71,6 +71,8 @@
 		If $L(Property)
 		{
 			#dim Value as %String=arKenmerken.GetAt(Key)
+			If (Key["Rugwandmateriaal")&&(IngegevenKenmerken.%ClassName()["TBX")&&(Value="Hout") Set Value=IngegevenKenmerken.RugwandMateriaal ; Correctie voor stalen rug bij TBX corr - PV 24/03/2020
+
 			If Value'=""
 			{
 				;Write:Property="" $S(Property="":"???"_Key,1:Property)," ",Value,!
Index: BL/Derde/LevSpecifiek.inc.rou
===================================================================
diff -u -r60202 -r60424
--- BL/Derde/LevSpecifiek.inc.rou	(.../LevSpecifiek.inc.rou)	(revision 60202)
+++ BL/Derde/LevSpecifiek.inc.rou	(.../LevSpecifiek.inc.rou)	(revision 60424)
@@ -6,7 +6,8 @@
  #define LevVRD 5803
  #define LevVanHoecke 6051
  #define LevMeyvaert 7112
- #define LevBaliko 5938
+ #define LevBaliko 5938 
+ #define LevAgoform 5002
  ; hout leveranciers
  #define LevDekaply 7025
  #define LevStylinArt 6628
Index: APPS/VKP/Maatwerk/ConverteerNaarComponent/impl/DataBouwer.cls.xml
===================================================================
diff -u
--- APPS/VKP/Maatwerk/ConverteerNaarComponent/impl/DataBouwer.cls.xml	(revision 0)
+++ APPS/VKP/Maatwerk/ConverteerNaarComponent/impl/DataBouwer.cls.xml	(revision 60424)
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.VKP.Maatwerk.ConverteerNaarComponent.impl.DataBouwer">
+<IncludeCode>BL.Derde.KlantSpecifiek,Prod.Product,BL.Derde.LevSpecifiek</IncludeCode>
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="AxOrderLijnIterator">
+<Type>APPS.VKP.Maatwerk.ConverteerNaarComponent.impl.AxOrderLijnIterator</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Translator">
+<Type>AX.Uitgaand.EC.DataAX.impl.Translator</Type>
+</Property>
+
+<Property name="AXSalesID">
+<Type>%String</Type>
+</Property>
+
+<Property name="Cache">
+<Type>%String</Type>
+<MultiDimensional>1</MultiDimensional>
+</Property>
+
+<Property name="CacheSort">
+<Type>%String</Type>
+<MultiDimensional>1</MultiDimensional>
+</Property>
+
+<Method name="%OnNew">
+<Description>
+d ##class(APPS.VKP.Maatwerk.ConverteerNaarComponent.impl.DataBouwer).%New().VraagEnVerwerk()</Description>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="VraagEnVerwerk">
+<Implementation><![CDATA[
+	Do ..AskOrderID()
+	Quit:..AXSalesID=""
+	Set ..AxOrderLijnIterator = ##class(APPS.VKP.Maatwerk.ConverteerNaarComponent.impl.AxOrderLijnIterator).%New(..AXSalesID)
+	Do ..HaalOp()
+	;k %x m %x=..Cache zw %x
+	Do ..Export()
+]]></Implementation>
+</Method>
+
+<Method name="AskOrderID">
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+	Write !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!,@F11
+	Write "Geef AX ordernummer : "
+	Read AXSalesID
+	Set:$E(AXSalesID,1,2)'="VO" AXSalesID=""
+	Set ..AXSalesID=AXSalesID
+]]></Implementation>
+</Method>
+
+<Method name="Export">
+<Implementation><![CDATA[
+	Write !,..AXSalesID,!!
+	Set SortKey=$O(..CacheSort(""))
+	
+	If SortKey=""
+	{
+		W !!,"**** NIETS GECONVERTEERD ****",!!!
+	}
+	
+	While SortKey'=""
+	{
+		Set KPRNr=..CacheSort(SortKey)
+		Set Aantal=+$J(..Cache(KPRNr)+0.499,0,0)
+		Write $$$ProductGet(KPRNr,$$$IdentNummer),*9,$$$ProductGet(KPRNr,$$$KortTekst),*9,$$$ExcelNum(Aantal),!
+		
+		; Next
+		Set SortKey=$O(..CacheSort(SortKey))
+
+	}
+
+	Write !
+	r "Druk enter om verder te gaan",K
+]]></Implementation>
+</Method>
+
+<Method name="HaalOp">
+<Implementation><![CDATA[
+	#define Strip0(%v) $TR(%v,$C(0))
+
+	While (..AxOrderLijnIterator.HasNext()) 
+	{
+			#dim rs As %ResultSet = ..AxOrderLijnIterator.Next()
+			#dim AXSalesId As %String = rs.Data("SALESID")
+			#dim OrderId As %String = $Reverse($E($Reverse(AXSalesId),1,6))
+			#dim KlantNr As %String = +rs.Data("CUSTACCOUNT")
+		
+
+			#dim ItemId As %String =rs.Data("ITEMID")
+			#dim ProductNr As %String = $$$Strip0(rs.Data("ADMINPRODUCTNUMMER"))
+			;#dim AantalGepickt As %String = +rs.Data("GEPICKTEHOEVEELHEID")
+			;#dim AantalBesteld As %String = +rs.Data("QTYORDERED")
+			#dim AantalOpenstaand As %String = +rs.Data("OPENSTAANDEHOEVEELHEID") ;-rs.Data("GEPICKTEHOEVEELHEID")
+			#dim InventTransId As %String = rs.Data("INVENTTRANSID")
+			#dim ConfigId As %String = $$$Strip0(rs.Data("CONFIGID"))
+			;#dim SoprContractId As %String =$$$Strip0(rs.Data("ADUSOPRCONTRACTID"))
+		If (ProductNr'="") && $D(^KPR(ProductNr,"J"_$$$LevHalux))
+		{
+			Do ..ConvertBouwstenen(ProductNr, AantalOpenstaand, InventTransId)
+		}
+
+	}
+]]></Implementation>
+</Method>
+
+<Method name="ConvertBouwstenen">
+<FormalSpec>MPRNr:%String,MaatwerkAantal:%Decimal,InventTransId:%String</FormalSpec>
+<Implementation><![CDATA[
+	#dim BSKey as %String =$O(^PRBS("BS",MPRNr,""))
+	#dim DimensieAantal as %Deciam
+	While BSKey'="" 
+	{
+		#dim BSRec as %String=^PRBS("BS",MPRNr,BSKey)
+		#dim KPRNr as %String=$P(BSRec,"\",1)
+		
+		If KPRNr'=""
+		{
+			If ( $D(^KPR(KPRNr,"J"_$$$LevBlum)) || $D(^KPR(KPRNr,"J"_$$$LevAgoform)) || ($E($$$ProductGet(KPRNr,$$$KortTekst),1,3)="KPR") || ($E($$$ProductGet(KPRNr,$$$KortTekst),1,3)="SYF"))  && ($$$ProductGet(KPRNr,$$$Hoofdgroep)'["VB")
+			{
+				#dim ComponentAantal as %Decimal = $P(BSRec,"\",2)
+				Set DimensieAantal =1
+				If $D(^PRBS("BS",MPRNr,BSKey,"D"))
+				{
+					#dim DimensieMetUitval=$P(^PRBS("BS",MPRNr,BSKey,"D"),"\",3)
+					#dim DimensieComponent=$$$ProductGet(KPRNr,$$$WerkvloerGrootteNetto)
+					If (+DimensieMetUitval'=0) && (+DimensieComponent'=0)
+					{
+						Set DimensieAantal = DimensieMetUitval/DimensieComponent
+					}
+				}
+				
+			#dim Aantal as %Decimal=MaatwerkAantal*ComponentAantal*DimensieAantal
+			Set ..Cache(KPRNr ,MPRNr)=$LB(InventTransId, Aantal, MaatwerkAantal, ComponentAantal, DimensieAantal)
+			Set ..Cache(KPRNr)=$G(..Cache(KPRNr))+Aantal
+			Set ..CacheSort($$SORTKEY^PRODUKT(KPRNr))=KPRNr
+			}		
+		}
+		; next
+		Set BSKey=$O(^PRBS("BS",MPRNr,BSKey))
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>