Index: UI/PR/GA/Antislipmat.cls.xml
===================================================================
diff -u -r1074 -r1185
--- UI/PR/GA/Antislipmat.cls.xml (.../Antislipmat.cls.xml) (revision 1074)
+++ UI/PR/GA/Antislipmat.cls.xml (.../Antislipmat.cls.xml) (revision 1185)
@@ -1446,7 +1446,7 @@
. Set ..frmWBrowser.Form.Height=620
. Set ..frmWBrowser.Form.Width=750
- Set CspDirDefault=$S(($$$Server="CACHE02")&&($$$NSpace="DEV-ADMIN1"):"ADMIN1", 1:$$$NSpace)
+ Set CspDirDefault=$S(($$$Server="CACHE02")&&($$$NSpace="DEV-ADMIN1"):"ADMIN1", ($$$NSpace="DEV"):"ADMIN1", 1:$$$NSpace) ; quick fix for namespace in webbrowser url
Set URL="http://"_$G(ComputerName,$$$Server)_"/csp/"_$G(NameSpace,CspDirDefault)_"/PRGAProduct.csp?KEY="_Key_"&CHK="_CheckDigits
;bvb ==>"http://192.168.1.67/csp/admin1/PRGAProduct.csp?KEY="_Key_"&CHK="_CheckDigits
Do ..frmWBrowser.ocBrowser.Navigate(URL)
Index: UI/Utils/MAppLauncher/MainForm.cls.xml
===================================================================
diff -u -r1074 -r1185
--- UI/Utils/MAppLauncher/MainForm.cls.xml (.../MainForm.cls.xml) (revision 1074)
+++ UI/Utils/MAppLauncher/MainForm.cls.xml (.../MainForm.cls.xml) (revision 1185)
@@ -5,6 +5,7 @@
KeyCodesCNTs,PRGACNTs,UILibCtrlCNTs
Default
%Library.TMFormClass
+0
%Library.String
@@ -436,7 +437,6 @@
Set ..ComKey=$G(^IPCom("IP",MApplication.GetClientIP()))
Kill ^IPCom("IP",MApplication.GetClientIP())
Quit
-
]]>
@@ -625,7 +625,6 @@
IPCom("P","OBJTYP")="OFF"
IPCom("P","DFLREF")=$Name(^HADPR("P",PRNr,"BP"))
*/
-
]]>
@@ -736,7 +735,6 @@
Set ..Params("GAPR","PRNr")=$LG(lbParams,5)
Set ..Params("GAPR","Qty")=$LG(lbParams,6)
Quit
-
]]>
@@ -806,7 +804,6 @@
Set ..Params("GAPR","PRNr")=$LG(lbParams,5)
Set ..Params("GAPR","Qty")=$LG(lbParams,6)
Quit
-
]]>
@@ -855,7 +852,6 @@
Set ..Params("GAPR","PRNr")=$LG(lbParams,5)
Set ..Params("GAPR","Qty")=$LG(lbParams,6)
Quit
-
]]>
@@ -901,7 +897,6 @@
Set ..Params("GAPR","PRNr")=$LG(lbParams,5)
Set ..Params("GAPR","Qty")=$LG(lbParams,6)
Quit
-
]]>
@@ -947,7 +942,6 @@
Set ..Params("GAPR","PRNr")=$LG(lbParams,5)
Set ..Params("GAPR","Qty")=$LG(lbParams,6)
Quit
-
]]>
@@ -988,7 +982,6 @@
Quit ..#MakovaPath_" -a"_$$$CacheIP_" -p7200 -n"_$$$CacheNSpc_" -uCUSR -wCUSR -fUI.Utils.MAppLauncher.MainForm"
; "\\Notes01\shared\common\Makova Run Time\smwrt.exe -a192.168.1.6 -p7200 -nADMIN1 -uCUSR -wCUSR -fUI.Utils.MAppLauncher.MainForm"
-
]]>
@@ -999,9 +992,7 @@
%Library.String
document
literal
-
Index: csp/prgaproduct.cls.xml
===================================================================
diff -u -r1074 -r1185
--- csp/prgaproduct.cls.xml (.../prgaproduct.cls.xml) (revision 1074)
+++ csp/prgaproduct.cls.xml (.../prgaproduct.cls.xml) (revision 1185)
@@ -21,7 +21,7 @@
%Status
0
Index: UI/PR/GA/TandemBox.cls.xml
===================================================================
diff -u -r1074 -r1185
--- UI/PR/GA/TandemBox.cls.xml (.../TandemBox.cls.xml) (revision 1074)
+++ UI/PR/GA/TandemBox.cls.xml (.../TandemBox.cls.xml) (revision 1185)
@@ -3776,7 +3776,7 @@
Do $$$TBoxParameter("SpoelbakZkLi", SPZLI)
Do $$$TBoxParameter("SpoelbakZkRe", SPZRE)
Do $$$TBoxParameter("SpoelbakZkMi", $S(SifonQty>1:SPZMI, 1:""))
- d WL^vhDBG("BTValues : "_(..blTBox.BTValues.GetAt("SpoelbakZkMi"))_" SifonQty="_SifonQty_" SPZMI="_SPZMI)
+ ;d WL^vhDBG("BTValues : "_(..blTBox.BTValues.GetAt("SpoelbakZkMi"))_" SifonQty="_SifonQty_" SPZMI="_SPZMI)
Do $$$TBoxParameter("SpoelbakBreedte", SPBR)
Quit 1
@@ -4925,7 +4925,7 @@
. Set ..frmWBrowser.Form.Height=620
. Set ..frmWBrowser.Form.Width=750
- Set CspDirDefault=$S(($$$Server="CACHE02")&&($$$NSpace="DEV-ADMIN1"):"ADMIN1", 1:$$$NSpace)
+ Set CspDirDefault=$S(($$$Server="CACHE02")&&($$$NSpace="DEV-ADMIN1"):"ADMIN1", ($$$NSpace="DEV"):"ADMIN1", 1:$$$NSpace) ; quick fix for namespace in webbrowser url
Set URL="http://"_$G(ComputerName,$$$Server)_"/csp/"_$G(NameSpace,CspDirDefault)_"/PRGAProduct.csp?KEY="_Key_"&CHK="_CheckDigits
;bvb ==>"http://192.168.1.67/csp/admin1/PRGAProduct.csp?KEY="_Key_"&CHK="_CheckDigits
Do ..frmWBrowser.ocBrowser.Navigate(URL)
Index: csp/PRGAProduct/tmpDev.mac.rou
===================================================================
diff -u -r1152 -r1185
--- csp/PRGAProduct/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 1152)
+++ csp/PRGAProduct/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 1185)
@@ -43,10 +43,15 @@
Quit
opgXMLViaID(ProdID)
New arValidPR,PR
+ d WLIP^vhDBG(97,"opgXMLViaID "_ProdID)
+
Set PR=##class(Prod.GAData.Product).OpenWithCalc(ProdID)
+ d WLIP^vhDBG(97,"after OpenWithCalc ")
Quit:('$IsObject(PR))
If 'PR.ValidatePR(.arValidPR) Do opgInvalidPR
+ d WLIP^vhDBG(97,"after ValidatePR ")
Do PR.XMLWrite(0,"N","GAF;GAO",$S($G(%request.Data("NOXSL",1))=1:"", 1:"Format GAProduct.xsl"))
+ d WLIP^vhDBG(97,"after XMLWrite ")
Do:($G(%request.Data("TOGLOB",1))=1) opgXMLtoGlobal
Do PR.%Close()
Quit
Index: HADWIZ.mac.rou
===================================================================
diff -u -r734 -r1185
--- HADWIZ.mac.rou (.../HADWIZ.mac.rou) (revision 734)
+++ HADWIZ.mac.rou (.../HADWIZ.mac.rou) (revision 1185)
@@ -1,3 +1,5 @@
+#include vhLib.Macro
+
HADWIZ ;Halux deuren wizard [ 11/28/2003 9:45 AM ]
Do INIT^vhTERMINA
;Do DISPLAY(59067)
@@ -144,6 +146,7 @@
Lock -^IPCom("N")
Kill ^IPCom("D",Key)
Set IP=$$GetIP()
+ Set:(IP="127.0.0.1") IP=$$GetIP^BLDSYSLOG($$$Server,1) ; Patch voor lokale terminal op CacheServer ; Added by WimV on 18/05/2011
Quit:IP'?1.3N1"."1.3N1"."1.3N1"."1.3N ""
Set ^IPCom("IP",IP)=Key
Kill ^IPCom("D",Key)
Index: WV GAProduct WWW.prj.xml
===================================================================
diff -u -r1161 -r1185
--- WV GAProduct WWW.prj.xml (.../WV GAProduct WWW.prj.xml) (revision 1161)
+++ WV GAProduct WWW.prj.xml (.../WV GAProduct WWW.prj.xml) (revision 1185)
@@ -1,7 +1,36 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -127,8 +156,6 @@
-
-
@@ -137,34 +164,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Index: UI/PR/GA/Verlichting.cls.xml
===================================================================
diff -u -r1074 -r1185
--- UI/PR/GA/Verlichting.cls.xml (.../Verlichting.cls.xml) (revision 1074)
+++ UI/PR/GA/Verlichting.cls.xml (.../Verlichting.cls.xml) (revision 1185)
@@ -3174,7 +3174,7 @@
. Set ..frmWBrowser.Form.Height=620
. Set ..frmWBrowser.Form.Width=750
- Set CspDirDefault=$S(($$$Server="CACHE02")&&($$$NSpace="DEV-ADMIN1"):"ADMIN1", 1:$$$NSpace)
+ Set CspDirDefault=$S(($$$Server="CACHE02")&&($$$NSpace="DEV-ADMIN1"):"ADMIN1", ($$$NSpace="DEV"):"ADMIN1", 1:$$$NSpace) ; quick fix for namespace in webbrowser url
Set URL="http://"_$G(ComputerName,$$$Server)_"/csp/"_$G(NameSpace,CspDirDefault)_"/PRGAProduct.csp?KEY="_Key_"&CHK="_CheckDigits
;bvb ==>"http://192.168.1.67/csp/admin1/PRGAProduct.csp?KEY="_Key_"&CHK="_CheckDigits
Do ..frmWBrowser.ocBrowser.Navigate(URL)
Index: csp/quotation.cls.xml
===================================================================
diff -u -r1074 -r1185
--- csp/quotation.cls.xml (.../quotation.cls.xml) (revision 1074)
+++ csp/quotation.cls.xml (.../quotation.cls.xml) (revision 1185)
@@ -4,7 +4,28 @@
User
cache
%CSP.Page,cspBasis.KadQuotation
+0
+
+ISO-8859-1
+
+
+
+text/html
+
+
+
+c:\cache\cache2005v021\csp\admin1\Quotation.csp
+
+
+
+/csp/admin1/Quotation.csp
+
+
+
+62185,43249
+
+
1
code
@@ -549,25 +570,5 @@
Set MuntList=$$$NULLOREF
]]>
-
-
-ISO-8859-1
-
-
-
-text/html
-
-
-
-c:\cachesys\csp\admin1\Quotation.csp
-
-
-
-/csp/admin1/Quotation.csp
-
-
-
-61786,41875
-