Index: CHUI/Orgalux/PrintSelect.cls.xml
===================================================================
diff -u -r802 -r902
--- CHUI/Orgalux/PrintSelect.cls.xml	(.../PrintSelect.cls.xml)	(revision 802)
+++ CHUI/Orgalux/PrintSelect.cls.xml	(.../PrintSelect.cls.xml)	(revision 902)
@@ -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-07 12:06:09">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-02-28 09:04:45">
 <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>62129,43617.931178</TimeChanged>
+<TimeChanged>62150,32751.36011</TimeChanged>
 <TimeCreated>60290,55550.636499</TimeCreated>
 <ClassDefinitionError>0</ClassDefinitionError>
 
@@ -29,15 +29,15 @@
 <Type>%CHUI.TAction</Type>
 </Property>
 
-<Property name="acExcel">
+<Property name="acPrijslijst">
 <Type>%CHUI.TAction</Type>
 </Property>
 
 <Property name="acXML">
 <Type>%CHUI.TAction</Type>
 </Property>
 
-<Property name="acPDF">
+<Property name="acVerkoophandboek">
 <Type>%CHUI.TAction</Type>
 </Property>
 
@@ -84,7 +84,7 @@
 <Type>%CHUI.TLabel</Type>
 </Property>
 
-<Property name="lblLand">
+<Property name="lblBTW">
 <Type>%CHUI.TLabel</Type>
 </Property>
 
@@ -99,10 +99,13 @@
 <Type>%CHUI.Ctrl.TKlantEdit</Type>
 </Property>
 
-<Property name="chkInclUndef">
-<Type>%CHUI.TCheckBox</Type>
-</Property>
+<UDLText name="T">
+<Content><![CDATA[
+//Property chkInclUndef As %CHUI.TCheckBox;
 
+]]></Content>
+</UDLText>
+
 <Property name="chkInclMulti">
 <Type>%CHUI.TCheckBox</Type>
 </Property>
@@ -130,15 +133,15 @@
 <Type>%CHUI.TButton</Type>
 </Property>
 
-<Property name="btnExcel">
+<Property name="btnPrijslijst">
 <Type>%CHUI.TButton</Type>
 </Property>
 
 <Property name="btnXML">
 <Type>%CHUI.TButton</Type>
 </Property>
 
-<Property name="btnPDF">
+<Property name="btnVerkoophandboek">
 <Type>%CHUI.TButton</Type>
 </Property>
 
@@ -179,7 +182,7 @@
 <Type>%CHUI.TPopup</Type>
 </Property>
 
-<Property name="pmLand">
+<Property name="pmBTW">
 <Type>%CHUI.TPopup</Type>
 </Property>
 
@@ -199,6 +202,16 @@
 <Default>53</Default>
 </Parameter>
 
+<Property name="ExportFilter">
+<Type>DOM.PM.OL.Gamma.dto.ExportFilter</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ExportTalen">
+<Type>%List</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="CreateControls">
 <Description>
 ==========================================================================================================================
@@ -212,12 +225,12 @@
 	Do ..Center()
 	
 	//Actions
-	Do ##class(%CHUI.TAction).CreateSet(%this,"acPDF","PDF",1,$LB("P"))
-	Set ..acPDF.OnExecute=$LB(%this,"acPDFExecute")
-	Do ##class(%CHUI.TAction).CreateSet(%this,"acExcel","Excel",1,$LB("E"))
-	Set ..acExcel.OnExecute=$LB(%this,"acExcelExecute")
-	Do ##class(%CHUI.TAction).CreateSet(%this,"acXML","XML",1,$LB("X"))
-	Set ..acXML.OnExecute=$LB(%this,"acXMLExecute")
+	Do ##class(%CHUI.TAction).CreateSet(%this,"acVerkoophandboek","Verkoophandboek",1,$LB("P"))
+	Set ..acVerkoophandboek.OnExecute=$LB(%this,"acVerkoophandboekExecute")
+	Do ##class(%CHUI.TAction).CreateSet(%this,"acPrijslijst","Prijslijst",1,$LB("E"))
+	Set ..acPrijslijst.OnExecute=$LB(%this,"acPrijslijstExecute")
+	;Do ##class(%CHUI.TAction).CreateSet(%this,"acXML","XML",1,$LB("X"))
+	;Set ..acXML.OnExecute=$LB(%this,"acXMLExecute")
 	Do ##class(%CHUI.TAction).CreateSet(%this,"acCancel","Cancel",1,$LB("-"))
 	Set ..acCancel.OnExecute=$LB(%this,"acCancelExecute")
 	
@@ -227,34 +240,34 @@
 	Set ..lblHeader.Sizing=$$$lsFixed
 	Set ..CaptionControl=..lblHeader
 	Do ##class(%CHUI.TLabel).CreateSet(%this,"lblKlant","Klant:",3,..#Col1,,,$$$alLeft,,,$LB(,,$$$fsNoUnderline))
-	Do ##class(%CHUI.TLabel).CreateSet(%this,"lblDesign","Design",5,..#Col1,,,$$$alLeft,,,$LB(,,$$$fsNoUnderline))
+	Do ##class(%CHUI.TLabel).CreateSet(%this,"lblDesign","Design:",5,..#Col1,,,$$$alLeft,,,$LB(,,$$$fsNoUnderline))
 	Do ##class(%CHUI.TLabel).CreateSet(%this,"lblLadeDiepte","Ladediepte:",7,..#Col1,,,$$$alLeft,,,$LB(,,$$$fsNoUnderline))
 	Do ##class(%CHUI.TLabel).CreateSet(%this,"lblKleur","Kleur:",10,..#Col1,,,$$$alLeft,,,$LB(,,$$$fsNoUnderline))
 	Do ##class(%CHUI.TLabel).CreateSet(%this,"lblWandDikte","Wanddikte:",13,..#Col1,,,$$$alLeft,,,$LB(,,$$$fsNoUnderline))
 	Do ##class(%CHUI.TLabel).CreateSet(%this,"lblLadeType","Type lade:",16,..#Col1,,,$$$alLeft,,,$LB(,,$$$fsNoUnderline))
 	Do ##class(%CHUI.TLabel).CreateSet(%this,"lblMeubelToepassing","MeubelToep.:",19,..#Col1,,,$$$alLeft,,,$LB(,,$$$fsNoUnderline))
 	
 	Do ##class(%CHUI.TLabel).CreateSet(%this,"lblTaal","Taal:",5,..#Col3,,,$$$alLeft,,,$LB(,,$$$fsNoUnderline))
-	Do ##class(%CHUI.TLabel).CreateSet(%this,"lblLand","Land(BTW):",7,..#Col3,,,$$$alLeft,,,$LB(,,$$$fsNoUnderline))
+	Do ##class(%CHUI.TLabel).CreateSet(%this,"lblBTW","BTW% C.P.:",7,..#Col3,,,$$$alLeft,,,$LB(,,$$$fsNoUnderline))
 	
 
 	//Edits
 	Do ##class(%CHUI.Ctrl.TKlantEdit).CreateSet(%this,"txtKlant","Persoon",3,..#Col2,,25)
 	
 	//CheckBoxs
-	Do ##class(%CHUI.TCheckBox).CreateSet(%this,"chkInclUndef","Producten zonder kenmerken (XLS)",16,..#Col3,,10)
+	;Do ##class(%CHUI.TCheckBox).CreateSet(%this,"chkInclUndef","Producten zonder kenmerken (Prijslijst)",16,..#Col3,,10)
 	Do ##class(%CHUI.TCheckBox).CreateSet(%this,"chkInclMulti","Dubbel indien dubbele kenmerken",17,..#Col3,,10)
-	Do ##class(%CHUI.TCheckBox).CreateSet(%this,"chkExtraColumns","Extra columns (XLS)",18,..#Col3,,10)
-	Do ##class(%CHUI.TCheckBox).CreateSet(%this,"chkHiRes","Hoge res. beelden(PDF)",19,..#Col3,,10)
+	Do ##class(%CHUI.TCheckBox).CreateSet(%this,"chkExtraColumns","Extra columns (Prijslijst)",18,..#Col3,,10)
+	Do ##class(%CHUI.TCheckBox).CreateSet(%this,"chkHiRes","Hoge res. beelden(Verkoophandboek)",19,..#Col3,,10)
 	Do ##class(%CHUI.TCheckBox).CreateSet(%this,"chkSchaduw","Schaduwprijzen",20,..#Col3,,10)
 	
 	//Buttons
-	Do ##class(%CHUI.TButton).CreateSet(%this,"btnXML","XML",24,35,,9,,,,,$$$alCenter)
-	Set ..btnXML.Action=..acXML
-	Do ##class(%CHUI.TButton).CreateSet(%this,"btnPDF","PDF",24,45,,9,,,,,$$$alCenter)
-	Set ..btnPDF.Action=..acPDF
-	Do ##class(%CHUI.TButton).CreateSet(%this,"btnExcel","Excel",24,55,,9,,,,,$$$alCenter)
-	Set ..btnExcel.Action=..acExcel
+	;Do ##class(%CHUI.TButton).CreateSet(%this,"btnXML","XML",24,35,,9,,,,,$$$alCenter)
+	;Set ..btnXML.Action=..acXML
+	Do ##class(%CHUI.TButton).CreateSet(%this,"btnVerkoophandboek","Verkoophandboek",24,30,,15,,,,,$$$alCenter)
+	Set ..btnVerkoophandboek.Action=..acVerkoophandboek
+	Do ##class(%CHUI.TButton).CreateSet(%this,"btnPrijslijst","Prijslijst",24,48,,15,,,,,$$$alCenter)
+	Set ..btnPrijslijst.Action=..acPrijslijst
 	Do ##class(%CHUI.TButton).CreateSet(%this,"btnCancel","Cancel",24,65,,9,,,,,$$$alCenter)
 	Set ..btnCancel.Action=..acCancel
 
@@ -295,6 +308,7 @@
 	Set ..pmLadeType=##class(%CHUI.TPopup).Create(%this,"pmLadeType","Type lade",..lblLadeType.Top,..#Col2,2,25)
 	Set ..pmLadeType.opMultiSelect=0
 	Do ..pmLadeType.InitSpec(,,,10)
+	Do ..pmLadeType.AddItem("","(Geen)")
 	Do ..pmLadeType.AddItem($$$ToepassingLageLade,"Lage laden")
 	Do ..pmLadeType.AddItem($$$ToepassingHogeLade,"Hoge Laden")
 	Do ..pmLadeType.DefaultFrames()
@@ -305,6 +319,7 @@
 	do ..pmMeubelToepassing.InitSpec(,,,10)
 	
 	set itMeubelToepassingen = ##class(TECH.ListIterator).%New(##class(DOM.PM.OL.Gamma.enu.MeubelToepassing).ValueList())
+	do ..pmMeubelToepassing.AddItem("","(Geen)")
 	while itMeubelToepassingen.HasNext() {
 		set MeubelToepassing = itMeubelToepassingen.Next()
 		do ..pmMeubelToepassing.AddItem(MeubelToepassing,MeubelToepassing)
@@ -317,21 +332,23 @@
 	Do ..pmTaal.AddItem("K","[Klant]")
 	Do ..pmTaal.AddItem("N","N")
 	Do ..pmTaal.AddItem("F","F")
-	Do ..pmTaal.AddItem("NF","N+F(XLS)")
+	Do ..pmTaal.AddItem("NF","N+F")
 	Do ..pmTaal.DefaultFrames()
 	Set ..pmTaal.Value="K"
 	
-	Set ..pmLand=##class(%CHUI.TPopup).Create(%this,"pmLand","Land",..lblLand.Top,..#Col4,1,11)
-	Do ..pmLand.InitSpec(,,,5,11)
-	Do ..pmLand.AddItem("K","[Klant]")
-	Do ..pmLand.AddItem("Z","Zonder BTW")
-	Do ..pmLand.AddItem("1019","Belgische")
-	Do ..pmLand.AddItem("1147","Nederlandse")
-	Do ..pmLand.AddItem("BNL","B+NL(XLS)")
-	Do ..pmLand.DefaultFrames()
-	Set ..pmLand.Value="K"
+	Set ..pmBTW=##class(%CHUI.TPopup).Create(%this,"pmBTW","BTW",..lblBTW.Top,..#Col4,1,11)
+	Do ..pmBTW.InitSpec(,,,5,11)
+	Do ..pmBTW.AddItem("K","[Klant]")
+	Do ..pmBTW.AddItem("ExclBTW","Excl BTW")
+	Do ..pmBTW.AddItem("InclBTW-BE","BE (+21%)")
+	Do ..pmBTW.AddItem("InclBTW-NL","NL (+19%)")
+	Do ..pmBTW.AddItem("InclBTW-BE,InclBTW-NL","BE & NL")
+	Do ..pmBTW.DefaultFrames()
+	Set ..pmBTW.Value="K"
 
-	Do ..SetTabAndPaintOrder(..txtKlant,..pmTBXType,..pmLadeDiepte,..pmKleur,..pmWandDikte,..pmLadeType,..pmMeubelToepassing,..chkInclUndef,..chkInclMulti,..chkExtraColumns,..chkHiRes,..chkSchaduw,..pmTaal,..pmLand,..btnXML,..btnPDF,..btnExcel,..btnCancel)
+	Do ..SetTabAndPaintOrder(..txtKlant,..pmTBXType,..pmLadeDiepte,..pmKleur,..pmWandDikte,..pmLadeType,..pmMeubelToepassing,..pmTaal,..pmBTW,..chkInclMulti,..chkExtraColumns,..chkHiRes,..chkSchaduw,..btnVerkoophandboek,..btnPrijslijst,..btnCancel)
+	;Do ..SetTabAndPaintOrder(..txtKlant,..pmTBXType,..pmLadeDiepte,..pmKleur,..pmWandDikte,..pmLadeType,..pmMeubelToepassing,..pmTaal,..pmLand,..chkInclUndef,..chkInclMulti,..chkExtraColumns,..chkHiRes,..chkSchaduw,..btnPrijslijst,..btnCancel)
+	;Do ..SetTabAndPaintOrder(..txtKlant,..pmTBXType,..pmLadeDiepte,..pmKleur,..pmWandDikte,..pmLadeType,..pmMeubelToepassing,..pmTaal,..pmLand,..chkInclUndef,..chkInclMulti,..chkExtraColumns,..chkHiRes,..chkSchaduw,..btnXML,..btnVerkoophandboek,..btnPrijslijst,..btnCancel)
 ]]></Implementation>
 </Method>
 
@@ -345,84 +362,100 @@
 ]]></Implementation>
 </Method>
 
-<Method name="cvtValuesToExportFilter">
-<ReturnType>DOM.PM.OL.Gamma.dto.ExportFilter</ReturnType>
+<Method name="BuildExportParameters">
+<ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	set ExportFilter = ##class(DOM.PM.OL.Gamma.dto.ExportFilter).%New()
-	set ExportFilter.KlantNr = ..txtKlant.Value
+	set ..ExportFilter = ##class(DOM.PM.OL.Gamma.dto.ExportFilter).%New()
+	set ..ExportFilter.KlantNr = ..txtKlant.Value
 
-	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
-	set ExportFilter.MeubelToepassing = ..pmMeubelToepassing.Value
-	set ExportFilter.Land = ..pmLand.Value
-	set ExportFilter.OokExtraKolommen = ..chkExtraColumns.Checked
-	set ExportFilter.OokMultiples = ..chkInclMulti.Checked
-	set ExportFilter.OokProductenZonderKenmerken = ..chkInclUndef.Checked
-	set ExportFilter.OokSchaduwPrijzen = ..chkSchaduw.Checked
-	set ExportFilter.HogeResolutieBeelden = ..chkHiRes.Checked
+	set ..ExportFilter.HogeLageLade = ..pmLadeType.Value
+	set ..ExportFilter.LadeDesigns = ..pmTBXType.Value
+	set ..ExportFilter.LadeDieptes = ..pmLadeDiepte.Value
+	set ..ExportFilter.LadeKleuren = ..pmKleur.Value
+	set ..ExportFilter.WandDiktes = ..pmWandDikte.Value
+	set ..ExportFilter.MeubelToepassing = ..pmMeubelToepassing.Value
+	set ..ExportFilter.OokExtraKolommen = ..chkExtraColumns.Checked
+	set ..ExportFilter.OokMultiples = ..chkInclMulti.Checked
+	//set ExportFilter.OokProductenZonderKenmerken = ..chkInclUndef.Checked
+	set ..ExportFilter.ToonSchaduwPrijzen = ..chkSchaduw.Checked
+	set ..ExportFilter.HogeResolutieBeelden = ..chkHiRes.Checked
 	
-	quit ExportFilter
+	set errMessage = ""
+	if '$length(..ExportFilter.KlantNr) {
+		set errMessage = errMessage_"Klant is verplicht"_$$$CRLF	
+ 	} 
+ 	else {
+ 		set Klant = $$$CRMGeefKlant(..ExportFilter.KlantNr)
+ 		set LandKlant = Klant.GeefLand()
+ 		if (LandKlant'=1019)&&(LandKlant'=1147) //&&(LandKlant'=1120) 
+ 			{ set errMessage=errMessage_"Klant is niet afkomstig van Belgie of Nederland"_$$$CRLF }
+ 	 	if ..pmTaal.Value = "K" { 
+			set TaalKlant = Klant.GeefTaal()
+			if (TaalKlant'=##class(DOM.enu.Taal).Frans()) && ( TaalKlant '= ##class(DOM.enu.Taal).Nederlands()) {
+				set errMessage = errMessage_"Taalkeuze is niet Nederlands of Frans"_$$$CRLF
+			}
+			set ..ExportTalen = $listbuild(TaalKlant)
+		}
+		elseif ..pmTaal.Value = ("NF") {
+			set ..ExportTalen = $listbuild(##class(DOM.enu.Taal).Nederlands(),##class(DOM.enu.Taal).Frans()) 
+		}
+		else { 
+			set ..ExportTalen = $listbuild(..pmTaal.Value) 
+		}
+		
+		if ..pmBTW.Value= "K" {
+			if LandKlant=1019 { set ..ExportFilter.BTW = "InclBTW-BE" }
+			elseif LandKlant=1147 { set ..ExportFilter.BTW = "InclBTW-NL" }
+			elseif LandKlant=1120 { set ..ExportFilter.BTW = "InclBTW-BE" }
+		}
+		else { set ..ExportFilter.BTW = ..pmBTW.Value }
+ 	}
+	
+	if $length(errMessage) {
+		set errMessage = $piece(errMessage,$$$CRLF,1,$length(errMessage,$$$CRLF)-1) // laatste CLRF afstrippen
+		set resDummy = $$$MsgBox("Generatie bestanden niet mogelijk",errMessage,$listbuild($$$mbOk))	
+	}
+	
+	quit errMessage
 ]]></Implementation>
 </Method>
 
-<Method name="acExcelExecute">
+<Method name="acPrijslijstExecute">
 <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 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) 
-	}
-	
-	if flagExport {
+	set errMessage= ..BuildExportParameters()
+	if '$length(errMessage) {
 		set resBestanden = ""
-		do $$$CreateFM("Opbouw tekstbestand","Selecteren ORGALUX producten, even geduld...")
+		do $$$CreateFM("Opbouw bestanden","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)
+		for ctrTalen = 1 : 1 : $listlength(..ExportTalen) {
+			set ..ExportFilter.Taal = $listget(..ExportTalen,ctrTalen)
 			set BestandsNaam = ""  // bestandsnaam op leegzetten zodat er een nieuwe gegeneerd wordt
-			do Exporter.ExportPrijsLijst(ExportFilter,.BestandsNaam)
-			set resBestanden = resBestanden _ BestandsNaam _ $$$CRLF
+			do Exporter.ExportPrijsLijst(..ExportFilter,.BestandsNaam)
+			if $length(BestandsNaam) set resBestanden = resBestanden _ BestandsNaam _ $$$CRLF
 		}
 		Do $$$DestroyFM
-		
-		set resDummy = $$$MsgBox("Aangemaakte bestanden",resBestanden,$lb($$$mbOk))			
+		set resDummy = $$$MsgBox("Aangemaakte bestanden",resBestanden,$listbuild($$$mbOk))			
+	}
+]]></Implementation>
+</Method>
 
-		
+<Method name="acVerkoophandboekExecute">
+<FormalSpec>Sender:%CHUI.TControlBasis</FormalSpec>
+<Implementation><![CDATA[
+	set errMessage= ..BuildExportParameters()
+	if '$length(errMessage) {
+		set resBestanden = ""
+		do $$$CreateFM("Opbouw bestanden","Selecteren ORGALUX producten, even geduld...")
+		set Exporter = ##class(APPS.PM.OL.Export.impl.OrgaluxGammaExporterKQW).%New()
+		for ctrTalen = 1 : 1 : $listlength(..ExportTalen) {
+			set ..ExportFilter.Taal = $listget(..ExportTalen,ctrTalen)
+			do Exporter.ExportVerkoophandboek(..ExportFilter,.BestandsNaam)
+			if $length(BestandsNaam) set resBestanden = resBestanden _ BestandsNaam _ $$$CRLF
+		}
+		Do $$$DestroyFM
+		set resDummy = $$$MsgBox("Volgende bestanden worden aangemaakt",resBestanden,$listbuild($$$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))	
-	}
-	
-	/*
-	Set KLNr=..txtKlant.Value
-	Set NoSa=$S(..chkSchaduw.Checked:"S",1:"N")
-	
-	;w "*",$$ListToPieces^vhLib(..pmLadeDiepte.Value),"*",! h 5
-	Do ..BldSortLocal(KLNr,.Sort,$LB(..pmTBXType.Value),..pmLadeDiepte.Value,..pmWandDikte.Value,..pmKleur.Value,..pmLadeType.Value,..chkInclUndef.Checked,..chkInclMulti.Checked)
-	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>
 
@@ -437,7 +470,7 @@
 	Do $$$CreateFM("Opbouw XMLbestand","Schrijven naar "_FileNm)
 
 	Set rs=##class(%XML.DataSet).%New("BL.Prod.OL.Query:qGetList")
-	Do rs.SetArgs(KLNr,..pmTaal.Value,$LB(..pmTBXType.Value),..pmLadeDiepte.Value,..pmWandDikte.Value,..pmKleur.Value,..pmLadeType.Value,..chkInclUndef.Checked,..chkInclMulti.Checked)
+	;Do rs.SetArgs(KLNr,..pmTaal.Value,$LB(..pmTBXType.Value),..pmLadeDiepte.Value,..pmWandDikte.Value,..pmKleur.Value,..pmLadeType.Value,..chkInclUndef.Checked,..chkInclMulti.Checked)
 	Set rs.DiffGram=0 
 	Set rs.NeedSchema=1
 	
@@ -454,15 +487,15 @@
 ]]></Implementation>
 </Method>
 
-<Method name="acPDFExecute">
+<Method name="OldacPDFExecute">
 <FormalSpec>Sender:%CHUI.TControlBasis</FormalSpec>
 <Implementation><![CDATA[
 	Do $$$CreateFM("Opbouw PDF-bestand","De PDF wordt aangemaakt in uw shared map ...")
 	#define OLProdGrp ""_"&ProductType=WOODLINE_Beuk" ; _"&SubType="_$$$cUrl("Antislipmat grijs") ; _"&ProductType=BOXSIDE" ; "&SubType=..."
 	Set KLNr=..txtKlant.Value
 	Set NoSa=$S(..chkSchaduw.Checked:"S",1:"N")
 
-	Set Land=..pmLand.Value
+	Set Land=..pmBTW.Value
 	Set:Land="BNL" Land="K"
  	Set:Land="K" Land=$P(^KKL(^KK1(KLNr),0),"\",8)
  	Set LandCode="BE"
@@ -749,5 +782,5 @@
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="1071980549"/>
+<Checksum value="2177468623"/>
 </Export>