diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py index 822e391650d..c23029747f3 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report.py +++ b/addons/hr_recruitment/report/hr_recruitment_report.py @@ -41,6 +41,8 @@ class hr_recruitment_report(osv.osv): 'type_id': fields.many2one('crm.case.resource.type', 'Degree', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]"), '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") } _order = 'date desc' @@ -62,6 +64,8 @@ class hr_recruitment_report(osv.osv): s.department_id, s.priority, s.stage_id, + sum(salary_proposed) as salary_prop, + sum(salary_expected) as salary_exp, count(*) as nbr from hr_applicant s group by diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml index 3ed947468ee..df7e90aa4aa 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml +++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml @@ -7,17 +7,19 @@ tree - - - - - - - - - + + + + + + + + + + + @@ -49,58 +51,57 @@ string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Recruitments of this month"/> + + + + + + + - - - + + - - - - - - - - - + - + - + @@ -121,7 +122,7 @@ hr.recruitment.report form tree,graph - {'search_default_Stage': 1 } + {'search_default_inprogress': 1 } diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index 9faf7670fba..3dcc193b5e2 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -13,12 +13,6 @@ - - - - - - @@ -27,6 +21,12 @@ + + + + + +