Anand Doshi 0eef6e9e42 Merge branch 'edge' of github.com:webnotes/erpnext into webshop ...

Conflicts:
	patches/patch_list.py

2013-05-15 21:18:27 +05:30

..

doctype

[rename] [fix] merge related fixes

2013-05-09 13:21:13 +05:30

locale

updated language and separated slickgrid files

2013-02-25 11:05:27 +05:30

page

[setup home] combined Update Application, Backup Manager and Scheduler Error Log under Setup > Administration

2013-05-15 12:24:50 +05:30

__init__.py

install from txt files, part 1

2013-01-16 17:48:17 +05:30

utils.py

[buying, selling] [refactor] get item details

2013-05-15 21:15:57 +05:30