brotherton-erpnext/erpnext/hr
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
..
Deduction Type first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
doctype Merge branch 'stable' into latest 2012-02-07 10:58:45 +05:30
DocType Mapper fixes to startup 2011-09-15 15:06:23 +05:30
Earning 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
Leave Type first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
Module Def/HR first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
page first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
Role first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
search_criteria Report to get Employeewise Balance Leave 2011-10-31 16:47:48 +05:30
__init__.py first cut for lazy loading framework 2011-09-05 18:43:09 +05:30