diff options
| author | Raphael Collet <rco@openerp.com> | 2011-12-12 10:52:37 +0100 |
|---|---|---|
| committer | Raphael Collet <rco@openerp.com> | 2011-12-12 10:52:37 +0100 |
| commit | dcfb5b0f460df97281119aa482e4fd74337f40bc (patch) | |
| tree | baf5e127721f350360a43a7c7c65f8891eb6d50f /addons/document | |
| parent | 6ced5c16c1b269f3820588156c0ba197c55e498e (diff) | |
| parent | d9bbf2f3909e5c8e14306d43afb635f2cf1f4af8 (diff) | |
merge from trunk
bzr revid: rco@openerp.com-20111212095237-x8wdo5m6v1z3yivy
Diffstat (limited to 'addons/document')
| -rw-r--r-- | addons/document/board_document_view.xml | 15 | ||||
| -rw-r--r-- | addons/document/document.py | 2 | ||||
| -rw-r--r-- | addons/document/report/document_report_view.xml | 8 |
3 files changed, 5 insertions, 20 deletions
diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml index 471b2966be5..e3b1b4c9c64 100644 --- a/addons/document/board_document_view.xml +++ b/addons/document/board_document_view.xml @@ -7,22 +7,15 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Document board"> - <board style="1-1" > + <board style="2-1" > <column> <action string="New Files" name="%(document.action_view_all_document_tree1)d" view_mode="tree,form"/> - <action string="File Size by Month" - name="%(document.action_view_size_month)d" - view_mode="graph,tree"/> </column> <column> - <action string="Files by Resource Type" - name="%(document.action_view_document_by_resourcetype_graph)d" - view_mode="graph,tree"/> - - <action string="Files by Partner" - name="%(document.action_view_files_by_partner)d" + <action string="File Size by Month" + name="%(document.action_view_size_month)d" view_mode="graph,tree"/> </column> </board> @@ -65,7 +58,7 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Document board"> - <board style="1-1"> + <board style="2-1"> <column> <action string="Wall of Shame" name="%(document.action_view_wall)d" diff --git a/addons/document/document.py b/addons/document/document.py index 36b10b34e4b..9ea7f97a321 100644 --- a/addons/document/document.py +++ b/addons/document/document.py @@ -132,7 +132,7 @@ class document_file(osv.osv): # fields used for file storage 'store_fname': fields.char('Stored Filename', size=200), } - _order = "create_date desc" + _order = "id desc" def __get_def_directory(self, cr, uid, context=None): dirobj = self.pool.get('document.directory') diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml index e7fa4efb5be..e6e1847cd56 100644 --- a/addons/document/report/document_report_view.xml +++ b/addons/document/report/document_report_view.xml @@ -120,14 +120,6 @@ </record> - <record model="ir.actions.act_window" id="action_view_document_by_resourcetype_graph"> - <field name="name">Files by Resource Type</field> - <field name="res_model">report.document.user</field> - <field name="view_id" ref="view_document_by_resourcetype_graph"/> - <field name="view_type">form</field> - <field name="view_mode">graph,tree</field> - </record> - <!--***************************************************************************************--> <record model="ir.ui.view" id="view_size_month"> |