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

[IMP] mail.thread on employee, holidays status in lists 

bzr revid: fp@openerp.com-20130224092310-olaefyk0ap58a287
This commit is contained in:
Fabien Pinckaers 2013-02-24 10:23:10 +01:00
parent 23ad320c31 427f93b950
commit 986e5ff1bb
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/hr/hr.py
View File

@ -146,6 +146,7 @@ class hr_employee(osv.osv):
_name = "hr.employee"
_description = "Employee"
_inherits = {'resource.resource': "resource_id"}
_inherit = ['mail.thread']
def _get_image(self, cr, uid, ids, name, args, context=None):
result = dict.fromkeys(ids, False)

4
addons/hr/hr_view.xml
View File

@ -84,6 +84,10 @@
</page>
</notebook>
</sheet>
<div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/>
<field name="message_ids" widget="mail_thread"/>
</div>
</form>
</field>
</record>

4
addons/hr_holidays/hr_holidays_view.xml
View File

@ -206,7 +206,8 @@
<field name="arch" type="xml">
<tree colors="red:state == 'refuse';blue:state == ' draft';black:state in ('confirm','validate','validate1')" string="Leave Requests">
<field name="employee_id"/>
<field name="holiday_type" string="Mode" groups="base.group_hr_user"/>
<field name="holiday_type" string="Mode" groups="base.group_no_one"/>
<field name="holiday_status_id"/>
<field name="name"/>
<field name="date_from"/>
<field name="date_to"/>
@ -214,7 +215,6 @@
<field name="state"/>
<field name="category_id" invisible="1"/>
<field name="department_id" invisible="not context.get('set_visible',False)"/>
<field name="holiday_status_id" invisible="1"/>
<field name="manager_id" invisible="1"/>
<field name="user_id" invisible="1"/>
</tree>