rohitwaghchaure 4444430200

Merge pull request #14108 from ESS-LLP/tax_deduction ...

Variable tax deduction

2018-05-17 13:55:52 +05:30

..

additional_salary_component

Additional Salary Component - naming and date fix

2018-05-15 19:20:51 +05:30

appraisal

Fixes ui tests

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

appraisal_goal

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

appraisal_template

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

appraisal_template_goal

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

attendance

[fix] resolved merge conflicts

2018-05-15 13:02:40 +05:30

attendance_request

Attendance Request - half day check is enabled

2018-05-14 18:34:34 +05:30

branch

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

compensatory_leave_request

[fix] syntax errors

2018-05-16 12:03:39 +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

fix for tests

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

department_approver

remove set query (#13908)

2018-05-03 16:19:56 +05:30

designation

[minor] remove in_dialog old property

2018-05-16 12:51:22 +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

Undo replace of frappe.db.sql with frappe.get_list (#14074)

2018-05-16 13:53:31 +05:30

employee_advance

Fix error

2018-05-16 16:14:34 +05:30

employee_attendance_tool

[minor] remove in_dialog old property

2018-05-16 12:51:22 +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_boarding_activity

[feature] added the employee onboarding and separation doctype

2018-05-14 20:27:00 +05:30

employee_education

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

employee_external_work_history

[minor] remove in_dialog old property

2018-05-16 12:51:22 +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

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

employee_onboarding

[enterprise] minor fixes

2018-05-16 14:51:25 +05:30

employee_onboarding_activity

[feature] added the employee onboarding and separation doctype

2018-05-14 20:27:00 +05:30

employee_onboarding_template

[feature] added the employee onboarding and separation doctype

2018-05-14 20:27:00 +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_separation

[feature] added the employee onboarding and separation doctype

2018-05-14 20:27:00 +05:30

employee_separation_template

[feature] added the employee onboarding and separation doctype

2018-05-14 20:27:00 +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

Exemption Declaration - field total_amount

2018-05-16 19:10:35 +05:30

employee_tax_exemption_declaration_category

update hr menu, field subcategory in child table

2018-05-10 15:04:32 +05:30

employee_tax_exemption_proof_submission

[fix] syntax errors

2018-05-16 12:03:39 +05:30

employee_tax_exemption_proof_submission_detail

update hr menu, field subcategory in child table

2018-05-10 15:04:32 +05:30

employee_tax_exemption_sub_category

Doctype Employee Tax Exemption Sub Category

2018-05-10 15:02:57 +05:30

employee_transfer

typo in frappe.throw in employee_transfer

2018-05-17 01:34:35 +05:30

employee_transfer_property

New DocTypes for HR Module (#13650)

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

employment_type

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

expense_claim

Fetch mandatory reqd from server side (#13924)

2018-05-04 17:51:10 +05:30

expense_claim_account

[minor] remove in_dialog old property

2018-05-16 12:51:22 +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

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

holiday

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

holiday_list

removed color field from sales order and work order

2018-05-01 18:56:06 +05:30

hr_settings

Fixed merge conflict

2018-05-05 12:19:14 +05:30

identification_document_type

[rename] Photo ID -> Identification Document

2018-05-16 14:12:22 +05:30

interest

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

job_applicant

[minor] remove in_dialog old property

2018-05-16 12:51:22 +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

set query for department based on company

2018-05-14 16:07:28 +05:30

leave_allocation

fix Leave Encashment unlink additional component, readonly encashed days

2018-05-15 20:11:30 +05:30

leave_application

[Fix] onload set default employee, leave approver, company

2018-05-16 19:55:52 +05:30

leave_block_list

fix for tests

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

leave_block_list_allow

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

leave_block_list_date

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

leave_control_panel

set query for department based on company

2018-05-14 16:07:28 +05:30

leave_encashment

[fix] syntax errors

2018-05-16 12:03:39 +05:30

leave_period

[fix] syntax errors

2018-05-16 12:03:39 +05:30

leave_policy

Leave Policy - Validate Annual alloction for leave type

2018-05-08 12:36:51 +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

duplicate field is_encash removed, fixed in install fixtures

2018-05-15 12:27:23 +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

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

payroll_employee_detail

removed process payroll doctype

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

payroll_entry

Resolve merge conflicts from enterprise_sprint branch

2018-05-14 21:15:46 +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

purpose_of_travel

[feature] added travel request doctype in HR

2018-05-16 11:02:28 +05:30

repayment_schedule

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

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

retention_bonus

[enterprise] minor fixes

2018-05-16 14:51:25 +05:30

salary_component

Salary Slip calc tax, except for flexi benefits

2018-05-16 23:01:40 +05:30

salary_detail

fields in salary detail, copy data from salary component on change

2018-05-16 22:59:21 +05:30

salary_slip

get_payroll_period return name, fix hard coded leave period

2018-05-17 10:00:33 +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

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

salary_structure

fields in salary detail, copy data from salary component on change

2018-05-16 22:59:21 +05:30

salary_structure_assignment

helper method to get employees assigned salary structure

2018-05-15 12:36:42 +05:30

salary_structure_employee

[minor] remove in_dialog old property

2018-05-16 12:51:22 +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

set query for department based on company

2018-05-14 16:07:28 +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

Salary Slip calc tax, except for flexi benefits

2018-05-16 23:01:40 +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

[minor] remove in_dialog old property

2018-05-16 12:51:22 +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

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

travel_itinerary

[feature] added travel request doctype in HR

2018-05-16 11:02:28 +05:30

travel_request

Added the travel request on the config page

2018-05-16 18:09:43 +05:30

travel_request_costing

[feature] added travel request doctype in HR

2018-05-16 11:02:28 +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

[minor] remove in_dialog old property

2018-05-16 12:51:22 +05:30

__init__.py

moved modules inside erpnext folder

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