Skip to content
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.

Sign up for GitHub

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

Jump to bottom

feat: minor enhancements in Employee Promotion #30780

Merged
merged 10 commits into from
Apr 22, 2022
Merged

feat: minor enhancements in Employee Promotion #30780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cf2e6c6
fix: remove hardcoded employee fields that can be updated via Promotion
ruchamahabal Apr 9, 2022
c3dc5d5
fix: property addition not working for select fields
ruchamahabal Apr 21, 2022
a93867d
feat: add CTC fields in Employee master and Promotion
ruchamahabal Apr 22, 2022
833a33a
test: employee property update via Employee Promotion
ruchamahabal Apr 22, 2022
ed04241
Merge branch 'develop' into promotion-enhancements
ruchamahabal Apr 22, 2022
788e0a1
chore: format `employee_property_update.js`
ruchamahabal Apr 22, 2022
9b93c63
fix: tests
ruchamahabal Apr 22, 2022
cfa4dfe
fix: reset old CTC on promotion cancellation
ruchamahabal Apr 22, 2022
9d15808
chore: remove unused Employee Transfer Property doctype
ruchamahabal Apr 22, 2022
8e5327a
fix: clear property child table on changing employee
ruchamahabal Apr 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion erpnext/hr/doctype/employee/employee.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@
"holiday_list",
"default_shift",
"salary_information",
"salary_currency",
"ctc",
"salary_mode",
"payroll_cost_center",
"column_break_52",
Expand Down Expand Up @@ -807,13 +809,25 @@
"fieldtype": "Link",
"label": "Shift Request Approver",
"options": "User"
},
{
"fieldname": "salary_currency",
"fieldtype": "Link",
"label": "Salary Currency",
"options": "Currency"
},
{
"fieldname": "ctc",
"fieldtype": "Currency",
"label": "Cost to Company (CTC)",
"options": "salary_currency"
}
],
"icon": "fa fa-user",
"idx": 24,
"image_field": "image",
"links": [],
"modified": "2022-03-22 13:44:37.088519",
"modified": "2022-04-22 16:21:55.811983",
"modified_by": "Administrator",
"module": "HR",
"name": "Employee",
Expand Down
Loading