From ee283a38830b497bf63ee106968df8e651d14a34 Mon Sep 17 00:00:00 2001
From: Udo Spallek <udono@virtual-things.biz>
Date: Thu, 12 Apr 2012 16:12:19 +0000
Subject: [PATCH] Tree does not need to have a field inside. Update form.rng
 with trang. issue2535

---
 trytond/ir/ui/form.rnc |  2 +-
 trytond/ir/ui/form.rng | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/trytond/ir/ui/form.rnc b/trytond/ir/ui/form.rnc
index b20dd5ce0d..b4a178db9b 100644
--- a/trytond/ir/ui/form.rnc
+++ b/trytond/ir/ui/form.rnc
@@ -20,7 +20,7 @@ attlist.form &= attribute on_write { text }?
 attlist.form &= [ a:defaultValue = "4" ] attribute col { text }?
 attlist.form &= attribute cursor { text }?
 
-tree = element tree { attlist.tree, field+ }
+tree = element tree { attlist.tree, field }
 attlist.tree &=
   [ a:defaultValue = "Unknown" ] attribute string { text }?
 attlist.tree &= attribute on_write { text }?
diff --git a/trytond/ir/ui/form.rng b/trytond/ir/ui/form.rng
index 1bb7c62bff..990c250d98 100644
--- a/trytond/ir/ui/form.rng
+++ b/trytond/ir/ui/form.rng
@@ -42,9 +42,7 @@
   <define name="tree">
     <element name="tree">
       <ref name="attlist.tree"/>
-      <oneOrMore>
-        <ref name="field"/>
-      </oneOrMore>
+      <ref name="field"/>
     </element>
   </define>
   <define name="attlist.tree" combine="interleave">
@@ -500,11 +498,6 @@
       </attribute>
     </optional>
   </define>
-  <define name="attlist.image" combine="interleave">
-    <optional>
-      <attribute name="help"/>
-    </optional>
-  </define>
   <define name="attlist.image" combine="interleave">
     <optional>
       <attribute name="xexpand" a:defaultValue="0">
@@ -525,6 +518,11 @@
       </attribute>
     </optional>
   </define>
+  <define name="attlist.image" combine="interleave">
+    <optional>
+      <attribute name="help"/>
+    </optional>
+  </define>
   <define name="attlist.image" combine="interleave">
     <optional>
       <attribute name="states"/>