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

MDUX#35315 Managementrapportage - catalogus op laten nemen

Browse Source 
svn path=/Website/trunk/; revision=28699
This commit is contained in:
Erik Groener
2016-03-31 09:04:48 +00:00
parent e948f7f4c2
commit 48441b17b2
2 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
APPL/BES/bes_list.inc
View File

@@ -402,15 +402,11 @@ function bes_list (pautfunction, params)
if (dep_key)
{
sql_org = "SELECT ab.niveau"
+ " FROM prs_v_afdeling_boom ab"
+ " WHERE ab.prs_afdeling_key = " + dep_key;
oRs_org = Oracle.Execute(sql_org);
// Net als bij opdr_list.inc zoeken over alle afdelingen.
sql_filter += " AND p.prs_afdeling_key IN"
+ " (SELECT ab.prs_afdeling_key"
+ " FROM prs_v_afdeling_boom ab"
+ " WHERE ab.prs_afdeling_key" + (!oRs_org.eof? oRs_org(0).value : "") + " = " + dep_key + ")";
+ " (SELECT a.prs_afdeling_key"
+ " FROM prs_v_afdeling_familie a"
+ " WHERE a.prs_afdeling_elder_key = " + dep_key + ")";
}
if (company_key)

33
APPL/BES/bes_search.asp
View File

@@ -359,6 +359,22 @@ oRs.Close();
trclass: "primsearch",
whenEmpty: L("lcl_search_generic") // want filter
});
}
if (minfo)
{
//<!-- Bedrijf -->
FCLTbedrijfselector("sComp_key", // company
"sgComp",
{ companyKey: comp_key,
label: L("lcl_bes_company"),
autlevel: authparams.PRSreadlevel, // Was voorheen niet aanwezig
trclass: "secsearch",
filtercode: "I",
whenEmpty: L("lcl_search_generic") // want filter
});
}
if (!frontend)
{
// <!-- Organisatie -->
FCLTafdelingselector("sDept_key", // organisation
"sgDept",
@@ -370,21 +386,9 @@ oRs.Close();
});
}
if (minfo)
{
//<!-- Bedrijf -->
FCLTbedrijfselector("sComp_key", // company
"sgComp",
{ companyKey: comp_key,
label: L("lcl_bes_company"),
autlevel: authparams.PRSreadlevel, // Was voorheen niet aanwezig
trclass: "secsearch",
filtercode: "I",
whenEmpty: L("lcl_search_generic") // want filter
});
// <!-- Kostenplaats -->
// <!-- Kostenplaats -->
FCLTkostenplaatsselector("sAccount_key",
"sgAccount",
user_key,
@@ -394,8 +398,7 @@ oRs.Close();
whenEmpty: L("lcl_search_generic")
});
// <!-- Leverancier -->
// <!-- Leverancier -->
FCLTbedrijfselector("sSuppl_key", // supplier
"sgSuppl",
{ companyKey: supplier,