diff --git a/addons/hr_expense/report/hr_expense_report.py b/addons/hr_expense/report/hr_expense_report.py
index 81cb18dcc09..80a14ed648b 100644
--- a/addons/hr_expense/report/hr_expense_report.py
+++ b/addons/hr_expense/report/hr_expense_report.py
@@ -35,8 +35,11 @@ class hr_expense_report(osv.osv):
('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
'product_id':fields.many2one('product.product', 'Product', readonly=True),
+ 'journal_id': fields.many2one('account.journal', 'Force Journal', readonly=True),
'product_qty':fields.float('Qty', readonly=True),
'employee_id': fields.many2one('hr.employee', "Employee's Name", readonly=True),
+ 'date_confirm': fields.date('Confirmation Date', readonly=True),
+ 'date_valid': fields.date('Validation Date', readonly=True),
'invoice_id': fields.many2one('account.invoice', 'Invoice',readonly=True),
'department_id':fields.many2one('hr.department','Department',readonly=True),
'company_id':fields.many2one('res.company', 'Company', readonly=True),
@@ -62,6 +65,9 @@ class hr_expense_report(osv.osv):
min(l.id) as id,
s.date as date,
s.employee_id,
+ s.journal_id,
+ to_date(to_char(s.date_confirm, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_confirm,
+ to_date(to_char(s.date_valid, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_valid,
s.invoice_id,
s.department_id,
to_char(s.date, 'YYYY') as year,
@@ -80,10 +86,18 @@ class hr_expense_report(osv.osv):
hr_expense_expense s on (s.id=l.expense_id)
left join product_uom u on (u.id=l.uom_id)
group by
- s.date, l.product_id,s.invoice_id,
+ s.date,
+ to_date(to_char(s.date_confirm, 'dd-MM-YYYY'),'dd-MM-YYYY'),
+ to_date(to_char(s.date_valid, 'dd-MM-YYYY'),'dd-MM-YYYY'),
+ l.product_id,
+ s.invoice_id,
s.department_id,
- l.uom_id, s.user_id, s.state,
- s.company_id,s.employee_id
+ l.uom_id,
+ s.user_id,
+ s.state,
+ s.journal_id,
+ s.company_id,
+ s.employee_id
)
""")
hr_expense_report()
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 86183693833..b5c61b65e76 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -15,6 +15,7 @@
+
@@ -53,9 +54,6 @@
domain="[('month','=',time.strftime('%%m'))]"
help="Expenses of this month"/>
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index 7c452b96044..52647ce7d80 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -46,8 +46,8 @@ class hr_recruitment_report(osv.osv):
create or replace view hr_recruitment_report as (
select
min(s.id) as id,
- s.date as date,
- s.date_closed,
+ date_trunc('day',s.date) as date,
+ date_trunc('day',s.date_closed) as date_closed,
to_char(s.date, 'YYYY') as name,
to_char(s.date, 'MM') as month,
s.state,
@@ -62,13 +62,14 @@ class hr_recruitment_report(osv.osv):
from hr_applicant s
group by
s.date,
+ date_trunc('day',s.date),
+ date_trunc('day',s.date_closed),
s.state,
s.company_id,
s.user_id,
s.stage_id,
s.type_id,
s.priority,
- s.date_closed,
s.job_id,
s.department_id
)