Nabin Hait 86375f089a Merge branch 'shf_rename' ... Conflicts: erpnext/patches/patch_list.py		2012-05-21 15:48:21 +05:30
..
doctype	Merge branch 'shf_rename'	2012-05-21 15:48:21 +05:30
DocType Mapper	change from labels to fieldname in cur_frm.cscript	2012-04-05 13:03:35 +05:30
page	fixes after merge with cms	2012-05-10 15:15:43 +05:30
Print Format	Fixes in Print Formats - discount in description	2012-05-17 18:11:54 +05:30
search_criteria	so pending item patch	2012-05-18 11:43:10 +05:30
__init__.py	fixes in install docs for roles	2012-04-17 11:45:35 +05:30