diff options
| author | Cristian Salamea <ovnicraft@gmail.com> | 2010-12-27 00:26:33 -0500 |
|---|---|---|
| committer | Cristian Salamea <ovnicraft@gmail.com> | 2010-12-27 00:26:33 -0500 |
| commit | 974a8cacf05be871ef71a8096e6dd2f0ef746ad5 (patch) | |
| tree | da3bae98ab87c998cd539d1dfaa9093866bba9ab /addons/document/document_view.xml | |
| parent | 612c454cc8c8f46c26996990fd333a56c4d6a1c5 (diff) | |
| parent | c362e4b48ead41e7a0add3449c3fff7bfedc9fb8 (diff) | |
[MERGE]
bzr revid: ovnicraft@gmail.com-20101227052633-hi3op794dkd3pn5m
Diffstat (limited to 'addons/document/document_view.xml')
| -rw-r--r-- | addons/document/document_view.xml | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml index 544ad1694be..df5e78894fd 100644 --- a/addons/document/document_view.xml +++ b/addons/document/document_view.xml @@ -82,7 +82,6 @@ <group colspan="4" col="4" attrs="{'invisible': [('type','!=','ressource')]}"> <field name="ressource_type_id" on_change="onchange_content_id(ressource_type_id)" attrs="{'required': [('type','=','ressource')] }"/> - <field name="resource_find_all" groups="base.group_extended" /> <newline/> <field name="resource_field" domain="[('model_id','=',ressource_type_id), ('ttype', 'in', ('char', 'selection', 'date', 'datetime'))]"/> <field name="ressource_tree"/> @@ -93,6 +92,9 @@ <field name="ressource_parent_type_id"/> <field name="ressource_id" select="2" readonly="1"/> </group> + <group colspan="4" col="2" attrs="{'invisible': [('type','!=','ressource'),('resource_parent_type_id','=',False)]}"> + <field name="resource_find_all" groups="base.group_extended" /> + </group> </page> <page string="Generated Files" groups="base.group_extended"> @@ -106,7 +108,7 @@ <field name="extension"/> <field name="include_name"/> <separator string="PDF Report" colspan="4"/> - <field name="report_id" domain="[('model_id','=',parent.ressource_type_id)]"/> + <field name="report_id" domain="[ ('type','=','ressource'),('model_id','=',parent.ressource_type_id)]"/> </form> <tree string="Contents"> <field name="sequence" string="Seq."/> @@ -148,6 +150,7 @@ <field name="name"/> <field name="type"/> <field name="user_id"/> + <field name="company_id" groups="base.group_multi_company"/> <field name="storage_id"/> <field name="create_date"/> <field name="write_date"/> @@ -166,12 +169,16 @@ <separator orientation="vertical"/> <field name="name" /> <field name="user_id" /> + <field name="company_id" groups="base.group_multi_company"/> <field name="storage_id" /> <newline/> <group expand="0" string="Group By..." groups="base.group_extended"> - <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/> <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> - <filter string="Storage" domain="[]" context="{'group_by':'storage_id'}"/> + <separator orientation="vertical"/> + <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/> + <filter string="Storage" domain="[]" icon="terp-accessories-archiver" context="{'group_by':'storage_id'}"/> + <separator orientation="vertical" groups="base.group_multi_company"/> + <filter string="Company" domain="[]" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> </group> </search> </field> |