diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index e099b4544aa..8aae859053b 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -30,7 +30,7 @@ class report_project_task_user(osv.osv):
         'name': fields.char('Task Summary', size=128, readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'year': fields.char('Year',size=64,required=False, readonly=True),
-        'user_id':fields.many2one('res.users', 'User', readonly=True),
+        'user_id':fields.many2one('res.users', 'Assigned To', readonly=True),
         'date_start': fields.datetime('Starting Date',readonly=True),
         'no_of_days': fields.integer('#Days', size=128, readonly=True),
         'description': fields.text('Description',readonly=True),
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index fefb8752108..da1aad8e393 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -89,11 +89,7 @@
 	                        		domain="[('user_id','=',False)]"/>
 	                    </field>
 	                    <field name="project_id" widget="selection">
-<<<<<<< TREE
-	                        <filter icon="terp-project"
-=======
 	                    	<filter icon="terp-project"
->>>>>>> MERGE-SOURCE
 	                        		string="My Task"
 	                        		help="My Tasks"
 	                        		domain="[('project_id','=',context.get('project_id', False)]"/>
@@ -104,21 +100,19 @@
 	                    </field>
                     </group>
                     <newline/>
-	                <group expand="0" string="Extended options..." colspan="10" col="12">
-                    	<separator orientation="vertical"/>
+	                <group expand="0" string="Extended options..." col="12">
 	                    <field name="type" widget="selection"/>
 	                    <field name="priority"/>
 	                    <field name="partner_id" />
                       <field name="company_id" groups="base.group_multi_company"/>
-	                    <separator orientation="vertical"/>
+                    <newline/>
 	                    <field name="date_deadline"/>
-	                    <newline/>
 	                    <field name="date_start"/>
 	                    <field name="date_end"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="10" col="11">
-                        <filter string="User" name="User" icon="terp-project" context="{'group_by':'user_id'}" />
+                        <filter string="Assigned To" name="User" icon="terp-project" context="{'group_by':'user_id'}" />
                         <filter string="Project" icon="terp-project" context="{'group_by':'project_id'}"/>
                         <filter string="Partner" icon="terp-project" context="{'group_by':'partner_id'}" />
                         <filter string="Task" icon="terp-project" context="{'group_by':'name'}" />
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index 2bf67d47191..513bae085bd 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -31,7 +31,6 @@
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
     'depends': [
-        'crm',
         'project',
         'hr_timesheet_sheet',
     ],
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index 28223d21d9e..6bc02be3ab2 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -68,7 +68,6 @@ class project_issue_report(osv.osv):
         'create_date': fields.datetime('Create Date', readonly=True),
         'day': fields.char('Day', size=128, readonly=True), 
         'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'project.issue')]"),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'project.issue')]"),
         'nbr': fields.integer('# of Issues', readonly=True),
         'delay_close': fields.float('Avg Closing Delay', digits=(16,2), readonly=True, group_operator="avg",
                                            help="Number of Days to close the project issue"),
@@ -77,7 +76,6 @@ class project_issue_report(osv.osv):
         'company_id' : fields.many2one('res.company', 'Company'),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'project_id':fields.many2one('project.project', 'Project',readonly=True),
-        'type_id': fields.many2one('crm.case.resource.type', 'Version', domain="[('object_id.model', '=', 'project.issue')]"),
         'date_closed': fields.datetime('Close Date', readonly=True),
         'date_open': fields.datetime('Opened', readonly=True),
         'assigned_to' : fields.many2one('res.users', 'Assigned to',readonly=True),
@@ -99,12 +97,10 @@ class project_issue_report(osv.osv):
                     c.user_id,
                     c.section_id,
                     c.categ_id,
-                    c.stage_id,
                     to_char(c.date_closed, 'YYYY/mm/dd') as date_closed,
                     u.company_id as company_id,
                     c.priority as priority,
                     c.project_id as project_id,
-                    c.type_id as type_id,
                     count(*) as nbr,
                     c.assigned_to,
                     c.partner_id,
@@ -127,12 +123,10 @@ class project_issue_report(osv.osv):
                     c.user_id,
                     c.section_id,
                     c.categ_id,
-                    c.stage_id,
                     c.date_closed,
                     u.company_id,
                     c.priority,
                     c.project_id,
-                    c.type_id,
                     date_trunc('day',c.create_date),
                     c.assigned_to,
                     c.partner_id,
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index d7672fb6f10..d725e5bd1a0 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -11,8 +11,6 @@
                     <field name="name" invisible="1"/>
                     <field name="month" invisible="1"/>
                     <field name="project_id" invisible="1"/>
-                    <field name="stage_id" invisible="1"/>
-                    <field name="type_id" string="Type" invisible="1"/>
                     <field name="priority" invisible="1"/>
                     <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                     <field name="section_id" invisible="1"/>
@@ -52,14 +50,10 @@
             <field name="arch" type="xml">
 				<search string="Search">
                   <group col="16" colspan="8">
-                   		<!--  <filter string="This Year" name="This Year" icon="terp-hr"
-                   			domain="[('name','=',time.localtime()[0])]"/>-->
-                   		<filter string="This Year" icon="terp-hr"
+                   		<filter icon="gtk-media-rewind"  string="365 Days" icon="terp-hr"
                    			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
 
-                   		<!-- <filter string="This Month" name="This Year" icon="terp-hr"
-                   			domain="[('month','=',time.strftime('%%m'))]" />-->
-                       <filter string="This Month" icon="terp-hr" name="This Month"
+                       <filter icon="gtk-media-rewind"  string="30 Days" icon="terp-hr" name="This Month"
                     	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
 
                        <filter icon="gtk-media-rewind" string="7 Days" separator="1"
@@ -110,11 +104,9 @@
                   			<field name="project_id" widget="selection" />
                     		<field name="priority" />
                     		<separator orientation="vertical"/>
-                    		<field name="type_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
                     		<separator orientation="vertical"/>
                     		<newline/>
                     		<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                    		<field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]" />
                     		<separator orientation="vertical"/>
                     		<field name="assigned_to" widget="selection">
                     			<filter icon="terp-crm"  help = "Project Issue Assigned To Me" domain="[('assigned_to','=',uid)]" />
@@ -129,12 +121,10 @@
                         </group>
 				</xpath>
 				<xpath expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="Category"]' position='after'>
-            		<filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/>
             		<separator orientation="vertical"/>
             		<filter string="Project"  icon="terp-sale" domain="[]" context="{'group_by':'project_id'}" />
             		<filter string="Priority"  icon="terp-sale" domain="[]" context="{'group_by':'priority'}" />
             		<separator orientation="vertical"/>
-            		<filter string="Type"  icon="terp-sale" domain="[]" context="{'group_by':'type_id'}"/>
             		<separator orientation="vertical"/>
             		<filter string="Assigned To"  icon="terp-sale" domain="[]" context="{'group_by':'assigned_to'}"/>
             		<separator orientation="vertical"/>