[tryton-debian-vcs] tryton-modules-account branch upstream-3.4 updated. upstream/3.4.4-1-g093670d
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Mar 15 20:35:00 UTC 2016
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.4-1-g093670d
commit 093670dc11bdf0c48624da8ac366c8d9baed2015
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 15 21:18:51 2016 +0100
Adding upstream version 3.4.5.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 776e3f4..922c85f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.5 - 2016-03-14
+* Bug fixes (see mercurial logs for details)
+
Version 3.4.4 - 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 be5a3c1..38fa628 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account
-Version: 3.4.4
+Version: 3.4.5
Summary: Tryton module for accounting
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/move.py b/move.py
index df900a1..3200d78 100644
--- a/move.py
+++ b/move.py
@@ -18,7 +18,7 @@ from trytond.wizard import Wizard, StateTransition, StateView, StateAction, \
Button
from trytond.report import Report
from trytond import backend
-from trytond.pyson import Eval, Bool, PYSONEncoder
+from trytond.pyson import Eval, Bool, If, PYSONEncoder
from trytond.transaction import Transaction
from trytond.pool import Pool, PoolMeta
from trytond.rpc import RPC
@@ -1439,9 +1439,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 d4d1089..d3cb7f7 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.4
+version=3.4.5
depends:
company
currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index 54540e9..000a164 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.4
+Version: 3.4.5
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