Anand Doshi 6c5262abb1 Merge branch 'master' of github.com:webnotes/erpnext into stock_reco ... Conflicts: patches/patch_list.py stock/report/stock_ledger/stock_ledger.txt		2013-01-14 13:28:31 +05:30
..
__init__.py	updated is_custom='Yes' in standard reports	2013-01-14 10:49:29 +05:30
stock_ledger.txt	Merge branch 'master' of github.com:webnotes/erpnext into stock_reco	2013-01-14 13:28:31 +05:30