Index: APPS/common/KlantKost/impl/KlantKostService.cls.xml
===================================================================
diff -u -r2502 -r2568
--- APPS/common/KlantKost/impl/KlantKostService.cls.xml	(.../KlantKostService.cls.xml)	(revision 2502)
+++ APPS/common/KlantKost/impl/KlantKostService.cls.xml	(.../KlantKostService.cls.xml)	(revision 2568)
@@ -168,7 +168,8 @@
 		If ($$$ISERR(Status)) w $$ParseStatus^vhLib(Status)
 		
 	/// Losse transporten
-		Do ##class(APPS.common.KlantKost.impl.data.MeervoudigeFactor).%DeleteId("LosTransport")		
+		Do ##class(APPS.common.KlantKost.impl.data.MeervoudigeFactor).%DeleteId("LosTransport")	
+		&SQL(delete from APPS_common_KlantKost_impl_data.Factor WHERE ID = 'LosTransport')	
 		
 		Set LosTransportFactor = ##class(APPS.common.KlantKost.impl.data.MeervoudigeFactor).%New("LosTransport")		
 		Set Status = LosTransportFactor.%Save()
@@ -212,9 +213,6 @@
 		/// LUX - TTC - Pallet
 		Set FactorNaam = TransportCalculator.GeefFactorNaamLosTransport(Luxemburg,TTC,EuroPallet)		
 		Do ..ZetFactorMetNaamEnWaarde(LosTransportFactor,FactorNaam,37.34,GeldigVanaf)
-		/// OPTIMAPACK
-		Set FactorNaam = TransportCalculator.GeefFactorNaamOptimaPackPallet()		
-		Do ..ZetFactorMetNaamEnWaarde(LosTransportFactor,FactorNaam,22.23,GeldigVanaf)
 		
 		///////////////////
 		////   GLS    /////
@@ -241,15 +239,35 @@
 		
 		Set LosTransportFactor = ""
 		
+		/// Uitzonderingen in los transport
+		Set Naam = "LosTransportUitzonderingen"
+		Do ##class(APPS.common.KlantKost.impl.data.MeervoudigeFactor).%DeleteId(Naam)	
+		&SQL(delete from APPS_common_KlantKost_impl_data.Factor WHERE ID = :Naam)	
+		
+		
+		Set KlantAPI = ##class(DOM.DomeinContext).Instance().GeefKlantAPI()
+		Set LosTransportFactor = ##class(APPS.common.KlantKost.impl.data.MeervoudigeFactor).%New(Naam)		
+		Set Status = LosTransportFactor.%Save()
+		If ($$$ISERR(Status)) w $$ParseStatus^vhLib(Status)
+		
+		/// OPTIMA Per pallet eigen prijs.
+		Set KlantOptima = KlantAPI.GeefKlantOptimaPack()
+		Set FactorNaam = TransportCalculator.GeefFactorNaamLosTransportUitz(KlantOptima,Belgie,TTC,EuroPallet)		
+		Do ..ZetFactorMetNaamEnWaarde(LosTransportFactor,FactorNaam,22.23,GeldigVanaf)	
+		
+		Set LosTransportFactor = ""	
+		
 	///////////////////////
 	////Rit Transport /////
 	///////////////////////
 		Do ##class(APPS.common.KlantKost.impl.data.MeervoudigeFactor).%DeleteId("RitTransport")		
+		&SQL(delete from APPS_common_KlantKost_impl_data.Factor WHERE ID = 'RitTransport')
 		
 		Set RitTransportFactor = ##class(APPS.common.KlantKost.impl.data.MeervoudigeFactor).%New("RitTransport")		
 		Set Status = RitTransportFactor.%Save()
 		If ($$$ISERR(Status)) w $$ParseStatus^vhLib(Status)
 		
+		
 		Set KlantAPI = ##class(DOM.DomeinContext).Instance().GeefKlantAPI()
 		
 		Set FactorNaam = TransportCalculator.GeefFactorNaamRitTransport(KlantAPI.GeefKlantHaefeleNederland())