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
..
doctype	Merge branch 'master' into dev	2012-07-12 22:16:19 +05:30
DocType Mapper	mapper fix	2012-05-08 11:51:35 +05:30
Item Group	first cut for lazy loading framework	2011-09-05 18:43:09 +05:30
page	fixes to taxes and charges master and naming_series	2012-07-12 16:01:20 +05:30
Print Format	Fixes in Print Formats - discount in description	2012-05-17 18:11:54 +05:30
search_criteria	fixed conflict in sales bom using ours	2012-04-27 14:03:06 +05:30
__init__.py	fixes in install docs for roles	2012-04-17 11:45:35 +05:30
tests.py	added license files	2012-02-23 12:35:32 +05:30