[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 11/12: Improve calc
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 11/12: Improve calc |
Date: |
Fri, 16 Mar 2018 16:28:27 -0400 (EDT) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 6140eb38feccbe1ee795d29eddabfecff0f85b19
Author: Dany De Bontridder <address@hidden>
Date: Fri Mar 16 12:18:07 2018 +0100
Improve calc
---
html/js/calc.js | 3 ++-
html/lang/en_US/LC_MESSAGES/messages.po | 4 ++--
include/constant.php | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/html/js/calc.js b/html/js/calc.js
index ae5dac2..90e9114 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()+'<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;
diff --git a/html/lang/en_US/LC_MESSAGES/messages.po
b/html/lang/en_US/LC_MESSAGES/messages.po
index fcaff53..5631080 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</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
diff --git a/include/constant.php b/include/constant.php
index cc46c60..3be52ca 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
+}
- [Noalyss-commit] [noalyss] branch master updated (2711cee -> 5ae4416), Dany De Bontridder, 2018/03/16
- [Noalyss-commit] [noalyss] 02/12: Install.php, Dany De Bontridder, 2018/03/16
- [Noalyss-commit] [noalyss] 04/12: upgrade102 Adapt for postgres 9.0, Dany De Bontridder, 2018/03/16
- [Noalyss-commit] [noalyss] 05/12: Fix problem with old SQL upgrade, Dany De Bontridder, 2018/03/16
- [Noalyss-commit] [noalyss] 03/12: Improve MONO, Dany De Bontridder, 2018/03/16
- [Noalyss-commit] [noalyss] 06/12: Fix version for MONO, Dany De Bontridder, 2018/03/16
- [Noalyss-commit] [noalyss] 10/12: Upgrade : do not propose to upgrade if system up to date, Dany De Bontridder, 2018/03/16
- [Noalyss-commit] [noalyss] 07/12: translation, Dany De Bontridder, 2018/03/16
- [Noalyss-commit] [noalyss] 12/12: Improve install, Dany De Bontridder, 2018/03/16
- [Noalyss-commit] [noalyss] 11/12: Improve calc,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 09/12: translate, Dany De Bontridder, 2018/03/16
- [Noalyss-commit] [noalyss] 08/12: translate, Dany De Bontridder, 2018/03/16
- [Noalyss-commit] [noalyss] 01/12: Translate, Dany De Bontridder, 2018/03/16