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

Merge 5.4.2d patches

Browse Source 
svn path=/Website/trunk/; revision=22861
This commit is contained in:
Jos Groot Lipman
2014-10-09 11:50:25 +00:00
parent 3e2265caa8
commit 4531413820
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
APPL/INS/load_owkenmerk.asp
View File

@@ -305,7 +305,7 @@ if( txt ) rowIndex = txt.rowIndex;
kv = "<input type=text readonly style='width:200px' value='"+ safe.htmlattr( c1.Value ) + "'>";
else
{
appender = '<option value=\\"'+c0.Value+'\\"'
appender = '<option value="'+c0.Value+'"'
+ ((c0.Value==val || (!isNaN(val) && oRs(3).Value=="INS_V_INS_POORTEN" && s0==c0.Value))?' selected':'')+'>'+ safe.html( c1.Value ) + '</option>';
builder[builder.length]=appender; // push at end of array
}
@@ -356,7 +356,7 @@ if( (klen > 50 && ktype == 'C') || ( ktype == 'L') || ( ktype == 'Q')) {
%>
td.align='left';
td.innerHTML = "<nobr><b id=k<%=i%>l<%=serienr%>><%=((ktype == 'Q')?"":oRs(1).Value)+(kdim!=null?' ['+kdim+']':'') + val_seperator%></b></nobr><input type=hidden name='k<%=i%>key<%=serienr%>' value='<%=oRs(0)%>'><%= kreq ? "<input type=hidden name=k"+i+"req" + serienr + " value=1>" :'' %>"
+ "<br /><div align=<%=ktype == 'L'?'left':'right'%>><%=kv%></div>";
+ "<br /><div align=<%=ktype == 'L'?'left':'right'%>><%=safe.jsstring(kv)%></div>";
td.colSpan = 2;
<%
} else {
@@ -364,7 +364,7 @@ if( (klen > 50 && ktype == 'C') || ( ktype == 'L') || ( ktype == 'Q')) {
td.align='right';
td.innerHTML = "<nobr><b id=k<%=i%>l<%=serienr%>><%=oRs(1).value+(kdim!=null?' ['+kdim+']':'') + val_seperator%></b></nobr><input type=hidden name='k<%=i%>key<%=serienr%>' value='<%=oRs(0)%>'><%= kreq ? "<input type=hidden name=k"+i+"req" + serienr + " value=1>" :'' %>";
td = tr.insertCell(-1);
td.innerHTML = "<%=kv%>";
td.innerHTML = "<%=safe.jsstring(kv)%>";
<%}%>
<% if( !reado ) { %>
function checkK<%=i%><%=serienr%>(show){

34
APPL/RES/res.inc
View File

@@ -748,6 +748,23 @@ res = {
{
rresult.canDelete = false;
}
var sql_d = "SELECT SUM(aantal) aantal_cv"
+ " FROM (SELECT count(*) aantal"
+ " FROM res_rsv_deel"
+ " WHERE res_rsv_deel_verwijder IS NOT NULL"
+ " AND res_rsv_ruimte_key = " + rsv_ruimte_key
+ " UNION "
+ "SELECT count(*) aantal"
+ " FROM res_rsv_artikel"
+ " WHERE res_rsv_artikel_verwijder IS NULL"
+ " AND res_rsv_ruimte_key = " + rsv_ruimte_key
+ ")";
oRs_d = Oracle.Execute(sql_d);
if (oRs_d("aantal_cv").value > 0)
rresult.canChangeCV = rresult.canChangeCV && (rsv_ruimte_van < rresult.earliest_expire_changeCV? false : true);
oRs_d.Close();
rresult.canChangeCV = (S("res_cat_with_expired_room") ? rresult.canChangeCV : rresult.canChange);
}
// Als *alle* R/C/V onderdelen 'verwerkt' zijn dan worden we ook readonly
@@ -781,23 +798,6 @@ res = {
rresult.readoReason = L("lcl_res_reado_completed"); // Alles is al verwerkt;
}
var sql_d = "SELECT SUM(aantal) aantal_cv"
+ " FROM (SELECT count(*) aantal"
+ " FROM res_rsv_deel"
+ " WHERE res_rsv_deel_verwijder IS NOT NULL"
+ " AND res_rsv_ruimte_key = " + rsv_ruimte_key
+ " UNION "
+ "SELECT count(*) aantal"
+ " FROM res_rsv_artikel"
+ " WHERE res_rsv_artikel_verwijder IS NULL"
+ " AND res_rsv_ruimte_key = " + rsv_ruimte_key
+ ")";
oRs_d = Oracle.Execute(sql_d);
if (oRs_d("aantal_cv").value > 0)
rresult.canChangeCV = rresult.canChangeCV && (rsv_ruimte_van < rresult.earliest_expire_changeCV? false : true);
oRs_d.Close();
rresult.canChangeCV = (S("res_cat_with_expired_room") ? rresult.canChangeCV : rresult.canChange);
if (rresult.canDelete)
{ // Hij mag geen onderdelen hebben met status 6 (verwerkt)
if (rresult.max_bo && rresult.max_bo == 6)