Index: DOM/PM/impl/DataM/DataMProductAPI.cls.xml
===================================================================
diff -u -r734 -r802
--- DOM/PM/impl/DataM/DataMProductAPI.cls.xml	(.../DataMProductAPI.cls.xml)	(revision 734)
+++ DOM/PM/impl/DataM/DataMProductAPI.cls.xml	(.../DataMProductAPI.cls.xml)	(revision 802)
@@ -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:59">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-02-06 22:00:50">
 <Class name="DOM.PM.impl.DataM.DataMProductAPI">
 <IncludeCode>TECH.Error</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>DOM.PM.ProductAPI,%RegisteredObject</Super>
-<TimeChanged>62118,54137.020493</TimeChanged>
+<TimeChanged>62128,79297.344134</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Method name="GeefProduct">
@@ -63,15 +63,21 @@
 	If (ProductSpecificatie.GeefFamilie() = ##class(DOM.PM.enu.Familie).Lade())
 	{
 		Set ProductCreator = ##class(DOM.PM.impl.DataM.DataMLadeCreator).%New(ProductSpecificatie, BerekeningsSpecificatie, HalffabItemsBoom, KostItem)
+		Set PRNr = ProductCreator.GeefPRNr()
+		Set ProductCreator = ##class(DOM.PM.impl.DataM.DataMLadeKenmerkenCreator).%New(PRNr,ProductSpecificatie, BerekeningsSpecificatie, HalffabItemsBoom)
 	}
 	Else
 	{
 		Set ProductCreator = ##class(DOM.PM.impl.DataM.DataMAluKaderCreator).%New(ProductSpecificatie, BerekeningsSpecificatie, HalffabItemsBoom, KostItem)
+		Set PRNr = ProductCreator.GeefPRNr()
+		Set ProductCreator = ##class(DOM.PM.impl.DataM.DataMAluKaderKenmerkenCreator).%New(PRNr,ProductSpecificatie, BerekeningsSpecificatie, HalffabItemsBoom)
 	}
-	// TODO: Productnummer opvragen van de creator en teruggeven
-	Quit ..GeefProduct(ProductCreator.GeefPRNr())
+	
+	Set BouwsteenCreator = ##class(DOM.PM.impl.DataM.DataMBouwsteenCreator).%New(PRNr, ProductSpecificatie, BerekeningsSpecificatie, HalffabItemsBoom, KostItem)
+	
+	Quit ..GeefProduct(PRNr)
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="3189846839"/>
+<Checksum value="2017261341"/>
 </Export>
Index: DOM/PM/OL/Gamma/impl/ProductenNaarPrijslijst.cls.xml
===================================================================
diff -u -r797 -r802
--- DOM/PM/OL/Gamma/impl/ProductenNaarPrijslijst.cls.xml	(.../ProductenNaarPrijslijst.cls.xml)	(revision 797)
+++ DOM/PM/OL/Gamma/impl/ProductenNaarPrijslijst.cls.xml	(.../ProductenNaarPrijslijst.cls.xml)	(revision 802)
@@ -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-02-04 16:22:33">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-02-07 12:02:28">
 <Class name="DOM.PM.OL.Gamma.impl.ProductenNaarPrijslijst">
 <IncludeCode>vhLib.Macro,DOM.PM.OL,DOM.DomeinContext</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>DOM.PM.OL.Gamma.IProductenNaarPrijslijst</Super>
-<TimeChanged>62126,58998.591735</TimeChanged>
+<TimeChanged>62129,43396.522098</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="VeldDelim">
@@ -55,12 +55,12 @@
 </Method>
 
 <Method name="ExportProducten">
-<FormalSpec>ProductList:%ListOfDataTypes,BestandsNaam:%String=""</FormalSpec>
+<FormalSpec><![CDATA[ProductList:%ListOfDataTypes,&BestandsNaam:%String=""]]></FormalSpec>
 <Implementation><![CDATA[
 	do ..SorteerProductList(ProductList)
 	do ..HoofdingOpslaanInStream()
 	do ..InfoOpslaanInStream(ProductList)
-	do ..ExporteerStream(BestandsNaam)
+	do ..ExporteerStream(.BestandsNaam)
 	
 	quit
 ]]></Implementation>
@@ -111,7 +111,7 @@
 </Method>
 
 <Method name="ExporteerStream">
-<FormalSpec>Bestandsnaam:%String=""</FormalSpec>
+<FormalSpec><![CDATA[&Bestandsnaam:%String]]></FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	if '$length(Bestandsnaam) { 
@@ -219,7 +219,7 @@
 	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()
+	set ProductInfo.Omschrijving=oKenmerk.GetLangTekst()
 	
 	set ProductInfo.Diepte = oKenmerk.GetDiepte()
 	set ProductInfo.WandDikte = oKenmerk.GetWandDiktes()
@@ -292,5 +292,5 @@
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="2811697380"/>
+<Checksum value="3171655954"/>
 </Export>
Index: DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r734 -r802
--- DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 734)
+++ DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 802)
@@ -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:00:59">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-02-07 11:35:14">
 <Class name="DOM.PM.impl.DataM.DataMProduct">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>DOM.PM.Product,%RegisteredObject</Super>
-<TimeChanged>62118,53999.551279</TimeChanged>
+<TimeChanged>62129,41762.675744</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="Data">
@@ -31,18 +31,78 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefLangtekst">
+<FormalSpec>Taal:%String="N"</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	set ProductTekst = ##class(Prod.ProductTekst).%OpenId(..ProductNummer)
+	do ProductTekst.GetOmschrijvingArray(Taal,.Array)
+	
+	set idx = ""
+	set Langtekst = ""
+	for { set idx = $order(Array(idx)) quit:idx="" 
+		set Langtekst = Langtekst_Array(idx)_" "
+	}
+	set Langtekst = $extract(Langtekst,1,$length(Langtekst)-1)
+	quit Langtekst
+]]></Implementation>
+</Method>
+
 <Method name="GeefDossierNr">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit $P(^KPR(..ProductNummer,"G"),"\")
 ]]></Implementation>
 </Method>
 
+<Method name="GeefKostBouwstenenIterator">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[
+	Set BouwsteenLijst = ##class(%ListOfObjects).%New()
+	
+	Set Key = $Order(^PRBS("BS",..ProductNummer,"KST."))
+	While ((Key '= "") && (Key [ "KST."))
+	{
+		Set Bouwsteen = ##class(DOM.PR.BouwStenen.BouwSteen).%OpenId(..ProductNummer_"||"_Key)
+		Do BouwsteenLijst.Insert(Bouwsteen)
+		Set Key = $Order(^PRBS("BS",..ProductNummer,Key))
+	}
+	
+	Quit ##class(TECH.ListIterator).%New(BouwsteenLijst)
+]]></Implementation>
+</Method>
+
 <Method name="GeefOmschrijving">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit $P(..Data,"\",2) _ " " _ $P(..Data,"\",11)
 ]]></Implementation>
 </Method>
 
+<Method name="GeefBerekeningsSpecificatie">
+<ReturnType>DOM.PM.Maatwerk.Calc.Common.BerekeningsSpecificatie</ReturnType>
+<Implementation><![CDATA[
+	Set ID = $Piece(^KPR(..ProductNummer,15),"\",14)
+	Set BerekeningsSpecificatie = ""
+	If (ID '= "")
+	{
+		Set BerekeningsSpecificatie = ##class(DOM.PM.Maatwerk.Calc.Common.BerekeningsSpecificatie).%OpenId(ID)
+	}
+	Quit BerekeningsSpecificatie
+]]></Implementation>
+</Method>
+
+<Method name="GeefProductSpecificatie">
+<ReturnType>DOM.PM.Maatwerk.Calc.Common.ProductSpecificatie</ReturnType>
+<Implementation><![CDATA[
+	Set ID = $Piece(^KPR(..ProductNummer,15),"\",13)
+	Set ProductSpecificatie = ""
+	If (ID '= "")
+	{
+		Set ProductSpecificatie = ##class(DOM.PM.Maatwerk.Calc.Common.ProductSpecificatie).%OpenId(ID)
+	}
+	Quit ProductSpecificatie
+]]></Implementation>
+</Method>
+
 <Method name="GeefPRNr">
 <ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[	Quit ..ProductNummer
@@ -70,5 +130,5 @@
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="901031838"/>
+<Checksum value="4291367209"/>
 </Export>
Index: DOM/PM/impl/ProductImpl.cls.xml
===================================================================
diff -u -r734 -r802
--- DOM/PM/impl/ProductImpl.cls.xml	(.../ProductImpl.cls.xml)	(revision 734)
+++ DOM/PM/impl/ProductImpl.cls.xml	(.../ProductImpl.cls.xml)	(revision 802)
@@ -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:00:59">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-02-07 11:24:48">
 <Class name="DOM.PM.impl.ProductImpl">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject,DOM.PM.Product</Super>
-<TimeChanged>62118,53958.139668</TimeChanged>
+<TimeChanged>62129,41136.577612</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="Product">
@@ -28,6 +28,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefLangtekst">
+<FormalSpec>Taal:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..Product.GeefLangtekst(.Taal)
+]]></Implementation>
+</Method>
+
 <Method name="GeefOmschrijving">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit ..Product.GeefOmschrijving()
@@ -46,11 +53,29 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefKostBouwstenenIterator">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ..Product.GeefKostBouwstenenIterator()
+]]></Implementation>
+</Method>
+
+<Method name="GeefBerekeningsSpecificatie">
+<ReturnType>DOM.PM.Maatwerk.Calc.Common.BerekeningsSpecificatie</ReturnType>
+<Implementation><![CDATA[	Quit ..Product.GeefBerekeningsSpecificatie()
+]]></Implementation>
+</Method>
+
+<Method name="GeefProductSpecificatie">
+<ReturnType>DOM.PM.Maatwerk.Calc.Common.ProductSpecificatie</ReturnType>
+<Implementation><![CDATA[	Quit ..Product.GeefProductSpecificatie()
+]]></Implementation>
+</Method>
+
 <Method name="IsLangGoed">
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	Quit ..Product.IsLangGoed()
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="623108861"/>
+<Checksum value="3895421846"/>
 </Export>
Index: Prod/Kenmerk/Product.cls.xml
===================================================================
diff -u -r734 -r802
--- Prod/Kenmerk/Product.cls.xml	(.../Product.cls.xml)	(revision 734)
+++ Prod/Kenmerk/Product.cls.xml	(.../Product.cls.xml)	(revision 802)
@@ -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:05">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-02-07 11:54:37">
 <Class name="Prod.Kenmerk.Product">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
-<TimeChanged>62112,40556.933183</TimeChanged>
+<TimeChanged>62129,42925.974682</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="KenmerkUnID">
@@ -56,12 +56,16 @@
 
 <Method name="GetKortTekst">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	  ;quit $p(^KPR(..ProductGetObjectId(),0),"\",1)
-	  Quit $extract(..Product.KortTekst,1,11)
+<Implementation><![CDATA[	  Quit $extract(..Product.KortTekst,1,11)
 ]]></Implementation>
 </Method>
 
+<Method name="GetLangTekst">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	  Quit ##class(DOM.DomeinContext).Instance().GeefProductAPI().GeefProduct(..GetProductNr()).GeefLangtekst(..Taal)
+]]></Implementation>
+</Method>
+
 <Method name="IsActief">
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	Quit '..Product.NONAktief
@@ -112,5 +116,5 @@
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="1447616888"/>
+<Checksum value="1408887334"/>
 </Export>
Index: CHUI/Orgalux/PrintSelect.cls.xml
===================================================================
diff -u -r795 -r802
--- CHUI/Orgalux/PrintSelect.cls.xml	(.../PrintSelect.cls.xml)	(revision 795)
+++ CHUI/Orgalux/PrintSelect.cls.xml	(.../PrintSelect.cls.xml)	(revision 802)
@@ -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-02-04 15:06:05">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-02-07 12:06:09">
 <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>62126,54409.850443</TimeChanged>
+<TimeChanged>62129,43617.931178</TimeChanged>
 <TimeCreated>60290,55550.636499</TimeCreated>
 <ClassDefinitionError>0</ClassDefinitionError>
 
@@ -372,31 +372,48 @@
 <Method name="acExcelExecute">
 <FormalSpec>Sender:%CHUI.TControlBasis</FormalSpec>
 <Implementation><![CDATA[
-	
+	set flagExport = 1
+	set txtMsgBox = ""
 	set ExportFilter = ..cvtValuesToExportFilter()
 	
 	if ..pmTaal.Value = "K" { 
 		set Klant = $$$CRMGeefKlant(ExportFilter.KlantNr)
-		set lbTalen = $listbuild(Klant.GeefTaal())
+		set TaalKlant = Klant.GeefTaal()
+		if (TaalKlant'=##class(DOM.enu.Taal).Frans()) && ( TaalKlant '= ##class(DOM.enu.Taal).Nederlands()) {
+			set flagExport = 0
+			set txtMsgBox = txtMsgBox_"Taalkeuze : "_TaalKlant_$$$CRLF
 		}
+		set lbTalen = $listbuild(TaalKlant)
+	}
 	elseif ..pmTaal.Value = ("NF") {
-		set lbTalen = $listbuild(##class(DOM.enu.Taal).Nederlands(),##class(DOM.enu.Taal).Frans()) }
-	else { set lbTalen = $listbuild(..pmTaal.Value) }
+		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()
-	
-	for ctrTalen = 1 : 1 : $listlength(lbTalen) {
-		set ExportFilter.Taal = $listget(lbTalen,ctrTalen)
-		do Exporter.ExportPrijsLijst(ExportFilter)
+	if flagExport {
+		set resBestanden = ""
+		do $$$CreateFM("Opbouw tekstbestand","Selecteren ORGALUX producten, even geduld...")
+		set Exporter = ##class(APPS.PM.OL.Export.impl.OrgaluxGammaExporterKQW).%New()
+		for ctrTalen = 1 : 1 : $listlength(lbTalen) {
+			set ExportFilter.Taal = $listget(lbTalen,ctrTalen)
+			set BestandsNaam = ""  // bestandsnaam op leegzetten zodat er een nieuwe gegeneerd wordt
+			do Exporter.ExportPrijsLijst(ExportFilter,.BestandsNaam)
+			set resBestanden = resBestanden _ BestandsNaam _ $$$CRLF
+		}
+		Do $$$DestroyFM
+		
+		set resDummy = $$$MsgBox("Aangemaakte bestanden",resBestanden,$lb($$$mbOk))			
+
+		
 	}
+	else {
+		set txtMsgBox = $piece(txtMsgBox,$$$CRLF,1,$length(txtMsgBox,$$$CRLF)-1) // laatste CLRF afstrippen
+		set resDummy = $$$MsgBox("Generatie prijslijst niet mogelijk",txtMsgBox,$lb($$$mbOk))	
+	}
 	
-	Do $$$DestroyFM
-	
 	/*
-	
-	
 	Set KLNr=..txtKlant.Value
 	Set NoSa=$S(..chkSchaduw.Checked:"S",1:"N")
 	
@@ -405,8 +422,6 @@
 	Set FileNm="Orgalux prijslijst "_KLNr_" "_$$UPTRIMAN^vhRtn1($P(^KKL(^KK1(KLNr),0),"\",2))_".txt"
 	Do $$$ChangeFM("Schrijven "_FileNm)
 	Do ..BldBestand(KLNr,.Sort,FileNm,NoSa,..chkExtraColumns.Checked,..pmTaal.Value,..pmLand.Value)
-	
-	
 	*/
 ]]></Implementation>
 </Method>
@@ -734,5 +749,5 @@
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="204610906"/>
+<Checksum value="1071980549"/>
 </Export>