[MERGE] merged with trunk-development-branch

bzr revid: hmo@tinyerp.com-20111214122924-izzibrz1yz67rt7g

7 files changed, 33 insertions, 50 deletions

diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index 6b9cbd21f48..0a403dcaa35 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Integrated Document Management System',
+    'name': 'Document Management System',
     'version': '2.1',
     'category': 'Knowledge Management',
     'complexity': "normal",
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 1bf177f50e6..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')
@@ -254,7 +254,6 @@ class document_file(osv.osv):
             del vals['file_size']
         if ids and vals:
             result = super(document_file,self).write(cr, uid, ids, vals, context=context)
-        cr.commit() # ?
         return result
 
     def create(self, cr, uid, vals, context=None):
@@ -299,7 +298,6 @@ class document_file(osv.osv):
         else:
             #raise osv.except_osv(_('ValidateError'), _('File name must be unique!'))
             result = super(document_file, self).create(cr, uid, vals, context)
-            cr.commit() # ?
         return result
 
     def __get_partner_id(self, cr, uid, res_model, res_id, context=None):
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">
diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
index bc0281e388c..74f3426fc50 100644
--- a/addons/document/security/document_security.xml
+++ b/addons/document/security/document_security.xml
@@ -3,7 +3,8 @@
 <data noupdate="0">
 
     <record id="base.group_document_user" model="res.groups">
-        <field name="name">Knowledge / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_knowledge_management"/>
     </record>
 
 <!--    <record id="group_document_manager" model="res.groups">-->
diff --git a/addons/document/security/ir.model.access.csv b/addons/document/security/ir.model.access.csv
index d840055e89a..36f0aa86dff 100644
--- a/addons/document/security/ir.model.access.csv
+++ b/addons/document/security/ir.model.access.csv
@@ -1,25 +1,25 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_document_directory_all","document.directory all","model_document_directory",,1,0,0,0
-"access_document_directory_group_document_manager","document.directory document manager","model_document_directory","base.group_system",1,1,1,1
-"access_document_directory_group_knowledge","document.directory modify","model_document_directory","base.group_document_user",1,1,1,1
-"access_document_directory_content_all","document.directory.content all","model_document_directory_content",,1,0,0,0
-"access_document_directory_content_group_document_manager","document.directory.content document manager","model_document_directory_content","base.group_system",1,1,1,1
-"access_document_directory_content_type_group_document_manager","document.directory.content.type document manager","model_document_directory_content_type","base.group_system",1,1,1,1
-"access_document_directory_content_type_group_system","document.directory.content.type group system","model_document_directory_content_type","base.group_user",1,0,0,0
-"access_document_storage_group_document_manager","document.storage document manager","model_document_storage","base.group_system",1,1,1,1
-"access_document_storage_group_system","document.storage group system","model_document_storage","base.group_user",1,0,0,0
-"access_document_storage_group_user","document.storage group user","model_document_storage","base.group_document_user",1,1,1,1
-"access_ir_attachment_group_user","ir.attachment user","base.model_ir_attachment","base.group_document_user",1,1,1,1
-"access_ir_attachment_group_system","ir.attachment system","base.model_ir_attachment","base.group_system",1,0,0,0
-"access_res_partner_group_user","res.partner user","base.model_res_partner","base.group_document_user",1,1,1,0
-"access_document_directory_dctx_all","document.directory.dctx all","model_document_directory_dctx",,1,0,0,0
-"access_document_directory_dctx_group_document_manager","document.directory.dctx document manager","model_document_directory_dctx","base.group_system",1,1,1,1
-"access_report_document_user_group_document_manager","report.document.user document manager","model_report_document_user","base.group_system",1,0,0,0
-"access_report_files_partner_group_document_manager","report.files.partner document manager","model_report_files_partner","base.group_system",1,0,0,0
-"access_report_document_file_group_document_manager","report.document.file document manager","model_report_document_file","base.group_system",1,0,0,0
-"access_report_document_wall_group_document_manager","report.document.wall document manager","model_report_document_wall","base.group_system",1,0,0,0
-"access_report_document_wall_group_system","report.document.wall group system","model_report_document_wall","base.group_system",1,0,0,0
-"access_report_files_partner_group_document","report.files.partner document manager","model_report_files_partner","base.group_document_user",1,0,0,0
-"access_report_document_file_group_document","report.document.file document manager","model_report_document_file","base.group_document_user",1,0,0,0
-"access_report_document_wall_group_document","report.document.wall document manager","model_report_document_wall","base.group_document_user",1,0,0,0
-"access_report_document_user_knowledgeuser","report.document.user knowledgeuser","document.model_report_document_user","base.group_document_user",1,0,0,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_document_directory_all,document.directory all,model_document_directory,,1,0,0,0

+access_document_directory_group_document_manager,document.directory document manager,model_document_directory,base.group_system,1,1,1,1

+access_document_directory_group_knowledge,document.directory modify,model_document_directory,base.group_document_user,1,1,1,1

+access_document_directory_content_all,document.directory.content all,model_document_directory_content,,1,0,0,0

+access_document_directory_content_group_document_manager,document.directory.content document manager,model_document_directory_content,base.group_system,1,1,1,1

+access_document_directory_content_type_group_document_manager,document.directory.content.type document manager,model_document_directory_content_type,base.group_system,1,1,1,1

+access_document_directory_content_type_group_system,document.directory.content.type group system,model_document_directory_content_type,base.group_user,1,0,0,0

+access_document_storage_group_document_manager,document.storage document manager,model_document_storage,base.group_system,1,1,1,1

+access_document_storage_group_system,document.storage group system,model_document_storage,base.group_user,1,0,0,0

+access_document_storage_group_user,document.storage group user,model_document_storage,base.group_document_user,1,1,1,1

+access_ir_attachment_group_user,ir.attachment user,base.model_ir_attachment,base.group_document_user,1,1,1,1

+access_ir_attachment_group_system,ir.attachment system,base.model_ir_attachment,base.group_system,1,0,0,0

+access_res_partner_group_user,res.partner user,base.model_res_partner,base.group_document_user,1,1,1,0

+access_document_directory_dctx_all,document.directory.dctx all,model_document_directory_dctx,,1,0,0,0

+access_document_directory_dctx_group_document_manager,document.directory.dctx document manager,model_document_directory_dctx,base.group_system,1,1,1,1

+access_report_document_user_group_document_manager,report.document.user document manager,model_report_document_user,base.group_system,1,0,0,0

+access_report_files_partner_group_document_manager,report.files.partner document manager,model_report_files_partner,base.group_system,1,0,0,0

+access_report_document_file_group_document_manager,report.document.file document manager,model_report_document_file,base.group_system,1,0,0,0

+access_report_document_wall_group_document_manager,report.document.wall document manager,model_report_document_wall,base.group_system,1,0,0,0

+access_report_document_wall_group_system,report.document.wall group system,model_report_document_wall,base.group_system,1,0,0,0

+access_report_files_partner_group_document,report.files.partner document manager,model_report_files_partner,base.group_document_user,1,0,0,0

+access_report_document_file_group_document,report.document.file document manager,model_report_document_file,base.group_document_user,1,0,0,0

+access_report_document_wall_group_document,report.document.wall document manager,model_report_document_wall,base.group_document_user,1,0,0,0

+access_report_document_user_knowledgeuser,report.document.user knowledgeuser,document.model_report_document_user,base.group_document_user,1,0,0,0

diff --git a/addons/document/test/document_test2.yml b/addons/document/test/document_test2.yml
index 65312eaf10d..be91bfb3644 100644
--- a/addons/document/test/document_test2.yml
+++ b/addons/document/test/document_test2.yml
@@ -80,4 +80,3 @@
 -
     !python {model: document.directory}: |
       self.unlink(cr, uid, [ref('dir_tests')])
-      cr.commit()