[MERGE]: Merge with lp:openobject-addons

bzr revid: mma@tinyerp.com-20120827111650-8tqzbl959qma1kzb

2 files changed, 32 insertions, 229 deletions

diff --git a/addons/document/report/document_report.py b/addons/document/report/document_report.py
index 34b61f01c01..92e33c13746 100644
--- a/addons/document/report/document_report.py
+++ b/addons/document/report/document_report.py
@@ -32,7 +32,7 @@ class report_document_user(osv.osv):
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
                                   ('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),
+        'user': fields.related('user_id', 'name', type='char', size=64, readonly=True),
         'directory': fields.char('Directory',size=64,readonly=True),
         'datas_fname': fields.char('File Name',size=64,readonly=True),
         'create_date': fields.datetime('Date Created', readonly=True),
@@ -50,7 +50,6 @@ class report_document_user(osv.osv):
                      to_char(f.create_date, 'YYYY') as name,
                      to_char(f.create_date, 'MM') as month,
                      f.user_id as user_id,
-                     u.name as user,
                      count(*) as nbr,
                      d.name as directory,
                      f.datas_fname as datas_fname,
@@ -60,45 +59,11 @@ class report_document_user(osv.osv):
                      f.write_date as change_date
                  FROM ir_attachment f
                      left join document_directory d on (f.parent_id=d.id and d.name<>'')
-                     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,f.datas_fname
+                 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,d.type,f.write_date,f.datas_fname
              )
         """)
-report_document_user()
 
 
-
-class report_files_partner(osv.osv):
-    _name = "report.files.partner"
-    _description = "Files details by Partners"
-    _auto = False
-    _columns = {
-        'name': fields.char('Year',size=64,required=False, readonly=True),
-        'file_size': fields.integer('File Size', readonly=True),
-        'nbr':fields.integer('# of Files', readonly=True),
-        'partner':fields.char('Partner',size=64,readonly=True),
-        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
-                                  ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
-     }
-    def init(self, cr):
-         tools.drop_view_if_exists(cr, 'report_files_partner')
-         cr.execute("""
-            CREATE VIEW report_files_partner as (
-                SELECT min(f.id) AS id,
-                       COUNT(*) AS nbr,
-                       to_char(date_trunc('month', f.create_date),'YYYY') AS name,
-                       to_char(date_trunc('month', f.create_date),'MM') AS month,
-                       SUM(f.file_size) AS file_size,
-                       p.name AS partner
-
-                FROM ir_attachment f
-                  LEFT JOIN res_partner p ON (f.partner_id=p.id)
-                WHERE f.datas_fname IS NOT NULL
-                GROUP BY p.name, date_trunc('month', f.create_date)
-             )
-         """)
-report_files_partner()
-
 class report_document_file(osv.osv):
     _name = "report.document.file"
     _description = "Files details by Directory"
@@ -122,37 +87,5 @@ class report_document_file(osv.osv):
              )
         """)
 
-report_document_file()
-
-class report_document_wall(osv.osv):
-    _name = "report.document.wall"
-    _description = "Users that did not inserted documents since one month"
-    _auto = False
-    _columns = {
-        'name': fields.date('Month', readonly=True),
-        '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),
-        'last':fields.datetime('Last Posted Time', readonly=True),
-             }
-
-    def init(self, cr):
-        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,
-               f.user_id as user_id, f.user_id as user,
-               to_char(f.create_date,'Month') as month
-               from ir_attachment f
-               where f.create_date in (
-                   select max(i.create_date)
-                   from ir_attachment i
-                   inner join res_users u on (i.user_id=u.id)
-                   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/report/document_report_view.xml b/addons/document/report/document_report_view.xml
index e6e1847cd56..2a8b9f34ddf 100644
--- a/addons/document/report/document_report_view.xml
+++ b/addons/document/report/document_report_view.xml
@@ -4,13 +4,12 @@
     <record model="ir.ui.view" id="view_document_user_form">
             <field name="name">report.document.user.form</field>
             <field name="model">report.document.user</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Files">
-                    <field name="name" select="1"/>
-                    <field name="user" select="1"/>
-                    <field name="directory" select="1"/>
-                    <field name="datas_fname" select="1"/>
+                    <field name="name"/>
+                    <field name="user"/>
+                    <field name="directory"/>
+                    <field name="datas_fname"/>
                     <field name="file_size"/>
                     <field name="create_date"/>
                 </form>
@@ -21,13 +20,12 @@
         <record model="ir.ui.view" id="view_document_user_tree">
             <field name="name">report.document.user.tree</field>
             <field name="model">report.document.user</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Files">
-                    <field name="name" select="1"/>
-                    <field name="month" select="1"/>
-                    <field name="user" select="1" invisible="1"/>
-                    <field name="directory" select="1" invisible="1"/>
+                    <field name="name"/>
+                    <field name="month"/>
+                    <field name="user" invisible="1"/>
+                    <field name="directory" invisible="1"/>
                     <field name="file_size" invisible="1"/>
                     <field name="create_date" invisible="1"/>
                     <field name="nbr"/>
@@ -38,25 +36,14 @@
         <record id="view_report_document_user_search" model="ir.ui.view">
             <field name="name">report.document.user.search</field>
             <field name="model">report.document.user</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="All users files">
-                        <group>
-                        <separator orientation="vertical"/>
-                            <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.localtime()[0])]" help="All Months Files"/>
-                            <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.localtime()[1])]" help="This Months Files"/>
-                            <separator orientation="vertical"/>
-                            <field name="name"/>
-                            <field name="month"/>
-                            <field name="user"/>
-                            <field name="directory"/>
-                        </group>
+                    <field name="name" filter_domain="['|', '|',('name','ilike',self), ('user','ilike',self), ('directory','ilike',self)]" string="Users File"/>
+                    <field name="month"/>
                </search>
             </field>
         </record>
 
-     <!--   <menuitem name="Document Management" id="menu_action_view_my_document"/>
-        <menuitem name="Reporting" id="menu_action_view_my_document_report" parent="menu_action_view_my_document"/>-->
 
         <record model="ir.actions.act_window" id="action_view_all_document_tree1">
             <field name="name">All Users files</field>
@@ -67,77 +54,21 @@
             <field name="search_view_id" ref="view_report_document_user_search"/>
         </record>
 
-      <!--  <menuitem name="All Users files" id="menu_action_view_my_document_report_all_userfile" parent="menu_action_view_my_document_report" action="action_view_all_document_tree1"/>-->
-
-<!--        -->
-        <record model="ir.ui.view" id="view_document_wall_form">
-            <field name="name">report.document.wall.form</field>
-            <field name="model">report.document.wall</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Wall of Shame">
-                    <field name="user_id" select="1"/>
-                    <field name="month" 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>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Wall of Shame">
-                    <field name="user_id" select="1"/>
-                    <field name="month" select="1"/>
-                    <field name="last"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_view_wall">
-            <field name="name">Wall of Shame</field>
-            <field name="res_model">report.document.wall</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <!--<menuitem name="Wall of Shame" id="menu_action_view_my_document_report_shame" parent="menu_action_view_my_document_report" action="action_view_wall"/>-->
-
-<!--***************************************************************************************-->
-
-        <record model="ir.ui.view" id="view_document_by_resourcetype_graph">
-            <field name="name">report.document.resource.graph</field>
-            <field name="model">report.document.user</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Files by Resource Type" type="pie">
-                    <field name="type" />
-                    <field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-
-<!--***************************************************************************************-->
 
-    <record model="ir.ui.view" id="view_size_month">
+        <record model="ir.ui.view" id="view_size_month">
             <field name="name">report.document.user.graph</field>
             <field name="model">report.document.file</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph string="File Size by Month" type="bar">
+                <graph string="File Size by Month" type="line">
                     <field name="month"/>
                     <field name="file_size" operator="+"/>
                 </graph>
             </field>
-    </record>
+        </record>
 
-    <record model="ir.ui.view" id="view_size_month_tree">
+        <record model="ir.ui.view" id="view_size_month_tree">
             <field name="name">report.document.user.tree</field>
             <field name="model">report.document.file</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="File Size by Month">
                     <field name="month" />
@@ -145,6 +76,7 @@
                 </tree>
             </field>
         </record>
+
         <record model="ir.actions.act_window" id="action_view_size_month">
             <field name="name">File Size by Month</field>
             <field name="res_model">report.document.file</field>
@@ -153,20 +85,14 @@
             <field name="view_mode">tree</field>
         </record>
 
-<!--***************************************************************************************-->
-
 
-    <record model="ir.ui.view" id="view_files_by_month_graph">
+        <record model="ir.ui.view" id="view_files_by_month_graph">
             <field name="name">report.file.month.graph</field>
             <field name="model">report.document.user</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph string="Files by Month" type="bar">
+                <graph string="Files by Month" type="pie">
                     <field name="month" />
                     <field name="nbr" operator="+"/>
-<!--                    <field name="name" operator="+"/>-->
-<!--                    <field name="file_size" operator="+"/>-->
-
                 </graph>
             </field>
         </record>
@@ -174,7 +100,6 @@
         <record model="ir.ui.view" id="view_files_by_month_tree">
             <field name="name">report.file.month.tree</field>
             <field name="model">report.document.user</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Files by Month">
                     <field name="name"/>
@@ -184,87 +109,32 @@
             </field>
         </record>
 
-        <record model="ir.actions.act_window" id="action_view_files_by_month_graph">
-            <field name="name">Files by Month</field>
-            <field name="res_model">report.document.user</field>
-            <field name="view_id" ref="view_files_by_month_graph"></field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree</field>
-        </record>
-
-
-<!--***************************************************************************************-->
-
-    <record model="ir.ui.view" id="view_user_graph">
-            <field name="name">report.document.user.graph</field>
+        <record model="ir.ui.view" id="view_files_by_user_graph">
+            <field name="name">report.file.user.graph</field>
             <field name="model">report.document.user</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph string="Files by users" type="bar">
+                <graph string="Files by User" type="pie">
                     <field name="user" />
                     <field name="nbr" operator="+"/>
                 </graph>
             </field>
         </record>
 
-        <record model="ir.actions.act_window" id="action_view_user_graph">
-            <field name="name">Files By Users</field>
+        <record model="ir.actions.act_window" id="action_view_files_by_user_graph">
+            <field name="name">Files by User</field>
             <field name="res_model">report.document.user</field>
-            <field name="view_id" ref="view_user_graph"></field>
+            <field name="view_id" ref="view_files_by_user_graph"></field>
             <field name="view_type">form</field>
             <field name="view_mode">tree</field>
         </record>
 
-
-<!--***************************************************************************************-->
-
-        <record model="ir.ui.view" id="view_files_by_partner_graph">
-            <field name="name">view.files.partner.graph</field>
-            <field name="model">report.files.partner</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Files By Partner" type="bar">
-                    <field name="partner"/>
-                    <field name="nbr"/>
-
-                </graph>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_files_by_partner_tree">
-            <field name="name">view.files.partner.tree</field>
-            <field name="model">report.files.partner</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Files per Month">
-                    <field name="name"/>
-                    <field name="month"/>
-                    <field name="partner"/>
-                    <field name="nbr"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_files_by_partner_form">
-            <field name="name">view.files.partner.form</field>
-            <field name="model">report.files.partner</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <tree string="Files per Month">
-                    <field name="name" select="1"/>
-                    <field name="month" select="1"/>
-                    <field name="partner"/>
-                    <field name="nbr"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_view_files_by_partner">
-            <field name="name">Files Per Partner</field>
-            <field name="res_model">report.files.partner</field>
-            <field name="view_id" ref="view_files_by_partner_graph"></field>
+        <record model="ir.actions.act_window" id="action_view_files_by_month_graph">
+            <field name="name">Files by Month</field>
+            <field name="res_model">report.document.user</field>
+            <field name="view_id" ref="view_files_by_month_graph"></field>
             <field name="view_type">form</field>
             <field name="view_mode">tree</field>
         </record>
-        </data>
- </openerp>
+
+    </data>
+</openerp>