[tryton-debian-vcs] tryton-modules-account branch upstream-3.2 updated. upstream/3.2.4-1-g8973180

[Mathias Behrle]

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

commit 8973180a1bf22f627c61831dd3d02a159e18d631
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 23 21:04:39 2015 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index d02ee45..81a057b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.5 - 2015-05-22
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.4 - 2015-03-02
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index c46b500..84caa50 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account
-Version: 3.2.4
+Version: 3.2.5
 Summary: Tryton module for accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/account.py b/account.py
index e71d6a9..89bc179 100644
--- a/account.py
+++ b/account.py
@@ -1137,7 +1137,7 @@ class GeneralLedger(Report):
                     ('fiscalyear', '=', data['fiscalyear']),
                     ('end_date', '<=', start_period.start_date),
                     ])
-            start_period_ids = [p.id for p in start_periods]
+            start_period_ids += [p.id for p in start_periods]
 
         with Transaction().set_context(
                 fiscalyear=data['fiscalyear'],
diff --git a/fiscalyear.py b/fiscalyear.py
index 5a96934..11e06bf 100644
--- a/fiscalyear.py
+++ b/fiscalyear.py
@@ -363,16 +363,18 @@ class BalanceNonDeferral(Wizard):
     def get_move_line(self, account):
         pool = Pool()
         Line = pool.get('account.move.line')
-        if account.company.currency.is_zero(account.balance):
+        # Don't use account.balance because we need the non-commulated balance
+        balance = account.debit - account.credit
+        if account.company.currency.is_zero(balance):
             return
         line = Line()
         line.account = account
-        if account.balance >= 0:
-            line.credit = abs(account.balance)
+        if balance >= 0:
+            line.credit = abs(balance)
             line.debit = 0
         else:
             line.credit = 0
-            line.debit = abs(account.balance)
+            line.debit = abs(balance)
         return line
 
     def get_counterpart_line(self, amount):
diff --git a/move.py b/move.py
index 8376296..4894661 100644
--- a/move.py
+++ b/move.py
@@ -1386,7 +1386,7 @@ class Line(ModelSQL, ModelView):
                 cls.raise_user_error('already_reconciled',
                         error_args=(line.move.number, line.id,))
 
-        lines = lines[:]
+        lines = list(lines)
         reconcile_account = None
         amount = Decimal('0.0')
         for line in lines:
diff --git a/tryton.cfg b/tryton.cfg
index e8db517..88ac5c8 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.2.4
+version=3.2.5
 depends:
     company
     currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index 83c797f..a3df401 100644
--- a/trytond_account.egg-info/PKG-INFO
+++ b/trytond_account.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-account
-Version: 3.2.4
+Version: 3.2.5
 Summary: Tryton module for accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-account