For transactions that have only 2 splits, re-creating the splits lose…

…s all other attributes. Fixes #701
codinguser · Jul 3, 2017 · 957ae86 · 957ae86
1 parent badbe14
commit 957ae86
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/app/src/main/java/org/gnucash/android/ui/transaction/TransactionFormFragment.java b/app/src/main/java/org/gnucash/android/ui/transaction/TransactionFormFragment.java
@@ -698,7 +698,7 @@ private List<Split> extractSplitsFromView(){
 
         BigDecimal amountBigd = mAmountEditText.getValue();
         String baseCurrencyCode = mTransactionsDbAdapter.getAccountCurrencyCode(mAccountUID);
-        Money value 	= new Money(amountBigd, Commodity.getInstance(baseCurrencyCode)).abs();
+        Money value = new Money(amountBigd, Commodity.getInstance(baseCurrencyCode));
         Money quantity = new Money(value);
 
         String transferAcctUID = getTransferAccountUID();
@@ -719,9 +719,24 @@ private List<Split> extractSplitsFromView(){
             }
         }
 
-        Split split1 = new Split(value, mAccountUID);
+        Split split1;
+        Split split2;
+        // Try to preserve the other split attributes.
+        if (mSplitsList.size() >= 2) {
+            split1 = mSplitsList.get(0);
+            split1.setValue(value);
+            split1.setQuantity(value);
+            split1.setAccountUID(mAccountUID);
+
+            split2 = mSplitsList.get(1);
+            split2.setValue(value);
+            split2.setQuantity(quantity);
+            split2.setAccountUID(transferAcctUID);
+        } else {
+            split1 = new Split(value, mAccountUID);
+            split2 = new Split(value, quantity, transferAcctUID);
+        }
         split1.setType(mTransactionTypeSwitch.getTransactionType());
-        Split split2 = new Split(value, quantity, transferAcctUID);
         split2.setType(mTransactionTypeSwitch.getTransactionType().invert());
 
         List<Split> splitList = new ArrayList<>();