admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve calc

Browse source
This commit is contained in:
Dany De Bontridder 2018-03-16 12:18:07 +01:00
parent d3f09968de
commit 6140eb38fe
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
html/js/calc.js
View file

@ -53,6 +53,7 @@ function cal()
p_variable=p_variable.replace(/\+/g,"+ ");
p_variable=p_variable.replace(/-/g,"- ");
p_variable=p_variable.replace(/\//g,"/ ");
p_variable=p_variable.replace(/,/g,".");
sub=eval(p_variable);
var result=parseFloat(sub);
@ -64,7 +65,7 @@ function cal()
return false;
}
p_history=p_variable+"="+result.toString()+'<br>'+p_history;
var str_sub="Total :"+p_variable+" = "+'<b>'+result.toString()+'</b>';
var str_sub='<p class="highlight"> '+p_variable+" = "+result.toString()+'</p>';
this.document.getElementById("sub_total").innerHTML=str_sub;
this.document.getElementById("listing").innerHTML=p_history;
this.document.getElementById('inp').value=result;

4
html/lang/en_US/LC_MESSAGES/messages.po
View file

@ -3626,7 +3626,7 @@ msgstr "Report choice"
#: include/opening.inc.php:138
#, php-format
msgid "Choix du dossier : %s"
msgstr "Select your folder"
msgstr "Selected folder %s"
#: include/compta_ach.inc.php:83 include/compta_ach.inc.php:86
#: include/compta_ven.inc.php:95 include/compta_ach.inc.php:88
@ -6079,7 +6079,7 @@ msgstr "Difference"
msgid ""
"Différence entre le montant à amortir %s et le montant amorti %s = %s</h2>"
msgstr ""
"Difference between the amount to be amortized and depreciated amount %s= %s"
"Difference between the amount to be amortized %s and depreciated amount %s= %s"
#: include/ext/amortis/include/template/material_detail.php:128
#: include/ext/amortis/include/template/material_display.php:102

4
include/constant.php
View file

@ -88,7 +88,7 @@ define ('SMALLX','&#x2D5D;');
define ('BUTTONADD',"&#10010;");
define ('SVNINFO',7000);
define ('SVNINFO',7002);
if ( ! defined ('DEBUG')) {
define ("DEBUG",false);
}
@ -326,4 +326,4 @@ if ( ! defined ("NOALYSS_URL")) {
":".$_SERVER['SERVER_PORT'].
dirname($_SERVER['PHP_SELF']);
define ("NOALYSS_URL",$base);
}
}