diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index 14e10548999..e9423001645 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -118,9 +118,9 @@ class timesheet_invoice(osv.osv):
create or replace view report_hr_timesheet_invoice_journal as (
select
min(l.id) as id,
- substring(l.create_date for 7)||'-01' as name,
+ substring(l.date for 7)||'-01' as name,
sum(
- CASE WHEN -l.amount>0 THEN 0 ELSE -l.amount
+ CASE WHEN l.amount>0 THEN 0 ELSE l.amount
END
) as cost,
sum(
@@ -133,7 +133,7 @@ class timesheet_invoice(osv.osv):
from account_analytic_line l
left join product_uom u on (u.id=l.product_uom_id)
group by
- substring(l.create_date for 7),
+ substring(l.date for 7),
journal_id,
account_id
)""")
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index df552113123..e40ed244d07 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -63,7 +63,7 @@
-
+
@@ -263,6 +263,20 @@
report.hr.timesheet.invoice.journal.form
report.hr.timesheet.invoice.journal
+ form
+
+
+
+
+
+
+
+ report.hr.timesheet.invoice.journal.tree
+ report.hr.timesheet.invoice.journal
tree
@@ -276,13 +290,27 @@
+
+ report.hr.timesheet.invoice.journal.graph
+ report.hr.timesheet.invoice.journal
+ graph
+
+
+
+
+
+
+
+
+
+
Account Cost and Revenue by journal
report.hr.timesheet.invoice.journal
form
- tree
+ tree,graph
-