Anand Doshi 22c9497833 Merge branch 'edge' of github.com:webnotes/erpnext into edge ...

Conflicts:
	patches/patch_list.py

2013-01-02 14:02:36 +05:30

..

__init__.py

added new item-wise pricelist report and deprecated search criteria of Stock module

2013-01-02 13:51:29 +05:30

deprecate_stock_search_criteria.py

added new item-wise pricelist report and deprecated search criteria of Stock module

2013-01-02 13:51:29 +05:30

remove_bad_permissions.py

new permission manager

2013-01-01 19:51:35 +05:30