Index: APPS/PM/Maatwerk/TBX/Frees/Generator.cls.xml
===================================================================
diff -u -r44137 -r45824
--- APPS/PM/Maatwerk/TBX/Frees/Generator.cls.xml	(.../Generator.cls.xml)	(revision 44137)
+++ APPS/PM/Maatwerk/TBX/Frees/Generator.cls.xml	(.../Generator.cls.xml)	(revision 45824)
@@ -59,6 +59,8 @@
 	#dim API As DOM.PM.ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI()
 	#dim TandemBox As DOM.PM.TBXProduct.TBXLade = API.GeefProduct(PRNr)
 	If (TandemBox.BevatBodem()) {
+		#dim TemplateNameMpr As %String = ""
+
 		#dim Breedte As %Decimal = TandemBox.GeefBodemBreedte()
 		#dim Diepte As %Decimal = TandemBox.GeefBodemDiepte()
 		#dim Dikte As %Decimal = 16.1
@@ -85,6 +87,7 @@
 		If (FreesUitsparingen && TandemBox.%Extends("DOM.PM.TBXProduct.TBXLadeMetUitsparing"))
 		{
 			#dim Uitsparingen As %ListOfObjects = TandemBox.GeefUitsparingen()
+			Set TemplateNameMpr = "DUBBELE_SIFON.mpr"   ; Template is compatible met EnkeleSifon :-) 
 		
 			Set Variabelen("FreesGat") = 1
 			Set Variabelen("SBreed1") = Uitsparingen.GetAt(1).GeefBreedteInBodem()
@@ -124,34 +127,15 @@
 			}
 		}
 	
-		// Tipon
+		// Tipon DEPRECATED
 		If (Tipon && TandemBox.BevatTipOn())
 		{
-			Set Variabelen("TiponLi") = TandemBox.BevatTiponLinks()
-			Set Variabelen("TiponRe") = TandemBox.BevatTiponRechts()
-			;Set Variabelen("HasTipon") = 1   ; DEPRECATED 
-			Set FileSuffix = FileSuffix_"-Tipon"
-			// Smal 
-			If (Diepte >= Breedte)
-			{
-				Set Variabelen("Hoek") = 90
-				Set FileSuffix = FileSuffix_"Smal"
-			}
-			// Breed 
-			Else
-			{
-				Set FileSuffix = FileSuffix_"Breed"
-			}
-		
-			If (TandemBox.BevatSynchro())
-			{
-				Set FileSuffix = FileSuffix_"Synchro"
-				Set Variabelen("HasSync") = 1
-			}
+			Do ##class(TECH.Exceptions.UnimplementedException).Throw("TIPON is niet meer ondersteund voor TANDEMBOX. Batch:'"_..BatchID_"'  ProductID:'"_TandemBox.GeefPRNr()_"'.")
 		}
+
 		If (FileSuffix '= "")
 		{
-			Set MRGFile = ##class(APPS.PM.Maatwerk.TBX.Frees.MRG.MRGFile).%New(..BatchID, SequenceNr, DossierNr, FileSuffix, .Variabelen, "DUBBELE_SIFON.mpr")
+			Set MRGFile = ##class(APPS.PM.Maatwerk.TBX.Frees.MRG.MRGFile).%New(..BatchID, SequenceNr, DossierNr, FileSuffix, .Variabelen, TemplateNameMpr)
 		}	
 	}
 ]]></Implementation>