Added support for trading accounts

Should fix crashes during import due to trading account missing - closes codinguser#272
Streward · Jan 23, 2015 · 33e4267 · 33e4267
1 parent 1cdf8b0
commit 33e4267
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 1 deletion.
diff --git a/app/res/values-de/strings.xml b/app/res/values-de/strings.xml
@@ -364,6 +364,7 @@
         <item>WÄHRUNG</item>
         <item>AKTIENKONTO</item>
         <item>INVESTMENTFONDS</item>
+		<item>TRADING</item>
     </string-array>
     <string-array name="export_formats">
         <item>QIF</item>

diff --git a/app/res/values-el/strings.xml b/app/res/values-el/strings.xml
@@ -379,6 +379,7 @@
         <item>ΝΟΜΙΣΜΑ</item>
         <item>ΜΕΤΟΧΗ</item>
         <item>ΑΜΟΙΒΑΙΟ ΚΕΦΑΛΑΙΟ</item>
+		<item>TRADING</item>
     </string-array>
     <string-array name="export_formats">
         <item>QIF</item>

diff --git a/app/res/values-es-rMX/strings.xml b/app/res/values-es-rMX/strings.xml
@@ -364,6 +364,7 @@
         <item>DIVISA</item>
         <item>ACCIONES</item>
         <item>FONDOS</item>
+		<item>TRADING</item>
     </string-array>
     <string-array name="export_formats">
         <item>QIF</item>

diff --git a/app/res/values-es/strings.xml b/app/res/values-es/strings.xml
@@ -364,6 +364,7 @@
         <item>DIVISA</item>
         <item>ACCIONES</item>
         <item>FONDOS</item>
+		<item>TRADING</item>
     </string-array>
     <string-array name="export_formats">
         <item>QIF</item>

diff --git a/app/res/values-fr/strings.xml b/app/res/values-fr/strings.xml
@@ -362,6 +362,7 @@
         <item>DEVISES</item>
         <item>ACTIONS</item>
         <item>FONDS COMMUNS</item>
+        <item>TRADING</item>
     </string-array>
     <string-array name="export_formats">
         <item>QIF</item>

diff --git a/app/res/values-hu/strings.xml b/app/res/values-hu/strings.xml
@@ -366,6 +366,7 @@
         <item>CURRENCY</item>
         <item>STOCK</item>
         <item>MUTUAL FUND</item>
+		<item>TRADING</item>
     </string-array>
     <string-array name="export_formats">
         <item>QIF</item>

diff --git a/app/res/values-it/strings.xml b/app/res/values-it/strings.xml
@@ -366,6 +366,7 @@
         <item>VALUTA</item>
         <item>AZIONE</item>
         <item>FONDO COMUNE</item>
+		<item>TRADING</item>
     </string-array>
     <string-array name="export_formats">
         <item>QIF</item>

diff --git a/app/res/values-nb/strings.xml b/app/res/values-nb/strings.xml
@@ -365,6 +365,7 @@
         <item>VALUTA</item>
         <item>AKSJE</item>
         <item>AKSJEFOND</item>
+		<item>TRADING</item>
     </string-array>
     <string-array name="export_formats">
         <item>QIF</item>

diff --git a/app/res/values-nl/strings.xml b/app/res/values-nl/strings.xml
@@ -366,6 +366,7 @@
         <item>CURRENCY</item>
         <item>STOCK</item>
         <item>MUTUAL FUND</item>
+		<item>TRADING</item>
     </string-array>
     <string-array name="export_formats">
         <item>QIF</item>

diff --git a/app/res/values-pt-rBR/strings.xml b/app/res/values-pt-rBR/strings.xml
@@ -364,6 +364,7 @@
         <item>CURRENCY</item>
         <item>AÇÕES</item>
         <item>FUNDO MÚTUO</item>
+		<item>TRADING</item>
     </string-array>
     <string-array name="export_formats">
         <item>QIF</item>

diff --git a/app/res/values-ru/strings.xml b/app/res/values-ru/strings.xml
@@ -362,6 +362,7 @@
         <item>СОБСТВЕННЫЕ СРЕДСТВА</item>
         <item>ТОРГОВЛЯ</item>
         <item>ВЗАИМНЫЙ ФОНД</item>
+		<item>TRADING</item>
     </string-array>
     <string-array name="export_formats">
         <item>QIF</item>

diff --git a/app/res/values-zh/strings.xml b/app/res/values-zh/strings.xml
@@ -362,6 +362,7 @@
         <item>货币</item>
         <item>股票</item>
         <item>共同基金</item>
+        <item>TRADING</item>
     </string-array>
     <string-array name="export_formats">
         <item>QIF</item>

diff --git a/app/res/values/key_strings.xml b/app/res/values/key_strings.xml
@@ -41,6 +41,7 @@
         <item>CURRENCY</item>
         <item>STOCK</item>
         <item>MUTUAL</item>
+        <item>TRADING</item>
     </string-array>
     <string-array name="key_export_format_values">
         <item>QIF</item>

diff --git a/app/res/values/strings.xml b/app/res/values/strings.xml
@@ -376,6 +376,7 @@
         <item>CURRENCY</item>
         <item>STOCK</item>
         <item>MUTUAL FUND</item>
+		<item>TRADING</item>
     </string-array>
     <string-array name="export_formats">
         <item>QIF</item>

diff --git a/app/src/org/gnucash/android/model/AccountType.java b/app/src/org/gnucash/android/model/AccountType.java
@@ -8,7 +8,7 @@
 public enum AccountType {
     CASH(TransactionType.DEBIT), BANK(TransactionType.DEBIT), CREDIT, ASSET(TransactionType.DEBIT), LIABILITY,
     INCOME, EXPENSE(TransactionType.DEBIT), PAYABLE, RECEIVABLE(TransactionType.DEBIT), EQUITY, CURRENCY,
-    STOCK(TransactionType.DEBIT), MUTUAL(TransactionType.DEBIT), ROOT;
+    STOCK(TransactionType.DEBIT), MUTUAL(TransactionType.DEBIT), TRADING, ROOT;
 
     /**
      * Indicates that this type of normal balance the account type has

diff --git a/app/src/org/gnucash/android/ui/util/TransactionTypeToggleButton.java b/app/src/org/gnucash/android/ui/util/TransactionTypeToggleButton.java
@@ -93,6 +93,7 @@ public void setAccountType(AccountType accountType){
                 break;
             case CURRENCY:
             case ROOT:
+            default:
                 setTextOn(context.getString(R.string.label_debit));
                 setTextOff(context.getString(R.string.label_credit));
                 break;