[tryton-debian-vcs] tryton-modules-account-deposit branch upstream updated. upstream/3.6.0-1-gd8e3c37

[Mathias Behrle]

The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-deposit.git;a=commitdiff;h=upstream/3.6.0-1-gd8e3c37

commit d8e3c37a86ad0c6b00f48655666c756bde6fc3fd
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jul 15 12:39:25 2015 +0200

    Adding upstream version 3.6.1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index 17ebdc9..fbf875c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 3.6.1 - 2015-07-13
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.0 - 2015-04-20
 * Initial release
\ No newline at end of file
diff --git a/PKG-INFO b/PKG-INFO
index a145200..d00bed6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account_deposit
-Version: 3.6.0
+Version: 3.6.1
 Summary: Tryton module for accounting deposit
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/invoice.py b/invoice.py
index 59c5f13..f92fdfb 100644
--- a/invoice.py
+++ b/invoice.py
@@ -97,10 +97,14 @@ class DepositRecall(Wizard):
         pool = Pool()
         Invoice = pool.get('account.invoice')
         InvoiceLine = pool.get('account.invoice.line')
+        Currency = pool.get('currency.currency')
         invoice = Invoice(Transaction().context['active_id'])
 
         amount = 0
-        balance = invoice.party.get_deposit_balance(self.start.account)
+        account = self.start.account
+        balance = invoice.party.get_deposit_balance(account)
+        balance = Currency.compute(account.company.currency, balance,
+            invoice.currency)
         if invoice.type.startswith('in'):
             if balance > 0 and invoice.total_amount > 0:
                 amount = -min(balance, invoice.total_amount)
diff --git a/tryton.cfg b/tryton.cfg
index eceb8fb..d622cc8 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.6.0
+version=3.6.1
 depends:
     account
     account_invoice
diff --git a/trytond_account_deposit.egg-info/PKG-INFO b/trytond_account_deposit.egg-info/PKG-INFO
index f14fcfd..cdad162 100644
--- a/trytond_account_deposit.egg-info/PKG-INFO
+++ b/trytond_account_deposit.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-account-deposit
-Version: 3.6.0
+Version: 3.6.1
 Summary: Tryton module for accounting deposit
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-account-deposit