Merge 2016.3 Gold D changes

svn path=/Website/trunk/; revision=33357
2017-03-30 21:40:17 +00:00
parent a328602f24 7cb4e92b75
commit f9f3bac071
19 changed files with 780 additions and 254 deletions
--- a/UTILS/PutOrders/puo_settings.js
+++ b/UTILS/PutOrders/puo_settings.js
@@ -122,6 +122,16 @@ var settings = { // defaults voordat parameters gelezen zijn; fouten gaan nog al
                                        break;
                                }
                            }
+                            else
+                            {
+                                if (n == "flexfilespath" && v.substr(0,1) == '*') // *_DATA wordt branch20163_DATA of FPlace5i_DATA
+                                {
+                                    var fso = new ActiveXObject("Scripting.FileSystemObject");
+                                    v = fso.GetAbsolutePathName(custabspath + "../../..")
+                                                 + v.substr(1) + "/" + customerId;
+                                    __Log("Path {0} is set to {1}".format(n, v));
+                                }
+                            }
                            this[n]= {v: v, t: t};
                            oRs.MoveNext();
                        }