Nabin Hait 926f46f04a Fixed conflict while merging with master

2012-05-01 11:51:08 +05:30

..

appraisal

fix in field names

2012-04-12 14:08:43 +05:30

appraisal_goal

rename dt first cut

2012-03-30 12:29:06 +05:30

appraisal_template

fix in field names

2012-04-12 14:08:43 +05:30

appraisal_template_goal

rename dt first cut

2012-03-30 12:29:06 +05:30

attendance

fixed hr issues

2012-04-16 12:22:47 +05:30

attendance_control_panel

fix in field names

2012-04-12 14:08:43 +05:30

branch

fix in field names

2012-04-12 14:08:43 +05:30

deduction_type

fix in field names

2012-04-12 14:08:43 +05:30

department

fix in field names

2012-04-12 14:08:43 +05:30

designation

fix in field names

2012-04-12 14:08:43 +05:30

earning_type

fix in field names

2012-04-12 14:08:43 +05:30

employee

rename dt second cut

2012-03-30 18:18:36 +05:30

employee_education

rename dt first cut

2012-03-30 12:29:06 +05:30

employee_external_work_history

rename dt first cut

2012-03-30 12:29:06 +05:30

employee_internal_work_history

rename dt first cut

2012-03-30 12:29:06 +05:30

employee_training

rename dt first cut

2012-03-30 12:29:06 +05:30

employment_type

fix in field names

2012-04-12 14:08:43 +05:30

expense_claim

Fixed conflict while merging with master

2012-05-01 11:51:08 +05:30

expense_claim_detail

rename dt first cut

2012-03-30 12:29:06 +05:30

expense_claim_type

fix in field names

2012-04-12 14:08:43 +05:30

grade

fix in field names

2012-04-12 14:08:43 +05:30

holiday

rename dt first cut

2012-03-30 12:29:06 +05:30

holiday_list

fix in field names

2012-04-12 14:08:43 +05:30

leave_allocation

merge of sync handler and sync_file_db - first cut

2012-03-27 19:31:38 +05:30

leave_application

rename dt first cut

2012-03-30 12:29:06 +05:30

leave_control_panel

merge of sync handler and sync_file_db - first cut

2012-03-27 19:31:38 +05:30

leave_type

fix in field names

2012-04-12 14:08:43 +05:30

other_income_detail

merge of sync handler and sync_file_db - first cut

2012-03-27 19:31:38 +05:30

salary_manager

fix in field names

2012-04-12 14:08:43 +05:30

salary_slip

rerun of rename_dt

2012-04-02 19:12:29 +05:30

salary_slip_deduction

rename dt first cut

2012-03-30 12:29:06 +05:30

salary_slip_earning

rename dt first cut

2012-03-30 12:29:06 +05:30

salary_structure

fixed hr issues

2012-04-16 12:22:47 +05:30

salary_structure_deduction

rename dt first cut

2012-03-30 12:29:06 +05:30

salary_structure_earning

rename dt first cut

2012-03-30 12:29:06 +05:30

__init__.py

first cut for lazy loading framework

2011-09-05 18:43:09 +05:30