[Merge] Merge with trunk addons

bzr revid: vir@tinyerp.com-20100602082332-bq3vbck48iyd4thx

2 files changed, 0 insertions, 12 deletions

diff --git a/addons/document/report/document_report.py b/addons/document/report/document_report.py
index efe3a8183ab..d3964fc2d99 100644
--- a/addons/document/report/document_report.py
+++ b/addons/document/report/document_report.py
@@ -44,7 +44,6 @@ class report_document_user(osv.osv):
                                   ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
         'user_id':fields.integer('Owner', readonly=True),
         'user':fields.char('User',size=64,readonly=True),
-        'file_title': fields.char('File Name',size=64,readonly=True),
         'directory': fields.char('Directory',size=64,readonly=True),
         'create_date': fields.datetime('Date Created', readonly=True),
         'change_date': fields.datetime('Modified Date', readonly=True),
@@ -66,7 +65,6 @@ class report_document_user(osv.osv):
                      d.name as directory,
                      f.create_date as create_date,
                      f.file_size as file_size,
-                     min(f.title) as file_title,
                      min(d.type) as type,
                      f.write_date as change_date
                  from ir_attachment f
@@ -83,7 +81,6 @@ class report_files_partner(osv.osv):
     _auto = False
     _columns = {
         'name': fields.char('Year',size=64,required=False, readonly=True),
-        'file_title': fields.char('File Name',size=64,readonly=True),
         'directory': fields.char('Directory',size=64,readonly=True),
         'create_date': fields.datetime('Date Created', readonly=True),
         'change_date': fields.datetime('Modified Date', readonly=True),
@@ -101,7 +98,6 @@ class report_files_partner(osv.osv):
                 select min(f.id) as id,count(*) as nbr,
                        to_char(f.create_date,'YYYY') as name,
                        min(to_char(f.create_date,'MM')) as month,
-                       min(f.title) as file_title,
                        p.name as partner
                 from ir_attachment f
                 inner join res_partner p
@@ -145,7 +141,6 @@ class report_document_wall(osv.osv):
         'user_id':fields.many2one('res.users', 'Owner',readonly=True),
         'user':fields.char('User',size=64,readonly=True),
         'month': fields.char('Month', size=24,readonly=True),
-        'file_name':fields.char('Last Posted File Name',size=64,readonly=True),
         'last':fields.datetime('Last Posted Time', readonly=True),
              }
 
@@ -153,7 +148,6 @@ class report_document_wall(osv.osv):
          cr.execute("""
             create or replace view report_document_wall as (
                select max(f.id) as id,
-               min(title) as file_name,
                to_char(min(f.create_date),'YYYY-MM-DD HH24:MI:SS') as last,
                f.user_id as user_id, f.user_id as user,
                to_char(f.create_date,'Month') as month
diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml
index c6d59fa3d29..4afc66fb4d7 100644
--- a/addons/document/report/document_report_view.xml
+++ b/addons/document/report/document_report_view.xml
@@ -8,7 +8,6 @@
             <field name="arch" type="xml">
                 <form string="Files">
                     <field name="name" select="1"/>
-                    <field name="file_title" select="1"/>
                     <field name="user" select="1"/>
                     <field name="directory" select="1"/>
                     <field name="file_size"/>
@@ -26,7 +25,6 @@
                 <tree string="Files">
                     <field name="name" select="1"/>
                     <field name="month" select="1"/>
-                    <field name="file_title"/>
                     <field name="user" select="1"/>
                     <field name="directory" select="1"/>
                     <field name="file_size"/>
@@ -48,7 +46,6 @@
 						<separator orientation="vertical"/>
 						<field name="name" select="1"/>
 						<field name="month" select="1"/>
-						<field name="file_title" select="1"/>
 	                    <field name="user" select="1"/>
 	                    <field name="directory" select="1"/>
 	           		</group>
@@ -79,13 +76,11 @@
                 <form string="Wall of Shame">
                     <field name="user_id" select="1"/>
                     <field name="month" select="1"/>
-                    <field name="file_name" select="1"/>
                     <field name="last"/>
                 </form>
             </field>
         </record>
 
-
         <record model="ir.ui.view" id="view_document_wall_tree">
             <field name="name">report.document.wall.tree</field>
             <field name="model">report.document.wall</field>
@@ -94,7 +89,6 @@
                 <tree string="Wall of Shame">
                     <field name="user_id" select="1"/>
                     <field name="month" select="1"/>
-                    <field name="file_name"/>
                     <field name="last"/>
                 </tree>
             </field>