@7365admin1/layer-common 4.90.2-staging.492 → 4.90.2-staging.494

package/components/InventoryReportsTab.vue

@@ -7,6 +7,7 @@
         <v-btn v-if="ctl.fullReports" value="technicians" class="text-none">{{ worker.many }}</v-btn>
         <v-btn v-if="ctl.fullReports" value="purchases" class="text-none">Purchases</v-btn>
         <v-btn v-if="ctl.fullReports || ctl.review" value="handovers" class="text-none">Hand-overs</v-btn>
+        <v-btn v-if="stepsLive && (ctl.fullReports || ctl.review)" value="reconciliation" class="text-none">Reconciliation</v-btn>
       </v-btn-toggle>
       <v-select
         v-if="report === 'purchases'"
@@ -21,7 +22,7 @@
       />
       <v-text-field v-model="month" type="month" :label="report === 'purchases' && span === 'year' ? 'Up to month' : 'Month'" density="compact" hide-details style="max-width: 180px" />
       <v-select
-        v-if="(report === 'usage' || report === 'movement') && sites.length > 1"
+        v-if="(report === 'usage' || report === 'movement' || report === 'reconciliation') && sites.length > 1"
         v-model="site"
         :items="[{ _id: '', name: 'All properties' }, ...sites]"
         item-title="name"
@@ -60,6 +61,7 @@
         hide-details
         style="max-width: 260px"
       />
+      <v-text-field v-if="report === 'reconciliation'" v-model="itemText" label="Item" prepend-inner-icon="mdi-magnify" density="compact" hide-details clearable style="max-width: 220px" />
       <v-checkbox v-if="report === 'usage' && canCheck" v-model="uncheckedOnly" label="Not checked yet" density="compact" hide-details class="flex-grow-0" />
       <v-spacer />
       <v-btn v-if="report === 'purchases'" class="text-none screen-btn-ghost" variant="outlined" prepend-icon="mdi-clipboard-search-outline" @click="openPo('')">
@@ -146,7 +148,35 @@
       </v-row>
     </template>
 
+    <!-- Reconciliation (client 2026-10-02): per item, where every unit went, and whether it tallies. -->
+    <template v-if="report === 'reconciliation'">
+      <v-progress-linear v-if="loading" indeterminate color="primary" />
+      <div v-else-if="!reconRows.length" class="text-center text-medium-emphasis py-10">Nothing moved in this period.</div>
+      <v-alert v-if="!loading && reconRows.length && !reconFull" type="info" variant="tonal" density="compact" class="mb-2">
+        You see your own company's people only. The store's owner sees the store's side too.
+      </v-alert>
+      <v-alert v-if="!loading && notTallying" type="error" variant="tonal" density="compact" class="mb-2">
+        {{ notTallying === 1 ? "1 item does not" : `${notTallying} items do not` }} tally. They are marked in red below.
+      </v-alert>
+      <AppCard v-for="r in reconRows" :key="String(r.item)" class="pa-4 mb-3" :style="r.check && !r.check.ok ? 'border-left: 4px solid rgb(var(--v-theme-error))' : ''">
+        <div class="d-flex flex-wrap align-center ga-2 mb-1">
+          <div class="font-weight-medium">{{ r.name }}</div>
+          <div class="text-caption text-medium-emphasis">{{ [r.code, r.unit].filter(Boolean).join(" · ") }}</div>
+          <v-spacer />
+          <v-chip v-if="r.check" size="small" variant="tonal" :color="r.check.ok ? 'success' : 'error'">{{ r.check.ok ? "Tallies" : "Does not tally" }}</v-chip>
+        </div>
+        <div v-if="r.store" class="text-body-2 mb-1">
+          <strong>Store:</strong> {{ reconStoreText(r) }}
+        </div>
+        <div v-for="p in r.people" :key="String(p.holder)" class="text-body-2">
+          <strong>{{ p.holderLabel || p.name }}:</strong> {{ reconciliationPersonText(p, r.unit) }}
+        </div>
+        <div v-if="r.check" class="text-caption mt-1" :class="r.check.ok ? 'text-medium-emphasis' : 'text-error'">{{ reconciliationCheckText(r.check) }}</div>
+      </AppCard>
+    </template>
+
     <v-data-table
+      v-else
       v-model="selected"
       :headers="tableHeaders"
       :items="shownRows"
@@ -190,6 +220,9 @@
       </template>
       <template #item.state="{ item }">
         <v-chip size="x-small" variant="tonal" :color="item.status === 'draft' ? 'info' : 'success'">{{ item.status === "draft" ? "In progress" : "Submitted" }}</v-chip>
+        <div v-if="item.status === 'draft' && stepsLive && ctl.recordUsage && String(item.holder) !== me" class="mt-1">
+          <v-btn size="x-small" variant="outlined" class="text-none" :loading="takingOver === item._id" @click="takeOver(item)">Take over</v-btn>
+        </div>
         <div v-for="f in item.flags ?? []" :key="f" class="mt-1">
           <v-chip size="x-small" variant="tonal" color="warning">{{ flagWords[f] ?? f }}</v-chip>
         </div>
@@ -227,10 +260,12 @@
 import useInventory, { saveBlob } from "../composables/useInventory";
 import useWorkerTerm, { workerAppKey } from "../composables/useWorkerTerm";
 import useUtils from "../composables/useUtils";
+import useLocalAuth from "../composables/useLocalAuth";
 import { inventoryControls } from "../utils/inventory-presets";
 import { USED_BY_FILTERS } from "../utils/inventory-used-by";
 import { USAGE_FLAG_WORDS, USAGE_STATUS_CHOICES, usagePathText, usageQuery, usageTotals } from "../utils/inventory-usage";
 import { receivingLabel } from "../utils/inventory-receiving";
+import { inventoryStepsLive, reconciliationCheckText, reconciliationPersonText, writeOffReasonText } from "../utils/inventory-ack";
 
 const props = defineProps({
   store: { type: Object as PropType<TInventoryStore>, required: true },
@@ -248,7 +283,8 @@ const appSlug = workerAppKey();
 const now = new Date();
 const month = ref(`${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}`);
 // An approver without `view-reports` gets only the usage check screen.
-const report = ref<"movement" | "usage" | "technicians" | "purchases" | "handovers">(ctl.value.fullReports ? "movement" : "usage");
+const stepsLive = computed(() => inventoryStepsLive(props.store));
+const report = ref<"movement" | "usage" | "technicians" | "purchases" | "handovers" | "reconciliation">(ctl.value.fullReports ? "movement" : "usage");
 const span = ref<"month" | "year">("year");
 const site = ref("");
 const locationType = ref("");
@@ -297,8 +333,35 @@ const help: Record<string, string> = {
   technicians: "For each person: stock they held at the start, took, used, returned, and hold at the end of the month.",
   purchases: "Every delivery received — by PO, DO or cash — and opening stock entered with new items, with totals by month and by supplier. Click a PO number (or Check a PO) to see ordered against received.",
   handovers: "Stock passed from one person to a colleague: who gave it, who received it, and whether they confirmed.",
+  reconciliation:
+    "For each item: what came in (PO, DO, cash, opening stock), what the store issued, and for each person what they took, used (and where), wrote off, gave to colleagues, returned and still hold. Every item should tally; anything that does not is marked red.",
 };
 
+// Reconciliation rows, narrowed by the Item box.
+const itemText = ref("");
+const reconFull = ref(true);
+const reconRows = computed(() => {
+  if (report.value !== "reconciliation") return [];
+  const q = (itemText.value || "").trim().toLowerCase();
+  return rows.value.filter((r) => !q || String(r.name ?? "").toLowerCase().includes(q) || String(r.code ?? "").toLowerCase().includes(q));
+});
+const notTallying = computed(() => reconRows.value.filter((r) => r.check && !r.check.ok).length);
+function reconStoreText(r: any) {
+  const s = r.store;
+  const got = [s.received.po && `${s.received.po} by PO`, s.received.do && `${s.received.do} by DO`, s.received.cash && `${s.received.cash} by cash`, s.received.opening && `${s.received.opening} opening stock`].filter(Boolean).join(", ");
+  return [
+    `start ${s.opening}`,
+    `received ${s.received.total}${got ? ` (${got})` : ""}`,
+    `issued ${s.issued}`,
+    s.returned ? `returned ${s.returned}` : "",
+    s.adjusted ? `stock count ${s.adjusted > 0 ? "+" : ""}${s.adjusted}` : "",
+    s.writtenOff ? `written off from the shelf ${s.writtenOff}` : "",
+    `end ${s.closing} ${r.unit}`,
+  ]
+    .filter(Boolean)
+    .join(" · ");
+}
+
 const handoverStatus: Record<string, string> = { pending: "Waiting to confirm", accepted: "Confirmed", declined: "Declined", cancelled: "Cancelled" };
 
 // "Company · Service" of the person on each row, for the filter (usage, staff and hand-over reports).
@@ -359,6 +422,7 @@ const headers: Record<string, any[]> = {
     { title: "End", key: "closing" },
     { title: "Used", key: "usedByTechnicians" },
     { title: "Usage cost", key: "usedCost" },
+    { title: "Written off", key: "writtenOffAll" },
   ],
   usage: [
     { title: "Date", key: "date" },
@@ -392,6 +456,7 @@ const headers: Record<string, any[]> = {
     { title: "Used", key: "used" },
     { title: "Returned", key: "returned" },
     { title: "To colleagues", key: "gaveToColleagues" },
+    { title: "Written off", key: "writtenOffText" },
     { title: "Holding at end", key: "closing" },
     { title: "In hand now", key: "inHandNow" },
   ],
@@ -424,15 +489,17 @@ const headers: Record<string, any[]> = {
 };
 
 const siteName = computed(() => (site.value ? props.sites.find((s) => s._id === site.value)?.name ?? "" : ""));
+// The "Written off" columns only from an API that records write-offs.
+const baseHeaders = (key: string) => (stepsLive.value ? headers[key] : (headers[key] ?? []).filter((h) => h.key !== "writtenOffAll" && h.key !== "writtenOffText"));
 const tableHeaders = computed(() =>
   report.value === "movement" && siteName.value
     ? [
-        ...headers.movement,
+        ...baseHeaders("movement"),
         { title: `Issued for ${siteName.value}`, key: "siteIssued" },
         { title: `Used at ${siteName.value}`, key: "siteUsed" },
         { title: `Usage cost at ${siteName.value}`, key: "siteUsedCost" },
       ]
-    : headers[report.value],
+    : baseHeaders(report.value),
 );
 
 function period(): TInventoryPeriod & { unchecked?: boolean } {
@@ -442,7 +509,7 @@ function period(): TInventoryPeriod & { unchecked?: boolean } {
   return {
     from: from.toISOString(),
     to: to.toISOString(),
-    ...((report.value === "usage" || report.value === "movement") && site.value ? { site: site.value } : {}),
+    ...((report.value === "usage" || report.value === "movement" || report.value === "reconciliation") && site.value ? { site: site.value } : {}),
     ...(report.value === "usage" && locationType.value ? { locationType: locationType.value } : {}),
     ...(report.value === "usage" && uncheckedOnly.value ? { unchecked: true } : {}),
     ...(usedBy.value ? { usedBy: usedBy.value } : {}),
@@ -473,7 +540,13 @@ async function load() {
   selected.value = [];
   try {
     const res: any = await api.getReport(props.store._id, report.value, period());
-    rows.value = res.rows;
+    // Written off: the store shelf plus people's own stock (movement); "5 used up, 2 spoilt" (staff).
+    rows.value = (res.rows ?? []).map((r: any) => ({
+      ...r,
+      ...(r.writtenOff !== undefined || r.writtenOffByTechnicians !== undefined ? { writtenOffAll: (r.writtenOff ?? 0) + (r.writtenOffByTechnicians ?? 0) } : {}),
+      ...(report.value === "technicians" ? { writtenOffText: writeOffReasonText(r.writtenOffByReason) || (r.writtenOff ? String(r.writtenOff) : "") } : {}),
+    }));
+    reconFull.value = res.full !== false;
     totals.qty = res.totalQty ?? 0;
     totals.cost = res.totalCost ?? 0;
     scope.value = res.scope ?? "all";
@@ -488,6 +561,24 @@ async function load() {
   }
 }
 
+// Shift hand-over (client 2026-10-02): a colleague finishes a draft someone else started, from their own stock.
+const { currentUser } = useLocalAuth();
+const me = computed(() => String(currentUser.value?._id ?? ""));
+const takingOver = ref("");
+async function takeOver(r: any) {
+  if (!confirm(`Take over ${r.technician || "your colleague"}'s draft for ${r.qty} ${r.unit ?? ""} ${r.itemName}? You finish it (after photo, submit), and the stock comes from YOUR own stock, not theirs.`)) return;
+  takingOver.value = r._id;
+  try {
+    await api.takeOverDraft(String(r._id));
+    notify("The draft is yours now. Finish it from My Stock > My drafts.");
+    await load();
+  } catch (error: any) {
+    notify(error?.data?.message || "Could not take over the draft.", "error");
+  } finally {
+    takingOver.value = "";
+  }
+}
+
 async function setChecked(checked: boolean) {
   if (!selected.value.length) return;
   checking.value = checked ? "on" : "off";

package/components/InventoryRequestsTab.vue

@@ -4,6 +4,7 @@
       <v-btn-toggle v-model="status" mandatory density="comfortable" variant="outlined" divided>
         <v-btn value="pending" class="text-none">Waiting</v-btn>
         <v-btn value="issued" class="text-none">Approved</v-btn>
+        <v-btn v-if="stepsLive" value="confirm" class="text-none">Waiting for Received</v-btn>
         <v-btn value="rejected" class="text-none">Rejected</v-btn>
         <v-btn value="" class="text-none">All</v-btn>
       </v-btn-toggle>
@@ -24,14 +25,20 @@
 
     <v-progress-linear v-if="loading" indeterminate color="primary" />
     <div v-else-if="!requests.length" class="text-center text-medium-emphasis py-10">
-      {{ search ? `No requests match "${search}". Try another word, or pick "All" to look through every status.` : status === "pending" ? (store.access.canApprove ? "No requests waiting for approval." : "You have no requests waiting. Use Request Stock to ask the store for items.") : "No requests to show." }}
+      {{ search ? `No requests match "${search}". Try another word, or pick "All" to look through every status.` : status === "confirm" ? "Nothing is waiting for anyone to tap Received." : status === "pending" ? (store.access.canApprove ? "No requests waiting for approval." : "You have no requests waiting. Use Request Stock to ask the store for items.") : "No requests to show." }}
     </div>
 
-    <AppCard v-for="r in requests" :key="r._id" class="pa-4 mb-3">
+    <AppCard
+      v-for="r in requests"
+      :key="r._id"
+      class="pa-4 mb-3"
+      :style="r._id === focusRequest ? { borderLeft: '4px solid rgb(var(--v-theme-primary))' } : undefined"
+    >
       <div class="d-flex flex-wrap align-center ga-2 mb-2">
         <div class="font-weight-medium">{{ r.requestedByLabel || r.requestedByName || "Someone" }}</div>
         <div class="text-caption text-medium-emphasis">{{ standardFormatDateTime(r.createdAt) }}</div>
         <v-chip size="small" :color="chip[r.status].color" variant="tonal">{{ chip[r.status].label }}</v-chip>
+        <v-chip v-if="r.status === 'issued' && r.ackStatus && r.ackStatus !== 'received'" size="small" :color="ACK_CHIP[r.ackStatus].color" variant="tonal">{{ ACK_CHIP[r.ackStatus].label }}</v-chip>
         <!-- One store can supply several properties: say which one this request is for. -->
         <v-chip v-if="store.sites.length > 1 && r.siteName" size="small" variant="outlined" prepend-icon="mdi-office-building-outline">For {{ r.siteName }}</v-chip>
         <v-spacer />
@@ -39,6 +46,7 @@
           <v-btn v-if="ctl.review" class="text-none screen-btn-primary" variant="flat" @click="openDecision(r)">Review</v-btn>
           <v-btn v-else-if="isMine(r)" class="text-none screen-btn-ghost" variant="outlined" :loading="busyId === r._id" @click="cancel(r)">Cancel</v-btn>
         </template>
+        <InventoryReceiptActions v-if="r.status === 'issued' && isMine(r) && (r.ackStatus === 'awaiting' || r.ackStatus === 'not_received')" :request="r" @done="changed" />
       </div>
       <div v-for="l in r.lines" :key="String(l.item)" class="text-body-2">
         {{ requestLineText(r.status, l) }}
@@ -47,6 +55,9 @@
       <div v-if="r.decidedByName" class="text-caption mt-1">
         {{ requestOutcomeText(r, standardFormatDateTime) }}
       </div>
+      <div v-if="ackText(r, isMine(r))" class="text-body-2 mt-1" :class="r.ackStatus === 'not_received' ? 'text-error' : r.ackStatus === 'awaiting' ? 'text-warning' : 'text-medium-emphasis'">
+        {{ ackText(r, isMine(r)) }}
+      </div>
     </AppCard>
 
     <div class="text-center" v-if="page < pages">
@@ -66,7 +77,7 @@
             <div v-for="l in decision.lines" :key="l.item" class="d-flex align-center ga-3 mb-1">
               <div class="flex-grow-1">
                 <div class="font-weight-medium">{{ l.itemName }}</div>
-                <div class="text-caption text-medium-emphasis">Asked {{ l.qty }} · In store {{ l.onHand ?? "…" }} {{ l.unit }}</div>
+                <div class="text-caption text-medium-emphasis">Asked {{ l.qty }} · You can give up to {{ l.onHand ?? "…" }} {{ l.unit }}{{ l.reservedQty ? ` (${l.reservedQty} set aside for this request)` : "" }}</div>
               </div>
               <v-text-field
                 v-model.number="l.give"
@@ -76,7 +87,7 @@
                 label="Give"
                 density="comfortable"
                 style="max-width: 120px"
-                :rules="[(v: any) => (Number.isInteger(Number(v)) && Number(v) >= 0 && Number(v) <= l.qty) || `0 to ${l.qty}`, (v: any) => l.onHand === undefined || Number(v) <= l.onHand || `Only ${l.onHand} in store`]"
+                :rules="[(v: any) => (Number.isInteger(Number(v)) && Number(v) >= 0 && Number(v) <= l.qty) || `0 to ${l.qty}`, (v: any) => l.onHand === undefined || Number(v) <= l.onHand || `Only ${l.onHand} available`]"
               />
             </div>
             <InputLabel title="Remarks" class="mb-1 mt-2" />
@@ -100,10 +111,13 @@ import useUtils from "../composables/useUtils";
 import { REQUEST_STATUS, requestLineText, requestOutcomeText } from "../utils/inventory-request-text";
 import useLocalAuth from "../composables/useLocalAuth";
 import { inventoryControls } from "../utils/inventory-presets";
+import { ACK_CHIP, ackText, approveCap, inventoryStepsLive } from "../utils/inventory-ack";
 
 const props = defineProps({
   store: { type: Object as PropType<TInventoryStore>, required: true },
   siteId: { type: String, required: true },
+  /** A request to open first (notification link). Shown on top, marked, in the "All" list. */
+  focusRequest: { type: String, default: "" },
 });
 const ctl = computed(() => inventoryControls(props.store.access));
 const emit = defineEmits(["changed"]);
@@ -114,8 +128,9 @@ const { currentUser } = useLocalAuth();
 const notify = inject<(text: string, color?: string) => void>("inventoryNotify", () => {});
 
 const chip = REQUEST_STATUS;
+const stepsLive = computed(() => inventoryStepsLive(props.store));
 
-const status = ref("pending");
+const status = ref(props.focusRequest ? "" : "pending");
 const search = ref("");
 const requests = ref<TInventoryRequest[]>([]);
 const page = ref(1);
@@ -129,8 +144,14 @@ const isMine = (r: TInventoryRequest) => String(r.requestedBy) === String(curren
 async function load(p = 1) {
   loading.value = true;
   try {
-    const res = await api.getRequests(props.store._id, { page: p, limit: 20, status: status.value || undefined, search: search.value?.trim() || undefined });
-    requests.value = p === 1 ? res.items : [...requests.value, ...res.items];
+    // "Waiting for Received" is approved requests whose person has not confirmed yet.
+    const confirm = status.value === "confirm";
+    const res = await api.getRequests(props.store._id, { page: p, limit: confirm ? 100 : 20, status: confirm ? "issued" : status.value || undefined, search: search.value?.trim() || undefined });
+    const got = confirm ? res.items.filter((r) => r.ackStatus === "awaiting" || r.ackStatus === "not_received") : res.items;
+    // ponytail: the linked request is found in the first page of "All" (the newest 20); an older one just shows the list.
+    const focused = p === 1 && props.focusRequest ? got.find((r) => r._id === props.focusRequest) : undefined;
+    const rows = focused ? [focused, ...got.filter((r) => r !== focused)] : got;
+    requests.value = p === 1 ? rows : [...requests.value, ...got];
     page.value = p;
     pages.value = res.pages;
   } catch {
@@ -146,7 +167,7 @@ function changed() {
 }
 
 async function cancel(r: TInventoryRequest) {
-  if (!confirm("Cancel this request? The store keeper will no longer see it.")) return;
+  if (!confirm("Cancel this request? The store keeper will no longer see it, and anything set aside for it goes back to the store.")) return;
   busyId.value = r._id;
   try {
     await api.cancelRequest(r._id);
@@ -163,7 +184,7 @@ const decisionForm = ref();
 const decision = reactive({
   show: false,
   request: null as TInventoryRequest | null,
-  lines: [] as { item: string; itemName: string; unit: string; qty: number; give: number; onHand?: number }[],
+  lines: [] as { item: string; itemName: string; unit: string; qty: number; give: number; onHand?: number; reservedQty?: number }[],
   remarks: "",
   busy: "" as "" | "approve" | "reject",
 });
@@ -174,13 +195,14 @@ async function openDecision(r: TInventoryRequest) {
     request: r,
     remarks: "",
     busy: "",
-    lines: r.lines.map((l) => ({ item: String(l.item), itemName: l.itemName, unit: l.unit, qty: l.qty, give: l.qty, onHand: undefined })),
+    lines: r.lines.map((l) => ({ item: String(l.item), itemName: l.itemName, unit: l.unit, qty: l.qty, give: l.qty, onHand: undefined, reservedQty: l.reservedQty })),
   });
   try {
     const res = await api.getItems(props.store._id, { limit: 200, includeInactive: true });
     for (const line of decision.lines) {
       const found = res.items.find((i) => i._id === line.item);
-      line.onHand = found?.onHand ?? 0;
+      // What is free, plus what this request already set aside for itself.
+      line.onHand = approveCap(found, line.reservedQty ?? 0) ?? 0;
       line.give = Math.min(line.qty, line.onHand);
     }
   } catch {
@@ -197,7 +219,7 @@ async function approve() {
       lines: decision.lines.map((l) => ({ item: l.item, qty: Number(l.give) })),
       remarks: decision.remarks,
     });
-    notify("Approved. The stock is now with the requester.");
+    notify(stepsLive.value ? "Approved. The requester is asked to tap Received once they have the items." : "Approved. The stock is now with the requester.");
     decision.show = false;
     changed();
   } catch (error: any) {
@@ -213,7 +235,7 @@ async function reject() {
   decision.busy = "reject";
   try {
     await api.rejectRequest(decision.request._id, decision.remarks.trim());
-    notify("Request rejected.");
+    notify(stepsLive.value ? "Request rejected. Anything set aside for it is back in the store." : "Request rejected.");
     decision.show = false;
     changed();
   } catch (error: any) {

package/components/InventorySettingsTab.vue

@@ -21,6 +21,26 @@
         />
       </template>
 
+      <template v-if="stepsLive">
+        <v-divider class="my-4" />
+        <div class="text-subtitle-1 mb-1">Low stock reminders</div>
+        <p class="text-body-2 text-medium-emphasis mb-2">
+          When an item goes low, the people who manage this store get an alert. Choose how often to remind them until someone records a PO number for it.
+        </p>
+        <v-text-field
+          v-model.number="reminderDays"
+          type="number"
+          min="0"
+          max="30"
+          label="Remind every (days)"
+          density="comfortable"
+          style="max-width: 220px"
+          :rules="[(v: any) => (Number.isInteger(Number(v)) && Number(v) >= 0 && Number(v) <= 30) || 'A whole number from 0 to 30']"
+          :hint="reminderDaysText(reminderDays)"
+          persistent-hint
+        />
+      </template>
+
       <v-divider class="my-4" />
       <div class="text-subtitle-1 mb-1">Service365 app</div>
       <p class="text-body-2 text-medium-emphasis mb-2">
@@ -40,6 +60,7 @@
 import useInventory from "../composables/useInventory";
 import useUtils from "../composables/useUtils";
 import { inventorySiteOptions } from "../utils/inventory-store-label";
+import { inventoryStepsLive, reminderDaysText } from "../utils/inventory-ack";
 
 const props = defineProps({
   store: { type: Object as PropType<TInventoryStore>, required: true },
@@ -57,6 +78,8 @@ const name = ref("");
 const sites = ref<string[]>([]);
 const showInResidentApp = ref(false);
 const showCostInResidentApp = ref(false);
+const reminderDays = ref<number>(1);
+const stepsLive = computed(() => inventoryStepsLive(props.store));
 
 const siteItems = computed(() => inventorySiteOptions(props.orgSites, props.store));
 
@@ -65,6 +88,7 @@ function reset() {
   sites.value = [...props.store.sites];
   showInResidentApp.value = props.store.showInResidentApp;
   showCostInResidentApp.value = props.store.showCostInResidentApp;
+  reminderDays.value = props.store.lowStockReminderDays ?? 1;
 }
 
 async function save() {
@@ -77,6 +101,8 @@ async function save() {
       sites: sites.value,
       showInResidentApp: showInResidentApp.value,
       showCostInResidentApp: showInResidentApp.value && showCostInResidentApp.value,
+      // Only to an API that has reminders (an older one refuses the unknown field).
+      ...(stepsLive.value ? { lowStockReminderDays: Number(reminderDays.value) } : {}),
     });
     notify("Settings saved.");
     emit("saved");
@@ -87,5 +113,5 @@ async function save() {
   }
 }
 
-watch(() => props.store, reset, { immediate: true });
+watch(() => [props.store, props.store.lowStockReminderDays], reset, { immediate: true });
 </script>

package/components/InventoryStockTab.vue

@@ -96,10 +96,17 @@
         </div>
       </template>
       <template #item.onHand="{ item }">
-        <span :class="item.lowStock ? 'text-error font-weight-bold' : 'font-weight-medium'">{{ item.onHand }}</span>
+        <!-- Owner 2026-10-03: what is requested comes off this number at once (set aside), so everyone sees what is really left. -->
+        <span :class="item.lowStock ? 'text-error font-weight-bold' : 'font-weight-medium'">{{ availableQty(item) }}</span>
         <span class="text-medium-emphasis ml-1">{{ item.unit }}</span>
         <v-chip v-if="item.lowStock" size="x-small" color="error" variant="tonal" class="ml-2">Low</v-chip>
         <v-chip v-if="item.status === 'inactive'" size="x-small" variant="tonal" class="ml-2">Not in use</v-chip>
+        <div v-if="item.reserved" class="text-caption text-medium-emphasis">+ {{ item.reserved }} set aside for requests (still on the shelf)</div>
+        <div v-if="item.awaitingReceipt" class="text-caption text-medium-emphasis">{{ item.awaitingReceipt }} handed out, waiting for Received</div>
+        <div v-if="item.lowStockAlert" class="text-caption text-error" @click.stop>
+          {{ lowStockAlertText(item.lowStockAlert, standardFormatDate) }}
+          <a v-if="canAckLow && !item.lowStockAlert.poNumber" href="#" class="text-primary ml-1" @click.prevent.stop="openAck(item)">Acknowledge</a>
+        </div>
       </template>
       <template #item.reorderLevel="{ value }">{{ value || "—" }}</template>
       <template #item.usedBy="{ item }">{{ usedByText(item.usedBy) }}</template>
@@ -143,6 +150,23 @@
         </div>
       </v-card>
     </v-dialog>
+    <v-dialog v-model="ack.show" max-width="480">
+      <v-card v-if="ack.item" class="screen-modal">
+        <v-card-title>Low stock: {{ ack.item.name }}</v-card-title>
+        <v-card-text class="screen-modal__body">
+          <p class="text-body-2 mb-3">
+            {{ availableQty(ack.item) }} {{ ack.item.unit }} left (alert at {{ ack.item.reorderLevel }}). Record the PO number once you have ordered more:
+            the reminders then stop. Without a PO number, we note that you have seen it and the reminders carry on.
+          </p>
+          <InputLabel title="PO number (optional)" class="mb-1" />
+          <v-text-field v-model="ack.poNumber" density="comfortable" maxlength="100" placeholder="e.g. PO-0412" />
+        </v-card-text>
+        <div class="screen-modal__footer">
+          <v-btn class="screen-btn-ghost" variant="outlined" :disabled="ack.saving" @click="ack.show = false">Cancel</v-btn>
+          <v-btn class="screen-btn-primary" variant="flat" :loading="ack.saving" @click="saveAck">{{ ack.poNumber.trim() ? "Save PO and stop reminders" : "Mark as seen" }}</v-btn>
+        </div>
+      </v-card>
+    </v-dialog>
     <InventoryItemDetail v-model="detail.show" :store="store" :item="detail.item" @edit="editItem" @done="done" />
   </div>
 </template>
@@ -154,6 +178,7 @@ import useUtils from "../composables/useUtils";
 import { inventoryItemMeta } from "../utils/inventory-store-label";
 import { inventoryControls } from "../utils/inventory-presets";
 import { hasLegacyEquipmentToCopy } from "../utils/inventory-legacy";
+import { availableQty, lowStockAlertText } from "../utils/inventory-ack";
 import { nextUsedBy, USED_BY_ALL, USED_BY_ALL_LABEL, USED_BY_FILTERS, USED_BY_HINT, USED_BY_OPTIONS, usedByChips, usedByText } from "../utils/inventory-used-by";
 
 const props = defineProps({
@@ -164,7 +189,30 @@ const props = defineProps({
 const ctl = computed(() => inventoryControls(props.store.access));
 const emit = defineEmits(["changed"]);
 
-const { getItems, getLegacyEquipment, setUsedBy } = useInventory();
+const { getItems, getLegacyEquipment, setUsedBy, acknowledgeLowStock } = useInventory();
+const { standardFormatDate } = useUtils();
+
+// Low stock acknowledge (client 2026-10-02): store managers, approvers and store keepers.
+const canAckLow = computed(() => ctl.value.addItems || ctl.value.review || ctl.value.receive);
+const ack = reactive({ show: false, item: null as TInventoryItem | null, poNumber: "", saving: false });
+function openAck(item: TInventoryItem) {
+  Object.assign(ack, { show: true, item, poNumber: "", saving: false });
+}
+async function saveAck() {
+  if (!ack.item) return;
+  ack.saving = true;
+  try {
+    const po = ack.poNumber.trim();
+    await acknowledgeLowStock(ack.item._id, po);
+    notify(po ? `PO ${po} recorded for ${ack.item.name}. The low stock reminders have stopped.` : `Noted that you have seen ${ack.item.name} is low. Reminders continue until a PO number is recorded.`);
+    ack.show = false;
+    load();
+  } catch (error: any) {
+    notify(error?.data?.message || "Could not save. Please try again.", "error");
+  } finally {
+    ack.saving = false;
+  }
+}
 const notify = inject<(text: string, color?: string) => void>("inventoryNotify", () => {});
 
 // Used by belongs to the main (property) store; its owner sees the column, the filter and bulk edit.
@@ -210,7 +258,7 @@ const pageRange = computed(() => (total.value ? `${(page.value - 1) * limit + 1}
 
 const headers = computed(() => [
   { title: "Item", value: "name" },
-  { title: "In store", value: "onHand" },
+  { title: "Available", value: "onHand" },
   { title: "Low stock alert at", value: "reorderLevel" },
   ...(usedByOwner.value ? [{ title: "Used by", value: "usedBy" }] : []),
   ...(ctl.value.unitPrice ? [{ title: "Unit price", value: "unitCost" }] : []),

package/components/InventoryTechniciansTab.vue

@@ -6,6 +6,17 @@
       <v-text-field v-model="search" density="compact" placeholder="Search name or item" clearable hide-details append-inner-icon="mdi-magnify" style="max-width: 280px" />
     </div>
 
+    <!-- Returns the holder started (owner 2026-10-03): accept once the items are back on the shelf. -->
+    <AppCard v-for="h in returns" :key="h._id" class="pa-4 mb-3 d-flex flex-wrap align-center ga-3" style="border-left: 4px solid rgb(var(--v-theme-warning))">
+      <v-icon icon="mdi-keyboard-return" color="warning" />
+      <div class="flex-grow-1" style="min-width: 220px">
+        <div class="font-weight-medium">{{ h.fromLabel || h.fromName }} wants to return {{ h.qty }} {{ h.unit }} {{ h.itemName }}</div>
+        <div class="text-caption text-medium-emphasis">{{ standardFormatDate(h.createdAt) }}{{ h.note ? ` · "${h.note}"` : "" }} · Accept once you have the items back; they go back into the store.</div>
+      </div>
+      <v-btn class="text-none screen-btn-ghost" variant="outlined" size="small" :disabled="!!acting" @click="openDecline(h)">Not received</v-btn>
+      <v-btn class="text-none screen-btn-primary" variant="flat" size="small" :loading="acting === h._id" :disabled="!!acting" @click="acceptReturn(h)">Accept return</v-btn>
+    </AppCard>
+
     <v-progress-linear v-if="loading" indeterminate color="primary" />
     <div v-else-if="!groups.length" class="text-center text-medium-emphasis py-10">Nobody is holding stock from this store.</div>
 
@@ -17,7 +28,9 @@
         <v-btn v-if="ctl.takeReturn" class="text-none screen-btn-ghost" variant="outlined" size="small" prepend-icon="mdi-keyboard-return" @click="openReturn(g)">Receive return</v-btn>
       </div>
       <div class="d-flex flex-wrap ga-2">
-        <v-chip v-for="h in g.items" :key="h._id" variant="tonal">{{ h.itemName }}: {{ h.qty }} {{ h.unit }} left · {{ h.usedThisMonth ?? 0 }} used this month</v-chip>
+        <v-chip v-for="h in g.items" :key="h._id" variant="tonal">
+          {{ h.itemName }}: {{ h.qty }} {{ h.unit }} left · {{ h.usedThisMonth ?? 0 }} used this month{{ h.unacknowledged ? ` · ${h.unacknowledged} not yet confirmed as received` : "" }}
+        </v-chip>
       </div>
     </AppCard>
 
@@ -30,18 +43,76 @@
       :holdings="ret.items"
       @done="changed"
     />
+    <v-dialog v-model="decline.show" max-width="480">
+      <v-card v-if="decline.handover" class="screen-modal">
+        <v-card-title>Return not received</v-card-title>
+        <v-card-text class="screen-modal__body">
+          <p class="text-body-2 mb-3">The {{ decline.handover.itemName }} stays with {{ decline.handover.fromName }}. Tell them why, so they know what to do.</p>
+          <v-textarea v-model="decline.reason" rows="2" auto-grow density="comfortable" maxlength="500" placeholder="e.g. nothing was brought to the store" />
+        </v-card-text>
+        <div class="screen-modal__footer">
+          <v-btn class="screen-btn-ghost" variant="outlined" :disabled="!!acting" @click="decline.show = false">Cancel</v-btn>
+          <v-btn class="screen-btn-primary" variant="flat" :loading="!!acting" @click="declineReturn">Send</v-btn>
+        </div>
+      </v-card>
+    </v-dialog>
   </div>
 </template>
 
 <script setup lang="ts">
 import useInventory from "../composables/useInventory";
 import { inventoryControls } from "../utils/inventory-presets";
+import useUtils from "../composables/useUtils";
 
 const props = defineProps({ store: { type: Object as PropType<TInventoryStore>, required: true } });
 const ctl = computed(() => inventoryControls(props.store.access));
 const emit = defineEmits(["changed"]);
 
-const { getHoldings } = useInventory();
+const { getHoldings, getHandovers, acceptHandover, declineHandover } = useInventory();
+const { standardFormatDate } = useUtils();
+const notify = inject<(text: string, color?: string) => void>("inventoryNotify", () => {});
+
+const returns = ref<TInventoryHandover[]>([]);
+const acting = ref("");
+const decline = reactive({ show: false, handover: null as TInventoryHandover | null, reason: "" });
+async function loadReturns() {
+  if (!ctl.value.takeReturn) return (returns.value = []);
+  try {
+    returns.value = (await getHandovers(props.store._id, { status: "pending", limit: 50 })).items.filter((h) => h.kind === "return");
+  } catch {
+    returns.value = [];
+  }
+}
+async function acceptReturn(h: TInventoryHandover) {
+  acting.value = h._id;
+  try {
+    await acceptHandover(h._id);
+    notify(`${h.qty} ${h.unit} ${h.itemName} is back in the store.`);
+    changed();
+  } catch (error: any) {
+    notify(error?.data?.message || "Could not accept the return.", "error");
+  } finally {
+    acting.value = "";
+  }
+}
+function openDecline(h: TInventoryHandover) {
+  Object.assign(decline, { show: true, handover: h, reason: "" });
+}
+async function declineReturn() {
+  const h = decline.handover;
+  if (!h) return;
+  acting.value = h._id;
+  try {
+    await declineHandover(h._id, decline.reason.trim());
+    notify(`Return not accepted. The ${h.itemName} stays with ${h.fromName}, who has been told.`);
+    decline.show = false;
+    changed();
+  } catch (error: any) {
+    notify(error?.data?.message || "Could not update the return.", "error");
+  } finally {
+    acting.value = "";
+  }
+}
 const holdings = ref<TInventoryHolding[]>([]);
 const loading = ref(false);
 const search = ref("");
@@ -76,9 +147,10 @@ function openReturn(g: { holder: string; holderName: string; items: TInventoryHo
 
 function changed() {
   load();
+  loadReturns();
   emit("changed");
 }
 
-watch(() => props.store._id, load);
-onMounted(load);
+watch(() => props.store._id, () => (load(), loadReturns()));
+onMounted(() => (load(), loadReturns()));
 </script>