Index: APPS/BKH/AankoopFactuurArchivering/impl/EasyFormRepository.cls.xml
===================================================================
diff -u -r29670 -r29672
--- APPS/BKH/AankoopFactuurArchivering/impl/EasyFormRepository.cls.xml	(.../EasyFormRepository.cls.xml)	(revision 29670)
+++ APPS/BKH/AankoopFactuurArchivering/impl/EasyFormRepository.cls.xml	(.../EasyFormRepository.cls.xml)	(revision 29672)
@@ -43,13 +43,21 @@
 <Default>'3CBB1FC3-D8A9-482C-8062-1412A9ABE017'</Default>
 </Parameter>
 
-<Parameter name="FirmaEntityIdVanHoecke">
-<Default>'E4A6D3B3-059C-4E6B-87B2-22B4C238A4D6'</Default>
-</Parameter>
+<Property name="InterneFirmaBepaler">
+<Type>APPS.BKH.AankoopFactuurArchivering.impl.EasyFormInterneFirmaBepaler</Type>
+<Private>1</Private>
+</Property>
 
-<Parameter name="FirmaEntityIdHalux">
-<Default>'E5A6D3B3-059C-4E6B-87B2-22B4C238A4D6'</Default>
-</Parameter>
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..InterneFirmaBepaler = ##class(APPS.BKH.AankoopFactuurArchivering.impl.EasyFormInterneFirmaBepaler).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
 
 <Method name="Execute">
 <FormalSpec><![CDATA[Query:%String,Param:%List,&List:%ListOfDataTypes]]></FormalSpec>
Index: APPS/BKH/AankoopFactuurArchivering/impl/DocumentZoeker.cls.xml
===================================================================
diff -u -r29670 -r29672
--- APPS/BKH/AankoopFactuurArchivering/impl/DocumentZoeker.cls.xml	(.../DocumentZoeker.cls.xml)	(revision 29670)
+++ APPS/BKH/AankoopFactuurArchivering/impl/DocumentZoeker.cls.xml	(.../DocumentZoeker.cls.xml)	(revision 29672)
@@ -114,7 +114,9 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim Query As %String
- 	set Query = "SELECT EntityID FROM APPS_BKH_AankoopFactuurArchivering_dataEF.EntityField WHERE FieldTypeID = "_ ..#AankoopFactuurID _ " AND StringValue = ? AND Deleted = 0"
+ 	set Query = "SELECT EntityID FROM APPS_BKH_AankoopFactuurArchivering_dataEF.EntityField"_
+	   			"INNER JOIN APPS_BKH_AankoopFactuurArchivering_dataEF.EntityField InterneFirma ON ( (InterneFirma.EntityID=EntityID) AND (InterneFirma.FieldTypeID="_..#Firma_") AND (InterneFirma.RefEntityID="_..InterneFirmaBepaler.GeefInterneFirmaEntityID()_") )" _
+ 					"WHERE FieldTypeID = "_ ..#AankoopFactuurID _ " AND StringValue = ? AND Deleted = 0"
 	
 	do ..Execute(Query,$listbuild(..AankoopFactuurID),..ViaAankoopFactuurID)
 ]]></Implementation>
@@ -127,6 +129,7 @@
   	set Query = "" _
 	   " SELECT E.EntityID FROM APPS_BKH_AankoopFactuurArchivering_dataEF.Entity E INNER JOIN APPS_BKH_AankoopFactuurArchivering_dataEF.EntityField EF1 ON EF1.EntityID = E.EntityID "_
 	   "   INNER JOIN APPS_BKH_AankoopFactuurArchivering_dataEF.EntityField EF2 ON EF2.EntityID = E.EntityID " _
+	   "   INNER JOIN APPS_BKH_AankoopFactuurArchivering_dataEF.EntityField InterneFirma ON ( (InterneFirma.EntityID=E.EntityID) AND (InterneFirma.FieldTypeID="_..#Firma_") AND (InterneFirma.RefEntityID="_..InterneFirmaBepaler.GeefInterneFirmaEntityID()_") )" _
 	   "   WHERE E.Type = "_ ..#InvoiceDocument _" AND E.Deleted = 0 AND EF1.FieldTypeID = "_..#Leverancier _" AND EF1.RefEntityID IN "_
 	  			  
 	   " ( SELECT FE.EntityID FROM APPS_BKH_AankoopFactuurArchivering_dataEF.EntityField FEF INNER JOIN APPS_BKH_AankoopFactuurArchivering_dataEF.Entity FE ON FEF.EntityID = FE.EntityID "_
@@ -145,6 +148,7 @@
   	set Query = "" _
 	   "  SELECT E.EntityID FROM APPS_BKH_AankoopFactuurArchivering_dataEF.Entity E INNER JOIN APPS_BKH_AankoopFactuurArchivering_dataEF.EntityField EF1 ON EF1.EntityID = E.EntityID "_
 	   "   INNER JOIN APPS_BKH_AankoopFactuurArchivering_dataEF.EntityField EF2 ON EF2.EntityID = E.EntityID " _
+	   "   INNER JOIN APPS_BKH_AankoopFactuurArchivering_dataEF.EntityField InterneFirma ON ( (InterneFirma.EntityID=E.EntityID) AND (InterneFirma.FieldTypeID="_..#Firma_") AND (InterneFirma.RefEntityID="_..InterneFirmaBepaler.GeefInterneFirmaEntityID()_") )" _
 	   "   WHERE E.Type = "_ ..#InvoiceDocument _" AND E.Deleted = 0 AND EF1.FieldTypeID = "_..#Leverancier _" AND EF1.RefEntityID IN "_
 	  			  
 	   " ( SELECT FE.EntityID FROM APPS_BKH_AankoopFactuurArchivering_dataEF.EntityField FEF INNER JOIN APPS_BKH_AankoopFactuurArchivering_dataEF.Entity FE ON FEF.EntityID = FE.EntityID "_
@@ -163,6 +167,7 @@
   	set Query = "" _
 	   " SELECT E.EntityID FROM APPS_BKH_AankoopFactuurArchivering_dataEF.Entity E INNER JOIN APPS_BKH_AankoopFactuurArchivering_dataEF.EntityField EF1 ON EF1.EntityID = E.EntityID "_
 	   "   INNER JOIN APPS_BKH_AankoopFactuurArchivering_dataEF.EntityField EF2 ON EF2.EntityID = E.EntityID " _
+	   "   INNER JOIN APPS_BKH_AankoopFactuurArchivering_dataEF.EntityField InterneFirma ON ( (InterneFirma.EntityID=E.EntityID) AND (InterneFirma.FieldTypeID="_..#Firma_") AND (InterneFirma.RefEntityID="_..InterneFirmaBepaler.GeefInterneFirmaEntityID()_") )" _
 	   "   WHERE E.Type = "_ ..#InvoiceDocument _" AND E.Deleted = 0 AND EF1.FieldTypeID = "_..#Leverancier _" AND EF1.RefEntityID IN "_
 	  			  
 	   " ( SELECT FE.EntityID FROM APPS_BKH_AankoopFactuurArchivering_dataEF.EntityField FEF INNER JOIN APPS_BKH_AankoopFactuurArchivering_dataEF.Entity FE ON FEF.EntityID = FE.EntityID "_
Index: APPS/BKH/AankoopFactuurArchivering/impl/EasyFormInterneFirmaBepaler.cls.xml
===================================================================
diff -u
--- APPS/BKH/AankoopFactuurArchivering/impl/EasyFormInterneFirmaBepaler.cls.xml	(revision 0)
+++ APPS/BKH/AankoopFactuurArchivering/impl/EasyFormInterneFirmaBepaler.cls.xml	(revision 29672)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.BKH.AankoopFactuurArchivering.impl.EasyFormInterneFirmaBepaler">
+<Super>DOM.common.impl.InterneFirmaBepaler,DOM.common.enu.InterneFirma.Verwerker</Super>
+
+<Property name="FirmaEntityID">
+<Type>TECH.String</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="GeefInterneFirmaEntityID">
+<ReturnType>TECH.String</ReturnType>
+<Implementation><![CDATA[
+	Set ..FirmaEntityID = ""
+	Do ..Verwerk(..GeefInterneFirma())
+	Quit ..FirmaEntityID
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaluxNv">
+<Private>1</Private>
+<Implementation><![CDATA[	Set ..FirmaEntityID = "'E5A6D3B3-059C-4E6B-87B2-22B4C238A4D6'"
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkVanHoeckeBv">
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkVanHoeckeNv">
+<Private>1</Private>
+<Implementation><![CDATA[	Set ..FirmaEntityID = "'E4A6D3B3-059C-4E6B-87B2-22B4C238A4D6'"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: DOM/common/enu/InterneFirma/AutoComplete.cls.xml
===================================================================
diff -u
--- DOM/common/enu/InterneFirma/AutoComplete.cls.xml	(revision 0)
+++ DOM/common/enu/InterneFirma/AutoComplete.cls.xml	(revision 29672)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="DOM.common.enu.InterneFirma.AutoComplete">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de Enumeratie - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+De enumeratie Eigenschapn moeten als type de enumeratieklasse zelf terug geven. De enumeratieklasse moet afleiden van TECH.Enumeration</Description>
+<ClassType>serial</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%SerialObject</Super>
+
+<Property name="HaluxNv">
+<Type>DOM.common.enu.InterneFirma</Type>
+<InitialExpression>"Halux nv"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="VanHoeckeBv">
+<Type>DOM.common.enu.InterneFirma</Type>
+<InitialExpression>"Van Hoecke bv"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="VanHoeckeNv">
+<Type>DOM.common.enu.InterneFirma</Type>
+<InitialExpression>"Van Hoecke nv"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+</Class>
+
+
+</Export>
Index: DOM/common/enu/InterneFirma/Verwerker.cls.xml
===================================================================
diff -u
--- DOM/common/enu/InterneFirma/Verwerker.cls.xml	(revision 0)
+++ DOM/common/enu/InterneFirma/Verwerker.cls.xml	(revision 29672)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="DOM.common.enu.InterneFirma.Verwerker">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de Enumeratie - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+De enumeratie methoden moeten als type de enumeratieklasse zelf terug geven. De enumeratieklasse moet afleiden van TECH.Enumeration</Description>
+<Abstract>1</Abstract>
+<ProcedureBlock>1</ProcedureBlock>
+
+<Method name="Verwerk">
+<Final>1</Final>
+<FormalSpec>InterneFirma:DOM.common.enu.InterneFirma</FormalSpec>
+<Implementation><![CDATA[
+	If InterneFirma = "Halux nv" {
+		Do ..VerwerkHaluxNv()
+	} ElseIf InterneFirma = "Van Hoecke bv" {
+		Do ..VerwerkVanHoeckeBv()
+	} ElseIf InterneFirma = "Van Hoecke nv" {
+		Do ..VerwerkVanHoeckeNv()
+	} Else {
+		Set Exceptie = ##class(TECH.Exceptions.EnumerationException).%New(InterneFirma,"DOM.common.enu.InterneFirma")
+		Do ##class(TECH.ExceptionHandler).Throw(Exceptie)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkHaluxNv">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkVanHoeckeBv">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkVanHoeckeNv">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>