diff options
| author | uco (OpenERP) <uco@tinyerp.com> | 2010-12-06 18:41:02 +0530 |
|---|---|---|
| committer | uco (OpenERP) <uco@tinyerp.com> | 2010-12-06 18:41:02 +0530 |
| commit | b1cf433ecc01a58c8abe27fdf9dbaba2deedf7f5 (patch) | |
| tree | 7d4b2df75b76c3529854cf98c401ad59370ce00a /addons/document/document_view.xml | |
| parent | eb04af83f31615e220a1b5e9639e799eb88242d6 (diff) | |
| parent | 5350ab0c1930e6573ee52bd430bb1d0f5adea2a3 (diff) | |
[MERGE]: Merged with trunk-addons.
bzr revid: uco@tinyerp.com-20101206131102-z2xzz8eshkswo00q
Diffstat (limited to 'addons/document/document_view.xml')
| -rw-r--r-- | addons/document/document_view.xml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml index 544ad1694be..536683f6a59 100644 --- a/addons/document/document_view.xml +++ b/addons/document/document_view.xml @@ -106,7 +106,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 +148,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 +167,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> |