Index: AX/Uitgaand/BKH/OpenstaandeVerkoopFactuur/impl/TransactionLockingRepository.cls.xml
===================================================================
diff -u -r34804 -r35005
--- AX/Uitgaand/BKH/OpenstaandeVerkoopFactuur/impl/TransactionLockingRepository.cls.xml	(.../TransactionLockingRepository.cls.xml)	(revision 34804)
+++ AX/Uitgaand/BKH/OpenstaandeVerkoopFactuur/impl/TransactionLockingRepository.cls.xml	(.../TransactionLockingRepository.cls.xml)	(revision 35005)
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="AX.Uitgaand.BKH.OpenstaandeVerkoopFactuur.impl.TransactionLockingRepository">
-<Super>TECH.RegisteredObject,TECH.Mockable</Super>
+<Super>TECH.Repository.OdbcBasedRepositoryTemplate,TECH.Mockable</Super>
 
-<Property name="ClassMethodExecuter">
-<Type>TECH.Executer.ClassMethod</Type>
-</Property>
-
-<Property name="ClassName">
-<Type>%String</Type>
+<Property name="PersistentObjectAPI">
+<Type>TECH.Persistent.PersistentObjectAPI</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="QueryAPI">
-<Type>TECH.Query.QueryAPI</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="%OnNew">
-<FormalSpec>initvalue:%CacheString</FormalSpec>
+<FormalSpec>QueryAPI:TECH.Query.QueryAPI</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..ClassMethodExecuter = ##class(TECH.Executer.impl.ClassMethod).%New()
-	Set ..ClassName = "AX.Uitgaand.BKH.OpenstaandeVerkoopFactuur.data.TransactionsLocking"_##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_BKH_OpenstaandeVerkoopFactuur_Transaction_Storage")
+	do ##class(TECH.Repository.OdbcBasedRepositoryTemplate)$this.%OnNew(.QueryAPI)
+	
+	Set ..ClassName = "AX.Uitgaand.BKH.OpenstaandeVerkoopFactuur.data.TransactionLocking"_##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_BKH_OpenstaandeVerkoopFactuur_Transaction_Storage")
 	Set ..QueryAPI = ##class(TECH.Context).Instance().GeefQueryAPI()
+	Set ..PersistentObjectAPI = ##class(TECH.Context).Instance().GeefPersistentObjectAPI()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="ZoekAlle">
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[
-	Set Query = ##class(TECH.ClassQuery).%New(..ClassName,"%Extend")
-	Quit ##class(TECH.Repository.RepositoryResultIterator).%New(..QueryAPI.GetResultSet(Query),$this)
+	Set Query = ##class(TECH.DynamicQuery).%New("SELECT RECID FROM "_##class(TECH.CompiledClassUtils).GetSQLTableName(..ClassName))
+	quit ##class(TECH.Repository.RepositoryResultIterator).%New(..GetIterator(Query),$this)
 ]]></Implementation>
 </Method>
+
+<Method name="GeefViaID">
+<FormalSpec>TransactionLockingId:%String</FormalSpec>
+<ReturnType>TECH.Persistent</ReturnType>
+<Implementation><![CDATA[	quit ..PersistentObjectAPI.OpenID(..ClassName,TransactionLockingId)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AX/Uitgaand/BKH/OpenstaandeVerkoopFactuur/impl/TransactionRepository.cls.xml
===================================================================
diff -u -r34791 -r35005
--- AX/Uitgaand/BKH/OpenstaandeVerkoopFactuur/impl/TransactionRepository.cls.xml	(.../TransactionRepository.cls.xml)	(revision 34791)
+++ AX/Uitgaand/BKH/OpenstaandeVerkoopFactuur/impl/TransactionRepository.cls.xml	(.../TransactionRepository.cls.xml)	(revision 35005)
@@ -1,37 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="AX.Uitgaand.BKH.OpenstaandeVerkoopFactuur.impl.TransactionRepository">
-<Super>TECH.RegisteredObject,TECH.Mockable</Super>
+<Super>TECH.Repository.OdbcBasedRepositoryTemplate,TECH.Mockable</Super>
 
 <Property name="ClassMethodExecuter">
 <Type>TECH.Executer.ClassMethod</Type>
 </Property>
 
-<Property name="ClassName">
-<Type>%String</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="QueryAPI">
-<Type>TECH.Query.QueryAPI</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="FirmaBepaler">
 <Type>AX.common.impl.FirmaBepaler</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
+<FormalSpec>QueryAPI:TECH.Query.QueryAPI</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
+	do ##class(TECH.Repository.OdbcBasedRepositoryTemplate)$this.%OnNew(.QueryAPI)
+	
 	set ..ClassMethodExecuter = ##class(TECH.Executer.impl.ClassMethod).%New()
 	set ..ClassName = "AX.Uitgaand.BKH.OpenstaandeVerkoopFactuur.data.Transactions"_##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_BKH_OpenstaandeVerkoopFactuur_Transaction_Storage")
-	set ..QueryAPI = ##class(TECH.Context).Instance().GeefQueryAPI()
 	set ..FirmaBepaler = ##class(AX.common.impl.FirmaBepaler).%New()
+	
 	quit $$$OK
 ]]></Implementation>
 </Method>
@@ -54,8 +47,8 @@
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[
 	#dim SqlTableName As %String = ##class(TECH.CompiledClassUtils).GetSQLTableName(..ClassName)
-	set Query = ##class(TECH.DynamicQuery).%New("SELECT RecId FROM "_SqlTableName_" WHERE TransactionId = ? AND %SQLUpper(DataAreaID) = %SQLUpper(?)",$listbuild(Id,..FirmaBepaler.GeefInitialen()))
-	quit ##class(TECH.Repository.RepositoryResultIterator).%New(..QueryAPI.GetResultSet(Query),$this)
+	set Query = ##class(TECH.DynamicQuery).%New("SELECT RecId FROM "_SqlTableName_" WHERE TransactionId = ? AND DataAreaID = ?",$listbuild(Id,..FirmaBepaler.GeefInitialen()))
+	quit ##class(TECH.Repository.RepositoryResultIterator).%New(..GetIterator(Query),$this)
 ]]></Implementation>
 </Method>
 </Class>