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

TWYN#53297 projectnummers

Browse Source 
svn path=/Website/branches/v2017.3/; revision=37951
This commit is contained in:
Erik Groener
2018-05-22 11:07:59 +00:00
parent 0b729e020e
commit 4ec5b705d9
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
APPL/BGT/bgt_tools.inc
View File

@@ -22,12 +22,12 @@ function object_merge(){
function bgt_budgetdiscipline_foreign(p_checkauth)
{
var tbl = "(SELECT d.ins_discipline_key"
+ ", p.bgt_disc_params_code ||' - '|| d.ins_discipline_omschrijving oms"
+ " FROM ins_tab_discipline d"
+ " , bgt_disc_params p"
+ " WHERE d.ins_discipline_key = p.bgt_ins_discipline_key"
+ " AND d.ins_discipline_module = 'BGT'"
+ " AND d.ins_discipline_verwijder IS NULL";
+ " , d.ins_discipline_omschrijving oms"
+ " FROM ins_tab_discipline d"
+ " , bgt_disc_params p"
+ " WHERE d.ins_discipline_key = p.bgt_ins_discipline_key"
+ " AND d.ins_discipline_module = 'BGT'"
+ " AND d.ins_discipline_verwijder IS NULL";
if (p_checkauth)
{
tbl += ""
@@ -41,7 +41,8 @@ function bgt_budgetdiscipline_foreign(p_checkauth)
var foreign = {
"tbl": tbl,
"key": "ins_discipline_key",
"desc": "oms"
"desc": "oms",
"order": "oms"
};
return foreign;

10
APPL/BGT/get_bgt_info_ajax.asp
View File

@@ -241,7 +241,7 @@ switch (req_info)
case "D":
{
sql = "SELECT d.ins_discipline_key sel_key"
+ " , p.bgt_disc_params_code ||' '||d.ins_discipline_omschrijving sel_oms"
+ " , d.ins_discipline_omschrijving sel_oms"
+ " , d.ins_discipline_btw btw_inc"
+ " , NULL btw_val"
+ " , NULL grp_key"
@@ -257,9 +257,9 @@ switch (req_info)
+ " (SELECT ins_discipline_key FROM fac_v_webgebruiker"
+ " WHERE prs_perslid_key = " + user_key
+ " AND (fac_gebruiker_prs_level_read<9 OR fac_gebruiker_alg_level_read<9))";
order = " ORDER BY ins_discipline_volgnr"
+ " , p.bgt_disc_params_code"
+ " , p.bgt_disc_params_code ||' - '||d.ins_discipline_omschrijving";
order = " ORDER BY NVL(ins_discipline_volgnr, 0)"
+ " , d.ins_discipline_omschrijving";
break;
}
case "P":
@@ -277,7 +277,7 @@ switch (req_info)
+ " FROM bgt_project p"
+ " WHERE p.bgt_project_verwijder IS NULL"
+ " AND p.ins_discipline_key = " + parent_key;
order = " ORDER BY p.bgt_project_volgnr"
order = " ORDER BY NVL(p.bgt_project_volgnr, 0)"
+ " , p.bgt_project_code"
+ " , p.bgt_project_code ||' - '|| p.bgt_project_omschrijving";
break;