diff options
| author | Mantavya Gajjar <mga@tinyerp.com> | 2010-04-20 02:36:35 +0530 |
|---|---|---|
| committer | Mantavya Gajjar <mga@tinyerp.com> | 2010-04-20 02:36:35 +0530 |
| commit | 5f197ef01f7f4224f5805b5dcdeecfee40aeb379 (patch) | |
| tree | a1d6a5b81bfe98800ef0c461b6594969f6c0b6d9 /addons/document/document_view.xml | |
| parent | f2f2bde0f3c0a09c8eb0cb841d6f2171ad83c735 (diff) | |
| parent | e55d830a7c76e8390bd2f533370424368339da4d (diff) | |
[MERGE]: merging from same branch
bzr revid: mga@tinyerp.com-20100419210635-fv7bhc6474l4blc8
Diffstat (limited to 'addons/document/document_view.xml')
| -rw-r--r-- | addons/document/document_view.xml | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml index 27297d3b2a8..0185f9fe444 100644 --- a/addons/document/document_view.xml +++ b/addons/document/document_view.xml @@ -13,12 +13,16 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Storage Media"> - <field name="name" select="1" colspan="4"/> - <field name="user_id"/> - <field name="type" /> - <field name="online" /> - <field name="readonly" /> - <field name="path" /> + <group colspan="4" col="4"> + <field name="name" select="1" colspan="4"/> + <field name="user_id"/> + <field name="type"/> + <field name="online"/> + <field name="readonly"/> + </group> + <group colspan="2" attrs="{'invisible':[('type','!=','realstore')]}"> + <field name="path"/> + </group> </form> </field> </record> @@ -67,13 +71,13 @@ <newline/> <field name="domain" attrs="{'required': [('type','=','ressource')], 'readonly': [('type','=','static')]}"/> <field name="ressource_tree"/> - <field name="resource_field"/> + <field name="resource_field" domain="[('model_id','=',ressource_type_id), ('ttype', 'in', ('char', 'selection', 'date', 'datetime'))]"/> <field name="ressource_id" select="2" readonly="1"/> <field name="ressource_parent_type_id"/> </page> <page string="Generated Files"> <label colspan="4" string="For each entry here, virtual files will appear in this folder." /> - <field name="content_ids" nolabel="1" colspan="4"> + <field name="content_ids" nolabel="1" colspan="4" attrs="{'readonly': [('ressource_type_id','=',False)]}"> <form string="Contents"> <field name="name"/> <field name="sequence"/> @@ -179,7 +183,7 @@ <field name="title" select="1"/> <field name="partner_id"/> <field name="user_id"/> - <field name="parent_id" select="2"/> + <field name="parent_id"/> </group> <notebook colspan="4"> <page string="Attachment"> @@ -190,7 +194,7 @@ </group> <group col="2" colspan="2"> <separator string="Attached To" colspan="2"/> - <field name="res_model" select="2" readonly="1"/> + <field name="res_model" readonly="1"/> <field name="res_id" readonly="1"/> </group> <separator string="Preview" colspan="4"/> |