From 8cca2e3db7eb2599a41e42f7bed6dc97423adb29 Mon Sep 17 00:00:00 2001
From: JeanGarf <thierryw777@gmail.com>
Date: Tue, 8 Jun 2021 00:46:15 +0200
Subject: [PATCH] #876 - ** when editing transaction, display 2 decimals but
 not currency symbol because it shall be evaluated (in order to allows
 arithmetic expressions as value)

---
 .../org/gnucash/android/model/AccountType.java     | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/gnucash/android/model/AccountType.java b/app/src/main/java/org/gnucash/android/model/AccountType.java
index 6826f598b..fa51113f0 100644
--- a/app/src/main/java/org/gnucash/android/model/AccountType.java
+++ b/app/src/main/java/org/gnucash/android/model/AccountType.java
@@ -120,6 +120,8 @@ public TransactionType getDefaultTransactionType() {
      * @param shallDisplayCurrency if true will display Currency as well as amount (usefull when displaying balance in
      *                             TransactionListFragment, BalanceSheetFragment...)
      *                             else will not display Currency (usefull in SplitEditorFragment or TransactionFormFragment)
+     *                                  because this allows the value to be an arithmetic expression (ex. 130.67+3) that can be
+     *                                  evluated when loosing focus
      */
     public void displayBalance(final TextView balanceTextView,
                                final Money balance,
@@ -134,7 +136,7 @@ public void displayBalance(final TextView balanceTextView,
         final Money balanceToDisplay = getBalanceWithSignumForDisplay(balance);
 
         if (shallDisplayCurrency) {
-            // Shall currency
+            // Shall display currency
 
             // Display currency
             balanceTextView.setText(!shallDisplayNegativeSignum
@@ -143,7 +145,8 @@ public void displayBalance(final TextView balanceTextView,
                                     : balanceToDisplay.formattedString());
 
         } else {
-            // Shall not display currency
+            // Shall not display currency, because the value may be an aritmetic expression (ex. 130.67+3)
+            // and must not contain currency to be evaluated
 
             // Shall display value in all other cases than zero balance and shall not display zero balance
             final boolean shallDisplayValue = !(balanceToDisplay.isAmountZero() && !shallDisplayZero);
@@ -151,11 +154,12 @@ public void displayBalance(final TextView balanceTextView,
             if (shallDisplayValue) {
                 // Shall display balance
 
-                // Display value without currency and without decimals
+                // Display value without currency but with 2 decimals, in order to be able to be evaluated
+                // in the case where the value is an arithmetic expression like 130.67+3
                 balanceTextView.setText(!shallDisplayNegativeSignum
                                         ? balanceToDisplay.abs()
-                                                          .toShortString()
-                                        : balanceToDisplay.toShortString());
+                                                          .toLocaleString()
+                                        : balanceToDisplay.toLocaleString());
 
             } else {
                 // Shall not display balance