From 0736573c2df00a4b3473b9b1bf9fae68827db82d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20=C3=89vrard?= <nicoe@b2ck.com>
Date: Wed, 8 Jun 2011 14:41:36 +0200
Subject: [PATCH] Add missing colspan attribute for action

---
 trytond/ir/ui/board.rnc | 1 +
 trytond/ir/ui/board.rng | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/trytond/ir/ui/board.rnc b/trytond/ir/ui/board.rnc
index 06662802c0..19fd9c112a 100644
--- a/trytond/ir/ui/board.rnc
+++ b/trytond/ir/ui/board.rnc
@@ -144,5 +144,6 @@ attlist.xpath &=
   attribute position { "inside" | "replace" | "replace_attributes" | "after" | "before" }?
 action = element action { attlist.action, empty }
 attlist.action &= attribute name { text }
+attlist.action &= [ a:defaultValue = "1" ] attribute colspan { text }?
 label |= notAllowed
 start = data | board | label
diff --git a/trytond/ir/ui/board.rng b/trytond/ir/ui/board.rng
index a0c90e3b8d..06d68504d2 100644
--- a/trytond/ir/ui/board.rng
+++ b/trytond/ir/ui/board.rng
@@ -447,6 +447,11 @@
   <define name="attlist.action" combine="interleave">
     <attribute name="name"/>
   </define>
+  <define name="attlist.action" combine="interleave">
+    <optional>
+      <attribute name="colspan" a:defaultValue="1"/>
+    </optional>
+  </define>
   <define name="label" combine="choice">
     <notAllowed/>
   </define>