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

Merge 2024.1 Gold D patches

Browse Source 
svn path=/Website/trunk/; revision=64972
This commit is contained in:
Jos Groot Lipman
2024-06-04 14:50:17 +00:00
parent 51d45aca6d
commit e09409ae28
8 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/API2/model_issues.inc
View File

@@ -55,7 +55,7 @@ function model_issues(mld_key, params)
"issuetype" : { dbs: "mld_stdmelding_key", typ: "key", foreign: "mld_stdmelding", label: L("lcl_complain"), track: true },
"description": { dbs: "mld_melding_omschrijving", typ: "clob", len: S("mld_melding_oms_maxlen"), label: L("lcl_descr"), track: true, filter: "like" },
"remark" : { dbs: "mld_melding_opmerking", typ: "varchar", label: L("lcl_remark"), track: true},
"subject" : { dbs: "mld_melding_onderwerp", typ: "varchar", label: L("lcl_mld_subject"), track: true},
"subject" : { dbs: "mld_melding_onderwerp", typ: "varchar", label: L("lcl_mld_subject"), track: true, len: 80},
"status" : { dbs: "mld_melding_status", typ: "key", foreign: mld.getmldstatustext, label: L("lcl_status"), track: true, filter: mld.getStatusSql },
"flag" : { dbs: "mld_melding_flag", typ: "key", /* geen echte key, wel key-gedrag */ label: L("lcl_mld_flags"), track: true },
"origin" : { dbs: "mld_meldbron_key", typ: "key", foreign: { tbl: "mld_meldbron",

3
APPL/BES/voorraadInfo.asp
View File

@@ -4,10 +4,13 @@
$Id$
File: voorraadInfo.asp
Note: Het bestand is unauthenticed aan te roepen (vanuit DynArtikelInfo.asp).
Dat vind ik acceptabel voor de minimale informatie die het oplevert
*/ %>
<%
DOCTYPE_Disable = 1;
var ANONYMOUS_Allowed = 1;
%>
<!-- #include file="../Shared/common.inc" -->

2
APPL/BEZ/bez_check_in.asp
View File

@@ -78,7 +78,7 @@ for (i = 0 ; i < bez_key_arr.length; i++)
var loc_key = oRs_A("alg_locatie_key").Value;
var onr_key = oRs_A("alg_onrgoed_keys").Value||-1;
var seq_name = "ALG_LOCATIE_KEY_" + loc_key + "_BADGE"; // Badge nummering per locatie is de default.
if ((S("vis_badgeprint_enable")&8) == 1) //badgenummering per gebouw
if ((S("vis_badgeprint_enable")&8) == 8) //badgenummering per gebouw
{
if (onr_key > 0)
{

21
APPL/IMP/imp_shared.js
View File

@@ -353,18 +353,23 @@ function impReadStream(fileStream, import_app_key, params)
Oracle.Execute(sql);
} // Als import_csv=true dan wordt er niet in specifieke import tabellen geimporteerd maar zal verwerking (update) vanuit fac_imp_csv gebeuren.
var read_lines = teller-1;
var summarytxt = "Ingelezen regels: " + read_lines;
var summarytxt = "";
if (read_lines != 2) // uitsluitend header + 1 dataregel komt bij klanten die PRSIMP per persoon doen duizenden keren per dag voor
{
var summarytxt = "Ingelezen regels: " + read_lines;
}
var read_lines = teller-1;
sql = "BEGIN fac.imp_writelog (" + import_key + ","
+ "'S',"
+ safe.quoted_sql(summarytxt) + ", NULL);"
+ "END;"
Oracle.Execute(sql)
if (summarytxt)
{
sql = "BEGIN fac.imp_writelog (" + import_key + ","
+ "'S',"
+ safe.quoted_sql(summarytxt) + ", NULL);"
+ "END;"
Oracle.Execute(sql)
}
return { success: true, import_key: import_key, backDir: backDir, read_lines: read_lines }
}
// import_key bevat een te verwerken key

16
APPL/INS/ins_xcp_multi_save.asp
View File

@@ -61,10 +61,10 @@ user.auth_required_or_abort(tobeedited > 0); // We klagen niet over enkele wel e
// De ingevulde waarden ophalen.
var fperiode = getFParamInt("periode", null);
var fkp_key = getFParamInt("account", -1);
var fkosten1 = getFParamFloat("kosten1", null);
var fkosten2 = getFParamFloat("kosten2", null);
var fkosten3 = getFParamFloat("kosten3", null);
var fmateriaal = getFParamFloat("materiaal", null);
var fkosten1 = getFParam("kosten1", "");
var fkosten2 = getFParam("kosten2", "");
var fkosten3 = getFParam("kosten3", "");
var fmateriaal = getFParam("materiaal", "");
var furen = getFParamFloat("uren") || null;
var fperc = getFParam("perc", null);
var fstartdatum = getFParamDate("startdatum", null);
@@ -131,19 +131,19 @@ for (var i = 0; i < ingesloten.length; i++)
else
var kp_key = oRs_val("kp_key_val").Value || -1;
if (getFParam("check_kosten1", "off") == "on")
var kosten1 = (fkosten1 == null? oRs_std("kosten1_std").Value : fkosten1);
var kosten1 = (fkosten1 == null? oRs_std("kosten1_std").Value : calculatePrice(oRs_val("kosten1_val").Value, fkosten1));
else
var kosten1 = oRs_val("kosten1_val").Value;
if (getFParam("check_kosten2", "off") == "on")
var kosten2 = (fkosten2 == null? oRs_std("kosten2_std").Value : fkosten2);
var kosten2 = (fkosten2 == null? oRs_std("kosten2_std").Value : calculatePrice(oRs_val("kosten2_val").Value, fkosten2));
else
var kosten2 = oRs_val("kosten2_val").Value;
if (getFParam("check_kosten3", "off") == "on")
var kosten3 = (fkosten3 == null? oRs_std("kosten3_std").Value : fkosten3);
var kosten3 = (fkosten3 == null? oRs_std("kosten3_std").Value : calculatePrice(oRs_val("kosten3_val").Value, fkosten3));
else
var kosten3 = oRs_val("kosten3_val").Value;
if (getFParam("check_materiaal", "off") == "on")
var materiaal = (fmateriaal == null? oRs_std("materiaal_std").Value : fmateriaal);
var materiaal = (fmateriaal == null? oRs_std("materiaal_std").Value : calculatePrice(oRs_val("materiaal_val").Value, fmateriaal));
else
var materiaal = oRs_val("materiaal_val").Value;
if (getFParam("check_uren", "off") == "on")

3
APPL/MGT/mgt_generic.asp
View File

@@ -48,6 +48,7 @@
},
"ins_deelsrtcontrole": { "track": "#INSCUP",
"fields": ["ins_deelsrtcontrole_status",
"ins_deelsrtcontrole_plandatum",
"ins_deelsrtcontrole_datum",
"ins_deelsrtcontrole_datum_org",
"ins_controlemode_key",
@@ -150,7 +151,7 @@
},
"alg_ruimte": { "track": "#ALGRUP",
"fields": ["alg_verdieping_key"]
}
}
}
var table = getQParam("table").toUpperCase();

1
APPL/MJB/mjb_search_list.js
View File

@@ -324,6 +324,7 @@ function multiPriceChangeCallback(json, insKeyString)
kp_key_arr: kp_key_arr,
incbtw: incbtw,
groupby: groupby,
moredetail: moredetail,
deel: deel,
mjbMoved: mjbMoved,
mjbFreezed: mjbFreezed,

2
APPL/MLD/mld_flexkenmerk.inc
View File

@@ -157,6 +157,8 @@ function getFlexKenmerkBlockSql(params)
+ " AND t2.mld_srtkenmerk_kenmerktype = 'M'"
+ " AND k2.mld_kenmerk_verwijder IS NULL"
+ " AND k2.mld_srtkenmerk_key = t2.mld_srtkenmerk_key"
+ " AND COALESCE(k2.mld_kenmerk_omschrijving, t2.mld_srtkenmerk_omschrijving) = "
+ " COALESCE(k.mld_kenmerk_omschrijving, t.mld_srtkenmerk_omschrijving)"
+ " AND BITAND(t2.mld_srtkenmerk_systeem,4) = 0" // niet als vertrouwelijk
+ " AND k2.mld_kenmerk_groep = k.mld_kenmerk_groep"
+ " AND t2.mld_srtkenmerk_verwijder IS NULL"