@7365admin1/layer-common 4.71.1 → 4.72.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 4.72.0
+
+### Minor Changes
+
+- eb2e98f: Inventory: "Main store · <company>" with who manages it, a request-first view for other companies, pending-approval banner for the owner; Used by on items (form, chips, column, filter, bulk edit, report filter); Give to colleague (My Stock) with confirm/decline; Hand-overs report; name · company · service on requests, holdings, history, reports; Issue Stock "Give to" grouped by company with a Used-by warning.
+
+## 4.71.2
+
+### Patch Changes
+
+- 99042e0: Building Management → Units import dialog: the instructions no longer ask for a block number (the import takes it from the chosen building).
+
 ## 4.71.1
 
 ### Patch Changes
@@ -1867,11 +1879,11 @@
   `utils/console-tier.ts` + `composables/useConsoleTier.ts` mirror the server's
   own rule from two endpoints the console already calls, unprojected:
 
-                                                                                                                                                                                                                                                                                                                      GET /api/members/user/:user/app/admin    the Seven365 staff membership
-                                                                                                                                                                                                                                                                                                                      GET /api/roles/id/:role                  that membership's role document
+                                                                                                                                                                                                                                                                                                                          GET /api/members/user/:user/app/admin    the Seven365 staff membership
+                                                                                                                                                                                                                                                                                                                          GET /api/roles/id/:role                  that membership's role document
 
-                                                                                                                                                                                                                                                                                                                      owner  = member.type === "admin" && role.type === "admin" && role.default === true
-                                                                                                                                                                                                                                                                                                                      staff  = member.type === "admin" && role.type === "admin"
+                                                                                                                                                                                                                                                                                                                          owner  = member.type === "admin" && role.type === "admin" && role.default === true
+                                                                                                                                                                                                                                                                                                                          staff  = member.type === "admin" && role.type === "admin"
 
   `role.default` is the marker because it is the only property of a platform
   staff role no API caller can set - `role.controller.ts` validates create and

package/components/BuildingManagement/units.vue

@@ -31,7 +31,7 @@
         title="Import Blocks, Levels and Units from Excel"
         noun="rows"
         name-label="Building / Level / Unit"
-        fill-hint="One row per unit: block number, building name, level and unit. Building Name and Level have dropdowns with this property's own values."
+        fill-hint="One row per unit: building name, level and unit. Pick Building Name and Level from the dropdowns (type a new name for a new building). No block number needed — an existing building keeps its own and a new one gets the next free number."
         duplicate-note="Units already on that level are skipped and left unchanged."
         template-file-name="units-import-template.xlsx"
         :download-template="() => downloadTemplate('building-units', { site })"

package/components/InventoryItemDetail.vue

@@ -58,7 +58,7 @@
               </td>
               <td class="text-right">{{ t.type === "use" ? "" : t.storeBalance }}</td>
               <td class="text-caption">{{ describe(t) }}</td>
-              <td class="text-caption">{{ t.createdByName }}</td>
+              <td class="text-caption">{{ (t as any).createdByLabel || t.createdByName }}</td>
             </tr>
             <tr v-if="!history.length && !loading">
               <td colspan="6" class="text-center text-medium-emphasis py-4">Nothing recorded yet.</td>
@@ -108,11 +108,14 @@ const formatDate = (d: string) => standardFormatDate(d);
 function describe(t: TInventoryTransaction) {
   const parts: string[] = [];
   if (t.type === "receive") parts.push(t.supplier || "", t.reference ? `PO ${t.reference}` : "");
-  if (t.type === "issue") parts.push(`${t.qty} to ${t.holderName}`, t.reference || "");
-  if (t.type === "return") parts.push(`${t.qty} from ${t.holderName}`);
+  const who = (t as any).holderLabel || t.holderName;
+  if (t.type === "issue") parts.push(`${t.qty} to ${who}`, t.reference || "");
+  if (t.type === "return") parts.push(`${t.qty} from ${who}`);
+  // Give to colleague: one row per holder.
+  if (t.type === "handover") parts.push(who || "", t.remarks || "");
   if (t.type === "use")
     parts.push(
-      `${t.holderName} used ${t.qty}`,
+      `${who} used ${t.qty}`,
       t.location?.type === "tenant_unit" ? `${t.location.unitName} ${t.location.tenantName || ""}` : t.location?.area || "",
       t.reference || "",
     );

package/components/InventoryItemDialog.vue

@@ -36,6 +36,21 @@
               <v-text-field v-model.number="f.unitCost" type="number" min="0" step="0.01" prefix="$" density="comfortable" :rules="[moneyRule]" hint="Price of one unit" persistent-hint />
             </v-col>
           </v-row>
+          <!-- Main store only: which service providers see and may request it (owner 2026-09-29). -->
+          <template v-if="store.ownerType === 'property'">
+            <InputLabel title="Used by" class="mb-1 mt-2" />
+            <v-select
+              :model-value="f.usedBy"
+              :items="usedByItems"
+              multiple
+              chips
+              closable-chips
+              density="comfortable"
+              :hint="USED_BY_HINT"
+              persistent-hint
+              @update:model-value="(v: string[]) => (f.usedBy = nextUsedBy(f.usedBy, v))"
+            />
+          </template>
           <!-- Stock already on the shelf, recorded like a delivery (one "Opening stock" entry in the item's history). -->
           <template v-if="!item">
             <div class="text-subtitle-2 mt-4">Opening stock</div>
@@ -93,6 +108,9 @@
 <script setup lang="ts">
 import useInventory, { pickedDate } from "../composables/useInventory";
 import useUtils from "../composables/useUtils";
+import { normaliseUsedBy, nextUsedBy, USED_BY_ALL, USED_BY_ALL_LABEL, USED_BY_HINT, USED_BY_OPTIONS } from "../utils/inventory-used-by";
+
+const usedByItems = [{ value: USED_BY_ALL, title: USED_BY_ALL_LABEL }, ...USED_BY_OPTIONS];
 
 const show = defineModel<boolean>({ default: false });
 const props = defineProps({
@@ -126,6 +144,7 @@ const blank = () => ({
   openingReceivedBy: "",
   openingRemarks: "",
   description: "",
+  usedBy: [USED_BY_ALL] as string[],
 });
 const today = new Date().toLocaleDateString("en-CA");
 const f = reactive(blank());
@@ -135,7 +154,7 @@ const inUse = ref(true);
 watch(show, (open) => {
   if (!open) return;
   const i = props.item;
-  Object.assign(f, blank(), i ? { name: i.name, unit: i.unit, packing: i.packing ?? "", code: i.code, category: i.category, reorderLevel: i.reorderLevel, unitCost: i.unitCost ?? 0, description: i.description } : {});
+  Object.assign(f, blank(), i ? { name: i.name, unit: i.unit, packing: i.packing ?? "", code: i.code, category: i.category, reorderLevel: i.reorderLevel, unitCost: i.unitCost ?? 0, description: i.description, usedBy: normaliseUsedBy(i.usedBy) } : {});
   photo.value = i?.photo ? [i.photo] : [];
   inUse.value = i ? i.status === "active" : true;
 });
@@ -154,6 +173,7 @@ async function save() {
     unitCost: Number(f.unitCost || 0),
     description: f.description,
     photo: photo.value[0] ?? "",
+    ...(props.store.ownerType === "property" ? { usedBy: normaliseUsedBy(f.usedBy) } : {}),
   };
   try {
     if (props.item) {

package/components/InventoryLinesDialog.vue

@@ -16,19 +16,23 @@
               v-if="mode === 'issue'"
               v-model="holder"
               :items="people"
-              item-title="name"
+              :item-title="(p: any) => p.label || p.name"
               item-value="_id"
               :loading="peopleLoading"
               placeholder="Search a name"
               density="comfortable"
               :rules="[requiredRule]"
               no-filter
+              hint="Everyone at this property who can take stock: your staff and the service providers' people."
+              persistent-hint
               @update:search="searchPeople"
             >
               <template #item="{ props: p, item }">
-                <v-list-item v-bind="p" :subtitle="item.raw.orgName" />
+                <v-list-subheader v-if="groupStarts(item.raw)">{{ item.raw.company || "Other" }}</v-list-subheader>
+                <v-list-item v-bind="p" :title="item.raw.name" :subtitle="[item.raw.serviceLabel, item.raw.email].filter(Boolean).join(' · ')" />
               </template>
             </v-autocomplete>
+            <v-alert v-if="usedByWarning" type="warning" variant="tonal" density="compact" class="mt-2">{{ usedByWarning }}</v-alert>
             <v-text-field v-else :model-value="holderName" density="comfortable" readonly />
           </template>
 
@@ -129,6 +133,7 @@
 <script setup lang="ts">
 import useInventory, { pickedDate } from "../composables/useInventory";
 import useUtils from "../composables/useUtils";
+import { normaliseUsedBy, usedByChips, usedByText } from "../utils/inventory-used-by";
 
 type TMode = "receive" | "issue" | "request" | "return";
 type TRow = { item: string; qty: number | null; unitCost?: number | null };
@@ -230,7 +235,24 @@ async function loadItems(search = "") {
 }
 const searchItems = debounce((q: string) => loadItems(q || ""), 300);
 
-const people = ref<{ _id: string; name: string; orgName: string }[]>([]);
+type TPerson = { _id: string; name: string; orgName: string; email?: string; company?: string; service?: string; serviceLabel?: string; label?: string };
+const people = ref<TPerson[]>([]);
+/** A company heading above the first person of each company (the server sorts by company). */
+const groupStarts = (p: TPerson) => {
+  const i = people.value.indexOf(p);
+  return i === 0 || (i > 0 && people.value[i - 1].company !== p.company);
+};
+/** Used by: warn before the server refuses an item meant for another service. */
+const usedByWarning = computed(() => {
+  if (props.mode !== "issue" || !holder.value) return "";
+  const person = people.value.find((p) => p._id === holder.value);
+  if (!person?.service || person.service === "property") return "";
+  const blocked = rows.value
+    .map((r) => itemChoices.value.find((c) => c._id === r.item))
+    .filter((i): i is TInventoryItem => Boolean(i) && usedByChips(i!.usedBy).length > 0 && !normaliseUsedBy(i!.usedBy).includes(person.service!));
+  if (!blocked.length) return "";
+  return `${blocked.map((i) => i.name).join(", ")} ${blocked.length === 1 ? "is" : "are"} for ${usedByText(blocked[0].usedBy)} only — ${person.name} works for ${person.serviceLabel || "another service"}.`;
+});
 const peopleLoading = ref(false);
 const searchPeople = debounce(async (q: string) => {
   peopleLoading.value = true;

package/components/InventoryMain.vue

@@ -82,6 +82,23 @@
     </AppCard>
 
     <template v-else>
+      <!-- Owner rule 2026-09-29: another organisation's store is for requesting only. -->
+      <v-alert v-if="requestOnly" type="info" variant="tonal" density="compact" class="mb-4" icon="mdi-cart-arrow-down">
+        <div class="font-weight-medium">Request items from the main store</div>
+        <div class="text-body-2">Pick the items you need and press Request Stock. You are told when the store keeper approves it.</div>
+      </v-alert>
+      <v-alert
+        v-else-if="store.access.canApprove && pendingCount > 0 && tab !== 'requests'"
+        type="warning"
+        variant="tonal"
+        density="compact"
+        class="mb-4"
+      >
+        <div class="d-flex align-center flex-wrap ga-2">
+          <span>{{ pendingCount === 1 ? "1 request is" : `${pendingCount} requests are` }} waiting for your approval.</span>
+          <v-btn size="small" variant="flat" color="warning" class="text-none" @click="tab = 'requests'">Review requests</v-btn>
+        </div>
+      </v-alert>
       <v-tabs v-model="tab" color="primary" class="mb-4" show-arrows>
         <v-tab v-for="t in tabs" :key="t.value" :value="t.value" class="text-none">
           {{ t.label }}
@@ -123,7 +140,7 @@ import useInventory from "../composables/useInventory";
 import useWorkerTerm from "../composables/useWorkerTerm";
 import useSite from "../composables/useSite";
 import useUtils from "../composables/useUtils";
-import { inventoryStoreLabel, inventorySuppliesText } from "../utils/inventory-store-label";
+import { inventoryManagedBy, inventoryStoreLabel, inventorySuppliesText } from "../utils/inventory-store-label";
 import { inventoryControls } from "../utils/inventory-presets";
 
 const props = defineProps({
@@ -167,8 +184,16 @@ const storeSites = computed(() =>
   })),
 );
 
+// Another organisation's (main) store: the person requests from it and manages nothing there.
+const requestOnly = computed(() => Boolean(store.value && store.value.owner === false));
+const managedBy = computed(() => (store.value ? inventoryManagedBy(store.value) : ""));
+
 const subtitle = computed(() => {
   if (!store.value) return "";
+  if (store.value.main && store.value.owner === false) {
+    // "Main store · managed by Management Pte Ltd (Property management)"
+    return managedBy.value ? `Main store · ${managedBy.value.replace(/^Managed/, "managed")}` : "Main store";
+  }
   if (storeSites.value.length > 1) {
     const supplies = inventorySuppliesText(storeSites.value.map((s) => s.name));
     return stores.value.length > 1 ? `${inventoryStoreLabel(store.value, stores.value)} · ${supplies}` : supplies;

package/components/InventoryMyStockTab.vue

@@ -6,6 +6,22 @@
       <v-btn v-if="ctl.request" class="text-none screen-btn-primary" variant="flat" prepend-icon="mdi-cart-arrow-down" @click="showRequest = true">Request Stock</v-btn>
     </div>
 
+    <!-- Give to colleague: what waits for me to confirm, and what I gave that waits for them. -->
+    <AppCard v-for="h in toConfirm" :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-hand-coin-outline" color="warning" />
+      <div class="flex-grow-1">
+        <div class="font-weight-medium">{{ h.fromLabel || h.fromName }} is giving you {{ h.qty }} {{ h.unit }} {{ h.itemName }}</div>
+        <div class="text-caption text-medium-emphasis">{{ standardFormatDate(h.createdAt) }}{{ h.note ? ` · ${h.note}` : "" }} · Confirm once you have it in hand.</div>
+      </div>
+      <v-btn class="text-none screen-btn-ghost" variant="outlined" size="small" :loading="acting === h._id + 'd'" @click="decide(h, false)">Decline</v-btn>
+      <v-btn class="text-none screen-btn-primary" variant="flat" size="small" :loading="acting === h._id + 'a'" @click="decide(h, true)">I received it</v-btn>
+    </AppCard>
+    <AppCard v-for="h in waiting" :key="h._id" class="pa-3 mb-3 d-flex flex-wrap align-center ga-3">
+      <v-icon icon="mdi-timer-sand" color="medium-emphasis" />
+      <div class="flex-grow-1 text-body-2">Waiting for {{ h.toName }} to confirm {{ h.qty }} {{ h.unit }} {{ h.itemName }}.</div>
+      <v-btn class="text-none" variant="text" size="small" :loading="acting === h._id + 'c'" @click="cancelHandover(h)">Cancel</v-btn>
+    </AppCard>
+
     <v-progress-linear v-if="loading" indeterminate color="primary" />
     <AppCard v-else-if="!holdings.length" class="pa-6 text-center">
       <div class="text-body-1 mb-1">You are not holding any stock.</div>
@@ -23,7 +39,10 @@
             <div class="font-weight-medium">{{ h.itemName }}</div>
             <div class="text-body-2">{{ h.qty }} {{ h.unit }} left · {{ h.usedThisMonth ?? 0 }} used this month</div>
           </div>
-          <v-btn v-if="h.qty > 0 && ctl.recordUsage" class="text-none screen-btn-primary" variant="flat" size="small" @click="use(h)">Record usage</v-btn>
+          <div class="d-flex flex-column ga-1">
+            <v-btn v-if="h.qty > 0 && ctl.recordUsage" class="text-none screen-btn-primary" variant="flat" size="small" @click="use(h)">Record usage</v-btn>
+            <v-btn v-if="h.qty > 0" class="text-none screen-btn-ghost" variant="outlined" size="small" @click="openGive(h)">Give to colleague</v-btn>
+          </div>
         </AppCard>
       </v-col>
     </v-row>
@@ -44,10 +63,10 @@
         <tr v-for="t in activity" :key="t._id">
           <td class="text-no-wrap">{{ standardFormatDate(t.date) }}</td>
           <td>{{ t.itemName }}</td>
-          <td>{{ t.type === "issue" ? "Taken from store" : t.type === "return" ? "Given back to store" : typeLabels[t.type] }}</td>
+          <td>{{ activityText(t) }}</td>
           <td class="text-right">{{ t.qty }}</td>
           <td class="text-caption">
-            {{ [t.location?.type === "tenant_unit" ? `${t.location.unitName} ${t.location.tenantName || ""}` : t.location?.area, t.reference].filter(Boolean).join(" · ") }}
+            {{ [t.location?.type === "tenant_unit" ? `${t.location.unitName} ${t.location.tenantName || ""}` : t.location?.area, t.type === "handover" ? t.remarks : t.reference].filter(Boolean).join(" · ") }}
           </td>
           <td class="text-right">{{ t.holderBalance }}</td>
         </tr>
@@ -58,6 +77,54 @@
     </v-table>
 
     <InventoryUsageDialog v-model="usage.show" :store="store" :site-id="siteId" :holding="usage.holding" :sites="sites" @done="changed" />
+    <v-dialog v-model="give.show" max-width="520" persistent>
+      <v-card class="screen-modal">
+        <v-card-title class="d-flex align-center">
+          Give to colleague
+          <v-spacer />
+          <v-btn icon="mdi-close" variant="text" class="screen-modal__close" aria-label="Close" @click="give.show = false" />
+        </v-card-title>
+        <v-card-text class="screen-modal__body">
+          <p class="text-body-2 text-medium-emphasis mb-3">
+            {{ give.holding?.itemName }}: you hold {{ give.holding?.qty }} {{ give.holding?.unit }}. It moves to your colleague once they confirm they received it.
+          </p>
+          <v-form ref="giveForm">
+            <InputLabel title="Colleague" required class="mb-1" />
+            <v-autocomplete
+              v-model="give.to"
+              :items="colleagues"
+              :item-title="(p: any) => p.label || p.name"
+              item-value="_id"
+              :loading="colleaguesLoading"
+              placeholder="Search a name"
+              density="comfortable"
+              no-filter
+              :rules="[(v: string) => !!v || 'Choose who you are giving it to']"
+              @update:search="searchColleagues"
+            />
+            <InputLabel title="Quantity" required class="mb-1" />
+            <v-text-field
+              v-model.number="give.qty"
+              type="number"
+              min="1"
+              density="comfortable"
+              :suffix="give.holding?.unit"
+              :rules="[giveQtyRule]"
+              hint="Counted in the unit the store issues it in."
+              persistent-hint
+            />
+            <InputLabel title="Note (optional)" class="mb-1 mt-2" />
+            <v-text-field v-model="give.note" density="comfortable" maxlength="500" placeholder="e.g. for the lift lobby job" />
+            <InputLabel title="Photo (optional)" class="mb-1" />
+            <InventoryPhotoInput v-model="give.photos" :max="1" />
+          </v-form>
+        </v-card-text>
+        <div class="screen-modal__footer">
+          <v-btn class="screen-btn-ghost" variant="outlined" :disabled="give.saving" @click="give.show = false">Cancel</v-btn>
+          <v-btn class="screen-btn-primary" variant="flat" :loading="give.saving" @click="submitGive">Give</v-btn>
+        </div>
+      </v-card>
+    </v-dialog>
     <InventoryLinesDialog v-model="showRequest" mode="request" :store="store" :site-id="siteId" @done="changed" />
   </div>
 </template>
@@ -88,6 +155,100 @@ const activity = ref<TInventoryTransaction[]>([]);
 const loading = ref(false);
 const showRequest = ref(false);
 const usage = reactive({ show: false, holding: null as TInventoryHolding | null });
+const notify = inject<(text: string, color?: string) => void>("inventoryNotify", () => {});
+
+const handovers = ref<TInventoryHandover[]>([]);
+const me = computed(() => String(currentUser.value?._id ?? ""));
+const toConfirm = computed(() => handovers.value.filter((h) => h.status === "pending" && String(h.to) === me.value));
+const waiting = computed(() => handovers.value.filter((h) => h.status === "pending" && String(h.from) === me.value));
+const acting = ref("");
+
+function activityText(t: TInventoryTransaction) {
+  if (t.type === "issue") return "Taken from store";
+  if (t.type === "return") return "Given back to store";
+  if (t.type === "handover") return (t.holderChange ?? 0) < 0 ? "Given to colleague" : "Received from colleague";
+  return typeLabels[t.type];
+}
+
+async function loadHandovers() {
+  try {
+    handovers.value = (await api.getHandovers(props.store._id, { mine: true, status: "pending", limit: 50 })).items;
+  } catch {
+    handovers.value = [];
+  }
+}
+
+async function decide(h: TInventoryHandover, accept: boolean) {
+  acting.value = h._id + (accept ? "a" : "d");
+  try {
+    if (accept) await api.acceptHandover(h._id);
+    else await api.declineHandover(h._id, "");
+    notify(accept ? `You received ${h.qty} ${h.unit} ${h.itemName} from ${h.fromName}.` : `Declined. The ${h.itemName} stays with ${h.fromName}.`);
+    changed();
+  } catch (error: any) {
+    notify(error?.data?.message || "Could not update the hand-over.", "error");
+  } finally {
+    acting.value = "";
+  }
+}
+
+async function cancelHandover(h: TInventoryHandover) {
+  acting.value = h._id + "c";
+  try {
+    await api.cancelHandover(h._id);
+    notify("Hand-over cancelled.");
+    changed();
+  } catch (error: any) {
+    notify(error?.data?.message || "Could not cancel.", "error");
+  } finally {
+    acting.value = "";
+  }
+}
+
+const giveForm = ref();
+const give = reactive({ show: false, holding: null as TInventoryHolding | null, to: "", qty: 1 as number | null, note: "", photos: [] as string[], saving: false });
+const pendingOf = (item: string) => waiting.value.filter((h) => String(h.item) === item).reduce((s, h) => s + h.qty, 0);
+const giveQtyRule = (v: number | null) => {
+  if (!v || v < 1 || !Number.isInteger(Number(v))) return "Enter a whole number";
+  const free = (give.holding?.qty ?? 0) - pendingOf(String(give.holding?.item ?? ""));
+  return Number(v) <= free || `You can give up to ${Math.max(0, free)}`;
+};
+const colleagues = ref<{ _id: string; name: string; label?: string }[]>([]);
+const colleaguesLoading = ref(false);
+let searchTimer: ReturnType<typeof setTimeout> | undefined;
+function searchColleagues(q: string) {
+  clearTimeout(searchTimer);
+  searchTimer = setTimeout(async () => {
+    colleaguesLoading.value = true;
+    try {
+      colleagues.value = await api.getColleagues(props.store._id, q || "");
+    } catch {
+      colleagues.value = [];
+    } finally {
+      colleaguesLoading.value = false;
+    }
+  }, 300);
+}
+function openGive(h: TInventoryHolding) {
+  Object.assign(give, { show: true, holding: h, to: "", qty: 1, note: "", photos: [], saving: false });
+  searchColleagues("");
+}
+async function submitGive() {
+  const { valid } = await giveForm.value.validate();
+  if (!valid || !give.holding) return;
+  give.saving = true;
+  try {
+    await api.createHandover(props.store._id, { site: props.siteId, item: String(give.holding.item), to: give.to, qty: Number(give.qty), note: give.note, photos: give.photos });
+    const name = colleagues.value.find((c) => c._id === give.to)?.name ?? "your colleague";
+    notify(`Waiting for ${name} to confirm.`);
+    give.show = false;
+    changed();
+  } catch (error: any) {
+    notify(error?.data?.message || "Could not give it.", "error");
+  } finally {
+    give.saving = false;
+  }
+}
 
 async function load() {
   loading.value = true;
@@ -108,9 +269,10 @@ function use(h: TInventoryHolding) {
 
 function changed() {
   load();
+  loadHandovers();
   emit("changed");
 }
 
-watch(() => props.store._id, load);
-onMounted(load);
+watch(() => props.store._id, () => (load(), loadHandovers()));
+onMounted(() => (load(), loadHandovers()));
 </script>

package/components/InventoryReportsTab.vue

@@ -6,6 +6,7 @@
         <v-btn value="usage" class="text-none">Usage</v-btn>
         <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 value="handovers" class="text-none">Hand-overs</v-btn>
       </v-btn-toggle>
       <v-select
         v-if="report === 'purchases'"
@@ -41,6 +42,24 @@
         hide-details
         style="max-width: 260px"
       />
+      <v-select
+        v-if="store.ownerType === 'property'"
+        v-model="usedBy"
+        :items="USED_BY_FILTERS"
+        label="Used by"
+        density="compact"
+        hide-details
+        style="max-width: 220px"
+      />
+      <v-select
+        v-if="serviceChoices.length > 1"
+        v-model="serviceFilter"
+        :items="[{ value: '', title: 'All companies' }, ...serviceChoices]"
+        label="Company / service"
+        density="compact"
+        hide-details
+        style="max-width: 260px"
+      />
       <v-checkbox v-if="report === 'usage'" v-model="uncheckedOnly" label="Not checked yet" density="compact" hide-details class="flex-grow-0" />
       <v-spacer />
       <v-btn v-if="ctl.fullReports" class="text-none screen-btn-ghost" variant="outlined" prepend-icon="mdi-file-excel-outline" :loading="exporting" @click="exportExcel">
@@ -99,7 +118,7 @@
     <v-data-table
       v-model="selected"
       :headers="tableHeaders"
-      :items="rows"
+      :items="shownRows"
       :loading="loading"
       :show-select="report === 'usage' && canCheck"
       item-value="_id"
@@ -109,6 +128,11 @@
       no-data-text="Nothing recorded in this period."
     >
       <template #item.date="{ value }">{{ standardFormatDate(value) }}</template>
+      <template #item.createdAt="{ value }">{{ standardFormatDate(value) }}</template>
+      <template #item.decidedAt="{ value }">{{ value ? standardFormatDate(value) : "—" }}</template>
+      <template #item.status="{ value }">
+        <v-chip size="x-small" variant="tonal" :color="value === 'accepted' ? 'success' : value === 'pending' ? 'warning' : undefined">{{ handoverStatus[value] ?? value }}</v-chip>
+      </template>
       <template #item.locationType="{ value }">{{ value === "tenant_unit" ? "Tenant unit" : "Common area" }}</template>
       <template #item.unitCost="{ value }">{{ money(value) }}</template>
       <template #item.totalCost="{ value }">{{ money(value) }}</template>
@@ -144,6 +168,7 @@ import useWorkerTerm, { workerAppKey } from "../composables/useWorkerTerm";
 import useUtils from "../composables/useUtils";
 import useFile from "../composables/useFile";
 import { inventoryControls } from "../utils/inventory-presets";
+import { USED_BY_FILTERS } from "../utils/inventory-used-by";
 
 const props = defineProps({
   store: { type: Object as PropType<TInventoryStore>, required: true },
@@ -166,11 +191,12 @@ 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">(ctl.value.fullReports ? "movement" : "usage");
+const report = ref<"movement" | "usage" | "technicians" | "purchases" | "handovers">(ctl.value.fullReports ? "movement" : "usage");
 const span = ref<"month" | "year">("year");
 const site = ref("");
 const locationType = ref("");
 const uncheckedOnly = ref(false);
+const usedBy = ref("");
 const rows = ref<any[]>([]);
 const selected = ref<string[]>([]);
 const purchases = reactive({ byMonth: [] as { month: string; deliveries: number; totalCost: number }[], bySupplier: [] as { supplier: string; deliveries: number; totalCost: number }[] });
@@ -191,8 +217,19 @@ const help: Record<string, string> = {
   usage: "Every recorded usage: where it was used, for which tenant, by whom, and the cost. Use this for tenant billing. Tick records and mark them checked once verified.",
   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, and opening stock entered with new items (Type: Opening stock), with totals by month and by supplier.",
+  handovers: "Stock passed from one person to a colleague: who gave it, who received it, and whether they confirmed.",
 };
 
+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).
+const companyOf = (r: any) => [r.holderCompany ?? r.fromCompany, r.holderServiceLabel ?? r.fromServiceLabel].filter(Boolean).join(" · ");
+const serviceFilter = ref("");
+const serviceChoices = computed(() =>
+  [...new Set(rows.value.map(companyOf).filter(Boolean))].sort().map((v) => ({ value: v, title: v })),
+);
+const shownRows = computed(() => (serviceFilter.value ? rows.value.filter((r) => companyOf(r) === serviceFilter.value || [r.toCompany, r.toServiceLabel].filter(Boolean).join(" · ") === serviceFilter.value) : rows.value));
+
 const headers: Record<string, any[]> = {
   movement: [
     { title: "Item", key: "name" },
@@ -219,6 +256,8 @@ const headers: Record<string, any[]> = {
     { title: "Unit price", key: "unitCost" },
     { title: "Total", key: "totalCost" },
     { title: worker.one, key: "technician" },
+    { title: "Company", key: "holderCompany" },
+    { title: "Service", key: "holderServiceLabel" },
     { title: "Photos", key: "photos", sortable: false },
     { title: "Reference", key: "reference" },
     { title: "Reported by", key: "reportedBy" },
@@ -226,15 +265,30 @@ const headers: Record<string, any[]> = {
   ],
   technicians: [
     { title: "Name", key: "technician" },
+    { title: "Company", key: "holderCompany" },
+    { title: "Service", key: "holderServiceLabel" },
     { title: "Item", key: "itemName" },
     { title: "Unit", key: "unit" },
     { title: "Holding at start", key: "opening" },
     { title: "Taken", key: "taken" },
+    { title: "From colleagues", key: "gotFromColleagues" },
     { title: "Used", key: "used" },
     { title: "Returned", key: "returned" },
+    { title: "To colleagues", key: "gaveToColleagues" },
     { title: "Holding at end", key: "closing" },
     { title: "In hand now", key: "inHandNow" },
   ],
+  handovers: [
+    { title: "Date", key: "createdAt" },
+    { title: "Item", key: "itemName" },
+    { title: "Qty", key: "qty" },
+    { title: "Unit", key: "unit" },
+    { title: "Given by", key: "fromLabel" },
+    { title: "Given to", key: "toLabel" },
+    { title: "Status", key: "status" },
+    { title: "Confirmed / declined", key: "decidedAt" },
+    { title: "Note", key: "note" },
+  ],
   purchases: [
     { title: "Date", key: "date" },
     { title: "Type", key: "kind" },
@@ -271,6 +325,7 @@ function period(): TInventoryPeriod & { unchecked?: boolean } {
     ...((report.value === "usage" || report.value === "movement") && 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 } : {}),
   };
 }
 
@@ -319,6 +374,7 @@ async function exportExcel() {
   }
 }
 
-watch([report, month, span, site, locationType, uncheckedOnly, () => props.store._id], load);
+watch([report, month, span, site, locationType, uncheckedOnly, usedBy, () => props.store._id], load);
+watch(report, () => (serviceFilter.value = ""));
 onMounted(load);
 </script>

package/components/InventoryRequestsTab.vue

@@ -20,7 +20,7 @@
 
     <AppCard v-for="r in requests" :key="r._id" class="pa-4 mb-3">
       <div class="d-flex flex-wrap align-center ga-2 mb-2">
-        <div class="font-weight-medium">{{ r.requestedByName || "Someone" }}</div>
+        <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>
         <!-- One store can supply several properties: say which one this request is for. -->
@@ -47,7 +47,7 @@
     <v-dialog v-model="decision.show" max-width="620" persistent scrollable>
       <v-card v-if="decision.request" class="screen-modal">
         <v-card-title class="d-flex align-center">
-          Request from {{ decision.request.requestedByName }}
+          Request from {{ decision.request.requestedByLabel || decision.request.requestedByName }}
           <v-spacer />
           <v-btn icon="mdi-close" variant="text" class="screen-modal__close" aria-label="Close" @click="decision.show = false" />
         </v-card-title>

package/components/InventoryStockTab.vue

@@ -35,7 +35,25 @@
           <v-list-item v-if="legacyToCopy" prepend-icon="mdi-content-copy" title="Copy from old Equipment list" @click="showLegacy = true" />
         </v-list>
       </v-menu>
+      <v-btn
+        v-if="usedByOwner && selected.length"
+        class="text-none screen-btn-ghost"
+        variant="outlined"
+        prepend-icon="mdi-account-group-outline"
+        @click="openBulk"
+      >
+        Set "Used by" for {{ selected.length }} item{{ selected.length === 1 ? "" : "s" }}
+      </v-btn>
       <v-spacer />
+      <v-select
+        v-if="usedByOwner"
+        v-model="usedByFilter"
+        :items="USED_BY_FILTERS"
+        label="Used by"
+        density="compact"
+        hide-details
+        style="min-width: 200px; max-width: 240px"
+      />
       <v-checkbox v-model="lowOnly" label="Low stock only" density="compact" hide-details class="flex-grow-0" />
       <v-text-field
         v-model="search"
@@ -56,6 +74,8 @@
       v-model:page="page"
       :pages="pages"
       :page-range="pageRange"
+      :show-select="usedByOwner"
+      v-model:selected="selected"
       @refresh="load"
       @row-click="(row: any) => openItem(row.item)"
     >
@@ -68,6 +88,9 @@
           <div>
             <div class="font-weight-medium">{{ item.name }}</div>
             <div class="text-caption text-medium-emphasis">{{ inventoryItemMeta(item) }}</div>
+            <div v-if="isMain && usedByChips(item.usedBy).length" class="d-flex flex-wrap ga-1 mt-1">
+              <v-chip v-for="c in usedByChips(item.usedBy)" :key="c" size="x-small" variant="tonal" color="primary">{{ c }}</v-chip>
+            </div>
           </div>
         </div>
       </template>
@@ -78,6 +101,7 @@
         <v-chip v-if="item.status === 'inactive'" size="x-small" variant="tonal" class="ml-2">Not in use</v-chip>
       </template>
       <template #item.reorderLevel="{ value }">{{ value || "—" }}</template>
+      <template #item.usedBy="{ item }">{{ usedByText(item.usedBy) }}</template>
       <template #item.unitCost="{ value }">{{ value !== undefined ? money(value) : "—" }}</template>
       <template #no-data>
         <div class="py-8 text-center">
@@ -94,6 +118,29 @@
     <InventoryImportDialog v-model="showImport" :store="store" @done="done" />
     <InventoryImportDialog v-model="showReceiveImport" :store="store" kind="receipts" @done="done" />
     <InventoryLegacyImportDialog v-model="showLegacy" :store="store" @done="done" />
+    <v-dialog v-model="bulk.show" max-width="480">
+      <v-card class="screen-modal">
+        <v-card-title>Set "Used by"</v-card-title>
+        <v-card-text class="screen-modal__body">
+          <p class="text-body-2 mb-3">For the {{ selected.length }} selected item{{ selected.length === 1 ? "" : "s" }}.</p>
+          <v-select
+            :model-value="bulk.usedBy"
+            :items="usedByItems"
+            multiple
+            chips
+            closable-chips
+            density="comfortable"
+            :hint="USED_BY_HINT"
+            persistent-hint
+            @update:model-value="(v: string[]) => (bulk.usedBy = nextUsedBy(bulk.usedBy, v))"
+          />
+        </v-card-text>
+        <div class="screen-modal__footer">
+          <v-btn class="screen-btn-ghost" variant="outlined" :disabled="bulk.saving" @click="bulk.show = false">Cancel</v-btn>
+          <v-btn class="screen-btn-primary" variant="flat" :loading="bulk.saving" @click="saveBulk">Save</v-btn>
+        </div>
+      </v-card>
+    </v-dialog>
     <InventoryItemDetail v-model="detail.show" :store="store" :item="detail.item" @edit="editItem" @done="done" />
   </div>
 </template>
@@ -105,6 +152,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 { 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({
   store: { type: Object as PropType<TInventoryStore>, required: true },
@@ -114,7 +162,34 @@ const props = defineProps({
 const ctl = computed(() => inventoryControls(props.store.access));
 const emit = defineEmits(["changed"]);
 
-const { getItems, getLegacyEquipment } = useInventory();
+const { getItems, getLegacyEquipment, setUsedBy } = useInventory();
+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.
+const isMain = computed(() => props.store.ownerType === "property");
+const usedByOwner = computed(() => isMain.value && props.store.access.canManage);
+const usedByFilter = ref("");
+const selected = ref<string[]>([]);
+const usedByItems = [{ value: USED_BY_ALL, title: USED_BY_ALL_LABEL }, ...USED_BY_OPTIONS];
+const bulk = reactive({ show: false, usedBy: [USED_BY_ALL] as string[], saving: false });
+function openBulk() {
+  Object.assign(bulk, { show: true, usedBy: [USED_BY_ALL], saving: false });
+}
+async function saveBulk() {
+  bulk.saving = true;
+  try {
+    const ids = selected.value.map((s: any) => (typeof s === "string" ? s : s._id));
+    const res = await setUsedBy(props.store._id, ids, bulk.usedBy);
+    notify(`"Used by" set to ${usedByText(bulk.usedBy)} for ${res?.updated ?? ids.length} item(s).`);
+    bulk.show = false;
+    selected.value = [];
+    load();
+  } catch (error: any) {
+    notify(error?.data?.message || "Could not save.", "error");
+  } finally {
+    bulk.saving = false;
+  }
+}
 const { getFileUrl } = useFile();
 const { debounce } = useUtils();
 
@@ -135,6 +210,7 @@ const headers = computed(() => [
   { title: "Item", value: "name" },
   { title: "In store", value: "onHand" },
   { title: "Low stock alert at", value: "reorderLevel" },
+  ...(usedByOwner.value ? [{ title: "Used by", value: "usedBy" }] : []),
   ...(ctl.value.unitPrice ? [{ title: "Unit price", value: "unitCost" }] : []),
 ]);
 
@@ -149,6 +225,7 @@ async function load() {
       search: search.value || "",
       lowStock: lowOnly.value || undefined,
       includeInactive: props.store.access.canManage || undefined,
+      usedBy: (usedByOwner.value && usedByFilter.value) || undefined,
     });
     items.value = res.items;
     pages.value = res.pages;
@@ -199,6 +276,7 @@ function done() {
 
 watch(page, load);
 watch(lowOnly, () => (page.value === 1 ? load() : (page.value = 1)));
+watch(usedByFilter, () => (page.value === 1 ? load() : (page.value = 1)));
 watch(search, debounce(() => (page.value === 1 ? load() : (page.value = 1)), 400));
 watch(() => props.store._id, () => (checkLegacy(), page.value === 1 ? load() : (page.value = 1)));
 onMounted(() => (load(), checkLegacy()));

package/components/InventoryTechniciansTab.vue

@@ -12,6 +12,7 @@
     <AppCard v-for="g in groups" :key="g.holder" class="pa-4 mb-3">
       <div class="d-flex align-center mb-2">
         <div class="font-weight-medium">{{ g.holderName || "Unnamed" }}</div>
+        <div v-if="g.company || g.serviceLabel" class="text-caption text-medium-emphasis">{{ [g.company, g.serviceLabel].filter(Boolean).join(" · ") }}</div>
         <v-spacer />
         <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>
@@ -47,11 +48,11 @@ const search = ref("");
 
 const groups = computed(() => {
   const q = (search.value || "").toLowerCase();
-  const map = new Map<string, { holder: string; holderName: string; items: TInventoryHolding[] }>();
+  const map = new Map<string, { holder: string; holderName: string; company?: string; serviceLabel?: string; items: TInventoryHolding[] }>();
   for (const h of holdings.value) {
     if (q && !h.holderName.toLowerCase().includes(q) && !h.itemName.toLowerCase().includes(q)) continue;
     const key = String(h.holder);
-    if (!map.has(key)) map.set(key, { holder: key, holderName: h.holderName, items: [] });
+    if (!map.has(key)) map.set(key, { holder: key, holderName: h.holderName, company: (h as any).holderCompany, serviceLabel: (h as any).holderServiceLabel, items: [] });
     map.get(key)!.items.push(h);
   }
   return [...map.values()];

package/composables/useInventory.ts

@@ -17,6 +17,7 @@ export default function useInventory() {
     use: "Used",
     return: "Returned",
     adjust: "Stock count",
+    handover: "Hand-over",
   };
 
   return {
@@ -29,10 +30,13 @@ export default function useInventory() {
     updateStore: (id: string, body: Partial<Pick<TInventoryStore, "name" | "sites" | "showInResidentApp" | "showCostInResidentApp">>) =>
       api<TInventoryStore>(`/stores/${id}`, { method: "PATCH", body }),
 
-    getItems: (store: string, query: { page?: number; limit?: number; search?: string; lowStock?: boolean; includeInactive?: boolean }) =>
+    getItems: (store: string, query: { page?: number; limit?: number; search?: string; lowStock?: boolean; includeInactive?: boolean; usedBy?: string }) =>
       api<{ items: TInventoryItem[]; total: number; lowCount: number; page: number; pages: number }>(`/stores/${store}/items`, { query }),
     createItem: (store: string, body: Record<string, any>) => api(`/stores/${store}/items`, { method: "POST", body }),
     updateItem: (id: string, body: Record<string, any>) => api(`/items/${id}`, { method: "PATCH", body }),
+    /** Bulk edit: set "Used by" on several items (store owner). */
+    setUsedBy: (store: string, items: string[], usedBy: string[]) =>
+      api<{ updated: number }>(`/stores/${store}/items/used-by`, { method: "POST", body: { items, usedBy } }),
 
     receive: (store: string, body: Record<string, any>) => api(`/stores/${store}/receive`, { method: "POST", body }),
     count: (store: string, body: { item: string; countedQty: number; reason: string }) =>
@@ -51,15 +55,26 @@ export default function useInventory() {
 
     getHoldings: (store: string, holder: string = "me", includeUsedUp = false) =>
       api<TInventoryHolding[]>(`/stores/${store}/holdings`, { query: { holder, ...(includeUsedUp ? { includeUsedUp: true } : {}) } }),
+    /** Give to colleague. */
+    getHandovers: (store: string, query: { mine?: boolean; status?: string; item?: string; page?: number; limit?: number }) =>
+      api<{ items: TInventoryHandover[]; total: number; waitingForMe: number }>(`/stores/${store}/handovers`, { query }),
+    createHandover: (store: string, body: { site: string; item: string; to: string; qty: number; note?: string; photos?: string[] }) =>
+      api<TInventoryHandover>(`/stores/${store}/handovers`, { method: "POST", body }),
+    acceptHandover: (id: string) => api(`/handovers/${id}/accept`, { method: "POST" }),
+    declineHandover: (id: string, reason = "") => api(`/handovers/${id}/decline`, { method: "POST", body: { reason } }),
+    cancelHandover: (id: string) => api(`/handovers/${id}/cancel`, { method: "POST" }),
+    getColleagues: (store: string, search = "") =>
+      api<{ _id: string; name: string; company?: string; serviceLabel?: string; label?: string }[]>(`/stores/${store}/colleagues`, { query: { search } }),
     getTransactions: (store: string, query: Record<string, any>) =>
       api<{ items: TInventoryTransaction[]; total: number; page: number; pages: number }>(`/stores/${store}/transactions`, { query }),
 
     getUnits: (store: string, site: string, search = "") =>
       api<{ _id: string; name: string; tenantName: string }[]>(`/stores/${store}/units`, { query: { site, search } }),
     getCommonAreas: (store: string, site: string) => api<string[]>(`/stores/${store}/common-areas`, { query: { site } }),
-    getPeople: (store: string, search = "") => api<{ _id: string; name: string; orgName: string }[]>(`/stores/${store}/people`, { query: { search } }),
+    getPeople: (store: string, search = "") =>
+      api<{ _id: string; name: string; orgName: string; email?: string; company?: string; service?: string; serviceLabel?: string; label?: string }[]>(`/stores/${store}/people`, { query: { search } }),
 
-    getReport: (store: string, report: "movement" | "usage" | "technicians" | "purchases", query: TInventoryPeriod & { unchecked?: boolean }) =>
+    getReport: (store: string, report: "movement" | "usage" | "technicians" | "purchases" | "handovers", query: TInventoryPeriod & { unchecked?: boolean }) =>
       api<{ rows: any[]; totalQty?: number; totalCost?: number }>(`/stores/${store}/reports/${report}`, { query }),
     exportReport: (store: string, report: string, query: TInventoryPeriod & { appSlug?: string }) =>
       api<Blob>(`/stores/${store}/reports/${report}/export`, { query, responseType: "blob" }),

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.71.1",
+  "version": "4.72.0",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "//files": "What a consumer extending this layer actually loads. Without this npm ships the whole working tree - the changesets, the CI workflows, the render harness in tools/ and any scratch directory that happened to exist at publish time. Nuxt resolves a layer by directory, so every runtime directory below has to stay listed; adding a new top-level runtime directory means adding it here too.",

package/types/inventory.d.ts

@@ -23,6 +23,13 @@ declare type TInventoryStore = {
   showInResidentApp: boolean;
   showCostInResidentApp: boolean;
   access: TInventoryAccess;
+  /** The property manager's store: the site's main store, which providers request from. */
+  main?: boolean;
+  /** The caller belongs to the organisation that owns (manages) this store. */
+  owner?: boolean;
+  ownerService?: string | null;
+  /** "Property management", "M&E", ... */
+  ownerServiceLabel?: string;
 };
 
 declare type TInventoryItem = {
@@ -40,6 +47,8 @@ declare type TInventoryItem = {
   onHand: number;
   status: "active" | "inactive";
   lowStock: boolean;
+  /** Main store: which service providers see and may request it (["all"] or service keys). */
+  usedBy?: string[];
 };
 
 declare type TInventoryLine = { item: string; qty: number };
@@ -80,7 +89,7 @@ declare type TInventoryTransaction = {
   item: string;
   itemName: string;
   unit: string;
-  type: "opening" | "receive" | "issue" | "use" | "return" | "adjust";
+  type: "opening" | "receive" | "issue" | "use" | "return" | "adjust" | "handover";
   qty: number;
   storeChange: number;
   storeBalance: number;
@@ -102,7 +111,7 @@ declare type TInventoryTransaction = {
   createdByName: string;
 };
 
-declare type TInventoryPeriod = { from: string; to: string; site?: string; locationType?: string };
+declare type TInventoryPeriod = { from: string; to: string; site?: string; locationType?: string; usedBy?: string };
 
 /** An organisation's supplier (shared by its stores). Only the name is required. */
 declare type TInventorySupplier = {
@@ -116,3 +125,26 @@ declare type TInventorySupplier = {
   notes: string;
   status: "active" | "inactive";
 };
+
+/** Give to colleague: stock in hand passed to a colleague, pending until they confirm. */
+declare type TInventoryHandover = {
+  _id: string;
+  store: string;
+  site: string;
+  item: string;
+  itemName: string;
+  unit: string;
+  qty: number;
+  from: string;
+  fromName: string;
+  fromLabel?: string;
+  to: string;
+  toName: string;
+  toLabel?: string;
+  note: string;
+  photos: string[];
+  status: "pending" | "accepted" | "declined" | "cancelled";
+  declineReason?: string;
+  createdAt: string;
+  decidedAt?: string;
+};

package/utils/inventory-store-label.ts

@@ -4,7 +4,7 @@
  * same kind (e.g. staff of several organisations at one property), each one
  * also names its organisation so the buttons can be told apart.
  */
-type TStoreLike = { ownerType: string; orgName?: string };
+type TStoreLike = { ownerType: string; orgName?: string; main?: boolean; owner?: boolean; ownerServiceLabel?: string };
 
 /** "Supplies Winsland House I and Winsland House II" for a store that supplies several sites. */
 export function inventorySuppliesText(names: string[]) {
@@ -14,11 +14,24 @@ export function inventorySuppliesText(names: string[]) {
 }
 
 export function inventoryStoreLabel(store: TStoreLike, all: TStoreLike[]) {
+  // Owner rule 2026-09-29: the property manager's store is the site's MAIN store,
+  // named with who runs it; a provider's own store is "Our store".
+  if (store.main !== undefined) {
+    if (store.main) return store.orgName ? `Main store · ${store.orgName}` : "Main store";
+    const own = all.filter((s) => !s.main).length;
+    return own > 1 && store.orgName ? `Our store · ${store.orgName}` : "Our store";
+  }
   const kind = store.ownerType === "property" ? "Property store" : "Our store";
   const sameKind = all.filter((s) => s.ownerType === store.ownerType).length;
   return sameKind > 1 && store.orgName ? `${kind} · ${store.orgName}` : kind;
 }
 
+/** "Managed by Management Pte Ltd (Property management)" — who runs the store. */
+export function inventoryManagedBy(store: TStoreLike) {
+  if (!store.orgName) return "";
+  return store.ownerServiceLabel ? `Managed by ${store.orgName} (${store.ownerServiceLabel})` : `Managed by ${store.orgName}`;
+}
+
 /**
  * The properties a store can be set to supply, by name. The organisation's own
  * site list does not always contain the store's current property (a manager

package/utils/inventory-used-by.ts

@@ -0,0 +1,57 @@
+/**
+ * "Used by" (owner 2026-09-29): which service providers see and may request an
+ * item from the main store. Mirrors API-core `utils/inventory-used-by.ts`.
+ * Browser-safe, no Node globals.
+ */
+export const USED_BY_ALL = "all";
+export const USED_BY_ALL_LABEL = "All service providers";
+
+export const USED_BY_OPTIONS = [
+  { value: "cleaning", title: "Cleaning" },
+  { value: "security", title: "Security" },
+  { value: "mne", title: "M&E" },
+  { value: "pest", title: "Pest control" },
+  { value: "pool", title: "Pool" },
+  { value: "landscape", title: "Landscape" },
+];
+
+export const USED_BY_HINT = "Choose who can see and request this item. Leave as All if everyone uses it.";
+
+/** Stored/sent value, cleaned: missing, empty or containing "all" means all. */
+export function normaliseUsedBy(value?: readonly string[] | null): string[] {
+  const list = (value ?? []).map(String);
+  if (!list.length || list.includes(USED_BY_ALL)) return [USED_BY_ALL];
+  const keys = USED_BY_OPTIONS.map((o) => o.value).filter((k) => list.includes(k));
+  return keys.length ? keys : [USED_BY_ALL];
+}
+
+/** Chips for one item: nothing for "all" (the usual case says nothing), else one word per service. */
+export function usedByChips(value?: readonly string[] | null): string[] {
+  const keys = normaliseUsedBy(value);
+  if (keys[0] === USED_BY_ALL) return [];
+  return keys.map((k) => USED_BY_OPTIONS.find((o) => o.value === k)!.title);
+}
+
+/** "All service providers" / "Cleaning, M&E" — for a table cell or a sentence. */
+export function usedByText(value?: readonly string[] | null) {
+  const chips = usedByChips(value);
+  return chips.length ? chips.join(", ") : USED_BY_ALL_LABEL;
+}
+
+/**
+ * The multi-select's model <-> the stored value. Picking a service clears
+ * "All"; picking "All" clears the services; clearing everything means All.
+ */
+export function nextUsedBy(previous: readonly string[], picked: readonly string[]): string[] {
+  const added = picked.filter((p) => !previous.includes(p));
+  if (added.includes(USED_BY_ALL) || !picked.length) return [USED_BY_ALL];
+  const services = picked.filter((p) => p !== USED_BY_ALL);
+  return services.length ? services : [USED_BY_ALL];
+}
+
+/** Filter choices for the owner's stock list and reports. */
+export const USED_BY_FILTERS = [
+  { value: "", title: "Everyone's items" },
+  { value: USED_BY_ALL, title: "For all providers only" },
+  ...USED_BY_OPTIONS.map((o) => ({ value: o.value, title: `Offered to ${o.title}` })),
+];