brotherton-erpnext/erpnext/hr/doctype
Anand Doshi e00e70841c Merge branch 'stable' into latest
Conflicts:
	erpnext/accounts/doctype/journal_voucher/journal_voucher.js
	erpnext/accounts/doctype/payable_voucher/payable_voucher.js
	index.html
	version.num
2012-02-07 10:58:45 +05:30
..
absent_days_detail first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
appraisal version 2012-01-23 16:18:34 +05:30
appraisal_detail Resolved conflict after merging with master 2011-10-11 14:42:34 +05:30
attendance Removed custom field from doctype 2011-12-20 18:48:19 +05:30
attendance_control_panel Fetch defaults in purchase common and sales common related doctypes and fix minor utf-8 issues 2012-02-07 10:48:11 +05:30
branch first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
chapter_vi_a_detail first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
declaration_detail first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
deduction_detail first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
deduction_type first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
department first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
designation first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
earn_deduction_detail first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
earning_detail first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
earning_type first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
educational_qualifications first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
educational_qualifications_detail first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
employee checked sal struc docstatus in validation 2011-09-16 14:47:19 +05:30
employee_profile first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
employment_type first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
expense_type first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
expense_voucher Changes in Notifications 2012-01-04 19:31:32 +05:30
expense_voucher_detail first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
experience_in_company_detail first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
grade first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
holiday_list first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
holiday_list_detail first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
invest_80_declaration_detail first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
it_checklist removed make_feed() function 2011-09-16 11:24:54 +05:30
kra_sheet first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
kra_template first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
leave_allocation first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
leave_application error fixed in leave calculation 2011-10-11 17:11:24 +05:30
leave_control_panel first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
leave_type first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
other_income_detail first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
payroll_rule first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
previous_experience_detail first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
professional_training_details first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
salary_manager Employemnt Type filter removed from salary manager 2011-11-07 10:48:51 +05:30
salary_slip first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
salary_structure first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
ss_deduction_detail first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
ss_earning_detail first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
__init__.py first cut for lazy loading framework 2011-09-05 18:43:09 +05:30