Skip to content

[pull] develop from frappe:develop #387

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 1 commit into from
Jul 3, 2026
Merged

[pull] develop from frappe:develop #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions hrms/desktop_icon/leaves.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"docstatus": 0,
"doctype": "Desktop Icon",
"hidden": 0,
"icon": "non-profit",
"icon": "tree-palm",
"icon_type": "Link",
"idx": 0,
"label": "Leaves",
"link_to": "Leaves",
"link_type": "Workspace Sidebar",
"logo_url": "/assets/hrms/icons/desktop_icons/leaves.svg",
"modified": "2026-01-01 20:07:01.290307",
"modified": "2026-07-03 20:07:01.290307",
"modified_by": "Administrator",
"name": "Leaves",
"owner": "Administrator",
Expand Down
4 changes: 2 additions & 2 deletions hrms/desktop_icon/payroll.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"docstatus": 0,
"doctype": "Desktop Icon",
"hidden": 0,
"icon": "accounting",
"icon": "wallet",
"icon_type": "Link",
"idx": 0,
"label": "Payroll",
"link_to": "Payroll",
"link_type": "Workspace Sidebar",
"logo_url": "/assets/hrms/icons/desktop_icons/salary_payout.svg",
"modified": "2026-01-01 20:07:01.308523",
"modified": "2026-07-03 20:07:01.308523",
"modified_by": "Administrator",
"name": "Payroll",
"owner": "Administrator",
Expand Down
4 changes: 2 additions & 2 deletions hrms/desktop_icon/tax_&_benefits.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"docstatus": 0,
"doctype": "Desktop Icon",
"hidden": 0,
"icon": "money-coins-1",
"icon": "coins",
"icon_type": "Link",
"idx": 0,
"label": "Tax & Benefits",
"link_to": "Tax & Benefits",
"link_type": "Workspace Sidebar",
"logo_url": "/assets/hrms/icons/desktop_icons/tax-benefits.svg",
"modified": "2026-01-01 20:07:01.316510",
"modified": "2026-07-03 20:07:01.316510",
"modified_by": "Administrator",
"name": "Tax & Benefits",
"owner": "Administrator",
Expand Down
4 changes: 2 additions & 2 deletions hrms/desktop_icon/tenure.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"docstatus": 0,
"doctype": "Desktop Icon",
"hidden": 0,
"icon": "customer",
"icon": "user",
"icon_type": "Link",
"idx": 0,
"label": "Tenure",
"link_to": "Tenure",
"link_type": "Workspace Sidebar",
"logo_url": "/assets/hrms/icons/desktop_icons/employee_lifecycle.svg",
"modified": "2026-01-01 20:07:01.267686",
"modified": "2026-07-03 20:07:01.267686",
"modified_by": "Administrator",
"name": "Tenure",
"owner": "Administrator",
Expand Down
8 changes: 4 additions & 4 deletions hrms/hr/workspace/expenses/expenses.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"doctype": "Workspace",
"for_user": "",
"hide_custom": 1,
"icon": "expenses",
"icon": "receipt-text",
"idx": 0,
"is_hidden": 0,
"label": "Expenses",
Expand Down Expand Up @@ -257,7 +257,7 @@
"type": "Link"
}
],
"modified": "2026-06-14 13:44:08.158384",
"modified": "2026-07-03 13:44:08.158384",
"modified_by": "Administrator",
"module": "HR",
"name": "Expenses",
Expand All @@ -273,7 +273,7 @@
{
"child": 0,
"collapsible": 1,
"icon": "home",
"icon": "house",
"indent": 0,
"keep_closed": 0,
"label": "Home",
Expand Down Expand Up @@ -376,7 +376,7 @@
{
"child": 0,
"collapsible": 1,
"icon": "money-coins-1",
"icon": "coins",
"indent": 1,
"keep_closed": 1,
"label": "Accounting Entries",
Expand Down
8 changes: 4 additions & 4 deletions hrms/hr/workspace/hr_setup/hr_setup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"doctype": "Workspace",
"for_user": "",
"hide_custom": 0,
"icon": "hr",
"icon": "briefcase-business",
"idx": 1,
"is_hidden": 0,
"label": "HR Setup",
Expand Down Expand Up @@ -386,7 +386,7 @@
"type": "Link"
}
],
"modified": "2026-06-14 13:43:50.847257",
"modified": "2026-07-03 13:43:50.847257",
"modified_by": "Administrator",
"module": "HR",
"name": "HR Setup",
Expand All @@ -403,7 +403,7 @@
{
"child": 0,
"collapsible": 1,
"icon": "home",
"icon": "house",
"indent": 0,
"keep_closed": 0,
"label": "Home",
Expand Down Expand Up @@ -442,7 +442,7 @@
{
"child": 0,
"collapsible": 1,
"icon": "organization",
"icon": "building-2",
"indent": 0,
"keep_closed": 0,
"label": "Organizational Chart",
Expand Down
10 changes: 5 additions & 5 deletions hrms/hr/workspace/leaves/leaves.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"doctype": "Workspace",
"for_user": "",
"hide_custom": 0,
"icon": "non-profit",
"icon": "tree-palm",
"idx": 0,
"is_hidden": 0,
"label": "Leaves",
Expand Down Expand Up @@ -186,7 +186,7 @@
"type": "Link"
}
],
"modified": "2026-06-14 13:44:08.045734",
"modified": "2026-07-03 13:44:08.045734",
"modified_by": "Administrator",
"module": "HR",
"name": "Leaves",
Expand Down Expand Up @@ -215,7 +215,7 @@
{
"child": 0,
"collapsible": 1,
"icon": "home",
"icon": "house",
"indent": 0,
"keep_closed": 0,
"label": "Home",
Expand All @@ -241,7 +241,7 @@
{
"child": 0,
"collapsible": 1,
"icon": "money-coins-1",
"icon": "coins",
"indent": 0,
"keep_closed": 0,
"label": "Leave Encashment",
Expand All @@ -254,7 +254,7 @@
{
"child": 1,
"collapsible": 1,
"icon": "setting",
"icon": "sliders-horizontal",
"indent": 0,
"keep_closed": 0,
"label": "Leave Control Panel",
Expand Down
8 changes: 4 additions & 4 deletions hrms/hr/workspace/performance/performance.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"is_hidden": 0,
"label": "Performance",
"links": [],
"modified": "2026-06-14 13:44:08.008994",
"modified": "2026-07-03 13:44:08.008994",
"modified_by": "Administrator",
"module": "HR",
"name": "Performance",
Expand All @@ -34,7 +34,7 @@
{
"child": 0,
"collapsible": 1,
"icon": "home",
"icon": "house",
"indent": 0,
"keep_closed": 0,
"label": "Home",
Expand Down Expand Up @@ -73,7 +73,7 @@
{
"child": 0,
"collapsible": 1,
"icon": "up-arrow",
"icon": "arrow-up",
"indent": 0,
"keep_closed": 0,
"label": "Appraisal",
Expand All @@ -86,7 +86,7 @@
{
"child": 0,
"collapsible": 1,
"icon": "criticize",
"icon": "trending-up",
"indent": 0,
"keep_closed": 0,
"label": "Employee Performance Feedback",
Expand Down
6 changes: 3 additions & 3 deletions hrms/hr/workspace/recruitment/recruitment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
"type": "Link"
}
],
"modified": "2026-06-14 13:43:50.797829",
"modified": "2026-07-03 13:43:50.797829",
"modified_by": "Administrator",
"module": "HR",
"name": "Recruitment",
Expand All @@ -197,7 +197,7 @@
{
"child": 0,
"collapsible": 1,
"icon": "home",
"icon": "house",
"indent": 0,
"keep_closed": 0,
"label": "Home",
Expand Down Expand Up @@ -425,7 +425,7 @@
{
"child": 0,
"collapsible": 1,
"icon": "web",
"icon": "globe",
"indent": 0,
"keep_closed": 0,
"label": "Job Portal",
Expand Down
6 changes: 3 additions & 3 deletions hrms/hr/workspace/shift_&_attendance/shift_&_attendance.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@
"type": "Link"
}
],
"modified": "2026-06-14 13:43:50.672935",
"modified": "2026-07-03 13:43:50.672935",
"modified_by": "Administrator",
"module": "HR",
"name": "Shift & Attendance",
Expand All @@ -287,7 +287,7 @@
{
"child": 0,
"collapsible": 1,
"icon": "home",
"icon": "house",
"indent": 0,
"keep_closed": 0,
"label": "Home",
Expand Down Expand Up @@ -326,7 +326,7 @@
{
"child": 0,
"collapsible": 1,
"icon": "tool",
"icon": "wrench",
"indent": 0,
"keep_closed": 0,
"label": "Employee Attendance Tool",
Expand Down
6 changes: 3 additions & 3 deletions hrms/hr/workspace/tenure/tenure.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"doctype": "Workspace",
"for_user": "",
"hide_custom": 0,
"icon": "customer",
"icon": "user",
"idx": 0,
"is_hidden": 0,
"label": "Tenure",
Expand Down Expand Up @@ -214,7 +214,7 @@
"type": "Link"
}
],
"modified": "2026-06-14 13:44:08.211321",
"modified": "2026-07-03 13:44:08.211321",
"modified_by": "Administrator",
"module": "HR",
"name": "Tenure",
Expand Down Expand Up @@ -246,7 +246,7 @@
{
"child": 0,
"collapsible": 1,
"icon": "home",
"icon": "house",
"indent": 0,
"keep_closed": 0,
"label": "Home",
Expand Down
10 changes: 5 additions & 5 deletions hrms/payroll/workspace/payroll/payroll.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"doctype": "Workspace",
"for_user": "",
"hide_custom": 0,
"icon": "accounting",
"icon": "wallet",
"idx": 2,
"is_hidden": 0,
"label": "Payroll",
Expand Down Expand Up @@ -737,7 +737,7 @@
"type": "Link"
}
],
"modified": "2026-07-01 01:05:50.395061",
"modified": "2026-07-03 01:05:50.395061",
"modified_by": "Administrator",
"module": "Payroll",
"name": "Payroll",
Expand All @@ -754,7 +754,7 @@
"child": 0,
"collapsible": 1,
"default_workspace": 0,
"icon": "home",
"icon": "house",
"indent": 0,
"keep_closed": 0,
"label": "Home",
Expand Down Expand Up @@ -796,7 +796,7 @@
"child": 0,
"collapsible": 1,
"default_workspace": 0,
"icon": "loan",
"icon": "hand-coins",
"indent": 0,
"keep_closed": 0,
"label": "Salary Structure Assignment",
Expand All @@ -810,7 +810,7 @@
"child": 0,
"collapsible": 1,
"default_workspace": 0,
"icon": "accounting",
"icon": "wallet",
"indent": 0,
"keep_closed": 0,
"label": "Salary Slip",
Expand Down
10 changes: 5 additions & 5 deletions hrms/payroll/workspace/tax_&_benefits/tax_&_benefits.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"doctype": "Workspace",
"for_user": "",
"hide_custom": 0,
"icon": "money-coins-1",
"icon": "coins",
"idx": 1,
"is_hidden": 0,
"label": "Tax & Benefits",
Expand Down Expand Up @@ -136,7 +136,7 @@
"type": "Link"
}
],
"modified": "2026-06-14 13:43:50.624306",
"modified": "2026-07-03 13:43:50.624306",
"modified_by": "Administrator",
"module": "Payroll",
"name": "Tax & Benefits",
Expand All @@ -152,7 +152,7 @@
{
"child": 0,
"collapsible": 1,
"icon": "home",
"icon": "house",
"indent": 0,
"keep_closed": 0,
"label": "Home",
Expand All @@ -178,7 +178,7 @@
{
"child": 0,
"collapsible": 1,
"icon": "liabilities",
"icon": "scale",
"indent": 0,
"keep_closed": 0,
"label": "Excemption Submission Proof",
Expand All @@ -191,7 +191,7 @@
{
"child": 0,
"collapsible": 1,
"icon": "criticize",
"icon": "trending-up",
"indent": 0,
"keep_closed": 0,
"label": "Benefit Application",
Expand Down
Loading
Loading