odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] hr_*: usability improvements 

bzr revid: qdp-launchpad@tinyerp.com-20101008171837-iog32jb6x61fisv0
This commit is contained in:
qdp-launchpad@tinyerp.com 2010-10-08 19:18:37 +02:00
parent c50c0d8c4d
commit 32c4dfc3ec
6 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/hr_evaluation/hr_evaluation_view.xml
View File

@ -183,14 +183,14 @@
<newline/>
<group col="6" colspan="4">
<field name="state"/>
<button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"
icon="gtk-cancel"/>
<button name="button_plan_in_progress" string="Start Evaluation" states="draft" type="object"
icon="gtk-execute"/>
<button name="button_final_validation" string="Validate Evaluation" states="wait" type="object"
icon="gtk-execute"/>
<button name="button_done" string="Done" states="progress" type="object"
icon="gtk-jump-to"/>
<button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"
icon="gtk-cancel"/>
</group>
</form>
</field>

15
addons/hr_expense/hr_expense_view.xml
View File

@ -47,8 +47,8 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree colors="blue:state in ('draft');black:state in ('confirm','accepted','invoiced','paid');gray:state in('cancelled')" string="Expenses" editable="top">
<field name="date"/>
<field name="employee_id"/>
<field name="date"/>
<field name="department_id" groups="base.group_extended"/>
<field name="ref"/>
<field name="name"/>
@ -96,12 +96,11 @@
</field>
<field name="state"/>
<group col="6" colspan="2">
<button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
<button name="cancel" states="cancel" string="Cancel" type="workflow" icon="gtk-cancel"/>
<button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert"/>
<button name="validate" states="confirm" string="Approve" type="workflow" icon="terp-camera_test"/>
<button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_manager" />
<button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
<button name="invoice" states="accepted" string="Invoice" type="workflow" icon="gtk-execute"/>
<button name="refuse" states="confirm,draft,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_manager" />
<button name="validate" states="confirm" string="Approve" type="workflow" icon="terp-camera_test"/>
</group>
</page>
<page string="Other Info" groups="base.group_extended">
@ -143,14 +142,14 @@
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
<separator orientation="vertical"/>
<field name="employee_id" select='1'/>
<field name="name" select='1'/>
<field name="date" select='1'/>
<field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
<filter icon="terp-personal+" context="{'invisible_department': False}" domain="[('department_id','=',context.get('department_id',False))]" help="My Department"/>
<field name="name" select='1'/>
<field name="user_id" string="User" invisible="True">
<filter icon="terp-personal+" domain="[('department_id','=',context.get('department_id',False))]"
string="Expenses of My Department"/>
</field>
<field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
<filter icon="terp-personal+" context="{'invisible_department': False}" domain="[('department_id','=',context.get('department_id',False))]" help="My Department"/>
</field>
</group>
<newline />

6
addons/hr_expense/hr_expense_workflow.xml
View File

@ -83,12 +83,6 @@
<field name="signal">refuse</field>
</record>
<record id="t5" model="workflow.transition">
<field name="act_from" ref="act_draft"/>
<field name="act_to" ref="act_refused"/>
<field name="signal">refuse</field>
</record>
<record id="t6" model="workflow.transition">
<field name="act_from" ref="act_accepted"/>
<field name="act_to" ref="act_refused"/>

7
addons/hr_holidays/hr_holidays_view.xml
View File

@ -90,11 +90,11 @@
<newline/>
<field name="state" colspan="2"/>
<group colspan="2">
<button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
<button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
<button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
<button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
<button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
<button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
<button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
<button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
</group>
</page>
@ -401,7 +401,8 @@
<!-- Shortcuts -->
<act_window name="Holidays"
domain="[('employee_id', '=', active_id), ('type','=','remove')]"
domain="[('type','=','remove')]"
context="{'search_default_employee_id': [active_id]}"
res_model="hr.holidays"
src_model="hr.employee"
view_id ="eval('edit_holiday_new')"

6
addons/hr_recruitment/hr_recruitment_view.xml
View File

@ -128,10 +128,10 @@
<separator colspan="4" string="Status"/>
<group col="8" colspan="4">
<field name="state"/>
<button name="case_open" string="In Progress" states="draft,pending" type="object" icon="gtk-go-forward"/>
<button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
<button name="case_close" string="Hired" states="open,draft,pending" type="object" icon="terp-partner"/>
<button name="case_cancel" string="Refused" states="draft,open,pending" type="object" icon="gtk-cancel"/>
<button name="case_open" string="In Progress" states="draft,pending" type="object" icon="gtk-go-forward"/>
<button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause"/>
<button name="case_close" string="Hired" states="open,pending" type="object" icon="terp-partner"/>
<button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
</group>
</page>

6
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
View File

@ -129,7 +129,7 @@
</notebook>
<field name="state"/>
<group col="4" colspan="2">
<button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-check"/>
<button name="button_confirm" states="draft" string="Close" type="object" icon="terp-check"/>
<button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
<button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-cancel"/>
<button name="done" states="confirm" string="Approve" type="workflow" icon="terp-camera_test"/>
@ -322,7 +322,9 @@
</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"/>
<act_window
context="{'search_default_employee_id': [active_id]}"
id="act_hr_employee_2_hr_timesheet" name="Timesheets" res_model="hr_timesheet_sheet.sheet" src_model="hr.employee"/>
</data>
</openerp>