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 @@
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
@@ -384,6 +386,11 @@
+
+
+
+
+
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 @@
many2one
date
one2many
+ many2many
selection
float
numeric
float_time
integer
datetime
+ time
boolean
text
url
@@ -96,6 +98,9 @@
callto
sip
progressbar
+ reference
+ one2one
+ binary
@@ -177,6 +182,11 @@
+
+
+
+
+