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

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:openobject-addons

Jignesh Rathod(OpenERP) (community): Needs Resubmitting on 2013-06-18

Mustufa Rangwala (Open ERP) (community): Needs Fixing on 2013-06-18

Diff: 834 lines (+317/-44)

19 files modified

hr/__openerp__.py (+1/-0)
hr/hr.py (+1/-1)
hr/hr_data.xml (+2/-0)
hr/hr_department.py (+48/-0)
hr/hr_department_data.xml (+45/-0)
hr/hr_department_view.xml (+4/-0)
hr/hr_view.xml (+1/-0)
hr_contract/hr_contract.py (+11/-0)
hr_contract/hr_contract_data.xml (+4/-0)
hr_contract/hr_contract_view.xml (+4/-0)
hr_evaluation/hr_evaluation.py (+13/-5)
hr_evaluation/hr_evaluation_view.xml (+6/-0)
hr_expense/hr_expense.py (+26/-4)
hr_expense/hr_expense_view.xml (+51/-17)
hr_holidays/hr_holidays.py (+28/-2)
hr_holidays/hr_holidays_view.xml (+47/-8)
hr_recruitment/hr_recruitment.py (+10/-3)
hr_timesheet_sheet/hr_timesheet_sheet.py (+12/-2)
hr_timesheet_sheet/hr_timesheet_sheet_view.xml (+3/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

8727. By Bharat Devnani (Open ERP) on 2013-06-20

[IMP] changed the position of journal_id field

8726. By Bharat Devnani (Open ERP) on 2013-06-20

[IMP] changed the position of journal_id field in hr_expense

8725. By Bharat Devnani (Open ERP) on 2013-06-20

[MERGE] merged with main addons

8724. By Jignesh Rathod(OpenERP) on 2013-06-18

Merge With Addons.

8723. By Jignesh Rathod(OpenERP) on 2013-06-18

Resolve Conflicts.

8722. By Bharat Devnani (Open ERP) on 2013-06-12

[IMP] improved case of help

8721. By Bharat Devnani (Open ERP) on 2013-06-06

[IMP] improved, optimized and removed unused code

8720. By Bhumi Thakkar (Open ERP) on 2013-06-06

[MERGE]Merge lp:openobject-addons.

8719. By Bhumi Thakkar (Open ERP) on 2013-06-05

[MERGE]Merge lp:openobject-addons.

8718. By Bhumi Thakkar (Open ERP) on 2013-06-05

[IMP]Improve code.