Merge branch 'develop'

.gitignore

@@ -12,4 +12,6 @@ gen-external-apklibs
 *.ipr
 .idea/
 *.iws
-out/
+out/
+*.project
+*.classpath

CHANGELOG.md

@@ -1,5 +1,17 @@
 Change Log
 ===============================================================================
+Version 1.3.1 *(2014-02-14)*
+----------------------------
+* Fixed: Crash when bulk moving transactions
+* Fixed: Missing string for internationalization in ru_RU locale
+* Fixed: Random crashes when opening ScheduledTransactions list
+* Fixed: Blank screen after closing AccountFormFragment
+* Fixed: Correct normal balance of the different types of ASSET accounts
+* Fixed: Limit the target accounts for bulk transfers to same currency and non-placeholder accounts
+* Improved: Remember last opened tab in accounts list
+* Improved: Added version information for feedback email
+* Improved: Lists of accounts are now sorted by the fully qualified account name
+
 Version 1.3.0 *(2014-02-10)*
 ----------------------------
 * Fixed: Some file managers do not display all files available for import

app/AndroidManifest.xml

@@ -17,8 +17,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.gnucash.android"
-    android:versionCode="25"
-    android:versionName="1.3.0" >
+    android:versionCode="26"
+    android:versionName="@string/app_version_name" >
 
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="15"/>
 
@@ -48,15 +48,15 @@
         android:label="@string/app_name" 
         android:theme="@style/Theme.Sherlock.Light.DarkActionBar">
         <activity
-            android:name=".ui.accounts.AccountsActivity"
+            android:name=".ui.account.AccountsActivity"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity android:name=".ui.settings.SettingsActivity"/>
-        <activity android:name=".ui.transactions.TransactionsActivity" 
+        <activity android:name=".ui.transaction.TransactionsActivity"
             android:configChanges="orientation|screenSize">
         </activity>
         <activity android:name=".ui.widget.WidgetConfigurationActivity"

app/res/layout/list_item_account.xml

@@ -15,7 +15,7 @@
  limitations under the License.
 -->
 
-<org.gnucash.android.util.CheckableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<org.gnucash.android.ui.util.CheckableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="match_parent"
               android:layout_height="?android:attr/listPreferredItemHeight"
               android:gravity="center_vertical"
@@ -62,4 +62,4 @@
             android:focusable="false"
             android:contentDescription="@string/description_add_transaction_icon"/>
 
-</org.gnucash.android.util.CheckableLinearLayout>
+</org.gnucash.android.ui.util.CheckableLinearLayout>

app/res/layout/list_item_transaction.xml

@@ -15,7 +15,7 @@
  limitations under the License.
 -->
 
-<org.gnucash.android.util.CheckableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<org.gnucash.android.ui.util.CheckableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:orientation="vertical">
@@ -63,4 +63,4 @@
                 android:layout_marginRight="12dp"
                 style="@style/ListItemText"/>
     </LinearLayout>
-</org.gnucash.android.util.CheckableLinearLayout>
+</org.gnucash.android.ui.util.CheckableLinearLayout>

app/res/menu/account_actions.xml

@@ -22,12 +22,13 @@
           android:showAsAction="always"/>
 
     <item android:id="@+id/menu_recurring_transactions"
-          android:title="@string/menu_item_recurring_transactions"
+          android:title="@string/menu_scheduled_transactions"
+          android:icon="@drawable/content_event_holo_dark"
           android:showAsAction="never|withText"
           android:orderInCategory="4" />
 
     <item android:id="@+id/menu_export"
-          android:icon="@drawable/content_import_export_holo_light"
+          android:icon="@drawable/content_import_export_holo_dark"
           android:title="@string/menu_export_transactions"
           android:showAsAction="never"
           android:orderInCategory="5"/>

app/res/values-de/strings.xml

@@ -289,8 +289,8 @@
 		<item>Haben</item>
 		<item>Soll</item>
 	</string-array>
-	<string name="delete_all_transactions_confirmation_message">Wollen Sie wirklich ALLE Buchungen l&#246;schen?</string>
-	<string name="delete_transaction_confirmation_message">Wollen Sie wirklich diese Buchung l&#246;schen?</string>	
+	<string name="msg_delete_all_transactions_confirmation">Wollen Sie wirklich ALLE Buchungen l&#246;schen?</string>
+	<string name="msg_delete_transaction_confirmation">Wollen Sie wirklich diese Buchung l&#246;schen?</string>
 	<string name="title_export_preference_category">Exportieren</string>
 	<string name="title_export_all_transactions">Alle Buchungen exportieren</string>
 	<string name="title_always_delete_exported_transactions">Alle exportierten Buchungen l&#246;schen</string>
@@ -383,11 +383,11 @@
     <string name="title_all_accounts">Alle</string>
     <string name="summary_create_default_accounts">Erstellt die häufig verwendete standard GnuCash Konten</string>
     <string name="title_create_default_accounts">Standard Konten erstellen</string>
-    <string name="message_confirm_create_default_accounts_setting">New accounts will be created in addition to the existing
+    <string name="msg_confirm_create_default_accounts_setting">New accounts will be created in addition to the existing
         account structure.\n\nIf you wish to replace currently existing accounts, delete them first before proceeding!
     </string>
-    <string name="menu_item_recurring_transactions">Wiederkehrende Buchungen</string>
-    <string name="message_confirm_create_default_accounts_first_run">Welcome to GnuCash Android! \nYou can either create
+    <string name="menu_scheduled_transactions">Eingeplante Buchungen</string>
+    <string name="msg_confirm_create_default_accounts_first_run">Welcome to GnuCash Android! \nYou can either create
         a hierarchy of commonly-used accounts, or import your own GnuCash account structure. \n\nBoth options are also
         available in app Settings so you can decide later.
     </string>
@@ -397,4 +397,5 @@
         <item>WÖCHENTLICH</item>
         <item>MONATLICH</item>
     </string-array>
+    <string name="title_scheduled_transactions">Eingeplante Buchungen</string>
 </resources>

app/res/values-el/strings.xml

@@ -295,8 +295,8 @@
 		<item>ΠΙΣΤΩΣΗ</item>
 		<item>ΧΡΕΩΣΗ</item>
 	</string-array>
-	<string name="delete_all_transactions_confirmation_message">Σίγουρα θέλετε να διαγράψετε ΌΛΕΣ τις κινήσεις;</string>
-	<string name="delete_transaction_confirmation_message">Σίγουρα θέλετε να διαγράψετε αυτή τη κίνηση;</string>
+	<string name="msg_delete_all_transactions_confirmation">Σίγουρα θέλετε να διαγράψετε ΌΛΕΣ τις κινήσεις;</string>
+	<string name="msg_delete_transaction_confirmation">Σίγουρα θέλετε να διαγράψετε αυτή τη κίνηση;</string>
 	<string name="title_export_preference_category">Εξαγωγή</string>
 	<string name="title_export_all_transactions">Εξαγωγή όλων των κινήσεων</string>
 	<string name="title_always_delete_exported_transactions">Διαγραφή εξηγμένων κινήσεων</string>
@@ -399,11 +399,11 @@
     <string name="title_all_accounts">All</string>
     <string name="summary_create_default_accounts">Creates default GnuCash commonly-used account structure</string>
     <string name="title_create_default_accounts">Create default accounts</string>
-    <string name="message_confirm_create_default_accounts_setting">New accounts will be created in addition to the existing
+    <string name="msg_confirm_create_default_accounts_setting">New accounts will be created in addition to the existing
         account structure.\n\nIf you wish to replace currently existing accounts, delete them first before proceeding!
     </string>
-    <string name="menu_item_recurring_transactions">Recurring Transactions</string>
-    <string name="message_confirm_create_default_accounts_first_run">Welcome to GnuCash Android! \nYou can either create
+    <string name="menu_scheduled_transactions">Scheduled Transactions</string>
+    <string name="msg_confirm_create_default_accounts_first_run">Welcome to GnuCash Android! \nYou can either create
         a hierarchy of commonly-used accounts, or import your own GnuCash account structure. \n\nBoth options are also
         available in app Settings so you can decide later.
     </string>
@@ -413,4 +413,5 @@
         <item>WEEKLY</item>
         <item>MONTHLY</item>
     </string-array>
+    <string name="title_scheduled_transactions">Scheduled Transactions</string>
 </resources>

app/res/values-es-rMX/strings.xml

@@ -289,8 +289,8 @@
 		<item>ABONO</item>
 		<item>CARGO</item>
 	</string-array>
-	<string name="delete_all_transactions_confirmation_message">&#191;Est&#225; seguro de borrar TODAS las transacciones?</string>
-	<string name="delete_transaction_confirmation_message">&#191;Est&#225; seguro de borrar esta transacci&#243;n?</string>
+	<string name="msg_delete_all_transactions_confirmation">&#191;Est&#225; seguro de borrar TODAS las transacciones?</string>
+	<string name="msg_delete_transaction_confirmation">&#191;Est&#225; seguro de borrar esta transacci&#243;n?</string>
 	<string name="title_export_preference_category">Exportaci&#243;n</string>
 	<string name="title_export_all_transactions">Exportar todas las transacciones</string>
 	<string name="title_always_delete_exported_transactions">Borrar las transacciones exportadas</string>
@@ -383,11 +383,10 @@
     <string name="title_all_accounts">All</string>
     <string name="summary_create_default_accounts">Creates default GnuCash commonly-used account structure</string>
     <string name="title_create_default_accounts">Create default accounts</string>
-    <string name="message_confirm_create_default_accounts_setting">New accounts will be created in addition to the existing
+    <string name="msg_confirm_create_default_accounts_setting">New accounts will be created in addition to the existing
         account structure.\n\nIf you wish to replace currently existing accounts, delete them first before proceeding!
     </string>
-    <string name="menu_item_recurring_transactions">Recurring Transactions</string>
-    <string name="message_confirm_create_default_accounts_first_run">Welcome to GnuCash Android! \nYou can either create
+    <string name="msg_confirm_create_default_accounts_first_run">Welcome to GnuCash Android! \nYou can either create
         a hierarchy of commonly-used accounts, or import your own GnuCash account structure. \n\nBoth options are also
         available in app Settings so you can decide later.
     </string>
@@ -397,4 +396,6 @@
         <item>SEMANAL</item>
         <item>MENSUAL</item>
     </string-array>
+    <string name="menu_scheduled_transactions">Scheduled Transactions</string>
+    <string name="title_scheduled_transactions">Scheduled Transactions</string>
 </resources>

app/res/values-es/strings.xml

@@ -289,8 +289,8 @@
 		<item>ABONO</item>
 		<item>CARGO</item>
 	</string-array>
-	<string name="delete_all_transactions_confirmation_message">&#191;Borrar TODAS las transacciones?</string>
-	<string name="delete_transaction_confirmation_message">&#191;Borrar esta transacci&#243;n?</string>
+	<string name="msg_delete_all_transactions_confirmation">&#191;Borrar TODAS las transacciones?</string>
+	<string name="msg_delete_transaction_confirmation">&#191;Borrar esta transacci&#243;n?</string>
 	<string name="title_export_preference_category">Exportaci&#243;n</string>
 	<string name="title_export_all_transactions">Exportar todas las transacciones</string>
 	<string name="title_always_delete_exported_transactions">Borrar las transacciones exportadas</string>
@@ -383,15 +383,16 @@
     <string name="title_all_accounts">Todas</string>
     <string name="summary_create_default_accounts">Crea una estructura por defecto de cuentas GnuCash com&#250;nmente usadas</string>
     <string name="title_create_default_accounts">Crear cuentas por defecto</string>
-    <string name="message_confirm_create_default_accounts_setting">Se crear&#225;n nuevas cuentas por defecto adem&#225;s de la estructura ya existente.\n\nSi desea reemplazar las cuentas ya existentes b&#243;rrelas primero antes de seguir.
+    <string name="msg_confirm_create_default_accounts_setting">Se crear&#225;n nuevas cuentas por defecto adem&#225;s de la estructura ya existente.\n\nSi desea reemplazar las cuentas ya existentes b&#243;rrelas primero antes de seguir.
     </string>
-    <string name="menu_item_recurring_transactions">Transacciones Recurrentes</string>
-    <string name="message_confirm_create_default_accounts_first_run">&#161;Bienvenido a GnuCash Android! \nPuede crear una jerarqu&#237;a de cuentas com&#250;nmente usadas o importar su propia estructura de cuentas GnuCash. \n\nAmbas opciones est&#225;n disponibles en las opciones de la aplicaci&#243; por si quiere decidirlo m&#225;s tarde.
+    <string name="msg_confirm_create_default_accounts_first_run">&#161;Bienvenido a GnuCash Android! \nPuede crear una jerarqu&#237;a de cuentas com&#250;nmente usadas o importar su propia estructura de cuentas GnuCash. \n\nAmbas opciones est&#225;n disponibles en las opciones de la aplicaci&#243; por si quiere decidirlo m&#225;s tarde.
     </string>
     <string-array name="recurrence_period_strings">
         <item>NINGUNO</item>
         <item>DIARIO</item>
         <item>SEMANAL</item>
         <item>MENSUAL</item>
     </string-array>
+    <string name="menu_scheduled_transactions">Scheduled Transactions</string>
+    <string name="title_scheduled_transactions">Scheduled Transactions</string>
 </resources>

app/res/values-fr/strings.xml

@@ -289,8 +289,8 @@
         <item>CREDIT</item>
         <item>DEBIT</item>
     </string-array>
-    <string name="delete_all_transactions_confirmation_message">Etes vous s&#251;re de vouloir supprimer TOUTES les transactions?</string>
-    <string name="delete_transaction_confirmation_message">Etes vous s&#251;re de vouloir supprimer cette transaction?</string>
+    <string name="msg_delete_all_transactions_confirmation">Etes vous s&#251;re de vouloir supprimer TOUTES les transactions?</string>
+    <string name="msg_delete_transaction_confirmation">Etes vous s&#251;re de vouloir supprimer cette transaction?</string>
     <string name="title_export_preference_category">Export</string>
     <string name="title_export_all_transactions">Exporter toutes les transactions</string>
     <string name="title_always_delete_exported_transactions">Supprimer les transactions export&#233;es</string>
@@ -381,11 +381,10 @@
     <string name="title_all_accounts">Tous</string>
     <string name="summary_create_default_accounts">Crée une structure de compte GnuCash par défaut couramment utilisé</string>
     <string name="title_create_default_accounts">Crée comptes par défaut</string>
-    <string name="message_confirm_create_default_accounts_setting">Les nouveaux comptes seront créés en plus de l\'existante
+    <string name="msg_confirm_create_default_accounts_setting">Les nouveaux comptes seront créés en plus de l\'existante
 		structure de compte.\n\n Si vous souhaitez remplacer des comptes existants, supprimez-les d\'abord avant de commencer!
     </string>
-    <string name="menu_item_recurring_transactions">Transactions récurrentes</string>
-    <string name="message_confirm_create_default_accounts_first_run">Bienvenue à GnuCash Android!\n Vous pouvez soit créer
+    <string name="msg_confirm_create_default_accounts_first_run">Bienvenue à GnuCash Android!\n Vous pouvez soit créer
 		une hiérarchie de comptes couramment utilisés, importer votre propre structure de compte GnuCash.\n\n Les deux options sont également
 		disponible dans les paramètres d\'applications de sorte que vous puissiez décider plus tard.</string>
     <string-array name="recurrence_period_strings">
@@ -394,4 +393,6 @@
         <item>SEMAINE</item>
         <item>MENSUEL</item>
     </string-array>
+    <string name="menu_scheduled_transactions">Scheduled Transactions</string>
+    <string name="title_scheduled_transactions">Scheduled Transactions</string>
 </resources>

app/res/values-hu/strings.xml

@@ -288,8 +288,8 @@
 		<item>CREDIT</item>
 		<item>DEBIT</item>
 	</string-array>
-	<string name="delete_all_transactions_confirmation_message">Are you sure you want to delete ALL transactions?</string>
-	<string name="delete_transaction_confirmation_message">Are you sure you want to delete this transaction?</string>
+	<string name="msg_delete_all_transactions_confirmation">Are you sure you want to delete ALL transactions?</string>
+	<string name="msg_delete_transaction_confirmation">Are you sure you want to delete this transaction?</string>
 	<string name="title_export_preference_category">Export</string>
 	<string name="title_export_all_transactions">Export all transactions</string>
 	<string name="title_always_delete_exported_transactions">Delete exported transactions</string>
@@ -382,11 +382,11 @@
     <string name="title_all_accounts">All</string>
     <string name="summary_create_default_accounts">Creates default GnuCash commonly-used account structure</string>
     <string name="title_create_default_accounts">Create default accounts</string>
-    <string name="message_confirm_create_default_accounts_setting">New accounts will be created in addition to the existing
+    <string name="msg_confirm_create_default_accounts_setting">New accounts will be created in addition to the existing
         account structure.\n\nIf you wish to replace currently existing accounts, delete them first before proceeding!
     </string>
-    <string name="menu_item_recurring_transactions">Recurring Transactions</string>
-    <string name="message_confirm_create_default_accounts_first_run">Welcome to GnuCash Android! \nYou can either create
+    <string name="menu_scheduled_transactions">Scheduled Transactions</string>
+    <string name="msg_confirm_create_default_accounts_first_run">Welcome to GnuCash Android! \nYou can either create
         a hierarchy of commonly-used accounts, or import your own GnuCash account structure. \n\nBoth options are also
         available in app Settings so you can decide later.
     </string>
@@ -396,4 +396,5 @@
         <item>WEEKLY</item>
         <item>MONTHLY</item>
     </string-array>
+    <string name="title_scheduled_transactions">Scheduled Transactions</string>
 </resources>