New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
refactor!: Remove HR and Payroll modules from ERPNext #31467
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Employee: used in Telephony, Stock, Quality, Projects, Manufacturing, Loans, Buying, Assets, Accounts, Dependent Apps: Healthcare - Holiday List: CRM (Appointment Booking), Projects, Healthcare, Support (SLA), Education (Student's Holiday List) - Branch: Selling (SMS Center), used widely as an accounting dimension - Department: Assets, Projects, SMS Center, used widely as an accounting dimension - Designation: Lead, Healthcare Practitioner, used in Employee master which will now be in core - Employee Group: Telephony, Communication - Child Tables for above dts: Employee Group Table (Employee Group), Employee Education (Employee), Employee External Work History (Employee), Employee Internal Work History (Employee), Designation Skill (Designation), Holiday (Holiday List)
- these will be added to the masters as custom fields on HRMS app setup
- change `erpnext.hr.EmployeeController` to `erpnext.setup.EmployeeController`
- moved to hrms hooks, will only be triggered if app is installed
…E events - moved them to HRMS app hooks
- Moved to the HRMS app
- moved to HRMS app
- Fixtures moved to HRMS app - 'HR' field in Terms and Conditions removed, added via HRMS setup
…ms app - Salary Slip Loan dt moved to hrms, removed from erpnext app - Repay from Salary field removed from Loan and Loan Repayment, installed on hrms app setup - fixed references to salary slip loan fields
… code from accounting - Added hooks `advance_payment_doctypes`, `invoice_doctypes`, `period_closing_doctypes` for other apps to extend accounting functionality - Removed `set_query` code from `journal_entry.js` and `payment_entry.js` - removed `update_status_for_full_and_final_statement` trigger on JE submission/cancellation - refactored `payment_entry.py`: split functions for validating reference doctypes for easy overriding, removed hrms references from `get_reference_details` and `get_payment_entry` - removed dead code: functions `get_bill_no_and_update_amounts`, `get_total_amount_exchange_rate_base_on_currency`, `get_total_amount_exchange_rate_for_employee_advance`, `get_amounts_based_on_ref_doc`, `get_amounts_based_on_reference_doctype`
- Remove `total_expense_claim` field from Project and Task, will be installed with hrms setup - Remove Expense Claim calculation from `update_costing` in project - Remove `update_total_expense_claim` from task - Remove Expense Claim references from employee form tour - Remove 'Make Expense Claim' button from Delivery Trip, will only be available if hrms is installed - Update delivery trip tests
- Project Profitability report: Projects - Employee Hours Utilization Based on Timesheet: Projects - Unpaid Expense Claims: Accounts
…orm scripts - removed approver fields and payroll cost center from Employee master - removed query filter code for HR related fields from employee and department form scripts - removed `update_approver_role`
- Employee, Holiday List, Project, Task, Timesheet
- Removed reports Provident Fund Deductions, Professional Tax Deductions, helper js file `salary_slip_deductions_report_filters.js` - Removed Gratuity rules setup for India and UAE - Removed custom field setup for India - Moved all setups to the HRMS app
- Removed template `employees_to_mark_attendance.html` - Removed HR references from ERPNext Settings and Home workspaces
… and Project Profitability from Projects workspace
ruchamahabal
force-pushed
the
hr-separation
branch
from
June 28, 2022 07:55
c9a55a3
to
5a038de
Compare
- Driver, Vehicle, Driving License Category (child table) - Removed Email Account setup for Job Applicant from setup wizard
ruchamahabal
force-pushed
the
hr-separation
branch
from
July 11, 2022 06:27
fd8d9a3
to
cd9a01b
Compare
ruchamahabal
force-pushed
the
hr-separation
branch
from
July 11, 2022 09:06
5a795ce
to
5a51951
Compare
ruchamahabal
force-pushed
the
hr-separation
branch
from
July 14, 2022 06:29
0877ec2
to
f765428
Compare
ruchamahabal
requested review from
nextchamp-saqib,
marination,
deepeshgarg007,
rohitwaghchaure,
s-aga-r and
ruthra-kumar
as code owners
July 14, 2022 06:31
ruchamahabal
force-pushed
the
hr-separation
branch
from
July 19, 2022 12:21
ba72fac
to
b30f66c
Compare
Failing checks:
|
This was referenced Jul 28, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
New App
HR & Payroll modules are now going to be a part of a new app https://github.com/frappe/hrms.
This app still depends on ERPNext.
Why not standalone?
Unlike other modules that were separated from the ERPNext core, HR and Payroll have a high dependency on the core. Some doctypes from HR are also widely used in the ERPNext core.
Separation Details
Generic
The following doctypes are used in ERPNext and hence they are moved from HR module to Setup module in ERPNext:
Fields in the above masters that are HR-specific have been removed and would be added as Custom Fields on the HRMS app setup: frappe/hrms@4d0aa1f, frappe/hrms@6a1caa7
Fields
References to HR/Payroll doctypes in other form dashboards has been removed. Its added in the HRMS app using
override_doctype_dashboards
hook: frappe/hrms@6f9ef74Removed HR reports from other modules: frappe/hrms@da9f190
HR field removed from the "Terms and Conditions" doctype. HR specific Email Templates and Notifications moved. User Type and Permission setup moved: frappe/hrms@c958762
Removed HR and Payroll links from ERPNext Workspaces
Regional
Moved HR/Payroll Code from the Regional module:
frappe/hrms@7f6a194
Loan Management
repay_from_salary
in queriesfrappe/hrms@428cb2d, frappe/hrms@00bbdae
Accounting
Removed HR/Payroll code from Payment Entry and Journal Entry:
ERPNext: 1ff0e45, 0f83e7a
HRMS: frappe/hrms@69b9519, frappe/hrms@a9b2ba1
Projects
total_expense_claim
field and Expense Claim calculation from Project and Task: frappe/hrms@68ee6e6Delivery Trip
Testing Details
To Test
ToDo