Allow calendar elements as calendar view xpath children

issue6812
review37741002

trytond/ir/ui/calendar.rnc

@@ -18,7 +18,7 @@ data = element data { attlist.data, xpath* }
 attlist.data &= empty
 
 xpath = element xpath {
-    attlist.xpath, ( field )*
+    attlist.xpath, (field | calendar)*
   }
 attlist.xpath &= attribute expr { text }
 attlist.xpath &=

trytond/ir/ui/calendar.rng

@@ -60,7 +60,10 @@
     <element name="xpath">
       <ref name="attlist.xpath"/>
       <zeroOrMore>
-        <ref name="field"/>
+        <choice>
+          <ref name="field"/>
+          <ref name="calendar"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>