[tryton-debian-vcs] tryton-modules-account branch upstream-3.0 updated. upstream/3.0.3-1-gbc03e05
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Mon May 12 16:06:36 UTC 2014
The following commit has been merged in the upstream-3.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account.git;a=commitdiff;h=upstream/3.0.3-1-gbc03e05
commit bc03e057fbef5bb9800cb7eeebb2631abd5b0672
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon May 12 17:02:40 2014 +0200
Adding upstream version 3.0.4.
diff --git a/CHANGELOG b/CHANGELOG
index 73c1744..b5eb023 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.4 - 2014-05-06
+* Bug fixes (see mercurial logs for details)
+
Version 3.0.3 - 2014-04-07
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 19f6d0c..ce2f904 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account
-Version: 3.0.3
+Version: 3.0.4
Summary: Tryton module for accounting
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/account.py b/account.py
index dfd35d1..db1efc9 100644
--- a/account.py
+++ b/account.py
@@ -513,7 +513,7 @@ class AccountTemplate(ModelSQL, ModelView):
if self.taxes:
Account.write([Account(template2account[self.id])], {
'taxes': [
- ('add', template2tax[x.id]) for x in self.taxes],
+ ('add', [template2tax[x.id] for x in self.taxes])],
})
template_done.append(self.id)
@@ -1201,10 +1201,12 @@ class GeneralLedger(Report):
clause.append(('move.state', '=', 'posted'))
lines = MoveLine.search(clause,
order=[
- ('account', 'ASC'),
+ ('account', 'ASC'), # TODO replace by account.id
('date', 'ASC'),
])
- return groupby(lines, operator.attrgetter('account'))
+ key = operator.attrgetter('account')
+ lines.sort(key=key)
+ return groupby(lines, key)
@classmethod
def lines(cls, accounts, periods, posted):
diff --git a/tryton.cfg b/tryton.cfg
index aea3156..5d917a9 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.3
+version=3.0.4
depends:
company
currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index dc4d18d..8c4e82e 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.3
+Version: 3.0.4
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