Index: vhUnitTest/APPS/TRANSP/GLS/Shipment/Verwerker/TestGLSMeerdereBonnenInEenTransport.cls.xml
===================================================================
diff -u -r66911 -r67151
--- vhUnitTest/APPS/TRANSP/GLS/Shipment/Verwerker/TestGLSMeerdereBonnenInEenTransport.cls.xml	(.../TestGLSMeerdereBonnenInEenTransport.cls.xml)	(revision 66911)
+++ vhUnitTest/APPS/TRANSP/GLS/Shipment/Verwerker/TestGLSMeerdereBonnenInEenTransport.cls.xml	(.../TestGLSMeerdereBonnenInEenTransport.cls.xml)	(revision 67151)
@@ -25,7 +25,7 @@
 <Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
 	do ##super()
-	#dim Query As %String = "Delete from APPS_common_KlantKost_impl_data.GLSTransportKostItem where KlantNr = ?"
+	#dim Query As %String = "Delete from APPS_TRANSP_GLS_Shipment_Verwerker.GLSTransportKostItem where KlantNr = ?"
 	#dim ResultSet As %ResultSet = $$ExecDynQuery^vhLib.Query(Query,$LB(1000))
 	
 	#dim Datum As %Date = ##class(TECH.DateTime).TextToDate("21.10.01")
@@ -100,7 +100,7 @@
 	
 	Kill ^KFA1("F",1000,-Datum)
 	
-	#dim Query As %String = "Delete from APPS_common_KlantKost_impl_data.GLSTransportKostItem where KlantNr = ?"
+	#dim Query As %String = "Delete from APPS_TRANSP_GLS_Shipment_Verwerker.GLSTransportKostItem where KlantNr = ?"
 	#dim ResultSet As %ResultSet = $$ExecDynQuery^vhLib.Query(Query,$LB(1000))
 	
 	do ##super()
@@ -117,7 +117,7 @@
 	
 	Do $$$AssertContains(Feedback,"1 bon(nen) werden verwerkt in de periode van 05-09-2001 tot 23-10-2001.")
 	
-	#dim Query As %String = "Select * from APPS_common_KlantKost_impl_data.GLSTransportKostItem where KlantNr = ?"
+	#dim Query As %String = "Select * from APPS_TRANSP_GLS_Shipment_Verwerker.GLSTransportKostItem where KlantNr = ?"
 	#dim ResultSet As %ResultSet = $$ExecDynQuery^vhLib.Query(Query,$LB(1000))
 	
 	Do $$$AssertTrue(ResultSet.Next(),"Eerste GLS transport kost item gevonden voor klant 1000")	
Index: vhUnitTest/APPS/TRANSP/GLS/Shipment/Verwerker/TestGLSService.cls.xml
===================================================================
diff -u -r66911 -r67151
--- vhUnitTest/APPS/TRANSP/GLS/Shipment/Verwerker/TestGLSService.cls.xml	(.../TestGLSService.cls.xml)	(revision 66911)
+++ vhUnitTest/APPS/TRANSP/GLS/Shipment/Verwerker/TestGLSService.cls.xml	(.../TestGLSService.cls.xml)	(revision 67151)
@@ -15,7 +15,7 @@
 	Do $$$AssertContains(Feedback,"Bon '222222' op factuur '3' stond op verzendwijze : 'OD2 '.")
 	Do $$$AssertContains(Feedback,"Niet gekoppelde BonID's : 555555")
 	
-	#dim Query As %String = "Select * from APPS_common_KlantKost_impl_data.GLSTransportKostItem where KlantNr = ?"
+	#dim Query As %String = "Select * from APPS_TRANSP_GLS_Shipment_verwerker.GLSTransportKostItem where KlantNr = ?"
 	#dim ResultSet As %ResultSet = $$ExecDynQuery^vhLib.Query(Query,$LB(1000))
 		
 	Do $$$AssertTrue(ResultSet.Next(),"Eerste GLS transport kost item gevonden voor klant 1000")	
@@ -65,7 +65,7 @@
 	Do ##class(DOM.DomeinContext).Instance().PushVerkoopAPIClassName("vhUnitTest.APPS.TRANSP.GLS.Shipment.Verwerker.DataMKlantAPI")
 	Do ##class(DOM.DomeinContext).Instance().PushOrderAPIClassName("vhUnitTest.DOM.VKP.impl.UnitTestOrderAPI")
 	
-	#dim Query As %String = "Delete from APPS_common_KlantKost_impl_data.GLSTransportKostItem where KlantNr = ?"
+	#dim Query As %String = "Delete from APPS_TRANSP_GLS_Shipment_verwerker.GLSTransportKostItem where KlantNr = ?"
 	#dim ResultSet As %ResultSet = $$ExecDynQuery^vhLib.Query(Query,$LB(1000))
 	
 	#dim Datum,BonID,FactuurID
@@ -160,7 +160,7 @@
 		Kill ^KUL(1000,"F",Teller,1) 
 	}
 	
-	#dim Query As %String = "Delete from APPS_common_KlantKost_impl_data.GLSTransportKostItem where KlantNr = ?"
+	#dim Query As %String = "Delete from APPS_TRANSP_GLS_Shipment_verwerker.GLSTransportKostItem where KlantNr = ?"
 	#dim ResultSet As %ResultSet = $$ExecDynQuery^vhLib.Query(Query,$LB(1000))
 	
 	Quit $$$OK
Index: APPS/TRANSP/GLS/Shipment/Verwerker/IndividueelKostItem.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/GLS/Shipment/Verwerker/IndividueelKostItem.cls.xml	(revision 0)
+++ APPS/TRANSP/GLS/Shipment/Verwerker/IndividueelKostItem.cls.xml	(revision 67151)
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.GLS.Shipment.Verwerker.IndividueelKostItem">
+<ClassType>persistent</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>TECH.Concurrency.VhPersistent</Super>
+
+<Property name="Datum">
+<Type>%Date</Type>
+</Property>
+
+<Property name="Jaar">
+<Type>%Integer</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Maand">
+<Type>%Integer</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="KlantNr">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="KostType">
+<Type>Stat.enu.KlantKostType</Type>
+</Property>
+
+<Property name="Kost">
+<Type>%Float</Type>
+</Property>
+
+<Property name="Info">
+<Type>%String</Type>
+<Parameter name="MAXLEN" value="250"/>
+<Parameter name="TRUNCATE" value="1"/>
+</Property>
+
+<Index name="IndexOnKlantNr">
+<Properties>KlantNr</Properties>
+</Index>
+
+<Index name="IndexOnJaar">
+<Properties>Jaar</Properties>
+</Index>
+
+<Index name="IndexOnMaand">
+<Properties>Maand</Properties>
+</Index>
+
+<Index name="IndexOnKostType">
+<Properties>KostType</Properties>
+</Index>
+
+<Method name="%OnNew">
+<FormalSpec>Datum:%Date,KlantNr:%Integer,Kost:%Integer,Info:%CacheString=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..Datum = Datum
+	Set ..KlantNr = ..GeefTeRegistrerenKlantID(KlantNr)
+	Set ..Kost = Kost
+	Set ..Info = Info
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="%OnBeforeSave">
+<FormalSpec>insert:%Boolean</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..Jaar = ##class(TECH.DateTime).Jaar(..Datum)
+	Set ..Maand = ##class(TECH.DateTime).Maand(..Datum)
+	Quit ##super(insert)
+]]></Implementation>
+</Method>
+
+<Method name="GeefTeRegistrerenKlantID">
+<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim PartijID As DOM.common.PartijID = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID(KlantID)
+	#dim Klant As DOM.VKP.VanHoeckeKlant = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().GeefKlant(PartijID)
+	#dim KlantNr As %String = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(Klant.GeefID())
+	#dim CommercieelOverdrachtKlantID = Klant.GeefCommericeelOverdrachtKlantID()
+	Quit $S($length(CommercieelOverdrachtKlantID):CommercieelOverdrachtKlantID,1:KlantNr)
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+<DataLocation>^APPS.commonB5C.IndividueelK7A2D</DataLocation>
+<DefaultData>IndividueelKostItemDefaultData</DefaultData>
+<IdLocation>^APPS.commonB5C.IndividueelK7A2D</IdLocation>
+<IndexLocation>^APPS.commonB5C.IndividueelK7A2I</IndexLocation>
+<StreamLocation>^APPS.commonB5C.IndividueelK7A2S</StreamLocation>
+<Data name="IndividueelKostItemDefaultData">
+<Value name="1">
+<Value>%%CLASSNAME</Value>
+</Value>
+<Value name="2">
+<Value>Datum</Value>
+</Value>
+<Value name="3">
+<Value>Klant</Value>
+</Value>
+<Value name="4">
+<Value>Kost</Value>
+</Value>
+<Value name="5">
+<Value>KostType</Value>
+</Value>
+<Value name="6">
+<Value>KlantNr</Value>
+</Value>
+<Value name="7">
+<Value>Info</Value>
+</Value>
+<Value name="8">
+<Value>InstanceVersion</Value>
+</Value>
+<Value name="9">
+<Value>Jaar</Value>
+</Value>
+<Value name="10">
+<Value>Maand</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/GLS/Shipment/Verwerker.cls.xml
===================================================================
diff -u -r52423 -r67151
--- APPS/TRANSP/GLS/Shipment/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 52423)
+++ APPS/TRANSP/GLS/Shipment/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 67151)
@@ -443,7 +443,7 @@
 	#dim Aantal As Integer = $$$Trim(..Reader.Data("AantalColli"))
 	If Aantal > 0 {
 		#dim VerpakkingEenheidType As DOM.TRANSP.enu.VerpakkingEenheidType = ##class(DOM.TRANSP.enu.VerpakkingEenheidType).Colli()
-		Set GLSKostItem = ##class(APPS.common.KlantKost.impl.data.GLSTransportKostItem).%New(Datum,KlantID,Kost,VerpakkingEenheidType,Aantal,Info,BonID,ShipmentID)	
+		Set GLSKostItem = ##class(APPS.TRANSP.GLS.Shipment.Verwerker.GLSTransportKostItem).%New(Datum,KlantID,Kost,VerpakkingEenheidType,Aantal,Info,BonID,ShipmentID)	
 		Set GLSKostItem.GLSBestand = ..GLSBestand
 		Do GLSKostItem.Save()
 	}
@@ -459,7 +459,7 @@
 	#dim AantalPalletten As %Integer = $$$Trim(..Reader.Data("AantalPalletten"))
 	If AantalPalletten > 0 {
 		#dim VerpakkingEenheidType As DOM.TRANSP.enu.VerpakkingEenheidType = ##class(DOM.TRANSP.enu.VerpakkingEenheidType).EuroPallet()
-		Set GLSKostItem = ##class(APPS.common.KlantKost.impl.data.GLSTransportKostItem).%New(Datum,KlantID,Kost,VerpakkingEenheidType,AantalPalletten,Info,BonID,ShipmentID)
+		Set GLSKostItem = ##class(APPS.TRANSP.GLS.Shipment.Verwerker.GLSTransportKostItem).%New(Datum,KlantID,Kost,VerpakkingEenheidType,AantalPalletten,Info,BonID,ShipmentID)
 		Set GLSKostItem.GLSBestand = ..GLSBestand
 		Do GLSKostItem.Save()
 	}
Index: APPS/TRANSP/GLS/Shipment/Verwerker/GLSTransportKostItem.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/GLS/Shipment/Verwerker/GLSTransportKostItem.cls.xml	(revision 0)
+++ APPS/TRANSP/GLS/Shipment/Verwerker/GLSTransportKostItem.cls.xml	(revision 67151)
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.GLS.Shipment.Verwerker.GLSTransportKostItem">
+<ClassType>persistent</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.TRANSP.GLS.Shipment.Verwerker.IndividueelKostItem</Super>
+
+<Property name="Aantal">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="VerpakkingEenheidType">
+<Type>DOM.TRANSP.enu.VerpakkingEenheidType</Type>
+</Property>
+
+<Property name="ShipmentID">
+<Type>%String</Type>
+</Property>
+
+<Property name="BonID">
+<Type>%String</Type>
+</Property>
+
+<Property name="GLSBestand">
+<Type>%String</Type>
+<Parameter name="MAXLEN" value="250"/>
+</Property>
+
+<Index name="IndexOnBonID">
+<Properties>BonID</Properties>
+</Index>
+
+<Method name="%OnNew">
+<FormalSpec>Datum:%Date,KlantNr:%Integer,Kost:%Integer,VerpakkingEenheidType:DOM.TRANSP.enu.VerpakkingEenheidType,Aantal:%Integer=0,Info:%String,BonID:%String,ShipmentID:%String</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Do ##super(Datum,KlantNr,Kost,Info)
+	Set ..KostType = ##class(Stat.enu.KlantKostType).GLS()
+	Set ..BonID = BonID
+	Set ..ShipmentID = ShipmentID
+	Set ..VerpakkingEenheidType = VerpakkingEenheidType
+	Set ..Aantal = Aantal
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+<DefaultData>GLSTransportKostItemDefaultData</DefaultData>
+<Data name="GLSTransportKostItemDefaultData">
+<Subscript>"GLSTransportKostItem"</Subscript>
+<Value name="1">
+<Value>ShipmentID</Value>
+</Value>
+<Value name="2">
+<Value>Aantal</Value>
+</Value>
+<Value name="3">
+<Value>VerpakkingEenheidType</Value>
+</Value>
+<Value name="4">
+<Value>BonID</Value>
+</Value>
+<Value name="5">
+<Value>GLSBestand</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+
+
+</Export>