Brahma K 790a78785b fixed conflict		2011-07-27 10:54:11 +05:30
..
Deduction Type	restructured erpnext and deleted unwanted	2011-07-01 13:34:41 +05:30
doctype	fixed conflict	2011-07-27 10:54:11 +05:30
DocType Mapper	all txt files updated due to module renaming/merging	2011-07-01 15:47:42 +05:30
Earning Type	restructured erpnext and deleted unwanted	2011-07-01 13:34:41 +05:30
Expense Type	restructured erpnext and deleted unwanted	2011-07-01 13:34:41 +05:30
Leave Type	restructured erpnext and deleted unwanted	2011-07-01 13:34:41 +05:30
Module Def/HR	restructured erpnext and deleted unwanted	2011-07-01 13:34:41 +05:30
page	restructured erpnext and deleted unwanted	2011-07-01 13:34:41 +05:30
Role	all txt files updated due to module renaming/merging	2011-07-01 15:47:42 +05:30
search_criteria	all txt files updated due to module renaming/merging	2011-07-01 15:47:42 +05:30
__init__.py	restructured erpnext and deleted unwanted	2011-07-01 13:34:41 +05:30