hr_lite 0.54.0 → 0.56.0

data/app/services/hr_lite/slip_builder.rb

@@ -71,10 +71,8 @@ module HrLite
       deductions << { code: "pt", label: "Professional tax", amount: pt } if pt.positive?
 
       deductions.concat(extra_deductions)
-      loan = loan_instalment
-      deductions << loan if loan
 
-      fy = SalarySlip.fy_to_date(@user, @run.period_month)
+      fy =SalarySlip.fy_to_date(@user, @run.period_month)
       tds = Calculators::Tds.call(
         regime: tax_regime,
         structure_monthly_gross: @structure.monthly_gross,
@@ -90,9 +88,16 @@ module HrLite
         rates: @rates[:income_tax],
         override: @tds_override
       )
+      loan = loan_instalment(gross_earned - deductions.sum(BigDecimal(0)) { |row| row[:amount] } - tds.monthly)
+      deductions << loan if loan
       deductions << { code: "tds", label: "Income tax (TDS)", amount: tds.monthly } if tds.monthly.positive?
 
       total_deductions = deductions.sum(BigDecimal(0)) { |row| row[:amount] }
+      # Claims booked onto this month: paid back with the salary but not
+      # salary, so outside gross and every PF, ESI, PT and TDS base.
+      claims = Expense.awaiting_reimbursement.where(user_id: @user.id, reimbursed_in: @run.period_month).includes(:category).map do |claim|
+        { code: "reimbursement", label: "#{claim.category.name} claim (reimbursement, outside gross)", amount: claim.amount }
+      end
 
       {
         period_month: @run.period_month,
@@ -104,7 +109,7 @@ module HrLite
         lop_days: Money.d(summary[:lop_days]),
         lop_override: @lop_override,
         tds_override: @tds_override,
-        earnings: serialize_rows(earnings),
+        earnings: serialize_rows(earnings + claims),
         deductions: serialize_rows(deductions),
         employer_costs: employer_costs.transform_values { |v| v.to_s("F") }.to_json,
         tax_details: tds.details.to_json,
@@ -113,7 +118,7 @@ module HrLite
         # A heavy-LOP month can leave TDS (projected from the full structure)
         # larger than what was actually earned. Nobody is paid a negative
         # salary; PayrollRunProcessor warns when this floor bites.
-        net_pay: [ gross_earned - total_deductions, BigDecimal(0) ].max,
+        net_pay: [ gross_earned + claims.sum(BigDecimal(0)) { |row| row[:amount] } - total_deductions, BigDecimal(0) ].max,
         computed_at: Time.current
       }
     end
@@ -172,13 +177,16 @@ module HrLite
     # The month's loan instalment, as one deduction line. Computed here and
     # BOOKED only when the run is finalized — a draft is recomputed freely,
     # and booking at compute would take a repayment on every pass.
-    def loan_instalment
-      total = Loan.active.where(user_id: @user.id).sum(BigDecimal(0)) do |loan|
+    # Never more than `room` (pay left after every other deduction); the rest stays owed.
+    def loan_instalment(room)
+      due = Loan.active.where(user_id: @user.id).sum(BigDecimal(0)) do |loan|
         loan.instalment_for(@run.period_month)
       end
-      return nil unless total.positive?
+      return nil unless due.positive?
 
-      { code: "loan_repayment", label: "Loan repayment", amount: total }
+      amount = room.clamp(BigDecimal(0), due)
+      row = { code: "loan_repayment", label: "Loan repayment", amount: amount }
+      amount < due ? row.merge(meta: { carried_forward: (due - amount).to_s("F") }) : row
     end
 
     # Months left in the Indian FY (Apr–Mar) including the run month itself:

data/app/services/hr_lite/work_status.rb

@@ -16,8 +16,11 @@ module HrLite
     def self.for(user_id, at: Time.current) = for_users([ user_id ], at: at)[user_id]
 
     # When an open Busy or Meeting ends, or nil when the person is reachable.
-    def self.do_not_disturb_until(user_id, at: Time.current)
-      WorkModeEvent.open.overlay.where(user_id: user_id, mode: %w[busy meeting]).where("ends_at > ?", at).maximum(:ends_at)
+    def self.do_not_disturb_until(user_id, at: Time.current) = do_not_disturb_for([ user_id ], at: at)[user_id]
+
+    # The same for many people in one query: { user_id => ends_at }, reachable people absent.
+    def self.do_not_disturb_for(user_ids, at: Time.current)
+      WorkModeEvent.open.overlay.where(user_id: user_ids, mode: %w[busy meeting]).where("ends_at > ?", at).group(:user_id).maximum(:ends_at)
     end
 
     def self.for_users(user_ids, at: Time.current)

data/app/views/hr_lite/admin/assets/index.html.erb

@@ -22,6 +22,9 @@
 <% end %>
 
 <section class="hrl-card">
+  <% if @assets.empty? %>
+    <p class="hrl-muted">No assets recorded yet. Add the first one above.</p>
+  <% else %>
   <div class="hrl-table-wrap">
     <table class="hrl-table hrl-table--stack">
       <thead><tr><th>Asset</th><th>Status</th><th>With</th><th></th></tr></thead>
@@ -39,13 +42,16 @@
             <td data-label="">
               <% if asset.assigned? %>
                 <%= form_with url: hr_lite.take_back_admin_asset_path(asset), method: :post do %>
-                  <%= text_field_tag :condition_note, nil, placeholder: "Condition", class: "hrl-input" %>
+                  <%= label_tag "asset-condition-#{asset.id}", "Condition on return", class: "hrl-sr-only" %>
+                  <%= text_field_tag :condition_note, nil, id: "asset-condition-#{asset.id}", placeholder: "Condition on return", class: "hrl-input" %>
                   <%= submit_tag "Take back", class: "hrl-btn" %>
                 <% end %>
               <% elsif asset.available? %>
                 <%= form_with url: hr_lite.assign_admin_asset_path(asset), method: :post do %>
+                  <%= label_tag "asset-holder-#{asset.id}", "Hand over to", class: "hrl-sr-only" %>
                   <%= select_tag :user_id,
-                        options_for_select(HrLite.employees.map { |u| [ hr_display_name(u), u.id ] }), class: "hrl-input",
+                        options_for_select(HrLite.employees.map { |u| [ hr_display_name(u), u.id ] }), id: "asset-holder-#{asset.id}",
+                        include_blank: "Choose…", required: true, class: "hrl-input",
                         data: { hrl_filter: "Type a name to filter" } %>
                   <%= submit_tag "Hand over", class: "hrl-btn" %>
                 <% end %>
@@ -56,5 +62,6 @@
       </tbody>
     </table>
   </div>
+  <% end %>
   <%= hrl_pagination %>
 </section>

data/app/views/hr_lite/admin/attendances/show.html.erb

@@ -1,5 +1,6 @@
 <% content_for(:page_title) { "Attendance — #{hr_display_name(@employee)}" } %>
 <% content_for(:tabrow) { render "hr_lite/shared/person_tabs", user: @employee } %>
+<% content_for(:back, "Team") %>
 <div class="hrl-page__head">
   <h1 class="hrl-page__title"><%= hr_display_name(@employee) %></h1>
   <div class="hrl-page__actions">
@@ -33,6 +34,7 @@
 <% if @punches.any? %>
   <section class="hrl-card">
     <h2 class="hrl-card__title">Where they punched</h2>
+    <% all_punches = HrLite::AttendancePunch.where(user_id: @employee.id, date: @punches.map(&:date)).order(:at, :id).group_by(&:date) # one query, not one a day %>
     <% @punches.each do |record| %>
       <div class="hrl-feed__item hrl-small">
         <div class="hrl-feed__body">
@@ -47,7 +49,7 @@
               <% end %>
             </div>
           <% end %>
-          <% if record.check_in_place %><%= render "hr_lite/attendance/trail", record: record %><% end %>
+          <% if record.check_in_place %><%= render "hr_lite/attendance/trail", record: record, punches: all_punches.fetch(record.date, []) %><% end %>
           <% if (gap = record.punch_gap_m) %>
             <div class="<%= gap > HrLite::AttendanceRecord::PUNCH_GAP_ALERT_M ? "hrl-badge hrl-badge--warn" : "hrl-muted" %>"><%= (gap / 1000.0).round(1) %> km apart</div>
           <% end %>

data/app/views/hr_lite/admin/attendances/summary.html.erb

@@ -25,14 +25,17 @@
   <% end %>
 </section>
 
+<% fixes_pending = HrLite::RegularizationRequest.pending.where(user_id: @employee.id, date: @period.from..@period.to).pluck(:date) %>
 <section class="hrl-card">
   <h2 class="hrl-card__title">Days</h2>
   <% (@period.from..@period.to).each do |date| %>
-    <% day = @days.for(date); rec = day.record; punches = @punches[date].to_a %>
+    <% day = @days.for(date); rec = day.record; punches = @punches[date].to_a
+       not_in_yet = date == Date.current && day.kind == :absent # the day is not over %>
     <div class="hrl-feed__item hrl-row">
       <div class="hrl-feed__body hrl-small">
         <strong><%= date.strftime("%a %-d %b") %></strong>
-        <span class="hrl-badge <%= tones[day.kind] %>"><%= HrLite::ApplicationHelper::DAY_STATES[day.kind][1] %></span>
+        <span class="hrl-badge <%= not_in_yet ? "hrl-badge--muted" : tones[day.kind] %>"><%= not_in_yet ? "Not in yet" : HrLite::ApplicationHelper::DAY_STATES[day.kind][1] %></span>
+        <% if fixes_pending.include?(date) %><span class="hrl-badge hrl-badge--warn">Fix pending</span><% end %>
         <% if @profile&.hours_allowance_minutes && (length = HrLite::EmployeeProfile.day_minutes_for(@employee.id, on: date)) < HrLite::Setting.instance.day_minutes %>
           <span class="hrl-badge hrl-badge--muted">Day <%= hrl_duration(length * 60) %></span>
         <% end %>

data/app/views/hr_lite/admin/audit_logs/index.html.erb

@@ -1,6 +1,8 @@
+<% content_for(:page_title) { "Audit trail" } %>
 <div class="hrl-page__head">
   <h1 class="hrl-page__title">Audit trail</h1>
-  <p class="hrl-page__sub">Every policy, settings and payroll change — append-only.</p>
+  <p class="hrl-page__sub">Every policy, settings and payroll change — append-only.
+    <% if params[:views] %><a href="<%= hr_lite.admin_audit_logs_path %>">Hide page views</a><% else %><a href="<%= hr_lite.admin_audit_logs_path(views: 1) %>">Show page views too</a><% end %></p>
 </div>
 
 <% if @audit_logs.any? %>
@@ -13,15 +15,15 @@
         <% @audit_logs.each do |log| %>
           <tr>
             <td data-label="When"><%= log.created_at.strftime("%d %b %Y, %H:%M") %></td>
-            <td data-label="Who"><%= hr_display_name(log.actor) %></td>
-            <td data-label="Action"><span class="hrl-badge hrl-badge--muted"><%= log.action %></span></td>
+            <td data-label="Who"><%= log.actor ? hr_display_name(log.actor) : "System" %></td>
+            <td data-label="Action"><span class="hrl-badge hrl-badge--muted"><%= log.action.tr("._", "  ").humanize %></span></td>
             <td data-label="Subject"><%= log.subject_type.demodulize.underscore.humanize %> #<%= log.subject_id %></td>
             <td data-label="Changes">
               <% log.audited_changes.each do |attr, change| %>
                 <div class="hrl-small">
                   <span class="hrl-muted"><%= attr.humanize %>:</span>
                   <% if change.is_a?(Array) %>
-                    <%= change[0].inspect %> → <%= change[1].inspect %>
+                    <%= change[0].to_s.presence || "blank" %> → <%= change[1].to_s.presence || "blank" %>
                   <% else %>
                     <%= change %>
                   <% end %>

data/app/views/hr_lite/admin/ca_reviews/index.html.erb

@@ -22,12 +22,12 @@
 </div>
 
 <div class="hrl-row hrl-row--mb" role="tablist">
-  <a class="hrl-btn <%= "hrl-btn--primary" if @tab == "slips" %>" href="<%= hr_lite.admin_ca_reviews_path(keep.(tab: "slips", status: @status)) %>" aria-current="<%= @tab == "slips" ? "page" : nil %>">Salary slips</a>
-  <a class="hrl-btn <%= "hrl-btn--primary" if @tab == "declarations" %>" href="<%= hr_lite.admin_ca_reviews_path(keep.(tab: "declarations", status: @status)) %>" aria-current="<%= @tab == "declarations" ? "page" : nil %>">Tax declarations</a>
+  <a class="hrl-btn" <%= "aria-current=true" if @tab == "slips" %> href="<%= hr_lite.admin_ca_reviews_path(keep.(tab: "slips", status: @status)) %>">Salary slips</a>
+  <a class="hrl-btn" <%= "aria-current=true" if @tab == "declarations" %> href="<%= hr_lite.admin_ca_reviews_path(keep.(tab: "declarations", status: @status)) %>">Tax declarations</a>
 </div>
 <div class="hrl-row hrl-row--mb">
   <% [ [ nil, "All" ], [ "unreviewed", "To review" ], [ "flagged", "Flagged" ], [ "verified", "Verified" ], [ "resolved", "Resolved" ] ].each do |value, label| %>
-    <a class="hrl-btn <%= "hrl-btn--primary" if @status == value %>" href="<%= hr_lite.admin_ca_reviews_path(keep.(status: value)) %>"><%= label %></a>
+    <a class="hrl-btn" <%= "aria-current=true" if @status == value %> href="<%= hr_lite.admin_ca_reviews_path(keep.(status: value)) %>"><%= label %></a>
   <% end %>
 </div>
 

data/app/views/hr_lite/admin/checklists/index.html.erb

@@ -4,8 +4,7 @@
 <section class="hrl-card">
   <div class="hrl-row">
     <% HrLite::ChecklistTemplate::KINDS.each do |kind| %>
-      <a class="hrl-btn <%= "hrl-btn--primary" if kind == @kind %>"
-         href="<%= hr_lite.admin_checklists_path(kind: kind) %>"><%= kind.humanize %></a>
+      <%= link_to kind.humanize, hr_lite.admin_checklists_path(kind: kind), class: "hrl-btn", aria: { current: ("true" if kind == @kind) } %>
     <% end %>
   </div>
 </section>
@@ -37,7 +36,8 @@
               <td data-label="Due"><%= item.due_on&.strftime("%d %b %Y") || "—" %></td>
               <td data-label="">
                 <%= form_with url: hr_lite.complete_admin_checklist_path(item), method: :post do %>
-                  <%= text_field_tag :note, nil, placeholder: "Note", class: "hrl-input" %>
+                  <%= label_tag "checklist-note-#{item.id}", "Note (optional)", class: "hrl-sr-only" %>
+                  <%= text_field_tag :note, nil, id: "checklist-note-#{item.id}", placeholder: "Note (optional)", class: "hrl-input" %>
                   <%= submit_tag "Done", class: "hrl-btn hrl-btn--primary" %>
                 <% end %>
               </td>

data/app/views/hr_lite/admin/comp_off_requests/index.html.erb

@@ -6,8 +6,7 @@
 <div class="hrl-row hrl-row--mb">
   <span class="hrl-small hrl-muted">Status</span>
   <% HrLite::CompOffRequest::STATUSES.each do |status| %>
-    <a class="hrl-btn <%= 'hrl-btn--primary' if @status == status %>"
-       href="<%= hr_lite.admin_comp_off_requests_path(status: status) %>"><%= status.humanize %></a>
+    <%= link_to status.humanize, hr_lite.admin_comp_off_requests_path(status: status), class: "hrl-btn", aria: { current: ("true" if @status == status) } %>
   <% end %>
 </div>
 

data/app/views/hr_lite/admin/comp_off_requests/show.html.erb

@@ -1,9 +1,7 @@
 <% content_for(:page_title) { "Comp-off — #{hr_display_name(@request.user)}" } %>
+<a class="hrl-backlink" href="<%= hr_lite.admin_comp_off_requests_path %>"><span aria-hidden="true">‹</span> Approvals</a>
 <div class="hrl-page__head">
   <h1 class="hrl-page__title">Comp-off — <%= hr_display_name(@request.user) %></h1>
-  <div class="hrl-page__actions">
-    <a class="hrl-btn" href="<%= hr_lite.admin_comp_off_requests_path %>">All requests</a>
-  </div>
 </div>
 
 <section class="hrl-card">
@@ -34,7 +32,8 @@
       `formaction:` can never pass verification on the second endpoint. %>
   <section class="hrl-card">
     <h2 class="hrl-card__title">Approve</h2>
-    <%= form_with url: hr_lite.approve_admin_comp_off_request_path(@request), method: :post, local: true do |f| %>
+    <%= form_with url: hr_lite.approve_admin_comp_off_request_path(@request), method: :post, local: true,
+                  html: { data: { turbo_confirm: "Credit #{hrl_days(@request.credit_days)} day of comp-off to #{hr_display_name(@request.user)}?" } } do |f| %>
       <div class="hrl-field">
         <%= f.label :decision_note, "Note (optional)", for: "approve_note" %>
         <%= f.text_area :decision_note, id: "approve_note" %>
@@ -48,7 +47,8 @@
 
   <section class="hrl-card">
     <h2 class="hrl-card__title">Reject</h2>
-    <%= form_with url: hr_lite.reject_admin_comp_off_request_path(@request), method: :post, local: true do |f| %>
+    <%= form_with url: hr_lite.reject_admin_comp_off_request_path(@request), method: :post, local: true,
+                  html: { data: { turbo_confirm: "Reject #{hr_display_name(@request.user)}'s comp-off for #{@request.date_worked.strftime('%d %b %Y')}?" } } do |f| %>
       <div class="hrl-field">
         <%= f.label :decision_note, "Reason (required)", for: "reject_note" %>
         <%= f.text_area :decision_note, id: "reject_note", required: true %>

data/app/views/hr_lite/admin/designation_changes/new.html.erb

@@ -1,6 +1,6 @@
-<% content_for(:page_title) { "Role change" } %>
+<% content_for(:page_title) { "Designation change" } %>
 <div class="hrl-page__head">
-  <h1 class="hrl-page__title">Role change — <%= hr_display_name(@profile.user) %></h1>
+  <h1 class="hrl-page__title">Designation change — <%= hr_display_name(@profile.user) %></h1>
 </div>
 
 <section class="hrl-card">
@@ -12,7 +12,8 @@
     <div class="hrl-field"><%= f.label :effective_date %><%= f.date_field :effective_date %></div>
     <div class="hrl-field"><%= f.label :note, "Note (optional)" %><%= f.text_area :note %></div>
     <div class="hrl-form-actions">
-      <%= f.submit "Record change", class: "hrl-btn hrl-btn--primary" %>
+      <%= f.submit "Record change", class: "hrl-btn hrl-btn--primary",
+                   data: { turbo_confirm: "Record this designation change? #{hr_display_name(@profile.user)} is told at once." } %>
       <a class="hrl-btn" href="<%= hr_lite.admin_employee_path(@profile) %>">Cancel</a>
     </div>
   <% end %>

data/app/views/hr_lite/admin/documents/index.html.erb

@@ -8,10 +8,10 @@
     visibility allows.
   </p>
   <div class="hrl-row">
-    <a class="hrl-btn <%= "hrl-btn--primary" if @category.nil? %>"
+    <a class="hrl-btn" <%= "aria-current=true" if @category.nil? %>
        href="<%= hr_lite.admin_documents_path %>">All</a>
     <% @categories.each do |category| %>
-      <a class="hrl-btn <%= "hrl-btn--primary" if @category == category %>"
+      <a class="hrl-btn" <%= "aria-current=true" if @category == category %>
          href="<%= hr_lite.admin_documents_path(category: category) %>"><%= category.humanize %></a>
     <% end %>
   </div>
@@ -44,7 +44,8 @@
                 <%= button_to "Verify", hr_lite.verify_admin_document_path(doc),
                       method: :post, class: "hrl-btn hrl-btn--primary" %>
                 <%= form_with url: hr_lite.reject_admin_document_path(doc), method: :post, local: true do %>
-                  <%= text_field_tag :note, nil, placeholder: "What is wrong with it", class: "hrl-input", required: true %>
+                  <%= label_tag "reject-doc-#{doc.id}", "What is wrong with it", class: "hrl-sr-only" %>
+                  <%= text_field_tag :note, nil, id: "reject-doc-#{doc.id}", placeholder: "What is wrong with it", class: "hrl-input", required: true %>
                   <%= submit_tag "Reject", class: "hrl-btn" %>
                 <% end %>
               </td>
@@ -58,6 +59,9 @@
 
 <section class="hrl-card">
   <h2 class="hrl-card__title">Everything on file</h2>
+  <% if @documents.empty? %>
+    <p class="hrl-muted">No documents on file yet. People upload them from Me › Documents; you can upload for someone from their page.</p>
+  <% else %>
   <div class="hrl-table-wrap">
     <table class="hrl-table hrl-table--stack">
       <thead><tr><th>Person</th><th>Document</th><th>Expires</th><th>Checked</th></tr></thead>
@@ -85,5 +89,6 @@
       </tbody>
     </table>
   </div>
+  <% end %>
   <%= hrl_pagination %>
 </section>

data/app/views/hr_lite/admin/documents/show.html.erb

@@ -1,5 +1,6 @@
 <% content_for(:page_title) { hr_display_name(@employee) } %>
 <% content_for(:tabrow) { render "hr_lite/shared/person_tabs", user: @employee } %>
+<% content_for(:back, "Documents to verify") %>
 <div class="hrl-page__head">
   <h1 class="hrl-page__title"><%= hr_display_name(@employee) %> — documents</h1>
 </div>
@@ -31,7 +32,7 @@
               </td>
               <td data-label="">
                 <% if doc.readable_by?(hr_current_user) && doc.file.attached? %>
-                  <a class="hrl-small" href="<%= hr_lite.download_document_path(doc) %>">Open</a>
+                  <a class="hrl-btn" href="<%= hr_lite.download_document_path(doc) %>">Open</a>
                 <% end %>
               </td>
             </tr>

data/app/views/hr_lite/admin/employees/_form.html.erb

@@ -1,6 +1,7 @@
 <section class="hrl-card">
   <%= form_with model: profile, url: url, method: method, scope: :employee_profile, local: true do |f| %>
     <%= render "hr_lite/shared/form_errors", record: profile %>
+    <h2 class="hrl-card__title">Identity</h2>
     <% if profile.new_record? && profile.user_id.blank? %>
       <div class="hrl-field">
         <%= f.label :user_id, "Existing staff member" %>
@@ -22,7 +23,7 @@
         </div>
         <div class="hrl-field">
           <%= f.label :new_user_password, "Starting password (optional)" %>
-          <%= f.text_field :new_user_password %>
+          <%= f.password_field :new_user_password, autocomplete: "new-password" %>
           <p class="hrl-hint">Leave blank (recommended): they get an email invite and set their own
             password. Fill it only if you want to hand a password over yourself.</p>
         </div>
@@ -40,6 +41,7 @@
       <p class="hrl-hint">The employee code is assigned automatically
         (<%= HrLite::Setting.instance.employee_code_prefix %> + next number).</p>
     <% end %>
+    <h2 class="hrl-card__title hrl-mt">Work</h2>
     <div class="hrl-field"><%= f.label :designation %><%= f.text_field :designation %></div>
     <div class="hrl-field">
       <%= f.label :manager_id, "Reports to (their L1)" %>
@@ -64,7 +66,7 @@
         <%= f.select :office_location_id, offices, { include_blank: "None — only all-office holidays" }, data: { hrl_filter: ("Type an office" if offices.size > 5) } %></div>
     <% end %>
     <div class="hrl-field"><%= f.label :date_of_birth %><%= f.date_field :date_of_birth %></div>
-    <div class="hrl-field"><%= f.label :date_of_joining %><%= f.date_field :date_of_joining %></div>
+    <div class="hrl-field"><%= f.label :date_of_joining %><%= f.date_field :date_of_joining, required: true %></div>
     <div class="hrl-field">
       <%= f.label :blood_group, id: "hrl-blood-group", for: nil %>
       <div class="hrl-chiprow" role="radiogroup" aria-labelledby="hrl-blood-group">
@@ -79,6 +81,7 @@
       <%= f.label :probation_until, "On probation until (blank = not on probation)" %>
       <%= f.date_field :probation_until %>
     </div>
+    <h2 class="hrl-card__title hrl-mt">Attendance rules</h2>
     <% if HrLite.config.attendance_slots %>
       <div class="hrl-field">
         <%= f.label :buffer_minutes, "Late buffer (delays late penalties; colleagues see the reason category)" %>
@@ -99,12 +102,16 @@
       <%= f.label :date_of_exit, "Date of exit (leave blank while employed)" %>
       <%= f.date_field :date_of_exit %>
     </div>
-    <div class="hrl-field"><%= f.label :pan_number, "PAN" %><%= f.text_field :pan_number %></div>
-    <div class="hrl-field"><%= f.label :pf_uan, "PF UAN" %><%= f.text_field :pf_uan %></div>
+    <h2 class="hrl-card__title hrl-mt">Pay &amp; statutory</h2>
+    <div class="hrl-field"><%= f.label :pan_number, "PAN" %><%= f.text_field :pan_number %>
+      <p class="hrl-hint">10 characters in capitals, like ABCDE1234F.</p></div>
+    <div class="hrl-field"><%= f.label :pf_uan, "PF UAN" %><%= f.text_field :pf_uan %>
+      <p class="hrl-hint">12 digits.</p></div>
     <div class="hrl-field"><%= f.label :esi_number, "ESI number" %><%= f.text_field :esi_number %></div>
     <div class="hrl-field"><%= f.label :bank_name %><%= f.text_field :bank_name %></div>
     <div class="hrl-field"><%= f.label :bank_account_number %><%= f.text_field :bank_account_number %></div>
-    <div class="hrl-field"><%= f.label :bank_ifsc, "IFSC" %><%= f.text_field :bank_ifsc %></div>
+    <div class="hrl-field"><%= f.label :bank_ifsc, "IFSC" %><%= f.text_field :bank_ifsc %>
+      <p class="hrl-hint">11 characters in capitals, fifth is a zero, like HDFC0001234.</p></div>
     <div class="hrl-field">
       <%= f.label :tax_regime %>
       <%= f.select :tax_regime, HrLite::EmployeeProfile::TAX_REGIMES.map { |r| [ "#{r.humanize} regime", r ] } %>

data/app/views/hr_lite/admin/employees/show.html.erb

@@ -1,17 +1,20 @@
 <% content_for(:page_title) { @profile.employee_code } %>
 <% content_for(:tabrow) { render "hr_lite/shared/person_tabs", user: @profile.user } %>
+<% content_for(:back, "Employees") %>
+<% own = @profile.user_id == hr_current_user.id && !hr_superadmin? # your own pay and record are for someone else to change, unless you are Super Admin %>
 <div class="hrl-page__head">
   <h1 class="hrl-page__title"><%= hr_display_name(@profile.user) %> <span class="hrl-muted">(<%= @profile.employee_code %>)</span></h1>
   <div class="hrl-page__actions">
+    <% unless own %>
     <a class="hrl-btn" href="<%= hr_lite.edit_admin_employee_path(@profile) %>">Edit</a>
-    <%# Their records are the tabs above; the HR actions fold into one Manage button. %>
+    <%# Their records are the tabs above; the HR actions fold into one More actions button. %>
     <% if hr_superadmin? || hr_can?("salary.manage", scope: :all) %>
       <details>
-        <summary class="hrl-btn">Manage</summary>
+        <summary class="hrl-btn">More actions (appraisal, designation change, PIP, salary)</summary>
         <div class="hrl-row">
           <% if hr_superadmin? %>
             <a class="hrl-btn" href="<%= hr_lite.new_admin_employee_appraisal_path(@profile) %>">New appraisal</a>
-            <a class="hrl-btn" href="<%= hr_lite.new_admin_employee_designation_change_path(@profile) %>">Role change</a>
+            <a class="hrl-btn" href="<%= hr_lite.new_admin_employee_designation_change_path(@profile) %>">Designation change</a>
             <a class="hrl-btn" href="<%= hr_lite.new_admin_performance_plan_path(user_id: @profile.user_id) %>">Start PIP</a>
           <% end %>
           <% if hr_can?("salary.manage", scope: :all) %>
@@ -20,6 +23,7 @@
         </div>
       </details>
     <% end %>
+    <% end %>
   </div>
 </div>
 
@@ -48,34 +52,6 @@
   </section>
 <% end %>
 
-<%# Stays on the page after an exit date is stamped. Accepting a resignation
-    stamps one, and hiding this card at that moment removed the only control
-    that revokes sign-in — during the notice period, when it is needed. %>
-<section class="hrl-card">
-  <h2 class="hrl-card__title"><%= @profile.date_of_exit ? "Revoke access" : "Offboard" %></h2>
-  <% if @profile.date_of_exit %>
-    <p class="hrl-small hrl-muted">Last day is <%= @profile.date_of_exit.strftime("%d %b %Y") %> —
-      attendance and payroll already clip to it. Run this on or after that day to revoke
-      sign-in. Records are never deleted.</p>
-  <% else %>
-    <p class="hrl-small hrl-muted">Stamps the last day (attendance and payroll clip to it) and revokes sign-in.
-      Records are never deleted.</p>
-  <% end %>
-  <%= form_with url: hr_lite.offboard_admin_employee_path(@profile), method: :post, local: true,
-                html: { data: { turbo_confirm: "Offboard #{hr_display_name(@profile.user)}?" } } do %>
-    <div class="hrl-field">
-      <label for="off_date">Last working day</label>
-      <input type="date" id="off_date" name="date_of_exit" class="hrl-input"
-             value="<%= @profile.date_of_exit || Date.current %>">
-    </div>
-    <div class="hrl-form-actions">
-      <button class="hrl-btn hrl-btn--danger" type="submit">
-        <%= @profile.date_of_exit ? "Revoke access now" : "Offboard employee" %>
-      </button>
-    </div>
-  <% end %>
-</section>
-
 <div class="hrl-grid hrl-grid--2">
   <section class="hrl-card">
     <h2 class="hrl-card__title">Profile</h2>
@@ -107,7 +83,7 @@
                 <td data-label="Effective"><%= structure.effective_from.strftime("%b %Y") %></td>
                 <td data-label="Basic" class="hrl-num"><%= hrl_money(structure.basic) %></td>
                 <td data-label="Gross" class="hrl-num"><%= hrl_money(structure.monthly_gross) %></td>
-                <td data-label=""><a class="hrl-btn" href="<%= hr_lite.edit_admin_employee_salary_structure_path(@profile, structure) %>">Edit</a></td>
+                <td data-label=""><% unless own %><a class="hrl-btn" href="<%= hr_lite.edit_admin_employee_salary_structure_path(@profile, structure) %>">Edit</a><% end %></td>
               </tr>
             <% end %>
           </tbody>
@@ -146,3 +122,33 @@
   <% end %>
 </section>
 <% end %>
+
+<%# Stays on the page after an exit date is stamped. Accepting a resignation
+    stamps one, and hiding this card at that moment removed the only control
+    that revokes sign-in — during the notice period, when it is needed. %>
+<% unless own %>
+<section class="hrl-card">
+  <h2 class="hrl-card__title"><%= @profile.date_of_exit ? "Revoke access" : "Offboard" %></h2>
+  <% if @profile.date_of_exit %>
+    <p class="hrl-small hrl-muted">Last day is <%= @profile.date_of_exit.strftime("%d %b %Y") %> —
+      attendance and payroll already clip to it. Run this on or after that day to revoke
+      sign-in. Records are never deleted.</p>
+  <% else %>
+    <p class="hrl-small hrl-muted">Stamps the last day (attendance and payroll clip to it) and revokes sign-in.
+      Records are never deleted.</p>
+  <% end %>
+  <%= form_with url: hr_lite.offboard_admin_employee_path(@profile), method: :post, local: true,
+                html: { data: { turbo_confirm: "Offboard #{hr_display_name(@profile.user)}?" } } do %>
+    <div class="hrl-field">
+      <label for="off_date">Last working day</label>
+      <input type="date" id="off_date" name="date_of_exit" class="hrl-input"
+             value="<%= @profile.date_of_exit || Date.current %>">
+    </div>
+    <div class="hrl-form-actions">
+      <button class="hrl-btn hrl-btn--danger" type="submit">
+        <%= @profile.date_of_exit ? "Revoke access now" : "Offboard employee" %>
+      </button>
+    </div>
+  <% end %>
+</section>
+<% end %>

data/app/views/hr_lite/admin/expenses/index.html.erb

@@ -4,7 +4,7 @@
 <section class="hrl-card">
   <div class="hrl-row">
     <% HrLite::Expense::STATUSES.each do |status| %>
-      <a class="hrl-btn <%= "hrl-btn--primary" if status == @status %>"
+      <a class="hrl-btn" <%= "aria-current=true" if status == @status %>
          href="<%= hr_lite.admin_expenses_path(status: status) %>"><%= status.humanize %></a>
     <% end %>
   </div>
@@ -41,8 +41,9 @@
                   <% end %>
                 <% elsif expense.approved? %>
                   <%= form_with url: hr_lite.reimburse_admin_expense_path(expense), method: :post do %>
-                    <%= text_field_tag :period_month, Date.current.strftime("%Y-%m"), size: 8, class: "hrl-input" %>
-                    <%= submit_tag "Mark reimbursed", class: "hrl-btn" %>
+                    <%= label_tag "reimburse-month-#{expense.id}", "Paid with the payroll of", class: "hrl-sr-only" %>
+                    <%= month_field_tag :period_month, (expense.reimbursed_in || Date.current).strftime("%Y-%m"), id: "reimburse-month-#{expense.id}", required: true, class: "hrl-input" %>
+                    <%= submit_tag "Pay with payroll", class: "hrl-btn" %>
                   <% end %>
                 <% end %>
               </td>

data/app/views/hr_lite/admin/holidays/index.html.erb

@@ -2,8 +2,9 @@
 <div class="hrl-page__head">
   <h1 class="hrl-page__title">Holidays <%= @year %></h1>
   <div class="hrl-page__actions">
-    <a class="hrl-btn" href="<%= hr_lite.admin_holidays_path(year: @year - 1) %>"><%= @year - 1 %></a>
-    <a class="hrl-btn" href="<%= hr_lite.admin_holidays_path(year: @year + 1) %>"><%= @year + 1 %></a>
+    <a class="hrl-btn hrl-btn--primary" href="#add-holiday">Add a holiday</a>
+    <a class="hrl-btn" href="<%= hr_lite.admin_holidays_path(year: @year - 1) %>">‹ <%= @year - 1 %></a>
+    <a class="hrl-btn" href="<%= hr_lite.admin_holidays_path(year: @year + 1) %>"><%= @year + 1 %> ›</a>
   </div>
 </div>
 
@@ -35,7 +36,7 @@
 </section>
 
 <div class="hrl-grid hrl-grid--2">
-  <section class="hrl-card">
+  <section class="hrl-card" id="add-holiday">
     <h2 class="hrl-card__title">Add one</h2>
     <%= form_with model: @holiday, url: hr_lite.admin_holidays_path, local: true do |f| %>
       <div class="hrl-field"><%= f.label :date %><%= f.date_field :date %></div>
@@ -62,7 +63,7 @@
         <textarea name="lines" id="bulk-lines" class="hrl-input" rows="6" placeholder="2026-11-09, Diwali&#10;2026-03-04, Holi"></textarea>
       </div>
       <div class="hrl-form-actions">
-        <button type="submit" class="hrl-btn hrl-btn--primary">Add all</button>
+        <button type="submit" class="hrl-btn">Add all</button>
       </div>
     <% end %>
   </section>

data/app/views/hr_lite/admin/hr_requests/index.html.erb

@@ -4,7 +4,7 @@
 <section class="hrl-card">
   <div class="hrl-row">
     <% HrLite::HrRequest::STATUSES.each do |status| %>
-      <a class="hrl-btn <%= "hrl-btn--primary" if status == @status %>"
+      <a class="hrl-btn" <%= "aria-current=true" if status == @status %>
          href="<%= hr_lite.admin_hr_requests_path(status: status) %>"><%= status.humanize %></a>
     <% end %>
   </div>

data/app/views/hr_lite/admin/hr_requests/show.html.erb

@@ -4,7 +4,7 @@
 <section class="hrl-card">
   <p class="hrl-small hrl-muted">
     <%= @request.category_label %> · <%= hr_display_name(@request.user) %> ·
-    <%= @request.created_at.to_date.strftime("%d %b %Y") %> ·
+    <%= @request.created_at.to_date.strftime("%d %b %Y") %>
     <%= hrl_request_status_badge(@request.status) %>
   </p>
   <% if @request.category == "id_card" %>
@@ -20,7 +20,7 @@
     <h2 class="hrl-card__title">Answer</h2>
     <%= form_with url: hr_lite.resolve_admin_hr_request_path(@request), method: :post do %>
       <div class="hrl-field">
-        <%= label_tag :resolution, "What you did" %>
+        <%= label_tag :resolution, "Answer to #{hr_display_name(@request.user)}" %>
         <%= text_area_tag :resolution, nil, rows: 4, required: true %>
       </div>
       <div class="hrl-form-actions">
@@ -33,7 +33,8 @@
         <%= label_tag :assignee_id, "Or hand it to somebody" %>
         <%= select_tag :assignee_id,
               options_for_select(HrLite.users_holding("hr_request.manage")
-                                       .map { |u| [ hr_display_name(u), u.id ] }) %>
+                                       .map { |u| [ hr_display_name(u), u.id ] }),
+              include_blank: "Choose…", required: true, data: { hrl_filter: "Type a name to filter" } %>
       </div>
       <div class="hrl-form-actions">
         <%= submit_tag "Assign", class: "hrl-btn" %>