From a8fc7f0e50d4e093554e35aef7278d6e81fb8812 Mon Sep 17 00:00:00 2001
From: Juanjo Garcia <juanjo.garcia@nan-tic.com>
Date: Tue, 9 Jul 2019 23:42:43 +0200
Subject: [PATCH] Allow using yexpand and yfill attributes on notebook element

issue8418
review281681002
---
 trytond/ir/ui/form.rnc |  2 ++
 trytond/ir/ui/form.rng | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/trytond/ir/ui/form.rnc b/trytond/ir/ui/form.rnc
index eda2a299ff..38a0e75a3b 100644
--- a/trytond/ir/ui/form.rnc
+++ b/trytond/ir/ui/form.rnc
@@ -154,6 +154,8 @@ attlist.button &= attribute change { text }?
 attlist.button &= attribute type { "class" | "instance" }?
 notebook = element notebook { attlist.notebook, page* }
 attlist.notebook &= [ a:defaultValue = "4" ] attribute colspan { text }?
+attlist.notebook &= [ a:defaultValue = "1" ] attribute yexpand { "0" | "1" }?
+attlist.notebook &= [ a:defaultValue = "1" ] attribute yfill { "0" | "1" }?
 attlist.notebook &= attribute states { text }?
 attlist.notebook &= attribute width { text }?
 attlist.notebook &= attribute height { text }?
diff --git a/trytond/ir/ui/form.rng b/trytond/ir/ui/form.rng
index bd83b0f2d3..073a4af808 100644
--- a/trytond/ir/ui/form.rng
+++ b/trytond/ir/ui/form.rng
@@ -797,6 +797,28 @@
       </attribute>
     </optional>
   </define>
+  <define name="attlist.notebook" combine="interleave">
+    <optional>
+      <attribute a:defaultValue="1">
+        <name ns="">yexpand</name>
+        <choice>
+          <value>0</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="attlist.notebook" combine="interleave">
+    <optional>
+      <attribute a:defaultValue="1">
+        <name ns="">yfill</name>
+        <choice>
+          <value>0</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
   <define name="attlist.notebook" combine="interleave">
     <optional>
       <attribute>