From dd6a5338d07cfa9e8d560952732a223d4e846109 Mon Sep 17 00:00:00 2001
From: Flatlogic Bot <support@flatlogic.com>
Date: Tue, 17 Mar 2026 13:13:06 +0000
Subject: [PATCH] adding paging to accounting

---
 debug.log       |    1 +
 index.php       | 2170 ++++++++---------------------------------------
 login_debug.log |    1 +
 post_debug.log  |    2 +
 4 files changed, 377 insertions(+), 1797 deletions(-)

diff --git a/debug.log b/debug.log
index 71eaccd..07e86a0 100644
--- a/debug.log
+++ b/debug.log
@@ -5,3 +5,4 @@
 2026-03-01 18:24:40 - Items case hit
 2026-03-17 09:58:59 - Items case hit
 2026-03-17 10:04:31 - Items case hit
+2026-03-17 10:12:20 - Items case hit
diff --git a/index.php b/index.php
index cf76357..c723646 100644
--- a/index.php
+++ b/index.php
@@ -35,17 +35,6 @@ if ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') || (isset($_SERVER[
 }
 
 session_start();
-if (isset($_GET['action']) && $_GET['action'] === 'switch_outlet') {
-    $target = (int)$_GET['id'];
-    $is_admin = ($_SESSION['user_role_name'] ?? '') === 'Administrator';
-    $assigned_outlets = isset($_SESSION['assigned_outlets']) ? explode(',', $_SESSION['assigned_outlets']) : [];
-    if ($is_admin || in_array($target, $assigned_outlets)) {
-        $_SESSION['outlet_id'] = ($target === 0 && $is_admin) ? null : $target;
-    }
-    header("Location: " . ($_SERVER['HTTP_REFERER'] ?? 'index.php'));
-    exit;
-}
-
 if (isset($_GET['action']) && $_GET['action'] === 'download_items_template') {
     header('Content-Type: text/csv; charset=utf-8');
     header('Content-Disposition: attachment; filename=items_import_template.csv');
@@ -287,14 +276,13 @@ function renderPagination($currentPage, $totalPages) {
     </div>
     <script>
     (function() {
-        var script = document.currentScript;
-        if (script) {
-            var dropdown = script.previousElementSibling;
-            if (dropdown && dropdown.classList.contains('d-flex')) {
-                var tableWrapper = dropdown.previousElementSibling;
-                if (tableWrapper && tableWrapper.classList.contains('table-responsive')) {
-                    tableWrapper.parentNode.insertBefore(dropdown, tableWrapper);
-                }
+        let scriptTag = document.currentScript;
+        if(scriptTag) {
+            let container = scriptTag.parentElement;
+            let grid = container.previousElementSibling;
+            if (grid && grid.classList.contains('table-responsive')) {
+                let dropdown = container.querySelector('.d-flex');
+                if (dropdown) grid.parentNode.insertBefore(dropdown, grid);
             }
         }
     })();
@@ -348,8 +336,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['login'])) {
         $_SESSION['user_id'] = $u['id'];
         $_SESSION['username'] = $u['username'];
         $_SESSION['user_role_name'] = $u['role_name'];
-        $_SESSION['outlet_id'] = $u['outlet_id'];
-        $_SESSION['assigned_outlets'] = $u['assigned_outlets'];
         
         // Fetch permissions from the new role_permissions table
         $permStmt = db()->prepare("SELECT permission FROM role_permissions WHERE role_id = ?");
@@ -395,20 +381,17 @@ if (isset($_GET['action']) || isset($_POST['action'])) {
     }
 
     if ($action === 'search_items') {
+        file_put_contents('search_debug.log', date('Y-m-d H:i:s') . " - search_items call: q=" . ($_GET['q'] ?? '') . "\n", FILE_APPEND);
         header('Content-Type: application/json');
         $q = $_GET['q'] ?? '';
-        
-        $searchTerm = "%$q%";
-        // Optimization: Fetch items with promotional prices calculated
-        $stmt = db()->prepare("SELECT * FROM stock_items WHERE name_en LIKE ? OR name_ar LIKE ? OR sku LIKE ? LIMIT 50");
-        $stmt->execute([$searchTerm, $searchTerm, $searchTerm]);
-        $items = $stmt->fetchAll(PDO::FETCH_ASSOC);
-        
-        foreach ($items as &$item) {
-            $item['original_price'] = (float)$item['sale_price'];
-            $item['sale_price'] = getPromotionalPrice($item);
+        if (strlen($q) < 1) {
+            echo json_encode([]);
+            exit;
         }
-        echo json_encode($items);
+        $searchTerm = "%$q%";
+        $stmt = db()->prepare("SELECT * FROM stock_items WHERE name_en LIKE ? OR name_ar LIKE ? OR sku LIKE ? LIMIT 15");
+        $stmt->execute([$searchTerm, $searchTerm, $searchTerm]);
+        echo json_encode($stmt->fetchAll(PDO::FETCH_ASSOC));
         exit;
     }
 
@@ -424,13 +407,10 @@ if (isset($_GET['action']) || isset($_POST['action'])) {
     if ($action === 'get_payment_details') {
         header('Content-Type: application/json');
         $payment_id = (int)$_GET['payment_id'];
-        $stmt = db()->prepare("SELECT p.*, i.customer_id, i.id as inv_id, c.name as customer_name,
-                                      o.name as outlet_name, o.address as outlet_address, o.phone as outlet_phone,
-                                      o.ctr_number as outlet_ctr_number, o.vat_number as outlet_vat_number, o.logo as outlet_logo
+        $stmt = db()->prepare("SELECT p.*, i.customer_id, c.name as customer_name 
                                FROM payments p 
                                JOIN invoices i ON p.invoice_id = i.id 
-                               LEFT JOIN customers c ON i.customer_id = c.id 
-                               LEFT JOIN outlets o ON i.outlet_id = o.id
+                               JOIN customers c ON i.customer_id = c.id 
                                WHERE p.id = ?");
         $stmt->execute([$payment_id]);
         echo json_encode($stmt->fetch(PDO::FETCH_ASSOC));
@@ -499,8 +479,8 @@ if (isset($_GET['action']) || isset($_POST['action'])) {
                 $items_for_journal[] = ['id' => $item['id'], 'qty' => $item['qty']];
             }
 
-            $stmt = $db->prepare("INSERT INTO invoices (outlet_id, transaction_no, customer_id, invoice_date, payment_type, total_amount, vat_amount, total_with_vat, paid_amount, status, register_session_id, is_pos, discount_amount, loyalty_points_redeemed, created_by) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 'paid', ?, 1, ?, ?, ?)");
-            $stmt->execute([(int)($_SESSION["outlet_id"] ?? 1), $transaction_no, $customer_id, date('Y-m-d'), 'pos', $total_amount, $tax_amount, $net_amount, $net_amount, $session_id, $discount_amount, $loyalty_redeemed, $_SESSION['user_id']]);
+            $stmt = $db->prepare("INSERT INTO invoices (transaction_no, customer_id, invoice_date, payment_type, total_amount, vat_amount, total_with_vat, paid_amount, status, register_session_id, is_pos, discount_amount, loyalty_points_redeemed, created_by) VALUES (?, ?, ?, ?, ?, ?, ?, ?, 'paid', ?, 1, ?, ?, ?)");
+            $stmt->execute([$transaction_no, $customer_id, date('Y-m-d'), 'pos', $total_amount, $tax_amount, $net_amount, $net_amount, $session_id, $discount_amount, $loyalty_redeemed, $_SESSION['user_id']]);
             $transaction_id = (int)$db->lastInsertId();
             
             // Insert Items & Update Stock
@@ -548,25 +528,7 @@ if (isset($_GET['action']) || isset($_POST['action'])) {
             recordSaleJournal($transaction_id, $net_amount, date('Y-m-d'), $items_for_journal, $tax_amount);
             
             $db->commit();
-            
-            $outlet = [];
-            if (!empty($_SESSION['outlet_id'])) {
-                $stmtO = $db->prepare("SELECT name, phone, address, ctr_number, vat_number, logo FROM outlets WHERE id = ?");
-                $stmtO->execute([$_SESSION['outlet_id']]);
-                $outlet = $stmtO->fetch(PDO::FETCH_ASSOC);
-            }
-            
-            echo json_encode([
-                'success' => true, 
-                'invoice_id' => $transaction_id, 
-                'transaction_no' => $transaction_no,
-                'outlet_name' => $outlet['name'] ?? null,
-                'outlet_phone' => $outlet['phone'] ?? null,
-                'outlet_address' => $outlet['address'] ?? null,
-                'outlet_ctr_number' => $outlet['ctr_number'] ?? null,
-                'outlet_vat_number' => $outlet['vat_number'] ?? null,
-                'outlet_logo' => $outlet['logo'] ?? null
-            ]);
+            echo json_encode(['success' => true, 'invoice_id' => $transaction_id, 'transaction_no' => $transaction_no]);
         } catch (Exception $e) {
             $db->rollBack();
             echo json_encode(['success' => false, 'error' => $e->getMessage()]);
@@ -1146,8 +1108,8 @@ function getPromotionalPrice($item) {
             
             $total_with_vat = $total_subtotal + $total_vat;
             
-            $stmt = $db->prepare("INSERT INTO lpos (outlet_id, supplier_id, lpo_date, delivery_date, status, total_amount, vat_amount, total_with_vat, terms_conditions) VALUES (?, ?, ?, ?, 'pending', ?, ?, ?, ?)");
-            $stmt->execute([(int)($_SESSION["outlet_id"] ?? 1), $supp_id, $lpo_date, $delivery_date, $total_subtotal, $total_vat, $total_with_vat, $terms]);
+            $stmt = $db->prepare("INSERT INTO lpos (supplier_id, lpo_date, delivery_date, status, total_amount, vat_amount, total_with_vat, terms_conditions) VALUES (?, ?, ?, 'pending', ?, ?, ?, ?)");
+            $stmt->execute([$supp_id, $lpo_date, $delivery_date, $total_subtotal, $total_vat, $total_with_vat, $terms]);
             $lpo_id = $db->lastInsertId();
             
             foreach ($items as $i => $item_id) {
@@ -1251,8 +1213,8 @@ function getPromotionalPrice($item) {
             
             // Create Invoice
             $inv_date = date('Y-m-d');
-            $stmtInv = $db->prepare("INSERT INTO invoices (outlet_id, customer_id, invoice_date, status, payment_type, total_amount, vat_amount, total_with_vat, paid_amount) VALUES (?, ?, ?, 'unpaid', 'credit', ?, ?, ?, 0)");
-            $stmtInv->execute([(int)($_SESSION["outlet_id"] ?? 1), $quot['customer_id'], $inv_date, $quot['total_amount'], $quot['vat_amount'], $quot['total_with_vat']]);
+            $stmtInv = $db->prepare("INSERT INTO invoices (customer_id, invoice_date, status, payment_type, total_amount, vat_amount, total_with_vat, paid_amount) VALUES (?, ?, 'unpaid', 'credit', ?, ?, ?, 0)");
+            $stmtInv->execute([$quot['customer_id'], $inv_date, $quot['total_amount'], $quot['vat_amount'], $quot['total_with_vat']]);
             $inv_id = $db->lastInsertId();
             
             $items_for_journal = [];
@@ -1294,8 +1256,8 @@ function getPromotionalPrice($item) {
             
             // Create Purchase Invoice
             $pur_date = date('Y-m-d');
-            $stmtPur = $db->prepare("INSERT INTO purchases (outlet_id, supplier_id, invoice_date, status, payment_type, total_amount, vat_amount, total_with_vat, paid_amount) VALUES (?, ?, ?, 'unpaid', 'credit', ?, ?, ?, 0)");
-            $stmtPur->execute([(int)($_SESSION["outlet_id"] ?? 1), $lpo['supplier_id'], $pur_date, $lpo['total_amount'], $lpo['vat_amount'], $lpo['total_with_vat']]);
+            $stmtPur = $db->prepare("INSERT INTO purchases (supplier_id, invoice_date, status, payment_type, total_amount, vat_amount, total_with_vat, paid_amount) VALUES (?, ?, 'unpaid', 'credit', ?, ?, ?, 0)");
+            $stmtPur->execute([$lpo['supplier_id'], $pur_date, $lpo['total_amount'], $lpo['vat_amount'], $lpo['total_with_vat']]);
             $pur_id = $db->lastInsertId();
             
             $items_for_journal = [];
@@ -1342,221 +1304,19 @@ function getPromotionalPrice($item) {
         $amt = (float)$_POST['amount'];
         $date = $_POST['expense_date'] ?: date('Y-m-d');
         $desc = $_POST['description'] ?? '';
-        db()->prepare("INSERT INTO expenses (outlet_id, category_id, amount, expense_date, reference_no, description) VALUES (?, ?, ?, ?, ?, ?)")->execute([(int)($_SESSION["outlet_id"] ?? 1), (int)$_POST['category_id'], $amt, $date, $_POST['reference_no'] ?? '', $desc]);
+        db()->prepare("INSERT INTO expenses (category_id, amount, expense_date, reference_no, description) VALUES (?, ?, ?, ?, ?)")->execute([(int)$_POST['category_id'], $amt, $date, $_POST['reference_no'] ?? '', $desc]);
         recordExpenseJournal(db()->lastInsertId(), $amt, $date, $desc);
         redirectWithMessage("Expense recorded!", "index.php?page=expenses");
     }
 
-    if (isset($_POST['import_customers'])) {
-        if (isset($_FILES['excel_file']) && $_FILES['excel_file']['error'] === 0) {
-            $tmpPath = $_FILES['excel_file']['tmp_name'];
-            $firstBytes = file_get_contents($tmpPath, false, null, 0, 4);
-            $count = 0; $errors = 0;
-            
-            if ($firstBytes === "PK\x03\x04") {
-                require_once __DIR__ . '/includes/SimpleXLSX.php';
-                if ($xlsx = \Shuchkin\SimpleXLSX::parse($tmpPath)) {
-                    foreach ($xlsx->rows() as $i => $data) {
-                        if ($i === 0) continue;
-                        $name = trim($data[0] ?? '');
-                        if (!$name) { $errors++; continue; }
-                        $email = trim($data[1] ?? '');
-                        $phone = trim($data[2] ?? '');
-                        $tax_id = trim($data[3] ?? '');
-                        $balance = (float)($data[4] ?? 0);
-                        
-                        db()->prepare("INSERT INTO customers (name, email, phone, tax_id, balance) VALUES (?, ?, ?, ?, ?)")
-                            ->execute([$name, $email, $phone, $tax_id, $balance]);
-                        $count++;
-                    }
-                }
-            } else {
-                // CSV fallback
-                $handle = fopen($tmpPath, "r");
-                fgetcsv($handle); // skip header
-                while (($data = fgetcsv($handle)) !== FALSE) {
-                    $name = trim($data[0] ?? '');
-                    if (!$name) { $errors++; continue; }
-                    $email = trim($data[1] ?? '');
-                    $phone = trim($data[2] ?? '');
-                    $tax_id = trim($data[3] ?? '');
-                    $balance = (float)($data[4] ?? 0);
-                    db()->prepare("INSERT INTO customers (name, email, phone, tax_id, balance) VALUES (?, ?, ?, ?, ?)")
-                        ->execute([$name, $email, $phone, $tax_id, $balance]);
-                    $count++;
-                }
-                fclose($handle);
-            }
-            redirectWithMessage("Customers imported! $count processed." . ($errors ? " ($errors skipped)" : ""), "index.php?page=customers");
-        }
-    }
-
-    if (isset($_POST['import_suppliers'])) {
-        if (isset($_FILES['excel_file']) && $_FILES['excel_file']['error'] === 0) {
-            $tmpPath = $_FILES['excel_file']['tmp_name'];
-            $firstBytes = file_get_contents($tmpPath, false, null, 0, 4);
-            $count = 0; $errors = 0;
-            
-            if ($firstBytes === "PK\x03\x04") {
-                require_once __DIR__ . '/includes/SimpleXLSX.php';
-                if ($xlsx = \Shuchkin\SimpleXLSX::parse($tmpPath)) {
-                    foreach ($xlsx->rows() as $i => $data) {
-                        if ($i === 0) continue;
-                        $name = trim($data[0] ?? '');
-                        if (!$name) { $errors++; continue; }
-                        $email = trim($data[1] ?? '');
-                        $phone = trim($data[2] ?? '');
-                        $tax_id = trim($data[3] ?? '');
-                        $balance = (float)($data[4] ?? 0);
-                        
-                        db()->prepare("INSERT INTO suppliers (name, email, phone, tax_id, balance) VALUES (?, ?, ?, ?, ?)")
-                            ->execute([$name, $email, $phone, $tax_id, $balance]);
-                        $count++;
-                    }
-                }
-            } else {
-                // CSV fallback
-                $handle = fopen($tmpPath, "r");
-                fgetcsv($handle); // skip header
-                while (($data = fgetcsv($handle)) !== FALSE) {
-                    $name = trim($data[0] ?? '');
-                    if (!$name) { $errors++; continue; }
-                    $email = trim($data[1] ?? '');
-                    $phone = trim($data[2] ?? '');
-                    $tax_id = trim($data[3] ?? '');
-                    $balance = (float)($data[4] ?? 0);
-                    db()->prepare("INSERT INTO suppliers (name, email, phone, tax_id, balance) VALUES (?, ?, ?, ?, ?)")
-                        ->execute([$name, $email, $phone, $tax_id, $balance]);
-                    $count++;
-                }
-                fclose($handle);
-            }
-            redirectWithMessage("Suppliers imported! $count processed." . ($errors ? " ($errors skipped)" : ""), "index.php?page=suppliers");
-        }
-    }
-
-    if (isset($_POST['import_categories'])) {
-        if (isset($_FILES['excel_file']) && $_FILES['excel_file']['error'] === 0) {
-            $tmpPath = $_FILES['excel_file']['tmp_name'];
-            $firstBytes = file_get_contents($tmpPath, false, null, 0, 4);
-            $count = 0; $errors = 0;
-            
-            if ($firstBytes === "PK\x03\x04") {
-                require_once __DIR__ . '/includes/SimpleXLSX.php';
-                if ($xlsx = \Shuchkin\SimpleXLSX::parse($tmpPath)) {
-                    foreach ($xlsx->rows() as $i => $data) {
-                        if ($i === 0) continue;
-                        $name_en = trim($data[0] ?? '');
-                        if (!$name_en) { $errors++; continue; }
-                        $name_ar = trim($data[1] ?? '');
-                        
-                        db()->prepare("INSERT INTO stock_categories (name_en, name_ar) VALUES (?, ?)")
-                            ->execute([$name_en, $name_ar]);
-                        $count++;
-                    }
-                }
-            } else {
-                $handle = fopen($tmpPath, "r");
-                fgetcsv($handle); // skip header
-                while (($data = fgetcsv($handle)) !== FALSE) {
-                    $name_en = trim($data[0] ?? '');
-                    if (!$name_en) { $errors++; continue; }
-                    $name_ar = trim($data[1] ?? '');
-                    db()->prepare("INSERT INTO stock_categories (name_en, name_ar) VALUES (?, ?)")
-                        ->execute([$name_en, $name_ar]);
-                    $count++;
-                }
-                fclose($handle);
-            }
-            redirectWithMessage("Categories imported! $count processed.", "index.php?page=stock_categories");
-        }
-    }
-
-    if (isset($_POST['import_units'])) {
-        if (isset($_FILES['excel_file']) && $_FILES['excel_file']['error'] === 0) {
-            $tmpPath = $_FILES['excel_file']['tmp_name'];
-            $firstBytes = file_get_contents($tmpPath, false, null, 0, 4);
-            $count = 0; $errors = 0;
-            
-            if ($firstBytes === "PK\x03\x04") {
-                require_once __DIR__ . '/includes/SimpleXLSX.php';
-                if ($xlsx = \Shuchkin\SimpleXLSX::parse($tmpPath)) {
-                    foreach ($xlsx->rows() as $i => $data) {
-                        if ($i === 0) continue;
-                        $name_en = trim($data[0] ?? '');
-                        if (!$name_en) { $errors++; continue; }
-                        $name_ar = trim($data[1] ?? '');
-                        $short_name_en = trim($data[2] ?? '');
-                        $short_name_ar = trim($data[3] ?? '');
-                        
-                        db()->prepare("INSERT INTO stock_units (name_en, name_ar, short_name_en, short_name_ar) VALUES (?, ?, ?, ?)")
-                            ->execute([$name_en, $name_ar, $short_name_en, $short_name_ar]);
-                        $count++;
-                    }
-                }
-            } else {
-                $handle = fopen($tmpPath, "r");
-                fgetcsv($handle);
-                while (($data = fgetcsv($handle)) !== FALSE) {
-                    $name_en = trim($data[0] ?? '');
-                    if (!$name_en) { $errors++; continue; }
-                    $name_ar = trim($data[1] ?? '');
-                    $short_name_en = trim($data[2] ?? '');
-                    $short_name_ar = trim($data[3] ?? '');
-                    db()->prepare("INSERT INTO stock_units (name_en, name_ar, short_name_en, short_name_ar) VALUES (?, ?, ?, ?)")
-                        ->execute([$name_en, $name_ar, $short_name_en, $short_name_ar]);
-                    $count++;
-                }
-                fclose($handle);
-            }
-            redirectWithMessage("Units imported! $count processed.", "index.php?page=stock_units");
-        }
-    }
-
     if (isset($_POST['import_items'])) {
         error_log("Import items triggered. POST: " . print_r($_POST, true));
         if (isset($_FILES['excel_file']) && $_FILES['excel_file']['error'] === 0) {
             $tmpPath = $_FILES['excel_file']['tmp_name'];
             error_log("File uploaded to: $tmpPath");
             $firstBytes = file_get_contents($tmpPath, false, null, 0, 4);
-            
             if ($firstBytes === "PK\x03\x04") {
-                // EXCEL IMPORT VIA SimpleXLSX
-                require_once __DIR__ . '/includes/SimpleXLSX.php';
-                if ($xlsx = \Shuchkin\SimpleXLSX::parse($tmpPath)) {
-                    $rows = $xlsx->rows();
-                    $rowNum = 0;
-                    $count = 0;
-                    $errors = 0;
-                    foreach ($rows as $data) {
-                        $rowNum++;
-                        if ($rowNum === 1) continue; // Skip header
-                        
-                        $sku = trim($data[0] ?? '');
-                        $name_en = trim($data[1] ?? '');
-                        $name_ar = trim($data[2] ?? '');
-                        $sale_price = (float)($data[3] ?? 0);
-                        $purchase_price = (float)($data[4] ?? 0);
-                        $qty = (float)($data[5] ?? 0);
-                        $vat_rate = (float)($data[6] ?? 0);
-                        
-                        if (!$sku && !$name_en) { $errors++; continue; }
-                        
-                        $check = db()->prepare("SELECT id FROM stock_items WHERE sku = ?");
-                        $check->execute([$sku]);
-                        if ($check->fetch()) {
-                            db()->prepare("UPDATE stock_items SET name_en = ?, name_ar = ?, sale_price = ?, purchase_price = ?, stock_quantity = ?, vat_rate = ? WHERE sku = ?")
-                              ->execute([$name_en, $name_ar, $sale_price, $purchase_price, $qty, $vat_rate, $sku]);
-                        } else {
-                            db()->prepare("INSERT INTO stock_items (sku, name_en, name_ar, sale_price, purchase_price, stock_quantity, vat_rate) VALUES (?, ?, ?, ?, ?, ?, ?)")
-                              ->execute([$sku, $name_en, $name_ar, $sale_price, $purchase_price, $qty, $vat_rate]);
-                        }
-                        $count++;
-                    }
-                    redirectWithMessage("Excel Import completed! $count items processed." . ($errors > 0 ? " ($errors rows skipped.)" : ""), "index.php?page=items");
-                } else {
-                    $message = "Error parsing Excel file: " . \Shuchkin\SimpleXLSX::parseError();
-                }
+                $message = "Error: It looks like you uploaded an Excel (.xlsx) file. Please save it as CSV (UTF-8) and try again.";
             } else {
                 // Check for BOM and skip it
                 if (substr($firstBytes, 0, 3) === "\xEF\xBB\xBF") {
@@ -1689,8 +1449,8 @@ function getPromotionalPrice($item) {
             
             $total_with_vat = $total_subtotal + $total_vat;
             
-            $stmt = $db->prepare("INSERT INTO lpos (outlet_id, supplier_id, lpo_date, delivery_date, status, total_amount, vat_amount, total_with_vat, terms_conditions) VALUES (?, ?, ?, ?, 'pending', ?, ?, ?, ?)");
-            $stmt->execute([(int)($_SESSION["outlet_id"] ?? 1), $supp_id, $lpo_date, $delivery_date, $total_subtotal, $total_vat, $total_with_vat, $terms]);
+            $stmt = $db->prepare("INSERT INTO lpos (supplier_id, lpo_date, delivery_date, status, total_amount, vat_amount, total_with_vat, terms_conditions) VALUES (?, ?, ?, 'pending', ?, ?, ?, ?)");
+            $stmt->execute([$supp_id, $lpo_date, $delivery_date, $total_subtotal, $total_vat, $total_with_vat, $terms]);
             $lpo_id = $db->lastInsertId();
             
             foreach ($items as $i => $item_id) {
@@ -1797,8 +1557,8 @@ function getPromotionalPrice($item) {
             
             // Create Invoice
             $inv_date = date('Y-m-d');
-            $stmtInv = $db->prepare("INSERT INTO invoices (outlet_id, customer_id, invoice_date, status, payment_type, total_amount, vat_amount, total_with_vat, paid_amount) VALUES (?, ?, ?, 'unpaid', 'credit', ?, ?, ?, 0)");
-            $stmtInv->execute([(int)($_SESSION["outlet_id"] ?? 1), $quot['customer_id'], $inv_date, $quot['total_amount'], $quot['vat_amount'], $quot['total_with_vat']]);
+            $stmtInv = $db->prepare("INSERT INTO invoices (customer_id, invoice_date, status, payment_type, total_amount, vat_amount, total_with_vat, paid_amount) VALUES (?, ?, 'unpaid', 'credit', ?, ?, ?, 0)");
+            $stmtInv->execute([$quot['customer_id'], $inv_date, $quot['total_amount'], $quot['vat_amount'], $quot['total_with_vat']]);
             $inv_id = $db->lastInsertId();
             
             $items_for_journal = [];
@@ -1840,8 +1600,8 @@ function getPromotionalPrice($item) {
             
             // Create Purchase Invoice
             $inv_date = date('Y-m-d');
-            $stmtPur = $db->prepare("INSERT INTO purchases (outlet_id, supplier_id, invoice_date, status, payment_type, total_amount, vat_amount, total_with_vat, paid_amount) VALUES (?, ?, ?, 'unpaid', 'credit', ?, ?, ?, 0)");
-            $stmtPur->execute([(int)($_SESSION["outlet_id"] ?? 1), $lpo['supplier_id'], $inv_date, $lpo['total_amount'], $lpo['vat_amount'], $lpo['total_with_vat']]);
+            $stmtPur = $db->prepare("INSERT INTO purchases (supplier_id, invoice_date, status, payment_type, total_amount, vat_amount, total_with_vat, paid_amount) VALUES (?, ?, 'unpaid', 'credit', ?, ?, ?, 0)");
+            $stmtPur->execute([$lpo['supplier_id'], $inv_date, $lpo['total_amount'], $lpo['vat_amount'], $lpo['total_with_vat']]);
             $pur_id = $db->lastInsertId();
             
             $items_for_journal = [];
@@ -1893,221 +1653,19 @@ function getPromotionalPrice($item) {
         $amt = (float)$_POST['amount'];
         $date = $_POST['expense_date'] ?: date('Y-m-d');
         $desc = $_POST['description'] ?? '';
-        db()->prepare("INSERT INTO expenses (outlet_id, category_id, amount, expense_date, reference_no, description) VALUES (?, ?, ?, ?, ?, ?)")->execute([(int)($_SESSION["outlet_id"] ?? 1), (int)$_POST['category_id'], $amt, $date, $_POST['reference_no'] ?? '', $desc]);
+        db()->prepare("INSERT INTO expenses (category_id, amount, expense_date, reference_no, description) VALUES (?, ?, ?, ?, ?)")->execute([(int)$_POST['category_id'], $amt, $date, $_POST['reference_no'] ?? '', $desc]);
         recordExpenseJournal(db()->lastInsertId(), $amt, $date, $desc);
         $message = "Expense recorded!";
     }
 
-    if (isset($_POST['import_customers'])) {
-        if (isset($_FILES['excel_file']) && $_FILES['excel_file']['error'] === 0) {
-            $tmpPath = $_FILES['excel_file']['tmp_name'];
-            $firstBytes = file_get_contents($tmpPath, false, null, 0, 4);
-            $count = 0; $errors = 0;
-            
-            if ($firstBytes === "PK\x03\x04") {
-                require_once __DIR__ . '/includes/SimpleXLSX.php';
-                if ($xlsx = \Shuchkin\SimpleXLSX::parse($tmpPath)) {
-                    foreach ($xlsx->rows() as $i => $data) {
-                        if ($i === 0) continue;
-                        $name = trim($data[0] ?? '');
-                        if (!$name) { $errors++; continue; }
-                        $email = trim($data[1] ?? '');
-                        $phone = trim($data[2] ?? '');
-                        $tax_id = trim($data[3] ?? '');
-                        $balance = (float)($data[4] ?? 0);
-                        
-                        db()->prepare("INSERT INTO customers (name, email, phone, tax_id, balance) VALUES (?, ?, ?, ?, ?)")
-                            ->execute([$name, $email, $phone, $tax_id, $balance]);
-                        $count++;
-                    }
-                }
-            } else {
-                // CSV fallback
-                $handle = fopen($tmpPath, "r");
-                fgetcsv($handle); // skip header
-                while (($data = fgetcsv($handle)) !== FALSE) {
-                    $name = trim($data[0] ?? '');
-                    if (!$name) { $errors++; continue; }
-                    $email = trim($data[1] ?? '');
-                    $phone = trim($data[2] ?? '');
-                    $tax_id = trim($data[3] ?? '');
-                    $balance = (float)($data[4] ?? 0);
-                    db()->prepare("INSERT INTO customers (name, email, phone, tax_id, balance) VALUES (?, ?, ?, ?, ?)")
-                        ->execute([$name, $email, $phone, $tax_id, $balance]);
-                    $count++;
-                }
-                fclose($handle);
-            }
-            redirectWithMessage("Customers imported! $count processed." . ($errors ? " ($errors skipped)" : ""), "index.php?page=customers");
-        }
-    }
-
-    if (isset($_POST['import_suppliers'])) {
-        if (isset($_FILES['excel_file']) && $_FILES['excel_file']['error'] === 0) {
-            $tmpPath = $_FILES['excel_file']['tmp_name'];
-            $firstBytes = file_get_contents($tmpPath, false, null, 0, 4);
-            $count = 0; $errors = 0;
-            
-            if ($firstBytes === "PK\x03\x04") {
-                require_once __DIR__ . '/includes/SimpleXLSX.php';
-                if ($xlsx = \Shuchkin\SimpleXLSX::parse($tmpPath)) {
-                    foreach ($xlsx->rows() as $i => $data) {
-                        if ($i === 0) continue;
-                        $name = trim($data[0] ?? '');
-                        if (!$name) { $errors++; continue; }
-                        $email = trim($data[1] ?? '');
-                        $phone = trim($data[2] ?? '');
-                        $tax_id = trim($data[3] ?? '');
-                        $balance = (float)($data[4] ?? 0);
-                        
-                        db()->prepare("INSERT INTO suppliers (name, email, phone, tax_id, balance) VALUES (?, ?, ?, ?, ?)")
-                            ->execute([$name, $email, $phone, $tax_id, $balance]);
-                        $count++;
-                    }
-                }
-            } else {
-                // CSV fallback
-                $handle = fopen($tmpPath, "r");
-                fgetcsv($handle); // skip header
-                while (($data = fgetcsv($handle)) !== FALSE) {
-                    $name = trim($data[0] ?? '');
-                    if (!$name) { $errors++; continue; }
-                    $email = trim($data[1] ?? '');
-                    $phone = trim($data[2] ?? '');
-                    $tax_id = trim($data[3] ?? '');
-                    $balance = (float)($data[4] ?? 0);
-                    db()->prepare("INSERT INTO suppliers (name, email, phone, tax_id, balance) VALUES (?, ?, ?, ?, ?)")
-                        ->execute([$name, $email, $phone, $tax_id, $balance]);
-                    $count++;
-                }
-                fclose($handle);
-            }
-            redirectWithMessage("Suppliers imported! $count processed." . ($errors ? " ($errors skipped)" : ""), "index.php?page=suppliers");
-        }
-    }
-
-    if (isset($_POST['import_categories'])) {
-        if (isset($_FILES['excel_file']) && $_FILES['excel_file']['error'] === 0) {
-            $tmpPath = $_FILES['excel_file']['tmp_name'];
-            $firstBytes = file_get_contents($tmpPath, false, null, 0, 4);
-            $count = 0; $errors = 0;
-            
-            if ($firstBytes === "PK\x03\x04") {
-                require_once __DIR__ . '/includes/SimpleXLSX.php';
-                if ($xlsx = \Shuchkin\SimpleXLSX::parse($tmpPath)) {
-                    foreach ($xlsx->rows() as $i => $data) {
-                        if ($i === 0) continue;
-                        $name_en = trim($data[0] ?? '');
-                        if (!$name_en) { $errors++; continue; }
-                        $name_ar = trim($data[1] ?? '');
-                        
-                        db()->prepare("INSERT INTO stock_categories (name_en, name_ar) VALUES (?, ?)")
-                            ->execute([$name_en, $name_ar]);
-                        $count++;
-                    }
-                }
-            } else {
-                $handle = fopen($tmpPath, "r");
-                fgetcsv($handle); // skip header
-                while (($data = fgetcsv($handle)) !== FALSE) {
-                    $name_en = trim($data[0] ?? '');
-                    if (!$name_en) { $errors++; continue; }
-                    $name_ar = trim($data[1] ?? '');
-                    db()->prepare("INSERT INTO stock_categories (name_en, name_ar) VALUES (?, ?)")
-                        ->execute([$name_en, $name_ar]);
-                    $count++;
-                }
-                fclose($handle);
-            }
-            redirectWithMessage("Categories imported! $count processed.", "index.php?page=stock_categories");
-        }
-    }
-
-    if (isset($_POST['import_units'])) {
-        if (isset($_FILES['excel_file']) && $_FILES['excel_file']['error'] === 0) {
-            $tmpPath = $_FILES['excel_file']['tmp_name'];
-            $firstBytes = file_get_contents($tmpPath, false, null, 0, 4);
-            $count = 0; $errors = 0;
-            
-            if ($firstBytes === "PK\x03\x04") {
-                require_once __DIR__ . '/includes/SimpleXLSX.php';
-                if ($xlsx = \Shuchkin\SimpleXLSX::parse($tmpPath)) {
-                    foreach ($xlsx->rows() as $i => $data) {
-                        if ($i === 0) continue;
-                        $name_en = trim($data[0] ?? '');
-                        if (!$name_en) { $errors++; continue; }
-                        $name_ar = trim($data[1] ?? '');
-                        $short_name_en = trim($data[2] ?? '');
-                        $short_name_ar = trim($data[3] ?? '');
-                        
-                        db()->prepare("INSERT INTO stock_units (name_en, name_ar, short_name_en, short_name_ar) VALUES (?, ?, ?, ?)")
-                            ->execute([$name_en, $name_ar, $short_name_en, $short_name_ar]);
-                        $count++;
-                    }
-                }
-            } else {
-                $handle = fopen($tmpPath, "r");
-                fgetcsv($handle);
-                while (($data = fgetcsv($handle)) !== FALSE) {
-                    $name_en = trim($data[0] ?? '');
-                    if (!$name_en) { $errors++; continue; }
-                    $name_ar = trim($data[1] ?? '');
-                    $short_name_en = trim($data[2] ?? '');
-                    $short_name_ar = trim($data[3] ?? '');
-                    db()->prepare("INSERT INTO stock_units (name_en, name_ar, short_name_en, short_name_ar) VALUES (?, ?, ?, ?)")
-                        ->execute([$name_en, $name_ar, $short_name_en, $short_name_ar]);
-                    $count++;
-                }
-                fclose($handle);
-            }
-            redirectWithMessage("Units imported! $count processed.", "index.php?page=stock_units");
-        }
-    }
-
     if (isset($_POST['import_items'])) {
         error_log("Import items triggered. POST: " . print_r($_POST, true));
         if (isset($_FILES['excel_file']) && $_FILES['excel_file']['error'] === 0) {
             $tmpPath = $_FILES['excel_file']['tmp_name'];
             error_log("File uploaded to: $tmpPath");
             $firstBytes = file_get_contents($tmpPath, false, null, 0, 4);
-            
             if ($firstBytes === "PK\x03\x04") {
-                // EXCEL IMPORT VIA SimpleXLSX
-                require_once __DIR__ . '/includes/SimpleXLSX.php';
-                if ($xlsx = \Shuchkin\SimpleXLSX::parse($tmpPath)) {
-                    $rows = $xlsx->rows();
-                    $rowNum = 0;
-                    $count = 0;
-                    $errors = 0;
-                    foreach ($rows as $data) {
-                        $rowNum++;
-                        if ($rowNum === 1) continue; // Skip header
-                        
-                        $sku = trim($data[0] ?? '');
-                        $name_en = trim($data[1] ?? '');
-                        $name_ar = trim($data[2] ?? '');
-                        $sale_price = (float)($data[3] ?? 0);
-                        $purchase_price = (float)($data[4] ?? 0);
-                        $qty = (float)($data[5] ?? 0);
-                        $vat_rate = (float)($data[6] ?? 0);
-                        
-                        if (!$sku && !$name_en) { $errors++; continue; }
-                        
-                        $check = db()->prepare("SELECT id FROM stock_items WHERE sku = ?");
-                        $check->execute([$sku]);
-                        if ($check->fetch()) {
-                            db()->prepare("UPDATE stock_items SET name_en = ?, name_ar = ?, sale_price = ?, purchase_price = ?, stock_quantity = ?, vat_rate = ? WHERE sku = ?")
-                              ->execute([$name_en, $name_ar, $sale_price, $purchase_price, $qty, $vat_rate, $sku]);
-                        } else {
-                            db()->prepare("INSERT INTO stock_items (sku, name_en, name_ar, sale_price, purchase_price, stock_quantity, vat_rate) VALUES (?, ?, ?, ?, ?, ?, ?)")
-                              ->execute([$sku, $name_en, $name_ar, $sale_price, $purchase_price, $qty, $vat_rate]);
-                        }
-                        $count++;
-                    }
-                    redirectWithMessage("Excel Import completed! $count items processed." . ($errors > 0 ? " ($errors rows skipped.)" : ""), "index.php?page=items");
-                } else {
-                    $message = "Error parsing Excel file: " . \Shuchkin\SimpleXLSX::parseError();
-                }
+                $message = "Error: It looks like you uploaded an Excel (.xlsx) file. Please save it as CSV (UTF-8) and try again.";
             } else {
                 // Check for BOM and skip it
                 if (substr($firstBytes, 0, 3) === "\xEF\xBB\xBF") {
@@ -2688,13 +2246,9 @@ if (isset($_POST['add_hr_department'])) {
         $group_id = (int)($_POST['group_id'] ?? 0) ?: null;
         if ($username && $password) {
             $hashed_password = password_hash($password, PASSWORD_DEFAULT);
-            $outlet_ids = !empty($_POST['outlet_ids']) && is_array($_POST['outlet_ids']) ? array_filter($_POST['outlet_ids'], function($v) { return $v !== ''; }) : [];
-            $outlet_id = !empty($outlet_ids) ? (int)reset($outlet_ids) : null;
-            $assigned_outlets = !empty($outlet_ids) ? implode(',', array_map('intval', $outlet_ids)) : null;
-
-            $stmt = db()->prepare("INSERT INTO users (username, password, email, phone, group_id, outlet_id, assigned_outlets) VALUES (?, ?, ?, ?, ?, ?, ?)");
+            $stmt = db()->prepare("INSERT INTO users (username, password, email, phone, group_id) VALUES (?, ?, ?, ?, ?)");
             try {
-                $stmt->execute([$username, $hashed_password, $email, $phone, $group_id, $outlet_id, $assigned_outlets]);
+                $stmt->execute([$username, $hashed_password, $email, $phone, $group_id]);
                 $message = "User added successfully!";
             } catch (PDOException $e) {
                 if ($e->getCode() == '23000') {
@@ -2749,13 +2303,9 @@ if (isset($_POST['add_hr_department'])) {
         $phone = $_POST['phone'] ?? '';
         $group_id = (int)($_POST['group_id'] ?? 0) ?: null;
         $status = $_POST['status'] ?? 'active';
-        $outlet_ids = !empty($_POST['outlet_ids']) && is_array($_POST['outlet_ids']) ? array_filter($_POST['outlet_ids'], function($v) { return $v !== ''; }) : [];
-        $outlet_id = !empty($outlet_ids) ? (int)reset($outlet_ids) : null;
-        $assigned_outlets = !empty($outlet_ids) ? implode(',', array_map('intval', $outlet_ids)) : null;
-
         if ($id && $username) {
-            $stmt = db()->prepare("UPDATE users SET username = ?, email = ?, phone = ?, group_id = ?, status = ?, outlet_id = ?, assigned_outlets = ? WHERE id = ?");
-            $stmt->execute([$username, $email, $phone, $group_id, $status, $outlet_id, $assigned_outlets, $id]);
+            $stmt = db()->prepare("UPDATE users SET username = ?, email = ?, phone = ?, group_id = ?, status = ? WHERE id = ?");
+            $stmt->execute([$username, $email, $phone, $group_id, $status, $id]);
             
             if (!empty($_POST['password'])) {
                 $hashed_password = password_hash($_POST['password'], PASSWORD_DEFAULT);
@@ -2923,202 +2473,7 @@ if (isset($_POST['add_hr_department'])) {
         }
     }
 
-    
-    // --- Outlets Handlers ---
-    if (isset($_POST['add_outlet']) && ($_SESSION['user_role_name'] ?? '') === 'Administrator') {
-        $name = $_POST['name'] ?? '';
-        $phone = $_POST['phone'] ?? '';
-        $address = $_POST['address'] ?? '';
-        $ctr_number = $_POST['ctr_number'] ?? '';
-        $vat_number = $_POST['vat_number'] ?? '';
-        $status = $_POST['status'] ?? 'active';
-        $logo = null;
-
-        if (isset($_FILES['logo']) && $_FILES['logo']['error'] === UPLOAD_ERR_OK) {
-            $ext = strtolower(pathinfo($_FILES['logo']['name'], PATHINFO_EXTENSION));
-            $allowed = ['jpg', 'jpeg', 'png', 'gif'];
-            if (in_array($ext, $allowed)) {
-                $filename = 'outlet_logo_' . time() . '_' . rand(100, 999) . '.' . $ext;
-                $dest = __DIR__ . '/assets/images/' . $filename;
-                if (!is_dir(__DIR__ . '/assets/images/')) {
-                    mkdir(__DIR__ . '/assets/images/', 0777, true);
-                }
-                if (move_uploaded_file($_FILES['logo']['tmp_name'], $dest)) {
-                    $logo = 'assets/images/' . $filename;
-                }
-            }
-        }
-
-        if ($name) {
-            $stmt = db()->prepare("INSERT INTO outlets (name, phone, address, ctr_number, vat_number, logo, status) VALUES (?, ?, ?, ?, ?, ?, ?)");
-            $stmt->execute([$name, $phone, $address, $ctr_number, $vat_number, $logo, $status]);
-            redirectWithMessage("Outlet added successfully!", "index.php?page=outlets");
-        }
-    }
-    if (isset($_POST['edit_outlet']) && ($_SESSION['user_role_name'] ?? '') === 'Administrator') {
-        $id = (int)$_POST['id'];
-        $name = $_POST['name'] ?? '';
-        $phone = $_POST['phone'] ?? '';
-        $address = $_POST['address'] ?? '';
-        $ctr_number = $_POST['ctr_number'] ?? '';
-        $vat_number = $_POST['vat_number'] ?? '';
-        $status = $_POST['status'] ?? 'active';
-        
-        $logo_query_part = "";
-        $params = [$name, $phone, $address, $ctr_number, $vat_number, $status, $id];
-
-        if (isset($_FILES['logo']) && $_FILES['logo']['error'] === UPLOAD_ERR_OK) {
-            $ext = strtolower(pathinfo($_FILES['logo']['name'], PATHINFO_EXTENSION));
-            $allowed = ['jpg', 'jpeg', 'png', 'gif'];
-            if (in_array($ext, $allowed)) {
-                $filename = 'outlet_logo_' . time() . '_' . rand(100, 999) . '.' . $ext;
-                $dest = __DIR__ . '/assets/images/' . $filename;
-                if (!is_dir(__DIR__ . '/assets/images/')) {
-                    mkdir(__DIR__ . '/assets/images/', 0777, true);
-                }
-                if (move_uploaded_file($_FILES['logo']['tmp_name'], $dest)) {
-                    $logo = 'assets/images/' . $filename;
-                    $logo_query_part = ", logo=?";
-                    // Insert logo before ID in params
-                    array_splice($params, 6, 0, [$logo]);
-                }
-            }
-        }
-
-        if ($name) {
-            $stmt = db()->prepare("UPDATE outlets SET name=?, phone=?, address=?, ctr_number=?, vat_number=?, status=? $logo_query_part WHERE id=?");
-            $stmt->execute($params);
-            redirectWithMessage("Outlet updated successfully!", "index.php?page=outlets");
-        }
-    }
-    if (isset($_POST['delete_outlet']) && ($_SESSION['user_role_name'] ?? '') === 'Administrator') {
-        $id = (int)$_POST['id'];
-        $stmt = db()->prepare("DELETE FROM outlets WHERE id=?");
-        $stmt->execute([$id]);
-        redirectWithMessage("Outlet deleted successfully!", "index.php?page=outlets");
-    }
-
-    // --- Data Synchronization Handler ---
-    if (isset($_POST['perform_data_sync']) && ($_SESSION['user_role_name'] ?? '') === 'Administrator') {
-        $source_id = (int)$_POST['source_outlet_id'];
-        $target_id = (int)$_POST['target_outlet_id'];
-        
-        if ($source_id === $target_id) {
-            redirectWithMessage("Source and target outlet must be different.", "index.php?page=data_sync");
-        }
-
-        $db = db();
-        $db->beginTransaction();
-        try {
-            // 1. Sync & Map Categories
-            $cat_map = [];
-            if (isset($_POST['sync_categories'])) {
-                $source_cats = $db->prepare("SELECT * FROM _stock_categories WHERE outlet_id = ?");
-                $source_cats->execute([$source_id]);
-                foreach ($source_cats->fetchAll() as $cat) {
-                    $stmt = $db->prepare("INSERT INTO _stock_categories (outlet_id, name_en, name_ar) VALUES (?, ?, ?) ON DUPLICATE KEY UPDATE name_ar = VALUES(name_ar)");
-                    $stmt->execute([$target_id, $cat['name_en'], $cat['name_ar']]);
-                }
-            }
-            
-            // Build category map based on Name EN (unique within outlet)
-            $s_cats = $db->prepare("SELECT id, name_en FROM _stock_categories WHERE outlet_id = ?");
-            $s_cats->execute([$source_id]);
-            $source_cats_by_name = $s_cats->fetchAll(PDO::FETCH_KEY_PAIR);
-            
-            $t_cats = $db->prepare("SELECT id, name_en FROM _stock_categories WHERE outlet_id = ?");
-            $t_cats->execute([$target_id]);
-            $target_cats_by_name = array_flip($t_cats->fetchAll(PDO::FETCH_KEY_PAIR));
-            
-            foreach ($source_cats_by_name as $sid => $name) {
-                if (isset($target_cats_by_name[$name])) {
-                    $cat_map[$sid] = $target_cats_by_name[$name];
-                }
-            }
-
-            // 2. Sync & Map Units
-            $unit_map = [];
-            if (isset($_POST['sync_units'])) {
-                $source_units = $db->prepare("SELECT * FROM _stock_units WHERE outlet_id = ?");
-                $source_units->execute([$source_id]);
-                foreach ($source_units->fetchAll() as $unit) {
-                    $stmt = $db->prepare("INSERT INTO _stock_units (outlet_id, name_en, name_ar, short_name_en, short_name_ar) VALUES (?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE name_ar = VALUES(name_ar), short_name_en = VALUES(short_name_en), short_name_ar = VALUES(short_name_ar)");
-                    $stmt->execute([$target_id, $unit['name_en'], $unit['name_ar'], $unit['short_name_en'], $unit['short_name_ar']]);
-                }
-            }
-            
-            $s_units = $db->prepare("SELECT id, name_en FROM _stock_units WHERE outlet_id = ?");
-            $s_units->execute([$source_id]);
-            $source_units_by_name = $s_units->fetchAll(PDO::FETCH_KEY_PAIR);
-            
-            $t_units = $db->prepare("SELECT id, name_en FROM _stock_units WHERE outlet_id = ?");
-            $t_units->execute([$target_id]);
-            $target_units_by_name = array_flip($t_units->fetchAll(PDO::FETCH_KEY_PAIR));
-            
-            foreach ($source_units_by_name as $sid => $name) {
-                if (isset($target_units_by_name[$name])) {
-                    $unit_map[$sid] = $target_units_by_name[$name];
-                }
-            }
-
-            // 3. Sync Items
-            if (isset($_POST['sync_items'])) {
-                $source_items = $db->prepare("SELECT * FROM _stock_items WHERE outlet_id = ?");
-                $source_items->execute([$source_id]);
-                foreach ($source_items->fetchAll() as $item) {
-                    // Check if item exists in target by SKU
-                    $check_stmt = $db->prepare("SELECT id FROM _stock_items WHERE outlet_id = ? AND sku = ?");
-                    $check_stmt->execute([$target_id, $item['sku']]);
-                    $target_item_id = $check_stmt->fetchColumn();
-
-                    $t_cat_id = $cat_map[$item['category_id']] ?? null;
-                    $t_unit_id = $unit_map[$item['unit_id']] ?? null;
-
-                    if ($target_item_id) {
-                        // Update existing: Keep stock_quantity
-                        $stmt = $db->prepare("UPDATE _stock_items SET 
-                            category_id = ?, unit_id = ?, 
-                            name_en = ?, name_ar = ?, purchase_price = ?, sale_price = ?, 
-                            min_stock_level = ?, expiry_date = ?, image_path = ?, 
-                            vat_rate = ?, is_promotion = ?, promotion_start = ?, 
-                            promotion_end = ?, promotion_percent = ? 
-                            WHERE id = ?");
-                        $stmt->execute([
-                            $t_cat_id, $t_unit_id,
-                            $item['name_en'], $item['name_ar'], $item['purchase_price'], $item['sale_price'],
-                            $item['min_stock_level'], $item['expiry_date'], $item['image_path'],
-                            $item['vat_rate'], $item['is_promotion'], $item['promotion_start'],
-                            $item['promotion_end'], $item['promotion_percent'], $target_item_id
-                        ]);
-                    } else {
-                        // Insert new: Set stock_quantity to 0
-                        $stmt = $db->prepare("INSERT INTO _stock_items 
-                            (outlet_id, category_id, unit_id, supplier_id, name_en, name_ar, sku, 
-                             purchase_price, sale_price, stock_quantity, min_stock_level, 
-                             expiry_date, image_path, vat_rate, is_promotion, promotion_start, 
-                             promotion_end, promotion_percent) 
-                            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 0, ?, ?, ?, ?, ?, ?, ?, ?)");
-                        $stmt->execute([
-                            $target_id, $t_cat_id, $t_unit_id, $item['supplier_id'],
-                            $item['name_en'], $item['name_ar'], $item['sku'],
-                            $item['purchase_price'], $item['sale_price'], 
-                            $item['min_stock_level'], $item['expiry_date'], $item['image_path'],
-                            $item['vat_rate'], $item['is_promotion'], $item['promotion_start'],
-                            $item['promotion_end'], $item['promotion_percent']
-                        ]);
-                    }
-                }
-            }
-
-            $db->commit();
-            redirectWithMessage("Data synchronization completed successfully!", "index.php?page=data_sync");
-        } catch (Exception $e) {
-            $db->rollBack();
-            redirectWithMessage("Error: " . $e->getMessage(), "index.php?page=data_sync");
-        }
-    }
-
-// --- Cash Register & Session Handlers ---
+    // --- Cash Register & Session Handlers ---
     if (isset($_POST['add_cash_register'])) {
         $name = $_POST['name'] ?? '';
         if ($name) {
@@ -3660,16 +3015,6 @@ $page_num = isset($_GET["p"]) ? (int)$_GET["p"] : 1;
 if ($page_num < 1) $page_num = 1;
 $offset = ($page_num - 1) * $limit;
 switch ($page) {
-    case 'outlets':
-        $stmt = db()->prepare("SELECT * FROM outlets ORDER BY id DESC");
-        $stmt->execute();
-        $data['outlets'] = $stmt->fetchAll();
-        break;
-    case 'data_sync':
-        $stmt = db()->prepare("SELECT * FROM outlets ORDER BY name ASC");
-        $stmt->execute();
-        $data['outlets'] = $stmt->fetchAll();
-        break;
     case 'suppliers':
         $where = ["1=1"];
         $params = [];
@@ -3769,9 +3114,6 @@ switch ($page) {
         break;
     case 'quotations':
         $where = ["1=1"];
-        if (isset($_SESSION['outlet_id'])) {
-            $where[] = "q.outlet_id = " . (int)$_SESSION['outlet_id'];
-        }
         $params = [];
         if (!empty($_GET['search'])) {
             $s = $_GET['search'];
@@ -3809,10 +3151,9 @@ switch ($page) {
         $data['total_pages'] = ceil($total_records / $limit);
         $data['current_page'] = $page_num;
 
-        $stmt = db()->prepare("SELECT q.*, c.name as customer_name, o.name as outlet_name, o.address as outlet_address, o.phone as outlet_phone, o.ctr_number as outlet_ctr_number, o.vat_number as outlet_vat_number, o.logo as outlet_logo 
+        $stmt = db()->prepare("SELECT q.*, c.name as customer_name 
                                       FROM quotations q 
                                       JOIN customers c ON q.customer_id = c.id 
-                                      LEFT JOIN outlets o ON q.outlet_id = o.id 
                                       WHERE $whereSql 
                                       ORDER BY q.id DESC
                                       LIMIT $limit OFFSET $offset");
@@ -3821,9 +3162,6 @@ switch ($page) {
         break;
     case 'lpos':
         $where = ["1=1"];
-        if (isset($_SESSION['outlet_id'])) {
-            $where[] = "q.outlet_id = " . (int)$_SESSION['outlet_id'];
-        }
         $params = [];
         if (!empty($_GET['search'])) {
             $s = $_GET['search'];
@@ -3861,10 +3199,9 @@ switch ($page) {
         $data['total_pages'] = ceil($total_records / $limit);
         $data['current_page'] = $page_num;
 
-        $stmt = db()->prepare("SELECT q.*, s.name as supplier_name, o.name as outlet_name, o.address as outlet_address, o.phone as outlet_phone 
+        $stmt = db()->prepare("SELECT q.*, s.name as supplier_name 
                                       FROM lpos q 
                                       JOIN suppliers s ON q.supplier_id = s.id 
-                                      LEFT JOIN outlets o ON q.outlet_id = o.id 
                                       WHERE $whereSql 
                                       ORDER BY q.id DESC
                                       LIMIT $limit OFFSET $offset");
@@ -3890,9 +3227,6 @@ switch ($page) {
         $cust_supplier_table = ($type === 'purchase') ? 'suppliers' : 'customers';
         
         $where = ["1=1"];
-        if (isset($_SESSION['outlet_id'])) {
-            $where[] = "v.outlet_id = " . (int)$_SESSION['outlet_id'];
-        }
         $params = [];
         
         if (!empty($_GET['search'])) {
@@ -3933,10 +3267,9 @@ switch ($page) {
         $data['total_pages'] = ceil($total_records / $limit);
         $data['current_page'] = $page_num;
 
-        $stmt = db()->prepare("SELECT v.*, c.name as customer_name, c.tax_id as customer_tax_id, c.phone as customer_phone, o.name as outlet_name, o.phone as outlet_phone, o.address as outlet_address 
+        $stmt = db()->prepare("SELECT v.*, c.name as customer_name, c.tax_id as customer_tax_id, c.phone as customer_phone 
                                FROM $table v 
                                LEFT JOIN $cust_supplier_table c ON v.$cust_supplier_col = c.id 
-                               LEFT JOIN outlets o ON v.outlet_id = o.id 
                                WHERE $whereSql 
                                ORDER BY v.id DESC LIMIT $limit OFFSET $offset");
         $stmt->execute($params);
@@ -3971,9 +3304,6 @@ switch ($page) {
 
     case 'sales_returns':
         $where = ["1=1"];
-        if (isset($_SESSION['outlet_id'])) {
-            $where[] = "sr.outlet_id = " . (int)$_SESSION['outlet_id'];
-        }
         $params = [];
         if (!empty($_GET['search'])) {
             $s = $_GET['search'];
@@ -4006,9 +3336,6 @@ switch ($page) {
 
     case 'purchase_returns':
         $where = ["1=1"];
-        if (isset($_SESSION['outlet_id'])) {
-            $where[] = "pr.outlet_id = " . (int)$_SESSION['outlet_id'];
-        }
         $params = [];
         if (!empty($_GET['search'])) {
             $s = $_GET['search'];
@@ -4082,9 +3409,6 @@ switch ($page) {
         break;
     case 'expenses':
         $where = ["1=1"];
-        if (isset($_SESSION['outlet_id'])) {
-            $where[] = "e.outlet_id = " . (int)$_SESSION['outlet_id'];
-        }
         $params = [];
         if (!empty($_GET['category_id'])) {
             $where[] = "e.category_id = ?";
@@ -4113,7 +3437,6 @@ switch ($page) {
     case 'users':
         $data['users'] = db()->query("SELECT u.*, g.name as group_name FROM users u LEFT JOIN role_groups g ON u.group_id = g.id ORDER BY u.username ASC")->fetchAll();
         $data['role_groups'] = db()->query("SELECT id, name FROM role_groups ORDER BY name ASC")->fetchAll();
-        $data['outlets'] = db()->query("SELECT id, name FROM outlets ORDER BY name ASC")->fetchAll();
         break;
     case 'backups':
         $data['backups'] = BackupService::getBackups();
@@ -4122,18 +3445,12 @@ switch ($page) {
         $data['backup_settings'] = $stmt->fetchAll(PDO::FETCH_KEY_PAIR);
         break;
     case 'accounting':
-        $limit = isset($_GET["limit"]) ? (int)$_GET["limit"] : 20;
-        $page = isset($_GET["p"]) ? (int)$_GET["p"] : 1;
-        $offset = ($page - 1) * $limit;
-        
-        $totalEntries = db()->query("SELECT COUNT(*) FROM acc_journal_entries")->fetchColumn();
-        $data["total_pages"] = ceil($totalEntries / $limit);
-        $data["current_page"] = $page;
-        
-        $data["journal_entries"] = db()->query("SELECT je.*, 
+        $data['journal_entries'] = db()->query("SELECT je.*, 
                                                 (SELECT SUM(debit) FROM acc_ledger WHERE journal_entry_id = je.id) as total_debit 
                                                 FROM acc_journal_entries je 
-                                                ORDER BY je.entry_date DESC, je.id DESC LIMIT $limit OFFSET $offset")->fetchAll();
+                                                ORDER BY je.entry_date DESC, je.id DESC LIMIT 100")->fetchAll();
+        $data['accounts'] = db()->query("SELECT * FROM acc_accounts ORDER BY code ASC")->fetchAll();
+        
         if (isset($_GET['action']) && $_GET['action'] === 'get_entry_details') {
             header('Content-Type: application/json');
             $id = (int)$_GET['id'];
@@ -4365,72 +3682,24 @@ switch ($page) {
         break;
     default:
         if (can('dashboard_view')) {
-            $out_w = isset($_SESSION['outlet_id']) ? "WHERE outlet_id = " . (int)$_SESSION['outlet_id'] : "WHERE 1=1";
-            $out_and = isset($_SESSION['outlet_id']) ? "AND outlet_id = " . (int)$_SESSION['outlet_id'] : "";
-            
-            $data['customers'] = db()->query("SELECT * FROM customers $out_w ORDER BY id DESC LIMIT 5")->fetchAll();
+            $data['customers'] = db()->query("SELECT * FROM customers ORDER BY id DESC LIMIT 5")->fetchAll();
             $data['stats'] = [
-                'total_customers' => db()->query("SELECT COUNT(*) FROM customers $out_w")->fetchColumn(),
-                'total_items' => db()->query("SELECT COUNT(*) FROM stock_items $out_w")->fetchColumn(),
-                'total_sales' => (db()->query("SELECT SUM(total_with_vat) FROM invoices $out_w")->fetchColumn() ?: 0) + (db()->query("SELECT SUM(net_amount) FROM pos_transactions WHERE status = 'completed' $out_and")->fetchColumn() ?: 0),
-                'total_received' => (db()->query("SELECT SUM(amount) FROM payments $out_w")->fetchColumn() ?: 0) + (db()->query("SELECT SUM(amount) FROM pos_payments WHERE 1=1 $out_and")->fetchColumn() ?: 0),
-                'total_purchases' => db()->query("SELECT SUM(total_with_vat) FROM purchases $out_w")->fetchColumn() ?: 0,
-                'total_paid' => db()->query("SELECT SUM(amount) FROM purchase_payments $out_w")->fetchColumn() ?: 0,
-                'expired_items' => db()->query("SELECT COUNT(*) FROM stock_items WHERE expiry_date IS NOT NULL AND expiry_date <= CURDATE() $out_and")->fetchColumn(),
-                'near_expiry_items' => db()->query("SELECT COUNT(*) FROM stock_items WHERE expiry_date IS NOT NULL AND expiry_date > CURDATE() AND expiry_date <= DATE_ADD(CURDATE(), INTERVAL 30 DAY) $out_and")->fetchColumn(),
-                'low_stock_items_count' => db()->query("SELECT COUNT(*) FROM stock_items WHERE stock_quantity <= min_stock_level $out_and")->fetchColumn(),
+                'total_customers' => db()->query("SELECT COUNT(*) FROM customers")->fetchColumn(),
+                'total_items' => db()->query("SELECT COUNT(*) FROM stock_items")->fetchColumn(),
+                'total_sales' => (db()->query("SELECT SUM(total_with_vat) FROM invoices")->fetchColumn() ?: 0) + (db()->query("SELECT SUM(net_amount) FROM pos_transactions WHERE status = 'completed'")->fetchColumn() ?: 0),
+                'total_received' => (db()->query("SELECT SUM(amount) FROM payments")->fetchColumn() ?: 0) + (db()->query("SELECT SUM(amount) FROM pos_payments")->fetchColumn() ?: 0),
+                'total_purchases' => db()->query("SELECT SUM(total_with_vat) FROM purchases")->fetchColumn() ?: 0,
+                'total_paid' => db()->query("SELECT SUM(amount) FROM purchase_payments")->fetchColumn() ?: 0,
+                'expired_items' => db()->query("SELECT COUNT(*) FROM stock_items WHERE expiry_date IS NOT NULL AND expiry_date <= CURDATE()")->fetchColumn(),
+                'near_expiry_items' => db()->query("SELECT COUNT(*) FROM stock_items WHERE expiry_date IS NOT NULL AND expiry_date > CURDATE() AND expiry_date <= DATE_ADD(CURDATE(), INTERVAL 30 DAY)")->fetchColumn(),
+                'low_stock_items_count' => db()->query("SELECT COUNT(*) FROM stock_items WHERE stock_quantity <= min_stock_level")->fetchColumn(),
             ];
             $data['stats']['total_receivable'] = $data['stats']['total_sales'] - $data['stats']['total_received'];
             $data['stats']['total_payable'] = $data['stats']['total_purchases'] - $data['stats']['total_paid'];
 
-            // Sales Chart Data (Invoices + POS)
-            $data['monthly_sales'] = db()->query("
-                SELECT label, SUM(tot) as total FROM (
-                    SELECT DATE_FORMAT(invoice_date, '%M %Y') as label, total_with_vat as tot, DATE_FORMAT(invoice_date, '%Y-%m') as sort_col FROM invoices $out_w
-                    UNION ALL
-                    SELECT DATE_FORMAT(created_at, '%M %Y') as label, net_amount as tot, DATE_FORMAT(created_at, '%Y-%m') as sort_col FROM pos_transactions WHERE status = 'completed' $out_and
-                ) t 
-                GROUP BY label, sort_col 
-                ORDER BY sort_col ASC LIMIT 12
-            ")->fetchAll(PDO::FETCH_ASSOC);
-
-            $data['yearly_sales'] = db()->query("
-                SELECT label, SUM(tot) as total FROM (
-                    SELECT YEAR(invoice_date) as label, total_with_vat as tot FROM invoices $out_w
-                    UNION ALL
-                    SELECT YEAR(created_at) as label, net_amount as tot FROM pos_transactions WHERE status = 'completed' $out_and
-                ) t 
-                GROUP BY label 
-                ORDER BY label ASC LIMIT 5
-            ")->fetchAll(PDO::FETCH_ASSOC);
-
-            // Cash Flow Data (Income vs Expense - last 6 months)
-            $data['cash_flow'] = db()->query("
-                SELECT m.sort_col, m.label,
-                    (
-                        SELECT COALESCE(SUM(amount), 0) FROM payments WHERE DATE_FORMAT(payment_date, '%Y-%m') = m.sort_col $out_and
-                    ) + (
-                        SELECT COALESCE(SUM(amount), 0) FROM pos_payments WHERE DATE_FORMAT(created_at, '%Y-%m') = m.sort_col $out_and
-                    ) as income,
-                    (
-                        SELECT COALESCE(SUM(amount), 0) FROM expenses WHERE DATE_FORMAT(expense_date, '%Y-%m') = m.sort_col $out_and
-                    ) + (
-                        SELECT COALESCE(SUM(amount), 0) FROM purchase_payments WHERE DATE_FORMAT(payment_date, '%Y-%m') = m.sort_col $out_and
-                    ) + (
-                        SELECT COALESCE(SUM(net_salary), 0) FROM hr_payroll WHERE DATE_FORMAT(payment_date, '%Y-%m') = m.sort_col $out_and
-                    ) as expense
-                FROM (
-                    SELECT DISTINCT DATE_FORMAT(dt, '%Y-%m') as sort_col, DATE_FORMAT(dt, '%M %Y') as label
-                    FROM (
-                        SELECT payment_date as dt FROM payments $out_w
-                        UNION SELECT created_at as dt FROM pos_payments $out_w
-                        UNION SELECT expense_date as dt FROM expenses $out_w
-                        UNION SELECT payment_date as dt FROM purchase_payments $out_w
-                    ) dates
-                ) m
-                ORDER BY m.sort_col DESC LIMIT 6
-            ")->fetchAll(PDO::FETCH_ASSOC);
-            $data['cash_flow'] = array_reverse($data['cash_flow']); // Chronological order
+            // Sales Chart Data
+            $data['monthly_sales'] = db()->query("SELECT DATE_FORMAT(invoice_date, '%M %Y') as label, SUM(total_with_vat) as total FROM invoices GROUP BY DATE_FORMAT(invoice_date, '%Y-%m') ORDER BY invoice_date ASC LIMIT 12")->fetchAll(PDO::FETCH_ASSOC);
+            $data['yearly_sales'] = db()->query("SELECT YEAR(invoice_date) as label, SUM(total_with_vat) as total FROM invoices GROUP BY label ORDER BY label ASC LIMIT 5")->fetchAll(PDO::FETCH_ASSOC);
         }
         break;
 }
@@ -4458,8 +3727,6 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
     <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script src="https://cdn.jsdelivr.net/npm/jsbarcode@3.11.5/dist/JsBarcode.all.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/html2pdf.js/0.10.1/html2pdf.bundle.min.js"></script>
-    
     <script src="assets/js/main.js?v=<?= time() ?>"></script>
     <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;600;700&display=swap" rel="stylesheet">
     <link rel="stylesheet" href="assets/css/custom.css?v=<?= time() ?>">
@@ -4573,71 +3840,6 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
             body { font-size: 12px !important; color: #000 !important; background: #fff !important; }
             @page { margin: 1cm; }
         }
-
-            /* Thermal Receipt Layout */
-            .thermal-receipt {
-                width: 300px;
-                margin: 0 auto;
-                background: #fff;
-                color: #000;
-                font-family: 'Courier New', Courier, monospace;
-                font-size: 12px;
-                line-height: 1.4;
-                padding: 10px;
-            }
-            .thermal-receipt .center {
-                text-align: center;
-            }
-            .thermal-receipt .separator {
-                border-bottom: 1px dashed #000;
-                margin: 8px 0;
-            }
-            .thermal-receipt table {
-                width: 100%;
-                border-collapse: collapse;
-            }
-            .thermal-receipt table th, .thermal-receipt table td {
-                padding: 4px 2px;
-                text-align: left;
-                vertical-align: top;
-            }
-            .thermal-receipt table th {
-                border-bottom: 1px dashed #000;
-                font-weight: bold;
-            }
-            .thermal-receipt .total-row {
-                font-weight: bold;
-                font-size: 14px;
-                border-top: 1px dashed #000;
-                border-bottom: 1px dashed #000;
-                padding: 5px 0;
-                margin: 5px 0;
-            }
-            .thermal-receipt.rtl {
-                direction: rtl;
-                text-align: right;
-            }
-            .thermal-receipt.rtl table th, .thermal-receipt.rtl table td {
-                text-align: right;
-            }
-            @media print {
-                body.printing-receipt {
-                    background: none;
-                }
-                body.printing-receipt .thermal-receipt-print {
-                    width: 100% !important;
-                    max-width: 300px; /* typically 80mm thermal paper width */
-                    margin: 0;
-                    padding: 0;
-                }
-                body.printing-receipt #posPrintArea {
-                    position: absolute;
-                    top: 0;
-                    left: 0;
-                    width: 100%;
-                }
-            }
-
         .print-only { display: none; }
         [dir="rtl"] { font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; }
     </style>
@@ -4894,20 +4096,12 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
         <?php endif; ?>
 
         <!-- Administrations Section -->
-        <?php if (can('users_view') || ($_SESSION['user_role_name'] ?? '') === 'Administrator'): ?>
-        <div class="nav-section-title px-4 mt-3 mb-1 text-uppercase text-muted <?= !in_array($page, ['role_groups', 'users', 'cash_registers', 'register_sessions', 'scale_devices', 'backups', 'customer_display_settings', 'outlets']) ? 'collapsed' : '' ?>" data-bs-toggle="collapse" data-bs-target="#admin-collapse">
+        <?php if (can('users_view')): ?>
+        <div class="nav-section-title px-4 mt-3 mb-1 text-uppercase text-muted <?= !in_array($page, ['role_groups', 'users', 'cash_registers', 'register_sessions', 'scale_devices', 'backups', 'customer_display_settings']) ? 'collapsed' : '' ?>" data-bs-toggle="collapse" data-bs-target="#admin-collapse">
             <span><i class="fas fa-user-gear group-icon"></i><span><?= __('admin') ?></span></span>
             <i class="fas fa-chevron-down chevron"></i>
         </div>
-        <div class="collapse <?= in_array($page, ['role_groups', 'users', 'cash_registers', 'register_sessions', 'scale_devices', 'backups', 'customer_display_settings', 'outlets']) ? 'show' : '' ?>" id="admin-collapse">
-            <?php if (($_SESSION['user_role_name'] ?? '') === 'Administrator'): ?>
-            <a href="index.php?page=outlets" class="nav-link <?= $page === 'outlets' ? 'active' : '' ?>">
-                <i class="fas fa-shop"></i> <span>Outlets</span>
-            </a>
-            <a href="index.php?page=data_sync" class="nav-link <?= $page === 'data_sync' ? 'active' : '' ?>">
-                <i class="fas fa-sync"></i> <span>Data Sync</span>
-            </a>
-            <?php endif; ?>
+        <div class="collapse <?= in_array($page, ['role_groups', 'users', 'cash_registers', 'register_sessions', 'scale_devices', 'backups', 'customer_display_settings']) ? 'show' : '' ?>" id="admin-collapse">
             <a href="index.php?page=role_groups" class="nav-link <?= $page === 'role_groups' ? 'active' : '' ?>">
                 <i class="fas fa-user-shield"></i> <span><?= __('role_groups') ?></span>
             </a>
@@ -4932,21 +4126,12 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
         </div>
         <?php endif; ?>
 
-        <!-- Tools Section -->
-        <a href="price_checker.php" target="_blank" class="nav-link">
-            <i class="fas fa-barcode"></i> <span>Price Checker</span>
-        </a>
-
-        <!-- Help Section -->
-        <a href="index.php?page=help" class="nav-link <?= $page === 'help' ? 'active' : '' ?>">
-            <i class="fas fa-question-circle"></i> <span><?= __('help') ?></span>
-        </a>
-
         <!-- Version & Logs -->
         <div class="mt-5 px-4 pb-4 border-top pt-4 sidebar-footer">
             <div class="text-muted small fw-bold mb-1">Accounting System</div>
             <div class="d-flex align-items-center justify-content-between text-muted small mb-2">
                 <span><i class="bi bi-info-circle me-1"></i> v1.2.5</span>
+                <span class="badge bg-success-subtle text-success border border-success-subtle rounded-pill">Stable</span>
             </div>
             <a href="?page=logs" class="text-decoration-none text-muted small d-block">
                 <i class="bi bi-journal-text me-1"></i> <span>System Logs</span>
@@ -5000,36 +4185,6 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                 </div>
             </div>
             <?php endif; ?>
-            <?php 
-            $is_admin = ($_SESSION['user_role_name'] ?? '') === 'Administrator';
-            $assigned_outlets_str = $_SESSION['assigned_outlets'] ?? '';
-            $assigned_outlets_arr = array_filter(explode(',', $assigned_outlets_str));
-            if ($is_admin || count($assigned_outlets_arr) > 1): 
-                if ($is_admin) {
-                    $outlets = db()->query("SELECT * FROM outlets WHERE status = 'active'")->fetchAll(PDO::FETCH_ASSOC);
-                } else {
-                    $in_clause = implode(',', array_map('intval', $assigned_outlets_arr));
-                    $outlets = db()->query("SELECT * FROM outlets WHERE status = 'active' AND id IN ($in_clause)")->fetchAll(PDO::FETCH_ASSOC);
-                }
-                $cur_out = $_SESSION['outlet_id'] ?? 0;
-                $cur_name = $is_admin ? 'All Outlets' : (count($outlets) > 0 ? $outlets[0]['name'] : 'Select Outlet');
-                foreach ($outlets as $o) { if ($o['id'] == $cur_out) $cur_name = $o['name']; }
-            ?>
-            <div class="dropdown me-3">
-                <button class="btn btn-outline-primary btn-sm dropdown-toggle" type="button" data-bs-toggle="dropdown">
-                    <i class="bi bi-shop"></i> <span class="d-none d-md-inline"><?= htmlspecialchars($cur_name) ?></span>
-                </button>
-                <ul class="dropdown-menu shadow-sm border-0">
-                    <?php if ($is_admin): ?>
-                    <li><a class="dropdown-item <?= $cur_out == 0 ? 'active' : '' ?>" href="index.php?action=switch_outlet&id=0">All Outlets</a></li>
-                    <li><hr class="dropdown-divider"></li>
-                    <?php endif; ?>
-                    <?php foreach ($outlets as $o): ?>
-                        <li><a class="dropdown-item <?= $cur_out == $o['id'] ? 'active' : '' ?>" href="index.php?action=switch_outlet&id=<?= $o['id'] ?>"><?= htmlspecialchars($o['name']) ?></a></li>
-                    <?php endforeach; ?>
-                </ul>
-            </div>
-            <?php endif; ?>
             <div class="dropdown me-3">
                 <button class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" data-bs-toggle="dropdown">
                     <i class="bi bi-palette"></i> <span><?= $lang === 'ar' ? 'المظهر' : 'Theme' ?></span>
@@ -5255,31 +4410,20 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
     </div>
 
     <div class="row g-4 mb-4">
-        <div class="col-md-7">
-            <div class="card p-4 h-100 shadow-sm border-0" style="border-radius: 12px;">
+        <div class="col-12">
+            <div class="card p-4">
                 <div class="d-flex justify-content-between align-items-center mb-4">
-                    <h5 class="m-0 fw-bold text-dark" data-en="Sales Trend" data-ar="اتجاه المبيعات">Sales Trend</h5>
-                    <div class="btn-group btn-group-sm shadow-sm">
+                    <h5 class="m-0" data-en="Sales Performance" data-ar="أداء المبيعات">Sales Performance</h5>
+                    <div class="btn-group btn-group-sm">
                         <button type="button" class="btn btn-outline-primary active" id="btnMonthly" data-en="Monthly" data-ar="شهري">Monthly</button>
                         <button type="button" class="btn btn-outline-primary" id="btnYearly" data-en="Yearly" data-ar="سنوي">Yearly</button>
                     </div>
                 </div>
-                <div style="height: 300px; position: relative;">
+                <div style="height: 300px;">
                     <canvas id="salesChart"></canvas>
                 </div>
             </div>
         </div>
-        <div class="col-md-5">
-            <div class="card p-4 h-100 shadow-sm border-0" style="border-radius: 12px;">
-                <div class="d-flex justify-content-between align-items-center mb-4">
-                    <h5 class="m-0 fw-bold text-dark" data-en="Cash Flow Overview" data-ar="نظرة عامة على التدفق النقدي">Cash Flow Overview</h5>
-                    <span class="badge bg-light text-muted border" data-en="Last 6 Months" data-ar="آخر 6 أشهر">Last 6 Months</span>
-                </div>
-                <div style="height: 300px; position: relative;">
-                    <canvas id="cashFlowChart"></canvas>
-                </div>
-            </div>
-        </div>
     </div>
 
     <div class="row">
@@ -5345,224 +4489,6 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
         <h1 class="display-4 fw-bold text-muted text-center mt-3"><?= htmlspecialchars($data['settings']['company_name'] ?? 'Company Name') ?></h1>
     </div>
     <?php endif; ?>
-    <?php elseif ($page === 'outlets' && ($_SESSION['user_role_name'] ?? '') === 'Administrator'): ?>
-        <div class="card border-0 shadow-sm rounded-4 mb-4">
-            <div class="card-header bg-white border-bottom-0 pt-4 pb-0 px-4 d-flex justify-content-between align-items-center">
-                <h5 class="fw-bold mb-0"><i class="bi bi-shop text-primary me-2"></i> Manage Outlets</h5>
-                <button class="btn btn-primary rounded-pill px-3 py-2" data-bs-toggle="modal" data-bs-target="#addOutletModal">
-                    <i class="bi bi-plus-lg me-1"></i> Add Outlet
-                </button>
-            </div>
-            <div class="card-body p-4">
-                <div class="table-responsive">
-                    <table class="table table-hover align-middle mb-0">
-                        <thead class="table-light">
-                            <tr>
-                                <th>ID</th>
-                                <th>Logo</th>
-                                <th>Name</th>
-                                <th>Details</th>
-                                <th>Address</th>
-                                <th>Status</th>
-                                <th class="text-end">Actions</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <?php foreach ($data['outlets'] as $o): ?>
-                                <tr>
-                                    <td>#<?= $o['id'] ?></td>
-                                    <td>
-                                        <?php if ($o['logo']): ?>
-                                            <img src="<?= htmlspecialchars($o['logo']) ?>" alt="Logo" class="rounded" style="max-height: 40px; max-width: 80px; object-fit: contain;">
-                                        <?php else: ?>
-                                            <span class="text-muted small">-</span>
-                                        <?php endif; ?>
-                                    </td>
-                                    <td class="fw-semibold text-dark"><?= htmlspecialchars($o['name']) ?></td>
-                                    <td class="text-muted small">
-                                        <div><i class="bi bi-telephone text-muted"></i> <?= htmlspecialchars($o['phone'] ?: '-') ?></div>
-                                        <?php if ($o['ctr_number']): ?><div><strong>CTR:</strong> <?= htmlspecialchars($o['ctr_number']) ?></div><?php endif; ?>
-                                        <?php if ($o['vat_number']): ?><div><strong>VAT:</strong> <?= htmlspecialchars($o['vat_number']) ?></div><?php endif; ?>
-                                    </td>
-                                    <td class="text-muted small"><?= htmlspecialchars($o['address'] ?: '-') ?></td>
-                                    <td><span class="badge bg-<?= $o['status'] === 'active' ? 'success' : 'secondary' ?> bg-opacity-10 text-<?= $o['status'] === 'active' ? 'success' : 'secondary' ?> rounded-pill px-2"><?= ucfirst($o['status']) ?></span></td>
-                                    <td class="text-end">
-                                        <button class="btn btn-light btn-sm rounded-circle me-1" onclick="editOutlet(<?= htmlspecialchars(json_encode($o)) ?>)" title="Edit">
-                                            <i class="bi bi-pencil"></i>
-                                        </button>
-                                        <?php if ($o['id'] !== 1): ?>
-                                        <form method="POST" class="d-inline" onsubmit="return confirm('Are you sure you want to delete this outlet?');">
-                                            <input type="hidden" name="id" value="<?= $o['id'] ?>">
-                                            <button type="submit" name="delete_outlet" class="btn btn-light btn-sm rounded-circle text-danger" title="Delete">
-                                                <i class="bi bi-trash"></i>
-                                            </button>
-                                        </form>
-                                        <?php endif; ?>
-                                    </td>
-                                </tr>
-                            <?php endforeach; ?>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-
-        <!-- Add/Edit Modal -->
-        <div class="modal fade" id="addOutletModal" tabindex="-1">
-            <div class="modal-dialog modal-dialog-centered">
-                <div class="modal-content border-0 shadow rounded-4">
-                    <form method="POST" enctype="multipart/form-data">
-                        <input type="hidden" name="id" id="outlet_id">
-                        <div class="modal-header border-bottom-0 pb-0">
-                            <h5 class="modal-title fw-bold" id="outletModalTitle">Add Outlet</h5>
-                            <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
-                        </div>
-                        <div class="modal-body p-4">
-                            <div class="mb-3">
-                                <label class="form-label small fw-semibold text-muted">Name</label>
-                                <input type="text" name="name" id="outlet_name" class="form-control rounded-3" required>
-                            </div>
-                            <div class="row">
-                                <div class="col-md-6 mb-3">
-                                    <label class="form-label small fw-semibold text-muted">Phone</label>
-                                    <input type="text" name="phone" id="outlet_phone" class="form-control rounded-3">
-                                </div>
-                                <div class="col-md-6 mb-3">
-                                    <label class="form-label small fw-semibold text-muted">CTR Number</label>
-                                    <input type="text" name="ctr_number" id="outlet_ctr_number" class="form-control rounded-3">
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="col-md-6 mb-3">
-                                    <label class="form-label small fw-semibold text-muted">VAT Number</label>
-                                    <input type="text" name="vat_number" id="outlet_vat_number" class="form-control rounded-3">
-                                </div>
-                                <div class="col-md-6 mb-3">
-                                    <label class="form-label small fw-semibold text-muted">Logo Image</label>
-                                    <input type="file" name="logo" id="outlet_logo" class="form-control rounded-3" accept="image/*">
-                                </div>
-                            </div>
-                            <div class="mb-3">
-                                <label class="form-label small fw-semibold text-muted">Address</label>
-                                <textarea name="address" id="outlet_address" class="form-control rounded-3" rows="2"></textarea>
-                            </div>
-                            <div class="mb-0">
-                                <label class="form-label small fw-semibold text-muted">Status</label>
-                                <select name="status" id="outlet_status" class="form-select rounded-3">
-                                    <option value="active">Active</option>
-                                    <option value="inactive">Inactive</option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="modal-footer border-top-0 pt-0">
-                            <button type="button" class="btn btn-light rounded-pill px-4" data-bs-dismiss="modal">Cancel</button>
-                            <button type="submit" name="add_outlet" id="outletSubmitBtn" class="btn btn-primary rounded-pill px-4">Save Outlet</button>
-                        </div>
-                    </form>
-                </div>
-            </div>
-        </div>
-        <script>
-            function editOutlet(o) {
-                document.getElementById('outlet_id').value = o.id;
-                document.getElementById('outlet_name').value = o.name;
-                document.getElementById('outlet_phone').value = o.phone || '';
-                document.getElementById('outlet_ctr_number').value = o.ctr_number || '';
-                document.getElementById('outlet_vat_number').value = o.vat_number || '';
-                document.getElementById('outlet_address').value = o.address || '';
-                document.getElementById('outlet_status').value = o.status;
-                document.getElementById('outlet_logo').value = '';
-                document.getElementById('outletModalTitle').innerText = 'Edit Outlet';
-                document.getElementById('outletSubmitBtn').name = 'edit_outlet';
-                document.getElementById('outletSubmitBtn').innerText = 'Update Outlet';
-                new bootstrap.Modal(document.getElementById('addOutletModal')).show();
-            }
-            document.getElementById('addOutletModal').addEventListener('hidden.bs.modal', function () {
-                document.getElementById('outlet_id').value = '';
-                document.getElementById('outlet_name').value = '';
-                document.getElementById('outlet_phone').value = '';
-                document.getElementById('outlet_ctr_number').value = '';
-                document.getElementById('outlet_vat_number').value = '';
-                document.getElementById('outlet_address').value = '';
-                document.getElementById('outlet_logo').value = '';
-                document.getElementById('outlet_status').value = 'active';
-                document.getElementById('outletModalTitle').innerText = 'Add Outlet';
-                document.getElementById('outletSubmitBtn').name = 'add_outlet';
-                document.getElementById('outletSubmitBtn').innerText = 'Save Outlet';
-            });
-        </script>
-
-    <?php elseif ($page === 'data_sync' && ($_SESSION['user_role_name'] ?? '') === 'Administrator'): ?>
-        <div class="container-fluid p-0">
-            <div class="d-flex justify-content-between align-items-center mb-4">
-                <h2 class="h4 mb-0" data-en="Data Synchronization" data-ar="مزامنة البيانات">Data Synchronization</h2>
-            </div>
-
-            <div class="card border-0 shadow-sm rounded-4">
-                <div class="card-body p-4">
-                    <form method="POST">
-                        <div class="row g-4">
-                            <div class="col-md-6">
-                                <label class="form-label fw-bold" data-en="Source Outlet" data-ar="الفرع المصدر">Source Outlet</label>
-                                <select name="source_outlet_id" class="form-select form-select-lg" required>
-                                    <option value="">-- Select Source --</option>
-                                    <?php foreach ($data['outlets'] as $o): ?>
-                                        <option value="<?= $o['id'] ?>"><?= htmlspecialchars($o['name']) ?></option>
-                                    <?php endforeach; ?>
-                                </select>
-                                <div class="form-text mt-2" data-en="Data will be copied FROM this outlet." data-ar="سيتم نسخ البيانات من هذا الفرع.">Data will be copied FROM this outlet.</div>
-                            </div>
-                            <div class="col-md-6">
-                                <label class="form-label fw-bold" data-en="Target Outlet" data-ar="الفرع الهدف">Target Outlet</label>
-                                <select name="target_outlet_id" class="form-select form-select-lg" required>
-                                    <option value="">-- Select Target --</option>
-                                    <?php foreach ($data['outlets'] as $o): ?>
-                                        <option value="<?= $o['id'] ?>"><?= htmlspecialchars($o['name']) ?></option>
-                                    <?php endforeach; ?>
-                                </select>
-                                <div class="form-text mt-2" data-en="Data will be copied TO this outlet." data-ar="سيتم نسخ البيانات إلى هذا الفرع.">Data will be copied TO this outlet.</div>
-                            </div>
-                            
-                            <div class="col-12">
-                                <hr class="my-4">
-                                <h5 class="mb-3" data-en="Select Data to Sync" data-ar="اختر البيانات للمزامنة">Select Data to Sync</h5>
-                                <div class="form-check mb-2">
-                                    <input class="form-check-input" type="checkbox" name="sync_categories" id="sync_categories" checked>
-                                    <label class="form-check-label" for="sync_categories" data-en="Stock Categories" data-ar="فئات المخزون">Stock Categories</label>
-                                </div>
-                                <div class="form-check mb-2">
-                                    <input class="form-check-input" type="checkbox" name="sync_units" id="sync_units" checked>
-                                    <label class="form-check-label" for="sync_units" data-en="Stock Units" data-ar="وحدات المخزون">Stock Units</label>
-                                </div>
-                                <div class="form-check mb-2">
-                                    <input class="form-check-input" type="checkbox" name="sync_items" id="sync_items" checked>
-                                    <label class="form-check-label" for="sync_items" data-en="Stock Items" data-ar="أصناف المخزون">Stock Items</label>
-                                </div>
-                            </div>
-
-                            <div class="col-12 mt-4">
-                                <div class="alert alert-info border-0 shadow-sm">
-                                    <i class="bi bi-info-circle me-2"></i>
-                                    <span data-en="Note: For items, if they already exist in the target outlet (by SKU), their details will be updated but stock quantity will remain unchanged. If they are new, stock quantity will be set to 0." 
-                                          data-ar="ملاحظة: بالنسبة للأصناف، إذا كانت موجودة بالفعل في الفرع الهدف (عن طريق SKU)، فسيتم تحديث تفاصيلها ولكن ستبقى كمية المخزون دون تغيير. إذا كانت جديدة، فسيتم تعيين كمية المخزون إلى 0.">
-                                        Note: For items, if they already exist in the target outlet (by SKU), their details will be updated but stock quantity will remain unchanged. If they are new, stock quantity will be set to 0.
-                                    </span>
-                                </div>
-                            </div>
-
-                            <div class="col-12 mt-4 text-end">
-                                <button type="submit" name="perform_data_sync" class="btn btn-primary btn-lg px-5 rounded-pill" 
-                                        onclick="return confirm('Are you sure you want to sync data? This operation cannot be undone.')">
-                                    <i class="bi bi-arrow-repeat me-2"></i>
-                                    <span data-en="Start Synchronization" data-ar="بدء المزامنة">Start Synchronization</span>
-                                </button>
-                            </div>
-                        </div>
-                    </form>
-                </div>
-            </div>
-        </div>
-
     <?php elseif ($page === 'customers' || $page === 'suppliers'): ?>
     <div class="card p-4">
         <div class="d-flex justify-content-between align-items-center mb-4">
@@ -5668,11 +4594,11 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                             <div class="modal fade" id="editCustomerModal<?= $c['id'] ?>" tabindex="-1">
                                 <div class="modal-dialog">
                                     <div class="modal-content border-0 shadow text-start">
-                                        <div class="modal-header bg-primary">
-                                            <h5 class="modal-title text-white">
+                                        <div class="modal-header">
+                                            <h5 class="modal-title">
                                                 <span data-en="Edit <?= $currTitle['en'] ?>" data-ar="تعديل <?= $currTitle['ar'] ?>">Edit <?= $currTitle['en'] ?></span>
                                             </h5>
-                                            <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                                            <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                                         </div>
                                         <form method="POST">
                                             <input type="hidden" name="id" value="<?= $c['id'] ?>">
@@ -5766,9 +4692,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                             <div class="modal fade" id="editCatModal<?= $cat['id'] ?>" tabindex="-1">
                                 <div class="modal-dialog">
                                     <div class="modal-content text-start">
-                                        <div class="modal-header bg-primary">
-                                            <h5 class="modal-title text-white">Edit Category</h5>
-                                            <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                                        <div class="modal-header">
+                                            <h5 class="modal-title">Edit Category</h5>
+                                            <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                                         </div>
                                         <form method="POST">
                                             <input type="hidden" name="id" value="<?= $cat['id'] ?>">
@@ -5863,9 +4789,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                             <div class="modal fade" id="editUnitModal<?= $u['id'] ?>" tabindex="-1">
                                 <div class="modal-dialog">
                                     <div class="modal-content text-start">
-                                        <div class="modal-header bg-primary">
-                                            <h5 class="modal-title text-white">Edit Unit</h5>
-                                            <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                                        <div class="modal-header">
+                                            <h5 class="modal-title">Edit Unit</h5>
+                                            <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                                         </div>
                                         <form method="POST">
                                             <input type="hidden" name="id" value="<?= $u['id'] ?>">
@@ -6003,7 +4929,7 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                 <tbody>
                     <?php foreach ($data['items'] as $item): ?>
                     <tr>
-                        <td><input type="checkbox" class="form-check-input item-checkbox" data-id="<?= $item['id'] ?>" data-sku="<?= htmlspecialchars($item['sku']) ?>" data-name-en="<?= htmlspecialchars($item['name_en']) ?>" data-name-ar="<?= htmlspecialchars($item['name_ar']) ?>" data-price="<?= number_format((float)$item['sale_price'] * (1 + (float)($item['vat_rate'] ?? 0) / 100), 3) ?>"></td>
+                        <td><input type="checkbox" class="form-check-input item-checkbox" data-id="<?= $item['id'] ?>" data-sku="<?= htmlspecialchars($item['sku']) ?>" data-name="<?= htmlspecialchars($item['name_en'] . ' - ' . $item['name_ar']) ?>" data-price="<?= number_format((float)$item['sale_price'] * (1 + (float)($item['vat_rate'] ?? 0) / 100), 3) ?>"></td>
                         <td>
                             <?php if ($item['image_path']): ?>
                                 <img src="<?= htmlspecialchars($item['image_path']) ?>" alt="item" style="width: 40px; height: 40px; object-fit: cover;" class="rounded">
@@ -6040,7 +4966,7 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                             <div class="btn-group btn-group-sm">
                                 <button class="btn btn-outline-info" title="View" data-bs-toggle="modal" data-bs-target="#viewItemModal<?= $item['id'] ?>"><i class="bi bi-eye"></i></button>
                                 <button class="btn btn-outline-primary" title="Edit" data-bs-toggle="modal" data-bs-target="#editItemModal<?= $item['id'] ?>"><i class="bi bi-pencil"></i></button>
-                                <button class="btn btn-outline-dark" title="Barcode" onclick="printItemBarcode('<?= htmlspecialchars($item['sku']) ?>', '<?= htmlspecialchars($item['name_en']) ?>', '<?= htmlspecialchars($item['name_ar']) ?>', '<?= number_format((float)$item['sale_price'] * (1 + (float)($item['vat_rate'] ?? 0) / 100), 3) ?>')"><i class="bi bi-upc"></i></button>
+                                <button class="btn btn-outline-dark" title="Barcode" onclick="printItemBarcode('<?= htmlspecialchars($item['sku']) ?>', '<?= htmlspecialchars($item['name_en'] . ' - ' . $item['name_ar']) ?>', '<?= number_format((float)$item['sale_price'] * (1 + (float)($item['vat_rate'] ?? 0) / 100), 3) ?>')"><i class="bi bi-upc"></i></button>
                                 <form method="POST" class="d-inline" onsubmit="return confirm('Are you sure?')">
                                     <input type="hidden" name="id" value="<?= $item['id'] ?>">
                                     <button type="submit" name="delete_item" class="btn btn-outline-danger" title="Delete"><i class="bi bi-trash"></i></button>
@@ -6051,9 +4977,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                             <div class="modal fade" id="viewItemModal<?= $item['id'] ?>" tabindex="-1">
                                 <div class="modal-dialog">
                                     <div class="modal-content border-0 shadow">
-                                        <div class="modal-header bg-primary">
-                                            <h5 class="modal-title text-white"><?= htmlspecialchars((string)($item['name_en'] ?? '')) ?></h5>
-                                            <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                                        <div class="modal-header">
+                                            <h5 class="modal-title"><?= htmlspecialchars((string)($item['name_en'] ?? '')) ?></h5>
+                                            <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                                         </div>
                                         <div class="modal-body">
                                             <div class="text-center mb-3">
@@ -6077,7 +5003,7 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
         
 
                                         <div class="modal-footer">
-                                            <button class="btn btn-outline-dark" onclick="printItemBarcode('<?= htmlspecialchars($item['sku']) ?>', '<?= htmlspecialchars($item['name_en']) ?>', '<?= htmlspecialchars($item['name_ar']) ?>', '<?= number_format((float)$item['sale_price'] * (1 + (float)($item['vat_rate'] ?? 0) / 100), 3) ?>')"><i class="bi bi-printer"></i> Print Barcode</button>
+                                            <button class="btn btn-outline-dark" onclick="printItemBarcode('<?= htmlspecialchars($item['sku']) ?>', '<?= htmlspecialchars($item['name_en'] . ' - ' . $item['name_ar']) ?>', '<?= number_format((float)$item['sale_price'] * (1 + (float)($item['vat_rate'] ?? 0) / 100), 3) ?>')"><i class="bi bi-printer"></i> Print Barcode</button>
                                             <button type="button" class="btn btn-light" data-bs-dismiss="modal" data-en="Close" data-ar="إغلاق">Close</button>
                                         </div>
                                     </div>
@@ -6088,9 +5014,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                             <div class="modal fade" id="editItemModal<?= $item['id'] ?>" tabindex="-1">
                                 <div class="modal-dialog modal-lg">
                                     <div class="modal-content border-0 shadow">
-                                        <div class="modal-header bg-primary">
-                                            <h5 class="modal-title text-white" data-en="Edit Item" data-ar="تعديل صنف">Edit Item</h5>
-                                            <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                                        <div class="modal-header">
+                                            <h5 class="modal-title" data-en="Edit Item" data-ar="تعديل صنف">Edit Item</h5>
+                                            <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                                         </div>
                                         <form method="POST" enctype="multipart/form-data">
                                             <input type="hidden" name="id" value="<?= $item['id'] ?>">
@@ -6114,11 +5040,22 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                                                             </button>
                                                         </div>
                                                     </div>
+...
                                                     <div class="col-md-6">
-                                                        <label class="form-label">SKU / Barcode</label>
+                                                        <label class="form-label">SKU</label>
                                                         <input type="text" name="sku" class="form-control" value="<?= htmlspecialchars((string)($item['sku'] ?? '')) ?>">
                                                     </div>
+                                                    </div>
                                                     <div class="col-md-6">
+                                                        <label class="form-label">Name (AR)</label>
+                                                        <div class="input-group">
+                                                            <input type="text" name="name_ar" id="editItemNameAr<?= $item['id'] ?>" class="form-control" value="<?= htmlspecialchars($item['name_ar']) ?>" required>
+                                                            <button class="btn btn-outline-secondary btn-translate" type="button" data-source="editItemNameEn<?= $item['id'] ?>" data-target="editItemNameAr<?= $item['id'] ?>" data-to="ar">
+                                                                <i class="bi bi-translate"></i> AR
+                                                            </button>
+                                                        </div>
+                                                    </div>
+                                                    <div class="col-md-4">
                                                         <label class="form-label" data-en="Category" data-ar="الفئة">Category</label>
                                                         <select name="category_id" class="form-select">
                                                             <option value="">---</option>
@@ -6127,7 +5064,7 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                                                             <?php endforeach; ?>
                                                         </select>
                                                     </div>
-                                                    <div class="col-md-6">
+                                                    <div class="col-md-4">
                                                         <label class="form-label">Unit</label>
                                                         <select name="unit_id" class="form-select">
                                                             <option value="">---</option>
@@ -6136,7 +5073,7 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                                                             <?php endforeach; ?>
                                                         </select>
                                                     </div>
-                                                    <div class="col-md-6">
+                                                    <div class="col-md-4">
                                                         <label class="form-label" data-en="Supplier" data-ar="المورد">Supplier</label>
                                                         <select name="supplier_id" class="form-select">
                                                             <option value="">---</option>
@@ -6145,51 +5082,45 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                                                             <?php endforeach; ?>
                                                         </select>
                                                     </div>
-                                                    <div class="col-md-6">
+                                                    <div class="col-md-3">
                                                         <label class="form-label">Sale Price</label>
                                                         <input type="number" step="0.001" name="sale_price" class="form-control" value="<?= (float)$item['sale_price'] ?>">
                                                     </div>
-                                                    <div class="col-md-6">
+                                                    <div class="col-md-3">
                                                         <label class="form-label">Purchase Price</label>
                                                         <input type="number" step="0.001" name="purchase_price" class="form-control" value="<?= (float)$item['purchase_price'] ?>">
                                                     </div>
-                                                    <div class="col-md-6">
+                                                    <div class="col-md-3">
                                                         <label class="form-label">Stock Qty</label>
                                                         <input type="number" step="0.001" name="stock_quantity" class="form-control" value="<?= (float)$item['stock_quantity'] ?>">
                                                     </div>
-                                                    <div class="col-md-6">
+                                                    <div class="col-md-3">
                                                         <label class="form-label">Min Level</label>
                                                         <input type="number" step="0.001" name="min_stock_level" class="form-control" value="<?= (float)$item['min_stock_level'] ?>">
                                                     </div>
+                                                    <div class="col-md-6">
+                                                        <label class="form-label">SKU</label>
+                                                        <input type="text" name="sku" class="form-control" value="<?= htmlspecialchars($item['sku']) ?>">
+                                                    </div>
                                                     <div class="col-md-6">
                                                         <label class="form-label">VAT Rate (%)</label>
                                                         <input type="number" step="0.01" name="vat_rate" class="form-control" value="<?= number_format((float)$item['vat_rate'], 2, '.', '') ?>">
                                                     </div>
-                                                    <div class="col-md-6">
+                                                    <div class="col-md-12">
                                                         <label class="form-label">Item Picture</label>
                                                         <input type="file" name="image" class="form-control" accept="image/*">
                                                     </div>
-                                                    <div class="col-md-6">
-                                                        <div class="form-check form-switch mt-4">
-                                                            <input class="form-check-input hasExpiryToggleEdit" type="checkbox" id="hasExpiryToggleEdit<?= $item['id'] ?>" <?= !empty($item['expiry_date']) ? 'checked' : '' ?>>
-                                                            <label class="form-check-label fw-bold" for="hasExpiryToggleEdit<?= $item['id'] ?>" data-en="Has Expiry Date?" data-ar="هل له تاريخ انتهاء؟">Has Expiry Date?</label>
-                                                        </div>
-                                                    </div>
-                                                    <div class="col-md-6 expiryDateContainerEdit" style="display: <?= !empty($item['expiry_date']) ? 'block' : 'none' ?>;">
-                                                        <label class="form-label" data-en="Expiry Date" data-ar="تاريخ الانتهاء">Expiry Date</label>
-                                                        <input type="date" name="expiry_date" class="form-control" value="<?= $item['expiry_date'] ?? '' ?>">
-                                                    </div>
-                                                    <div class="col-12 mt-3">
+                                                    <div class="col-12">
                                                         <hr>
                                                         <h6 data-en="Promotion Details" data-ar="تفاصيل العرض">Promotion Details</h6>
                                                     </div>
-                                                    <div class="col-md-12">
-                                                        <div class="form-check form-switch mt-2 mb-2">
+                                                    <div class="col-md-4">
+                                                        <div class="form-check form-switch mt-4">
                                                             <input class="form-check-input isPromotionToggleEdit" type="checkbox" name="is_promotion" value="1" <?= $item['is_promotion'] ? 'checked' : '' ?> id="isPromotionToggleEdit<?= $item['id'] ?>" data-id="<?= $item['id'] ?>">
-                                                            <label class="form-check-label fw-bold" for="isPromotionToggleEdit<?= $item['id'] ?>" data-en="On Promotion?" data-ar="في العرض؟">On Promotion?</label>
+                                                            <label class="form-check-label" for="isPromotionToggleEdit<?= $item['id'] ?>" data-en="On Promotion?" data-ar="في العرض؟">On Promotion?</label>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-12">
+                                                    <div class="col-md-8">
                                                         <div class="row g-3 promotionFieldsContainerEdit" id="promotionFieldsContainerEdit<?= $item['id'] ?>" style="display: <?= $item['is_promotion'] ? 'flex' : 'none' ?>;">
                                                             <div class="col-md-4">
                                                                 <label class="form-label">Start Date</label>
@@ -6207,9 +5138,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                                                     </div>
                                                 </div>
                                             </div>
-                                            <div class="modal-footer bg-light">
-                                                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal" data-en="Cancel" data-ar="إلغاء">Cancel</button>
-                                                <button type="submit" name="edit_item" class="btn btn-primary px-4"><i class="bi bi-save"></i> Save Changes</button>
+                                            <div class="modal-footer">
+                                                <button type="button" class="btn btn-light" data-bs-dismiss="modal" data-en="Cancel" data-ar="إلغاء">Cancel</button>
+                                                <button type="submit" name="edit_item" class="btn btn-primary">Update Item</button>
                                             </div>
                                         </form>
                                     </div>
@@ -6448,8 +5379,7 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
     $registers = db()->query("SELECT * FROM cash_registers WHERE status = 'active'")->fetchAll();
     
     $allow_zero_stock_sell = ($data['settings']['allow_zero_stock_sell'] ?? '1') === '1';
-    // Optimization: Only load top 50 products initially to prevent heavy load
-    $sql = "SELECT * FROM stock_items ORDER BY id DESC LIMIT 50";
+    $sql = "SELECT * FROM stock_items ORDER BY name_en ASC";
     $products_raw = db()->query($sql)->fetchAll(PDO::FETCH_ASSOC);
     $products = [];
     foreach ($products_raw as $p) {
@@ -6485,10 +5415,7 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                             <i class="bi bi-box-seam text-muted" style="font-size: 3rem;"></i>
                         </div>
                     <?php endif; ?>
-                    <div class="mb-1 product-name">
-                        <div class="fw-bold text-truncate" title="<?= htmlspecialchars($p['name_en']) ?>"><?= htmlspecialchars($p['name_en']) ?></div>
-                        <div class="small text-muted fw-normal text-truncate" title="<?= htmlspecialchars($p['name_ar']) ?>" dir="rtl"><?= htmlspecialchars($p['name_ar']) ?></div>
-                    </div>
+                    <div class="fw-bold mb-1 product-name" data-en="<?= htmlspecialchars($p['name_en']) ?>" data-ar="<?= htmlspecialchars($p['name_ar']) ?>"><?= htmlspecialchars($p['name_en']) ?></div>
                     <div class="small text-muted mb-2"><?= htmlspecialchars($p['sku']) ?></div>
                     <div class="d-flex justify-content-between align-items-center mt-auto">
                         <div class="d-flex flex-column">
@@ -6702,98 +5629,6 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
             this.items = this.items.filter(item => item.id !== id);
             this.render();
         },
-        setQty(id, qty) {
-            if (!this.items) return;
-            const item = this.items.find(i => i.id === id);
-            if (item) {
-                const allowZeroStock = (typeof companySettings !== 'undefined' && String(companySettings.allow_zero_stock_sell) === '1');
-                const currentStock = parseFloat(item.stock_quantity) || 0;
-                
-                if (!allowZeroStock && qty > currentStock) {
-                    Swal.fire('Error', 'Insufficient stock!', 'error');
-                    return;
-                }
-
-                item.qty = qty;
-                if (item.qty <= 0) this.remove(id);
-                else this.render();
-            }
-        },
-        async readScale(id) {
-            if (!('serial' in navigator)) {
-                Swal.fire('Error', 'Web Serial API is not supported in this browser. Please use Chrome or Edge.', 'error');
-                return;
-            }
-            try {
-                if (!this.scalePort) {
-                    this.scalePort = await navigator.serial.requestPort();
-                    await this.scalePort.open({ baudRate: 9600 });
-                } else if (!this.scalePort.readable) {
-                    await this.scalePort.open({ baudRate: 9600 });
-                }
-
-                const reader = this.scalePort.readable.getReader();
-                let accumulatedData = '';
-                
-                Swal.fire({
-                    title: 'Reading Scale...',
-                    text: 'Waiting for stable weight...',
-                    allowOutsideClick: false,
-                    didOpen: () => {
-                        Swal.showLoading();
-                    }
-                });
-
-                let weight = null;
-                const decoder = new TextDecoder('utf-8');
-                let readCount = 0;
-
-                while (readCount < 100) {
-                    const { value, done } = await Promise.race([
-                        reader.read(),
-                        new Promise((_, reject) => setTimeout(() => reject(new Error('Timeout')), 500))
-                    ]).catch(e => ({ done: true, value: null }));
-                    
-                    if (done) break;
-                    if (value) {
-                        accumulatedData += decoder.decode(value);
-                        const matches = accumulatedData.match(/[\d]+\.\d+/g);
-                        if (matches && matches.length > 0) {
-                            weight = parseFloat(matches[matches.length - 1]);
-                            if (!isNaN(weight) && weight > 0) {
-                                break;
-                            }
-                        }
-                    }
-                    readCount++;
-                }
-
-                reader.releaseLock();
-
-                if (weight !== null && weight > 0) {
-                    Swal.close();
-                    this.setQty(id, weight);
-                    Swal.fire({
-                        toast: true,
-                        position: 'top-end',
-                        icon: 'success',
-                        title: 'Weight Read: ' + weight.toFixed(3) + ' kg',
-                        showConfirmButton: false,
-                        timer: 1500
-                    });
-                } else {
-                    Swal.fire('Warning', 'Could not read a valid weight. Please try again.', 'warning');
-                }
-            } catch (err) {
-                console.error('Scale Error:', err);
-                if (err.name === 'NotFoundError') {
-                    // User cancelled the prompt
-                    return;
-                }
-                Swal.fire('Error', 'Failed to read from scale: ' + err.message, 'error');
-                this.scalePort = null;
-            }
-        },
         updateQty(id, delta) {
             if (!this.items) return;
             const item = this.items.find(i => i.id === id);
@@ -7033,9 +5868,6 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                                 <button class="qty-btn" onclick="cart.updateQty(${item.id}, -1)">-</button>
                                 <span class="small fw-bold">${qty}</span>
                                 <button class="qty-btn" onclick="cart.updateQty(${item.id}, 1)">+</button>
-                                <button class="qty-btn ms-1 bg-info text-white border-info" style="border-radius: 4px; padding: 0 6px;" onclick="cart.readScale(${item.id})" title="Read from Scale">
-                                    <i class="bi bi-speedometer2"></i>
-                                </button>
                             </div>
                             <div class="text-end" style="min-width: 80px;">
                                 <div class="fw-bold small"><?= __('currency') ?> ${itemTotal.toFixed(3)}</div>
@@ -7324,7 +6156,7 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                 if (result.success) {
                     const payModal = bootstrap.Modal.getInstance(document.getElementById('posPaymentModal'));
                     if (payModal) payModal.hide();
-                    this.showReceipt(result.invoice_id, discountAmount, loyaltyRedeemed, result.transaction_no, result.outlet_name, result.outlet_phone, result.outlet_address, result.outlet_vat_number, result.outlet_ctr_number, result.outlet_logo);
+                    this.showReceipt(result.invoice_id, discountAmount, loyaltyRedeemed, result.transaction_no);
                 } else {
                     Swal.fire('Error', result.error, 'error');
                     btn.disabled = false;
@@ -7337,7 +6169,7 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                 btn.innerText = originalText;
             }
         },
-        showReceipt(invId, discountAmount, loyaltyRedeemed, transactionNo, outletName, outletPhone, outletAddress, outletVatNumber, outletCtrNumber, outletLogo) {
+        showReceipt(invId, discountAmount, loyaltyRedeemed, transactionNo) {
             const container = document.getElementById('posReceiptContent');
             const customerSelect = document.getElementById('posCustomer');
             const customerName = (customerSelect && customerSelect.selectedIndex >= 0 && customerSelect.value !== '') ? customerSelect.options[customerSelect.selectedIndex].text : '<?= $translations['ar']['walk_in_customer'] ?> / <?= $translations['en']['walk_in_customer'] ?>';
@@ -7378,9 +6210,8 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                 return sum + ((item.price * item.qty) * (vatRate / (100 + vatRate)));
             }, 0);
             const total = subtotal - discountAmount - loyaltyRedeemed;
-            const companyName = outletName || "<?= htmlspecialchars($data['settings']['company_name'] ?? 'Accounting System') ?>";
-            const companyPhone = outletPhone || "<?= htmlspecialchars($data['settings']['company_phone'] ?? '') ?>";
-            const companyAddress = outletAddress ? outletAddress.replace(/\n/g, '<br>') : (typeof companySettings !== 'undefined' ? (companySettings.company_address || '').replace(/\n/g, '<br>') : '');
+            const companyName = "<?= htmlspecialchars($data['settings']['company_name'] ?? 'Accounting System') ?>";
+            const companyPhone = "<?= htmlspecialchars($data['settings']['company_phone'] ?? '') ?>";
             const companyVat = "<?= htmlspecialchars($data['settings']['vat_number'] ?? '') ?>";
             const companyLogo = "<?= htmlspecialchars($data['settings']['company_logo'] ?? '') ?>";
 
@@ -7389,7 +6220,6 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                     <div class="center">
                         ${companyLogo ? `<img src="${companyLogo}" alt="Logo" style="max-height: 60px; width: auto; margin-bottom: 10px; display: block; margin-left: auto; margin-right: auto;">` : ''}
                         <h5 class="mb-0 fw-bold">${companyName}</h5>
-                        ${companyAddress ? `<div>${companyAddress}</div>` : ''}
                         ${companyPhone ? `<div>هاتف / Tel: ${companyPhone}</div>` : ''}
                         ${companyVat ? `<div>الرقم الضريبي / VAT No: ${companyVat}</div>` : ''}
                         <div class="separator"></div>
@@ -7465,80 +6295,38 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
         }
     };
 
-    function attachProductClickListeners() {
-        document.querySelectorAll('.product-grid .product-card').forEach(card => {
-            card.onclick = () => {
-                const product = {
-                    id: parseInt(card.dataset.id),
-                    nameEn: card.dataset.nameEn,
-                    nameAr: card.dataset.nameAr,
-                    price: parseFloat(card.dataset.price),
-                    sku: card.dataset.sku,
-                    stock_quantity: parseFloat(card.dataset.stockQuantity),
-                    vatRate: parseFloat(card.dataset.vatRate) || 0
-                };
-                cart.add(product);
+    document.querySelectorAll('.product-card').forEach(card => {
+        card.addEventListener('click', () => {
+            const product = {
+                id: parseInt(card.dataset.id),
+                nameEn: card.dataset.nameEn,
+                nameAr: card.dataset.nameAr,
+                price: parseFloat(card.dataset.price),
+                stock_quantity: parseFloat(card.dataset.stockQuantity),
+                vatRate: parseFloat(card.dataset.vatRate) || 0
             };
+            cart.add(product);
         });
-    }
-    attachProductClickListeners();
-
-    let searchTimeout = null;
-    document.getElementById('productSearch').addEventListener('input', (e) => {
-        clearTimeout(searchTimeout);
-        const q = e.target.value.trim();
-        searchTimeout = setTimeout(async () => {
-            try {
-                const resp = await fetch('index.php?action=search_items&q=' + encodeURIComponent(q));
-                const products = await resp.json();
-                renderProductGrid(products);
-            } catch (err) { console.error(err); }
-        }, 300);
     });
 
-    function renderProductGrid(products) {
-        const grid = document.getElementById('productGrid');
-        const lang = document.documentElement.lang || 'en';
-        if (products.length === 0) {
-            grid.innerHTML = '<div class="text-center w-100 p-5 text-muted"><i class="bi bi-search mb-3 d-block" style="font-size: 3rem;"></i> No products found.</div>';
-            return;
-        }
+    document.getElementById('productSearch').addEventListener('input', (e) => {
+        const q = e.target.value.toLowerCase();
+        document.querySelectorAll('.product-grid .product-card').forEach(card => {
+            const name = card.dataset.nameEn.toLowerCase() + ' ' + card.dataset.nameAr.toLowerCase();
+            const sku = card.dataset.sku.toLowerCase();
+            if (name.includes(q) || sku.includes(q)) {
+                card.style.display = 'flex';
+            } else {
+                card.style.display = 'none';
+            }
+        });
+    });
 
-        grid.innerHTML = products.map(p => {
-            const salePrice = parseFloat(p.sale_price);
-            const originalPrice = parseFloat(p.original_price || p.sale_price);
-            const img = p.image_path ? `<img src="${p.image_path}" alt="${p.name_en}">` : `
-                <div class="bg-light d-flex align-items-center justify-content-center rounded mb-2" style="height: 120px;">
-                    <i class="bi bi-box-seam text-muted" style="font-size: 3rem;"></i>
-                </div>`;
-            const promoHtml = salePrice < originalPrice ? `<span class="text-muted smaller text-decoration-line-through">OMR ${originalPrice.toFixed(3)}</span>` : '';
-            
-            return `
-                <div class="product-card" data-id="${p.id}" data-name-en="${p.name_en}" data-name-ar="${p.name_ar}" data-price="${p.sale_price}" data-sku="${p.sku}" data-stock-quantity="${p.stock_quantity}" data-vat-rate="${p.vat_rate}">
-                    ${img}
-                    <div class="mb-1 product-name">
-                        <div class="fw-bold text-truncate" title="${p.name_en}">${p.name_en}</div>
-                        <div class="small text-muted fw-normal text-truncate" title="${p.name_ar}" dir="rtl">${p.name_ar}</div>
-                    </div>
-                    <div class="small text-muted mb-2">${p.sku}</div>
-                    <div class="d-flex justify-content-between align-items-center mt-auto">
-                        <div class="d-flex flex-column">
-                            ${promoHtml}
-                            <span class="price text-primary fw-bold">OMR ${salePrice.toFixed(3)}</span>
-                        </div>
-                        <span class="badge bg-light text-dark small">${parseFloat(p.stock_quantity)} left</span>
-                    </div>
-                </div>`;
-        }).join('');
-        attachProductClickListeners();
-    }
-
-    document.getElementById('barcodeInput').addEventListener('keypress', async (e) => {
+    document.getElementById('barcodeInput').addEventListener('keypress', (e) => {
         if (e.key === 'Enter') {
             const barcode = e.target.value.trim();
             if (!barcode) return;
             
-            // First check local DOM
             const card = Array.from(document.querySelectorAll('.product-card')).find(c => c.dataset.sku === barcode);
             if (card) {
                 const product = {
@@ -7552,31 +6340,24 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                 };
                 cart.add(product);
                 e.target.value = '';
-                Swal.fire({ toast: true, position: 'top-end', icon: 'success', title: 'Added: ' + product.nameEn, showConfirmButton: false, timer: 1000 });
+                Swal.fire({
+                    toast: true,
+                    position: 'top-end',
+                    icon: 'success',
+                    title: 'Added: ' + product.nameEn,
+                    showConfirmButton: false,
+                    timer: 1000
+                });
             } else {
-                // Not in DOM, check server
-                try {
-                    const resp = await fetch('index.php?action=search_items&q=' + encodeURIComponent(barcode));
-                    const products = await resp.json();
-                    const found = products.find(p => p.sku === barcode);
-                    if (found) {
-                        const product = {
-                            id: found.id,
-                            nameEn: found.name_en,
-                            nameAr: found.name_ar,
-                            price: parseFloat(found.sale_price),
-                            sku: found.sku,
-                            stock_quantity: parseFloat(found.stock_quantity),
-                            vatRate: parseFloat(found.vat_rate) || 0
-                        };
-                        cart.add(product);
-                        e.target.value = '';
-                        Swal.fire({ toast: true, position: 'top-end', icon: 'success', title: 'Added: ' + product.nameEn, showConfirmButton: false, timer: 1000 });
-                    } else {
-                        Swal.fire({ toast: true, position: 'top-end', icon: 'error', title: 'Product not found', showConfirmButton: false, timer: 1500 });
-                        e.target.select();
-                    }
-                } catch (err) { console.error(err); }
+                Swal.fire({
+                    toast: true,
+                    position: 'top-end',
+                    icon: 'error',
+                    title: 'Product not found',
+                    showConfirmButton: false,
+                    timer: 1500
+                });
+                e.target.select();
             }
         }
     });
@@ -7612,8 +6393,8 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
     <div class="modal fade" id="openRegisterModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1">
         <div class="modal-dialog modal-dialog-centered">
             <div class="modal-content">
-                <div class="modal-header bg-primary">
-                    <h5 class="modal-title text-white">Open Cash Register</h5>
+                <div class="modal-header">
+                    <h5 class="modal-title">Open Cash Register</h5>
                 </div>
                 <form method="POST">
                     <div class="modal-body">
@@ -7649,9 +6430,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
     <div class="modal fade" id="closeRegisterModal" tabindex="-1">
         <div class="modal-dialog modal-dialog-centered">
             <div class="modal-content">
-                <div class="modal-header bg-primary">
-                    <h5 class="modal-title text-white">Close Cash Register</h5>
-                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                <div class="modal-header">
+                    <h5 class="modal-title">Close Cash Register</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                 </div>
                 <form method="POST">
                     <div class="modal-body">
@@ -8471,9 +7252,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
     <div class="modal fade" id="addPaymentMethodModal" tabindex="-1">
         <div class="modal-dialog">
             <div class="modal-content border-0 shadow">
-                <div class="modal-header bg-primary">
-                    <h5 class="modal-title text-white" data-en="Add Payment Method" data-ar="إضافة طريقة دفع">Add Payment Method</h5>
-                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                <div class="modal-header">
+                    <h5 class="modal-title" data-en="Add Payment Method" data-ar="إضافة طريقة دفع">Add Payment Method</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                 </div>
                 <form method="POST">
                     <div class="modal-body">
@@ -8531,9 +7312,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                             <div class="modal fade" id="editExpCatModal<?= $cat['id'] ?>" tabindex="-1">
                                 <div class="modal-dialog">
                                     <div class="modal-content text-start">
-                                        <div class="modal-header bg-primary">
-                                            <h5 class="modal-title text-white">Edit Category</h5>
-                                            <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                                        <div class="modal-header">
+                                            <h5 class="modal-title">Edit Category</h5>
+                                            <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                                         </div>
                                         <form method="POST">
                                             <input type="hidden" name="id" value="<?= $cat['id'] ?>">
@@ -8579,9 +7360,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
     <div class="modal fade" id="addExpenseCategoryModal" tabindex="-1">
         <div class="modal-dialog">
             <div class="modal-content">
-                <div class="modal-header bg-primary">
-                    <h5 class="modal-title text-white">Add Category</h5>
-                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                <div class="modal-header">
+                    <h5 class="modal-title">Add Category</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                 </div>
                 <form method="POST">
                     <div class="modal-body">
@@ -8929,9 +7710,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
     <div class="modal fade" id="journalModal" tabindex="-1">
         <div class="modal-dialog modal-lg">
             <div class="modal-content">
-                <div class="modal-header bg-primary">
-                    <h5 class="modal-title text-white" data-en="Journal Entry Details" data-ar="تفاصيل قيد اليومية">Journal Entry Details</h5>
-                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                <div class="modal-header">
+                    <h5 class="modal-title" data-en="Journal Entry Details" data-ar="تفاصيل قيد اليومية">Journal Entry Details</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                 </div>
                 <div class="modal-body">
                     <table class="table table-bordered">
@@ -9045,9 +7826,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                             <div class="modal fade" id="editExpenseModal<?= $exp['id'] ?>" tabindex="-1">
                                 <div class="modal-dialog">
                                     <div class="modal-content text-start">
-                                        <div class="modal-header bg-primary">
-                                            <h5 class="modal-title text-white">Edit Expense</h5>
-                                            <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                                        <div class="modal-header">
+                                            <h5 class="modal-title">Edit Expense</h5>
+                                            <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                                         </div>
                                         <form method="POST">
                                             <input type="hidden" name="id" value="<?= $exp['id'] ?>">
@@ -9099,9 +7880,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
     <div class="modal fade" id="addExpenseModal" tabindex="-1">
         <div class="modal-dialog">
             <div class="modal-content">
-                <div class="modal-header bg-primary">
-                    <h5 class="modal-title text-white">Add Expense</h5>
-                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                <div class="modal-header">
+                    <h5 class="modal-title">Add Expense</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                 </div>
                 <form method="POST">
                     <div class="modal-body">
@@ -9434,9 +8215,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                     <div class="modal fade" id="editHrDepartmentModal<?= $d['id'] ?>" tabindex="-1">
                         <div class="modal-dialog">
                             <div class="modal-content border-0 shadow">
-                                <div class="modal-header bg-primary">
-                                    <h5 class="modal-title text-white" data-en="Edit Department" data-ar="تعديل القسم">Edit Department</h5>
-                                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                                <div class="modal-header">
+                                    <h5 class="modal-title" data-en="Edit Department" data-ar="تعديل القسم">Edit Department</h5>
+                                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                                 </div>
                                 <form method="POST">
                                     <input type="hidden" name="id" value="<?= $d['id'] ?>">
@@ -9511,9 +8292,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                     <div class="modal fade" id="editHrEmployeeModal<?= $e['id'] ?>" tabindex="-1">
                         <div class="modal-dialog modal-lg">
                             <div class="modal-content border-0 shadow">
-                                <div class="modal-header bg-primary">
-                                    <h5 class="modal-title text-white" data-en="Edit Employee" data-ar="تعديل الموظف">Edit Employee</h5>
-                                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                                <div class="modal-header">
+                                    <h5 class="modal-title" data-en="Edit Employee" data-ar="تعديل الموظف">Edit Employee</h5>
+                                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                                 </div>
                                 <form method="POST">
                                     <input type="hidden" name="id" value="<?= $e['id'] ?>">
@@ -9638,9 +8419,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                     <div class="modal fade" id="markAttendanceModal<?= $e['id'] ?>" tabindex="-1">
                         <div class="modal-dialog">
                             <div class="modal-content border-0 shadow">
-                                <div class="modal-header bg-primary">
-                                    <h5 class="modal-title text-white" data-en="Mark Attendance" data-ar="تسجيل الحضور">Mark Attendance - <?= htmlspecialchars($e['name']) ?></h5>
-                                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                                <div class="modal-header">
+                                    <h5 class="modal-title" data-en="Mark Attendance" data-ar="تسجيل الحضور">Mark Attendance - <?= htmlspecialchars($e['name']) ?></h5>
+                                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                                 </div>
                                 <form method="POST">
                                     <input type="hidden" name="employee_id" value="<?= $e['id'] ?>">
@@ -9685,9 +8466,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
     <div class="modal fade" id="biometricInfoModal" tabindex="-1">
         <div class="modal-dialog">
             <div class="modal-content border-0 shadow">
-                <div class="modal-header bg-primary">
-                    <h5 class="modal-title text-white" data-en="Biometric Integration Info" data-ar="معلومات تكامل البصمة">Biometric Integration Info</h5>
-                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                <div class="modal-header">
+                    <h5 class="modal-title" data-en="Biometric Integration Info" data-ar="معلومات تكامل البصمة">Biometric Integration Info</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                 </div>
                 <div class="modal-body">
                     <p data-en="To sync attendance from your biometric device, use the following API endpoint:" data-ar="لمزامنة الحضور من جهاز البصمة الخاص بك، استخدم نقطة نهاية API التالية:">
@@ -9795,9 +8576,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
     <div class="modal fade" id="generatePayrollModal" tabindex="-1">
         <div class="modal-dialog">
             <div class="modal-content border-0 shadow">
-                <div class="modal-header bg-primary">
-                    <h5 class="modal-title text-white" data-en="Generate Payroll" data-ar="توليد الرواتب">Generate Payroll</h5>
-                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                <div class="modal-header">
+                    <h5 class="modal-title" data-en="Generate Payroll" data-ar="توليد الرواتب">Generate Payroll</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                 </div>
                 <form method="POST">
                     <input type="hidden" name="month" value="<?= $data['month'] ?>">
@@ -9890,9 +8671,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                     <div class="modal fade" id="editDeviceModal<?= $d['id'] ?>" tabindex="-1">
                         <div class="modal-dialog">
                             <div class="modal-content border-0 shadow">
-                                <div class="modal-header bg-primary">
-                                    <h5 class="modal-title text-white" data-en="Edit Device" data-ar="تعديل الجهاز">Edit Device</h5>
-                                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                                <div class="modal-header">
+                                    <h5 class="modal-title" data-en="Edit Device" data-ar="تعديل الجهاز">Edit Device</h5>
+                                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                                 </div>
                                 <form method="POST">
                                     <input type="hidden" name="id" value="<?= $d['id'] ?>">
@@ -9940,9 +8721,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
     <div class="modal fade" id="addDeviceModal" tabindex="-1">
         <div class="modal-dialog">
             <div class="modal-content border-0 shadow">
-                <div class="modal-header bg-primary">
-                    <h5 class="modal-title text-white" data-en="Add Biometric Device" data-ar="إضافة جهاز بصمة">Add Biometric Device</h5>
-                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                <div class="modal-header">
+                    <h5 class="modal-title" data-en="Add Biometric Device" data-ar="إضافة جهاز بصمة">Add Biometric Device</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                 </div>
                 <form method="POST">
                     <div class="modal-body">
@@ -10041,7 +8822,7 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                             <div class="modal-content shadow border-0 rounded-4">
                                 <div class="modal-header border-0">
                                     <h5 class="modal-title fw-bold" data-en="Edit Device" data-ar="تعديل الجهاز">Edit Device</h5>
-                                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                                 </div>
                                 <form method="POST">
                                     <input type="hidden" name="id" value="<?= $d['id'] ?>">
@@ -10112,7 +8893,7 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
             <div class="modal-content shadow border-0 rounded-4">
                 <div class="modal-header border-0">
                     <h5 class="modal-title fw-bold" data-en="Add POS Device" data-ar="إضافة جهاز">Add POS Device</h5>
-                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                 </div>
                 <form method="POST">
                     <div class="modal-body">
@@ -10306,23 +9087,6 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
         </form>
     </div>
 
-    <?php if (($_SESSION['user_role_name'] ?? '') === 'Administrator'): ?>
-    <div class="card p-4 mt-4">
-        <h5 class="mb-3" data-en="Advanced Tools" data-ar="أدوات متقدمة">Advanced Tools</h5>
-        <div class="row">
-            <div class="col-md-6">
-                <div class="p-3 border rounded bg-light">
-                    <h6 class="fw-bold mb-2" data-en="Data Synchronization" data-ar="مزامنة البيانات">Data Synchronization</h6>
-                    <p class="text-muted small" data-en="Copy items, categories, and units between outlets easily." data-ar="نسخ الأصناف والفئات والوحدات بين الفروع بسهولة.">Copy items, categories, and units between outlets easily.</p>
-                    <a href="index.php?page=data_sync" class="btn btn-outline-primary btn-sm rounded-pill">
-                        <i class="bi bi-arrow-repeat me-1"></i> <span data-en="Go to Data Sync" data-ar="الذهاب إلى مزامنة البيانات">Go to Data Sync</span>
-                    </a>
-                </div>
-            </div>
-        </div>
-    </div>
-    <?php endif; ?>
-
     <?php elseif ($page === 'role_groups'): ?>
     <div class="card border-0 shadow-sm rounded-4 overflow-hidden">
         <div class="card-header bg-white py-3 d-flex justify-content-between align-items-center border-0">
@@ -10382,9 +9146,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                             <div class="modal fade" id="editRoleGroupModal<?= $group['id'] ?>" tabindex="-1">
                                 <div class="modal-dialog modal-lg">
                                     <div class="modal-content border-0 shadow text-start">
-                                        <div class="modal-header bg-primary">
+                                        <div class="modal-header">
                                             <h5 class="modal-title fw-bold" data-en="Edit Role Group" data-ar="تعديل مجموعة الأدوار">Edit Role Group</h5>
-                                            <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                                            <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                                         </div>
                                         <form method="POST">
                                             <input type="hidden" name="id" value="<?= $group['id'] ?>">
@@ -10679,7 +9443,7 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
             </div>
             <?php if (can('users_add')): ?>
             <button class="btn btn-primary rounded-pill px-4" data-bs-toggle="modal" data-bs-target="#addUserModal">
-                <i class="bi bi-person-plus me-1"></i> <span data-en="Add User" data-ar="دعوة مستخدم">Add User</span>
+                <i class="bi bi-person-plus me-1"></i> <span data-en="Invite User" data-ar="دعوة مستخدم">Invite User</span>
             </button>
             <?php endif; ?>
         </div>
@@ -10689,7 +9453,6 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                     <tr>
                         <th class="ps-4" data-en="User Info" data-ar="معلومات المستخدم">User Info</th>
                         <th data-en="Access Level" data-ar="مستوى الوصول">Access Level</th>
-                        <th data-en="Outlet" data-ar="الفرع">Outlet</th>
                         <th data-en="Contact" data-ar="الاتصال">Contact</th>
                         <th data-en="Status" data-ar="الحالة">Status</th>
                         <th data-en="Actions" data-ar="الإجراءات" class="text-end pe-4">Actions</th>
@@ -10718,26 +9481,6 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                                 <?= htmlspecialchars((string)($u['group_name'] ?? 'No Role Assigned')) ?>
                             </span>
                         </td>
-                        <td>
-                            <div class="d-flex flex-wrap gap-1">
-                                <?php 
-                                    $out_names = [];
-                                    $assigned = array_filter(explode(',', $u['assigned_outlets'] ?? ''));
-                                    if (empty($assigned) && !empty($u['outlet_id'])) {
-                                        $assigned = [$u['outlet_id']];
-                                    }
-                                    if (empty($assigned)) {
-                                        echo '<span class="badge rounded-pill bg-secondary bg-opacity-10 text-secondary px-3">Global / All Outlets</span>';
-                                    } else {
-                                        foreach (($data["outlets"] ?? []) as $out) {
-                                            if (in_array($out["id"], $assigned)) {
-                                                echo '<span class="badge rounded-pill bg-secondary bg-opacity-10 text-secondary px-2 py-1">' . htmlspecialchars($out["name"]) . '</span>';
-                                            }
-                                        }
-                                    }
-                                ?>
-                            </div>
-                        </td>
                         <td>
                             <div class="text-dark small mb-1"><i class="bi bi-envelope me-1"></i> <?= htmlspecialchars((string)($u['email'] ?? '')) ?></div>
                             <div class="text-muted small"><i class="bi bi-phone me-1"></i> <?= htmlspecialchars((string)($u['phone'] ?? '-')) ?></div>
@@ -10750,27 +9493,33 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                             <?php endif; ?>
                         </td>
                         <td class="text-end pe-4">
-                            <div class="d-flex justify-content-end gap-2">
-                                <?php if (can('users_edit')): ?>
-                                <button class="btn btn-light btn-sm text-primary" data-bs-toggle="modal" data-bs-target="#editUserModal<?= $u['id'] ?>" title="Edit Profile">
-                                    <i class="bi bi-pencil"></i>
+                            <div class="dropdown">
+                                <button class="btn btn-light btn-sm rounded-circle" type="button" data-bs-toggle="dropdown">
+                                    <i class="bi bi-three-dots-vertical"></i>
                                 </button>
-                                <?php endif; ?>
-                                <?php if (can('users_delete')): ?>
-                                <form method="POST" onsubmit="return confirm('Deactivate this user account?')" class="d-inline">
-                                    <input type="hidden" name="id" value="<?= $u['id'] ?>">
-                                    <button type="submit" name="delete_user" class="btn btn-light btn-sm text-danger" title="Remove Access"><i class="bi bi-trash"></i></button>
-                                </form>
-                                <?php endif; ?>
+                                <ul class="dropdown-menu dropdown-menu-end shadow-sm border-0">
+                                    <?php if (can('users_edit')): ?>
+                                    <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#editUserModal<?= $u['id'] ?>"><i class="bi bi-pencil me-2 text-primary"></i> Edit Profile</a></li>
+                                    <?php endif; ?>
+                                    <?php if (can('users_delete')): ?>
+                                    <li><hr class="dropdown-divider"></li>
+                                    <li>
+                                        <form method="POST" onsubmit="return confirm('Deactivate this user account?')">
+                                            <input type="hidden" name="id" value="<?= $u['id'] ?>">
+                                            <button type="submit" name="delete_user" class="dropdown-item text-danger"><i class="bi bi-trash me-2"></i> Remove Access</button>
+                                        </form>
+                                    </li>
+                                    <?php endif; ?>
+                                </ul>
                             </div>
 
                             <!-- Edit User Modal -->
                             <div class="modal fade" id="editUserModal<?= $u['id'] ?>" tabindex="-1">
                                 <div class="modal-dialog">
                                     <div class="modal-content border-0 shadow text-start">
-                                        <div class="modal-header bg-primary">
+                                        <div class="modal-header">
                                             <h5 class="modal-title fw-bold" data-en="Edit User Account" data-ar="تعديل حساب المستخدم">Edit User Account</h5>
-                                            <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                                            <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                                         </div>
                                         <form method="POST">
                                             <input type="hidden" name="id" value="<?= $u['id'] ?>">
@@ -10796,18 +9545,6 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                                                         <?php endforeach; ?>
                                                     </select>
                                                 </div>
-                                                <div class="mb-3">
-                                                    <label class="form-label fw-semibold" data-en="Assigned Outlets" data-ar="الفروع المخصصة">Assigned Outlets</label>
-                                                    <select name="outlet_ids[]" class="form-select" multiple size="4">
-                                                        <option value="">--- Global (Admin only) ---</option>
-                                                        <?php 
-                                                        $assigned = explode(',', $u['assigned_outlets'] ?? '');
-                                                        foreach (($data['outlets'] ?? []) as $o): ?>
-                                                        <option value="<?= $o['id'] ?>" <?= in_array($o['id'], $assigned) || ($u['outlet_id'] ?? null) == $o['id'] ? 'selected' : '' ?>><?= htmlspecialchars($o['name']) ?></option>
-                                                        <?php endforeach; ?>
-                                                    </select>
-                                                    <div class="form-text small" data-en="Hold Ctrl/Cmd to select multiple outlets." data-ar="اضغط على Ctrl/Cmd لتحديد فروع متعددة.">Hold Ctrl/Cmd to select multiple outlets.</div>
-                                                </div>
                                                 <div class="mb-3">
                                                     <label class="form-label fw-semibold" data-en="Account Status" data-ar="حالة الحساب">Account Status</label>
                                                     <select name="status" class="form-select">
@@ -10892,9 +9629,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                             <div class="modal fade" id="editRegisterModal<?= $r['id'] ?>" tabindex="-1">
                                 <div class="modal-dialog">
                                     <div class="modal-content border-0 shadow">
-                                        <div class="modal-header bg-primary">
-                                            <h5 class="modal-title text-white">Edit Register</h5>
-                                            <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                                        <div class="modal-header">
+                                            <h5 class="modal-title">Edit Register</h5>
+                                            <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                                         </div>
                                         <form method="POST">
                                             <div class="modal-body text-start">
@@ -10933,9 +9670,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
     <div class="modal fade" id="addRegisterModal" tabindex="-1">
         <div class="modal-dialog">
             <div class="modal-content border-0 shadow">
-                <div class="modal-header bg-primary">
-                    <h5 class="modal-title text-white">Add Cash Register</h5>
-                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                <div class="modal-header">
+                    <h5 class="modal-title">Add Cash Register</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                 </div>
                 <form method="POST">
                     <div class="modal-body">
@@ -11121,9 +9858,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
     <div class="modal fade" id="sessionReportModal<?= $s['id'] ?>" tabindex="-1">
                                 <div class="modal-dialog modal-lg">
                                     <div class="modal-content border-0 shadow">
-                                        <div class="modal-header bg-primary">
-                                            <h5 class="modal-title text-white">Session Cashflow Report (#<?= $s['id'] ?>)</h5>
-                                            <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                                        <div class="modal-header">
+                                            <h5 class="modal-title">Session Cashflow Report (#<?= $s['id'] ?>)</h5>
+                                            <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                                         </div>
                                         <div class="modal-body text-start">
                                             <div class="row g-3">
@@ -11351,9 +10088,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
     <div class="modal fade" id="openRegisterModal" tabindex="-1">
         <div class="modal-dialog">
             <div class="modal-content border-0 shadow">
-                <div class="modal-header bg-primary">
-                    <h5 class="modal-title text-white">Open Register Session</h5>
-                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                <div class="modal-header">
+                    <h5 class="modal-title">Open Register Session</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                 </div>
                 <form method="POST">
                     <div class="modal-body">
@@ -11385,9 +10122,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
     <div class="modal fade" id="closeRegisterModal" tabindex="-1">
         <div class="modal-dialog">
             <div class="modal-content border-0 shadow">
-                <div class="modal-header bg-primary">
-                    <h5 class="modal-title text-white">Close Register Session (#<?= $session['id'] ?>)</h5>
-                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                <div class="modal-header">
+                    <h5 class="modal-title">Close Register Session (#<?= $session['id'] ?>)</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                 </div>
                 <form method="POST">
                     <div class="modal-body">
@@ -11550,8 +10287,6 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
             </div>
         </div>
     </div>
-    <?php elseif ($page === 'help'): ?>
-        <?php include 'help.php'; ?>
     <?php endif; ?>
 </div>
 
@@ -11559,9 +10294,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
 <div class="modal fade" id="addHrDepartmentModal" tabindex="-1">
     <div class="modal-dialog">
         <div class="modal-content border-0 shadow">
-            <div class="modal-header bg-primary">
-                <h5 class="modal-title text-white" data-en="Add HR Department" data-ar="إضافة قسم">Add HR Department</h5>
-                <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+            <div class="modal-header">
+                <h5 class="modal-title" data-en="Add HR Department" data-ar="إضافة قسم">Add HR Department</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
             </div>
             <form method="POST">
                 <div class="modal-body">
@@ -11583,9 +10318,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
 <div class="modal fade" id="addHrEmployeeModal" tabindex="-1">
     <div class="modal-dialog modal-lg">
         <div class="modal-content border-0 shadow">
-            <div class="modal-header bg-primary">
-                <h5 class="modal-title text-white" data-en="Add HR Employee" data-ar="إضافة موظف">Add HR Employee</h5>
-                <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+            <div class="modal-header">
+                <h5 class="modal-title" data-en="Add HR Employee" data-ar="إضافة موظف">Add HR Employee</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
             </div>
             <form method="POST">
                 <div class="modal-body">
@@ -11642,9 +10377,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
 <div class="modal fade" id="addRoleGroupModal" tabindex="-1">
     <div class="modal-dialog modal-lg">
         <div class="modal-content border-0 shadow">
-            <div class="modal-header bg-primary">
-                <h5 class="modal-title text-white" data-en="Add Role Group" data-ar="إضافة مجموعة أدوار">Add Role Group</h5>
-                <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+            <div class="modal-header">
+                <h5 class="modal-title" data-en="Add Role Group" data-ar="إضافة مجموعة أدوار">Add Role Group</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
             </div>
             <form method="POST">
                 <div class="modal-body">
@@ -11727,9 +10462,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
 <div class="modal fade" id="addUserModal" tabindex="-1">
     <div class="modal-dialog">
         <div class="modal-content border-0 shadow">
-            <div class="modal-header bg-primary">
-                <h5 class="modal-title text-white" data-en="Add New User" data-ar="إضافة مستخدم جديد">Add New User</h5>
-                <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+            <div class="modal-header">
+                <h5 class="modal-title" data-en="Add New User" data-ar="إضافة مستخدم جديد">Add New User</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
             </div>
             <form method="POST">
                 <div class="modal-body">
@@ -11758,16 +10493,6 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                             <?php endforeach; ?>
                         </select>
                     </div>
-                    <div class="mb-3">
-                        <label class="form-label" data-en="Assigned Outlets" data-ar="الفروع المخصصة">Assigned Outlets</label>
-                        <select name="outlet_ids[]" class="form-select" multiple size="4">
-                            <option value="">--- Global (Admin only) ---</option>
-                            <?php foreach (($data['outlets'] ?? []) as $o): ?>
-                            <option value="<?= $o['id'] ?>"><?= htmlspecialchars($o['name']) ?></option>
-                            <?php endforeach; ?>
-                        </select>
-                        <div class="form-text small" data-en="Hold Ctrl/Cmd to select multiple outlets." data-ar="اضغط على Ctrl/Cmd لتحديد فروع متعددة.">Hold Ctrl/Cmd to select multiple outlets.</div>
-                    </div>
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-light" data-bs-dismiss="modal" data-en="Cancel" data-ar="إلغاء">Cancel</button>
@@ -11782,15 +10507,15 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
 <div class="modal fade" id="addCustomerModal" tabindex="-1">
     <div class="modal-dialog">
         <div class="modal-content border-0 shadow">
-            <div class="modal-header bg-primary">
-                <h5 class="modal-title text-white">
+            <div class="modal-header">
+                <h5 class="modal-title">
                     <?php if ($page === 'suppliers'): ?>
                         <span data-en="Add New Supplier" data-ar="إضافة مورد جديد">Add New Supplier</span>
                     <?php else: ?>
                         <span data-en="Add New Customer" data-ar="إضافة عميل جديد">Add New Customer</span>
                     <?php endif; ?>
                 </h5>
-                <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
             </div>
             <form method="POST">
                 <input type="hidden" name="type" value="<?= $page === 'suppliers' ? 'supplier' : 'customer' ?>">
@@ -11829,9 +10554,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
 <div class="modal fade" id="addItemModal" tabindex="-1">
     <div class="modal-dialog modal-lg">
         <div class="modal-content border-0 shadow">
-            <div class="modal-header bg-primary">
-                <h5 class="modal-title text-white" data-en="Add New Item" data-ar="إضافة صنف جديد">Add New Item</h5>
-                <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+            <div class="modal-header">
+                <h5 class="modal-title" data-en="Add New Item" data-ar="إضافة صنف جديد">Add New Item</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
             </div>
             <form method="POST" enctype="multipart/form-data">
                 <div class="modal-body">
@@ -11963,16 +10688,16 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
 <div class="modal fade" id="importItemsModal" tabindex="-1">
     <div class="modal-dialog">
         <div class="modal-content border-0 shadow text-start">
-            <div class="modal-header bg-primary">
-                <h5 class="modal-title text-white" data-en="Import Items from Excel (CSV)" data-ar="استيراد الأصناف من اكسل (CSV)">Import Items from Excel (CSV)</h5>
-                <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+            <div class="modal-header">
+                <h5 class="modal-title" data-en="Import Items from Excel (CSV)" data-ar="استيراد الأصناف من اكسل (CSV)">Import Items from Excel (CSV)</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
             </div>
             <form method="POST" enctype="multipart/form-data">
                 <div class="modal-body">
                     <div class="alert alert-info py-2">
                         <div class="mb-2">
-                            <small data-en="Please upload an Excel (.xlsx) or CSV file with the following columns: SKU, English Name, Arabic Name, Sale Price, Cost Price." data-ar="يرجى رفع ملف إكسل (.xlsx) أو CSV بالأعمدة التالية: الباركود، الاسم الإنجليزي، الاسم العربي، سعر البيع، سعر التكلفة.">
-                                Please upload an Excel (.xlsx) or CSV file with the following columns: SKU, English Name, Arabic Name, Sale Price, Cost Price.
+                            <small data-en="Please upload a CSV file with the following columns: SKU, English Name, Arabic Name, Sale Price, Cost Price." data-ar="يرجى رفع ملف CSV بالأعمدة التالية: الباركود، الاسم الإنجليزي، الاسم العربي، سعر البيع، سعر التكلفة.">
+                                Please upload a CSV file with the following columns: SKU, English Name, Arabic Name, Sale Price, Cost Price.
                             </small>
                         </div>
                         <a href="index.php?action=download_items_template" class="btn btn-sm btn-primary">
@@ -11980,8 +10705,8 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
                         </a>
                     </div>
                     <div class="mb-3">
-                        <label class="form-label" data-en="Choose File" data-ar="اختر الملف">Choose File</label>
-                        <input type="file" name="excel_file" class="form-control" accept=".csv, .xlsx" required>
+                        <label class="form-label" data-en="Choose CSV File" data-ar="اختر ملف CSV">Choose CSV File</label>
+                        <input type="file" name="excel_file" class="form-control" accept=".csv" required>
                     </div>
                 </div>
                 <div class="modal-footer">
@@ -11997,20 +10722,20 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
 <div class="modal fade" id="importCustomersModal" tabindex="-1">
     <div class="modal-dialog">
         <div class="modal-content border-0 shadow text-start">
-            <div class="modal-header bg-primary">
-                <h5 class="modal-title text-white" data-en="Import Customers from Excel (CSV)" data-ar="استيراد العملاء من اكسل (CSV)">Import Customers from Excel (CSV)</h5>
-                <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+            <div class="modal-header">
+                <h5 class="modal-title" data-en="Import Customers from Excel (CSV)" data-ar="استيراد العملاء من اكسل (CSV)">Import Customers from Excel (CSV)</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
             </div>
             <form method="POST" enctype="multipart/form-data">
                 <div class="modal-body">
                     <div class="alert alert-info py-2">
-                        <small data-en="Please upload an Excel (.xlsx) or CSV file with the following columns: Name, Email, Phone, Tax ID, Balance." data-ar="يرجى رفع ملف إكسل (.xlsx) أو CSV بالأعمدة التالية: الاسم، البريد الإلكتروني، الهاتف، الرقم الضريبي، الرصيد.">
-                            Please upload an Excel (.xlsx) or CSV file with the following columns: Name, Email, Phone, Tax ID, Balance.
+                        <small data-en="Please upload a CSV file with the following columns: Name, Email, Phone, Tax ID, Balance." data-ar="يرجى رفع ملف CSV بالأعمدة التالية: الاسم، البريد الإلكتروني، الهاتف، الرقم الضريبي، الرصيد.">
+                            Please upload a CSV file with the following columns: Name, Email, Phone, Tax ID, Balance.
                         </small>
                     </div>
                     <div class="mb-3">
-                        <label class="form-label" data-en="Choose File" data-ar="اختر الملف">Choose File</label>
-                        <input type="file" name="excel_file" class="form-control" accept=".csv, .xlsx" required>
+                        <label class="form-label" data-en="Choose CSV File" data-ar="اختر ملف CSV">Choose CSV File</label>
+                        <input type="file" name="excel_file" class="form-control" accept=".csv" required>
                     </div>
                 </div>
                 <div class="modal-footer">
@@ -12026,20 +10751,20 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
 <div class="modal fade" id="importSuppliersModal" tabindex="-1">
     <div class="modal-dialog">
         <div class="modal-content border-0 shadow text-start">
-            <div class="modal-header bg-primary">
-                <h5 class="modal-title text-white" data-en="Import Suppliers from Excel (CSV)" data-ar="استيراد الموردين من اكسل (CSV)">Import Suppliers from Excel (CSV)</h5>
-                <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+            <div class="modal-header">
+                <h5 class="modal-title" data-en="Import Suppliers from Excel (CSV)" data-ar="استيراد الموردين من اكسل (CSV)">Import Suppliers from Excel (CSV)</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
             </div>
             <form method="POST" enctype="multipart/form-data">
                 <div class="modal-body">
                     <div class="alert alert-info py-2">
-                        <small data-en="Please upload an Excel (.xlsx) or CSV file with the following columns: Name, Email, Phone, Tax ID, Balance." data-ar="يرجى رفع ملف إكسل (.xlsx) أو CSV بالأعمدة التالية: الاسم، البريد الإلكتروني، الهاتف، الرقم الضريبي، الرصيد.">
-                            Please upload an Excel (.xlsx) or CSV file with the following columns: Name, Email, Phone, Tax ID, Balance.
+                        <small data-en="Please upload a CSV file with the following columns: Name, Email, Phone, Tax ID, Balance." data-ar="يرجى رفع ملف CSV بالأعمدة التالية: الاسم، البريد الإلكتروني، الهاتف، الرقم الضريبي، الرصيد.">
+                            Please upload a CSV file with the following columns: Name, Email, Phone, Tax ID, Balance.
                         </small>
                     </div>
                     <div class="mb-3">
-                        <label class="form-label" data-en="Choose File" data-ar="اختر الملف">Choose File</label>
-                        <input type="file" name="excel_file" class="form-control" accept=".csv, .xlsx" required>
+                        <label class="form-label" data-en="Choose CSV File" data-ar="اختر ملف CSV">Choose CSV File</label>
+                        <input type="file" name="excel_file" class="form-control" accept=".csv" required>
                     </div>
                 </div>
                 <div class="modal-footer">
@@ -12055,20 +10780,20 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
 <div class="modal fade" id="importCategoriesModal" tabindex="-1">
     <div class="modal-dialog">
         <div class="modal-content border-0 shadow text-start">
-            <div class="modal-header bg-primary">
-                <h5 class="modal-title text-white" data-en="Import Categories from Excel (CSV)" data-ar="استيراد الفئات من اكسل (CSV)">Import Categories from Excel (CSV)</h5>
-                <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+            <div class="modal-header">
+                <h5 class="modal-title" data-en="Import Categories from Excel (CSV)" data-ar="استيراد الفئات من اكسل (CSV)">Import Categories from Excel (CSV)</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
             </div>
             <form method="POST" enctype="multipart/form-data">
                 <div class="modal-body">
                     <div class="alert alert-info py-2">
-                        <small data-en="Please upload an Excel (.xlsx) or CSV file with the following columns: Name (EN), Name (AR)." data-ar="يرجى رفع ملف إكسل (.xlsx) أو CSV بالأعمدة التالية: الاسم (إنجليزي)، الاسم (عربي).">
-                            Please upload an Excel (.xlsx) or CSV file with the following columns: Name (EN), Name (AR).
+                        <small data-en="Please upload a CSV file with the following columns: Name (EN), Name (AR)." data-ar="يرجى رفع ملف CSV بالأعمدة التالية: الاسم (إنجليزي)، الاسم (عربي).">
+                            Please upload a CSV file with the following columns: Name (EN), Name (AR).
                         </small>
                     </div>
                     <div class="mb-3">
-                        <label class="form-label" data-en="Choose File" data-ar="اختر الملف">Choose File</label>
-                        <input type="file" name="excel_file" class="form-control" accept=".csv, .xlsx" required>
+                        <label class="form-label" data-en="Choose CSV File" data-ar="اختر ملف CSV">Choose CSV File</label>
+                        <input type="file" name="excel_file" class="form-control" accept=".csv" required>
                     </div>
                 </div>
                 <div class="modal-footer">
@@ -12084,20 +10809,20 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
 <div class="modal fade" id="importUnitsModal" tabindex="-1">
     <div class="modal-dialog">
         <div class="modal-content border-0 shadow text-start">
-            <div class="modal-header bg-primary">
-                <h5 class="modal-title text-white" data-en="Import Units from Excel (CSV)" data-ar="استيراد الوحدات من اكسل (CSV)">Import Units from Excel (CSV)</h5>
-                <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+            <div class="modal-header">
+                <h5 class="modal-title" data-en="Import Units from Excel (CSV)" data-ar="استيراد الوحدات من اكسل (CSV)">Import Units from Excel (CSV)</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
             </div>
             <form method="POST" enctype="multipart/form-data">
                 <div class="modal-body">
                     <div class="alert alert-info py-2">
-                        <small data-en="Please upload an Excel (.xlsx) or CSV file with the following columns: Name (EN), Name (AR), Short (EN), Short (AR)." data-ar="يرجى رفع ملف إكسل (.xlsx) أو CSV بالأعمدة التالية: الاسم (إنجليزي)، الاسم (عربي)، الاختصار (إنجليزي)، الاختصار (عربي).">
-                            Please upload an Excel (.xlsx) or CSV file with the following columns: Name (EN), Name (AR), Short (EN), Short (AR).
+                        <small data-en="Please upload a CSV file with the following columns: Name (EN), Name (AR), Short (EN), Short (AR)." data-ar="يرجى رفع ملف CSV بالأعمدة التالية: الاسم (إنجليزي)، الاسم (عربي)، الاختصار (إنجليزي)، الاختصار (عربي).">
+                            Please upload a CSV file with the following columns: Name (EN), Name (AR), Short (EN), Short (AR).
                         </small>
                     </div>
                     <div class="mb-3">
-                        <label class="form-label" data-en="Choose File" data-ar="اختر الملف">Choose File</label>
-                        <input type="file" name="excel_file" class="form-control" accept=".csv, .xlsx" required>
+                        <label class="form-label" data-en="Choose CSV File" data-ar="اختر ملف CSV">Choose CSV File</label>
+                        <input type="file" name="excel_file" class="form-control" accept=".csv" required>
                     </div>
                 </div>
                 <div class="modal-footer">
@@ -12113,9 +10838,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
 <div class="modal fade" id="addCategoryModal" tabindex="-1">
     <div class="modal-dialog">
         <div class="modal-content border-0 shadow">
-            <div class="modal-header bg-primary">
-                <h5 class="modal-title text-white" data-en="Add Category" data-ar="إضافة فئة">Add Category</h5>
-                <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+            <div class="modal-header">
+                <h5 class="modal-title" data-en="Add Category" data-ar="إضافة فئة">Add Category</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
             </div>
             <form method="POST">
                 <div class="modal-body">
@@ -12151,9 +10876,9 @@ $projectDescription = $_SERVER['PROJECT_DESCRIPTION'] ?? 'Accounting System';
 <div class="modal fade" id="addUnitModal" tabindex="-1">
     <div class="modal-dialog">
         <div class="modal-content border-0 shadow">
-            <div class="modal-header bg-primary">
-                <h5 class="modal-title text-white" data-en="Add Unit" data-ar="إضافة وحدة">Add Unit</h5>
-                <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+            <div class="modal-header">
+                <h5 class="modal-title" data-en="Add Unit" data-ar="إضافة وحدة">Add Unit</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
             </div>
             <form method="POST">
                 <div class="modal-body">
@@ -12354,14 +11079,6 @@ document.addEventListener('DOMContentLoaded', function() {
                 document.getElementById('receiptAmount').textContent = parseFloat(data.amount).toFixed(3);
                 document.getElementById('receiptAmountWords').textContent = data.amount_words;
 
-                const rcn = document.getElementById('receiptCompanyName');
-                if(rcn) rcn.textContent = data.outlet_name || "<?= htmlspecialchars($data['settings']['company_name'] ?? 'Accounting System') ?>";
-                const rca = document.getElementById('receiptCompanyAddress');
-                if(rca) {
-                    rca.textContent = data.outlet_address || (typeof companySettings !== 'undefined' ? companySettings.company_address : '') || '';
-                    rca.style.whiteSpace = 'pre-line';
-                }
-
                 // Update labels for Purchase vs Sale
                 const partyLabel = document.getElementById('receiptPartyLabel');
                 const againstLabel = document.getElementById('receiptAgainstLabel');
@@ -12679,10 +11396,10 @@ document.addEventListener('DOMContentLoaded', function() {
             <div class="row align-items-center mb-4">
                 <div class="col-6">
                     ${logoUrl ? `<img src="${logoUrl}" alt="Logo" style="max-height: 80px;" class="mb-3">` : ''}
-                    <h4 class="fw-bold mb-0">${data.outlet_name || companySettings.company_name || 'Your Company'}</h4>
+                    <h4 class="fw-bold mb-0">${companySettings.company_name || 'Your Company'}</h4>
                     <p class="text-muted mb-0 small">
-                        ${data.outlet_address ? data.outlet_address.replace(/\n/g, '<br>') : (companySettings.company_address || '').replace(/\n/g, '<br>')}<br>
-                        Phone: ${data.outlet_phone || companySettings.company_phone || ''} | Email: ${companySettings.company_email || ''}
+                        ${companySettings.company_address || ''}<br>
+                        Phone: ${companySettings.company_phone || ''} | Email: ${companySettings.company_email || ''}
                         ${companySettings.tax_number ? `<br>TRN: ${companySettings.tax_number}` : ''}
                     </p>
                 </div>
@@ -12870,10 +11587,10 @@ document.addEventListener('DOMContentLoaded', function() {
         // Company Logo and Header Construction
         const logoUrl = companySettings.company_logo || '';
         const logoImg = logoUrl ? `<img src="${logoUrl}" alt="Logo" class="invoice-logo mb-3">` : '';
-        const companyName = data.outlet_name || companySettings.company_name || 'Accounting System';
-        const companyAddress = data.outlet_address ? data.outlet_address.replace(/\n/g, '<br>') : (companySettings.company_address || '').replace(/\n/g, '<br>');
+        const companyName = companySettings.company_name || 'Accounting System';
+        const companyAddress = (companySettings.company_address || '').replace(/\n/g, '<br>');
         const companyVat = companySettings.vat_number ? `<p class="text-muted small mb-0">VAT: ${companySettings.vat_number}</p>` : '';
-        const companyPhone = data.outlet_phone ? `<p class="text-muted small mb-0">Tel: ${data.outlet_phone}</p>` : (companySettings.company_phone ? `<p class="text-muted small mb-0">Tel: ${companySettings.company_phone}</p>` : '');
+        const companyPhone = companySettings.company_phone ? `<p class="text-muted small mb-0">Tel: ${companySettings.company_phone}</p>` : '';
 
         // Quotation Header Construction
         const quotDate = data.quotation_date;
@@ -13236,9 +11953,9 @@ document.addEventListener('DOMContentLoaded', function() {
     <div class="modal fade" id="viewReturnDetailsModal" tabindex="-1">
         <div class="modal-dialog modal-lg">
             <div class="modal-content text-start border-0 shadow">
-                <div class="modal-header bg-primary">
-                    <h5 class="modal-title text-white">Return Details <span id="view_return_no"></span></h5>
-                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                <div class="modal-header">
+                    <h5 class="modal-title">Return Details <span id="view_return_no"></span></h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                 </div>
                 <div class="modal-body">
                     <div class="row mb-4">
@@ -13288,9 +12005,9 @@ document.addEventListener('DOMContentLoaded', function() {
     <div class="modal fade" id="addPurchaseReturnModal" tabindex="-1">
         <div class="modal-dialog modal-lg">
             <div class="modal-content text-start border-0 shadow">
-                <div class="modal-header bg-primary">
-                    <h5 class="modal-title text-white">Process Purchase Return</h5>
-                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                <div class="modal-header">
+                    <h5 class="modal-title">Process Purchase Return</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                 </div>
                 <form method="POST">
                     <div class="modal-body">
@@ -13352,9 +12069,9 @@ document.addEventListener('DOMContentLoaded', function() {
     <div class="modal fade" id="addSalesReturnModal" tabindex="-1">
         <div class="modal-dialog modal-lg">
             <div class="modal-content text-start border-0 shadow">
-                <div class="modal-header bg-primary">
-                    <h5 class="modal-title text-white">Process Sales Return</h5>
-                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                <div class="modal-header">
+                    <h5 class="modal-title">Process Sales Return</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                 </div>
                 <form method="POST">
                     <div class="modal-body">
@@ -13418,9 +12135,9 @@ document.addEventListener('DOMContentLoaded', function() {
     <div class="modal fade" id="addAccountModal" tabindex="-1">
         <div class="modal-dialog">
             <div class="modal-content border-0 shadow">
-                <div class="modal-header bg-primary">
-                    <h5 class="modal-title text-white" data-en="Add New Account" data-ar="إضافة حساب جديد">Add New Account</h5>
-                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                <div class="modal-header">
+                    <h5 class="modal-title" data-en="Add New Account" data-ar="إضافة حساب جديد">Add New Account</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                 </div>
                 <form method="POST">
                     <div class="modal-body">
@@ -13472,7 +12189,7 @@ document.addEventListener('DOMContentLoaded', function() {
         <div class="modal-dialog modal-lg">
             <div class="modal-content border-0 shadow">
                 <div class="modal-header bg-success text-white">
-                    <h5 class="modal-title text-white" data-en="New Manual Journal Entry" data-ar="قيد يومية يدوي جديد">New Manual Journal Entry</h5>
+                    <h5 class="modal-title" data-en="New Manual Journal Entry" data-ar="قيد يومية يدوي جديد">New Manual Journal Entry</h5>
                     <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
                 </div>
                 <form method="POST">
@@ -13640,7 +12357,7 @@ document.addEventListener('DOMContentLoaded', function() {
         <div class="modal-dialog modal-xl">
             <div class="modal-content border-0 shadow">
                 <div class="modal-header bg-primary text-white">
-                    <h5 class="modal-title text-white" data-en="Create New Tax Invoice" data-ar="إنشاء فاتورة ضريبية جديدة">Create New Tax Invoice</h5>
+                    <h5 class="modal-title" data-en="Create New Tax Invoice" data-ar="إنشاء فاتورة ضريبية جديدة">Create New Tax Invoice</h5>
                     <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
                 </div>
                 <form method="POST">
@@ -13744,7 +12461,7 @@ document.addEventListener('DOMContentLoaded', function() {
         <div class="modal-dialog modal-xl">
             <div class="modal-content border-0 shadow">
                 <div class="modal-header bg-primary text-white">
-                    <h5 class="modal-title text-white" data-en="Edit Invoice" data-ar="تعديل الفاتورة">Edit Invoice</h5>
+                    <h5 class="modal-title" data-en="Edit Invoice" data-ar="تعديل الفاتورة">Edit Invoice</h5>
                     <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
                 </div>
                 <form method="POST">
@@ -13849,7 +12566,7 @@ document.addEventListener('DOMContentLoaded', function() {
         <div class="modal-dialog modal-xl">
             <div class="modal-content border-0 shadow">
                 <div class="modal-header bg-primary text-white">
-                    <h5 class="modal-title text-white" data-en="Create New LPO" data-ar="إنشاء أمر شراء جديد">Create New LPO</h5>
+                    <h5 class="modal-title" data-en="Create New LPO" data-ar="إنشاء أمر شراء جديد">Create New LPO</h5>
                     <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
                 </div>
                 <form method="POST">
@@ -13932,7 +12649,7 @@ document.addEventListener('DOMContentLoaded', function() {
         <div class="modal-dialog modal-xl">
             <div class="modal-content border-0 shadow">
                 <div class="modal-header bg-primary text-white">
-                    <h5 class="modal-title text-white" data-en="Edit LPO" data-ar="تعديل أمر الشراء">Edit LPO</h5>
+                    <h5 class="modal-title" data-en="Edit LPO" data-ar="تعديل أمر الشراء">Edit LPO</h5>
                     <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
                 </div>
                 <form method="POST">
@@ -14024,7 +12741,7 @@ document.addEventListener('DOMContentLoaded', function() {
         <div class="modal-dialog modal-lg">
             <div class="modal-content border-0 shadow">
                 <div class="modal-header bg-info text-white">
-                    <h5 class="modal-title text-white">LPO Details</h5>
+                    <h5 class="modal-title">LPO Details</h5>
                     <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
                 </div>
                 <div class="modal-body p-4" id="lpoDetailsContent">
@@ -14033,7 +12750,6 @@ document.addEventListener('DOMContentLoaded', function() {
                 <div class="modal-footer">
                     <button type="button" class="btn btn-secondary" data-bs-dismiss="modal" data-en="Close" data-ar="إغلاق">Close</button>
                     <button type="button" class="btn btn-primary" onclick="window.printLPO()">Print LPO</button>
-                    <button type="button" class="btn btn-danger" onclick="downloadPDF('lpoDetailsContent', 'LPO')"><i class="bi bi-file-earmark-pdf me-2"></i>PDF</button>
                 </div>
             </div>
         </div>
@@ -14043,7 +12759,7 @@ document.addEventListener('DOMContentLoaded', function() {
         <div class="modal-dialog modal-xl">
             <div class="modal-content border-0 shadow">
                 <div class="modal-header bg-primary text-white">
-                    <h5 class="modal-title text-white" data-en="Create New Quotation" data-ar="إنشاء عرض سعر جديد">Create New Quotation</h5>
+                    <h5 class="modal-title" data-en="Create New Quotation" data-ar="إنشاء عرض سعر جديد">Create New Quotation</h5>
                     <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
                 </div>
                 <form method="POST">
@@ -14122,7 +12838,7 @@ document.addEventListener('DOMContentLoaded', function() {
         <div class="modal-dialog modal-xl">
             <div class="modal-content border-0 shadow">
                 <div class="modal-header bg-primary text-white">
-                    <h5 class="modal-title text-white" data-en="Edit Quotation" data-ar="تعديل عرض السعر">Edit Quotation</h5>
+                    <h5 class="modal-title" data-en="Edit Quotation" data-ar="تعديل عرض السعر">Edit Quotation</h5>
                     <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
                 </div>
                 <form method="POST">
@@ -14211,7 +12927,7 @@ document.addEventListener('DOMContentLoaded', function() {
         <div class="modal-dialog modal-lg">
             <div class="modal-content border-0 shadow">
                 <div class="modal-header bg-info text-white d-print-none">
-                    <h5 class="modal-title text-white" data-en="View Quotation" data-ar="عرض سعر">View Quotation</h5>
+                    <h5 class="modal-title" data-en="View Quotation" data-ar="عرض سعر">View Quotation</h5>
                     <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
                 </div>
                 <div class="modal-body p-0" id="quotationPrintableArea">
@@ -14220,7 +12936,6 @@ document.addEventListener('DOMContentLoaded', function() {
                 <div class="modal-footer d-print-none">
                     <div id="quotationActionButtons" class="me-auto"></div>
                     <button type="button" class="btn btn-secondary" onclick="window.print()"><i class="bi bi-printer"></i data-en="Print" data-ar="طباعة">Print</button>
-                    <button type="button" class="btn btn-danger" onclick="downloadPDF('quotationPrintableArea', 'Quotation')"><i class="bi bi-file-earmark-pdf me-2"></i>PDF</button>
                     <button type="button" class="btn btn-light" data-bs-dismiss="modal" data-en="Close" data-ar="إغلاق">Close</button>
                 </div>
             </div>
@@ -14318,8 +13033,8 @@ document.addEventListener('DOMContentLoaded', function() {
         <div class="modal-dialog modal-lg">
             <div class="modal-content border-0 shadow">
                 <div class="modal-header d-print-none">
-                    <h5 class="modal-title text-white" data-en="View Invoice" data-ar="عرض الفاتورة">View Invoice</h5>
-                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                    <h5 class="modal-title" data-en="View Invoice" data-ar="عرض الفاتورة">View Invoice</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                 </div>
                 <div class="modal-body p-0" id="invoicePrintableArea">
                     <div class="p-4 invoice-printable-container">
@@ -14332,10 +13047,12 @@ document.addEventListener('DOMContentLoaded', function() {
                                     ?>
                                         <img src="<?= htmlspecialchars($logo) ?>" alt="Logo" class="invoice-logo mb-3">
                                     <?php endif; ?>
-                                    <h3 class="mb-1 fw-bold" id="printCompanyName"><?= htmlspecialchars($data['settings']['company_name'] ?? 'Accounting System') ?></h3>
-                                    <p class="text-muted small mb-0" id="printCompanyAddress"><?= nl2br(htmlspecialchars($data['settings']['company_address'] ?? '')) ?></p>
+                                    <h3 class="mb-1 fw-bold"><?= htmlspecialchars($data['settings']['company_name'] ?? 'Accounting System') ?></h3>
+                                    <p class="text-muted small mb-0"><?= nl2br(htmlspecialchars($data['settings']['company_address'] ?? '')) ?></p>
                                     <p class="text-muted small mb-0">VAT: <?= htmlspecialchars($data['settings']['vat_number'] ?? '') ?></p>
-                                    <p class="text-muted small mb-0" id="printCompanyPhoneContainer" style="<?= empty($data['settings']['company_phone']) ? 'display:none;' : '' ?>">Tel: <span id="printCompanyPhone"><?= htmlspecialchars($data['settings']['company_phone'] ?? '') ?></span></p>
+                                    <?php if (!empty($data['settings']['company_phone'])): ?>
+                                        <p class="text-muted small mb-0">Tel: <?= htmlspecialchars($data['settings']['company_phone']) ?></p>
+                                    <?php endif; ?>
                                 </div>
                                 <div class="col-6 text-end">
                                     <h1 class="invoice-title fw-bold mb-0 text-uppercase">Tax Invoice / فاتورة ضريبية</h1>
@@ -14457,7 +13174,6 @@ document.addEventListener('DOMContentLoaded', function() {
                 <div class="modal-footer d-print-none">
                     <button type="button" class="btn btn-light" data-bs-dismiss="modal" data-en="Close" data-ar="إغلاق">Close</button>
                     <button type="button" class="btn btn-primary" onclick="window.print()"><i class="bi bi-printer me-2"></i>Print Invoice</button>
-                    <button type="button" class="btn btn-danger" onclick="downloadPDF('invoicePrintableArea', 'Invoice')"><i class="bi bi-file-earmark-pdf me-2"></i>PDF</button>
                 </div>
             </div>
         </div>
@@ -14468,7 +13184,7 @@ document.addEventListener('DOMContentLoaded', function() {
         <div class="modal-dialog">
             <div class="modal-content border-0 shadow">
                 <div class="modal-header bg-success text-white">
-                    <h5 class="modal-title text-white" data-en="Record Payment" data-ar="تسجيل دفعة">Record Payment</h5>
+                    <h5 class="modal-title" data-en="Record Payment" data-ar="تسجيل دفعة">Record Payment</h5>
                     <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
                 </div>
                 <form method="POST">
@@ -14517,8 +13233,8 @@ document.addEventListener('DOMContentLoaded', function() {
         <div class="modal-dialog">
             <div class="modal-content border-0 shadow">
                 <div class="modal-header border-0 pb-0 d-print-none">
-                    <h5 class="modal-title text-white">Payment Receipt</h5>
-                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                    <h5 class="modal-title">Payment Receipt</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                 </div>
                 <div class="modal-body p-0" id="printableReceipt">
                     <div class="receipt-container p-4">
@@ -14528,8 +13244,8 @@ document.addEventListener('DOMContentLoaded', function() {
                             if ($logo): ?>
                                 <img src="<?= htmlspecialchars($logo) ?>" alt="Logo" class="invoice-logo mb-3">
                             <?php endif; ?>
-                            <h3 class="mb-1 fw-bold" id="receiptCompanyName"><?= htmlspecialchars($data['settings']['company_name'] ?? 'Accounting System') ?></h3>
-                            <p class="text-muted small mb-0" id="receiptCompanyAddress"><?= nl2br(htmlspecialchars($data['settings']['company_address'] ?? '')) ?></p>
+                            <h3 class="mb-1 fw-bold"><?= htmlspecialchars($data['settings']['company_name'] ?? 'Accounting System') ?></h3>
+                            <p class="text-muted small mb-0"><?= nl2br(htmlspecialchars($data['settings']['company_address'] ?? '')) ?></p>
                             <hr class="my-4">
                             <h4 class="letter-spacing-2 fw-bold text-uppercase">Payment Receipt / سند قبض</h4>
                         </div>
@@ -14619,7 +13335,7 @@ document.addEventListener('DOMContentLoaded', function() {
             <div class="modal-content border-0">
                 <div class="modal-header border-0 pb-0">
                     <h5 class="modal-title fw-bold">Payment</h5>
-                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal" aria-label="Close"></button>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
                 <div class="modal-body">
                     <div class="mb-2 p-2 border rounded bg-light shadow-sm">
@@ -14724,7 +13440,7 @@ document.addEventListener('DOMContentLoaded', function() {
         <div class="modal-dialog modal-sm">
             <div class="modal-content border-0">
                 <div class="modal-header border-0 pb-0">
-                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal" aria-label="Close"></button>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
                 <div class="modal-body pt-0">
                     <div id="posReceiptContent">
@@ -14746,9 +13462,9 @@ document.addEventListener('DOMContentLoaded', function() {
     <div class="modal fade" id="barcodePrintModal" tabindex="-1">
         <div class="modal-dialog">
             <div class="modal-content border-0 shadow">
-                <div class="modal-header bg-primary">
-                    <h5 class="modal-title text-white">Print Barcode Label</h5>
-                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                <div class="modal-header">
+                    <h5 class="modal-title">Print Barcode Label</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                 </div>
                 <div class="modal-body text-center">
                     <div id="barcodeContainer" class="p-4 bg-white border mb-3 mx-auto" style="width: fit-content;">
@@ -14784,8 +13500,8 @@ document.addEventListener('DOMContentLoaded', function() {
         <div class="modal-dialog modal-xl">
             <div class="modal-content border-0 shadow">
                 <div class="modal-header d-print-none">
-                    <h5 class="modal-title text-white">Avery Barcode Labels (A4)</h5>
-                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
+                    <h5 class="modal-title">Avery Barcode Labels (A4)</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
                 </div>
                 <div class="modal-body">
                     <div class="row mb-4 d-print-none">
@@ -14955,14 +13671,12 @@ document.addEventListener('DOMContentLoaded', function() {
                 
                 checkedItems.forEach(cb => {
                     const sku = cb.dataset.sku;
-                    const nameEn = cb.dataset.nameEn || '';
-                    const nameAr = cb.dataset.nameAr || '';
-                    const name = nameEn + (nameAr ? ' - ' + nameAr : '');
+                    const name = cb.dataset.name;
                     const id = cb.dataset.id;
                     
                     const tr = document.createElement('tr');
                     tr.innerHTML = `
-                        <td class="align-middle" style="width: 70%; font-size: 0.9em; max-width: 200px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">${name} <span class="text-muted">(${sku})</span></td>
+                        <td class="align-middle" style="width: 70%; font-size: 0.9em;">${name} <span class="text-muted">(${sku})</span></td>
                         <td class="align-middle" style="width: 30%;">
                             <input type="number" class="form-control form-control-sm item-qty-input" 
                                    data-id="${id}" value="${defaultCopies}" min="0" onchange="updateAveryPreview()" onkeyup="updateAveryPreview()">
@@ -14998,8 +13712,7 @@ document.addEventListener('DOMContentLoaded', function() {
         
         checkedItems.forEach(cb => {
             const sku = cb.dataset.sku;
-            const nameEn = cb.dataset.nameEn || '';
-            const nameAr = cb.dataset.nameAr || '';
+            const name = cb.dataset.name;
             const price = cb.dataset.price;
             const id = cb.dataset.id;
             
@@ -15018,8 +13731,7 @@ document.addEventListener('DOMContentLoaded', function() {
                 const uniqueId = Math.random().toString(36).substr(2, 9);
                 const svgId = `bc-${sku}-${uniqueId}`;
                 label.innerHTML = `
-                    <div style="font-size: 9px; font-weight: bold; margin-bottom: 1px; line-height: 1.1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; max-width: 100%;">${nameEn}</div>
-                    <div style="font-size: 8px; font-weight: bold; margin-bottom: 2px; line-height: 1.1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; max-width: 100%;">${nameAr}</div>
+                    <div style="font-size: 9px; font-weight: bold; margin-bottom: 2px; line-height: 1.1; overflow: hidden; text-overflow: ellipsis; width: 100%;">${name}</div>
                     <svg id="${svgId}"></svg>
                     <div style="font-size: 11px; font-weight: bold; margin-top: 2px;">OMR ${price}</div>
                 `;
@@ -15055,14 +13767,12 @@ document.addEventListener('DOMContentLoaded', function() {
 
 
     <script>
-    window.currentPrintData = {};
-    window.printItemBarcode = function(sku, nameEn, nameAr, price) {
+    window.printItemBarcode = function(sku, name, price) {
         if (!sku) {
             Swal.fire('Error', 'This item has no SKU/Barcode assigned.', 'error');
             return;
         }
-        window.currentPrintData = { sku, nameEn, nameAr, price };
-        document.getElementById('barcodeLabelName').innerHTML = `<div class="text-truncate" style="max-width:100%;">${nameEn}</div><div class="text-truncate" style="max-width:100%; font-size:0.85em;">${nameAr}</div>`;
+        document.getElementById('barcodeLabelName').textContent = name;
         document.getElementById('barcodeLabelPrice').textContent = 'OMR ' + price;
         
         JsBarcode("#barcodeSvg", sku, {
@@ -15083,8 +13793,7 @@ document.addEventListener('DOMContentLoaded', function() {
         const height = parseInt(document.getElementById('barcodeHeight').value) || 25;
         
         // Get content
-        const nameEn = window.currentPrintData.nameEn || '';
-        const nameAr = window.currentPrintData.nameAr || '';
+        const name = document.getElementById('barcodeLabelName').innerText;
         const price = document.getElementById('barcodeLabelPrice').innerText;
         const svg = document.getElementById('barcodeSvg').outerHTML;
         
@@ -15102,8 +13811,7 @@ document.addEventListener('DOMContentLoaded', function() {
         for (let i = 0; i < qty; i++) {
             labelsHtml += `
                 <div class="label-container">
-                    <div class="label-name-en">${nameEn}</div>
-                    <div class="label-name-ar">${nameAr}</div>
+                    <div class="label-name">${name}</div>
                     ${svg}
                     <div class="label-price">${price}</div>
                 </div>
@@ -15131,8 +13839,7 @@ document.addEventListener('DOMContentLoaded', function() {
                         padding: 1mm;
                     }
                     .label-container:last-child { page-break-after: avoid; }
-                    .label-name-en { font-size: 9px; font-weight: bold; margin-bottom: 1px; line-height: 1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; max-width: 100%; }
-                    .label-name-ar { font-size: 8px; font-weight: bold; margin-bottom: 2px; line-height: 1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; max-width: 100%; }
+                    .label-name { font-size: 9px; font-weight: bold; margin-bottom: 2px; line-height: 1.1; overflow: hidden; text-overflow: ellipsis; max-width: 100%; }
                     .label-price { font-size: 12px; font-weight: bold; margin-top: 2px; }
                     svg { max-width: 100%; height: auto; max-height: 70%; display: block; }
                 </style>
@@ -15156,17 +13863,6 @@ document.addEventListener('DOMContentLoaded', function() {
     window.viewAndPrintA4Invoice = function(data, autoPrint = true) {
         if (!data) return;
         // Reuse view logic
-        document.getElementById('printCompanyName').textContent = data.outlet_name || "<?= htmlspecialchars($data['settings']['company_name'] ?? 'Accounting System') ?>";
-        document.getElementById('printCompanyAddress').textContent = data.outlet_address || (typeof companySettings !== 'undefined' ? companySettings.company_address : '') || '';
-        document.getElementById('printCompanyAddress').style.whiteSpace = 'pre-line';
-        const cPhone = data.outlet_phone || "<?= htmlspecialchars($data['settings']['company_phone'] ?? '') ?>";
-        if (cPhone) {
-            document.getElementById('printCompanyPhone').textContent = cPhone;
-            document.getElementById('printCompanyPhoneContainer').style.display = 'block';
-        } else {
-            document.getElementById('printCompanyPhoneContainer').style.display = 'none';
-        }
-
         document.getElementById('invNumber').textContent = 'INV-' + data.id.toString().padStart(5, '0');
         document.getElementById('invDate').textContent = data.invoice_date;
         document.getElementById('invPaymentType').textContent = data.payment_type ? data.payment_type.toUpperCase() : 'CASH';
@@ -15239,7 +13935,7 @@ document.addEventListener('DOMContentLoaded', function() {
         if (document.getElementById('invBalanceInfo')) document.getElementById('invBalanceInfo').innerHTML = '<small><?= __('currency') ?></small> ' + balance.toFixed(3);
 
         // Generate QR Code for Zakat, Tax and Customs Authority (ZATCA) style or simple formal
-        const companyName = data.outlet_name || <?= json_encode($data['settings']['company_name'] ?? 'Accounting System') ?>;
+        const companyName = <?= json_encode($data['settings']['company_name'] ?? 'Accounting System') ?>;
         const vatNo = <?= json_encode($data['settings']['vat_number'] ?? '') ?>;
         const qrData = `Seller: ${companyName}\nVAT: ${vatNo}\nInvoice: INV-${data.id.toString().padStart(5, '0')}\nDate: ${data.invoice_date}\nTotal: ${grandTotalValue.toFixed(3)}`;
         const qrUrl = `https://api.qrserver.com/v1/create-qr-code/?size=100x100&data=${encodeURIComponent(qrData)}`;
@@ -15297,9 +13993,8 @@ document.addEventListener('DOMContentLoaded', function() {
         }, 0);
         const subtotal = inv.items.reduce((sum, item) => sum + (item.unit_price * item.quantity), 0);
         
-        const companyName = inv.outlet_name || "<?= htmlspecialchars($data['settings']['company_name'] ?? 'Accounting System') ?>";
-        const companyPhone = inv.outlet_phone || "<?= htmlspecialchars($data['settings']['company_phone'] ?? '') ?>";
-        const companyAddress = inv.outlet_address ? inv.outlet_address.replace(/\n/g, '<br>') : (typeof companySettings !== 'undefined' ? (companySettings.company_address || '').replace(/\n/g, '<br>') : '');
+        const companyName = "<?= htmlspecialchars($data['settings']['company_name'] ?? 'Accounting System') ?>";
+        const companyPhone = "<?= htmlspecialchars($data['settings']['company_phone'] ?? '') ?>";
         const companyVat = "<?= htmlspecialchars($data['settings']['vat_number'] ?? '') ?>";
         const companyLogo = "<?= htmlspecialchars($data['settings']['company_logo'] ?? '') ?>";
 
@@ -15308,7 +14003,6 @@ document.addEventListener('DOMContentLoaded', function() {
                 <div class="center">
                     ${companyLogo ? `<img src="${companyLogo}" alt="Logo" style="max-height: 60px; width: auto; margin-bottom: 10px; display: block; margin-left: auto; margin-right: auto;">` : ''}
                     <h5 class="mb-0 fw-bold">${companyName}</h5>
-                    ${companyAddress ? `<div>${companyAddress}</div>` : ''}
                     ${companyPhone ? `<div>Tel: ${companyPhone}</div>` : ''}
                     ${companyVat ? `<div>VAT: ${companyVat}</div>` : ''}
                     <div class="separator"></div>
@@ -15376,29 +14070,6 @@ document.addEventListener('DOMContentLoaded', function() {
         location.reload();
     }
 
-    
-    window.downloadPDF = function(elementId, filenamePrefix) {
-        const element = document.getElementById(elementId);
-        if (!element) return;
-        
-        // Hide elements with 'd-print-none' during PDF generation
-        const hiddenElements = element.querySelectorAll('.d-print-none');
-        hiddenElements.forEach(el => el.style.display = 'none');
-        
-        const opt = {
-          margin:       [10, 10, 10, 10],
-          filename:     filenamePrefix + '_' + new Date().getTime() + '.pdf',
-          image:        { type: 'jpeg', quality: 0.98 },
-          html2canvas:  { scale: 2, useCORS: true },
-          jsPDF:        { unit: 'mm', format: 'a4', orientation: 'portrait' }
-        };
-        
-        html2pdf().set(opt).from(element).save().then(() => {
-            // Restore hidden elements
-            hiddenElements.forEach(el => el.style.display = '');
-        });
-    };
-    
     // --- Language Apply Script ---
     function applyLanguage(node) {
         const docLang = document.documentElement.lang || 'ar';
@@ -15459,31 +14130,19 @@ document.addEventListener('DOMContentLoaded', function() {
     });
     // -----------------------------
     <?php if ($page === 'dashboard' && can('dashboard_view')): ?>
-    const monthlyData = <?= json_encode($data['monthly_sales'] ?? []) ?>;
-    const yearlyData = <?= json_encode($data['yearly_sales'] ?? []) ?>;
-    const cashFlowData = <?= json_encode($data['cash_flow'] ?? []) ?>;
+    const monthlyData = <?= json_encode($data['monthly_sales']) ?>;
+    const yearlyData = <?= json_encode($data['yearly_sales']) ?>;
     
     const ctx = document.getElementById('salesChart').getContext('2d');
-    
-    let gradient = ctx.createLinearGradient(0, 0, 0, 400);
-    gradient.addColorStop(0, 'rgba(13, 110, 253, 0.4)');   
-    gradient.addColorStop(1, 'rgba(13, 110, 253, 0)');
-
     let salesChart = new Chart(ctx, {
         type: 'line',
         data: {
             labels: monthlyData.map(d => d.label),
             datasets: [{
-                label: '<?= $lang === "ar" ? "المبيعات" : "Sales" ?>',
+                label: 'Sales (OMR)',
                 data: monthlyData.map(d => d.total),
                 borderColor: '#0d6efd',
-                backgroundColor: gradient,
-                borderWidth: 3,
-                pointBackgroundColor: '#ffffff',
-                pointBorderColor: '#0d6efd',
-                pointBorderWidth: 2,
-                pointRadius: 4,
-                pointHoverRadius: 6,
+                backgroundColor: 'rgba(13, 110, 253, 0.1)',
                 fill: true,
                 tension: 0.4
             }]
@@ -15492,36 +14151,16 @@ document.addEventListener('DOMContentLoaded', function() {
             responsive: true,
             maintainAspectRatio: false,
             plugins: {
-                legend: { display: false },
-                tooltip: {
-                    backgroundColor: 'rgba(0,0,0,0.8)',
-                    titleFont: { size: 14, family: "'Segoe UI', Roboto, sans-serif" },
-                    bodyFont: { size: 14, family: "'Segoe UI', Roboto, sans-serif" },
-                    padding: 10,
-                    cornerRadius: 8,
-                    displayColors: false,
-                    callbacks: {
-                        label: function(context) {
-                            let label = context.dataset.label || '';
-                            if (label) { label += ': '; }
-                            if (context.parsed.y !== null) { label += new Intl.NumberFormat().format(context.parsed.y) + ' OMR'; }
-                            return label;
-                        }
-                    }
-                }
+                legend: { display: false }
             },
             scales: {
-                x: { grid: { display: false, drawBorder: false } },
-                y: { 
-                    beginAtZero: true, 
-                    grid: { color: 'rgba(0,0,0,0.05)', drawBorder: false },
-                    border: { dash: [5, 5] },
+                y: {
+                    beginAtZero: true,
                     ticks: {
                         callback: function(value) { return 'OMR ' + value.toFixed(3); }
                     }
                 }
-            },
-            interaction: { mode: 'index', intersect: false }
+            }
         }
     });
 
@@ -15540,69 +14179,6 @@ document.addEventListener('DOMContentLoaded', function() {
         salesChart.data.datasets[0].data = yearlyData.map(d => d.total);
         salesChart.update();
     });
-
-    if (cashFlowData.length > 0) {
-        const ctxCf = document.getElementById('cashFlowChart').getContext('2d');
-        new Chart(ctxCf, {
-            type: 'bar',
-            data: {
-                labels: cashFlowData.map(d => d.label),
-                datasets: [
-                    {
-                        label: '<?= $lang === "ar" ? "الدخل" : "Income" ?>',
-                        data: cashFlowData.map(d => d.income),
-                        backgroundColor: '#198754',
-                        borderRadius: 4,
-                        barPercentage: 0.6,
-                        categoryPercentage: 0.8
-                    },
-                    {
-                        label: '<?= $lang === "ar" ? "المصروفات" : "Expenses" ?>',
-                        data: cashFlowData.map(d => d.expense),
-                        backgroundColor: '#dc3545',
-                        borderRadius: 4,
-                        barPercentage: 0.6,
-                        categoryPercentage: 0.8
-                    }
-                ]
-            },
-            options: {
-                responsive: true,
-                maintainAspectRatio: false,
-                plugins: {
-                    legend: { 
-                        position: 'top',
-                        labels: { usePointStyle: true, boxWidth: 8, font: { family: "'Segoe UI', Roboto, sans-serif" } }
-                    },
-                    tooltip: {
-                        backgroundColor: 'rgba(0,0,0,0.8)',
-                        padding: 10,
-                        cornerRadius: 8,
-                        callbacks: {
-                            label: function(context) {
-                                let label = context.dataset.label || '';
-                                if (label) { label += ': '; }
-                                if (context.parsed.y !== null) { label += new Intl.NumberFormat().format(context.parsed.y) + ' OMR'; }
-                                return label;
-                            }
-                        }
-                    }
-                },
-                scales: {
-                    x: { grid: { display: false, drawBorder: false } },
-                    y: { 
-                        beginAtZero: true, 
-                        grid: { color: 'rgba(0,0,0,0.05)', drawBorder: false },
-                        border: { dash: [5, 5] },
-                        ticks: {
-                            callback: function(value) { return 'OMR ' + value.toFixed(3); }
-                        }
-                    }
-                },
-                interaction: { mode: 'index', intersect: false }
-            }
-        });
-    }
     <?php endif; ?>
 
     </script>
diff --git a/login_debug.log b/login_debug.log
index 1ba92df..f8c527f 100644
--- a/login_debug.log
+++ b/login_debug.log
@@ -2,3 +2,4 @@
 2026-02-26 17:58:40 - Failed login for 'admin'. Reason: Password mismatch
 2026-02-26 17:58:46 - Failed login for 'admin'. Reason: Password mismatch
 2026-02-26 17:59:03 - Failed login for 'admin'. Reason: Password mismatch
+2026-03-17 10:12:37 - Failed login for 'moosa'. Reason: Password mismatch
diff --git a/post_debug.log b/post_debug.log
index 7104fe1..95c26a7 100644
--- a/post_debug.log
+++ b/post_debug.log
@@ -35,3 +35,5 @@
 2026-03-17 09:25:20 - POST: {"start_trial":""}
 2026-03-17 09:25:46 - POST: {"username":"admin","password":"admin","login":""}
 2026-03-17 09:58:21 - POST: {"license_key":"FLAT-8E07-54E9-B427","activate":""}
+2026-03-17 10:12:13 - POST: {"username":"admin","password":"admin","login":""}
+2026-03-17 10:12:37 - POST: {"username":"moosa","password":"moosa123","login":""}