Index: AXdixf/SOPRContract/SOPRDefinitie.cls.xml
===================================================================
diff -u -r46276 -r46484
--- AXdixf/SOPRContract/SOPRDefinitie.cls.xml	(.../SOPRDefinitie.cls.xml)	(revision 46276)
+++ AXdixf/SOPRContract/SOPRDefinitie.cls.xml	(.../SOPRDefinitie.cls.xml)	(revision 46484)
@@ -44,6 +44,10 @@
 <Property name="ClientID">
 <Type>%String</Type>
 </Property>
+
+<Property name="Opmerking">
+<Type>%String</Type>
+</Property>
 </Class>
 
 
Index: AX/Uitgaand/PM/SOPRContract/impl/SOPRDixfGenerator.cls.xml
===================================================================
diff -u -r46463 -r46484
--- AX/Uitgaand/PM/SOPRContract/impl/SOPRDixfGenerator.cls.xml	(.../SOPRDixfGenerator.cls.xml)	(revision 46463)
+++ AX/Uitgaand/PM/SOPRContract/impl/SOPRDixfGenerator.cls.xml	(.../SOPRDixfGenerator.cls.xml)	(revision 46484)
@@ -80,6 +80,7 @@
 	Do AXProductData.VoegToeVeld("AXdixf.SOPRContract.SOPRDefinitie", "Ingangsdatum")
 	Do AXProductData.VoegToeVeld("AXdixf.SOPRContract.SOPRDefinitie", "ClientID")
 	Do AXProductData.VoegToeVeld("AXdixf.SOPRContract.SOPRDefinitie", "KortTekst")
+	Do AXProductData.VoegToeVeld("AXdixf.SOPRContract.SOPRDefinitie", "Opmerking","Opmerking")
 
 	Set AXProductData.ScheidingsTeken = ";"	
 	Set AXProductData.Iterator = ProductIterator
Index: AX/Uitgaand/PM/SOPRContract/impl/SOPRDixfConverter.cls.xml
===================================================================
diff -u -r46465 -r46484
--- AX/Uitgaand/PM/SOPRContract/impl/SOPRDixfConverter.cls.xml	(.../SOPRDixfConverter.cls.xml)	(revision 46465)
+++ AX/Uitgaand/PM/SOPRContract/impl/SOPRDixfConverter.cls.xml	(.../SOPRDixfConverter.cls.xml)	(revision 46484)
@@ -39,7 +39,7 @@
 </Method>
 
 <Method name="Convert">
-<FormalSpec>PRNr:%String,KLNr:%String</FormalSpec>
+<FormalSpec>PRNr:%String,KLNr:%String,Data:%String</FormalSpec>
 <ReturnType>AXdixf.SOPRContract.SOPRDefinitie</ReturnType>
 <Implementation><![CDATA[
 	
@@ -52,8 +52,8 @@
 	Set SOPRContract=..SoprContractConvertor.AdminNaarAx(ConvertedAxProduct.BlumKunde)
 	Set ..AxSOPRDefinitie.SOPRcontract=SOPRContract
 
-	Set ..AxSOPRDefinitie.Aankoopprijs=$$$ExcelNum(+$J($$$ProductGet(PRNr,$$$PPLMTL),0,2))
-
+	Set ..AxSOPRDefinitie.Aankoopprijs=$$$ExcelNum($P(PrijsRec,"\",1)*$S($P(PrijsRec,"\",3)=1:100,1:1))
+	
 	Set ..AxSOPRDefinitie.AankoopUnitID="100"
 
 	Set ..AxSOPRDefinitie.Kostprijs=$$$ExcelNum(+$J($P(PrijsRec,"\",6)*100,0,2))
@@ -63,8 +63,8 @@
 	Set ..AxSOPRDefinitie.Ingangsdatum="01/10/2017"
 
 	Set ..AxSOPRDefinitie.ClientID=$S($L(KLNr)<5:"0",1:"")_KLNr
-	Set ..AxSOPRDefinitie.ClientID=$S($L(KLNr)<5:"0",1:"")_KLNr
 
+	Set ..AxSOPRDefinitie.Opmerking=Data
 	
 	Quit ..AxSOPRDefinitie
 ]]></Implementation>
Index: AX/Uitgaand/PM/SOPRContract/impl/SOPRIterator.cls.xml
===================================================================
diff -u -r46464 -r46484
--- AX/Uitgaand/PM/SOPRContract/impl/SOPRIterator.cls.xml	(.../SOPRIterator.cls.xml)	(revision 46464)
+++ AX/Uitgaand/PM/SOPRContract/impl/SOPRIterator.cls.xml	(.../SOPRIterator.cls.xml)	(revision 46484)
@@ -61,7 +61,7 @@
 <Implementation><![CDATA[
 	Set ..Data=..DynIterator.Next()
 	Set ..Nodes=..DynIterator.Key()
-	#dim ConvertedPrijsUitz As AXdixf.SOPRContract.SOPRDefinitie = ..Converter.Convert( ..GeefPRNr(),..GeefKLNr())
+	#dim ConvertedPrijsUitz As AXdixf.SOPRContract.SOPRDefinitie = ..Converter.Convert( ..GeefPRNr(),..GeefKLNr(),..Data)
 	
 	#dim ProductNr As %String = ..GeefPRNr()
 	#dim AxEntiteit As %String = "SOPRContract"
Index: AX/Uitgaand/PM/SOPRContract/impl/SOPRCacheBouwen.cls.xml
===================================================================
diff -u -r46276 -r46484
--- AX/Uitgaand/PM/SOPRContract/impl/SOPRCacheBouwen.cls.xml	(.../SOPRCacheBouwen.cls.xml)	(revision 46276)
+++ AX/Uitgaand/PM/SOPRContract/impl/SOPRCacheBouwen.cls.xml	(.../SOPRCacheBouwen.cls.xml)	(revision 46484)
@@ -34,20 +34,25 @@
 	Set PRNr=$O(^KPR(0))
 	While PRNr
 	{
-		If $$$PRGet($$$LeveranciersNr)=$$$LevBlum
+		If $$$PRGet($$$LeveranciersNr)=$$$LevBlum&&($$$PRGet($$$NONAktief)'=1)
 		{
 			#dim ConvertedAxProduct as AX.Uitgaand.PM.impl.Convertor.Sopr.AxProduct = ..AxProductConvertor.AdminNaarAx(PRNr)
 			If (ConvertedAxProduct.IsSoprInCache) && ('ConvertedAxProduct.IsSoprInAx)
 			{
 				Set KLNr=$O(^PRPUTZ("N",PRNr,0))
 				While KLNr
 				{
-					If (KLNr'=11708)
+					Set KLNrAktief=KLNr
+					Set:KLNrAktief=11708 KLNrAktief= 23112 
+					
+					Set Klant=##class(Derde.Klant.Klant).%OpenId(KLNrAktief)
+					
+					If ('Klant.CommNonActief)
 					{
 						Set BlumKunde=$P(^PRPUTZ("N",PRNr,KLNr,0),"\",1)
-						Set ^||SOPRContract(..Vestiging,PRNr,KLNr)=""
+						Set ^||SOPRContract(..Vestiging,PRNr,KLNrAktief)="Contract"
 						Set ^||SOPRContract("BLUMKUNDE",PRNr)=BlumKunde
-						Set ^||SOPRContract("CHECK",ConvertedAxProduct.VervangSoprPRNr,KLNr)=PRNr
+						Set ^||SOPRContract("CHECK",ConvertedAxProduct.VervangSoprPRNr,KLNrAktief)=PRNr
 					}
 				 	Set KLNr=$O(^PRPUTZ("N",PRNr,KLNr))
 				}
@@ -59,15 +64,35 @@
 					{
 						If $O(^KSTPR(PRNr,KLNr,StatistiekDatum))'=""&&(KLNr'=11708) ; recent gekocht
 						{
-							Set ^||SOPRContract(..Vestiging,PRNr,KLNr)=""
+							Set ^||SOPRContract(..Vestiging,PRNr,KLNr)="Stat"
 							Set ^||SOPRContract("CHECK",ConvertedAxProduct.VervangSoprPRNr,KLNr)=PRNr
 						}
 					}
 					Set KLNr=$O(^KSTPR(PRNr,KLNr))
 				}
+				; soms maken andere klanten ook gebruik van een SOPR contract asl bouwsteen van maatwerk
+				Set MPRNr=$O(^PRBS("IP",PRNr,""))
+				While MPRNr
+				{
+					Set KLNr=$O(^KSTPR(MPRNr,0))
+					While KLNr
+					{
+						If '$D(^||SOPRContract("CHECK",ConvertedAxProduct.VervangSoprPRNr,KLNr))
+						{
+							If $O(^KSTPR(MPRNr,KLNr,StatistiekDatum))'=""&&(KLNr'=11708) ; recent gekocht
+							{
+								Set ^||SOPRContract(..Vestiging,PRNr,KLNr)="Maatwerk"
+								Set ^||SOPRContract("CHECK",ConvertedAxProduct.VervangSoprPRNr,KLNr)=PRNr
+							}
+						}
+						Set KLNr=$O(^KSTPR(PRNr,KLNr))
+					}
+					Set MPRNr=$O(^PRBS("IP",PRNr,MPRNr))
+				}
 			}
 		}
 		Set PRNr=$O(^KPR(PRNr))
+		
 	}
 ]]></Implementation>
 </Method>