[IMP]: Improve board_hr : Timesheet by Month graph.

bzr revid: rch_open_erp-20100415114528-0p8nw0v7oyq3k0hj

diff --git a/addons/board_hr/__terp__.py b/addons/board_hr/__terp__.py
index b64d09c..500887a 100644 (file)
--- a/addons/board_hr/__terp__.py
+++ b/addons/board_hr/__terp__.py
@@ -32,7 +32,7 @@ This module implements a dashboard for human resource management that includes:
     """,
     'author': 'Tiny',
     'depends': [ 'project_issue','board','hr_expense','hr_timesheet_sheet','hr_holidays'
-    ],
+   , 'hr_evaluation'],
     'update_xml': ['board_hr_view.xml'],
     'demo_xml': [],
     'installable': True,

diff --git a/addons/board_hr/board_hr_view.xml b/addons/board_hr/board_hr_view.xml
index badcbe6..fac0d7f 100644 (file)
--- a/addons/board_hr/board_hr_view.xml
+++ b/addons/board_hr/board_hr_view.xml
@@ -53,6 +53,14 @@
                        <field name="domain">[('user_id','=',uid)]</field>
                        <field name="view_id" ref="hr_holidays.view_hr_holidays_remaining_leaves_user_graph"/>
                </record>
+          <record id="action_hr_timesheet_sheet_graph" model="ir.actions.act_window">
+            <field name="name">Timesheets</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr_timesheet_sheet.sheet</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_graph"/>
+        </record>
         <record id="board_hr_form" model="ir.ui.view">
             <field name="name">board.hr.form</field>
             <field name="model">board.board</field>
@@ -66,7 +74,7 @@
                             <action colspan="4" height="220" name="%(action_my_expense)d" string="My Expenses" />
                         </child1>
                         <child2>
-                               <action colspan="4" height="220" name="%(action_timesheet_report_all)d" string="Timesheets by Month" />
+                               <action colspan="4" height="220" name="%(action_hr_timesheet_sheet_graph)d" string="Timesheets by Month" />
                                                <action colspan="4" height="220" name="%(action_hr_holidays_remaining_leaves_user_all)d" string="Reamining Leaves by Type and User" />
                         </child2>
                     </hpaned>

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 580fc64..48cff1c 100644 (file)
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -20,7 +20,18 @@
                 </tree>
             </field>
         </record>
-
+       <record id="hr_timesheet_sheet_graph" model="ir.ui.view">
+         <field name="name">hr.timesheet.sheet.graph</field>
+         <field name="model">hr_timesheet_sheet.sheet</field>
+         <field name="type">graph</field>
+         <field name="arch" type="xml">
+             <graph string="Timesheets" type="bar">
+                 <field name="name"/>
+                 <field name="total_attendance" operator="+"/>
+                 <field name="total_timesheet" operator="+"/>
+             </graph>
+         </field>
+        </record>
         <record id="hr_timesheet_account_form" model="ir.ui.view">
             <field name="name">hr.timesheet.account.form</field>
             <field name="model">hr_timesheet_sheet.sheet.account</field>