From 41216ed63a3ae1c5bebed407b580b841faa37baa Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 31 May 2007 09:12:21 +0000
Subject: [PATCH] Better dashboards

bzr revid: fp@tinyerp.com-71c15a3277d25fdaaa65e5d27cf3d1a74f774cea
---
 addons/board_account/__terp__.py              | 10 +++-
 addons/board_account/board_account_view.xml   | 55 +++++++++++++++++++
 .../board_project_manager_view.xml            |  2 +-
 addons/esale_joomla/esale_joomla.py           |  2 +-
 addons/hr_timesheet/hr_timesheet_view.xml     |  4 +-
 .../hr_timesheet_invoice_view.xml             |  6 +-
 addons/l10n_be/account_demo.xml               |  1 -
 7 files changed, 71 insertions(+), 9 deletions(-)

diff --git a/addons/board_account/__terp__.py b/addons/board_account/__terp__.py
index 05f9f0b2026..57c9514678a 100644
--- a/addons/board_account/__terp__.py
+++ b/addons/board_account/__terp__.py
@@ -3,7 +3,15 @@
 	"version":"1.0",
 	"author":"Tiny",
 	"category":"Board",
-	"depends":["account","hr_timesheet_invoice","board","report_account","report_analytic","report_analytic_line"],
+	"depends":[
+		"account",
+		"hr_timesheet_invoice",
+		"board",
+		"report_account",
+		"report_analytic",
+		"report_analytic_line",
+		"account_report"
+	],
 	"demo_xml":["board_account_demo.xml"],
 	"update_xml":["board_account_view.xml"],
 	"description": """
diff --git a/addons/board_account/board_account_view.xml b/addons/board_account/board_account_view.xml
index e5170655810..b05b9b2dda9 100644
--- a/addons/board_account/board_account_view.xml
+++ b/addons/board_account/board_account_view.xml
@@ -6,6 +6,21 @@
 			<field name="name">Accountants</field>
 		</record>
 
+		<record model="ir.ui.view" id="hr_timesheet_sheet_tree">
+			<field name="name">hr.timesheet.sheet.tree.simplified.board</field>
+			<field name="model">hr_timesheet_sheet.sheet</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Timesheets">
+					<field name="date_from" />
+					<field name="user_id"/>
+					<field name="name" />
+					<field name="total_attendance"/>
+					<field name="total_timesheet"/>
+					<field name="state"/>
+				</tree>
+			</field>
+		</record>
 
 		<record model="ir.actions.act_window" id="action_account_analytic_line_to_invoice">
 			<field name="res_model">report.account.analytic.line.to.invoice</field>
@@ -29,6 +44,24 @@
 		</record>
 
 
+		<act_window name="Accounts to invoice"
+			domain="[('state','&lt;&gt;','close'),('partner_id','&lt;&gt;',False)]"
+			res_model="account.analytic.account"
+			src_model="res.users"
+			view_type="form"
+			view_mode="tree,form"
+			id="act_my_account"/>
+
+		<record model="ir.actions.act_window" id="act_hr_timesheet_sheet">
+			<field name="name">Timesheets</field>
+			<field name="res_model">hr_timesheet_sheet.sheet</field>
+			<field name="domain">[('state','&lt;&gt;','done'),('date_to','&lt;',time.strftime('%Y-%m-%d'))]</field>
+			<field name="view_type">form</field>
+			<field name="view_id" ref="hr_timesheet_sheet_tree"/>
+		</record>
+
+
+
 		<record model="ir.ui.view" id="board_account_form">
 			<field name="name">board.account.form</field>
 			<field name="model">board.board</field>
@@ -46,11 +79,26 @@
 								height="160"
 								width="510"/>
 
+							<action
+								string="Accounts to invoice"
+								name="%(act_my_account)d"
+								colspan="4"
+								height="160"
+								width="510"/>
+
+							<!--
 							<action
 								string="Uninvoiced quotations"
 								name="%(sale.action_order_tree3)d"
 								height="160"
 								colspan="4"/>
+							-->
+
+							<action
+								string="Unvalidated timesheets"
+								name="%(act_hr_timesheet_sheet)s"
+								colspan="4"
+								height="160"/>
 
 							<action
 								string="Draft invoices"
@@ -66,6 +114,13 @@
 								icon="gtk-ok"
 								type="action"
 								colspan="4"/>
+								
+							<button
+								string="My indicators"
+								name="%(account_report.action_account_report_tree_view_indicator)d"
+								icon="terp-purchase"
+								type="action"
+								colspan="4"/>
 
 							<action
 								string="Costs to invoice"
diff --git a/addons/board_project/board_project_manager_view.xml b/addons/board_project/board_project_manager_view.xml
index e0f71ed516e..3c9aba3e409 100644
--- a/addons/board_project/board_project_manager_view.xml
+++ b/addons/board_project/board_project_manager_view.xml
@@ -18,7 +18,7 @@
 			id="act_my_project"/>
 
 		<act_window name="My accounts to invoice"
-			domain="[('user_id', '=', uid)]"
+			domain="[('user_id','=',uid),('state','&ltk&gt;','close'),('partner_id','&lt;&gt;',False)]"
 			res_model="account.analytic.account"
 			src_model="res.users"
 			view_type="form"
diff --git a/addons/esale_joomla/esale_joomla.py b/addons/esale_joomla/esale_joomla.py
index a4bf9134538..88a3d4457cc 100644
--- a/addons/esale_joomla/esale_joomla.py
+++ b/addons/esale_joomla/esale_joomla.py
@@ -126,7 +126,7 @@ class esale_joomla_product(osv.osv):
 	_name = "esale_joomla.product"
 	_description = "eSale Product"
 	_columns = {
-		'web_id'			: fields.many2one('esale_joomla.web', 'Web Ref', relate=True),
+		'web_id'			: fields.many2one('esale_joomla.web', 'Web Ref'),
 		'name'				: fields.char('Name', size=64, required=True),
 		'product_id'		: fields.many2one('product.product', 'Product', required=True),
 		'esale_joomla_id'		: fields.integer('eSale product id'),
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 8c039036b2f..74bcf4b6c5f 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -34,8 +34,8 @@
 					<field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" />
 
 					<field name="account_id" on_change="on_change_account_id(account_id)" domain="[('type','=','normal')]" select="1"/>
-					<field name="amount"  select="1"/>
-                    <field name="general_account_id"  select="1"/>
+					<field name="amount"  select="2"/>
+                    <field name="general_account_id"  select="2"/>
                     <field name="journal_id"/>
 				</form>
 			</field>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 0d6c1250688..46a0ebd95d2 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -25,7 +25,7 @@
 		<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form" />
 		<field name="arch" type="xml">
 			<field name="journal_id" position="after">
-				<field name="to_invoice" select="1"/>
+				<field name="to_invoice" select="2"/>
 				<field name="invoice_id"/>
 			</field>
 		</field>
@@ -105,8 +105,8 @@
 			<field name="arch" type="xml">
 				<form string="Type of invoicing">
 					<field name="name" select="1" colspan="1"/>
-					<field name="customer_name" select="1" colspan="1"/>
-					<field name="factor" colspan="1"/>
+					<field name="customer_name" select="2" colspan="1"/>
+					<field name="factor" colspan="2"/>
 				</form>
 			</field>
 		</record>
diff --git a/addons/l10n_be/account_demo.xml b/addons/l10n_be/account_demo.xml
index a3a41c2f238..47c927cd92a 100644
--- a/addons/l10n_be/account_demo.xml
+++ b/addons/l10n_be/account_demo.xml
@@ -10,7 +10,6 @@
 		<field name="state">draft</field>
 		<field name="type">out_invoice</field>
 		<field name="account_id" ref="account.a_recv"/>
-		<field name="date_invoice">2006-03-30</field>
 		<field name="name">Invoice for the order of company Buzz+, 2006-03-31</field>
 		<field name="address_contact_id" ref="base.res_partner_address_tang"/>
 	</record>