diff --git a/CHANGELOG b/CHANGELOG index 7004ae522e..230f4605a6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -17,6 +17,7 @@ * Make global cache depends on explicit context keys * Don't add to global cache Binary fields * Add MatchMixin +* Add image widget to tree * Remove context, current_date and time from record rule evaluation Version 3.2.0 - 2014-04-21 diff --git a/trytond/ir/ui/tree.rnc b/trytond/ir/ui/tree.rnc index 7260f0e411..925331ecb3 100644 --- a/trytond/ir/ui/tree.rnc +++ b/trytond/ir/ui/tree.rnc @@ -41,6 +41,7 @@ attlist.field &= | "reference" | "one2one" | "binary" + | "image" }? attlist.field &= [ a:defaultValue = "0" ] attribute tree_invisible { "0" | "1" }? @@ -49,6 +50,7 @@ attlist.field &= attlist.field &= attribute icon { text }? attlist.field &= attribute sum { text }? attlist.field &= attribute width { text }? +attlist.field &= attribute height { text }? attlist.field &= [ a:defaultValue = "left_to_right" ] attribute orientation { "left_to_right" diff --git a/trytond/ir/ui/tree.rng b/trytond/ir/ui/tree.rng index 4d16918080..0508c44392 100644 --- a/trytond/ir/ui/tree.rng +++ b/trytond/ir/ui/tree.rng @@ -111,6 +111,7 @@ reference one2one binary + image @@ -150,6 +151,11 @@ + + + + +