Vishmita Jadeja (openerp) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-hr_features-vja into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-hr_features-vja/+merge/145562
Hello,
Fixed following issues :
1) Applicants: After hire an applicant,in the employee form put a chatter
to say that the document is created.
2) Leaves: replace Mode column by Leave Type column in Human Resources =>
Leaves => Leave Requests and Leave Requests to Approve.
Thanks.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-hr_features-vja/+merge/145562
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-hr_features-vja.
=== modified file 'hr/hr.py'
--- hr/hr.py 2012-12-24 12:29:19 +0000
+++ hr/hr.py 2013-01-30 09:38:24 +0000
@@ -146,6 +146,7 @@
_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)
=== modified file 'hr/hr_view.xml'
--- hr/hr_view.xml 2012-12-08 10:33:38 +0000
+++ hr/hr_view.xml 2013-01-30 09:38:24 +0000
@@ -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>
=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml 2012-12-21 16:48:08 +0000
+++ hr_holidays/hr_holidays_view.xml 2013-01-30 09:38:24 +0000
@@ -206,7 +206,7 @@
<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_status_id"/>
<field name="name"/>
<field name="date_from"/>
<field name="date_to"/>
@@ -214,7 +214,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>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
