Anand Doshi 59d8a76e60 Merge branch 'master' of github.com:webnotes/erpnext into edge ...

Conflicts:
	hr/doctype/leave_application/locale/_messages_py.json
	hr/doctype/leave_block_list/locale/_messages_doc.json
	public/js/locale/_messages_js.json
	setup/doctype/email_digest/locale/_messages_doc.json
	setup/doctype/global_defaults/global_defaults.txt

2013-02-21 11:09:43 +05:30

..

__init__.py

…

event_handlers.py

…

install.py

…

observers.py

fixes related to Material Request; added button to make Stock Entry of type Material Transfer; calculate ordered_qty and per_ordered in Material Request using observer pattern when Stock Entry against it is submitted or cancelled

2013-02-20 18:44:10 +05:30

open_count.py

…

query_handlers.py

…

report_data_map.py

fixes related to Material Request; added button to make Stock Entry of type Material Transfer; calculate ordered_qty and per_ordered in Material Request using observer pattern when Stock Entry against it is submitted or cancelled

2013-02-20 18:44:10 +05:30

schedule_handlers.py

…

startup.py

…