[REF]: Removed menu items 'New..' and 'My..' and also its related actions

[odoo/odoo.git] / addons / hr_timesheet / hr_timesheet_view.xml

diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index e44a50a..0650889 100644 (file)
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -8,14 +8,15 @@
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Timesheet Line">
                     <field name="user_id" on_change="on_change_user_id(user_id)" required="1"/>
-                    <field name="date"/>
+                    <field name="date" on_change="on_change_date(date)"/>
                     <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id"/>
                     <field name="name"/>
                     <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" sum="Total time"/>
-                    <field name="product_id" required="1" domain="[('type','=','service')]"/>
+                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" required="1" domain="[('type','=','service')]"/>
                     <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
                     <field name="amount" sum="Total cost"/>
                     <field name="general_account_id"/>
+                    <field name="journal_id"/>
                 </tree>
             </field>
         </record>
@@ -25,9 +26,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Timesheet Lines">
-                    <field colspan="4" name="name"/>
+                    <field colspan="4" name="name" select="2"/>
                     <field name="user_id" on_change="on_change_user_id(user_id)" required="1" select="1"/>
-                    <field name="date" select="1"/>
+                    <field name="date" select="1" on_change="on_change_date(date)"/>
                     <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
                     <newline/>
                     <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" required="1" domain="[('type','=','service')]"/>
@@ -40,6 +41,25 @@
                 </form>
             </field>
         </record>
+        
+        <record id="hr_timesheet_line_search" model="ir.ui.view">
+            <field name="name">hr.analytic.timesheet.search</field>
+            <field name="model">hr.analytic.timesheet</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Timesheet">
+                    <group col='8' colspan='4'>
+                           <filter icon="terp-hr" domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" string="Today"/>
+                           <filter icon="terp-hr" domain="[('user_id','=',uid)]" string="My Work" help="My Work"/>
+                           <separator orientation="vertical"/>                    
+                           <field name="user_id" select="1" widget="selection"/>
+                           <field name="account_id" select="1" widget="selection"/>                    
+                           <field name="date" select="1"/>
+                    </group>
+                </search>
+            </field>
+        </record>        
+
         <menuitem id="menu_act_hr_timesheet_line_today_form" parent="hr.menu_hr_root" name="Working Hours" />
         
         <record id="act_hr_timesheet_line_me_all_form" model="ir.actions.act_window">
@@ -49,26 +69,17 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('user_id','=',uid)]</field>
+            <field name="filter" eval="True"/>
+            <field name="search_view_id" ref="hr_timesheet_line_search"/>
         </record>
-        <menuitem action="act_hr_timesheet_line_me_all_form" id="menu_act_hr_timesheet_line_me_all_form" parent="hr_timesheet.menu_act_hr_timesheet_line_today_form"/>
 
-        <record id="act_hr_timesheet_line_evry1_today_form_my" model="ir.actions.act_window">
-            <field name="name">My Working Hours of The Day</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr.analytic.timesheet</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id','=',uid),('date', '=',time.strftime('%Y-%m-%d'))]</field>
-        </record>
-        <menuitem action="act_hr_timesheet_line_evry1_today_form_my" id="menu_act_hr_timesheet_line_evry1_today_form_my" parent="menu_act_hr_timesheet_line_me_all_form"/>
- 
-        
         <record id="act_hr_timesheet_line_evry1_all_form" model="ir.actions.act_window">
             <field name="name">Working Hours</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.analytic.timesheet</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="hr_timesheet_line_search"/>            
         </record>
         <menuitem
             action="act_hr_timesheet_line_evry1_all_form"
@@ -76,16 +87,6 @@
             parent="hr_timesheet.menu_act_hr_timesheet_line_today_form"
             groups="hr.group_hr_manager"/>
 
-        <record id="act_hr_timesheet_line_evry1_today_form" model="ir.actions.act_window">
-            <field name="name">Working Hours of The Day</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr.analytic.timesheet</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('date', '=',    time.strftime('%Y-%m-%d'))]</field>
-        </record>
-        <menuitem action="act_hr_timesheet_line_evry1_today_form" id="menu_act_hr_timesheet_line_evry1_today_form" parent="menu_act_hr_timesheet_line_evry1_all_form"/>
-       
         <record id="hr_timesheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.employee.extd_form</field>
             <field name="model">hr.employee</field>