brotherton-erpnext/erpnext/hr
Anand Doshi 45a4edc9c9 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
Conflicts:
	css/all-app.css
	version.num
2012-04-17 11:19:15 +05:30
..
Deduction Type first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
doctype fixed hr issues 2012-04-16 12:22:47 +05:30
DocType Mapper change from labels to fieldname in cur_frm.cscript 2012-04-05 13:03:35 +05:30
Earning Type first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
Expense Type rename dt first cut 2012-03-30 12:29:06 +05:30
Leave Type first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
page Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-17 11:19:15 +05:30
search_criteria hr reports cleanup 2012-04-16 12:31:36 +05:30
__init__.py cleanup of search criteria 2012-04-05 18:27:56 +05:30