X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FUpdateTransactionsTask.java;fp=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FUpdateTransactionsTask.java;h=9e7c8101b669a91b106fbba811c101ebb11c27f3;hp=b6e9c3edad505f5d786a30388c0eaa26e4ede6fa;hb=9b96a8e36b9db5061ab49578cdbac1b465558dfa;hpb=87a1e58f79757bb0257c911e9bd77eb5d77a3e40 diff --git a/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java b/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java index b6e9c3ed..9e7c8101 100644 --- a/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java +++ b/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java @@ -43,7 +43,7 @@ public class UpdateTransactionsTask extends AsyncTask { final String accFilter = model[0].getAccountFilter() .getValue(); if (accFilter == null) { - sql = "SELECT id, year, month, day FROM transactions WHERE profile=? ORDER BY " + + sql = "SELECT id, year, month, day FROM transactions WHERE profile_id=? ORDER BY " + "year desc, month desc, day desc, id desc"; params = new String[]{String.valueOf(profile_id)}; @@ -51,7 +51,8 @@ public class UpdateTransactionsTask extends AsyncTask { else { sql = "SELECT distinct tr.id, tr.year, tr.month, tr.day from transactions tr " + "JOIN " + "transaction_accounts ta " + - "ON ta.transaction_id=tr.id AND ta.profile=tr.profile WHERE tr.profile=? " + + "ON ta.transaction_id=tr.id AND ta.profile=tr.profile WHERE tr.profile_id=?" + + " " + "and ta.account_name LIKE ?||'%' AND ta" + ".amount <> 0 ORDER BY tr.year desc, tr.month desc, tr.day desc, tr.id " + "desc";