diff options
| author | Foram Katharotiya (OpenERP) <fka@tinyerp.com> | 2012-06-13 14:44:41 +0530 |
|---|---|---|
| committer | Foram Katharotiya (OpenERP) <fka@tinyerp.com> | 2012-06-13 14:44:41 +0530 |
| commit | 4b31700d0aa3cede5619844e770f2986d62ec4b1 (patch) | |
| tree | 618fd72590938aa0866b62db98fbc526f08b012e /addons/document_webdav/webdav_view.xml | |
| parent | e6480079840ebdbce3c519e37006c5cd99289c6c (diff) | |
| parent | af25c37e8b992a4ba2cddd24233e1c61d591599e (diff) | |
[MERGE] Merge with parent branch
bzr revid: fka@tinyerp.com-20120613091441-ztliham5qony2lr3
Diffstat (limited to 'addons/document_webdav/webdav_view.xml')
| -rw-r--r-- | addons/document_webdav/webdav_view.xml | 86 |
1 files changed, 44 insertions, 42 deletions
diff --git a/addons/document_webdav/webdav_view.xml b/addons/document_webdav/webdav_view.xml index a17595323a5..b0101c01574 100644 --- a/addons/document_webdav/webdav_view.xml +++ b/addons/document_webdav/webdav_view.xml @@ -7,14 +7,14 @@ <field name="model">document.webdav.dir.property</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Properties"> - <field name="namespace"/> - <field name="name"/> - <newline /> - <field name="dir_id" /> - <field name="do_subst" /> - <newline /> - <field name="value" colspan="4" /> + <form string="Properties" version="7.0"> + <group col="4"> + <field name="namespace"/> + <field name="name"/> + <field name="dir_id" /> + <field name="do_subst" /> + </group> + <field name="value" colspan="4" /> </form> </field> </record> @@ -25,9 +25,9 @@ <field name="type">tree</field> <field name="arch" type="xml"> <tree string="Properties" toolbar="1"> - <field name="dir_id" /> - <field name="namespace"/> - <field name="name"/> + <field name="dir_id" /> + <field name="namespace"/> + <field name="name"/> </tree> </field> </record> @@ -77,27 +77,28 @@ <field name="inherit_id" ref="document.view_document_directory_form" /> <field name="type">form</field> <field name="arch" type="xml"> - <page string="Dynamic context" position="after"> - <page string="WebDAV properties"> - <label string="These properties will be added to WebDAV requests" colspan="4" /> + <page string="Dynamic context" position="after" version="7.0"> + <page string="WebDAV properties"> + <label string="These properties will be added to WebDAV requests" colspan="4" /> - <field name="dav_prop_ids" nolabel="1" colspan="4"> - <tree string="Properties"> - <field name="namespace"/> - <field name="name"/> - </tree> - <form string="Properties"> - <field name="namespace"/> - <field name="name"/> - <newline /> - <field name="do_subst" /> - <newline /> - <field name="value" colspan="4" /> - </form> - </field> - </page> - </page> - </field> + <field name="dav_prop_ids" nolabel="1" colspan="4"> + <tree string="Properties"> + <field name="namespace"/> + <field name="name"/> + </tree> + <form string="Properties" version="7.0"> + <group col="4"> + <field name="namespace"/> + <field name="name"/> + <newline /> + <field name="do_subst" /> + </group> + <field name="value"/> + </form> + </field> + </page> + </page> + </field> </record> <!-- File properties --> @@ -106,14 +107,15 @@ <field name="model">document.webdav.file.property</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Properties"> - <field name="namespace"/> - <field name="name"/> - <newline /> - <field name="file_id" /> - <field name="do_subst" /> - <newline /> - <field name="value" colspan="4" /> + <form string="Properties" version="7.0"> + <group col="4"> + <field name="namespace"/> + <field name="name"/> + <newline /> + <field name="file_id" /> + <field name="do_subst" /> + </group> + <field name="value"/> </form> </field> </record> @@ -124,9 +126,9 @@ <field name="type">tree</field> <field name="arch" type="xml"> <tree string="Properties" toolbar="1"> - <field name="file_id" /> - <field name="namespace"/> - <field name="name"/> + <field name="file_id" /> + <field name="namespace"/> + <field name="name"/> </tree> </field> </record> |