[MERGE] merge with trunk addons

bzr revid: mra@mra-laptop-20100626070939-6whcffnrj4x8ndsi

7 files changed, 20 insertions, 13 deletions

diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index 5e1aa939b54..e8b8b3969e9 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -43,10 +43,10 @@
     'depends': ['base', 'process','board'],
     'init_xml': [],
     'update_xml': [
+        'security/document_security.xml',
         'document_view.xml',
         'document_data.xml',
         'wizard/document_configuration_view.xml',
-        'security/document_security.xml',
         'security/ir.model.access.csv',
         'report/document_report_view.xml',
         'board_document_view.xml',
diff --git a/addons/document/board_document_demo.xml b/addons/document/board_document_demo.xml
index 6f8f8ffa39e..672fb5cb268 100644
--- a/addons/document/board_document_demo.xml
+++ b/addons/document/board_document_demo.xml
@@ -6,12 +6,12 @@
             Administrator shortcut
             Demo user startup menu
         -->
-         <record model="ir.ui.view_sc" id="sc_document_dash">
+        <!-- <record model="ir.ui.view_sc" id="sc_document_dash">
             <field name="name">Documents dashboard</field>
              <field name="user_id" ref="base.user_root"/>
              <field name="resource">ir.ui.menu</field>
              <field name="sequence">1</field>
             <field name="res_id" ref="menu_board_document_manager"/>
-         </record>
+         </record> -->
      </data>
  </openerp>
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 8fcd791144e..f40074df644 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -3,7 +3,7 @@
     <!--<menuitem name="Document Management" icon="terp-stock" id="menu_document"/>
     <menuitem name="Document Configuration" id="menu_document_configuration" parent="menu_document"/>-->
 
-    <menuitem name="Knowledge" icon="terp-stock" id="base.menu_document" sequence="19" groups="base.group_user"/>
+    <menuitem name="Knowledge" icon="terp-stock" id="base.menu_document" sequence="19" groups="group_document_user"/>
     <menuitem name="Configuration" id="base.menu_document_configuration" parent="base.menu_document" sequence="50"/>
     <menuitem name="Document Management" id="menu_document_management_configuration" parent="base.menu_document_configuration" sequence="1"/>
 
@@ -288,7 +288,7 @@
         <field name="res_model">ir.attachment</field>
         <field name="view_type">form</field>
         <field name="domain">[('parent_id','child_of',active_id)]</field>
-        <field name="context">{'parent_id':'active_id'}</field>
+        <field name="context">{'parent_id':active_id}</field>
     </record>
 
     <record model="ir.values" id="ir_action_document_file_directory_form">
diff --git a/addons/document/i18n/el.po b/addons/document/i18n/el.po
index 9b425c31b89..56b87d3cc6d 100644
--- a/addons/document/i18n/el.po
+++ b/addons/document/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-06-26 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/i18n/es.po b/addons/document/i18n/es.po
index c491e4daa8d..1c062b61792 100644
--- a/addons/document/i18n/es.po
+++ b/addons/document/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-24 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-06-26 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/report/document_report.py b/addons/document/report/document_report.py
index d3964fc2d99..2294aacbd10 100644
--- a/addons/document/report/document_report.py
+++ b/addons/document/report/document_report.py
@@ -53,7 +53,8 @@ class report_document_user(osv.osv):
         'partner':fields.char('Partner',size=64,readonly=True),
      }
     def init(self, cr):
-         cr.execute("""
+        tools.drop_view_if_exists(cr, 'report_document_user')
+        cr.execute("""
             create or replace view report_document_user as (
                  select
                      min(f.id) as id,
@@ -72,7 +73,7 @@ class report_document_user(osv.osv):
                      inner join res_users u on (f.user_id=u.id)
                  group by to_char(f.create_date, 'YYYY'), to_char(f.create_date, 'MM'),d.name,f.parent_id,d.type,f.create_date,f.user_id,f.file_size,u.name,d.type,f.write_date
              )
-         """)
+        """)
 report_document_user()
 
 class report_files_partner(osv.osv):
@@ -119,7 +120,8 @@ class report_document_file(osv.osv):
      }
     _order = "month"
     def init(self, cr):
-         cr.execute("""
+        tools.drop_view_if_exists(cr, 'report_document_file')
+        cr.execute("""
             create or replace view report_document_file as (
                 select min(f.id) as id,
                        count(*) as nbr,
@@ -128,7 +130,7 @@ class report_document_file(osv.osv):
                 from ir_attachment f
                 group by EXTRACT(MONTH FROM f.create_date)
              )
-         """)
+        """)
 
 report_document_file()
 
@@ -145,7 +147,8 @@ class report_document_wall(osv.osv):
              }
 
     def init(self, cr):
-         cr.execute("""
+        tools.drop_view_if_exists(cr, 'report_document_wall')
+        cr.execute("""
             create or replace view report_document_wall as (
                select max(f.id) as id,
                to_char(min(f.create_date),'YYYY-MM-DD HH24:MI:SS') as last,
@@ -159,7 +162,7 @@ class report_document_wall(osv.osv):
                    group by i.user_id) group by f.user_id,f.create_date
                    having (CURRENT_DATE - to_date(to_char(f.create_date,'YYYY-MM-DD'),'YYYY-MM-DD')) > 30
              )
-         """)
+        """)
 report_document_wall()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
index 4eb257a2325..333cc853542 100644
--- a/addons/document/security/document_security.xml
+++ b/addons/document/security/document_security.xml
@@ -2,6 +2,10 @@
 <openerp>
 <data noupdate="0">
 
+    <record id="group_document_user" model="res.groups">
+        <field name="name">Document / User</field>
+    </record>
+
     <record id="group_document_manager" model="res.groups">
         <field name="name">Document / Manager</field>
     </record>