[tryton-debian-vcs] tryton-modules-account branch debian-jessie-3.0 updated. debian/3.0.8-1-2-gdd081e1
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sun May 24 12:15:52 UTC 2015
The following commit has been merged in the debian-jessie-3.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account.git;a=commitdiff;h=debian/3.0.8-1-2-gdd081e1
commit dd081e12f6eb600b8e47de9d2dbd03f545779c58
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 23 21:03:34 2015 +0200
Releasing debian version 3.0.9-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 4700a94..211174d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-account (3.0.9-1) unstable; urgency=medium
+
+ * Merging upstream version 3.0.9.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 23 May 2015 21:03:34 +0200
+
tryton-modules-account (3.0.8-1) unstable; urgency=medium
* Adding actual upstream signing key.
commit 3e013035ea8b112dc00118c90134effe12b1a9f6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 23 21:03:34 2015 +0200
Merging upstream version 3.0.9.
diff --git a/CHANGELOG b/CHANGELOG
index 223e021..77f600d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.9 - 2015-05-22
+* Bug fixes (see mercurial logs for details)
+
Version 3.0.8 - 2015-03-02
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 209a799..bf8b669 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account
-Version: 3.0.8
+Version: 3.0.9
Summary: Tryton module for accounting
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/account.py b/account.py
index 2d3eea7..cf71b92 100644
--- a/account.py
+++ b/account.py
@@ -1128,7 +1128,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 3935ce6..39bf971 100644
--- a/fiscalyear.py
+++ b/fiscalyear.py
@@ -353,16 +353,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 abb3016..8b8655b 100644
--- a/move.py
+++ b/move.py
@@ -1364,7 +1364,7 @@ class Line(ModelSQL, ModelView):
cls.raise_user_error('already_reconciled',
error_args=(line.move.number, line.id,))
- lines = lines[:]
+ lines = list(lines)
if journal and account:
if not date:
date = Date.today()
diff --git a/tryton.cfg b/tryton.cfg
index 87523cb..c8889fe 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.8
+version=3.0.9
depends:
company
currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index e67d665..2260183 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.0.8
+Version: 3.0.9
Summary: Tryton module for accounting
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-account
More information about the tryton-debian-vcs
mailing list