brotherton-erpnext/erpnext/hr/doctype
Nabin Hait 86375f089a Merge branch 'shf_rename'
Conflicts:
	erpnext/patches/patch_list.py
2012-05-21 15:48:21 +05:30
..
appraisal delete button in doclistview 2012-05-21 14:31:03 +05:30
appraisal_goal rename dt first cut 2012-03-30 12:29:06 +05:30
appraisal_template fix in field names 2012-04-12 14:08:43 +05:30
appraisal_template_goal rename dt first cut 2012-03-30 12:29:06 +05:30
attendance delete button in doclistview 2012-05-21 14:31:03 +05:30
attendance_control_panel Merge branch 'shf_rename' 2012-05-21 15:48:21 +05:30
branch fix in field names 2012-04-12 14:08:43 +05:30
deduction_type fix in field names 2012-04-12 14:08:43 +05:30
department fix in field names 2012-04-12 14:08:43 +05:30
designation fix in field names 2012-04-12 14:08:43 +05:30
earning_type fix in field names 2012-04-12 14:08:43 +05:30
employee delete button in doclistview 2012-05-21 14:31:03 +05:30
employee_education rename dt first cut 2012-03-30 12:29:06 +05:30
employee_external_work_history rename dt first cut 2012-03-30 12:29:06 +05:30
employee_internal_work_history rename dt first cut 2012-03-30 12:29:06 +05:30
employee_training rename dt first cut 2012-03-30 12:29:06 +05:30
employment_type fix in field names 2012-04-12 14:08:43 +05:30
expense_claim delete button in doclistview 2012-05-21 14:31:03 +05:30
expense_claim_detail rename dt first cut 2012-03-30 12:29:06 +05:30
expense_claim_type fix in field names 2012-04-12 14:08:43 +05:30
grade fix in field names 2012-04-12 14:08:43 +05:30
holiday rename dt first cut 2012-03-30 12:29:06 +05:30
holiday_list cleaned up imports, doc 2012-05-11 15:53:37 +05:30
leave_allocation cleaned up imports, doc 2012-05-11 15:53:37 +05:30
leave_application delete button in doclistview 2012-05-21 14:31:03 +05:30
leave_control_panel cleaned up imports, doc 2012-05-11 15:53:37 +05:30
leave_type fix in field names 2012-04-12 14:08:43 +05:30
other_income_detail merge of sync handler and sync_file_db - first cut 2012-03-27 19:31:38 +05:30
salary_manager cleaned up imports, doc 2012-05-11 15:53:37 +05:30
salary_slip delete button in doclistview 2012-05-21 14:31:03 +05:30
salary_slip_deduction rename dt first cut 2012-03-30 12:29:06 +05:30
salary_slip_earning rename dt first cut 2012-03-30 12:29:06 +05:30
salary_structure cleaned up imports, doc 2012-05-11 15:53:37 +05:30
salary_structure_deduction rename dt first cut 2012-03-30 12:29:06 +05:30
salary_structure_earning rename dt first cut 2012-03-30 12:29:06 +05:30
__init__.py first cut for lazy loading framework 2011-09-05 18:43:09 +05:30