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

[IMP] hr_* : Usability improvements 

bzr revid: vir@tinyerp.com-20100922053937-5gah2r12uvewy210
This commit is contained in:
Vir (Open ERP) 2010-09-22 11:09:37 +05:30
parent 33eeaab966
commit 1e9167f9a9
10 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/hr/hr_department_view.xml
View File

@ -14,9 +14,9 @@
<field name="arch" type="xml">
<form string="department">
<group col="6" colspan="4">
<field colspan="4" name="name" select="1"/>
<field name="name" select="1"/>
<field name="parent_id"/>
<field colspan="4" name="manager_id" select="1"/>
<field name="manager_id" select="1"/>
<field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
</group>
<notebook colspan="4" >

4
addons/hr/hr_view.xml
View File

@ -99,7 +99,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Employees">
<filter icon="terp-personal-" domain="[('active','=',False)]" string="Unactive" groups="base.group_extended"/>
<filter icon="terp-personal+" domain="[('active','=',True)]" string="Active" groups="base.group_extended"/>
<separator orientation="vertical" />
<field name="name"/>
<field name="department_id" widget="selection">
@ -114,7 +114,7 @@
<separator orientation="vertical" />
<filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
<filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
<filter string="Company" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'company_id'}"/>
<filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/>
</group>
</search>
</field>

2
addons/hr_expense/hr_expense.py
View File

@ -81,7 +81,7 @@ class hr_expense_expense(osv.osv):
'company_id': fields.many2one('res.company', 'Company', required=True),
'state': fields.selection([
('draft', 'Draft'),
('confirm', 'Waiting Approved'),
('confirm', 'Waiting Approval'),
('accepted', 'Approved'),
('invoiced', 'Invoiced'),
('paid', 'Reimbursed'),

4
addons/hr_expense/hr_expense_view.xml
View File

@ -77,7 +77,7 @@
<field name="company_id" groups="base.group_multi_company"/>
</group>
<notebook colspan="4">
<page string="Expense Sheet">
<page string="Description">
<newline/>
<field colspan="4" name="line_ids" nolabel="1">
<form string="Expense Lines">
@ -99,7 +99,7 @@
<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="gtk-ok"/>
<button name="validate" states="confirm" string="Approve" type="workflow" icon="terp-camera_test"/>
<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" />
</group>

14
addons/hr_holidays/hr_holidays_view.xml
View File

@ -12,12 +12,13 @@
<filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated"
default="context.get('report', False)"/>
<separator orientation="vertical"/>
<filter icon="terp-gtk-go-back-rtl" domain="[('state','=','draft')]" string="To Confirm"/>
<filter icon="terp-gtk-go-back-rtl" domain="[('state','=','confirm')]" string="To Approve"/>
<filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
<filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve"/>
<separator orientation="vertical"/>
<filter string="This Month" icon="terp-go-month" name="This Month"
domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_from','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
<field name="user_id"/>
<separator orientation="vertical"/>
<field name="employee_id"/>
<field name="department_id" widget="selection">
<filter icon="terp-personal+" help="My Department Holidays"
domain="[('department_id.manager_id','=',uid)]" />
@ -228,14 +229,14 @@
<tree colors="red:state in ('refuse');blue:state in (' draft');black:state in ('confirm','validate','validate1');gray:state in ('cancel')">
<field name="employee_id"/>
<field name="department_id" invisible="not context.get('set_visible',False)"/>
<field name="holiday_status_id"/>
<field name="name"/>
<field name="number_of_days" string="Number of Days" sum='Remaining Days'/>
<field name="date_from"/>
<field name="date_to"/>
<field name="name"/>
<field name="holiday_status_id"/>
<field name="manager_id" invisible="1"/>
<field name="user_id" invisible="1"/>
<field name="type"/>
<!--field name="type"/-->
<field name="state"/>
<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"/>
@ -259,7 +260,6 @@
<field name="view_type">form</field>
<field name="view_id" ref="edit_holiday_new"/>
<field name="domain">[('type','=','remove')]</field>
<field name="context">{'search_default_user_id':uid}</field>
<field name="search_view_id" ref="view_hr_holidays_filter"/>
<field name="help">Leaves requests can be recorded by employees and validated by their managers. Once a leave request is validated it appears automatically in the agenda of the employee. You can define several allowance types (paid holidays, sickness, etc) and manage allowances per type.</field>
</record>

1
addons/hr_holidays/security/ir.model.access.csv
View File

@ -11,3 +11,4 @@
"access_hr_holidays_system","hr.holidays.system","model_hr_holidays","base.group_system",1,0,0,0
"access_hr_holidays_employee","hr.holidays.employee","model_hr_holidays","base.group_user",1,0,0,0
"access_hr_holydays_status_employee","hr.holidays.status.employee","model_hr_holidays_status","base.group_user",1,0,0,0
"access_resource_calendar_leaves_employee","resource_calendar_leaves_employee","resource.model_resource_calendar_leaves","base.group_hr_user",1,1,1,1

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
11 access_hr_holidays_system hr.holidays.system model_hr_holidays base.group_system 1 0 0 0
12 access_hr_holidays_employee hr.holidays.employee model_hr_holidays base.group_user 1 0 0 0
13 access_hr_holydays_status_employee hr.holidays.status.employee model_hr_holidays_status base.group_user 1 0 0 0
14 access_resource_calendar_leaves_employee resource_calendar_leaves_employee resource.model_resource_calendar_leaves base.group_hr_user 1 1 1 1

2
addons/hr_recruitment/hr_recruitment.py
View File

@ -437,7 +437,7 @@ class hr_applicant(crm.crm_case, osv.osv):
emp_id = employee_obj.create(cr,uid,{'name':applicant.name,'job_id':applicant.job_id.id})
job_data = job_obj.browse(cr,uid, applicant.job_id.id)
expected_emp = job_data['expected_employees'] - 1
job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp})
job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp,'state': 'old'})
return res

4
addons/hr_recruitment/hr_recruitment_view.xml
View File

@ -78,7 +78,7 @@
<field name="partner_name"/>
<field name="job_id" on_change="onchange_job(job_id)"/>
<button string="Schedule a Phone Call" name="%(action_hr_recruitment_phonecall)d" icon="terp-call-start" type="action" groups="base.group_extended"/>
<button name="action_makeMeeting" type="object" string="Schedule Meeting" icon="terp-hr"/>
<button name="action_makeMeeting" type="object" string="Schedule Meeting" icon="gtk-index"/>
<newline/>
<field name="department_id" widget="selection"/>
<group colspan="2" col="4">
@ -100,7 +100,7 @@
<field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" />
<button string="Create Partner"
name="%(action_hr_recruitment_partner_create)d"
icon="terp-personal" type="action" attrs="{'readonly':[('partner_id','!=',False)]}"/>
icon="gtk-index" type="action" attrs="{'readonly':[('partner_id','!=',False)]}"/>
<newline/>
<field name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="3"/>
<field name="email_from" colspan="3"/>

11
addons/hr_timesheet/hr_timesheet_view.xml
View File

@ -16,8 +16,8 @@
<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" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" required="1" domain="[('type','=','service')]"/>
<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" sum="Total time"/>
<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"/>
@ -77,10 +77,11 @@
<newline/>
<group expand="0" string="Group By...">
<filter string="Users" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="Anlytic account" icon="terp-personal+" domain="[]" context="{'group_by':'account_id'}"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-personal" domain="[]" context="{'group_by':'product_id'}"/>
<filter string="Date" icon="terp-personal+" domain="[]" context="{'group_by':'date'}"/>
<separator orientation="vertical"/>
<filter string="Anlytic account" icon="terp-folder-green" domain="[]" context="{'group_by':'account_id'}"/>
<filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
<separator orientation="vertical"/>
<filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
</group>
</search>
</field>

4
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
View File

@ -148,10 +148,10 @@
</notebook>
<field name="state"/>
<group col="4" colspan="2">
<button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-camera_test"/>
<button name="button_confirm" states="draft" string="Confirm" 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="gtk-jump-to"/>
<button name="done" states="confirm" string="Approve" type="workflow" icon="terp-camera_test"/>
</group>
</form>
</field>