Merge lp:~openerp-dev/openobject-addons/7.0-bug_hr_holiday_1090224-adh into lp:openobject-addons/7.0

[Anand Dharampuriya(OpenERP)]

Hello,

While you change department of an employee at that time you can see new department_id for that employee. But in database it will carry older department_id.
Here department_id field store its value.
make department_id's store value false. so that it will not store department_id.

Regards
Anand(adh)

[lp:~openerp-dev/openobject-addons/7.0-bug_hr_holiday_1090224-adh]

10015. By Anand Dharampuriya(OpenERP) on 2014-05-01

Solved while change department of an employee department_id not change.

10016. By Amit Vora(OpenERP) on 2014-05-06

[MRG] merge with main branch

10017. By Anand Dharampuriya(OpenERP) on 2014-05-07

[IMP]hr_holidays: while change department of an employee it store oldr department_id in database

Unmerged revisions

10017. By Anand Dharampuriya(OpenERP) on 2014-05-07

[IMP]hr_holidays: while change department of an employee it store oldr department_id in database

10016. By Amit Vora(OpenERP) on 2014-05-06

[MRG] merge with main branch

10015. By Anand Dharampuriya(OpenERP) on 2014-05-01

Solved while change department of an employee department_id not change.

=== modified file 'hr_holidays/hr_holidays.py'
--- hr_holidays/hr_holidays.py	2013-04-15 15:06:55 +0000
+++ hr_holidays/hr_holidays.py	2014-05-07 06:20:41 +0000
@@ -160,7 +160,7 @@
         'type': fields.selection([('remove','Leave Request'),('add','Allocation Request')], 'Request Type', required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help="Choose 'Leave Request' if someone wants to take an off-day. \nChoose 'Allocation Request' if you want to increase the number of leaves available for someone", select=True),
         'parent_id': fields.many2one('hr.holidays', 'Parent'),
         'linked_request_ids': fields.one2many('hr.holidays', 'parent_id', 'Linked Requests',),
-        'department_id':fields.related('employee_id', 'department_id', string='Department', type='many2one', relation='hr.department', readonly=True, store=True),
+        'department_id':fields.related('employee_id', 'department_id', string='Department', type='many2one', relation='hr.department', readonly=True),
         'category_id': fields.many2one('hr.employee.category', "Employee Tag", help='Category of Employee', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Tag')], 'Allocation Mode', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help='By Employee: Allocation/Request for individual Employee, By Employee Tag: Allocation/Request for group of employees in category', required=True),
         'manager_id2': fields.many2one('hr.employee', 'Second Approval', readonly=True, help='This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)'),