diff --git a/html/js/calc.js b/html/js/calc.js
index ae5dac2f4..90e91142a 100644
--- a/html/js/calc.js
+++ b/html/js/calc.js
@@ -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()+'
'+p_history;
- var str_sub="Total :"+p_variable+" = "+''+result.toString()+'';
+ var str_sub='
'+p_variable+" = "+result.toString()+'
'; this.document.getElementById("sub_total").innerHTML=str_sub; this.document.getElementById("listing").innerHTML=p_history; this.document.getElementById('inp').value=result; diff --git a/html/lang/en_US/LC_MESSAGES/messages.po b/html/lang/en_US/LC_MESSAGES/messages.po index fcaff5328..563108098 100644 --- a/html/lang/en_US/LC_MESSAGES/messages.po +++ b/html/lang/en_US/LC_MESSAGES/messages.po @@ -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" 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 diff --git a/include/constant.php b/include/constant.php index cc46c6017..3be52caf8 100644 --- a/include/constant.php +++ b/include/constant.php @@ -88,7 +88,7 @@ define ('SMALLX','ⵝ'); define ('BUTTONADD',"✚"); -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); -} \ No newline at end of file +}