Anand Doshi 59d37c4bcb Merge branch 'master' of github.com:webnotes/erpnext into unicode ... Conflicts: erpnext/hr/doctype/expense_claim/expense_claim.js erpnext/patches/patch_list.py		2012-07-31 17:30:49 +05:30
..
__init__.py	added unicode_literals import at start of each file	2012-07-19 13:40:31 +05:30
stock_level.js	added filter on item group and brand	2012-07-31 12:07:40 +05:30
stock_level.py	added unicode_literals import at start of each file	2012-07-19 13:40:31 +05:30
stock_level.txt	change from labels to fieldname in cur_frm.cscript	2012-04-05 13:03:35 +05:30