Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
d35354cc06
brotherton-erpnext/erpnext/hr
History
Anand Doshi d35354cc06 Merge remote-tracking branch 'frappe/develop' into v5.0 
Conflicts:
	erpnext/__version__.py
	erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
	erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
	erpnext/hooks.py
	erpnext/patches.txt
	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
	erpnext/stock/get_item_details.py
	erpnext/translations/ar.csv
	erpnext/translations/bs.csv
	erpnext/translations/ca.csv
	erpnext/translations/el.csv
	erpnext/translations/es.csv
	erpnext/translations/fr.csv
	erpnext/translations/hr.csv
	erpnext/translations/id.csv
	erpnext/translations/is.csv
	erpnext/translations/ja.csv
	erpnext/translations/nl.csv
	erpnext/translations/pl.csv
	erpnext/translations/pt-BR.csv
	erpnext/translations/ru.csv
	erpnext/translations/tr.csv
	erpnext/translations/zh-cn.csv
	erpnext/translations/zh-tw.csv
	setup.py
2015-02-24 18:12:17 +05:30
..
doctype Merge remote-tracking branch 'frappe/develop' into v5.0 2015-02-24 18:12:17 +05:30
page Module Home Pages using Module View 2014-03-03 15:06:34 +05:30
report [refactor] [frappe 5.0] 2014-09-16 15:10:54 +05:30
__init__.py moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30
README.md moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30
utils.py HR - Leave Approver and Expense Approver fields changed to Link Fields, better default permissions 2014-08-29 11:19:10 +05:30

README.md

Key features:

  • Leave and Attendance
  • Payroll
  • Appraisal
  • Expense Claim