Skip to content

[pull] develop from frappe:develop #341

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

Merged
pull merged 4 commits into from
May 27, 2026
Merged

[pull] develop from frappe:develop #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
535c205
fix: Swedish translations
frappe-pr-bot May 26, 2026
2d1fc55
fix: Add missing perm checks
deepeshgarg007 May 27, 2026
5feb28d
Merge pull request #4592 from frappe/l10n_develop
asmitahase May 27, 2026
7471aad
Merge pull request #4594 from deepeshgarg007/perm_fixes
deepeshgarg007 May 27, 2026
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
2 changes: 2 additions & 0 deletions hrms/hr/doctype/interview/interview.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,8 @@ def get_recipients(name, for_feedback=0):

@frappe.whitelist()
def get_feedback(interview: str) -> list[dict]:
frappe.has_permission("Interview Feedback", "read", throw=True)

interview_feedback = frappe.qb.DocType("Interview Feedback")
employee = frappe.qb.DocType("Employee")

Expand Down
6 changes: 3 additions & 3 deletions hrms/locale/sv.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: frappe\n"
"Report-Msgid-Bugs-To: contact@frappe.io\n"
"POT-Creation-Date: 2026-05-24 10:09+0000\n"
"PO-Revision-Date: 2026-05-25 11:49\n"
"PO-Revision-Date: 2026-05-26 11:53\n"
"Last-Translator: contact@frappe.io\n"
"Language-Team: Swedish\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -4723,7 +4723,7 @@ msgstr "Personal & Lön"

#: hrms/setup.py:67
msgid "HR & Payroll Settings"
msgstr "Personal & Lön Inställningar"
msgstr "Personal & Löneinställningar"

#. Name of a DocType
#. Label of a Link in the HR Setup Workspace
Expand Down Expand Up @@ -7833,7 +7833,7 @@ msgstr "Lönerapporter"
#: hrms/hr/workspace/hr_setup/hr_setup.json
#: hrms/payroll/doctype/payroll_settings/payroll_settings.json
msgid "Payroll Settings"
msgstr "Lön Inställningar"
msgstr "Löneinställningar"

#: hrms/payroll/doctype/additional_salary/additional_salary.py:158
msgid "Payroll date can not be greater than employee's relieving date."
Expand Down
2 changes: 1 addition & 1 deletion hrms/subscription_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
]


@frappe.whitelist(allow_guest=True)
@frappe.whitelist()
def get_add_on_details(plan: str) -> dict[str, int]:
"""
Returns the number of employees to be billed under add-ons for SAAS subscription
Expand Down
Loading