Merge branch 'master' into edge

Conflicts:
	home/page/latest_updates/latest_updates.js
	hr/doctype/employee/employee.txt
This commit is contained in:
Anand Doshi
2013-04-16 21:32:06 +05:30
22 changed files with 465 additions and 167 deletions

View File

@@ -1,5 +1,6 @@
erpnext.updates = [
["10th April", ["Redesigned File Uploads and added File Manager in Setup"]],
["12th April", ["Employee: List of Leave Approvers who can approve the Employee's Leave Applications"]],
["27th March", ["Rename multiple items together. Go to Setup > Rename Tool"]],
["26th March", ["Added project to Stock Ledger and Balance",
"Added Default Cash Account in Company."]],