Anand Doshi 0c26f8116d Merge branch '1310' of github.com:webnotes/erpnext
Conflicts:
	accounts/doctype/account/account.py
	controllers/accounts_controller.py
	patches/patch_list.py
	selling/doctype/sales_common/sales_common.py
	stock/doctype/purchase_receipt/purchase_receipt.py
2013-11-15 19:12:09 +05:30
..
2012-09-24 19:13:42 +05:30
2013-06-11 12:04:01 +05:30
2013-10-03 15:26:36 -03:00
2013-10-24 11:21:11 +05:30
2013-10-28 18:21:07 +05:30

Location (physical or virtual) where Items can be stored.