Akhilesh Darjee 60ae96d588 [fix] [minor] merge conflict fixed

2013-11-26 11:21:07 +05:30

..

appraisal

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

appraisal_goal

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

appraisal_template

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

appraisal_template_goal

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

attendance

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

branch

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

deduction_type

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

department

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

designation

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

earning_type

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

employee

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

employee_education

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

employee_external_work_history

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

employee_internal_work_history

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

employee_leave_approver

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

employment_type

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

expense_claim

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

expense_claim_detail

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

expense_claim_type

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

grade

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

holiday

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

holiday_list

[fix] [setup_wizard] fiscal year fix for setup wizard

2013-11-25 19:51:18 +05:30

hr_settings

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

job_applicant

[fix] [minor] added subject in job communication

2013-11-26 10:42:52 +05:30

job_opening

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

leave_allocation

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

leave_application

[fix] [minor] removed leave by from leave application

2013-11-21 11:25:41 +05:30

leave_block_list

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

leave_block_list_allow

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

leave_block_list_date

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

leave_control_panel

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

leave_type

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

salary_manager

[fix] [setup_wizard] fiscal year fix for setup wizard

2013-11-25 19:51:18 +05:30

salary_slip

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

salary_slip_deduction

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

salary_slip_earning

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

salary_structure

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

salary_structure_deduction

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

salary_structure_earning

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

upload_attendance

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

__init__.py

moved directory structure

2012-09-24 19:13:42 +05:30