diff --git a/app/accounting/gl_entries.php b/app/accounting/gl_entries.php
index 9e7d7ca..c970b77 100644
--- a/app/accounting/gl_entries.php
+++ b/app/accounting/gl_entries.php
@@ -262,7 +262,7 @@
           '<td>' + escape_html(r.doc_number) + '</td>' +
           '<td>' + escape_html(r.contact_name || '—') + '</td>' +
           '<td class="text-end">' + format_number(r.grand_total, 2) + '</td>' +
-          '<td>' + escape_html(r.doc_date || '—') + '</td>' +
+          '<td>' + escape_html(format_date(r.doc_date)) + '</td>' +
           '<td>' + mapping_badge + '</td>' +
           '<td>' + status_badge + '</td>' +
           '</tr>';
diff --git a/app/accounting/gl_movement.php b/app/accounting/gl_movement.php
index b51be2d..ae8a269 100644
--- a/app/accounting/gl_movement.php
+++ b/app/accounting/gl_movement.php
@@ -198,7 +198,7 @@
           export_data.push({ date:r.entry_date||'', period:r.period||'', department:r.dept_code||'', reference:r.reference||'', description:r.line_description||r.gl_description||'', debit:dr||'', credit:cr||'', balance:running });
           var bal_color = running >= 0 ? '' : 'text-danger';
           html += '<tr>' +
-            '<td class="small">' + escape_html(r.entry_date || '—') + '</td>' +
+            '<td class="small">' + escape_html(format_date(r.entry_date)) + '</td>' +
             '<td class="small">' + escape_html(r.period) + '</td>' +
             '<td class="small">' + (r.dept_code ? escape_html(r.dept_code) : '<span class="text-muted">—</span>') + '</td>' +
             '<td class="small">' + escape_html(r.reference || '—') + '</td>' +
diff --git a/app/accounting/journal_listing.php b/app/accounting/journal_listing.php
index 224a59b..efed99a 100644
--- a/app/accounting/journal_listing.php
+++ b/app/accounting/journal_listing.php
@@ -281,7 +281,7 @@
         '<td class="text-muted small">' + escape_html(r.formula_name || '—') + '</td>' +
         '<td class="text-end">' + format_number(r.total_debit, 2) + '</td>' +
         '<td class="text-end">' + format_number(r.total_credit, 2) + '</td>' +
-        '<td class="text-muted small">' + escape_html(r.posted_at) + '</td>' +
+        '<td class="text-muted small">' + escape_html(format_date(r.posted_at)) + '</td>' +
         '<td>' +
           '<a href="javascript:;" onclick="show_journal_detail(' + r.id + ',\'' + escape_html(r.doc_number || '') + '\')" title="View lines">' +
           '<i class="ti ti-eye fs-5"></i></a>' +
diff --git a/app/accounting/vat_report.php b/app/accounting/vat_report.php
index c2f90b7..1aadad4 100644
--- a/app/accounting/vat_report.php
+++ b/app/accounting/vat_report.php
@@ -210,7 +210,7 @@
         var html = '';
         rows.forEach(function(r) {
           html += '<tr>' +
-            '<td class="small">' + escape_html(r.entry_date || '—') + '</td>' +
+            '<td class="small">' + escape_html(format_date(r.entry_date)) + '</td>' +
             '<td class="small">' + escape_html(r.period) + '</td>' +
             '<td class="small"><span class="badge bg-secondary bg-opacity-10 text-secondary">' + escape_html(src_labels[r.source_type] || r.source_type) + '</span></td>' +
             '<td class="small">' + (r.dept_code ? escape_html(r.dept_code) : '<span class="text-muted">—</span>') + '</td>' +
diff --git a/app/assets/js/custom.js b/app/assets/js/custom.js
index 5b5ad57..fe9c47e 100644
--- a/app/assets/js/custom.js
+++ b/app/assets/js/custom.js
@@ -4,6 +4,36 @@ function escape_html(value) {
   });
 }
 
+// Text is stored HTML-escaped (see db_statement in dbconn.php), which is right
+// for anything written into markup but wrong inside a form field: a note saved
+// as  5" pipe <spare>  came back as  5&quot; pipe &lt;spare&gt;. Field values
+// are never parsed as HTML, so decoding them here is safe.
+function decode_html(value) {
+  if (typeof value !== 'string' || value.indexOf('&') === -1) return value;
+  return value.replace(/&(quot|#0*39|#x0*27|apos|lt|gt|amp);/gi, function (m, name) {
+    name = name.toLowerCase();
+    if (name === 'quot') return '"';
+    if (name === 'lt') return '<';
+    if (name === 'gt') return '>';
+    if (name === 'amp') return '&';
+    return "'";
+  });
+}
+
+(function ($) {
+  if (!$ || !$.fn || $.fn.val.__decodes_html) return;
+  var original_val = $.fn.val;
+  $.fn.val = function (value) {
+    if (arguments.length && typeof value === 'string') {
+      // Only free-text fields; a <select> value must keep matching its option.
+      var text_fields = this.filter('input, textarea');
+      if (text_fields.length === this.length) return original_val.call(this, decode_html(value));
+    }
+    return original_val.apply(this, arguments);
+  };
+  $.fn.val.__decodes_html = true;
+})(window.jQuery);
+
 /** =========================
  * SIDEBAR ACTIVE STATE
  * Override: activate the parent listing page for manage_* sub-pages.
diff --git a/app/assets/utils/classes/DocumentValidator.php b/app/assets/utils/classes/DocumentValidator.php
new file mode 100644
index 0000000..b50a6d0
--- /dev/null
+++ b/app/assets/utils/classes/DocumentValidator.php
@@ -0,0 +1,131 @@
+<?php
+
+/**
+ * Server-side rules shared by the documents that carry priced lines: sales
+ * orders, purchase orders, quotations and purchase requests.
+ *
+ * The pages enforce the same limits, but only in JavaScript, so a request sent
+ * straight to the engine could store a 150% tax rate, a negative price or a
+ * line total that does not match quantity × price. Everything here throws a
+ * plain Exception, which the engines already report back as the alert text.
+ */
+class DocumentValidator
+{
+    const MAX_TAX_RATE   = 100;
+    // Far above any real unit price, low enough to stop a slipped keystroke
+    // (or a crafted request) from booking billions.
+    const MAX_UNIT_PRICE = 999999999.99;
+    const MAX_QUANTITY   = 999999999.9999;
+    const MIN_QUANTITY   = 0.0001;
+
+    /**
+     * Validate the lines and return them with total_price and tax_amount
+     * recomputed, using the same formula as the pages:
+     *   total = quantity × unit_price, tax = total × tax_rate / 100 (4 dp).
+     */
+    public static function normaliseLines(array $items, string $doc_label = 'Document'): array
+    {
+        $out = [];
+        foreach (array_values($items) as $i => $item) {
+            if (!is_array($item)) {
+                throw new Exception("{$doc_label} line #" . ($i + 1) . " is not valid.");
+            }
+            $name  = trim((string)($item['product_name'] ?? '')) ?: trim((string)($item['product_sku'] ?? ''));
+            $label = 'Line #' . ($i + 1) . ($name !== '' ? " ({$name})" : '');
+
+            $qty   = self::number($item['quantity'] ?? 0, "{$label}: quantity");
+            $price = self::number($item['unit_price'] ?? $item['price'] ?? 0, "{$label}: unit price");
+            $rate  = self::number($item['tax_rate'] ?? 0, "{$label}: tax rate");
+
+            $qty = round($qty, 4);
+            if ($qty < self::MIN_QUANTITY) {
+                throw new Exception("{$label}: quantity must be greater than zero.");
+            }
+            if ($qty > self::MAX_QUANTITY) {
+                throw new Exception("{$label}: quantity is too large.");
+            }
+            if ($price < 0) {
+                throw new Exception("{$label}: unit price cannot be negative.");
+            }
+            if ($price > self::MAX_UNIT_PRICE) {
+                throw new Exception("{$label}: unit price cannot exceed " . number_format(self::MAX_UNIT_PRICE, 2) . ".");
+            }
+            if ($rate < 0 || $rate > self::MAX_TAX_RATE) {
+                throw new Exception("{$label}: tax rate must be between 0 and " . self::MAX_TAX_RATE . "%.");
+            }
+
+            $total = round($qty * $price, 4);
+            $item['quantity']    = $qty;
+            $item['unit_price']  = round($price, 4);
+            $item['tax_rate']    = round($rate, 2);
+            $item['total_price'] = $total;
+            $item['tax_amount']  = round($total * $item['tax_rate'] / 100, 4);
+            $out[] = $item;
+        }
+        return $out;
+    }
+
+    /** Header amounts (discount, shipping fee): numeric and never negative. */
+    public static function amount($value, string $label): float
+    {
+        $n = self::number($value, $label);
+        if ($n < 0) {
+            throw new Exception("{$label} cannot be negative.");
+        }
+        if ($n > self::MAX_UNIT_PRICE * 1000) {
+            throw new Exception("{$label} is too large.");
+        }
+        return $n;
+    }
+
+    /** A discount larger than the goods would turn the document negative. */
+    public static function discount($value, float $subtotal): float
+    {
+        $discount = self::amount($value, 'Discount');
+        if ($discount > $subtotal + 0.00005) {
+            throw new Exception('Discount cannot exceed the subtotal.');
+        }
+        return $discount;
+    }
+
+    public static function requireId($value, string $message): int
+    {
+        $id = (int)$value;
+        if ($id <= 0) {
+            throw new Exception($message);
+        }
+        return $id;
+    }
+
+    /**
+     * A department is mandatory once the company uses departments. A company
+     * that has never defined one keeps saving with "No Department".
+     */
+    public static function requireDepartment(PDO $pdo, int $company_id, $value): int
+    {
+        $id = (int)$value;
+        if ($id > 0) {
+            $sth = $pdo->prepare("SELECT COUNT(*) FROM md_department WHERE company_id = :cid AND id = :id");
+            $sth->execute([':cid' => $company_id, ':id' => $id]);
+            if ((int)$sth->fetchColumn() === 0) {
+                throw new Exception('The selected department does not exist.');
+            }
+            return $id;
+        }
+        $sth = $pdo->prepare("SELECT COUNT(*) FROM md_department WHERE company_id = :cid AND status = 1");
+        $sth->execute([':cid' => $company_id]);
+        if ((int)$sth->fetchColumn() > 0) {
+            throw new Exception('Department is required.');
+        }
+        return 0;
+    }
+
+    private static function number($value, string $label): float
+    {
+        if ($value === '' || $value === null) return 0.0;
+        if (!is_numeric($value) || !is_finite((float)$value)) {
+            throw new Exception("{$label} must be a number.");
+        }
+        return (float)$value;
+    }
+}
diff --git a/app/assets/utils/classes/OrderManager.php b/app/assets/utils/classes/OrderManager.php
index 6aa24f7..87ae74e 100644
--- a/app/assets/utils/classes/OrderManager.php
+++ b/app/assets/utils/classes/OrderManager.php
@@ -1,5 +1,6 @@
 <?php
 require_once __DIR__ . '/DocumentNumberManager.php';
+require_once __DIR__ . '/DocumentValidator.php';
 require_once __DIR__ . '/../classes_ac/PostingWindowGuard.php';
 
 /**
@@ -269,7 +270,7 @@ class OrderManager {
                  ON  c.company_id = o.company_id
                  AND c.id         = o.contact_id
              WHERE o.company_id = :company_id
-             ORDER BY o.created_at DESC"
+             ORDER BY o.order_date DESC, o.id DESC"
         );
         $sth->execute([':company_id' => $this->company_id]);
         $rows = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -485,13 +486,18 @@ class OrderManager {
     public function saveOrder(array $data, array $logging): int
     {
         $id    = (int)($data['id'] ?? 0);
-        $items = $data['items'] ?? [];
+        $items = DocumentValidator::normaliseLines($data['items'] ?? [], 'Order');
+        $data['items'] = $items;
+        DocumentValidator::requireId($data['contact_id'] ?? 0, 'Contact is required.');
+        if ($id === 0 || array_key_exists('department_id', $data)) {
+            $data['department_id'] = DocumentValidator::requireDepartment($this->pdo, $this->company_id, $data['department_id'] ?? 0);
+        }
 
         // Calculate totals from items
         $subtotal       = array_reduce($items, fn($carry, $item) =>
             $carry + (float)($item['total_price'] ?? 0), 0.0
         );
-        $discount       = (float)($data['discount']        ?? 0);
+        $discount       = DocumentValidator::discount($data['discount'] ?? 0, $subtotal);
         $tax_adjustment = (float)($data['tax_adjustment']  ?? 0);
         if (abs($tax_adjustment) > 0.30) {
             throw new Exception("Tax adjustment cannot exceed ±0.30.");
@@ -499,7 +505,7 @@ class OrderManager {
         $tax            = round(array_reduce($items, fn($carry, $item) =>
             $carry + (float)($item['tax_amount'] ?? 0), 0.0
         ), 2) + $tax_adjustment;
-        $shipping_fee   = (float)($data['shipping_fee']    ?? 0);
+        $shipping_fee   = DocumentValidator::amount($data['shipping_fee'] ?? 0, 'Shipping fee');
         $tracking_no    = trim((string)($data['shipping_tracking_number'] ?? ''));
         $grand_total    = $subtotal - $discount + $tax + $shipping_fee;
 
diff --git a/app/assets/utils/classes/ProductManager.php b/app/assets/utils/classes/ProductManager.php
index 30150dc..c8ef448 100644
--- a/app/assets/utils/classes/ProductManager.php
+++ b/app/assets/utils/classes/ProductManager.php
@@ -569,9 +569,9 @@ class ProductManager {
                 ON  p.company_id = r.company_id
                 AND p.sku        = r.product_sku
             WHERE r.company_id = :company_id
-            ORDER BY mw.warehouse_name, r.zone,
-                    CAST(r.aisle AS UNSIGNED), r.aisle,
-                    CAST(r.bin AS UNSIGNED),  r.bin"
+            ORDER BY mw.warehouse_name, REGEXP_REPLACE(r.zone, '[0-9]+$', ''), CAST(REGEXP_SUBSTR(r.zone, '[0-9]+$') AS UNSIGNED), r.zone,
+                    REGEXP_REPLACE(r.aisle, '[0-9]+$', ''), CAST(REGEXP_SUBSTR(r.aisle, '[0-9]+$') AS UNSIGNED), r.aisle,
+                    REGEXP_REPLACE(r.bin, '[0-9]+$', ''), CAST(REGEXP_SUBSTR(r.bin, '[0-9]+$') AS UNSIGNED), r.bin"
         );
         $sth->execute([':company_id' => $this->company_id]);
         return $sth->fetchAll(PDO::FETCH_ASSOC);
diff --git a/app/assets/utils/classes/PurchaseOrderManager.php b/app/assets/utils/classes/PurchaseOrderManager.php
index 159d822..616b114 100644
--- a/app/assets/utils/classes/PurchaseOrderManager.php
+++ b/app/assets/utils/classes/PurchaseOrderManager.php
@@ -1,5 +1,6 @@
 <?php
 require_once __DIR__ . '/DocumentNumberManager.php';
+require_once __DIR__ . '/DocumentValidator.php';
 require_once __DIR__ . '/WarehouseManager.php';
 require_once __DIR__ . '/StockManager.php';
 require_once __DIR__ . '/../classes_ac/PostingWindowGuard.php';
@@ -204,7 +205,7 @@ class PurchaseOrderManager {
                  ON  c.company_id = p.company_id
                  AND c.id         = p.contact_id
              WHERE p.company_id = :company_id
-             ORDER BY p.created_at DESC"
+             ORDER BY p.po_date DESC, p.id DESC"
         );
         $sth->execute([':company_id' => $this->company_id]);
         $rows = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -325,7 +326,12 @@ class PurchaseOrderManager {
     public function savePo(array $data, array $logging): int
     {
         $id    = (int)($data['id'] ?? 0);
-        $items = $data['items'] ?? [];
+        $items = DocumentValidator::normaliseLines($data['items'] ?? [], 'Purchase order');
+        $data['items'] = $items;
+        DocumentValidator::requireId($data['contact_id'] ?? 0, 'Supplier is required.');
+        if ($id === 0 || array_key_exists('department_id', $data)) {
+            $data['department_id'] = DocumentValidator::requireDepartment($this->pdo, $this->company_id, $data['department_id'] ?? 0);
+        }
 
         $skus = array_filter(array_column($items, 'product_sku'));
         if (count($skus) !== count(array_unique($skus))) {
@@ -335,7 +341,7 @@ class PurchaseOrderManager {
         $subtotal       = array_reduce($items, fn($carry, $item) =>
             $carry + (float)($item['total_price'] ?? 0), 0.0
         );
-        $discount       = (float)($data['discount']       ?? 0);
+        $discount       = DocumentValidator::discount($data['discount'] ?? 0, $subtotal);
         $tax_adjustment = (float)($data['tax_adjustment'] ?? 0);
         if (abs($tax_adjustment) > 0.30) {
             throw new Exception("Tax adjustment cannot exceed ±0.30.");
@@ -343,7 +349,7 @@ class PurchaseOrderManager {
         $tax            = round(array_reduce($items, fn($carry, $item) =>
             $carry + (float)($item['tax_amount'] ?? 0), 0.0
         ), 2) + $tax_adjustment;
-        $shipping_fee   = (float)($data['shipping_fee']   ?? 0);
+        $shipping_fee   = DocumentValidator::amount($data['shipping_fee'] ?? 0, 'Shipping fee');
         $grand_total    = $subtotal - $discount + $tax + $shipping_fee;
 
         if ($id > 0) {
diff --git a/app/assets/utils/classes/PurchaseRequestManager.php b/app/assets/utils/classes/PurchaseRequestManager.php
index 13a0a30..da0be2d 100644
--- a/app/assets/utils/classes/PurchaseRequestManager.php
+++ b/app/assets/utils/classes/PurchaseRequestManager.php
@@ -1,5 +1,6 @@
 <?php
 require_once __DIR__ . '/DocumentNumberManager.php';
+require_once __DIR__ . '/DocumentValidator.php';
 require_once __DIR__ . '/../classes_ac/PostingWindowGuard.php';
 
 /**
@@ -163,9 +164,13 @@ class PurchaseRequestManager
     public function save(array $data, array $logging): int
     {
         $id           = (int)($data['id'] ?? 0);
-        $items        = $data['items'] ?? [];
-        $discount     = (float)($data['discount']     ?? 0);
-        $shipping_fee = (float)($data['shipping_fee'] ?? 0);
+        $items        = DocumentValidator::normaliseLines($data['items'] ?? [], 'Purchase request');
+        $data['items'] = $items;
+        $discount     = DocumentValidator::discount($data['discount'] ?? 0, array_sum(array_column($items, 'total_price')));
+        $shipping_fee = DocumentValidator::amount($data['shipping_fee'] ?? 0, 'Shipping fee');
+        if ($id === 0 || array_key_exists('department_id', $data)) {
+            $data['department_id'] = DocumentValidator::requireDepartment($this->pdo, $this->company_id, $data['department_id'] ?? 0);
+        }
 
         if (empty($items)) throw new Exception('At least one item is required.');
 
diff --git a/app/assets/utils/classes/QuotationManager.php b/app/assets/utils/classes/QuotationManager.php
index 58e7dd6..f3138bf 100644
--- a/app/assets/utils/classes/QuotationManager.php
+++ b/app/assets/utils/classes/QuotationManager.php
@@ -1,5 +1,6 @@
 <?php
 require_once __DIR__ . '/DocumentNumberManager.php';
+require_once __DIR__ . '/DocumentValidator.php';
 require_once __DIR__ . '/../classes_ac/PostingWindowGuard.php';
 
 /**
@@ -173,8 +174,9 @@ class QuotationManager
     public function save(array $data, array $logging): int
     {
         $id       = (int)($data['id'] ?? 0);
-        $items    = $data['items'] ?? [];
-        $discount = (float)($data['discount'] ?? 0);
+        $items    = DocumentValidator::normaliseLines($data['items'] ?? [], 'Quotation');
+        $data['items'] = $items;
+        $discount = DocumentValidator::discount($data['discount'] ?? 0, array_sum(array_column($items, 'total_price')));
 
         $quotation_date = (string)($data['quotation_date'] ?? '');
         $valid_until    = (string)($data['valid_until']    ?? '');
diff --git a/app/assets/utils/classes/ReportManager.php b/app/assets/utils/classes/ReportManager.php
index 86c1d81..15423fb 100644
--- a/app/assets/utils/classes/ReportManager.php
+++ b/app/assets/utils/classes/ReportManager.php
@@ -35,6 +35,8 @@ class ReportManager
     // Private helpers
     // ─────────────────────────────────────────────────────────────
 
+    private ?array $transfer_totals = null;
+
     private function stockTableNameFromWarehouseId(int $warehouse_id): string
     {
         if ($warehouse_id <= 0) {
@@ -45,6 +47,61 @@ class ReportManager
     }
 
 
+    /**
+     * Approved warehouse-to-warehouse transfer quantities, per month and SKU.
+     *
+     * A transfer is stored as an `out` row in the source warehouse and an `in`
+     * row in the destination, and both reach etl_stock_summary, which is right
+     * for each warehouse's balance. Company-wide "Stock In / Stock Out" figures
+     * must leave them out: the goods were already counted when first received,
+     * and moving them between warehouses is neither a receipt nor an issue.
+     *
+     * @return array  [month => [sku => ['in' => float, 'out' => float]]]
+     */
+    private function transferTotals(): array
+    {
+        if ($this->transfer_totals !== null) return $this->transfer_totals;
+
+        $totals = [];
+        $sth = $this->pdo->prepare("SELECT id FROM md_warehouse WHERE company_id = :company_id");
+        $sth->execute([':company_id' => $this->company_id]);
+        foreach ($sth->fetchAll(PDO::FETCH_COLUMN) as $wh_id) {
+            $table = $this->stockTableNameFromWarehouseId((int)$wh_id);
+            try {
+                $rows = $this->fetchAll(
+                    "SELECT DATE_FORMAT(`date`, '%Y-%m') AS month, product_sku,
+                            SUM(`in`) AS qty_in, SUM(`out`) AS qty_out
+                     FROM `{$table}`
+                     WHERE company_id = :company_id AND status = 1 AND type = 'transfer'
+                     GROUP BY month, product_sku"
+                );
+            } catch (PDOException $e) {
+                continue; // warehouse without a stock table yet
+            }
+            foreach ($rows as $r) {
+                $slot = &$totals[$r['month']][$r['product_sku']];
+                $slot['in']  = ($slot['in']  ?? 0) + (float)$r['qty_in'];
+                $slot['out'] = ($slot['out'] ?? 0) + (float)$r['qty_out'];
+                unset($slot);
+            }
+        }
+        return $this->transfer_totals = $totals;
+    }
+
+    /** Transfer in/out summed over the given month (null = all months). */
+    private function transferSum(?string $month = null, ?string $sku = null): array
+    {
+        $in = 0.0; $out = 0.0;
+        foreach ($this->transferTotals() as $m => $by_sku) {
+            if ($month !== null && $m !== $month) continue;
+            foreach ($by_sku as $k => $t) {
+                if ($sku !== null && (string)$k !== $sku) continue;
+                $in += $t['in']; $out += $t['out'];
+            }
+        }
+        return ['in' => $in, 'out' => $out];
+    }
+
     private function resolveWarehouseTable(int $warehouse_id): ?string
     {
         $sth = $this->pdo->prepare(
@@ -297,15 +354,7 @@ class ReportManager
      */
     public function getLowStockCount(): int
     {
-        $products = $this->getStockBalance();
-        $count = 0;
-        foreach ($products as $product) {
-            $balance = (float) $product["total_in"] - (float) $product["total_out"];
-            if ($balance < (float) $product["min_stock"]) {
-                $count++;
-            }
-        }
-        return $count;
+        return count($this->getLowStockItems());
     }
 
     public function getDashboardStockTotals(): array
@@ -318,13 +367,20 @@ class ReportManager
              WHERE company_id = :company_id"
         );
         $sth->execute([':company_id' => $this->company_id]);
-        return $sth->fetch(PDO::FETCH_ASSOC) ?: ['total_in' => 0, 'total_out' => 0];
+        $row = $sth->fetch(PDO::FETCH_ASSOC) ?: ['total_in' => 0, 'total_out' => 0];
+        $transfers = $this->transferSum();
+        return [
+            'total_in'  => round(max(0, (float)$row['total_in']  - $transfers['in']),  2),
+            'total_out' => round(max(0, (float)$row['total_out'] - $transfers['out']), 2),
+        ];
     }
 
     public function getDashboardOrderStats(): array
     {
         $sth = $this->pdo->prepare(
-            "SELECT COUNT(*), COALESCE(SUM(subtotal), 0)
+            // Orders are counted unless cancelled; revenue only once confirmed —
+            // a draft or pending order is not a sale yet.
+            "SELECT COUNT(*), COALESCE(SUM(CASE WHEN status >= 1 THEN subtotal ELSE 0 END), 0)
              FROM td_order
              WHERE company_id = :company_id
                AND status    != -1"
@@ -400,6 +456,13 @@ class ReportManager
      *
      * @return array  Low/critical stock items with warehouse_name, product_name, balance, status.
      */
+    /*
+     * The one definition of "low stock", shared by the dashboard tile, the Low
+     * Stock page, the warehouse overview tile and the daily alert: an active
+     * product in an active warehouse whose balance there is at or below its
+     * reorder point (or minimum stock, whichever is higher). Each screen used
+     * to apply its own threshold and grouping, so the counts never matched.
+     */
     public function getLowStockItems(): array
     {
         $sql = "SELECT
@@ -420,11 +483,13 @@ class ReportManager
                     ON  wb.company_id   = mw.company_id
                     AND wb.warehouse_id = mw.id
                 WHERE wb.company_id = :company_id
-                  AND mp.reorder_point > 0
+                  AND mp.status > 0
+                  AND mw.status = 1
+                  AND GREATEST(mp.reorder_point, mp.min_stock) > 0
                 GROUP BY
                     wb.warehouse_id, wb.product_sku, mw.warehouse_name,
                     mp.product_name, mp.min_stock, mp.reorder_point, mp.product_image, mp.cost_price
-                HAVING balance <= mp.reorder_point
+                HAVING balance <= GREATEST(mp.reorder_point, mp.min_stock)
                 ORDER BY mp.product_name ASC, mw.warehouse_name ASC";
 
         $rows = $this->fetchAll($sql);
@@ -498,9 +563,13 @@ class ReportManager
                AND month      = :month"
         );
         $sth->execute([':company_id' => $this->company_id, ':month' => $month]);
-        return $sth->fetch(PDO::FETCH_ASSOC) ?: [
+        $row = $sth->fetch(PDO::FETCH_ASSOC) ?: [
             'total_in' => 0, 'total_out' => 0, 'active_products' => 0
         ];
+        $transfers = $this->transferSum($month);
+        $row['total_in']  = round(max(0, (float)$row['total_in']  - $transfers['in']),  2);
+        $row['total_out'] = round(max(0, (float)$row['total_out'] - $transfers['out']), 2);
+        return $row;
     }
 
     /**
@@ -568,6 +637,9 @@ class ReportManager
 
         $dataByMonth = [];
         foreach ($rows as $row) {
+            $transfers = $this->transferSum($row['month']);
+            $row['stock_in']  = round(max(0, (float)$row['stock_in']  - $transfers['in']),  2);
+            $row['stock_out'] = round(max(0, (float)$row['stock_out'] - $transfers['out']), 2);
             $dataByMonth[$row['month']] = $row;
         }
 
@@ -611,15 +683,22 @@ class ReportManager
                  AND pc.id = p.category
              WHERE wb.company_id = :company_id
                AND wb.month      = :month
-             GROUP BY wb.product_sku, p.product_name, pc.category
-             ORDER BY total_out DESC
-             LIMIT {$limit}"
+             GROUP BY wb.product_sku, p.product_name, pc.category"
         );
         $sth->execute([
             ':company_id' => $this->company_id,
             ':month'      => $month,
         ]);
-        return $sth->fetchAll(PDO::FETCH_ASSOC);
+        $rows = $sth->fetchAll(PDO::FETCH_ASSOC);
+        foreach ($rows as &$row) {
+            $transfers = $this->transferSum($month, (string)$row['product_sku']);
+            $row['total_in']  = round(max(0, (float)$row['total_in']  - $transfers['in']),  2);
+            $row['total_out'] = round(max(0, (float)$row['total_out'] - $transfers['out']), 2);
+        }
+        unset($row);
+        $rows = array_values(array_filter($rows, fn($r) => $r['total_in'] > 0 || $r['total_out'] > 0));
+        usort($rows, fn($a, $b) => $b['total_out'] <=> $a['total_out'] ?: $b['total_in'] <=> $a['total_in']);
+        return array_slice($rows, 0, $limit);
     }
 
     /**
@@ -668,8 +747,8 @@ class ReportManager
                 $cid   = (int) $this->company_id;
                 $warehouse_name = $this->pdo->quote($wh['warehouse_name']);
                 return "SELECT s.date, s.product_sku, s.type,
-                            ROUND(COALESCE(s.`in`,  0), 2) AS stock_in,
-                            ROUND(COALESCE(s.`out`, 0), 2) AS stock_out,
+                            COALESCE(s.`in`,  0) AS stock_in,
+                            COALESCE(s.`out`, 0) AS stock_out,
                             p.product_name,
                             {$warehouse_name} AS warehouse_name
                         FROM `{$table}` s
@@ -677,7 +756,8 @@ class ReportManager
                             ON p.company_id = s.company_id
                             AND p.sku = s.product_sku
                         WHERE s.company_id = {$cid}
-                          AND s.status = 1";
+                          AND s.status = 1
+                          AND (s.`in` > 0 OR s.`out` > 0)";
             },
             $warehouses
         ));
@@ -691,6 +771,8 @@ class ReportManager
 
         $items = [];
         foreach ($sth->fetchAll(PDO::FETCH_ASSOC) as $row) {
+            // Decided on the unrounded quantity: a receipt of 0.004 used to round
+            // to 0.00, fall through to "out" and show as -0.
             $is_in   = (float)$row['stock_in'] > 0;
             $items[] = [
                 'product_name'   => $row['product_name'] ?: $row['product_sku'],
@@ -771,25 +853,10 @@ class ReportManager
      */
     public function getWarehouseLowStockCount(int $warehouse_id): int
     {
-        $sth = $this->pdo->prepare(
-            "SELECT wb.product_sku,
-                    ROUND(SUM(wb.total_in) - SUM(wb.total_out), 2) AS balance,
-                    mp.min_stock
-             FROM etl_stock_summary wb
-             INNER JOIN md_product mp
-                 ON mp.company_id = wb.company_id
-                 AND mp.sku = wb.product_sku
-             WHERE wb.company_id = :company_id
-               AND wb.warehouse_id = :warehouse_id
-             GROUP BY wb.product_sku, mp.min_stock"
-        );
-        $sth->execute([':company_id' => $this->company_id, ':warehouse_id' => $warehouse_id]);
-        $rows  = $sth->fetchAll(PDO::FETCH_ASSOC);
-        $count = 0;
-        foreach ($rows as $row) {
-            if ((float)$row['balance'] < (float)$row['min_stock']) $count++;
-        }
-        return $count;
+        return count(array_filter(
+            $this->getLowStockItems(),
+            fn($item) => $item['warehouse_id'] === $warehouse_id
+        ));
     }
 
     /**
@@ -1181,16 +1248,19 @@ class ReportManager
             $table = $this->stockTableNameFromWarehouseId((int)$wh['id']);
 
             $sth = $this->pdo->query(
-                "SELECT lot_number,
-                        ROUND(SUM(COALESCE(`in`, 0)) - SUM(COALESCE(`out`, 0)), 2) AS lot_balance
+                // Every row of the lot makes it listable; only approved rows
+                // count towards the balance. A lot received but not yet
+                // approved used to vanish here while the lot master showed it.
+                // Keyed by SKU as well: two products may share a lot number.
+                "SELECT product_sku, lot_number,
+                        ROUND(SUM(CASE WHEN status = 1 THEN COALESCE(`in`, 0) - COALESCE(`out`, 0) ELSE 0 END), 4) AS lot_balance
                  FROM `{$table}`
                  WHERE company_id = {$cid}
-                   AND status = 1
-                   AND lot_number IS NOT NULL
-                 GROUP BY lot_number"
+                   AND lot_number <> ''
+                 GROUP BY product_sku, lot_number"
             );
             foreach ($sth->fetchAll(PDO::FETCH_ASSOC) as $lb) {
-                $key = $lb['lot_number'];
+                $key = $lb['product_sku'] . "\0" . $lb['lot_number'];
                 $lot_balance[$key] = ($lot_balance[$key] ?? 0) + (float)$lb['lot_balance'];
             }
         }
@@ -1217,16 +1287,22 @@ class ReportManager
         $active = $expired = $near = 0;
 
         // Exclude lots that have no td_stock record at all (e.g. all rows were soft-deleted)
-        $rows = array_values(array_filter($rows, fn($r) => array_key_exists($r['lot_number'], $lot_balance)));
+        $lot_key = fn($r) => $r['product_sku'] . "\0" . $r['lot_number'];
+        $rows = array_values(array_filter($rows, fn($r) => array_key_exists($lot_key($r), $lot_balance)));
 
         foreach ($rows as &$row) {
             $days    = (int)$row['days_remaining'];
-            $balance = round($lot_balance[$row['lot_number']] ?? 0, 2);
+            $balance = round($lot_balance[$lot_key($row)] ?? 0, 4);
 
             $row['balance']   = $balance;
             $row['is_active'] = $balance > 0 ? 1 : 0;
 
             if ($balance > 0)              $active++;
+            if ($row['expiry_date'] === null || $row['expiry_date'] === '') {
+                // No expiry recorded: not "expiring today"
+                $row['status'] = 'ok';
+                continue;
+            }
             if ($days < 0)                 $expired++;
             if ($days >= 0 && $days <= 30) $near++;
 
@@ -1324,9 +1400,9 @@ class ReportManager
                 ON  p.company_id = r.company_id
                 AND p.sku        = r.product_sku
             WHERE r.company_id = :company_id
-            ORDER BY mw.warehouse_name, r.zone,
-                    CAST(r.aisle AS UNSIGNED), r.aisle,
-                    CAST(r.bin AS UNSIGNED),  r.bin"
+            ORDER BY mw.warehouse_name, REGEXP_REPLACE(r.zone, '[0-9]+$', ''), CAST(REGEXP_SUBSTR(r.zone, '[0-9]+$') AS UNSIGNED), r.zone,
+                    REGEXP_REPLACE(r.aisle, '[0-9]+$', ''), CAST(REGEXP_SUBSTR(r.aisle, '[0-9]+$') AS UNSIGNED), r.aisle,
+                    REGEXP_REPLACE(r.bin, '[0-9]+$', ''), CAST(REGEXP_SUBSTR(r.bin, '[0-9]+$') AS UNSIGNED), r.bin"
         );
         $sth->execute([':company_id' => $this->company_id]);
         return $sth->fetchAll(PDO::FETCH_ASSOC);
diff --git a/app/assets/utils/classes/WarehouseManager.php b/app/assets/utils/classes/WarehouseManager.php
index b775199..b074ca6 100644
--- a/app/assets/utils/classes/WarehouseManager.php
+++ b/app/assets/utils/classes/WarehouseManager.php
@@ -1035,7 +1035,7 @@ class WarehouseManager {
         $sth = $this->pdo->prepare(
             "SELECT DISTINCT zone FROM md_bin
             WHERE company_id = :company_id AND warehouse = :warehouse
-            ORDER BY CAST(zone AS UNSIGNED), zone"
+            ORDER BY REGEXP_REPLACE(zone, '[0-9]+$', ''), CAST(REGEXP_SUBSTR(zone, '[0-9]+$') AS UNSIGNED), zone"
         );
         $sth->execute([':company_id' => $this->company_id, ':warehouse' => $warehouse_id]);
         return $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1055,7 +1055,7 @@ class WarehouseManager {
         $sth = $this->pdo->prepare(
             "SELECT DISTINCT aisle FROM md_bin
             WHERE company_id = :company_id AND warehouse = :warehouse AND zone = :zone
-            ORDER BY CAST(aisle AS UNSIGNED), aisle"
+            ORDER BY REGEXP_REPLACE(aisle, '[0-9]+$', ''), CAST(REGEXP_SUBSTR(aisle, '[0-9]+$') AS UNSIGNED), aisle"
         );
         $sth->execute([':company_id' => $this->company_id, ':warehouse' => $warehouse_id, ':zone' => $zone]);
         return array_column($sth->fetchAll(PDO::FETCH_ASSOC), 'aisle');
@@ -1077,7 +1077,7 @@ class WarehouseManager {
             $sth = $this->pdo->prepare(
                 "SELECT DISTINCT bin FROM md_bin
                 WHERE company_id = :company_id AND warehouse = :warehouse
-                ORDER BY CAST(bin AS UNSIGNED), bin"
+                ORDER BY REGEXP_REPLACE(bin, '[0-9]+$', ''), CAST(REGEXP_SUBSTR(bin, '[0-9]+$') AS UNSIGNED), bin"
             );
             $sth->execute([':company_id' => $this->company_id, ':warehouse' => $warehouse_id]);
             return array_column($sth->fetchAll(PDO::FETCH_ASSOC), 'bin');
@@ -1086,7 +1086,7 @@ class WarehouseManager {
         $sth = $this->pdo->prepare(
             "SELECT DISTINCT bin FROM md_bin
             WHERE company_id = :company_id AND warehouse = :warehouse AND zone = :zone AND aisle = :aisle
-            ORDER BY CAST(bin AS UNSIGNED), bin"
+            ORDER BY REGEXP_REPLACE(bin, '[0-9]+$', ''), CAST(REGEXP_SUBSTR(bin, '[0-9]+$') AS UNSIGNED), bin"
         );
         $sth->execute([':company_id' => $this->company_id, ':warehouse' => $warehouse_id, ':zone' => $zone, ':aisle' => $aisle]);
         return array_column($sth->fetchAll(PDO::FETCH_ASSOC), 'bin');
@@ -1915,7 +1915,7 @@ class WarehouseManager {
              WHERE company_id = :company_id
                AND warehouse  = :warehouse
                AND product_sku IS NULL
-             ORDER BY CAST(zone AS UNSIGNED), zone"
+             ORDER BY REGEXP_REPLACE(zone, '[0-9]+$', ''), CAST(REGEXP_SUBSTR(zone, '[0-9]+$') AS UNSIGNED), zone"
         );
         $sth->execute([':company_id' => $this->company_id, ':warehouse' => $warehouse_id]);
         return $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1961,7 +1961,7 @@ class WarehouseManager {
                      {$lot_cond}
                      {$serial_cond}
                )
-             ORDER BY CAST(r.zone AS UNSIGNED), r.zone"
+             ORDER BY REGEXP_REPLACE(r.zone, '[0-9]+$', ''), CAST(REGEXP_SUBSTR(r.zone, '[0-9]+$') AS UNSIGNED), r.zone"
         );
         $sth->execute($params);
         return $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1982,7 +1982,7 @@ class WarehouseManager {
                AND warehouse  = :warehouse
                AND zone       = :zone
                AND product_sku IS NULL
-             ORDER BY CAST(aisle AS UNSIGNED), aisle"
+             ORDER BY REGEXP_REPLACE(aisle, '[0-9]+$', ''), CAST(REGEXP_SUBSTR(aisle, '[0-9]+$') AS UNSIGNED), aisle"
         );
         $sth->execute([
             ':company_id' => $this->company_id,
@@ -2033,7 +2033,7 @@ class WarehouseManager {
                      {$lot_cond}
                      {$serial_cond}
                )
-             ORDER BY CAST(r.aisle AS UNSIGNED), r.aisle"
+             ORDER BY REGEXP_REPLACE(r.aisle, '[0-9]+$', ''), CAST(REGEXP_SUBSTR(r.aisle, '[0-9]+$') AS UNSIGNED), r.aisle"
         );
         $sth->execute($params);
         return array_column($sth->fetchAll(PDO::FETCH_ASSOC), 'aisle');
@@ -2055,7 +2055,7 @@ class WarehouseManager {
                  WHERE company_id = :company_id
                    AND warehouse  = :warehouse
                    AND product_sku IS NULL
-                 ORDER BY CAST(bin AS UNSIGNED), bin"
+                 ORDER BY REGEXP_REPLACE(bin, '[0-9]+$', ''), CAST(REGEXP_SUBSTR(bin, '[0-9]+$') AS UNSIGNED), bin"
             );
             $sth->execute([
                 ':company_id' => $this->company_id,
@@ -2071,7 +2071,7 @@ class WarehouseManager {
                AND zone       = :zone
                AND aisle      = :aisle
                AND product_sku IS NULL
-             ORDER BY CAST(bin AS UNSIGNED), bin"
+             ORDER BY REGEXP_REPLACE(bin, '[0-9]+$', ''), CAST(REGEXP_SUBSTR(bin, '[0-9]+$') AS UNSIGNED), bin"
         );
         $sth->execute([
             ':company_id' => $this->company_id,
@@ -2130,7 +2130,7 @@ class WarehouseManager {
                      {$lot_cond}
                      {$serial_cond}
                )
-             ORDER BY CAST(r.bin AS UNSIGNED), r.bin"
+             ORDER BY REGEXP_REPLACE(r.bin, '[0-9]+$', ''), CAST(REGEXP_SUBSTR(r.bin, '[0-9]+$') AS UNSIGNED), r.bin"
         );
         $sth->execute($params);
         return array_column($sth->fetchAll(PDO::FETCH_ASSOC), 'bin');
diff --git a/app/assets/utils/db_auth.php b/app/assets/utils/db_auth.php
index 7c16490..ec8e17e 100644
--- a/app/assets/utils/db_auth.php
+++ b/app/assets/utils/db_auth.php
@@ -141,6 +141,12 @@ $answer = array("success"=>0, "message"=>"");
 if (isset($_POST['json'])) {
 // Old Method: Data is wrapped in a JSON string
 $data = json_decode($_POST['json'], true);
+if (!is_array($data)) {
+    // An undecodable payload used to carry on as an empty request.
+    http_response_code(400);
+    $answer["message"] = "The request could not be read. Please reload the page and try again.";
+    exit(json_encode($answer));
+}
 } else if (isset($_POST['otp'])) { 
     // New Method: Data is sent directly (FormData)
     // We check for 'otp' because every request should have one
diff --git a/app/cron/alert_low_stock.php b/app/cron/alert_low_stock.php
index 7fb099d..7b05685 100644
--- a/app/cron/alert_low_stock.php
+++ b/app/cron/alert_low_stock.php
@@ -1,28 +1,33 @@
 <?php
 /**
  * alert_low_stock.php — Called by Node.js scheduler daily at 8am.
- * Returns companies that have one or more SKUs below their min_stock threshold.
+ * Returns companies that have one or more low-stock products.
  * Response: { success: 1, alerts: [{ company_id, count }] }
  */
 require __DIR__ . '/../assets/utils/cron_auth.php';
 
+// Same rule as ReportManager::getLowStockItems(): counted per warehouse, at or
+// below the higher of reorder point and minimum stock.
 $sth = $pdo2->query(
     "SELECT e.company_id, COUNT(*) AS count
       FROM (
-          SELECT company_id, product_sku, SUM(total_in - total_out) AS balance
+          SELECT company_id, warehouse_id, product_sku, SUM(total_in - total_out) AS balance
           FROM etl_stock_summary
           WHERE company_id > 0
-          GROUP BY company_id, product_sku
+          GROUP BY company_id, warehouse_id, product_sku
       ) e
       JOIN md_product p
         ON p.sku        = e.product_sku
-      AND p.company_id = e.company_id
-      AND p.status     = 1
-      WHERE p.min_stock > 0
-        AND e.balance   < p.min_stock
+       AND p.company_id = e.company_id
+       AND p.status     > 0
+      JOIN md_warehouse w
+        ON w.id         = e.warehouse_id
+       AND w.company_id = e.company_id
+       AND w.status     = 1
+      WHERE GREATEST(p.reorder_point, p.min_stock) > 0
+        AND e.balance <= GREATEST(p.reorder_point, p.min_stock)
       GROUP BY e.company_id
       HAVING count > 0"
-
 );
 
 $answer['success'] = 1;
diff --git a/app/dashboard/api/engine_report/low_stock.php b/app/dashboard/api/engine_report/low_stock.php
index 2026e19..6702e75 100644
--- a/app/dashboard/api/engine_report/low_stock.php
+++ b/app/dashboard/api/engine_report/low_stock.php
@@ -14,8 +14,14 @@
         if ($item['status'] === 'critical') { $critical++; } else { $warning++; }
     }
 
+    // Every active warehouse, so one with healthy stock still appears in the
+    // filter (and reads as "nothing low here") instead of looking left out.
+    $sth = $pdo2->prepare("SELECT id, warehouse_name FROM md_warehouse WHERE company_id = :cid AND status = 1 ORDER BY warehouse_name");
+    $sth->execute([':cid' => $company_id]);
+
     $answer['output'] = [
         'items'          => $items,
+        'warehouses'     => $sth->fetchAll(PDO::FETCH_ASSOC),
         'total_low'      => count($items),
         'total_critical' => $critical,
         'total_warning'  => $warning,
diff --git a/app/dashboard/index.php b/app/dashboard/index.php
index 3f4db9e..52b1567 100644
--- a/app/dashboard/index.php
+++ b/app/dashboard/index.php
@@ -430,8 +430,8 @@
             <small class="text-muted">${item.product_sku}</small>
           </div>
           <div class="text-end">
-            <span class="fw-bold text-danger">-${Number(item.total_out).toLocaleString()}</span><br>
-            <small class="text-success">+${Number(item.total_in).toLocaleString()}</small>
+            <span class="fw-bold text-danger">Out ${format_quantity(item.total_out)}</span><br>
+            <small class="text-success">In ${format_quantity(item.total_in)}</small>
           </div>
         </li>`;
       });
@@ -483,7 +483,7 @@
             <small class="text-muted">${item.warehouse_name}</small>
           </div>
           <div class="text-end">
-            <span class="fw-bold text-${color}">${sign}${Number(item.qty).toLocaleString()}</span><br>
+            <span class="fw-bold text-${color}">${sign}${format_quantity(item.qty)}</span><br>
             <small class="text-muted">${time_ago(item.date)}</small>
           </div>
         </li>`;
@@ -569,7 +569,7 @@
             moved_html += `<li class="list-group-item d-flex align-items-center gap-3 py-3">
               <div class="icon-shape icon-sm bg-danger bg-opacity-10 text-danger rounded-2 flex-shrink-0"><i class="ti ti-trending-down"></i></div>
               <div class="flex-grow-1"><p class="mb-0 fw-semibold">${item.product_name || item.product_sku}</p><small class="text-muted">${item.product_sku}</small></div>
-              <div class="text-end"><span class="fw-bold text-danger">-${Number(item.total_out).toLocaleString()}</span><br><small class="text-success">+${Number(item.total_in).toLocaleString()}</small></div>
+              <div class="text-end"><span class="fw-bold text-danger">Out ${format_quantity(item.total_out)}</span><br><small class="text-success">In ${format_quantity(item.total_in)}</small></div>
             </li>`;
           });
         }
@@ -608,7 +608,7 @@
             act_html += `<li class="list-group-item d-flex align-items-center gap-3 py-3">
               <div class="icon-shape icon-sm bg-${color} bg-opacity-10 text-${color} rounded-2 flex-shrink-0"><i class="ti ${icon}"></i></div>
               <div class="flex-grow-1"><p class="mb-0 fw-semibold">${item.product_name}</p><small class="text-muted">${item.warehouse_name}</small></div>
-              <div class="text-end"><span class="fw-bold text-${color}">${sign}${Number(item.qty).toLocaleString()}</span><br><small class="text-muted">${time_ago(item.date)}</small></div>
+              <div class="text-end"><span class="fw-bold text-${color}">${sign}${format_quantity(item.qty)}</span><br><small class="text-muted">${time_ago(item.date)}</small></div>
             </li>`;
           });
         }
diff --git a/app/dashboard/low_stock_products.php b/app/dashboard/low_stock_products.php
index bb71a24..b7b580b 100644
--- a/app/dashboard/low_stock_products.php
+++ b/app/dashboard/low_stock_products.php
@@ -1,316 +1,312 @@
-<?php 
-  session_start();
-  require '../config.php';
-  require '../include_header.php';
-?>
-
-<body>
-  <?php require '../include_topbar.php';?>
-  <?php require '../include_sidebar.php';?>
-
-
-  <!-- MAIN CONTENT -->
-  <main id="content" class="content py-15">
-    <div class="container-fluid">
-
-      <!-- Page header -->
-      <div class="row">
-        <div class="col-12">
-          <div class="mb-6 d-flex justify-content-between align-items-center">
-            <div>
-              <h1 class="fs-3 mb-1">Low Stock Products</h1>
-              <p class="mb-0 text-muted">Products whose current balance has fallen below minimum stock level</p>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <!-- Summary cards -->
-      <div class="row mb-5 g-5">
-        <div class="col-lg-4 col-12">
-          <div class="card border border-warning border-opacity-25">
-            <div class="card-body p-5">
-              <div class="d-flex justify-content-between align-items-center">
-                <span>Total Low Stock</span>
-                <span><i class="ti ti-alert-triangle fs-3 text-warning"></i></span>
-              </div>
-              <div class="d-flex flex-column mt-3">
-                <span class="fs-3 fw-bold mb-0 d-block text-warning" id="stat_total">—</span>
-                <small class="text-muted">Products need attention</small>
-              </div>
-              <div class="card-loader-overlay" id="loader_total">
-                <div class="spinner-border spinner-border-sm text-primary"></div>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <div class="col-lg-4 col-12">
-          <div class="card border border-danger border-opacity-25">
-            <div class="card-body p-5">
-              <div class="d-flex justify-content-between align-items-center">
-                <span>Critical Level</span>
-                <span><i class="ti ti-activity-heartbeat fs-3 text-danger"></i></span>
-              </div>
-              <div class="d-flex flex-column mt-3">
-                <span class="fs-3 fw-bold mb-0 d-block text-danger" id="stat_critical">—</span>
-                <small class="text-muted">Immediate restock needed</small>
-              </div>
-              <div class="card-loader-overlay" id="loader_critical">
-                <div class="spinner-border spinner-border-sm text-primary"></div>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <div class="col-lg-4 col-12">
-          <div class="card border border-secondary border-opacity-25">
-            <div class="card-body p-5">
-              <div class="d-flex justify-content-between align-items-center">
-                <span>Warning Level</span>
-                <span><i class="ti ti-box-seam fs-3 text-secondary"></i></span>
-              </div>
-              <div class="d-flex flex-column mt-3">
-                <span class="fs-3 fw-bold mb-0 d-block text-secondary" id="stat_warning">—</span>
-                <small class="text-muted">Restock soon</small>
-              </div>
-              <div class="card-loader-overlay" id="loader_warning">
-                <div class="spinner-border spinner-border-sm text-primary"></div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <!-- Filter bar -->
-      <div class="row mb-4 g-3 align-items-end">
-        <div class="col-md-4 col-12">
-          <label class="form-label mb-1">Filter by Status</label>
-          <select id="filter_status" class="form-select">
-            <option value="">All</option>
-            <option value="critical">Critical</option>
-            <option value="warning">Warning</option>
-          </select>
-        </div>
-        <div class="col-md-4 col-12">
-          <label class="form-label mb-1">Filter by Warehouse</label>
-          <select id="filter_warehouse" class="form-select">
-            <option value="">All Warehouses</option>
-          </select>
-        </div>
-        <div class="col-md-4 col-12">
-          <label class="form-label mb-1">Search Product</label>
-          <input type="text" id="filter_search" class="form-control" placeholder="Name or SKU…">
-        </div>
-      </div>
-
-      <!-- Table -->
-      <div class="row g-5">
-        <div class="col-12">
-          <div class="card">
-            <div class="card-body p-5">
-              <div class="d-flex justify-content-between align-items-center mb-4">
-                <h2 class="fs-5 mb-0">Low Stock Items</h2>
-                <small class="text-muted" id="result_count"></small>
-              </div>
-              <div class="table-responsive">
-                <table class="table table-hover mb-0 table-centered" id="low_stock">
-                  <thead class="table-light">
-                    <tr>
-                      <th>Product</th>
-                      <th>SKU</th>
-                      <th>Warehouse</th>
-                      <th>Balance</th>
-                      <th>Min Stock</th>
-                      <th>Reorder Point</th>
-                      <th>Status</th>
-                      <th>Action</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <tr>
-                      <td colspan="8" class="text-center py-5 text-muted">
-                        <div class="spinner-border spinner-border-sm me-2"></div>Loading…
-                      </td>
-                    </tr>
-                  </tbody>
-                  <tfoot></tfoot>
-                </table>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-
-    </div>
-  </main>
-
-  <?php require "../include_ending.php";?>
-
-  <script>
-  // ── In-memory dataset ────────────────────────────────────────────────
-  var all_items = [];
-
-
-  // ── Fetch low-stock data from the report engine ──────────────────────
-  function retrieve_low_stock() {
-
-    return ajax_request({
-      url: "<?php echo $server_url?>dashboard/api/engine_report/low_stock.php",
-      autoPrepare: true,
-      checkRequired: 0,
-      action: 'read',
-      onSuccess: function(res) {
-        var out = res.output || {};
-        all_items = out.items || [];
-
-        // Summary cards
-        $('#stat_total').text(out.total_low ?? 0);
-        $('#stat_critical').text(out.total_critical ?? 0);
-        $('#stat_warning').text(out.total_warning ?? 0);
-        $('#loader_total, #loader_critical, #loader_warning').hide();
-
-        // Warehouse filter options (derived from data)
-        var warehouses = {};
-        $.each(all_items, function(i, item) {
-          warehouses[item.warehouse_id] = item.warehouse_name;
-        });
-        var wh_options = '<option value="">All Warehouses</option>';
-        $.each(warehouses, function(id, name) {
-          wh_options += `<option value="${id}">${name}</option>`;
-        });
-        $('#filter_warehouse').html(wh_options);
-
-        // Register dataset in alasql for paginated rendering
-        alasql('CREATE TABLE IF NOT EXISTS low_stock');
-        alasql.tables.low_stock.data = all_items;
-
-        change_page_low_stock(1);
-      }
-    });
-
-  }
-
-
-  // ── Apply filters, then paginate ─────────────────────────────────────
-  function change_page_low_stock(page_num) {
-
-    var offset = (page_num - 1) * prop_limit;
-
-    var status = $('#filter_status').val().trim().toLowerCase();
-    var warehouse = $('#filter_warehouse').val();
-    var search = $('#filter_search').val().trim().toLowerCase();
-
-    // Filter first — we need the full filtered set for correct pagination
-    var filtered = all_items.filter(function(item) {
-      if (status && item.status !== status) return false;
-      if (warehouse && String(item.warehouse_id) !== String(warehouse)) return false;
-      if (search) {
-        var hay = (item.product_name + ' ' + item.product_sku).toLowerCase();
-        if (hay.indexOf(search) === -1) return false;
-      }
-      return true;
-    });
-
-    // Pagination footer reflects filtered count
-    var page = generate_pagination('low_stock', filtered.length);
-    $(`table#low_stock tfoot`).html(page);
-
-    $('#result_count').text(filtered.length + ' item(s)');
-
-    if (filtered.length === 0) {
-      $('table#low_stock > tbody').html(
-        `<tr><td colspan="8" class="text-center py-5 text-muted">
-           <i class="ti ti-mood-smile fs-3 d-block mb-2"></i>
-           No low-stock products found.
-         </td></tr>`
-      );
-      return;
-    }
-
-    // Render only the current page slice
-    var page_data = filtered.slice(offset, offset + prop_limit);
-
-    var body = '';
-    $.each(page_data, function(i, item) {
-
-      var pct = item.reorder_point > 0 ? Math.round((item.balance / item.reorder_point) * 100) : 0;
-      var bar_cls = item.status === 'critical' ? 'bg-danger' : 'bg-warning';
-
-      var badge = item.status === 'critical' ?
-        '<span class="badge bg-danger rounded-pill">Critical</span>' :
-        '<span class="badge bg-secondary bg-opacity-10 text-dark rounded-pill">Warning</span>';
-
-      var balance_cls = item.status === 'critical' ? 'text-danger fw-semibold' : 'text-warning fw-semibold';
-
-      body += `<tr>
-        <td class="py-3">
-          <div class="d-flex flex-column">
-            <span>${item.product_name}</span>
-            <div class="progress mt-1" style="height:4px;width:80px;" title="${pct}% of reorder point">
-              <div class="progress-bar ${bar_cls}" style="width:${Math.min(pct,100)}%"></div>
-            </div>
-          </div>
-        </td>
-        <td class="py-3 text-secondary">${item.product_sku}</td>
-        <td class="py-3">${item.warehouse_name}</td>
+<?php 
+  session_start();
+  require '../config.php';
+  require '../include_header.php';
+?>
+
+<body>
+  <?php require '../include_topbar.php';?>
+  <?php require '../include_sidebar.php';?>
+
+
+  <!-- MAIN CONTENT -->
+  <main id="content" class="content py-15">
+    <div class="container-fluid">
+
+      <!-- Page header -->
+      <div class="row">
+        <div class="col-12">
+          <div class="mb-6 d-flex justify-content-between align-items-center">
+            <div>
+              <h1 class="fs-3 mb-1">Low Stock Products</h1>
+              <p class="mb-0 text-muted">Products whose current balance has fallen below minimum stock level</p>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <!-- Summary cards -->
+      <div class="row mb-5 g-5">
+        <div class="col-lg-4 col-12">
+          <div class="card border border-warning border-opacity-25">
+            <div class="card-body p-5">
+              <div class="d-flex justify-content-between align-items-center">
+                <span>Total Low Stock</span>
+                <span><i class="ti ti-alert-triangle fs-3 text-warning"></i></span>
+              </div>
+              <div class="d-flex flex-column mt-3">
+                <span class="fs-3 fw-bold mb-0 d-block text-warning" id="stat_total">—</span>
+                <small class="text-muted">Products need attention</small>
+              </div>
+              <div class="card-loader-overlay" id="loader_total">
+                <div class="spinner-border spinner-border-sm text-primary"></div>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div class="col-lg-4 col-12">
+          <div class="card border border-danger border-opacity-25">
+            <div class="card-body p-5">
+              <div class="d-flex justify-content-between align-items-center">
+                <span>Critical Level</span>
+                <span><i class="ti ti-activity-heartbeat fs-3 text-danger"></i></span>
+              </div>
+              <div class="d-flex flex-column mt-3">
+                <span class="fs-3 fw-bold mb-0 d-block text-danger" id="stat_critical">—</span>
+                <small class="text-muted">Immediate restock needed</small>
+              </div>
+              <div class="card-loader-overlay" id="loader_critical">
+                <div class="spinner-border spinner-border-sm text-primary"></div>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div class="col-lg-4 col-12">
+          <div class="card border border-secondary border-opacity-25">
+            <div class="card-body p-5">
+              <div class="d-flex justify-content-between align-items-center">
+                <span>Warning Level</span>
+                <span><i class="ti ti-box-seam fs-3 text-secondary"></i></span>
+              </div>
+              <div class="d-flex flex-column mt-3">
+                <span class="fs-3 fw-bold mb-0 d-block text-secondary" id="stat_warning">—</span>
+                <small class="text-muted">Restock soon</small>
+              </div>
+              <div class="card-loader-overlay" id="loader_warning">
+                <div class="spinner-border spinner-border-sm text-primary"></div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <!-- Filter bar -->
+      <div class="row mb-4 g-3 align-items-end">
+        <div class="col-md-4 col-12">
+          <label class="form-label mb-1">Filter by Status</label>
+          <select id="filter_status" class="form-select">
+            <option value="">All</option>
+            <option value="critical">Critical</option>
+            <option value="warning">Warning</option>
+          </select>
+        </div>
+        <div class="col-md-4 col-12">
+          <label class="form-label mb-1">Filter by Warehouse</label>
+          <select id="filter_warehouse" class="form-select">
+            <option value="">All Warehouses</option>
+          </select>
+        </div>
+        <div class="col-md-4 col-12">
+          <label class="form-label mb-1">Search Product</label>
+          <input type="text" id="filter_search" class="form-control" placeholder="Name or SKU…">
+        </div>
+      </div>
+
+      <!-- Table -->
+      <div class="row g-5">
+        <div class="col-12">
+          <div class="card">
+            <div class="card-body p-5">
+              <div class="d-flex justify-content-between align-items-center mb-4">
+                <h2 class="fs-5 mb-0">Low Stock Items</h2>
+                <small class="text-muted" id="result_count"></small>
+              </div>
+              <div class="table-responsive">
+                <table class="table table-hover mb-0 table-centered" id="low_stock">
+                  <thead class="table-light">
+                    <tr>
+                      <th>Product</th>
+                      <th>SKU</th>
+                      <th>Warehouse</th>
+                      <th>Balance</th>
+                      <th>Min Stock</th>
+                      <th>Reorder Point</th>
+                      <th>Status</th>
+                      <th>Action</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <tr>
+                      <td colspan="8" class="text-center py-5 text-muted">
+                        <div class="spinner-border spinner-border-sm me-2"></div>Loading…
+                      </td>
+                    </tr>
+                  </tbody>
+                  <tfoot></tfoot>
+                </table>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+    </div>
+  </main>
+
+  <?php require "../include_ending.php";?>
+
+  <script>
+  // ── In-memory dataset ────────────────────────────────────────────────
+  var all_items = [];
+
+
+  // ── Fetch low-stock data from the report engine ──────────────────────
+  function retrieve_low_stock() {
+
+    return ajax_request({
+      url: "<?php echo $server_url?>dashboard/api/engine_report/low_stock.php",
+      autoPrepare: true,
+      checkRequired: 0,
+      action: 'read',
+      onSuccess: function(res) {
+        var out = res.output || {};
+        all_items = out.items || [];
+
+        // Summary cards
+        $('#stat_total').text(out.total_low ?? 0);
+        $('#stat_critical').text(out.total_critical ?? 0);
+        $('#stat_warning').text(out.total_warning ?? 0);
+        $('#loader_total, #loader_critical, #loader_warning').hide();
+
+        // Warehouse filter options: every active warehouse, not only those with low items
+        var wh_options = '<option value="">All Warehouses</option>';
+        $.each(out.warehouses || [], function(i, wh) {
+          wh_options += `<option value="${wh.id}">${wh.warehouse_name}</option>`;
+        });
+        $('#filter_warehouse').html(wh_options);
+
+        // Register dataset in alasql for paginated rendering
+        alasql('CREATE TABLE IF NOT EXISTS low_stock');
+        alasql.tables.low_stock.data = all_items;
+
+        change_page_low_stock(1);
+      }
+    });
+
+  }
+
+
+  // ── Apply filters, then paginate ─────────────────────────────────────
+  function change_page_low_stock(page_num) {
+
+    var offset = (page_num - 1) * prop_limit;
+
+    var status = $('#filter_status').val().trim().toLowerCase();
+    var warehouse = $('#filter_warehouse').val();
+    var search = $('#filter_search').val().trim().toLowerCase();
+
+    // Filter first — we need the full filtered set for correct pagination
+    var filtered = all_items.filter(function(item) {
+      if (status && item.status !== status) return false;
+      if (warehouse && String(item.warehouse_id) !== String(warehouse)) return false;
+      if (search) {
+        var hay = (item.product_name + ' ' + item.product_sku).toLowerCase();
+        if (hay.indexOf(search) === -1) return false;
+      }
+      return true;
+    });
+
+    // Pagination footer reflects filtered count
+    var page = generate_pagination('low_stock', filtered.length);
+    $(`table#low_stock tfoot`).html(page);
+
+    $('#result_count').text(filtered.length + ' item(s)');
+
+    if (filtered.length === 0) {
+      $('table#low_stock > tbody').html(
+        `<tr><td colspan="8" class="text-center py-5 text-muted">
+           <i class="ti ti-mood-smile fs-3 d-block mb-2"></i>
+           No low-stock products found.
+         </td></tr>`
+      );
+      return;
+    }
+
+    // Render only the current page slice
+    var page_data = filtered.slice(offset, offset + prop_limit);
+
+    var body = '';
+    $.each(page_data, function(i, item) {
+
+      var pct = item.reorder_point > 0 ? Math.round((item.balance / item.reorder_point) * 100) : 0;
+      var bar_cls = item.status === 'critical' ? 'bg-danger' : 'bg-warning';
+
+      var badge = item.status === 'critical' ?
+        '<span class="badge bg-danger rounded-pill">Critical</span>' :
+        '<span class="badge bg-secondary bg-opacity-10 text-dark rounded-pill">Warning</span>';
+
+      var balance_cls = item.status === 'critical' ? 'text-danger fw-semibold' : 'text-warning fw-semibold';
+
+      body += `<tr>
+        <td class="py-3">
+          <div class="d-flex flex-column">
+            <span>${item.product_name}</span>
+            <div class="progress mt-1" style="height:4px;width:80px;" title="${pct}% of reorder point">
+              <div class="progress-bar ${bar_cls}" style="width:${Math.min(pct,100)}%"></div>
+            </div>
+          </div>
+        </td>
+        <td class="py-3 text-secondary">${item.product_sku}</td>
+        <td class="py-3">${item.warehouse_name}</td>
         <td class="py-3 ${balance_cls}">
           ${item.balance} <span class="text-muted fw-normal small">${item.uom || 'pcs'}</span>
           ${item.cost_price > 0
             ? `<div class="text-muted small fw-normal">Value: ${format_number(item.balance * item.cost_price, 2)}</div>`
             : ''}
         </td>
-        <td class="py-3">${item.min_stock}</td>
-        <td class="py-3">${item.reorder_point}</td>
-        <td class="py-3">${badge}</td>
-        <td class="py-3">
-          <a href="<?php echo $server_url?>ics/manage_stock_in.php?sku=${encodeURIComponent(item.product_sku)}&name=${encodeURIComponent(item.product_name)}&qty=${Math.max(0, item.reorder_point - item.balance)}&wh=${item.warehouse_id}"
-             class="btn btn-sm btn-outline-primary">
-            <i class="ti ti-plus me-1"></i>Restock
-          </a>
-        </td>
-      </tr>`;
-    });
-
-    $('table#low_stock > tbody').html(body);
-  }
-
-
-  // ── Filter listeners ─────────────────────────────────────────────────
-  function debounce(fn, ms) {
-    var t;
-    return function() {
-      var args = arguments,
-        ctx = this;
-      clearTimeout(t);
-      t = setTimeout(function() {
-        fn.apply(ctx, args);
-      }, ms);
-    };
-  }
-
-  $('#filter_status, #filter_warehouse').on('change', function() {
-    change_page_low_stock(1); // reset to page 1 on filter change
-  });
-
-  $('#filter_search').on('input', debounce(function() {
-    change_page_low_stock(1);
-  }, 200));
-
-
-  // ── Boot ─────────────────────────────────────────────────────────────
-  $(async function() {
-    try {
-      await retrieve_low_stock();
-    } catch (e) {
-      console.error(e);
-      $('table#low_stock > tbody').html(
-        '<tr><td colspan="8" class="text-center py-5 text-danger">Failed to load data.</td></tr>'
-      );
-    }
-  });
-  </script>
-
-</body>
-
+        <td class="py-3">${item.min_stock}</td>
+        <td class="py-3">${item.reorder_point}</td>
+        <td class="py-3">${badge}</td>
+        <td class="py-3">
+          <a href="<?php echo $server_url?>ics/manage_stock_in.php?sku=${encodeURIComponent(item.product_sku)}&name=${encodeURIComponent(item.product_name)}&qty=${Math.max(0, item.reorder_point - item.balance)}&wh=${item.warehouse_id}"
+             class="btn btn-sm btn-outline-primary">
+            <i class="ti ti-plus me-1"></i>Restock
+          </a>
+        </td>
+      </tr>`;
+    });
+
+    $('table#low_stock > tbody').html(body);
+  }
+
+
+  // ── Filter listeners ─────────────────────────────────────────────────
+  function debounce(fn, ms) {
+    var t;
+    return function() {
+      var args = arguments,
+        ctx = this;
+      clearTimeout(t);
+      t = setTimeout(function() {
+        fn.apply(ctx, args);
+      }, ms);
+    };
+  }
+
+  $('#filter_status, #filter_warehouse').on('change', function() {
+    change_page_low_stock(1); // reset to page 1 on filter change
+  });
+
+  $('#filter_search').on('input', debounce(function() {
+    change_page_low_stock(1);
+  }, 200));
+
+
+  // ── Boot ─────────────────────────────────────────────────────────────
+  $(async function() {
+    try {
+      await retrieve_low_stock();
+    } catch (e) {
+      console.error(e);
+      $('table#low_stock > tbody').html(
+        '<tr><td colspan="8" class="text-center py-5 text-danger">Failed to load data.</td></tr>'
+      );
+    }
+  });
+  </script>
+
+</body>
+
 </html>
diff --git a/app/dbconn.php b/app/dbconn.php
index 0a7a53b..ce571c9 100644
--- a/app/dbconn.php
+++ b/app/dbconn.php
@@ -31,6 +31,40 @@ class db_statement extends PDOStatement {
 		$this->pdo = $pdo;
 	}
 
+	// double_encode is off so text that is loaded and saved again is not escaped
+	// a second time (&quot; becoming &amp;quot;), and ENT_SUBSTITUTE keeps a value
+	// with a broken byte sequence instead of silently storing an empty string.
+	const ESCAPE_FLAGS = ENT_QUOTES | ENT_SUBSTITUTE;
+
+	private static function escapeString(string $value): string {
+		return htmlspecialchars($value, self::ESCAPE_FLAGS, 'UTF-8', false);
+	}
+
+	private static function escapeTree($node) {
+		if (is_string($node)) return self::escapeString($node);
+		if (!is_array($node)) return $node;
+		$out = [];
+		foreach ($node as $k => $v) {
+			$out[is_string($k) ? self::escapeString($k) : $k] = self::escapeTree($v);
+		}
+		return $out;
+	}
+
+	public static function escapeValue(string $item): string {
+		$first = $item[0] ?? '';
+		if ($first === '{' || $first === '[') {
+			$tree = json_decode($item, true);
+			if (is_array($tree)) {
+				$flags = JSON_PRESERVE_ZERO_FRACTION;
+				// An empty {} must not come back as [].
+				if ($tree === [] ) return $item;
+				$encoded = json_encode(self::escapeTree($tree), $flags);
+				if ($encoded !== false) return $encoded;
+			}
+		}
+		return self::escapeString($item);
+	}
+
 	// PDOStatement::execute() is declared ?array $params = null : bool. This
 	// override deliberately accepts a looser signature so callers may pass
 	// positional arguments (see func_get_args() below), so the tightened return
@@ -49,46 +83,13 @@ class db_statement extends PDOStatement {
 			// null is preserved as-is so PDO can bind NULL columns correctly.
 			$args = array_map(fn($v) => is_null($v) ? null : (string)$v, $args);
 
-			// escaping array
-			// prevent store XSS
+			// Escape on the way in, to prevent stored XSS. Values holding a JSON
+			// object/array are escaped string by string so they stay valid JSON.
 			foreach($args as &$item){
-
 				if (is_null($item)) continue;
-
-				// decode the JSON data
-				// set second parameter boolean TRUE for associative array output.
-				$result = json_decode($item);
-				if (json_last_error() === JSON_ERROR_NONE) {
-					// encode html for json
-					$tmp = json_decode($item,true);
-					foreach((array)$tmp as &$ii){
-
-						// Inner values may be arrays (nested JSON objects) — cast to string
-						if (!is_string($ii)) {
-							$ii = json_encode($ii);
-							continue;
-						}
-
-						$result = json_decode($ii);
-						if (json_last_error() === JSON_ERROR_NONE) {
-							// json inside json
-							$tmpp = json_decode($ii,true);
-							foreach ((array)$tmpp as &$iii) {
-								$iii = htmlspecialchars($ii, ENT_QUOTES, 'UTF-8');
-							}
-							$ii = json_encode($tmpp);
-						}else{
-							// string inside json
-							$ii = htmlspecialchars($ii, ENT_QUOTES, 'UTF-8');
-						}
-						
-					}
-					$item = json_encode($tmp);
-				}else{
-					// encode html for string
-					$item = htmlspecialchars($item, ENT_QUOTES, 'UTF-8');
-				}
+				$item = self::escapeValue($item);
 			}
+			unset($item);
 		}
 		return parent::execute($args);
 	}
@@ -96,11 +97,11 @@ class db_statement extends PDOStatement {
 }
 
 //..................... PDO1 .....................//
-$pdo1 = new database($db_type.':host='.$db_server.';dbname='.$db_database.';charset=utf8', $db_user, $db_pass);
+$pdo1 = new database($db_type.':host='.$db_server.';dbname='.$db_database.';charset=utf8mb4', $db_user, $db_pass);
 $pdo1->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
 //..................... PDO2 .....................//
-$pdo2 = new database($db_type2.':host='.$db_server2.';dbname='.$db_database2.';charset=utf8', $db_user2, $db_pass2);
+$pdo2 = new database($db_type2.':host='.$db_server2.';dbname='.$db_database2.';charset=utf8mb4', $db_user2, $db_pass2);
 $pdo2->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
 // Pin both connections to the application timezone, so MySQL NOW() and PHP
diff --git a/app/expense/api/engine/manage_purchase_request.php b/app/expense/api/engine/manage_purchase_request.php
index 1499492..fe32206 100644
--- a/app/expense/api/engine/manage_purchase_request.php
+++ b/app/expense/api/engine/manage_purchase_request.php
@@ -13,13 +13,14 @@ $prm = new PurchaseRequestManager($pdo2, $company_id);
 
 try {
     if ($action === 'create') {
-        $new_id = $prm->save(array_merge($data, ['id' => 0, 'items' => $items]), $logging);
+        // One transaction: a failure while writing the lines must not leave the header behind.
+        $new_id = dbTransaction($pdo2, fn() => $prm->save(array_merge($data, ['id' => 0, 'items' => $items]), $logging));
         $answer['success'] = 1;
         $answer['message'] = 'Purchase request created.';
         $answer['new_id']  = $new_id;
         (new UsageGuard($pdo1, $company_id, $packages))->increment();
     } elseif ($action === 'update') {
-        $prm->save(array_merge($data, ['id' => $id, 'items' => $items]), $logging);
+        dbTransaction($pdo2, fn() => $prm->save(array_merge($data, ['id' => $id, 'items' => $items]), $logging));
         $answer['success'] = 1;
         $answer['message'] = 'Purchase request updated.';
     } else {
diff --git a/app/expense/purchase_invoice.php b/app/expense/purchase_invoice.php
index 9bd2054..f0013ce 100644
--- a/app/expense/purchase_invoice.php
+++ b/app/expense/purchase_invoice.php
@@ -26,7 +26,7 @@
       </div>
 
       <div class="row g-5 mb-5">
-        <div class="col-lg-3 col-sm-6 col-12">
+        <div class="col-lg col-sm-6 col-12">
           <div class="card p-4">
             <div class="d-flex align-items-center gap-3">
               <div class="icon-shape icon-md bg-primary bg-opacity-10 text-primary rounded-2">
@@ -39,7 +39,7 @@
             </div>
           </div>
         </div>
-        <div class="col-lg-3 col-sm-6 col-12">
+        <div class="col-lg col-sm-6 col-12">
           <div class="card p-4">
             <div class="d-flex align-items-center gap-3">
               <div class="icon-shape icon-md bg-success bg-opacity-10 text-success rounded-2">
@@ -52,7 +52,7 @@
             </div>
           </div>
         </div>
-        <div class="col-lg-3 col-sm-6 col-12">
+        <div class="col-lg col-sm-6 col-12">
           <div class="card p-4">
             <div class="d-flex align-items-center gap-3">
               <div class="icon-shape icon-md bg-warning bg-opacity-10 text-warning rounded-2">
@@ -65,7 +65,20 @@
             </div>
           </div>
         </div>
-        <div class="col-lg-3 col-sm-6 col-12">
+        <div class="col-lg col-sm-6 col-12">
+          <div class="card p-4">
+            <div class="d-flex align-items-center gap-3">
+              <div class="icon-shape icon-md bg-secondary bg-opacity-10 text-secondary rounded-2">
+                <i class="ti ti-ban fs-4"></i>
+              </div>
+              <div>
+                <p class="mb-0 text-muted small">Void</p>
+                <h3 class="fw-bold mb-0" id="stat_void">—</h3>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="col-lg col-sm-6 col-12">
           <div class="card p-4">
             <div class="d-flex align-items-center gap-3">
               <div class="icon-shape icon-md bg-info bg-opacity-10 text-info rounded-2">
@@ -255,8 +268,11 @@
   function update_stats() {
     var pis = all_invoices.filter(i => i.doc_type === 'purchase_invoice');
     $('#stat_invoice').text(format_number(pis.length));
-    $('#stat_paid').text(format_number(pis.filter(i => String(i.status) === '2').length));
-    $('#stat_open').text(format_number(pis.filter(i => ['0','1'].includes(String(i.status))).length));
+    // Same test as the row badge, so a tile never disagrees with the list below it
+    var is_paid = i => String(i.status) === '2' || i.payment_state === 'paid';
+    $('#stat_paid').text(format_number(pis.filter(i => String(i.status) !== '4' && is_paid(i)).length));
+    $('#stat_open').text(format_number(pis.filter(i => ['0','1'].includes(String(i.status)) && !is_paid(i)).length));
+    $('#stat_void').text(format_number(pis.filter(i => String(i.status) === '4').length));
     $('#stat_scn').text(format_number(all_invoices.filter(i => i.doc_type === 'supplier_credit_note').length));
   }
 
diff --git a/app/journal/index.php b/app/journal/index.php
index bb128c8..edd0b61 100644
--- a/app/journal/index.php
+++ b/app/journal/index.php
@@ -164,7 +164,7 @@
             '<td class="small">' + escape_html(r.period) + '</td>' +
             '<td class="text-end small">' + format_number(r.total_debit, 2) + '</td>' +
             '<td class="text-end small">' + format_number(r.total_credit, 2) + '</td>' +
-            '<td class="small text-muted">' + escape_html(r.posted_at) + '</td>' +
+            '<td class="small text-muted">' + escape_html(format_date(r.posted_at)) + '</td>' +
             '<td><a href="javascript:;" onclick="view_detail(' + r.id + ')"><i class="ti ti-eye fs-5"></i></a>' +
               (r.source_type === 'manual' ? ' <a href="' + server_url + 'journal/new.php?gl_id=' + r.id + '" class="ms-2"><i class="ti ti-edit fs-5"></i></a>' : '') +
             '</td>' +
diff --git a/app/order/invoice.php b/app/order/invoice.php
index 3ec3390..1c711cf 100644
--- a/app/order/invoice.php
+++ b/app/order/invoice.php
@@ -23,7 +23,7 @@
       </div>
 
       <div class="row g-5 mb-5">
-        <div class="col-lg-3 col-sm-6 col-12">
+        <div class="col-xl-2 col-lg-4 col-sm-6 col-12">
           <div class="card p-4">
             <div class="d-flex align-items-center gap-3">
               <div class="icon-shape icon-md bg-primary bg-opacity-10 text-primary rounded-2">
@@ -36,7 +36,7 @@
             </div>
           </div>
         </div>
-        <div class="col-lg-3 col-sm-6 col-12">
+        <div class="col-xl-2 col-lg-4 col-sm-6 col-12">
           <div class="card p-4">
             <div class="d-flex align-items-center gap-3">
               <div class="icon-shape icon-md bg-warning bg-opacity-10 text-warning rounded-2">
@@ -49,7 +49,7 @@
             </div>
           </div>
         </div>
-        <div class="col-lg-3 col-sm-6 col-12">
+        <div class="col-xl-2 col-lg-4 col-sm-6 col-12">
           <div class="card p-4">
             <div class="d-flex align-items-center gap-3">
               <div class="icon-shape icon-md bg-info bg-opacity-10 text-info rounded-2">
@@ -62,7 +62,7 @@
             </div>
           </div>
         </div>
-        <div class="col-lg-3 col-sm-6 col-12">
+        <div class="col-xl-2 col-lg-4 col-sm-6 col-12">
           <div class="card p-4">
             <div class="d-flex align-items-center gap-3">
               <div class="icon-shape icon-md bg-danger bg-opacity-10 text-danger rounded-2">
@@ -75,7 +75,33 @@
             </div>
           </div>
         </div>
-      </div>
+        <div class="col-xl-2 col-lg-4 col-sm-6 col-12">
+          <div class="card p-4">
+            <div class="d-flex align-items-center gap-3">
+              <div class="icon-shape icon-md bg-success bg-opacity-10 text-success rounded-2">
+                <i class="ti ti-circle-check fs-4"></i>
+              </div>
+              <div>
+                <p class="mb-0 text-muted small">Paid</p>
+                <h3 class="fw-bold mb-0" id="stat_paid">—</h3>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="col-xl-2 col-lg-4 col-sm-6 col-12">
+          <div class="card p-4">
+            <div class="d-flex align-items-center gap-3">
+              <div class="icon-shape icon-md bg-secondary bg-opacity-10 text-secondary rounded-2">
+                <i class="ti ti-ban fs-4"></i>
+              </div>
+              <div>
+                <p class="mb-0 text-muted small">Void</p>
+                <h3 class="fw-bold mb-0" id="stat_void">—</h3>
+              </div>
+            </div>
+          </div>
+        </div>
+</div>
 
       <div class="row g-5">
         <div class="col-12">
@@ -224,6 +250,8 @@
         $('#stat_total').text(format_number(all.length));
         $('#stat_draft').text(format_number(all.filter(i => String(i.status) === '0').length));
         $('#stat_issued').text(format_number(all.filter(i => String(i.status) === '1').length));
+        $('#stat_paid').text(format_number(all.filter(i => String(i.status) === '2').length));
+        $('#stat_void').text(format_number(all.filter(i => String(i.status) === '4').length));
         $('#stat_overdue').text(format_number(all.filter(i => is_overdue(i)).length));
 
         alasql('CREATE TABLE IF NOT EXISTS invoice_list');
diff --git a/app/order/order.php b/app/order/order.php
index 58f0b81..bf67b4c 100644
--- a/app/order/order.php
+++ b/app/order/order.php
@@ -30,7 +30,7 @@
 
       <!-- Stat cards -->
       <div class="row g-5 mb-5">
-        <div class="col-lg-3 col-sm-6 col-12">
+        <div class="col-lg col-sm-6 col-12">
           <div class="card p-4">
             <div class="d-flex align-items-center gap-3">
               <div class="icon-shape icon-md bg-primary bg-opacity-10 text-primary rounded-2">
@@ -43,7 +43,7 @@
             </div>
           </div>
         </div>
-        <div class="col-lg-3 col-sm-6 col-12">
+        <div class="col-lg col-sm-6 col-12">
           <div class="card p-4">
             <div class="d-flex align-items-center gap-3">
               <div class="icon-shape icon-md bg-warning bg-opacity-10 text-warning rounded-2">
@@ -56,7 +56,20 @@
             </div>
           </div>
         </div>
-        <div class="col-lg-3 col-sm-6 col-12">
+        <div class="col-lg col-sm-6 col-12">
+          <div class="card p-4">
+            <div class="d-flex align-items-center gap-3">
+              <div class="icon-shape icon-md bg-danger bg-opacity-10 text-danger rounded-2">
+                <i class="ti ti-building-warehouse fs-4"></i>
+              </div>
+              <div>
+                <p class="mb-0 text-muted small">Pending Warehouse</p>
+                <h3 class="fw-bold mb-0" id="stat_pending">—</h3>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="col-lg col-sm-6 col-12">
           <div class="card p-4">
             <div class="d-flex align-items-center gap-3">
               <div class="icon-shape icon-md bg-info bg-opacity-10 text-info rounded-2">
@@ -69,7 +82,7 @@
             </div>
           </div>
         </div>
-        <div class="col-lg-3 col-sm-6 col-12">
+        <div class="col-lg col-sm-6 col-12">
           <div class="card p-4">
             <div class="d-flex align-items-center gap-3">
               <div class="icon-shape icon-md bg-secondary bg-opacity-10 text-secondary rounded-2">
@@ -215,6 +228,7 @@
 
         // Stat cards
         $('#stat_total').text(format_number(all.length));
+        $('#stat_pending').text(format_number(all.filter(o => parseInt(o.status) === -2).length));
         $('#stat_draft').text(format_number(all.filter(o => parseInt(o.status) === 0).length));
         $('#stat_confirmed').text(format_number(all.filter(o => parseInt(o.status) === 1).length));
         $('#stat_completed').text(format_number(all.filter(o => parseInt(o.status) === -1).length));
diff --git a/app/po/invoice.php b/app/po/invoice.php
index c4a981c..eb3d5c8 100644
--- a/app/po/invoice.php
+++ b/app/po/invoice.php
@@ -23,7 +23,7 @@
       </div>
 
       <div class="row g-5 mb-5">
-        <div class="col-lg-3 col-sm-6 col-12">
+        <div class="col-xl-2 col-lg-4 col-sm-6 col-12">
           <div class="card p-4">
             <div class="d-flex align-items-center gap-3">
               <div class="icon-shape icon-md bg-primary bg-opacity-10 text-primary rounded-2">
@@ -36,7 +36,7 @@
             </div>
           </div>
         </div>
-        <div class="col-lg-3 col-sm-6 col-12">
+        <div class="col-xl-2 col-lg-4 col-sm-6 col-12">
           <div class="card p-4">
             <div class="d-flex align-items-center gap-3">
               <div class="icon-shape icon-md bg-warning bg-opacity-10 text-warning rounded-2">
@@ -49,7 +49,7 @@
             </div>
           </div>
         </div>
-        <div class="col-lg-3 col-sm-6 col-12">
+        <div class="col-xl-2 col-lg-4 col-sm-6 col-12">
           <div class="card p-4">
             <div class="d-flex align-items-center gap-3">
               <div class="icon-shape icon-md bg-info bg-opacity-10 text-info rounded-2">
@@ -62,7 +62,7 @@
             </div>
           </div>
         </div>
-        <div class="col-lg-3 col-sm-6 col-12">
+        <div class="col-xl-2 col-lg-4 col-sm-6 col-12">
           <div class="card p-4">
             <div class="d-flex align-items-center gap-3">
               <div class="icon-shape icon-md bg-danger bg-opacity-10 text-danger rounded-2">
@@ -75,7 +75,33 @@
             </div>
           </div>
         </div>
-      </div>
+        <div class="col-xl-2 col-lg-4 col-sm-6 col-12">
+          <div class="card p-4">
+            <div class="d-flex align-items-center gap-3">
+              <div class="icon-shape icon-md bg-success bg-opacity-10 text-success rounded-2">
+                <i class="ti ti-circle-check fs-4"></i>
+              </div>
+              <div>
+                <p class="mb-0 text-muted small">Paid</p>
+                <h3 class="fw-bold mb-0" id="stat_paid">—</h3>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="col-xl-2 col-lg-4 col-sm-6 col-12">
+          <div class="card p-4">
+            <div class="d-flex align-items-center gap-3">
+              <div class="icon-shape icon-md bg-secondary bg-opacity-10 text-secondary rounded-2">
+                <i class="ti ti-ban fs-4"></i>
+              </div>
+              <div>
+                <p class="mb-0 text-muted small">Void</p>
+                <h3 class="fw-bold mb-0" id="stat_void">—</h3>
+              </div>
+            </div>
+          </div>
+        </div>
+</div>
 
       <div class="row g-5">
         <div class="col-12">
@@ -212,6 +238,8 @@
         $('#stat_total').text(format_number(all.length));
         $('#stat_draft').text(format_number(all.filter(i => String(i.status) === '0').length));
         $('#stat_issued').text(format_number(all.filter(i => String(i.status) === '1').length));
+        $('#stat_paid').text(format_number(all.filter(i => String(i.status) === '2').length));
+        $('#stat_void').text(format_number(all.filter(i => String(i.status) === '4').length));
         $('#stat_overdue').text(format_number(all.filter(i =>
           String(i.status) === '1' && i.due_date && i.due_date < today
         ).length));
diff --git a/app/reports/expired_stock.php b/app/reports/expired_stock.php
index bc04fa4..7e49b42 100644
--- a/app/reports/expired_stock.php
+++ b/app/reports/expired_stock.php
@@ -306,7 +306,7 @@
         <td class="py-3">${item.product_sku}</td>
         <td class="py-3">${item.lot_number || '<span class="text-muted">—</span>'}</td>
         <td class="py-3">${format_location(item)}</td>
-        <td class="py-3">${item.expiry_date}</td>
+        <td class="py-3">${format_date(item.expiry_date)}</td>
         <td class="py-3 text-danger fw-semibold">${Math.abs(item.days_remaining)} days</td>
         <td class="py-3">${item.quantity}</td>
         <td class="py-3">${status_badge(item.status)}</td>
@@ -330,7 +330,7 @@
         <td class="py-3">${item.product_sku}</td>
         <td class="py-3">${item.lot_number || '<span class="text-muted">—</span>'}</td>
         <td class="py-3">${format_location(item)}</td>
-        <td class="py-3">${item.expiry_date}</td>
+        <td class="py-3">${format_date(item.expiry_date)}</td>
         <td class="py-3 text-warning fw-semibold">${item.days_remaining} days</td>
         <td class="py-3">${item.quantity}</td>
         <td class="py-3">${status_badge(item.status)}</td>
diff --git a/app/reports/stock_movement.php b/app/reports/stock_movement.php
index 2c155b4..a2f4874 100644
--- a/app/reports/stock_movement.php
+++ b/app/reports/stock_movement.php
@@ -533,7 +533,7 @@
         }
 
         body += `<tr>
-          <td class="py-2">${row.date}</td>
+          <td class="py-2">${format_date(row.date)}</td>
           <td class="py-2">${type_badge[row.type] || row.type}</td>
           <td class="py-2"><code>${row.product_sku}</code></td>
           <td class="py-2">${row.lot_number || '<span class="text-muted">—</span>'}</td>
diff --git a/app/revenue/api/engine/manage_quotation.php b/app/revenue/api/engine/manage_quotation.php
index c84fb8a..4c08d9e 100644
--- a/app/revenue/api/engine/manage_quotation.php
+++ b/app/revenue/api/engine/manage_quotation.php
@@ -13,14 +13,15 @@ $qm = new QuotationManager($pdo2, $company_id);
 try {
     if ($action === 'create') {
         require_role($user_role, ['owner', 'admin', 'staff']);
-        $new_id = $qm->save(array_merge($data, ['id' => 0, 'items' => $items]), $logging);
+        // One transaction: a failure while writing the lines must not leave the header behind.
+        $new_id = dbTransaction($pdo2, fn() => $qm->save(array_merge($data, ['id' => 0, 'items' => $items]), $logging));
         $answer['success'] = 1;
         $answer['message'] = 'Quotation created.';
         $answer['new_id']  = $new_id;
         (new UsageGuard($pdo1, $company_id, $packages))->increment();
     } elseif ($action === 'update') {
         require_role($user_role, ['owner', 'admin', 'staff']);
-        $qm->save(array_merge($data, ['id' => $id, 'items' => $items]), $logging);
+        dbTransaction($pdo2, fn() => $qm->save(array_merge($data, ['id' => $id, 'items' => $items]), $logging));
         $answer['success'] = 1;
         $answer['message'] = 'Quotation updated.';
     } else {
diff --git a/app/revenue/invoice.php b/app/revenue/invoice.php
index 1666e7a..fc310db 100644
--- a/app/revenue/invoice.php
+++ b/app/revenue/invoice.php
@@ -26,7 +26,7 @@
       </div>
 
       <div class="row g-5 mb-5">
-        <div class="col-lg-3 col-sm-6 col-12">
+        <div class="col-lg col-sm-6 col-12">
           <div class="card p-4">
             <div class="d-flex align-items-center gap-3">
               <div class="icon-shape icon-md bg-primary bg-opacity-10 text-primary rounded-2">
@@ -39,7 +39,7 @@
             </div>
           </div>
         </div>
-        <div class="col-lg-3 col-sm-6 col-12">
+        <div class="col-lg col-sm-6 col-12">
           <div class="card p-4">
             <div class="d-flex align-items-center gap-3">
               <div class="icon-shape icon-md bg-success bg-opacity-10 text-success rounded-2">
@@ -52,7 +52,7 @@
             </div>
           </div>
         </div>
-        <div class="col-lg-3 col-sm-6 col-12">
+        <div class="col-lg col-sm-6 col-12">
           <div class="card p-4">
             <div class="d-flex align-items-center gap-3">
               <div class="icon-shape icon-md bg-warning bg-opacity-10 text-warning rounded-2">
@@ -65,7 +65,20 @@
             </div>
           </div>
         </div>
-        <div class="col-lg-3 col-sm-6 col-12">
+        <div class="col-lg col-sm-6 col-12">
+          <div class="card p-4">
+            <div class="d-flex align-items-center gap-3">
+              <div class="icon-shape icon-md bg-secondary bg-opacity-10 text-secondary rounded-2">
+                <i class="ti ti-ban fs-4"></i>
+              </div>
+              <div>
+                <p class="mb-0 text-muted small">Void</p>
+                <h3 class="fw-bold mb-0" id="stat_void">—</h3>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="col-lg col-sm-6 col-12">
           <div class="card p-4">
             <div class="d-flex align-items-center gap-3">
               <div class="icon-shape icon-md bg-danger bg-opacity-10 text-danger rounded-2">
@@ -255,8 +268,11 @@
 
   function update_stats() {
     $('#stat_invoice').text(format_number(all_invoices.filter(i => i.doc_type === 'invoice').length));
-    $('#stat_paid').text(format_number(all_invoices.filter(i => i.doc_type === 'invoice' && String(i.status) === '2').length));
-    $('#stat_open').text(format_number(all_invoices.filter(i => i.doc_type === 'invoice' && ['0', '1'].includes(String(i.status))).length));
+    // Same test as the row badge, so a tile never disagrees with the list below it
+    var is_paid = i => String(i.status) === '2' || i.payment_state === 'paid';
+    $('#stat_paid').text(format_number(all_invoices.filter(i => i.doc_type === 'invoice' && String(i.status) !== '4' && is_paid(i)).length));
+    $('#stat_open').text(format_number(all_invoices.filter(i => i.doc_type === 'invoice' && ['0', '1'].includes(String(i.status)) && !is_paid(i)).length));
+    $('#stat_void').text(format_number(all_invoices.filter(i => i.doc_type === 'invoice' && String(i.status) === '4').length));
     $('#stat_cn').text(format_number(all_invoices.filter(i => i.doc_type === 'credit_note').length));
   }
 
diff --git a/app/revenue/manage_order.php b/app/revenue/manage_order.php
index e022dd0..535430c 100644
--- a/app/revenue/manage_order.php
+++ b/app/revenue/manage_order.php
@@ -50,6 +50,13 @@
                     placeholder="DD/MM/YYYY" autocomplete="off">
                 </div>
 
+                <div class="mb-3 col-lg-6">
+                  <label class="form-label">Department</label>
+                  <select id="department_id" class="form-select">
+                    <option value="0">— No Department —</option>
+                  </select>
+                </div>
+
                 <div class="mb-3 col-lg-12">
                   <label class="form-label">Notes</label>
                   <textarea id="notes" class="form-control" rows="2"
@@ -293,7 +300,7 @@
     has_active_invoice = has_active_invoice || false;
     active_invoice_id = parseInt(active_invoice_id) || 0;
     var editable = status === -2;
-    $('#contact, #order_date, #notes, #discount, #tax_adjustment, #shipping_fee, #btn_add_item')
+    $('#contact, #order_date, #department_id, #notes, #discount, #tax_adjustment, #shipping_fee, #btn_add_item')
       .prop('disabled', !editable);
     $('.item_sku, .item_desc, .item_qty, .item_price, .item_tax_rate').prop('disabled', !editable);
     $('.remove_item_btn').toggleClass('d-none', !editable);
@@ -357,6 +364,7 @@
         $('#contact').val(o.contact_name || '');
         $('#contact_id').val(o.contact_id || 0);
         $('#order_date').val(o.order_date ? format_date_input(o.order_date) : '');
+        $('#department_id').val(o.department_id || 0);
         $('#notes').val(o.notes || '');
         $('#discount').val(o.discount || 0);
         $('#tax_adjustment').val(o.tax_adjustment || 0);
@@ -388,6 +396,7 @@
         id: order_id,
         contact_id: $('#contact_id').val() || 0,
         order_date: to_iso_date($('#order_date').val()),
+        department_id: $('#department_id').val() || 0,
         items: JSON.stringify(items),
         discount:       $('#discount').val()       || 0,
         tax_adjustment: $('#tax_adjustment').val() || 0,
@@ -490,6 +499,8 @@
 
   $(async function() {
     try {
+      // Options must exist before retrieve_order() selects the saved department
+      await Promise.resolve(load_departments('department_id')).catch(function() {});
       if (order_id) {
         await retrieve_order();
       } else {
diff --git a/app/revenue/order.php b/app/revenue/order.php
index 6e55b9f..afc2312 100644
--- a/app/revenue/order.php
+++ b/app/revenue/order.php
@@ -26,7 +26,7 @@
       </div>
 
       <div class="row g-5 mb-5">
-        <div class="col-lg-3 col-sm-6 col-12">
+        <div class="col-lg col-sm-6 col-12">
           <div class="card p-4">
             <div class="d-flex align-items-center gap-3">
               <div class="icon-shape icon-md bg-primary bg-opacity-10 text-primary rounded-2">
@@ -39,7 +39,7 @@
             </div>
           </div>
         </div>
-        <div class="col-lg-3 col-sm-6 col-12">
+        <div class="col-lg col-sm-6 col-12">
           <div class="card p-4">
             <div class="d-flex align-items-center gap-3">
               <div class="icon-shape icon-md bg-danger bg-opacity-10 text-danger rounded-2">
@@ -52,7 +52,7 @@
             </div>
           </div>
         </div>
-        <div class="col-lg-3 col-sm-6 col-12">
+        <div class="col-lg col-sm-6 col-12">
           <div class="card p-4">
             <div class="d-flex align-items-center gap-3">
               <div class="icon-shape icon-md bg-warning bg-opacity-10 text-warning rounded-2">
@@ -65,7 +65,7 @@
             </div>
           </div>
         </div>
-        <div class="col-lg-3 col-sm-6 col-12">
+        <div class="col-lg col-sm-6 col-12">
           <div class="card p-4">
             <div class="d-flex align-items-center gap-3">
               <div class="icon-shape icon-md bg-success bg-opacity-10 text-success rounded-2">
@@ -78,7 +78,20 @@
             </div>
           </div>
         </div>
-      </div>
+        <div class="col-lg col-sm-6 col-12">
+          <div class="card p-4">
+            <div class="d-flex align-items-center gap-3">
+              <div class="icon-shape icon-md bg-secondary bg-opacity-10 text-secondary rounded-2">
+                <i class="ti ti-x fs-4"></i>
+              </div>
+              <div>
+                <p class="mb-0 text-muted small">Cancelled</p>
+                <h3 class="fw-bold mb-0" id="stat_cancelled">—</h3>
+              </div>
+            </div>
+          </div>
+        </div>
+</div>
 
       <div class="row g-5">
         <div class="col-12">
@@ -197,6 +210,7 @@
         $('#stat_total').text(format_number(all.length));
         $('#stat_pending').text(format_number(all.filter(o => String(o.status) === '-2').length));
         $('#stat_draft').text(format_number(all.filter(o => String(o.status) === '0').length));
+        $('#stat_cancelled').text(format_number(all.filter(o => String(o.status) === '-1').length));
         $('#stat_confirmed').text(format_number(all.filter(o => parseInt(o.status) >= 1).length));
 
         alasql('CREATE TABLE IF NOT EXISTS revenue_order_list');
diff --git a/setup.php b/setup.php
index 3a2a666..2f16661 100644
--- a/setup.php
+++ b/setup.php
@@ -1229,6 +1229,48 @@ CREATE TABLE IF NOT EXISTS `document_number_sequences` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 ", 'document_number_sequences');
 
+// ── utf8mb4 ───────────────────────────────────────────────────────────────────
+// Older tables were created as utf8mb3, which cannot hold 4-byte characters
+// (emoji, some CJK). With the connection on utf8mb4 a note containing one was
+// rejected by the server and the whole save rolled back. Convert whatever is
+// still utf8mb3, including the per-warehouse td_stock_<id> tables, to the
+// collation the existing utf8mb4 tables already use so joins keep working.
+foreach ([$db1, $db2] as $db_name) {
+    try {
+        $st = $pdo->prepare("SELECT TABLE_COLLATION FROM information_schema.TABLES
+                              WHERE TABLE_SCHEMA = ? AND TABLE_TYPE = 'BASE TABLE' AND TABLE_COLLATION LIKE 'utf8mb4\\_%'
+                              GROUP BY TABLE_COLLATION ORDER BY COUNT(*) DESC LIMIT 1");
+        $st->execute([$db2]);
+        $target = $st->fetchColumn();
+        if (!$target) {
+            $target = $pdo->query("SELECT COLLATION_NAME FROM information_schema.COLLATIONS
+                                    WHERE CHARACTER_SET_NAME = 'utf8mb4' AND IS_DEFAULT = 'Yes' LIMIT 1")->fetchColumn() ?: 'utf8mb4_general_ci';
+        }
+        if (!preg_match('/^utf8mb4_[a-z0-9_]+$/', $target)) $target = 'utf8mb4_general_ci';
+
+        $st = $pdo->prepare("SELECT TABLE_NAME FROM information_schema.TABLES
+                              WHERE TABLE_SCHEMA = ? AND TABLE_TYPE = 'BASE TABLE'
+                                AND (TABLE_COLLATION LIKE 'utf8mb3\\_%' OR TABLE_COLLATION LIKE 'utf8\\_%')
+                              ORDER BY TABLE_NAME");
+        $st->execute([$db_name]);
+        $legacy = $st->fetchAll(PDO::FETCH_COLUMN);
+        if (!$legacy) { skip("utf8mb4: `{$db_name}` (already converted)"); }
+        foreach ($legacy as $tbl) {
+            run($pdo, "ALTER TABLE `{$db_name}`.`{$tbl}` CONVERT TO CHARACTER SET utf8mb4 COLLATE {$target}", "utf8mb4: {$db_name}.{$tbl}");
+        }
+        run($pdo, "ALTER DATABASE `{$db_name}` CHARACTER SET utf8mb4 COLLATE {$target}", "utf8mb4: database `{$db_name}` default");
+    } catch (PDOException $e) {
+        fail("utf8mb4 conversion of `{$db_name}`: " . $e->getMessage());
+    }
+}
+$pdo->exec("USE `{$db2}`");
+
+// td_purchase_order totals were decimal(15,2) while its lines are decimal(18,4);
+// match the other document headers.
+foreach (['subtotal', 'discount', 'tax', 'shipping_fee', 'grand_total'] as $col) {
+    run($pdo, "ALTER TABLE `{$db2}`.`td_purchase_order` MODIFY `{$col}` decimal(18,4) NOT NULL DEFAULT 0.0000", "td_purchase_order.{$col} decimal(18,4)");
+}
+
 // ── Summary ───────────────────────────────────────────────────────────────────
 $total = $ok_count + $skip_count + $err_count;
 echo "\n\033[1m=== Done ===\033[0m\n";