Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
brotherton-erpnext/erpnext/hr/doctype
History
Vishal Dhayagude 2ae87876b6 fix: salary structure assignment filter employee based on company (#20318) 
* fix: pick company from employee salary structure

* fix: Salary structure assignment fetch company from enmployee

* Revert "fix: Salary structure assignment fetch company from enmployee"

This reverts commit ab2da691c79646d6d095f347ea3e273f466ee34f.

* fix: Salary structure assignment fetch company from enmployee

* fix: filter on company for salary structure assignment

* fix: minor changes

* fix: minor changes

* fix: added company to salary strucutre assignment
2020-01-17 11:44:11 +05:30
..
additional_salary
fix: Additional salary, Department, driver, loan, salary slip, shift,Travel request form UI
2019-12-31 17:18:15 +05:30
appraisal
Fix: Precision in Appraisals (#17673)
2019-05-27 13:57:56 +05:30
appraisal_goal
[minor] remove in_dialog old property
2018-05-16 12:51:22 +05:30
appraisal_template
feat: dashboards for HR module
2019-06-14 14:10:47 +05:30
appraisal_template_goal
[minor] remove in_dialog old property
2018-05-16 12:51:22 +05:30
attendance
feat: Mark Unmarked Attendance (#20062)
2019-12-31 17:09:56 +05:30
attendance_request
fix: Atendance Request, Employee Skill Map, Leave Encashment form UI
2019-12-31 17:18:15 +05:30
branch
[minor] remove in_dialog old property
2018-05-16 12:51:22 +05:30
compensatory_leave_request
fix(compensatory leave request): Create leave ledger entry on submit/cancel (#19476)
2019-12-09 14:27:38 +05:30
daily_work_summary
fix: Project update status code and design refactored
2019-01-17 19:21:44 +05:30
daily_work_summary_group
refactor(HR): Auto Attendance
2019-06-24 15:15:38 +05:30
daily_work_summary_group_user
[Enhance] Department added wherever applicable (#14121)
2018-05-23 11:11:36 +05:30
department
fix: Additional salary, Department, driver, loan, salary slip, shift,Travel request form UI
2019-12-31 17:18:15 +05:30
department_approver
feat: fetch leave approver from both employee and department approvers (#19613)
2019-11-19 15:07:30 +05:30
designation
Enhancement(HR): hiring process (#18129)
2019-07-22 11:47:53 +05:30
designation_skill
feat: Add employee training section to the employee skill map
2019-04-18 12:46:33 +05:30
driver
fixes: internal issues (#19201)
2019-10-11 11:09:10 +05:30
driving_license_category
fix: Additional salary, Department, driver, loan, salary slip, shift,Travel request form UI
2019-12-31 17:18:15 +05:30
employee
fix: Employee form UI
2019-12-31 17:18:14 +05:30
employee_advance
fix: Multiple fixes based on testing on pre-release branch (#20301)
2020-01-16 13:37:25 +05:30
employee_attendance_tool
fix: Mark attendance from employee attendance tool (#19627)
2019-11-21 17:58:18 +05:30
employee_benefit_application
fix: change formatting
2019-06-17 19:03:46 +05:30
employee_benefit_application_detail
Refactor Naming Series (#15070)
2018-08-28 13:44:48 +05:30
employee_benefit_claim
refactor: added missing translation functions (#18143)
2019-07-03 15:15:08 +05:30
employee_boarding_activity
fix: set task weight from onboarding template (#17840)
2019-06-05 10:26:01 +05:30
employee_checkin
fix(auto attendance): handling None case for IN/OUT Logs (#18867)
2019-09-05 15:02:33 +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
Merge branch 'staging' into develop
2019-01-29 18:39:14 +05:30
employee_group
feat(Support): Service Level Agreements (#16828)
2019-03-19 16:47:56 +05:30
employee_group_table
feat: Add user_id of employee to employee group
2019-06-06 14:47:40 +05:30
employee_health_insurance
Renamed Health Insurance to Employee Health Insurance
2018-04-26 12:16:17 +05:30
employee_incentive
fix: Employee incentive form UI
2019-12-31 17:18:15 +05:30
employee_internal_work_history
[minor] remove in_dialog old property
2018-05-16 12:51:22 +05:30
employee_loan
Replace 'Make' with 'Create'
2018-12-23 13:25:58 +05:30
employee_onboarding
fix(employee onboarding): stop showing irrelevant job offer links for a job applicant (#20053)
2019-12-23 19:02:29 +05:30
employee_onboarding_activity
[feature] added the employee onboarding and separation doctype
2018-05-14 20:27:00 +05:30
employee_onboarding_template
feat: dashboards for HR module
2019-06-14 14:10:47 +05:30
employee_promotion
Refactor Naming Series (#15070)
2018-08-28 13:44:48 +05:30
employee_property_history
minor fixes
2018-05-07 16:11:35 +05:30
employee_separation
Feat: Notify by email feature (#18587)
2019-08-05 10:07:05 +05:30
employee_separation_template
feat: dashboards for HR module
2019-06-14 14:10:47 +05:30
employee_skill
feat: Add employee training section to the employee skill map
2019-04-18 12:46:33 +05:30
employee_skill_map
fix: Atendance Request, Employee Skill Map, Leave Encashment form UI
2019-12-31 17:18:15 +05:30
employee_tax_exemption_category
refactor: Employee Tax Exemption
2019-04-25 18:53:39 +05:30
employee_tax_exemption_declaration
refator: Payroll processing and tax calculation (#17617)
2019-05-16 11:23:04 +05:30
employee_tax_exemption_declaration_category
fix: a few fixes in payroll
2019-05-01 12:17:47 +05:30
employee_tax_exemption_proof_submission
refator: Payroll processing and tax calculation (#17617)
2019-05-16 11:23:04 +05:30
employee_tax_exemption_proof_submission_detail
refactor: Employee Tax Exemption
2019-04-25 18:53:39 +05:30
employee_tax_exemption_sub_category
refactor: Employee Tax Exemption
2019-04-25 18:53:39 +05:30
employee_training
feat: Add training date field
2019-04-22 23:35:36 +05:30
employee_transfer
Refactor Naming Series (#15070)
2018-08-28 13:44:48 +05:30
employee_transfer_property
New DocTypes for HR Module (#13650)
2018-04-26 12:10:13 +05:30
employment_type
perms: fix default import, export perms
2018-08-29 17:10:27 +05:30
expense_claim
fix: Multiple fixes based on testing on pre-release branch (#20301)
2020-01-16 13:37:25 +05:30
expense_claim_account
[minor] remove in_dialog old property
2018-05-16 12:51:22 +05:30
expense_claim_advance
fix: Multiple fixes based on testing on pre-release branch (#20301)
2020-01-16 13:37:25 +05:30
expense_claim_detail
fix: Expense calim form UI
2019-12-31 17:18:15 +05:30
expense_claim_type
fix: Expense calim form UI
2019-12-31 17:18:15 +05:30
expense_taxes_and_charges
fix: Expense calim form UI
2019-12-31 17:18:15 +05:30
holiday
[minor] remove in_dialog old property
2018-05-16 12:51:22 +05:30
holiday_list
refactor(HR): Auto Attendance
2019-06-24 15:15:38 +05:30
hr_settings
fix: UX improvement. move trigger on fieldname restrict_backdated_leave_application (#20211)
2020-01-07 13:02:13 +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
feat(job-applicant): allow rename/merge with existing
2019-09-26 12:29:41 +05:30
job_applicant_source
Job Applicant Source (#14543)
2018-06-21 10:47:54 +05:30
job_offer
feat: add job applicant's email in job offer (#20153)
2019-12-31 17:09:02 +05:30
job_offer_term
Rename Offer Letter to Job Offer (#12934)
2018-02-16 10:49:34 +05:30
job_opening
feat: dashboards for HR module
2019-06-14 14:10:47 +05:30
leave_allocation
fix(compensatory leave request): Create leave ledger entry on submit/cancel (#19476)
2019-12-09 14:27:38 +05:30
leave_application
feat: Backdated leave application (#20201)
2020-01-07 11:48:38 +05:30
leave_block_list
fix(unicode): Import unicode_literals in every file
2019-01-22 18:36:10 +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
fix: Additional salary, Department, driver, loan, salary slip, shift,Travel request form UI
2019-12-31 17:18:15 +05:30
leave_encashment
fix: Atendance Request, Employee Skill Map, Leave Encashment form UI
2019-12-31 17:18:15 +05:30
leave_ledger_entry
fix: process allocation expiry
2019-08-27 22:37:12 +05:30
leave_period
fix(compensatory leave request): Create leave ledger entry on submit/cancel (#19476)
2019-12-09 14:27:38 +05:30
leave_policy
feat: add link to policy
2019-06-05 21:16:27 +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
fix: Leave Type form UI
2019-12-31 17:18:15 +05:30
loan
fix: Additional salary, Department, driver, loan, salary slip, shift,Travel request form UI
2019-12-31 17:18:15 +05:30
loan_application
fix: loan application (#18882)
2019-09-02 15:59:44 +05:30
loan_type
feat: dashboards for HR module
2019-06-14 14:10:47 +05:30
offer_term
[minor] remove in_dialog old property
2018-05-16 12:51:22 +05:30
payroll_employee_detail
fix: modified date (#16520)
2019-01-30 11:46:34 +05:30
payroll_entry
feat: fixed party and party type in Accrual journal entry (#20021)
2019-12-23 15:50:29 +05:30
payroll_period
fix: Missing commits from hotfix branch (#17997)
2019-07-03 10:34:31 +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
modified: erpnext/hr/doctype/repayment_schedule/repayment_schedule.json (#19470)
2019-11-29 18:00:30 +05:30
retention_bonus
feat: Employee Incentive and Retention Bonus added in Salary Slip (Additional Salary) (#18647)
2019-09-03 20:45:52 +05:30
salary_component
fix: Missing commits from hotfix branch (#17997)
2019-07-03 10:34:31 +05:30
salary_detail
fix: minor field arrangements
2019-12-31 17:18:15 +05:30
salary_slip
fix: minor field arrangements
2019-12-31 17:18:15 +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: Removed precision from multiple doctypes
2019-02-19 08:40:16 +05:30
salary_structure
fix: salary structure assignment filter employee based on company (#20318)
2020-01-17 11:44:11 +05:30
salary_structure_assignment
fix: set currency to company default currency (#20157)
2019-12-31 17:23:31 +05:30
shift_assignment
fix: Additional salary, Department, driver, loan, salary slip, shift,Travel request form UI
2019-12-31 17:18:15 +05:30
shift_request
feat: dashboards for HR module
2019-06-14 14:10:47 +05:30
shift_type
feat: Mark Unmarked Attendance (#20062)
2019-12-31 17:09:56 +05:30
skill
feat: Add skill child table to designation doctype
2019-04-16 10:19:53 +05:30
staffing_plan
enhancement: Item-wise sales history report (#19500)
2019-11-11 10:54:12 +05:30
staffing_plan_detail
Enhancement(HR): hiring process (#18129)
2019-07-22 11:47:53 +05:30
taxable_salary_slab
fix: misleading condition example in field options
2019-04-09 18:10:41 +05:30
training_event
fix: requested Changes
2019-06-14 14:10:48 +05:30
training_event_employee
fix: modified date (#16520)
2019-01-30 11:46:34 +05:30
training_feedback
fix(hr): Use event_status instead of status
2019-05-09 19:00:05 +05:30
training_program
fix(unicode): Import unicode_literals in every file
2019-01-22 18:36:10 +05:30
training_result
Refactor Naming Series (#15070)
2018-08-28 13:44:48 +05:30
training_result_employee
fix: modified date (#16520)
2019-01-30 11:46:34 +05:30
travel_itinerary
[feature] added travel request doctype in HR
2018-05-16 11:02:28 +05:30
travel_request
fix: Additional salary, Department, driver, loan, salary slip, shift,Travel request form UI
2019-12-31 17:18:15 +05:30
travel_request_costing
[feature] added travel request doctype in HR
2018-05-16 11:02:28 +05:30
upload_attendance
fix: upload attendance template not marking attendance
2019-09-18 13:11:30 +05:30
vehicle
fix: requested Changes
2019-06-14 14:10:48 +05:30
vehicle_log
feat: change the claim amount in expenses to amount
2019-06-12 12:52:02 +05:30
vehicle_service
[minor] remove in_dialog old property
2018-05-16 12:51:22 +05:30
__init__.py
…