Nabin Hait 4ecc785aab fixed conflict

2012-12-19 12:18:15 +05:30

..

appraisal

changed old type txt to new type txtt

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

appraisal_goal

changed old type txt to new type txtt

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

appraisal_template

changed old type txt to new type txtt

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

appraisal_template_goal

changed old type txt to new type txtt

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

attendance

doctype, attendance, sandbox fix

2012-12-13 14:24:15 +05:30

attendance_control_panel

changed old type txt to new type txtt

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

branch

changed old type txt to new type txtt

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

deduction_type

changed old type txt to new type txtt

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

department

changed old type txt to new type txtt

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

designation

changed old type txt to new type txtt

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

earning_type

changed old type txt to new type txtt

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

employee

refactored javascript models

2012-12-13 12:53:21 +05:30

employee_education

changed old type txt to new type txtt

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

employee_external_work_history

fixed employee permissions, fixed bug in import_merge of timestamps

2012-11-30 12:02:00 +05:30

employee_internal_work_history

changed old type txt to new type txtt

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

employee_training

changed old type txt to new type txtt

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

employment_type

changed old type txt to new type txtt

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

expense_claim

Expense Claim option removed from authorization rule

2012-12-12 11:03:16 +05:30

expense_claim_detail

refactored leave and expense

2012-12-05 14:27:50 +05:30

expense_claim_type

changed old type txt to new type txtt

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

grade

changed old type txt to new type txtt

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

holiday

changed old type txt to new type txtt

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

holiday_list

changed old type txt to new type txtt

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

leave_allocation

changed old type txt to new type txtt

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

leave_application

modified timestamp

2012-12-19 10:35:09 +05:30

leave_control_panel

merged with master

2012-12-14 10:43:56 +05:30

leave_type

changed old type txt to new type txtt

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

other_income_detail

changed old type txt to new type txtt

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

salary_manager

merged with master

2012-12-14 10:43:56 +05:30

salary_slip

removed basic info section

2012-12-03 17:27:21 +05:30

salary_slip_deduction

changed old type txt to new type txtt

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

salary_slip_earning

changed old type txt to new type txtt

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

salary_structure

refactored javascript models

2012-12-13 12:53:21 +05:30

salary_structure_deduction

changed old type txt to new type txtt

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

salary_structure_earning

changed old type txt to new type txtt

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

__init__.py

moved directory structure

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