Amit Bhavsar (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-usability2-hr_calendarview-amb into
lp:~openerp-dev/openobject-addons/trunk-usability2.
Requested reviews:
Amit (Open ERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability2-hr_calendarview-amb/+merge/79232
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability2-hr_calendarview-amb/+merge/79232
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-usability2.
=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml 2011-10-11 14:03:35 +0000
+++ hr_holidays/hr_holidays_view.xml 2011-10-13 09:29:24 +0000
@@ -9,7 +9,7 @@
<search string="Search Leave">
<group>
<filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
- <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve"/>
+ <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" name="approve"/>
<filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated" name="validated"/>
<separator orientation="vertical"/>
<filter string="This Month" icon="terp-go-month" name="This Month" domain="[('date_from','<=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','>=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
@@ -258,21 +258,21 @@
</record>
<record model="ir.actions.act_window.view" id="action_open_ask_holidays_tree">
- <field name="sequence" eval="1"/>
+ <field name="sequence" eval="2"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_holiday"/>
<field name="act_window_id" ref="open_ask_holidays"/>
</record>
<record model="ir.actions.act_window.view" id="action_open_ask_holidays_form">
- <field name="sequence" eval="2"/>
+ <field name="sequence" eval="3"/>
<field name="view_mode">form</field>
<field name="view_id" ref="edit_holiday_new"/>
<field name="act_window_id" ref="open_ask_holidays"/>
</record>
<record model="ir.actions.act_window.view" id="action_open_ask_holidays_calendar">
- <field name="sequence" eval="3"/>
+ <field name="sequence" eval="1"/>
<field name="view_mode">calendar</field>
<field name="view_id" ref="view_holiday_new_calendar"/>
<field name="act_window_id" ref="open_ask_holidays"/>
@@ -280,6 +280,32 @@
<menuitem name="Leave Requests" parent="menu_open_ask_holidays" id="menu_open_ask_holidays_new" action="open_ask_holidays"/>
+ <record model="ir.actions.act_window" id="request_approve_holidays">
+ <field name="name">Requests Approve</field>
+ <field name="res_model">hr.holidays</field>
+ <field name="view_type">form</field>
+ <field name="context">{'search_default_approve':1,"search_default_department_id": department_id}</field>
+ <field name="domain">[('type','=','add')]</field>
+ <field name="view_id" ref="edit_holiday_new"/>
+ <field name="search_view_id" ref="view_hr_holidays_filter"/>
+ </record>
+
+ <record model="ir.actions.act_window.view" id="action_request_approve_holidays_tree">
+ <field name="sequence" eval="1"/>
+ <field name="view_mode">tree</field>
+ <field name="view_id" ref="view_holiday"/>
+ <field name="act_window_id" ref="request_approve_holidays"/>
+ </record>
+
+ <record model="ir.actions.act_window.view" id="action_request_approve_holidays_form">
+ <field name="sequence" eval="2"/>
+ <field name="view_mode">form</field>
+ <field name="view_id" ref="allocation_leave_new"/>
+ <field name="act_window_id" ref="request_approve_holidays"/>
+ </record>
+
+ <menuitem name="Leave Request to Approve" parent="menu_open_ask_holidays" id="menu_request_approve_holidays" action="request_approve_holidays" groups="base.group_hr_manager,base.group_hr_user"/>
+
<record model="ir.actions.act_window" id="open_allocation_holidays">
<field name="name">Allocation Requests</field>
<field name="res_model">hr.holidays</field>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
