lp:~openerp-dev/openobject-addons/trunk-visibility-hr_holidays-bth-tde

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:openobject-addons

OpenERP Core Team: Pending requested 2013-06-20

Diff: 1564 lines (+490/-165)

28 files modified

hr/__openerp__.py (+5/-5)
hr/hr.py (+4/-5)
hr/hr_data.xml (+2/-0)
hr/hr_department.py (+27/-25)
hr/hr_department_view.xml (+4/-1)
hr/hr_view.xml (+23/-8)
hr_contract/__openerp__.py (+1/-1)
hr_contract/hr_contract.py (+40/-9)
hr_contract/hr_contract_data.xml (+72/-0)
hr_contract/hr_contract_view.xml (+31/-14)
hr_evaluation/hr_evaluation.py (+24/-11)
hr_evaluation/hr_evaluation_data.xml (+44/-2)
hr_evaluation/hr_evaluation_view.xml (+17/-7)
hr_expense/hr_expense.py (+3/-3)
hr_expense/hr_expense_data.xml (+10/-0)
hr_expense/hr_expense_view.xml (+13/-18)
hr_holidays/hr_holidays.py (+22/-27)
hr_holidays/hr_holidays_data.xml (+41/-3)
hr_holidays/hr_holidays_demo.xml (+3/-2)
hr_holidays/hr_holidays_view.xml (+33/-14)
hr_recruitment/hr_recruitment.py (+8/-1)
hr_recruitment/hr_recruitment_data.xml (+17/-1)
hr_timesheet_sheet/hr_timesheet_sheet.py (+9/-2)
hr_timesheet_sheet/hr_timesheet_sheet_data.xml (+16/-0)
hr_timesheet_sheet/hr_timesheet_sheet_view.xml (+3/-2)
mail/mail_thread.py (+16/-3)
portal_hr_employees/hr_employee_view.xml (+1/-0)
survey/survey.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

8736. By Darshan Kalola(OpenERP) on 2013-08-29

[MERGE]merged with main addons

8735. By Thibault Delavallée (OpenERP) on 2013-08-08

[MERGE] Sync with trunk

8734. By Thibault Delavallée (OpenERP) on 2013-07-16

[FIX] hr: fixed tracking structures, because in trunk we now use browse record, not read results anymore.

8733. By Thibault Delavallée (OpenERP) on 2013-07-16

[FIX] [IMP] hr_recruitment: applicant hired subtype triggered when changing emp_id; removed applicant_refused that cannot be trigerred anymore.

8732. By Thibault Delavallée (OpenERP) on 2013-07-16

[MERGE] Sync with trunk

8731. By Thibault Delavallée (OpenERP) on 2013-06-21

[FIX] portal_hr_employees: portal specific kanban view of employees should not be the default kanban view.

8730. By Thibault Delavallée (OpenERP) on 2013-06-21

[MERGE] Sync with trunk

8729. By Thibault Delavallée (OpenERP) on 2013-06-21

[CLEAN] hr: removed some debugging data modifications.

8728. By Thibault Delavallée (OpenERP) on 2013-06-20

[FIX] Fixed forgotten conflict

8727. By Thibault Delavallée (OpenERP) on 2013-06-20

[MERGE] Sync with parent branch