From 4b03036000840bc90844c5ce3df454dc25829362 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 21 Jun 2007 16:12:59 +0000
Subject: [PATCH] Analytic accounts statistics 	Bugfix in debit/credit
 computation 	Graph view

bzr revid: fp@tinyerp.com-a0b7dbc288760ee7054b3ad5df83afc498c70ab8
---
 addons/account/account_analytic_line.py |  6 ++---
 addons/account/project/project_view.xml | 34 ++++++++++++++++++++++---
 2 files changed, 34 insertions(+), 6 deletions(-)

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 @@
 							<field name="description" colspan="4" nolabel="1" />
 						</page>
 						<page string="Statistics">
-							<field name="stats_ids" colspan="4" nolabel="1"/>
+							<field name="stats_ids" colspan="4" mode="graph,tree" nolabel="1"/>
 						</page>
 					</notebook>
 				</form>
@@ -263,6 +263,20 @@
 	<record model="ir.ui.view" id="report_hr_timesheet_invoice_journal_form">
 		<field name="name">report.hr.timesheet.invoice.journal.form</field>
 		<field name="model">report.hr.timesheet.invoice.journal</field>
+		<field name="type">form</field>
+		<field name="arch" type="xml">
+			<form string="Analytic Entries Stats">
+				<field name="name" select="1"/>
+				<field name="account_id" select="1"/>
+				<field name="journal_id" select="2"/>
+			</form>
+		</field>
+	</record>
+
+
+	<record model="ir.ui.view" id="report_hr_timesheet_invoice_journal_tree">
+		<field name="name">report.hr.timesheet.invoice.journal.tree</field>
+		<field name="model">report.hr.timesheet.invoice.journal</field>
 		<field name="type">tree</field>
 		<field name="arch" type="xml">
 			<tree string="Analytic Entries Stats">
@@ -276,13 +290,27 @@
 		</field>
 	</record>
 
+	<record model="ir.ui.view" id="report_hr_timesheet_invoice_journal_graph">
+		<field name="name">report.hr.timesheet.invoice.journal.graph</field>
+		<field name="model">report.hr.timesheet.invoice.journal</field>
+		<field name="type">graph</field>
+		<field name="arch" type="xml">
+			<graph type="bar">
+				<field name="name"/>
+				<field name="cost" operator="+"/>
+				<field name="revenue" operator="+"/>
+				<field group="True" name="journal_id"/>
+			</graph>
+		</field>
+	</record>
+
 	<record model="ir.actions.act_window" id="report_account_analytic_journal_tree">
 		<field name="name">Account Cost and Revenue by journal</field>
 		<field name="res_model">report.hr.timesheet.invoice.journal</field>
 		<field name="view_type">form</field>
-		<field name="view_mode">tree</field>
+		<field name="view_mode">tree,graph</field>
 	</record>
-	<menuitem name="Financial Management/Reporting/Analytic/All Months/Account Cost and Revenue by journal"
+	<menuitem name="Financial Management/Reporting/Analytic/All Months/Account cost and revenue by journal"
 		id="report_account_analytic_journal_print"
 		action="report_account_analytic_journal_tree"/>