Anand Doshi c6aecb3f97 Merge branch 'master' into edge ...

Conflicts:
	home/page/latest_updates/latest_updates.js
	hr/doctype/employee/employee.txt

2013-04-16 21:32:06 +05:30

..

doctype

Merge branch 'master' into edge

2013-04-16 21:32:06 +05:30

DocType Mapper

changed old type txt to new type txtt

2012-12-11 15:20:53 +05:30

page

refactored upload attendace tool

2013-03-05 15:52:07 +05:30

report

show leave balance in leave balance report

2013-03-01 14:11:56 +05:30

search_criteria

fixed monthly attendance report

2013-03-12 18:21:24 +05:30

__init__.py

install from txt files, part 1

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

utils.py

[Leave Application] [fixes] Validate Leave Approver based on a list specified in Employee

2013-04-12 20:19:53 +05:30