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

YKPN#55907 Veldje extra zichtbaar in factuurregistratie module

Browse Source 
svn path=/Website/trunk/; revision=41274
This commit is contained in:
Erik Groener
2019-03-04 13:50:18 +00:00
parent fb94947c36
commit fee762c1c5
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
APPL/FIN/fin.inc
View File

@@ -1644,19 +1644,15 @@ fin = { func_enabled_factuur: // Wat mag ik zoal op deze specifieke factuur?
+ " AND k.fin_kenmerk_type LIKE 'R'";
function fnBTW(oRs)
{ // TODO: rekening houden met verlegd
if (oRs("BTW").Value == null)
return "";
return oRs("BTW").Value + "%";
}
function fnBTWverlegd(oRs)
{
var v_verlegd = "";
if (oRs("verlegd").Value == 1)
v_verlegd = L("lcl_Yes");
return v_verlegd;
{
var v_btw = "";
if (oRs("BTW").Value != null)
{
v_btw = oRs("BTW").Value + "%";
if (oRs("verlegd").Value == 1)
v_btw += " (" + L("fin_btwtabelwaarde_verlegd").toLowerCase() + ")";
}
return v_btw;
}
var rst = new ResultsetTable({ sql: fin.regelSQL(fin_key),
@@ -1687,7 +1683,6 @@ fin = { func_enabled_factuur: // Wat mag ik zoal op deze specifieke factuur?
rst.addColumn(new Column({caption: L("lcl_shared_charge_type"), content: "kostensoort" }));
rst.addColumn(new Column({caption: L("lcl_fin_total_sum_exBTW")+ " (" + L("lcl_valutasign") + ")", content: "fin_factuurregel_totaal", datatype: "currency", total: true }));
rst.addColumn(new Column({caption: L("lcl_fin_btwtarief"), content: fnBTW, align: "right" }));
rst.addColumn(new Column({caption: L("lcl_fin_btwtabelwaarde_verlegd"), content: fnBTWverlegd }));
rst.addColumn(new Column({caption: L("lcl_fin_total_sum_inBTW"), content: "sumBTW", datatype: "currency", total: true }));
var cnt = rst.processResultset();