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

PLAT#51674: Inclusief btw tonen van geaccordeerde begrotingsregels lukt niet in MJOB console.

Browse Source 
svn path=/Website/trunk/; revision=39559
This commit is contained in:
Maykel Geerdink
2018-10-29 12:33:06 +00:00
parent 63f2910215
commit 71a4f5cadf
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
APPL/INS/ins.inc
View File

@@ -3483,8 +3483,9 @@ ins = {checkAutLevel:
if (ins_xcp_active_cost & 4) costarray.push("COALESCE(comp.ins_srtcontrole_kosten3, 0)");
if (ins_xcp_active_cost & 8) costarray.push("COALESCE(comp.ins_srtcontrole_materiaal, 0)");
var sqlcost = "";
var sqlbtw = (incbtw ? " (COALESCE(comp.ins_srtcontrole_percentage, 100) / 100) *"
+ " (1 + COALESCE((SELECT fbtw.fin_btwtabelwaarde_perc"
var sqlbtw = (incbtw
? " (COALESCE(comp.ins_srtcontrole_percentage, 100) / 100) *"
+ " (1 + COALESCE((SELECT fbtw.fin_btwtabelwaarde_perc"
+ " FROM fin_btwtabelwaarde fbtw"
+ " WHERE fbtw.fin_btwtabelwaarde_key = comp.fin_btwtabelwaarde_key) / 100"
+ " , 0)) "
@@ -3509,18 +3510,24 @@ ins = {checkAutLevel:
+ " WHEN EXTRACT(YEAR FROM comp.ins_deelsrtcontrole_freezedate) = comp.org_nextdate AND"
+ " comp.ins_deelsrtcontrole_status = 2"
+ " THEN COALESCE(comp.ins_deelsrtcontrole_freezecost * "
+ (incbtw ? sqlbtw : "1")
+ " , 0)"
+ " ELSE"
+ " COALESCE (comp.ins_deel_aantal * "
+ sqlcost
+ (incbtw ? sqlbtw + " * POWER(" + inflatiefactor + " , comp.vervangingsjaar - EXTRACT(YEAR FROM SYSDATE))" : "1")
+ " , 0)"
+ (incbtw
? sqlbtw
: "1")
+ " , 0)"
+ " ELSE COALESCE(comp.ins_deel_aantal * "
+ sqlcost
+ (incbtw
? sqlbtw
: "1") + " * "
+ " POWER(" + inflatiefactor + " , comp.vervangingsjaar - EXTRACT(YEAR FROM SYSDATE))"
+ " , 0)"
+ " END bedrag"
+ " , hierlevel"
: " , comp.ins_deelsrtcontrole_freezecost * "
+ (incbtw ? sqlbtw : "1")
+ " bedrag"
: " , comp.ins_deelsrtcontrole_freezecost * "
+ (incbtw
? sqlbtw
: " 1")
+ " bedrag"
+ " , 1 hierlevel")
+ " , comp.ins_deel_aantal"
+ " , comp.ins_srtdeel_eenheid"