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

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:openobject-addons

Mustufa Rangwala (Open ERP) (community): Needs Fixing on 2014-05-14

Mansi Kariya(OpenERP) (community): Needs Resubmitting on 2014-05-14

Diff: 2002 lines (+723/-187)

26 files modified

hr/__openerp__.py (+2/-2)
hr/hr.py (+27/-3)
hr/hr_data.xml (+2/-0)
hr/hr_view.xml (+28/-7)
hr_attendance/hr_attendance_view.xml (+1/-1)
hr_contract/hr_contract.py (+36/-11)
hr_contract/hr_contract_data.xml (+93/-0)
hr_contract/hr_contract_view.xml (+31/-14)
hr_evaluation/hr_evaluation.py (+28/-9)
hr_evaluation/hr_evaluation_data.xml (+50/-2)
hr_evaluation/hr_evaluation_view.xml (+19/-8)
hr_expense/hr_expense.py (+14/-10)
hr_expense/hr_expense_data.xml (+12/-0)
hr_expense/hr_expense_view.xml (+51/-22)
hr_holidays/hr_holidays.py (+36/-36)
hr_holidays/hr_holidays_data.xml (+43/-4)
hr_holidays/hr_holidays_demo.xml (+1/-1)
hr_holidays/hr_holidays_view.xml (+162/-44)
hr_payroll/hr_payroll.py (+0/-1)
hr_recruitment/hr_recruitment.py (+20/-2)
hr_recruitment/hr_recruitment_data.xml (+19/-3)
hr_recruitment/hr_recruitment_view.xml (+1/-0)
hr_timesheet_sheet/hr_timesheet_sheet.py (+10/-2)
hr_timesheet_sheet/hr_timesheet_sheet_data.xml (+31/-0)
hr_timesheet_sheet/hr_timesheet_sheet_view.xml (+6/-4)
mail/mail_message_subtype.py (+0/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

8830. By Mansi Kariya(OpenERP) on 2014-05-19

[IMP] Improved expense - restricted to submit expense without expense line

8829. By Bharat Devnani (Open ERP) on 2014-05-16

[IMP] improved indentation

8828. By Mansi Kariya(OpenERP) on 2014-05-16

[IMP] Code Improved

8827. By Mansi Kariya(OpenERP) on 2014-05-15

[Merge] Merged with Latest Trunk

8826. By Mansi Kariya(OpenERP) on 2014-05-15

[IMP] Improved flow of Expense, Added field to get Employee payable Account from Expense view if not in home address

8825. By Mansi Kariya(OpenERP) on 2014-05-14

[Merge] Merged with main addons

8824. By Mansi Kariya(OpenERP) on 2014-05-14

[IMP] Code Optimized

8823. By Mansi Kariya(OpenERP) on 2014-05-14

[IMP] Improved Code

8822. By Mansi Kariya(OpenERP) on 2014-05-13

[FIX] Fixed issue of wrong calculation on Allocated Days

8821. By Mansi Kariya(OpenERP) on 2014-05-13

[Add] Added domain on Approved Leaves which will show current months approved leaves only