brotherton-erpnext/erpnext
Anand Doshi 87a2c5cc69 Merge branch 'master' of github.com:webnotes/erpnext into shf_rename
Conflicts:
	erpnext/accounts/doctype/c_form/c_form.txt
	erpnext/patches/patch_list.py
	erpnext/setup/doctype/permission_control/permission_control.py
2012-04-09 12:14:53 +05:30
..
accounts Merge branch 'master' of github.com:webnotes/erpnext into shf_rename 2012-04-09 12:14:53 +05:30
buying Merge branch 'master' of github.com:webnotes/erpnext into shf_rename 2012-04-09 12:14:53 +05:30
home fixes after sync 2012-04-06 17:54:17 +05:30
hr cleanup of search criteria 2012-04-05 18:27:56 +05:30
knowledge_base fixes after sync 2012-04-06 17:54:17 +05:30
patches Merge branch 'master' of github.com:webnotes/erpnext into shf_rename 2012-04-09 12:14:53 +05:30
production cleanup of search criteria 2012-04-05 18:27:56 +05:30
projects cleanup of search criteria 2012-04-05 18:27:56 +05:30
sandbox rename dt first cut 2012-03-30 12:29:06 +05:30
selling Merge branch 'master' of github.com:webnotes/erpnext into shf_rename 2012-04-09 12:14:53 +05:30
setup Merge branch 'master' of github.com:webnotes/erpnext into shf_rename 2012-04-09 12:14:53 +05:30
startup fixes after sync 2012-04-06 17:54:17 +05:30
stock fixes after sync 2012-04-06 17:54:17 +05:30
support change from labels to fieldname in cur_frm.cscript 2012-04-05 13:03:35 +05:30
utilities fixes after sync 2012-04-06 17:54:17 +05:30
website rename dt second cut 2012-03-30 18:18:36 +05:30
.no_timestamps first cut for lazy loading framework 2011-09-05 18:43:09 +05:30