Anand Doshi 05aaae33ae Merge branch 'master' of github.com:webnotes/erpnext into 1209 ... Conflicts: accounts/doctype/account/account.py erpnext/accounts/doctype/journal_voucher/journal_voucher.py patches/patch_list.py startup/event_handlers.py		2012-10-02 14:35:20 +05:30
..
appraisal	Merge branch 'master' of github.com:webnotes/erpnext into 1209	2012-10-02 14:35:20 +05:30
appraisal_goal	moved directory structure	2012-09-24 19:13:42 +05:30
appraisal_template	moved directory structure	2012-09-24 19:13:42 +05:30
appraisal_template_goal	moved directory structure	2012-09-24 19:13:42 +05:30
attendance	dont save duplicate files	2012-09-25 18:20:36 +05:30
attendance_control_panel	dont save duplicate files	2012-09-25 18:20:36 +05:30
branch	moved directory structure	2012-09-24 19:13:42 +05:30
deduction_type	moved directory structure	2012-09-24 19:13:42 +05:30
department	moved directory structure	2012-09-24 19:13:42 +05:30
designation	moved directory structure	2012-09-24 19:13:42 +05:30
earning_type	moved directory structure	2012-09-24 19:13:42 +05:30
employee	dont save duplicate files	2012-09-25 18:20:36 +05:30
employee_education	moved directory structure	2012-09-24 19:13:42 +05:30
employee_external_work_history	moved directory structure	2012-09-24 19:13:42 +05:30
employee_internal_work_history	moved directory structure	2012-09-24 19:13:42 +05:30
employee_training	moved directory structure	2012-09-24 19:13:42 +05:30
employment_type	moved directory structure	2012-09-24 19:13:42 +05:30
expense_claim	dont save duplicate files	2012-09-25 18:20:36 +05:30
expense_claim_detail	moved directory structure	2012-09-24 19:13:42 +05:30
expense_claim_type	moved directory structure	2012-09-24 19:13:42 +05:30
grade	moved directory structure	2012-09-24 19:13:42 +05:30
holiday	moved directory structure	2012-09-24 19:13:42 +05:30
holiday_list	dont save duplicate files	2012-09-25 18:20:36 +05:30
leave_allocation	Merge branch 'master' of github.com:webnotes/erpnext into 1209	2012-10-02 14:35:20 +05:30
leave_application	Merge branch 'master' of github.com:webnotes/erpnext into 1209	2012-10-02 14:35:20 +05:30
leave_control_panel	dont save duplicate files	2012-09-25 18:20:36 +05:30
leave_type	moved directory structure	2012-09-24 19:13:42 +05:30
other_income_detail	moved directory structure	2012-09-24 19:13:42 +05:30
salary_manager	dont save duplicate files	2012-09-25 18:20:36 +05:30
salary_slip	dont save duplicate files	2012-09-25 18:20:36 +05:30
salary_slip_deduction	moved directory structure	2012-09-24 19:13:42 +05:30
salary_slip_earning	moved directory structure	2012-09-24 19:13:42 +05:30
salary_structure	dont save duplicate files	2012-09-25 18:20:36 +05:30
salary_structure_deduction	moved directory structure	2012-09-24 19:13:42 +05:30
salary_structure_earning	moved directory structure	2012-09-24 19:13:42 +05:30
__init__.py	moved directory structure	2012-09-24 19:13:42 +05:30