[tryton-debian-vcs] tryton-modules-account branch debian-jessie-3.0 updated. debian/3.0.10-1-4-gdfffcaa
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Mar 15 20:34:59 UTC 2016
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.10-1-4-gdfffcaa
commit dfffcaaa324834240a0d77f8d8a2d3b8e889c671
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 15 21:15:55 2016 +0100
Releasing debian version 3.0.11-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index ad047ec..9c9254f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-account (3.0.11-1) unstable; urgency=medium
+
+ * Updating signing-key.asc with the actual upstream maintainer keys.
+ * Merging upstream version 3.0.11.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 15 Mar 2016 21:15:55 +0100
+
tryton-modules-account (3.0.10-1) unstable; urgency=medium
* Merging upstream version 3.0.10.
commit 65649c662703ca43ec1bc2d5ad38abe52acc0dea
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 15 21:15:54 2016 +0100
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index b9a3ed9..092f18e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2008-2015 Cédric Krier
+Copyright: 2008-2016 Cédric Krier
2008-2013 Bertrand Chenal
- 2008-2015 B2CK SPRL
+ 2008-2016 B2CK SPRL
2004-2008 Tiny SPRL
License: GPL-3+
commit aade1b1da80c4678c3951b3bdf269293592fe80e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 15 21:15:54 2016 +0100
Merging upstream version 3.0.11.
diff --git a/CHANGELOG b/CHANGELOG
index bdffcd1..2f100f8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.11 - 2016-03-14
+* Bug fixes (see mercurial logs for details)
+
Version 3.0.10 - 2015-12-22
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 3a28212..48f96af 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2015 Cédric Krier.
+Copyright (C) 2008-2016 Cédric Krier.
Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2015 B2CK SPRL.
+Copyright (C) 2008-2016 B2CK SPRL.
Copyright (C) 2004-2008 Tiny SPRL.
This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index a339082..0f17f4e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account
-Version: 3.0.10
+Version: 3.0.11
Summary: Tryton module for accounting
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/move.py b/move.py
index 8b8655b..577cd3d 100644
--- a/move.py
+++ b/move.py
@@ -12,7 +12,7 @@ from trytond.wizard import Wizard, StateTransition, StateView, StateAction, \
Button
from trytond.report import Report
from trytond import backend
-from trytond.pyson import Eval, PYSONEncoder
+from trytond.pyson import Eval, If, PYSONEncoder
from trytond.transaction import Transaction
from trytond.pool import Pool, PoolMeta
from trytond.rpc import RPC
@@ -1324,9 +1324,12 @@ class Line(ModelSQL, ModelView):
if not journal.view:
return result
+ colors = PYSONEncoder().encode(
+ If(Eval('state', '') == 'draft', 'red', 'black'))
+ # Use single quote for colors as pyson contains double quote
xml = '<?xml version="1.0"?>\n' \
'<tree string="%s" editable="top" on_write="on_write" ' \
- 'colors="red:state==\'draft\'">\n' % title
+ 'colors=\'%s\'>\n' % (title, colors)
fields = set()
for column in journal.view.columns:
fields.add(column.field.name)
diff --git a/tryton.cfg b/tryton.cfg
index 7af68c6..7b93535 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.10
+version=3.0.11
depends:
company
currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index 8ef0d65..449aed2 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.10
+Version: 3.0.11
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