admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 5.3.1 GoldE patches

Browse Source 
svn path=/Website/trunk/; revision=19353
This commit is contained in:
Jos Groot Lipman
2013-10-02 14:01:14 +00:00
parent 38648deef9
commit 7028ba4e91
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CUST/CONN/deelwerk/deelwerk_edit.asp
View File

@@ -25,6 +25,15 @@
<!-- #include file="../../../appl/Shared/persoonselector.inc" -->
<%
// Haltewerkzaamheden CONN
mld_deelwerk_wijzig = 4; // Het aantal volle weken voor de huidige week dat men nog haltewerkzaamheden mag invoeren en wijzigen.
mld_material_fac_usrtab_key = 881; // fac_usrtab_key of materials
mld_activity_fac_usrtab_key = 882; // fac_usrtab_key of stopping-place activities
mld_principal_fac_usrtab_key = 501; // fac_usrtab_key of principals
var mld_disc_stoppingplace = 1001; // discipine key stopping-places
FCLTHeader.Requires({ js: ["autocomplete.js",

6
CUST/CONN/deelwerk/deelwerk_material.asp
View File

@@ -34,8 +34,8 @@ var matamountstr = getQParamArray("matamountstr", []);
<head>
<% FCLTHeader.Generate() %>
<script>
var matkeystrArr = "<%=matkeystr%>";
var matamountstrArr = "<%=matamountstr%>";
var matkeystrArr = "<%=matkeystr.join(",")%>".split(",");
var matamountstrArr = "<%=matamountstr.join(",")%>".split(",");
function moveRight(obj)
{
@@ -160,7 +160,7 @@ var matamountstr = getQParamArray("matamountstr", []);
+ ", ud.fac_usrdata_omschr"
+ " FROM fac_usrdata ud"
+ " WHERE ud.fac_usrtab_key = " + mld_material_fac_usrtab_key
+ " AND ud.fac_usrdata_key IN (" + matkeystr.join(",") + ")"
+ " AND ud.fac_usrdata_key IN (" + (matkeystr.join(",")||-1) + ")"
+ " AND ud.fac_usrdata_verwijder IS NULL"
+ " ORDER BY UPPER(ud.fac_usrdata_omschr)";
FCLTselector("matExist", sql, {multi: true, size:20});