brotherton-erpnext/stock
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
..
doctype Merge branch '1310' of github.com:webnotes/erpnext 2013-11-15 19:12:09 +05:30
page Merge branch '1310' of github.com:webnotes/erpnext 2013-11-15 19:12:09 +05:30
Print Format [fix] [minor] [print formats] use format_currency in place of fmt_money 2013-08-07 20:15:37 +05:30
report Merge branch 'i18n' of git://github.com/bperretti/erpnext into bperretti-i18n 2013-10-24 11:40:32 +05:30
__init__.py install from txt files, part 1 2013-01-16 17:48:17 +05:30
README.md [docs] added for stock module 2013-06-11 12:04:01 +05:30
stock_ledger.py Merge branch 'master' of github.com:webnotes/erpnext into wsgi 2013-10-02 16:52:52 +05:30
utils.py [minor] removed remark field from auto material request 2013-11-13 17:34:21 +05:30

Inventory management module.