Jamsheer 46b23f8e6e Salary Structure Refactor, Formula on Salary Component Master (#13967) ...

* Salary structure refactor

* Salary Structure Assignment - filters applied

* Formula on Salary Component Master

* Salary Structure - filter updated, Salary Component - fields re-arranged

* Payroll Entry - get_employee_list fix

* Salary Structure Assignment - Validate Duplicate Assignment

* Salary Structure Assignment - filters for salary structure

2018-05-11 21:05:24 +05:30

..

appraisal

Fixes ui tests

2017-09-14 16:45:47 +05:30

appraisal_goal

[fix] make grids editable

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

appraisal_template

Time out increased for appraisal template

2017-09-15 18:56:49 +05:30

appraisal_template_goal

[fix] make grids editable

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

attendance

Data import Tool bug fix (#13165)

2018-03-09 12:33:13 +05:30

attendance_request

Removed employee table from Salary Structure and added employee name in all forms

2018-04-26 12:14:01 +05:30

branch

Fix travis (#11882)

2017-12-08 14:57:38 +05:30

compensatory_leave_request

Removed employee table from Salary Structure and added employee name in all forms

2018-05-02 14:33:37 +05:30

daily_work_summary

Daily work summary refactor (#12944)

2018-02-21 15:15:43 +05:30

daily_work_summary_group

Daily work summary refactor (#12944)

2018-02-21 15:15:43 +05:30

daily_work_summary_group_user

Daily work summary refactor (#12944)

2018-02-21 15:15:43 +05:30

department

Company field added in department

2018-04-26 12:16:38 +05:30

department_approver

[Enhancement] Leave Application and Expense Claim (#13645)

2018-04-19 20:58:52 -08:00

designation

Fix travis (#11882)

2017-12-08 14:57:38 +05:30

driver

[New Feature] Delivery

2017-11-20 10:28:49 +08:00

driving_license_category

[New Feature] Delivery

2017-11-20 10:28:49 +08:00

employee

Merge branch 'multi-company-transations' of https://github.com/shreyashah115/erpnext into shreyashah115-multi-company-transations

2018-05-07 13:12:16 +05:30

employee_advance

[Feature] Advance Account Balance in Employee Advance (#13263)

2018-03-20 12:35:02 +05:30

employee_attendance_tool

Fixes ui tests

2017-09-14 16:45:47 +05:30

employee_benefit_application

Removed employee table from Salary Structure and added employee name in all forms

2018-04-26 12:14:01 +05:30

employee_benefit_application_detail

New doctypes for HR and Accounting (#13652)

2018-04-26 12:12:29 +05:30

employee_benefit_claim

minor fixes

2018-05-07 16:11:35 +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_grade

New doctypes for HR and Accounting (#13652)

2018-04-26 12:12:29 +05:30

employee_health_insurance

Renamed Health Insurance to Employee Health Insurance

2018-04-26 12:16:17 +05:30

employee_incentive

Removed employee table from Salary Structure and added employee name in all forms

2018-04-26 12:14:01 +05:30

employee_internal_work_history

[fix] make grids editable

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

employee_promotion

Employee Promotion, Transfer - test submit before date, create new employee

2018-05-05 13:43:15 +05:30

employee_property_history

minor fixes

2018-05-07 16:11:35 +05:30

employee_tax_exemption_category

New doctypes for HR and Accounting (#13652)

2018-04-26 12:12:29 +05:30

employee_tax_exemption_declaration

New doctypes for HR and Accounting (#13652)

2018-04-26 12:12:29 +05:30

employee_tax_exemption_declaration_category

New doctypes for HR and Accounting (#13652)

2018-04-26 12:12:29 +05:30

employee_tax_exemption_proof_submission

New doctypes for HR and Accounting (#13652)

2018-04-26 12:12:29 +05:30

employee_tax_exemption_proof_submission_detail

New doctypes for HR and Accounting (#13652)

2018-04-26 12:12:29 +05:30

employee_transfer

minor fix

2018-05-07 12:22:57 +05:30

employee_transfer_property

New DocTypes for HR Module (#13650)

2018-04-26 12:10:13 +05:30

employment_type

Fix travis (#11882)

2017-12-08 14:57:38 +05:30

expense_claim

[Enhancement] Leave Application and Expense Claim (#13645)

2018-04-19 20:58:52 -08:00

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_advance

Employee advance (#11875)

2017-12-14 13:25:57 +05:30

expense_claim_detail

[Minor] Populate Expense Claim Description from Expense Claim Type (#11156)

2017-10-17 17:23:26 +05:30

expense_claim_type

Fix travis (#11882)

2017-12-08 14:57:38 +05:30

holiday

[fix] make grids editable

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

holiday_list

[fix] cal view start end date field discrepancies

2018-04-23 13:32:59 +05:30

hr_settings

[Enhancement] Leave Application and Expense Claim (#13645)

2018-04-19 20:58:52 -08:00

interest

Moved Intrest to HR module

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

job_applicant

Rename Offer Letter to Job Offer (#12934)

2018-02-16 10:49:34 +05:30

job_offer

Rename Offer Letter to Job Offer (#12934)

2018-02-16 10:49:34 +05:30

job_offer_term

Rename Offer Letter to Job Offer (#12934)

2018-02-16 10:49:34 +05:30

job_opening

Staffing plan for group company

2018-05-08 18:36:14 +05:30

leave_allocation

Data import Tool bug fix (#13165)

2018-03-09 12:33:13 +05:30

leave_application

Optional leave (#13931)

2018-05-07 12:43:08 +05:30

leave_block_list

self.assertEqual

2018-02-28 21:13:51 +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

New doctypes for HR and Accounting (#13652)

2018-04-26 12:12:29 +05:30

leave_encashment

Removed employee table from Salary Structure and added employee name in all forms

2018-04-26 12:14:01 +05:30

leave_period

Merge branch 'enterprise_sprint' of https://github.com/frappe/erpnext into enterprise_sprint

2018-05-07 16:13:33 +05:30

leave_policy

Removed employee table from Salary Structure and added employee name in all forms

2018-04-26 12:14:01 +05:30

leave_policy_detail

Removed employee table from Salary Structure and added employee name in all forms

2018-04-26 12:14:01 +05:30

leave_type

Optional leave (#13931)

2018-05-07 12:43:08 +05:30

loan

Loan Management for the Members (Non Profit Module) (#13149)

2018-04-24 12:19:36 +05:30

loan_application

Loan Management for the Members (Non Profit Module) (#13149)

2018-04-24 12:19:36 +05:30

loan_type

Minor fix for ui tests

2017-09-15 19:35:12 +05:30

offer_term

[fix] quick entry

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

payroll_employee_detail

removed process payroll doctype

2017-12-04 16:49:44 +05:30

payroll_entry

Salary Structure Refactor, Formula on Salary Component Master (#13967)

2018-05-11 21:05:24 +05:30

payroll_period

New doctypes for HR and Accounting (#13652)

2018-04-26 12:12:29 +05:30

payroll_period_date

New doctypes for HR and Accounting (#13652)

2018-04-26 12:12:29 +05:30

repayment_schedule

Loan Management for the Members (Non Profit Module) (#13149)

2018-04-24 12:19:36 +05:30

salary_component

Salary Structure Refactor, Formula on Salary Component Master (#13967)

2018-05-11 21:05:24 +05:30

salary_detail

Payroll feature (#10900)

2017-10-05 15:59:51 +05:30

salary_slip

Salary Structure Refactor, Formula on Salary Component Master (#13967)

2018-05-11 21:05:24 +05:30

salary_slip_loan

Loan Management for the Members (Non Profit Module) (#13149)

2018-04-24 12:19:36 +05:30

salary_slip_timesheet

[fix] make grids editable

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

salary_structure

Salary Structure Refactor, Formula on Salary Component Master (#13967)

2018-05-11 21:05:24 +05:30

salary_structure_assignment

Salary Structure Refactor, Formula on Salary Component Master (#13967)

2018-05-11 21:05:24 +05:30

salary_structure_employee

[Minor] Company default currency in Salary Slip and Structure

2017-02-23 11:16:53 +05:30

shift_assignment

minor fixes

2018-05-07 16:11:35 +05:30

shift_request

Shift Management - Documentation and Tests (#13997)

2018-05-11 21:03:50 +05:30

shift_type

Shift Management - Documentation and Tests (#13997)

2018-05-11 21:03:50 +05:30

staffing_plan

Staffing plan for group company

2018-05-08 18:36:14 +05:30

staffing_plan_detail

Staffing Plan - validations, get employee count on designation change, calc estimated cost

2018-05-07 13:54:49 +05:30

taxable_salary_slab

New doctypes for HR and Accounting (#13652)

2018-04-26 12:12:29 +05:30

training_event

[Fix] Filter on child table not working in Calendar (#11824)

2017-12-04 11:22:25 +05:30

training_event_employee

[minor] Add "Attendance" in grid view for Training Event Employee (#11063)

2017-10-05 14:20:43 +05:30

training_feedback

[fix] trainig_feedback.py

2017-09-07 10:43:36 +05:30

training_program

[minor] Set Rename for Training Program (#11740)

2017-11-28 11:26:23 +05:30

training_result

[fixes] email notifications by email alert on training event and result

2017-08-14 11:53:34 +05:30

training_result_employee

Test for training (#10545)

2017-08-25 12:01:04 +05:30

upload_attendance

[minor] remove unnecessary description in upload attendance, fixes #10603

2017-11-14 12:52:53 +05:30

vehicle

[fix] Asset test cases and added make_sales_invoice (#11800)

2017-11-30 15:59:40 +05:30

vehicle_log

[fix] Asset test cases and added make_sales_invoice (#11800)

2017-11-30 15:59:40 +05:30

vehicle_service

Fleet management moved to HR

2017-01-16 14:38:24 +05:30

__init__.py

moved modules inside erpnext folder

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