Merge lp:~samd/wxbanker/per-account-currencies into lp:wxbanker

[Michael Rooney]

I'm going to propose a merge for easier discussion and change review!

[Michael Rooney (mrooney)]

Thanks for this awesome code, overall it looks pretty great! A few comments:

* it would be great to remove usages of "from wxbanker.currconvert import *", for an easier to follow namespace. If you don't want to have to type the full path each time, you could use "from wxbanker import currconvert" and then use it that way.
* is it no longer using Account.Balance, but the GetCurrentBalance function? I'm just wondering if this defeats the point of caching this value and now has to add up all transactions for all accounts to display the totals. If so, maybe it could just convert the cached .Balance attribute, but if I'm misunderstanding, let me know.
* it would be great to add a few tests (there are bunch located at wxbanker/tests/ including UI tests)! I think I did a bad job at documenting how to run them so I'll attempt to get them running with nose and a simple "setup.py test" or something.
* regarding your exchanges.xml question, the idea was the ship each version with an up-to-date (at the time) version for offline use, but on startup grab the latest data if online (from http://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml) and write it back to exchanges.xml. I can help implement this feature if you'd like.

review: Needs Information

[lp:~samd/wxbanker/per-account-currencies]

849. By Sam Dieck on 2012-06-07

Reduced import scopes for easier to follow namespace.

[Sam Dieck (samd)]

* Namespaces are now corrected and not using * when importing.

* About the use of the .Balance attribute, i think that the code in question is the following:

            def GetBalance(self):
    208 - return sum([account.Balance for account in self])
    209 + totalCurrency = self.Store.getGlobalCurrency()
    210 + total = 0
    211 + for account in self:
    212 + total = total + account.GetCurrentBalance(totalCurrency)
    213 + return total

  Here are my thoughts on this code, and hopefully you could clarify me on this. From what I see in the function "GetCurrentBalance" the attribute ".Balance" contains even future transactions, and that's the difference between using "GetCurrentBalance and the attribute "Balance" (actually, even GetCurrentBalance() makes use of .Balance) ; do we want to include future transactions on total balances? even if those transactions have not been made? If that's the case, its just matter of creating a new function ".GetBalance(currency)" in the account class which returns the ".Balance" property converted to the desired currency without substracting future transactions (as GetCurrentBalance() does).

* I would be more than happy to run/add more tests, is there anything i need to know before going into that?

* Alright, i got ya on the exchanges.xml, ill start implementing it and tell you if i run into any problems and need help. Dont you think that it'll be better to add a "currency rates settings" where you can see current rates, click on an "update" button to update current rates, and possibly add an option for "check for currency updates automatically on startup" as i don't think that blindly pulling things from the internet without even a notification to the user is a good idea.

[Michael Rooney (mrooney)]

Thanks again Sam for all this awesome code, sorry for the delay! I've
merged this and made my first pass of changes at
http://bazaar.launchpad.net/~wxbanker-devs/wxbanker/trunk/revision/870.
Mostly minor changes, except that I made "Show currency names" non-default,
otherwise that would be a big change for everyone upgrading and it wouldn't
be useful for most people using only one currency.

As you mentioned, one of your changes does change the balances to be as of
today and not total including future as they were, and since that's kind of
an unrelated change (but something I do want to improve), I'll keep it
showing the grand total for now.

A few questions for you:

   1. Now the Currency menu drop-down just changes the global currency,
   where as before it changed them all. I'm wondering if this behavior will be
   immediately understandable, or if we should prompt when you change it
   asking if you want to change the global currency, the currency for all
   accounts (since that is what it used to do and changing them all
   individually would be a pain), or the currency for the current account.
   2. What do you think should happen for new accounts? Should they be the
   localized currency by default, or the global currency?
   3. If you are able to add some tests, it would be really helpful to make
   sure all these cases going forward. Particularly, tests that handle the
   rendering with nicknames, and making sure the total balance is handled
   correctly, and such. You can run them via "python -m
   wxbanker/tests/alltests" (I think a few translation tests will fail without
   certain language packs, you can ignore those or I can let you know which
   packs are required).

Thanks again. I'm going to do a performance review (there does seem to be a
big performance regression in startup time so I need to figure that one
out), and make a few tweaks, and figure out the best way to update the
exchanges.xml, then we can release 0.9!

On Thu, Jun 7, 2012 at 12:06 AM, Sam Dieck <email address hidden> wrote:

> * Namespaces are now corrected and not using * when importing.
>
> * About the use of the .Balance attribute, i think that the code in
> question is the following:
>
> def GetBalance(self):
> 208 - return sum([account.Balance for account in self])
> 209 + totalCurrency = self.Store.getGlobalCurrency()
> 210 + total = 0
> 211 + for account in self:
> 212 + total = total +
> account.GetCurrentBalance(totalCurrency)
> 213 + return total
>
> Here are my thoughts on this code, and hopefully you could clarify me on
> this. From what I see in the function "GetCurrentBalance" the attribute
> ".Balance" contains even future transactions, and that's the difference
> between using "GetCurrentBalance and the attribute "Balance" (actually,
> even GetCurrentBalance() makes use of .Balance) ; do we want to include
> future transactions on total balances? even if those transactions have not
> been made? If that's the case, its just matter of creating a new function
> ".GetBalance(currency)" in the account class which returns the ".Balance"
> property converted to the ...

=== modified file 'wxbanker/accountconfigdialog.py'
--- wxbanker/accountconfigdialog.py	2010-08-09 00:31:45 +0000
+++ wxbanker/accountconfigdialog.py	2012-06-07 03:50:23 +0000
@@ -19,6 +19,7 @@
 import wx
 from wx.lib.pubsub import Publisher
 from wxbanker.transactionctrl import TransactionCtrl
+from wxbanker.currencies import CurrencyStrings, GetCurrencyInt
 
 from wxbanker.mint.api import Mint
 try:
@@ -238,7 +239,49 @@
     def onTransactionChoice(self, event):
         transaction = self.GetCurrentRecurringTransaction()
         self.transactionCtrl.FromRecurring(transaction)
+        
+class CurrencyConfigPanel(wx.Panel):
+    def __init__(self, parent, account):
+        self.Account = account
+        wx.Panel.__init__(self, parent)
+        self.headerText = wx.StaticText(self, -1, _("Account currency: "))
+        
+        saveButton = wx.Button(self, label=_("Save"), id=wx.ID_SAVE)
+        closeButton = wx.Button(self, label=_("Cancel"), id=wx.ID_CLOSE)
+        
+        buttonSizer = wx.BoxSizer()
+        buttonSizer.Add(saveButton)
+        buttonSizer.AddSpacer(12)
+        buttonSizer.Add(closeButton)
+        buttonSizer.AddSpacer(6)
+        
+        #base currency = global currency
+        currencies = ["Base currency"] + CurrencyStrings
+        self.currencyCombo = wx.Choice(self, choices=currencies)
+        # we have to add 1 to the current indext because we added the "base currency" entry
+        self.currencyCombo.SetSelection(GetCurrencyInt(self.Account.GetCurrency())+1)
 
+        self.Sizer = wx.BoxSizer(wx.VERTICAL)
+        self.Sizer.AddSpacer(6)
+        self.Sizer.Add(self.headerText, 0, wx.LEFT, 6)
+        self.Sizer.AddSpacer(6)
+        self.Sizer.Add(self.currencyCombo, 0, wx.LEFT, 6)
+        self.Sizer.AddStretchSpacer(1)
+        self.Sizer.Add(buttonSizer, flag=wx.ALIGN_RIGHT)
+        self.Sizer.AddSpacer(6)
+        self.Bind(wx.EVT_BUTTON, self.onButton)
+        
+    def onButton(self, event):
+        """If the save button was clicked save, and close the dialog in any case (Close/Cancel/Save)."""
+        assert event.Id in (wx.ID_CLOSE, wx.ID_SAVE)
+        
+        if event.Id == wx.ID_SAVE:
+            #we have to substract 1 from combo_box selection because we added the "base currency" entry
+            selectedCurrency = self.currencyCombo.GetSelection() - 1
+            Publisher.sendMessage("user.account_currency_changed", (self.Account, selectedCurrency))
+            
+        self.GrandParent.Destroy()
+        
 class AccountConfigDialog(wx.Dialog):
     def __init__(self, parent, account, tab="default"):
         wx.Dialog.__init__(self, parent, title=account.Name, size=(600, 400))
@@ -248,8 +291,10 @@
         
         self.recurringPanel = RecurringConfigPanel(self.notebook, account)
         self.mintPanel = MintConfigPanel(self.notebook, account)
+        self.currencyPanel = CurrencyConfigPanel(self.notebook, account)
         self.notebook.AddPage(self.recurringPanel, _("Recurring Transactions"))
         self.notebook.AddPage(self.mintPanel, _("Mint.com Integration"))
+        self.notebook.AddPage(self.currencyPanel, _("Currency Settings"))
         
         if tab == "mint":
             # Setting the selection synchronously gets changed back somewhere in the event queue.

=== modified file 'wxbanker/accountlistctrl.py'
--- wxbanker/accountlistctrl.py	2010-08-19 04:30:23 +0000
+++ wxbanker/accountlistctrl.py	2012-06-07 03:50:23 +0000
@@ -116,6 +116,7 @@
         Publisher.subscribe(self.onAccountAdded, "account.created")
         Publisher.subscribe(self.onCurrencyChanged, "currency_changed")
         Publisher.subscribe(self.onShowZeroToggled, "controller.showzero_toggled")
+        Publisher.subscribe(self.onShowCurrencyNickToggled, "controller.show_currency_nick_toggled")
         Publisher.subscribe(self.onAccountChanged, "user.account changed")
         Publisher.subscribe(self.onSelectNextAccount, "user.next account")
         Publisher.subscribe(self.onSelectPreviousAccount, "user.previous account")
@@ -165,7 +166,7 @@
             mintCtrl.SetBitmap(wx.ArtProvider.GetBitmap("wxART_%s" % bitmapName))
             mintCtrl.SetToolTipString(tooltip)
 
-    def onCurrencyChanged(self, message):
+    def refreshBalances(self):
         # Update all the accounts.
         for account, textCtrl in zip(self.accountObjects, self.totalTexts):
             textCtrl.Label = account.float2str(account.Balance)
@@ -173,6 +174,15 @@
         self.updateGrandTotal()
         self.Parent.Layout()
         
+    def onCurrencyChanged(self, message):
+        self.refreshBalances()
+        
+    def onShowCurrencyNickToggled(self, message):
+        val = message.data
+        for account in self.Model.Accounts:
+            account.ShowCurrencyNick = val
+        self.refreshBalances()
+        
     def onToggleMintIntegration(self, message):
         enabled = message.data
         if enabled:
@@ -326,6 +336,10 @@
                 break
             index += 1
 
+        # Check if we should set account to show currency NIcks,
+        # wouldn't it be better to have per-account show-currency-nick setting?
+        account.ShowCurrencyNick = self.bankController.ShowCurrencyNick
+        
         self._InsertItem(index, account)
 
         if select:
@@ -427,7 +441,8 @@
         self._UpdateMintStatuses()
 
     def updateGrandTotal(self):
-        self.totalText.Label = self.Model.float2str( self.Model.Balance )
+        shownick = self.bankController.ShowCurrencyNick
+        self.totalText.Label = self.Model.float2str( self.Model.Balance, withNick=shownick )
 
     def onAddButton(self, event):
         self.showEditCtrl()

=== modified file 'wxbanker/bankobjects/account.py'
--- wxbanker/bankobjects/account.py	2010-10-05 21:34:34 +0000
+++ wxbanker/bankobjects/account.py	2012-06-07 03:50:23 +0000
@@ -26,13 +26,16 @@
 from wxbanker import currencies, bankexceptions, debug
 from wxbanker.mint.api import Mint
 
+from wxbanker.currencies import CurrencyList
+from wxbanker.currconvert import CurrencyConverter
+
 import datetime
 
 class Account(ORMObject):
     ORM_TABLE = "accounts"
     ORM_ATTRIBUTES = ["Name", "Balance", "MintId"]
     
-    def __init__(self, store, aID, name, currency=0, balance=0.0, mintId=None):
+    def __init__(self, store, aID, name, currency=0, balance=0.0, mintId=None, currNick=False):
         ORMObject.__init__(self)
         self.IsFrozen = True
         self.Store = store
@@ -45,6 +48,7 @@
         self.Currency = currency or 0
         self.Balance = balance or 0.0
         self.MintId = mintId
+        self.ShowCurrencyNick = currNick or False
         self.IsFrozen = False
 
         Publisher.subscribe(self.onTransactionAmountChanged, "ormobject.updated.Transaction.Amount")
@@ -86,7 +90,7 @@
     def GetCurrency(self):
         return self._Currency
     
-    def GetCurrentBalance(self):
+    def GetCurrentBalance(self, currency=None):
         """Returns the balance up to and including today, but not transactions in the future."""
         currentBalance = self.Balance
         today = datetime.date.today()
@@ -96,6 +100,12 @@
         while index >= 0 and transactions[index].Date > today:
             currentBalance -= transactions[index].Amount
             index -= 1
+
+        if currency:
+            conv = CurrencyConverter()
+            destCurrency = CurrencyList[currency]().GetCurrencyNick()
+            srcCurrency = self.GetCurrency().GetCurrencyNick()
+            return conv.Convert(currentBalance, srcCurrency, destCurrency)
         return currentBalance
         
     def GetRecurringTransactions(self):
@@ -329,7 +339,7 @@
             debug.debug("Ignoring transaction because I am %s: %s" % (self.Name, transaction))
 
     def float2str(self, *args, **kwargs):
-        return self.Currency.float2str(*args, **kwargs)
+        return self.Currency.float2str(withNick=self.ShowCurrencyNick, *args, **kwargs)
 
     def __cmp__(self, other):
         return cmp(self.Name, other.Name)

=== modified file 'wxbanker/bankobjects/accountlist.py'
--- wxbanker/bankobjects/accountlist.py	2010-08-09 00:31:45 +0000
+++ wxbanker/bankobjects/accountlist.py	2012-06-07 03:50:23 +0000
@@ -21,6 +21,7 @@
 from wx.lib.pubsub import Publisher
 from wxbanker import bankexceptions
 
+
 class AccountList(list):
     def __init__(self, store):
         list.__init__(self, store.GetAccounts())
@@ -43,7 +44,11 @@
         return allRecurrings
 
     def GetBalance(self):
-        return sum([account.Balance for account in self])
+        totalCurrency = self.Store.getGlobalCurrency()
+        total = 0
+        for account in self:
+            total = total + account.GetCurrentBalance(totalCurrency)
+        return total
     
     def GetById(self, theId):
         for account in self:
@@ -103,4 +108,5 @@
     def onAccountRenamed(self, message):
         self.sort()
 
-    Balance = property(GetBalance)
\ No newline at end of file
+    Balance = property(GetBalance)
+

=== modified file 'wxbanker/bankobjects/bankmodel.py'
--- wxbanker/bankobjects/bankmodel.py	2010-08-09 00:31:45 +0000
+++ wxbanker/bankobjects/bankmodel.py	2012-06-07 03:50:23 +0000
@@ -28,6 +28,8 @@
 from wxbanker.bankobjects.accountlist import AccountList
 from wxbanker.mint.api import Mint
 
+from wxbanker.currencies import GetCurrencyInt
+
 class BankModel(ORMKeyValueObject):
     ORM_TABLE = "meta"
     ORM_ATTRIBUTES = ["LastAccountId", "MintEnabled"]
@@ -42,7 +44,8 @@
         if self.MintEnabled:
             delayedresult.startWorker(lambda result: Publisher.sendMessage("mint.updated"), Mint.LoginFromKeyring, wkwargs={"notify": False})
 
-        Publisher.subscribe(self.onCurrencyChanged, "user.currency_changed")
+        Publisher.subscribe(self.onGlobalCurrencyChanged, "user.global_currency_changed")
+        Publisher.subscribe(self.onAccountCurrencyChanged, "user.account_currency_changed")
         Publisher.subscribe(self.onMintToggled, "user.mint.toggled")
         Publisher.subscribe(self.onAccountChanged, "view.account changed")
         Publisher.subscribe(self.onTransactionTagged, "transaction.tagged")
@@ -84,8 +87,10 @@
         """
         if account is None:
             transactions = self.GetTransactions()
+            currency = self.GlobalCurrency
         else:
             transactions = account.Transactions[:]
+            currency = GetCurrencyInt(account.GetCurrency())
         transactions.sort()
         
         if transactions == []:
@@ -104,7 +109,7 @@
                 if t.Date > endDate:
                     endi = i
                     break
-                total += t.Amount
+                total += t.GetAmount(currency)
                 
             transactions = transactions[starti:endi]
         else:
@@ -126,7 +131,7 @@
         balance = startingBalance
         while currDate <= endDate:
             while tindex < len(transactions) and transactions[tindex].Date <= currDate:
-                balance += transactions[tindex].Amount
+                balance += transactions[tindex].GetAmount(currency)
                 tindex += 1
             totals.append([currDate, balance])
             currDate += onedaydelta
@@ -167,23 +172,27 @@
         Handle representing floats as strings for non
         account-specific amounts, such as totals.
         """
-        if len(self.Accounts) == 0:
-            currency = currencies.CurrencyList[0]()
-        else:
-            currency = self.Accounts[0].Currency
-
+        currencyID = self.Store.getGlobalCurrency()
+        currency = currencies.CurrencyList[currencyID]()
         return currency.float2str(*args, **kwargs)
 
-    def setCurrency(self, currencyIndex):
+    def setGlobalCurrency(self, currencyIndex):
         self.Store.setCurrency(currencyIndex)
-        for account in self.Accounts:
-            account.Currency = currencyIndex
         Publisher.sendMessage("currency_changed", currencyIndex)
 
-    def onCurrencyChanged(self, message):
+    def setAccountCurrency(self, account, currencyIndex):
+        self.Store.setCurrency(currencyIndex, account)
+        account.SetCurrency(currencyIndex)
+        Publisher.sendMessage("currency_changed", currencyIndex)
+    
+    def onGlobalCurrencyChanged(self, message):
         currencyIndex = message.data
-        self.setCurrency(currencyIndex)
-        
+        self.setGlobalCurrency(currencyIndex)
+    
+    def onAccountCurrencyChanged(self, message):
+        account, currency = message.data
+        self.setAccountCurrency(account, currency)
+    
     def onAccountChanged(self, message):
         account = message.data
         if account:

=== modified file 'wxbanker/bankobjects/transaction.py'
--- wxbanker/bankobjects/transaction.py	2010-08-10 04:47:02 +0000
+++ wxbanker/bankobjects/transaction.py	2012-06-07 03:50:23 +0000
@@ -26,6 +26,9 @@
 from wxbanker.bankobjects.tag import Tag, EmptyTagException
 from wxbanker import debug
 
+from wxbanker.currencies import CurrencyList
+from wxbanker.currconvert import CurrencyConverter
+
 class Transaction(ORMObject):
     """
     An object which represents a transaction.
@@ -152,7 +155,12 @@
     def SetTags(self, tagList):
         self._Tags = tagList
 
-    def GetAmount(self):
+    def GetAmount(self, currency=None):
+        if currency:
+            conv = CurrencyConverter()
+            destCurrency = CurrencyList[currency]().GetCurrencyNick() 
+            srcCurrency = self.Parent.GetCurrency().GetCurrencyNick()
+            return conv.Convert(self._Amount, srcCurrency, destCurrency)
         return self._Amount
 
     def SetAmount(self, amount, fromLink=False):

=== modified file 'wxbanker/controller.py'
--- wxbanker/controller.py	2010-10-09 22:39:26 +0000
+++ wxbanker/controller.py	2012-06-07 03:50:23 +0000
@@ -29,6 +29,7 @@
     def __init__(self, path=None):
         self._AutoSave = True
         self._ShowZeroBalanceAccounts = True
+        self._ShowCurrencyNick = True
         self.Models = []
         
         self.InitConfig()
@@ -36,6 +37,7 @@
 
         Publisher.subscribe(self.onAutoSaveToggled, "user.autosave_toggled")
         Publisher.subscribe(self.onShowZeroToggled, "user.showzero_toggled")
+        Publisher.subscribe(self.onShowCurrencyNickToggled, "user.show_currency_nick_toggled")
         Publisher.subscribe(self.onSaveRequest, "user.saved")
         
     def MigrateIfFound(self, fromPath, toPath):
@@ -82,10 +84,13 @@
             config.WriteBool("AUTO-SAVE", True)
         if not config.HasEntry("HIDE_ZERO_BALANCE_ACCOUNTS"):
             config.WriteBool("HIDE_ZERO_BALANCE_ACCOUNTS", False)
+        if not config.HasEntry("SHOW_CURRENCY_NICK"):
+            config.WriteBool("SHOW_CURRENCY_NICK", True)
 
         # Set the auto-save option as appropriate.
         self.AutoSave = config.ReadBool("AUTO-SAVE")
         self.ShowZeroBalanceAccounts = not config.ReadBool("HIDE_ZERO_BALANCE_ACCOUNTS")
+        self.ShowCurrencyNick = config.ReadBool("SHOW_CURRENCY_NICK")
 
     def onAutoSaveToggled(self, message):
         val = message.data
@@ -95,6 +100,10 @@
         val = message.data
         self.ShowZeroBalanceAccounts = val
 
+    def onShowCurrencyNickToggled(self, message):
+        val = message.data
+        self.ShowCurrencyNick = val
+        
     def onSaveRequest(self, message):
         self.Model.Save()
 
@@ -121,6 +130,14 @@
         wx.Config.Get().WriteBool("HIDE_ZERO_BALANCE_ACCOUNTS", not val)
         Publisher.sendMessage("controller.showzero_toggled", val)
 
+    def GetShowCurrencyNick(self):
+        return self._ShowCurrencyNick
+    
+    def SetShowCurrencyNick(self, val):
+        self._ShowCurrencyNick = val
+        wx.Config.Get().WriteBool("SHOW_CURRENCY_NICK", val)
+        Publisher.sendMessage("controller.show_currency_nick_toggled", val)
+
     def LoadPath(self, path, use=False):
         if path is None:
             path = fileservice.getDataFilePath(self.DB_NAME)
@@ -153,3 +170,4 @@
 
     AutoSave = property(GetAutoSave, SetAutoSave)
     ShowZeroBalanceAccounts = property(GetShowZero, SetShowZero)
+    ShowCurrencyNick = property(GetShowCurrencyNick, SetShowCurrencyNick)

=== modified file 'wxbanker/currencies.py'
--- wxbanker/currencies.py	2010-08-09 00:31:45 +0000
+++ wxbanker/currencies.py	2012-06-07 03:50:23 +0000
@@ -69,7 +69,7 @@
     def GetCurrencyNick(self):
         return self.LOCALECONV["int_curr_symbol"].strip()
 
-    def float2str(self, val, just=0):
+    def float2str(self, val, just=0, withNick=True):
         """Formats float values as currency strings according to the currency settings in self.LOCALECONV"""
         # Don't show negative zeroes!
         if abs(val) < .001:
@@ -89,6 +89,9 @@
         if not isinstance(s, unicode):
             s = unicode(s, locale.getlocale()[1])
 
+        if withNick:
+            s = self.GetCurrencyNick() + " " + s
+            
         # Justify as appropriate.
         s = s.rjust(just)
 

=== modified file 'wxbanker/data/exchanges.xml'
--- wxbanker/data/exchanges.xml	2009-12-06 23:24:24 +0000
+++ wxbanker/data/exchanges.xml	2012-06-07 03:50:23 +0000
@@ -6,7 +6,7 @@
 	</gesmes:Sender>
 	<Cube>
 		<Cube time='2009-02-25'>
-			<Cube currency='USD' rate='1.2795'/>
+			<Cube currency='USD' rate='1.2489'/>
 			<Cube currency='JPY' rate='123.76'/>
 			<Cube currency='BGN' rate='1.9558'/>
 			<Cube currency='CZK' rate='28.350'/>
@@ -32,7 +32,7 @@
 			<Cube currency='IDR' rate='15385.99'/>
 			<Cube currency='INR' rate='63.7700'/>
 			<Cube currency='KRW' rate='1938.03'/>
-			<Cube currency='MXN' rate='18.9687'/>
+			<Cube currency='MXN' rate='17.3842235'/>
 			<Cube currency='MYR' rate='4.6951'/>
 			<Cube currency='NZD' rate='2.4847'/>
 			<Cube currency='PHP' rate='61.610'/>
@@ -41,4 +41,4 @@
 			<Cube currency='ZAR' rate='12.7223'/>
 		</Cube>
 	</Cube>
-</gesmes:Envelope>
\ No newline at end of file
+</gesmes:Envelope>

=== modified file 'wxbanker/menubar.py'
--- wxbanker/menubar.py	2010-08-19 04:27:51 +0000
+++ wxbanker/menubar.py	2012-06-07 03:50:23 +0000
@@ -39,6 +39,7 @@
     ID_REQUESTFEATURE = wx.NewId()
     ID_TRANSLATE = wx.NewId()
     IDS_CURRENCIES = [wx.NewId() for i in range(len(CurrencyStrings))]
+    ID_SHOWCURRENCYNICK = wx.NewId()
     ID_MINTINTEGRATION = wx.NewId()
     ID_REQUESTCURRENCY = wx.NewId()
     ID_IMPORT_CSV = wx.NewId()
@@ -49,6 +50,7 @@
         self.bankController = bankController
         autosave = bankController.AutoSave
         showZero = bankController.ShowZeroBalanceAccounts
+        showcurrnick = bankController.ShowCurrencyNick
         self.currencyStrings = CurrencyStrings[:]
 
         # File menu.
@@ -76,7 +78,7 @@
         settingsMenu = wx.Menu()
 
         ## TRANSLATORS: Put the ampersand (&) before the letter to use as the Alt shortcut.
-        currencyMenu = wx.MenuItem(settingsMenu, -1, _("&Currency"), _("Select currency to display"))
+        currencyMenu = wx.MenuItem(settingsMenu, -1, _("Base &Currency"), _("Select currency for the 'All accounts balance'"))
         currencyMenu.SetBitmap(wx.ArtProvider.GetBitmap("wxART_money"))
 
         # Add an entry for each available currency.
@@ -97,6 +99,8 @@
 
         settingsMenu.AppendItem(currencyMenu)
         
+        self.showCurrencyNickItem = settingsMenu.AppendCheckItem(self.ID_SHOWCURRENCYNICK, _("Show currencies nick"), _("Show currencies nick before quantities"))
+
         self.mintEnabledItem = settingsMenu.AppendCheckItem(self.ID_MINTINTEGRATION, _("Integrate with Mint.com"), _("Sync account balances with an existing Mint.com account"))
 
         # Help menu.
@@ -142,8 +146,10 @@
         helpMenu.Bind(wx.EVT_MENU, self.onClickAbout)
 
         self.toggleAutoSave(autosave)
+        self.toggleShowCurrencyNick(showcurrnick)
         Publisher.subscribe(self.onAutoSaveToggled, "controller.autosave_toggled")
         Publisher.subscribe(self.onShowZeroToggled, "controller.showzero_toggled")
+        Publisher.subscribe(self.onShowCurrencyNickToggled, "controller.show_currency_nick_toggled")
         # Subscribe to a Mint update event, which tells us the checkbox should be enabled after startup.
         Publisher.subscribe(self.onMintUpdate, "mint.updated")
 
@@ -170,6 +176,7 @@
                 self.ID_EXPORT_CSV: self.onClickExportCsv,
                 wx.ID_ABOUT: self.onClickAbout,
                 self.ID_REQUESTCURRENCY: self.onClickRequestCurrency,
+                self.ID_SHOWCURRENCYNICK: self.onClickShowCurrencyNick,
                 self.ID_MINTINTEGRATION: self.onClickMintIntegration,
             }.get(ID, lambda e: e.Skip())
 
@@ -190,6 +197,12 @@
         
     def toggleShowZero(self, showzero):
         self.showZeroMenuItem.Check(showzero)
+
+    def onShowCurrencyNickToggled(self, message):
+        self.toggleShowCurrencyNick(message.data)
+
+    def toggleShowCurrencyNick(self, showcurr):
+        self.showCurrencyNickItem.Check(showcurr)
         
     def toggleMintEnabled(self, enabled):
         self.mintEnabledItem.Check(enabled)
@@ -216,7 +229,7 @@
         Publisher.sendMessage("quit")
 
     def onSelectCurrency(self, currencyIndex):
-        Publisher.sendMessage("user.currency_changed", currencyIndex)
+        Publisher.sendMessage("user.global_currency_changed", currencyIndex)
 
     def onClickFAQs(self, event):
         webbrowser.open("https://answers.launchpad.net/wxbanker/+faqs")
@@ -236,6 +249,9 @@
     def onClickRequestCurrency(self, event):
         webbrowser.open("https://answers.launchpad.net/wxbanker/+faq/477")
         
+    def onClickShowCurrencyNick(self, event):
+        Publisher.sendMessage("user.show_currency_nick_toggled", event.Checked())
+
     def onClickMintIntegration(self, event):
         Publisher.sendMessage("user.mint.toggled", event.Checked())
 
@@ -278,4 +294,4 @@
         if result == wx.ID_OK:
             csvpath = dlg.GetPath()
             CsvExporter.Export(self.bankController.Model, csvpath) 
-            
\ No newline at end of file
+            

=== modified file 'wxbanker/persistentstore.py'
--- wxbanker/persistentstore.py	2010-08-09 00:31:45 +0000
+++ wxbanker/persistentstore.py	2012-06-07 03:50:23 +0000
@@ -53,7 +53,7 @@
     """
     def __init__(self, path, autoSave=True):
         self.Subscriptions = []
-        self.Version = 11
+        self.Version = 12
         self.Path = path
         self.AutoSave = False
         self.Dirty = False
@@ -209,6 +209,10 @@
         cursor.execute('CREATE TABLE meta (id INTEGER PRIMARY KEY, name VARCHAR(255), value VARCHAR(255))')
         cursor.execute('INSERT INTO meta VALUES (null, ?, ?)', ('VERSION', '2'))
 
+    def getGlobalCurrency(self):
+        results = self.dbconn.cursor().execute('SELECT value FROM meta WHERE name="GlobalCurrency"').fetchall()
+        return int(results[0][0])
+
     def getMeta(self):
         try:
             results = self.dbconn.cursor().execute('SELECT * FROM meta').fetchall()
@@ -288,6 +292,9 @@
             # This is tested by testOrphanedTransactionsAreDeleted (dbupgradetests.DBUpgradeTest)
             # Also takes care of LP #249954 without the explicit need to defensively remove on any account creation.
             self.cleanOrphanedTransactions()
+        elif fromVer == 11:
+            # globalCurrency entry
+            cursor.execute('INSERT INTO meta VALUES (null, ?, ?)', ('GlobalCurrency', 0))
         else:
             raise Exception("Cannot upgrade database from version %i"%fromVer)
         
@@ -442,11 +449,16 @@
     def renameAccount(self, oldName, account):
         self.dbconn.cursor().execute("UPDATE accounts SET name=? WHERE name=?", (account.Name, oldName))
         self.commitIfAppropriate()
-
-    def setCurrency(self, currencyIndex):
-        self.dbconn.cursor().execute('UPDATE accounts SET currency=?', (currencyIndex,))
-        self.commitIfAppropriate()
-
+        
+    def setCurrency(self, currencyIndex, account=None):
+		if account:
+			self.dbconn.cursor().execute('UPDATE accounts SET currency=? WHERE id=?', (currencyIndex, account.ID))
+		else:
+		    #Since no account received, we are updating the global currency
+		    self.dbconn.cursor().execute('UPDATE meta SET value=? WHERE name="GlobalCurrency"', (currencyIndex,))	
+		self.commitIfAppropriate()
+
+        
     def __print__(self):
         cursor = self.dbconn.cursor()
         for account in cursor.execute("SELECT * FROM accounts").fetchall():

=== modified file 'wxbanker/plots/cairopanel.py'
--- wxbanker/plots/cairopanel.py	2010-09-13 07:40:38 +0000
+++ wxbanker/plots/cairopanel.py	2012-06-07 03:50:23 +0000
@@ -1,6 +1,7 @@
 import wx
 import datetime
 from wxbanker.plots import plotfactory
+from wx.lib.pubsub import Publisher
 
 try:
     try:
@@ -17,7 +18,7 @@
         self.Plots = [CairoPlotPanel, CairoPlotPanelMonthly]
     
 class BaseCairoPlotPanel(wx.Panel, baseplot.BasePlot):
-    def __init__(self, bankController, parent):
+    def __init__(self, bankController, parent, plotSettings=None):
         wx.Panel.__init__(self, parent)
         baseplot.BasePlot.__init__(self)
         self.bankController = bankController
@@ -25,6 +26,14 @@
         self.Bind(wx.EVT_SIZE, self.OnSize)
         self.data = None
         self.x_labels = None
+        self.plotSettings = plotSettings
+        
+        # watch if there's any currency change to repaint the plot.
+        Publisher.subscribe(self.currencyChanged, "controller.show_currency_nick_toggled")
+        Publisher.subscribe(self.currencyChanged, "currency_changed")
+    
+    def currencyChanged(self, message):
+        self.Refresh()
         
     def OnSize(self, event):
         self.Refresh()
@@ -33,6 +42,7 @@
     NAME = _("monthly")
     
     def plotBalance(self, totals, plotSettings):
+        self.plotSettings = plotSettings
         model = self.bankController.Model
         transactions = model.GetTransactions()
         earnings = baseplot.BasePlot.plotMonthly(self, transactions, plotSettings['Months'])
@@ -56,6 +66,13 @@
         
         cr = wx.lib.wxcairo.ContextFromDC(dc)
         size = self.GetClientSize()
+        
+        # try to format Y axes labels according to the account's currency.
+        if self.plotSettings['Account']:
+            value_formatter = lambda s: self.plotSettings['Account'].float2str(s)
+        else:
+            value_formatter = lambda s: self.bankController.Model.float2str(s)
+            
         cairoplot.vertical_bar_plot(
             cr.get_target(),
             data = self.data,
@@ -65,7 +82,7 @@
             colors = ["green"],
             #series_legend = True,
             display_values = True,
-            value_formatter = lambda s: self.bankController.Model.float2str(s),
+            value_formatter = value_formatter,
             #x_title=_("Earnings"),
             #y_title=_("Month"),
             rounded_corners = True,
@@ -76,6 +93,7 @@
     NAME = _("balance")
     
     def plotBalance(self, totals, plotSettings, xunits="Days"):
+        self.plotSettings = plotSettings
         amounts, dates, strdates, trendable = baseplot.BasePlot.plotBalance(self, totals, plotSettings, xunits)
         data = [(i, total) for i, total in enumerate(amounts)]
         self.data = {
@@ -107,6 +125,13 @@
         
         cr = wx.lib.wxcairo.ContextFromDC(dc)
         size = self.GetClientSize()
+        
+         # try to format Y axes labels according to the account's currency.
+        if self.plotSettings['Account']:
+            y_formatter = lambda s: self.plotSettings['Account'].float2str(s)
+        else:
+            y_formatter = lambda s: self.bankController.Model.float2str(s)
+        
         cairoplot.scatter_plot(
             cr.get_target(),
             data = self.data,
@@ -118,7 +143,7 @@
             series_colors = ["green", "blue"],
             series_legend = True,
             x_labels=self.x_labels,
-            y_formatter=lambda s: self.bankController.Model.float2str(s),
+            y_formatter=y_formatter,
             x_title=_("Time"),
             y_title=_("Balance"),
         )

=== modified file 'wxbanker/transactionolv.py'
--- wxbanker/transactionolv.py	2010-12-25 13:45:21 +0000
+++ wxbanker/transactionolv.py	2012-06-07 03:50:23 +0000
@@ -33,6 +33,7 @@
 from wxbanker.ObjectListView import GroupListView, ColumnDefn, CellEditorRegistry
 from wxbanker import bankcontrols, tagtransactiondialog
 
+from wxbanker.currencies import GetCurrencyInt
 
 class TransactionOLV(GroupListView):
     EMPTY_MSG_NORMAL = _("No transactions entered.")
@@ -43,6 +44,7 @@
         self.LastSearch = None
         self.CurrentAccount = None
         self.BankController = bankController
+        self.GlobalCurrency = self.BankController.Model.Store.getGlobalCurrency()
 
         self.showGroups = False
         #WXTODO: figure out these (and the text color, or is that already?) from theme (LP: ???)
@@ -66,7 +68,7 @@
         self.SetColumns([
             ColumnDefn(_("Date"), valueGetter=self.getDateAndIDOf, valueSetter=self.setDateOf, stringConverter=self.renderDateIDTuple, editFormatter=self.renderEditDate, width=dateWidth),
             ColumnDefn(_("Description"), valueGetter="Description", isSpaceFilling=True, editFormatter=self.renderEditDescription),
-            ColumnDefn(_("Amount"), "right", valueGetter="Amount", stringConverter=self.renderFloat, editFormatter=self.renderEditFloat),
+            ColumnDefn(_("Amount"), "right", valueGetter=self.getAmount, valueSetter=self.setAmount, stringConverter=self.renderFloat, editFormatter=self.renderEditFloat),
             ColumnDefn(_("Balance"), "right", valueGetter=self.getTotal, stringConverter=self.renderFloat, isEditable=False),
         ])
         # Our custom hack in OLV.py:2017 will render amount floats appropriately as %.2f when editing.
@@ -84,13 +86,14 @@
             (self.onTransactionAdded, "transaction.created"),
             (self.onTransactionsRemoved, "transactions.removed"),
             (self.onCurrencyChanged, "currency_changed"),
+            (self.onShowCurrencyNickToggled, "controller.show_currency_nick_toggled"),
             (self.updateTotals, "ormobject.updated.Transaction.Amount"),
             (self.onTransactionDateUpdated, "ormobject.updated.Transaction.Date"),
         )
 
         for callback, topic in self.Subscriptions:
             Publisher.subscribe(callback, topic)
-
+        
     def SetObjects(self, objs, *args, **kwargs):
         """
         Override the default SetObjects to properly refresh the auto-size,
@@ -127,6 +130,12 @@
         self.Freeze()
         self.SortBy(self.SORT_COL)
         self.Thaw()
+        
+    def setAmount(self, transaction, amount):
+        transaction.Amount = amount
+        self.Freeze()
+        self.SortBy(self.SORT_COL)
+        self.Thaw()
 
     def getTotal(self, transObj):
         if not hasattr(transObj, "_Total"):
@@ -139,23 +148,42 @@
         if first is None:
             return
         
-        first._Total = first.Amount
+        if not self.CurrentAccount:
+            #This means we are in 'All accounts' so we need to convert each total
+            # to the global currency
+            balance_currency = self.GlobalCurrency
+        else:
+            #we are just viewing a single account
+            # balance currency = accounts currency
+            balance_currency = GetCurrencyInt(self.CurrentAccount.GetCurrency())
+        
+        first._Total = first.GetAmount(balance_currency)
         
         b = first
         for i in range(1, len(self.GetObjects())):
             a, b = b, self.GetObjectAt(i)
-            b._Total = a._Total + b.Amount
+            b._Total = a._Total + b.GetAmount(balance_currency)
     
     def renderDateIDTuple(self, pair):
         return str(pair[0])
-    
-    def renderFloat(self, floatVal):
-        if self.CurrentAccount:
-            return self.CurrentAccount.float2str(floatVal)
+  
+    def getAmount(self, obj):
+        #Return the whole transaction/float since we need to use its
+        #renderAmount method to support multiple currencies.
+        return obj  
+        
+    def renderFloat(self, value):
+        if isinstance(value, float):
+            #this is a 'balance' column, its ok to use the bank model's float2str
+            # as long as we'r not in an account.
+            if self.CurrentAccount:
+                return self.CurrentAccount.float2str(value)
+            else:
+                return self.BankController.Model.float2str(value)
         else:
-            #WXTODO: fix me, this function should be given the object which should have a float2str method
-            # so that for multiple currencies they can be displayed differently when viewing all.
-            return self.BankController.Model.float2str(floatVal)
+            #this is a trnasaction, so it belogns to the 'Amount' column, render
+            # it with its appropieate currency
+            return value.RenderAmount()
     
     def renderEditDate(self, transaction):
         return str(transaction.Date)
@@ -413,13 +441,22 @@
         self.Refresh()
 
     def onCurrencyChanged(self, message):
-        # Refresh all the transaction objects, re-rendering the amounts.
-        self.RefreshObjects()
-        # The current likely changed the widths of the amount/total column.
-        self.sizeAmounts()
-        # Now we need to adjust the description width so we don't have a horizontal scrollbar.
-        self.AutoSizeColumns()
-
+        self.GlobalCurrency = message.data
+        # Refresh all the transaction objects, re-rendering the amounts.
+        self.RefreshObjects()
+        # The current likely changed the widths of the amount/total column.
+        self.sizeAmounts()
+        # Now we need to adjust the description width so we don't have a horizontal scrollbar.
+        self.AutoSizeColumns()
+        
+    def onShowCurrencyNickToggled(self, message):
+        # Refresh all the transaction objects, re-rendering the amounts.
+        self.RefreshObjects()
+        # The current likely changed the widths of the amount/total column.
+        self.sizeAmounts()
+        # Now we need to adjust the description width so we don't have a horizontal scrollbar.
+        self.AutoSizeColumns()
+        
     def __del__(self):
         for callback, topic in self.Subscriptions:
             Publisher.unsubscribe(callback)