Nabin Hait 80499bb657 Fixed merge conflict

2016-09-29 14:18:53 +05:30

..

appraisal

[fix] #6254

2016-09-06 18:28:41 +05:30

appraisal_goal

[fix] make grids editable

2016-07-11 13:01:58 +05:30

appraisal_template

[cleanup] link dashboard for customer, supplier, item, employee and hide form by default

2016-04-13 17:22:09 +05:30

appraisal_template_goal

[fix] make grids editable

2016-07-11 13:01:58 +05:30

attendance

Removed from Attendance, Upload Attendance, and Sales Order

2016-03-11 13:07:16 +05:30

branch

[fix] quick entry

2016-07-25 15:03:39 +05:30

department

Assigned permissions for Academic User role in Department

2016-08-01 12:51:04 +05:30

designation

[minor] make task editable in project and add description to designation fixing #5361

2016-06-01 12:52:50 +05:30

employee

[Fix] Image is copied when duplicate supplier, employee

2016-09-21 18:13:16 +05:30

employee_attendance_tool

[fixes] set todays date on employee attendance tool

2016-03-20 19:00:26 +05:30

employee_education

[fix] make grids editable

2016-07-11 13:01:58 +05:30

employee_external_work_history

[fix] make grids editable

2016-07-11 13:01:58 +05:30

employee_internal_work_history

[fix] make grids editable

2016-07-11 13:01:58 +05:30

employee_leave_approver

[fix] make grids editable

2016-07-11 13:01:58 +05:30

employment_type

[fix] homepage patch

2016-07-22 21:01:39 +05:30

expense_claim

[fix] test case fix for expense claim

2016-07-19 11:38:16 +05:30

expense_claim_account

[enhance] Add Accounts table in to mention expense account based on company #5777

2016-07-19 11:38:16 +05:30

expense_claim_detail

[fix] make grids editable

2016-07-11 13:01:58 +05:30

expense_claim_type

[fix] test case fix for expense claim

2016-07-19 11:38:16 +05:30

holiday

[fix] make grids editable

2016-07-11 13:01:58 +05:30

holiday_list

added required fields in doctypes for gantt (#6466)

2016-09-26 18:20:14 +05:30

hr_settings

[WIP] Formula based Salary Structure and multiple employees for same Salary Structure

2016-08-18 13:02:39 +05:30

interest

Moved Intrest to HR module

2016-08-01 15:18:36 +05:30

job_applicant

[minor] set applicant name automatically

2016-07-15 16:43:25 +05:30

job_opening

Added Student Admissions (#6359)

2016-09-15 14:48:13 +05:30

leave_allocation

Merge pull request #6325 from RobertSchouten/patch-26

2016-09-20 11:00:31 +05:30

leave_application

Fixed merge conflict

2016-09-29 14:18:53 +05:30

leave_block_list

Removed from Leave Block List and Monthly Attendance List

2016-03-11 13:07:49 +05:30

leave_block_list_allow

[fix] make grids editable

2016-07-11 13:01:58 +05:30

leave_block_list_date

[fix] make grids editable

2016-07-11 13:01:58 +05:30

leave_control_panel

[Fix] Allocate leaves only to active employees

2016-05-05 15:16:39 +05:30

leave_type

[cleanup] leave application

2016-02-08 10:53:22 +05:30

offer_letter

[minor] moved make_employee from Employee to Offer Letter

2016-02-16 15:53:09 +05:30

offer_letter_term

[fix] make grids editable

2016-07-11 13:01:58 +05:30

offer_term

[fix] quick entry

2016-07-25 15:03:39 +05:30

process_payroll

added posting date to process payroll and salary slip

2016-09-20 08:19:05 +08:00

salary_component

'Type' field added to Salary Component

2016-08-29 15:26:57 +05:30

salary_detail

Salary Slip fields in Condition and Formula

2016-09-20 14:59:42 +05:30

salary_slip

[Fix]Salary Slip can be created without salary structure

2016-09-24 18:56:56 +05:30

salary_slip_timesheet

[fix] make grids editable

2016-07-11 13:01:58 +05:30

salary_structure

[Fix]Salary Slip can be created without salary structure

2016-09-24 18:56:56 +05:30

salary_structure_employee

[WIP] Formula based Salary Structure and multiple employees for same Salary Structure

2016-08-18 13:02:39 +05:30

upload_attendance

[fixed] frappe.require is now async 💥

2016-04-29 17:22:42 +05:30

__init__.py

moved modules inside erpnext folder

2013-12-11 10:43:52 +05:30