[IMP] hr_timesheet_sheet:improved view of dashboard and remove unnecessary code

bzr revid: tpa@tinyerp.com-20120606091635-tglt5l9sk8cbf3dv

2 files changed, 9 insertions, 42 deletions

diff --git a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
index 74530b81859..2b165334739 100644
--- a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
+++ b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
@@ -2,30 +2,18 @@
 <openerp>
     <data>
 
-        <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="hr_timesheet_sheet_tree" model="ir.ui.view">
-            <field name="name">hr.timesheet.sheet.tree.simplified.board</field>
+        <record id="view_hr_timesheet_sheet_graph" model="ir.ui.view">
+            <field name="name">hr.timesheet.sheet.sheet.graph</field>
             <field name="model">hr_timesheet_sheet.sheet</field>
-            <field name="type">tree</field>
+            <field name="type">graph</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state == 'draft';black:state in ('confirm','new');gray:state == 'done'" string="Timesheets">
-                    <field name="date_from"/>
-                    <field name="user_id"/>
-                    <field name="department_id" invisible="1"/>
+                <graph orientation="horizontal" string="Available Attendance" type="bar">
                     <field name="name"/>
-                    <field name="total_attendance" widget="float_time"/>
-                    <field name="total_timesheet" widget="float_time"/>
-                    <field name="state"/>
-                </tree>
+                    <field name="total_attendance" operator="+"/>
+                </graph>
             </field>
         </record>
+
         <record id="action_week_attendance_graph" model="ir.actions.act_window">
             <field name="name">My Total Attendances By Week</field>
             <field name="res_model">hr_timesheet_sheet.sheet</field>
@@ -34,6 +22,7 @@
             <field name="domain">[('user_id','=',uid)]</field>
             <field name="view_id" ref="hr_timesheet_sheet.view_hr_timesheet_sheet_graph"/>
         </record>
+
         <record id="board_hr_week_attendace_form" model="ir.ui.view">
             <field name="name">board.hr.timesheet.sheet.form</field>
             <field name="model">board.board</field>
@@ -45,5 +34,6 @@
                 </xpath>
             </field>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index afd04aed1e1..0715ba1bdc2 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -2,18 +2,6 @@
 <openerp>
     <data>
 
-       <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>
@@ -336,17 +324,6 @@
                 </tree>
             </field>
         </record>
-        <record id="view_hr_timesheet_sheet_graph" model="ir.ui.view">
-            <field name="name">hr.timesheet.sheet.sheet.graph</field>
-            <field name="model">hr_timesheet_sheet.sheet</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph orientation="horizontal" string="Available Attendance" type="bar">
-                    <field name="name"/>
-                    <field name="total_attendance" operator="+"/>
-                </graph>
-            </field>
-        </record>
 
         <record id="hr_timesheet_day_tree" model="ir.ui.view">
             <field name="name">hr.timesheet.day.tree</field>