brotherton-erpnext/erpnext/hr
Anand Doshi e301e8a6c1 Merge branch 'master' into dev
Conflicts:
	erpnext/buying/doctype/quality_inspection/quality_inspection.py
2012-06-28 18:40:57 +05:30
..
Deduction Type first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
doctype Merge branch 'master' into dev 2012-06-28 18:40:57 +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 appframe is now heading 2012-06-14 11:05:09 +05:30
search_criteria salary register issue fixed 2012-05-17 17:47:26 +05:30
__init__.py fixes in install docs for roles 2012-04-17 11:45:35 +05:30