tree 706d020105ab04467487f9d14a5b7252e16d07c9
parent 2926651e1ca7d324f5a9e0b72b28b5e9e3137130
parent 7334bea3c29b031e8e4e28553f3b7b3c00b11cb7
author Anand Doshi <anand@erpnext.com> 1388062839 +0530
committer Anand Doshi <anand@erpnext.com> 1388065371 +0530

Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions

Conflicts:
	erpnext/accounts/page/accounts_browser/accounts_browser.css
	erpnext/controllers/buying_controller.py
	erpnext/manufacturing/doctype/production_order/production_order.py
	erpnext/patches/patch_list.py
	erpnext/selling/doctype/customer/customer.txt
	erpnext/selling/doctype/sales_order/sales_order.py
	erpnext/selling/doctype/sales_order/test_sales_order.py
	erpnext/setup/doctype/features_setup/features_setup.txt
	erpnext/stock/doctype/stock_entry/test_stock_entry.py
	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
	startup/query_handlers.py