Nabin Hait a469e659c5 Fixed merge conflict

2016-11-08 15:26:27 +05:30

..

appraisal

[minor] added default standard filters (#6854)

2016-11-07 17:19:19 +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

[minor] added default standard filters (#6854)

2016-11-07 17:19:19 +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

[minor] added default standard filters (#6854)

2016-11-07 17:19:19 +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

[minor] added default standard filters (#6854)

2016-11-07 17:19:19 +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

[minor] added default standard filters (#6854)

2016-11-07 17:19:19 +05:30

hr_settings

preferred email for payroll

2016-09-21 11:36:01 +08:00

interest

Moved Intrest to HR module

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

job_applicant

[minor] added default standard filters (#6854)

2016-11-07 17:19:19 +05:30

job_opening

[minor] added default standard filters (#6854)

2016-11-07 17:19:19 +05:30

leave_allocation

[minor] added default standard filters (#6854)

2016-11-07 17:19:19 +05:30

leave_application

[minor] added default standard filters (#6854)

2016-11-07 17:19:19 +05:30

leave_block_list

set remember last selected value as true for company field

2016-11-03 16:19:34 +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] added default standard filters (#6854)

2016-11-07 17:19:19 +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

Merge pull request #6723 from rohitwaghchaure/enhancement_remember_last_selected_value

2016-11-04 16:13:49 +05:30

salary_component

[minor] added default standard filters (#6854)

2016-11-07 17:19:19 +05:30

salary_detail

Salary Slip fields in Condition and Formula

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

salary_slip

Fixed merge conflict

2016-11-08 15:26:27 +05:30

salary_slip_timesheet

[fix] make grids editable

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

salary_structure

[minor] added default standard filters (#6854)

2016-11-07 17:19:19 +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