Skip to content

Commit 2bc0c39

Browse files
committed
Merge pull request #248 from fefe982/dev-split-edit
FIX: add split will throw NPE
2 parents ca4f145 + cb860bc commit 2bc0c39

3 files changed

Lines changed: 6 additions & 1 deletion

File tree

app/src/org/gnucash/android/model/Transaction.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,9 @@ public List<Split> getSplits(String accountUID){
186186
*/
187187
public void setSplits(List<Split> splitList){
188188
mSplitList = splitList;
189+
for (Split split : splitList) {
190+
split.setTransactionUID(mUID);
191+
}
189192
}
190193

191194
/**

app/src/org/gnucash/android/ui/transaction/TransactionFormFragment.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -754,6 +754,7 @@ public void setSplitList(List<Split> splitList, List<String> removedSplitUIDs){
754754
Money balance = Transaction.computeBalance(mAccountUID, mSplitsList);
755755

756756
mAmountEditText.setText(balance.toPlainString());
757+
mTransactionTypeButton.setChecked(balance.isNegative());
757758
//once we set the split list, do not allow direct editing of the total
758759
if (mSplitsList.size() > 1){
759760
mAmountEditText.setEnabled(false);

app/src/org/gnucash/android/ui/transaction/dialog/SplitEditorDialogFragment.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,8 @@ public void onClick(View view) {
229229
updateTransferAccountsList(accountsSpinner);
230230
accountsSpinner.setOnItemSelectedListener(new TypeButtonLabelUpdater(splitTypeButton));
231231

232-
Currency accountCurrency = Currency.getInstance(mAccountsDbAdapter.getCurrencyCode(split.getAccountUID()));
232+
Currency accountCurrency = Currency.getInstance(mAccountsDbAdapter.getCurrencyCode(
233+
split == null ? mAccountUID : split.getAccountUID()));
233234
splitCurrencyTextView.setText(accountCurrency.getSymbol());
234235
splitTypeButton.setAmountFormattingListener(splitAmountEditText, splitCurrencyTextView);
235236
splitTypeButton.setChecked(mBaseAmount.signum() > 0);

0 commit comments

Comments
 (0)