Index: WV GAProduct WWW.prj.xml
===================================================================
diff -u -r1698 -r1932
--- WV GAProduct WWW.prj.xml	(.../WV GAProduct WWW.prj.xml)	(revision 1698)
+++ WV GAProduct WWW.prj.xml	(.../WV GAProduct WWW.prj.xml)	(revision 1932)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
-<Project name="WV GAProduct WWW" LastModified="2011-07-15 14:18:58" Target="ophSendAlertMail^csp" TargetType="2" HttpServer="http://192.168.1.67:1972">
+<Project name="WV GAProduct WWW" LastModified="2011-08-30 17:53:25" Target="ophSendAlertMail^csp" TargetType="2" HttpServer="http://192.168.1.67:1972">
   <Items>
     <ProjectItem name="/csp/httplog/DLGqueryVH.csp" type="CSP"/>
     <ProjectItem name="/csp/httplog/queryVH.csp" type="CSP"/>
@@ -157,7 +157,6 @@
     <ProjectItem name="csp.errorvhtbx" type="CLS"/>
     <ProjectItem name="csp.tbx.errorreport" type="CLS"/>
     <ProjectItem name="csp.tbx.printpage" type="CLS"/>
-    <ProjectItem name="csp.tbx.resitems" type="CLS"/>
     <ProjectItem name="csp.vhisie.TBX.BuildRef.tmpDev.MAC" type="MAC"/>
     <ProjectItem name="csp.vhisie.TBX.MailResult.tmpDev.MAC" type="MAC"/>
     <ProjectItem name="csp.vhisie.TBX.Main.tmpDev.MAC" type="MAC"/>
@@ -178,7 +177,6 @@
     <ProjectItem name="vhDeploy.WV.Deploy20110630x1132" type="CLS"/>
     <ProjectItem name="vhUnitTest.APPS.TBXWeb.TestActies" type="CLS"/>
     <ProjectItem name="vhisie/TBX/TestDataOptHFLB.csp" type="CSP"/>
-    <ProjectItem name="wv.tmpDev3.MAC" type="MAC"/>
     <ProjectItem name="zTryout.WV.APPS.OV.OrderBevestigingSFS" type="CLS"/>
   </Items>
 </Project>
Index: Prod/GADef/KaderDeur/KostPrijs.mac.rou
===================================================================
diff -u -r1152 -r1932
--- Prod/GADef/KaderDeur/KostPrijs.mac.rou	(.../KostPrijs.mac.rou)	(revision 1152)
+++ Prod/GADef/KaderDeur/KostPrijs.mac.rou	(.../KostPrijs.mac.rou)	(revision 1932)
@@ -66,6 +66,7 @@
 #define KADBasis   "KADBasis"
  New KadObj,Prod,arValidPR,KPrijs,arKDtls,BEF2EUR
  Set KadObj=%this
+ Set:($G(%IsKlantHein)) KLNr=7833   ; Added by WimV on 31/08/2011  - prijsberekening voor VPK=E(xport) 
  ;Set BldDtl=($IsObject($G(CalcObj)))
  Do tnbInitGADataProd
  Quit:('$IsObject(Prod)) ""
@@ -136,7 +137,7 @@
  Do tnbSetViaProgLabel("LBSL2","")
  Do tnbSetViaProgLabel("LBOR","")
  Do tnbSetViaProgLabel("MON",KadObj.Gemonteerd)
- Do tnbSetViaProgLabel("VPK",KadObj.Verpakking)
+ Do tnbSetViaProgLabel("VPK",$$tnbCallbackVerpakking(KadObj.Verpakking,$G(KLNr),$G(blnGADataSchaduw)))
  Do tnbSetViaProgLabel("DOSNR",KadObj.Dossier)
  Set BEF2EUR=1   ; 1/40.3399
  Do tnbSetViaProgLabel("PROFKS",KadObj.ProfAfwKostSpecial*BEF2EUR)
@@ -165,7 +166,11 @@
  Quit Item.SetObject(KadObj)
  Quit $$$OK
  
+tnbCallbackVerpakking(Verpakking,KLNr,blnSchaduw)
+   d WLIP^vhDBG(97,"Verpakking="_Verpakking_"  KLNr="_KLNr_"  blnSchaduw="_blnSchaduw)
+ Quit Verpakking
  
+ 
  // =====================================================================================================
  // CALCviaResPiKost :
  // ----------------  
Index: Prod/GAData/Template.cls.xml
===================================================================
diff -u -r1074 -r1932
--- Prod/GAData/Template.cls.xml	(.../Template.cls.xml)	(revision 1074)
+++ Prod/GAData/Template.cls.xml	(.../Template.cls.xml)	(revision 1932)
@@ -364,7 +364,11 @@
 	If (..SchaduwVersion="") Do   ; If +..SchaduwVersion=0 Do
 	. Set ..SchaduwVersion=..Version
 
+	Set %CheckWithSchaduwTProduct=1
 	Set SyncResult=..SyncProd(PrevProdID,PrevProdID,.SyncStat,$LB(1,0,0))   ; Analyse only !!!
+	Set %CheckWithSchaduwTProduct=0
+	Kill %CheckWithSchaduwTProduct 
+
 	  d WLIP^vhDBG(97,"SyncResult : "_SyncResult_$$$CRLF_$$$ArrayTT("SyncStat",.SyncStat))
 	If SyncResult Do
 	. Kill SyncStat("SAME")
Index: Prod/GAData/Template/tmpDev.mac.rou
===================================================================
diff -u -r1047 -r1932
--- Prod/GAData/Template/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 1047)
+++ Prod/GAData/Template/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 1932)
@@ -170,7 +170,7 @@
    s:('$D(%ClientIP)) %ClientIP="192.168.1.97"
  Quit:($G(ProdID)="") 1
  New TemplID
- Set TemplID=..ProductGetObjectId()   ; $S(..SchaduwActief:..SchaduwProductGetObjectId() , 1:..ProductGetObjectId())
+ Set TemplID=$S((..SchaduwActief)&&($G(%CheckWithSchaduwTProduct,0)):..SchaduwProductGetObjectId() , 1:..ProductGetObjectId())
  Quit:(TemplID="")||(TemplID=ProdID) 1
  New arProd,arTempl,arNew,arComp,arSync,DestID
  New blnRemoveLostDItems,blnDoNotSave,blnForceSyncAll
Index: PRBS.mac.rou
===================================================================
diff -u -r1894 -r1932
--- PRBS.mac.rou	(.../PRBS.mac.rou)	(revision 1894)
+++ PRBS.mac.rou	(.../PRBS.mac.rou)	(revision 1932)
@@ -433,7 +433,7 @@
 	Quit:(GENTYP'?1(1"KAD",1"PRF",1"GLA",1"TBX",1"GRP",1"TLM",1"ASM"))
 	Quit:$D(^PRBS("BS",MPRNr))=""
 	Quit:$G(NoSa)'="S"&&(GENTYP?1(1"KAD",1"PRF",1"GLA")) ; Kaderdeur is niet mogelijk bij normale prijs
-	Set VersionIsFilled=($P(^PRBS("BS",MPRNr),"\",3)'="")
+	Set VersionIsFilled=($P($G(^PRBS("BS",MPRNr)),"\",3)'="")
 	Set:'VersionIsFilled $P(^PRBS("BS",MPRNr),"\",3)="v9.9.9" ; tijdelijk opzetten om de KPRCreate te kunnen uitvoeren
 	If $G(NoSa)="S" Do
 	. 	  d WLIP^vhDBG(97,"KPRCreateSchaduwViaPRNr")