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

AAIT#37456 0 waarde toestaan als (verplicht) opdrachtbedrag

Browse Source 
svn path=/Website/trunk/; revision=31916
This commit is contained in:
Erik Groener
2016-12-09 09:45:22 +00:00
parent 3050d659f6
commit 3450ed694b
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
APPL/MLD/mld.inc
View File

@@ -1537,7 +1537,10 @@ mld = {setmeldingstatus:
+ " AND sc.ctr_discipline_key = c.ins_discipline_key"
+ " AND ins_deelsrtcontrole_key = " + pkey;
var oRs = Oracle.Execute(sql);
return oRs("ins_discipline_omschrijving").value + " " + (oRs("ins_deelsrtcontrole_datum").value != "" ? toDateString(oRs("ins_deelsrtcontrole_datum").value) : "x");
return (oRs.eof
? "x"
: oRs("ins_discipline_omschrijving").value + " " + (oRs("ins_deelsrtcontrole_datum").value != "" ? toDateString(oRs("ins_deelsrtcontrole_datum").value) : "x")
);
break;
}
},

18
APPL/MLD/mld_edit_opdr.js
View File

@@ -17,6 +17,8 @@ function showUurtarief(json, textStatus)
var uurtarief = parseFloat(json.uurtarief); // Uurtarief van bedrijf
if (isNaN(uurtarief))
{ // Bereken opdrachttarief
if (json.uurtarief == null)
$("#uurtarief").val("");
var uren = parseFloat( $("#uren").val());
var mat_kosten = parseFloat( $("#mat_kosten").val());
var corr_kosten = parseFloat( $("#corr_kosten").val());
@@ -77,8 +79,20 @@ function calcTotal()
if ($("#corr_kosten").val() != '' && !isNaN(corr_kosten))
$("#corr_kosten").val(num2currEditable(corr_kosten));
$("#tot_kosten").val(num2currEditable(tot_kosten));
} else {
if ($("#mat_kosten").val() != '' && !isNaN(mat_kosten) ||
$("#corr_kosten").val() != '' && !isNaN(corr_kosten) ||
$("#uren").val() != '' && !isNaN(uren)
)
{
$("#tot_kosten").val(num2currEditable(tot_kosten));
}
else
{
$("#tot_kosten").val(null);
}
}
else
{
$("#tot_kosten").val(0);
}
}