hr_lite 0.5.0 → 0.5.3

data/app/services/hr_lite/slip_builder.rb

@@ -21,8 +21,14 @@ module HrLite
     def call
       summary = AttendanceSummary.for(user: @user, month: @run.period_month)
       days_in_month = summary[:days_in_month]
-      lop = Money.d(@lop_override || summary[:lop_days])
-      payable = [ Money.d(days_in_month) - Money.d(summary[:out_of_window]) - lop, Money.d(0) ].max
+      # Clamped defensively: a stored negative override (written before the
+      # controller bounded them) would otherwise pay more days than the month has.
+      lop = [ Money.d(@lop_override || summary[:lop_days]), BigDecimal(0) ].max
+      # `upcoming` is normally zero — PayrollRun refuses a month that has not
+      # ended — but subtracting it means a legacy run for an open month cannot
+      # pay for days nobody has worked yet.
+      payable = [ Money.d(days_in_month) - Money.d(summary[:out_of_window]) -
+                  Money.d(summary[:upcoming]) - lop, Money.d(0) ].max
 
       earnings = Calculators::Proration.call(
         structure: @structure, payable_days: payable, days_in_month: days_in_month
@@ -44,7 +50,7 @@ module HrLite
         )
       end
 
-      esi = Calculators::Esi.call(monthly_gross: @structure.monthly_gross, gross_earned: gross_earned,
+      esi = Calculators::Esi.call(monthly_gross: esi_reference_gross, gross_earned: gross_earned,
                                   applicable: @structure.esi_applicable, rates: @rates[:esi])
       if esi.applicable?
         deductions << { code: "esi_employee", label: "ESI", amount: esi.employee }
@@ -60,8 +66,12 @@ module HrLite
         regime: @profile.tax_regime,
         structure_monthly_gross: @structure.monthly_gross,
         gross_earned_this_month: gross_earned,
-        fy_gross_paid: fy[:gross],
-        fy_tds_paid: fy[:tds],
+        # Plus anything paid this FY that this install never ran — a previous
+        # employer, or the months before payroll was switched on. Without it a
+        # mid-year start projects those months as zero income and can land the
+        # whole year under the rebate cap.
+        fy_gross_paid: fy[:gross] + Money.d(@profile.fy_opening_gross),
+        fy_tds_paid: fy[:tds] + Money.d(@profile.fy_opening_tds),
         months_remaining: months_remaining_in_fy,
         declared_annual_deductions: @profile.declared_annual_deductions,
         rates: @rates[:income_tax],
@@ -75,6 +85,9 @@ module HrLite
         period_month: @run.period_month,
         days_in_month: days_in_month,
         payable_days: payable,
+        # Recorded so the slip can say WHY a mid-month joiner's payable days
+        # are short, instead of looking like days went missing.
+        out_of_window_days: Money.d(summary[:out_of_window]),
         lop_days: Money.d(summary[:lop_days]),
         lop_override: @lop_override,
         tds_override: @tds_override,
@@ -84,17 +97,50 @@ module HrLite
         tax_details: tds.details.to_json,
         gross_earnings: gross_earned,
         total_deductions: total_deductions,
-        net_pay: gross_earned - total_deductions,
+        # 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,
         computed_at: Time.current
       }
     end
 
     private
 
-    # Months left in the Indian FY including the run month itself.
+    # Months left in the Indian FY (Apr–Mar) including the run month itself:
+    # April = 12, December = 4, January = 3, March = 1. Capped at the exit
+    # month for a leaver, so a final settlement is not spread over months
+    # that will never be paid.
     def months_remaining_in_fy
       month = @run.period_month.month
-      month >= 4 ? (15 - month) : (3 - month + 1)
+      calendar = month >= 4 ? (16 - month) : (4 - month)
+      exit_date = @profile&.date_of_exit
+      return calendar if exit_date.nil? || exit_date < @run.period_month
+
+      [ calendar, months_between(@run.period_month, exit_date) ].min
+    end
+
+    def months_between(from, to)
+      (to.year * 12 + to.month) - (from.year * 12 + from.month) + 1
+    end
+
+    # ESIC contribution periods run April–September and October–March.
+    # Eligibility is fixed for the whole period, so it is decided on the
+    # salary in force on its first day — re-deciding it every month dropped
+    # someone out of ESI the moment a mid-period raise crossed the ceiling.
+    def esi_reference_gross
+      month = @run.period_month
+      start = if month.month.between?(4, 9)
+        Date.new(month.year, 4, 1)
+      elsif month.month >= 10
+        Date.new(month.year, 10, 1)
+      else
+        Date.new(month.year - 1, 10, 1)
+      end
+
+      # No structure that far back (a mid-period joiner) — their own is the
+      # only salary this period has ever had.
+      (SalaryStructure.effective_for(@user, start) || @structure).monthly_gross
     end
 
     def serialize_rows(rows)

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

@@ -14,7 +14,10 @@
 
 <div class="hrl-kpis">
   <div class="hrl-kpi"><div class="hrl-kpi__value"><%= @records.values.count { |r| r.check_in_at } %></div><div class="hrl-kpi__label">Checked in</div></div>
-  <div class="hrl-kpi"><div class="hrl-kpi__value"><%= @employees.size - @records.size %></div><div class="hrl-kpi__label">No punch</div></div>
+  <%# Derived from the same predicate as "Checked in". Counting rows instead
+      dropped a record with no check-in out of BOTH tiles, so the numbers
+      quietly stopped adding up to the headcount. %>
+  <div class="hrl-kpi"><div class="hrl-kpi__value"><%= @employees.size - @records.values.count { |r| r.check_in_at } %></div><div class="hrl-kpi__label">No punch</div></div>
   <div class="hrl-kpi"><div class="hrl-kpi__value"><%= @flagged_count %></div><div class="hrl-kpi__label">Flagged</div></div>
   <div class="hrl-kpi"><div class="hrl-kpi__value"><%= @records.values.count { |r| r.check_in_at && r.check_out_at.nil? } %></div><div class="hrl-kpi__label">Still in</div></div>
 </div>

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

@@ -29,18 +29,32 @@
 </section>
 
 <% if @request.pending? %>
+  <%# Approve and reject are two separate forms on purpose. Rails binds the
+      CSRF token to the form's OWN action, so one form retargeted with
+      `formaction:` can never pass verification on the second endpoint. %>
   <section class="hrl-card">
-    <h2 class="hrl-card__title">Decide</h2>
+    <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| %>
       <div class="hrl-field">
-        <%= f.label :decision_note, "Note (required to reject, optional to approve)" %>
-        <%= f.text_area :decision_note %>
+        <%= f.label :decision_note, "Note (optional)", for: "approve_note" %>
+        <%= f.text_area :decision_note, id: "approve_note" %>
       </div>
       <div class="hrl-form-actions">
         <%= f.button "Approve — credit #{@request.credit_days.to_f} day",
                      type: :submit, class: "hrl-btn hrl-btn--primary" %>
-        <%= f.button "Reject", type: :submit, class: "hrl-btn hrl-btn--danger",
-                     formaction: hr_lite.reject_admin_comp_off_request_path(@request) %>
+      </div>
+    <% end %>
+  </section>
+
+  <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| %>
+      <div class="hrl-field">
+        <%= f.label :decision_note, "Reason (required)", for: "reject_note" %>
+        <%= f.text_area :decision_note, id: "reject_note" %>
+      </div>
+      <div class="hrl-form-actions">
+        <%= f.button "Reject", type: :submit, class: "hrl-btn hrl-btn--danger" %>
       </div>
     <% end %>
   </section>

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

@@ -41,9 +41,16 @@
     <div class="hrl-field"><%= f.label :designation %><%= f.text_field :designation %></div>
     <div class="hrl-field">
       <%= f.label :manager_id, "Reports to (their L1)" %>
+      <%# The current manager stays listed even after they exit. Dropping them
+          left the select with no matching option, so the browser preselected
+          the blank one and saving anything silently wiped the reporting line
+          of everyone whose manager had left. %>
+      <% candidates = HrLite.active_employees.reject { |u| u.id == profile.user_id } %>
+      <% if profile.manager && candidates.none? { |u| u.id == profile.manager_id } %>
+        <% candidates += [ profile.manager ] %>
+      <% end %>
       <%= f.select :manager_id,
-                   HrLite.active_employees.reject { |u| u.id == profile.user_id }
-                         .map { |u| [ HrLite.display_name(u), u.id ] },
+                   candidates.map { |u| [ HrLite.display_name(u), u.id ] },
                    include_blank: "— nobody (top of the org) —" %>
     </div>
     <div class="hrl-field"><%= f.label :department %><%= f.text_field :department %></div>
@@ -68,6 +75,17 @@
       <%= f.label :declared_annual_deductions, "Declared annual deductions (old regime only)" %>
       <%= f.number_field :declared_annual_deductions, step: 0.01, value: profile.declared_annual_deductions&.to_s("F") %>
     </div>
+    <%# Only what THIS install has paid is visible to the tax projection, so a
+        mid-year start (or a joiner from another employer) needs the earlier
+        months stated here or the year under-deducts. %>
+    <div class="hrl-field">
+      <%= f.label :fy_opening_gross, "Gross already paid this FY elsewhere (previous employer, or before payroll started here)" %>
+      <%= f.number_field :fy_opening_gross, step: 0.01, value: profile.fy_opening_gross&.to_s("F") %>
+    </div>
+    <div class="hrl-field">
+      <%= f.label :fy_opening_tds, "TDS already deducted this FY elsewhere" %>
+      <%= f.number_field :fy_opening_tds, step: 0.01, value: profile.fy_opening_tds&.to_s("F") %>
+    </div>
     <div class="hrl-form-actions">
       <%= f.submit "Save profile", class: "hrl-btn hrl-btn--primary" %>
       <a class="hrl-btn" href="<%= hr_lite.admin_employees_path %>">Cancel</a>

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

@@ -35,23 +35,33 @@
   </section>
 <% end %>
 
-<% if @profile.date_of_exit.nil? %>
-  <section class="hrl-card">
-    <h2 class="hrl-card__title">Offboard</h2>
+<%# 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>
-    <%= 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="<%= Date.current %>">
-      </div>
-      <div class="hrl-form-actions">
-        <button class="hrl-btn hrl-btn--danger" type="submit">Offboard employee</button>
-      </div>
-    <% end %>
-  </section>
-<% end %>
+  <% 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">

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

@@ -10,7 +10,9 @@
   <dl class="hrl-deflist">
     <dt>Type</dt><dd><%= @request.leave_type.name %> (<%= @request.paid? ? "paid" : "unpaid" %>)</dd>
     <dt>Dates</dt><dd><%= @request.date_range_label %></dd>
-    <dt>Working days</dt><dd><%= @request.days_count.to_f %></dd>
+    <%# Counted live, not from the create-time cache: a holiday added after
+        the request was filed changes what the balance is actually debited. %>
+    <dt>Working days</dt><dd><%= HrLite::LeaveDayCounter.count(@request).to_f %></dd>
     <dt>Status</dt><dd><span class="hrl-badge"><%= @request.status.humanize %></span></dd>
     <% if @request.reason.present? %><dt>Reason</dt><dd><%= @request.reason %></dd><% end %>
     <% unless @request.leave_type.unlimited? %>
@@ -21,18 +23,48 @@
   </dl>
 </section>
 
+<%# An approved leave that has not started yet can still be called off — the
+    balance is recomputed live, so cancelling gives the days straight back. %>
+<% if @request.cancellable_by?(hr_current_user) && !@request.pending? %>
+  <section class="hrl-card">
+    <h2 class="hrl-card__title">Cancel</h2>
+    <p class="hrl-small hrl-muted">Releases the days back to their balance. Only possible
+      before the leave starts.</p>
+    <%= form_with url: hr_lite.cancel_admin_leave_request_path(@request), method: :post, local: true,
+                  html: { data: { turbo_confirm: "Cancel this approved leave?" } } do %>
+      <div class="hrl-form-actions">
+        <button class="hrl-btn hrl-btn--danger" type="submit">Cancel this leave</button>
+      </div>
+    <% end %>
+  </section>
+<% end %>
+
 <% if @request.pending? %>
   <section class="hrl-card">
     <h2 class="hrl-card__title">Decide</h2>
+    <%# Approve and reject are two separate forms on purpose. Rails binds the
+        CSRF token to the form's OWN action, so one form retargeted with
+        `formaction:` can never pass verification on the second endpoint. %>
     <%= form_with url: hr_lite.approve_admin_leave_request_path(@request), method: :post, local: true do %>
       <div class="hrl-field">
-        <label for="decision_note">Note (required to reject)</label>
-        <textarea name="decision_note" id="decision_note" class="hrl-input"></textarea>
+        <label for="approve_note">Note (optional)</label>
+        <textarea name="decision_note" id="approve_note" class="hrl-input"></textarea>
       </div>
       <div class="hrl-form-actions">
         <button class="hrl-btn hrl-btn--primary" type="submit">Approve</button>
-        <button class="hrl-btn hrl-btn--danger" type="submit"
-                formaction="<%= hr_lite.reject_admin_leave_request_path(@request) %>">Reject</button>
+      </div>
+    <% end %>
+  </section>
+
+  <section class="hrl-card">
+    <h2 class="hrl-card__title">Reject</h2>
+    <%= form_with url: hr_lite.reject_admin_leave_request_path(@request), method: :post, local: true do %>
+      <div class="hrl-field">
+        <label for="reject_note">Reason (required)</label>
+        <textarea name="decision_note" id="reject_note" class="hrl-input"></textarea>
+      </div>
+      <div class="hrl-form-actions">
+        <button class="hrl-btn hrl-btn--danger" type="submit">Reject</button>
       </div>
     <% end %>
   </section>

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

@@ -25,6 +25,27 @@
           <a class="hrl-btn" href="<%= hr_lite.admin_leave_request_path(request) %>">Decide</a>
         </div>
       <% end %>
+      <%# Comp-off and regularization are approvals too. Listing leave alone
+          left both queues invisible on the board that exists to surface work. %>
+      <% @query.pending_comp_offs.limit(HrLite::Admin::OverviewController::SECTION_CAP).each do |request| %>
+        <div class="hrl-feed__item">
+          <div class="hrl-feed__body">
+            <strong><%= hr_display_name(request.user) %></strong>
+            — comp-off for <%= request.date_worked.strftime("%d %b") %>
+            (<%= request.credit_days.to_f %> d)
+          </div>
+          <a class="hrl-btn" href="<%= hr_lite.admin_comp_off_request_path(request) %>">Decide</a>
+        </div>
+      <% end %>
+      <% @query.pending_regularizations.limit(HrLite::Admin::OverviewController::SECTION_CAP).each do |request| %>
+        <div class="hrl-feed__item">
+          <div class="hrl-feed__body">
+            <strong><%= hr_display_name(request.user) %></strong>
+            — attendance fix for <%= request.date.strftime("%d %b") %>
+          </div>
+          <a class="hrl-btn" href="<%= hr_lite.admin_regularization_request_path(request) %>">Decide</a>
+        </div>
+      <% end %>
       <a class="hrl-small" href="<%= hr_lite.admin_leave_requests_path %>">All requests</a>
     </section>
   <% end %>

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

@@ -23,7 +23,9 @@
 <section class="hrl-card">
   <div class="hrl-row">
     <span class="hrl-badge"><%= @run.status.humanize %></span>
-    <% if @run.draft? || @run.review? %>
+    <%# `processing` is offered too: a run stranded there by a killed process
+        would otherwise have no control at all and block that month forever. %>
+    <% if @run.draft? || @run.review? || @run.processing? %>
       <%= button_to @run.draft? ? "Compute" : "Recompute", hr_lite.compute_admin_payroll_run_path(@run),
                     method: :post, class: "hrl-btn hrl-btn--primary" %>
     <% end %>

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

@@ -35,15 +35,29 @@
     <h2 class="hrl-card__title">Decide</h2>
     <p class="hrl-hint">Approving writes the proposed times onto the day's attendance record
       (only the provided times overwrite) with the full regularization trail.</p>
+    <%# Approve and reject are two separate forms on purpose. Rails binds the
+        CSRF token to the form's OWN action, so one form retargeted with
+        `formaction:` can never pass verification on the second endpoint. %>
     <%= form_with url: hr_lite.approve_admin_regularization_request_path(@request), method: :post, local: true do |f| %>
       <div class="hrl-field">
-        <%= f.label :decision_note, "Note (required to reject, optional to approve)" %>
-        <%= f.text_area :decision_note %>
+        <%= f.label :decision_note, "Note (optional)", for: "approve_note" %>
+        <%= f.text_area :decision_note, id: "approve_note" %>
       </div>
       <div class="hrl-form-actions">
         <%= f.button "Approve — fix attendance", type: :submit, class: "hrl-btn hrl-btn--primary" %>
-        <%= f.button "Reject", type: :submit, class: "hrl-btn hrl-btn--danger",
-                     formaction: hr_lite.reject_admin_regularization_request_path(@request) %>
+      </div>
+    <% end %>
+  </section>
+
+  <section class="hrl-card">
+    <h2 class="hrl-card__title">Reject</h2>
+    <%= form_with url: hr_lite.reject_admin_regularization_request_path(@request), method: :post, local: true do |f| %>
+      <div class="hrl-field">
+        <%= f.label :decision_note, "Reason (required)", for: "reject_note" %>
+        <%= f.text_area :decision_note, id: "reject_note" %>
+      </div>
+      <div class="hrl-form-actions">
+        <%= f.button "Reject", type: :submit, class: "hrl-btn hrl-btn--danger" %>
       </div>
     <% end %>
   </section>

data/app/views/hr_lite/attendance/_punch_card.html.erb

@@ -1,4 +1,11 @@
 <% record = HrLite::AttendanceRecord.find_by(user_id: hr_current_user.id, date: Date.current) %>
+<%# A shift that runs past midnight leaves yesterday's record open.
+    AttendancePuncher already closes it, but this card looked only at today,
+    so after midnight it offered "Check in" and the night's punch never
+    closed — no worked duration, no hours on the team board. %>
+<% open_yesterday = record ? nil : HrLite::AttendanceRecord.for_date(Date.current - 1)
+                                                          .missing_checkout
+                                                          .find_by(user_id: hr_current_user.id) %>
 <section class="hrl-card">
   <h2 class="hrl-card__title">Today, <%= Date.current.strftime("%d %b") %></h2>
 
@@ -12,12 +19,25 @@
     <% if record&.flagged? %>
       <span class="hrl-badge hrl-badge--bad" title="<%= record.flag_note %>">Flagged</span>
     <% end %>
-    <% if record.nil? %>
+    <% if open_yesterday %>
+      <span class="hrl-badge hrl-badge--warn">Yesterday still open —
+        in <%= open_yesterday.check_in_at.strftime("%H:%M") %></span>
+    <% elsif record.nil? %>
       <span class="hrl-muted">Not checked in yet.</span>
     <% end %>
   </div>
 
-  <% if record&.check_in_at.blank? %>
+  <% if open_yesterday %>
+    <%= form_with url: hr_lite.check_out_attendance_path, method: :post, local: true,
+                  html: { data: { "hrl-geo-punch": true } } do %>
+      <input type="hidden" name="lat"><input type="hidden" name="lng">
+      <input type="hidden" name="accuracy_m"><input type="hidden" name="geo_status">
+      <button type="submit" class="hrl-btn hrl-btn--big hrl-btn--block">
+        Check out yesterday's shift
+      </button>
+      <p class="hrl-small hrl-muted" data-hrl-geo-status hidden></p>
+    <% end %>
+  <% elsif record&.check_in_at.blank? %>
     <%= form_with url: hr_lite.check_in_attendance_path, method: :post, local: true,
                   html: { data: { "hrl-geo-punch": true } } do %>
       <input type="hidden" name="lat"><input type="hidden" name="lng">

data/app/views/hr_lite/career/show.html.erb

@@ -6,7 +6,13 @@
 <section class="hrl-card">
   <h2 class="hrl-card__title">Current role</h2>
   <p><strong><%= @profile&.designation.presence || "Not set yet" %></strong>
-    <% if @profile %><span class="hrl-muted hrl-small">since <%= (@changes.first&.effective_date || @profile.date_of_joining).strftime("%b %Y") %></span><% end %>
+    <%# The most recent change IN FORCE, not simply the most recent row — a
+        promotion recorded for next quarter would otherwise date the current
+        role from a month that has not arrived yet. %>
+    <% if @profile %>
+      <% in_force = @changes.find { |change| change.effective_date <= Date.current } %>
+      <span class="hrl-muted hrl-small">since <%= (in_force&.effective_date || @profile.date_of_joining).strftime("%b %Y") %></span>
+    <% end %>
   </p>
 </section>
 

data/app/views/hr_lite/salary_slips/_slip_detail.html.erb

@@ -37,7 +37,11 @@
 <section class="hrl-card">
   <dl class="hrl-deflist">
     <dt>Net pay</dt><dd><strong><%= hrl_money(slip.net_pay) %></strong> (<%= hrl_amount_in_words(slip.net_pay) %>)</dd>
-    <dt>Days</dt><dd><%= slip.payable_days %> payable / <%= slip.effective_lop_days %> LOP of <%= slip.days_in_month %></dd>
+    <%# Out-of-window days are named rather than silently dropped: without them
+        a mid-month joiner's row does not add up to the month. %>
+    <dt>Days</dt>
+    <dd><%= slip.payable_days %> payable / <%= slip.effective_lop_days %> LOP<% if slip.out_of_window_days.to_f.positive? %>
+      / <%= slip.out_of_window_days %> outside employment<% end %> of <%= slip.days_in_month %></dd>
     <% if profile %>
       <dt>Employee code</dt><dd><%= profile.employee_code %></dd>
       <% if profile.masked_uan %><dt>PF UAN</dt><dd><%= profile.masked_uan %></dd><% end %>

data/app/views/hr_lite/salary_slips/pdf.html.erb

@@ -44,9 +44,9 @@
         <thead><tr><th>Earnings</th><th class="num">Full</th><th class="num">Earned</th></tr></thead>
         <tbody>
           <% @slip.earnings_rows.each do |row| %>
-            <tr><td><%= row["label"] %></td><td class="num"><%= row["full_amount"] %></td><td class="num"><%= row["amount"] %></td></tr>
+            <tr><td><%= row["label"] %></td><td class="num"><%= HrLite::Money.format(row["full_amount"]) %></td><td class="num"><%= HrLite::Money.format(row["amount"]) %></td></tr>
           <% end %>
-          <tr class="total"><td>Gross</td><td></td><td class="num"><%= @slip.gross_earnings.to_s("F") %></td></tr>
+          <tr class="total"><td>Gross</td><td></td><td class="num"><%= HrLite::Money.format(@slip.gross_earnings) %></td></tr>
         </tbody>
       </table>
     </div>
@@ -55,9 +55,9 @@
         <thead><tr><th>Deductions</th><th class="num">Amount</th></tr></thead>
         <tbody>
           <% @slip.deductions_rows.each do |row| %>
-            <tr><td><%= row["label"] %></td><td class="num"><%= row["amount"] %></td></tr>
+            <tr><td><%= row["label"] %></td><td class="num"><%= HrLite::Money.format(row["amount"]) %></td></tr>
           <% end %>
-          <tr class="total"><td>Total deductions</td><td class="num"><%= @slip.total_deductions.to_s("F") %></td></tr>
+          <tr class="total"><td>Total deductions</td><td class="num"><%= HrLite::Money.format(@slip.total_deductions) %></td></tr>
         </tbody>
       </table>
     </div>
@@ -66,7 +66,7 @@
   <div class="pdf-net">
     <%# PORO, not a helper — this template is rendered by HOST code via
         config.render_pdf, where engine helper modules are not in scope. %>
-    Net pay: <%= HrLite.config.currency_symbol %><%= @slip.net_pay.to_s("F") %>
+    Net pay: <%= HrLite::Money.format(@slip.net_pay) %>
     (<%= HrLite::AmountInWords.words(@slip.net_pay) %>)
   </div>
 

data/app/views/layouts/hr_lite/application.html.erb

@@ -37,11 +37,15 @@
           <% end %>
         <% end %>
 
-        <% if hr_leadership? %>
+        <% if hr_leadership? || hr_superadmin? %>
           <span class="hrl-side__group">Organisation</span>
-          <% hrl_nav_items(HrLite::ApplicationHelper::LEADERSHIP_NAV_ITEMS).each do |item| %>
-            <%= hrl_nav_link(item) %>
+          <% if hr_leadership? %>
+            <% hrl_nav_items(HrLite::ApplicationHelper::LEADERSHIP_NAV_ITEMS).each do |item| %>
+              <%= hrl_nav_link(item) %>
+            <% end %>
           <% end %>
+          <%# Payroll hangs off the money tier alone — a superadmin who is not
+              in leadership_emails still needs to reach it. %>
           <% if hr_superadmin? %>
             <% hrl_nav_items(HrLite::ApplicationHelper::SUPERADMIN_NAV_ITEMS).each do |item| %>
               <%= hrl_nav_link(item) %>
@@ -78,12 +82,46 @@
     </div>
   </div>
 
+  <%# The left rail is display:none below 768px, so before the More sheet
+      existed the phone — the surface this is installed on — could reach only
+      the first five items. Org, Kudos, Slips, Career and every admin,
+      leadership and payroll screen were unreachable. <details> keeps it
+      dependency-free; the engine ships no Turbo or Stimulus. %>
   <nav class="hrl-tabbar" aria-label="HR sections">
-    <% hrl_nav_items(HrLite::ApplicationHelper::NAV_ITEMS).first(5).each do |item| %>
+    <% primary, rest = hrl_nav_items(HrLite::ApplicationHelper::NAV_ITEMS).partition.with_index { |_, i| i < 4 } %>
+    <% primary.each do |item| %>
       <%= hrl_nav_link(item) %>
     <% end %>
+    <details class="hrl-tabbar__more">
+      <summary class="hrl-nav__link">More</summary>
+      <div class="hrl-sheet">
+        <% rest.each do |item| %>
+          <%= hrl_nav_link(item) %>
+        <% end %>
+        <% if hr_admin? || hr_leadership? %>
+          <span class="hrl-side__group">Manage</span>
+          <% hrl_nav_items(HrLite::ApplicationHelper::ADMIN_NAV_ITEMS).each do |item| %>
+            <%= hrl_nav_link(item) %>
+          <% end %>
+        <% end %>
+        <% if hr_leadership? || hr_superadmin? %>
+          <span class="hrl-side__group">Organisation</span>
+          <% if hr_leadership? %>
+            <% hrl_nav_items(HrLite::ApplicationHelper::LEADERSHIP_NAV_ITEMS).each do |item| %>
+              <%= hrl_nav_link(item) %>
+            <% end %>
+          <% end %>
+          <% if hr_superadmin? %>
+            <% hrl_nav_items(HrLite::ApplicationHelper::SUPERADMIN_NAV_ITEMS).each do |item| %>
+              <%= hrl_nav_link(item) %>
+            <% end %>
+          <% end %>
+        <% end %>
+      </div>
+    </details>
   </nav>
 
+  <%= javascript_include_tag "hr_lite/confirm", defer: true %>
   <%= javascript_include_tag "hr_lite/mention", defer: true %>
   <%= yield :scripts %>
 </body>

data/config/routes.rb

@@ -35,7 +35,7 @@ HrLite::Engine.routes.draw do
     get "overview", to: "overview#index"
     resources :attendances, only: %i[index show update], param: :user_id
     resources :leave_requests, only: %i[index show] do
-      member { post :approve; post :reject }
+      member { post :approve; post :reject; post :cancel }
     end
     resources :leave_balances, only: :index do
       collection { post :adjust }

data/db/migrate/20260807184103_add_live_uniqueness_indexes_to_hr_lite.rb

@@ -0,0 +1,28 @@
+class AddLiveUniquenessIndexesToHrLite < ActiveRecord::Migration[8.0]
+  # The models already validate each of these, but a validation is a
+  # read-then-write: two concurrent requests both see nothing and both insert.
+  # Comp-off requests already had this partial index; these three did not.
+  #
+  # Every table here holds a handful of rows per employee, so the index builds
+  # are instant and a plain (non-concurrent) build is fine.
+  def change
+    # One open resignation per person — Resignation#single_open_resignation.
+    add_index :hr_lite_resignations, :user_id,
+              unique: true,
+              where: "status = 'pending'",
+              name: "index_hr_lite_resignations_one_pending_per_user"
+
+    # One ticket per person per day — RegularizationRequest#no_duplicate_pending.
+    add_index :hr_lite_regularization_requests, %i[user_id date],
+              unique: true,
+              where: "status = 'pending'",
+              name: "index_hr_lite_regularizations_one_pending_per_day"
+
+    # Exactly one leave type carries the comp-off flag — approvals credit into
+    # THE comp-off type, and two would make the target position-order roulette.
+    add_index :hr_lite_leave_types, :comp_off,
+              unique: true,
+              where: "comp_off",
+              name: "index_hr_lite_leave_types_single_comp_off"
+  end
+end

data/db/migrate/20260807184426_add_fy_opening_to_hr_lite_employee_profiles.rb

@@ -0,0 +1,14 @@
+class AddFyOpeningToHrLiteEmployeeProfiles < ActiveRecord::Migration[8.0]
+  # Income already paid this financial year that this install did not run:
+  # a previous employer, or the months before payroll was switched on. TDS
+  # projects the annual total from slips it can see, so without these the
+  # first year after a mid-year start under-projects — often far enough
+  # under the rebate cap to deduct nothing at all.
+  #
+  # Text, because they are encrypted at rest like every other money column
+  # (see HrLite::EncryptedMoney).
+  def change
+    add_column :hr_lite_employee_profiles, :fy_opening_gross, :text
+    add_column :hr_lite_employee_profiles, :fy_opening_tds, :text
+  end
+end

data/db/migrate/20260807184939_add_out_of_window_days_to_hr_lite_salary_slips.rb

@@ -0,0 +1,12 @@
+class AddOutOfWindowDaysToHrLiteSalarySlips < ActiveRecord::Migration[8.0]
+  # Days outside the employment window — before joining, after the last day.
+  # SlipBuilder already subtracts them from payable days, but never recorded
+  # them, so a mid-month joiner's payslip read "15 payable, 0 LOP" of a
+  # 30-day month and looked as though days had gone missing.
+  #
+  # Not encrypted: a day count is not money.
+  def change
+    add_column :hr_lite_salary_slips, :out_of_window_days, :decimal, precision: 4, scale: 1,
+                                                                     default: "0.0", null: false
+  end
+end