Merge branch 'frappe:develop' into check-voucher_type-if-cash-or-bank

Author: elshafei-developer

.github/workflows/ci.yml

@@ -38,7 +38,7 @@ jobs:
 
     services:
       mysql:
-        image: mariadb:10.6
+        image: mariadb:11.8
         env:
           MARIADB_ROOT_PASSWORD: 'root'
         ports:
@@ -47,12 +47,12 @@ jobs:
 
     steps:
       - name: Clone
-        uses: actions/checkout@v2
+        uses: actions/checkout@v6
 
       - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v6
         with:
-          python-version: '3.10'
+          python-version: '3.14'
 
       - name: Check for valid Python & Merge Conflicts
         run: |
@@ -63,9 +63,9 @@ jobs:
           fi
 
       - name: Setup Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v6
         with:
-          node-version: 18
+          node-version: 24
           check-latest: true
 
       - name: Add to Hosts
@@ -131,7 +131,7 @@ jobs:
     if: ${{ github.event_name != 'pull_request' }}
     steps:
       - name: Clone
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Download artifacts
         uses: actions/download-artifact@v4

.github/workflows/docs_checker.yml

@@ -10,12 +10,12 @@ jobs:
 
     steps:
       - name: 'Setup Environment'
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v6
         with:
           python-version: 3.8
 
       - name: 'Clone repo'
-        uses: actions/checkout@v2
+        uses: actions/checkout@v6
 
       - name: Validate Docs
         env:

.github/workflows/generate-pot-file.yml

@@ -18,14 +18,14 @@ jobs:
 
     steps:
         - name: Checkout
-          uses: actions/checkout@v4
+          uses: actions/checkout@v6
           with:
             ref: ${{ matrix.branch }}
 
         - name: Setup Python
-          uses: actions/setup-python@v5
+          uses: actions/setup-python@v6
           with:
-            python-version: "3.12"
+            python-version: "3.14"
 
         - name: Run script to update POT file
           run: |

.github/workflows/linters.yml

@@ -10,12 +10,12 @@ jobs:
     if: github.event_name == 'pull_request'
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 200
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v6
         with:
-          node-version: 18
+          node-version: 24
           check-latest: true
 
       - name: Check commit titles
@@ -29,12 +29,12 @@ jobs:
     if: github.event_name == 'pull_request'
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v6
 
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v2
+      - name: Set up Python 3.14
+        uses: actions/setup-python@v6
         with:
-          python-version: '3.10'
+          python-version: '3.14'
 
       - name: Install and Run Pre-commit
         uses: pre-commit/action@v3.0.0

.github/workflows/on_release.yml

@@ -10,12 +10,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Entire Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           persist-credentials: false
       - name: Setup Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v6
         with:
           node-version: 20
       - name: Setup dependencies

hrms/desktop_icon/attendance.json

@@ -6,10 +6,11 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
-  "employee_settings",
+  "employee_tab",
+  "employee_settings_section",
   "emp_created_by",
   "standard_working_hours",
-  "column_break_9",
+  "column_break_lrow",
   "retirement_age",
   "reminders_section",
   "column_break_11",
@@ -20,21 +21,34 @@
   "column_break_hyec",
   "sender",
   "sender_email",
-  "leave_and_expense_claim_settings",
+  "leaves_tab",
+  "leave_settings_section",
+  "auto_leave_encashment",
+  "leave_approver_mandatory_in_leave_application",
+  "prevent_self_leave_approval",
+  "show_leaves_of_all_department_members_in_calendar",
+  "column_break_29",
   "send_leave_notification",
   "leave_approval_notification_template",
   "leave_status_notification_template",
-  "leave_approver_mandatory_in_leave_application",
   "restrict_backdated_leave_application",
-  "prevent_self_leave_approval",
-  "prevent_self_expense_approval",
   "role_allowed_to_create_backdated_leave_application",
-  "column_break_29",
+  "expenses_tab",
+  "expenses_settings_section",
   "expense_approver_mandatory_in_expense_claim",
-  "show_leaves_of_all_department_members_in_calendar",
-  "auto_leave_encashment",
+  "prevent_self_expense_approval",
+  "unlink_payment_on_cancellation_of_employee_advance",
+  "shift_and_attendance_tab",
   "shift_settings_section",
   "allow_multiple_shift_assignments",
+  "attendance_settings_section",
+  "allow_employee_checkin_from_mobile_app",
+  "allow_geolocation_tracking",
+  "tenure_tab",
+  "employee_exit_settings_section",
+  "exit_questionnaire_web_form",
+  "exit_questionnaire_notification_template",
+  "recruitment_tab",
   "hiring_settings_section",
   "check_vacancies",
   "send_interview_reminder",
@@ -44,23 +58,9 @@
   "feedback_reminder_notification_template",
   "column_break_4",
   "hiring_sender",
-  "hiring_sender_email",
-  "employee_exit_section",
-  "exit_questionnaire_web_form",
-  "column_break_34",
-  "exit_questionnaire_notification_template",
-  "attendance_settings_section",
-  "allow_employee_checkin_from_mobile_app",
-  "allow_geolocation_tracking",
-  "unlink_payment_section",
-  "unlink_payment_on_cancellation_of_employee_advance"
+  "hiring_sender_email"
  ],
  "fields": [
-  {
-   "fieldname": "employee_settings",
-   "fieldtype": "Section Break",
-   "label": "Employee Settings"
-  },
   {
    "fieldname": "retirement_age",
    "fieldtype": "Data",
@@ -137,12 +137,6 @@
    "fieldtype": "Float",
    "label": "Standard Working Hours"
   },
-  {
-   "collapsible": 1,
-   "fieldname": "leave_and_expense_claim_settings",
-   "fieldtype": "Section Break",
-   "label": "Leave and Expense Claim Settings"
-  },
   {
    "default": "00:15:00",
    "depends_on": "send_interview_reminder",
@@ -151,7 +145,6 @@
    "label": "Remind Before"
   },
   {
-   "collapsible": 1,
    "fieldname": "reminders_section",
    "fieldtype": "Section Break",
    "label": "Reminders"
@@ -183,10 +176,6 @@
    "fieldtype": "Check",
    "label": "Birthdays"
   },
-  {
-   "fieldname": "column_break_9",
-   "fieldtype": "Column Break"
-  },
   {
    "fieldname": "column_break_11",
    "fieldtype": "Column Break"
@@ -229,22 +218,12 @@
    "fieldtype": "Check",
    "label": "Restrict Backdated Leave Application"
   },
-  {
-   "fieldname": "hiring_settings_section",
-   "fieldtype": "Section Break",
-   "label": "Hiring Settings"
-  },
   {
    "default": "0",
    "fieldname": "check_vacancies",
    "fieldtype": "Check",
    "label": "Check Vacancies On Job Offer Creation"
   },
-  {
-   "fieldname": "employee_exit_section",
-   "fieldtype": "Section Break",
-   "label": "Employee Exit Settings"
-  },
   {
    "fieldname": "exit_questionnaire_web_form",
    "fieldtype": "Link",
@@ -257,10 +236,6 @@
    "label": "Exit Questionnaire Notification Template",
    "options": "Email Template"
   },
-  {
-   "fieldname": "column_break_34",
-   "fieldtype": "Column Break"
-  },
   {
    "fieldname": "sender",
    "fieldtype": "Link",
@@ -323,11 +298,6 @@
    "fieldtype": "Section Break",
    "label": "Attendance Settings"
   },
-  {
-   "fieldname": "unlink_payment_section",
-   "fieldtype": "Section Break",
-   "label": "Unlink Payment"
-  },
   {
    "default": "0",
    "fieldname": "unlink_payment_on_cancellation_of_employee_advance",
@@ -345,13 +315,72 @@
    "fieldname": "prevent_self_expense_approval",
    "fieldtype": "Check",
    "label": "Prevent self approval for expense claims even if user has permissions"
+  },
+  {
+   "fieldname": "employee_tab",
+   "fieldtype": "Tab Break",
+   "label": "Employee"
+  },
+  {
+   "fieldname": "expenses_tab",
+   "fieldtype": "Tab Break",
+   "label": "Expenses"
+  },
+  {
+   "fieldname": "shift_and_attendance_tab",
+   "fieldtype": "Tab Break",
+   "label": "Shift and Attendance"
+  },
+  {
+   "fieldname": "tenure_tab",
+   "fieldtype": "Tab Break",
+   "label": "Tenure"
+  },
+  {
+   "fieldname": "recruitment_tab",
+   "fieldtype": "Tab Break",
+   "label": "Recruitment"
+  },
+  {
+   "fieldname": "leaves_tab",
+   "fieldtype": "Tab Break",
+   "label": "Leaves"
+  },
+  {
+   "fieldname": "column_break_lrow",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "expenses_settings_section",
+   "fieldtype": "Section Break",
+   "label": "Expenses Settings"
+  },
+  {
+   "fieldname": "employee_settings_section",
+   "fieldtype": "Section Break",
+   "label": "Employee Settings"
+  },
+  {
+   "fieldname": "leave_settings_section",
+   "fieldtype": "Section Break",
+   "label": "Leave Settings"
+  },
+  {
+   "fieldname": "hiring_settings_section",
+   "fieldtype": "Section Break",
+   "label": "Hiring Settings"
+  },
+  {
+   "fieldname": "employee_exit_settings_section",
+   "fieldtype": "Section Break",
+   "label": "Employee Exit Settings"
   }
  ],
  "icon": "fa fa-cog",
  "idx": 1,
  "issingle": 1,
  "links": [],
- "modified": "2025-07-28 10:37:35.977951",
+ "modified": "2025-12-29 16:25:06.271352",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "HR Settings",