pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] hr_*: Put related button on employee form => timesheets,contracts,interviews

Browse Source 
[REM] hr_*: Remove Sign In / Out by Project, Sign In / Out
wizards from employee form view

bzr revid: mra@tinyerp.com-20100409112244-jg1226mpwbh59n12
This commit is contained in:
mra (Open ERP)
2010-04-09 16:52:44 +05:30
parent c0596f6d58
commit 464c80d9d3
5 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_attendance/hr_attendance_wizard.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<openerp>
<data>
<wizard id="si_so" model="hr.employee" name="hr.si_so" string="Sign in / Sign out"/>
<wizard multi="1" menu="False" id="si_so" model="hr.employee" name="hr.si_so" string="Sign in / Sign out"/>
<wizard id="wizard_attendance_error" keyword="client_print_multi" model="hr.employee" name="hr.attendance.report" string="Print Attendance Error Report"/>
<wizard id="print_week" keyword="client_print_multi" model="hr.employee" name="hr.attendance.print_week" string="Print Timesheet by week"/>
addons/hr_contract/hr_contract_view.xml
+5
View File
@@ -229,5 +229,10 @@
<menuitem id="hr_menu_contract_main" parent="hr.menu_hr_root" name="Contracts" sequence="3"/>
<menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr_menu_contract_main" name="Contracts"/>
<!-- Contracts Button on Employee Form -->
<act_window domain="[('employee_id', '=', active_id)]" id="act_hr_employee_2_hr_contract" name="Contracts" res_model="hr.contract" src_model="hr.employee"/>
</data>
</openerp>
addons/hr_evaluation/hr_evaluation_view.xml
+7 -2
View File
@@ -311,9 +311,9 @@
<field name="arch" type="xml">
<search string="Search Evaluation">
<group col='10' colspan='4'>
<filter icon="terp-crm" string="To Do" domain="[('state','=','waiting_answer')]" default="1"/>
<filter icon="terp-crm" name="to_wait" string="To Do" domain="[('state','=','waiting_answer')]" />
<separator orientation="vertical"/>
<filter string="My" icon="terp-partner" domain="[('user_id','=',uid)]" default="1"/>
<filter string="My" name="my_user" icon="terp-partner" domain="[('user_id','=',uid)]" />
<separator orientation="vertical"/>
<filter icon="terp-stock" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
<separator orientation="vertical"/>
@@ -329,6 +329,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('is_evaluation' ,'=', True)]</field>
<field name="context">{"search_default_to_wait":1, "search_default_my_user":1}</field>
<field name="search_view_id" ref="view_hr_evaluation_interview_search"/>
</record>
@@ -341,5 +342,9 @@
id="menu_eval_send_mail"
action="action_hr_evaluation_send_mail"
sequence="45"/>
<!-- Evaluation Interviews Button on Employee Form -->
<act_window domain="[('user_to_review_id', '=', active_id)]" id="act_hr_employee_2_hr__evaluation_interview" name="Evaluation Interviews" res_model="hr.evaluation.interview" src_model="hr.employee"/>
</data>
</openerp>
addons/hr_timesheet/hr_timesheet_wizard.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<wizard id="si_so" model="hr.employee" name="hr_timesheet.si_so" string="Sign in / Sign out by project"/>
<!--<wizard id="si_so" model="hr.employee" name="hr_timesheet.si_so" string="Sign in / Sign out by project"/>-->
<!-- <menuitem action="si_so" id="menu_si_so" parent="hr_attendance.menu_hr_attendance" type="wizard"/>-->
</data>
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+3
View File
@@ -332,5 +332,8 @@
</field>
</record>
<!-- Timesheet Button on Employee Form -->
<act_window domain="[('user_id', '=', user_id)]" id="act_hr_employee_2_hr_timesheet" name="Timesheets" res_model="hr_timesheet_sheet.sheet" src_model="hr.employee"/>
</data>
</openerp>