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=64977
This commit is contained in:
Jos Groot Lipman
2024-06-04 16:26:55 +00:00
parent ea31003a00
commit 1633b293b1
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 = getFParam("kosten1", "");
var fkosten2 = getFParam("kosten2", "");
var fkosten3 = getFParam("kosten3", "");
var fmateriaal = getFParam("materiaal", "");
var fkosten1 = getFParamFloat("kosten1", null);
var fkosten2 = getFParamFloat("kosten2", null);
var fkosten3 = getFParamFloat("kosten3", null);
var fmateriaal = getFParamFloat("materiaal", null);
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 : calculatePrice(oRs_val("kosten1_val").Value, fkosten1));
var kosten1 = (fkosten1 == null? oRs_std("kosten1_std").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 : calculatePrice(oRs_val("kosten2_val").Value, fkosten2));
var kosten2 = (fkosten2 == null? oRs_std("kosten2_std").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 : calculatePrice(oRs_val("kosten3_val").Value, fkosten3));
var kosten3 = (fkosten3 == null? oRs_std("kosten3_std").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 : calculatePrice(oRs_val("materiaal_val").Value, fmateriaal));
var materiaal = (fmateriaal == null? oRs_std("materiaal_std").Value : fmateriaal);
else
var materiaal = oRs_val("materiaal_val").Value;
if (getFParam("check_uren", "off") == "on")

1
APPL/MJB/mjb_search_list.js
View File

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