diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index c23029747f3..047aa4244a7 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -42,7 +42,8 @@ class hr_recruitment_report(osv.osv):
'department_id':fields.many2one('hr.department','Department',readonly=True),
'priority': fields.selection(hr_recruitment.AVAILABLE_PRIORITIES, 'Appreciation'),
'salary_prop' : fields.float("Salary Proposed"),
- 'salary_exp' : fields.float("Salary Expected")
+ 'salary_exp' : fields.float("Salary Expected"),
+ 'available' : fields.float("Availability")
}
_order = 'date desc'
@@ -52,15 +53,16 @@ class hr_recruitment_report(osv.osv):
create or replace view hr_recruitment_report as (
select
min(s.id) as id,
- date_trunc('day',s.date) as date,
+ date_trunc('day',s.create_date) as date,
date_trunc('day',s.date_closed) as date_closed,
- to_char(s.date, 'YYYY') as year,
- to_char(s.date, 'MM') as month,
+ to_char(s.create_date, 'YYYY') as year,
+ to_char(s.create_date, 'MM') as month,
s.state,
s.company_id,
s.user_id,
s.job_id,
s.type_id,
+ sum(s.availability) as available,
s.department_id,
s.priority,
s.stage_id,
@@ -69,9 +71,9 @@ class hr_recruitment_report(osv.osv):
count(*) as nbr
from hr_applicant s
group by
- to_char(s.date, 'YYYY'),
- to_char(s.date, 'MM'),
- date_trunc('day',s.date),
+ to_char(s.create_date, 'YYYY'),
+ to_char(s.create_date, 'MM'),
+ date_trunc('day',s.create_date),
date_trunc('day',s.date_closed),
s.state,
s.company_id,
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index df7e90aa4aa..e9a9074ee4b 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -10,16 +10,17 @@
-
+
-
-
-
+
+
+
+
@@ -93,9 +94,12 @@
-
+
+
+
+
@@ -122,7 +126,7 @@
hr.recruitment.report
form
tree,graph
- {'search_default_inprogress': 1 }
+ {'search_default_inprogress': 1, 'search_default_user_id': uid }
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 051195582e0..44f1dbd229a 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -28,6 +28,7 @@ class report_project_task_user(osv.osv):
_auto = False
_columns = {
'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),
'date_start': fields.datetime('Starting Date',readonly=True),
@@ -57,11 +58,10 @@ class report_project_task_user(osv.osv):
('done', 'Done')],
'State', readonly=True),
'company_id': fields.many2one('res.company', 'Company',readonly=True),
+ 'sprint_id': fields.many2one('scrum.sprint', 'Sprint',readonly=True),
'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),
'type': fields.many2one('project.task.type', 'Stage',readonly=True),
-
-
}
_order = 'name desc, project_id'
def init(self, cr):
@@ -72,6 +72,7 @@ class report_project_task_user(osv.osv):
min(t.id) as id,
to_char(date_start, 'YYYY') as year,
to_char(date_start, 'MM') as month,
+ to_char(date_start, 'YYYY-MM-DD') as day,
count(distinct t.id) as nbr,
date_trunc('day',t.date_start) as date_start,
date_trunc('day',t.date_end) as date_end,
@@ -79,6 +80,7 @@ class report_project_task_user(osv.osv):
sum(cast(to_char(date_trunc('day',t.date_end) - date_trunc('day',t.date_start),'DD') as int)) as no_of_days,
t.user_id,
t.project_id,
+ t.sprint_id as sprint_id,
t.state,
t.priority,
t.name,
@@ -104,7 +106,9 @@ class report_project_task_user(osv.osv):
t.partner_id,
t.type,
t.name,
- t.project_id
+ t.sprint_id,
+ t.project_id,
+ t.date_start
)
""")
report_project_task_user()
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index f643c06e313..b1125850962 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -19,8 +19,9 @@
-
+
+
@@ -77,16 +78,6 @@
domain="[('state','=','pending')]"
help = "Pending tasks"/>
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -112,10 +123,12 @@
+
+
@@ -129,7 +142,7 @@
form
tree,graph
- {'search_default_month':1,'search_default_user_id':uid, 'search_default_project_id':context.get('project_id', False)}
+ {'search_default_month':1,'search_default_user_id':uid}
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index a5672fcaf26..bdcbf86e10e 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -7,15 +7,14 @@
project.issue.report
tree
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -23,6 +22,7 @@
+