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

NMMS#54500 Inschakelen 7 decimalen achter de komma

Browse Source 
svn path=/Website/trunk/; revision=39391
This commit is contained in:
Alex Tiehuis
2018-10-15 11:07:52 +00:00
parent 684cb69f84
commit 9f611b8b9f
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
APPL/MLD/mld_opdr_materiaal.asp
View File

@@ -132,13 +132,6 @@ if (!readonly && opdr_key > 0)
<div id="aantalpriceselect" style="display: <%=readonly? "block" : "none"%>">
<% if (readonly)
{ // Bestaande opdracht
function fncolOmschr(oRs)
{
var omschr = oRs("fac_usrdata_omschr").value || oRs("mld_opdr_materiaal_omschr").value;
omschr = '<span title="'+safe.htmlattr(oRs("mld_opdr_materiaal_info").value)+'">'+safe.html(omschr)+'</span>';
return omschr;
}
var sql = "SELECT ud.mld_opdr_materiaal_key"
+ " , ud.mld_opdr_materiaal_id"
+ " , fu.fac_usrdata_key"
@@ -169,6 +162,28 @@ if (!readonly && opdr_key > 0)
+ " , ud.mld_opdr_materiaal_code"
: " ORDER BY fu.fac_usrdata_volgnr"
+ " , UPPER(" + lcl.xsql("fu.fac_usrdata_omschr", "fu.fac_usrdata_key") + ")");
/**********************************
* Callback functies ResultsetTable
*********************************/
function fncolOmschr(oRs)
{
var omschr = oRs("fac_usrdata_omschr").value || oRs("mld_opdr_materiaal_omschr").value;
omschr = '<span title="'+safe.htmlattr(oRs("mld_opdr_materiaal_info").value)+'">'+safe.html(omschr)+'</span>';
return omschr;
}
function fnMateriaalPrijs(oRs) // determine float or currency representation
{
var price = oRs("mld_opdr_materiaal_prijs").Value;
if (String(price).split(".")[1] > 99) // price has more then 2 digits after de decimal point
{
return safe.displayfloat(price, 7, true); // show all digits after decimal point without trailing zeroes
}
else
{
return safe.curr(price); // always show 2 digits after deimal point
}
}
var rst = new ResultsetTable({ keyColumn: "mld_opdr_materiaal_key",
sql: sql,
@@ -189,7 +204,7 @@ if (!readonly && opdr_key > 0)
rst.addColumn(new Column({caption: L("lcl_mld_opdr_omschr"), content: "mld_opdr_materiaal_omschr"}));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_aantal"), content: "mld_opdr_materiaal_aantal", datatype: "number"}));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_eenheid"), content: "mld_opdr_materiaal_eenheid" }));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_prijs"), content: "mld_opdr_materiaal_prijs", datatype: "float", decimals: 7}));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_prijs"), content: fnMateriaalPrijs, datatype: "currency"}));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_btw"), content: "fin_btwtabelwaarde_oms"}));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_totaal"), content: "totaal", datatype: "currency"}));
}
@@ -199,7 +214,7 @@ if (!readonly && opdr_key > 0)
rst.addColumn(new Column({caption: L("lcl_descr"), content: fncolOmschr}));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_code"), content: "mld_opdr_materiaal_code"}));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_eenheid"), content: "mld_opdr_materiaal_eenheid" }));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_prijs"), content: "mld_opdr_materiaal_prijs", datatype: "float", decimals: 7}));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_prijs"), content: fnMateriaalPrijs, datatype: "currency"}));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_btw"), content: "fin_btwtabelwaarde_oms"}));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_totaal"), content: "totaal", datatype: "currency"}));
}