Index: APPS/TRANSP/Stapeling/dto/Pallet.cls.xml
===================================================================
diff -u -r35982 -r36002
--- APPS/TRANSP/Stapeling/dto/Pallet.cls.xml	(.../Pallet.cls.xml)	(revision 35982)
+++ APPS/TRANSP/Stapeling/dto/Pallet.cls.xml	(.../Pallet.cls.xml)	(revision 36002)
@@ -8,7 +8,7 @@
 <Type>APPS.TRANSP.Stapeling.dto.Afmeting</Type>
 </Property>
 
-<Property name="Gewicht">
+<Property name="GewichtInKG">
 <Type>TECH.Decimal</Type>
 </Property>
 
@@ -23,7 +23,7 @@
 <Value>Afmeting</Value>
 </Value>
 <Value name="2">
-<Value>Gewicht</Value>
+<Value>GewichtInKG</Value>
 </Value>
 </Data>
 </Storage>
Index: APPS/TRANSP/Offerte/impl/DHL/StapelingBepaler.cls.xml
===================================================================
diff -u -r36000 -r36002
--- APPS/TRANSP/Offerte/impl/DHL/StapelingBepaler.cls.xml	(.../StapelingBepaler.cls.xml)	(revision 36000)
+++ APPS/TRANSP/Offerte/impl/DHL/StapelingBepaler.cls.xml	(.../StapelingBepaler.cls.xml)	(revision 36002)
@@ -45,9 +45,7 @@
 	{
 		#dim Pallet As APPS.TRANSP.OfferteService.dto.Pallet = ##class(APPS.TRANSP.OfferteService.dto.Pallet).%New()
 		#dim PalletData As APPS.TRANSP.Offerte.impl.DHL.Data.Pallet = PallettenIterator.Next()
-		/// Gewichten in software in GRAM !!!
-		Set Pallet.Gewicht = PalletData.Gewicht 
-		/// AfMetingen Berekeninput zijn in millimeter !!!
+		Set Pallet.Gewicht = (PalletData.GewichtInKG * 1000)
 		Set Pallet.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(PalletData.Afmeting.Hoogte,PalletData.Afmeting.Breedte, PalletData.Afmeting.Lengte)
 		Do Palletten.Insert(Pallet)
 	}
Index: APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/ResponseNotifier.cls.xml
===================================================================
diff -u -r35989 -r36002
--- APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/ResponseNotifier.cls.xml	(.../ResponseNotifier.cls.xml)	(revision 35989)
+++ APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/ResponseNotifier.cls.xml	(.../ResponseNotifier.cls.xml)	(revision 36002)
@@ -48,7 +48,7 @@
 	{
 		#dim LoadedContainer As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Response.loadedcontainer = LoadedContainersIterator.Next()
 		#dim Pallet As APPS.TRANSP.Stapeling.dto.Pallet = ##class(APPS.TRANSP.Stapeling.dto.Pallet).%New()
-		Set Pallet.Gewicht = LoadedContainer.totalweight		
+		Set Pallet.GewichtInKG = LoadedContainer.totalweight		
 		Set Pallet.Afmeting.Hoogte = LoadedContainer.maxheight
 		Set Pallet.Afmeting.Lengte = LoadedContainer.maxlength
 		Set Pallet.Afmeting.Breedte = LoadedContainer.maxwidth
Index: APPS/TRANSP/Offerte/impl/DHL/Data/Pallet.cls.xml
===================================================================
diff -u -r35985 -r36002
--- APPS/TRANSP/Offerte/impl/DHL/Data/Pallet.cls.xml	(.../Pallet.cls.xml)	(revision 35985)
+++ APPS/TRANSP/Offerte/impl/DHL/Data/Pallet.cls.xml	(.../Pallet.cls.xml)	(revision 36002)
@@ -8,9 +8,25 @@
 <Type>APPS.TRANSP.Stapeling.dto.Afmeting</Type>
 </Property>
 
-<Property name="Gewicht">
+<Property name="GewichtInKG">
 <Type>TECH.Decimal</Type>
 </Property>
+
+<Storage name="Default">
+<Type>%Library.CacheSerialState</Type>
+<State>PalletState</State>
+<StreamLocation>^APPS.TRANSP.Offerte938E.PalletS</StreamLocation>
+<Data name="PalletState">
+<Structure>listnode</Structure>
+<Subscript/>
+<Value name="1">
+<Value>Afmeting</Value>
+</Value>
+<Value name="2">
+<Value>GewichtInKG</Value>
+</Value>
+</Data>
+</Storage>
 </Class>
 
 
Index: vhTest/Utils/APPS/TRANSP/Stapeling/dto/StapelingResultaat.cls.xml
===================================================================
diff -u -r35995 -r36002
--- vhTest/Utils/APPS/TRANSP/Stapeling/dto/StapelingResultaat.cls.xml	(.../StapelingResultaat.cls.xml)	(revision 35995)
+++ vhTest/Utils/APPS/TRANSP/Stapeling/dto/StapelingResultaat.cls.xml	(.../StapelingResultaat.cls.xml)	(revision 36002)
@@ -10,7 +10,7 @@
 	#dim StapelingResultaat As APPS.TRANSP.Stapeling.dto.StapelingResultaat = ##class(APPS.TRANSP.Stapeling.dto.StapelingResultaat).%New()
 	Set StapelingResultaat.Referentie = "DummyReferentie"
 	#dim Pallet As APPS.TRANSP.Stapeling.dto.Pallet = ##class(APPS.TRANSP.Stapeling.dto.Pallet).%New()
-	Set Pallet.Gewicht = 100
+	Set Pallet.GewichtInKG = 100
 	Set Pallet.Afmeting = ##class(APPS.TRANSP.Stapeling.dto.Afmeting).%New(90,80,70)
 	Do StapelingResultaat.Palletten.Insert(Pallet)
 	Quit StapelingResultaat
Index: vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/PallettenBepaler/Bepaal/Test.cls.xml
===================================================================
diff -u -r35996 -r36002
--- vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/PallettenBepaler/Bepaal/Test.cls.xml	(.../Test.cls.xml)	(revision 35996)
+++ vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/PallettenBepaler/Bepaal/Test.cls.xml	(.../Test.cls.xml)	(revision 36002)
@@ -16,7 +16,7 @@
 	
 	Do $$$AssertEquals(Palletten.Count(),1)
 	#dim Pallet As APPS.TRANSP.OfferteService.dto.Pallet = Palletten.GetAt(1)
-	Do $$$AssertEquals(Pallet.Gewicht,100)
+	Do $$$AssertEquals(Pallet.Gewicht,100000)
 	Do $$$AssertEquals(Pallet.Afmeting.Hoogte,90)
 	Do $$$AssertEquals(Pallet.Afmeting.Breedte,80)
 	Do $$$AssertEquals(Pallet.Afmeting.Lengte,70)
Index: vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/ResponseNotifier/Test.cls.xml
===================================================================
diff -u -r35981 -r36002
--- vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/ResponseNotifier/Test.cls.xml	(.../Test.cls.xml)	(revision 35981)
+++ vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/ResponseNotifier/Test.cls.xml	(.../Test.cls.xml)	(revision 36002)
@@ -37,7 +37,7 @@
 	if $$$AssertEquals(Events.Count(),1) {
 		#dim StapelingResultaat As APPS.TRANSP.Stapeling.dto.StapelingResultaat = Events.GetAt(1).Data.GeefStapelingResultaat()
 		do $$$AssertEquals(StapelingResultaat.Referentie,"Referentie")
-		do $$$AssertEquals(StapelingResultaat.Palletten.GetAt(1).Gewicht,100)
+		do $$$AssertEquals(StapelingResultaat.Palletten.GetAt(1).GewichtInKG,100)
 		do $$$AssertEquals(StapelingResultaat.Palletten.GetAt(1).Afmeting.Breedte,70)
 		do $$$AssertEquals(StapelingResultaat.Palletten.GetAt(1).Afmeting.Lengte,80)
 		do $$$AssertEquals(StapelingResultaat.Palletten.GetAt(1).Afmeting.Hoogte,90)
Index: vhTest/Utils/APPS/TRANSP/Offerte/impl/DHL/Data/Stapeling.cls.xml
===================================================================
diff -u -r35996 -r36002
--- vhTest/Utils/APPS/TRANSP/Offerte/impl/DHL/Data/Stapeling.cls.xml	(.../Stapeling.cls.xml)	(revision 35996)
+++ vhTest/Utils/APPS/TRANSP/Offerte/impl/DHL/Data/Stapeling.cls.xml	(.../Stapeling.cls.xml)	(revision 36002)
@@ -9,7 +9,7 @@
 	#dim Stapeling As APPS.TRANSP.Offerte.impl.DHL.Data.Stapeling = ##class(APPS.TRANSP.Offerte.impl.DHL.Data.Stapeling).%New()
 	Set Stapeling.Referentie = "DummyReferentie"
 	#dim Pallet As APPS.TRANSP.Offerte.impl.DHL.Data.Pallet = ##class(APPS.TRANSP.Offerte.impl.DHL.Data.Pallet).%New()
-	Set Pallet.Gewicht = 100
+	Set Pallet.GewichtInKG = 100
 	Set Pallet.Afmeting = ##class(APPS.TRANSP.Offerte.impl.DHL.Data.Afmeting).%New(90,80,70)
 	Do Stapeling.Palletten.Insert(Pallet)
 	Quit Stapeling
Index: APPS/TRANSP/Offerte/impl/DHL/StapelingBewaarder.cls.xml
===================================================================
diff -u -r35995 -r36002
--- APPS/TRANSP/Offerte/impl/DHL/StapelingBewaarder.cls.xml	(.../StapelingBewaarder.cls.xml)	(revision 35995)
+++ APPS/TRANSP/Offerte/impl/DHL/StapelingBewaarder.cls.xml	(.../StapelingBewaarder.cls.xml)	(revision 36002)
@@ -54,7 +54,7 @@
 	{
 		#dim StapelingResultaatPallet As APPS.TRANSP.Stapeling.dto.Pallet = StapelingResultaatIterator.Next()
 		#dim StapelingPallet As APPS.TRANSP.Offerte.impl.DHL.Data.Pallet = ##class(APPS.TRANSP.Offerte.impl.DHL.Data.Pallet).%New()
-		Set StapelingPallet.Gewicht = StapelingResultaatPallet.Gewicht
+		Set StapelingPallet.GewichtInKG = StapelingResultaatPallet.GewichtInKG
 		Set StapelingPallet.Afmeting = ##class(APPS.TRANSP.Offerte.impl.DHL.Data.Afmeting).%New()
 		Set StapelingPallet.Afmeting.Breedte = StapelingResultaatPallet.Afmeting.Breedte
 		Set StapelingPallet.Afmeting.Hoogte = StapelingResultaatPallet.Afmeting.Hoogte