Anand Doshi c97f780940 Merge branch 'master' into dev ...

Conflicts:
	erpnext/patches/patch_list.py
	erpnext/startup/js/complete_setup.js
	erpnext/stock/doctype/item/item.txt
	public/css/all-app.css
	public/js/all-app.js
	public/js/all-web.js

2012-07-12 22:16:19 +05:30

..

april_2012

removed patch file specific to bullows

2012-05-02 17:58:13 +05:30

before_jan_2012

rerun of rename_dt

2012-04-02 19:12:29 +05:30

jan_mar_2012

new rename doc function

2012-05-29 15:47:27 +05:30

july_2012

fixes to taxes and charges master and naming_series

2012-07-12 16:01:20 +05:30

june_2012

update in cms2 patch: delete html files

2012-07-12 22:06:27 +05:30

mar_2012

custom fields creation patch - not to be executed automatically

2012-04-11 17:49:21 +05:30

may_2012

cms2 patch updates

2012-07-12 19:15:52 +05:30

__init__.py

first cut for lazy loading framework

2011-09-05 18:43:09 +05:30

patch_list.py

Merge branch 'master' into dev

2012-07-12 22:16:19 +05:30