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

fix in startup init file

2013-02-17 00:26:59 +05:30

event_handlers.py

website settings social icons

2013-02-20 15:02:21 +05:30

install.py

added Website Manager role in install

2013-02-12 13:03:25 +05:30

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

rename Purchase Request to Material Request

2013-02-18 13:49:15 +05:30

query_handlers.py

get_query continued

2013-02-08 14:04:13 +05:30

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

added automatic lead creation for sales email id

2013-01-16 12:36:07 +05:30

startup.py

added automatic lead creation for sales email id

2013-01-16 11:34:26 +05:30