diff --git a/frontend/src/components/CheckInPanel.vue b/frontend/src/components/CheckInPanel.vue index 23488422b28..9411a9b0a39 100644 --- a/frontend/src/components/CheckInPanel.vue +++ b/frontend/src/components/CheckInPanel.vue @@ -165,7 +165,18 @@ const submitLog = (logType) => { longitude: longitude.value, }, { - onSuccess() { + onSuccess(data) { + if (!data?.name) { + toast({ + title: __("Error"), + text: __("{0} failed!", [actionLabel]), + icon: "alert-circle", + position: "bottom-center", + iconClasses: "text-red-500", + }) + return + } + modalController.dismiss() toast({ title: __("Success"), @@ -176,7 +187,7 @@ const submitLog = (logType) => { }) }, onError(error) { - let messages = error.messages || [] + let messages = error.messages?.length ? error.messages : [__("{0} failed!", [actionLabel])] for (const message of messages) { toast({ diff --git a/hrms/hr/doctype/appointment_letter/appointment_letter.json b/hrms/hr/doctype/appointment_letter/appointment_letter.json index f07f648f670..1caeff8754f 100644 --- a/hrms/hr/doctype/appointment_letter/appointment_letter.json +++ b/hrms/hr/doctype/appointment_letter/appointment_letter.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "autoname": "HR-APP-LETTER-.#####", "creation": "2019-12-26 12:35:49.574828", "default_print_format": "Standard Appointment Letter", @@ -86,7 +87,7 @@ } ], "links": [], - "modified": "2024-03-27 13:06:30.680330", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Appointment Letter", diff --git a/hrms/hr/doctype/appointment_letter_template/appointment_letter_template.json b/hrms/hr/doctype/appointment_letter_template/appointment_letter_template.json index 2ba0dd222b9..4418ae1d26a 100644 --- a/hrms/hr/doctype/appointment_letter_template/appointment_letter_template.json +++ b/hrms/hr/doctype/appointment_letter_template/appointment_letter_template.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "autoname": "field:template_name", "creation": "2019-12-26 12:20:14.219578", "doctype": "DocType", @@ -40,7 +41,7 @@ } ], "links": [], - "modified": "2024-03-27 13:06:31.135009", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Appointment Letter Template", diff --git a/hrms/hr/doctype/appraisal/appraisal.json b/hrms/hr/doctype/appraisal/appraisal.json index 41fb406f9f4..72f6aa02b42 100644 --- a/hrms/hr/doctype/appraisal/appraisal.json +++ b/hrms/hr/doctype/appraisal/appraisal.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "autoname": "naming_series:", "creation": "2022-08-26 05:55:37.571091", "doctype": "DocType", @@ -298,7 +299,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2025-09-24 15:40:29.669135", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Appraisal", diff --git a/hrms/hr/doctype/appraisal_cycle/appraisal_cycle.json b/hrms/hr/doctype/appraisal_cycle/appraisal_cycle.json index 8b7060d16bd..ad6baba2847 100644 --- a/hrms/hr/doctype/appraisal_cycle/appraisal_cycle.json +++ b/hrms/hr/doctype/appraisal_cycle/appraisal_cycle.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "allow_rename": 1, "autoname": "field:cycle_name", "creation": "2022-08-24 15:05:29.694466", @@ -200,7 +201,7 @@ "link_fieldname": "appraisal_cycle" } ], - "modified": "2024-05-29 18:15:06.443594", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Appraisal Cycle", diff --git a/hrms/hr/doctype/daily_work_summary/daily_work_summary.json b/hrms/hr/doctype/daily_work_summary/daily_work_summary.json index 2e5de1e804d..0cafc5abbbf 100644 --- a/hrms/hr/doctype/daily_work_summary/daily_work_summary.json +++ b/hrms/hr/doctype/daily_work_summary/daily_work_summary.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "creation": "2016-11-08 04:58:20.001780", "doctype": "DocType", "document_type": "Document", @@ -36,7 +37,7 @@ ], "in_create": 1, "links": [], - "modified": "2026-04-16 12:52:47.429304", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Daily Work Summary", diff --git a/hrms/hr/doctype/daily_work_summary_group/daily_work_summary_group.json b/hrms/hr/doctype/daily_work_summary_group/daily_work_summary_group.json index 9fc3e10769c..22cbb7d8847 100644 --- a/hrms/hr/doctype/daily_work_summary_group/daily_work_summary_group.json +++ b/hrms/hr/doctype/daily_work_summary_group/daily_work_summary_group.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "autoname": "Prompt", "creation": "2018-02-12 15:06:18.767239", "doctype": "DocType", @@ -65,7 +66,7 @@ } ], "links": [], - "modified": "2024-03-27 13:06:49.230881", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Daily Work Summary Group", diff --git a/hrms/hr/doctype/employee_feedback_criteria/employee_feedback_criteria.json b/hrms/hr/doctype/employee_feedback_criteria/employee_feedback_criteria.json index 76e712ffa7b..2dfa3707b14 100644 --- a/hrms/hr/doctype/employee_feedback_criteria/employee_feedback_criteria.json +++ b/hrms/hr/doctype/employee_feedback_criteria/employee_feedback_criteria.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "allow_rename": 1, "autoname": "field:criteria", "creation": "2023-03-16 13:24:03.253830", @@ -22,7 +23,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2024-03-27 13:09:38.737816", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Employee Feedback Criteria", diff --git a/hrms/hr/doctype/employee_grievance/employee_grievance.json b/hrms/hr/doctype/employee_grievance/employee_grievance.json index 461fb949d8f..6ed74148ceb 100644 --- a/hrms/hr/doctype/employee_grievance/employee_grievance.json +++ b/hrms/hr/doctype/employee_grievance/employee_grievance.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "autoname": "HR-GRIEV-.YYYY.-.#####", "creation": "2021-05-11 13:41:51.485295", "doctype": "DocType", @@ -203,7 +204,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2025-11-21 17:25:40.972515", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Employee Grievance", diff --git a/hrms/hr/doctype/employee_health_insurance/employee_health_insurance.json b/hrms/hr/doctype/employee_health_insurance/employee_health_insurance.json index a0a89661fa2..00cdb316042 100644 --- a/hrms/hr/doctype/employee_health_insurance/employee_health_insurance.json +++ b/hrms/hr/doctype/employee_health_insurance/employee_health_insurance.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "allow_rename": 1, "autoname": "field:health_insurance_name", "creation": "2017-03-27 14:32:51.628588", @@ -21,7 +22,7 @@ } ], "links": [], - "modified": "2024-03-27 13:09:39.535296", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Employee Health Insurance", diff --git a/hrms/hr/doctype/employee_onboarding/employee_onboarding.json b/hrms/hr/doctype/employee_onboarding/employee_onboarding.json index 584be2da0fc..48292e22c17 100644 --- a/hrms/hr/doctype/employee_onboarding/employee_onboarding.json +++ b/hrms/hr/doctype/employee_onboarding/employee_onboarding.json @@ -174,7 +174,7 @@ ], "is_submittable": 1, "links": [], - "modified": "2026-03-24 17:13:19.990319", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Employee Onboarding", diff --git a/hrms/hr/doctype/employee_onboarding_template/employee_onboarding_template.json b/hrms/hr/doctype/employee_onboarding_template/employee_onboarding_template.json index baa402c0f8e..44c196b927e 100644 --- a/hrms/hr/doctype/employee_onboarding_template/employee_onboarding_template.json +++ b/hrms/hr/doctype/employee_onboarding_template/employee_onboarding_template.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "autoname": "HR-EMP-ONT-.#####", "creation": "2018-05-09 05:27:02.393377", "doctype": "DocType", @@ -68,7 +69,7 @@ } ], "links": [], - "modified": "2026-04-07 17:54:37.020259", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Employee Onboarding Template", diff --git a/hrms/hr/doctype/employee_performance_feedback/employee_performance_feedback.json b/hrms/hr/doctype/employee_performance_feedback/employee_performance_feedback.json index f45f1a720e9..6a42b9c8f6a 100644 --- a/hrms/hr/doctype/employee_performance_feedback/employee_performance_feedback.json +++ b/hrms/hr/doctype/employee_performance_feedback/employee_performance_feedback.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "allow_rename": 1, "autoname": "format:HR-PF-{YYYY}-{#####}", "creation": "2022-09-01 01:05:44.869523", @@ -183,7 +184,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2024-03-27 13:09:40.430183", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Employee Performance Feedback", diff --git a/hrms/hr/doctype/employee_promotion/employee_promotion.json b/hrms/hr/doctype/employee_promotion/employee_promotion.json index c34251b4cd0..ae7901c3a39 100644 --- a/hrms/hr/doctype/employee_promotion/employee_promotion.json +++ b/hrms/hr/doctype/employee_promotion/employee_promotion.json @@ -120,7 +120,7 @@ ], "is_submittable": 1, "links": [], - "modified": "2026-08-06 13:01:43.187327", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Employee Promotion", diff --git a/hrms/hr/doctype/employee_referral/employee_referral.json b/hrms/hr/doctype/employee_referral/employee_referral.json index 5da635a4dfa..f3320bdfe9a 100644 --- a/hrms/hr/doctype/employee_referral/employee_referral.json +++ b/hrms/hr/doctype/employee_referral/employee_referral.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "autoname": "format:HR-REF-{####}", "creation": "2021-03-23 14:54:45.047051", "doctype": "DocType", @@ -204,7 +205,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2025-12-06 14:32:15.005720", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Employee Referral", diff --git a/hrms/hr/doctype/employee_separation/employee_separation.json b/hrms/hr/doctype/employee_separation/employee_separation.json index bb01e9285f9..ce8ef3dde83 100644 --- a/hrms/hr/doctype/employee_separation/employee_separation.json +++ b/hrms/hr/doctype/employee_separation/employee_separation.json @@ -155,7 +155,7 @@ ], "is_submittable": 1, "links": [], - "modified": "2026-04-16 14:24:20.502402", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Employee Separation", diff --git a/hrms/hr/doctype/employee_separation_template/employee_separation_template.json b/hrms/hr/doctype/employee_separation_template/employee_separation_template.json index 1648e67e008..940aea322c5 100644 --- a/hrms/hr/doctype/employee_separation_template/employee_separation_template.json +++ b/hrms/hr/doctype/employee_separation_template/employee_separation_template.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "autoname": "HR-EMP-STP-.#####", "creation": "2018-05-09 06:31:44.498557", "doctype": "DocType", @@ -68,7 +69,7 @@ } ], "links": [], - "modified": "2026-04-07 18:18:38.087000", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Employee Separation Template", diff --git a/hrms/hr/doctype/employee_skill_map/employee_skill_map.json b/hrms/hr/doctype/employee_skill_map/employee_skill_map.json index 03fd8e6194a..8b7b68f54b4 100644 --- a/hrms/hr/doctype/employee_skill_map/employee_skill_map.json +++ b/hrms/hr/doctype/employee_skill_map/employee_skill_map.json @@ -62,7 +62,7 @@ } ], "links": [], - "modified": "2026-04-07 17:56:17.634829", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Employee Skill Map", diff --git a/hrms/hr/doctype/employee_transfer/employee_transfer.json b/hrms/hr/doctype/employee_transfer/employee_transfer.json index df106de460d..c3f157feeb5 100644 --- a/hrms/hr/doctype/employee_transfer/employee_transfer.json +++ b/hrms/hr/doctype/employee_transfer/employee_transfer.json @@ -113,7 +113,7 @@ ], "is_submittable": 1, "links": [], - "modified": "2024-03-27 13:09:42.664274", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Employee Transfer", diff --git a/hrms/hr/doctype/exit_interview/exit_interview.json b/hrms/hr/doctype/exit_interview/exit_interview.json index 1816c18db81..e28dac793d9 100644 --- a/hrms/hr/doctype/exit_interview/exit_interview.json +++ b/hrms/hr/doctype/exit_interview/exit_interview.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "allow_rename": 1, "autoname": "naming_series:", "creation": "2021-12-05 13:56:36.241690", @@ -218,7 +219,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2026-04-16 12:55:29.457937", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Exit Interview", diff --git a/hrms/hr/doctype/full_and_final_statement/full_and_final_statement.json b/hrms/hr/doctype/full_and_final_statement/full_and_final_statement.json index d4cfcac9284..55f6e9b89f2 100644 --- a/hrms/hr/doctype/full_and_final_statement/full_and_final_statement.json +++ b/hrms/hr/doctype/full_and_final_statement/full_and_final_statement.json @@ -196,7 +196,7 @@ "table_fieldname": "accounts" } ], - "modified": "2025-12-10 18:00:46.722706", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Full and Final Statement", diff --git a/hrms/hr/doctype/goal/goal.json b/hrms/hr/doctype/goal/goal.json index 71e610aed6d..c11ba911577 100644 --- a/hrms/hr/doctype/goal/goal.json +++ b/hrms/hr/doctype/goal/goal.json @@ -215,7 +215,7 @@ "index_web_pages_for_search": 1, "is_tree": 1, "links": [], - "modified": "2026-08-06 13:01:43.187327", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Goal", diff --git a/hrms/hr/doctype/grievance_type/grievance_type.json b/hrms/hr/doctype/grievance_type/grievance_type.json index ab2b79a8f68..f2255deaf2b 100644 --- a/hrms/hr/doctype/grievance_type/grievance_type.json +++ b/hrms/hr/doctype/grievance_type/grievance_type.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "allow_rename": 1, "autoname": "Prompt", "creation": "2021-05-11 12:41:50.256071", @@ -23,7 +24,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2024-03-27 13:09:46.513495", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Grievance Type", diff --git a/hrms/hr/doctype/holiday_list_assignment/holiday_list_assignment.json b/hrms/hr/doctype/holiday_list_assignment/holiday_list_assignment.json index 4be2a24645b..38cbf762e40 100644 --- a/hrms/hr/doctype/holiday_list_assignment/holiday_list_assignment.json +++ b/hrms/hr/doctype/holiday_list_assignment/holiday_list_assignment.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "autoname": "naming_series:", "creation": "2025-08-28 12:59:25.390188", "doctype": "DocType", @@ -107,7 +108,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2026-01-07 16:11:21.856458", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Holiday List Assignment", diff --git a/hrms/hr/doctype/hr_telemetry_milestone/hr_telemetry_milestone.json b/hrms/hr/doctype/hr_telemetry_milestone/hr_telemetry_milestone.json index 8d8ccb90957..e4b090cc2e6 100644 --- a/hrms/hr/doctype/hr_telemetry_milestone/hr_telemetry_milestone.json +++ b/hrms/hr/doctype/hr_telemetry_milestone/hr_telemetry_milestone.json @@ -24,7 +24,7 @@ "in_create": 1, "index_web_pages_for_search": 0, "links": [], - "modified": "2026-08-14 10:00:00.000000", + "modified": "2026-09-01 21:42:50.393703", "modified_by": "Administrator", "module": "HR", "name": "HR Telemetry Milestone", diff --git a/hrms/hr/doctype/identification_document_type/identification_document_type.json b/hrms/hr/doctype/identification_document_type/identification_document_type.json index e9480ec8a3f..d125855fba7 100644 --- a/hrms/hr/doctype/identification_document_type/identification_document_type.json +++ b/hrms/hr/doctype/identification_document_type/identification_document_type.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "autoname": "field:identification_document_type", "creation": "2018-05-15 07:13:28.620570", "doctype": "DocType", @@ -17,7 +18,7 @@ } ], "links": [], - "modified": "2024-03-27 13:09:50.249558", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Identification Document Type", diff --git a/hrms/hr/doctype/interview/interview.json b/hrms/hr/doctype/interview/interview.json index 60e7caad44d..49d2814ef83 100644 --- a/hrms/hr/doctype/interview/interview.json +++ b/hrms/hr/doctype/interview/interview.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "autoname": "HR-INT-.YYYY.-.####", "creation": "2021-04-12 15:03:11.524090", "doctype": "DocType", @@ -199,7 +200,7 @@ "link_fieldname": "interview" } ], - "modified": "2026-02-19 15:40:38.547112", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Interview", diff --git a/hrms/hr/doctype/interview_feedback/interview_feedback.json b/hrms/hr/doctype/interview_feedback/interview_feedback.json index f756cd8249b..8e4b01df5d4 100644 --- a/hrms/hr/doctype/interview_feedback/interview_feedback.json +++ b/hrms/hr/doctype/interview_feedback/interview_feedback.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "autoname": "HR-INT-FEED-.####", "creation": "2021-04-12 17:03:13.833285", "doctype": "DocType", @@ -123,7 +124,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2026-02-19 16:31:33.463199", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Interview Feedback", diff --git a/hrms/hr/doctype/interview_type/interview_type.json b/hrms/hr/doctype/interview_type/interview_type.json index ba0e651fea3..a08f1d5f83c 100644 --- a/hrms/hr/doctype/interview_type/interview_type.json +++ b/hrms/hr/doctype/interview_type/interview_type.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "allow_rename": 1, "autoname": "field:interview_type_name", "creation": "2021-04-12 12:57:19.902866", @@ -68,7 +69,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2026-02-16 15:52:26.011116", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Interview Type", diff --git a/hrms/hr/doctype/job_offer_term_template/job_offer_term_template.json b/hrms/hr/doctype/job_offer_term_template/job_offer_term_template.json index 4aae604ce20..7cb7fa79316 100644 --- a/hrms/hr/doctype/job_offer_term_template/job_offer_term_template.json +++ b/hrms/hr/doctype/job_offer_term_template/job_offer_term_template.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "allow_rename": 1, "autoname": "field:title", "creation": "2023-11-21 13:39:20.882706", @@ -25,7 +26,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2026-04-16 13:01:10.285764", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Job Offer Term Template", diff --git a/hrms/hr/doctype/job_opening_template/job_opening_template.json b/hrms/hr/doctype/job_opening_template/job_opening_template.json index 9635202bc8a..d27e2b9e653 100644 --- a/hrms/hr/doctype/job_opening_template/job_opening_template.json +++ b/hrms/hr/doctype/job_opening_template/job_opening_template.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "allow_rename": 1, "autoname": "field:template_title", "creation": "2025-12-11 18:04:50.413169", @@ -113,7 +114,7 @@ "grid_page_length": 50, "index_web_pages_for_search": 1, "links": [], - "modified": "2026-08-06 13:01:43.187327", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Job Opening Template", diff --git a/hrms/hr/doctype/job_requisition/job_requisition.json b/hrms/hr/doctype/job_requisition/job_requisition.json index 460dd60e39a..58e016bd602 100644 --- a/hrms/hr/doctype/job_requisition/job_requisition.json +++ b/hrms/hr/doctype/job_requisition/job_requisition.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "allow_rename": 1, "autoname": "naming_series:", "creation": "2022-08-29 19:00:53.358248", @@ -204,7 +205,7 @@ "link_fieldname": "job_requisition" } ], - "modified": "2026-08-06 13:01:43.187327", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Job Requisition", diff --git a/hrms/hr/doctype/kra/kra.json b/hrms/hr/doctype/kra/kra.json index 7614712d2c5..15dc666031c 100644 --- a/hrms/hr/doctype/kra/kra.json +++ b/hrms/hr/doctype/kra/kra.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "allow_rename": 1, "autoname": "field:title", "creation": "2022-08-24 18:37:12.427640", @@ -27,7 +28,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2026-04-09 18:47:44.330762", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "KRA", diff --git a/hrms/hr/doctype/leave_adjustment/leave_adjustment.json b/hrms/hr/doctype/leave_adjustment/leave_adjustment.json index a7137d40ae8..e9184014ced 100644 --- a/hrms/hr/doctype/leave_adjustment/leave_adjustment.json +++ b/hrms/hr/doctype/leave_adjustment/leave_adjustment.json @@ -154,7 +154,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2025-09-07 16:28:07.109228", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Leave Adjustment", diff --git a/hrms/hr/doctype/leave_ledger_entry/leave_ledger_entry.json b/hrms/hr/doctype/leave_ledger_entry/leave_ledger_entry.json index 949d1ab06b7..b2b57c54f18 100644 --- a/hrms/hr/doctype/leave_ledger_entry/leave_ledger_entry.json +++ b/hrms/hr/doctype/leave_ledger_entry/leave_ledger_entry.json @@ -126,7 +126,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2024-03-27 13:10:01.284398", + "modified": "2026-09-01 21:42:50.393703", "modified_by": "Administrator", "module": "HR", "name": "Leave Ledger Entry", diff --git a/hrms/hr/doctype/leave_policy/leave_policy.json b/hrms/hr/doctype/leave_policy/leave_policy.json index 0326499443b..de4228745b8 100644 --- a/hrms/hr/doctype/leave_policy/leave_policy.json +++ b/hrms/hr/doctype/leave_policy/leave_policy.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "autoname": "HR-LPOL-.YYYY.-.#####", "creation": "2018-04-13 16:06:19.507624", "doctype": "DocType", @@ -45,7 +46,7 @@ ], "is_submittable": 1, "links": [], - "modified": "2024-03-27 13:10:01.602911", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Leave Policy", diff --git a/hrms/hr/doctype/leave_policy_assignment/leave_policy_assignment.json b/hrms/hr/doctype/leave_policy_assignment/leave_policy_assignment.json index d52d7c860cf..fababb542bb 100644 --- a/hrms/hr/doctype/leave_policy_assignment/leave_policy_assignment.json +++ b/hrms/hr/doctype/leave_policy_assignment/leave_policy_assignment.json @@ -116,7 +116,7 @@ ], "is_submittable": 1, "links": [], - "modified": "2024-03-27 13:10:01.746553", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Leave Policy Assignment", diff --git a/hrms/hr/doctype/overtime_slip/overtime_slip.json b/hrms/hr/doctype/overtime_slip/overtime_slip.json index 540b955c9b2..8fb7fa9db95 100644 --- a/hrms/hr/doctype/overtime_slip/overtime_slip.json +++ b/hrms/hr/doctype/overtime_slip/overtime_slip.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "allow_rename": 1, "autoname": "HR-OT-SLIP-.#####", "creation": "2024-10-15 16:19:55.229439", @@ -151,7 +152,7 @@ "link_fieldname": "ref_docname" } ], - "modified": "2025-08-11 17:02:10.282104", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Overtime Slip", diff --git a/hrms/hr/doctype/overtime_type/overtime_type.json b/hrms/hr/doctype/overtime_type/overtime_type.json index 7482a090ff6..becc363de28 100644 --- a/hrms/hr/doctype/overtime_type/overtime_type.json +++ b/hrms/hr/doctype/overtime_type/overtime_type.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "allow_rename": 1, "autoname": "Prompt", "creation": "2024-10-12 23:46:31.408000", @@ -132,7 +133,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2026-08-06 13:01:43.187327", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Overtime Type", diff --git a/hrms/hr/doctype/purpose_of_travel/purpose_of_travel.json b/hrms/hr/doctype/purpose_of_travel/purpose_of_travel.json index 4317e656b2b..54194399029 100644 --- a/hrms/hr/doctype/purpose_of_travel/purpose_of_travel.json +++ b/hrms/hr/doctype/purpose_of_travel/purpose_of_travel.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "autoname": "field:purpose_of_travel", "creation": "2018-05-15 07:00:30.933908", "doctype": "DocType", @@ -17,7 +18,7 @@ } ], "links": [], - "modified": "2024-03-27 13:10:27.112282", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Purpose of Travel", diff --git a/hrms/hr/doctype/pwa_notification/pwa_notification.json b/hrms/hr/doctype/pwa_notification/pwa_notification.json index 3c16bba6ca4..2e3fd0d51d3 100644 --- a/hrms/hr/doctype/pwa_notification/pwa_notification.json +++ b/hrms/hr/doctype/pwa_notification/pwa_notification.json @@ -83,7 +83,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2024-03-27 13:10:27.401806", + "modified": "2026-09-01 21:42:50.393703", "modified_by": "Administrator", "module": "HR", "name": "PWA Notification", diff --git a/hrms/hr/doctype/shift_location/shift_location.json b/hrms/hr/doctype/shift_location/shift_location.json index c26dea57549..e09d45fd1e9 100644 --- a/hrms/hr/doctype/shift_location/shift_location.json +++ b/hrms/hr/doctype/shift_location/shift_location.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "allow_rename": 1, "autoname": "field:location_name", "creation": "2024-07-04 12:12:26.894513", @@ -66,7 +67,7 @@ "link_fieldname": "shift_location" } ], - "modified": "2026-08-06 13:01:43.187327", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Shift Location", diff --git a/hrms/hr/doctype/shift_schedule/shift_schedule.json b/hrms/hr/doctype/shift_schedule/shift_schedule.json index eacf1cd2a43..b3f7fe5a26c 100644 --- a/hrms/hr/doctype/shift_schedule/shift_schedule.json +++ b/hrms/hr/doctype/shift_schedule/shift_schedule.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "allow_rename": 1, "autoname": "prompt", "creation": "2024-11-11 16:56:33.536882", @@ -65,7 +66,7 @@ "link_fieldname": "shift_schedule" } ], - "modified": "2024-12-19 13:34:43.731635", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Shift Schedule", diff --git a/hrms/hr/doctype/shift_schedule_assignment/shift_schedule_assignment.json b/hrms/hr/doctype/shift_schedule_assignment/shift_schedule_assignment.json index 273d064ec1d..0bd758629f4 100644 --- a/hrms/hr/doctype/shift_schedule_assignment/shift_schedule_assignment.json +++ b/hrms/hr/doctype/shift_schedule_assignment/shift_schedule_assignment.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "autoname": "HR-SHSA-.YY.-.MM.-.#####", "creation": "2024-11-11 17:33:00.330488", "doctype": "DocType", @@ -107,7 +108,7 @@ "link_fieldname": "shift_schedule_assignment" } ], - "modified": "2025-07-10 18:48:42.170391", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Shift Schedule Assignment", diff --git a/hrms/hr/doctype/shift_type/shift_type.json b/hrms/hr/doctype/shift_type/shift_type.json index 83cf1355c08..d0651abbb2e 100644 --- a/hrms/hr/doctype/shift_type/shift_type.json +++ b/hrms/hr/doctype/shift_type/shift_type.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "autoname": "prompt", "creation": "2018-04-13 16:22:52.954783", "doctype": "DocType", @@ -216,7 +217,7 @@ } ], "links": [], - "modified": "2026-08-06 13:01:43.187327", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Shift Type", diff --git a/hrms/hr/doctype/skill/skill.json b/hrms/hr/doctype/skill/skill.json index 93428fbb2d3..8c7302c1e48 100644 --- a/hrms/hr/doctype/skill/skill.json +++ b/hrms/hr/doctype/skill/skill.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "allow_rename": 1, "autoname": "field:skill_name", "creation": "2019-04-16 09:54:39.486915", @@ -25,7 +26,7 @@ } ], "links": [], - "modified": "2026-03-24 14:23:41.134482", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Skill", diff --git a/hrms/hr/doctype/staffing_plan/staffing_plan.json b/hrms/hr/doctype/staffing_plan/staffing_plan.json index d64b88a248e..4152e4dba2c 100644 --- a/hrms/hr/doctype/staffing_plan/staffing_plan.json +++ b/hrms/hr/doctype/staffing_plan/staffing_plan.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "autoname": "prompt", "creation": "2018-04-13 18:07:21.582747", "doctype": "DocType", @@ -90,7 +91,7 @@ ], "is_submittable": 1, "links": [], - "modified": "2024-03-27 13:10:43.405514", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Staffing Plan", diff --git a/hrms/hr/doctype/training_feedback/training_feedback.json b/hrms/hr/doctype/training_feedback/training_feedback.json index 9f301f0108f..1a0d2157a32 100644 --- a/hrms/hr/doctype/training_feedback/training_feedback.json +++ b/hrms/hr/doctype/training_feedback/training_feedback.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "autoname": "HR-TRF-.YYYY.-.#####", "creation": "2022-01-27 13:14:35.935580", "doctype": "DocType", @@ -100,7 +101,7 @@ ], "is_submittable": 1, "links": [], - "modified": "2026-03-24 17:33:21.061679", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Training Feedback", diff --git a/hrms/hr/doctype/training_program/training_program.json b/hrms/hr/doctype/training_program/training_program.json index af4a6053a6c..3d49a5b13e7 100644 --- a/hrms/hr/doctype/training_program/training_program.json +++ b/hrms/hr/doctype/training_program/training_program.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "allow_rename": 1, "autoname": "field:training_program", "creation": "2017-10-11 04:43:17.230065", @@ -102,7 +103,7 @@ } ], "links": [], - "modified": "2026-03-24 17:33:35.839192", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Training Program", diff --git a/hrms/hr/doctype/training_result/training_result.json b/hrms/hr/doctype/training_result/training_result.json index 218657fc999..fae907f83c7 100644 --- a/hrms/hr/doctype/training_result/training_result.json +++ b/hrms/hr/doctype/training_result/training_result.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "allow_rename": 1, "autoname": "HR-TRR-.YYYY.-.#####", "creation": "2016-11-04 02:13:48.407576", @@ -52,7 +53,7 @@ ], "is_submittable": 1, "links": [], - "modified": "2026-03-24 17:46:52.547853", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Training Result", diff --git a/hrms/hr/doctype/travel_request/travel_request.json b/hrms/hr/doctype/travel_request/travel_request.json index ac4f49ac67b..320c1729bdd 100644 --- a/hrms/hr/doctype/travel_request/travel_request.json +++ b/hrms/hr/doctype/travel_request/travel_request.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "autoname": "HR-TRQ-.YYYY.-.#####", "creation": "2018-05-15 06:32:33.950356", "doctype": "DocType", @@ -225,7 +226,7 @@ ], "is_submittable": 1, "links": [], - "modified": "2024-05-24 17:09:09.480838", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Travel Request", diff --git a/hrms/hr/doctype/vehicle_log/vehicle_log.json b/hrms/hr/doctype/vehicle_log/vehicle_log.json index 04518246773..98764913920 100644 --- a/hrms/hr/doctype/vehicle_log/vehicle_log.json +++ b/hrms/hr/doctype/vehicle_log/vehicle_log.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "autoname": "naming_series:", "creation": "2016-09-03 14:14:51.788550", "doctype": "DocType", @@ -167,7 +168,7 @@ ], "is_submittable": 1, "links": [], - "modified": "2026-08-06 13:01:43.187327", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Vehicle Log", diff --git a/hrms/hr/doctype/vehicle_service_item/vehicle_service_item.json b/hrms/hr/doctype/vehicle_service_item/vehicle_service_item.json index e2102a53d94..5fa4ce2b527 100644 --- a/hrms/hr/doctype/vehicle_service_item/vehicle_service_item.json +++ b/hrms/hr/doctype/vehicle_service_item/vehicle_service_item.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "allow_rename": 1, "autoname": "field:service_item", "creation": "2023-08-02 18:01:01.161734", @@ -24,7 +25,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2024-03-27 13:10:58.630841", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "HR", "name": "Vehicle Service Item", diff --git a/hrms/payroll/doctype/arrear/arrear.json b/hrms/payroll/doctype/arrear/arrear.json index a2e44a72df1..2a135179cd0 100644 --- a/hrms/payroll/doctype/arrear/arrear.json +++ b/hrms/payroll/doctype/arrear/arrear.json @@ -148,7 +148,7 @@ "link_fieldname": "ref_docname" } ], - "modified": "2025-09-23 12:19:23.661340", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "Payroll", "name": "Arrear", diff --git a/hrms/payroll/doctype/employee_benefit_ledger/employee_benefit_ledger.json b/hrms/payroll/doctype/employee_benefit_ledger/employee_benefit_ledger.json index 0e7374cff89..a09664a6362 100644 --- a/hrms/payroll/doctype/employee_benefit_ledger/employee_benefit_ledger.json +++ b/hrms/payroll/doctype/employee_benefit_ledger/employee_benefit_ledger.json @@ -139,7 +139,7 @@ "grid_page_length": 50, "index_web_pages_for_search": 1, "links": [], - "modified": "2026-08-06 13:01:43.187327", + "modified": "2026-09-01 21:42:50.393703", "modified_by": "Administrator", "module": "Payroll", "name": "Employee Benefit Ledger", diff --git a/hrms/payroll/doctype/employee_incentive/employee_incentive.json b/hrms/payroll/doctype/employee_incentive/employee_incentive.json index 8b88d2d1ce0..b869da4fb91 100644 --- a/hrms/payroll/doctype/employee_incentive/employee_incentive.json +++ b/hrms/payroll/doctype/employee_incentive/employee_incentive.json @@ -112,7 +112,7 @@ ], "is_submittable": 1, "links": [], - "modified": "2026-08-06 13:01:43.187327", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "Payroll", "name": "Employee Incentive", diff --git a/hrms/payroll/doctype/employee_other_income/employee_other_income.json b/hrms/payroll/doctype/employee_other_income/employee_other_income.json index e97bc0e9f20..ee4c0b2e974 100644 --- a/hrms/payroll/doctype/employee_other_income/employee_other_income.json +++ b/hrms/payroll/doctype/employee_other_income/employee_other_income.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "autoname": "HR-INCOME-.######", "creation": "2020-03-18 15:04:40.767434", "doctype": "DocType", @@ -97,7 +98,7 @@ ], "is_submittable": 1, "links": [], - "modified": "2026-08-06 13:01:43.187327", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "Payroll", "name": "Employee Other Income", diff --git a/hrms/payroll/doctype/gratuity/gratuity.json b/hrms/payroll/doctype/gratuity/gratuity.json index 8eb161efa1b..0e718f8729d 100644 --- a/hrms/payroll/doctype/gratuity/gratuity.json +++ b/hrms/payroll/doctype/gratuity/gratuity.json @@ -200,7 +200,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2026-08-06 13:01:43.187327", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "Payroll", "name": "Gratuity", diff --git a/hrms/payroll/doctype/gratuity_rule/gratuity_rule.json b/hrms/payroll/doctype/gratuity_rule/gratuity_rule.json index 1201aeb7031..0d71c2499f2 100644 --- a/hrms/payroll/doctype/gratuity_rule/gratuity_rule.json +++ b/hrms/payroll/doctype/gratuity_rule/gratuity_rule.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "autoname": "Prompt", "creation": "2020-08-05 19:00:36.103500", "doctype": "DocType", @@ -95,7 +96,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2026-08-06 13:01:43.187327", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "Payroll", "name": "Gratuity Rule", diff --git a/hrms/payroll/doctype/payroll_correction/payroll_correction.json b/hrms/payroll/doctype/payroll_correction/payroll_correction.json index 056ac463fc5..4c7e2adee87 100644 --- a/hrms/payroll/doctype/payroll_correction/payroll_correction.json +++ b/hrms/payroll/doctype/payroll_correction/payroll_correction.json @@ -190,7 +190,7 @@ "link_fieldname": "ref_docname" } ], - "modified": "2025-09-20 17:12:38.862476", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "Payroll", "name": "Payroll Correction", diff --git a/hrms/payroll/doctype/payroll_entry/payroll_entry.json b/hrms/payroll/doctype/payroll_entry/payroll_entry.json index 74e0ef015f6..e9b85e118c7 100644 --- a/hrms/payroll/doctype/payroll_entry/payroll_entry.json +++ b/hrms/payroll/doctype/payroll_entry/payroll_entry.json @@ -340,7 +340,7 @@ "link_fieldname": "payroll_entry" } ], - "modified": "2026-07-28 20:19:41.847412", + "modified": "2026-09-01 21:42:50.393703", "modified_by": "Administrator", "module": "Payroll", "name": "Payroll Entry", diff --git a/hrms/payroll/doctype/payroll_entry/payroll_entry.py b/hrms/payroll/doctype/payroll_entry/payroll_entry.py index e2d88a8ba8f..ad5bf913a58 100644 --- a/hrms/payroll/doctype/payroll_entry/payroll_entry.py +++ b/hrms/payroll/doctype/payroll_entry/payroll_entry.py @@ -1461,18 +1461,32 @@ def set_filter_conditions(query, filters, qb_object): def set_match_conditions(query, qb_object): match_conditions = get_match_cond("Employee", as_condition=False) + employee_permission_fields = get_employee_permission_fields() for cond in match_conditions: if isinstance(cond, dict): for key, value in cond.items(): + fieldname = employee_permission_fields.get(key) + if not fieldname: + continue + if isinstance(value, list): - query = query.where(qb_object[key].isin(value)) + query = query.where(qb_object[fieldname].isin(value)) else: - query = query.where(qb_object[key] == value) + query = query.where(qb_object[fieldname] == value) return query +def get_employee_permission_fields(): + permission_fields = {"Employee": "name"} + for df in frappe.get_meta("Employee").get_link_fields(): + if not df.get("ignore_user_permissions"): + permission_fields[df.options] = df.fieldname + + return permission_fields + + def remove_payrolled_employees(emp_list, start_date, end_date): SalarySlip = frappe.qb.DocType("Salary Slip") diff --git a/hrms/payroll/doctype/payroll_entry/test_payroll_entry.py b/hrms/payroll/doctype/payroll_entry/test_payroll_entry.py index bcf5e2a4603..ad72cb7d778 100644 --- a/hrms/payroll/doctype/payroll_entry/test_payroll_entry.py +++ b/hrms/payroll/doctype/payroll_entry/test_payroll_entry.py @@ -1,6 +1,8 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt +from unittest.mock import patch + from dateutil.relativedelta import relativedelta import frappe @@ -18,6 +20,7 @@ PayrollEntry, get_end_date, get_start_end_dates, + set_match_conditions, ) from hrms.payroll.doctype.salary_component.test_salary_component import create_salary_component from hrms.payroll.doctype.salary_slip.salary_slip_loan_utils import if_lending_app_installed @@ -1185,6 +1188,22 @@ def test_status_on_discard(self): payroll_entry.reload() self.assertEqual(payroll_entry.status, "Cancelled") + def test_set_match_conditions_maps_permission_doctype_to_employee_field(self): + employee = frappe.qb.DocType("Employee") + query = frappe.qb.from_(employee).select(employee.name) + + with patch( + "hrms.payroll.doctype.payroll_entry.payroll_entry.get_match_cond", + return_value=[{"Employee Grade": ["A"], "Unknown Doctype": ["Ignored"]}], + ): + query = set_match_conditions(query, employee) + + query_sql = query.get_sql() + self.assertIn("grade", query_sql) + self.assertIn("'A'", query_sql) + self.assertNotIn("Employee Grade", query_sql) + self.assertNotIn("Unknown Doctype", query_sql) + def get_payroll_entry(**args): args = frappe._dict(args) diff --git a/hrms/payroll/doctype/salary_withholding/salary_withholding.json b/hrms/payroll/doctype/salary_withholding/salary_withholding.json index 60a5abbf5f5..fad6afa7411 100644 --- a/hrms/payroll/doctype/salary_withholding/salary_withholding.json +++ b/hrms/payroll/doctype/salary_withholding/salary_withholding.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_import": 1, "autoname": "format:SAL-WTH-{#####}", "creation": "2024-07-01 07:28:05.514677", "doctype": "DocType", @@ -176,7 +177,7 @@ "link_fieldname": "salary_withholding" } ], - "modified": "2024-07-22 18:24:24.217371", + "modified": "2026-09-01 18:39:51.520758", "modified_by": "Administrator", "module": "Payroll", "name": "Salary Withholding", diff --git a/hrms/payroll/print_format/salary_slip_classic/__init__.py b/hrms/payroll/print_format/salary_slip_classic/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/hrms/payroll/print_format/salary_slip_classic/salary_slip_classic.json b/hrms/payroll/print_format/salary_slip_classic/salary_slip_classic.json new file mode 100644 index 00000000000..828dedf241d --- /dev/null +++ b/hrms/payroll/print_format/salary_slip_classic/salary_slip_classic.json @@ -0,0 +1,35 @@ +{ + "absolute_value": 0, + "align_labels_right": 0, + "creation": "2026-08-31 00:00:00.000000", + "css": ".ss-doc {\n\tfont-family: \"Helvetica Neue\", Helvetica, Arial, sans-serif;\n\tcolor: #1a1a1a;\n\tfont-size: 12px;\n\tline-height: 1.45;\n}\n.ss-doc table { border-collapse: collapse; width: 100%; }\n.ss-doc td, .ss-doc th { vertical-align: top; padding: 0; }\n.ss-num { font-variant-numeric: tabular-nums; white-space: nowrap; }\n.ss-right { text-align: right; }\n.ss-label {\n\tfont-size: 9.5px;\n\tletter-spacing: 0.1em;\n\ttext-transform: uppercase;\n\tcolor: #757575;\n\tfont-weight: bold;\n}\n.ss-head-rule { border-top: 2px solid #1a1a1a; margin-bottom: 16px; }\n.section { margin-top: 0; }\n.section:not(:first-child) { margin-top: 0; }\n.custom-html { margin: 0; }\n.ss-title h3 {\n\tmargin: 0;\n\tfont-size: 15px;\n\tfont-weight: bold;\n\tletter-spacing: 0.1em;\n\ttext-transform: uppercase;\n}\n.ss-title .ss-period { font-size: 11.5px; color: #757575; margin-top: 2px; }\n.ss-ref { font-size: 10.5px; color: #757575; }\n.ss-ref strong { display: block; color: #1a1a1a; font-size: 11.5px; }\n.ss-meta {\n\tborder-top: 1px solid #e2e2e2;\n\tborder-bottom: 1px solid #e2e2e2;\n\tpadding: 12px 0;\n\tmargin: 16px 0 0;\n}\n.ss-meta td { width: 50%; }\n.ss-meta td + td { padding-left: 40px; }\n.ss-kv { width: 100%; }\n.ss-kv td { padding: 3px 0; font-size: 11px; }\n.ss-kv td.k { color: #757575; }\n.ss-kv td.v { text-align: right; font-size: 11.5px; font-weight: bold; }\n.ss-ledger th {\n\tfont-size: 9.5px;\n\tletter-spacing: 0.06em;\n\ttext-transform: uppercase;\n\tcolor: #757575;\n\tfont-weight: bold;\n\tborder-bottom: 1px solid #b0b0b0;\n\tpadding-bottom: 5px;\n\ttext-align: right;\n}\n.ss-ledger th.c { text-align: left; }\n.ss-ledger td {\n\tpadding: 5px 0;\n\tborder-bottom: 1px solid #e2e2e2;\n\tfont-size: 11.5px;\n\ttext-align: right;\n}\n.ss-ledger td.c { text-align: left; color: #444444; }\n.ss-ledger tr.ss-total td {\n\tborder-bottom: none;\n\tborder-top: 1px solid #b0b0b0;\n\tpadding-top: 7px;\n\tfont-weight: bold;\n\tfont-size: 12px;\n\tcolor: #1a1a1a;\n}\n.ss-net {\n\tbackground-color: #f2f2f2;\n\tborder-left: 3px solid #1a1a1a;\n\tmargin-top: 20px;\n}\n.ss-net td { padding: 14px 18px; }\n.ss-net .words { font-size: 10.5px; color: #757575; margin-top: 3px; }\n.ss-net .amt {\n\tfont-size: 21px;\n\tfont-weight: bold;\n\twhite-space: nowrap;\n\ttext-align: right;\n}\n.ss-split { margin-top: 20px; }\n.ss-split > tbody > tr > td { width: 50%; }\n.ss-split > tbody > tr > td.l { padding-right: 18px; border-right: 1px solid #e2e2e2; }\n.ss-split > tbody > tr > td.r { padding-left: 18px; }\n.ss-foot {\n\tmargin-top: 20px;\n\tpadding-top: 10px;\n\tborder-top: 1px solid #e2e2e2;\n\tfont-size: 9.5px;\n\tcolor: #757575;\n}\n", + "custom_format": 0, + "default_print_language": "en", + "disabled": 0, + "doc_type": "Salary Slip", + "docstatus": 0, + "doctype": "Print Format", + "font_size": 0, + "format_data": "{\"header\": {\"columns\": [{\"label\": \"\", \"fields\": []}]}, \"sections\": [{\"label\": \"\", \"columns\": [{\"label\": \"\", \"fields\": [{\"label\": \"Header\", \"fieldname\": \"custom_html_header\", \"fieldtype\": \"HTML\", \"html\": \"
\\n\\t
\\n\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\n\\t
\\n\\t\\t\\t\\t

{{ _(\\\"Salary Slip\\\") }}

\\n\\t\\t\\t\\t
\\n\\t\\t\\t\\t\\t{{ _(\\\"For the period\\\") }} {{ frappe.format(doc.start_date, {\\\"fieldtype\\\": \\\"Date\\\"}) }}\\n\\t\\t\\t\\t\\t{{ _(\\\"to\\\") }} {{ frappe.format(doc.end_date, {\\\"fieldtype\\\": \\\"Date\\\"}) }}\\n\\t\\t\\t\\t
\\n\\t\\t\\t
\\n\\t\\t\\t\\t{{ doc.name }}\\n\\t\\t\\t\\t{{ _(\\\"Issued\\\") }} {{ frappe.format(doc.posting_date, {\\\"fieldtype\\\": \\\"Date\\\"}) }}\\n\\t\\t\\t
\\n
\", \"custom\": 1}]}]}, {\"label\": \"\", \"columns\": [{\"label\": \"\", \"fields\": [{\"label\": \"Employee Details\", \"fieldname\": \"custom_html_employee\", \"fieldtype\": \"HTML\", \"html\": \"
\\n\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\n\\t
\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t{% if doc.designation %}{% endif %}\\n\\t\\t\\t\\t\\t{% if doc.department %}{% endif %}\\n\\t\\t\\t\\t\\t{% if doc.branch %}{% endif %}\\n\\t\\t\\t\\t
{{ _(\\\"Employee Name\\\") }}{{ doc.employee_name }}
{{ _(\\\"Employee ID\\\") }}{{ doc.employee }}
{{ _(\\\"Designation\\\") }}{{ doc.designation }}
{{ _(\\\"Department\\\") }}{{ doc.department }}
{{ _(\\\"Branch\\\") }}{{ doc.branch }}
\\n\\t\\t\\t
\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t{% if doc.payroll_frequency %}{% endif %}\\n\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t{% if doc.salary_structure %}{% endif %}\\n\\t\\t\\t\\t
{{ _(\\\"Payroll Frequency\\\") }}{{ _(doc.payroll_frequency) }}
{{ _(\\\"Working Days\\\") }}{{ doc.total_working_days | int }}
{{ _(\\\"Leave Without Pay\\\") }}{{ doc.leave_without_pay }}
{{ _(\\\"Payment Days\\\") }}{{ doc.payment_days }}
{{ _(\\\"Salary Structure\\\") }}{{ doc.salary_structure }}
\\n\\t\\t\\t
\\n
\", \"custom\": 1}]}]}, {\"label\": \"\", \"columns\": [{\"label\": \"\", \"fields\": [{\"label\": \"Earnings & Deductions\", \"fieldname\": \"custom_html_ledgers\", \"fieldtype\": \"HTML\", \"html\": \"{%- macro money(value) -%}{{ frappe.utils.fmt_money(value or 0, currency=doc.currency) }}{%- endmacro -%}\\n{%- set earnings = doc.earnings | rejectattr(\\\"do_not_include_in_total\\\") | selectattr(\\\"amount\\\") | list -%}\\n{%- set deductions = doc.deductions | rejectattr(\\\"do_not_include_in_total\\\") | selectattr(\\\"amount\\\") | list -%}\\n{%- set row_count = [earnings | length, deductions | length] | max -%}\\n
\\n\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\n\\t
\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t{% for row in earnings %}\\n\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t{% endfor %}\\n\\t\\t\\t\\t\\t\\t{% for i in range(row_count - (earnings | length)) %}\\n\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t{% endfor %}\\n\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t
{{ _(\\\"Earnings\\\") }}{{ _(\\\"Amount\\\") }}
{{ _(row.salary_component) }}{{ money(row.amount) }}
 
{{ _(\\\"Gross Pay\\\") }}{{ money(doc.gross_pay) }}
\\n\\t\\t\\t
\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t{% for row in deductions %}\\n\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t{% endfor %}\\n\\t\\t\\t\\t\\t\\t{% for i in range(row_count - (deductions | length)) %}\\n\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t{% endfor %}\\n\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t
{{ _(\\\"Deductions\\\") }}{{ _(\\\"Amount\\\") }}
{{ _(row.salary_component) }}{{ money(row.amount) }}
 
{{ _(\\\"Total Deduction\\\") }}{{ money(doc.total_deduction) }}
\\n\\t\\t\\t
\\n
\", \"custom\": 1}]}]}, {\"label\": \"\", \"columns\": [{\"label\": \"\", \"fields\": [{\"label\": \"Net Pay\", \"fieldname\": \"custom_html_net_pay\", \"fieldtype\": \"HTML\", \"html\": \"{%- macro money(value) -%}{{ frappe.utils.fmt_money(value or 0, currency=doc.currency) }}{%- endmacro -%}\\n{%- set disable_rounded_total = frappe.db.get_single_value(\\\"Payroll Settings\\\", \\\"disable_rounded_total\\\") -%}\\n{%- set net_total = doc.net_pay if disable_rounded_total else doc.rounded_total -%}\\n
\\n\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\n\\t
\\n\\t\\t\\t\\t
{{ _(\\\"Net Pay\\\") }}
\\n\\t\\t\\t\\t
{{ doc.total_in_words }}
\\n\\t\\t\\t
{{ money(net_total) }}
\\n
\", \"custom\": 1}]}]}, {\"label\": \"\", \"columns\": [{\"label\": \"\", \"fields\": [{\"label\": \"Footer\", \"fieldname\": \"custom_html_footer\", \"fieldtype\": \"HTML\", \"html\": \"
\\n\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\n\\t
\\n\\t\\t\\t\\t{%- if doc.bank_name -%}\\n\\t\\t\\t\\t\\t{{ doc.bank_name }}\\n\\t\\t\\t\\t\\t{%- if doc.bank_account_no %} • {{ _(\\\"A/C\\\") }} {{ doc.bank_account_no }}{% endif -%}\\n\\t\\t\\t\\t\\t{%- if doc.mode_of_payment %} • {{ _(doc.mode_of_payment) }}{% endif -%}\\n\\t\\t\\t\\t{%- elif doc.mode_of_payment -%}\\n\\t\\t\\t\\t\\t{{ _(\\\"Paid by\\\") }} {{ _(doc.mode_of_payment) }}\\n\\t\\t\\t\\t{%- endif -%}\\n\\t\\t\\t{{ _(\\\"This is a computer generated document and does not require a signature.\\\") }}
\\n
\", \"custom\": 1}]}]}], \"footer\": {\"columns\": [{\"label\": \"\", \"fields\": []}], \"show_label\": \"hide\"}}", + "idx": 0, + "line_breaks": 0, + "margin_bottom": 15.0, + "margin_left": 15.0, + "margin_right": 15.0, + "margin_top": 15.0, + "modified": "2026-09-03 12:30:00.000000", + "modified_by": "Administrator", + "module": "Payroll", + "name": "Salary Slip Classic", + "owner": "Administrator", + "page_number": "Hide", + "pdf_generator": "chrome", + "print_format_builder": 0, + "print_format_builder_beta": 1, + "print_format_for": "DocType", + "print_format_type": "Jinja", + "raw_printing": 0, + "show_label_colon": 0, + "show_section_headings": 0, + "standard": "Yes" +} diff --git a/hrms/payroll/print_format/salary_slip_compact/__init__.py b/hrms/payroll/print_format/salary_slip_compact/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/hrms/payroll/print_format/salary_slip_compact/salary_slip_compact.json b/hrms/payroll/print_format/salary_slip_compact/salary_slip_compact.json new file mode 100644 index 00000000000..c53118c8544 --- /dev/null +++ b/hrms/payroll/print_format/salary_slip_compact/salary_slip_compact.json @@ -0,0 +1,35 @@ +{ + "absolute_value": 0, + "align_labels_right": 0, + "creation": "2026-08-31 00:00:00.000000", + "css": ".ss-doc {\n\tfont-family: \"Helvetica Neue\", Helvetica, Arial, sans-serif;\n\tcolor: #1a1a1a;\n\tfont-size: 12px;\n\tline-height: 1.45;\n}\n.ss-doc table { border-collapse: collapse; width: 100%; }\n.ss-doc td, .ss-doc th { vertical-align: top; padding: 0; }\n.ss-num { font-variant-numeric: tabular-nums; white-space: nowrap; }\n.ss-right { text-align: right; }\n.ss-label {\n\tfont-size: 9.5px;\n\tletter-spacing: 0.1em;\n\ttext-transform: uppercase;\n\tcolor: #757575;\n\tfont-weight: bold;\n}\n.ss-head-rule { border-top: 2px solid #1a1a1a; margin-bottom: 16px; }\n.section { margin-top: 0; }\n.section:not(:first-child) { margin-top: 0; }\n.custom-html { margin: 0; }\n.ss-who td { padding-bottom: 16px; }\n.ss-who .name { font-size: 15px; font-weight: bold; letter-spacing: -0.01em; }\n.ss-who .sub { font-size: 10.5px; color: #757575; margin-top: 1px; }\n.ss-who .period { font-size: 11.5px; font-weight: bold; margin-top: 1px; }\n.ss-hero { background-color: #f2f2f2; }\n.ss-hero td { padding: 16px 18px; }\n.ss-hero .amt {\n\tfont-size: 30px;\n\tfont-weight: bold;\n\tline-height: 1.15;\n\tletter-spacing: -0.02em;\n\twhite-space: nowrap;\n\tmargin-top: 1px;\n}\n.ss-hero .words { font-size: 10.5px; color: #757575; margin-top: 4px; }\n.ss-hero .pay {\n\ttext-align: right;\n\tfont-size: 10.5px;\n\tcolor: #444444;\n\tline-height: 1.65;\n\twhite-space: nowrap;\n}\n.ss-hero .pay .ss-label { margin-bottom: 2px; }\n.ss-ledger { margin-top: 22px; }\n.ss-ledger col.amt { width: 30%; }\n.ss-ledger td {\n\tpadding: 6px 0;\n\tborder-bottom: 1px solid #e2e2e2;\n\tfont-size: 11.5px;\n\ttext-align: right;\n\tcolor: #444444;\n}\n.ss-ledger td.c { text-align: left; }\n.ss-ledger tr.ss-sec td {\n\tborder-bottom: 1px solid #b0b0b0;\n\tborder-top: 1px solid #b0b0b0;\n\tpadding: 6px 0 5px;\n\tfont-size: 9.5px;\n\tletter-spacing: 0.1em;\n\ttext-transform: uppercase;\n\tcolor: #757575;\n\tfont-weight: bold;\n}\n.ss-ledger tr.ss-sec.first td { border-top: none; padding-top: 0; }\n.ss-ledger tr.ss-sec td.c { text-align: left; }\n.ss-ledger tr.ss-sub td {\n\tborder-bottom: none;\n\tborder-top: 1px solid #b0b0b0;\n\tpadding-top: 7px;\n\tpadding-bottom: 14px;\n\tfont-weight: bold;\n\tfont-size: 12px;\n\tcolor: #1a1a1a;\n}\n.ss-ledger tr.ss-sub.last td { padding-bottom: 0; }\n.ss-foot {\n\tmargin-top: 18px;\n\tpadding-top: 10px;\n\tborder-top: 1px solid #e2e2e2;\n\tfont-size: 10px;\n\tcolor: #757575;\n}\n.ss-foot strong { color: #444444; font-weight: bold; }\n.ss-foot td { padding-right: 18px; }\n.ss-foot td.ref { padding-right: 0; text-align: right; }\n", + "custom_format": 0, + "default_print_language": "en", + "disabled": 0, + "doc_type": "Salary Slip", + "docstatus": 0, + "doctype": "Print Format", + "font_size": 0, + "format_data": "{\"header\": {\"columns\": [{\"label\": \"\", \"fields\": []}]}, \"sections\": [{\"label\": \"\", \"columns\": [{\"label\": \"\", \"fields\": [{\"label\": \"Header\", \"fieldname\": \"custom_html_header\", \"fieldtype\": \"HTML\", \"html\": \"
\\n\\t
\\n\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\n\\t
\\n\\t\\t\\t\\t
{{ doc.employee_name }}
\\n\\t\\t\\t\\t
\\n\\t\\t\\t\\t\\t{%- if doc.designation %}{{ doc.designation }} • {% endif -%}\\n\\t\\t\\t\\t\\t{%- if doc.department %}{{ doc.department }} • {% endif -%}\\n\\t\\t\\t\\t\\t{{ doc.employee }}\\n\\t\\t\\t\\t
\\n\\t\\t\\t
\\n\\t\\t\\t\\t
{{ _(\\\"Payslip for\\\") }}
\\n\\t\\t\\t\\t
\\n\\t\\t\\t\\t\\t{{ frappe.format(doc.start_date, {\\\"fieldtype\\\": \\\"Date\\\"}) }}\\n\\t\\t\\t\\t\\t{{ _(\\\"to\\\") }} {{ frappe.format(doc.end_date, {\\\"fieldtype\\\": \\\"Date\\\"}) }}\\n\\t\\t\\t\\t
\\n\\t\\t\\t
\\n
\", \"custom\": 1}]}]}, {\"label\": \"\", \"columns\": [{\"label\": \"\", \"fields\": [{\"label\": \"Net Pay\", \"fieldname\": \"custom_html_net_pay\", \"fieldtype\": \"HTML\", \"html\": \"{%- macro money(value) -%}{{ frappe.utils.fmt_money(value or 0, currency=doc.currency) }}{%- endmacro -%}\\n{%- set disable_rounded_total = frappe.db.get_single_value(\\\"Payroll Settings\\\", \\\"disable_rounded_total\\\") -%}\\n{%- set net_total = doc.net_pay if disable_rounded_total else doc.rounded_total -%}\\n
\\n\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\n\\t
\\n\\t\\t\\t\\t
{{ _(\\\"Net Pay\\\") }}
\\n\\t\\t\\t\\t
{{ money(net_total) }}
\\n\\t\\t\\t\\t
{{ doc.total_in_words }}
\\n\\t\\t\\t
\\n\\t\\t\\t\\t{%- if doc.bank_name or doc.mode_of_payment %}\\n\\t\\t\\t\\t
{{ _(\\\"Credited to\\\") }}
\\n\\t\\t\\t\\t{%- if doc.bank_name -%}\\n\\t\\t\\t\\t\\t
{{ doc.bank_name }}
\\n\\t\\t\\t\\t\\t{%- if doc.bank_account_no %}
{{ _(\\\"A/C\\\") }} {{ doc.bank_account_no }}
{% endif -%}\\n\\t\\t\\t\\t{%- else -%}\\n\\t\\t\\t\\t\\t
{{ _(doc.mode_of_payment) }}
\\n\\t\\t\\t\\t{%- endif -%}\\n\\t\\t\\t\\t{% endif -%}\\n\\t\\t\\t
\\n
\", \"custom\": 1}]}]}, {\"label\": \"\", \"columns\": [{\"label\": \"\", \"fields\": [{\"label\": \"Earnings & Deductions\", \"fieldname\": \"custom_html_ledger\", \"fieldtype\": \"HTML\", \"html\": \"{%- macro money(value) -%}{{ frappe.utils.fmt_money(value or 0, currency=doc.currency) }}{%- endmacro -%}\\n{%- set earnings = doc.earnings | rejectattr(\\\"do_not_include_in_total\\\") | selectattr(\\\"amount\\\") | list -%}\\n{%- set deductions = doc.deductions | rejectattr(\\\"do_not_include_in_total\\\") | selectattr(\\\"amount\\\") | list -%}\\n
\\n\\t\\n\\t\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t{% for row in earnings %}\\n\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t{% endfor %}\\n\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\n\\n\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t{% for row in deductions %}\\n\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t{% endfor %}\\n\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\n\\t
{{ _(\\\"Earnings\\\") }}{{ _(\\\"Amount\\\") }}
{{ _(row.salary_component) }}{{ money(row.amount) }}
{{ _(\\\"Gross Pay\\\") }}{{ money(doc.gross_pay) }}
{{ _(\\\"Deductions\\\") }}{{ _(\\\"Amount\\\") }}
{{ _(row.salary_component) }}{{ money(row.amount) }}
{{ _(\\\"Total Deduction\\\") }}{{ money(doc.total_deduction) }}
\\n
\", \"custom\": 1}]}]}, {\"label\": \"\", \"columns\": [{\"label\": \"\", \"fields\": [{\"label\": \"Footer\", \"fieldname\": \"custom_html_footer\", \"fieldtype\": \"HTML\", \"html\": \"
\\n\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\n\\t
{{ _(\\\"Working days\\\") }} {{ doc.total_working_days }}{{ _(\\\"Payment days\\\") }} {{ doc.payment_days }}{{ _(\\\"Leave without pay\\\") }} {{ doc.leave_without_pay }}{{ doc.name }}
\\n
\", \"custom\": 1}]}]}], \"footer\": {\"columns\": [{\"label\": \"\", \"fields\": []}], \"show_label\": \"hide\"}}", + "idx": 0, + "line_breaks": 0, + "margin_bottom": 15.0, + "margin_left": 15.0, + "margin_right": 15.0, + "margin_top": 15.0, + "modified": "2026-09-03 12:30:00.000000", + "modified_by": "Administrator", + "module": "Payroll", + "name": "Salary Slip Compact", + "owner": "Administrator", + "page_number": "Hide", + "pdf_generator": "chrome", + "print_format_builder": 0, + "print_format_builder_beta": 1, + "print_format_for": "DocType", + "print_format_type": "Jinja", + "raw_printing": 0, + "show_label_colon": 0, + "show_section_headings": 0, + "standard": "Yes" +} diff --git a/hrms/payroll/print_format/salary_slip_detailed/__init__.py b/hrms/payroll/print_format/salary_slip_detailed/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/hrms/payroll/print_format/salary_slip_detailed/salary_slip_detailed.json b/hrms/payroll/print_format/salary_slip_detailed/salary_slip_detailed.json new file mode 100644 index 00000000000..86cba978f72 --- /dev/null +++ b/hrms/payroll/print_format/salary_slip_detailed/salary_slip_detailed.json @@ -0,0 +1,35 @@ +{ + "absolute_value": 0, + "align_labels_right": 0, + "creation": "2026-08-31 00:00:00.000000", + "css": ".ss-doc {\n\tfont-family: \"Helvetica Neue\", Helvetica, Arial, sans-serif;\n\tcolor: #1a1a1a;\n\tfont-size: 12px;\n\tline-height: 1.45;\n}\n.ss-doc table { border-collapse: collapse; width: 100%; }\n.ss-doc td, .ss-doc th { vertical-align: top; padding: 0; }\n.ss-num { font-variant-numeric: tabular-nums; white-space: nowrap; }\n.ss-right { text-align: right; }\n.ss-label {\n\tfont-size: 9.5px;\n\tletter-spacing: 0.1em;\n\ttext-transform: uppercase;\n\tcolor: #757575;\n\tfont-weight: bold;\n}\n.ss-head-rule { border-top: 2px solid #1a1a1a; margin-bottom: 16px; }\n.section { margin-top: 0; }\n.section:not(:first-child) { margin-top: 0; }\n.custom-html { margin: 0; }\n.ss-title h3 {\n\tmargin: 0;\n\tfont-size: 15px;\n\tfont-weight: bold;\n\tletter-spacing: 0.1em;\n\ttext-transform: uppercase;\n}\n.ss-title .ss-period { font-size: 11.5px; color: #757575; margin-top: 2px; }\n.ss-ref { font-size: 10.5px; color: #757575; }\n.ss-ref strong { display: block; color: #1a1a1a; font-size: 11.5px; }\n.ss-meta {\n\tborder-top: 1px solid #e2e2e2;\n\tborder-bottom: 1px solid #e2e2e2;\n\tpadding: 12px 0;\n\tmargin: 16px 0 0;\n}\n.ss-meta td { width: 50%; }\n.ss-meta td + td { padding-left: 40px; }\n.ss-kv { width: 100%; }\n.ss-kv td { padding: 3px 0; font-size: 11px; }\n.ss-kv td.k { color: #757575; }\n.ss-kv td.v { text-align: right; font-size: 11.5px; font-weight: bold; }\n.ss-ledger th {\n\tfont-size: 9.5px;\n\tletter-spacing: 0.06em;\n\ttext-transform: uppercase;\n\tcolor: #757575;\n\tfont-weight: bold;\n\tborder-bottom: 1px solid #b0b0b0;\n\tpadding-bottom: 5px;\n\ttext-align: right;\n}\n.ss-ledger th.c { text-align: left; }\n.ss-ledger td {\n\tpadding: 5px 0;\n\tborder-bottom: 1px solid #e2e2e2;\n\tfont-size: 11.5px;\n\ttext-align: right;\n}\n.ss-ledger td.c { text-align: left; color: #444444; }\n.ss-ledger tr.ss-total td {\n\tborder-bottom: none;\n\tborder-top: 1px solid #b0b0b0;\n\tpadding-top: 7px;\n\tfont-weight: bold;\n\tfont-size: 12px;\n\tcolor: #1a1a1a;\n}\n.ss-net {\n\tbackground-color: #f2f2f2;\n\tborder-left: 3px solid #1a1a1a;\n\tmargin-top: 20px;\n}\n.ss-net td { padding: 14px 18px; }\n.ss-net .words { font-size: 10.5px; color: #757575; margin-top: 3px; }\n.ss-net .amt {\n\tfont-size: 21px;\n\tfont-weight: bold;\n\twhite-space: nowrap;\n\ttext-align: right;\n}\n.ss-strip { margin-top: 18px; border: 1px solid #e2e2e2; background-color: #f6f6f6; }\n.ss-strip td { padding: 9px 12px; border-right: 1px solid #e2e2e2; width: 20%; }\n.ss-strip td.last { border-right: none; }\n.ss-strip .ss-label { line-height: 1.3; min-height: 25px; }\n.ss-strip .v { font-size: 15px; font-weight: bold; margin-top: 2px; }\n.ss-section { margin: 24px 0 10px; }\n.ss-section td.rule { width: 100%; padding-left: 12px; vertical-align: middle; }\n.ss-section td.rule div { border-top: 1px solid #e2e2e2; }\n.ss-ledger col.amt { width: 24%; }\n.ss-net td.right { text-align: right; }\n.ss-split { margin-top: 24px; }\n.ss-split > tbody > tr > td { width: 50%; }\n.ss-split > tbody > tr > td.l { padding-right: 18px; }\n.ss-split > tbody > tr > td.r { padding-left: 18px; }\n.ss-foot {\n\tmargin-top: 22px;\n\tpadding-top: 10px;\n\tborder-top: 1px solid #e2e2e2;\n\tfont-size: 9.5px;\n\tcolor: #757575;\n}\n", + "custom_format": 0, + "default_print_language": "en", + "disabled": 0, + "doc_type": "Salary Slip", + "docstatus": 0, + "doctype": "Print Format", + "font_size": 0, + "format_data": "{\"header\": {\"columns\": [{\"label\": \"\", \"fields\": []}]}, \"sections\": [{\"label\": \"\", \"columns\": [{\"label\": \"\", \"fields\": [{\"label\": \"Header\", \"fieldname\": \"custom_html_header\", \"fieldtype\": \"HTML\", \"html\": \"
\\n\\t
\\n\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\n\\t
\\n\\t\\t\\t\\t

{{ _(\\\"Salary Statement\\\") }}

\\n\\t\\t\\t\\t
\\n\\t\\t\\t\\t\\t{{ frappe.format(doc.start_date, {\\\"fieldtype\\\": \\\"Date\\\"}) }}\\n\\t\\t\\t\\t\\t{{ _(\\\"to\\\") }} {{ frappe.format(doc.end_date, {\\\"fieldtype\\\": \\\"Date\\\"}) }}\\n\\t\\t\\t\\t\\t{%- if doc.current_payroll_period %} • {{ _(\\\"Payroll Period\\\") }} {{ doc.current_payroll_period }}{% endif %}\\n\\t\\t\\t\\t
\\n\\t\\t\\t
\\n\\t\\t\\t\\t{{ doc.name }}\\n\\t\\t\\t\\t{{ _(\\\"Issued\\\") }} {{ frappe.format(doc.posting_date, {\\\"fieldtype\\\": \\\"Date\\\"}) }}\\n\\t\\t\\t
\\n
\", \"custom\": 1}]}]}, {\"label\": \"\", \"columns\": [{\"label\": \"\", \"fields\": [{\"label\": \"Employee Details\", \"fieldname\": \"custom_html_employee\", \"fieldtype\": \"HTML\", \"html\": \"
\\n\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\n\\t
\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t{% if doc.designation %}{% endif %}\\n\\t\\t\\t\\t\\t{% if doc.department %}{% endif %}\\n\\t\\t\\t\\t
{{ _(\\\"Employee Name\\\") }}{{ doc.employee_name }}
{{ _(\\\"Employee ID\\\") }}{{ doc.employee }}
{{ _(\\\"Designation\\\") }}{{ doc.designation }}
{{ _(\\\"Department\\\") }}{{ doc.department }}
\\n\\t\\t\\t
\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t{% if doc.branch %}{% endif %}\\n\\t\\t\\t\\t\\t{% if doc.salary_structure %}{% endif %}\\n\\t\\t\\t\\t\\t{% if doc.payroll_frequency %}{% endif %}\\n\\t\\t\\t\\t\\t{% if doc.exchange_rate and doc.exchange_rate != 1 %}{% endif %}\\n\\t\\t\\t\\t
{{ _(\\\"Branch\\\") }}{{ doc.branch }}
{{ _(\\\"Salary Structure\\\") }}{{ doc.salary_structure }}
{{ _(\\\"Payroll Frequency\\\") }}{{ _(doc.payroll_frequency) }}
{{ _(\\\"Exchange Rate\\\") }}{{ doc.exchange_rate }}
\\n\\t\\t\\t
\\n
\", \"custom\": 1}]}]}, {\"label\": \"\", \"columns\": [{\"label\": \"\", \"fields\": [{\"label\": \"Attendance\", \"fieldname\": \"custom_html_attendance\", \"fieldtype\": \"HTML\", \"html\": \"
\\n\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\n\\t
\\n\\t\\t\\t\\t
{{ _(\\\"Working Days\\\") }}
\\n\\t\\t\\t\\t
{{ doc.total_working_days }}
\\n\\t\\t\\t
\\n\\t\\t\\t\\t
{{ _(\\\"Payment Days\\\") }}
\\n\\t\\t\\t\\t
{{ doc.payment_days }}
\\n\\t\\t\\t
\\n\\t\\t\\t\\t
{{ _(\\\"Leave Without Pay\\\") }}
\\n\\t\\t\\t\\t
{{ doc.leave_without_pay }}
\\n\\t\\t\\t
\\n\\t\\t\\t\\t
{{ _(\\\"Absent Days\\\") }}
\\n\\t\\t\\t\\t
{{ doc.absent_days }}
\\n\\t\\t\\t
\\n\\t\\t\\t\\t
{{ _(\\\"Unmarked Days\\\") }}
\\n\\t\\t\\t\\t
{{ doc.unmarked_days }}
\\n\\t\\t\\t
\\n
\", \"custom\": 1}]}]}, {\"label\": \"\", \"columns\": [{\"label\": \"\", \"fields\": [{\"label\": \"Earnings\", \"fieldname\": \"custom_html_earnings\", \"fieldtype\": \"HTML\", \"html\": \"{%- macro money(value) -%}{{ frappe.utils.fmt_money(value or 0, currency=doc.currency) }}{%- endmacro -%}\\n{%- set earnings = doc.earnings | rejectattr(\\\"do_not_include_in_total\\\") | selectattr(\\\"amount\\\") | list -%}\\n
\\n\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\n\\t
{{ _(\\\"Earnings\\\") }}
\\n\\t\\n\\t\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\n\\t\\t\\n\\t\\t\\t{% for row in earnings %}\\n\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t{% endfor %}\\n\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\n\\t
{{ _(\\\"Component\\\") }}{{ _(\\\"This Period\\\") }}{{ _(\\\"Year to Date\\\") }}
{{ _(row.salary_component) }}{{ money(row.amount) }}{{ money(row.year_to_date) }}
{{ _(\\\"Gross Pay\\\") }}{{ money(doc.gross_pay) }}{{ money(doc.gross_year_to_date) }}
\\n
\", \"custom\": 1}]}]}, {\"label\": \"\", \"columns\": [{\"label\": \"\", \"fields\": [{\"label\": \"Deductions\", \"fieldname\": \"custom_html_deductions\", \"fieldtype\": \"HTML\", \"html\": \"{%- macro money(value) -%}{{ frappe.utils.fmt_money(value or 0, currency=doc.currency) }}{%- endmacro -%}\\n{%- set deductions = doc.deductions | rejectattr(\\\"do_not_include_in_total\\\") | selectattr(\\\"amount\\\") | list -%}\\n
\\n\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\n\\t
{{ _(\\\"Deductions\\\") }}
\\n\\t\\n\\t\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\n\\t\\t\\n\\t\\t\\t{% for row in deductions %}\\n\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t{% endfor %}\\n\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\n\\t
{{ _(\\\"Component\\\") }}{{ _(\\\"This Period\\\") }}{{ _(\\\"Year to Date\\\") }}
{{ _(row.salary_component) }}{{ money(row.amount) }}{{ money(row.year_to_date) }}
{{ _(\\\"Total Deduction\\\") }}{{ money(doc.total_deduction) }}{{ money(deductions | sum(attribute=\\\"year_to_date\\\")) }}
\\n
\", \"custom\": 1}]}]}, {\"label\": \"\", \"columns\": [{\"label\": \"\", \"fields\": [{\"label\": \"Net Pay\", \"fieldname\": \"custom_html_net_pay\", \"fieldtype\": \"HTML\", \"html\": \"{%- macro money(value) -%}{{ frappe.utils.fmt_money(value or 0, currency=doc.currency) }}{%- endmacro -%}\\n{%- set disable_rounded_total = frappe.db.get_single_value(\\\"Payroll Settings\\\", \\\"disable_rounded_total\\\") -%}\\n{%- set net_total = doc.net_pay if disable_rounded_total else doc.rounded_total -%}\\n
\\n\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\n\\t
\\n\\t\\t\\t\\t
{{ _(\\\"Net Pay\\\") }}
\\n\\t\\t\\t\\t
{{ doc.total_in_words }}
\\n\\t\\t\\t
\\n\\t\\t\\t\\t
{{ money(net_total) }}
\\n\\t\\t\\t\\t
{{ _(\\\"Net paid year to date\\\") }} {{ money(doc.year_to_date) }}
\\n\\t\\t\\t
\\n
\", \"custom\": 1}]}]}, {\"label\": \"\", \"columns\": [{\"label\": \"\", \"fields\": [{\"label\": \"Leave Balances & Income Tax\", \"fieldname\": \"custom_html_leave_tax\", \"fieldtype\": \"HTML\", \"html\": \"{%- macro money(value) -%}{{ frappe.utils.fmt_money(value or 0, currency=doc.currency) }}{%- endmacro -%}\\n{%- set show_tax = doc.annual_taxable_amount or doc.total_income_tax or doc.ctc -%}\\n{% if doc.leave_details or show_tax %}\\n
\\n\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\n\\t
\\n\\t\\t\\t\\t{% if doc.leave_details %}\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t{% for row in doc.leave_details %}\\n\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t{% endfor %}\\n\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t
{{ _(\\\"Leave Type\\\") }}{{ _(\\\"Used\\\") }}{{ _(\\\"Available\\\") }}
{{ _(row.leave_type) }}{{ row.used_leaves }}{{ row.available_leaves }}
\\n\\t\\t\\t\\t{% endif %}\\n\\t\\t\\t
\\n\\t\\t\\t\\t{% if show_tax %}\\n\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t{% if doc.ctc %}{% endif %}\\n\\t\\t\\t\\t\\t\\t{% if doc.total_earnings %}{% endif %}\\n\\t\\t\\t\\t\\t\\t{% if doc.tax_exemption_declaration %}{% endif %}\\n\\t\\t\\t\\t\\t\\t{% if doc.standard_tax_exemption_amount %}{% endif %}\\n\\t\\t\\t\\t\\t\\t{% if doc.annual_taxable_amount %}{% endif %}\\n\\t\\t\\t\\t\\t\\t{% if doc.total_income_tax %}\\n\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\t\\t{% endif %}\\n\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t
{{ _(\\\"Income Tax Working\\\") }}{{ _(\\\"Annual\\\") }}
{{ _(\\\"CTC\\\") }}{{ money(doc.ctc) }}
{{ _(\\\"Total Earnings\\\") }}{{ money(doc.total_earnings) }}
{{ _(\\\"Tax Exemption Declaration\\\") }}{{ money(doc.tax_exemption_declaration) }}
{{ _(\\\"Standard Tax Exemption\\\") }}{{ money(doc.standard_tax_exemption_amount) }}
{{ _(\\\"Annual Taxable Amount\\\") }}{{ money(doc.annual_taxable_amount) }}
{{ _(\\\"Total Income Tax\\\") }}{{ money(doc.total_income_tax) }}
\\n\\t\\t\\t\\t{% endif %}\\n\\t\\t\\t
\\n
\\n{% endif %}\", \"custom\": 1}]}]}, {\"label\": \"\", \"columns\": [{\"label\": \"\", \"fields\": [{\"label\": \"Footer\", \"fieldname\": \"custom_html_footer\", \"fieldtype\": \"HTML\", \"html\": \"
\\n\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\n\\t
\\n\\t\\t\\t\\t{%- if doc.bank_name -%}\\n\\t\\t\\t\\t\\t{{ doc.bank_name }}\\n\\t\\t\\t\\t\\t{%- if doc.bank_account_no %} • {{ _(\\\"A/C\\\") }} {{ doc.bank_account_no }}{% endif -%}\\n\\t\\t\\t\\t\\t{%- if doc.mode_of_payment %} • {{ _(doc.mode_of_payment) }}{% endif -%}\\n\\t\\t\\t\\t{%- elif doc.mode_of_payment -%}\\n\\t\\t\\t\\t\\t{{ _(\\\"Paid by\\\") }} {{ _(doc.mode_of_payment) }}\\n\\t\\t\\t\\t{%- endif -%}\\n\\t\\t\\t{{ _(\\\"This is a computer generated document and does not require a signature.\\\") }}
\\n
\", \"custom\": 1}]}]}], \"footer\": {\"columns\": [{\"label\": \"\", \"fields\": []}], \"show_label\": \"hide\"}}", + "idx": 0, + "line_breaks": 0, + "margin_bottom": 15.0, + "margin_left": 15.0, + "margin_right": 15.0, + "margin_top": 15.0, + "modified": "2026-09-03 12:30:00.000000", + "modified_by": "Administrator", + "module": "Payroll", + "name": "Salary Slip Detailed", + "owner": "Administrator", + "page_number": "Hide", + "pdf_generator": "chrome", + "print_format_builder": 0, + "print_format_builder_beta": 1, + "print_format_for": "DocType", + "print_format_type": "Jinja", + "raw_printing": 0, + "show_label_colon": 0, + "show_section_headings": 0, + "standard": "Yes" +}