brotherton-erpnext/hr
Anand Doshi 5b004ff8a7 Merge branch 'master' of github.com:webnotes/erpnext into wsgi
Conflicts:
	accounts/doctype/account/account.py
	accounts/doctype/gl_entry/gl_entry.py
	accounts/doctype/period_closing_voucher/period_closing_voucher.py
	stock/doctype/delivery_note/delivery_note.py
	stock/doctype/landed_cost_wizard/landed_cost_wizard.py
	stock/doctype/purchase_receipt/purchase_receipt.py
	stock/doctype/stock_ledger/stock_ledger.py
	stock/doctype/warehouse/warehouse.py
	stock/stock_ledger.py
2013-09-25 19:55:41 +05:30
..
doctype Merge branch 'master' of github.com:webnotes/erpnext into wsgi 2013-09-25 19:55:41 +05:30
page [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
report [salary structure] Cleanup, Fixed Monthly Register Report and other minor changes 2013-08-06 17:53:41 +05:30
__init__.py install from txt files, part 1 2013-01-16 17:48:17 +05:30
README.md [docs] added readme for hr module 2013-06-11 15:03:41 +05:30
utils.py [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30

Key features:

  • Leave and Attendance
  • Payroll
  • Appraisal
  • Expense Claim