diff options
| author | Amit Patel (OpenERP) <apa@tinyerp.com> | 2012-08-01 12:34:25 +0530 |
|---|---|---|
| committer | Amit Patel (OpenERP) <apa@tinyerp.com> | 2012-08-01 12:34:25 +0530 |
| commit | 522a3edc19c7446c723d1b3e4cb4c19c89a36fa4 (patch) | |
| tree | 4eedd0276ee76e89c9cced59507bea4ff987874b /addons/document | |
| parent | 6e5d18a9332c3115b1eac5cd64d022545c56b987 (diff) | |
| parent | e845e2350c694484793020ab6a9a729f9c205de6 (diff) | |
[MERGE]:merged with trunk
bzr revid: apa@tinyerp.com-20120801070425-ydyx8nc2ngi3j0zi
Diffstat (limited to 'addons/document')
| -rw-r--r-- | addons/document/document_view.xml | 12 | ||||
| -rw-r--r-- | addons/document/report/document_report_view.xml | 9 |
2 files changed, 3 insertions, 18 deletions
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml index 1b1864cabe0..3f5768b8c4a 100644 --- a/addons/document/document_view.xml +++ b/addons/document/document_view.xml @@ -41,7 +41,6 @@ <field name="arch" type="xml"> <search string="Search Document Storage"> <field name="name" string="Document Storage"/> - <newline/> <group expand="0" string="Group By..."> <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/> </group> @@ -172,20 +171,15 @@ <field name="arch" type="xml"> <search string="Search Document Directory"> <field name="name" string="Document Directory"/> - <separator orientation="vertical"/> <filter string="Static" domain="[('type','=','directory')]"/> <filter string="Resources" icon="terp-personal" domain="[('type','=','ressource')]"/> - <separator orientation="vertical"/> <field name="company_id" groups="base.group_multi_company"/> <field name="storage_id" /> <field name="user_id" /> - <newline/> <group expand="0" string="Group By..."> <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_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> @@ -269,11 +263,7 @@ <field name="inherit_id" ref="base.view_attachment_search"/> <field name="arch" type="xml"> <xpath expr="//filter[@name='my_documents_filter']" position="replace"> - <filter name="my_documents_filter" - string="My Document(s)" - icon="terp-personal" - domain="[('user_id','=',uid)]" - help="Filter on my documents"/> + <filter name="my_documents_filter" string="My Document(s)" icon="terp-personal" domain="[('user_id','=',uid)]" help="Filter on my documents"/> </xpath> <xpath expr="//field[@name='create_uid']" position="replace"> <field name="user_id"/> diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml index 98016d2fee2..6b3708d1a2f 100644 --- a/addons/document/report/document_report_view.xml +++ b/addons/document/report/document_report_view.xml @@ -41,13 +41,8 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="All users files"> - <group> - <field name="name" - filter_domain="['|', '|',('name','ilike',self), ('user','ilike',self), ('directory','ilike',self)]" - string="Users File"/> - <separator orientation="vertical"/> - <field name="month"/> - </group> + <field name="name" filter_domain="['|', '|',('name','ilike',self), ('user','ilike',self), ('directory','ilike',self)]" string="Users File"/> + <field name="month"/> </search> </field> </record> |