[tryton-debian-vcs] tryton-modules-account branch debian-jessie-3.0 updated. debian/3.0.3-1-4-g9899fdb

[Mathias Behrle]

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.3-1-4-g9899fdb

commit 9899fdbdb3bdc8a359ba5c274750ca5fd9a2cf51
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon May 12 17:02:45 2014 +0200

    Releasing debian version 3.0.4-1.

diff --git a/debian/changelog b/debian/changelog
index afc22c5..57462e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-account (3.0.4-1) unstable; urgency=medium
+
+  * Setting the branch in the watch file to the fixed version 3.0.
+  * Updating signing key while using now plain .asc files instead of .pgp
+    binaries.
+  * Merging upstream version 3.0.4.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Mon, 12 May 2014 17:02:45 +0200
+
 tryton-modules-account (3.0.3-1) unstable; urgency=medium
 
   * Merging upstream version 3.0.3.
commit 0466dc0d43b96c3220f309d4406b2c956ed2d0b0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon May 12 17:02:41 2014 +0200

    Merging 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