Skip to content

[pull] develop from frappe:develop #364

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 5 commits into from
Jun 19, 2026
Merged

[pull] develop from frappe:develop #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a637f08
fix(payroll): use Salary Component Account for company filtering in E…
Abishek-TridotsTech Jun 10, 2026
eea1fab
fix: Filter the Earning component in Employee Incentive
Abishek-TridotsTech Jun 10, 2026
4e7a20a
fix: package frontend and roster assets from public dir
asmitahase Jun 19, 2026
230eb90
Merge pull request #4725 from asmitahase/fix-build
asmitahase Jun 19, 2026
6693f04
Merge pull request #4691 from Abishek-TridotsTech/Employee-Incentive
asmitahase Jun 19, 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: 1 addition & 1 deletion .github/workflows/build-and-commit-assets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:

- name: Package assets
working-directory: apps/hrms
run: tar czf hrms-assets.tar.gz -C ../../sites/assets/hrms dist frontend roster
run: tar czf hrms-assets.tar.gz -C ../../sites/assets/hrms dist -C "$PWD/hrms/public" frontend roster

- name: Upload to rolling release
working-directory: apps/hrms
Expand Down
3 changes: 2 additions & 1 deletion hrms/payroll/doctype/employee_incentive/employee_incentive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ frappe.ui.form.on("Employee Incentive", {
if (!frm.doc.company) return;
frm.set_query("salary_component", function () {
return {
filters: { type: "earning" },
filters: { component_type: "Earning", company: frm.doc.company },
query: "hrms.payroll.doctype.salary_structure.salary_structure.get_salary_component",
};
});
},
Expand Down
Loading