- Fixed: Editing account modifies the transaction type of transfer transactions - fixes #145

- Fixed: Bug causing double entry transactions not to be considered equal
- Fixed: Computation of account balance did not properly consider double entries
- Improved: Double entry accounting is now activated by default
- Improved: Restricted parent/child account hierarchies relationships to those defined by GnuCash accounting
(see: http://code.gnucash.org/docs/C/gnucash-help/acct-types.html )
Some code refactoring

Author: codinguser

CHANGELOG.md

@@ -1,5 +1,15 @@
 Change Log
 ===============================================================================
+Version 1.3.2 *(2014-03-28)*
+----------------------------
+* Fixed: Editing account modifies the transaction type of transfer transactions
+* Fixed: Bug causing double entry transactions not to be considered equal
+* Fixed: Computation of account balance did not properly consider double entries
+* Improved: Double-entry accounting is now activated by default
+* Improved: Restricted parent/child account hierarchies relationships to those defined by GnuCash accounting
+* Improved: Dutch translation
+* Improved: German translation
+
 Version 1.3.1 *(2014-02-14)*
 ----------------------------
 * Fixed: Crash when bulk moving transactions

app/AndroidManifest.xml

@@ -17,7 +17,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.gnucash.android"
-    android:versionCode="26"
+    android:versionCode="27"
     android:versionName="@string/app_version_name" >
 
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="15"/>

app/pom.xml

@@ -22,7 +22,7 @@
     <description>Gnucash Android companion application</description>
 
     <parent>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.2-SNAPSHOT</version>
         <groupId>org.gnucash.android</groupId>
         <artifactId>gnucash-android-parent</artifactId>
     </parent>

app/res/values-el/strings.xml

@@ -405,7 +405,7 @@
     <string name="menu_scheduled_transactions">Προγραμματισμένες Κινήσεις</string>
     <string name="msg_confirm_create_default_accounts_first_run">GnuCash Android. Καλώς ήρθατε! \nΜπορείτε είτε να δημιουργήσετε
         μια ιεραρχία συνηθισμένων λογαριασμών, ή να εισάγετε τη δική σας δομή λογαριασμών GnuCash. \n\nΚαι οι δύο επιλογές είναι επίσης
-        διαθέσιμες στις Επιλογές της εφαρμογής γι' αυτό μπορείτε να αποφασίσετε αργότερα.
+        διαθέσιμες στις Επιλογές της εφαρμογής γι\' αυτό μπορείτε να αποφασίσετε αργότερα.
     </string>
     <string-array name="recurrence_period_strings">
         <item>ΚΑΜΙΑ</item>

app/res/values/strings.xml

@@ -17,7 +17,7 @@
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">GnuCash</string>
-    <string name="app_version_name">1.3.1</string>
+    <string name="app_version_name">1.3.2</string>
     <string name="title_add_account">Create Account</string>
     <string name="title_edit_account">Edit Account</string>
     <string name="info_details">Info</string>

app/res/xml/fragment_account_preferences.xml

@@ -7,7 +7,8 @@
                     android:dialogTitle="@string/title_choose_currency"
                     android:title="@string/title_default_currency"
                     android:entries="@array/currency_names"
-                    android:entryValues="@array/currency_codes"/>
+                    android:entryValues="@array/currency_codes"
+                    android:defaultValue="USD"/>
     <Preference android:key="@string/key_import_accounts"
                 android:summary="@string/summary_import_accounts"
                 android:title="@string/title_import_accounts" />

app/res/xml/fragment_transaction_preferences.xml

@@ -23,6 +23,7 @@
                     android:summary="@string/summary_default_transaction_type"/>
     <CheckBoxPreference android:summary="@string/summary_use_double_entry"
                         android:key="@string/key_use_double_entry"
+                        android:defaultValue="true"
                         android:title="@string/title_use_double_entry"/>
     <Preference android:key="@string/key_delete_all_transactions"
                 android:summary="@string/summary_delete_all_transactions"

app/src/org/gnucash/android/db/AccountsDbAdapter.java

@@ -22,6 +22,7 @@
 import org.gnucash.android.model.Money;
 import org.gnucash.android.model.Account.AccountType;
 import org.gnucash.android.model.Transaction;
+import org.gnucash.android.model.Transaction.TransactionType;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -84,11 +85,8 @@ public long addAccount(Account account){
 		if ((rowId = getAccountID(account.getUID())) > 0){
 			//if account already exists, then just update
 			Log.d(TAG, "Updating existing account");
-			int rowsAffected = mDb.update(DatabaseHelper.ACCOUNTS_TABLE_NAME, contentValues,
+			mDb.update(DatabaseHelper.ACCOUNTS_TABLE_NAME, contentValues,
                     DatabaseHelper.KEY_ROW_ID + " = " + rowId, null);
-            if (rowsAffected == 1){
-                updateAccount(rowId, DatabaseHelper.KEY_FULL_NAME, getFullyQualifiedAccountName(rowId));
-            }
 		} else {
 			Log.d(TAG, "Adding new account to db");
 			rowId = mDb.insert(DatabaseHelper.ACCOUNTS_TABLE_NAME, null, contentValues);
@@ -99,7 +97,20 @@ public long addAccount(Account account){
             //update the fully qualified account name
             updateAccount(rowId, DatabaseHelper.KEY_FULL_NAME, getFullyQualifiedAccountName(rowId));
 			for (Transaction t : account.getTransactions()) {
-				mTransactionsAdapter.addTransaction(t);
+                //FIXME: This is a hack until actual splits are implemented
+                if (t.getDoubleEntryAccountUID().equals(account.getUID())){
+                    Transaction trx = new Transaction(t,false);
+//                    trx.setAmount(trx.getAmount().negate());
+                    if (trx.getType() == TransactionType.DEBIT) {
+                        trx.setType(TransactionType.CREDIT);
+                    } else {
+                        trx.setType(TransactionType.DEBIT);
+                    }
+
+                    mTransactionsAdapter.addTransaction(trx);
+                }
+                else
+				    mTransactionsAdapter.addTransaction(t);
 			}
 		}
 		return rowId;
@@ -147,7 +158,7 @@ public boolean destructiveDeleteAccount(long rowId){
 		//first remove all transactions for the account
 		Cursor c = mTransactionsAdapter.fetchAllTransactionsForAccount(rowId);
 		if (c == null)
-			return result; 
+			return false;
 
 		while (c.moveToNext()){
 			long id = c.getLong(DatabaseAdapter.COLUMN_ROW_ID);
@@ -210,7 +221,7 @@ public boolean transactionPreservingDelete(long accountId, long accountReassignI
      */
     public boolean recursiveDestructiveDelete(long accountId){
         Log.d(TAG, "Delete account with rowId with its transactions and sub-accounts: " + accountId);
-        boolean result = true;
+        boolean result = false;
 
         List<Long> subAccountIds = getSubAccountIds(accountId);
         for (long subAccountId : subAccountIds) {
@@ -425,7 +436,7 @@ public List<Account> getExportableAccounts(){
 		while (it.hasNext()){
 			Account account = it.next();
 
-			if (account.hasUnexportedTransactions() == false)
+			if (!account.hasUnexportedTransactions())
 				it.remove();
 		}
 		return accountsList;
@@ -440,13 +451,12 @@ public List<Account> getExportableAccounts(){
 	public Cursor fetchAllRecords(){
 		Log.v(TAG, "Fetching all accounts from db");
         String selection =  DatabaseHelper.KEY_TYPE + " != ?" ;
-		Cursor cursor = mDb.query(DatabaseHelper.ACCOUNTS_TABLE_NAME,
+        return mDb.query(DatabaseHelper.ACCOUNTS_TABLE_NAME,
                 null,
                 selection,
                 new String[]{AccountType.ROOT.name()},
                 null, null,
                 DatabaseHelper.KEY_NAME + " ASC");
-		return cursor;
 	}
 
     /**
@@ -489,10 +499,9 @@ public boolean deleteRecord(long rowId) {
 	 */
 	public Cursor fetchAccounts(String condition){
 		Log.v(TAG, "Fetching all accounts from db where " + condition);
-		Cursor cursor = mDb.query(DatabaseHelper.ACCOUNTS_TABLE_NAME, 
-				null, condition, null, null, null, 
-				DatabaseHelper.KEY_NAME + " ASC");
-		return cursor;
+        return mDb.query(DatabaseHelper.ACCOUNTS_TABLE_NAME,
+                null, condition, null, null, null,
+                DatabaseHelper.KEY_NAME + " ASC");
 	}
 
     /**
@@ -612,10 +621,9 @@ public Cursor fetchRecentAccounts(int numberOfRecents){
     public Cursor fetchFavoriteAccounts(){
         Log.v(TAG, "Fetching favorite accounts from db");
         String condition = DatabaseHelper.KEY_FAVORITE + " = 1";
-        Cursor cursor = mDb.query(DatabaseHelper.ACCOUNTS_TABLE_NAME,
+        return mDb.query(DatabaseHelper.ACCOUNTS_TABLE_NAME,
                 null, condition, null, null, null,
                 DatabaseHelper.KEY_NAME + " ASC");
-        return cursor;
     }
 
     /**

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

@@ -51,7 +51,7 @@ public class Account {
         ^             anchor for start of string
         #             the literal #
         (             start of group
-        ?:            indicate a non-capturing group that doesn't generate backreferences
+        ?:            indicate a non-capturing group that doesn't generate back-references
         [0-9a-fA-F]   hexadecimal digit
         {3}           three times
         )             end of group
@@ -357,7 +357,7 @@ public int getTransactionCount(){
 	 */
 	public boolean hasUnexportedTransactions(){
 		for (Transaction transaction : mTransactionsList) {
-			if (transaction.isExported() == false)
+			if (!transaction.isExported())
 				return true;			
 		}
 		return false;

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

@@ -169,10 +169,12 @@ public Transaction(Money amount, String name, TransactionType type){
     /**
      * Copy constructor.
      * Creates a new transaction object which is a clone of the parameter.
-     * <p><b>Note:</b> The unique ID of the transaction is not cloned, but a new one is generated.</p>
+     * <p><b>Note:</b> The unique ID of the transaction is not cloned if the parameter <code>generateNewUID</code>,
+     * is set to false. Otherwise, a new one is generated.</p>
      * @param transaction Transaction to be cloned
+     * @param generateNewUID Flag to determine if new UID should be assigned or not
      */
-    public Transaction(Transaction transaction){
+    public Transaction(Transaction transaction, boolean generateNewUID){
         initDefaults();
         setName(transaction.getName());
         setDescription(transaction.getDescription());
@@ -182,6 +184,9 @@ public Transaction(Transaction transaction){
         setDoubleEntryAccountUID(transaction.getDoubleEntryAccountUID());
         setExported(transaction.isExported());
         setTime(transaction.getTimeMillis());
+        if (!generateNewUID){
+            setUID(transaction.getUID());
+        }
     }
 
 	/**