Index: CHUI/Orgalux/PrintSelect.cls.xml
===================================================================
diff -u -r734 -r795
--- CHUI/Orgalux/PrintSelect.cls.xml	(.../PrintSelect.cls.xml)	(revision 734)
+++ CHUI/Orgalux/PrintSelect.cls.xml	(.../PrintSelect.cls.xml)	(revision 795)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-01-27 17:00:54">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-02-04 15:06:05">
 <Class name="CHUI.Orgalux.PrintSelect">
 <Description>
 d OrgaluxPrintSelect^CHUI.Projects()</Description>
 <IncludeCode>%occInclude,%Prod.Product,APPS.PM.OL.Common,DOM.PM.OL,DOM.DomeinContext</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%CHUI.TForm</Super>
-<TimeChanged>62115,53389.942801</TimeChanged>
+<TimeChanged>62126,54409.850443</TimeChanged>
 <TimeCreated>60290,55550.636499</TimeCreated>
 <ClassDefinitionError>0</ClassDefinitionError>
 
@@ -260,7 +260,7 @@
 
 	//Popups
 	Set ..pmTBXType=##class(%CHUI.TPopup).Create(%this,"pmTBXType","Design",..lblDesign.Top,..#Col2,1,25)
-	Set ..pmTBXType.opMultiSelect=0
+	Set ..pmTBXType.opMultiSelect=1
 	Do ..pmTBXType.InitSpec(,,,10)
 	Do ..pmTBXType.AddItem(##class(DOM.PM.enu.LadeVariant).TBXAntaro(),"TANDEMBOX antaro")
 	Do ..pmTBXType.AddItem(##class(DOM.PM.enu.LadeVariant).TBXIntivo(),"TANDEMBOX intivo")
@@ -272,9 +272,9 @@
 	Do ..pmLadeDiepte.InitSpec(,,,10)
 	Do ..pmLadeDiepte.AddItem(45,"45")
 	Do ..pmLadeDiepte.AddItem(50,"50")
+	Do ..pmLadeDiepte.AddItem(55,"55")
 	Do ..pmLadeDiepte.AddItem(60,"60")
 	Do ..pmLadeDiepte.AddItem(65,"65")
-	Do ..pmLadeDiepte.AddItem(70,"70")
 	Do ..pmLadeDiepte.DefaultFrames()
 	
 	Set ..pmKleur=##class(%CHUI.TPopup).Create(%this,"pmKleur","Kleur",..lblKleur.Top,..#Col2,2,25)
@@ -353,6 +353,7 @@
 
 	set ExportFilter.HogeLageLade = ..pmLadeType.Value
 	set ExportFilter.LadeDesign = ..pmTBXType.Value
+	set ExportFilter.LadeDesigns = ..pmTBXType.Value
 	set ExportFilter.LadeDieptes = ..pmLadeDiepte.Value
 	set ExportFilter.LadeKleuren = ..pmKleur.Value
 	set ExportFilter.WandDiktes = ..pmWandDikte.Value
@@ -364,30 +365,33 @@
 	set ExportFilter.OokSchaduwPrijzen = ..chkSchaduw.Checked
 	set ExportFilter.HogeResolutieBeelden = ..chkHiRes.Checked
 	
-	set Klant = $$$CRMGeefKlant(ExportFilter.KlantNr)
-	
-	if ..pmTaal.Value = "K" { set lbTalen = $listbuild(Klant.GeefTaal()) }
-	elseif ..pmTaal.Value = ("NF") {
-		set lbTalen = $listbuild(##class(DOM.enu.Taal).Nederlands(),##class(DOM.enu.Taal).Frans()) }
-	else { set lbTalen = $listbuild(..pmTaal.Value) }
-	
-	set ExportFilter.Talen = lbTalen
-	
-	
 	quit ExportFilter
 ]]></Implementation>
 </Method>
 
 <Method name="acExcelExecute">
 <FormalSpec>Sender:%CHUI.TControlBasis</FormalSpec>
 <Implementation><![CDATA[
+	
 	set ExportFilter = ..cvtValuesToExportFilter()
 	
+	if ..pmTaal.Value = "K" { 
+		set Klant = $$$CRMGeefKlant(ExportFilter.KlantNr)
+		set lbTalen = $listbuild(Klant.GeefTaal())
+		}
+	elseif ..pmTaal.Value = ("NF") {
+		set lbTalen = $listbuild(##class(DOM.enu.Taal).Nederlands(),##class(DOM.enu.Taal).Frans()) }
+	else { set lbTalen = $listbuild(..pmTaal.Value) }
+	
 	Do $$$CreateFM("Opbouw tekstbestand","Selecteren ORGALUX producten, even geduld...")
 	
 	set Exporter = ##class(APPS.PM.OL.Export.impl.OrgaluxGammaExporterKQW).%New()
-	do Exporter.ExportPrijsLijst(ExportFilter)
 	
+	for ctrTalen = 1 : 1 : $listlength(lbTalen) {
+		set ExportFilter.Taal = $listget(lbTalen,ctrTalen)
+		do Exporter.ExportPrijsLijst(ExportFilter)
+	}
+	
 	Do $$$DestroyFM
 	
 	/*
@@ -730,5 +734,5 @@
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="589044155"/>
+<Checksum value="204610906"/>
 </Export>
Index: APPS/PM/OL/Export/impl/OrgaluxGammaExporterKQW.cls.xml
===================================================================
diff -u -r734 -r795
--- APPS/PM/OL/Export/impl/OrgaluxGammaExporterKQW.cls.xml	(.../OrgaluxGammaExporterKQW.cls.xml)	(revision 734)
+++ APPS/PM/OL/Export/impl/OrgaluxGammaExporterKQW.cls.xml	(.../OrgaluxGammaExporterKQW.cls.xml)	(revision 795)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-01-27 17:00:47">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-02-04 15:35:54">
 <Class name="APPS.PM.OL.Export.impl.OrgaluxGammaExporterKQW">
 <IncludeCode>DOM.PM.OL,BL.Derde.KlantSpecifiek</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>APPS.PM.OL.Export.impl.OrgaluxGammaExporter</Super>
-<TimeChanged>62115,53573.126927</TimeChanged>
+<TimeChanged>62126,56199.104944</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="KenmerkQueryWaarden">
@@ -37,6 +37,9 @@
 
 <Method name="BepaalKenmerkQueryWaarden">
 <Implementation><![CDATA[
+	set Waarde = ##class(APPS.Web.OLParticulier.enu.Website).OrgaluxDotCom()
+    set KQP = ##class(DOM.PM.OL.Gamma.impl.KenmerkQueryParameter).%New("WebSites",Waarde)
+    do ..KenmerkQueryWaarden.Insert(KQP)
 	do ..AddItems()
 	quit
 ]]></Implementation>
@@ -77,12 +80,27 @@
 <Method name="AddLadeDesign">
 <Private>1</Private>
 <Implementation><![CDATA[
+	/** /
 	if $length(..ExportFilter.LadeDesign) {
 		set Waarden = $$ListToPieces^vhLib(..cvtLadeVariant2OLLadeFamilie(..ExportFilter.LadeDesign),";")
 	    set KQP = ##class(DOM.PM.OL.Gamma.impl.KenmerkQueryParameter).%New("LadeFamilie",Waarden)
 	    do ..KenmerkQueryWaarden.Insert(KQP)
 	}
+	/**/
 	
+	if $listlength(..ExportFilter.LadeDesigns) {
+		set Waarden = ""
+		for ctrDesign = 1 : 1 : $listlength(..ExportFilter.LadeDesigns) {
+			set LadeDesign = $listget(..ExportFilter.LadeDesigns,ctrDesign)
+			set Waarden = Waarden _ $$ListToPieces^vhLib(..cvtLadeVariant2OLLadeFamilie(LadeDesign),";")
+		}
+		d WLIP^vhDBG(195,"Waarden : "_Waarden)
+		set KQP = ##class(DOM.PM.OL.Gamma.impl.KenmerkQueryParameter).%New("LadeFamilie",Waarden,$$$IncludeUndefs)
+		do ..KenmerkQueryWaarden.Insert(KQP)
+	}
+	
+	d WLIP^vhDBG(195,"Waarden : "_..ExportFilter.LadeDesigns)
+	
 	quit
 ]]></Implementation>
 </Method>
@@ -122,5 +140,5 @@
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="4087504285"/>
+<Checksum value="3312101620"/>
 </Export>
Index: DOM/PM/OL/Gamma/dto/ProductInfoVoorPrijslijst.cls.xml
===================================================================
diff -u -r734 -r795
--- DOM/PM/OL/Gamma/dto/ProductInfoVoorPrijslijst.cls.xml	(.../ProductInfoVoorPrijslijst.cls.xml)	(revision 734)
+++ DOM/PM/OL/Gamma/dto/ProductInfoVoorPrijslijst.cls.xml	(.../ProductInfoVoorPrijslijst.cls.xml)	(revision 795)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-01-27 17:01:00">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-02-03 13:18:08">
 <Class name="DOM.PM.OL.Gamma.dto.ProductInfoVoorPrijslijst">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
-<TimeChanged>62112,62876.492194</TimeChanged>
+<TimeChanged>62125,47933.08703</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="Product">
@@ -14,14 +14,10 @@
 <Type>%String</Type>
 </Property>
 
-<Property name="OmschrijvingN">
+<Property name="Omschrijving">
 <Type>%String</Type>
 </Property>
 
-<Property name="OmschrijvingF">
-<Type>%String</Type>
-</Property>
-
 <Property name="Diepte">
 <Type>%String</Type>
 </Property>
@@ -34,14 +30,10 @@
 <Type>%String</Type>
 </Property>
 
-<Property name="KleurN">
+<Property name="Kleur">
 <Type>%String</Type>
 </Property>
 
-<Property name="KleurF">
-<Type>%String</Type>
-</Property>
-
 <Property name="LadeType">
 <Type>%String</Type>
 </Property>
@@ -58,6 +50,10 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="GroepOmschrijving">
+<Type>%String</Type>
+</Property>
+
 <Property name="Gewicht">
 <Type>%String</Type>
 </Property>
@@ -94,5 +90,5 @@
 <Type>%String</Type>
 </Property>
 </Class>
-<Checksum value="1106392542"/>
+<Checksum value="381552880"/>
 </Export>
Index: DOM/PM/OL/Gamma/dto/ExportFilter.cls.xml
===================================================================
diff -u -r734 -r795
--- DOM/PM/OL/Gamma/dto/ExportFilter.cls.xml	(.../ExportFilter.cls.xml)	(revision 734)
+++ DOM/PM/OL/Gamma/dto/ExportFilter.cls.xml	(.../ExportFilter.cls.xml)	(revision 795)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-01-27 17:01:00">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-02-04 13:54:19">
 <Class name="DOM.PM.OL.Gamma.dto.ExportFilter">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
-<TimeChanged>62115,39556.699083</TimeChanged>
+<TimeChanged>62126,50104.581623</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="HogeLageLade">
@@ -18,6 +18,10 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="LadeDesigns">
+<Type>%String</Type>
+</Property>
+
 <Property name="LadeDieptes">
 <Type>%List</Type>
 </Property>
@@ -64,9 +68,9 @@
 <Type>%Boolean</Type>
 </Property>
 
-<Property name="Talen">
-<Type>%List</Type>
+<Property name="Taal">
+<Type>%String</Type>
 </Property>
 </Class>
-<Checksum value="3992142216"/>
+<Checksum value="2841718177"/>
 </Export>
Index: DOM/PM/OL/Gamma/impl/ProductenNaarPrijslijst.cls.xml
===================================================================
diff -u -r734 -r795
--- DOM/PM/OL/Gamma/impl/ProductenNaarPrijslijst.cls.xml	(.../ProductenNaarPrijslijst.cls.xml)	(revision 734)
+++ DOM/PM/OL/Gamma/impl/ProductenNaarPrijslijst.cls.xml	(.../ProductenNaarPrijslijst.cls.xml)	(revision 795)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-01-27 17:01:00">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-02-03 13:17:38">
 <Class name="DOM.PM.OL.Gamma.impl.ProductenNaarPrijslijst">
-<IncludeCode>vhLib.Macro,DOM.DomeinContext</IncludeCode>
+<IncludeCode>vhLib.Macro,DOM.PM.OL,DOM.DomeinContext</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>DOM.PM.OL.Gamma.IProductenNaarPrijslijst</Super>
-<TimeChanged>62115,40327.020068</TimeChanged>
+<TimeChanged>62125,47903.862918</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="VeldDelim">
@@ -33,7 +33,7 @@
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	set ..ExportFilter = ExportFilter
-	if '$listlength(..ExportFilter.Talen) set ..ExportFilter.Talen = $listbuild(##class(DOM.enu.Taal).Nederlands())
+	if '$length(..ExportFilter.Taal) set ..ExportFilter.Taal = ##class(DOM.enu.Taal).Nederlands()
 	quit $$$OK
 ]]></Implementation>
 </Method>
@@ -57,6 +57,7 @@
 <Method name="ExportProducten">
 <FormalSpec>ProductList:%ListOfDataTypes,BestandsNaam:%String=""</FormalSpec>
 <Implementation><![CDATA[
+	do ..SorteerProductList(ProductList)
 	do ..HoofdingOpslaanInStream()
 	do ..InfoOpslaanInStream(ProductList)
 	do ..ExporteerStream(BestandsNaam)
@@ -72,6 +73,31 @@
 ]]></Content>
 </UDLText>
 
+<Method name="SorteerProductList">
+<FormalSpec>ProductList</FormalSpec>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[
+	
+	set arProducten = ##class(%ArrayOfDataTypes).%New()
+	
+	set itProducten = ##class(TECH.ListIterator).%New(ProductList)
+	while itProducten.HasNext() {
+		set UnID = itProducten.Next()
+		set KortTekst = ##class(Prod.Kenmerk.Orgalux).%New(UnID).GetKortTekst()
+		do arProducten.SetAt(UnID,KortTekst_" "_UnID)
+	}
+	
+	do ProductList.Clear()
+	set itProducten = ##class(TECH.ListIterator).%New(arProducten)
+	while itProducten.HasNext() {
+		set UnID =  itProducten.Next()
+		do ProductList.Insert(UnID)
+	}
+	
+	quit ProductList
+]]></Implementation>
+</Method>
+
 <Method name="InfoOpslaanInStream">
 <FormalSpec>ProductList:%ListOfDataTypes</FormalSpec>
 <Private>1</Private>
@@ -90,7 +116,8 @@
 <Implementation><![CDATA[
 	if '$length(Bestandsnaam) { 
 		set KlantNaam = $$$CRMGeefKlant(..ExportFilter.KlantNr).GeefNaam()
-		set Bestandsnaam = $$DIRUSER^vhDEV_"OrgaluxPrijslijst "_KlantNaam_" "_$$FormatDateTime^vhLib("JJJJMMDD uu""u""nn",$horolog)_".txt"
+		set Taal = ..ExportFilter.Taal
+		set Bestandsnaam = $$DIRUSER^vhDEV_"OrgaluxPrijslijst "_KlantNaam_" "_Taal_" "_$$FormatDateTime^vhLib("JJJJMMDD uu""u""nn",$horolog)_".txt"
 	}
 	set FileStream = ##class(%FileCharacterStream).%New()
 	set FileStream.Filename = Bestandsnaam
@@ -150,21 +177,15 @@
 	
 	do ExportVolgorde.Insert("Product")
 	do ExportVolgorde.Insert("EAN")
-	
-	if $listfind(..ExportFilter.Talen,##class(DOM.enu.Taal).Nederlands()) do ExportVolgorde.Insert("OmschrijvingN")
-	if $listfind(..ExportFilter.Talen,##class(DOM.enu.Taal).Frans()) do ExportVolgorde.Insert("OmschrijvingF")
-	
+	do ExportVolgorde.Insert("Omschrijving")
 	do ExportVolgorde.Insert("Diepte")
 	do ExportVolgorde.Insert("WandDikte")
 	do ExportVolgorde.Insert("Breedte")
-	
-	if $listfind(..ExportFilter.Talen,##class(DOM.enu.Taal).Nederlands()) do ExportVolgorde.Insert("KleurN")
-	if $listfind(..ExportFilter.Talen,##class(DOM.enu.Taal).Frans()) do ExportVolgorde.Insert("KleurF")
-	
-	if ..ExportFilter.OokExtraKolommen || 1 {
-	
-		do ExportVolgorde.Insert("Breedte")
-		do ExportVolgorde.Insert("LadeType")
+	do ExportVolgorde.Insert("Kleur")
+	do ExportVolgorde.Insert("LadeType")
+	do ExportVolgorde.Insert("GroepOmschrijving")
+
+	if ..ExportFilter.OokExtraKolommen {
 		do ExportVolgorde.Insert("volBreedte")
 		do ExportVolgorde.Insert("volDiepte")
 		do ExportVolgorde.Insert("volHoogte")
@@ -193,20 +214,13 @@
 	; sommige van onderstaande waarden maken gebruik van oKenmerk.GetProduct().Property .. weet dat dit geen mooie oplossing
 	; maar heb geen zin om voor alle waarde een getter te maken op oKenmerk.Product aangezien het systeem toch nog niet 100% vastligt.
 	
-	set oKenmerk = ##class(Prod.Kenmerk.Orgalux).%New(UnID,##class(DOM.enu.Taal).Nederlands())
+	set oKenmerk = ##class(Prod.Kenmerk.Orgalux).%New(UnID,..ExportFilter.Taal)
 	
 	set ProductInfo = ##class(DOM.PM.OL.Gamma.dto.ProductInfoVoorPrijslijst).%New()
 	set ProductInfo.Product = oKenmerk.GetKortTekst()
 	set ProductInfo.EAN = oKenmerk.GetProduct().BarcodeWaarde
+	set ProductInfo.Omschrijving=oKenmerk.GetOmschrijving()
 	
-	
-	for ctrTaal = 1 : 1 : $listlength(..ExportFilter.Talen) {
-		set Taal = $listget(..ExportFilter.Talen,ctrTaal)
-		do oKenmerk.ZetTaal(Taal)
-		set $zobjproperty(ProductInfo,"Omschrijving"_Taal)=oKenmerk.GetOmschrijving()
-		set $zobjproperty(ProductInfo,"Kleur"_Taal)=oKenmerk.GetKleurOmschrijving()
-	}
-	
 	set ProductInfo.Diepte = oKenmerk.GetDiepte()
 	set ProductInfo.WandDikte = oKenmerk.GetWandDiktes()
 	set ProductInfo.Breedte = oKenmerk.GetBreedte()
@@ -215,18 +229,18 @@
 	set ProductInfo.volBreedte = OptiBreedte
 	set ProductInfo.volDiepte = OptiDiepte
 	set ProductInfo.volHoogte = OptiHoogte
-		
-	do oKenmerk.ZetTaal($listget(..ExportFilter.Talen))
-	set ProductInfo.LadeType = oKenmerk.GetProductGroepOmschrijving()
-	set ProductInfo.Gewicht = oKenmerk.GetProduct().GewichtPerDuizendStuksInKG
+
+	set ProductInfo.LadeType = ..GetHogeLageLade(oKenmerk.GetLadeTypes())_"_"_$listget(oKenmerk.GetLadeFamilieOmschrijvingen())
+	set ProductInfo.GroepOmschrijving = oKenmerk.GetProductGroepOmschrijving()
+	set ProductInfo.Gewicht = oKenmerk.GetProduct().GewichtPerDuizendStuksInKG/1000
 	
 	set Statistiek = ..GetStatistiek(oKenmerk.GetProductNr(),..ExportFilter.KlantNr)
 	set ProductInfo.Aantal = +$piece(Statistiek,"\",1)
 	set ProductInfo.Omzet = +$translate($piece(Statistiek,"\",3),".",",")
-	set ProductInfo.Aankoop = $piece($$KLANTPR^KPRIJS(..ExportFilter.KlantNr,oKenmerk.GetProductNr(),.NoSa),"\")
-	set ProductInfo.Dealer = $$ConsumentenPrijs^ORGALUX(oKenmerk.GetProductNr(),"DEALER",$G(NoSa))
-	set ProductInfo.ConsNL = $$ConsumentenPrijs^ORGALUX(oKenmerk.GetProductNr(),"NL",$G(NoSa))
-	set ProductInfo.ConsB = $$ConsumentenPrijs^ORGALUX(oKenmerk.GetProductNr(),"B",$G(NoSa))
+	set ProductInfo.Aankoop = $piece($$KLANTPR^KPRIJS(..ExportFilter.KlantNr,oKenmerk.GetProductNr(),..ExportFilter.OokSchaduwPrijzen),"\")
+	set ProductInfo.Dealer = $$ConsumentenPrijs^ORGALUX(oKenmerk.GetProductNr(),"DEALER",..ExportFilter.OokSchaduwPrijzen)
+	set ProductInfo.ConsNL = $$ConsumentenPrijs^ORGALUX(oKenmerk.GetProductNr(),"NL",..ExportFilter.OokSchaduwPrijzen)
+	set ProductInfo.ConsB = $$ConsumentenPrijs^ORGALUX(oKenmerk.GetProductNr(),"B",..ExportFilter.OokSchaduwPrijzen)
 	set ProductInfo.URLGroot = oKenmerk.GetFotoBestand()
 	set ProductInfo.URLKlein = oKenmerk.GetFotoThumbnail()
 	
@@ -245,6 +259,35 @@
 	quit $$PROD^STAT(PRNr,KLNr,StartDatum,StopDatum,"1,3")
 ]]></Implementation>
 </Method>
+
+<UDLText name="T">
+<Content><![CDATA[
+// quick & dirty method 
+
+]]></Content>
+</UDLText>
+
+<Method name="GetHogeLageLade">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>LadeCodes:%List</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	set result = ""
+	set LadeCode = $listget(LadeCodes)
+	set HogeLades = $$$HogeLades
+	for ctr=1:1:$length(HogeLades,";") { 
+	 	set Piece = $piece(HogeLades,";",ctr)
+	 	if Piece=LadeCode set result = "HogeLade"
+	}
+	
+	set LageLades = $$$LageLades	
+	for ctr=1:1:$length(LageLades,";") {
+		set Piece = $piece(LageLades,";",ctr)
+		if Piece=LadeCode set result = "LageLade"
+	}
+	quit result
+]]></Implementation>
+</Method>
 </Class>
-<Checksum value="1896877745"/>
+<Checksum value="2663821690"/>
 </Export>
Index: vhUnitTest/DOM/PM/OL/Gamma/ProductenNaarPrijslijst.cls.xml
===================================================================
diff -u -r734 -r795
--- vhUnitTest/DOM/PM/OL/Gamma/ProductenNaarPrijslijst.cls.xml	(.../ProductenNaarPrijslijst.cls.xml)	(revision 734)
+++ vhUnitTest/DOM/PM/OL/Gamma/ProductenNaarPrijslijst.cls.xml	(.../ProductenNaarPrijslijst.cls.xml)	(revision 795)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-01-27 17:01:13">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-02-03 17:21:56">
 <Class name="vhUnitTest.DOM.PM.OL.Gamma.ProductenNaarPrijslijst">
 <Description>
 do ##class(vhUnitTest.Manager).RunTest("/Display=all","DOM.PM.OL.Gamma.ProductenNaarPrijslijst")</Description>
 <IncludeCode>vhLib.Macro,BL.Derde.KlantSpecifiek,vhUnitTest.DOM.PM.OL.Gamma</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>vhUnitTest.TestCase</Super>
-<TimeChanged>62115,32604.423084</TimeChanged>
+<TimeChanged>62125,62561.067968</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="ExportFilter">
@@ -17,7 +17,7 @@
 <Method name="TestHoofdingNL">
 <Implementation><![CDATA[
 	
-	set ..ExportFilter.Talen = $listbuild(##class(DOM.enu.Taal).Nederlands())
+	set ..ExportFilter.Taal = ##class(DOM.enu.Taal).Nederlands()
 	
 	set impl = ##class(ProductenNaarPrijslijstMock).%New(..ExportFilter)
 	do impl.HoofdingOpslaanInStream()
@@ -26,49 +26,31 @@
 
 	do $$$AssertEquals("Product",$piece(Line,$$$TAB,1),"Test Veld1")
 	do $$$AssertEquals("EAN",$piece(Line,$$$TAB,2),"Test Veld2")
-	do $$$AssertEquals("OmschrijvingN",$piece(Line,$$$TAB,3),"Test Veld3")
+	do $$$AssertEquals("Omschrijving",$piece(Line,$$$TAB,3),"Test Veld3")
 	
 	quit
 ]]></Implementation>
 </Method>
 
 <Method name="TestHoofdingFR">
 <Implementation><![CDATA[
-	set ..ExportFilter.Talen = $listbuild(##class(DOM.enu.Taal).Frans())
+	set ..ExportFilter.Taal = ##class(DOM.enu.Taal).Frans()
 	set impl = ##class(ProductenNaarPrijslijstMock).%New(..ExportFilter)
 	do impl.HoofdingOpslaanInStream()
 
 	set Line = impl.XLSStream.ReadLine()
 
 	do $$$AssertEquals("Product",$piece(Line,$$$TAB,1),"Test Veld1")
 	do $$$AssertEquals("EAN",$piece(Line,$$$TAB,2),"Test Veld2")
-	do $$$AssertEquals("OmschrijvingF",$piece(Line,$$$TAB,3),"Test Veld3")
+	do $$$AssertEquals("Omschrijving",$piece(Line,$$$TAB,3),"Test Veld3")
 	
 	quit
 ]]></Implementation>
 </Method>
 
-<Method name="TestHoofdingNLFR">
-<Implementation><![CDATA[
-	set ..ExportFilter.Talen = $listbuild(##class(DOM.enu.Taal).Frans(),##class(DOM.enu.Taal).Nederlands())
-	
-	set impl = ##class(ProductenNaarPrijslijstMock).%New(..ExportFilter)
-	do impl.HoofdingOpslaanInStream()
-
-	set Line = impl.XLSStream.ReadLine()
-
-	do $$$AssertEquals("Product",$piece(Line,$$$TAB,1),"Test Veld1")
-	do $$$AssertEquals("EAN",$piece(Line,$$$TAB,2),"Test Veld2")
-	do $$$AssertEquals("OmschrijvingN",$piece(Line,$$$TAB,3),"Test Veld3")
-	do $$$AssertEquals("OmschrijvingF",$piece(Line,$$$TAB,4),"Test Veld3")
-	
-	quit
-]]></Implementation>
-</Method>
-
 <Method name="TestInfoList1">
 <Implementation><![CDATA[
-	set ..ExportFilter.Talen = $listbuild(##class(DOM.enu.Taal).Nederlands())
+	set ..ExportFilter.Taal = ##class(DOM.enu.Taal).Nederlands()
 	set impl = ##class(ProductenNaarPrijslijstMock).%New(..ExportFilter)
 	set List = ##class(%ListOfDataTypes).%New()
 	
@@ -129,5 +111,5 @@
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="209164836"/>
+<Checksum value="1403027359"/>
 </Export>
Index: APPS/PM/OL/Export/impl/OrgaluxGammaExporter.cls.xml
===================================================================
diff -u -r734 -r795
--- APPS/PM/OL/Export/impl/OrgaluxGammaExporter.cls.xml	(.../OrgaluxGammaExporter.cls.xml)	(revision 734)
+++ APPS/PM/OL/Export/impl/OrgaluxGammaExporter.cls.xml	(.../OrgaluxGammaExporter.cls.xml)	(revision 795)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-01-27 17:00:47">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-02-03 13:15:28">
 <Class name="APPS.PM.OL.Export.impl.OrgaluxGammaExporter">
 <IncludeCode>DOM.PM.OL,BL.Derde.KlantSpecifiek,TECH.Error</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>APPS.PM.OL.Export.IOrgaluxGammaExporter</Super>
-<TimeChanged>62115,53500.977777</TimeChanged>
+<TimeChanged>62125,47773.529043</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="Context">
@@ -176,5 +176,5 @@
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="3063195819"/>
+<Checksum value="3499478842"/>
 </Export>