From 4e535164c22026c72bd7caa20acda7c95884d6a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sun, 26 Jan 2014 22:10:57 +0100
Subject: [PATCH] Resync widget attributes and add missing filename attribute
 in views

review2911002
---
 trytond/ir/ui/form.rnc | 29 ++++++++++++++++-------------
 trytond/ir/ui/form.rng | 33 ++++++++++++++++++++-------------
 trytond/ir/ui/tree.rnc |  6 ++++++
 trytond/ir/ui/tree.rng | 10 ++++++++++
 4 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/trytond/ir/ui/form.rnc b/trytond/ir/ui/form.rnc
index f696e9e4a0..2c58352ec9 100644
--- a/trytond/ir/ui/form.rnc
+++ b/trytond/ir/ui/form.rnc
@@ -41,29 +41,31 @@ attlist.field &= [ a:defaultValue = "1" ] attribute colspan { text }?
 attlist.field &=
   attribute widget {
     "date"
-    | "char"
-    | "many2one"
-    | "date"
-    | "one2many"
-    | "selection"
+    | "datetime"
+    | "time"
     | "float"
     | "numeric"
-    | "float_time"
     | "integer"
-    | "datetime"
-    | "boolean"
-    | "text"
-    | "url"
-    | "email"
-    | "callto"
-    | "sip"
+    | "selection"
+    | "char"
     | "sha"
+    | "float_time"
+    | "boolean"
     | "reference"
     | "binary"
+    | "text"
+    | "one2many"
     | "many2many"
+    | "many2one"
+    | "email"
+    | "url"
+    | "callto"
+    | "sip"
     | "image"
     | "progressbar"
+    | "one2one"
     | "richtext"
+    | "dict"
   }?
 attlist.field &= attribute fill { "0" | "1" }?
 attlist.field &= attribute yexpand { "0" | "1" }?
@@ -105,6 +107,7 @@ attlist.field &= attribute icon { text }?
 attlist.field &= [a:defaultValue = "1"] attribute completion { "0" | "1" }?
 attlist.field &= attribute string { text }?
 attlist.field &= [a:defaultValue = "1"] attribute factor { text }?
+attlist.field &= attribute filename { text }?
 image = element image { attlist.image, empty }
 attlist.image &= attribute name { text }
 attlist.image &= [ a:defaultValue = "1" ] attribute colspan { text }?
diff --git a/trytond/ir/ui/form.rng b/trytond/ir/ui/form.rng
index 5a68938a51..cb0d1aec0d 100644
--- a/trytond/ir/ui/form.rng
+++ b/trytond/ir/ui/form.rng
@@ -140,29 +140,31 @@
       <attribute name="widget">
         <choice>
           <value>date</value>
-          <value>char</value>
-          <value>many2one</value>
-          <value>date</value>
-          <value>one2many</value>
-          <value>selection</value>
+          <value>datetime</value>
+          <value>time</value>
           <value>float</value>
           <value>numeric</value>
-          <value>float_time</value>
           <value>integer</value>
-          <value>datetime</value>
-          <value>boolean</value>
-          <value>text</value>
-          <value>url</value>
-          <value>email</value>
-          <value>callto</value>
-          <value>sip</value>
+          <value>selection</value>
+          <value>char</value>
           <value>sha</value>
+          <value>float_time</value>
+          <value>boolean</value>
           <value>reference</value>
           <value>binary</value>
+          <value>text</value>
+          <value>one2many</value>
           <value>many2many</value>
+          <value>many2one</value>
+          <value>email</value>
+          <value>url</value>
+          <value>callto</value>
+          <value>sip</value>
           <value>image</value>
           <value>progressbar</value>
+          <value>one2one</value>
           <value>richtext</value>
+          <value>dict</value>
         </choice>
       </attribute>
     </optional>
@@ -384,6 +386,11 @@
       <attribute name="factor" a:defaultValue="1"/>
     </optional>
   </define>
+  <define name="attlist.field" combine="interleave">
+    <optional>
+      <attribute name="filename"/>
+    </optional>
+  </define>
   <define name="image">
     <element name="image">
       <ref name="attlist.image"/>
diff --git a/trytond/ir/ui/tree.rnc b/trytond/ir/ui/tree.rnc
index e422d93099..43e9471a31 100644
--- a/trytond/ir/ui/tree.rnc
+++ b/trytond/ir/ui/tree.rnc
@@ -21,12 +21,14 @@ attlist.field &=
     | "many2one"
     | "date"
     | "one2many"
+    | "many2many"
     | "selection"
     | "float"
     | "numeric"
     | "float_time"
     | "integer"
     | "datetime"
+    | "time"
     | "boolean"
     | "text"
     | "url"
@@ -34,6 +36,9 @@ attlist.field &=
     | "callto"
     | "sip"
     | "progressbar"
+    | "reference"
+    | "one2one"
+    | "binary"
   }?
 attlist.field &=
   [ a:defaultValue = "0" ] attribute tree_invisible { "0" | "1" }?
@@ -53,6 +58,7 @@ attlist.field &= attribute float_time { text }?
 attlist.field &= [a:defaultValue = "0"] attribute pre_validate { "0" | "1" }?
 attlist.field &= [a:defaultValue = "1"] attribute completion { "0" | "1" }?
 attlist.field &= [a:defaultValue = "1"] attribute factor { text }?
+attlist.field &= attribute filename { text }?
 prefix = element prefix { attlist.affix, empty }
 suffix = element suffix { attlist.affix, empty }
 attlist.affix &= attribute string { text }?
diff --git a/trytond/ir/ui/tree.rng b/trytond/ir/ui/tree.rng
index 12e9ef3d82..628d21fcae 100644
--- a/trytond/ir/ui/tree.rng
+++ b/trytond/ir/ui/tree.rng
@@ -83,12 +83,14 @@
           <value>many2one</value>
           <value>date</value>
           <value>one2many</value>
+          <value>many2many</value>
           <value>selection</value>
           <value>float</value>
           <value>numeric</value>
           <value>float_time</value>
           <value>integer</value>
           <value>datetime</value>
+          <value>time</value>
           <value>boolean</value>
           <value>text</value>
           <value>url</value>
@@ -96,6 +98,9 @@
           <value>callto</value>
           <value>sip</value>
           <value>progressbar</value>
+          <value>reference</value>
+          <value>one2one</value>
+          <value>binary</value>
         </choice>
       </attribute>
     </optional>
@@ -177,6 +182,11 @@
       <attribute name="factor" a:defaultValue="1"/>
     </optional>
   </define>
+  <define name="attlist.field" combine="interleave">
+    <optional>
+      <attribute name="filename"/>
+    </optional>
+  </define>
   <define name="prefix">
     <element name="prefix">
       <ref name="attlist.affix"/>