Revert "Merge pull request 'Dev' (#58) from Dev into production"

This reverts commit 821e96e011, reversing
changes made to 0ff39e9e58.

Frontend/erp-system/app/dashboard/procurement/purchase-invoices/new/page.tsx

@@ -112,17 +112,6 @@ function NewPurchaseInvoiceContent() {
     [vendors]
   )
 
-  // Deep-linked from a GRN detail page's "Create Purchase Invoice" prompt — that GRN is the
-  // whole reason this page was opened, so show only it rather than the vendor's full eligible
-  // list (which could pull in unrelated GRNs the user never meant to consolidate here).
-  // Declared before toggleAll, which reads it: referencing it ahead of its declaration stopped
-  // the React Compiler from preserving this memo (react-hooks/preserve-manual-memoization).
-  const deepLinkedGrnId = grnIdFromQuery ? Number(grnIdFromQuery) : null
-  const visibleGrns = useMemo(
-    () => (deepLinkedGrnId === null ? (eligibleGrns ?? []) : (eligibleGrns ?? []).filter((g) => g.grnId === deepLinkedGrnId)),
-    [eligibleGrns, deepLinkedGrnId]
-  )
-
   function toggleGrn(grnId: number, checked: boolean) {
     setSelectedGrnIds((prev) => {
       const next = new Set(prev)
@@ -136,6 +125,15 @@ function NewPurchaseInvoiceContent() {
     setSelectedGrnIds(checked ? new Set(visibleGrns.map((g) => g.grnId)) : new Set())
   }
 
+  // Deep-linked from a GRN detail page's "Create Purchase Invoice" prompt — that GRN is the
+  // whole reason this page was opened, so show only it rather than the vendor's full eligible
+  // list (which could pull in unrelated GRNs the user never meant to consolidate here).
+  const deepLinkedGrnId = grnIdFromQuery ? Number(grnIdFromQuery) : null
+  const visibleGrns = useMemo(
+    () => (deepLinkedGrnId === null ? (eligibleGrns ?? []) : (eligibleGrns ?? []).filter((g) => g.grnId === deepLinkedGrnId)),
+    [eligibleGrns, deepLinkedGrnId]
+  )
+
   const selectedGrns = useMemo(
     () => (eligibleGrns ?? []).filter((g) => selectedGrnIds.has(g.grnId)),
     [eligibleGrns, selectedGrnIds]

Frontend/erp-system/app/dashboard/sales/day-end/page.tsx

@@ -88,7 +88,7 @@ export default function SalesDayEndPage() {
         <div>
           <h1 className="text-2xl font-bold text-foreground">Day End</h1>
           <p className="text-base text-muted-foreground">
-            Close a cashier&apos;s business day — locks their posted sales slips and bundle sales, and posts one consolidated journal entry to the ledger.
+            Close a cashier's business day — locks their posted sales slips and bundle sales, and posts one consolidated journal entry to the ledger.
           </p>
         </div>
       </div>

Frontend/erp-system/app/dashboard/settings/invoice-template/page.tsx

@@ -149,14 +149,14 @@ export default function InvoiceTemplatePage() {
                 <Switch checked={showBankDetails} onCheckedChange={setShowBankDetails} className="mt-1 shrink-0" aria-label="Show bank details" />
                 <div className="flex flex-col gap-1">
                   <span className="text-base font-medium text-foreground">Show bank details</span>
-                  <span className="text-sm text-muted-foreground">Prints the company&apos;s bank name, account and SWIFT code on invoices.</span>
+                  <span className="text-sm text-muted-foreground">Prints the company's bank name, account and SWIFT code on invoices.</span>
                 </div>
               </div>
               <div className="flex items-start gap-4 py-4">
                 <Switch checked={showTaxRegNo} onCheckedChange={setShowTaxRegNo} className="mt-1 shrink-0" aria-label="Show tax registration no." />
                 <div className="flex flex-col gap-1">
                   <span className="text-base font-medium text-foreground">Show tax registration no.</span>
-                  <span className="text-sm text-muted-foreground">Prints the company&apos;s tax registration number in the invoice header.</span>
+                  <span className="text-sm text-muted-foreground">Prints the company's tax registration number in the invoice header.</span>
                 </div>
               </div>
             </div>