From 627cf334bcd81802ab4af3a2f86591c3583e2bd1 Mon Sep 17 00:00:00 2001 From: Erik Groener Date: Thu, 31 Mar 2016 13:56:03 +0000 Subject: [PATCH] MDUX#35315 Managementrapportage - catalogus op laten nemen svn path=/Website/trunk/; revision=28719 --- APPL/BES/bes_edit_bestelling.asp | 2 +- APPL/BES/bes_edit_bestelling_save.asp | 5 +++-- APPL/BES/bes_list.inc | 11 ----------- APPL/BES/bes_search.asp | 12 +----------- APPL/BES/bes_search_list.asp | 2 -- 5 files changed, 5 insertions(+), 27 deletions(-) diff --git a/APPL/BES/bes_edit_bestelling.asp b/APPL/BES/bes_edit_bestelling.asp index 052df8188c..2cc7b09e5e 100644 --- a/APPL/BES/bes_edit_bestelling.asp +++ b/APPL/BES/bes_edit_bestelling.asp @@ -743,7 +743,7 @@ else // nieuwe bestelling. Defaults bepalen label: L("lcl_bes_Supplier"), filtercode: "Lv", required: true, - readonly: !backo, + readonly: !(bes_key < 0 || (bes_key > 0 && backo)), onChange: "onChangeBedrijf" }); RWFIELDTR("srtdeel_nr", "fld", L("lcl_bes_srtdeel_nr"), "", { required: true, maxlength: 32 }); diff --git a/APPL/BES/bes_edit_bestelling_save.asp b/APPL/BES/bes_edit_bestelling_save.asp index f801fd21b1..f124f3ab7b 100644 --- a/APPL/BES/bes_edit_bestelling_save.asp +++ b/APPL/BES/bes_edit_bestelling_save.asp @@ -35,7 +35,6 @@ else } var bes_disc_info = bes.disc_info(dis_key); -var lev_key = getFParamInt("lev_key_ro", getFParamInt("lev_key")); var act_key = getFParamInt("act_key", -1); var act_mode = (act_key > 0); var kostenplaats_key = getFParamInt("kostenplaats",-1); @@ -49,6 +48,8 @@ var srtdeel_keys = getFParamIntArray("srtdeel_keys",[]); // Bij isFree ook voor if (bes_disc_info.isFreeArticle) { // Moeten we de nieuwe srtdeel-en nog aanmaken + var lev_key = getFParamInt("lev_key_ro", getFParamInt("lev_key")); + for (var itemregelnr = 0; itemregelnr < item_keys_unsafe.length; itemregelnr++) { var srtdeel_nr = getFParam("srtdeel_nr_" + item_keys_unsafe[itemregelnr], ""); // Leeg bij bewerken bestaande; @@ -332,7 +333,7 @@ else if (bes_bestelling.totaal.toFixed(2) != staffel_info.totaalbedrag.toFixed(2)) besUpd.trackarray.push(L("lcl_total") + ": " + buildTrackText("float", safe.curr(bes_bestelling.totaal), safe.curr(staffel_info.totaalbedrag))); - if (bes_bestelling.prs_bedrijf_key != lev_key) + if (bes_disc_info.isFreeArticle && bes_bestelling.prs_bedrijf_key != lev_key) { var upd_lev = "UPDATE bes_srtdeel" + " SET prs_bedrijf_key = " + lev_key diff --git a/APPL/BES/bes_list.inc b/APPL/BES/bes_list.inc index a5e37fba7b..fc4e0ae6f7 100644 --- a/APPL/BES/bes_list.inc +++ b/APPL/BES/bes_list.inc @@ -20,7 +20,6 @@ requestor_key search for orders for selected requestor personfor_key search for orders for person company_key search for orders for the selected company - account_key search for orders for the selected business unit dep_key search for orders for the selected department kp search for orders with the given account text in account description item search for orders with the given account text in item description @@ -89,7 +88,6 @@ function bes_list (pautfunction, params) // params.requestor_key : key // params.personfor_key : key // params.company_key : key - // params.account_key : key // params.dep_key : key // params.kp : wildcard string // params.item : wildcard string @@ -138,7 +136,6 @@ function bes_list (pautfunction, params) var requestor_key = params.requestor_key; var personfor_key = params.personfor_key; var company_key = params.company_key; - var account_key = params.account_key; var dep_key = params.dep_key; var kp = params.kp; var item = params.item; @@ -1258,9 +1255,6 @@ function bes_list (pautfunction, params) if (personfor_key) sql_filter += " AND bo.prs_perslid_key_voor = " + personfor_key; - if (account_key) - sql_filter += " AND b.prs_kostenplaats_key = " + account_key; - if (kp) { sql_filter += " AND bi.bes_bestelopdr_item_key IN " @@ -1304,9 +1298,6 @@ function bes_list (pautfunction, params) + ", bo.bes_bestelopdr_module" + ", dis.ins_discipline_key" + "," + lcl.xsql("dis.ins_discipline_omschrijving", "dis.ins_discipline_key") +" catalogus" - + ", (SELECT kp.prs_kostenplaats_omschrijving" - + " FROM prs_kostenplaats kp" - + " WHERE prs_kostenplaats_key = b.prs_kostenplaats_key) kostenplaats" + ", d.prs_afdeling_key" + ", (bi.bes_bestelopdr_item_aantal * bes_bestelopdr_item_prijs) totaalbedrag" // klopt dit wel? + ", (bi.bes_bestelopdr_item_aantal * bes_bestelopdr_item_inkprijs) inktotaalbedrag" @@ -1364,7 +1355,6 @@ function bes_list (pautfunction, params) + " , x.bes_bestelopdr_module" + " , x.supplier" + " , x.catalogus" - + " , x.kostenplaats" + " , x.besteller" + " , x.organisation" + " , SUM(x.totaalbedrag) totaalbedrag" @@ -1384,7 +1374,6 @@ function bes_list (pautfunction, params) + ", x.bes_bestelling_retourvan_key" + ", x.supplier" + ", x.catalogus" - + ", x.kostenplaats" + ", x.besteller" + ", x.organisation" + ", x.bes_bestelopdr_status" diff --git a/APPL/BES/bes_search.asp b/APPL/BES/bes_search.asp index ae45ab1ea4..c6be545deb 100644 --- a/APPL/BES/bes_search.asp +++ b/APPL/BES/bes_search.asp @@ -379,7 +379,7 @@ oRs.Close(); FCLTafdelingselector("sDept_key", // organisation "sgDept", { departmentKey: dep_key, - label: L("lcl_dep_name_level2"), // Nu Afdeling, was L("lcl_bes_organisation") => Organisatie + label: L("lcl_prs_organisatie"), // Nu Afdeling, was L("lcl_bes_organisation") => Organisatie autlevel: authparams.PRSreadlevel, // Was voorheen niet aanwezig trclass: "secsearch", whenEmpty: L("lcl_search_generic") // want filter @@ -388,16 +388,6 @@ oRs.Close(); } if (minfo) { - // - FCLTkostenplaatsselector("sAccount_key", - "sgAccount", - user_key, - { label: L("lcl_account"), - trclass: "secsearch", - filtercode: "A", //"AA", // Alleen actieve kostenplaatsen kunnen selecteren "All Active". Huidige waarde als initiële waarde kan bij kostenplaatsen altijd. - whenEmpty: L("lcl_search_generic") - }); - // FCLTbedrijfselector("sSuppl_key", // supplier "sgSuppl", diff --git a/APPL/BES/bes_search_list.asp b/APPL/BES/bes_search_list.asp index 4c9490fd52..c258b2936b 100644 --- a/APPL/BES/bes_search_list.asp +++ b/APPL/BES/bes_search_list.asp @@ -58,7 +58,6 @@ else var requestor_key = getQParamInt("sName_key", -1); var personfor_key = getQParamInt("personFor", -1); var company_key = getQParamInt("sComp_key", -1); - var account_key = getQParamInt("sAccount_key", -1); var dep_key = getQParamInt("sDept_key", -1); var kp = getQParam("kp", ""); var item = getQParam("item", ""); @@ -74,7 +73,6 @@ else params.requestor_key = (requestor_key != -1? requestor_key : null); params.personfor_key = (personfor_key != -1? personfor_key : null); params.company_key = (company_key != -1? company_key : null); - params.account_key = (account_key != -1? account_key : null); params.dep_key = (dep_key != -1? dep_key : null); params.kp = (kp != ""? kp : null); params.item = (item != ""? item : null);