fixes in sales/purchase invoice list view
[report] accounts receivable migrated into new style
fixed conflict
field label changed in salary structure
[patches] [fix] fix in update_account_property_patch
Merge branch 'master' of github.com:webnotes/erpnext
[salary structure] added a validation
[salary structure] added a validation
Merge branch 'master' of github.com:webnotes/erpnext
[leave application] [employee query] allow employee lookup for which the current user is leave approver or thhe employee has no leave approvers mentioned or the user is the employee
Merge branch 'master' of github.com:webnotes/erpnext
stock uom mandatory for item
[leave application] [employee query] fixes
[backup manager] [error handling] on error, send complete traceback as email
Merge branch 'master' into edge

Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	stock/doctype/item/item.txt