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

PLAT#55683 De ins_srtcontrole_percentage factor werd ook meegenomen in de btw-berekening maar deze factor zit al bij ins_deelsrtcontrole_freezecost in

Browse Source 
svn path=/Website/branches/v2018.2/; revision=40146
This commit is contained in:
Koen Reefman
2018-12-07 12:09:13 +00:00
parent 65573a693f
commit 6e3e13277d
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
APPL/INS/ins.inc
View File

@@ -3264,9 +3264,9 @@ ins = {checkAutLevel:
+ " , e.ins_srtcontrole_kosten2"
+ " , e.ins_srtcontrole_kosten3"
+ " , e.ins_srtcontrole_materiaal"
+ " , e.ins_srtcontrole_percentage"
+ " , e.ins_srtdeel_omschrijving"
: "")
+ " , e.ins_srtcontrole_percentage"
+ " , e.ins_srtcontrole_periode"
+ " , e.ins_srtcontrole_opmerking"
+ " , " + sql_vervangingsjaar
@@ -3313,9 +3313,9 @@ ins = {checkAutLevel:
+ " , el.ins_srtcontrole_kosten2"
+ " , el.ins_srtcontrole_kosten3"
+ " , el.ins_srtcontrole_materiaal"
+ " , el.ins_srtcontrole_percentage"
+ " , (SELECT ins_srtdeel_omschrijving FROM ins_srtdeel where ins_srtdeel_key = el.ins_srtdeel_key) ins_srtdeel_omschrijving"
: "")
+ " , el.ins_srtcontrole_percentage"
+ " , el.ins_deel_aanmaak"
+ " , el.ins_srtcontrole_periode"
+ " , el.ins_srtcontrole_opmerking"
@@ -3650,12 +3650,11 @@ ins = {checkAutLevel:
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"
? " (1 + COALESCE((SELECT fbtw.fin_btwtabelwaarde_perc"
+ " FROM fin_btwtabelwaarde fbtw"
+ " WHERE fbtw.fin_btwtabelwaarde_key = comp.fin_btwtabelwaarde_key) / 100"
+ " , 0)) "
: "")
: "1")
if (costarray.length > 0)
sqlcost = "(" + costarray.join(" + ") + ") *";
@@ -3676,24 +3675,18 @@ 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")
+ sqlbtw
+ " , 0)"
+ " ELSE COALESCE(comp.ins_deel_aantal * "
+ sqlcost
+ (incbtw
? sqlbtw
: "1") + " * "
+ " (COALESCE(comp.ins_srtcontrole_percentage, 100) / 100) * "
+ sqlbtw + " * "
+ " POWER(" + inflatiefactor + " , comp.vervangingsjaar - EXTRACT(YEAR FROM SYSDATE))"
+ " , 0)"
+ " END bedrag"
+ " , hierlevel"
: " , comp.ins_deelsrtcontrole_freezecost * "
+ (incbtw
? sqlbtw
: " 1")
+ " bedrag"
: " , (comp.ins_deelsrtcontrole_freezecost * "
+ sqlbtw + ") bedrag"
+ " , 1 hierlevel")
+ " , comp.ins_deel_aantal"
+ " , comp.ins_srtdeel_eenheid"