[tryton-debian-vcs] tryton-modules-account branch upstream-3.4 updated. upstream/3.4.2-1-gc93373c
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sun May 24 12:15:57 UTC 2015
The following commit has been merged in the upstream-3.4 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account.git;a=commitdiff;h=upstream/3.4.2-1-gc93373c
commit c93373cb4e461eab516298e904050b1394654837
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 23 21:05:45 2015 +0200
Adding upstream version 3.4.3.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index fc682ca..6ee0194 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.3 - 2015-05-22
+* Bug fixes (see mercurial logs for details)
+
Version 3.4.2 - 2015-03-02
* Bug fixes (see mercurial logs for details)
* Add fix_party script
diff --git a/PKG-INFO b/PKG-INFO
index 8456846..555d7ce 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account
-Version: 3.4.2
+Version: 3.4.3
Summary: Tryton module for accounting
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/account.py b/account.py
index ecf25b5..9e5633a 100644
--- a/account.py
+++ b/account.py
@@ -1151,7 +1151,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 f98d0b1..f5c0ac9 100644
--- a/fiscalyear.py
+++ b/fiscalyear.py
@@ -365,16 +365,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 a9500e9..df900a1 100644
--- a/move.py
+++ b/move.py
@@ -1480,7 +1480,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
reconcile_party = None
amount = Decimal('0.0')
diff --git a/tryton.cfg b/tryton.cfg
index bb978e4..8b608f8 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.2
+version=3.4.3
depends:
company
currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index 89221d2..7d8dd4a 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.4.2
+Version: 3.4.3
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