From ea6710fcf4e17e3db9a0051b77ba2b59075ec20e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Viga=C5=A1?= Date: Sat, 27 Apr 2024 15:55:13 +0200 Subject: [PATCH] update tax form (#912) --- public/form/form.572.html | 42 ++++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/public/form/form.572.html b/public/form/form.572.html index b7a83530..9514543e 100644 --- a/public/form/form.572.html +++ b/public/form/form.572.html @@ -20408,7 +20408,7 @@ function vypocet_t117(sid) { var t_t119 = hodnota(null, 't119','n',sid,'layoutRow37641','d12.2'); var t_t117 = hodnota(null, 't117','n',sid,'layoutRow37641','d12.2'); -var retval = (((Math.round(100.0000000000001*(t_t119))==Math.round(100.0000000000001*(0)))*zaokruhli_matmj(2,(inliner117('t117',sid)))+(Math.round(100.0000000000001*(t_t119))>Math.round(100.0000000000001*(0)))*Math.max(inliner117('t117',sid), t_t117))); +var retval = ((((Math.round(100.0000000000001*(t_t119))==Math.round(100.0000000000001*(0)))||(Math.round(100.0000000000001*(t_t119))<=Math.round(100.0000000000001*(inliner117('t117',sid)))))*zaokruhli_matmj(2,(inliner117('t117',sid)))+(Math.round(100.0000000000001*(t_t119))>Math.round(100.0000000000001*(inliner117('t117',sid))))*Math.max(inliner117('t117',sid), t_t117))); return retval; } @@ -20461,13 +20461,13 @@ function vypocet_t117_C3(sid) { var t_t117 = hodnota(null, 't117','n',sid,'layoutRow37641','d12.2'); var t_t119 = hodnota(null, 't119','n',sid,'layoutRow37641','d12.2'); -var retval = ((Math.round(100.0000000000001*(t_t117))==Math.round(100.0000000000001*((Math.round(100.0000000000001*(t_t119))==Math.round(100.0000000000001*(0)))*zaokruhli_matmj(2,(inliner117('t117',sid)))+(Math.round(100.0000000000001*(t_t119))>Math.round(100.0000000000001*(0)))*Math.max(inliner117('t117',sid), t_t117))))); +var retval = ((Math.round(100.0000000000001*(t_t117))==Math.round(100.0000000000001*(((Math.round(100.0000000000001*(t_t119))==Math.round(100.0000000000001*(0)))||(Math.round(100.0000000000001*(t_t119))<=Math.round(100.0000000000001*(inliner117('t117',sid)))))*zaokruhli_matmj(2,(inliner117('t117',sid)))+(Math.round(100.0000000000001*(t_t119))>Math.round(100.0000000000001*(inliner117('t117',sid))))*Math.max(inliner117('t117',sid), t_t117))))); return retval; } function vypocet_t117_T3(sid) { var t_t119 = hodnota(null, 't119','n',sid,'layoutRow37641','d12.2'); var t_t117 = hodnota(null, 't117','n',sid,'layoutRow37641','d12.2'); -var retval = ("'r. 117': "+(inliner117_text('t117',sid))+" ("+((Math.round(100.0000000000001*(t_t119))==Math.round(100.0000000000001*(0)))*zaokruhli_matmj(2,(inliner117('t117',sid)))+(Math.round(100.0000000000001*(t_t119))>Math.round(100.0000000000001*(0)))*Math.max(inliner117('t117',sid), t_t117))+")"); +var retval = ("'r. 117': "+(inliner117_text('t117',sid))+" ("+(((Math.round(100.0000000000001*(t_t119))==Math.round(100.0000000000001*(0)))||(Math.round(100.0000000000001*(t_t119))<=Math.round(100.0000000000001*(inliner117('t117',sid)))))*zaokruhli_matmj(2,(inliner117('t117',sid)))+(Math.round(100.0000000000001*(t_t119))>Math.round(100.0000000000001*(inliner117('t117',sid))))*Math.max(inliner117('t117',sid), t_t117))+")"); return retval; //; } @@ -20481,6 +20481,17 @@ var retval = ("'r. 117': DB nemože byť väčší ako je súčet výpočtov za jednotlivé deti (dieťa * sadzba podľa veku * počet zaškrtnutých mesiacov). ("+(inlinedb('t117',sid))+")"); return retval; //; } + + function vypocet_t117_C5(sid) { + var t_t119 = hodnota(null, 't119','n',sid,'layoutRow37641','d12.2'); + var t_t117 = hodnota(null, 't117','n',sid,'layoutRow37641','d12.2'); +var retval = (((((Math.round(100.0000000000001*(t_t119))>=Math.round(100.0000000000001*(inliner117('t117',sid))))&&(Math.round(100.0000000000001*(t_t117))>=Math.round(100.0000000000001*(inliner117('t117',sid))))&&(Math.round(100.0000000000001*(t_t117))<=Math.round(100.0000000000001*(t_t119))))||(Math.round(100.0000000000001*(t_t119))Math.round(100.0000000000001*(0)))*Math.max(inliner117('t117',sid), t_t117))); +var retval = ((((Math.round(100.0000000000001*(t_t119))==Math.round(100.0000000000001*(0)))||(Math.round(100.0000000000001*(t_t119))<=Math.round(100.0000000000001*(inliner117('t117',sid)))))*zaokruhli_matmj(2,(inliner117('t117',sid)))+(Math.round(100.0000000000001*(t_t119))>Math.round(100.0000000000001*(inliner117('t117',sid))))*Math.max(inliner117('t117',sid), t_t117))); return retval; } @@ -20588,13 +20605,13 @@ function vypocet_t117_C3(sid) { var t_t117 = hodnota(null, 't117','n',sid,'layoutRow37641','d12.2'); var t_t119 = hodnota(null, 't119','n',sid,'layoutRow37641','d12.2'); -var retval = ((Math.round(100.0000000000001*(t_t117))==Math.round(100.0000000000001*((Math.round(100.0000000000001*(t_t119))==Math.round(100.0000000000001*(0)))*zaokruhli_matmj(2,(inliner117('t117',sid)))+(Math.round(100.0000000000001*(t_t119))>Math.round(100.0000000000001*(0)))*Math.max(inliner117('t117',sid), t_t117))))); +var retval = ((Math.round(100.0000000000001*(t_t117))==Math.round(100.0000000000001*(((Math.round(100.0000000000001*(t_t119))==Math.round(100.0000000000001*(0)))||(Math.round(100.0000000000001*(t_t119))<=Math.round(100.0000000000001*(inliner117('t117',sid)))))*zaokruhli_matmj(2,(inliner117('t117',sid)))+(Math.round(100.0000000000001*(t_t119))>Math.round(100.0000000000001*(inliner117('t117',sid))))*Math.max(inliner117('t117',sid), t_t117))))); return retval; } function vypocet_t117_T3(sid) { var t_t119 = hodnota(null, 't119','n',sid,'layoutRow37641','d12.2'); var t_t117 = hodnota(null, 't117','n',sid,'layoutRow37641','d12.2'); -var retval = ("'r. 117': "+(inliner117_text('t117',sid))+" ("+((Math.round(100.0000000000001*(t_t119))==Math.round(100.0000000000001*(0)))*zaokruhli_matmj(2,(inliner117('t117',sid)))+(Math.round(100.0000000000001*(t_t119))>Math.round(100.0000000000001*(0)))*Math.max(inliner117('t117',sid), t_t117))+")"); +var retval = ("'r. 117': "+(inliner117_text('t117',sid))+" ("+(((Math.round(100.0000000000001*(t_t119))==Math.round(100.0000000000001*(0)))||(Math.round(100.0000000000001*(t_t119))<=Math.round(100.0000000000001*(inliner117('t117',sid)))))*zaokruhli_matmj(2,(inliner117('t117',sid)))+(Math.round(100.0000000000001*(t_t119))>Math.round(100.0000000000001*(inliner117('t117',sid))))*Math.max(inliner117('t117',sid), t_t117))+")"); return retval; //; } @@ -20608,6 +20625,17 @@ var retval = ("'r. 117': DB nemože byť väčší ako je súčet výpočtov za jednotlivé deti (dieťa * sadzba podľa veku * počet zaškrtnutých mesiacov). ("+(inlinedb('t117',sid))+")"); return retval; //; } + + function vypocet_t117_C5(sid) { + var t_t119 = hodnota(null, 't119','n',sid,'layoutRow37641','d12.2'); + var t_t117 = hodnota(null, 't117','n',sid,'layoutRow37641','d12.2'); +var retval = (((((Math.round(100.0000000000001*(t_t119))>=Math.round(100.0000000000001*(inliner117('t117',sid))))&&(Math.round(100.0000000000001*(t_t117))>=Math.round(100.0000000000001*(inliner117('t117',sid))))&&(Math.round(100.0000000000001*(t_t117))<=Math.round(100.0000000000001*(t_t119))))||(Math.round(100.0000000000001*(t_t119))