[IMP]: report_XXX modules changes.

bzr revid: uco@tinyerp.co.in-20091124135806-880eehkk0bqej1wo

2 files changed, 21 insertions, 6 deletions

diff --git a/addons/report_project/report_project.py b/addons/report_project/report_project.py
index 321ac59d28a..e6f5fd828e1 100644
--- a/addons/report_project/report_project.py
+++ b/addons/report_project/report_project.py
@@ -20,13 +20,14 @@
 ##############################################################################
 
 from osv import fields,osv
+import tools
 
 class report_project_task_user(osv.osv):
     _name = "report.project.task.user"
     _description = "Tasks by user and project"
     _auto = False
     _columns = {
-        'name': fields.date('Month', readonly=True),
+        'name': fields.char('Year',size=64,required=False, readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
         'project_id':fields.many2one('project.project', 'Project', readonly=True),
         'hours_planned': fields.float('Planned Hours', readonly=True),
@@ -34,14 +35,19 @@ class report_project_task_user(osv.osv):
         'hours_delay': fields.float('Avg. Plan.-Eff.', readonly=True),
         'closing_days': fields.char('Avg Closing Delay', size=64, readonly=True),
         'task_closed': fields.integer('Task Closed', 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),
+
     }
     _order = 'name desc, project_id'
     def init(self, cr):
+        tools.sql.drop_view_if_exists(cr, 'report_project_task_user')
         cr.execute("""
             create or replace view report_project_task_user as (
                 select
                     min(t.id) as id,
-                    to_char(date_close, 'YYYY-MM-01') as name,
+                    to_char(date_close, 'YYYY') as name,
+                    to_char(date_close, 'MM') as month,
                     count(distinct t.id) as task_closed,
                     t.user_id,
                     t.project_id,
@@ -54,7 +60,7 @@ class report_project_task_user(osv.osv):
                 where
                     t.state='done'
                 group by
-                    to_char(date_close, 'YYYY-MM-01'),t.user_id,project_id
+                    to_char(date_close, 'YYYY'),to_char(date_close, 'MM'),t.user_id,project_id
             )
         """)
 report_project_task_user()
@@ -65,21 +71,26 @@ class report_project_task(osv.osv):
     _description = "Tasks by project"
     _auto = False
     _columns = {
-        'name': fields.date('Month', readonly=True),
+        'name': fields.char('Year',size=64,required=False, readonly=True),
         'project_id':fields.many2one('project.project', 'Project', readonly=True),
         'hours_planned': fields.float('Planned Hours', readonly=True),
         'hours_effective': fields.float('Effective Hours', readonly=True),
         'hours_delay': fields.float('Avg. Plan.-Eff.', readonly=True),
         'closing_days': fields.char('Avg Closing Delay', size=64, readonly=True),
         'task_closed': fields.integer('Task Closed', 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),
+
     }
     _order = 'name desc, project_id'
     def init(self, cr):
+        tools.sql.drop_view_if_exists(cr, 'report_project_task')
         cr.execute("""
             create or replace view report_project_task as (
                 select
                     min(t.id) as id,
-                    to_char(date_close, 'YYYY-MM-01') as name,
+                    to_char(date_close, 'YYYY') as name,
+                    to_char(date_close, 'MM') as month,
                     count(distinct t.id) as task_closed,
                     t.project_id,
                     sum(planned_hours) as hours_planned,
@@ -91,7 +102,7 @@ class report_project_task(osv.osv):
                 where
                     t.state='done'
                 group by
-                    to_char(date_close, 'YYYY-MM-01'),project_id
+                    to_char(date_close, 'YYYY'),to_char(date_close, 'MM'),project_id
             )
         """)
 report_project_task()
diff --git a/addons/report_project/report_project_view.xml b/addons/report_project/report_project_view.xml
index 366564c7237..6589c5cea35 100644
--- a/addons/report_project/report_project_view.xml
+++ b/addons/report_project/report_project_view.xml
@@ -10,6 +10,7 @@
             <field name="arch" type="xml">
                 <form string="Tasks by Project and User">
                     <field name="name" select="1"/>
+                    <field name="month" select="1"/>
                     <field name="user_id" select="1"/>
                     <field name="project_id" select="1"/>
                     <field name="task_closed" select="1"/>
@@ -29,6 +30,7 @@
             <field name="arch" type="xml">
                 <tree string="Tasks by projects and users">
                     <field name="name" select="1"/>
+                    <field name="month" select="1"/>
                     <field name="user_id" select="1"/>
                     <field name="project_id" select="1"/>
                     <field name="task_closed" select="1"/>
@@ -65,6 +67,7 @@
             <field name="arch" type="xml">
                 <form string="Tasks by Project">
                     <field name="name" select="1"/>
+                    <field name="month" select="1"/>
                     <field name="project_id" select="1"/>
                     <field name="task_closed" select="1"/>
                     <field name="hours_planned" select="1"/>
@@ -81,6 +84,7 @@
             <field name="arch" type="xml">
                 <tree string="Tasks by project">
                     <field name="name" select="1"/>
+                    <field name="month" select="1"/>
                     <field name="project_id" select="1"/>
                     <field name="task_closed" select="1"/>
                     <field name="hours_planned" select="1"/>