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.

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

chore: release v15 #2668

Merged
merged 38 commits into from
Jan 23, 2025
Merged
Changes from 6 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
02432da
fix(Income Tax Computation): include all tax components under Total T…
mergify[bot] Jan 14, 2025
8c801ef
fix: fetch designation in job applicant from job opening
asmitahase Jan 16, 2025
48e5128
fix: create single leave ledger entry for encashment if leave is carr…
asmitahase Jan 10, 2025
dea0135
chore: fixed linter issue
asmitahase Jan 10, 2025
853ddad
chore: test creation of leave ledger entries depending on leave type …
asmitahase Jan 13, 2025
2e0c35e
chore: better test scenarios for encashments created after leave period
asmitahase Jan 15, 2025
b3a34f8
fix: translation in payroll (backport #2644) (#2656)
mergify[bot] Jan 16, 2025
5268ffe
chore: resolved merge conflicts for modified timestamp
asmitahase Jan 17, 2025
fc1c4ba
chore: resolved merge conflicts
asmitahase Jan 17, 2025
33ac200
Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr…
asmitahase Jan 17, 2025
45382f9
Merge pull request #2652 from frappe/mergify/bp/version-15-hotfix/pr-…
asmitahase Jan 17, 2025
4128db1
Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr…
asmitahase Jan 17, 2025
c74d9d5
Merge pull request #2654 from frappe/mergify/bp/version-15-hotfix/pr-…
asmitahase Jan 17, 2025
5828ccd
fix: mark absense for default shift due to missing checkins when an a…
asmitahase Jan 8, 2025
21db30c
fix: added check for 0 absent employees
asmitahase Jan 9, 2025
51ce588
fix: removed unnecessary filter and checks for assigned shifts, mark_…
asmitahase Jan 9, 2025
6b348db
fix: updated filter to exclude past and current date shift assignment
asmitahase Jan 9, 2025
a04eb17
Merge pull request #2666 from frappe/mergify/bp/version-15-hotfix/pr-…
asmitahase Jan 20, 2025
508fa38
fix: Bank Reconciliation tool fails to match on expense claims with t…
conncampbell Jan 20, 2025
76cbd4a
fix: Bank Reconciliation tool fails with KeyError: 'payment_doctype' …
conncampbell Jan 20, 2025
d1329db
fix: gratuity calculation for 'Sum of all previous slabs' option
AyshaHakeem Dec 2, 2024
2d4d811
fix: edit test to validate accurate gratuity calculation for employee…
AyshaHakeem Dec 27, 2024
5a0fcbc
fix: further slabs need not to be checked if experience is within cur…
AyshaHakeem Jan 9, 2025
80494e0
fix: set leave encashment amount and payable account in fnf payables …
mergify[bot] Jan 21, 2025
13d7ec3
fix: set default value for total_exemption, remove tax exemption elig…
mergify[bot] Jan 21, 2025
b32e441
chore: fix linter issue for emp variable in report file (copy #2679) …
mergify[bot] Jan 21, 2025
6f955a6
Merge pull request #2675 from frappe/mergify/bp/version-15-hotfix/pr-…
nabinhait Jan 21, 2025
c7140ab
build: upgrade frappe-ui to a fixed version
ruchamahabal Jan 21, 2025
f70bb03
fix(dayjs): use non esm import for relativeTime
ruchamahabal Jan 21, 2025
10b6361
chore: update frappe-ui submodule
ruchamahabal Jan 21, 2025
6dd51d7
chore: update yarn.lock
ruchamahabal Jan 22, 2025
2206c4e
Merge pull request #2684 from frappe/mergify/bp/version-15-hotfix/pr-…
ruchamahabal Jan 22, 2025
217cc1a
refactor: fetch all employees that may have shift type as active shif…
asmitahase Jan 22, 2025
d416bef
chore: typos in the comment
asmitahase Jan 22, 2025
7fe9574
chore: filter syntax
asmitahase Jan 22, 2025
2961109
refactor: None check for process_attendance_after is unnecessary sinc…
asmitahase Jan 22, 2025
8d545ad
refactor: type check for process_attendance_date
asmitahase Jan 22, 2025
5d50429
Merge pull request #2688 from frappe/mergify/bp/version-15-hotfix/pr-…
asmitahase Jan 23, 2025
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
5 changes: 3 additions & 2 deletions hrms/hr/doctype/job_applicant/job_applicant.json
Original file line number Diff line number Diff line change
@@ -183,6 +183,7 @@
"fieldtype": "Column Break"
},
{
"fetch_from": "job_title.designation",
"fetch_if_empty": 1,
"fieldname": "designation",
"fieldtype": "Link",
@@ -194,7 +195,7 @@
"idx": 1,
"index_web_pages_for_search": 1,
"links": [],
"modified": "2023-09-14 17:03:48.838409",
"modified": "2025-01-16 13:06:05.312255",
"modified_by": "Administrator",
"module": "HR",
"name": "Job Applicant",
@@ -220,4 +221,4 @@
"states": [],
"subject_field": "notes",
"title_field": "applicant_name"
}
}
4 changes: 2 additions & 2 deletions hrms/payroll/doctype/salary_slip/salary_slip.js
Original file line number Diff line number Diff line change
@@ -287,8 +287,8 @@ frappe.ui.form.on("Salary Slip", {
const message = `
<div class="small text-muted pb-3">
${__("Note").bold()}: ${__("Payment Days calculations are based on these Payroll Settings")}:
<br><br>${__("Payroll Based On")}: ${payroll_based_on.bold()}
<br>${__("Consider Unmarked Attendance As")}: ${consider_unmarked_attendance_as.bold()}
<br><br>${__("Payroll Based On")}: ${__(payroll_based_on).bold()}
<br>${__("Consider Unmarked Attendance As")}: ${__(consider_unmarked_attendance_as).bold()}
<br>${__("Consider Marked Attendance on Holidays")}:
${
cint(include_holidays_in_total_working_days) &&